Mercurial > pidgin

changeset 22081:9bddfb6df976

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge of '3dc120bb73d0a2d3ce3f6339e0882bd0321e24c8' and 'ec4fc775c7d333800b4229a7484b2f6f61c7c1a1'
author Sadrul Habib Chowdhury <imadil@gmail.com>
date Sat, 12 Jan 2008 03:24:35 +0000
parents d6f174c2a83e (current diff) 83613550512b (diff)
children b1a5385de557
files
diffstat 1 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/libpurple/util.c	Sat Jan 12 02:24:51 2008 +0000
+++ b/libpurple/util.c	Sat Jan 12 03:24:35 2008 +0000
@@ -4659,7 +4659,7 @@
 	GString *string;
 	char *esc;
 
-	if (!title)
+	if (!title || !*title)
 		return NULL;
 
 	esc = g_markup_escape_text(title, -1);
@@ -4667,13 +4667,13 @@
 	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);