Changeset 46641bf

Timestamp:

2011-01-03T03:13:00Z (14 years ago)

Author:

Miklos Vajna <vmiklos@…>

Branches:

master

Children:

2b183e4

Parents:

46e9822

Message:

skype_add_buddy: handle the case when /invite is used on a new group

File:

• skype/skype.c (modified) (4 diffs)

skype/skype.c

@@ -110 +110 @@
         /* List of struct skype_group* */
         GList *groups;
+        /* Pending user which has to be added to the next group which is
+         * created. */
+        char *pending_user;
 };
 
@@ -865 +868 @@
                         log_message(LOGLVL_ERROR,
                                 "No skype group with id %s. That's probably a bug.", id);
-        } else if (!strncmp(info, "NROFUSERS ", 10))
-                /* Number of users changed in this group, query its type to see
-                 * if it's a custom one we should care about. */
-                skype_printf(ic, "GET GROUP %s TYPE", id);
+        } else if (!strncmp(info, "NROFUSERS ", 10)) {
+                if (!sd->pending_user) {
+                        /* Number of users changed in this group, query its type to see
+                         * if it's a custom one we should care about. */
+                        skype_printf(ic, "GET GROUP %s TYPE", id);
+                        return;
+                }
+
+                /* This is a newly created group, we have a single user
+                 * to add. */
+                struct skype_group *sg = skype_group_by_id(ic, atoi(id));
+
+                if (sg) {
+                        skype_printf(ic, "ALTER GROUP %d ADDUSER %s", sg->id, sd->pending_user);
+                        g_free(sd->pending_user);
+                        sd->pending_user = NULL;
+                } else
+                        log_message(LOGLVL_ERROR,
+                                        "No skype group with id %s. That's probably a bug.", id);
+        }
         else if (!strcmp(info, "TYPE CUSTOM_GROUP"))
                 /* This one is interesting, query its users. */
@@ -1311 +1330 @@
 static void skype_add_buddy(struct im_connection *ic, char *who, char *group)
 {
+        struct skype_data *sd = ic->proto_data;
         char *nick, *ptr;
 
@@ -1326 +1346 @@
 
                 if (!sg) {
-                        // TODO
                         /* No such group, we need to create it, then have to
                          * add the user once it's created. */
-                        //skype_printf(ic, "CREATE GROUP %s", group);
+                        skype_printf(ic, "CREATE GROUP %s", group);
+                        sd->pending_user = g_strdup(nick);
                 } else {
                         skype_printf(ic, "ALTER GROUP %d ADDUSER %s", sg->id, nick);