Changeset 85341dd

Timestamp:

2012-01-27T23:25:13Z (13 years ago)

Author:

Miklos Vajna <vmiklos@…>

Branches:

master

Children:

e618d85

Parents:

7c2daf5f

Message:

skype: properly display multiple about lines

Previously we printed only the last one

File:

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

protocols/skype/skype.c

@@ -2 +2 @@
  *  skype.c - Skype plugin for BitlBee
  *
- *  Copyright (c) 2007, 2008, 2009, 2010, 2011 by Miklos Vajna <vmiklos@frugalware.org>
+ *  Copyright (c) 2007, 2008, 2009, 2010, 2011, 2012 by Miklos Vajna <vmiklos@frugalware.org>
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -386 +386 @@
         else if (!strncmp(ptr, "LASTONLINETIMESTAMP ", 20))
                 sd->info_seen = g_strdup(ptr + 20);
-        else if (!strncmp(ptr, "BIRTHDAY ", 9))
-                sd->info_birthday = g_strdup(ptr + 9);
         else if (!strncmp(ptr, "SEX ", 4))
                 sd->info_sex = g_strdup(ptr + 4);
@@ -401 +399 @@
                 sd->info_homepage = g_strdup(ptr + 9);
         else if (!strncmp(ptr, "ABOUT ", 6)) {
-                sd->info_about = g_strdup(ptr + 6);
+                /* Support multiple about lines. */
+                if (!sd->info_about)
+                        sd->info_about = g_strdup(ptr + 6);
+                else {
+                        GString *st = g_string_new(sd->info_about);
+                        g_string_append_printf(st, "\n%s", ptr + 6);
+                        g_free(sd->info_about);
+                        sd->info_about = g_strdup(st->str);
+                        g_string_free(st, TRUE);
+                }
+        }
+        else if (!strncmp(ptr, "BIRTHDAY ", 9)) {
+                sd->info_birthday = g_strdup(ptr + 9);
 
                 GString *st = g_string_new("Contact Information\n");
@@ -1461 +1471 @@
         skype_printf(ic, "GET USER %s TIMEZONE\n", nick);
         skype_printf(ic, "GET USER %s LASTONLINETIMESTAMP\n", nick);
-        skype_printf(ic, "GET USER %s BIRTHDAY\n", nick);
         skype_printf(ic, "GET USER %s SEX\n", nick);
         skype_printf(ic, "GET USER %s LANGUAGE\n", nick);
@@ -1469 +1478 @@
         skype_printf(ic, "GET USER %s HOMEPAGE\n", nick);
         skype_printf(ic, "GET USER %s ABOUT\n", nick);
+        /*
+         * Hack: we query the bithday property which is always a single line,
+         * so we can send the collected properties to the user when we have
+         * this one.
+         */
+        skype_printf(ic, "GET USER %s BIRTHDAY\n", nick);
 }