From ba6a2343869f6be82f44261f183cd6925659d5ee Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sun, 27 Mar 2011 15:16:39 -0400 Subject: Restore lockdown integration. With lockdown settings available through GSettings, widgets can handle lockdown integration themselves without having to use EShellSettings. Also fixed a few places where printing or save-to-disk actions were either not properly wired up or not responding to lockdown settings, but much more work needs done. Attachments, for example, are not honoring the disable-save-to-disk setting at all. This too requires the recently-added gsettings-desktop-schemas dependency. --- modules/addressbook/e-book-shell-content.c | 1 - modules/addressbook/e-book-shell-view-actions.c | 24 ++++++++++++------------ 2 files changed, 12 insertions(+), 13 deletions(-) (limited to 'modules/addressbook') diff --git a/modules/addressbook/e-book-shell-content.c b/modules/addressbook/e-book-shell-content.c index 4f3905181e..35167e330a 100644 --- a/modules/addressbook/e-book-shell-content.c +++ b/modules/addressbook/e-book-shell-content.c @@ -268,7 +268,6 @@ book_shell_content_constructed (GObject *object) widget, "orientation", G_BINDING_SYNC_CREATE); - e_shell_configure_web_view (shell, E_WEB_VIEW (widget)); gtk_widget_show (widget); g_signal_connect_swapped ( diff --git a/modules/addressbook/e-book-shell-view-actions.c b/modules/addressbook/e-book-shell-view-actions.c index b2c63b872a..fc7c841fad 100644 --- a/modules/addressbook/e-book-shell-view-actions.c +++ b/modules/addressbook/e-book-shell-view-actions.c @@ -717,13 +717,6 @@ static GtkActionEntry contact_entries[] = { N_("Rename the selected address book"), G_CALLBACK (action_address_book_rename_cb) }, - { "address-book-save-as", - GTK_STOCK_SAVE_AS, - N_("S_ave Address Book as vCard"), - NULL, - N_("Save the contacts of the selected address book as a vCard"), - G_CALLBACK (action_address_book_save_as_cb) }, - { "address-book-stop", GTK_STOCK_STOP, NULL, @@ -825,11 +818,6 @@ static EPopupActionEntry contact_popup_entries[] = { NULL, "address-book-rename" }, - { "address-book-popup-save-as", - /* Translators: This is an action label */ - N_("_Save as vCard..."), - "address-book-save-as" }, - { "contact-popup-copy", NULL, "contact-copy" }, @@ -970,6 +958,13 @@ static EPopupActionEntry lockdown_printing_popup_entries[] = { static GtkActionEntry lockdown_save_to_disk_entries[] = { + { "address-book-save-as", + GTK_STOCK_SAVE_AS, + N_("S_ave Address Book as vCard"), + NULL, + N_("Save the contacts of the selected address book as a vCard"), + G_CALLBACK (action_address_book_save_as_cb) }, + { "contact-save-as", GTK_STOCK_SAVE_AS, /* Translators: This is an action label */ @@ -981,6 +976,11 @@ static GtkActionEntry lockdown_save_to_disk_entries[] = { static EPopupActionEntry lockdown_save_to_disk_popup_entries[] = { + { "address-book-popup-save-as", + /* Translators: This is an action label */ + N_("_Save as vCard..."), + "address-book-save-as" }, + { "contact-popup-save-as", NULL, "contact-save-as" } -- cgit