Changes in protocols/nogaim.c [9076a1c:977a9d5]

File:

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

protocols/nogaim.c

@@ -90 +90 @@
 
 GList *protocols = NULL;
+GList *disabled_protocols = NULL;
 
 void register_protocol(struct prpl *p)
@@ -103 +104 @@
 
         if (refused) {
-                log_message(LOGLVL_WARNING, "Protocol %s disabled\n", p->name);
+                disabled_protocols = g_list_append(disabled_protocols, p);
         } else {
                 protocols = g_list_append(protocols, p);
@@ -109 +110 @@
 }
 
+static int proto_name_cmp(const void *proto_, const void *name)
+{
+        const struct prpl *proto = proto_;
+        return g_strcasecmp(proto->name, name);
+}
+
 struct prpl *find_protocol(const char *name)
 {
-        GList *gl;
-
-        for (gl = protocols; gl; gl = gl->next) {
-                struct prpl *proto = gl->data;
-
-                if (g_strcasecmp(proto->name, name) == 0) {
-                        return proto;
-                }
-        }
-
-        return NULL;
+        GList *gl = g_list_find_custom(protocols, name, proto_name_cmp);
+        return gl ? gl->data: NULL;
+}
+
+gboolean is_protocol_disabled(const char *name)
+{
+        return g_list_find_custom(disabled_protocols, name, proto_name_cmp) != NULL;
 }
 
@@ -132 +135 @@
         extern void twitter_initmodule();
         extern void purple_initmodule();
-        extern void rpc_initmodule();
 
 #ifdef WITH_MSN
@@ -156 +158 @@
 #ifdef WITH_PURPLE
         purple_initmodule();
-#endif
-
-#ifdef WITH_RPC
-        rpc_initmodule();
 #endif
 
@@ -209 +207 @@
         account_t *a;
 
+        if (!ic->bee->ui->log) {
+                return;
+        }
+
         va_start(params, format);
         text = g_strdup_vprintf(format, params);
@@ -227 +229 @@
         /* If we found one, include the screenname in the message. */
         if (a) {
-                /* FIXME(wilmer): ui_log callback or so */
-                irc_rootmsg(ic->bee->ui_data, "%s - %s", ic->acc->tag, text);
+                ic->bee->ui->log(ic->bee, ic->acc->tag, text);
         } else {
-                irc_rootmsg(ic->bee->ui_data, "%s - %s", ic->acc->prpl->name, text);
+                ic->bee->ui->log(ic->bee, ic->acc->prpl->name, text);
         }
 
@@ -312 +313 @@
         }
 
-        if ((ic->acc->flags & ACC_FLAG_LOCAL_CONTACTS) &&
-            !(ic->flags & OPT_LOCAL_CONTACTS_SENT) &&
-            ic->acc->prpl->add_buddy) {
+        if (ic->acc->flags & ACC_FLAG_LOCAL) {
                 GHashTableIter nicks;
-                gpointer handle;
+                gpointer k, v;
                 g_hash_table_iter_init(&nicks, ic->acc->nicks);
-                while (g_hash_table_iter_next(&nicks, &handle, NULL)) {
-                        ic->acc->prpl->add_buddy(ic, (char *) handle, NULL);
+                while (g_hash_table_iter_next(&nicks, &k, &v)) {
+                        ic->acc->prpl->add_buddy(ic, (char *) k, NULL);
                 }
         }
@@ -414 +413 @@
         query_del_by_conn((irc_t *) ic->bee->ui_data, ic);
 
-        /* Throw away groupchats owned by this account. Historically this was only
-           ever done by IM modules which is a bug. But it gives them opportunity
-           to clean up protocol-specific bits as well so keep it that way, just
-           do another cleanup here as a fallback. Don't want to leave any dangling
-           pointers! */
-        while (ic->groupchats) {
-                imcb_chat_free(ic->groupchats->data);
-        }
-
         if (!a) {
                 /* Uhm... This is very sick. */
@@ -508 +498 @@
 }
 
-/* Returns the local contacts for an IM account (based on assigned nicks).
-   Linked list should be freed, the strings themselves not! So look at it
-   like a GSList<const char*> I guess? Empty list means NULL retval (as
-   always with GSList). */
-GSList *imcb_get_local_contacts(struct im_connection *ic)
-{
-        GHashTableIter nicks;
-        GSList *ret = NULL;
-        
-        if (!(ic->acc->flags & ACC_FLAG_LOCAL_CONTACTS)) {
-                /* Only allow protocols that indicate local contact list
-                   support to use this function. */
-                return ret;
-        }
-        
-        g_hash_table_iter_init(&nicks, ic->acc->nicks);
-        gpointer handle;
-        while (g_hash_table_iter_next(&nicks, &handle, NULL)) {
-                ret = g_slist_prepend(ret, (char *) handle);
-        }
-        
-        /* If the protocol asked for the list, assume we won't have to send it
-           anymore in imcb_connected(). */
-        ic->flags |= OPT_LOCAL_CONTACTS_SENT;
-        
-        return ret;
-}
-
 
 struct imcb_ask_cb_data {
@@ -594 +556 @@
         struct imcb_ask_cb_data *cbd = data;
 
-        if (cbd->ic->acc->prpl->add_buddy) {
-                cbd->ic->acc->prpl->add_buddy(cbd->ic, cbd->handle, NULL);
-        }
+        cbd->ic->acc->prpl->add_buddy(cbd->ic, cbd->handle, NULL);
 
         imcb_ask_cb_free(data);
@@ -662 +622 @@
                 GList *m = ic->acc->prpl->away_states(ic);
                 msg = ic->acc->flags & ACC_FLAG_AWAY_MESSAGE ? away : NULL;
-                away = imc_away_state_find(m, away, &msg) ? : m->data;
+                away = imc_away_state_find(m, away, &msg) ? :
+                       (imc_away_state_find(m, "away", &msg) ? : m->data);
         } else if (ic->acc->flags & ACC_FLAG_STATUS_MESSAGE) {
                 away = NULL;
@@ -781 +742 @@
 }
 
+/* Deprecated: using this function resulted in merging several handles accidentally
+ * Also the irc layer handles this decently nowadays */
 void imcb_clean_handle(struct im_connection *ic, char *handle)
 {
-        /* Accepts a handle and does whatever is necessary to make it
-           BitlBee-friendly. Currently this means removing everything
-           outside 33-127 (ASCII printable excl spaces), @ (only one
-           is allowed) and ! and : */
-        char out[strlen(handle) + 1];
-        int s, d;
-
-        s = d = 0;
-        while (handle[s]) {
-                if (handle[s] > ' ' && handle[s] != '!' && handle[s] != ':' &&
-                    (handle[s] & 0x80) == 0) {
-                        if (handle[s] == '@') {
-                                /* See if we got an @ already? */
-                                out[d] = 0;
-                                if (strchr(out, '@')) {
-                                        continue;
-                                }
-                        }
-
-                        out[d++] = handle[s];
-                }
-                s++;
-        }
-        out[d] = handle[s];
-
-        strcpy(handle, out);
-}
+}