Implemented per-account nick lists instead of per-protocol nick lists.

nick_t is dead, instead nicks are just saves in a per-account_t GLib
hash table. While doing this, the import_buddies command finally died
and text_save() disappeared, because the old file format can't handle
most of the new features in this branch anyway.

Still have to implement support for the new nick lists in text_load()!

6 files changed, 14 insertions, 12 deletions

diff --git a/protocols/jabber/jabber.c b/protocols/jabber/jabber.c
index e7f4534e..7147a78c 100644
--- a/protocols/jabber/jabber.c
+++ b/protocols/jabber/jabber.c
@@ -2379,7 +2379,7 @@ void jabber_init()
 	ret->keepalive = jabber_keepalive;
 	ret->alias_buddy = jabber_roster_update;
 	ret->group_buddy = jabber_group_change;
-	ret->cmp_buddynames = g_strcasecmp;
+	ret->handle_cmp = g_strcasecmp;
 
 	register_protocol (ret);
 }
diff --git a/protocols/msn/msn.c b/protocols/msn/msn.c
index 790b372a..db4563dc 100644
--- a/protocols/msn/msn.c
+++ b/protocols/msn/msn.c
@@ -431,7 +431,7 @@ void msn_init()
 	ret->add_deny = msn_add_deny;
 	ret->rem_deny = msn_rem_deny;
 	ret->send_typing = msn_send_typing;
-	ret->cmp_buddynames = g_strcasecmp;
+	ret->handle_cmp = g_strcasecmp;
 
 	register_protocol(ret);
 }
diff --git a/protocols/nogaim.c b/protocols/nogaim.c
index 8346f5fa..54965b84 100644
--- a/protocols/nogaim.c
+++ b/protocols/nogaim.c
@@ -365,7 +365,7 @@ void add_buddy( struct gaim_connection *gc, char *group, char *handle, char *rea
 	}
 	
 	memset( nick, 0, MAX_NICK_LENGTH + 1 );
-	strcpy( nick, nick_get( gc->irc, handle, gc->acc->prpl, realname ) );
+	strcpy( nick, nick_get( gc->acc, handle, realname ) );
 	
 	u = user_add( gc->irc, nick );
 	
@@ -377,7 +377,7 @@ void add_buddy( struct gaim_connection *gc, char *group, char *handle, char *rea
 		u->host = g_strdup( s + 1 );
 		u->user = g_strndup( handle, s - handle );
 	}
-	else if( *gc->acc->server )
+	else if( gc->acc->server )
 	{
 		char *colon;
 		
@@ -777,7 +777,7 @@ void add_chat_buddy( struct conversation *b, char *handle )
 		serv_got_crap( b->gc, "User %s added to conversation %d", handle, b->id );
 	
 	/* It might be yourself! */
-	if( b->gc->acc->prpl->cmp_buddynames( handle, b->gc->username ) == 0 )
+	if( b->gc->acc->prpl->handle_cmp( handle, b->gc->username ) == 0 )
 	{
 		u = user_find( b->gc->irc, b->gc->irc->nick );
 		if( !b->joined )
@@ -1061,7 +1061,7 @@ static char *bim_away_alias_find( GList *gcm, char *away )
 
 void bim_add_allow( struct gaim_connection *gc, char *handle )
 {
-	if( g_slist_find_custom( gc->permit, handle, (GCompareFunc) gc->acc->prpl->cmp_buddynames ) == NULL )
+	if( g_slist_find_custom( gc->permit, handle, (GCompareFunc) gc->acc->prpl->handle_cmp ) == NULL )
 	{
 		gc->permit = g_slist_prepend( gc->permit, g_strdup( handle ) );
 	}
@@ -1073,7 +1073,7 @@ void bim_rem_allow( struct gaim_connection *gc, char *handle )
 {
 	GSList *l;
 	
-	if( ( l = g_slist_find_custom( gc->permit, handle, (GCompareFunc) gc->acc->prpl->cmp_buddynames ) ) )
+	if( ( l = g_slist_find_custom( gc->permit, handle, (GCompareFunc) gc->acc->prpl->handle_cmp ) ) )
 	{
 		g_free( l->data );
 		gc->permit = g_slist_delete_link( gc->permit, l );
@@ -1084,7 +1084,7 @@ void bim_rem_allow( struct gaim_connection *gc, char *handle )
 
 void bim_add_block( struct gaim_connection *gc, char *handle )
 {
-	if( g_slist_find_custom( gc->deny, handle, (GCompareFunc) gc->acc->prpl->cmp_buddynames ) == NULL )
+	if( g_slist_find_custom( gc->deny, handle, (GCompareFunc) gc->acc->prpl->handle_cmp ) == NULL )
 	{
 		gc->deny = g_slist_prepend( gc->deny, g_strdup( handle ) );
 	}
@@ -1096,7 +1096,7 @@ void bim_rem_block( struct gaim_connection *gc, char *handle )
 {
 	GSList *l;
 	
-	if( ( l = g_slist_find_custom( gc->deny, handle, (GCompareFunc) gc->acc->prpl->cmp_buddynames ) ) )
+	if( ( l = g_slist_find_custom( gc->deny, handle, (GCompareFunc) gc->acc->prpl->handle_cmp ) ) )
 	{
 		g_free( l->data );
 		gc->deny = g_slist_delete_link( gc->deny, l );
diff --git a/protocols/nogaim.h b/protocols/nogaim.h
index c0a867d6..bae4489f 100644
--- a/protocols/nogaim.h
+++ b/protocols/nogaim.h
@@ -164,7 +164,7 @@ struct prpl {
 	GList *(* away_states)(struct gaim_connection *gc);
 	
 	/* Mainly for AOL, since they think "Bung hole" == "Bu ngho le". *sigh* */
-	int (* cmp_buddynames) (const char *who1, const char *who2);
+	int (* handle_cmp) (const char *who1, const char *who2);
 };
 
 #define UC_UNAVAILABLE  1
diff --git a/protocols/oscar/oscar.c b/protocols/oscar/oscar.c
index 28239812..f65332dc 100644
--- a/protocols/oscar/oscar.c
+++ b/protocols/oscar/oscar.c
@@ -2680,9 +2680,10 @@ void oscar_init()
 	ret->rem_deny = oscar_rem_deny;
 	ret->set_permit_deny = oscar_set_permit_deny;
 	ret->keepalive = oscar_keepalive;
-	ret->cmp_buddynames = aim_sncmp;
 	ret->get_status_string = oscar_get_status_string;
 	ret->send_typing = oscar_send_typing;
+	
+	ret->handle_cmp = aim_sncmp;
 
 	register_protocol(ret);
 }
diff --git a/protocols/yahoo/yahoo.c b/protocols/yahoo/yahoo.c
index c21779ba..23c6f813 100644
--- a/protocols/yahoo/yahoo.c
+++ b/protocols/yahoo/yahoo.c
@@ -408,7 +408,8 @@ void byahoo_init( )
 	ret->chat_invite = byahoo_chat_invite;
 	ret->chat_leave = byahoo_chat_leave;
 	ret->chat_open = byahoo_chat_open;
-	ret->cmp_buddynames = g_strcasecmp;
+
+	ret->handle_cmp = g_strcasecmp;
 	
 	register_protocol(ret);
 }