cpw.qulogic.gtk3: 1153f36f: Fix media call initiation for UI manager...

[qulogic at pidgin.im]

-----------------------------------------------------------------
Revision: 1153f36f9a7f396da1c60c96af0b347a9739a948
Ancestor: 3f0689ff2eb811cfd44d8b89c623d93e3d6ce629
Author: qulogic at pidgin.im
Date: 2009-07-28T05:47:09
Branch: im.pidgin.cpw.qulogic.gtk3
URL: http://d.pidgin.im/viewmtn/revision/info/1153f36f9a7f396da1c60c96af0b347a9739a948

Modified files:
        pidgin/gtkconv.c

ChangeLog: 

Fix media call initiation for UI manager.

-------------- next part --------------
============================================================
--- pidgin/gtkconv.c	a33d4308bc9b076c68e8abf1880de9207e1f96a7
+++ pidgin/gtkconv.c	17423846123a08454f8d5f42e378eb93a47dbd7f
@@ -1227,15 +1227,25 @@ menu_initiate_media_call_cb(GtkAction *a
 static void 
 #if GTK_CHECK_VERSION(2,6,0)
 menu_initiate_media_call_cb(GtkAction *action, gpointer data)
+{
+	PidginWindow *win = (PidginWindow *)data;
+	PurpleConversation *conv = pidgin_conv_window_get_active_conversation(win);
+	PurpleAccount *account = purple_conversation_get_account(conv);
+
+	purple_prpl_initiate_media(account,
+			purple_conversation_get_name(conv),
+			action == win->audio_call ? PURPLE_MEDIA_AUDIO :
+			action == win->video_call ? PURPLE_MEDIA_VIDEO :
+			action == win->audio_video_call ? PURPLE_MEDIA_AUDIO |
+			PURPLE_MEDIA_VIDEO : PURPLE_MEDIA_NONE);
+}
 #else
 menu_initiate_media_call_cb(gpointer data, guint action, GtkWidget *widget)
-#endif
 {
 	PidginWindow *win = (PidginWindow *)data;
 	PurpleConversation *conv = pidgin_conv_window_get_active_conversation(win);
 	PurpleAccount *account = purple_conversation_get_account(conv);
 
-	/* FIXME: action is not an int... */
 	purple_prpl_initiate_media(account,
 			purple_conversation_get_name(conv),
 			action == 0 ? PURPLE_MEDIA_AUDIO :
@@ -1244,6 +1254,7 @@ menu_initiate_media_call_cb(gpointer dat
 			PURPLE_MEDIA_VIDEO : PURPLE_MEDIA_NONE);
 }
 #endif
+#endif
 
 static void
 #if GTK_CHECK_VERSION(2,6,0)