Mercurial > pidgin.yaz

comparison pidgin/gtkblist.c @ 32708:10e5000326a5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Convert code to use the purple_account accessor functions.
author andrew.victor@mxit.com
date Sat, 01 Oct 2011 21:04:35 +0000
parents 78fae2fc38d5
children 2ec94166be43
comparison
equal deleted inserted replaced
32707:f75041cb3fec 32708:10e5000326a5
1517 1517
1518 #endif 1518 #endif
1519 1519
1520 if (prpl_info && prpl_info->send_file) { 1520 if (prpl_info && prpl_info->send_file) {
1521 if (!prpl_info->can_receive_file || 1521 if (!prpl_info->can_receive_file ||
1522 prpl_info->can_receive_file(buddy->account->gc, buddy->name)) 1522 prpl_info->can_receive_file(purple_account_get_connection(buddy->account), buddy->name))
1523 { 1523 {
1524 pidgin_new_item_from_stock(menu, _("_Send File..."), 1524 pidgin_new_item_from_stock(menu, _("_Send File..."),
1525 PIDGIN_STOCK_TOOLBAR_SEND_FILE, 1525 PIDGIN_STOCK_TOOLBAR_SEND_FILE,
1526 G_CALLBACK(gtk_blist_menu_send_file_cb), 1526 G_CALLBACK(gtk_blist_menu_send_file_cb),
1527 buddy, 0, 0, NULL); 1527 buddy, 0, 0, NULL);
1545 gboolean show_offline = purple_blist_node_get_bool(node, "show_offline"); 1545 gboolean show_offline = purple_blist_node_get_bool(node, "show_offline");
1546 pidgin_new_item_from_stock(menu, show_offline ? _("Hide When Offline") : _("Show When Offline"), 1546 pidgin_new_item_from_stock(menu, show_offline ? _("Hide When Offline") : _("Show When Offline"),
1547 NULL, G_CALLBACK(gtk_blist_menu_showoffline_cb), node, 0, 0, NULL); 1547 NULL, G_CALLBACK(gtk_blist_menu_showoffline_cb), node, 0, 0, NULL);
1548 } 1548 }
1549 1549
1550 pidgin_append_blist_node_proto_menu(menu, buddy->account->gc, node); 1550 pidgin_append_blist_node_proto_menu(menu, purple_account_get_connection(buddy->account), node);
1551 pidgin_append_blist_node_extended_menu(menu, node); 1551 pidgin_append_blist_node_extended_menu(menu, node);
1552 1552
1553 if (!contact_expanded && contact != NULL) 1553 if (!contact_expanded && contact != NULL)
1554 pidgin_append_blist_node_move_to_menu(menu, (PurpleBlistNode *)contact); 1554 pidgin_append_blist_node_move_to_menu(menu, (PurpleBlistNode *)contact);
1555 1555
1598 buddy = (PurpleBuddy*)node; 1598 buddy = (PurpleBuddy*)node;
1599 } else { 1599 } else {
1600 return FALSE; 1600 return FALSE;
1601 } 1601 }
1602 if(buddy) 1602 if(buddy)
1603 pidgin_retrieve_user_info(buddy->account->gc, buddy->name); 1603 pidgin_retrieve_user_info(purple_account_get_connection(buddy->account), buddy->name);
1604 } else { 1604 } else {
1605 switch (event->keyval) { 1605 switch (event->keyval) {
1606 case GDK_F2: 1606 case GDK_F2:
1607 gtk_blist_menu_alias_cb(tv, node); 1607 gtk_blist_menu_alias_cb(tv, node);
1608 break; 1608 break;
1751 pidgin_new_check_item(menu, _("Persistent"), 1751 pidgin_new_check_item(menu, _("Persistent"),
1752 G_CALLBACK(gtk_blist_menu_persistent_cb), node, persistent); 1752 G_CALLBACK(gtk_blist_menu_persistent_cb), node, persistent);
1753 pidgin_new_item_from_stock(menu, _("View _Log"), NULL, 1753 pidgin_new_item_from_stock(menu, _("View _Log"), NULL,
1754 G_CALLBACK(gtk_blist_menu_showlog_cb), node, 0, 0, NULL); 1754 G_CALLBACK(gtk_blist_menu_showlog_cb), node, 0, 0, NULL);
1755 1755
1756 pidgin_append_blist_node_proto_menu(menu, c->account->gc, node); 1756 pidgin_append_blist_node_proto_menu(menu, purple_account_get_connection(c->account), node);
1757 pidgin_append_blist_node_extended_menu(menu, node); 1757 pidgin_append_blist_node_extended_menu(menu, node);
1758 1758
1759 pidgin_separator(menu); 1759 pidgin_separator(menu);
1760 1760
1761 pidgin_new_item_from_stock(menu, _("_Edit Settings..."), NULL, 1761 pidgin_new_item_from_stock(menu, _("_Edit Settings..."), NULL,
1836 GtkWidget *submenu; 1836 GtkWidget *submenu;
1837 GtkWidget *image; 1837 GtkWidget *image;
1838 1838
1839 if(buddy == b) 1839 if(buddy == b)
1840 continue; 1840 continue;
1841 if(!buddy->account->gc) 1841 if(!purple_account_get_connection(buddy->account))
1842 continue; 1842 continue;
1843 if(!show_offline && !PURPLE_BUDDY_IS_ONLINE(buddy)) 1843 if(!show_offline && !PURPLE_BUDDY_IS_ONLINE(buddy))
1844 continue; 1844 continue;
1845 1845
1846 menuitem = gtk_image_menu_item_new_with_label(buddy->name); 1846 menuitem = gtk_image_menu_item_new_with_label(buddy->name);
1965 prpl = purple_find_prpl(purple_account_get_protocol_id(b->account)); 1965 prpl = purple_find_prpl(purple_account_get_protocol_id(b->account));
1966 if (prpl != NULL) 1966 if (prpl != NULL)
1967 prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(prpl); 1967 prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(prpl);
1968 1968
1969 if (prpl && prpl_info->get_info) 1969 if (prpl && prpl_info->get_info)
1970 pidgin_retrieve_user_info(b->account->gc, b->name); 1970 pidgin_retrieve_user_info(purple_account_get_connection(b->account), b->name);
1971 handled = TRUE; 1971 handled = TRUE;
1972 } 1972 }
1973 1973
1974 #if (1) 1974 #if (1)
1975 /* 1975 /*
2671 2671
2672 if (buddy) { 2672 if (buddy) {
2673 account = purple_buddy_get_account(buddy); 2673 account = purple_buddy_get_account(buddy);
2674 } 2674 }
2675 2675
2676 if(account && account->gc) { 2676 if(account && purple_account_get_connection(account)) {
2677 prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(account->gc->prpl); 2677 prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(purple_account_get_connection(account)->prpl);
2678 } 2678 }
2679 2679
2680 #if 0 2680 #if 0
2681 if (!purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/blist/show_buddy_icons")) 2681 if (!purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/blist/show_buddy_icons"))
2682 return NULL; 2682 return NULL;
3679 prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(prpl); 3679 prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(prpl);
3680 3680
3681 connections = purple_connections_get_all(); 3681 connections = purple_connections_get_all();
3682 if (connections && connections->next) 3682 if (connections && connections->next)
3683 { 3683 {
3684 tmp = g_markup_escape_text(chat->account->username, -1); 3684 tmp = g_markup_escape_text(purple_account_get_username(chat->account), -1);
3685 g_string_append_printf(str, _("<b>Account:</b> %s"), tmp); 3685 g_string_append_printf(str, _("<b>Account:</b> %s"), tmp);
3686 g_free(tmp); 3686 g_free(tmp);
3687 } 3687 }
3688 3688
3689 if (bnode && bnode->conv.conv) { 3689 if (bnode && bnode->conv.conv) {
3711 g_free(topic); 3711 g_free(topic);
3712 } 3712 }
3713 } 3713 }
3714 3714
3715 if (prpl_info && prpl_info->chat_info != NULL) 3715 if (prpl_info && prpl_info->chat_info != NULL)
3716 cur = prpl_info->chat_info(chat->account->gc); 3716 cur = prpl_info->chat_info(purple_account_get_connection(chat->account));
3717 else 3717 else
3718 cur = NULL; 3718 cur = NULL;
3719 3719
3720 while (cur != NULL) 3720 while (cur != NULL)
3721 { 3721 {
4233 prpl = purple_find_prpl(purple_account_get_protocol_id(b->account)); 4233 prpl = purple_find_prpl(purple_account_get_protocol_id(b->account));
4234 4234
4235 if (prpl != NULL) 4235 if (prpl != NULL)
4236 prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(prpl); 4236 prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(prpl);
4237 4237
4238 if (prpl_info && prpl_info->status_text && b->account->gc) { 4238 if (prpl_info && prpl_info->status_text && purple_account_get_connection(b->account)) {
4239 char *tmp = prpl_info->status_text(b); 4239 char *tmp = prpl_info->status_text(b);
4240 const char *end; 4240 const char *end;
4241 4241
4242 if(tmp && !g_utf8_validate(tmp, -1, &end)) { 4242 if(tmp && !g_utf8_validate(tmp, -1, &end)) {
4243 char *new = g_strndup(tmp, 4243 char *new = g_strndup(tmp,