# HG changeset patch
# User Paul Aurich <darkrain42@pidgin.im>
# Date 1251749545 0
# Node ID 1c533c2efd06086115a84f4787175853dddc56b3
# Parent  8eccffa3d7be5b8087889ee578179ba6013aeb5e
Minor merge duplication.

diff -r 8eccffa3d7be -r 1c533c2efd06 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);