# HG changeset patch
# User Tim Ringenbach <marv@pidgin.im>
# Date 1087192061 0
# Node ID 1eaa4d8dcf26010da587c4ceb5be6c09a74086c9
# Parent  2401a9ef74a0a85cd676af73c665e34e3975a5e9
[gaim-migrate @ 10082]
Some more cleanups.
Add some yahoo_friend_* functions and made yahoo use them.
I may eventually make the structure opque.

committer: Tailor Script <tailor@pidgin.im>

diff -r 2401a9ef74a0 -r 1eaa4d8dcf26 src/protocols/yahoo/yahoo.c
--- a/src/protocols/yahoo/yahoo.c	Mon Jun 14 04:51:14 2004 +0000
+++ b/src/protocols/yahoo/yahoo.c	Mon Jun 14 05:47:41 2004 +0000
@@ -272,7 +272,6 @@
 static void yahoo_process_status(GaimConnection *gc, struct yahoo_packet *pkt)
 {
 	struct yahoo_data *yd = gc->proto_data;
-	GaimAccount *account = gaim_connection_get_account(gc);
 	GSList *l = pkt->hash;
 	YahooFriend *f = NULL;
 	char *name = NULL;
@@ -313,11 +312,7 @@
 			break;
 		case 7: /* the current buddy */
 			name = pair->value;
-			f = g_hash_table_lookup(yd->friends, gaim_normalize(account, name));
-			if (!f) {
-				f = yahoo_friend_new();
-				g_hash_table_insert(yd->friends, g_strdup(gaim_normalize(account, name)), f);
-			}
+			f = yahoo_friend_find_or_new(gc, name);
 			break;
 		case 10: /* state */
 			if (!f)
@@ -591,10 +586,8 @@
 			buddies = g_strsplit(split[1], ",", -1);
 			for (bud = buddies; bud && *bud; bud++) {
 				norm_bud = g_strdup(gaim_normalize(account, *bud));
-				if (!(f = g_hash_table_lookup(yd->friends, norm_bud))) {
-					f = yahoo_friend_new();
-					g_hash_table_insert(yd->friends, g_strdup(norm_bud), f);
-				}
+				f = yahoo_friend_find_or_new(gc, norm_bud);
+
 				if (!(b = gaim_find_buddy(account, norm_bud))) {
 					if (!(g = gaim_find_group(grp))) {
 						g = gaim_group_new(grp);
@@ -650,8 +643,6 @@
 	char *game = NULL;
 	YahooFriend *f = NULL;
 	GSList *l = pkt->hash;
-	GaimAccount *account = gaim_connection_get_account(gc);
-	struct yahoo_data *yd = (struct yahoo_data*) gc->proto_data;
 
 	while (l) {
 		struct yahoo_pair *pair = l->data;
@@ -683,7 +674,7 @@
 					   "you to know.\n", from);
 		}
 
-		f = g_hash_table_lookup(yd->friends, gaim_normalize(account, from));
+		f = yahoo_friend_find(gc, from);
 		if (!f)
 			return; /* if they're not on the list, don't bother */
 
@@ -1755,7 +1746,6 @@
 	char *decoded_group;
 	char *buf;
 	YahooFriend *f;
-	struct yahoo_data *yd = gc->proto_data;
 	GSList *l = pkt->hash;
 
 	while (l) {
@@ -1782,11 +1772,8 @@
 		group = "";
 
 	if (!err || (err == 2)) { /* 0 = ok, 2 = already on serv list */
-		if (!g_hash_table_lookup(yd->friends, gaim_normalize(gaim_connection_get_account(gc), who))) {
-			f = yahoo_friend_new();
-			g_hash_table_insert(yd->friends, g_strdup(gaim_normalize(gaim_connection_get_account(gc), who)), f);
-			yahoo_update_status(gc, who, f);
-		}
+		f = yahoo_friend_find_or_new(gc, who);
+		yahoo_update_status(gc, who, f);
 		return;
 	}
 
@@ -2329,7 +2316,7 @@
 	  				     !(yd = gc->proto_data))
 		return;
 
-	f = g_hash_table_lookup(yd->friends, b->name);
+	f = yahoo_friend_find(gc, b->name);
 	if (!f) {
 		*se = "notauthorized";
 		return;
@@ -2428,7 +2415,7 @@
 	gc = gaim_account_get_connection(buddy->account);
 	yd = (struct yahoo_data *) gc->proto_data;
 
-	f = g_hash_table_lookup(yd->friends, buddy->name);
+	f = yahoo_friend_find(gc, buddy->name);
 	if (!f)
 		return;
 
@@ -2447,10 +2434,9 @@
 
 static char *yahoo_status_text(GaimBuddy *b)
 {
-	struct yahoo_data *yd = (struct yahoo_data*)b->account->gc->proto_data;
 	YahooFriend *f = NULL;
 
-	f = g_hash_table_lookup(yd->friends, b->name);
+	f = yahoo_friend_find(b->account->gc, b->name);
 	if (!f)
 		return g_strdup(_("Not on server list"));
 
@@ -2473,11 +2459,10 @@
 
 char *yahoo_tooltip_text(GaimBuddy *b)
 {
-	struct yahoo_data *yd = (struct yahoo_data*)b->account->gc->proto_data;
 	YahooFriend *f;
 	char *escaped, *status, *ret;
 
-	f = g_hash_table_lookup(yd->friends, b->name);
+	f = yahoo_friend_find(b->account->gc, b->name);
 	if (!f)
 		status = g_strdup_printf("\n%s", _("Not on server list"));
 	else
@@ -2554,11 +2539,10 @@
 	GaimBlistNodeAction *act;
 
 	GaimConnection *gc = gaim_account_get_connection(buddy->account);
-	struct yahoo_data *yd = (struct yahoo_data *)gc->proto_data;
 	static char buf2[1024];
 	YahooFriend *f;
 
-	f = g_hash_table_lookup(yd->friends, buddy->name);
+	f = yahoo_friend_find(gc, buddy->name);
 
 	if (!f) {
 		act = gaim_blist_node_action_new(_("Add Buddy"),
@@ -2922,7 +2906,7 @@
 	gboolean remove = TRUE;
 	char *cg;
 
-	if (!(f = g_hash_table_lookup(yd->friends, who)))
+	if (!(f = yahoo_friend_find(gc, who)))
 		return;
 
 	buddies = gaim_find_buddies(gaim_connection_get_account(gc), who);
@@ -3028,7 +3012,7 @@
 	/* Step 0:  If they aren't on the server list anyway,
 	 *          don't bother letting the server know.
 	 */
-	if (!g_hash_table_lookup(yd->friends, who))
+	if (!yahoo_friend_find(gc, who))
 		return;
 
 	/* If old and new are the same, we would probably
diff -r 2401a9ef74a0 -r 1eaa4d8dcf26 src/protocols/yahoo/yahoo_friend.c
--- a/src/protocols/yahoo/yahoo_friend.c	Mon Jun 14 04:51:14 2004 +0000
+++ b/src/protocols/yahoo/yahoo_friend.c	Mon Jun 14 05:47:41 2004 +0000
@@ -22,6 +22,7 @@
  */
 
 #include "prpl.h"
+#include "util.h"
 
 #include "yahoo_friend.h"
 
@@ -35,6 +36,41 @@
 	return ret;
 }
 
+YahooFriend *yahoo_friend_find(GaimConnection *gc, const char *name)
+{
+	struct yahoo_data *yd;
+	const char *norm;
+
+	g_return_val_if_fail(gc != NULL, NULL);
+	g_return_val_if_fail(gc->proto_data != NULL, NULL);
+
+	yd = gc->proto_data;
+	norm = gaim_normalize(gaim_connection_get_account(gc), name);
+
+	return g_hash_table_lookup(yd->friends, norm);
+}
+
+YahooFriend *yahoo_friend_find_or_new(GaimConnection *gc, const char *name)
+{
+	YahooFriend *f;
+	struct yahoo_data *yd;
+	const char *norm;
+
+	g_return_val_if_fail(gc != NULL, NULL);
+	g_return_val_if_fail(gc->proto_data != NULL, NULL);
+
+	yd = gc->proto_data;
+	norm = gaim_normalize(gaim_connection_get_account(gc), name);
+
+	f = g_hash_table_lookup(yd->friends, norm);
+	if (!f) {
+		f = yahoo_friend_new();
+		g_hash_table_insert(yd->friends, g_strdup(norm), f);
+	}
+
+	return f;
+}
+
 void yahoo_friend_free(gpointer p)
 {
 	YahooFriend *f = p;
diff -r 2401a9ef74a0 -r 1eaa4d8dcf26 src/protocols/yahoo/yahoo_friend.h
--- a/src/protocols/yahoo/yahoo_friend.h	Mon Jun 14 04:51:14 2004 +0000
+++ b/src/protocols/yahoo/yahoo_friend.h	Mon Jun 14 05:47:41 2004 +0000
@@ -43,6 +43,8 @@
 } YahooFriend;
 
 YahooFriend *yahoo_friend_new(void);
+YahooFriend *yahoo_friend_find(GaimConnection *gc, const char *name);
+YahooFriend *yahoo_friend_find_or_new(GaimConnection *gc, const char *name);
 void yahoo_friend_free(gpointer p);
 
 #endif /* _YAHOO_FRIEND_H_ */