Changeset 87872c7

Timestamp:

2016-11-28T05:53:50Z (8 years ago)

Author:

dequis <dx@…>

Branches:

master

Children:

2a1c27f

Parents:

ed1f5e8d

git-author:

dequis <dx@…> (28-11-16 05:52:22)

git-committer:

dequis <dx@…> (28-11-16 05:53:50)

Message:

purple: Use roomlist_room_serialize, fixes joining jabber chats

The room names in 'chat list' were missing the server part.

Jabber is the only prpl which implements this method as far as I can
see, and it's needed to get the full name.

File:

• protocols/purple/purple.c (modified) (3 diffs)

protocols/purple/purple.c

@@ -1387 +1387 @@
 }
 
+static char *prplcb_roomlist_get_room_name(PurpleRoomlist *list, PurpleRoomlistRoom *room)
+{
+        struct im_connection *ic = purple_ic_by_pa(list->account);
+        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_room_serialize) {
+                return pi->roomlist_room_serialize(room);
+        } else {
+                return g_strdup(purple_roomlist_room_get_name(room));
+        }
+}
+
 static void prplcb_roomlist_add_room(PurpleRoomlist *list, PurpleRoomlistRoom *room)
 {
         bee_chat_info_t *ci;
-        const char *title;
+        char *title;
         const char *topic;
         GList *fields;
@@ -1396 +1410 @@
 
         fields = purple_roomlist_room_get_fields(room);
-        title = purple_roomlist_room_get_name(room);
+        title = prplcb_roomlist_get_room_name(list, room);
 
         if (rld->topic >= 0) {
@@ -1405 +1419 @@
 
         ci = g_new(bee_chat_info_t, 1);
-        ci->title = g_strdup(title);
+        ci->title = title;
         ci->topic = g_strdup(topic);
         rld->chats = g_slist_prepend(rld->chats, ci);