Changeset 01d56c0

Timestamp:

2016-10-08T06:39:05Z (8 years ago)

Author:

dequis <dx@…>

Branches:

master

Children:

9698fc0

Parents:

58d285a

git-author:

dequis <dx@…> (08-10-16 06:32:08)

git-committer:

dequis <dx@…> (08-10-16 06:39:05)

Message:

purple: Fix handling of empty, immediate roomlist results

Two issues here:

1. SIPE called in_progress(FALSE) immediately (which decreases refcount),

before purple_roomlist_get_list() could return (which would normally
increase refcount). The first refcount decrease steals it from the prpl,
and bad things happen.

Added an initialized flag to only do that decrease after it was
increased first. This is similar to how pidgin sets a 'dialog' attribute
after the purple_roomlist_get_list() call, and skips the unref if it's
not set.

2. The code assumed that NULL return value means room listing not

supported. That's not quite true, so now it checks in the prpl info to
see if roomlist_get_list is defined.

Also, made purple_roomlist_data more private.

Location:

protocols/purple

Files:

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

protocols/purple/bpurple.h

@@ -15 +15 @@
 };
 
-struct purple_roomlist_data
-{
-    GSList *chats;
-    gint topic;
-};
-
 #endif /* !BPURPLE_H */

protocols/purple/purple.c

@@ -54 +54 @@
 };
 
+struct purple_roomlist_data {
+        GSList *chats;
+        gint topic;
+        gboolean initialized;
+};
+
+
 struct im_connection *purple_ic_by_pa(PurpleAccount *pa)
 {
@@ -771 +778 @@
         PurpleRoomlist *list;
         struct purple_data *pd = ic->proto_data;
+        PurplePlugin *prpl = purple_plugins_find_with_id(pd->account->protocol_id);
+        PurplePluginProtocolInfo *pi = prpl->info->extra_info;
+
+        if (!pi || !pi->roomlist_get_list) {
+                imcb_log(ic, "Room listing unsupported by this purple plugin");
+                return;
+        }
 
         list = purple_roomlist_get_list(pd->account->gc);
 
         if (list) {
+                struct purple_roomlist_data *rld = list->ui_data;
+                rld->initialized = TRUE;
+
                 purple_roomlist_ref(list);
-        } else {
-                imcb_log(ic, "Room listing unsupported by this purple plugin");
         }
 }
@@ -1382 +1397 @@
         struct purple_roomlist_data *rld = list->ui_data;
 
-        if (in_progress) {
+        if (in_progress || !rld) {
                 return;
         }
@@ -1393 +1408 @@
 
         bee_chat_list_finish(ic);
-        purple_roomlist_unref(list);
+
+        if (rld->initialized) {
+                purple_roomlist_unref(list);
+        }
 }