comparison: pidgin/gtkblist.c
pidgin/gtkblist.c
- changeset 20702
- 9548d4fb8c8e
- parent 20699
- 22e12fba91bf
- child 20705
- 96f7b6c6ec4b
equal
deleted
inserted
replaced
| 20701:80ddafd2c371 | 20702:9548d4fb8c8e |
|---|---|
| 641 prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(purple_find_prpl(purple_account_get_protocol_id(account))); | 641 prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(purple_find_prpl(purple_account_get_protocol_id(account))); |
| 642 if (prpl_info && prpl_info->get_chat_name) { | 642 if (prpl_info && prpl_info->get_chat_name) { |
| 643 name = prpl_info->get_chat_name(c->components); | 643 name = prpl_info->get_chat_name(c->components); |
| 644 } | 644 } |
| 645 } else if (PURPLE_BLIST_NODE_IS_CONTACT(node)) { | 645 } else if (PURPLE_BLIST_NODE_IS_CONTACT(node)) { |
| 646 pidgin_log_show_contact(GTK_WINDOW(gtkblist->window), (PurpleContact *)node); | 646 pidgin_log_show_contact_with_parent(GTK_WINDOW(gtkblist->window), (PurpleContact *)node); |
| 647 pidgin_clear_cursor(gtkblist->window); | 647 pidgin_clear_cursor(gtkblist->window); |
| 648 return; | 648 return; |
| 649 } else { | 649 } else { |
| 650 pidgin_clear_cursor(gtkblist->window); | 650 pidgin_clear_cursor(gtkblist->window); |
| 651 | 651 |
| 653 * that doesn't match the type of one of the blocks above. */ | 653 * that doesn't match the type of one of the blocks above. */ |
| 654 g_return_if_reached(); | 654 g_return_if_reached(); |
| 655 } | 655 } |
| 656 | 656 |
| 657 if (name && account) { | 657 if (name && account) { |
| 658 pidgin_log_show(GTK_WINDOW(gtkblist->window), type, name, account); | 658 pidgin_log_show_with_parent(GTK_WINDOW(gtkblist->window), type, name, account); |
| 659 g_free(name); | 659 g_free(name); |
| 660 | 660 |
| 661 pidgin_clear_cursor(gtkblist->window); | 661 pidgin_clear_cursor(gtkblist->window); |
| 662 } | 662 } |
| 663 } | 663 } |
| 3096 { N_("/Tools/Pr_eferences"), "<CTL>P", pidgin_prefs_show, 0, "<StockItem>", GTK_STOCK_PREFERENCES }, | 3096 { N_("/Tools/Pr_eferences"), "<CTL>P", pidgin_prefs_show, 0, "<StockItem>", GTK_STOCK_PREFERENCES }, |
| 3097 { N_("/Tools/Pr_ivacy"), NULL, pidgin_privacy_dialog_show, 0, "<Item>", NULL }, | 3097 { N_("/Tools/Pr_ivacy"), NULL, pidgin_privacy_dialog_show, 0, "<Item>", NULL }, |
| 3098 { "/Tools/sep2", NULL, NULL, 0, "<Separator>", NULL }, | 3098 { "/Tools/sep2", NULL, NULL, 0, "<Separator>", NULL }, |
| 3099 { N_("/Tools/_File Transfers"), "<CTL>T", pidgin_xfer_dialog_show, 0, "<Item>", NULL }, | 3099 { N_("/Tools/_File Transfers"), "<CTL>T", pidgin_xfer_dialog_show, 0, "<Item>", NULL }, |
| 3100 { N_("/Tools/R_oom List"), NULL, pidgin_roomlist_dialog_show, 0, "<Item>", NULL }, | 3100 { N_("/Tools/R_oom List"), NULL, pidgin_roomlist_dialog_show, 0, "<Item>", NULL }, |
| 3101 { N_("/Tools/System _Log"), NULL, pidgin_blist_show_with_parent, (int)pidgin_syslog_show, "<Item>", NULL }, | 3101 { N_("/Tools/System _Log"), NULL, pidgin_blist_show_with_parent, (int)pidgin_syslog_show_with_parent, "<Item>", NULL }, |
| 3102 { "/Tools/sep3", NULL, NULL, 0, "<Separator>", NULL }, | 3102 { "/Tools/sep3", NULL, NULL, 0, "<Separator>", NULL }, |
| 3103 { N_("/Tools/Mute _Sounds"), "<CTL>S", pidgin_blist_mute_sounds_cb, 0, "<CheckItem>", NULL }, | 3103 { N_("/Tools/Mute _Sounds"), "<CTL>S", pidgin_blist_mute_sounds_cb, 0, "<CheckItem>", NULL }, |
| 3104 /* Help */ | 3104 /* Help */ |
| 3105 { N_("/_Help"), NULL, NULL, 0, "<Branch>", NULL }, | 3105 { N_("/_Help"), NULL, NULL, 0, "<Branch>", NULL }, |
| 3106 { N_("/Help/Online _Help"), "F1", gtk_blist_show_onlinehelp_cb, 0, "<StockItem>", GTK_STOCK_HELP }, | 3106 { N_("/Help/Online _Help"), "F1", gtk_blist_show_onlinehelp_cb, 0, "<StockItem>", GTK_STOCK_HELP }, |
