Mercurial > pidgin
changeset 32230:7fcf55606339
merge of '9912972220e43702dfc027a7d3b30db1697ed746'
and 'e70b24cc167f4cda5898dce940d4fdaad4fb63b3'
| author | Elliott Sales de Andrade <qulogic@pidgin.im> |
|---|---|
| date | Sun, 25 Sep 2011 20:22:44 +0000 |
| parents | 694111dd6896 (current diff) 5a379d8a72c1 (diff) |
| children | 5fdaf0fdc0fb |
| files | |
| diffstat | 1 files changed, 3 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/pidgin/gtkconv.c Sun Sep 25 19:28:12 2011 +0000 +++ b/pidgin/gtkconv.c Sun Sep 25 20:22:44 2011 +0000 @@ -5593,7 +5593,7 @@ theme = purple_theme_manager_find_theme(purple_prefs_get_string(PIDGIN_PREFS_ROOT "/conversations/theme"), "conversation"); if (!theme) theme = purple_theme_manager_find_theme("Default", "conversation"); - gtkconv->theme = PIDGIN_CONV_THEME(theme); + gtkconv->theme = PIDGIN_CONV_THEME(g_object_ref(theme)); gtkconv->last_flags = 0; if (conv_type == PURPLE_CONV_TYPE_IM) { @@ -5798,6 +5798,8 @@ g_source_remove(gtkconv->attach.timer); } + g_object_unref(gtkconv->theme); + g_free(gtkconv); }