diff -r 592be5c74b68 -r dc4dac5b33a4 pidgin/gtkconv.c --- a/pidgin/gtkconv.c Sun Jan 12 16:15:59 2014 +0530 +++ b/pidgin/gtkconv.c Wed Jan 15 23:41:46 2014 +0100 @@ -1985,7 +1985,7 @@ { 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 @@ { 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); }