Changeset 2eb4b1f

Timestamp:

2008-02-29T00:34:31Z (16 years ago)

Author:

Miklos Vajna <vmiklos@…>

Branches:

master

Children:

239b036

Parents:

9db0234

Message:

add support for account set -del skype/call
to finish an outgoing call

Location:

skype

Files:

• README (modified) (1 diff)
• skype.c (modified) (5 diffs)
• skyped.py (modified) (1 diff)

skype/README

@@ -238 +238 @@
   communication is encrypted.
 
-- Starting calls: `account set skype/call nick`
+- Managing outgoing calls:
+
+  * `account set skype/call nick`
+  * `account set -del skype/call`
 
 == What needs to be done (aka. TODO)

skype/skype.c

@@ -43 +43 @@
         SKYPE_CALL_MISSED,
         SKYPE_CALL_UNPLACED,
+        SKYPE_CALL_CANCELLED,
         /* This means we are ringing somebody, not somebody rings us. */
         SKYPE_CALL_RINGING_OUT
@@ -80 +81 @@
          * notification about the handle is in a given status. */
         skype_call_status call_status;
+        char *call_id;
         /* Same for file transfers. */
         skype_filetransfer_status filetransfer_status;
@@ -576 +578 @@
                                                 sd->call_status = SKYPE_CALL_MISSED;
                                         }
+                                        else if(!strcmp(info, "STATUS CANCELLED"))
+                                        {
+                                                g_snprintf(buf, 1024, "GET CALL %s PARTNER_HANDLE\n", id);
+                                                skype_write( ic, buf, strlen( buf ) );
+                                                sd->call_status = SKYPE_CALL_CANCELLED;
+                                        }
                                         else if(!strcmp(info, "STATUS UNPLACED"))
+                                        {
+                                                if(sd->call_id)
+                                                        g_free(sd->call_id);
+                                                /* Save the ID for later usage (Cancel/Finish). */
+                                                sd->call_id = g_strdup(id);
                                                 sd->call_status = SKYPE_CALL_UNPLACED;
+                                        }
                                         else if(!strncmp(info, "PARTNER_HANDLE ", 15))
                                         {
@@ -592 +606 @@
                                                                 case SKYPE_CALL_RINGING_OUT:
                                                                         imcb_log(ic, "You are currently ringing the user %s.", info);
+                                                                        break;
+                                                                case SKYPE_CALL_CANCELLED:
+                                                                        imcb_log(ic, "You cancelled the call to the user %s.", info);
                                                                         break;
                                                                 default:
@@ -908 +925 @@
         account_t *acc = set->data;
         struct im_connection *ic = acc->ic;
+        struct skype_data *sd = ic->proto_data;
         char *nick, *ptr, *buf;
-        user_t *u = user_find(acc->irc, value);
-
-        if(!u)
+
+        if(value)
         {
-                imcb_error(ic, "%s - no such nick", value);
-                return(value);
+                user_t *u = user_find(acc->irc, value);
+                /* We are starting a call */
+                if(!u)
+                {
+                        imcb_error(ic, "%s - no such nick", value);
+                        return(value);
+                }
+                nick = g_strdup(u->handle);
+                ptr = strchr(nick, '@');
+                if(ptr)
+                        *ptr = '\0';
+
+                buf = g_strdup_printf("CALL %s", nick);
+                skype_write( ic, buf, strlen( buf ) );
+                g_free(buf);
+                g_free(nick);
         }
-        nick = g_strdup(u->handle);
-        ptr = strchr(nick, '@');
-        if(ptr)
-                *ptr = '\0';
-
-        buf = g_strdup_printf("CALL %s", nick);
-        skype_write( ic, buf, strlen( buf ) );
-        g_free(buf);
-        g_free(nick);
+        else
+        {
+                /* We are ending a call */
+                if(sd->call_id)
+                {
+                        buf = g_strdup_printf("SET CALL %s STATUS FINISHED", sd->call_id);
+                        skype_write( ic, buf, strlen( buf ) );
+                        g_free(buf);
+                }
+                else
+                {
+                        imcb_error(ic, "There are no active calls currently.");
+                }
+        }
         return(value);
 }

skype/skyped.py

@@ -56 +56 @@
                 options.buf = None
         else:
-                input = fd.recv(1024)
+                try:
+                        input = fd.recv(1024)
+                except SysCallError:
+                        return True
                 for i in input.split("\n"):
                         skype.send(i.strip())