Changeset 36f6ab3 for protocols/skype/skype.c

Timestamp:

2013-02-28T07:15:49Z (11 years ago)

Author:

Miklos Vajna <vmiklos@…>

Branches:

master

Children:

b2b7f52

Parents:

c440320

Message:

skype: add support for fetching full names of buddies

File:

• protocols/skype/skype.c (modified) (5 diffs)

protocols/skype/skype.c

@@ -118 +118 @@
          * created. */
         char *pending_user;
+        /* If the info command was used, to determine what to do with FULLNAME result. */
+        int is_info;
 };
 
@@ -320 +322 @@
 
         nicks = g_strsplit(line + 6, ", ", 0);
-        for (i = nicks; *i; i++)
+        for (i = nicks; *i; i++) {
                 skype_printf(ic, "GET USER %s ONLINESTATUS\n", *i);
+                skype_printf(ic, "GET USER %s FULLNAME\n", *i);
+        }
         g_strfreev(nicks);
 }
@@ -375 +379 @@
                 if (set_getbool(&ic->acc->set, "show_moods"))
                         imcb_log(ic, "User `%s' changed mood text to `%s'", user, buf);
-        } else if (!strncmp(ptr, "FULLNAME ", 9))
-                sd->info_fullname = g_strdup(ptr + 9);
-        else if (!strncmp(ptr, "PHONE_HOME ", 11))
+        } else if (!strncmp(ptr, "FULLNAME ", 9)) {
+                char *name = ptr + 9;
+                if (sd->is_info) {
+                        sd->is_info = 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);
+                }
+        } else if (!strncmp(ptr, "PHONE_HOME ", 11))
                 sd->info_phonehome = g_strdup(ptr + 11);
         else if (!strncmp(ptr, "PHONE_OFFICE ", 13))
@@ -1503 +1515 @@
 static void skype_get_info(struct im_connection *ic, char *who)
 {
+        struct skype_data *sd = ic->proto_data;
         char *ptr, *nick;
         nick = g_strdup(who);
@@ -1508 +1521 @@
         if (ptr)
                 *ptr = '\0';
+        sd->is_info = TRUE;
         skype_printf(ic, "GET USER %s FULLNAME\n", nick);
         skype_printf(ic, "GET USER %s PHONE_HOME\n", nick);