Ignore:
Timestamp:
2006-05-26T15:02:41Z (15 years ago)
Author:
Jelmer Vernooij <jelmer@…>
Branches:
master
Children:
84eddee
Parents:
1cda4f3 (diff), 6048744 (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:

[merge] Wilmer

File:
1 edited

Legend:

Unmodified
Added
Removed
  • protocols/oscar/oscar.c

    r1cda4f3 r6fb6410  
    138138        int i, j;
    139139        char *x = strchr(name, '-');
    140         if (!x) return NULL;
     140        if (!x) return g_strdup(name);
    141141        x = strchr(++x, '-');
    142         if (!x) return NULL;
     142        if (!x) return g_strdup(name);
    143143        tmp = g_strdup(++x);
    144144
     
    26072607        int ret;
    26082608        static int chat_id = 0;
    2609         char * chatname = g_new0(char, strlen(gc->username)+4);
    2610        
    2611         g_snprintf(chatname, strlen(gc->username) + 4, "%s%d", gc->username, chat_id++);
     2609        char * chatname;
     2610       
     2611        chatname = g_strdup_printf("%s%d", gc->username, chat_id++);
    26122612 
    26132613        ret = oscar_chat_join(gc, chatname);
Note: See TracChangeset for help on using the changeset viewer.