# HG changeset patch
# User Paul Aurich <paul@darkrain42.org>
# Date 1260053314 0
# Node ID 531f8367025ea2084a565074f3e53433edf670f1
# Parent  d51d97e0d28d14ecc6b16a92fbfcae1e83d1347f
jabber: Clean up this code a little.

diff -r d51d97e0d28d -r 531f8367025e libpurple/protocols/jabber/google.c
--- a/libpurple/protocols/jabber/google.c	Fri Dec 04 06:29:30 2009 +0000
+++ b/libpurple/protocols/jabber/google.c	Sat Dec 05 22:48:34 2009 +0000
@@ -1032,9 +1032,9 @@
 	return TRUE;
 }
 
-void jabber_google_roster_add_deny(PurpleConnection *gc, const char *who)
+void jabber_google_roster_add_deny(JabberStream *js, const char *who)
 {
-	JabberStream *js;
+	PurpleAccount *account;
 	GSList *buddies;
 	JabberIq *iq;
 	xmlnode *query;
@@ -1044,14 +1044,10 @@
 	JabberBuddy *jb;
 	const char *balias;
 
-	js = (JabberStream*)(gc->proto_data);
-
-	if (!js || !(js->server_caps & JABBER_CAP_GOOGLE_ROSTER))
-		return;
-
 	jb = jabber_buddy_find(js, who, TRUE);
 
-	buddies = purple_find_buddies(js->gc->account, who);
+	account = purple_connection_get_account(js->gc);
+	buddies = purple_find_buddies(account, who);
 	if(!buddies)
 		return;
 
@@ -1098,12 +1094,11 @@
 		}
 	}
 
-	purple_prpl_got_user_status(purple_connection_get_account(gc), who, "offline", NULL);
+	purple_prpl_got_user_status(account, who, "offline", NULL);
 }
 
-void jabber_google_roster_rem_deny(PurpleConnection *gc, const char *who)
+void jabber_google_roster_rem_deny(JabberStream *js, const char *who)
 {
-	JabberStream *js;
 	GSList *buddies;
 	JabberIq *iq;
 	xmlnode *query;
@@ -1112,14 +1107,6 @@
 	PurpleBuddy *b;
 	const char *balias;
 
-	g_return_if_fail(gc != NULL);
-	g_return_if_fail(who != NULL);
-
-	js = (JabberStream*)(gc->proto_data);
-
-	if (!js || !(js->server_caps & JABBER_CAP_GOOGLE_ROSTER))
-		return;
-
 	buddies = purple_find_buddies(purple_connection_get_account(js->gc), who);
 	if(!buddies)
 		return;
diff -r d51d97e0d28d -r 531f8367025e libpurple/protocols/jabber/google.h
--- a/libpurple/protocols/jabber/google.h	Fri Dec 04 06:29:30 2009 +0000
+++ b/libpurple/protocols/jabber/google.h	Sat Dec 05 22:48:34 2009 +0000
@@ -43,8 +43,8 @@
 void jabber_google_presence_incoming(JabberStream *js, const char *who, JabberBuddyResource *jbr);
 char *jabber_google_presence_outgoing(PurpleStatus *tune);
 
-void jabber_google_roster_add_deny(PurpleConnection *gc, const char *who);
-void jabber_google_roster_rem_deny(PurpleConnection *gc, const char *who);
+void jabber_google_roster_add_deny(JabberStream *js, const char *who);
+void jabber_google_roster_rem_deny(JabberStream *js, const char *who);
 
 char *jabber_google_format_to_html(const char *text);
 
diff -r d51d97e0d28d -r 531f8367025e libpurple/protocols/jabber/jabber.c
--- a/libpurple/protocols/jabber/jabber.c	Fri Dec 04 06:29:30 2009 +0000
+++ b/libpurple/protocols/jabber/jabber.c	Sat Dec 05 22:48:34 2009 +0000
@@ -1742,13 +1742,15 @@
 	JabberIq *iq;
 	xmlnode *block, *item;
 
-	js = gc->proto_data;
+	g_return_if_fail(who != NULL && *who != '\0');
+
+	js = purple_connection_get_protocol_data(gc);
 	if (js == NULL)
 		return;
 
 	if (js->server_caps & JABBER_CAP_GOOGLE_ROSTER)
 	{
-		jabber_google_roster_add_deny(gc, who);
+		jabber_google_roster_add_deny(js, who);
 		return;
 	}
 
@@ -1776,13 +1778,15 @@
 	JabberIq *iq;
 	xmlnode *unblock, *item;
 
-	js = gc->proto_data;
+	g_return_if_fail(who != NULL && *who != '\0');
+
+	js = purple_connection_get_protocol_data(gc);
 	if (js == NULL)
 		return;
 
 	if (js->server_caps & JABBER_CAP_GOOGLE_ROSTER)
 	{
-		jabber_google_roster_rem_deny(gc, who);
+		jabber_google_roster_rem_deny(js, who);
 		return;
 	}