Mercurial > pidgin.yaz
changeset 26345:5e5494482f01
merge of '37604e59d5a53b761fa4d623e577ff79499b32a5'
and '81bb2e1582a2222b36e57c29ccb573dac27f2a44'
| author | Elliott Sales de Andrade <qulogic@pidgin.im> |
|---|---|
| date | Mon, 30 Mar 2009 05:52:32 +0000 |
| parents | 0a1f7bff1ddd (diff) c422c7b1bde7 (current diff) |
| children | c67bf2e1e6c0 f2f4fbbb9006 |
| files | |
| diffstat | 2 files changed, 3 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/protocols/oscar/oscar.c Sat Mar 28 16:58:32 2009 +0000 +++ b/libpurple/protocols/oscar/oscar.c Mon Mar 30 05:52:32 2009 +0000 @@ -4847,6 +4847,7 @@ /* TODO: Combine these two calls! */ aim_srv_setextrainfo(od, FALSE, 0, TRUE, status_text, itmsurl); oscar_set_extendedstatus(gc); + g_free(status_text); } }
--- a/pidgin/gtkutils.c Sat Mar 28 16:58:32 2009 +0000 +++ b/pidgin/gtkutils.c Mon Mar 30 05:52:32 2009 +0000 @@ -3578,7 +3578,9 @@ if (tmp == NULL) return FALSE; + g_free(tmp); tmp = NULL; + if (!g_spawn_command_line_sync("gconftool-2 --all-dirs /desktop/gnome/url-handlers", &tmp, &err, NULL, NULL)) {