pidgin.vv: 6e683319: Move these variables to the end to not b...

[maiku at soc.pidgin.im]

-----------------------------------------------------------------
Revision: 6e683319559d829234bc548e0795ed03403af478
Ancestor: ec871c67e9e695cb5d2028a4ad94fcfd8893d5ea
Author: maiku at soc.pidgin.im
Date: 2009-04-01T04:24:11
Branch: im.pidgin.pidgin.vv
URL: http://d.pidgin.im/viewmtn/revision/info/6e683319559d829234bc548e0795ed03403af478

Modified files:
        pidgin/gtkconv.c pidgin/gtkconvwin.h

ChangeLog: 

Move these variables to the end to not break ABI.

-------------- next part --------------
============================================================
--- pidgin/gtkconv.c	f8bf071416ebfb3b66002f33218096a1b73b7442
+++ pidgin/gtkconv.c	48ccd8ac1e2c6604ab4967892b4796f7acb6cceb
@@ -3453,13 +3453,13 @@ setup_menubar(PidginWindow *win)
 		                            N_("/Conversation/View Log"));
 
 #ifdef USE_VV
-	win->menu.audio_call =
+	win->audio_call =
 		gtk_item_factory_get_widget(win->menu.item_factory,
 					    N_("/Conversation/Media/Audio Call"));
-	win->menu.video_call =
+	win->video_call =
 		gtk_item_factory_get_widget(win->menu.item_factory,
 					    N_("/Conversation/Media/Video Call"));
-	win->menu.audio_video_call =
+	win->audio_video_call =
 		gtk_item_factory_get_widget(win->menu.item_factory,
 					    N_("/Conversation/Media/Audio\\/Video Call"));
 #endif
@@ -6456,24 +6456,24 @@ gray_stuff_out(PidginConversation *gtkco
 					purple_prpl_get_media_caps(account,
 					purple_conversation_get_name(conv));
 
-			gtk_widget_set_sensitive(win->menu.audio_call,
+			gtk_widget_set_sensitive(win->audio_call,
 					caps & PURPLE_MEDIA_CAPS_AUDIO
 					? TRUE : FALSE);
-			gtk_widget_set_sensitive(win->menu.video_call,
+			gtk_widget_set_sensitive(win->video_call,
 					caps & PURPLE_MEDIA_CAPS_VIDEO
 					? TRUE : FALSE);
-			gtk_widget_set_sensitive(win->menu.audio_video_call, 
+			gtk_widget_set_sensitive(win->audio_video_call, 
 					caps & PURPLE_MEDIA_CAPS_AUDIO_VIDEO
 					? TRUE : FALSE);
 		} else if (purple_conversation_get_type(conv) == PURPLE_CONV_TYPE_CHAT) {
 			/* for now, don't care about chats... */
-			gtk_widget_set_sensitive(win->menu.audio_call, FALSE);
-			gtk_widget_set_sensitive(win->menu.video_call, FALSE);
-			gtk_widget_set_sensitive(win->menu.audio_video_call, FALSE);
+			gtk_widget_set_sensitive(win->audio_call, FALSE);
+			gtk_widget_set_sensitive(win->video_call, FALSE);
+			gtk_widget_set_sensitive(win->audio_video_call, FALSE);
 		} else {
-			gtk_widget_set_sensitive(win->menu.audio_call, FALSE);
-			gtk_widget_set_sensitive(win->menu.video_call, FALSE);
-			gtk_widget_set_sensitive(win->menu.audio_video_call, FALSE);
+			gtk_widget_set_sensitive(win->audio_call, FALSE);
+			gtk_widget_set_sensitive(win->video_call, FALSE);
+			gtk_widget_set_sensitive(win->audio_video_call, FALSE);
 		}							
 #endif
 		
============================================================
--- pidgin/gtkconvwin.h	d465ce91335268efa990ef944cd2b8ba8322f4c8
+++ pidgin/gtkconvwin.h	4a76dac0d34b4a5806ca2a74cf16c52a8b2ddf89
@@ -49,11 +49,6 @@ struct _PidginWindow
 		GtkWidget *menubar;
 
 		GtkWidget *view_log;
-#ifdef USE_VV
-		GtkWidget *audio_call;
-		GtkWidget *video_call;
-		GtkWidget *audio_video_call;
-#endif
 		GtkWidget *send_file;
 		GtkWidget *add_pounce;
 		GtkWidget *get_info;
@@ -100,6 +95,12 @@ struct _PidginWindow
 
 	gint drag_motion_signal;
 	gint drag_leave_signal;
+
+#ifdef USE_VV
+	GtkWidget *audio_call;
+	GtkWidget *video_call;
+	GtkWidget *audio_video_call;
+#endif
 };
 
 /*@}*/