Changeset 93e0901

Timestamp:

2015-05-24T18:51:57Z (9 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Children:

8c3637b

Parents:

2446e4c

Message:

ACC_FLAG_LOCAL -> ACC_FLAG_LOCAL_CONTACTS.

Also, handle the flag more properly. The config loader was not the right
place to do this in.

Next up: Add a way for a protocol module to fetch the contact list
pre-login.

Files:

• protocols/account.c (modified) (2 diffs)
• protocols/account.h (modified) (2 diffs)
• protocols/nogaim.c (modified) (1 diff)
• protocols/purple/purple.c (modified) (1 diff)
• storage_xml.c (modified) (3 diffs)

protocols/account.c

@@ -27 +27 @@
 #include "bitlbee.h"
 #include "account.h"
-
-static const char* account_protocols_local[] = {
-        "gg", "whatsapp", NULL
-};
 
 static char *set_eval_nick_source(set_t *set, char *value);
@@ -463 +459 @@
         return a->auto_reconnect_delay;
 }
-
-int protocol_account_islocal(const char* protocol)
-{
-        const char** p = account_protocols_local;
-
-        do {
-                if (strcmp(*p, protocol) == 0) {
-                        return 1;
-                }
-        } while (*(++p));
-        return 0;
-}

protocols/account.h

@@ -58 +58 @@
 int account_reconnect_delay(account_t *a);
 
-int protocol_account_islocal(const char* protocol);
-
 typedef enum {
         ACC_SET_OFFLINE_ONLY = 0x02,    /* Allow changes only if the acct is offline. */
@@ -69 +67 @@
         ACC_FLAG_STATUS_MESSAGE = 0x02, /* Supports status messages (without being away). */
         ACC_FLAG_HANDLE_DOMAINS = 0x04, /* Contact handles need a domain portion. */
-        ACC_FLAG_LOCAL = 0x08,          /* Contact list is local. */
+        ACC_FLAG_LOCAL_CONTACTS = 0x08, /* Contact list is local. */
 } account_flag_t;
 

protocols/nogaim.c

@@ -312 +312 @@
         }
 
-        if (ic->acc->flags & ACC_FLAG_LOCAL) {
+        if (ic->acc->flags & ACC_FLAG_LOCAL_CONTACTS) {
                 GHashTableIter nicks;
                 gpointer k, v;

protocols/purple/purple.c

@@ -261 +261 @@
         }
         purple_accounts_remove(pa);
+        
+        /* Last, some protocols want their contact lists locally. */
+        if (strcmp(acc->prpl->name, "whatsapp") == 0 || strcmp(acc->prpl->name, "gg") == 0) {
+                acc->flags |= ACC_FLAG_LOCAL_CONTACTS;
+        }
 }
 

storage_xml.c

@@ -89 +89 @@
         char *pass_b64 = NULL;
         unsigned char *pass_cr = NULL;
-        int pass_len, local = 0;
+        int pass_len;
         struct prpl *prpl = NULL;
         account_t *acc;
@@ -107 +107 @@
                         return XT_ABORT;
                 }
-                local = protocol_account_islocal(protocol);
         }
 
@@ -123 +122 @@
                 if (tag) {
                         set_setstr(&acc->set, "tag", tag);
-                }
-                if (local) {
-                        acc->flags |= ACC_FLAG_LOCAL;
                 }
         } else {