Mercurial > pidgin
changeset 32634:866ef8552606
it's now possible to start conversations without glib fatal warnings...
| author | Marcus Lundblad <ml@update.uu.se> |
|---|---|
| date | Sun, 28 Nov 2010 22:52:10 +0000 |
| parents | 6487dbfd9b6b |
| children | 45625ed0a985 |
| files | pidgin/gtkconv.c |
| diffstat | 1 files changed, 6 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/pidgin/gtkconv.c Sun Nov 28 21:48:26 2010 +0000 +++ b/pidgin/gtkconv.c Sun Nov 28 22:52:10 2010 +0000 @@ -3579,6 +3579,10 @@ gtk_ui_manager_get_action(win->menu.ui, "/Conversation/ConversationMenu/SendFile"); + g_object_set_data(G_OBJECT(win->window), "get_attention", + gtk_ui_manager_get_action(win->menu.ui, + "/Conversation/ConversationMenu/GetAttention")); + win->menu.add_pounce = gtk_ui_manager_get_action(win->menu.ui, "/Conversation/ConversationMenu/AddBuddyPounce"); @@ -6612,7 +6616,7 @@ /* Deal with menu items */ gtk_action_set_visible(win->menu.view_log, TRUE); gtk_action_set_visible(win->menu.send_file, TRUE); - gtk_action_set_visible(g_object_get_data(G_OBJECT(win->window), "get_attention"), TRUE); + gtk_action_set_visible(GTK_ACTION(g_object_get_data(G_OBJECT(win->window), "get_attention")), TRUE); gtk_action_set_visible(win->menu.add_pounce, TRUE); gtk_action_set_visible(win->menu.get_info, TRUE); gtk_action_set_visible(win->menu.invite, FALSE); @@ -9748,8 +9752,7 @@ gtk_notebook_set_tab_label(GTK_NOTEBOOK(win->notebook), gtkconv->tab_cont, ebox); } - g_object_set(G_OBJECT(win->notebook), "expand", !tabs_side && !angle, - "fill", TRUE, NULL); + g_object_set(G_OBJECT(win->notebook), "expand", !tabs_side && !angle, NULL); if (pidgin_conv_window_get_gtkconv_count(win) == 1) gtk_notebook_set_show_tabs(GTK_NOTEBOOK(win->notebook),