Changeset 11e7828

Timestamp:

2015-01-26T02:43:35Z (10 years ago)

Author:

dequis <dx@…>

Branches:

master

Children:

5eab298f

Parents:

fcb2c2e

git-author:

dequis <dx@…> (23-01-15 06:29:00)

git-committer:

dequis <dx@…> (26-01-15 02:43:35)

Message:

Fix whatsapp local contact lists

Had to move the code that adds contacts to imcb_connected to avoid
dereferencing a null im_connection.

Turns out this kind of local contact lists only applies to renamed
contacts, though. It doesn't deal with libpurple's blist.xml at all
(it could, there are APIs for it since 2.6.0)

Location:

protocols

Files:

• account.c (modified) (3 diffs)
• nogaim.c (modified) (1 diff)

protocols/account.c

@@ -29 +29 @@
 
 static const char* account_protocols_local[] = {
-        "gg", NULL
+        "gg", "whatsapp", NULL
 };
 
@@ -351 +351 @@
 void account_on( bee_t *bee, account_t *a )
 {
-        GHashTableIter nicks;
-        gpointer k, v;
-
         if( a->ic )
         {
@@ -367 +364 @@
         if( a->ic && !( a->ic->flags & ( OPT_SLOW_LOGIN | OPT_LOGGED_IN ) ) )
                 a->ic->keepalive = b_timeout_add( 120000, account_on_timeout, a->ic );
-
-        if( a->flags & ACC_FLAG_LOCAL )
-        {
-                g_hash_table_iter_init(&nicks, a->nicks);
-                while( g_hash_table_iter_next( &nicks, &k, &v ) )
-                {
-                        a->prpl->add_buddy( a->ic, (char*) k, NULL );
-                }
-        }
 }
 

protocols/nogaim.c

@@ -294 +294 @@
         if( ic->flags & OPT_LOGGED_IN )
                 return;
+
+        if( ic->acc->flags & ACC_FLAG_LOCAL )
+        {
+                GHashTableIter nicks;
+                gpointer k, v;
+                g_hash_table_iter_init( &nicks, ic->acc->nicks );
+                while( g_hash_table_iter_next( &nicks, &k, &v ) )
+                {
+                        ic->acc->prpl->add_buddy( ic, (char*) k, NULL );
+                }
+        }
         
         imcb_log( ic, "Logged in" );