diff options
author | Matthew Barnes <mbarnes@redhat.com> | 2011-03-28 03:16:39 +0800 |
---|---|---|
committer | Matthew Barnes <mbarnes@redhat.com> | 2011-03-28 06:38:39 +0800 |
commit | ba6a2343869f6be82f44261f183cd6925659d5ee (patch) | |
tree | f7356964d4780d8889c439f9c8271c7d71315ab3 /modules/calendar/e-cal-shell-view-taskpad.c | |
parent | f35931919049a645681207856c384d70a749020c (diff) | |
download | gsoc2013-evolution-ba6a2343869f6be82f44261f183cd6925659d5ee.tar.gz gsoc2013-evolution-ba6a2343869f6be82f44261f183cd6925659d5ee.tar.zst gsoc2013-evolution-ba6a2343869f6be82f44261f183cd6925659d5ee.zip |
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.
Diffstat (limited to 'modules/calendar/e-cal-shell-view-taskpad.c')
-rw-r--r-- | modules/calendar/e-cal-shell-view-taskpad.c | 23 |
1 files changed, 16 insertions, 7 deletions
diff --git a/modules/calendar/e-cal-shell-view-taskpad.c b/modules/calendar/e-cal-shell-view-taskpad.c index ead28ae351..8afff2c767 100644 --- a/modules/calendar/e-cal-shell-view-taskpad.c +++ b/modules/calendar/e-cal-shell-view-taskpad.c @@ -359,13 +359,6 @@ static GtkActionEntry calendar_taskpad_entries[] = { NULL, NULL, /* XXX Add a tooltip! */ G_CALLBACK (action_calendar_taskpad_open_url_cb) }, - - { "calendar-taskpad-save-as", - GTK_STOCK_SAVE_AS, - N_("_Save as iCalendar..."), - NULL, - NULL, /* XXX Add a tooltip! */ - G_CALLBACK (action_calendar_taskpad_save_as_cb) } }; static GtkActionEntry lockdown_printing_entries[] = { @@ -378,6 +371,16 @@ static GtkActionEntry lockdown_printing_entries[] = { G_CALLBACK (action_calendar_taskpad_print_cb) } }; +static GtkActionEntry lockdown_save_to_disk_entries[] = { + + { "calendar-taskpad-save-as", + GTK_STOCK_SAVE_AS, + N_("_Save as iCalendar..."), + NULL, + NULL, /* XXX Add a tooltip! */ + G_CALLBACK (action_calendar_taskpad_save_as_cb) } +}; + void e_cal_shell_view_taskpad_actions_init (ECalShellView *cal_shell_view) { @@ -399,6 +402,12 @@ e_cal_shell_view_taskpad_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 |