Mercurial > pidgin

comparison libpurple/protocols/jabber/presence.c @ 26752:50db9eb2499a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tighter scoping++
author Paul Aurich <paul@darkrain42.org>
date Wed, 29 Apr 2009 05:37:58 +0000
parents 3912f55a1633
children 09dc63a697e1
comparison
equal deleted inserted replaced
26751:c33f21f0a73e 26752:50db9eb2499a
602 idle += offset; 602 idle += offset;
603 } 603 }
604 604
605 if(jid->node && (chat = jabber_chat_find(js, jid->node, jid->domain))) { 605 if(jid->node && (chat = jabber_chat_find(js, jid->node, jid->domain))) {
606 static int i = 1; 606 static int i = 1;
607 char *room_jid = g_strdup_printf("%s@%s", jid->node, jid->domain);
608 607
609 if(state == JABBER_BUDDY_STATE_ERROR) { 608 if(state == JABBER_BUDDY_STATE_ERROR) {
610 char *title, *msg = jabber_parse_error(js, packet, NULL); 609 char *title, *msg = jabber_parse_error(js, packet, NULL);
611 610
612 if (!chat->conv) { 611 if (!chat->conv) {
624 if (g_hash_table_size(chat->members) == 0) 623 if (g_hash_table_size(chat->members) == 0)
625 /* Only destroy the chat if the error happened while joining */ 624 /* Only destroy the chat if the error happened while joining */
626 jabber_chat_destroy(chat); 625 jabber_chat_destroy(chat);
627 jabber_id_free(jid); 626 jabber_id_free(jid);
628 g_free(status); 627 g_free(status);
629 g_free(room_jid);
630 g_free(avatar_hash); 628 g_free(avatar_hash);
631 return; 629 return;
632 } 630 }
633 631
634 632
641 if (chat->left && 639 if (chat->left &&
642 jid->resource && chat->handle && !strcmp(jid->resource, chat->handle)) 640 jid->resource && chat->handle && !strcmp(jid->resource, chat->handle))
643 jabber_chat_destroy(chat); 641 jabber_chat_destroy(chat);
644 jabber_id_free(jid); 642 jabber_id_free(jid);
645 g_free(status); 643 g_free(status);
646 g_free(room_jid);
647 g_free(avatar_hash); 644 g_free(avatar_hash);
648 return; 645 return;
649 } 646 }
650 647
651 jabber_buddy_remove_resource(jb, jid->resource); 648 jabber_buddy_remove_resource(jb, jid->resource);
697 jabber_chat_remove_handle(chat, jid->resource); 694 jabber_chat_remove_handle(chat, jid->resource);
698 } 695 }
699 } 696 }
700 } else { 697 } else {
701 if(!chat->conv) { 698 if(!chat->conv) {
699 char *room_jid = g_strdup_printf("%s@%s", jid->node, jid->domain);
702 chat->id = i++; 700 chat->id = i++;
703 chat->muc = muc; 701 chat->muc = muc;
704 chat->conv = serv_got_joined_chat(js->gc, chat->id, room_jid); 702 chat->conv = serv_got_joined_chat(js->gc, chat->id, room_jid);
705 purple_conv_chat_set_nick(PURPLE_CONV_CHAT(chat->conv), chat->handle); 703 purple_conv_chat_set_nick(PURPLE_CONV_CHAT(chat->conv), chat->handle);
706 704
707 jabber_chat_disco_traffic(chat); 705 jabber_chat_disco_traffic(chat);
706 g_free(room_jid);
708 } 707 }
709 708
710 jabber_buddy_track_resource(jb, jid->resource, priority, state, 709 jabber_buddy_track_resource(jb, jid->resource, priority, state,
711 status); 710 status);
712 711
717 real_jid, flags, !delayed); 716 real_jid, flags, !delayed);
718 else 717 else
719 purple_conv_chat_user_set_flags(PURPLE_CONV_CHAT(chat->conv), jid->resource, 718 purple_conv_chat_user_set_flags(PURPLE_CONV_CHAT(chat->conv), jid->resource,
720 flags); 719 flags);
721 } 720 }
722 g_free(room_jid);
723 } else { 721 } else {
724 buddy_name = g_strdup_printf("%s%s%s", jid->node ? jid->node : "", 722 buddy_name = g_strdup_printf("%s%s%s", jid->node ? jid->node : "",
725 jid->node ? "@" : "", jid->domain); 723 jid->node ? "@" : "", jid->domain);
726 if((b = purple_find_buddy(js->gc->account, buddy_name)) == NULL) { 724 if((b = purple_find_buddy(js->gc->account, buddy_name)) == NULL) {
727 if(!jid->node || strcmp(jid->node,js->user->node) || strcmp(jid->domain,js->user->domain)) { 725 if(!jid->node || strcmp(jid->node,js->user->node) || strcmp(jid->domain,js->user->domain)) {