Changeset 4346c3f4 for protocols

Timestamp:

2010-07-16T23:31:55Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

e437366

Parents:

3709301 (diff), ef14a83 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merging mainline.

Location:

protocols

Files:

• oscar/oscar.c (modified) (1 diff)
• twitter/twitter_lib.c (modified) (4 diffs)

protocols/oscar/oscar.c

@@ -2531 +2531 @@
         struct groupchat *c;
         
-        chatname = g_strdup_printf("%s%s_%d", isdigit(*ic->acc->user) ? "icq_" : "",
+        chatname = g_strdup_printf("%s%s%d", isdigit(*ic->acc->user) ? "icq" : "",
                                    ic->acc->user, chat_id++);
         

protocols/twitter/twitter_lib.c

@@ -36 +36 @@
 #include <errno.h>
 
+/* GLib < 2.12.0 doesn't have g_ascii_strtoll(), work around using system strtoll(). */
+/* GLib < 2.12.4 can be buggy: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=488013 */
+#if !GLIB_CHECK_VERSION(2,12,5)
+#include <stdlib.h>
+#include <limits.h>
+#define g_ascii_strtoll strtoll
+#endif
+
 #define TXL_STATUS 1
 #define TXL_USER 2
@@ -66 +74 @@
 static void txu_free(struct twitter_xml_user *txu)
 {
+        if (txu == NULL)
+                return;
         g_free(txu->name);
         g_free(txu->screen_name);
@@ -89 +99 @@
 {
         GSList *l;
+        if (txl == NULL)
+                return;
         for ( l = txl->list; l ; l = g_slist_next(l) )
                 if (txl->type == TXL_STATUS)
@@ -473 +485 @@
         {
                 status = l->data;
+                if (status->user == NULL || status->text == NULL)
+                        continue;
+
                 twitter_add_buddy(ic, status->user->screen_name, status->user->name);