Changeset fecdd71

Timestamp:

2016-11-04T23:48:52Z (8 years ago)

Author:

dequis <dx@…>

Branches:

master

Children:

30093fa

Parents:

50988d1

Message:

purple: hack to pass server parameter to jabber's input request

Because our purple module is all about hacks, adding more can't hurt.

There's a string comparison for "Enter a Conference Server". It's
gettexted in the source but in practice it isn't affected by locale
(bitlbee disables localization).

Worst case, if this stops working, it will open an input request like it
did before this commit. It also does that in purple's jabber if you
don't provide a server parameter.

Location:

protocols/purple

Files:

• bpurple.h (modified) (1 diff)
• purple.c (modified) (5 diffs)

protocols/purple/bpurple.h

@@ -13 +13 @@
     GHashTable *input_requests;
     guint next_request_id;
+    char *chat_list_server;
 };
 

protocols/purple/purple.c

@@ -389 +389 @@
         purple_accounts_remove(pd->account);
         imcb_chat_list_free(ic);
+        g_free(pd->chat_list_server);
         g_hash_table_destroy(pd->input_requests);
         g_free(pd);
@@ -782 +783 @@
                 return;
         }
+
+        g_free(pd->chat_list_server);
+        pd->chat_list_server = (server && *server) ? g_strdup(server) : NULL;
 
         list = purple_roomlist_get_list(pd->account->gc);
@@ -1230 +1234 @@
         struct im_connection *ic = purple_ic_by_pa(account);
         struct purple_data *pd = ic->proto_data;
-        struct request_input_data *ri = g_new0(struct request_input_data, 1);
-        guint id = pd->next_request_id++;
+        struct request_input_data *ri;
+        guint id;
+
+        /* hack so that jabber's chat list doesn't ask for conference server twice */
+        if (pd->chat_list_server && title && g_strcmp0(title, "Enter a Conference Server") == 0) {
+                ((ri_callback_t) ok_cb)(user_data, pd->chat_list_server);
+                g_free(pd->chat_list_server);
+                pd->chat_list_server = NULL;
+                return NULL;
+        }
+
+        id = pd->next_request_id++;
+        ri = g_new0(struct request_input_data, 1);
 
         ri->id = id;
@@ -1392 +1407 @@
 {
         struct im_connection *ic;
+        struct purple_data *pd;
         struct purple_roomlist_data *rld = list->ui_data;
 
@@ -1400 +1416 @@
         ic = purple_ic_by_pa(list->account);
         imcb_chat_list_free(ic);
+
+        pd = ic->proto_data;
+        g_free(pd->chat_list_server);
+        pd->chat_list_server = NULL;
 
         ic->chatlist = g_slist_reverse(rld->chats);