[Gaim-commits] CVS: gaim/src/protocols/sametime sametime.c,1.53,1.54

[Etan R. <de...@us...>]

Update of /cvsroot/gaim/gaim/src/protocols/sametime
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6242

Modified Files:
	sametime.c 
Log Message:
20:49:08 <datallah> deryni: sametime.c: In function 'blist_node_menu_cb':
20:49:08 <datallah> sametime.c:1251: warning: passing argument 2 of 
                    'gaim_menu_action_new' from incompatible pointer type
20:49:38 <deryni> Oh, oops.

All this GAIM_CALLBACK stuff will be able to go away when we gobjectify, since then the function will have the same signature for all uses.



Index: sametime.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/sametime/sametime.c,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -d -p -r1.53 -r1.54
--- sametime.c	17 Jan 2006 23:22:19 -0000	1.53
+++ sametime.c	18 Jan 2006 01:54:17 -0000	1.54
@@ -1239,7 +1239,7 @@ static void blist_node_menu_cb(GaimBlist
      them all to a conference */
   if(gaim_group_on_account(group, acct)) {
     act = gaim_menu_action_new(_("Invite Group to Conference..."),
-                               blist_menu_group_invite, pd, NULL);
+                               GAIM_CALLBACK(blist_menu_group_invite), pd, NULL);
     *menu = g_list_append(*menu, NULL);
   }
 #endif
@@ -1248,7 +1248,7 @@ static void blist_node_menu_cb(GaimBlist
   owner = gaim_blist_node_get_string(node, GROUP_KEY_OWNER);
   if(owner && !strcmp(owner, gaim_account_get_username(acct))) {
     act = gaim_menu_action_new(_("Get Notes Address Book Info"),
-                               blist_menu_nab, pd, NULL);
+                               GAIM_CALLBACK(blist_menu_nab), pd, NULL);
     *menu = g_list_append(*menu, act);
   }
 }