gobjectification: 112344c7: Fix compilation of XMPP prpl.

[darkrain42 at pidgin.im]

-----------------------------------------------------------------
Revision: 112344c710303a9d9eb95892b35d6983db9c85cc
Ancestor: 2d9654ec52f42e924bad0adb696aab34844029e0
Author: darkrain42 at pidgin.im
Date: 2009-07-19T05:38:41
Branch: im.pidgin.gobjectification
URL: http://d.pidgin.im/viewmtn/revision/info/112344c710303a9d9eb95892b35d6983db9c85cc

Modified files:
        libpurple/protocols/jabber/jabber.c
        libpurple/protocols/jabber/presence.c
        libpurple/protocols/jabber/roster.c

ChangeLog: 

Fix compilation of XMPP prpl.

I consider this reparations to grim for all the breakage I keep adding. :-P

-------------- next part --------------
============================================================
--- libpurple/protocols/jabber/jabber.c	550176cbe97fecf9cf978d022270f2238586bf77
+++ libpurple/protocols/jabber/jabber.c	2a3f607250f96b9def0289632088aadf4ce8d3d4
@@ -917,9 +917,12 @@ jabber_login(PurpleAccount *account)
 	PurpleConnection *gc = purple_account_get_connection(account);
 	JabberStream *js;
 	PurpleStoredImage *image;
+	PurpleConnectionFlags flags;
 
-	gc->flags |= PURPLE_CONNECTION_HTML |
-		PURPLE_CONNECTION_ALLOW_CUSTOM_SMILEY;
+	flags = PURPLE_CONNECTION_FLAGS_HTML |
+		PURPLE_CONNECTION_FLAGS_ALLOW_CUSTOM_SMILEY;
+	purple_connection_turn_on_flags(gc, flags);
+
 	js = jabber_stream_new(account);
 	if (js == NULL)
 		return;
============================================================
--- libpurple/protocols/jabber/presence.c	75e5cc8b22642327b3380c2441fc91d44dfbe12e
+++ libpurple/protocols/jabber/presence.c	0990afa1d2ae58a88244f967bd2dbbd8e1be6110
@@ -81,7 +81,8 @@ void jabber_presence_fake_to_self(Jabber
 		g_return_if_fail(jb != NULL);
 
 		purple_status_to_jabber(status, &state, &msg, &priority);
-				purple_prpl_got_user_status(purple_connection_get_account(js->gc), my_base_jid, "offline", msg ? "message" : NULL, msg, NULL);
+				purple_prpl_got_user_status(purple_connection_get_account(js->gc),
+				username, "offline", msg ? "message" : NULL, msg, NULL);
 
 		if (state == JABBER_BUDDY_STATE_UNAVAILABLE ||
 				state == JABBER_BUDDY_STATE_UNKNOWN) {
============================================================
--- libpurple/protocols/jabber/roster.c	b4ae2e56ecc3577b05b8a7dc7a5068ca6b5316b6
+++ libpurple/protocols/jabber/roster.c	e042e18d2140a5bdd5f6b919ed72d7e56aa6fc3a
@@ -421,7 +421,8 @@ void jabber_roster_group_change(PurpleCo
 	purple_debug_info("jabber", "jabber_roster_group_change(): Moving %s from %s to %s\n",
 	                  name, old_group, new_group);
 
-	jabber_roster_update(gc->proto_data, name, groups);
+	jabber_roster_update(purple_object_get_protocol_data(PURPLE_OBJECT(gc)),
+			name, groups);
 }
 
 void jabber_roster_group_rename(PurpleConnection *gc, const char *old_name,