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.

1 files changed, 16 insertions, 7 deletions

diff --git a/modules/calendar/e-cal-shell-view-memopad.c b/modules/calendar/e-cal-shell-view-memopad.c
index c4b67a88f4..2f625df75b 100644
--- a/modules/calendar/e-cal-shell-view-memopad.c
+++ b/modules/calendar/e-cal-shell-view-memopad.c
@@ -272,13 +272,6 @@ static GtkActionEntry calendar_memopad_entries[] = {
 	  NULL,
 	  NULL,  /* XXX Add a tooltip! */
 	  G_CALLBACK (action_calendar_memopad_open_url_cb) },
-
-	{ "calendar-memopad-save-as",
-	  GTK_STOCK_SAVE_AS,
-	  N_("Save as iCalendar..."),
-	  NULL,
-	  NULL,  /* XXX Add a tooltip! */
-	  G_CALLBACK (action_calendar_memopad_save_as_cb) }
 };
 
 static GtkActionEntry lockdown_printing_entries[] = {
@@ -291,6 +284,16 @@ static GtkActionEntry lockdown_printing_entries[] = {
 	  G_CALLBACK (action_calendar_memopad_print_cb) }
 };
 
+static GtkActionEntry lockdown_save_to_disk_entries[] = {
+
+	{ "calendar-memopad-save-as",
+	  GTK_STOCK_SAVE_AS,
+	  N_("Save as iCalendar..."),
+	  NULL,
+	  NULL,  /* XXX Add a tooltip! */
+	  G_CALLBACK (action_calendar_memopad_save_as_cb) }
+};
+
 void
 e_cal_shell_view_memopad_actions_init (ECalShellView *cal_shell_view)
 {
@@ -312,6 +315,12 @@ e_cal_shell_view_memopad_actions_init (ECalShellView *cal_shell_view)
 	gtk_action_group_add_actions (
 		action_group, lockdown_printing_entries,
 		G_N_ELEMENTS (lockdown_printing_entries), cal_shell_view);
+
+	/* Lockdown Save-to-Disk Actions */
+	action_group = ACTION_GROUP (LOCKDOWN_SAVE_TO_DISK);
+	gtk_action_group_add_actions (
+		action_group, lockdown_save_to_disk_entries,
+		G_N_ELEMENTS (lockdown_save_to_disk_entries), cal_shell_view);
 }
 
 void