comparison: src/gtkblist.c
src/gtkblist.c
- changeset 7956
- 21d891f33b89
- parent 7950
- 1f1f2fe00cef
- child 8003
- 7ddbb7a360eb
equal
deleted
inserted
replaced
| 7955:fdb05712d343 | 7956:21d891f33b89 |
|---|---|
| 962 b = gaim_contact_get_priority_buddy((GaimContact*)node); | 962 b = gaim_contact_get_priority_buddy((GaimContact*)node); |
| 963 else | 963 else |
| 964 b = (GaimBuddy *)node; | 964 b = (GaimBuddy *)node; |
| 965 | 965 |
| 966 /* Protocol specific options */ | 966 /* Protocol specific options */ |
| 967 prpl = gaim_find_prpl(gaim_account_get_protocol(b->account)); | 967 prpl = gaim_find_prpl(gaim_account_get_protocol_id(b->account)); |
| 968 | 968 |
| 969 if (prpl != NULL) | 969 if (prpl != NULL) |
| 970 prpl_info = GAIM_PLUGIN_PROTOCOL_INFO(prpl); | 970 prpl_info = GAIM_PLUGIN_PROTOCOL_INFO(prpl); |
| 971 | 971 |
| 972 if(event->button == 2 && event->type == GDK_2BUTTON_PRESS) { | 972 if(event->button == 2 && event->type == GDK_2BUTTON_PRESS) { |
| 1020 | 1020 |
| 1021 submenu = gtk_menu_new(); | 1021 submenu = gtk_menu_new(); |
| 1022 gtk_menu_item_set_submenu(GTK_MENU_ITEM(menuitem), submenu); | 1022 gtk_menu_item_set_submenu(GTK_MENU_ITEM(menuitem), submenu); |
| 1023 gtk_widget_show(submenu); | 1023 gtk_widget_show(submenu); |
| 1024 | 1024 |
| 1025 prpl = gaim_find_prpl(gaim_account_get_protocol(buddy->account)); | 1025 prpl = gaim_find_prpl(gaim_account_get_protocol_id(buddy->account)); |
| 1026 prpl_info = prpl ? GAIM_PLUGIN_PROTOCOL_INFO(prpl) : NULL; | 1026 prpl_info = prpl ? GAIM_PLUGIN_PROTOCOL_INFO(prpl) : NULL; |
| 1027 | 1027 |
| 1028 make_buddy_menu(submenu, prpl_info, buddy); | 1028 make_buddy_menu(submenu, prpl_info, buddy); |
| 1029 } | 1029 } |
| 1030 } | 1030 } |
| 1742 static char *gaim_get_tooltip_text(GaimBlistNode *node) | 1742 static char *gaim_get_tooltip_text(GaimBlistNode *node) |
| 1743 { | 1743 { |
| 1744 GaimPlugin *prpl; | 1744 GaimPlugin *prpl; |
| 1745 GaimPluginProtocolInfo *prpl_info = NULL; | 1745 GaimPluginProtocolInfo *prpl_info = NULL; |
| 1746 char *text = NULL; | 1746 char *text = NULL; |
| 1747 | 1747 |
| 1748 if(GAIM_BLIST_NODE_IS_CHAT(node)) { | 1748 if(GAIM_BLIST_NODE_IS_CHAT(node)) { |
| 1749 GaimChat *chat = (GaimChat *)node; | 1749 GaimChat *chat = (GaimChat *)node; |
| 1750 char *name = NULL; | 1750 char *name = NULL; |
| 1751 struct proto_chat_entry *pce; | 1751 struct proto_chat_entry *pce; |
| 1752 GList *parts, *tmp; | 1752 GList *parts, *tmp; |
| 1753 GString *parts_text = g_string_new(""); | 1753 GString *parts_text = g_string_new(""); |
| 1754 | 1754 |
| 1755 prpl = gaim_find_prpl(gaim_account_get_protocol(chat->account)); | 1755 prpl = gaim_find_prpl(gaim_account_get_protocol_id(chat->account)); |
| 1756 prpl_info = GAIM_PLUGIN_PROTOCOL_INFO(prpl); | 1756 prpl_info = GAIM_PLUGIN_PROTOCOL_INFO(prpl); |
| 1757 | 1757 |
| 1758 parts = prpl_info->chat_info(chat->account->gc); | 1758 parts = prpl_info->chat_info(chat->account->gc); |
| 1759 | 1759 |
| 1760 name = g_markup_escape_text(gaim_chat_get_name(chat), -1); | 1760 name = g_markup_escape_text(gaim_chat_get_name(chat), -1); |
| 1807 contactaliastext = g_markup_escape_text(contact->alias, -1); | 1807 contactaliastext = g_markup_escape_text(contact->alias, -1); |
| 1808 } else { | 1808 } else { |
| 1809 b = (GaimBuddy *)node; | 1809 b = (GaimBuddy *)node; |
| 1810 } | 1810 } |
| 1811 | 1811 |
| 1812 prpl = gaim_find_prpl(gaim_account_get_protocol(b->account)); | 1812 prpl = gaim_find_prpl(gaim_account_get_protocol_id(b->account)); |
| 1813 prpl_info = GAIM_PLUGIN_PROTOCOL_INFO(prpl); | 1813 prpl_info = GAIM_PLUGIN_PROTOCOL_INFO(prpl); |
| 1814 | 1814 |
| 1815 if (prpl_info && prpl_info->tooltip_text) { | 1815 if (prpl_info && prpl_info->tooltip_text) { |
| 1816 const char *end; | 1816 const char *end; |
| 1817 statustext = prpl_info->tooltip_text(b); | 1817 statustext = prpl_info->tooltip_text(b); |
| 1925 if(buddy) | 1925 if(buddy) |
| 1926 account = buddy->account; | 1926 account = buddy->account; |
| 1927 else | 1927 else |
| 1928 account = chat->account; | 1928 account = chat->account; |
| 1929 | 1929 |
| 1930 prpl = gaim_find_prpl(gaim_account_get_protocol(account)); | 1930 prpl = gaim_find_prpl(gaim_account_get_protocol_id(account)); |
| 1931 if(!prpl) | 1931 if(!prpl) |
| 1932 return NULL; | 1932 return NULL; |
| 1933 | 1933 |
| 1934 prpl_info = GAIM_PLUGIN_PROTOCOL_INFO(prpl); | 1934 prpl_info = GAIM_PLUGIN_PROTOCOL_INFO(prpl); |
| 1935 | 1935 |
| 2063 name = contact->alias; | 2063 name = contact->alias; |
| 2064 else | 2064 else |
| 2065 name = gaim_get_buddy_alias(b); | 2065 name = gaim_get_buddy_alias(b); |
| 2066 esc = g_markup_escape_text(name, strlen(name)); | 2066 esc = g_markup_escape_text(name, strlen(name)); |
| 2067 | 2067 |
| 2068 prpl = gaim_find_prpl(gaim_account_get_protocol(b->account)); | 2068 prpl = gaim_find_prpl(gaim_account_get_protocol_id(b->account)); |
| 2069 | 2069 |
| 2070 if (prpl != NULL) | 2070 if (prpl != NULL) |
| 2071 prpl_info = GAIM_PLUGIN_PROTOCOL_INFO(prpl); | 2071 prpl_info = GAIM_PLUGIN_PROTOCOL_INFO(prpl); |
| 2072 | 2072 |
| 2073 if (!gaim_prefs_get_bool("/gaim/gtk/blist/show_buddy_icons")) { | 2073 if (!gaim_prefs_get_bool("/gaim/gtk/blist/show_buddy_icons")) { |
| 3847 GdkPixbuf *status = NULL; | 3847 GdkPixbuf *status = NULL; |
| 3848 char *filename = NULL; | 3848 char *filename = NULL; |
| 3849 const char *protoname = NULL; | 3849 const char *protoname = NULL; |
| 3850 char buf[256]; | 3850 char buf[256]; |
| 3851 | 3851 |
| 3852 prpl = gaim_find_prpl(gaim_account_get_protocol(account)); | 3852 prpl = gaim_find_prpl(gaim_account_get_protocol_id(account)); |
| 3853 | 3853 |
| 3854 if (prpl != NULL) { | 3854 if (prpl != NULL) { |
| 3855 prpl_info = GAIM_PLUGIN_PROTOCOL_INFO(prpl); | 3855 prpl_info = GAIM_PLUGIN_PROTOCOL_INFO(prpl); |
| 3856 | 3856 |
| 3857 if (prpl_info->list_icon != NULL) | 3857 if (prpl_info->list_icon != NULL) |
