Mercurial > pidgin.yaz

changeset 28517:40d8427d1813

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Minor merge duplication.
author Paul Aurich <paul@darkrain42.org>
date Mon, 31 Aug 2009 20:12:25 +0000
parents 087ad09cd4f5
children 8aa7df246e13 a444fe876e52
files libpurple/protocols/jabber/data.c
diffstat 1 files changed, 1 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/libpurple/protocols/jabber/data.c	Mon Aug 31 20:10:35 2009 +0000
+++ b/libpurple/protocols/jabber/data.c	Mon Aug 31 20:12:25 2009 +0000
@@ -76,17 +76,12 @@
 
 	raw_data = xmlnode_get_data(tag);
 
-	if (raw_data == NULL) {
+	if (raw_data == NULL || *raw_data == '\0') {
 		purple_debug_error("jabber", "data element was empty");
 		g_free(data);
 		return NULL;
 	}
 
-	if (raw_data == NULL || *raw_data == '\0') {
-		g_free(raw_data);
-		return NULL;
-	}
-
 	data = g_new0(JabberData, 1);
 	data->data = purple_base64_decode(raw_data, &data->size);
 	g_free(raw_data);