Changeset 5b52a48 for protocols/nogaim.c

Timestamp:

2006-07-03T21:22:45Z (18 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

7e3592e

Parents:

911f2eb

Message:

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()!

File:

• protocols/nogaim.c (modified) (7 diffs)

protocols/nogaim.c

@@ -366 +366 @@
         
         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 );
@@ -378 +378 @@
                 u->user = g_strndup( handle, s - handle );
         }
-        else if( *gc->acc->server )
+        else if( gc->acc->server )
         {
                 char *colon;
@@ -778 +778 @@
         
         /* 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 );
@@ -1062 +1062 @@
 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 ) );
@@ -1074 +1074 @@
         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 );
@@ -1085 +1085 @@
 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 ) );
@@ -1097 +1097 @@
         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 );