comparison: pidgin/gtkdocklet.c
pidgin/gtkdocklet.c
- changeset 37879
- 38eebb7c9019
- parent 37422
- 07dcc28b6039
- child 38358
- 30ba44276e74
equal
deleted
inserted
replaced
| 37774:bf8ed95aaa1c | 37879:38eebb7c9019 |
|---|---|
| 587 } | 587 } |
| 588 g_list_free(popular_statuses); | 588 g_list_free(popular_statuses); |
| 589 | 589 |
| 590 pidgin_separator(submenu); | 590 pidgin_separator(submenu); |
| 591 | 591 |
| 592 pidgin_new_item_from_stock(submenu, _("New..."), NULL, G_CALLBACK(show_custom_status_editor_cb), NULL, 0, 0, NULL); | 592 pidgin_new_menu_item(submenu, _("New..."), NULL, |
| 593 pidgin_new_item_from_stock(submenu, _("Saved..."), NULL, G_CALLBACK(pidgin_status_window_show), NULL, 0, 0, NULL); | 593 G_CALLBACK(show_custom_status_editor_cb), NULL); |
| 594 pidgin_new_menu_item(submenu, _("Saved..."), NULL, | |
| 595 G_CALLBACK(pidgin_status_window_show), NULL); | |
| 594 | 596 |
| 595 return menuitem; | 597 return menuitem; |
| 596 } | 598 } |
| 597 | 599 |
| 598 | 600 |
| 711 } | 713 } |
| 712 gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem); | 714 gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem); |
| 713 | 715 |
| 714 pidgin_separator(menu); | 716 pidgin_separator(menu); |
| 715 | 717 |
| 716 menuitem = pidgin_new_item_from_stock(menu, _("New _Message..."), PIDGIN_STOCK_TOOLBAR_MESSAGE_NEW, G_CALLBACK(pidgin_dialogs_im), NULL, 0, 0, NULL); | 718 menuitem = pidgin_new_menu_item(menu, _("New _Message..."), |
| 719 PIDGIN_STOCK_TOOLBAR_MESSAGE_NEW, | |
| 720 G_CALLBACK(pidgin_dialogs_im), NULL); | |
| 717 if (status == PURPLE_STATUS_OFFLINE) | 721 if (status == PURPLE_STATUS_OFFLINE) |
| 718 gtk_widget_set_sensitive(menuitem, FALSE); | 722 gtk_widget_set_sensitive(menuitem, FALSE); |
| 719 | 723 |
| 720 menuitem = pidgin_new_item_from_stock(menu, _("Join Chat..."), PIDGIN_STOCK_CHAT, | 724 menuitem = pidgin_new_menu_item(menu, _("Join Chat..."), |
| 721 G_CALLBACK(pidgin_blist_joinchat_show), NULL, 0, 0, NULL); | 725 PIDGIN_STOCK_CHAT, G_CALLBACK(pidgin_blist_joinchat_show), |
| 726 NULL); | |
| 722 if (status == PURPLE_STATUS_OFFLINE) | 727 if (status == PURPLE_STATUS_OFFLINE) |
| 723 gtk_widget_set_sensitive(menuitem, FALSE); | 728 gtk_widget_set_sensitive(menuitem, FALSE); |
| 724 | 729 |
| 725 menuitem = docklet_status_submenu(); | 730 menuitem = docklet_status_submenu(); |
| 726 gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem); | 731 gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem); |
| 727 | 732 |
| 728 pidgin_separator(menu); | 733 pidgin_separator(menu); |
| 729 | 734 |
| 730 pidgin_new_item_from_stock(menu, _("_Accounts"), NULL, G_CALLBACK(pidgin_accounts_window_show), NULL, 0, 0, NULL); | 735 pidgin_new_menu_item(menu, _("_Accounts"), NULL, |
| 731 pidgin_new_item_from_stock(menu, _("Plu_gins"), PIDGIN_STOCK_TOOLBAR_PLUGINS, G_CALLBACK(pidgin_plugin_dialog_show), NULL, 0, 0, NULL); | 736 G_CALLBACK(pidgin_accounts_window_show), NULL); |
| 732 pidgin_new_item_from_stock(menu, _("Pr_eferences"), GTK_STOCK_PREFERENCES, G_CALLBACK(pidgin_prefs_show), NULL, 0, 0, NULL); | 737 pidgin_new_menu_item(menu, _("Plu_gins"), |
| 738 PIDGIN_STOCK_TOOLBAR_PLUGINS, | |
| 739 G_CALLBACK(pidgin_plugin_dialog_show), NULL); | |
| 740 pidgin_new_menu_item(menu, _("Pr_eferences"), | |
| 741 GTK_STOCK_PREFERENCES, | |
| 742 G_CALLBACK(pidgin_prefs_show), NULL); | |
| 733 | 743 |
| 734 pidgin_separator(menu); | 744 pidgin_separator(menu); |
| 735 | 745 |
| 736 menuitem = gtk_check_menu_item_new_with_mnemonic(_("Mute _Sounds")); | 746 menuitem = gtk_check_menu_item_new_with_mnemonic(_("Mute _Sounds")); |
| 737 gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem), purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/sound/mute")); | 747 gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem), purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/sound/mute")); |
| 743 pidgin_separator(menu); | 753 pidgin_separator(menu); |
| 744 | 754 |
| 745 /* add plugin actions */ | 755 /* add plugin actions */ |
| 746 docklet_plugin_actions(menu); | 756 docklet_plugin_actions(menu); |
| 747 | 757 |
| 748 pidgin_new_item_from_stock(menu, _("_Quit"), GTK_STOCK_QUIT, G_CALLBACK(purple_core_quit), NULL, 0, 0, NULL); | 758 pidgin_new_menu_item(menu, _("_Quit"), GTK_STOCK_QUIT, |
| 759 G_CALLBACK(purple_core_quit), NULL); | |
| 749 | 760 |
| 750 #ifdef _WIN32 | 761 #ifdef _WIN32 |
| 751 g_signal_connect(menu, "leave-notify-event", G_CALLBACK(docklet_menu_leave_enter), NULL); | 762 g_signal_connect(menu, "leave-notify-event", G_CALLBACK(docklet_menu_leave_enter), NULL); |
| 752 g_signal_connect(menu, "enter-notify-event", G_CALLBACK(docklet_menu_leave_enter), NULL); | 763 g_signal_connect(menu, "enter-notify-event", G_CALLBACK(docklet_menu_leave_enter), NULL); |
| 753 pos_func = NULL; | 764 pos_func = NULL; |
