Changeset 89db90e for protocols/purple/purple.c

Timestamp:

2015-03-12T09:10:16Z (10 years ago)

Author:

dequis <dx@…>

Children:

fc650a8

Parents:

0e4c3dd (diff), 3bb333c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'develop' into feat/hip-cat

File:

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

protocols/purple/purple.c

@@ -23 +23 @@
 
 #include "bitlbee.h"
+#include "bpurple.h"
 #include "help.h"
 
@@ -42 +43 @@
 {
         GSList *i;
+        struct purple_data *pd;
 
         for (i = purple_connections; i; i = i->next) {
-                if (((struct im_connection *) i->data)->proto_data == pa) {
+                pd = ((struct im_connection *) i->data)->proto_data;
+                if (pd->account == pa) {
                         return i->data;
                 }
@@ -290 +293 @@
 {
         struct im_connection *ic = imcb_new(acc);
-        PurpleAccount *pa;
+        struct purple_data *pd;
 
         if ((local_bee != NULL && local_bee != acc->bee) ||
@@ -306 +309 @@
         purple_connections = g_slist_prepend(purple_connections, ic);
 
-        ic->proto_data = pa = purple_account_new(acc->user, (char *) acc->prpl->data);
-        purple_account_set_password(pa, acc->pass);
-        purple_sync_settings(acc, pa);
-
-        purple_account_set_enabled(pa, "BitlBee", TRUE);
+        ic->proto_data = pd = g_new0(struct purple_data, 1);
+        pd->account = purple_account_new(acc->user, (char *) acc->prpl->data);
+        purple_account_set_password(pd->account, acc->pass);
+        purple_sync_settings(acc, pd->account);
+
+        purple_account_set_enabled(pd->account, "BitlBee", TRUE);
 }
 
 static void purple_logout(struct im_connection *ic)
 {
-        PurpleAccount *pa = ic->proto_data;
-
-        purple_account_set_enabled(pa, "BitlBee", FALSE);
+        struct purple_data *pd = ic->proto_data;
+
+        purple_account_set_enabled(pd->account, "BitlBee", FALSE);
         purple_connections = g_slist_remove(purple_connections, ic);
-        purple_accounts_remove(pa);
+        purple_accounts_remove(pd->account);
+        g_free(pd);
 }
 
@@ -325 +330 @@
 {
         PurpleConversation *conv;
+        struct purple_data *pd = ic->proto_data;
 
         if ((conv = purple_find_conversation_with_account(PURPLE_CONV_TYPE_IM,
-                                                          who, ic->proto_data)) == NULL) {
+                                                          who, pd->account)) == NULL) {
                 conv = purple_conversation_new(PURPLE_CONV_TYPE_IM,
-                                               ic->proto_data, who);
+                                               pd->account, who);
         }
 
@@ -339 +345 @@
 static GList *purple_away_states(struct im_connection *ic)
 {
-        PurpleAccount *pa = ic->proto_data;
+        struct purple_data *pd = ic->proto_data;
         GList *st, *ret = NULL;
 
-        for (st = purple_account_get_status_types(pa); st; st = st->next) {
+        for (st = purple_account_get_status_types(pd->account); st; st = st->next) {
                 PurpleStatusPrimitive prim = purple_status_type_get_primitive(st->data);
                 if (prim != PURPLE_STATUS_AVAILABLE && prim != PURPLE_STATUS_OFFLINE) {
@@ -354 +360 @@
 static void purple_set_away(struct im_connection *ic, char *state_txt, char *message)
 {
-        PurpleAccount *pa = ic->proto_data;
-        GList *status_types = purple_account_get_status_types(pa), *st;
+        struct purple_data *pd = ic->proto_data;
+        GList *status_types = purple_account_get_status_types(pd->account), *st;
         PurpleStatusType *pst = NULL;
         GList *args = NULL;
@@ -378 +384 @@
         }
 
-        purple_account_set_status_list(pa, st ? purple_status_type_get_id(pst) : "away",
+        purple_account_set_status_list(pd->account,
+                                       st ? purple_status_type_get_id(pst) : "away",
                                        TRUE, args);
 
@@ -447 +454 @@
         PurpleBuddy *pb;
         PurpleGroup *pg = NULL;
+        struct purple_data *pd = ic->proto_data;
 
         if (group && !(pg = purple_find_group(group))) {
@@ -453 +461 @@
         }
 
-        pb = purple_buddy_new((PurpleAccount *) ic->proto_data, who, NULL);
+        pb = purple_buddy_new(pd->account, who, NULL);
         purple_blist_add_buddy(pb, NULL, pg, NULL);
-        purple_account_add_buddy((PurpleAccount *) ic->proto_data, pb);
-
-        purple_gg_buddylist_export(((PurpleAccount *) ic->proto_data)->gc);
+        purple_account_add_buddy(pd->account, pb);
+
+        purple_gg_buddylist_export(pd->account->gc);
 }
 
@@ -463 +471 @@
 {
         PurpleBuddy *pb;
-
-        pb = purple_find_buddy((PurpleAccount *) ic->proto_data, who);
+        struct purple_data *pd = ic->proto_data;
+
+        pb = purple_find_buddy(pd->account, who);
         if (pb != NULL) {
                 PurpleGroup *group;
 
                 group = purple_buddy_get_group(pb);
-                purple_account_remove_buddy((PurpleAccount *) ic->proto_data, pb, group);
+                purple_account_remove_buddy(pd->account, pb, group);
 
                 purple_blist_remove_buddy(pb);
         }
 
-        purple_gg_buddylist_export(((PurpleAccount *) ic->proto_data)->gc);
+        purple_gg_buddylist_export(pd->account->gc);
 }
 
 static void purple_add_permit(struct im_connection *ic, char *who)
 {
-        PurpleAccount *pa = ic->proto_data;
-
-        purple_privacy_permit_add(pa, who, FALSE);
+        struct purple_data *pd = ic->proto_data;
+
+        purple_privacy_permit_add(pd->account, who, FALSE);
 }
 
 static void purple_add_deny(struct im_connection *ic, char *who)
 {
-        PurpleAccount *pa = ic->proto_data;
-
-        purple_privacy_deny_add(pa, who, FALSE);
+        struct purple_data *pd = ic->proto_data;
+
+        purple_privacy_deny_add(pd->account, who, FALSE);
 }
 
 static void purple_rem_permit(struct im_connection *ic, char *who)
 {
-        PurpleAccount *pa = ic->proto_data;
-
-        purple_privacy_permit_remove(pa, who, FALSE);
+        struct purple_data *pd = ic->proto_data;
+
+        purple_privacy_permit_remove(pd->account, who, FALSE);
 }
 
 static void purple_rem_deny(struct im_connection *ic, char *who)
 {
-        PurpleAccount *pa = ic->proto_data;
-
-        purple_privacy_deny_remove(pa, who, FALSE);
+        struct purple_data *pd = ic->proto_data;
+
+        purple_privacy_deny_remove(pd->account, who, FALSE);
 }
 
 static void purple_get_info(struct im_connection *ic, char *who)
 {
-        serv_get_info(purple_account_get_connection(ic->proto_data), who);
+        struct purple_data *pd = ic->proto_data;
+
+        serv_get_info(purple_account_get_connection(pd->account), who);
 }
 
@@ -517 +528 @@
 {
         PurpleTypingState state = PURPLE_NOT_TYPING;
-        PurpleAccount *pa = ic->proto_data;
+        struct purple_data *pd = ic->proto_data;
 
         if (flags & OPT_TYPING) {
@@ -525 +536 @@
         }
 
-        serv_send_typing(purple_account_get_connection(pa), who, state);
+        serv_send_typing(purple_account_get_connection(pd->account), who, state);
 
         return 1;
@@ -559 +570 @@
         /* There went my nice afternoon. :-( */
 
-        PurpleAccount *pa = ic->proto_data;
-        PurplePlugin *prpl = purple_plugins_find_with_id(pa->protocol_id);
+        struct purple_data *pd = ic->proto_data;
+        PurplePlugin *prpl = purple_plugins_find_with_id(pd->account->protocol_id);
         PurplePluginProtocolInfo *pi = prpl->info->extra_info;
-        PurpleBuddy *pb = purple_find_buddy((PurpleAccount *) ic->proto_data, who);
+        PurpleBuddy *pb = purple_find_buddy(pd->account, who);
         PurpleMenuAction *mi;
         GList *menu;
@@ -597 +608 @@
         PurpleConversation *pc = gc->data;
         PurpleConvChat *pcc = PURPLE_CONV_CHAT(pc);
-
-        serv_chat_invite(purple_account_get_connection(gc->ic->proto_data),
+        struct purple_data *pd = gc->ic->proto_data;
+
+        serv_chat_invite(purple_account_get_connection(pd->account),
                          purple_conv_chat_get_id(pcc),
                          message && *message ? message : "Please join my chat",
@@ -623 +635 @@
                                    set_t **sets)
 {
-        PurpleAccount *pa = ic->proto_data;
-        PurplePlugin *prpl = purple_plugins_find_with_id(pa->protocol_id);
+        struct purple_data *pd = ic->proto_data;
+        PurplePlugin *prpl = purple_plugins_find_with_id(pd->account->protocol_id);
         PurplePluginProtocolInfo *pi = prpl->info->extra_info;
         GHashTable *chat_hash;
@@ -631 +643 @@
 
         if (!pi->chat_info || !pi->chat_info_defaults ||
-            !(info = pi->chat_info(purple_account_get_connection(pa)))) {
+            !(info = pi->chat_info(purple_account_get_connection(pd->account)))) {
                 imcb_error(ic, "Joining chatrooms not supported by this protocol");
                 return NULL;
         }
 
-        if ((conv = purple_find_conversation_with_account(PURPLE_CONV_TYPE_CHAT, room, pa))) {
+        if ((conv = purple_find_conversation_with_account(PURPLE_CONV_TYPE_CHAT,
+                                                          room, pd->account))) {
                 purple_conversation_destroy(conv);
         }
 
-        chat_hash = pi->chat_info_defaults(purple_account_get_connection(pa), room);
+        chat_hash = pi->chat_info_defaults(
+                purple_account_get_connection(pd->account), room
+        );
 
         for (l = info; l; l = l->next) {
@@ -654 +669 @@
         }
 
-        serv_join_chat(purple_account_get_connection(pa), chat_hash);
+        serv_join_chat(purple_account_get_connection(pd->account), chat_hash);
 
         return NULL;
@@ -1033 +1048 @@
 }
 
+/* So it turns out some requests have no account context at all, because
+ * libpurple hates us. This means that query_del_by_conn() won't remove those
+ * on logout, and will segfault if the user replies. That's why this exists.
+ */
+static void prplcb_close_request(PurpleRequestType type, void *data)
+{
+        if (type == PURPLE_REQUEST_ACTION) {
+                struct prplcb_request_action_data *pqad = data;
+                query_del(local_bee->ui_data, pqad->bee_data);
+        }
+        /* Add the request input handler here when that becomes a thing */
+}
+
 /*
 static void prplcb_request_test()
@@ -1047 +1075 @@
         NULL,
         NULL,
-        NULL,
+        prplcb_close_request,
         NULL,
 };