Changeset 59ccef5

Timestamp:

2016-12-26T00:20:09Z (8 years ago)

Author:

dequis <dx@…>

Branches:

master

Children:

9c7ef22

Parents:

6d212f4

git-author:

dequis <dx@…> (26-12-16 00:13:57)

git-committer:

dequis <dx@…> (26-12-16 00:20:09)

Message:

purple: Call imcb_buddy_nick_change() on a few whitelisted plugins

The whitelist includes hangouts, funyahoo and icq.

These plugins tend to have numeric or meaningless usernames. With this
change, users don't have to do 'ac whatever set nick_format %full_name'
anymore. Just sugar.

Location:

protocols/purple

Files:

• bpurple.h (modified) (2 diffs)
• purple.c (modified) (4 diffs)

protocols/purple/bpurple.h

@@ -6 +6 @@
 
 #define PURPLE_REQUEST_HANDLE "purple_request"
+
+#define PURPLE_OPT_SHOULD_SET_NICK 1
 
 struct purple_data
@@ -15 +17 @@
     char *chat_list_server;
     GSList *filetransfers;
+
+    int flags;
 };
 

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",
+                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)
 {
@@ -367 +390 @@
         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);
@@ -903 +930 @@
                 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) {
@@ -910 +939 @@
                 }
 
-                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);
+                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);
+                        }
                 }