aboutsummaryrefslogtreecommitdiffstats
path: root/modules
diff options
context:
space:
mode:
Diffstat (limited to 'modules')
-rw-r--r--modules/addressbook/e-book-shell-content.c1
-rw-r--r--modules/addressbook/e-book-shell-view-actions.c24
-rw-r--r--modules/calendar/e-cal-shell-view-actions.c37
-rw-r--r--modules/calendar/e-cal-shell-view-memopad.c23
-rw-r--r--modules/calendar/e-cal-shell-view-taskpad.c23
-rw-r--r--modules/calendar/e-memo-shell-content.c1
-rw-r--r--modules/calendar/e-task-shell-content.c1
-rw-r--r--modules/mail/em-composer-prefs.c24
8 files changed, 70 insertions, 64 deletions
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" }
diff --git a/modules/calendar/e-cal-shell-view-actions.c b/modules/calendar/e-cal-shell-view-actions.c
index 5e16b6db5b..ba72a41748 100644
--- a/modules/calendar/e-cal-shell-view-actions.c
+++ b/modules/calendar/e-cal-shell-view-actions.c
@@ -1467,13 +1467,6 @@ static GtkActionEntry calendar_entries[] = {
NULL, /* XXX Add a tooltip! */
G_CALLBACK (action_event_reply_all_cb) },
- { "event-save-as",
- GTK_STOCK_SAVE_AS,
- N_("Save as iCalendar..."),
- NULL,
- NULL, /* XXX Add a tooltip! */
- G_CALLBACK (action_event_save_as_cb) },
-
{ "event-schedule",
NULL,
N_("_Schedule Meeting..."),
@@ -1587,10 +1580,6 @@ static EPopupActionEntry calendar_popup_entries[] = {
NULL,
"event-reply-all" },
- { "event-popup-save-as",
- NULL,
- "event-save-as" },
-
{ "event-popup-schedule",
NULL,
"event-schedule" },
@@ -1741,6 +1730,23 @@ static EPopupActionEntry lockdown_printing_popup_entries[] = {
"event-print" }
};
+static GtkActionEntry lockdown_save_to_disk_entries[] = {
+
+ { "event-save-as",
+ GTK_STOCK_SAVE_AS,
+ N_("Save as iCalendar..."),
+ NULL,
+ NULL, /* XXX Add a tooltip! */
+ G_CALLBACK (action_event_save_as_cb) },
+};
+
+static EPopupActionEntry lockdown_save_to_disk_popup_entries[] = {
+
+ { "event-popup-save-as",
+ NULL,
+ "event-save-as" },
+};
+
void
e_cal_shell_view_actions_init (ECalShellView *cal_shell_view)
{
@@ -1790,6 +1796,15 @@ e_cal_shell_view_actions_init (ECalShellView *cal_shell_view)
action_group, lockdown_printing_popup_entries,
G_N_ELEMENTS (lockdown_printing_popup_entries));
+ /* 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);
+ e_action_group_add_popup_actions (
+ action_group, lockdown_save_to_disk_popup_entries,
+ G_N_ELEMENTS (lockdown_save_to_disk_popup_entries));
+
/* Fine tuning. */
action = ACTION (CALENDAR_GO_TODAY);
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
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
diff --git a/modules/calendar/e-memo-shell-content.c b/modules/calendar/e-memo-shell-content.c
index bbf12de7db..9e280e36ff 100644
--- a/modules/calendar/e-memo-shell-content.c
+++ b/modules/calendar/e-memo-shell-content.c
@@ -473,7 +473,6 @@ memo_shell_content_constructed (GObject *object)
container = priv->paned;
widget = e_cal_component_preview_new ();
- e_shell_configure_web_view (shell, E_WEB_VIEW (widget));
gtk_widget_show (widget);
g_signal_connect_swapped (
diff --git a/modules/calendar/e-task-shell-content.c b/modules/calendar/e-task-shell-content.c
index f2d10e4a4d..dbfa5fb7fc 100644
--- a/modules/calendar/e-task-shell-content.c
+++ b/modules/calendar/e-task-shell-content.c
@@ -469,7 +469,6 @@ task_shell_content_constructed (GObject *object)
container = priv->paned;
widget = e_cal_component_preview_new ();
- e_shell_configure_web_view (shell, E_WEB_VIEW (widget));
gtk_widget_show (widget);
g_signal_connect_swapped (
diff --git a/modules/mail/em-composer-prefs.c b/modules/mail/em-composer-prefs.c
index 3added6de1..18f12e8c9e 100644
--- a/modules/mail/em-composer-prefs.c
+++ b/modules/mail/em-composer-prefs.c
@@ -563,18 +563,6 @@ em_composer_prefs_construct (EMComposerPrefs *prefs,
widget, "prefer-html",
G_BINDING_SYNC_CREATE);
-#if 0 /* XXX Lockdown keys have moved to gsettings-desktop-schemas,
- * so disable lockdown integration until we're ready for
- * GSettings. */
-#ifndef G_OS_WIN32
- g_object_bind_property (
- shell_settings, "disable-command-line",
- widget, "allow-scripts",
- G_BINDING_SYNC_CREATE |
- G_BINDING_INVERT_BOOLEAN);
-#endif
-#endif
-
signature_tree_view = e_signature_manager_get_tree_view (
E_SIGNATURE_MANAGER (widget));
@@ -584,18 +572,6 @@ em_composer_prefs_construct (EMComposerPrefs *prefs,
gtk_container_add (GTK_CONTAINER (container), widget);
gtk_widget_show (widget);
-#if 0 /* XXX Lockdown keys have moved to gsettings-desktop-schemas,
- * so disable lockdown integration until we're ready for
- * GSettings. */
-#ifndef G_OS_WIN32
- g_object_bind_property (
- shell_settings, "disable-command-line",
- widget, "allow-scripts",
- G_BINDING_SYNC_CREATE |
- G_BINDING_INVERT_BOOLEAN);
-#endif
-#endif
-
g_object_bind_property (
signature_tree_view, "selected",
widget, "signature",
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 15:21:41 +0800