Mercurial > pidgin
changeset 20870:c026361d4e63
merge of 'cd26f6af7f8ee75ef909ae08b06ad5a1978051d9'
and 'e995c23bc19d0f8a2f833a105da86eaa9218f517'
| author | Daniel Atallah <daniel.atallah@gmail.com> |
|---|---|
| date | Wed, 10 Oct 2007 01:59:36 +0000 |
| parents | a7733677ee20 (current diff) 2a6ef74f5a4e (diff) |
| children | 34fc2a999977 |
| files | |
| diffstat | 2 files changed, 9 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/finch/libgnt/gntwm.c Wed Oct 10 01:45:37 2007 +0000 +++ b/finch/libgnt/gntwm.c Wed Oct 10 01:59:36 2007 +0000 @@ -1717,12 +1717,11 @@ void gnt_wm_window_close(GntWM *wm, GntWidget *widget) { GntWS *s; - GntNode *node; int pos; s = gnt_wm_widget_find_workspace(wm, widget); - if ((node = g_hash_table_lookup(wm->nodes, widget)) == NULL) + if (g_hash_table_lookup(wm->nodes, widget) == NULL) return; g_signal_emit(wm, signals[SIG_CLOSE_WIN], 0, widget);
--- a/pidgin/gtkutils.c Wed Oct 10 01:45:37 2007 +0000 +++ b/pidgin/gtkutils.c Wed Oct 10 01:59:36 2007 +0000 @@ -111,19 +111,20 @@ desc = pango_font_description_from_string(font); } else if (purple_running_gnome()) { /* Use the GNOME "document" font, if applicable */ - char *path, *font; + char *path; if ((path = g_find_program_in_path("gconftool-2"))) { + char *font = NULL; g_free(path); - if (!g_spawn_command_line_sync( + if (g_spawn_command_line_sync( "gconftool-2 -g /desktop/gnome/interface/document_font_name", - &font, NULL, NULL, NULL)) - return; + &font, NULL, NULL, NULL)) { + desc = pango_font_description_from_string(font); + } + g_free(font); } - desc = pango_font_description_from_string(font); - g_free(font); } - + if (desc) { gtk_widget_modify_font(imhtml, desc); pango_font_description_free(desc);