/soc/2013/ankitkv/gobjectification: 80a6477fd903: Merged default...

[Ankit Vani]

Changeset: 80a6477fd90324ae0d6126aa45c40c39ba456f65
Author:	 Ankit Vani <a at nevitus.org>
Date:	 2014-01-16 04:59 +0530
Branch:	 soc.2013.gobjectification.plugins
URL: https://hg.pidgin.im/soc/2013/ankitkv/gobjectification/rev/80a6477fd903

Description:

Merged default branch

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
@@ -1988,7 +1988,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));
 
@@ -9843,6 +9843,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);
 }