gaim/gaim

Fix for yahoo chats crashing occasionally on win32, mostly from Bleeter with a tweak or two from me
oldstatus
2005-09-12, Daniel Atallah
f5354211bf6b
Parents 8fdc5ce5f0e4
Children e452b35472c5
Fix for yahoo chats crashing occasionally on win32, mostly from Bleeter with a tweak or two from me
1 files changed, 10 insertions(+), 10 deletions(-)
  • +10 -10
    src/protocols/yahoo/yahoochat.c
    • --- a/src/protocols/yahoo/yahoochat.c Fri Sep 09 00:02:24 2005 -0400
    +++ b/src/protocols/yahoo/yahoochat.c Mon Sep 12 10:46:47 2005 -0400
    @@ -354,7 +354,6 @@
    GSList *l;
    GList *members = NULL;
    GList *roomies = NULL;
    - GaimConversationUiOps *ops;
    char *room = NULL;
    char *topic = NULL;
    char *someid, *someotherid, *somebase64orhashosomething, *somenegativenumber;
    @@ -453,22 +452,23 @@
    yahoo_chat_add_users(GAIM_CONV_CHAT(c), members);
    }
    - ops = gaim_conversation_get_ui_ops(c);
    - for (l = account->deny; l != NULL; l = l->next) {
    - for (roomies = members; roomies; roomies = roomies->next) {
    - if (!gaim_utf8_strcasecmp((char *)l->data, roomies->data)) {
    - gaim_debug_info("yahoo", "Ignoring room member %s in room %s\n" ,roomies->data, room);
    - gaim_conv_chat_ignore(GAIM_CONV_CHAT(c),roomies->data);
    - ops->chat_update_user((c), roomies->data);
    + if (account->deny && c) {
    + GaimConversationUiOps *ops = gaim_conversation_get_ui_ops(c);
    + for (l = account->deny; l != NULL; l = l->next) {
    + for (roomies = members; roomies; roomies = roomies->next) {
    + if (!gaim_utf8_strcasecmp((char *)l->data, roomies->data)) {
    + gaim_debug_info("yahoo", "Ignoring room member %s in room %s\n" , roomies->data, room ? room : "");
    + gaim_conv_chat_ignore(GAIM_CONV_CHAT(c),roomies->data);
    + ops->chat_update_user(c, roomies->data);
    + }
    }
    }
    }
    g_list_free(roomies);
    g_list_free(members);
    g_free(room);
    - if (topic)
    - g_free(topic);
    + g_free(topic);
    }
    void yahoo_process_chat_exit(GaimConnection *gc, struct yahoo_packet *pkt)