Mercurial > pidgin.yaz
changeset 18472:58aeac6930fa
merge of '1bc2ea23969174b3ad8cb5bebc864bc222d2d5ea'
and '76fc29e65404bf23ab7b09fc64d4312cf43637a0'
| author | Sadrul Habib Chowdhury <imadil@gmail.com> |
|---|---|
| date | Tue, 10 Jul 2007 08:58:23 +0000 |
| parents | c34981ad802a (diff) 6a8a142cd600 (current diff) |
| children | 38ff7582c569 3131e25b8925 2cbc6d5036b7 5c1ed6296b56 1e92ac5586d9 |
| files | |
| diffstat | 2 files changed, 7 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- 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", "");
--- 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();