pidgin: 31a31cc0: Minor merge duplication.

[darkrain42 at pidgin.im]

-----------------------------------------------------------------
Revision: 31a31cc06b9ffe3852194028de753641dbfa0329
Ancestor: 45648a255619d2cd5f706725fa74543ded0409bc
Author: darkrain42 at pidgin.im
Date: 2009-08-31T20:12:25
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/31a31cc06b9ffe3852194028de753641dbfa0329

Modified files:
        libpurple/protocols/jabber/data.c

ChangeLog: 

Minor merge duplication.

-------------- next part --------------
============================================================
--- libpurple/protocols/jabber/data.c	c5360cf5d85b26485d9cc0328e0cc4277194513e
+++ libpurple/protocols/jabber/data.c	7840a5103c245547b3a0226fdd6cec4c2ced2c0d
@@ -76,17 +76,12 @@ jabber_data_create_from_xml(xmlnode *tag
 
 	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);