Changeset 7613670

Timestamp:

2007-09-03T22:22:55Z (17 years ago)

Author:

VMiklos <vmiklos@…>

Branches:

master

Children:

dab0f8a

Parents:

02a531b

Message:

handle the case when the input is a multiline message

Location:

skype

Files:

• skype.c (modified) (3 diffs)
• skyped.py (modified) (3 diffs)

skype/skype.c

@@ -261 +261 @@
                                                  * when we got the message's
                                                  * body. */
+                                                g_free(sd->handle);
                                                 sd->handle = g_strdup_printf("%s@skype.com", info);
                                         }
@@ -270 +271 @@
                                                         /* New body, we have everything to use imcb_buddy_msg() now! */
                                                         imcb_buddy_msg(ic, sd->handle, info, 0, 0);
-                                                        g_free(sd->handle);
-                                                        sd->handle = NULL;
                                                 }
                                         }
@@ -380 +379 @@
 
         g_free(sd->username);
+        g_free(sd->handle);
         g_free(sd);
         ic->proto_data = NULL;

skype/skyped.py

@@ -53 +53 @@
         for i in input.split("\n"):
                 if i:
-                        fd.send((skype.send(i.strip()) + "\n").encode(locale.getdefaultlocale()[1]))
+                        for j in skype.send(i.strip()):
+                                fd.send((j + "\n").encode(locale.getdefaultlocale()[1]))
         return True
 
@@ -85 +86 @@
 
                 reply = self.send('NAME ' + CLIENT_NAME)
-                if reply != 'OK':
+                if reply[0] != 'OK':
                         sys.exit('Could not bind to Skype client')
 
@@ -117 +118 @@
                                         pass
                                 mainloop.quit()
-                dprint('<< ' + reply)
+                if "\n" in reply:
+                        # crappy skype prefixes only the first line for
+                        # multiline messages so we need to do so for the other
+                        # lines, too. this is something like:
+                        # 'CHATMESSAGE id BODY first line\nsecond line' ->
+                        # 'CHATMESSAGE id BODY first line\nCHATMESSAGE id BODY second line'
+                        prefix = " ".join(reply.split(" ")[:3])
+                        reply = ["%s %s" % (prefix, i) for i in " ".join(reply.split(" ")[3:]).split("\n")]
+                else:
+                        reply = [reply]
+                for i in reply:
+                        dprint('<< ' + i)
                 return reply