comparison pidgin/gtkblist.c @ 32702:78fae2fc38d5

More code changed to use the accessor functions.
author andrew.victor@mxit.com
date Sat, 01 Oct 2011 15:50:20 +0000
parents 20dfcc9aa471
children 10e5000326a5
comparison
equal deleted inserted replaced
32701:35c1739709df 32702:78fae2fc38d5
4588 4588
4589 static void 4589 static void
4590 conversation_updated_cb(PurpleConversation *conv, PurpleConvUpdateType type, 4590 conversation_updated_cb(PurpleConversation *conv, PurpleConvUpdateType type,
4591 PidginBuddyList *gtkblist) 4591 PidginBuddyList *gtkblist)
4592 { 4592 {
4593 PurpleAccount *account = purple_conversation_get_account(conv);
4593 GList *convs = NULL; 4594 GList *convs = NULL;
4594 GList *ims, *chats; 4595 GList *ims, *chats;
4595 GList *l = NULL; 4596 GList *l = NULL;
4596 4597
4597 if (type != PURPLE_CONV_UPDATE_UNSEEN) 4598 if (type != PURPLE_CONV_UPDATE_UNSEEN)
4598 return; 4599 return;
4599 4600
4600 if(conv->account != NULL && conv->name != NULL) { 4601 if(account != NULL && purple_conversation_get_name(conv) != NULL) {
4601 PurpleBuddy *buddy = purple_find_buddy(conv->account, conv->name); 4602 PurpleBuddy *buddy = purple_find_buddy(account, purple_conversation_get_name(conv));
4602 if(buddy != NULL) 4603 if(buddy != NULL)
4603 pidgin_blist_update_buddy(NULL, (PurpleBlistNode *)buddy, TRUE); 4604 pidgin_blist_update_buddy(NULL, (PurpleBlistNode *)buddy, TRUE);
4604 } 4605 }
4605 4606
4606 if (gtkblist->menutrayicon) { 4607 if (gtkblist->menutrayicon) {
4705 } 4706 }
4706 4707
4707 static void 4708 static void
4708 conversation_created_cb(PurpleConversation *conv, PidginBuddyList *gtkblist) 4709 conversation_created_cb(PurpleConversation *conv, PidginBuddyList *gtkblist)
4709 { 4710 {
4710 switch (conv->type) { 4711 PurpleAccount *account = purple_conversation_get_account(conv);
4712
4713 switch (purple_conversation_get_type(conv)) {
4711 case PURPLE_CONV_TYPE_IM: 4714 case PURPLE_CONV_TYPE_IM:
4712 { 4715 {
4713 GSList *buddies = purple_find_buddies(conv->account, conv->name); 4716 GSList *buddies = purple_find_buddies(account, purple_conversation_get_name(conv));
4714 while (buddies) { 4717 while (buddies) {
4715 PurpleBlistNode *buddy = buddies->data; 4718 PurpleBlistNode *buddy = buddies->data;
4716 struct _pidgin_blist_node *ui = buddy->ui_data; 4719 struct _pidgin_blist_node *ui = buddy->ui_data;
4717 buddies = g_slist_delete_link(buddies, buddies); 4720 buddies = g_slist_delete_link(buddies, buddies);
4718 if (!ui) 4721 if (!ui)
4729 } 4732 }
4730 } 4733 }
4731 break; 4734 break;
4732 case PURPLE_CONV_TYPE_CHAT: 4735 case PURPLE_CONV_TYPE_CHAT:
4733 { 4736 {
4734 PurpleChat *chat = purple_blist_find_chat(conv->account, conv->name); 4737 PurpleChat *chat = purple_blist_find_chat(account, purple_conversation_get_name(conv));
4735 struct _pidgin_blist_node *ui; 4738 struct _pidgin_blist_node *ui;
4736 if (!chat) 4739 if (!chat)
4737 break; 4740 break;
4738 ui = chat->node.ui_data; 4741 ui = chat->node.ui_data;
4739 if (!ui) 4742 if (!ui)