gobjectification: cb41ea05: Fix jabber compile.

[qulogic at pidgin.im]

-----------------------------------------------------------------
Revision: cb41ea0585b9d9ba2bd513b43f7a9b696b052909
Ancestor: 28d1ea2c5e6493a4bda40923f261de0c0e03c6ca
Author: qulogic at pidgin.im
Date: 2009-06-09T03:37:48
Branch: im.pidgin.gobjectification
URL: http://d.pidgin.im/viewmtn/revision/info/cb41ea0585b9d9ba2bd513b43f7a9b696b052909

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

ChangeLog: 

Fix jabber compile.

-------------- next part --------------
============================================================
--- libpurple/protocols/jabber/buddy.c	299dda99541872a954ca27274e6a5825ae2a37d9
+++ libpurple/protocols/jabber/buddy.c	e18878651b5eace66736eb30e7ea2a8370c2b9fc
@@ -490,7 +490,7 @@ void jabber_set_buddy_icon(PurpleConnect
 	PurpleAccount *account = purple_connection_get_account(gc);
 
 	/* Publish the avatar as specified in XEP-0084 */
-	jabber_avatar_set(purple_connection_get_protocol_data(gc), img);
+	jabber_avatar_set(purple_object_get_protocol_data(PURPLE_OBJECT(gc)), img);
 	/* Set the image in our vCard */
 	jabber_set_info(gc, purple_account_get_user_info(account));
 
============================================================
--- libpurple/protocols/jabber/jabber.c	790b31a690f46029704cbc6f22b8822796938788
+++ libpurple/protocols/jabber/jabber.c	bc48ea518e3d0bc1a27c5b924cf5a476703c9fae
@@ -460,7 +460,7 @@ void jabber_send_signal_cb(PurpleConnect
 		return;
 
 	txt = xmlnode_to_str(*packet, &len);
-	jabber_send_raw(purple_connection_get_protocol_data(pc), txt, len);
+	jabber_send_raw(purple_object_get_protocol_data(PURPLE_OBJECT(pc)), txt, len);
 	g_free(txt);
 }
 
@@ -2832,7 +2832,7 @@ static PurpleCmdRet jabber_cmd_ping(Purp
 	account = purple_conversation_get_account(conv);
 	pc = purple_account_get_connection(account);
 
-	if(!jabber_ping_jid(purple_connection_get_protocol_data(pc), args[0])) {
+	if(!jabber_ping_jid(purple_object_get_protocol_data(PURPLE_OBJECT(pc)), args[0])) {
 		*error = g_strdup_printf(_("Unable to ping user %s"), args[0]);
 		return PURPLE_CMD_RET_FAILED;
 	}
============================================================
--- libpurple/protocols/jabber/presence.c	0cf91cce05fad69b55c62aff4698212d8444b6b2
+++ libpurple/protocols/jabber/presence.c	3ce7ac7381ce2df94e398c882237a4ec959153e3
@@ -111,7 +111,7 @@ void jabber_set_status(PurpleAccount *ac
 	}
 
 	gc = purple_account_get_connection(account);
-	js = purple_connection_get_protocol_data(gc);
+	js = purple_object_get_protocol_data(PURPLE_OBJECT(gc));
 	jabber_presence_send(js, FALSE);
 }
 
@@ -245,7 +245,9 @@ xmlnode *jabber_presence_create_js(Jabbe
 {
 	xmlnode *show, *status, *presence, *pri, *c;
 	const char *show_string = NULL;
+#ifdef USE_VV
 	gboolean audio_enabled, video_enabled;
+#endif
 
 	presence = xmlnode_new("presence");