Changes in protocols/purple/purple.c [a9e0de2:9f03c47]

File:

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

protocols/purple/purple.c

@@ -114 +114 @@
 }
 
-static gboolean purple_account_should_set_nick(account_t *acc)
-{
-        /* whitelist of protocols that tend to have numeric or meaningless usernames, and should
-         * always offer the 'alias' as a nick.  this is just so that users don't have to do
-         * 'account whatever set nick_format %full_name'
-         */
-        char *whitelist[] = {
-                "prpl-hangouts",
-                "prpl-eionrobb-funyahoo-plusplus",
-                "prpl-icq",
-                "prpl-line",
-                NULL,
-        };
-        char **p;
-
-        for (p = whitelist; *p; p++) {
-                if (g_strcmp0(acc->prpl->data, *p) == 0) {
-                        return TRUE;
-                }
-        }
-
-        return FALSE;
-}
-
 static void purple_init(account_t *acc)
 {
@@ -305 +281 @@
         }
 
-        if (g_strcmp0(prpl->info->id, "prpl-line") == 0) {
-                s = set_add(&acc->set, "line-auth-token", NULL, NULL, acc);
-                s->flags |= SET_HIDDEN;
-        }
-
         /* Go through all away states to figure out if away/status messages
            are possible. */
@@ -368 +339 @@
                 purple_account_set_check_mail(pa, set_getbool(&acc->set, "mail_notifications"));
         }
-
-        if (g_strcmp0(prpl->info->id, "prpl-line") == 0) {
-                const char *name = "line-auth-token";
-                purple_account_set_string(pa, name, set_getstr(&acc->set, name));
-        }
 }
 
@@ -401 +367 @@
         purple_account_set_password(pd->account, acc->pass);
         purple_sync_settings(acc, pd->account);
-
-        if (purple_account_should_set_nick(acc)) {
-                pd->flags = PURPLE_OPT_SHOULD_SET_NICK;
-        }
 
         purple_account_set_enabled(pd->account, "BitlBee", TRUE);
@@ -774 +736 @@
         struct groupchat *gc;
         GList *info, *l;
-        GString *missing_settings = NULL;
 
         if (!pi->chat_info || !pi->chat_info_defaults ||
@@ -800 +761 @@
                 } else if (strcmp(pce->identifier, "passwd") == 0) {
                         g_hash_table_replace(chat_hash, "passwd", g_strdup(password));
-                } else {
-                        char *key, *value;
-
-                        key = g_strdup_printf("purple_%s", pce->identifier);
-                        str_reject_chars(key, " -", '_');
-
-                        if ((value = set_getstr(sets, key))) {
-                                /* sync from bitlbee to the prpl */
-                                g_hash_table_replace(chat_hash, (char *) pce->identifier, g_strdup(value));
-                        } else if ((value = g_hash_table_lookup(chat_hash, pce->identifier))) {
-                                /* if the bitlbee one was empty, sync from prpl to bitlbee */
-                                set_setstr(sets, key, value);
-                        }
-
-                        g_free(key);
-                }
-
-                if (pce->required && !g_hash_table_lookup(chat_hash, pce->identifier)) {
-                        if (!missing_settings) {
-                                missing_settings = g_string_sized_new(32);
-                        }
-                        g_string_append_printf(missing_settings, "%s, ", pce->identifier);
                 }
 
@@ -828 +767 @@
 
         g_list_free(info);
-
-        if (missing_settings) {
-                /* remove the ", " from the end */
-                g_string_truncate(missing_settings, missing_settings->len - 2);
-
-                imcb_error(ic, "Can't join %s. The following settings are required: %s", room, missing_settings->str);
-
-                g_string_free(missing_settings, TRUE);
-                g_hash_table_destroy(chat_hash);
-                return NULL;
-        }
 
         /* do this before serv_join_chat to handle cases where prplcb_conv_new is called immediately (not async) */
