pidgin: af6d489b: On errors, don't pretend we did fetch so...

[darkrain42 at pidgin.im]

-----------------------------------------------------------------
Revision: af6d489b1d3665917ae2f580cbfb8cd7c3fa7d6b
Ancestor: 8a23e76c1b796430786141442e693a924790838c
Author: darkrain42 at pidgin.im
Date: 2009-05-03T06:38:16
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/af6d489b1d3665917ae2f580cbfb8cd7c3fa7d6b

Modified files:
        libpurple/protocols/jabber/pep.c
        libpurple/protocols/jabber/usernick.c

ChangeLog: 

On errors, don't pretend we did fetch something, pass NULL.

-------------- next part --------------
============================================================
--- libpurple/protocols/jabber/pep.c	fe94cc48e7a779b8ca9b42938ef0688cd00ceb96
+++ libpurple/protocols/jabber/pep.c	a123e50ced058cf5954343fcf124e6f5709dc819
@@ -67,12 +67,15 @@ do_pep_iq_request_item_callback(JabberSt
                                 JabberIqType type, const char *id,
                                 xmlnode *packet, gpointer data)
 {
-	xmlnode *pubsub = xmlnode_get_child_with_namespace(packet,"pubsub","http://jabber.org/protocol/pubsub");
+	xmlnode *pubsub;
 	xmlnode *items = NULL;
 	JabberPEPHandler *cb = data;
 
-	if(pubsub)
-		items = xmlnode_get_child(pubsub, "items");
+	if (type == JABBER_IQ_RESULT) {
+		pubsub = xmlnode_get_child_with_namespace(packet, "pubsub", "http://jabber.org/protocol/pubsub");
+		if(pubsub)
+			items = xmlnode_get_child(pubsub, "items");
+	}
 
 	cb(js, from, items);
 }
============================================================
--- libpurple/protocols/jabber/usernick.c	8899d3bf4a0abc325ec9273b06f25a5722258104
+++ libpurple/protocols/jabber/usernick.c	ae16cc4a2b42466338ffa324ef1d756469a0600a
@@ -65,7 +65,10 @@ static void do_nick_got_own_nick_cb(Jabb
 
 static void do_nick_got_own_nick_cb(JabberStream *js, const char *from, xmlnode *items) {
 	char *oldnickname = NULL;
-	xmlnode *item = xmlnode_get_child(items,"item");
+	xmlnode *item = NULL;
+	
+	if (items)
+		item = xmlnode_get_child(items,"item");
 
 	if(item) {
 		xmlnode *nick = xmlnode_get_child_with_namespace(item,"nick","http://jabber.org/protocol/nick");