cpw.darkrain42.xmpp.bosh: 8ddbfe5d: Fix merging.

[darkrain42 at pidgin.im]

-----------------------------------------------------------------
Revision: 8ddbfe5d6f5c2455497d11ccbfff769ed4e9fad4
Ancestor: 511953ddd75ccd866325fa6cf1e72dbb4fca3e82
Author: darkrain42 at pidgin.im
Date: 2009-04-28T18:57:47
Branch: im.pidgin.cpw.darkrain42.xmpp.bosh
URL: http://d.pidgin.im/viewmtn/revision/info/8ddbfe5d6f5c2455497d11ccbfff769ed4e9fad4

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

ChangeLog: 

Fix merging.

I blame meld and the fact I didn't `mtn copy buddy.c useravatar.c`.

-------------- next part --------------
============================================================
--- libpurple/protocols/jabber/jabber.c	14fcdf9ea0725db6ce11b62ce868630e618a63d4
+++ libpurple/protocols/jabber/jabber.c	3d565bdd61b7de87a39d916b1b017b680b9fa1b6
@@ -1637,14 +1637,12 @@ void jabber_idle_set(PurpleConnection *g
 void jabber_idle_set(PurpleConnection *gc, int idle)
 {
 	JabberStream *js = gc->proto_data;
-	PurpleAccount *account = purple_connection_get_account(gc);
-	PurpleStatus *status = purple_account_get_active_status(account);
 
 	js->idle = idle ? time(NULL) - idle : idle;
 
 	/* send out an updated prescence */
 	purple_debug_info("jabber", "sending updated presence for idle\n");
-	jabber_presence_send(account, status);
+	jabber_presence_send(js, FALSE);
 }
 
 static void jabber_blocklist_parse(JabberStream *js, const char *from,
============================================================
--- libpurple/protocols/jabber/useravatar.c	c9c88615d2128a7aff0f5675171807a0145d3bc5
+++ libpurple/protocols/jabber/useravatar.c	03992bf27d748b8435b1298a38e236fbecb84eef
@@ -33,15 +33,15 @@ void jabber_avatar_init(void)
 
 void jabber_avatar_init(void)
 {
-	jabber_pep_register_handler("avatar", NS_AVATAR_0_12_METADATA,
+	jabber_pep_register_handler(NS_AVATAR_0_12_METADATA,
 	                            update_buddy_metadata);
 
-	jabber_add_feature("urn_avatarmeta", NS_AVATAR_1_1_METADATA,
+	jabber_add_feature(NS_AVATAR_1_1_METADATA,
 	                   jabber_pep_namespace_only_when_pep_enabled_cb);
-	jabber_add_feature("urn_avatardata", NS_AVATAR_1_1_DATA,
+	jabber_add_feature(NS_AVATAR_1_1_DATA,
 	                   jabber_pep_namespace_only_when_pep_enabled_cb);
 
-	jabber_pep_register_handler("urn_avatar", NS_AVATAR_1_1_METADATA,
+	jabber_pep_register_handler(NS_AVATAR_1_1_METADATA,
 	                            update_buddy_metadata);
 }