Ignore:
Timestamp:
2010-07-16T23:31:55Z (11 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.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • protocols/twitter/twitter_lib.c

    r3709301 r4346c3f4  
    3636#include <errno.h>
    3737
     38/* GLib < 2.12.0 doesn't have g_ascii_strtoll(), work around using system strtoll(). */
     39/* GLib < 2.12.4 can be buggy: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=488013 */
     40#if !GLIB_CHECK_VERSION(2,12,5)
     41#include <stdlib.h>
     42#include <limits.h>
     43#define g_ascii_strtoll strtoll
     44#endif
     45
    3846#define TXL_STATUS 1
    3947#define TXL_USER 2
     
    6674static void txu_free(struct twitter_xml_user *txu)
    6775{
     76        if (txu == NULL)
     77                return;
    6878        g_free(txu->name);
    6979        g_free(txu->screen_name);
     
    8999{
    90100        GSList *l;
     101        if (txl == NULL)
     102                return;
    91103        for ( l = txl->list; l ; l = g_slist_next(l) )
    92104                if (txl->type == TXL_STATUS)
     
    473485        {
    474486                status = l->data;
     487                if (status->user == NULL || status->text == NULL)
     488                        continue;
     489
    475490                twitter_add_buddy(ic, status->user->screen_name, status->user->name);
    476491               
Note: See TracChangeset for help on using the changeset viewer.