Changeset d87daf3

Timestamp:

2008-02-29T01:40:12Z (17 years ago)

Author:

Miklos Vajna <vmiklos@…>

Branches:

master

Children:

e0074cb

Parents:

a92fb07

Message:

replace the fake SKYPE_CALL_RINGING_OUT with a proper call_out variable

File:

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

skype/skype.c

@@ -42 +42 @@
         SKYPE_CALL_RINGING = 1,
         SKYPE_CALL_MISSED,
-        SKYPE_CALL_UNPLACED,
         SKYPE_CALL_CANCELLED,
         SKYPE_CALL_FINISHED,
-        SKYPE_CALL_REFUSED,
-        /* This means we are ringing somebody, not somebody rings us. */
-        SKYPE_CALL_RINGING_OUT
+        SKYPE_CALL_REFUSED
 } skype_call_status;
 
@@ -85 +82 @@
         char *call_id;
         char *call_duration;
+        /* If the call is outgoing or not */
+        int call_out;
         /* Same for file transfers. */
         skype_filetransfer_status filetransfer_status;
@@ -570 +569 @@
                                                 g_snprintf(buf, 1024, "GET CALL %s PARTNER_HANDLE\n", id);
                                                 skype_write( ic, buf, strlen( buf ) );
-                                                if(sd->call_status != SKYPE_CALL_UNPLACED)
-                                                        sd->call_status = SKYPE_CALL_RINGING;
-                                                else
-                                                        sd->call_status = SKYPE_CALL_RINGING_OUT;
+                                                sd->call_status = SKYPE_CALL_RINGING;
                                         }
                                         else if(!strcmp(info, "STATUS MISSED"))
@@ -583 +579 @@
                                         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;
+                                                        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 FINISHED"))
@@ -605 +601 @@
                                                 /* Save the ID for later usage (Cancel/Finish). */
                                                 sd->call_id = g_strdup(id);
-                                                sd->call_status = SKYPE_CALL_UNPLACED;
+                                                sd->call_out = TRUE;
                                         }
                                         else if(!strncmp(info, "DURATION ", 9))
@@ -620 +616 @@
                                                         {
                                                                 case SKYPE_CALL_RINGING:
-                                                                        imcb_log(ic, "The user %s is currently ringing you.", info);
+                                                                        if(sd->call_out)
+                                                                                imcb_log(ic, "You are currently ringing the user %s.", info);
+                                                                        else
+                                                                                imcb_log(ic, "The user %s is currently ringing you.", info);
                                                                         break;
                                                                 case SKYPE_CALL_MISSED:
                                                                         imcb_log(ic, "You have missed a call from user %s.", info);
                                                                         break;
-                                                                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);
+                                                                        sd->call_status = 0;
+                                                                        sd->call_out = FALSE;
                                                                         break;
                                                                 case SKYPE_CALL_REFUSED:
-                                                                        imcb_log(ic, "The user %s refused the call.", info);
+                                                                        if(sd->call_out)
+                                                                                imcb_log(ic, "The user %s refused the call.", info);
+                                                                        else
+                                                                                imcb_log(ic, "You refused the call from user %s.", info);
+                                                                        sd->call_out = FALSE;
                                                                         break;
                                                                 case SKYPE_CALL_FINISHED:
                                                                         if(sd->call_duration)
-                                                                        {
                                                                                 imcb_log(ic, "You finished the call to the user %s (duration: %s seconds).", info, sd->call_duration);
-                                                                        }
                                                                         else
-                                                                        {
                                                                                 imcb_log(ic, "You finished the call to the user %s.", info);
-                                                                        }
+                                                                        sd->call_out = FALSE;
                                                                         break;
                                                                 default: