Mercurial > pidgin.yaz
diff pidgin/gtkconv.c @ 26477:e1523f30bdb5
Move these variables to the end to not break ABI.
author | Mike Ruprecht <maiku@soc.pidgin.im> |
---|---|
date | Wed, 01 Apr 2009 04:24:11 +0000 |
parents | e23a74d7c97c |
children | b162300ab1e7 1337d2813b2d ae24e54a5014 |
line wrap: on
line diff
--- a/pidgin/gtkconv.c Wed Apr 01 03:23:21 2009 +0000 +++ b/pidgin/gtkconv.c Wed Apr 01 04:24:11 2009 +0000 @@ -3453,13 +3453,13 @@ 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 @@ 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