Merge branch 'master' into patched-master

1 files changed, 25 insertions, 22 deletions

diff --git a/protocols/purple/purple.c b/protocols/purple/purple.c
index f71cade2..db523ada 100644
--- a/protocols/purple/purple.c
+++ b/protocols/purple/purple.c
@@ -53,6 +53,13 @@ struct request_input_data {
 	guint id;
 };
 
+struct purple_roomlist_data {
+	GSList *chats;
+	gint topic;
+	gboolean initialized;
+};
+
+
 struct im_connection *purple_ic_by_pa(PurpleAccount *pa)
 {
 	GSList *i;
@@ -365,21 +372,6 @@ static void purple_login(account_t *acc)
 	}
 }
 
-static void purple_chatlist_free(struct im_connection *ic)
-{
-	bee_chat_info_t *ci;
-	GSList *l = ic->chatlist;
-
-	while (l) {
-		ci = l->data;
-		l = g_slist_delete_link(l, l);
-
-		g_free(ci->title);
-		g_free(ci->topic);
-		g_free(ci);
-	}
-}
-
 static void purple_logout(struct im_connection *ic)
 {
 	struct purple_data *pd = ic->proto_data;
@@ -397,7 +389,7 @@ static void purple_logout(struct im_connection *ic)
 	purple_account_set_enabled(pd->account, "BitlBee", FALSE);
 	purple_connections = g_slist_remove(purple_connections, ic);
 	purple_accounts_remove(pd->account);
-	purple_chatlist_free(ic);
+	imcb_chat_list_free(ic);
 	g_hash_table_destroy(pd->input_requests);
 	g_free(pd);
 }
@@ -784,13 +776,21 @@ void purple_chat_list(struct im_connection *ic, const char *server)
 {
 	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");
 	}
 }
 
@@ -1395,18 +1395,21 @@ static void prplcb_roomlist_in_progress(PurpleRoomlist *list, gboolean in_progre
 	struct im_connection *ic;
 	struct purple_roomlist_data *rld = list->ui_data;
 
-	if (in_progress) {
+	if (in_progress || !rld) {
 		return;
 	}
 
 	ic = purple_ic_by_pa(list->account);
-	purple_chatlist_free(ic);
+	imcb_chat_list_free(ic);
 
 	ic->chatlist = g_slist_reverse(rld->chats);
 	rld->chats = NULL;
 
-	bee_chat_list_finish(ic);
-	purple_roomlist_unref(list);
+	imcb_chat_list_finish(ic);
+
+	if (rld->initialized) {
+		purple_roomlist_unref(list);
+	}
 }
 
 static void prplcb_roomlist_destroy(PurpleRoomlist *list)