# HG changeset patch
# User Paul Aurich <paul@darkrain42.org>
# Date 1251749545 0
# Node ID 40d8427d18137e0498b737279c76feb94904ba89
# Parent  087ad09cd4f5d9d5c93068e521a524cb321eac41
Minor merge duplication.

diff -r 087ad09cd4f5 -r 40d8427d1813 libpurple/protocols/jabber/data.c
--- 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);