Changeset a3d6427

Timestamp:

2007-08-20T17:25:32Z (17 years ago)

Author:

VMiklos <vmiklos@…>

Branches:

master

Children:

218ffbd

Parents:

39a0d64

Message:

bugfix: we can't join to &bitlbee twice

Location:

skype

Files:

• README (modified) (1 diff)
• skype.c (modified) (4 diffs)

skype/README

@@ -80 +80 @@
 == What needs to be done (aka. TODO)
 
-- we can't ourselves join to &bitlbee (ignore such a message from skype)
-
 - mark received messages as read so that skype won't say there are unread messages
 

skype/skype.c

@@ -15 +15 @@
 {
         struct im_connection *ic;
+        char *username;
         int fd;
         char *txq;
@@ -108 +109 @@
                                 ptr = strchr(++user, ' ');
                                 *ptr = '\0';
-                                ptr = g_strdup_printf("%s@skype.com", user);
-                                imcb_add_buddy(ic, ptr, NULL);
-                                if(strcmp(status, "OFFLINE") != 0)
-                                        flags |= OPT_LOGGED_IN;
-                                if(strcmp(status, "ONLINE") != 0 && strcmp(status, "SKYPEME") != 0)
-                                        flags |= OPT_AWAY;
-                                imcb_buddy_status(ic, ptr, flags, NULL, NULL);
-                                g_free(ptr);
+                                if(strcmp(user, sd->username) != 0)
+                                {
+                                        ptr = g_strdup_printf("%s@skype.com", user);
+                                        imcb_add_buddy(ic, ptr, NULL);
+                                        if(strcmp(status, "OFFLINE") != 0)
+                                                flags |= OPT_LOGGED_IN;
+                                        if(strcmp(status, "ONLINE") != 0 && strcmp(status, "SKYPEME") != 0)
+                                                flags |= OPT_AWAY;
+                                        imcb_buddy_status(ic, ptr, flags, NULL, NULL);
+                                        g_free(ptr);
+                                }
                         }
                         else if(!strncmp(line, "CHATMESSAGE ", 12))
@@ -221 +225 @@
         imcb_buddy_status(ic, "test@skype.com", OPT_LOGGED_IN, NULL, NULL);
         imcb_buddy_msg(ic, "test@skype.com", "test from skype plugin", 0, 0);*/
+        sd->username = g_strdup( acc->user );
 
         sd->ic = ic;
@@ -228 +233 @@
 {
         struct skype_data *sd = ic->proto_data;
+        g_free(sd->username);
         g_free(sd);
 }