# HG changeset patch
# User Ka-Hing Cheung <khc@hxbc.us>
# Date 1196040329 0
# Node ID dc9d0141a35f33837828224612638443be15d62f
# Parent  844225b0c9059c0e916ecd937c39ee9ece382444# Parent  1853d9d0cc652205cb81f8ecf3f9c43c54b8ea38
merge of 'c6cea9233a5f4d22b6b5f012bd8432d2732765ea'
     and 'cbdc6d4cab03017c1c0267f861f9ed59407e1e61'

diff -r 844225b0c905 -r dc9d0141a35f libpurple/Makefile.am
--- 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)
diff -r 844225b0c905 -r dc9d0141a35f libpurple/protocols/jabber/google.c
--- 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("");
 }