# HG changeset patch
# User Sadrul Habib Chowdhury <imadil@gmail.com>
# Date 1184057903 0
# Node ID 58aeac6930faab0e7a5b1016b7da64940ffc7d77
# Parent  c34981ad802adc37055b671f07a72c96ea1f83f5# Parent  6a8a142cd6007d0e357b6bc35a585eaa204ff6ce
merge of '1bc2ea23969174b3ad8cb5bebc864bc222d2d5ea'
     and '76fc29e65404bf23ab7b09fc64d4312cf43637a0'

diff -r 6a8a142cd600 -r 58aeac6930fa finch/gntdebug.c
--- a/finch/gntdebug.c	Tue Jul 10 06:19:09 2007 +0000
+++ b/finch/gntdebug.c	Tue Jul 10 08:58:23 2007 +0000
@@ -302,7 +302,8 @@
 	REGISTER_G_LOG_HANDLER("GThread");
 
 	g_set_print_handler(print_stderr);   /* Redirect the debug messages to stderr */
-	g_set_printerr_handler(suppress_error_messages);
+	if (!purple_debug_is_enabled())
+		g_set_printerr_handler(suppress_error_messages);
 
 	purple_prefs_add_none(PREF_ROOT);
 	purple_prefs_add_string(PREF_ROOT "/filter", "");
diff -r 6a8a142cd600 -r 58aeac6930fa finch/libgnt/gntwm.c
--- a/finch/libgnt/gntwm.c	Tue Jul 10 06:19:09 2007 +0000
+++ b/finch/libgnt/gntwm.c	Tue Jul 10 08:58:23 2007 +0000
@@ -1918,8 +1918,11 @@
 
 	while (widget->parent)
 		widget = widget->parent;
-	if (!GNT_IS_MENU(widget))
+	if (!GNT_IS_MENU(widget)) {
+		if (!GNT_IS_BOX(widget))
+			return;
 		gnt_box_sync_children(GNT_BOX(widget));
+	}
 
 	ws = gnt_wm_widget_find_workspace(wm, widget);
 	node = g_hash_table_lookup(wm->nodes, widget);
@@ -1932,7 +1935,7 @@
 		gnt_wm_copy_win(widget, node);
 		update_screen(wm);
 		gnt_ws_draw_taskbar(wm->cws, FALSE);
-	} else if (ws != wm->cws && GNT_WIDGET_IS_FLAG_SET(widget, GNT_WIDGET_URGENT)) {
+	} else if (ws && ws != wm->cws && GNT_WIDGET_IS_FLAG_SET(widget, GNT_WIDGET_URGENT)) {
 		if (!act || (act && !g_list_find(act, ws)))
 			act = g_list_prepend(act, ws);
 		update_act_msg();
diff -r 6a8a142cd600 -r 58aeac6930fa libpurple/dbus-useful.c
diff -r 6a8a142cd600 -r 58aeac6930fa libpurple/debug.c
diff -r 6a8a142cd600 -r 58aeac6930fa libpurple/plugins/perl/common/Connection.xs
diff -r 6a8a142cd600 -r 58aeac6930fa libpurple/protocols/gg/lib/http.c
diff -r 6a8a142cd600 -r 58aeac6930fa libpurple/protocols/gg/lib/pubdir50.c
diff -r 6a8a142cd600 -r 58aeac6930fa libpurple/protocols/jabber/jutil.c
diff -r 6a8a142cd600 -r 58aeac6930fa libpurple/protocols/yahoo/Makefile.am
diff -r 6a8a142cd600 -r 58aeac6930fa libpurple/protocols/yahoo/yahoochat.h
diff -r 6a8a142cd600 -r 58aeac6930fa pidgin/gtkdocklet.c
diff -r 6a8a142cd600 -r 58aeac6930fa pidgin/gtklog.c
diff -r 6a8a142cd600 -r 58aeac6930fa pidgin/plugins/gestures/gestures.c
diff -r 6a8a142cd600 -r 58aeac6930fa pidgin/plugins/notify.c
diff -r 6a8a142cd600 -r 58aeac6930fa pidgin/plugins/timestamp.c