Ticket #1169: skype-displayname.patch

protocols/skype/skype.c

@@ -93 +93 @@
         int topic_wait;
         /* These are used by the info command. */
         char *info_fullname;
+        char *info_displayname;
         char *info_phonehome;
         char *info_phoneoffice;
         char *info_phonemobile;
@@ -117 +118 @@
         /* Pending user which has to be added to the next group which is
          * created. */
         char *pending_user;
-        /* If the info command was used, to determine what to do with FULLNAME result. */
-        int is_info;
+        /* If the info command was used, to determine what to do with
+         * FULLNAME & DISPLAYNAME result. */
+        int is_info_fullname;
+        int is_info_displayname;
 };
 
 struct skype_away_state {
@@ -324 +327 @@
         for (i = nicks; *i; i++) {
                 skype_printf(ic, "GET USER %s ONLINESTATUS\n", *i);
                 skype_printf(ic, "GET USER %s FULLNAME\n", *i);
+                skype_printf(ic, "GET USER %s DISPLAYNAME\n", *i);
         }
         g_strfreev(nicks);
 }
@@ -380 +384 @@
                         imcb_log(ic, "User `%s' changed mood text to `%s'", user, buf);
         } else if (!strncmp(ptr, "FULLNAME ", 9)) {
                 char *name = ptr + 9;
-                if (sd->is_info) {
-                        sd->is_info = FALSE;
+                if (sd->is_info_fullname) {
+                        sd->is_info_fullname = FALSE;
                         sd->info_fullname = g_strdup(name);
                 } else {
                         char *buf = g_strdup_printf("%s@skype.com", user);
-                        imcb_rename_buddy(ic, buf, name);
-                        g_free(buf);
+                        if (strlen(name)) {
+                                imcb_rename_buddy(ic, buf, name);
+                                bee_t *bee = ic->bee;
+                                bee_user_t *bu = bee_user_by_handle(bee, ic, buf);
+                                if (bu)
+                                        bee->ui->user_group(bee, bu);
+                                g_free(buf);
+                        }
+                }
+        } else if (!strncmp(ptr, "DISPLAYNAME ", 12)) {
+                char *name = ptr + 12;
+                if (sd->is_info_displayname) {
+                        sd->is_info_displayname = FALSE;
+                        sd->info_displayname = g_strdup(name);
+                } else {
+                        if (strlen(name)) {
+                                char *buf = g_strdup_printf("%s@skype.com", user);
+                                imcb_rename_buddy(ic, buf, name);
+                                bee_t *bee = ic->bee;
+                                bee_user_t *bu = bee_user_by_handle(bee, ic, buf);
+                                if (bu)
+                                        bee->ui->user_group(bee, bu);
+                                g_free(buf);
+                        }
                 }
         } else if (!strncmp(ptr, "PHONE_HOME ", 11))
                 sd->info_phonehome = g_strdup(ptr + 11);
@@ -435 +461 @@
                         g_free(sd->info_fullname);
                         sd->info_fullname = NULL;
                 }
+                if (sd->info_displayname) {
+                        if (strlen(sd->info_displayname))
+                                g_string_append_printf(st, "Display Name: %s\n",
+                                        sd->info_displayname);
+                        g_free(sd->info_displayname);
+                        sd->info_displayname = NULL;
+                }
                 if (sd->info_phonehome) {
                         if (strlen(sd->info_phonehome))
                                 g_string_append_printf(st, "Home Phone: %s\n",
@@ -1527 +1560 @@
         ptr = strchr(nick, '@');
         if (ptr)
                 *ptr = '\0';
-        sd->is_info = TRUE;
+        sd->is_info_fullname = TRUE;
+        sd->is_info_displayname = TRUE;
         skype_printf(ic, "GET USER %s FULLNAME\n", nick);
+        skype_printf(ic, "GET USER %s DISPLAYNAME\n", nick);
         skype_printf(ic, "GET USER %s PHONE_HOME\n", nick);
         skype_printf(ic, "GET USER %s PHONE_OFFICE\n", nick);
         skype_printf(ic, "GET USER %s PHONE_MOBILE\n", nick);