Changeset 9db0234

Timestamp:

2008-02-29T00:09:22Z (16 years ago)

Author:

Miklos Vajna <vmiklos@…>

Branches:

master

Children:

2eb4b1f

Parents:

123e45a

Message:

finetune ringing message
old:
the user foo is ringing you

new:
you are ringing the user foo
or
the user foo is ringing you

File:

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

skype/skype.c

@@ -41 +41 @@
 {
         SKYPE_CALL_RINGING = 1,
-        SKYPE_CALL_MISSED
+        SKYPE_CALL_MISSED,
+        SKYPE_CALL_UNPLACED,
+        /* This means we are ringing somebody, not somebody rings us. */
+        SKYPE_CALL_RINGING_OUT
 } skype_call_status;
 
@@ -562 +565 @@
                                                 g_snprintf(buf, 1024, "GET CALL %s PARTNER_HANDLE\n", id);
                                                 skype_write( ic, buf, strlen( buf ) );
-                                                sd->call_status = SKYPE_CALL_RINGING;
+                                                if(sd->call_status != SKYPE_CALL_UNPLACED)
+                                                        sd->call_status = SKYPE_CALL_RINGING;
+                                                else
+                                                        sd->call_status = SKYPE_CALL_RINGING_OUT;
                                         }
                                         else if(!strcmp(info, "STATUS MISSED"))
@@ -570 +576 @@
                                                 sd->call_status = SKYPE_CALL_MISSED;
                                         }
+                                        else if(!strcmp(info, "STATUS UNPLACED"))
+                                                sd->call_status = SKYPE_CALL_UNPLACED;
                                         else if(!strncmp(info, "PARTNER_HANDLE ", 15))
                                         {
@@ -581 +589 @@
                                                                 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;
+                                                                default:
+                                                                        /* Don't be noisy, ignore other statuses for now. */
                                                                         break;
                                                         }
@@ -911 +925 @@
         g_free(buf);
         g_free(nick);
-        imcb_log(ic, "Ringing the user %s.", value);
         return(value);
 }