Mercurial > pidgin.yaz
comparison pidgin/gtkconv.c @ 32804:b6276b10cb10
Use the PurpleBuddy accessor functions.
| author | andrew.victor@mxit.com |
|---|---|
| date | Sun, 30 Oct 2011 21:46:51 +0000 |
| parents | 3e7a7e14af62 |
| children | 76096c42f558 |
comparison
equal
deleted
inserted
replaced
| 32800:46177ee4af40 | 32804:b6276b10cb10 |
|---|---|
| 855 else if (PURPLE_BLIST_NODE_IS_BUDDY(node)) | 855 else if (PURPLE_BLIST_NODE_IS_BUDDY(node)) |
| 856 buddy = (PurpleBuddy *)node; | 856 buddy = (PurpleBuddy *)node; |
| 857 else | 857 else |
| 858 return; | 858 return; |
| 859 | 859 |
| 860 if (strcmp(convprotocol, purple_account_get_protocol_id(buddy->account))) | 860 if (strcmp(convprotocol, purple_account_get_protocol_id(purple_buddy_get_account(buddy)))) |
| 861 { | 861 { |
| 862 purple_notify_error(PIDGIN_CONVERSATION(info->conv), NULL, | 862 purple_notify_error(PIDGIN_CONVERSATION(info->conv), NULL, |
| 863 _("That buddy is not on the same protocol as this " | 863 _("That buddy is not on the same protocol as this " |
| 864 "chat."), NULL); | 864 "chat."), NULL); |
| 865 success = FALSE; | 865 success = FALSE; |
| 4528 model = gtk_tree_view_get_model(GTK_TREE_VIEW(gtkconv->u.chat->list)); | 4528 model = gtk_tree_view_get_model(GTK_TREE_VIEW(gtkconv->u.chat->list)); |
| 4529 | 4529 |
| 4530 if (!gtk_tree_model_get_iter_first(GTK_TREE_MODEL(model), &iter)) | 4530 if (!gtk_tree_model_get_iter_first(GTK_TREE_MODEL(model), &iter)) |
| 4531 return; | 4531 return; |
| 4532 | 4532 |
| 4533 normalized_name = g_strdup(purple_normalize(account, buddy->name)); | 4533 normalized_name = g_strdup(purple_normalize(account, purple_buddy_get_name(buddy))); |
| 4534 | 4534 |
| 4535 do { | 4535 do { |
| 4536 char *name; | 4536 char *name; |
| 4537 | 4537 |
| 4538 gtk_tree_model_get(model, &iter, CHAT_USERS_NAME_COLUMN, &name, -1); | 4538 gtk_tree_model_get(model, &iter, CHAT_USERS_NAME_COLUMN, &name, -1); |
| 4631 model = gtk_tree_view_get_model(GTK_TREE_VIEW(PIDGIN_CONVERSATION(conv)->u.chat->list)); | 4631 model = gtk_tree_view_get_model(GTK_TREE_VIEW(PIDGIN_CONVERSATION(conv)->u.chat->list)); |
| 4632 | 4632 |
| 4633 if (!gtk_tree_model_get_iter_first(GTK_TREE_MODEL(model), &iter)) | 4633 if (!gtk_tree_model_get_iter_first(GTK_TREE_MODEL(model), &iter)) |
| 4634 return; | 4634 return; |
| 4635 | 4635 |
| 4636 normalized_name = g_strdup(purple_normalize(purple_conversation_get_account(conv), buddy->name)); | 4636 normalized_name = g_strdup(purple_normalize(purple_conversation_get_account(conv), purple_buddy_get_name(buddy))); |
| 4637 | 4637 |
| 4638 do { | 4638 do { |
| 4639 char *name; | 4639 char *name; |
| 4640 | 4640 |
| 4641 gtk_tree_model_get(model, &iter, CHAT_USERS_NAME_COLUMN, &name, -1); | 4641 gtk_tree_model_get(model, &iter, CHAT_USERS_NAME_COLUMN, &name, -1); |
| 5563 | 5563 |
| 5564 cn = PURPLE_BLIST_NODE(c); | 5564 cn = PURPLE_BLIST_NODE(c); |
| 5565 for (bn = purple_blist_node_get_first_child(cn); bn; bn = purple_blist_node_get_sibling_next(bn)) { | 5565 for (bn = purple_blist_node_get_first_child(cn); bn; bn = purple_blist_node_get_sibling_next(bn)) { |
| 5566 PurpleBuddy *b = PURPLE_BUDDY(bn); | 5566 PurpleBuddy *b = PURPLE_BUDDY(bn); |
| 5567 PurpleConversation *conv; | 5567 PurpleConversation *conv; |
| 5568 if ((conv = purple_find_conversation_with_account(PURPLE_CONV_TYPE_IM, b->name, b->account))) { | 5568 if ((conv = purple_find_conversation_with_account(PURPLE_CONV_TYPE_IM, purple_buddy_get_name(b), purple_buddy_get_account(b)))) { |
| 5569 if (PIDGIN_CONVERSATION(conv)) | 5569 if (PIDGIN_CONVERSATION(conv)) |
| 5570 return PIDGIN_CONVERSATION(conv); | 5570 return PIDGIN_CONVERSATION(conv); |
| 5571 } | 5571 } |
| 5572 } | 5572 } |
| 5573 | 5573 |
| 7961 | 7961 |
| 7962 for (; node; node = node->next) | 7962 for (; node; node = node->next) |
| 7963 { | 7963 { |
| 7964 PurpleBuddy *buddy = (PurpleBuddy*)node; | 7964 PurpleBuddy *buddy = (PurpleBuddy*)node; |
| 7965 PurpleConversation *conv; | 7965 PurpleConversation *conv; |
| 7966 conv = purple_find_conversation_with_account(PURPLE_CONV_TYPE_IM, buddy->name, buddy->account); | 7966 conv = purple_find_conversation_with_account(PURPLE_CONV_TYPE_IM, purple_buddy_get_name(buddy), purple_buddy_get_account(buddy)); |
| 7967 if (conv) | 7967 if (conv) |
| 7968 return PIDGIN_CONVERSATION(conv); | 7968 return PIDGIN_CONVERSATION(conv); |
| 7969 } | 7969 } |
| 7970 return NULL; | 7970 return NULL; |
| 7971 } | 7971 } |
| 8064 static void | 8064 static void |
| 8065 update_buddy_idle_changed(PurpleBuddy *buddy, gboolean old, gboolean newidle) | 8065 update_buddy_idle_changed(PurpleBuddy *buddy, gboolean old, gboolean newidle) |
| 8066 { | 8066 { |
| 8067 PurpleConversation *conv; | 8067 PurpleConversation *conv; |
| 8068 | 8068 |
| 8069 conv = purple_find_conversation_with_account(PURPLE_CONV_TYPE_IM, buddy->name, buddy->account); | 8069 conv = purple_find_conversation_with_account(PURPLE_CONV_TYPE_IM, purple_buddy_get_name(buddy), purple_buddy_get_account(buddy)); |
| 8070 if (conv) | 8070 if (conv) |
| 8071 pidgin_conv_update_fields(conv, PIDGIN_CONV_TAB_ICON); | 8071 pidgin_conv_update_fields(conv, PIDGIN_CONV_TAB_ICON); |
| 8072 } | 8072 } |
| 8073 | 8073 |
| 8074 static void | 8074 static void |
| 8075 update_buddy_icon(PurpleBuddy *buddy) | 8075 update_buddy_icon(PurpleBuddy *buddy) |
| 8076 { | 8076 { |
| 8077 PurpleConversation *conv; | 8077 PurpleConversation *conv; |
| 8078 | 8078 |
| 8079 conv = purple_find_conversation_with_account(PURPLE_CONV_TYPE_IM, buddy->name, buddy->account); | 8079 conv = purple_find_conversation_with_account(PURPLE_CONV_TYPE_IM, purple_buddy_get_name(buddy), purple_buddy_get_account(buddy)); |
| 8080 if (conv) | 8080 if (conv) |
| 8081 pidgin_conv_update_fields(conv, PIDGIN_CONV_BUDDY_ICON); | 8081 pidgin_conv_update_fields(conv, PIDGIN_CONV_BUDDY_ICON); |
| 8082 } | 8082 } |
| 8083 | 8083 |
| 8084 static void | 8084 static void |