diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2010-01-10 05:17:23 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2010-01-11 00:33:53 +0800 |
| commit | 611fda70547f7a5258a1eaf52691cb05f8b3ec63 (patch) | |
| tree | 1a274adb039e9c07c4e539b7199874b7968e76fc /modules/addressbook | |
| parent | c073b9c6c1e45a3e80a47eec27b58f2b2e984811 (diff) | |
| download | gsoc2013-evolution-611fda70547f7a5258a1eaf52691cb05f8b3ec63.tar gsoc2013-evolution-611fda70547f7a5258a1eaf52691cb05f8b3ec63.tar.gz gsoc2013-evolution-611fda70547f7a5258a1eaf52691cb05f8b3ec63.tar.bz2 gsoc2013-evolution-611fda70547f7a5258a1eaf52691cb05f8b3ec63.tar.lz gsoc2013-evolution-611fda70547f7a5258a1eaf52691cb05f8b3ec63.tar.xz gsoc2013-evolution-611fda70547f7a5258a1eaf52691cb05f8b3ec63.tar.zst gsoc2013-evolution-611fda70547f7a5258a1eaf52691cb05f8b3ec63.zip | |
Cleanup delete actions in shell views.
Diffstat (limited to 'modules/addressbook')
| -rw-r--r-- | modules/addressbook/e-book-shell-view-actions.c | 11 | ||||
| -rw-r--r-- | modules/addressbook/e-book-shell-view-private.h | 1 |
2 files changed, 3 insertions, 9 deletions
diff --git a/modules/addressbook/e-book-shell-view-actions.c b/modules/addressbook/e-book-shell-view-actions.c index 61434d4e52..e791f8e08d 100644 --- a/modules/addressbook/e-book-shell-view-actions.c +++ b/modules/addressbook/e-book-shell-view-actions.c @@ -337,7 +337,7 @@ action_contact_delete_cb (GtkAction *action, view = e_book_shell_content_get_current_view (book_shell_content); g_return_if_fail (view != NULL); - e_addressbook_view_delete_selection (view, TRUE); + e_selectable_delete_selection (E_SELECTABLE (view)); } static void @@ -661,7 +661,7 @@ static GtkActionEntry contact_entries[] = { { "address-book-delete", GTK_STOCK_DELETE, - N_("Del_ete Address Book"), + N_("D_elete Address Book"), NULL, N_("Delete the selected address book"), G_CALLBACK (action_address_book_delete_cb) }, @@ -803,10 +803,6 @@ static EPopupActionEntry contact_popup_entries[] = { NULL, "contact-copy" }, - { "contact-popup-delete", - NULL, - "contact-delete" }, - { "contact-popup-forward", NULL, "contact-forward" }, @@ -1042,9 +1038,6 @@ e_book_shell_view_actions_init (EBookShellView *book_shell_view) /* Fine tuning. */ - action = ACTION (CONTACT_DELETE); - g_object_set (action, "short-label", _("Delete"), NULL); - g_signal_connect ( ACTION (GAL_SAVE_CUSTOM_VIEW), "activate", G_CALLBACK (action_gal_save_custom_view_cb), book_shell_view); diff --git a/modules/addressbook/e-book-shell-view-private.h b/modules/addressbook/e-book-shell-view-private.h index c0fb2f09df..97fe64e5c5 100644 --- a/modules/addressbook/e-book-shell-view-private.h +++ b/modules/addressbook/e-book-shell-view-private.h @@ -41,6 +41,7 @@ #include "shell/e-shell-sidebar.h" #include "shell/e-shell-utils.h" #include "misc/e-popup-action.h" +#include "misc/e-selectable.h" #include "addressbook/util/eab-book-util.h" #include "addressbook/gui/contact-editor/e-contact-editor.h" |