@@ -873 +801 @@
                 purple_roomlist_ref(list);
         }
-}
-
-/* handles either prpl->chat_(add|free)_settings depending on the value of 'add' */
-static void purple_chat_update_settings(account_t *acc, set_t **head, gboolean add)
-{
-        PurplePlugin *prpl = purple_plugins_find_with_id((char *) acc->prpl->data);
-        PurplePluginProtocolInfo *pi = prpl->info->extra_info;
-        GList *info, *l;
-
-        if (!pi->chat_info || !pi->chat_info_defaults) {
-                return;
-        }
-
-        /* hack / leap of faith: pass a NULL here because we don't have a connection yet.
-         * i reviewed all the built-in prpls and a bunch of third-party ones and none
-         * of them seem to need this parameter at all, so... i hope it never crashes */
-        info = pi->chat_info(NULL);
-
-        for (l = info; l; l = l->next) {
-                struct proto_chat_entry *pce = l->data;
-                char *key;
-
-                if (strcmp(pce->identifier, "handle") == 0 ||
-                    strcmp(pce->identifier, "password") == 0 ||
-                    strcmp(pce->identifier, "passwd") == 0) {
-                        /* skip these, they are handled above */
-                        g_free(pce);
-                        continue;
-                }
-
-                key = g_strdup_printf("purple_%s", pce->identifier);
-                str_reject_chars(key, " -", '_');
-
-                if (add) {
-                        set_add(head, key, NULL, NULL, NULL);
-                } else {
-                        set_del(head, key);
-                }
-
-                g_free(key);
-                g_free(pce);
-        }
-
-        g_list_free(NULL);
-        g_list_free(info);
-}
-
-static void purple_chat_add_settings(account_t *acc, set_t **head)
-{
-        purple_chat_update_settings(acc, head, TRUE);
-}
-
-static void purple_chat_free_settings(account_t *acc, set_t **head)
-{
-        purple_chat_update_settings(acc, head, FALSE);
 }
 
