cpw.qulogic.gtk3: b00bbf6f: it's now possible to start conversations...

[malu at pidgin.im]

----------------------------------------------------------------------
Revision: b00bbf6fb5600584ee28dcd4f35054c539d588dd
Parent:   11ba7dbcb558106a4503cbf20c8d11e4ce8747c1
Author:   malu at pidgin.im
Date:     11/28/10 17:52:10
Branch:   im.pidgin.cpw.qulogic.gtk3
URL: http://d.pidgin.im/viewmtn/revision/info/b00bbf6fb5600584ee28dcd4f35054c539d588dd

Changelog: 

it's now possible to start conversations without glib fatal warnings...

Changes against parent 11ba7dbcb558106a4503cbf20c8d11e4ce8747c1

  patched  pidgin/gtkconv.c

-------------- next part --------------
============================================================
--- pidgin/gtkconv.c	4160c4611d519376f98aa16b9c8824ef662048de
+++ pidgin/gtkconv.c	83f8191bce0c169def2be24ccf7b7bd1d4230114
@@ -3579,6 +3579,10 @@ setup_menubar(PidginWindow *win)
 		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 @@ gray_stuff_out(PidginConversation *gtkco
 		/* 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 @@ pidgin_conv_tab_pack(PidginWindow *win, 
 		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),