aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordequis <dx@dxzone.com.ar>2016-10-16 03:45:28 -0300
committerdequis <dx@dxzone.com.ar>2016-10-16 03:51:53 -0300
commita08b2db9575b276d7e6008e794fa728518671ec4 (patch)
tree7b4bc4f1cb02962e356b02944f49400fbf2f18ec
parent9698fc0a190f958fa28a8e54b2bfd6ccfdb2aa18 (diff)
Rename bee_chat_list_finish() to imcb_chat_list_finish()
bee_chat_list_finish is still available as a deprecated function but it will be removed before the next stable release It has never been part of any release, just keeping it for a while for the sake of being polite to the users of the discord plugin who may be using the experimental chat list branch.
-rw-r--r--protocols/bee.h3
-rw-r--r--protocols/bee_chat.c8
-rw-r--r--protocols/purple/purple.c2
3 files changed, 10 insertions, 3 deletions
diff --git a/protocols/bee.h b/protocols/bee.h
index 5f47e464..93027d59 100644
--- a/protocols/bee.h
+++ b/protocols/bee.h
@@ -189,6 +189,7 @@ G_MODULE_EXPORT int bee_chat_msg(bee_t *bee, struct groupchat *c, const char *ms
G_MODULE_EXPORT struct groupchat *bee_chat_by_title(bee_t *bee, struct im_connection *ic, const char *title);
G_MODULE_EXPORT void imcb_chat_invite(struct im_connection *ic, const char *name, const char *who, const char *msg);
-G_MODULE_EXPORT void bee_chat_list_finish(struct im_connection *ic);
+G_GNUC_DEPRECATED G_MODULE_EXPORT void bee_chat_list_finish(struct im_connection *ic);
+G_MODULE_EXPORT void imcb_chat_list_finish(struct im_connection *ic);
#endif /* __BEE_H__ */
diff --git a/protocols/bee_chat.c b/protocols/bee_chat.c
index 76ed7f85..c5f2b262 100644
--- a/protocols/bee_chat.c
+++ b/protocols/bee_chat.c
@@ -274,7 +274,13 @@ void imcb_chat_invite(struct im_connection *ic, const char *name, const char *wh
}
}
-void bee_chat_list_finish(struct im_connection *ic)
+void imcb_chat_list_finish(struct im_connection *ic)
{
cmd_chat_list_finish(ic);
}
+
+void bee_chat_list_finish(struct im_connection *ic)
+{
+ imcb_log(ic, "Warning: using deprecated bee_chat_list_finish. This will be removed in the stable release.");
+ imcb_chat_list_finish(ic);
+}
diff --git a/protocols/purple/purple.c b/protocols/purple/purple.c
index 6b043101..bd84966e 100644
--- a/protocols/purple/purple.c
+++ b/protocols/purple/purple.c
@@ -1406,7 +1406,7 @@ static void prplcb_roomlist_in_progress(PurpleRoomlist *list, gboolean in_progre
ic->chatlist = g_slist_reverse(rld->chats);
rld->chats = NULL;
- bee_chat_list_finish(ic);
+ imcb_chat_list_finish(ic);
if (rld->initialized) {
purple_roomlist_unref(list);