Changeset c81d0ef

Timestamp:

2007-10-06T20:28:44Z (17 years ago)

Author:

VMiklos <vmiklos@…>

Branches:

master

Children:

548bf76

Parents:

3ef1910

Message:

receiving group chat messages now works
it's a bit agressive. dialogs are not group chats, but i'll fix it later

File:

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

skype/skype.c

@@ -61 +61 @@
          * we're connected and when we aren't. */
         int bfd;
-        /* When we receive a new message id, we query the handle, then the
-         * body. Store the handle here so that we imcb_buddy_msg() when we got
-         * the body. */
+        /* When we receive a new message id, we query the handle, the body and
+         * the chatname. Store the handle and the body here so that we
+         * imcb_buddy_msg() when we got the chatname. */
         char *handle;
+        char *body;
         /* This is necessary because we send a notification when we get the
          * handle. So we store the state here and then we can send a
@@ -271 +272 @@
                                                  * (1) Request its from field
                                                  * (2) Request its body
+                                                 * (3) Query chatname
                                                  */
                                                 g_snprintf(buf, 1024, "GET CHATMESSAGE %s FROM_HANDLE\n", id);
                                                 skype_write( ic, buf, strlen( buf ) );
                                                 g_snprintf(buf, 1024, "GET CHATMESSAGE %s BODY\n", id);
+                                                skype_write( ic, buf, strlen( buf ) );
+                                                g_snprintf(buf, 1024, "GET CHATMESSAGE %s CHATNAME\n", id);
                                                 skype_write( ic, buf, strlen( buf ) );
                                         }
@@ -301 +305 @@
                                         {
                                                 info += 5;
-                                                if(sd->handle && strlen(info))
+                                                g_free(sd->body);
+                                                sd->body = g_strdup(info);
+                                        }
+                                        else if(!strncmp(info, "CHATNAME ", 9))
+                                        {
+                                                info += 9;
+                                                if(sd->handle && sd->body && strlen(info))
                                                 {
-                                                        /* New body, we have everything to use imcb_buddy_msg() now! */
-                                                        imcb_buddy_msg(ic, sd->handle, info, 0, 0);
+                                                        struct groupchat *gc = skype_chat_by_name(ic, info);
+                                                        if(!gc)
+                                                        {
+                                                                printf("gc is null, id is '%s'\n", info);
+                                                                /* Private message */
+                                                                imcb_buddy_msg(ic, sd->handle, sd->body, 0, 0);
+                                                        }
+                                                        else
+                                                        {
+                                                                printf("gc is not null, id is '%s'\n", info);
+                                                                imcb_chat_msg(gc, sd->handle, sd->body, 0, 0);
+                                                        }
                                                 }
                                         }
@@ -572 +592 @@
 }
 
-int skype_chat_msg( struct groupchat *c, char *message, int flags )
+void skype_chat_msg( struct groupchat *c, char *message, int flags )
 {
         // TODO: this is just here atm to prevent a segfault