Changeset e4f5ca8 for protocols/skype/skype.c

Timestamp:

2013-02-10T12:48:32Z (12 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

12f500f, 65a5d15

Parents:

be98957 (diff), 875ba16 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge from vmiklos. Adds a "group info" command to list members of a group.

File:

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

protocols/skype/skype.c

@@ -46 +46 @@
 enum {
         SKYPE_FILETRANSFER_NEW = 1,
+        SKYPE_FILETRANSFER_TRANSFERRING,
+        SKYPE_FILETRANSFER_COMPLETED,
         SKYPE_FILETRANSFER_FAILED
 };
@@ -81 +83 @@
         /* Same for file transfers. */
         int filetransfer_status;
+        /* Path of the file being transferred. */
+        char *filetransfer_path;
         /* Using /j #nick we want to have a groupchat with two people. Usually
          * not (default). */
@@ -783 +787 @@
                         id);
                 sd->filetransfer_status = SKYPE_FILETRANSFER_FAILED;
+        } else if (!strcmp(info, "STATUS COMPLETED")) {
+                skype_printf(ic, "GET FILETRANSFER %s PARTNER_HANDLE\n", id);
+                sd->filetransfer_status = SKYPE_FILETRANSFER_COMPLETED;
+        } else if (!strcmp(info, "STATUS TRANSFERRING")) {
+                skype_printf(ic, "GET FILETRANSFER %s PARTNER_HANDLE\n", id);
+                sd->filetransfer_status = SKYPE_FILETRANSFER_TRANSFERRING;
+        } else if (!strncmp(info, "FILEPATH ", 9)) {
+                info += 9;
+                sd->filetransfer_path = g_strdup(info);
         } else if (!strncmp(info, "PARTNER_HANDLE ", 15)) {
                 info += 15;
@@ -795 +808 @@
                         imcb_log(ic, "Failed to transfer file from user %s.",
                                 info);
+                        break;
+                case SKYPE_FILETRANSFER_COMPLETED:
+                        imcb_log(ic, "File transfer from user %s completed.", info);
+                        break;
+                case SKYPE_FILETRANSFER_TRANSFERRING:
+                        if (sd->filetransfer_path) {
+                                imcb_log(ic, "File transfer from user %s started, saving to %s.", info, sd->filetransfer_path);
+                                g_free(sd->filetransfer_path);
+                                sd->filetransfer_path = NULL;
+                        }
                         break;
                 }