im.pidgin.pidgin: ec4fc775c7d333800b4229a7484b2f6f61c7c1a1

[sadrul at pidgin.im]

-----------------------------------------------------------------
Revision: ec4fc775c7d333800b4229a7484b2f6f61c7c1a1
Ancestor: 1991213a0cb9c2d4b066d5acb8e5b5fb77b1470b
Author: sadrul at pidgin.im
Date: 2008-01-11T23:21:16
Branch: im.pidgin.pidgin

Modified files:
        libpurple/util.c

ChangeLog: 

Ignore both NULL and empty strings.

-------------- next part --------------
============================================================
--- libpurple/util.c	fefb802459ac8814b5a17e82f9a47761558cf8af
+++ libpurple/util.c	c183e1b443eccf5b026701c90723fb31aaf2eff6
@@ -4659,7 +4659,7 @@ char * purple_util_format_song_info(cons
 	GString *string;
 	char *esc;
 
-	if (!title)
+	if (!title || !*title)
 		return NULL;
 
 	esc = g_markup_escape_text(title, -1);
@@ -4667,13 +4667,13 @@ char * purple_util_format_song_info(cons
 	g_string_append_printf(string, "%s", esc);
 	g_free(esc);
 
-	if (artist) {
+	if (artist && *artist) {
 		esc = g_markup_escape_text(artist, -1);
 		g_string_append_printf(string, _(" - %s"), esc);
 		g_free(esc);
 	}
 
-	if (album) {
+	if (album && *album) {
 		esc = g_markup_escape_text(album, -1);
 		g_string_append_printf(string, _(" (%s)"), esc);
 		g_free(esc);