/pidgin/main: dc4dac5b33a4: Fix a crash when using hidden conv w...

[Tomasz Wasilczyk]

Changeset: dc4dac5b33a495fef8a6522dbf38274713b8539f
Author:	 Tomasz Wasilczyk <twasilczyk at pidgin.im>
Date:	 2014-01-15 23:41 +0100
Branch:	 default
URL: https://hg.pidgin.im/pidgin/main/rev/dc4dac5b33a4

Description:

Fix a crash when using hidden conv window (for persistent chats) and a single compilation error

diffstat:

 pidgin/gtkconv.c |  5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diffs (22 lines):

diff --git a/pidgin/gtkconv.c b/pidgin/gtkconv.c
--- a/pidgin/gtkconv.c
+++ b/pidgin/gtkconv.c
@@ -1985,7 +1985,7 @@ update_typing_deleting(PidginConversatio
 {
 	gchar *text;
 
-	g_return_val_if_fail(gtkconv != NULL, FALSE);
+	g_return_if_fail(gtkconv != NULL);
 
 	text = gtk_webview_get_body_text(GTK_WEBVIEW(gtkconv->entry));
 
@@ -9844,6 +9844,9 @@ notebook_remove_tab_from_menu_cb(GtkNote
 {
 	GtkWidget *item;
 
+	/* Disconnecting the "child-notify::menu-label" signal. */
+	g_signal_handlers_disconnect_by_data(child, notebook);
+
 	item = g_object_get_data(G_OBJECT(child), "popup-menu-item");
 	gtk_container_remove(GTK_CONTAINER(win->notebook_menu), item);
 }