@@ -966 +839 @@
 {
         struct im_connection *ic = purple_ic_by_gc(gc);
-        struct purple_data *pd = ic->proto_data;
-        const char *dn, *token;
+        const char *dn;
         set_t *s;
 
@@ -980 +852 @@
         // user list needs to be requested for Gadu-Gadu
         purple_gg_buddylist_import(gc);
-
-        /* more awful hacks, because clearly we didn't have enough of those */
-        if ((s = set_find(&ic->acc->set, "line-auth-token")) &&
-            (token = purple_account_get_string(pd->account, "line-auth-token", NULL))) {
-                g_free(s->value);
-                s->value = g_strdup(token);
-        }
 
         ic->flags |= OPT_DOES_HTML;
@@ -1038 +903 @@
                 PurpleGroup *group = purple_buddy_get_group(bud);
                 struct im_connection *ic = purple_ic_by_pa(bud->account);
-                struct purple_data *pd = ic->proto_data;
                 PurpleStatus *as;
                 int flags = 0;
-                char *alias = NULL;
 
                 if (ic == NULL) {
@@ -1047 +910 @@
                 }
 
-                alias = bud->server_alias ? : bud->alias;
-
-                if (alias) {
-                        imcb_rename_buddy(ic, bud->name, alias);
-                        if (pd->flags & PURPLE_OPT_SHOULD_SET_NICK) {
-                                imcb_buddy_nick_change(ic, bud->name, alias);
-                        }
+                if (bud->server_alias) {
+                        imcb_rename_buddy(ic, bud->name, bud->server_alias);
+                } else if (bud->alias) {
+                        imcb_rename_buddy(ic, bud->name, bud->alias);
                 }
 
@@ -1197 +1057 @@
 }
 
-/* Handles write_im and write_chat. Removes echoes of locally sent messages.
- *
- * PURPLE_MESSAGE_DELAYED is used for chat backlogs - if a message has both
- * that flag and _SEND, it's a self-message from before joining the channel.
- * Those are safe to display. The rest (with just _SEND) may be echoes. */
+/* Handles write_im and write_chat. Removes echoes of locally sent messages */
 static void prplcb_conv_msg(PurpleConversation *conv, const char *who, const char *message, PurpleMessageFlags flags, time_t mtime)
 {
-        if ((!(flags & PURPLE_MESSAGE_SEND)) || (flags & PURPLE_MESSAGE_DELAYED)) {
-                handle_conv_msg(conv, who, message, (flags & PURPLE_MESSAGE_SEND) ? OPT_SELFMESSAGE : 0, mtime);
+        if (!(flags & PURPLE_MESSAGE_SEND)) {
+                handle_conv_msg(conv, who, message, 0, mtime);
         }
 }
@@ -1531 +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;
-        char *title;
+        const char *title;
         const char *topic;
         GList *fields;
@@ -1554 +1396 @@
 
         fields = purple_roomlist_room_get_fields(room);
-        title = prplcb_roomlist_get_room_name(list, room);
+        title = purple_roomlist_room_get_name(room);
 
         if (rld->topic >= 0) {
@@ -1563 +1405 @@
 
         ci = g_new(bee_chat_info_t, 1);
-        ci->title = title;
+        ci->title = g_strdup(title);
         ci->topic = g_strdup(topic);
         rld->chats = g_slist_prepend(rld->chats, ci);
@@ -1785 +1627 @@
 }
 
-/* borrowing this semi-private function
- * TODO: figure out a better interface later (famous last words) */
-gboolean plugin_info_add(struct plugin_info *info);
-
 void purple_initmodule()
 {
@@ -1795 +1633 @@
         GString *help;
         char *dir;
-        gboolean debug_enabled = !!getenv("BITLBEE_DEBUG");
 
         if (purple_get_core() != NULL) {
@@ -1803 +1640 @@
         }
 
-        g_return_if_fail((int) B_EV_IO_READ == (int) PURPLE_INPUT_READ);
-        g_return_if_fail((int) B_EV_IO_WRITE == (int) PURPLE_INPUT_WRITE);
+        g_assert((int) B_EV_IO_READ == (int) PURPLE_INPUT_READ);
+        g_assert((int) B_EV_IO_WRITE == (int) PURPLE_INPUT_WRITE);
 
         dir = g_strdup_printf("%s/purple", global.conf->configdir);
@@ -1814 +1651 @@
         g_free(dir);
 
-        purple_debug_set_enabled(debug_enabled);
+        purple_debug_set_enabled(FALSE);
         purple_core_set_ui_ops(&bee_core_uiops);
         purple_eventloop_set_ui_ops(&glib_eventloops);
@@ -1822 +1659 @@
                 abort();
         }
-        purple_debug_set_enabled(FALSE);
 
         if (proxytype != PROXY_NONE) {
@@ -1881 +1717 @@
         funcs.chat_join = purple_chat_join;
         funcs.chat_list = purple_chat_list;
-        funcs.chat_add_settings = purple_chat_add_settings;
-        funcs.chat_free_settings = purple_chat_free_settings;
         funcs.transfer_request = purple_transfer_request;
 
@@ -1893 +1727 @@
                 PurplePluginProtocolInfo *pi = prot->info->extra_info;
                 struct prpl *ret;
-                struct plugin_info *info;
 
                 /* If we already have this one (as a native module), don't
@@ -1928 +1761 @@
                         register_protocol(ret);
                 }
-
-                info = g_new0(struct plugin_info, 1);
-                info->abiver = BITLBEE_ABI_VERSION_CODE;
-                info->name = ret->name;
-                info->version = prot->info->version;
-                info->description = prot->info->description;
-                info->author = prot->info->author;
-                info->url = prot->info->homepage;
-
-                plugin_info_add(info);
         }