Changes in protocols/nogaim.c [098a75b:9076a1c]

File:

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

protocols/nogaim.c

@@ -132 +132 @@
         extern void twitter_initmodule();
         extern void purple_initmodule();
+        extern void rpc_initmodule();
 
 #ifdef WITH_MSN
@@ -155 +156 @@
 #ifdef WITH_PURPLE
         purple_initmodule();
+#endif
+
+#ifdef WITH_RPC
+        rpc_initmodule();
 #endif
 
@@ -307 +312 @@
         }
 
-        if (ic->acc->flags & ACC_FLAG_LOCAL) {
+        if ((ic->acc->flags & ACC_FLAG_LOCAL_CONTACTS) &&
+            !(ic->flags & OPT_LOCAL_CONTACTS_SENT) &&
+            ic->acc->prpl->add_buddy) {
                 GHashTableIter nicks;
-                gpointer k, v;
+                gpointer handle;
                 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);
+                while (g_hash_table_iter_next(&nicks, &handle, NULL)) {
+                        ic->acc->prpl->add_buddy(ic, (char *) handle, NULL);
                 }
         }
@@ -407 +414 @@
         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. */
@@ -492 +508 @@
 }
 
+/* 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 {
@@ -550 +594 @@
         struct imcb_ask_cb_data *cbd = data;
 
-        cbd->ic->acc->prpl->add_buddy(cbd->ic, cbd->handle, NULL);
+        if (cbd->ic->acc->prpl->add_buddy) {
+                cbd->ic->acc->prpl->add_buddy(cbd->ic, cbd->handle, NULL);
+        }
 
         imcb_ask_cb_free(data);