# HG changeset patch
# User Christopher O'Brien <siege@pidgin.im>
# Date 1137553095 0
# Node ID f50a99d5ba9b6673832c5a8f86311c44e86f912f
# Parent  7324922a88497b6bd28fd7ac137eb875330f1cdf
[gaim-migrate @ 15276]
fixing gaim_menu_action_new warnings

committer: Tailor Script <tailor@pidgin.im>

diff -r 7324922a8849 -r f50a99d5ba9b src/protocols/novell/novell.c
--- a/src/protocols/novell/novell.c	Wed Jan 18 02:10:10 2006 +0000
+++ b/src/protocols/novell/novell.c	Wed Jan 18 02:58:15 2006 +0000
@@ -3442,7 +3442,7 @@
 
 	if(GAIM_BLIST_NODE_IS_BUDDY(node)) {
 		act = gaim_menu_action_new(_("Initiate _Chat"),
-		                           _initiate_conference_cb, NULL, NULL);
+		                           GAIM_CALLBACK(_initiate_conference_cb), NULL, NULL);
 		list = g_list_append(list, act);
 	}
 
diff -r 7324922a8849 -r f50a99d5ba9b src/protocols/sametime/sametime.c
--- a/src/protocols/sametime/sametime.c	Wed Jan 18 02:10:10 2006 +0000
+++ b/src/protocols/sametime/sametime.c	Wed Jan 18 02:58:15 2006 +0000
@@ -1239,7 +1239,8 @@
      them all to a conference */
   if(gaim_group_on_account(group, acct)) {
     act = gaim_menu_action_new(_("Invite Group to Conference..."),
-                               GAIM_CALLBACK(blist_menu_group_invite), pd, NULL);
+                               GAIM_CALLBACK(blist_menu_group_invite),
+			       pd, NULL);
     *menu = g_list_append(*menu, NULL);
   }
 #endif
@@ -3492,7 +3493,7 @@
   l = g_list_append(l, NULL);
 
   act = gaim_menu_action_new(_("Invite to Conference..."),
-                             blist_menu_conf, NULL, NULL);
+                             GAIM_CALLBACK(blist_menu_conf), NULL, NULL);
   l = g_list_append(l, act);
 
   /** note: this never gets called for a GaimGroup, have to use the