Mercurial > pidgin
changeset 21638:dc9d0141a35f
merge of 'c6cea9233a5f4d22b6b5f012bd8432d2732765ea'
and 'cbdc6d4cab03017c1c0267f861f9ed59407e1e61'
| author | Ka-Hing Cheung <khc@hxbc.us> |
|---|---|
| date | Mon, 26 Nov 2007 01:25:29 +0000 |
| parents | 844225b0c905 (current diff) 1853d9d0cc65 (diff) |
| children | fa5d1f426332 |
| files | |
| diffstat | 2 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/Makefile.am Sun Nov 25 20:51:25 2007 +0000 +++ b/libpurple/Makefile.am Mon Nov 26 01:25:29 2007 +0000 @@ -156,7 +156,7 @@ dbus_exported = dbus-useful.h dbus-define-api.h account.h blist.h buddyicon.h \ connection.h conversation.h core.h ft.h log.h notify.h prefs.h roomlist.h \ - savedstatuses.h status.h server.h util.h xmlnode.h + savedstatuses.h status.h server.h util.h xmlnode.h prpl.h purple_build_coreheaders = $(addprefix $(srcdir)/, $(purple_coreheaders)) \ $(purple_builtheaders)
--- a/libpurple/protocols/jabber/google.c Sun Nov 25 20:51:25 2007 +0000 +++ b/libpurple/protocols/jabber/google.c Mon Nov 26 01:25:29 2007 +0000 @@ -532,6 +532,6 @@ char *jabber_google_presence_outgoing(PurpleStatus *tune) { - char *ret = g_strdup_printf("♫ %s", purple_status_get_attr_string(tune, PURPLE_TUNE_TITLE)); - return ret; + const char *attr = purple_status_get_attr_string(tune, PURPLE_TUNE_TITLE); + return attr ? g_strdup_printf("♫ %s", attr) : g_strdup(""); }