Changeset 75610c3


Ignore:
Timestamp:
2010-05-09T00:40:54Z (9 years ago)
Author:
Wilmer van der Gaast <wilmer@…>
Branches:
master
Children:
bd5eee3
Parents:
36577aa
Message:

Fixed up OSCAR to work with the new way of setting up groupchats.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • protocols/oscar/oscar.c

    r36577aa r75610c3  
    799799        chatcon = find_oscar_chat_by_conn(ic, fr->conn);
    800800        chatcon->id = id;
    801         chatcon->cnv = imcb_chat_new(ic, chatcon->show);
     801        chatcon->cnv = bee_chat_by_title(ic->bee, ic, chatcon->show);
     802        if (chatcon->cnv == NULL)
     803                chatcon->cnv = imcb_chat_new(ic, chatcon->show);
    802804        chatcon->cnv->data = chatcon;
    803805
     
    26512653        static int chat_id = 0;
    26522654        char * chatname;
    2653        
    2654         chatname = g_strdup_printf("%s%d", ic->acc->user, chat_id++);
    2655  
     2655        struct groupchat *c;
     2656       
     2657        chatname = g_strdup_printf("%s%s_%d", isdigit(*ic->acc->user) ? "icq_" : "",
     2658                                   ic->acc->user, chat_id++);
     2659       
     2660        c = imcb_chat_new(ic, chatname);
     2661
    26562662        ret = oscar_chat_join(ic, chatname, NULL, NULL);
    26572663
Note: See TracChangeset for help on using the changeset viewer.