[gaim-bnet-commits] gaim-bnet/src bnet.c,1.29,1.30

[Don S. <ri...@us...>]

Update of /cvsroot/gaim-bnet/gaim-bnet/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28828/src

Modified Files:
	bnet.c 
Log Message:
Doing buddy list the right way

Index: bnet.c
===================================================================
RCS file: /cvsroot/gaim-bnet/gaim-bnet/src/bnet.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** bnet.c	14 Jan 2005 05:25:45 -0000	1.29
--- bnet.c	14 Jan 2005 15:27:50 -0000	1.30
***************
*** 81,144 ****
  }
  
! void
! bnet_user_stats(GaimBlistNode *node, gpointer data) {
  	GaimBuddy *buddy;
! 	GaimAccount *account;
! 	GaimConnection *conn;
  
  	g_return_if_fail(GAIM_BLIST_NODE_IS_BUDDY(node));
  
  	buddy = (GaimBuddy *) node;
! 	account = buddy->account;
! 	//conn = gaim_account_get_connection(account);
! 	conn = account->gc;
  
  	gaim_debug_info("bnet_user_stats", "I want to call stats for %s in %s\n", buddy->name, data);
! 	bnet_conn_send(conn->proto_data, "/stats %s %s\n", buddy->name, data);
  }
  
  
! /*
!  * Statistics sub-menu
!  */
! static void blist_node_menu(GaimBlistNode *node, GList **menu, gpointer data) {
  
  	GaimBlistNodeAction *act;
  
  	g_return_if_fail(node != NULL);
- 	g_return_if_fail(menu != NULL);
- 
- 	if(! GAIM_BLIST_NODE_IS_BUDDY(node))
- 		return;
  
! 	*menu = g_list_append(*menu, NULL);
  
  	act = gaim_blist_node_action_new(_("StarCraft Stats"),
! 									bnet_user_stats,
! 									"STAR");
! 	*menu = g_list_append(*menu, act);
  
  	act = gaim_blist_node_action_new(_("StarCraft Broodwar Stats"),
! 									bnet_user_stats,
! 									"SEXP");
! 	*menu = g_list_append(*menu, act);
  
  	act = gaim_blist_node_action_new(_("WarCraft II Battle.net Edition Stats"),
! 									bnet_user_stats,
! 									"W2BN");
! 	*menu = g_list_append(*menu, act);
  
  	act = gaim_blist_node_action_new(_("WarCraft III Stats"),
! 									bnet_user_stats,
! 									"WAR3");
! 	*menu = g_list_append(*menu, act);
  
  	act = gaim_blist_node_action_new(_("WarCraft III The Frozen Throne Stats"),
! 									bnet_user_stats,
! 									"W3XP");
! 	*menu = g_list_append(*menu, act);
! 
! 	*menu = g_list_append(*menu, NULL);
  
  }
  
--- 81,131 ----
  }
  
! static void bnet_user_stats(GaimBlistNode *node, gpointer data) {
  	GaimBuddy *buddy;
! 	GaimConnection *gc;
! 	BNetConn *conn;
  
  	g_return_if_fail(GAIM_BLIST_NODE_IS_BUDDY(node));
  
  	buddy = (GaimBuddy *) node;
! 	gc = gaim_account_get_connection(buddy->account);
! 	conn = gc->proto_data;
  
  	gaim_debug_info("bnet_user_stats", "I want to call stats for %s in %s\n", buddy->name, data);
! 	bnet_conn_send(conn, "/stats %s %s\n", buddy->name, data);
  }
  
  
! static GList *blist_node_menu(GaimBlistNode *node) {
  
  	GaimBlistNodeAction *act;
+ 	GList *m = NULL;
  
  	g_return_if_fail(node != NULL);
  
! 	if(!GAIM_BLIST_NODE_IS_BUDDY(node))
! 		return NULL;
  
  	act = gaim_blist_node_action_new(_("StarCraft Stats"),
! 									bnet_user_stats, "STAR");
! 	m = g_list_append(m, act);
  
  	act = gaim_blist_node_action_new(_("StarCraft Broodwar Stats"),
! 									bnet_user_stats, "SEXP");
! 	m = g_list_append(m, act);
  
  	act = gaim_blist_node_action_new(_("WarCraft II Battle.net Edition Stats"),
! 									bnet_user_stats, "W2BN");
! 	m = g_list_append(m, act);
  
  	act = gaim_blist_node_action_new(_("WarCraft III Stats"),
! 									bnet_user_stats, "WAR3");
! 	m = g_list_append(m, act);
  
  	act = gaim_blist_node_action_new(_("WarCraft III The Frozen Throne Stats"),
! 									bnet_user_stats, "W3XP");
! 	m = g_list_append(m, act);
  
+ 	return m;
  }
  
***************
*** 165,169 ****
  	NULL,							/* tooltip_text				*/
  	NULL,							/* away_states				*/
! 	NULL,							/* blist_node_menu			*/
  	bnet_chat_info,					/* chat_info				*/
  	NULL,							/* chat_info_defaults		*/
--- 152,156 ----
  	NULL,							/* tooltip_text				*/
  	NULL,							/* away_states				*/
! 	blist_node_menu,				/* blist_node_menu			*/
  	bnet_chat_info,					/* chat_info				*/
  	NULL,							/* chat_info_defaults		*/
***************
*** 243,247 ****
  static void
  init_plugin(GaimPlugin *plugin) {
- 	void *blist_handle = gaim_blist_get_handle();
  #if 0
  	GList *server_list = NULL;
--- 230,233 ----
***************
*** 258,264 ****
  
  
- 	gaim_signal_connect(blist_handle, "blist-node-extended-menu", plugin,
- 						GAIM_CALLBACK(blist_node_menu), NULL);
- 
  	GaimAccountOption *option;
  
--- 244,247 ----