diff options
| author | Rodrigo Moya <rodrigo@gnome-db.org> | 2011-11-08 19:48:40 +0800 |
|---|---|---|
| committer | Rodrigo Moya <rodrigo@gnome-db.org> | 2011-11-08 19:48:40 +0800 |
| commit | 1107fea0f8edff76d5956426044c9afe41c387fa (patch) | |
| tree | 3140debb1cef6c058425360e0c43b6c55da75f3a | |
| parent | ceda5ef420b4a4b97ce0011d49be3f96e857c9ef (diff) | |
| parent | 88d5608a97ebaee9c04c3e8ac6b79278e824ecee (diff) | |
| download | gsoc2013-evolution-1107fea0f8edff76d5956426044c9afe41c387fa.tar gsoc2013-evolution-1107fea0f8edff76d5956426044c9afe41c387fa.tar.gz gsoc2013-evolution-1107fea0f8edff76d5956426044c9afe41c387fa.tar.bz2 gsoc2013-evolution-1107fea0f8edff76d5956426044c9afe41c387fa.tar.lz gsoc2013-evolution-1107fea0f8edff76d5956426044c9afe41c387fa.tar.xz gsoc2013-evolution-1107fea0f8edff76d5956426044c9afe41c387fa.tar.zst gsoc2013-evolution-1107fea0f8edff76d5956426044c9afe41c387fa.zip | |
Merge branch 'master' into wip/gsettings
74 files changed, 2613 insertions, 10915 deletions
diff --git a/calendar/gui/alarm-notify/notify-main.c b/calendar/gui/alarm-notify/notify-main.c index b1775d8d23..a6d9d53fc5 100644 --- a/calendar/gui/alarm-notify/notify-main.c +++ b/calendar/gui/alarm-notify/notify-main.c @@ -30,6 +30,8 @@ #include <stdlib.h> #include <glib/gi18n.h> +#include <libedataserver/e-gdbus-templates.h> + #include "alarm-notify.h" #ifdef G_OS_WIN32 @@ -82,6 +84,8 @@ main (gint argc, gtk_init (&argc, &argv); + e_gdbus_templates_init_main_thread (); + #ifdef G_OS_WIN32 path = g_build_path (";", _e_get_bindir (), g_getenv ("PATH"), NULL); diff --git a/configure.ac b/configure.ac index 5ee70f2581..71198b1ec5 100644 --- a/configure.ac +++ b/configure.ac @@ -190,7 +190,7 @@ dnl ******************************************** dnl User / Developer Documentation dnl ******************************************** GNOME_DOC_INIT -GTK_DOC_CHECK(1.9) +GTK_DOC_CHECK([1.14],[--flavour no-tmpl]) dnl ****************************** dnl Win32 diff --git a/doc/reference/shell/tmpl/action-groups.sgml b/doc/reference/shell/tmpl/action-groups.sgml deleted file mode 100644 index 7e63335da0..0000000000 --- a/doc/reference/shell/tmpl/action-groups.sgml +++ /dev/null @@ -1,102 +0,0 @@ -<!-- ##### SECTION Title ##### --> -Action Groups - -<!-- ##### SECTION Short_Description ##### --> - - -<!-- ##### SECTION Long_Description ##### --> -<para> - -</para> - -<!-- ##### SECTION See_Also ##### --> -<para> - -</para> - -<!-- ##### SECTION Stability_Level ##### --> - - -<!-- ##### SECTION Image ##### --> - - -<!-- ##### MACRO E_SHELL_WINDOW_ACTION_GROUP_SHELL ##### --> -<para> - -</para> - -@window: - - -<!-- ##### MACRO E_SHELL_WINDOW_ACTION_GROUP_SWITCHER ##### --> -<para> - -</para> - -@window: - - -<!-- ##### MACRO E_SHELL_WINDOW_ACTION_GROUP_NEW_ITEM ##### --> -<para> - -</para> - -@window: - - -<!-- ##### MACRO E_SHELL_WINDOW_ACTION_GROUP_NEW_SOURCE ##### --> -<para> - -</para> - -@window: - - -<!-- ##### MACRO E_SHELL_WINDOW_ACTION_GROUP_CUSTOM_RULES ##### --> -<para> - -</para> - -@window: - - -<!-- ##### MACRO E_SHELL_WINDOW_ACTION_GROUP_GAL_VIEW ##### --> -<para> - -</para> - -@window: - - -<!-- ##### MACRO E_SHELL_WINDOW_ACTION_GROUP_LOCKDOWN_APPLICATION_HANDLERS ##### --> -<para> - -</para> - -@window: - - -<!-- ##### MACRO E_SHELL_WINDOW_ACTION_GROUP_LOCKDOWN_PRINTING ##### --> -<para> - -</para> - -@window: - - -<!-- ##### MACRO E_SHELL_WINDOW_ACTION_GROUP_LOCKDOWN_PRINT_SETUP ##### --> -<para> - -</para> - -@window: - - -<!-- ##### MACRO E_SHELL_WINDOW_ACTION_GROUP_LOCKDOWN_SAVE_TO_DISK ##### --> -<para> - -</para> - -@window: - - diff --git a/doc/reference/shell/tmpl/e-account-combo-box.sgml b/doc/reference/shell/tmpl/e-account-combo-box.sgml deleted file mode 100644 index d876e81029..0000000000 --- a/doc/reference/shell/tmpl/e-account-combo-box.sgml +++ /dev/null @@ -1,112 +0,0 @@ -<!-- ##### SECTION Title ##### --> -e-account-combo-box - -<!-- ##### SECTION Short_Description ##### --> - - -<!-- ##### SECTION Long_Description ##### --> -<para> - -</para> - -<!-- ##### SECTION See_Also ##### --> -<para> - -</para> - -<!-- ##### SECTION Stability_Level ##### --> - - -<!-- ##### SECTION Image ##### --> - - -<!-- ##### STRUCT EAccountComboBox ##### --> -<para> - -</para> - -@parent: -@priv: - -<!-- ##### FUNCTION e_account_combo_box_new ##### --> -<para> - -</para> - -@void: -@Returns: - - -<!-- ##### FUNCTION e_account_combo_box_set_session ##### --> -<para> - -</para> - -@session: - - -<!-- ##### FUNCTION e_account_combo_box_get_account_list ##### --> -<para> - -</para> - -@combo_box: -@Returns: - - -<!-- ##### FUNCTION e_account_combo_box_set_account_list ##### --> -<para> - -</para> - -@combo_box: -@account_list: - - -<!-- ##### FUNCTION e_account_combo_box_get_active ##### --> -<para> - -</para> - -@combo_box: -@Returns: - - -<!-- ##### FUNCTION e_account_combo_box_set_active ##### --> -<para> - -</para> - -@combo_box: -@account: -@Returns: - - -<!-- ##### FUNCTION e_account_combo_box_get_active_name ##### --> -<para> - -</para> - -@combo_box: -@Returns: - - -<!-- ##### FUNCTION e_account_combo_box_set_active_name ##### --> -<para> - -</para> - -@combo_box: -@account_name: -@Returns: - - -<!-- ##### FUNCTION e_account_combo_box_count_displayed_accounts ##### --> -<para> - -</para> - -@combo_box: -@Returns: - - diff --git a/doc/reference/shell/tmpl/e-account-manager.sgml b/doc/reference/shell/tmpl/e-account-manager.sgml deleted file mode 100644 index a170718c07..0000000000 --- a/doc/reference/shell/tmpl/e-account-manager.sgml +++ /dev/null @@ -1,82 +0,0 @@ -<!-- ##### SECTION Title ##### --> -e-account-manager - -<!-- ##### SECTION Short_Description ##### --> - - -<!-- ##### SECTION Long_Description ##### --> -<para> - -</para> - -<!-- ##### SECTION See_Also ##### --> -<para> - -</para> - -<!-- ##### SECTION Stability_Level ##### --> - - -<!-- ##### SECTION Image ##### --> - - -<!-- ##### FUNCTION e_account_manager_new ##### --> -<para> - -</para> - -@account_list: -@Returns: - - -<!-- ##### FUNCTION e_account_manager_add_account ##### --> -<para> - -</para> - -@manager: - - -<!-- ##### FUNCTION e_account_manager_edit_account ##### --> -<para> - -</para> - -@manager: - - -<!-- ##### FUNCTION e_account_manager_delete_account ##### --> -<para> - -</para> - -@manager: - - -<!-- ##### FUNCTION e_account_manager_get_account_list ##### --> -<para> - -</para> - -@manager: -@Returns: - - -<!-- ##### FUNCTION e_account_manager_set_account_list ##### --> -<para> - -</para> - -@manager: -@account_list: - - -<!-- ##### FUNCTION e_account_manager_get_tree_view ##### --> -<para> - -</para> - -@manager: -@Returns: - - diff --git a/doc/reference/shell/tmpl/e-account-tree-view.sgml b/doc/reference/shell/tmpl/e-account-tree-view.sgml deleted file mode 100644 index 8d309abc32..0000000000 --- a/doc/reference/shell/tmpl/e-account-tree-view.sgml +++ /dev/null @@ -1,92 +0,0 @@ -<!-- ##### SECTION Title ##### --> -e-account-tree-view - -<!-- ##### SECTION Short_Description ##### --> - - -<!-- ##### SECTION Long_Description ##### --> -<para> - -</para> - -<!-- ##### SECTION See_Also ##### --> -<para> - -</para> - -<!-- ##### SECTION Stability_Level ##### --> - - -<!-- ##### SECTION Image ##### --> - - -<!-- ##### STRUCT EAccountTreeView ##### --> -<para> - -</para> - -@parent: -@priv: - -<!-- ##### FUNCTION e_account_tree_view_new ##### --> -<para> - -</para> - -@void: -@Returns: - - -<!-- ##### FUNCTION e_account_tree_view_enable_account ##### --> -<para> - -</para> - -@tree_view: - - -<!-- ##### FUNCTION e_account_tree_view_disable_account ##### --> -<para> - -</para> - -@tree_view: - - -<!-- ##### FUNCTION e_account_tree_view_get_account_list ##### --> -<para> - -</para> - -@tree_view: -@Returns: - - -<!-- ##### FUNCTION e_account_tree_view_set_account_list ##### --> -<para> - -</para> - -@tree_view: -@account_list: - - -<!-- ##### FUNCTION e_account_tree_view_get_selected ##### --> -<para> - -</para> - -@tree_view: -@Returns: - - -<!-- ##### FUNCTION e_account_tree_view_set_selected ##### --> -<para> - -</para> - -@tree_view: -@account: -@Returns: - - diff --git a/doc/reference/shell/tmpl/e-account-utils.sgml b/doc/reference/shell/tmpl/e-account-utils.sgml deleted file mode 100644 index 8aa329aa35..0000000000 --- a/doc/reference/shell/tmpl/e-account-utils.sgml +++ /dev/null @@ -1,84 +0,0 @@ -<!-- ##### SECTION Title ##### --> -Mail Accounts - -<!-- ##### SECTION Short_Description ##### --> - - -<!-- ##### SECTION Long_Description ##### --> -<para> - -</para> - -<!-- ##### SECTION See_Also ##### --> -<para> - -</para> - -<!-- ##### SECTION Stability_Level ##### --> - - -<!-- ##### SECTION Image ##### --> - - -<!-- ##### FUNCTION e_get_account_list ##### --> -<para> - -</para> - -@void: -@Returns: - - -<!-- ##### FUNCTION e_get_default_account ##### --> -<para> - -</para> - -@void: -@Returns: - - -<!-- ##### FUNCTION e_set_default_account ##### --> -<para> - -</para> - -@account: - - -<!-- ##### FUNCTION e_get_account_by_name ##### --> -<para> - -</para> - -@name: -@Returns: - - -<!-- ##### FUNCTION e_get_account_by_uid ##### --> -<para> - -</para> - -@uid: -@Returns: - - -<!-- ##### FUNCTION e_get_any_enabled_account ##### --> -<para> - -</para> - -@void: -@Returns: - - -<!-- ##### FUNCTION e_get_default_transport ##### --> -<para> - -</para> - -@void: -@Returns: - - diff --git a/doc/reference/shell/tmpl/e-action-combo-box.sgml b/doc/reference/shell/tmpl/e-action-combo-box.sgml deleted file mode 100644 index 3bdd6dae6e..0000000000 --- a/doc/reference/shell/tmpl/e-action-combo-box.sgml +++ /dev/null @@ -1,100 +0,0 @@ -<!-- ##### SECTION Title ##### --> -e-action-combo-box - -<!-- ##### SECTION Short_Description ##### --> - - -<!-- ##### SECTION Long_Description ##### --> -<para> - -</para> - -<!-- ##### SECTION See_Also ##### --> -<para> - -</para> - -<!-- ##### SECTION Stability_Level ##### --> - - -<!-- ##### SECTION Image ##### --> - - -<!-- ##### STRUCT EActionComboBox ##### --> -<para> - -</para> - - -<!-- ##### FUNCTION e_action_combo_box_new ##### --> -<para> - -</para> - -@void: -@Returns: - - -<!-- ##### FUNCTION e_action_combo_box_new_with_action ##### --> -<para> - -</para> - -@action: -@Returns: - - -<!-- ##### FUNCTION e_action_combo_box_get_action ##### --> -<para> - -</para> - -@combo_box: -@Returns: - - -<!-- ##### FUNCTION e_action_combo_box_set_action ##### --> -<para> - -</para> - -@combo_box: -@action: - - -<!-- ##### FUNCTION e_action_combo_box_get_current_value ##### --> -<para> - -</para> - -@combo_box: -@Returns: - - -<!-- ##### FUNCTION e_action_combo_box_set_current_value ##### --> -<para> - -</para> - -@combo_box: -@current_value: - - -<!-- ##### FUNCTION e_action_combo_box_add_separator_before ##### --> -<para> - -</para> - -@combo_box: -@action_value: - - -<!-- ##### FUNCTION e_action_combo_box_add_separator_after ##### --> -<para> - -</para> - -@combo_box: -@action_value: - - diff --git a/doc/reference/shell/tmpl/e-activity-proxy.sgml b/doc/reference/shell/tmpl/e-activity-proxy.sgml deleted file mode 100644 index fe579129fc..0000000000 --- a/doc/reference/shell/tmpl/e-activity-proxy.sgml +++ /dev/null @@ -1,48 +0,0 @@ -<!-- ##### SECTION Title ##### --> -e-activity-proxy - -<!-- ##### SECTION Short_Description ##### --> - - -<!-- ##### SECTION Long_Description ##### --> -<para> - -</para> - -<!-- ##### SECTION See_Also ##### --> -<para> - -</para> - -<!-- ##### SECTION Stability_Level ##### --> - - -<!-- ##### SECTION Image ##### --> - - -<!-- ##### STRUCT EActivityProxy ##### --> -<para> - -</para> - -@parent: -@priv: - -<!-- ##### FUNCTION e_activity_proxy_new ##### --> -<para> - -</para> - -@activity: -@Returns: - - -<!-- ##### FUNCTION e_activity_proxy_get_activity ##### --> -<para> - -</para> - -@proxy: -@Returns: - - diff --git a/doc/reference/shell/tmpl/e-activity.sgml b/doc/reference/shell/tmpl/e-activity.sgml deleted file mode 100644 index bae3675a13..0000000000 --- a/doc/reference/shell/tmpl/e-activity.sgml +++ /dev/null @@ -1,154 +0,0 @@ -<!-- ##### SECTION Title ##### --> -e-activity - -<!-- ##### SECTION Short_Description ##### --> - - -<!-- ##### SECTION Long_Description ##### --> -<para> - -</para> - -<!-- ##### SECTION See_Also ##### --> -<para> - -</para> - -<!-- ##### SECTION Stability_Level ##### --> - - -<!-- ##### SECTION Image ##### --> - - -<!-- ##### STRUCT EActivity ##### --> -<para> - -</para> - - -<!-- ##### FUNCTION e_activity_new ##### --> -<para> - -</para> - -@void: -@Returns: - - -<!-- ##### FUNCTION e_activity_describe ##### --> -<para> - -</para> - -@activity: -@Returns: - - -<!-- ##### FUNCTION e_activity_get_alert_sink ##### --> -<para> - -</para> - -@activity: -@Returns: - - -<!-- ##### FUNCTION e_activity_set_alert_sink ##### --> -<para> - -</para> - -@activity: -@alert_sink: - - -<!-- ##### FUNCTION e_activity_get_cancellable ##### --> -<para> - -</para> - -@activity: -@Returns: - - -<!-- ##### FUNCTION e_activity_set_cancellable ##### --> -<para> - -</para> - -@activity: -@cancellable: - - -<!-- ##### FUNCTION e_activity_get_icon_name ##### --> -<para> - -</para> - -@activity: -@Returns: - - -<!-- ##### FUNCTION e_activity_set_icon_name ##### --> -<para> - -</para> - -@activity: -@icon_name: - - -<!-- ##### FUNCTION e_activity_get_percent ##### --> -<para> - -</para> - -@activity: -@Returns: - - -<!-- ##### FUNCTION e_activity_set_percent ##### --> -<para> - -</para> - -@activity: -@percent: - - -<!-- ##### FUNCTION e_activity_get_state ##### --> -<para> - -</para> - -@activity: -@Returns: - - -<!-- ##### FUNCTION e_activity_set_state ##### --> -<para> - -</para> - -@activity: -@state: - - -<!-- ##### FUNCTION e_activity_get_text ##### --> -<para> - -</para> - -@activity: -@Returns: - - -<!-- ##### FUNCTION e_activity_set_text ##### --> -<para> - -</para> - -@activity: -@text: - - diff --git a/doc/reference/shell/tmpl/e-alert.sgml b/doc/reference/shell/tmpl/e-alert.sgml deleted file mode 100644 index 2c460a32ba..0000000000 --- a/doc/reference/shell/tmpl/e-alert.sgml +++ /dev/null @@ -1,82 +0,0 @@ -<!-- ##### SECTION Title ##### --> -User Alert Handling - -<!-- ##### SECTION Short_Description ##### --> - - -<!-- ##### SECTION Long_Description ##### --> -<para> - -</para> - -<!-- ##### SECTION See_Also ##### --> -<para> - -</para> - -<!-- ##### SECTION Stability_Level ##### --> - - -<!-- ##### SECTION Image ##### --> - - -<!-- ##### MACRO E_ALERT_ASK_FILE_EXISTS_OVERWRITE ##### --> -<para> - -</para> - - - -<!-- ##### MACRO E_ALERT_NO_SAVE_FILE ##### --> -<para> - -</para> - - - -<!-- ##### MACRO E_ALERT_NO_LOAD_FILE ##### --> -<para> - -</para> - - - -<!-- ##### STRUCT EAlert ##### --> -<para> - -</para> - -@parent: -@priv: - -<!-- ##### FUNCTION e_alert_new ##### --> -<para> - -</para> - -@tag: -@Varargs: -@Returns: - - -<!-- ##### FUNCTION e_alert_run_dialog ##### --> -<para> - -</para> - -@parent: -@alert: -@Returns: - - -<!-- ##### FUNCTION e_alert_run_dialog_for_args ##### --> -<para> - -</para> - -@parent: -@tag: -@Varargs: -@Returns: - - diff --git a/doc/reference/shell/tmpl/e-attachment-button.sgml b/doc/reference/shell/tmpl/e-attachment-button.sgml deleted file mode 100644 index f6c6b5de58..0000000000 --- a/doc/reference/shell/tmpl/e-attachment-button.sgml +++ /dev/null @@ -1,102 +0,0 @@ -<!-- ##### SECTION Title ##### --> -e-attachment-button - -<!-- ##### SECTION Short_Description ##### --> - - -<!-- ##### SECTION Long_Description ##### --> -<para> - -</para> - -<!-- ##### SECTION See_Also ##### --> -<para> - -</para> - -<!-- ##### SECTION Stability_Level ##### --> - - -<!-- ##### SECTION Image ##### --> - - -<!-- ##### STRUCT EAttachmentButton ##### --> -<para> - -</para> - -@parent: -@priv: - -<!-- ##### FUNCTION e_attachment_button_new ##### --> -<para> - -</para> - -@view: -@Returns: - - -<!-- ##### FUNCTION e_attachment_button_get_view ##### --> -<para> - -</para> - -@button: -@Returns: - - -<!-- ##### FUNCTION e_attachment_button_get_attachment ##### --> -<para> - -</para> - -@button: -@Returns: - - -<!-- ##### FUNCTION e_attachment_button_set_attachment ##### --> -<para> - -</para> - -@button: -@attachment: - - -<!-- ##### FUNCTION e_attachment_button_get_expandable ##### --> -<para> - -</para> - -@button: -@Returns: - - -<!-- ##### FUNCTION e_attachment_button_set_expandable ##### --> -<para> - -</para> - -@button: -@expandable: - - -<!-- ##### FUNCTION e_attachment_button_get_expanded ##### --> -<para> - -</para> - -@button: -@Returns: - - -<!-- ##### FUNCTION e_attachment_button_set_expanded ##### --> -<para> - -</para> - -@button: -@expanded: - - diff --git a/doc/reference/shell/tmpl/e-attachment-dialog.sgml b/doc/reference/shell/tmpl/e-attachment-dialog.sgml deleted file mode 100644 index c78d22d8dc..0000000000 --- a/doc/reference/shell/tmpl/e-attachment-dialog.sgml +++ /dev/null @@ -1,58 +0,0 @@ -<!-- ##### SECTION Title ##### --> -e-attachment-dialog - -<!-- ##### SECTION Short_Description ##### --> - - -<!-- ##### SECTION Long_Description ##### --> -<para> - -</para> - -<!-- ##### SECTION See_Also ##### --> -<para> - -</para> - -<!-- ##### SECTION Stability_Level ##### --> - - -<!-- ##### SECTION Image ##### --> - - -<!-- ##### STRUCT EAttachmentDialog ##### --> -<para> - -</para> - -@parent: -@priv: - -<!-- ##### FUNCTION e_attachment_dialog_new ##### --> -<para> - -</para> - -@parent: -@attachment: -@Returns: - - -<!-- ##### FUNCTION e_attachment_dialog_get_attachment ##### --> -<para> - -</para> - -@dialog: -@Returns: - - -<!-- ##### FUNCTION e_attachment_dialog_set_attachment ##### --> -<para> - -</para> - -@dialog: -@attachment: - - diff --git a/doc/reference/shell/tmpl/e-attachment-handler.sgml b/doc/reference/shell/tmpl/e-attachment-handler.sgml deleted file mode 100644 index feb4c2a1e7..0000000000 --- a/doc/reference/shell/tmpl/e-attachment-handler.sgml +++ /dev/null @@ -1,58 +0,0 @@ -<!-- ##### SECTION Title ##### --> -e-attachment-handler - -<!-- ##### SECTION Short_Description ##### --> - - -<!-- ##### SECTION Long_Description ##### --> -<para> - -</para> - -<!-- ##### SECTION See_Also ##### --> -<para> - -</para> - -<!-- ##### SECTION Stability_Level ##### --> - - -<!-- ##### SECTION Image ##### --> - - -<!-- ##### STRUCT EAttachmentHandler ##### --> -<para> - -</para> - -@parent: -@priv: - -<!-- ##### FUNCTION e_attachment_handler_get_view ##### --> -<para> - -</para> - -@handler: -@Returns: - - -<!-- ##### FUNCTION e_attachment_handler_get_drag_actions ##### --> -<para> - -</para> - -@handler: -@Returns: - - -<!-- ##### FUNCTION e_attachment_handler_get_target_table ##### --> -<para> - -</para> - -@handler: -@n_targets: -@Returns: - - diff --git a/doc/reference/shell/tmpl/e-attachment-icon-view.sgml b/doc/reference/shell/tmpl/e-attachment-icon-view.sgml deleted file mode 100644 index 2478c37b0a..0000000000 --- a/doc/reference/shell/tmpl/e-attachment-icon-view.sgml +++ /dev/null @@ -1,47 +0,0 @@ -<!-- ##### SECTION Title ##### --> -e-attachment-icon-view - -<!-- ##### SECTION Short_Description ##### --> - - -<!-- ##### SECTION Long_Description ##### --> -<para> - -</para> - -<!-- ##### SECTION See_Also ##### --> -<para> - -</para> - -<!-- ##### SECTION Stability_Level ##### --> - - -<!-- ##### SECTION Image ##### --> - - -<!-- ##### STRUCT EAttachmentIconView ##### --> -<para> - -</para> - -@parent: -@priv: - -<!-- ##### FUNCTION e_attachment_icon_view_new ##### --> -<para> - -</para> - -@void: -@Returns: - - -<!-- ##### FUNCTION e_attachment_icon_view_set_default_icon_size ##### --> -<para> - -</para> - -@size: - - diff --git a/doc/reference/shell/tmpl/e-attachment-paned.sgml b/doc/reference/shell/tmpl/e-attachment-paned.sgml deleted file mode 100644 index 672f7cd5e1..0000000000 --- a/doc/reference/shell/tmpl/e-attachment-paned.sgml +++ /dev/null @@ -1,124 +0,0 @@ -<!-- ##### SECTION Title ##### --> -e-attachment-paned - -<!-- ##### SECTION Short_Description ##### --> - - -<!-- ##### SECTION Long_Description ##### --> -<para> - -</para> - -<!-- ##### SECTION See_Also ##### --> -<para> - -</para> - -<!-- ##### SECTION Stability_Level ##### --> - - -<!-- ##### SECTION Image ##### --> - - -<!-- ##### STRUCT EAttachmentPaned ##### --> -<para> - -</para> - -@parent: -@priv: - -<!-- ##### FUNCTION e_attachment_paned_new ##### --> -<para> - -</para> - -@void: -@Returns: - - -<!-- ##### FUNCTION e_attachment_paned_get_content_area ##### --> -<para> - -</para> - -@paned: -@Returns: - - -<!-- ##### FUNCTION e_attachment_paned_get_active_view ##### --> -<para> - -</para> - -@paned: -@Returns: - - -<!-- ##### FUNCTION e_attachment_paned_set_active_view ##### --> -<para> - -</para> - -@paned: -@active_view: - - -<!-- ##### FUNCTION e_attachment_paned_get_expanded ##### --> -<para> - -</para> - -@paned: -@Returns: - - -<!-- ##### FUNCTION e_attachment_paned_set_expanded ##### --> -<para> - -</para> - -@paned: -@expanded: - - -<!-- ##### FUNCTION e_attachment_paned_drag_data_received ##### --> -<para> - -</para> - -@paned: -@context: -@x: -@y: -@selection: -@info: -@time: - - -<!-- ##### FUNCTION e_attachment_paned_get_controls_container ##### --> -<para> - -</para> - -@paned: -@Returns: - - -<!-- ##### FUNCTION e_attachment_paned_get_view_combo ##### --> -<para> - -</para> - -@paned: -@Returns: - - -<!-- ##### FUNCTION e_attachment_paned_set_default_height ##### --> -<para> - -</para> - -@height: - - diff --git a/doc/reference/shell/tmpl/e-attachment-store.sgml b/doc/reference/shell/tmpl/e-attachment-store.sgml deleted file mode 100644 index e7d64e85b9..0000000000 --- a/doc/reference/shell/tmpl/e-attachment-store.sgml +++ /dev/null @@ -1,191 +0,0 @@ -<!-- ##### SECTION Title ##### --> -e-attachment-store - -<!-- ##### SECTION Short_Description ##### --> - - -<!-- ##### SECTION Long_Description ##### --> -<para> - -</para> - -<!-- ##### SECTION See_Also ##### --> -<para> - -</para> - -<!-- ##### SECTION Stability_Level ##### --> - - -<!-- ##### SECTION Image ##### --> - - -<!-- ##### STRUCT EAttachmentStore ##### --> -<para> - -</para> - -@parent: -@priv: - -<!-- ##### FUNCTION e_attachment_store_new ##### --> -<para> - -</para> - -@void: -@Returns: - - -<!-- ##### FUNCTION e_attachment_store_add_attachment ##### --> -<para> - -</para> - -@store: -@attachment: - - -<!-- ##### FUNCTION e_attachment_store_remove_attachment ##### --> -<para> - -</para> - -@store: -@attachment: -@Returns: - - -<!-- ##### FUNCTION e_attachment_store_add_to_multipart ##### --> -<para> - -</para> - -@store: -@multipart: -@default_charset: - - -<!-- ##### FUNCTION e_attachment_store_get_attachments ##### --> -<para> - -</para> - -@store: -@Returns: - - -<!-- ##### FUNCTION e_attachment_store_get_num_attachments ##### --> -<para> - -</para> - -@store: -@Returns: - - -<!-- ##### FUNCTION e_attachment_store_get_num_loading ##### --> -<para> - -</para> - -@store: -@Returns: - - -<!-- ##### FUNCTION e_attachment_store_get_total_size ##### --> -<para> - -</para> - -@store: -@Returns: - - -<!-- ##### FUNCTION e_attachment_store_run_load_dialog ##### --> -<para> - -</para> - -@store: -@parent: - - -<!-- ##### FUNCTION e_attachment_store_run_save_dialog ##### --> -<para> - -</para> - -@store: -@attachment_list: -@parent: -@Returns: - - -<!-- ##### FUNCTION e_attachment_store_get_uris_async ##### --> -<para> - -</para> - -@store: -@attachment_list: -@callback: -@user_data: - - -<!-- ##### FUNCTION e_attachment_store_get_uris_finish ##### --> -<para> - -</para> - -@store: -@result: -@error: -@Returns: - - -<!-- ##### FUNCTION e_attachment_store_load_async ##### --> -<para> - -</para> - -@store: -@attachment_list: -@callback: -@user_data: - - -<!-- ##### FUNCTION e_attachment_store_load_finish ##### --> -<para> - -</para> - -@store: -@result: -@error: -@Returns: - - -<!-- ##### FUNCTION e_attachment_store_save_async ##### --> -<para> - -</para> - -@store: -@destination: -@filename_prefix: -@callback: -@user_data: - - -<!-- ##### FUNCTION e_attachment_store_save_finish ##### --> -<para> - -</para> - -@store: -@result: -@error: -@Returns: - - diff --git a/doc/reference/shell/tmpl/e-attachment-tree-view.sgml b/doc/reference/shell/tmpl/e-attachment-tree-view.sgml deleted file mode 100644 index e6f2ca4a04..0000000000 --- a/doc/reference/shell/tmpl/e-attachment-tree-view.sgml +++ /dev/null @@ -1,39 +0,0 @@ -<!-- ##### SECTION Title ##### --> -e-attachment-tree-view - -<!-- ##### SECTION Short_Description ##### --> - - -<!-- ##### SECTION Long_Description ##### --> -<para> - -</para> - -<!-- ##### SECTION See_Also ##### --> -<para> - -</para> - -<!-- ##### SECTION Stability_Level ##### --> - - -<!-- ##### SECTION Image ##### --> - - -<!-- ##### STRUCT EAttachmentTreeView ##### --> -<para> - -</para> - -@parent: -@priv: - -<!-- ##### FUNCTION e_attachment_tree_view_new ##### --> -<para> - -</para> - -@void: -@Returns: - - diff --git a/doc/reference/shell/tmpl/e-attachment-view.sgml b/doc/reference/shell/tmpl/e-attachment-view.sgml deleted file mode 100644 index d351ab46e4..0000000000 --- a/doc/reference/shell/tmpl/e-attachment-view.sgml +++ /dev/null @@ -1,427 +0,0 @@ -<!-- ##### SECTION Title ##### --> -e-attachment-view - -<!-- ##### SECTION Short_Description ##### --> - - -<!-- ##### SECTION Long_Description ##### --> -<para> - -</para> - -<!-- ##### SECTION See_Also ##### --> -<para> - -</para> - -<!-- ##### SECTION Stability_Level ##### --> - - -<!-- ##### SECTION Image ##### --> - - -<!-- ##### STRUCT EAttachmentView ##### --> -<para> - -</para> - - -<!-- ##### FUNCTION e_attachment_view_init ##### --> -<para> - -</para> - -@view: - - -<!-- ##### FUNCTION e_attachment_view_dispose ##### --> -<para> - -</para> - -@view: - - -<!-- ##### FUNCTION e_attachment_view_finalize ##### --> -<para> - -</para> - -@view: - - -<!-- ##### FUNCTION e_attachment_view_get_private ##### --> -<para> - -</para> - -@view: -@Returns: - - -<!-- ##### FUNCTION e_attachment_view_get_store ##### --> -<para> - -</para> - -@view: -@Returns: - - -<!-- ##### FUNCTION e_attachment_view_get_editable ##### --> -<para> - -</para> - -@view: -@Returns: - - -<!-- ##### FUNCTION e_attachment_view_set_editable ##### --> -<para> - -</para> - -@view: -@editable: - - -<!-- ##### FUNCTION e_attachment_view_get_target_list ##### --> -<para> - -</para> - -@view: -@Returns: - - -<!-- ##### FUNCTION e_attachment_view_get_drag_actions ##### --> -<para> - -</para> - -@view: -@Returns: - - -<!-- ##### FUNCTION e_attachment_view_get_selected_attachments ##### --> -<para> - -</para> - -@view: -@Returns: - - -<!-- ##### FUNCTION e_attachment_view_open_path ##### --> -<para> - -</para> - -@view: -@path: -@app_info: - - -<!-- ##### FUNCTION e_attachment_view_remove_selected ##### --> -<para> - -</para> - -@view: -@select_next: - - -<!-- ##### FUNCTION e_attachment_view_button_press_event ##### --> -<para> - -</para> - -@view: -@event: -@Returns: - - -<!-- ##### FUNCTION e_attachment_view_button_release_event ##### --> -<para> - -</para> - -@view: -@event: -@Returns: - - -<!-- ##### FUNCTION e_attachment_view_motion_notify_event ##### --> -<para> - -</para> - -@view: -@event: -@Returns: - - -<!-- ##### FUNCTION e_attachment_view_key_press_event ##### --> -<para> - -</para> - -@view: -@event: -@Returns: - - -<!-- ##### FUNCTION e_attachment_view_get_path_at_pos ##### --> -<para> - -</para> - -@view: -@x: -@y: -@Returns: - - -<!-- ##### FUNCTION e_attachment_view_get_selected_paths ##### --> -<para> - -</para> - -@view: -@Returns: - - -<!-- ##### FUNCTION e_attachment_view_path_is_selected ##### --> -<para> - -</para> - -@view: -@path: -@Returns: - - -<!-- ##### FUNCTION e_attachment_view_select_path ##### --> -<para> - -</para> - -@view: -@path: - - -<!-- ##### FUNCTION e_attachment_view_unselect_path ##### --> -<para> - -</para> - -@view: -@path: - - -<!-- ##### FUNCTION e_attachment_view_select_all ##### --> -<para> - -</para> - -@view: - - -<!-- ##### FUNCTION e_attachment_view_unselect_all ##### --> -<para> - -</para> - -@view: - - -<!-- ##### FUNCTION e_attachment_view_sync_selection ##### --> -<para> - -</para> - -@view: -@target: - - -<!-- ##### FUNCTION e_attachment_view_drag_source_set ##### --> -<para> - -</para> - -@view: - - -<!-- ##### FUNCTION e_attachment_view_drag_source_unset ##### --> -<para> - -</para> - -@view: - - -<!-- ##### FUNCTION e_attachment_view_drag_begin ##### --> -<para> - -</para> - -@view: -@context: - - -<!-- ##### FUNCTION e_attachment_view_drag_end ##### --> -<para> - -</para> - -@view: -@context: - - -<!-- ##### FUNCTION e_attachment_view_drag_data_get ##### --> -<para> - -</para> - -@view: -@context: -@selection: -@info: -@time: - - -<!-- ##### FUNCTION e_attachment_view_drag_dest_set ##### --> -<para> - -</para> - -@view: - - -<!-- ##### FUNCTION e_attachment_view_drag_dest_unset ##### --> -<para> - -</para> - -@view: - - -<!-- ##### FUNCTION e_attachment_view_drag_motion ##### --> -<para> - -</para> - -@view: -@context: -@x: -@y: -@time: -@Returns: - - -<!-- ##### FUNCTION e_attachment_view_drag_drop ##### --> -<para> - -</para> - -@view: -@context: -@x: -@y: -@time: -@Returns: - - -<!-- ##### FUNCTION e_attachment_view_drag_data_received ##### --> -<para> - -</para> - -@view: -@context: -@x: -@y: -@selection: -@info: -@time: - - -<!-- ##### FUNCTION e_attachment_view_get_action ##### --> -<para> - -</para> - -@view: -@action_name: -@Returns: - - -<!-- ##### FUNCTION e_attachment_view_add_action_group ##### --> -<para> - -</para> - -@view: -@group_name: -@Returns: - - -<!-- ##### FUNCTION e_attachment_view_get_action_group ##### --> -<para> - -</para> - -@view: -@group_name: -@Returns: - - -<!-- ##### FUNCTION e_attachment_view_get_popup_menu ##### --> -<para> - -</para> - -@view: -@Returns: - - -<!-- ##### FUNCTION e_attachment_view_get_ui_manager ##### --> -<para> - -</para> - -@view: -@Returns: - - -<!-- ##### FUNCTION e_attachment_view_recent_action_new ##### --> -<para> - -</para> - -@view: -@action_name: -@action_label: -@Returns: - - -<!-- ##### FUNCTION e_attachment_view_show_popup_menu ##### --> -<para> - -</para> - -@view: -@event: -@func: -@user_data: - - -<!-- ##### FUNCTION e_attachment_view_update_actions ##### --> -<para> - -</para> - -@view: - - diff --git a/doc/reference/shell/tmpl/e-attachment.sgml b/doc/reference/shell/tmpl/e-attachment.sgml deleted file mode 100644 index e2cb42bd41..0000000000 --- a/doc/reference/shell/tmpl/e-attachment.sgml +++ /dev/null @@ -1,413 +0,0 @@ -<!-- ##### SECTION Title ##### --> -e-attachment - -<!-- ##### SECTION Short_Description ##### --> - - -<!-- ##### SECTION Long_Description ##### --> -<para> - -</para> - -<!-- ##### SECTION See_Also ##### --> -<para> - -</para> - -<!-- ##### SECTION Stability_Level ##### --> - - -<!-- ##### SECTION Image ##### --> - - -<!-- ##### STRUCT EAttachment ##### --> -<para> - -</para> - -@parent: -@priv: - -<!-- ##### FUNCTION e_attachment_new ##### --> -<para> - -</para> - -@void: -@Returns: - - -<!-- ##### FUNCTION e_attachment_new_for_path ##### --> -<para> - -</para> - -@path: -@Returns: - - -<!-- ##### FUNCTION e_attachment_new_for_uri ##### --> -<para> - -</para> - -@uri: -@Returns: - - -<!-- ##### FUNCTION e_attachment_new_for_message ##### --> -<para> - -</para> - -@message: -@Returns: - - -<!-- ##### FUNCTION e_attachment_add_to_multipart ##### --> -<para> - -</para> - -@attachment: -@multipart: -@default_charset: - - -<!-- ##### FUNCTION e_attachment_cancel ##### --> -<para> - -</para> - -@attachment: - - -<!-- ##### FUNCTION e_attachment_get_can_show ##### --> -<para> - -</para> - -@attachment: -@Returns: - - -<!-- ##### FUNCTION e_attachment_set_can_show ##### --> -<para> - -</para> - -@attachment: -@can_show: - - -<!-- ##### FUNCTION e_attachment_get_disposition ##### --> -<para> - -</para> - -@attachment: -@Returns: - - -<!-- ##### FUNCTION e_attachment_set_disposition ##### --> -<para> - -</para> - -@attachment: -@disposition: - - -<!-- ##### FUNCTION e_attachment_get_file ##### --> -<para> - -</para> - -@attachment: -@Returns: - - -<!-- ##### FUNCTION e_attachment_set_file ##### --> -<para> - -</para> - -@attachment: -@file: - - -<!-- ##### FUNCTION e_attachment_get_file_info ##### --> -<para> - -</para> - -@attachment: -@Returns: - - -<!-- ##### FUNCTION e_attachment_set_file_info ##### --> -<para> - -</para> - -@attachment: -@file_info: - - -<!-- ##### FUNCTION e_attachment_get_icon ##### --> -<para> - -</para> - -@attachment: -@Returns: - - -<!-- ##### FUNCTION e_attachment_get_loading ##### --> -<para> - -</para> - -@attachment: -@Returns: - - -<!-- ##### FUNCTION e_attachment_get_mime_part ##### --> -<para> - -</para> - -@attachment: -@Returns: - - -<!-- ##### FUNCTION e_attachment_set_mime_part ##### --> -<para> - -</para> - -@attachment: -@mime_part: - - -<!-- ##### FUNCTION e_attachment_get_percent ##### --> -<para> - -</para> - -@attachment: -@Returns: - - -<!-- ##### FUNCTION e_attachment_get_reference ##### --> -<para> - -</para> - -@attachment: -@Returns: - - -<!-- ##### FUNCTION e_attachment_set_reference ##### --> -<para> - -</para> - -@attachment: -@reference: - - -<!-- ##### FUNCTION e_attachment_get_saving ##### --> -<para> - -</para> - -@attachment: -@Returns: - - -<!-- ##### FUNCTION e_attachment_get_shown ##### --> -<para> - -</para> - -@attachment: -@Returns: - - -<!-- ##### FUNCTION e_attachment_set_shown ##### --> -<para> - -</para> - -@attachment: -@shown: - - -<!-- ##### FUNCTION e_attachment_get_encrypted ##### --> -<para> - -</para> - -@attachment: -@Returns: - - -<!-- ##### FUNCTION e_attachment_set_encrypted ##### --> -<para> - -</para> - -@attachment: -@encrypted: - - -<!-- ##### FUNCTION e_attachment_get_signed ##### --> -<para> - -</para> - -@attachment: -@Returns: - - -<!-- ##### FUNCTION e_attachment_set_signed ##### --> -<para> - -</para> - -@attachment: -@signed_: - - -<!-- ##### FUNCTION e_attachment_get_description ##### --> -<para> - -</para> - -@attachment: -@Returns: - - -<!-- ##### FUNCTION e_attachment_get_thumbnail_path ##### --> -<para> - -</para> - -@attachment: -@Returns: - - -<!-- ##### FUNCTION e_attachment_is_rfc822 ##### --> -<para> - -</para> - -@attachment: -@Returns: - - -<!-- ##### FUNCTION e_attachment_list_apps ##### --> -<para> - -</para> - -@attachment: -@Returns: - - -<!-- ##### FUNCTION e_attachment_load_async ##### --> -<para> - -</para> - -@attachment: -@callback: -@user_data: - - -<!-- ##### FUNCTION e_attachment_load_finish ##### --> -<para> - -</para> - -@attachment: -@result: -@error: -@Returns: - - -<!-- ##### FUNCTION e_attachment_open_async ##### --> -<para> - -</para> - -@attachment: -@app_info: -@callback: -@user_data: - - -<!-- ##### FUNCTION e_attachment_open_finish ##### --> -<para> - -</para> - -@attachment: -@result: -@error: -@Returns: - - -<!-- ##### FUNCTION e_attachment_save_async ##### --> -<para> - -</para> - -@attachment: -@destination: -@callback: -@user_data: - - -<!-- ##### FUNCTION e_attachment_save_finish ##### --> -<para> - -</para> - -@attachment: -@result: -@error: -@Returns: - - -<!-- ##### FUNCTION e_attachment_load_handle_error ##### --> -<para> - -</para> - -@attachment: -@result: -@parent: - - -<!-- ##### FUNCTION e_attachment_open_handle_error ##### --> -<para> - -</para> - -@attachment: -@result: -@parent: - - -<!-- ##### FUNCTION e_attachment_save_handle_error ##### --> -<para> - -</para> - -@attachment: -@result: -@parent: - - diff --git a/doc/reference/shell/tmpl/e-binding.sgml b/doc/reference/shell/tmpl/e-binding.sgml deleted file mode 100644 index 3d84407ee4..0000000000 --- a/doc/reference/shell/tmpl/e-binding.sgml +++ /dev/null @@ -1,162 +0,0 @@ -<!-- ##### SECTION Title ##### --> -GObject Property Bindings - -<!-- ##### SECTION Short_Description ##### --> - - -<!-- ##### SECTION Long_Description ##### --> -<para> - -</para> - -<!-- ##### SECTION See_Also ##### --> -<para> - -</para> - -<!-- ##### SECTION Stability_Level ##### --> - - -<!-- ##### SECTION Image ##### --> - - -<!-- ##### STRUCT EBinding ##### --> -<para> - -</para> - - -<!-- ##### STRUCT EMutualBinding ##### --> -<para> - -</para> - - -<!-- ##### USER_FUNCTION EBindingTransform ##### --> -<para> - -</para> - -@src_value: -@dst_value: -@user_data: -@Returns: - - -<!-- ##### FUNCTION e_binding_new ##### --> -<para> - -</para> - -@src_object: -@src_property: -@dst_object: -@dst_property: -@Returns: - - -<!-- ##### FUNCTION e_binding_new_full ##### --> -<para> - -</para> - -@src_object: -@src_property: -@dst_object: -@dst_property: -@transform: -@destroy_notify: -@user_data: -@Returns: - - -<!-- ##### FUNCTION e_binding_new_with_negation ##### --> -<para> - -</para> - -@src_object: -@src_property: -@dst_object: -@dst_property: -@Returns: - - -<!-- ##### FUNCTION e_binding_unbind ##### --> -<para> - -</para> - -@binding: - - -<!-- ##### FUNCTION e_mutual_binding_new ##### --> -<para> - -</para> - -@object1: -@property1: -@object2: -@property2: -@Returns: - - -<!-- ##### FUNCTION e_mutual_binding_new_full ##### --> -<para> - -</para> - -@object1: -@property1: -@object2: -@property2: -@transform: -@reverse_transform: -@destroy_notify: -@user_data: -@Returns: - - -<!-- ##### FUNCTION e_mutual_binding_new_with_negation ##### --> -<para> - -</para> - -@object1: -@property1: -@object2: -@property2: -@Returns: - - -<!-- ##### FUNCTION e_mutual_binding_unbind ##### --> -<para> - -</para> - -@binding: - - -<!-- ##### FUNCTION e_binding_transform_color_to_string ##### --> -<para> - -</para> - -@src_value: -@dst_value: -@user_data: -@Returns: - - -<!-- ##### FUNCTION e_binding_transform_string_to_color ##### --> -<para> - -</para> - -@src_value: -@dst_value: -@user_data: -@Returns: - - diff --git a/doc/reference/shell/tmpl/e-bit-array.sgml b/doc/reference/shell/tmpl/e-bit-array.sgml deleted file mode 100644 index 088d06e8b8..0000000000 --- a/doc/reference/shell/tmpl/e-bit-array.sgml +++ /dev/null @@ -1,170 +0,0 @@ -<!-- ##### SECTION Title ##### --> -Bit Arrays (Legacy) - -<!-- ##### SECTION Short_Description ##### --> - - -<!-- ##### SECTION Long_Description ##### --> -<para> - -</para> - -<!-- ##### SECTION See_Also ##### --> -<para> - -</para> - -<!-- ##### SECTION Stability_Level ##### --> - - -<!-- ##### SECTION Image ##### --> - - -<!-- ##### STRUCT EBitArray ##### --> -<para> - -</para> - - -<!-- ##### FUNCTION e_bit_array_new ##### --> -<para> - -</para> - -@count: -@Returns: - - -<!-- ##### FUNCTION e_bit_array_value_at ##### --> -<para> - -</para> - -@selection: -@n: -@Returns: - - -<!-- ##### FUNCTION e_bit_array_foreach ##### --> -<para> - -</para> - -@selection: -@callback: -@closure: - - -<!-- ##### FUNCTION e_bit_array_selected_count ##### --> -<para> - -</para> - -@selection: -@Returns: - - -<!-- ##### FUNCTION e_bit_array_select_all ##### --> -<para> - -</para> - -@selection: - - -<!-- ##### FUNCTION e_bit_array_invert_selection ##### --> -<para> - -</para> - -@selection: - - -<!-- ##### FUNCTION e_bit_array_bit_count ##### --> -<para> - -</para> - -@selection: -@Returns: - - -<!-- ##### FUNCTION e_bit_array_change_one_row ##### --> -<para> - -</para> - -@selection: -@row: -@grow: - - -<!-- ##### FUNCTION e_bit_array_change_range ##### --> -<para> - -</para> - -@selection: -@start: -@end: -@grow: - - -<!-- ##### FUNCTION e_bit_array_select_single_row ##### --> -<para> - -</para> - -@eba: -@row: - - -<!-- ##### FUNCTION e_bit_array_toggle_single_row ##### --> -<para> - -</para> - -@eba: -@row: - - -<!-- ##### FUNCTION e_bit_array_insert ##### --> -<para> - -</para> - -@esm: -@row: -@count: - - -<!-- ##### FUNCTION e_bit_array_delete ##### --> -<para> - -</para> - -@esm: -@row: -@count: - - -<!-- ##### FUNCTION e_bit_array_delete_single_mode ##### --> -<para> - -</para> - -@esm: -@row: -@count: - - -<!-- ##### FUNCTION e_bit_array_move_row ##### --> -<para> - -</para> - -@esm: -@old_row: -@new_row: - - diff --git a/doc/reference/shell/tmpl/e-categories-config.sgml b/doc/reference/shell/tmpl/e-categories-config.sgml deleted file mode 100644 index 29b36220c2..0000000000 --- a/doc/reference/shell/tmpl/e-categories-config.sgml +++ /dev/null @@ -1,40 +0,0 @@ -<!-- ##### SECTION Title ##### --> -Categories - -<!-- ##### SECTION Short_Description ##### --> - - -<!-- ##### SECTION Long_Description ##### --> -<para> - -</para> - -<!-- ##### SECTION See_Also ##### --> -<para> - -</para> - -<!-- ##### SECTION Stability_Level ##### --> - - -<!-- ##### SECTION Image ##### --> - - -<!-- ##### FUNCTION e_categories_config_get_icon_for ##### --> -<para> - -</para> - -@category: -@pixbuf: -@Returns: - - -<!-- ##### FUNCTION e_categories_config_open_dialog_for_entry ##### --> -<para> - -</para> - -@entry: - - diff --git a/doc/reference/shell/tmpl/e-datetime-format.sgml b/doc/reference/shell/tmpl/e-datetime-format.sgml deleted file mode 100644 index 7dee839d75..0000000000 --- a/doc/reference/shell/tmpl/e-datetime-format.sgml +++ /dev/null @@ -1,69 +0,0 @@ -<!-- ##### SECTION Title ##### --> -Date and Time Formatting - -<!-- ##### SECTION Short_Description ##### --> - - -<!-- ##### SECTION Long_Description ##### --> -<para> - -</para> - -<!-- ##### SECTION See_Also ##### --> -<para> - -</para> - -<!-- ##### SECTION Stability_Level ##### --> - - -<!-- ##### SECTION Image ##### --> - - -<!-- ##### ENUM DTFormatKind ##### --> -<para> - -</para> - -@DTFormatKindDate: -@DTFormatKindTime: -@DTFormatKindDateTime: -@DTFormatKindShortDate: - -<!-- ##### FUNCTION e_datetime_format_add_setup_widget ##### --> -<para> - -</para> - -@table: -@row: -@component: -@part: -@kind: -@caption: - - -<!-- ##### FUNCTION e_datetime_format_format ##### --> -<para> - -</para> - -@component: -@part: -@kind: -@value: -@Returns: - - -<!-- ##### FUNCTION e_datetime_format_format_tm ##### --> -<para> - -</para> - -@component: -@part: -@kind: -@tm_time: -@Returns: - - diff --git a/doc/reference/shell/tmpl/e-dialog-utils.sgml b/doc/reference/shell/tmpl/e-dialog-utils.sgml deleted file mode 100644 index 69dd22d7bb..0000000000 --- a/doc/reference/shell/tmpl/e-dialog-utils.sgml +++ /dev/null @@ -1,71 +0,0 @@ -<!-- ##### SECTION Title ##### --> -Dialog Utilities (Legacy) - -<!-- ##### SECTION Short_Description ##### --> - - -<!-- ##### SECTION Long_Description ##### --> -<para> - -</para> - -<!-- ##### SECTION See_Also ##### --> -<para> - -</para> - -<!-- ##### SECTION Stability_Level ##### --> - - -<!-- ##### SECTION Image ##### --> - - -<!-- ##### FUNCTION e_notice ##### --> -<para> - -</para> - -@parent: -@type: -@format: -@Varargs: - - -<!-- ##### FUNCTION e_dialog_editable_set ##### --> -<para> - -</para> - -@widget: -@value: - - -<!-- ##### FUNCTION e_dialog_editable_get ##### --> -<para> - -</para> - -@widget: -@Returns: - - -<!-- ##### FUNCTION e_dialog_combo_box_set ##### --> -<para> - -</para> - -@widget: -@value: -@value_map: - - -<!-- ##### FUNCTION e_dialog_combo_box_get ##### --> -<para> - -</para> - -@widget: -@value_map: -@Returns: - - diff --git a/doc/reference/shell/tmpl/e-html-utils.sgml b/doc/reference/shell/tmpl/e-html-utils.sgml deleted file mode 100644 index 7bf402148c..0000000000 --- a/doc/reference/shell/tmpl/e-html-utils.sgml +++ /dev/null @@ -1,99 +0,0 @@ -<!-- ##### SECTION Title ##### --> -Text to HTML Conversion - -<!-- ##### SECTION Short_Description ##### --> - - -<!-- ##### SECTION Long_Description ##### --> -<para> - -</para> - -<!-- ##### SECTION See_Also ##### --> -<para> - -</para> - -<!-- ##### SECTION Stability_Level ##### --> - - -<!-- ##### SECTION Image ##### --> - - -<!-- ##### MACRO E_TEXT_TO_HTML_PRE ##### --> -<para> - -</para> - - - -<!-- ##### MACRO E_TEXT_TO_HTML_CONVERT_NL ##### --> -<para> - -</para> - - - -<!-- ##### MACRO E_TEXT_TO_HTML_CONVERT_SPACES ##### --> -<para> - -</para> - - - -<!-- ##### MACRO E_TEXT_TO_HTML_CONVERT_URLS ##### --> -<para> - -</para> - - - -<!-- ##### MACRO E_TEXT_TO_HTML_MARK_CITATION ##### --> -<para> - -</para> - - - -<!-- ##### MACRO E_TEXT_TO_HTML_CONVERT_ADDRESSES ##### --> -<para> - -</para> - - - -<!-- ##### MACRO E_TEXT_TO_HTML_ESCAPE_8BIT ##### --> -<para> - -</para> - - - -<!-- ##### MACRO E_TEXT_TO_HTML_CITE ##### --> -<para> - -</para> - - - -<!-- ##### FUNCTION e_text_to_html_full ##### --> -<para> - -</para> - -@input: -@flags: -@color: -@Returns: - - -<!-- ##### FUNCTION e_text_to_html ##### --> -<para> - -</para> - -@input: -@flags: -@Returns: - - diff --git a/doc/reference/shell/tmpl/e-icon-factory.sgml b/doc/reference/shell/tmpl/e-icon-factory.sgml deleted file mode 100644 index ddd24e66ba..0000000000 --- a/doc/reference/shell/tmpl/e-icon-factory.sgml +++ /dev/null @@ -1,62 +0,0 @@ -<!-- ##### SECTION Title ##### --> -Icon Utilities (Legacy) - -<!-- ##### SECTION Short_Description ##### --> - - -<!-- ##### SECTION Long_Description ##### --> -<para> - -</para> - -<!-- ##### SECTION See_Also ##### --> -<para> - -</para> - -<!-- ##### SECTION Stability_Level ##### --> - - -<!-- ##### SECTION Image ##### --> - - -<!-- ##### FUNCTION e_icon_factory_get_icon_filename ##### --> -<para> - -</para> - -@icon_name: -@icon_size: -@Returns: - - -<!-- ##### FUNCTION e_icon_factory_get_icon ##### --> -<para> - -</para> - -@icon_name: -@icon_size: -@Returns: - - -<!-- ##### FUNCTION e_icon_factory_pixbuf_scale ##### --> -<para> - -</para> - -@pixbuf: -@width: -@height: -@Returns: - - -<!-- ##### FUNCTION e_icon_factory_create_thumbnail ##### --> -<para> - -</para> - -@filename: -@Returns: - - diff --git a/doc/reference/shell/tmpl/e-logger.sgml b/doc/reference/shell/tmpl/e-logger.sgml deleted file mode 100644 index 8b24f8be1b..0000000000 --- a/doc/reference/shell/tmpl/e-logger.sgml +++ /dev/null @@ -1,90 +0,0 @@ -<!-- ##### SECTION Title ##### --> -Error Logging - -<!-- ##### SECTION Short_Description ##### --> - - -<!-- ##### SECTION Long_Description ##### --> -<para> - -</para> - -<!-- ##### SECTION See_Also ##### --> -<para> - -</para> - -<!-- ##### SECTION Stability_Level ##### --> - - -<!-- ##### SECTION Image ##### --> - - -<!-- ##### STRUCT ELogger ##### --> -<para> - -</para> - - -<!-- ##### ARG ELogger:name ##### --> -<para> - -</para> - -<!-- ##### USER_FUNCTION ELogFunction ##### --> -<para> - -</para> - -@line: -@data: - - -<!-- ##### ENUM ELogLevel ##### --> -<para> - -</para> - -@E_LOG_ERROR: -@E_LOG_WARNING: -@E_LOG_DEBUG: - -<!-- ##### FUNCTION e_logger_new ##### --> -<para> - -</para> - -@name: -@Returns: - - -<!-- ##### FUNCTION e_logger_get_name ##### --> -<para> - -</para> - -@logger: -@Returns: - - -<!-- ##### FUNCTION e_logger_log ##### --> -<para> - -</para> - -@logger: -@level: -@primary: -@secondary: - - -<!-- ##### FUNCTION e_logger_get_logs ##### --> -<para> - -</para> - -@logger: -@func: -@user_data: - - diff --git a/doc/reference/shell/tmpl/e-poolv.sgml b/doc/reference/shell/tmpl/e-poolv.sgml deleted file mode 100644 index e58dc345ef..0000000000 --- a/doc/reference/shell/tmpl/e-poolv.sgml +++ /dev/null @@ -1,67 +0,0 @@ -<!-- ##### SECTION Title ##### --> -EPoolv - -<!-- ##### SECTION Short_Description ##### --> - - -<!-- ##### SECTION Long_Description ##### --> -<para> - -</para> - -<!-- ##### SECTION See_Also ##### --> -<para> - -</para> - -<!-- ##### SECTION Stability_Level ##### --> - - -<!-- ##### SECTION Image ##### --> - - -<!-- ##### STRUCT EPoolv ##### --> -<para> - -</para> - - -<!-- ##### FUNCTION e_poolv_new ##### --> -<para> - -</para> - -@size: -@Returns: - - -<!-- ##### FUNCTION e_poolv_set ##### --> -<para> - -</para> - -@poolv: -@index: -@str: -@freeit: -@Returns: - - -<!-- ##### FUNCTION e_poolv_get ##### --> -<para> - -</para> - -@poolv: -@index: -@Returns: - - -<!-- ##### FUNCTION e_poolv_destroy ##### --> -<para> - -</para> - -@poolv: - - diff --git a/doc/reference/shell/tmpl/e-popup-action.sgml b/doc/reference/shell/tmpl/e-popup-action.sgml deleted file mode 100644 index ad02da1fca..0000000000 --- a/doc/reference/shell/tmpl/e-popup-action.sgml +++ /dev/null @@ -1,58 +0,0 @@ -<!-- ##### SECTION Title ##### --> -e-popup-action - -<!-- ##### SECTION Short_Description ##### --> - - -<!-- ##### SECTION Long_Description ##### --> -<para> - -</para> - -<!-- ##### SECTION See_Also ##### --> -<para> - -</para> - -<!-- ##### SECTION Stability_Level ##### --> - - -<!-- ##### SECTION Image ##### --> - - -<!-- ##### STRUCT EPopupAction ##### --> -<para> - -</para> - -@parent: -@priv: - -<!-- ##### FUNCTION e_popup_action_new ##### --> -<para> - -</para> - -@name: -@Returns: - - -<!-- ##### STRUCT EPopupActionEntry ##### --> -<para> - -</para> - -@name: -@label: -@related: - -<!-- ##### FUNCTION e_action_group_add_popup_actions ##### --> -<para> - -</para> - -@action_group: -@entries: -@n_entries: - - diff --git a/doc/reference/shell/tmpl/e-print.sgml b/doc/reference/shell/tmpl/e-print.sgml deleted file mode 100644 index 81a9bb6864..0000000000 --- a/doc/reference/shell/tmpl/e-print.sgml +++ /dev/null @@ -1,39 +0,0 @@ -<!-- ##### SECTION Title ##### --> -Printing - -<!-- ##### SECTION Short_Description ##### --> - - -<!-- ##### SECTION Long_Description ##### --> -<para> - -</para> - -<!-- ##### SECTION See_Also ##### --> -<para> - -</para> - -<!-- ##### SECTION Stability_Level ##### --> - - -<!-- ##### SECTION Image ##### --> - - -<!-- ##### FUNCTION e_print_operation_new ##### --> -<para> - -</para> - -@void: -@Returns: - - -<!-- ##### FUNCTION e_print_run_page_setup_dialog ##### --> -<para> - -</para> - -@parent: - - diff --git a/doc/reference/shell/tmpl/e-selection.sgml b/doc/reference/shell/tmpl/e-selection.sgml deleted file mode 100644 index 71f32f3827..0000000000 --- a/doc/reference/shell/tmpl/e-selection.sgml +++ /dev/null @@ -1,194 +0,0 @@ -<!-- ##### SECTION Title ##### --> -Selections - -<!-- ##### SECTION Short_Description ##### --> - - -<!-- ##### SECTION Long_Description ##### --> -<para> - -</para> - -<!-- ##### SECTION See_Also ##### --> -<para> - -</para> - -<!-- ##### SECTION Stability_Level ##### --> - - -<!-- ##### SECTION Image ##### --> - - -<!-- ##### FUNCTION e_target_list_add_calendar_targets ##### --> -<para> - -</para> - -@list: -@info: - - -<!-- ##### FUNCTION e_target_list_add_directory_targets ##### --> -<para> - -</para> - -@list: -@info: - - -<!-- ##### FUNCTION e_selection_data_set_calendar ##### --> -<para> - -</para> - -@selection_data: -@source: -@length: -@Returns: - - -<!-- ##### FUNCTION e_selection_data_set_directory ##### --> -<para> - -</para> - -@selection_data: -@source: -@length: -@Returns: - - -<!-- ##### FUNCTION e_selection_data_get_calendar ##### --> -<para> - -</para> - -@selection_data: -@Returns: - - -<!-- ##### FUNCTION e_selection_data_get_directory ##### --> -<para> - -</para> - -@selection_data: -@Returns: - - -<!-- ##### FUNCTION e_selection_data_targets_include_calendar ##### --> -<para> - -</para> - -@selection_data: -@Returns: - - -<!-- ##### FUNCTION e_selection_data_targets_include_directory ##### --> -<para> - -</para> - -@selection_data: -@Returns: - - -<!-- ##### FUNCTION e_targets_include_calendar ##### --> -<para> - -</para> - -@targets: -@n_targets: -@Returns: - - -<!-- ##### FUNCTION e_targets_include_directory ##### --> -<para> - -</para> - -@targets: -@n_targets: -@Returns: - - -<!-- ##### FUNCTION e_clipboard_set_calendar ##### --> -<para> - -</para> - -@clipboard: -@source: -@length: - - -<!-- ##### FUNCTION e_clipboard_set_directory ##### --> -<para> - -</para> - -@clipboard: -@source: -@length: - - -<!-- ##### FUNCTION e_clipboard_request_calendar ##### --> -<para> - -</para> - -@clipboard: -@callback: -@user_data: - - -<!-- ##### FUNCTION e_clipboard_request_directory ##### --> -<para> - -</para> - -@clipboard: -@callback: -@user_data: - - -<!-- ##### FUNCTION e_clipboard_wait_for_calendar ##### --> -<para> - -</para> - -@clipboard: -@Returns: - - -<!-- ##### FUNCTION e_clipboard_wait_for_directory ##### --> -<para> - -</para> - -@clipboard: -@Returns: - - -<!-- ##### FUNCTION e_clipboard_wait_is_calendar_available ##### --> -<para> - -</para> - -@clipboard: -@Returns: - - -<!-- ##### FUNCTION e_clipboard_wait_is_directory_available ##### --> -<para> - -</para> - -@clipboard: -@Returns: - - diff --git a/doc/reference/shell/tmpl/e-shell-backend.sgml b/doc/reference/shell/tmpl/e-shell-backend.sgml deleted file mode 100644 index d8ccb8c6d2..0000000000 --- a/doc/reference/shell/tmpl/e-shell-backend.sgml +++ /dev/null @@ -1,134 +0,0 @@ -<!-- ##### SECTION Title ##### --> -EShellBackend - -<!-- ##### SECTION Short_Description ##### --> - - -<!-- ##### SECTION Long_Description ##### --> -<para> - -</para> - -<!-- ##### SECTION See_Also ##### --> -<para> - -</para> - -<!-- ##### SECTION Stability_Level ##### --> - - -<!-- ##### SECTION Image ##### --> - - -<!-- ##### STRUCT EShellBackend ##### --> -<para> - -</para> - - -<!-- ##### SIGNAL EShellBackend::activity-added ##### --> -<para> - -</para> - -@eshellbackend: the object which received the signal. -@arg1: - -<!-- ##### ARG EShellBackend:busy ##### --> -<para> - -</para> - -<!-- ##### FUNCTION e_shell_backend_compare ##### --> -<para> - -</para> - -@shell_backend_a: -@shell_backend_b: -@Returns: - - -<!-- ##### FUNCTION e_shell_backend_get_config_dir ##### --> -<para> - -</para> - -@shell_backend: -@Returns: - - -<!-- ##### FUNCTION e_shell_backend_get_data_dir ##### --> -<para> - -</para> - -@shell_backend: -@Returns: - - -<!-- ##### FUNCTION e_shell_backend_get_shell ##### --> -<para> - -</para> - -@shell_backend: -@Returns: - - -<!-- ##### FUNCTION e_shell_backend_add_activity ##### --> -<para> - -</para> - -@shell_backend: -@activity: - - -<!-- ##### FUNCTION e_shell_backend_cancel_all ##### --> -<para> - -</para> - -@shell_backend: - - -<!-- ##### FUNCTION e_shell_backend_is_busy ##### --> -<para> - -</para> - -@shell_backend: -@Returns: - - -<!-- ##### FUNCTION e_shell_backend_start ##### --> -<para> - -</para> - -@shell_backend: - - -<!-- ##### FUNCTION e_shell_backend_is_started ##### --> -<para> - -</para> - -@shell_backend: -@Returns: - - -<!-- ##### FUNCTION e_shell_backend_migrate ##### --> -<para> - -</para> - -@shell_backend: -@major: -@minor: -@micro: -@error: -@Returns: - - diff --git a/doc/reference/shell/tmpl/e-shell-content.sgml b/doc/reference/shell/tmpl/e-shell-content.sgml deleted file mode 100644 index 2fd9f79f3d..0000000000 --- a/doc/reference/shell/tmpl/e-shell-content.sgml +++ /dev/null @@ -1,133 +0,0 @@ -<!-- ##### SECTION Title ##### --> -EShellContent - -<!-- ##### SECTION Short_Description ##### --> - - -<!-- ##### SECTION Long_Description ##### --> -<para> - -</para> - -<!-- ##### SECTION See_Also ##### --> -<para> - -</para> - -<!-- ##### SECTION Stability_Level ##### --> - - -<!-- ##### SECTION Image ##### --> - - -<!-- ##### STRUCT EShellContent ##### --> -<para> - -</para> - - -<!-- ##### ARG EShellContent:alert-bar ##### --> -<para> - -</para> - -<!-- ##### ARG EShellContent:shell-view ##### --> -<para> - -</para> - -<!-- ##### FUNCTION e_shell_content_new ##### --> -<para> - -</para> - -@shell_view: -@Returns: - - -<!-- ##### FUNCTION e_shell_content_set_searchbar ##### --> -<para> - -</para> - -@shell_content: -@searchbar: - - -<!-- ##### FUNCTION e_shell_content_check_state ##### --> -<para> - -</para> - -@shell_content: -@Returns: - - -<!-- ##### FUNCTION e_shell_content_focus_search_results ##### --> -<para> - -</para> - -@shell_content: - - -<!-- ##### FUNCTION e_shell_content_get_alert_bar ##### --> -<para> - -</para> - -@shell_content: -@Returns: - - -<!-- ##### FUNCTION e_shell_content_get_shell_view ##### --> -<para> - -</para> - -@shell_content: -@Returns: - - -<!-- ##### FUNCTION e_shell_content_get_view_id ##### --> -<para> - -</para> - -@shell_content: -@Returns: - - -<!-- ##### FUNCTION e_shell_content_set_view_id ##### --> -<para> - -</para> - -@shell_content: -@view_id: - - -<!-- ##### FUNCTION e_shell_content_run_advanced_search_dialog ##### --> -<para> - -</para> - -@shell_content: - - -<!-- ##### FUNCTION e_shell_content_run_edit_searches_dialog ##### --> -<para> - -</para> - -@shell_content: - - -<!-- ##### FUNCTION e_shell_content_run_save_search_dialog ##### --> -<para> - -</para> - -@shell_content: - - diff --git a/doc/reference/shell/tmpl/e-shell-searchbar.sgml b/doc/reference/shell/tmpl/e-shell-searchbar.sgml deleted file mode 100644 index fd575ae949..0000000000 --- a/doc/reference/shell/tmpl/e-shell-searchbar.sgml +++ /dev/null @@ -1,310 +0,0 @@ -<!-- ##### SECTION Title ##### --> -EShellSearchbar - -<!-- ##### SECTION Short_Description ##### --> - - -<!-- ##### SECTION Long_Description ##### --> -<para> - -</para> - -<!-- ##### SECTION See_Also ##### --> -<para> - -</para> - -<!-- ##### SECTION Stability_Level ##### --> - - -<!-- ##### SECTION Image ##### --> - - -<!-- ##### STRUCT EShellSearchbar ##### --> -<para> - -</para> - - -<!-- ##### ARG EShellSearchbar:express-mode ##### --> -<para> - -</para> - -<!-- ##### ARG EShellSearchbar:filter-combo-box ##### --> -<para> - -</para> - -<!-- ##### ARG EShellSearchbar:filter-visible ##### --> -<para> - -</para> - -<!-- ##### ARG EShellSearchbar:labels-visible ##### --> -<para> - -</para> - -<!-- ##### ARG EShellSearchbar:scope-combo-box ##### --> -<para> - -</para> - -<!-- ##### ARG EShellSearchbar:scope-visible ##### --> -<para> - -</para> - -<!-- ##### ARG EShellSearchbar:search-hint ##### --> -<para> - -</para> - -<!-- ##### ARG EShellSearchbar:search-option ##### --> -<para> - -</para> - -<!-- ##### ARG EShellSearchbar:search-text ##### --> -<para> - -</para> - -<!-- ##### ARG EShellSearchbar:search-visible ##### --> -<para> - -</para> - -<!-- ##### ARG EShellSearchbar:shell-view ##### --> -<para> - -</para> - -<!-- ##### ARG EShellSearchbar:state-group ##### --> -<para> - -</para> - -<!-- ##### FUNCTION e_shell_searchbar_new ##### --> -<para> - -</para> - -@shell_view: -@Returns: - - -<!-- ##### FUNCTION e_shell_searchbar_get_shell_view ##### --> -<para> - -</para> - -@searchbar: -@Returns: - - -<!-- ##### FUNCTION e_shell_searchbar_get_express_mode ##### --> -<para> - -</para> - -@searchbar: -@Returns: - - -<!-- ##### FUNCTION e_shell_searchbar_set_express_mode ##### --> -<para> - -</para> - -@searchbar: -@express_mode: - - -<!-- ##### FUNCTION e_shell_searchbar_get_filter_combo_box ##### --> -<para> - -</para> - -@searchbar: -@Returns: - - -<!-- ##### FUNCTION e_shell_searchbar_get_filter_visible ##### --> -<para> - -</para> - -@searchbar: -@Returns: - - -<!-- ##### FUNCTION e_shell_searchbar_set_filter_visible ##### --> -<para> - -</para> - -@searchbar: -@filter_visible: - - -<!-- ##### FUNCTION e_shell_searchbar_get_labels_visible ##### --> -<para> - -</para> - -@searchbar: -@Returns: - - -<!-- ##### FUNCTION e_shell_searchbar_set_labels_visible ##### --> -<para> - -</para> - -@searchbar: -@labels_visible: - - -<!-- ##### FUNCTION e_shell_searchbar_get_search_hint ##### --> -<para> - -</para> - -@searchbar: -@Returns: - - -<!-- ##### FUNCTION e_shell_searchbar_set_search_hint ##### --> -<para> - -</para> - -@searchbar: -@search_hint: - - -<!-- ##### FUNCTION e_shell_searchbar_get_search_option ##### --> -<para> - -</para> - -@searchbar: -@Returns: - - -<!-- ##### FUNCTION e_shell_searchbar_set_search_option ##### --> -<para> - -</para> - -@searchbar: -@search_option: - - -<!-- ##### FUNCTION e_shell_searchbar_get_search_text ##### --> -<para> - -</para> - -@searchbar: -@Returns: - - -<!-- ##### FUNCTION e_shell_searchbar_set_search_text ##### --> -<para> - -</para> - -@searchbar: -@search_text: - - -<!-- ##### FUNCTION e_shell_searchbar_get_search_visible ##### --> -<para> - -</para> - -@searchbar: -@Returns: - - -<!-- ##### FUNCTION e_shell_searchbar_set_search_visible ##### --> -<para> - -</para> - -@searchbar: -@search_visible: - - -<!-- ##### FUNCTION e_shell_searchbar_get_scope_combo_box ##### --> -<para> - -</para> - -@searchbar: -@Returns: - - -<!-- ##### FUNCTION e_shell_searchbar_get_scope_visible ##### --> -<para> - -</para> - -@searchbar: -@Returns: - - -<!-- ##### FUNCTION e_shell_searchbar_set_scope_visible ##### --> -<para> - -</para> - -@searchbar: -@scope_visible: - - -<!-- ##### FUNCTION e_shell_searchbar_set_state_dirty ##### --> -<para> - -</para> - -@searchbar: - - -<!-- ##### FUNCTION e_shell_searchbar_get_state_group ##### --> -<para> - -</para> - -@searchbar: -@Returns: - - -<!-- ##### FUNCTION e_shell_searchbar_set_state_group ##### --> -<para> - -</para> - -@searchbar: -@state_group: - - -<!-- ##### FUNCTION e_shell_searchbar_load_state ##### --> -<para> - -</para> - -@searchbar: - - -<!-- ##### FUNCTION e_shell_searchbar_save_state ##### --> -<para> - -</para> - -@searchbar: - - diff --git a/doc/reference/shell/tmpl/e-shell-settings.sgml b/doc/reference/shell/tmpl/e-shell-settings.sgml deleted file mode 100644 index 375b7ff078..0000000000 --- a/doc/reference/shell/tmpl/e-shell-settings.sgml +++ /dev/null @@ -1,153 +0,0 @@ -<!-- ##### SECTION Title ##### --> -EShellSettings - -<!-- ##### SECTION Short_Description ##### --> - - -<!-- ##### SECTION Long_Description ##### --> -<para> - -</para> - -<!-- ##### SECTION See_Also ##### --> -<para> - -</para> - -<!-- ##### SECTION Stability_Level ##### --> - - -<!-- ##### SECTION Image ##### --> - - -<!-- ##### STRUCT EShellSettings ##### --> -<para> - -</para> - - -<!-- ##### FUNCTION e_shell_settings_install_property ##### --> -<para> - -</para> - -@pspec: - - -<!-- ##### FUNCTION e_shell_settings_install_property_for_key ##### --> -<para> - -</para> - -@property_name: -@gconf_key: - - -<!-- ##### FUNCTION e_shell_settings_enable_debug ##### --> -<para> - -</para> - -@shell_settings: - - -<!-- ##### FUNCTION e_shell_settings_get_boolean ##### --> -<para> - -</para> - -@shell_settings: -@property_name: -@Returns: - - -<!-- ##### FUNCTION e_shell_settings_set_boolean ##### --> -<para> - -</para> - -@shell_settings: -@property_name: -@v_boolean: - - -<!-- ##### FUNCTION e_shell_settings_get_int ##### --> -<para> - -</para> - -@shell_settings: -@property_name: -@Returns: - - -<!-- ##### FUNCTION e_shell_settings_set_int ##### --> -<para> - -</para> - -@shell_settings: -@property_name: -@v_int: - - -<!-- ##### FUNCTION e_shell_settings_get_string ##### --> -<para> - -</para> - -@shell_settings: -@property_name: -@Returns: - - -<!-- ##### FUNCTION e_shell_settings_set_string ##### --> -<para> - -</para> - -@shell_settings: -@property_name: -@v_string: - - -<!-- ##### FUNCTION e_shell_settings_get_object ##### --> -<para> - -</para> - -@shell_settings: -@property_name: -@Returns: - - -<!-- ##### FUNCTION e_shell_settings_set_object ##### --> -<para> - -</para> - -@shell_settings: -@property_name: -@v_object: - - -<!-- ##### FUNCTION e_shell_settings_get_pointer ##### --> -<para> - -</para> - -@shell_settings: -@property_name: -@Returns: - - -<!-- ##### FUNCTION e_shell_settings_set_pointer ##### --> -<para> - -</para> - -@shell_settings: -@property_name: -@v_pointer: - - diff --git a/doc/reference/shell/tmpl/e-shell-sidebar.sgml b/doc/reference/shell/tmpl/e-shell-sidebar.sgml deleted file mode 100644 index 3f65241857..0000000000 --- a/doc/reference/shell/tmpl/e-shell-sidebar.sgml +++ /dev/null @@ -1,129 +0,0 @@ -<!-- ##### SECTION Title ##### --> -EShellSidebar - -<!-- ##### SECTION Short_Description ##### --> - - -<!-- ##### SECTION Long_Description ##### --> -<para> - -</para> - -<!-- ##### SECTION See_Also ##### --> -<para> - -</para> - -<!-- ##### SECTION Stability_Level ##### --> - - -<!-- ##### SECTION Image ##### --> - - -<!-- ##### STRUCT EShellSidebar ##### --> -<para> - -</para> - - -<!-- ##### ARG EShellSidebar:icon-name ##### --> -<para> - -</para> - -<!-- ##### ARG EShellSidebar:primary-text ##### --> -<para> - -</para> - -<!-- ##### ARG EShellSidebar:secondary-text ##### --> -<para> - -</para> - -<!-- ##### ARG EShellSidebar:shell-view ##### --> -<para> - -</para> - -<!-- ##### FUNCTION e_shell_sidebar_new ##### --> -<para> - -</para> - -@shell_view: -@Returns: - - -<!-- ##### FUNCTION e_shell_sidebar_check_state ##### --> -<para> - -</para> - -@shell_sidebar: -@Returns: - - -<!-- ##### FUNCTION e_shell_sidebar_get_shell_view ##### --> -<para> - -</para> - -@shell_sidebar: -@Returns: - - -<!-- ##### FUNCTION e_shell_sidebar_get_icon_name ##### --> -<para> - -</para> - -@shell_sidebar: -@Returns: - - -<!-- ##### FUNCTION e_shell_sidebar_set_icon_name ##### --> -<para> - -</para> - -@shell_sidebar: -@icon_name: - - -<!-- ##### FUNCTION e_shell_sidebar_get_primary_text ##### --> -<para> - -</para> - -@shell_sidebar: -@Returns: - - -<!-- ##### FUNCTION e_shell_sidebar_set_primary_text ##### --> -<para> - -</para> - -@shell_sidebar: -@primary_text: - - -<!-- ##### FUNCTION e_shell_sidebar_get_secondary_text ##### --> -<para> - -</para> - -@shell_sidebar: -@Returns: - - -<!-- ##### FUNCTION e_shell_sidebar_set_secondary_text ##### --> -<para> - -</para> - -@shell_sidebar: -@secondary_text: - - diff --git a/doc/reference/shell/tmpl/e-shell-switcher.sgml b/doc/reference/shell/tmpl/e-shell-switcher.sgml deleted file mode 100644 index 6c991cb45d..0000000000 --- a/doc/reference/shell/tmpl/e-shell-switcher.sgml +++ /dev/null @@ -1,109 +0,0 @@ -<!-- ##### SECTION Title ##### --> -EShellSwitcher - -<!-- ##### SECTION Short_Description ##### --> - - -<!-- ##### SECTION Long_Description ##### --> -<para> - -</para> - -<!-- ##### SECTION See_Also ##### --> -<para> - -</para> - -<!-- ##### SECTION Stability_Level ##### --> - - -<!-- ##### SECTION Image ##### --> - - -<!-- ##### STRUCT EShellSwitcher ##### --> -<para> - -</para> - - -<!-- ##### SIGNAL EShellSwitcher::style-changed ##### --> -<para> - -</para> - -@eshellswitcher: the object which received the signal. -@arg1: - -<!-- ##### ARG EShellSwitcher:toolbar-style ##### --> -<para> - -</para> - -<!-- ##### ARG EShellSwitcher:toolbar-visible ##### --> -<para> - -</para> - -<!-- ##### FUNCTION e_shell_switcher_new ##### --> -<para> - -</para> - -@void: -@Returns: - - -<!-- ##### FUNCTION e_shell_switcher_add_action ##### --> -<para> - -</para> - -@switcher: -@switch_action: -@new_window_action: - - -<!-- ##### FUNCTION e_shell_switcher_get_style ##### --> -<para> - -</para> - -@switcher: -@Returns: - - -<!-- ##### FUNCTION e_shell_switcher_set_style ##### --> -<para> - -</para> - -@switcher: -@style: - - -<!-- ##### FUNCTION e_shell_switcher_unset_style ##### --> -<para> - -</para> - -@switcher: - - -<!-- ##### FUNCTION e_shell_switcher_get_visible ##### --> -<para> - -</para> - -@switcher: -@Returns: - - -<!-- ##### FUNCTION e_shell_switcher_set_visible ##### --> -<para> - -</para> - -@switcher: -@visible: - - diff --git a/doc/reference/shell/tmpl/e-shell-taskbar.sgml b/doc/reference/shell/tmpl/e-shell-taskbar.sgml deleted file mode 100644 index c1e9a658b6..0000000000 --- a/doc/reference/shell/tmpl/e-shell-taskbar.sgml +++ /dev/null @@ -1,91 +0,0 @@ -<!-- ##### SECTION Title ##### --> -EShellTaskbar - -<!-- ##### SECTION Short_Description ##### --> - - -<!-- ##### SECTION Long_Description ##### --> -<para> - -</para> - -<!-- ##### SECTION See_Also ##### --> -<para> - -</para> - -<!-- ##### SECTION Stability_Level ##### --> - - -<!-- ##### SECTION Image ##### --> - - -<!-- ##### STRUCT EShellTaskbar ##### --> -<para> - -</para> - - -<!-- ##### ARG EShellTaskbar:message ##### --> -<para> - -</para> - -<!-- ##### ARG EShellTaskbar:shell-view ##### --> -<para> - -</para> - -<!-- ##### FUNCTION e_shell_taskbar_new ##### --> -<para> - -</para> - -@shell_view: -@Returns: - - -<!-- ##### FUNCTION e_shell_taskbar_get_shell_view ##### --> -<para> - -</para> - -@shell_taskbar: -@Returns: - - -<!-- ##### FUNCTION e_shell_taskbar_get_message ##### --> -<para> - -</para> - -@shell_taskbar: -@Returns: - - -<!-- ##### FUNCTION e_shell_taskbar_set_message ##### --> -<para> - -</para> - -@shell_taskbar: -@message: - - -<!-- ##### FUNCTION e_shell_taskbar_unset_message ##### --> -<para> - -</para> - -@shell_taskbar: - - -<!-- ##### FUNCTION e_shell_taskbar_get_activity_count ##### --> -<para> - -</para> - -@shell_taskbar: -@Returns: - - diff --git a/doc/reference/shell/tmpl/e-shell-utils.sgml b/doc/reference/shell/tmpl/e-shell-utils.sgml deleted file mode 100644 index 2b41b82167..0000000000 --- a/doc/reference/shell/tmpl/e-shell-utils.sgml +++ /dev/null @@ -1,78 +0,0 @@ -<!-- ##### SECTION Title ##### --> -Shell Utilities - -<!-- ##### SECTION Short_Description ##### --> - - -<!-- ##### SECTION Long_Description ##### --> -<para> - -</para> - -<!-- ##### SECTION See_Also ##### --> -<para> - -</para> - -<!-- ##### SECTION Stability_Level ##### --> - - -<!-- ##### SECTION Image ##### --> - - -<!-- ##### FUNCTION e_shell_configure_ui_manager ##### --> -<para> - -</para> - -@shell: -@ui_manager: - - -<!-- ##### FUNCTION e_shell_run_open_dialog ##### --> -<para> - -</para> - -@shell: -@title: -@customize_func: -@customize_data: -@Returns: - - -<!-- ##### FUNCTION e_shell_run_save_dialog ##### --> -<para> - -</para> - -@shell: -@title: -@suggestion: -@filters: -@customize_func: -@customize_data: -@Returns: - - -<!-- ##### FUNCTION e_shell_utils_import_uris ##### --> -<para> - -</para> - -@shell: -@uris: -@Returns: - - -<!-- ##### FUNCTION e_shell_hide_widgets_for_express_mode ##### --> -<para> - -</para> - -@shell: -@builder: -@widget_name: -@Varargs: - - diff --git a/doc/reference/shell/tmpl/e-shell-view.sgml b/doc/reference/shell/tmpl/e-shell-view.sgml deleted file mode 100644 index fd7cb4b48f..0000000000 --- a/doc/reference/shell/tmpl/e-shell-view.sgml +++ /dev/null @@ -1,429 +0,0 @@ -<!-- ##### SECTION Title ##### --> -EShellView - -<!-- ##### SECTION Short_Description ##### --> - - -<!-- ##### SECTION Long_Description ##### --> -<para> - -</para> - -<!-- ##### SECTION See_Also ##### --> -<para> - -</para> - -<!-- ##### SECTION Stability_Level ##### --> - - -<!-- ##### SECTION Image ##### --> - - -<!-- ##### STRUCT EShellView ##### --> -<para> - -</para> - - -<!-- ##### SIGNAL EShellView::clear-search ##### --> -<para> - -</para> - -@eshellview: the object which received the signal. - -<!-- ##### SIGNAL EShellView::custom-search ##### --> -<para> - -</para> - -@eshellview: the object which received the signal. -@arg1: - -<!-- ##### SIGNAL EShellView::execute-search ##### --> -<para> - -</para> - -@eshellview: the object which received the signal. - -<!-- ##### SIGNAL EShellView::toggled ##### --> -<para> - -</para> - -@eshellview: the object which received the signal. - -<!-- ##### SIGNAL EShellView::update-actions ##### --> -<para> - -</para> - -@eshellview: the object which received the signal. - -<!-- ##### ARG EShellView:action ##### --> -<para> - -</para> - -<!-- ##### ARG EShellView:page-num ##### --> -<para> - -</para> - -<!-- ##### ARG EShellView:search-rule ##### --> -<para> - -</para> - -<!-- ##### ARG EShellView:shell-backend ##### --> -<para> - -</para> - -<!-- ##### ARG EShellView:shell-content ##### --> -<para> - -</para> - -<!-- ##### ARG EShellView:shell-sidebar ##### --> -<para> - -</para> - -<!-- ##### ARG EShellView:shell-taskbar ##### --> -<para> - -</para> - -<!-- ##### ARG EShellView:shell-window ##### --> -<para> - -</para> - -<!-- ##### ARG EShellView:state-key-file ##### --> -<para> - -</para> - -<!-- ##### ARG EShellView:title ##### --> -<para> - -</para> - -<!-- ##### ARG EShellView:view-id ##### --> -<para> - -</para> - -<!-- ##### STRUCT EShellViewClass ##### --> -<para> - -</para> - -@parent_class: -@label: -@icon_name: -@ui_definition: -@ui_manager_id: -@search_context_type: -@search_context: -@search_options: -@search_rules: -@view_collection: -@shell_backend: -@new_shell_content: -@new_shell_sidebar: -@new_shell_taskbar: -@construct_searchbar: -@get_search_name: -@toggled: -@clear_search: -@custom_search: -@execute_search: -@update_actions: - -<!-- ##### FUNCTION e_shell_view_get_name ##### --> -<para> - -</para> - -@shell_view: -@Returns: - - -<!-- ##### FUNCTION e_shell_view_get_action ##### --> -<para> - -</para> - -@shell_view: -@Returns: - - -<!-- ##### FUNCTION e_shell_view_get_title ##### --> -<para> - -</para> - -@shell_view: -@Returns: - - -<!-- ##### FUNCTION e_shell_view_set_title ##### --> -<para> - -</para> - -@shell_view: -@title: - - -<!-- ##### FUNCTION e_shell_view_get_view_id ##### --> -<para> - -</para> - -@shell_view: -@Returns: - - -<!-- ##### FUNCTION e_shell_view_set_view_id ##### --> -<para> - -</para> - -@shell_view: -@view_id: - - -<!-- ##### FUNCTION e_shell_view_is_active ##### --> -<para> - -</para> - -@shell_view: -@Returns: - - -<!-- ##### FUNCTION e_shell_view_get_page_num ##### --> -<para> - -</para> - -@shell_view: -@Returns: - - -<!-- ##### FUNCTION e_shell_view_set_page_num ##### --> -<para> - -</para> - -@shell_view: -@page_num: - - -<!-- ##### FUNCTION e_shell_view_get_searchbar ##### --> -<para> - -</para> - -@shell_view: -@Returns: - - -<!-- ##### FUNCTION e_shell_view_get_search_name ##### --> -<para> - -</para> - -@shell_view: -@Returns: - - -<!-- ##### FUNCTION e_shell_view_get_search_rule ##### --> -<para> - -</para> - -@shell_view: -@Returns: - - -<!-- ##### FUNCTION e_shell_view_set_search_rule ##### --> -<para> - -</para> - -@shell_view: -@search_rule: - - -<!-- ##### FUNCTION e_shell_view_get_search_query ##### --> -<para> - -</para> - -@shell_view: -@Returns: - - -<!-- ##### FUNCTION e_shell_view_get_size_group ##### --> -<para> - -</para> - -@shell_view: -@Returns: - - -<!-- ##### FUNCTION e_shell_view_get_shell_backend ##### --> -<para> - -</para> - -@shell_view: -@Returns: - - -<!-- ##### FUNCTION e_shell_view_get_shell_content ##### --> -<para> - -</para> - -@shell_view: -@Returns: - - -<!-- ##### FUNCTION e_shell_view_get_shell_sidebar ##### --> -<para> - -</para> - -@shell_view: -@Returns: - - -<!-- ##### FUNCTION e_shell_view_get_shell_taskbar ##### --> -<para> - -</para> - -@shell_view: -@Returns: - - -<!-- ##### FUNCTION e_shell_view_get_shell_window ##### --> -<para> - -</para> - -@shell_view: -@Returns: - - -<!-- ##### FUNCTION e_shell_view_get_state_key_file ##### --> -<para> - -</para> - -@shell_view: -@Returns: - - -<!-- ##### FUNCTION e_shell_view_set_state_dirty ##### --> -<para> - -</para> - -@shell_view: - - -<!-- ##### FUNCTION e_shell_view_clear_search ##### --> -<para> - -</para> - -@shell_view: - - -<!-- ##### FUNCTION e_shell_view_custom_search ##### --> -<para> - -</para> - -@shell_view: -@custom_rule: - - -<!-- ##### FUNCTION e_shell_view_execute_search ##### --> -<para> - -</para> - -@shell_view: - - -<!-- ##### FUNCTION e_shell_view_block_execute_search ##### --> -<para> - -</para> - -@shell_view: - - -<!-- ##### FUNCTION e_shell_view_unblock_execute_search ##### --> -<para> - -</para> - -@shell_view: - - -<!-- ##### FUNCTION e_shell_view_update_actions ##### --> -<para> - -</para> - -@shell_view: - - -<!-- ##### FUNCTION e_shell_view_block_update_actions ##### --> -<para> - -</para> - -@shell_view: - - -<!-- ##### FUNCTION e_shell_view_unblock_update_actions ##### --> -<para> - -</para> - -@shell_view: - - -<!-- ##### FUNCTION e_shell_view_show_popup_menu ##### --> -<para> - -</para> - -@shell_view: -@widget_path: -@event: -@Returns: - - -<!-- ##### FUNCTION e_shell_view_new_view_instance ##### --> -<para> - -</para> - -@shell_view: -@instance_id: -@Returns: - - diff --git a/doc/reference/shell/tmpl/e-shell-window.sgml b/doc/reference/shell/tmpl/e-shell-window.sgml deleted file mode 100644 index 396f4ac4d1..0000000000 --- a/doc/reference/shell/tmpl/e-shell-window.sgml +++ /dev/null @@ -1,346 +0,0 @@ -<!-- ##### SECTION Title ##### --> -EShellWindow - -<!-- ##### SECTION Short_Description ##### --> - - -<!-- ##### SECTION Long_Description ##### --> -<para> - -</para> - -<!-- ##### SECTION See_Also ##### --> -<para> - -</para> - -<!-- ##### SECTION Stability_Level ##### --> - - -<!-- ##### SECTION Image ##### --> - - -<!-- ##### STRUCT EShellWindow ##### --> -<para> - -</para> - - -<!-- ##### SIGNAL EShellWindow::shell-view-created ##### --> -<para> - -</para> - -@eshellwindow: the object which received the signal. -@arg1: - -<!-- ##### ARG EShellWindow:active-view ##### --> -<para> - -</para> - -<!-- ##### ARG EShellWindow:alert-bar ##### --> -<para> - -</para> - -<!-- ##### ARG EShellWindow:focus-tracker ##### --> -<para> - -</para> - -<!-- ##### ARG EShellWindow:geometry ##### --> -<para> - -</para> - -<!-- ##### ARG EShellWindow:safe-mode ##### --> -<para> - -</para> - -<!-- ##### ARG EShellWindow:shell ##### --> -<para> - -</para> - -<!-- ##### ARG EShellWindow:sidebar-visible ##### --> -<para> - -</para> - -<!-- ##### ARG EShellWindow:switcher-visible ##### --> -<para> - -</para> - -<!-- ##### ARG EShellWindow:taskbar-visible ##### --> -<para> - -</para> - -<!-- ##### ARG EShellWindow:toolbar-visible ##### --> -<para> - -</para> - -<!-- ##### ARG EShellWindow:ui-manager ##### --> -<para> - -</para> - -<!-- ##### FUNCTION e_shell_window_new ##### --> -<para> - -</para> - -@shell: -@safe_mode: -@geometry: -@Returns: - - -<!-- ##### FUNCTION e_shell_window_get_shell ##### --> -<para> - -</para> - -@shell_window: -@Returns: - - -<!-- ##### FUNCTION e_shell_window_get_shell_view ##### --> -<para> - -</para> - -@shell_window: -@view_name: -@Returns: - - -<!-- ##### FUNCTION e_shell_window_peek_shell_view ##### --> -<para> - -</para> - -@shell_window: -@view_name: -@Returns: - - -<!-- ##### FUNCTION e_shell_window_get_shell_view_action ##### --> -<para> - -</para> - -@shell_window: -@view_name: -@Returns: - - -<!-- ##### FUNCTION e_shell_window_get_alert_bar ##### --> -<para> - -</para> - -@shell_window: -@Returns: - - -<!-- ##### FUNCTION e_shell_window_get_focus_tracker ##### --> -<para> - -</para> - -@shell_window: -@Returns: - - -<!-- ##### FUNCTION e_shell_window_get_ui_manager ##### --> -<para> - -</para> - -@shell_window: -@Returns: - - -<!-- ##### FUNCTION e_shell_window_get_action ##### --> -<para> - -</para> - -@shell_window: -@action_name: -@Returns: - - -<!-- ##### FUNCTION e_shell_window_get_action_group ##### --> -<para> - -</para> - -@shell_window: -@group_name: -@Returns: - - -<!-- ##### FUNCTION e_shell_window_get_managed_widget ##### --> -<para> - -</para> - -@shell_window: -@widget_path: -@Returns: - - -<!-- ##### FUNCTION e_shell_window_get_active_view ##### --> -<para> - -</para> - -@shell_window: -@Returns: - - -<!-- ##### FUNCTION e_shell_window_set_active_view ##### --> -<para> - -</para> - -@shell_window: -@view_name: - - -<!-- ##### FUNCTION e_shell_window_get_safe_mode ##### --> -<para> - -</para> - -@shell_window: -@Returns: - - -<!-- ##### FUNCTION e_shell_window_set_safe_mode ##### --> -<para> - -</para> - -@shell_window: -@safe_mode: - - -<!-- ##### FUNCTION e_shell_window_add_action_group ##### --> -<para> - -</para> - -@shell_window: -@group_name: - - -<!-- ##### FUNCTION e_shell_window_get_sidebar_visible ##### --> -<para> - -</para> - -@shell_window: -@Returns: - - -<!-- ##### FUNCTION e_shell_window_set_sidebar_visible ##### --> -<para> - -</para> - -@shell_window: -@sidebar_visible: - - -<!-- ##### FUNCTION e_shell_window_get_switcher_visible ##### --> -<para> - -</para> - -@shell_window: -@Returns: - - -<!-- ##### FUNCTION e_shell_window_set_switcher_visible ##### --> -<para> - -</para> - -@shell_window: -@switcher_visible: - - -<!-- ##### FUNCTION e_shell_window_get_taskbar_visible ##### --> -<para> - -</para> - -@shell_window: -@Returns: - - -<!-- ##### FUNCTION e_shell_window_set_taskbar_visible ##### --> -<para> - -</para> - -@shell_window: -@taskbar_visible: - - -<!-- ##### FUNCTION e_shell_window_get_toolbar_visible ##### --> -<para> - -</para> - -@shell_window: -@Returns: - - -<!-- ##### FUNCTION e_shell_window_set_toolbar_visible ##### --> -<para> - -</para> - -@shell_window: -@toolbar_visible: - - -<!-- ##### FUNCTION e_shell_window_register_new_item_actions ##### --> -<para> - -</para> - -@shell_window: -@backend_name: -@entries: -@n_entries: - - -<!-- ##### FUNCTION e_shell_window_register_new_source_actions ##### --> -<para> - -</para> - -@shell_window: -@backend_name: -@entries: -@n_entries: - - -<!-- ##### FUNCTION e_shell_window_get_menu_bar_box ##### --> -<para> - -</para> - -@shell_window: -@Returns: - - diff --git a/doc/reference/shell/tmpl/e-shell.sgml b/doc/reference/shell/tmpl/e-shell.sgml deleted file mode 100644 index 94c6e1169c..0000000000 --- a/doc/reference/shell/tmpl/e-shell.sgml +++ /dev/null @@ -1,417 +0,0 @@ -<!-- ##### SECTION Title ##### --> -EShell - -<!-- ##### SECTION Short_Description ##### --> - - -<!-- ##### SECTION Long_Description ##### --> -<para> - -</para> - -<!-- ##### SECTION See_Also ##### --> -<para> - -</para> - -<!-- ##### SECTION Stability_Level ##### --> - - -<!-- ##### SECTION Image ##### --> - - -<!-- ##### STRUCT EShell ##### --> -<para> - -</para> - - -<!-- ##### SIGNAL EShell::event ##### --> -<para> - -</para> - -@eshell: the object which received the signal. -@arg1: - -<!-- ##### SIGNAL EShell::handle-uri ##### --> -<para> - -</para> - -@eshell: the object which received the signal. -@arg1: -@Returns: - -<!-- ##### SIGNAL EShell::prepare-for-offline ##### --> -<para> - -</para> - -@eshell: the object which received the signal. -@arg1: - -<!-- ##### SIGNAL EShell::prepare-for-online ##### --> -<para> - -</para> - -@eshell: the object which received the signal. -@arg1: - -<!-- ##### SIGNAL EShell::prepare-for-quit ##### --> -<para> - -</para> - -@eshell: the object which received the signal. -@arg1: - -<!-- ##### SIGNAL EShell::quit-requested ##### --> -<para> - -</para> - -@eshell: the object which received the signal. -@Param2: - -<!-- ##### ARG EShell:express-mode ##### --> -<para> - -</para> - -<!-- ##### ARG EShell:geometry ##### --> -<para> - -</para> - -<!-- ##### ARG EShell:meego-mode ##### --> -<para> - -</para> - -<!-- ##### ARG EShell:module-directory ##### --> -<para> - -</para> - -<!-- ##### ARG EShell:network-available ##### --> -<para> - -</para> - -<!-- ##### ARG EShell:online ##### --> -<para> - -</para> - -<!-- ##### ARG EShell:shell-settings ##### --> -<para> - -</para> - -<!-- ##### ARG EShell:small-screen-mode ##### --> -<para> - -</para> - -<!-- ##### FUNCTION e_shell_get_default ##### --> -<para> - -</para> - -@void: -@Returns: - - -<!-- ##### FUNCTION e_shell_load_modules ##### --> -<para> - -</para> - -@shell: - - -<!-- ##### FUNCTION e_shell_get_shell_backends ##### --> -<para> - -</para> - -@shell: -@Returns: - - -<!-- ##### FUNCTION e_shell_get_canonical_name ##### --> -<para> - -</para> - -@shell: -@name: -@Returns: - - -<!-- ##### FUNCTION e_shell_get_backend_by_name ##### --> -<para> - -</para> - -@shell: -@name: -@Returns: - - -<!-- ##### FUNCTION e_shell_get_backend_by_scheme ##### --> -<para> - -</para> - -@shell: -@scheme: -@Returns: - - -<!-- ##### FUNCTION e_shell_get_shell_settings ##### --> -<para> - -</para> - -@shell: -@Returns: - - -<!-- ##### FUNCTION e_shell_get_gconf_client ##### --> -<para> - -</para> - -@shell: -@Returns: - - -<!-- ##### FUNCTION e_shell_create_shell_window ##### --> -<para> - -</para> - -@shell: -@view_name: -@Returns: - - -<!-- ##### FUNCTION e_shell_handle_uris ##### --> -<para> - -</para> - -@shell: -@uris: -@do_import: -@Returns: - - -<!-- ##### FUNCTION e_shell_submit_alert ##### --> -<para> - -</para> - -@shell: -@alert: - - -<!-- ##### FUNCTION e_shell_get_active_window ##### --> -<para> - -</para> - -@shell: -@Returns: - - -<!-- ##### FUNCTION e_shell_get_meego_mode ##### --> -<para> - -</para> - -@shell: -@Returns: - - -<!-- ##### FUNCTION e_shell_get_express_mode ##### --> -<para> - -</para> - -@shell: -@Returns: - - -<!-- ##### FUNCTION e_shell_get_small_screen_mode ##### --> -<para> - -</para> - -@shell: -@Returns: - - -<!-- ##### FUNCTION e_shell_get_module_directory ##### --> -<para> - -</para> - -@shell: -@Returns: - - -<!-- ##### FUNCTION e_shell_get_network_available ##### --> -<para> - -</para> - -@shell: -@Returns: - - -<!-- ##### FUNCTION e_shell_set_network_available ##### --> -<para> - -</para> - -@shell: -@network_available: - - -<!-- ##### FUNCTION e_shell_lock_network_available ##### --> -<para> - -</para> - -@shell: - - -<!-- ##### FUNCTION e_shell_get_online ##### --> -<para> - -</para> - -@shell: -@Returns: - - -<!-- ##### FUNCTION e_shell_set_online ##### --> -<para> - -</para> - -@shell: -@online: - - -<!-- ##### FUNCTION e_shell_get_preferences_window ##### --> -<para> - -</para> - -@shell: -@Returns: - - -<!-- ##### FUNCTION e_shell_event ##### --> -<para> - -</para> - -@shell: -@event_name: -@event_data: - - -<!-- ##### ENUM EShellQuitReason ##### --> -<para> - -</para> - -@E_SHELL_QUIT_ACTION: -@E_SHELL_QUIT_LAST_WINDOW: -@E_SHELL_QUIT_OPTION: -@E_SHELL_QUIT_REMOTE_REQUEST: -@E_SHELL_QUIT_SESSION_REQUEST: - -<!-- ##### FUNCTION e_shell_quit ##### --> -<para> - -</para> - -@shell: -@reason: -@Returns: - - -<!-- ##### FUNCTION e_shell_cancel_quit ##### --> -<para> - -</para> - -@shell: - - -<!-- ##### FUNCTION e_shell_adapt_window_size ##### --> -<para> - -</para> - -@shell: -@window: - - -<!-- ##### FUNCTION e_shell_set_startup_view ##### --> -<para> - -</para> - -@shell: -@view: - - -<!-- ##### FUNCTION e_shell_get_startup_view ##### --> -<para> - -</para> - -@shell: -@Returns: - - -<!-- ##### MACRO E_SHELL_MIGRATE_ERROR ##### --> -<para> - -</para> - - - -<!-- ##### ENUM EShellMigrateError ##### --> -<para> - -</para> - -@E_SHELL_MIGRATE_ERROR_FAILED: - -<!-- ##### FUNCTION e_shell_migrate_attempt ##### --> -<para> - -</para> - -@shell: -@Returns: - - -<!-- ##### FUNCTION e_shell_detect_meego ##### --> -<para> - -</para> - -@is_meego: -@small_screen: - - diff --git a/doc/reference/shell/tmpl/e-signature-list.sgml b/doc/reference/shell/tmpl/e-signature-list.sgml deleted file mode 100644 index 340e187726..0000000000 --- a/doc/reference/shell/tmpl/e-signature-list.sgml +++ /dev/null @@ -1,125 +0,0 @@ -<!-- ##### SECTION Title ##### --> -Container for Signatures - -<!-- ##### SECTION Short_Description ##### --> - - -<!-- ##### SECTION Long_Description ##### --> -<para> - -</para> - -<!-- ##### SECTION See_Also ##### --> -<para> - -</para> - -<!-- ##### SECTION Stability_Level ##### --> - - -<!-- ##### SECTION Image ##### --> - - -<!-- ##### STRUCT ESignatureList ##### --> -<para> - -</para> - - -<!-- ##### SIGNAL ESignatureList::signature-added ##### --> -<para> - -</para> - -@esignaturelist: the object which received the signal. -@arg1: - -<!-- ##### SIGNAL ESignatureList::signature-changed ##### --> -<para> - -</para> - -@esignaturelist: the object which received the signal. -@arg1: - -<!-- ##### SIGNAL ESignatureList::signature-removed ##### --> -<para> - -</para> - -@esignaturelist: the object which received the signal. -@arg1: - -<!-- ##### FUNCTION e_signature_list_new ##### --> -<para> - -</para> - -@client: -@Returns: - - -<!-- ##### FUNCTION e_signature_list_construct ##### --> -<para> - -</para> - -@signature_list: -@client: - - -<!-- ##### FUNCTION e_signature_list_save ##### --> -<para> - -</para> - -@signature_list: - - -<!-- ##### FUNCTION e_signature_list_add ##### --> -<para> - -</para> - -@signature_list: -@signature: - - -<!-- ##### FUNCTION e_signature_list_change ##### --> -<para> - -</para> - -@signature_list: -@signature: - - -<!-- ##### FUNCTION e_signature_list_remove ##### --> -<para> - -</para> - -@signature_list: -@signature: - - -<!-- ##### FUNCTION e_signature_list_find_by_name ##### --> -<para> - -</para> - -@signature_list: -@signature_name: -@Returns: - - -<!-- ##### FUNCTION e_signature_list_find_by_uid ##### --> -<para> - -</para> - -@signature_list: -@signature_uid: -@Returns: - - diff --git a/doc/reference/shell/tmpl/e-signature-utils.sgml b/doc/reference/shell/tmpl/e-signature-utils.sgml deleted file mode 100644 index b16e2ae30e..0000000000 --- a/doc/reference/shell/tmpl/e-signature-utils.sgml +++ /dev/null @@ -1,78 +0,0 @@ -<!-- ##### SECTION Title ##### --> -More Signature Utilities - -<!-- ##### SECTION Short_Description ##### --> - - -<!-- ##### SECTION Long_Description ##### --> -<para> - -</para> - -<!-- ##### SECTION See_Also ##### --> -<para> - -</para> - -<!-- ##### SECTION Stability_Level ##### --> - - -<!-- ##### SECTION Image ##### --> - - -<!-- ##### FUNCTION e_get_signature_list ##### --> -<para> - -</para> - -@void: -@Returns: - - -<!-- ##### FUNCTION e_get_signature_by_name ##### --> -<para> - -</para> - -@name: -@Returns: - - -<!-- ##### FUNCTION e_get_signature_by_uid ##### --> -<para> - -</para> - -@uid: -@Returns: - - -<!-- ##### FUNCTION e_create_signature_file ##### --> -<para> - -</para> - -@error: -@Returns: - - -<!-- ##### FUNCTION e_read_signature_file ##### --> -<para> - -</para> - -@signature: -@convert_to_html: -@error: -@Returns: - - -<!-- ##### FUNCTION e_run_signature_script ##### --> -<para> - -</para> - -@filename: -@Returns: - - diff --git a/doc/reference/shell/tmpl/e-signature-utils.sgml.sgml b/doc/reference/shell/tmpl/e-signature-utils.sgml.sgml deleted file mode 100644 index 9dfef1a16d..0000000000 --- a/doc/reference/shell/tmpl/e-signature-utils.sgml.sgml +++ /dev/null @@ -1,466 +0,0 @@ -<!-- ##### SECTION Title ##### --> -e-signature-utils.sgml - -<!-- ##### SECTION Short_Description ##### --> - - -<!-- ##### SECTION Long_Description ##### --> -<para> - -</para> - -<!-- ##### SECTION See_Also ##### --> -<para> - -</para> - -<!-- ##### SECTION Stability_Level ##### --> - - -<!-- ##### SECTION Image ##### --> - - -<!-- ##### STRUCT EWebView ##### --> -<para> - -</para> - -@parent: -@priv: - -<!-- ##### FUNCTION e_web_view_new ##### --> -<para> - -</para> - -@void: -@Returns: - - -<!-- ##### FUNCTION e_web_view_clear ##### --> -<para> - -</para> - -@web_view: - - -<!-- ##### FUNCTION e_web_view_load_string ##### --> -<para> - -</para> - -@web_view: -@string: - - -<!-- ##### FUNCTION e_web_view_get_animate ##### --> -<para> - -</para> - -@web_view: -@Returns: - - -<!-- ##### FUNCTION e_web_view_set_animate ##### --> -<para> - -</para> - -@web_view: -@animate: - - -<!-- ##### FUNCTION e_web_view_get_caret_mode ##### --> -<para> - -</para> - -@web_view: -@Returns: - - -<!-- ##### FUNCTION e_web_view_set_caret_mode ##### --> -<para> - -</para> - -@web_view: -@caret_mode: - - -<!-- ##### FUNCTION e_web_view_get_copy_target_list ##### --> -<para> - -</para> - -@web_view: -@Returns: - - -<!-- ##### FUNCTION e_web_view_get_disable_printing ##### --> -<para> - -</para> - -@web_view: -@Returns: - - -<!-- ##### FUNCTION e_web_view_set_disable_printing ##### --> -<para> - -</para> - -@web_view: -@disable_printing: - - -<!-- ##### FUNCTION e_web_view_get_disable_save_to_disk ##### --> -<para> - -</para> - -@web_view: -@Returns: - - -<!-- ##### FUNCTION e_web_view_set_disable_save_to_disk ##### --> -<para> - -</para> - -@web_view: -@disable_save_to_disk: - - -<!-- ##### FUNCTION e_web_view_get_editable ##### --> -<para> - -</para> - -@web_view: -@Returns: - - -<!-- ##### FUNCTION e_web_view_set_editable ##### --> -<para> - -</para> - -@web_view: -@editable: - - -<!-- ##### FUNCTION e_web_view_get_inline_spelling ##### --> -<para> - -</para> - -@web_view: -@Returns: - - -<!-- ##### FUNCTION e_web_view_set_inline_spelling ##### --> -<para> - -</para> - -@web_view: -@inline_spelling: - - -<!-- ##### FUNCTION e_web_view_get_magic_links ##### --> -<para> - -</para> - -@web_view: -@Returns: - - -<!-- ##### FUNCTION e_web_view_set_magic_links ##### --> -<para> - -</para> - -@web_view: -@magic_links: - - -<!-- ##### FUNCTION e_web_view_get_magic_smileys ##### --> -<para> - -</para> - -@web_view: -@Returns: - - -<!-- ##### FUNCTION e_web_view_set_magic_smileys ##### --> -<para> - -</para> - -@web_view: -@magic_smileys: - - -<!-- ##### FUNCTION e_web_view_get_selected_uri ##### --> -<para> - -</para> - -@web_view: -@Returns: - - -<!-- ##### FUNCTION e_web_view_set_selected_uri ##### --> -<para> - -</para> - -@web_view: -@selected_uri: - - -<!-- ##### FUNCTION e_web_view_get_open_proxy ##### --> -<para> - -</para> - -@web_view: -@Returns: - - -<!-- ##### FUNCTION e_web_view_set_open_proxy ##### --> -<para> - -</para> - -@web_view: -@open_proxy: - - -<!-- ##### FUNCTION e_web_view_get_paste_target_list ##### --> -<para> - -</para> - -@web_view: -@Returns: - - -<!-- ##### FUNCTION e_web_view_get_print_proxy ##### --> -<para> - -</para> - -@web_view: -@Returns: - - -<!-- ##### FUNCTION e_web_view_set_print_proxy ##### --> -<para> - -</para> - -@web_view: -@print_proxy: - - -<!-- ##### FUNCTION e_web_view_get_save_as_proxy ##### --> -<para> - -</para> - -@web_view: -@Returns: - - -<!-- ##### FUNCTION e_web_view_set_save_as_proxy ##### --> -<para> - -</para> - -@web_view: -@save_as_proxy: - - -<!-- ##### FUNCTION e_web_view_get_action ##### --> -<para> - -</para> - -@web_view: -@action_name: -@Returns: - - -<!-- ##### FUNCTION e_web_view_get_action_group ##### --> -<para> - -</para> - -@web_view: -@group_name: -@Returns: - - -<!-- ##### FUNCTION e_web_view_extract_uri ##### --> -<para> - -</para> - -@web_view: -@event: -@frame: -@Returns: - - -<!-- ##### FUNCTION e_web_view_copy_clipboard ##### --> -<para> - -</para> - -@web_view: - - -<!-- ##### FUNCTION e_web_view_cut_clipboard ##### --> -<para> - -</para> - -@web_view: - - -<!-- ##### FUNCTION e_web_view_is_selection_active ##### --> -<para> - -</para> - -@web_view: -@Returns: - - -<!-- ##### FUNCTION e_web_view_paste_clipboard ##### --> -<para> - -</para> - -@web_view: - - -<!-- ##### FUNCTION e_web_view_scroll_forward ##### --> -<para> - -</para> - -@web_view: -@Returns: - - -<!-- ##### FUNCTION e_web_view_scroll_backward ##### --> -<para> - -</para> - -@web_view: -@Returns: - - -<!-- ##### FUNCTION e_web_view_select_all ##### --> -<para> - -</para> - -@web_view: - - -<!-- ##### FUNCTION e_web_view_unselect_all ##### --> -<para> - -</para> - -@web_view: - - -<!-- ##### FUNCTION e_web_view_zoom_100 ##### --> -<para> - -</para> - -@web_view: - - -<!-- ##### FUNCTION e_web_view_zoom_in ##### --> -<para> - -</para> - -@web_view: - - -<!-- ##### FUNCTION e_web_view_zoom_out ##### --> -<para> - -</para> - -@web_view: - - -<!-- ##### FUNCTION e_web_view_get_ui_manager ##### --> -<para> - -</para> - -@web_view: -@Returns: - - -<!-- ##### FUNCTION e_web_view_get_popup_menu ##### --> -<para> - -</para> - -@web_view: -@Returns: - - -<!-- ##### FUNCTION e_web_view_show_popup_menu ##### --> -<para> - -</para> - -@web_view: -@event: -@func: -@user_data: - - -<!-- ##### FUNCTION e_web_view_status_message ##### --> -<para> - -</para> - -@web_view: -@status_message: - - -<!-- ##### FUNCTION e_web_view_stop_loading ##### --> -<para> - -</para> - -@web_view: - - -<!-- ##### FUNCTION e_web_view_update_actions ##### --> -<para> - -</para> - -@web_view: - - diff --git a/doc/reference/shell/tmpl/e-signature.sgml b/doc/reference/shell/tmpl/e-signature.sgml deleted file mode 100644 index 8de6adfdc0..0000000000 --- a/doc/reference/shell/tmpl/e-signature.sgml +++ /dev/null @@ -1,222 +0,0 @@ -<!-- ##### SECTION Title ##### --> -Personalized Signatures - -<!-- ##### SECTION Short_Description ##### --> - - -<!-- ##### SECTION Long_Description ##### --> -<para> - -</para> - -<!-- ##### SECTION See_Also ##### --> -<para> - -</para> - -<!-- ##### SECTION Stability_Level ##### --> - - -<!-- ##### SECTION Image ##### --> - - -<!-- ##### STRUCT ESignature ##### --> -<para> - -</para> - - -<!-- ##### ARG ESignature:autogenerated ##### --> -<para> - -</para> - -<!-- ##### ARG ESignature:filename ##### --> -<para> - -</para> - -<!-- ##### ARG ESignature:is-html ##### --> -<para> - -</para> - -<!-- ##### ARG ESignature:is-script ##### --> -<para> - -</para> - -<!-- ##### ARG ESignature:name ##### --> -<para> - -</para> - -<!-- ##### ARG ESignature:uid ##### --> -<para> - -</para> - -<!-- ##### FUNCTION e_signature_new ##### --> -<para> - -</para> - -@void: -@Returns: - - -<!-- ##### FUNCTION e_signature_new_from_xml ##### --> -<para> - -</para> - -@xml: -@Returns: - - -<!-- ##### FUNCTION e_signature_uid_from_xml ##### --> -<para> - -</para> - -@xml: -@Returns: - - -<!-- ##### FUNCTION e_signature_set_from_xml ##### --> -<para> - -</para> - -@signature: -@xml: -@Returns: - - -<!-- ##### FUNCTION e_signature_to_xml ##### --> -<para> - -</para> - -@signature: -@Returns: - - -<!-- ##### FUNCTION e_signature_is_equal ##### --> -<para> - -</para> - -@signature1: -@signature2: -@Returns: - - -<!-- ##### FUNCTION e_signature_get_autogenerated ##### --> -<para> - -</para> - -@signature: -@Returns: - - -<!-- ##### FUNCTION e_signature_set_autogenerated ##### --> -<para> - -</para> - -@signature: -@autogenerated: - - -<!-- ##### FUNCTION e_signature_get_filename ##### --> -<para> - -</para> - -@signature: -@Returns: - - -<!-- ##### FUNCTION e_signature_set_filename ##### --> -<para> - -</para> - -@signature: -@filename: - - -<!-- ##### FUNCTION e_signature_get_is_html ##### --> -<para> - -</para> - -@signature: -@Returns: - - -<!-- ##### FUNCTION e_signature_set_is_html ##### --> -<para> - -</para> - -@signature: -@is_html: - - -<!-- ##### FUNCTION e_signature_get_is_script ##### --> -<para> - -</para> - -@signature: -@Returns: - - -<!-- ##### FUNCTION e_signature_set_is_script ##### --> -<para> - -</para> - -@signature: -@is_script: - - -<!-- ##### FUNCTION e_signature_get_name ##### --> -<para> - -</para> - -@signature: -@Returns: - - -<!-- ##### FUNCTION e_signature_set_name ##### --> -<para> - -</para> - -@signature: -@name: - - -<!-- ##### FUNCTION e_signature_get_uid ##### --> -<para> - -</para> - -@signature: -@Returns: - - -<!-- ##### FUNCTION e_signature_set_uid ##### --> -<para> - -</para> - -@signature: -@uid: - - diff --git a/doc/reference/shell/tmpl/e-util.sgml b/doc/reference/shell/tmpl/e-util.sgml deleted file mode 100644 index 7adb70cb39..0000000000 --- a/doc/reference/shell/tmpl/e-util.sgml +++ /dev/null @@ -1,449 +0,0 @@ -<!-- ##### SECTION Title ##### --> -Miscellaneous Utilities - -<!-- ##### SECTION Short_Description ##### --> - - -<!-- ##### SECTION Long_Description ##### --> -<para> - -</para> - -<!-- ##### SECTION See_Also ##### --> -<para> - -</para> - -<!-- ##### SECTION Stability_Level ##### --> - - -<!-- ##### SECTION Image ##### --> - - -<!-- ##### FUNCTION e_get_accels_filename ##### --> -<para> - -</para> - -@void: -@Returns: - - -<!-- ##### FUNCTION e_show_uri ##### --> -<para> - -</para> - -@parent: -@uri: - - -<!-- ##### FUNCTION e_display_help ##### --> -<para> - -</para> - -@parent: -@link_id: - - -<!-- ##### FUNCTION e_lookup_action ##### --> -<para> - -</para> - -@ui_manager: -@action_name: -@Returns: - - -<!-- ##### FUNCTION e_lookup_action_group ##### --> -<para> - -</para> - -@ui_manager: -@group_name: -@Returns: - - -<!-- ##### FUNCTION e_action_compare_by_label ##### --> -<para> - -</para> - -@action1: -@action2: -@Returns: - - -<!-- ##### FUNCTION e_action_group_remove_all_actions ##### --> -<para> - -</para> - -@action_group: - - -<!-- ##### FUNCTION e_radio_action_get_current_action ##### --> -<para> - -</para> - -@radio_action: -@Returns: - - -<!-- ##### FUNCTION e_categories_add_change_hook ##### --> -<para> - -</para> - -@func: -@object: - - -<!-- ##### FUNCTION e_str_without_underscores ##### --> -<para> - -</para> - -@string: -@Returns: - - -<!-- ##### FUNCTION e_str_compare ##### --> -<para> - -</para> - -@x: -@y: -@Returns: - - -<!-- ##### FUNCTION e_str_case_compare ##### --> -<para> - -</para> - -@x: -@y: -@Returns: - - -<!-- ##### FUNCTION e_collate_compare ##### --> -<para> - -</para> - -@x: -@y: -@Returns: - - -<!-- ##### FUNCTION e_int_compare ##### --> -<para> - -</para> - -@x: -@y: -@Returns: - - -<!-- ##### FUNCTION e_color_to_value ##### --> -<para> - -</para> - -@color: -@Returns: - - -<!-- ##### FUNCTION e_format_number ##### --> -<para> - -</para> - -@number: -@Returns: - - -<!-- ##### USER_FUNCTION ESortCompareFunc ##### --> -<para> - -</para> - -@first: -@second: -@closure: -@Returns: - - -<!-- ##### FUNCTION e_bsearch ##### --> -<para> - -</para> - -@key: -@base: -@nmemb: -@size: -@compare: -@closure: -@start: -@end: - - -<!-- ##### FUNCTION e_strftime_fix_am_pm ##### --> -<para> - -</para> - -@str: -@max: -@fmt: -@tm: -@Returns: - - -<!-- ##### FUNCTION e_utf8_strftime_fix_am_pm ##### --> -<para> - -</para> - -@str: -@max: -@fmt: -@tm: -@Returns: - - -<!-- ##### FUNCTION e_get_month_name ##### --> -<para> - -</para> - -@month: -@abbreviated: -@Returns: - - -<!-- ##### FUNCTION e_get_weekday_name ##### --> -<para> - -</para> - -@weekday: -@abbreviated: -@Returns: - - -<!-- ##### FUNCTION e_flexible_strtod ##### --> -<para> - -</para> - -@nptr: -@endptr: -@Returns: - - -<!-- ##### FUNCTION e_ascii_dtostr ##### --> -<para> - -</para> - -@buffer: -@buf_len: -@format: -@d: -@Returns: - - -<!-- ##### FUNCTION e_file_lock_create ##### --> -<para> - -</para> - -@void: -@Returns: - - -<!-- ##### FUNCTION e_file_lock_destroy ##### --> -<para> - -</para> - -@void: - - -<!-- ##### FUNCTION e_file_lock_exists ##### --> -<para> - -</para> - -@void: -@Returns: - - -<!-- ##### FUNCTION e_util_guess_mime_type ##### --> -<para> - -</para> - -@filename: -@localfile: -@Returns: - - -<!-- ##### FUNCTION e_util_get_category_filter_options ##### --> -<para> - -</para> - -@void: -@Returns: - - -<!-- ##### FUNCTION e_binding_transform_color_to_string ##### --> -<para> - -</para> - -@binding: -@source_value: -@target_value: -@not_used: -@Returns: - - -<!-- ##### FUNCTION e_binding_transform_string_to_color ##### --> -<para> - -</para> - -@binding: -@source_value: -@target_value: -@not_used: -@Returns: - - -<!-- ##### FUNCTION e_binding_transform_enum_nick_to_value ##### --> -<para> - -</para> - -@binding: -@source_value: -@target_value: -@not_used: -@Returns: - - -<!-- ##### FUNCTION e_binding_transform_enum_value_to_nick ##### --> -<para> - -</para> - -@binding: -@source_value: -@target_value: -@not_used: -@Returns: - - -<!-- ##### FUNCTION e_binding_transform_source_to_uid ##### --> -<para> - -</para> - -@binding: -@source_value: -@target_value: -@source_list: -@Returns: - - -<!-- ##### FUNCTION e_binding_transform_uid_to_source ##### --> -<para> - -</para> - -@binding: -@source_value: -@target_value: -@source_list: -@Returns: - - -<!-- ##### FUNCTION e_charset_add_radio_actions ##### --> -<para> - -</para> - -@action_group: -@action_prefix: -@default_charset: -@callback: -@user_data: -@Returns: - - -<!-- ##### FUNCTION e_file_replace_contents_async ##### --> -<para> - -</para> - -@file: -@contents: -@length: -@etag: -@make_backup: -@flags: -@callback: -@user_data: -@Returns: - - -<!-- ##### FUNCTION e_file_replace_contents_finish ##### --> -<para> - -</para> - -@file: -@result: -@new_etag: -@error: -@Returns: - - -<!-- ##### FUNCTION e_mktemp ##### --> -<para> - -</para> - -@template: -@Returns: - - -<!-- ##### FUNCTION e_mkstemp ##### --> -<para> - -</para> - -@template: -@Returns: - - -<!-- ##### FUNCTION e_mkdtemp ##### --> -<para> - -</para> - -@template: -@Returns: - - diff --git a/doc/reference/shell/tmpl/e-xml-utils.sgml b/doc/reference/shell/tmpl/e-xml-utils.sgml deleted file mode 100644 index 09899f98a7..0000000000 --- a/doc/reference/shell/tmpl/e-xml-utils.sgml +++ /dev/null @@ -1,219 +0,0 @@ -<!-- ##### SECTION Title ##### --> -Reading and Writing XML - -<!-- ##### SECTION Short_Description ##### --> - - -<!-- ##### SECTION Long_Description ##### --> -<para> - -</para> - -<!-- ##### SECTION See_Also ##### --> -<para> - -</para> - -<!-- ##### SECTION Stability_Level ##### --> - - -<!-- ##### SECTION Image ##### --> - - -<!-- ##### FUNCTION e_xml_get_child_by_name_by_lang ##### --> -<para> - -</para> - -@parent: -@child_name: -@lang: -@Returns: - - -<!-- ##### FUNCTION e_xml_get_child_by_name_by_lang_list ##### --> -<para> - -</para> - -@parent: -@name: -@lang_list: -@Returns: - - -<!-- ##### FUNCTION e_xml_get_child_by_name_no_lang ##### --> -<para> - -</para> - -@parent: -@name: -@Returns: - - -<!-- ##### FUNCTION e_xml_get_integer_prop_by_name ##### --> -<para> - -</para> - -@parent: -@prop_name: -@Returns: - - -<!-- ##### FUNCTION e_xml_get_integer_prop_by_name_with_default ##### --> -<para> - -</para> - -@parent: -@prop_name: -@def: -@Returns: - - -<!-- ##### FUNCTION e_xml_set_integer_prop_by_name ##### --> -<para> - -</para> - -@parent: -@prop_name: -@value: - - -<!-- ##### FUNCTION e_xml_get_uint_prop_by_name ##### --> -<para> - -</para> - -@parent: -@prop_name: -@Returns: - - -<!-- ##### FUNCTION e_xml_get_uint_prop_by_name_with_default ##### --> -<para> - -</para> - -@parent: -@prop_name: -@def: -@Returns: - - -<!-- ##### FUNCTION e_xml_set_uint_prop_by_name ##### --> -<para> - -</para> - -@parent: -@prop_name: -@value: - - -<!-- ##### FUNCTION e_xml_get_bool_prop_by_name ##### --> -<para> - -</para> - -@parent: -@prop_name: -@Returns: - - -<!-- ##### FUNCTION e_xml_get_bool_prop_by_name_with_default ##### --> -<para> - -</para> - -@parent: -@prop_name: -@def: -@Returns: - - -<!-- ##### FUNCTION e_xml_set_bool_prop_by_name ##### --> -<para> - -</para> - -@parent: -@prop_name: -@value: - - -<!-- ##### FUNCTION e_xml_get_double_prop_by_name ##### --> -<para> - -</para> - -@parent: -@prop_name: -@Returns: - - -<!-- ##### FUNCTION e_xml_get_double_prop_by_name_with_default ##### --> -<para> - -</para> - -@parent: -@prop_name: -@def: -@Returns: - - -<!-- ##### FUNCTION e_xml_set_double_prop_by_name ##### --> -<para> - -</para> - -@parent: -@prop_name: -@value: - - -<!-- ##### FUNCTION e_xml_get_string_prop_by_name ##### --> -<para> - -</para> - -@parent: -@prop_name: -@Returns: - - -<!-- ##### FUNCTION e_xml_get_string_prop_by_name_with_default ##### --> -<para> - -</para> - -@parent: -@prop_name: -@def: -@Returns: - - -<!-- ##### FUNCTION e_xml_set_string_prop_by_name ##### --> -<para> - -</para> - -@parent: -@prop_name: -@value: - - -<!-- ##### FUNCTION e_xml_get_translated_string_prop_by_name ##### --> -<para> - -</para> - -@parent: -@prop_name: -@Returns: - - diff --git a/doc/reference/shell/tmpl/eshell-unused.sgml b/doc/reference/shell/tmpl/eshell-unused.sgml deleted file mode 100644 index d8f54f7867..0000000000 --- a/doc/reference/shell/tmpl/eshell-unused.sgml +++ /dev/null @@ -1,811 +0,0 @@ -<!-- ##### SECTION ./tmpl/e-binding.sgml:Image ##### --> - - - -<!-- ##### SECTION ./tmpl/e-binding.sgml:Long_Description ##### --> -<para> - -</para> - - -<!-- ##### SECTION ./tmpl/e-binding.sgml:See_Also ##### --> -<para> - -</para> - - -<!-- ##### SECTION ./tmpl/e-binding.sgml:Short_Description ##### --> - - - -<!-- ##### SECTION ./tmpl/e-binding.sgml:Stability_Level ##### --> - - - -<!-- ##### SECTION ./tmpl/e-binding.sgml:Title ##### --> -GObject Property Bindings - - -<!-- ##### SECTION ./tmpl/e-extensible.sgml:Image ##### --> - - - -<!-- ##### SECTION ./tmpl/e-extensible.sgml:Long_Description ##### --> -<para> - -</para> - - -<!-- ##### SECTION ./tmpl/e-extensible.sgml:See_Also ##### --> -<para> - -</para> - - -<!-- ##### SECTION ./tmpl/e-extensible.sgml:Short_Description ##### --> - - - -<!-- ##### SECTION ./tmpl/e-extensible.sgml:Stability_Level ##### --> - - - -<!-- ##### SECTION ./tmpl/e-extensible.sgml:Title ##### --> -EExtensible - - -<!-- ##### SECTION ./tmpl/e-extension.sgml:Image ##### --> - - - -<!-- ##### SECTION ./tmpl/e-extension.sgml:Long_Description ##### --> -<para> - -</para> - - -<!-- ##### SECTION ./tmpl/e-extension.sgml:See_Also ##### --> -<para> - -</para> - - -<!-- ##### SECTION ./tmpl/e-extension.sgml:Short_Description ##### --> - - - -<!-- ##### SECTION ./tmpl/e-extension.sgml:Stability_Level ##### --> - - - -<!-- ##### SECTION ./tmpl/e-extension.sgml:Title ##### --> -EExtension - - -<!-- ##### SECTION ./tmpl/e-logger.sgml:Image ##### --> - - - -<!-- ##### SECTION ./tmpl/e-logger.sgml:Long_Description ##### --> -<para> - -</para> - - -<!-- ##### SECTION ./tmpl/e-logger.sgml:See_Also ##### --> -<para> - -</para> - - -<!-- ##### SECTION ./tmpl/e-logger.sgml:Short_Description ##### --> - - - -<!-- ##### SECTION ./tmpl/e-logger.sgml:Stability_Level ##### --> - - - -<!-- ##### SECTION ./tmpl/e-logger.sgml:Title ##### --> -Error Logging - - -<!-- ##### SECTION ./tmpl/e-module.sgml:Image ##### --> - - - -<!-- ##### SECTION ./tmpl/e-module.sgml:Long_Description ##### --> -<para> - -</para> - - -<!-- ##### SECTION ./tmpl/e-module.sgml:See_Also ##### --> -<para> - -</para> - - -<!-- ##### SECTION ./tmpl/e-module.sgml:Short_Description ##### --> - - - -<!-- ##### SECTION ./tmpl/e-module.sgml:Stability_Level ##### --> - - - -<!-- ##### SECTION ./tmpl/e-module.sgml:Title ##### --> -EModule - - -<!-- ##### SECTION ./tmpl/e-shell-window.sgml.sgml.sgml.sgml:Image ##### --> - - - -<!-- ##### SECTION ./tmpl/e-shell-window.sgml.sgml.sgml.sgml:Long_Description ##### --> -<para> - -</para> - - -<!-- ##### SECTION ./tmpl/e-shell-window.sgml.sgml.sgml.sgml:See_Also ##### --> -<para> - -</para> - - -<!-- ##### SECTION ./tmpl/e-shell-window.sgml.sgml.sgml.sgml:Short_Description ##### --> - - - -<!-- ##### SECTION ./tmpl/e-shell-window.sgml.sgml.sgml.sgml:Stability_Level ##### --> - - - -<!-- ##### SECTION ./tmpl/e-shell-window.sgml.sgml.sgml.sgml:Title ##### --> -e-shell-window.sgml.sgml.sgml - - -<!-- ##### SECTION ./tmpl/e-shell-window.sgml.sgml.sgml:Image ##### --> - - - -<!-- ##### SECTION ./tmpl/e-shell-window.sgml.sgml.sgml:Long_Description ##### --> -<para> - -</para> - - -<!-- ##### SECTION ./tmpl/e-shell-window.sgml.sgml.sgml:See_Also ##### --> -<para> - -</para> - - -<!-- ##### SECTION ./tmpl/e-shell-window.sgml.sgml.sgml:Short_Description ##### --> - - - -<!-- ##### SECTION ./tmpl/e-shell-window.sgml.sgml.sgml:Stability_Level ##### --> - - - -<!-- ##### SECTION ./tmpl/e-shell-window.sgml.sgml.sgml:Title ##### --> -e-shell-window.sgml.sgml - - -<!-- ##### SECTION ./tmpl/e-shell-window.sgml.sgml:Image ##### --> - - - -<!-- ##### SECTION ./tmpl/e-shell-window.sgml.sgml:Long_Description ##### --> -<para> - -</para> - - -<!-- ##### SECTION ./tmpl/e-shell-window.sgml.sgml:See_Also ##### --> -<para> - -</para> - - -<!-- ##### SECTION ./tmpl/e-shell-window.sgml.sgml:Short_Description ##### --> - - - -<!-- ##### SECTION ./tmpl/e-shell-window.sgml.sgml:Stability_Level ##### --> - - - -<!-- ##### SECTION ./tmpl/e-shell-window.sgml.sgml:Title ##### --> -e-shell-window.sgml - - -<!-- ##### STRUCT EBinding ##### --> -<para> - -</para> - - -<!-- ##### USER_FUNCTION EBindingTransform ##### --> -<para> - -</para> - -@src_value: -@dst_value: -@user_data: -@Returns: - -<!-- ##### STRUCT EExtensible ##### --> -<para> - -</para> - - -<!-- ##### STRUCT EExtension ##### --> -<para> - -</para> - - -<!-- ##### ARG EExtension:extensible ##### --> -<para> - -</para> - - -<!-- ##### USER_FUNCTION ELogFunction ##### --> -<para> - -</para> - -@line: -@data: - -<!-- ##### ENUM ELogLevel ##### --> -<para> - -</para> - -@E_LOG_ERROR: -@E_LOG_WARNING: -@E_LOG_DEBUG: - -<!-- ##### STRUCT ELogger ##### --> -<para> - -</para> - - -<!-- ##### ARG ELogger:name ##### --> -<para> - -</para> - - -<!-- ##### STRUCT EModule ##### --> -<para> - -</para> - - -<!-- ##### ARG EModule:filename ##### --> -<para> - -</para> - - -<!-- ##### STRUCT EMutualBinding ##### --> -<para> - -</para> - - -<!-- ##### SIGNAL EShell::send-receive ##### --> -<para> - -</para> - -@eshell: the object which received the signal. -@arg1: - -<!-- ##### SIGNAL EShell::window-created ##### --> -<para> - -</para> - -@eshell: the object which received the signal. -@arg1: - -<!-- ##### SIGNAL EShell::window-destroyed ##### --> -<para> - -</para> - -@eshell: the object which received the signal. - -<!-- ##### ARG EShellSearchbar:label-visible ##### --> -<para> - -</para> - - -<!-- ##### MACRO E_ALERT_ERROR ##### --> -<para> - -</para> - - -<!-- ##### MACRO E_ALERT_ERROR_PRIMARY ##### --> -<para> - -</para> - - -<!-- ##### MACRO E_ALERT_INFO ##### --> -<para> - -</para> - - -<!-- ##### MACRO E_ALERT_INFO_PRIMARY ##### --> -<para> - -</para> - - -<!-- ##### MACRO E_ALERT_WARNING ##### --> -<para> - -</para> - - -<!-- ##### MACRO E_ALERT_WARNING_PRIMARY ##### --> -<para> - -</para> - - -<!-- ##### MACRO E_SHELL_WINDOW_ACTION_FAQ ##### --> -<para> - -</para> - -@window: - -<!-- ##### MACRO E_SHELL_WINDOW_ACTION_SEND_RECEIVE ##### --> -<para> - -</para> - -@window: - -<!-- ##### MACRO E_SHELL_WINDOW_ACTION_SYNC_OPTIONS ##### --> -<para> - -</para> - -@window: - -<!-- ##### FUNCTION e_activity_cancel ##### --> -<para> - -</para> - -@activity: - -<!-- ##### FUNCTION e_activity_clicked ##### --> -<para> - -</para> - -@activity: - -<!-- ##### FUNCTION e_activity_complete ##### --> -<para> - -</para> - -@activity: - -<!-- ##### FUNCTION e_activity_get_allow_cancel ##### --> -<para> - -</para> - -@activity: -@Returns: - -<!-- ##### FUNCTION e_activity_get_clickable ##### --> -<para> - -</para> - -@activity: -@Returns: - -<!-- ##### FUNCTION e_activity_get_primary_text ##### --> -<para> - -</para> - -@activity: -@Returns: - -<!-- ##### FUNCTION e_activity_get_secondary_text ##### --> -<para> - -</para> - -@activity: -@Returns: - -<!-- ##### FUNCTION e_activity_is_cancelled ##### --> -<para> - -</para> - -@activity: -@Returns: - -<!-- ##### FUNCTION e_activity_is_completed ##### --> -<para> - -</para> - -@activity: -@Returns: - -<!-- ##### FUNCTION e_activity_newv ##### --> -<para> - -</para> - -@format: -@Varargs: -@Returns: - -<!-- ##### FUNCTION e_activity_set_allow_cancel ##### --> -<para> - -</para> - -@activity: -@allow_cancel: - -<!-- ##### FUNCTION e_activity_set_clickable ##### --> -<para> - -</para> - -@activity: -@clickable: - -<!-- ##### FUNCTION e_activity_set_primary_text ##### --> -<para> - -</para> - -@activity: -@primary_text: - -<!-- ##### FUNCTION e_activity_set_secondary_text ##### --> -<para> - -</para> - -@activity: -@secondary_text: - -<!-- ##### FUNCTION e_alert_dialog_count_buttons ##### --> -<para> - -</para> - -@dialog: -@Returns: - -<!-- ##### FUNCTION e_attachment_store_get_current_folder ##### --> -<para> - -</para> - -@store: -@Returns: - -<!-- ##### FUNCTION e_attachment_store_get_current_folder_uri ##### --> -<para> - -</para> - -@store: -@Returns: - -<!-- ##### FUNCTION e_attachment_store_run_file_chooser_dialog ##### --> -<para> - -</para> - -@store: -@dialog: -@Returns: - -<!-- ##### FUNCTION e_attachment_store_set_current_folder ##### --> -<para> - -</para> - -@store: -@current_folder: - -<!-- ##### FUNCTION e_attachment_store_set_current_folder_uri ##### --> -<para> - -</para> - -@store: -@current_folder: - -<!-- ##### FUNCTION e_binding_new ##### --> -<para> - -</para> - -@src_object: -@src_property: -@dst_object: -@dst_property: -@Returns: - -<!-- ##### FUNCTION e_binding_new_full ##### --> -<para> - -</para> - -@src_object: -@src_property: -@dst_object: -@dst_property: -@transform: -@destroy_notify: -@user_data: -@Returns: - -<!-- ##### FUNCTION e_binding_new_with_negation ##### --> -<para> - -</para> - -@src_object: -@src_property: -@dst_object: -@dst_property: -@Returns: - -<!-- ##### FUNCTION e_binding_unbind ##### --> -<para> - -</para> - -@binding: - -<!-- ##### FUNCTION e_extensible_list_extensions ##### --> -<para> - -</para> - -@extensible: -@extension_type: -@Returns: - -<!-- ##### FUNCTION e_extensible_load_extensions ##### --> -<para> - -</para> - -@extensible: - -<!-- ##### FUNCTION e_extension_get_extensible ##### --> -<para> - -</para> - -@extension: -@Returns: - -<!-- ##### FUNCTION e_get_gnome2_user_dir ##### --> -<para> - -</para> - -@void: -@Returns: - -<!-- ##### FUNCTION e_get_user_data_dir ##### --> -<para> - -</para> - -@void: -@Returns: - -<!-- ##### FUNCTION e_logger_get_logs ##### --> -<para> - -</para> - -@logger: -@func: -@user_data: - -<!-- ##### FUNCTION e_logger_get_name ##### --> -<para> - -</para> - -@logger: -@Returns: - -<!-- ##### FUNCTION e_logger_log ##### --> -<para> - -</para> - -@logger: -@level: -@primary: -@secondary: - -<!-- ##### FUNCTION e_logger_new ##### --> -<para> - -</para> - -@name: -@Returns: - -<!-- ##### FUNCTION e_module_get_filename ##### --> -<para> - -</para> - -@module: -@Returns: - -<!-- ##### FUNCTION e_module_load_all_in_directory ##### --> -<para> - -</para> - -@dirname: -@Returns: - -<!-- ##### FUNCTION e_module_new ##### --> -<para> - -</para> - -@filename: -@Returns: - -<!-- ##### FUNCTION e_mutual_binding_new ##### --> -<para> - -</para> - -@object1: -@property1: -@object2: -@property2: -@Returns: - -<!-- ##### FUNCTION e_mutual_binding_new_full ##### --> -<para> - -</para> - -@object1: -@property1: -@object2: -@property2: -@transform: -@reverse_transform: -@destroy_notify: -@user_data: -@Returns: - -<!-- ##### FUNCTION e_mutual_binding_new_with_negation ##### --> -<para> - -</para> - -@object1: -@property1: -@object2: -@property2: -@Returns: - -<!-- ##### FUNCTION e_mutual_binding_unbind ##### --> -<para> - -</para> - -@binding: - -<!-- ##### FUNCTION e_shell_content_get_search_name ##### --> -<para> - -</para> - -@shell_content: -@Returns: - -<!-- ##### FUNCTION e_shell_content_get_searchbar ##### --> -<para> - -</para> - -@shell_content: -@Returns: - -<!-- ##### FUNCTION e_shell_get_watched_windows ##### --> -<para> - -</para> - -@shell: -@Returns: - -<!-- ##### FUNCTION e_shell_searchbar_get_label_visible ##### --> -<para> - -</para> - -@searchbar: -@Returns: - -<!-- ##### FUNCTION e_shell_searchbar_set_label_visible ##### --> -<para> - -</para> - -@searchbar: -@label_visible: - -<!-- ##### FUNCTION e_shell_send_receive ##### --> -<para> - -</para> - -@shell: -@parent: - -<!-- ##### FUNCTION e_signature_list_find ##### --> -<para> - -</para> - -@signature_list: -@type: -@key: -@Returns: - -<!-- ##### FUNCTION e_type_traverse ##### --> -<para> - -</para> - -@parent_type: -@func: -@user_data: - -<!-- ##### FUNCTION get_font_options ##### --> -<para> - -</para> - -@void: -@Returns: - diff --git a/doc/reference/shell/tmpl/gconf-bridge.sgml b/doc/reference/shell/tmpl/gconf-bridge.sgml deleted file mode 100644 index 8cd6a87b9f..0000000000 --- a/doc/reference/shell/tmpl/gconf-bridge.sgml +++ /dev/null @@ -1,142 +0,0 @@ -<!-- ##### SECTION Title ##### --> -GConf Bridge - -<!-- ##### SECTION Short_Description ##### --> - - -<!-- ##### SECTION Long_Description ##### --> -<para> - -</para> - -<!-- ##### SECTION See_Also ##### --> -<para> - -</para> - -<!-- ##### SECTION Stability_Level ##### --> - - -<!-- ##### SECTION Image ##### --> - - -<!-- ##### STRUCT GConfBridge ##### --> -<para> - -</para> - - -<!-- ##### FUNCTION gconf_bridge_install_default_error_handler ##### --> -<para> - -</para> - -@void: - - -<!-- ##### FUNCTION gconf_bridge_get ##### --> -<para> - -</para> - -@void: -@Returns: - - -<!-- ##### FUNCTION gconf_bridge_get_client ##### --> -<para> - -</para> - -@bridge: -@Returns: - - -<!-- ##### FUNCTION gconf_bridge_bind_property_full ##### --> -<para> - -</para> - -@bridge: -@key: -@object: -@prop: -@delayed_sync: -@Returns: - - -<!-- ##### MACRO gconf_bridge_bind_property ##### --> -<para> - -</para> - -@bridge: -@key: -@object: -@prop: - - -<!-- ##### MACRO gconf_bridge_bind_property_delayed ##### --> -<para> - -</para> - -@bridge: -@key: -@object: -@prop: - - -<!-- ##### FUNCTION gconf_bridge_bind_window ##### --> -<para> - -</para> - -@bridge: -@key_prefix: -@window: -@bind_size: -@bind_pos: -@Returns: - - -<!-- ##### MACRO gconf_bridge_bind_window_size ##### --> -<para> - -</para> - -@bridge: -@key_prefix: -@window: - - -<!-- ##### MACRO gconf_bridge_bind_window_pos ##### --> -<para> - -</para> - -@bridge: -@key_prefix: -@window: - - -<!-- ##### FUNCTION gconf_bridge_bind_string_list_store ##### --> -<para> - -</para> - -@bridge: -@key: -@list_store: -@Returns: - - -<!-- ##### FUNCTION gconf_bridge_unbind ##### --> -<para> - -</para> - -@bridge: -@binding_id: - - diff --git a/doc/reference/shell/tmpl/shell-actions.sgml b/doc/reference/shell/tmpl/shell-actions.sgml deleted file mode 100644 index f6e457adcc..0000000000 --- a/doc/reference/shell/tmpl/shell-actions.sgml +++ /dev/null @@ -1,270 +0,0 @@ -<!-- ##### SECTION Title ##### --> -Shell Actions - -<!-- ##### SECTION Short_Description ##### --> - - -<!-- ##### SECTION Long_Description ##### --> -<para> - -</para> - -<!-- ##### SECTION See_Also ##### --> -<para> - -</para> - -<!-- ##### SECTION Stability_Level ##### --> - - -<!-- ##### SECTION Image ##### --> - - -<!-- ##### MACRO E_SHELL_WINDOW_ACTION_ABOUT ##### --> -<para> - -</para> - -@window: - - -<!-- ##### MACRO E_SHELL_WINDOW_ACTION_CLOSE ##### --> -<para> - -</para> - -@window: - - -<!-- ##### MACRO E_SHELL_WINDOW_ACTION_CONTENTS ##### --> -<para> - -</para> - -@window: - - -<!-- ##### MACRO E_SHELL_WINDOW_ACTION_FORGET_PASSWORDS ##### --> -<para> - -</para> - -@window: - - -<!-- ##### MACRO E_SHELL_WINDOW_ACTION_GAL_CUSTOM_VIEW ##### --> -<para> - -</para> - -@window: - - -<!-- ##### MACRO E_SHELL_WINDOW_ACTION_GAL_DEFINE_VIEWS ##### --> -<para> - -</para> - -@window: - - -<!-- ##### MACRO E_SHELL_WINDOW_ACTION_GAL_SAVE_CUSTOM_VIEW ##### --> -<para> - -</para> - -@window: - - -<!-- ##### MACRO E_SHELL_WINDOW_ACTION_IMPORT ##### --> -<para> - -</para> - -@window: - - -<!-- ##### MACRO E_SHELL_WINDOW_ACTION_NEW_WINDOW ##### --> -<para> - -</para> - -@window: - - -<!-- ##### MACRO E_SHELL_WINDOW_ACTION_PAGE_SETUP ##### --> -<para> - -</para> - -@window: - - -<!-- ##### MACRO E_SHELL_WINDOW_ACTION_PREFERENCES ##### --> -<para> - -</para> - -@window: - - -<!-- ##### MACRO E_SHELL_WINDOW_ACTION_QUICK_REFERENCE ##### --> -<para> - -</para> - -@window: - - -<!-- ##### MACRO E_SHELL_WINDOW_ACTION_QUIT ##### --> -<para> - -</para> - -@window: - - -<!-- ##### MACRO E_SHELL_WINDOW_ACTION_SEARCH_ADVANCED ##### --> -<para> - -</para> - -@window: - - -<!-- ##### MACRO E_SHELL_WINDOW_ACTION_SEARCH_CLEAR ##### --> -<para> - -</para> - -@window: - - -<!-- ##### MACRO E_SHELL_WINDOW_ACTION_SEARCH_EDIT ##### --> -<para> - -</para> - -@window: - - -<!-- ##### MACRO E_SHELL_WINDOW_ACTION_SEARCH_OPTIONS ##### --> -<para> - -</para> - -@window: - - -<!-- ##### MACRO E_SHELL_WINDOW_ACTION_SEARCH_QUICK ##### --> -<para> - -</para> - -@window: - - -<!-- ##### MACRO E_SHELL_WINDOW_ACTION_SEARCH_SAVE ##### --> -<para> - -</para> - -@window: - - -<!-- ##### MACRO E_SHELL_WINDOW_ACTION_SHOW_SIDEBAR ##### --> -<para> - -</para> - -@window: - - -<!-- ##### MACRO E_SHELL_WINDOW_ACTION_SHOW_SWITCHER ##### --> -<para> - -</para> - -@window: - - -<!-- ##### MACRO E_SHELL_WINDOW_ACTION_SHOW_TASKBAR ##### --> -<para> - -</para> - -@window: - - -<!-- ##### MACRO E_SHELL_WINDOW_ACTION_SHOW_TOOLBAR ##### --> -<para> - -</para> - -@window: - - -<!-- ##### MACRO E_SHELL_WINDOW_ACTION_SUBMIT_BUG ##### --> -<para> - -</para> - -@window: - - -<!-- ##### MACRO E_SHELL_WINDOW_ACTION_SWITCHER_INITIAL ##### --> -<para> - -</para> - -@window: - - -<!-- ##### MACRO E_SHELL_WINDOW_ACTION_SWITCHER_STYLE_BOTH ##### --> -<para> - -</para> - -@window: - - -<!-- ##### MACRO E_SHELL_WINDOW_ACTION_SWITCHER_STYLE_ICONS ##### --> -<para> - -</para> - -@window: - - -<!-- ##### MACRO E_SHELL_WINDOW_ACTION_SWITCHER_STYLE_TEXT ##### --> -<para> - -</para> - -@window: - - -<!-- ##### MACRO E_SHELL_WINDOW_ACTION_SWITCHER_STYLE_USER ##### --> -<para> - -</para> - -@window: - - -<!-- ##### MACRO E_SHELL_WINDOW_ACTION_WORK_OFFLINE ##### --> -<para> - -</para> - -@window: - - -<!-- ##### MACRO E_SHELL_WINDOW_ACTION_WORK_ONLINE ##### --> -<para> - -</para> - -@window: - - diff --git a/mail/em-account-editor.c b/mail/em-account-editor.c index 036570730c..04d69ad211 100644 --- a/mail/em-account-editor.c +++ b/mail/em-account-editor.c @@ -53,6 +53,7 @@ #include "e-util/e-signature-list.h" #include "e-util/e-signature-utils.h" #include "e-util/e-util-private.h" +#include "widgets/misc/e-auth-combo-box.h" #include "widgets/misc/e-signature-editor.h" #include "widgets/misc/e-port-entry.h" @@ -123,7 +124,6 @@ typedef struct _EMAccountEditorService { EPortEntry *port; GtkLabel *userlabel; GtkEntry *username; - GtkEntry *path; GtkLabel *pathlabel; GtkWidget *pathentry; @@ -139,16 +139,20 @@ typedef struct _EMAccountEditorService { GtkToggleButton *remember; GtkButton *check_supported; GtkToggleButton *needs_auth; + gboolean requires_auth; GCancellable *checking; GtkWidget *check_dialog; - GList *auth_types; /* if "Check supported" */ - CamelProvider *provider; + const gchar *protocol; CamelProviderType type; CamelSettings *settings; - gint auth_changed_id; + gboolean visible_auth; + gboolean visible_host; + gboolean visible_path; + gboolean visible_port; + gboolean visible_user; } EMAccountEditorService; struct _EMAccountEditorPrivate { @@ -226,10 +230,25 @@ enum { PROP_0, PROP_BACKEND, PROP_MODIFIED_ACCOUNT, - PROP_ORIGINAL_ACCOUNT + PROP_ORIGINAL_ACCOUNT, + PROP_STORE_PROVIDER, + PROP_STORE_REQUIRES_AUTH, + PROP_STORE_SETTINGS, + PROP_STORE_VISIBLE_AUTH, + PROP_STORE_VISIBLE_HOST, + PROP_STORE_VISIBLE_PATH, + PROP_STORE_VISIBLE_PORT, + PROP_STORE_VISIBLE_USER, + PROP_TRANSPORT_PROVIDER, + PROP_TRANSPORT_REQUIRES_AUTH, + PROP_TRANSPORT_SETTINGS, + PROP_TRANSPORT_VISIBLE_AUTH, + PROP_TRANSPORT_VISIBLE_HOST, + PROP_TRANSPORT_VISIBLE_PATH, + PROP_TRANSPORT_VISIBLE_PORT, + PROP_TRANSPORT_VISIBLE_USER }; -static void emae_refresh_authtype (EMAccountEditor *emae, EMAccountEditorService *service); static void em_account_editor_construct (EMAccountEditor *emae, EMAccountEditorType type, const gchar *id); static void emae_account_folder_changed (EMFolderSelectionButton *folder, EMAccountEditor *emae); static ServerData * emae_check_servers (const gchar *email); @@ -237,6 +256,14 @@ static ServerData * emae_check_servers (const gchar *email); static gpointer parent_class; static void +emae_config_target_changed_cb (EMAccountEditor *emae) +{ + e_config_target_changed ( + (EConfig *) emae->config, + E_CONFIG_TARGET_CHANGED_STATE); +} + +static void emae_set_original_account (EMAccountEditor *emae, EAccount *original_account) { @@ -277,6 +304,10 @@ emae_set_original_account (EMAccountEditor *emae, emae->priv->original_account = original_account; emae->priv->modified_account = modified_account; + + g_signal_connect_swapped ( + emae->priv->modified_account, "changed", + G_CALLBACK (emae_config_target_changed_cb), emae); } static void @@ -289,6 +320,264 @@ emae_set_backend (EMAccountEditor *emae, emae->priv->backend = g_object_ref (backend); } +static CamelProvider * +emae_get_store_provider (EMAccountEditor *emae) +{ + CamelProvider *provider = NULL; + const gchar *protocol; + + protocol = emae->priv->source.protocol; + + if (protocol != NULL) + provider = camel_provider_get (protocol, NULL); + + return provider; +} + +static gboolean +emae_get_store_requires_auth (EMAccountEditor *emae) +{ + return emae->priv->source.requires_auth; +} + +static void +emae_set_store_requires_auth (EMAccountEditor *emae, + gboolean requires_auth) +{ + emae->priv->source.requires_auth = requires_auth; + + g_object_notify (G_OBJECT (emae), "store-requires-auth"); +} + +static CamelSettings * +emae_get_store_settings (EMAccountEditor *emae) +{ + return emae->priv->source.settings; +} + +static void +emae_set_store_settings (EMAccountEditor *emae, + CamelSettings *settings) +{ + if (settings != NULL) + g_object_ref (settings); + + if (emae->priv->source.settings != NULL) { + g_signal_handlers_disconnect_by_func ( + emae->priv->source.settings, + emae_config_target_changed_cb, emae); + g_object_unref (emae->priv->source.settings); + } + + emae->priv->source.settings = settings; + + g_object_notify (G_OBJECT (emae), "store-settings"); +} + +static gboolean +emae_get_store_visible_auth (EMAccountEditor *emae) +{ + return emae->priv->source.visible_auth; +} + +static void +emae_set_store_visible_auth (EMAccountEditor *emae, + gboolean visible_auth) +{ + emae->priv->source.visible_auth = visible_auth; + + g_object_notify (G_OBJECT (emae), "store-visible-auth"); +} + +static gboolean +emae_get_store_visible_host (EMAccountEditor *emae) +{ + return emae->priv->source.visible_host; +} + +static void +emae_set_store_visible_host (EMAccountEditor *emae, + gboolean visible_host) +{ + emae->priv->source.visible_host = visible_host; + + g_object_notify (G_OBJECT (emae), "store-visible-host"); +} + +static gboolean +emae_get_store_visible_path (EMAccountEditor *emae) +{ + return emae->priv->source.visible_path; +} + +static void +emae_set_store_visible_path (EMAccountEditor *emae, + gboolean visible_path) +{ + emae->priv->source.visible_path = visible_path; + + g_object_notify (G_OBJECT (emae), "store-visible-path"); +} + +static gboolean +emae_get_store_visible_port (EMAccountEditor *emae) +{ + return emae->priv->source.visible_port; +} + +static void +emae_set_store_visible_port (EMAccountEditor *emae, + gboolean visible_port) +{ + emae->priv->source.visible_port = visible_port; + + g_object_notify (G_OBJECT (emae), "store-visible-port"); +} + +static gboolean +emae_get_store_visible_user (EMAccountEditor *emae) +{ + return emae->priv->source.visible_user; +} + +static void +emae_set_store_visible_user (EMAccountEditor *emae, + gboolean visible_user) +{ + emae->priv->source.visible_user = visible_user; + + g_object_notify (G_OBJECT (emae), "store-visible-user"); +} + +static CamelProvider * +emae_get_transport_provider (EMAccountEditor *emae) +{ + CamelProvider *provider = NULL; + const gchar *protocol; + + protocol = emae->priv->transport.protocol; + + if (protocol != NULL) + provider = camel_provider_get (protocol, NULL); + + return provider; +} + +static gboolean +emae_get_transport_requires_auth (EMAccountEditor *emae) +{ + return emae->priv->transport.requires_auth; +} + +static void +emae_set_transport_requires_auth (EMAccountEditor *emae, + gboolean requires_auth) +{ + emae->priv->transport.requires_auth = requires_auth; + + g_object_notify (G_OBJECT (emae), "transport-requires-auth"); +} + +static CamelSettings * +emae_get_transport_settings (EMAccountEditor *emae) +{ + return emae->priv->transport.settings; +} + +static void +emae_set_transport_settings (EMAccountEditor *emae, + CamelSettings *settings) +{ + if (settings != NULL) + g_object_ref (settings); + + if (emae->priv->transport.settings != NULL) { + g_signal_handlers_disconnect_by_func ( + emae->priv->transport.settings, + emae_config_target_changed_cb, emae); + g_object_unref (emae->priv->transport.settings); + } + + emae->priv->transport.settings = settings; + + g_object_notify (G_OBJECT (emae), "transport-settings"); +} + +static gboolean +emae_get_transport_visible_auth (EMAccountEditor *emae) +{ + return emae->priv->transport.visible_auth; +} + +static void +emae_set_transport_visible_auth (EMAccountEditor *emae, + gboolean visible_auth) +{ + emae->priv->transport.visible_auth = visible_auth; + + g_object_notify (G_OBJECT (emae), "transport-visible-auth"); +} + +static gboolean +emae_get_transport_visible_host (EMAccountEditor *emae) +{ + return emae->priv->transport.visible_host; +} + +static void +emae_set_transport_visible_host (EMAccountEditor *emae, + gboolean visible_host) +{ + emae->priv->transport.visible_host = visible_host; + + g_object_notify (G_OBJECT (emae), "transport-visible-host"); +} + +static gboolean +emae_get_transport_visible_path (EMAccountEditor *emae) +{ + return emae->priv->transport.visible_path; +} + +static void +emae_set_transport_visible_path (EMAccountEditor *emae, + gboolean visible_path) +{ + emae->priv->transport.visible_path = visible_path; + + g_object_notify (G_OBJECT (emae), "transport-visible-path"); +} + +static gboolean +emae_get_transport_visible_port (EMAccountEditor *emae) +{ + return emae->priv->transport.visible_port; +} + +static void +emae_set_transport_visible_port (EMAccountEditor *emae, + gboolean visible_port) +{ + emae->priv->transport.visible_port = visible_port; + + g_object_notify (G_OBJECT (emae), "transport-visible-port"); +} + +static gboolean +emae_get_transport_visible_user (EMAccountEditor *emae) +{ + return emae->priv->transport.visible_user; +} + +static void +emae_set_transport_visible_user (EMAccountEditor *emae, + gboolean visible_user) +{ + emae->priv->transport.visible_user = visible_user; + + g_object_notify (G_OBJECT (emae), "transport-visible-user"); +} + static void emae_set_property (GObject *object, guint property_id, @@ -307,6 +596,90 @@ emae_set_property (GObject *object, EM_ACCOUNT_EDITOR (object), g_value_get_object (value)); return; + + case PROP_STORE_REQUIRES_AUTH: + emae_set_store_requires_auth ( + EM_ACCOUNT_EDITOR (object), + g_value_get_boolean (value)); + return; + + case PROP_STORE_SETTINGS: + emae_set_store_settings ( + EM_ACCOUNT_EDITOR (object), + g_value_get_object (value)); + return; + + case PROP_STORE_VISIBLE_AUTH: + emae_set_store_visible_auth ( + EM_ACCOUNT_EDITOR (object), + g_value_get_boolean (value)); + return; + + case PROP_STORE_VISIBLE_HOST: + emae_set_store_visible_host ( + EM_ACCOUNT_EDITOR (object), + g_value_get_boolean (value)); + return; + + case PROP_STORE_VISIBLE_PATH: + emae_set_store_visible_path ( + EM_ACCOUNT_EDITOR (object), + g_value_get_boolean (value)); + return; + + case PROP_STORE_VISIBLE_PORT: + emae_set_store_visible_port ( + EM_ACCOUNT_EDITOR (object), + g_value_get_boolean (value)); + return; + + case PROP_STORE_VISIBLE_USER: + emae_set_store_visible_user ( + EM_ACCOUNT_EDITOR (object), + g_value_get_boolean (value)); + return; + + case PROP_TRANSPORT_REQUIRES_AUTH: + emae_set_transport_requires_auth ( + EM_ACCOUNT_EDITOR (object), + g_value_get_boolean (value)); + return; + + case PROP_TRANSPORT_SETTINGS: + emae_set_transport_settings ( + EM_ACCOUNT_EDITOR (object), + g_value_get_object (value)); + return; + + case PROP_TRANSPORT_VISIBLE_AUTH: + emae_set_transport_visible_auth ( + EM_ACCOUNT_EDITOR (object), + g_value_get_boolean (value)); + return; + + case PROP_TRANSPORT_VISIBLE_HOST: + emae_set_transport_visible_host ( + EM_ACCOUNT_EDITOR (object), + g_value_get_boolean (value)); + return; + + case PROP_TRANSPORT_VISIBLE_PATH: + emae_set_transport_visible_path ( + EM_ACCOUNT_EDITOR (object), + g_value_get_boolean (value)); + return; + + case PROP_TRANSPORT_VISIBLE_PORT: + emae_set_transport_visible_port ( + EM_ACCOUNT_EDITOR (object), + g_value_get_boolean (value)); + return; + + case PROP_TRANSPORT_VISIBLE_USER: + emae_set_transport_visible_user ( + EM_ACCOUNT_EDITOR (object), + g_value_get_boolean (value)); + return; } G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); @@ -339,6 +712,118 @@ emae_get_property (GObject *object, em_account_editor_get_original_account ( EM_ACCOUNT_EDITOR (object))); return; + + case PROP_STORE_PROVIDER: + g_value_set_pointer ( + value, + emae_get_store_provider ( + EM_ACCOUNT_EDITOR (object))); + return; + + case PROP_STORE_REQUIRES_AUTH: + g_value_set_boolean ( + value, + emae_get_store_requires_auth ( + EM_ACCOUNT_EDITOR (object))); + return; + + case PROP_STORE_SETTINGS: + g_value_set_object ( + value, + emae_get_store_settings ( + EM_ACCOUNT_EDITOR (object))); + return; + + case PROP_STORE_VISIBLE_AUTH: + g_value_set_boolean ( + value, + emae_get_store_visible_auth ( + EM_ACCOUNT_EDITOR (object))); + return; + + case PROP_STORE_VISIBLE_HOST: + g_value_set_boolean ( + value, + emae_get_store_visible_host ( + EM_ACCOUNT_EDITOR (object))); + return; + + case PROP_STORE_VISIBLE_PATH: + g_value_set_boolean ( + value, + emae_get_store_visible_path ( + EM_ACCOUNT_EDITOR (object))); + return; + + case PROP_STORE_VISIBLE_PORT: + g_value_set_boolean ( + value, + emae_get_store_visible_port ( + EM_ACCOUNT_EDITOR (object))); + return; + + case PROP_STORE_VISIBLE_USER: + g_value_set_boolean ( + value, + emae_get_store_visible_user ( + EM_ACCOUNT_EDITOR (object))); + return; + + case PROP_TRANSPORT_PROVIDER: + g_value_set_pointer ( + value, + emae_get_transport_provider ( + EM_ACCOUNT_EDITOR (object))); + return; + + case PROP_TRANSPORT_REQUIRES_AUTH: + g_value_set_boolean ( + value, + emae_get_transport_requires_auth ( + EM_ACCOUNT_EDITOR (object))); + return; + + case PROP_TRANSPORT_SETTINGS: + g_value_set_object ( + value, + emae_get_transport_settings ( + EM_ACCOUNT_EDITOR (object))); + return; + + case PROP_TRANSPORT_VISIBLE_AUTH: + g_value_set_boolean ( + value, + emae_get_transport_visible_auth ( + EM_ACCOUNT_EDITOR (object))); + return; + + case PROP_TRANSPORT_VISIBLE_HOST: + g_value_set_boolean ( + value, + emae_get_transport_visible_host ( + EM_ACCOUNT_EDITOR (object))); + return; + + case PROP_TRANSPORT_VISIBLE_PATH: + g_value_set_boolean ( + value, + emae_get_transport_visible_path ( + EM_ACCOUNT_EDITOR (object))); + return; + + case PROP_TRANSPORT_VISIBLE_PORT: + g_value_set_boolean ( + value, + emae_get_transport_visible_port ( + EM_ACCOUNT_EDITOR (object))); + return; + + case PROP_TRANSPORT_VISIBLE_USER: + g_value_set_boolean ( + value, + emae_get_transport_visible_user ( + EM_ACCOUNT_EDITOR (object))); + return; } G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); @@ -357,6 +842,9 @@ emae_dispose (GObject *object) } if (priv->modified_account != NULL) { + g_signal_handlers_disconnect_by_func ( + priv->modified_account, + emae_config_target_changed_cb, object); g_object_unref (priv->modified_account); priv->modified_account = NULL; } @@ -367,11 +855,17 @@ emae_dispose (GObject *object) } if (priv->source.settings != NULL) { + g_signal_handlers_disconnect_by_func ( + priv->source.settings, + emae_config_target_changed_cb, object); g_object_unref (priv->source.settings); priv->source.settings = NULL; } if (priv->transport.settings != NULL) { + g_signal_handlers_disconnect_by_func ( + priv->transport.settings, + emae_config_target_changed_cb, object); g_object_unref (priv->transport.settings); priv->transport.settings = NULL; } @@ -395,9 +889,6 @@ emae_finalize (GObject *object) g_signal_handler_disconnect (signatures, priv->sig_changed_id); } - g_list_free (priv->source.auth_types); - g_list_free (priv->transport.auth_types); - g_list_free (priv->providers); /* Chain up to parent's finalize() method. */ @@ -427,7 +918,8 @@ emae_class_init (GObjectClass *class) NULL, E_TYPE_MAIL_BACKEND, G_PARAM_READWRITE | - G_PARAM_CONSTRUCT_ONLY)); + G_PARAM_CONSTRUCT_ONLY | + G_PARAM_STATIC_STRINGS)); g_object_class_install_property ( object_class, @@ -437,7 +929,8 @@ emae_class_init (GObjectClass *class) "Modified Account", NULL, E_TYPE_ACCOUNT, - G_PARAM_READABLE)); + G_PARAM_READABLE | + G_PARAM_STATIC_STRINGS)); g_object_class_install_property ( object_class, @@ -448,7 +941,194 @@ emae_class_init (GObjectClass *class) NULL, E_TYPE_ACCOUNT, G_PARAM_READWRITE | - G_PARAM_CONSTRUCT_ONLY)); + G_PARAM_CONSTRUCT_ONLY | + G_PARAM_STATIC_STRINGS)); + + g_object_class_install_property ( + object_class, + PROP_STORE_PROVIDER, + g_param_spec_pointer ( + "store-provider", + "Store Provider", + "CamelProvider for the storage service", + G_PARAM_READABLE | + G_PARAM_STATIC_STRINGS)); + + g_object_class_install_property ( + object_class, + PROP_STORE_REQUIRES_AUTH, + g_param_spec_boolean ( + "store-requires-auth", + "Store Requires Auth", + "Storage service requires authentication", + TRUE, + G_PARAM_READWRITE | + G_PARAM_CONSTRUCT | + G_PARAM_STATIC_STRINGS)); + + g_object_class_install_property ( + object_class, + PROP_STORE_SETTINGS, + g_param_spec_object ( + "store-settings", + "Store Settings", + "CamelSettings for the storage service", + CAMEL_TYPE_SETTINGS, + G_PARAM_READWRITE | + G_PARAM_STATIC_STRINGS)); + + g_object_class_install_property ( + object_class, + PROP_STORE_VISIBLE_AUTH, + g_param_spec_boolean ( + "store-visible-auth", + "Store Visible Auth", + "Show auth widgets for the storage service", + TRUE, + G_PARAM_READWRITE | + G_PARAM_CONSTRUCT | + G_PARAM_STATIC_STRINGS)); + + g_object_class_install_property ( + object_class, + PROP_STORE_VISIBLE_HOST, + g_param_spec_boolean ( + "store-visible-host", + "Store Visible Host", + "Show host widgets for the storage service", + TRUE, + G_PARAM_READWRITE | + G_PARAM_CONSTRUCT | + G_PARAM_STATIC_STRINGS)); + + g_object_class_install_property ( + object_class, + PROP_STORE_VISIBLE_PATH, + g_param_spec_boolean ( + "store-visible-path", + "Store Visible Path", + "Show path widgets for the storage service", + FALSE, + G_PARAM_READWRITE | + G_PARAM_CONSTRUCT | + G_PARAM_STATIC_STRINGS)); + + g_object_class_install_property ( + object_class, + PROP_STORE_VISIBLE_PORT, + g_param_spec_boolean ( + "store-visible-port", + "Store Visible Port", + "Show port widgets for the storage service", + TRUE, + G_PARAM_READWRITE | + G_PARAM_CONSTRUCT | + G_PARAM_STATIC_STRINGS)); + + g_object_class_install_property ( + object_class, + PROP_STORE_VISIBLE_USER, + g_param_spec_boolean ( + "store-visible-user", + "Store Visible User", + "Show user widgets for the storage service", + TRUE, + G_PARAM_READWRITE | + G_PARAM_CONSTRUCT | + G_PARAM_STATIC_STRINGS)); + + g_object_class_install_property ( + object_class, + PROP_TRANSPORT_PROVIDER, + g_param_spec_pointer ( + "transport-provider", + "Transport Provider", + "CamelProvider for the transport service", + G_PARAM_READABLE | + G_PARAM_STATIC_STRINGS)); + + g_object_class_install_property ( + object_class, + PROP_TRANSPORT_REQUIRES_AUTH, + g_param_spec_boolean ( + "transport-requires-auth", + "Transport Requires Auth", + "Transport service requires authentication", + FALSE, + G_PARAM_READWRITE | + G_PARAM_CONSTRUCT | + G_PARAM_STATIC_STRINGS)); + + g_object_class_install_property ( + object_class, + PROP_TRANSPORT_SETTINGS, + g_param_spec_object ( + "transport-settings", + "Transport Settings", + "CamelSettings for the transport service", + CAMEL_TYPE_SETTINGS, + G_PARAM_READWRITE | + G_PARAM_STATIC_STRINGS)); + + g_object_class_install_property ( + object_class, + PROP_TRANSPORT_VISIBLE_AUTH, + g_param_spec_boolean ( + "transport-visible-auth", + "Transport Visible Auth", + "Show auth widgets for the transport service", + TRUE, + G_PARAM_READWRITE | + G_PARAM_CONSTRUCT | + G_PARAM_STATIC_STRINGS)); + + g_object_class_install_property ( + object_class, + PROP_TRANSPORT_VISIBLE_HOST, + g_param_spec_boolean ( + "transport-visible-host", + "Transport Visible Host", + "Show host widgets for the transport service", + TRUE, + G_PARAM_READWRITE | + G_PARAM_CONSTRUCT | + G_PARAM_STATIC_STRINGS)); + + g_object_class_install_property ( + object_class, + PROP_TRANSPORT_VISIBLE_PATH, + g_param_spec_boolean ( + "transport-visible-path", + "Transport Visible Path", + "Show path widgets for the transport service", + FALSE, + G_PARAM_READWRITE | + G_PARAM_CONSTRUCT | + G_PARAM_STATIC_STRINGS)); + + g_object_class_install_property ( + object_class, + PROP_TRANSPORT_VISIBLE_PORT, + g_param_spec_boolean ( + "transport-visible-port", + "Transport Visible Port", + "Show port widgets for the transport service", + TRUE, + G_PARAM_READWRITE | + G_PARAM_CONSTRUCT | + G_PARAM_STATIC_STRINGS)); + + g_object_class_install_property ( + object_class, + PROP_TRANSPORT_VISIBLE_USER, + g_param_spec_boolean ( + "transport-visible-user", + "Transport Visible User", + "Show user widgets for the transport service", + TRUE, + G_PARAM_READWRITE | + G_PARAM_CONSTRUCT | + G_PARAM_STATIC_STRINGS)); } static void @@ -462,6 +1142,10 @@ emae_init (EMAccountEditor *emae) emae->priv->source.emae = emae; emae->priv->transport.emae = emae; emae->priv->widgets = g_hash_table_new (g_str_hash, g_str_equal); + + /* Pick default storage and transport protocols. */ + emae->priv->source.protocol = "imapx"; + emae->priv->transport.protocol = "smtp"; } GType @@ -655,6 +1339,7 @@ emae_auto_detect (EMAccountEditor *emae) { EMAccountEditorPrivate *priv = emae->priv; EMAccountEditorService *service = &priv->source; + CamelProvider *provider; GHashTable *auto_detected; GSList *l; CamelProviderConfEntry *entries; @@ -662,15 +1347,19 @@ emae_auto_detect (EMAccountEditor *emae) gint i; CamelURL *url; - if (service->provider == NULL - || (entries = service->provider->extra_conf) == NULL) + provider = camel_provider_get (service->protocol, NULL); + + if (provider == NULL || provider->extra_conf == NULL) return; + entries = provider->extra_conf; + d (printf ("Running auto-detect\n")); url = emae_account_url (emae, E_ACCOUNT_SOURCE_URL); - camel_provider_auto_detect (service->provider, url, &auto_detected, NULL); + camel_provider_auto_detect (provider, url, &auto_detected, NULL); camel_url_free (url); + if (auto_detected == NULL) { d (printf (" no values detected\n")); return; @@ -898,7 +1587,6 @@ emae_setup_signatures (EMAccountEditor *emae, gtk_combo_box_set_active (dropdown, active); g_signal_connect (dropdown, "changed", G_CALLBACK(emae_signaturetype_changed), emae); - gtk_widget_set_sensitive ((GtkWidget *) dropdown, e_account_writable (account, E_ACCOUNT_ID_SIGNATURE)); button = e_builder_get_widget (builder, "sigAddNew"); g_signal_connect (button, "clicked", G_CALLBACK(emae_signature_new), emae); @@ -973,7 +1661,6 @@ emae_setup_receipt_policy (EMAccountEditor *emae, gtk_combo_box_set_active (dropdown, active); g_signal_connect (dropdown, "changed", G_CALLBACK(emae_receipt_policy_changed), emae); - gtk_widget_set_sensitive ((GtkWidget *) dropdown, e_account_writable (account, E_ACCOUNT_RECEIPT_POLICY)); return (GtkWidget *) dropdown; } @@ -1014,7 +1701,6 @@ emae_account_entry (EMAccountEditor *emae, gtk_entry_set_text (entry, text); g_object_set_data ((GObject *)entry, "account-item", GINT_TO_POINTER(item)); g_signal_connect (entry, "changed", G_CALLBACK(emae_account_entry_changed), emae); - gtk_widget_set_sensitive ((GtkWidget *) entry, e_account_writable (account, item)); return entry; } @@ -1041,16 +1727,12 @@ emae_account_toggle_widget (EMAccountEditor *emae, { EAccount *account; gboolean active; - gboolean writable; account = em_account_editor_get_modified_account (emae); active = e_account_get_bool (account, item); gtk_toggle_button_set_active (toggle, active); - writable = e_account_writable (account, item); - gtk_widget_set_sensitive (GTK_WIDGET (toggle), writable); - g_object_set_data ( G_OBJECT (toggle), "account-item", GINT_TO_POINTER (item)); @@ -1095,7 +1777,6 @@ emae_account_spinint_widget (EMAccountEditor *emae, gint item) { EAccount *account; - gboolean writable; gint v_int; account = em_account_editor_get_modified_account (emae); @@ -1103,9 +1784,6 @@ emae_account_spinint_widget (EMAccountEditor *emae, v_int = e_account_get_int (account, item); gtk_spin_button_set_value (spin, v_int); - writable = e_account_writable (account, item); - gtk_widget_set_sensitive (GTK_WIDGET (spin), writable); - g_object_set_data ( G_OBJECT (spin), "account-item", GINT_TO_POINTER (item)); @@ -1161,8 +1839,6 @@ emae_account_folder (EMAccountEditor *emae, g_signal_connect (folder, "selected", G_CALLBACK(emae_account_folder_changed), emae); gtk_widget_show ((GtkWidget *) folder); - gtk_widget_set_sensitive ((GtkWidget *) folder, e_account_writable (account, item)); - return folder; } @@ -1270,54 +1946,6 @@ smime_encrypt_key_clear (GtkWidget *w, } #endif -static void -emae_url_set_host (CamelURL *url, - const gchar *txt) -{ - gchar *host; - - if (txt && *txt) { - host = g_strdup (txt); - g_strstrip (host); - camel_url_set_host (url, host); - g_free (host); - } -} - -static void -emae_url_set_port (CamelURL *url, - const gchar *port) -{ - if (port && *port) - camel_url_set_port (url, atoi (port)); -} - -/* This is used to map a funciton which will set on the url a string value. - * if widgets[0] is set, it is the entry which will be called against setval () - * We need our own function for host:port decoding, as above */ -struct _provider_host_info { - guint32 flag; - void (*setval)(CamelURL *, const gchar *); - glong widgets[3]; -}; - -static struct _provider_host_info emae_source_host_info[] = { - { CAMEL_URL_PART_HOST, emae_url_set_host, { G_STRUCT_OFFSET (EMAccountEditorService, hostname), G_STRUCT_OFFSET (EMAccountEditorService, hostlabel), }, }, - { CAMEL_URL_PART_PORT, emae_url_set_port, { G_STRUCT_OFFSET (EMAccountEditorService, port), G_STRUCT_OFFSET (EMAccountEditorService, portlabel), }, }, - { CAMEL_URL_PART_USER, camel_url_set_user, { G_STRUCT_OFFSET (EMAccountEditorService, username), G_STRUCT_OFFSET (EMAccountEditorService, userlabel), } }, - { CAMEL_URL_PART_PATH, camel_url_set_path, { G_STRUCT_OFFSET (EMAccountEditorService, path), G_STRUCT_OFFSET (EMAccountEditorService, pathlabel), G_STRUCT_OFFSET (EMAccountEditorService, pathentry) }, }, - { CAMEL_URL_PART_AUTH, NULL, { 0, G_STRUCT_OFFSET (EMAccountEditorService, auth_frame), }, }, - { 0 }, -}; - -static struct _provider_host_info emae_transport_host_info[] = { - { CAMEL_URL_PART_HOST, emae_url_set_host, { G_STRUCT_OFFSET (EMAccountEditorService, hostname), G_STRUCT_OFFSET (EMAccountEditorService, hostlabel), }, }, - { CAMEL_URL_PART_PORT, emae_url_set_port, { G_STRUCT_OFFSET (EMAccountEditorService, port), G_STRUCT_OFFSET (EMAccountEditorService, portlabel), }, }, - { CAMEL_URL_PART_USER, camel_url_set_user, { G_STRUCT_OFFSET (EMAccountEditorService, username), G_STRUCT_OFFSET (EMAccountEditorService, userlabel), } }, - { CAMEL_URL_PART_AUTH, NULL, { 0, G_STRUCT_OFFSET (EMAccountEditorService, auth_frame), }, }, - { 0 }, -}; - /* This is used to map each of the two services in a typical account to * the widgets that represent each service. i.e. the receiving (source) * service, and the sending (transport) service. It is used throughout @@ -1354,8 +1982,6 @@ static struct _service_info { const gchar *remember_password; - struct _provider_host_info *host_info; - } emae_service_info[CAMEL_NUM_PROVIDER_TYPES] = { { E_ACCOUNT_SOURCE_URL, @@ -1387,9 +2013,8 @@ static struct _service_info { "source_auth_dropdown", "source_check_supported", - "source_remember_password", - - emae_source_host_info }, + "source_remember_password" + }, { E_ACCOUNT_TRANSPORT_URL, E_ACCOUNT_TRANSPORT_SAVE_PASSWD, @@ -1420,164 +2045,49 @@ static struct _service_info { "transport_auth_dropdown", "transport_check_supported", - "transport_remember_password", - - emae_transport_host_info, - }, + "transport_remember_password" + } }; static void -emae_uri_changed (EMAccountEditorService *service, - CamelURL *url) +emae_file_chooser_changed (GtkFileChooser *file_chooser, + EMAccountEditorService *service) { - EAccount *account; - gchar *uri; - - account = em_account_editor_get_modified_account (service->emae); - uri = camel_url_to_string (url, 0); - - e_account_set_string (account, emae_service_info[service->type].account_uri_key, uri); - - /* small hack for providers which are store and transport - copy settings across */ - if (service->type == CAMEL_PROVIDER_STORE - && service->provider - && CAMEL_PROVIDER_IS_STORE_AND_TRANSPORT (service->provider)) - e_account_set_string (account, E_ACCOUNT_TRANSPORT_URL, uri); + CamelLocalSettings *local_settings; + const gchar *filename; - g_free (uri); + local_settings = CAMEL_LOCAL_SETTINGS (service->settings); + filename = gtk_file_chooser_get_filename (file_chooser); + camel_local_settings_set_path (local_settings, filename); } static void -emae_service_url_changed (EMAccountEditorService *service, - void (*setval)(CamelURL *, const gchar *), - GtkWidget *entry) +emae_setup_settings (EMAccountEditorService *service) { - GtkComboBox *dropdown; - gint id; - GtkTreeModel *model; - GtkTreeIter iter; - CamelServiceAuthType *authtype; - gchar *text; - - CamelURL *url = emae_account_url (service->emae, emae_service_info[service->type].account_uri_key); - - if (GTK_IS_ENTRY (entry)) - text = g_strdup (gtk_entry_get_text (GTK_ENTRY (entry))); - else if (E_IS_PORT_ENTRY (entry)) { - text = g_strdup_printf ("%i", e_port_entry_get_port (E_PORT_ENTRY (entry))); - } else - return; + CamelServiceClass *class; + CamelProvider *provider; + CamelSettings *settings = NULL; + GType service_type; + GType settings_type; + CamelURL *url; - g_strstrip (text); + provider = camel_provider_get (service->protocol, NULL); + g_return_if_fail (provider != NULL); - setval (url, (text && text[0]) ? text : NULL); - - if (text && text[0] && setval == camel_url_set_user) { - dropdown = service->authtype; - if (dropdown) { - id = gtk_combo_box_get_active (dropdown); - if (id != -1) { - model = gtk_combo_box_get_model (dropdown); - if (gtk_tree_model_iter_nth_child (model, &iter, NULL, id)) { - gtk_tree_model_get (model, &iter, 1, &authtype, -1); - if (authtype) - camel_url_set_authmech (url, authtype->authproto); - } - } - } - } + service_type = provider->object_types[service->type]; + g_return_if_fail (g_type_is_a (service_type, CAMEL_TYPE_SERVICE)); - emae_uri_changed (service, url); - camel_url_free (url); - g_free (text); -} + class = g_type_class_ref (service_type); + settings_type = class->settings_type; + g_type_class_unref (class); -static void -emae_service_url_path_changed (EMAccountEditorService *service, - void (*setval)(CamelURL *, const gchar *), - GtkWidget *widget) -{ - GtkComboBox *dropdown; - gint id; - GtkTreeModel *model; - GtkTreeIter iter; - CamelServiceAuthType *authtype; - - CamelURL *url = emae_account_url (service->emae, emae_service_info[service->type].account_uri_key); - const gchar *text = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (widget)); - - setval (url, (text && text[0]) ? text : NULL); - - if (text && text[0] && setval == camel_url_set_user) { - dropdown = service->authtype; - if (dropdown) { - id = gtk_combo_box_get_active (dropdown); - if (id != -1) { - model = gtk_combo_box_get_model (dropdown); - if (gtk_tree_model_iter_nth_child (model, &iter, NULL, id)) { - gtk_tree_model_get (model, &iter, 1, &authtype, -1); - if (authtype) - camel_url_set_authmech (url, authtype->authproto); - } - } - } + /* If we already have a CamelSettings instance + * of the appropriate type, leave it alone. */ + if (service->settings != NULL) { + if (G_OBJECT_TYPE (service->settings) == settings_type) + return; } - emae_uri_changed (service, url); - camel_url_free (url); -} - -static void -emae_hostname_changed (GtkEntry *entry, - EMAccountEditorService *service) -{ - emae_service_url_changed (service, emae_url_set_host, GTK_WIDGET (entry)); -} - -static void -emae_port_changed (EPortEntry *pentry, - EMAccountEditorService *service) -{ - emae_service_url_changed (service, emae_url_set_port, GTK_WIDGET (pentry)); -} - -static void -emae_username_changed (GtkEntry *entry, - EMAccountEditorService *service) -{ - emae_service_url_changed (service, camel_url_set_user, GTK_WIDGET (entry)); -} - -static void -emae_path_changed (GtkWidget *widget, - EMAccountEditorService *service) -{ - emae_service_url_path_changed (service, camel_url_set_path, widget); -} - -static void -emae_ssl_changed (GtkComboBox *dropdown, - EMAccountEditorService *service) -{ - CamelURL *url; - - url = emae_account_url ( - service->emae, - emae_service_info[service->type].account_uri_key); - camel_url_set_port (url, e_port_entry_get_port (service->port)); - emae_uri_changed (service, url); - camel_url_free (url); -} - -static void -emae_setup_settings (EMAccountEditorService *service) -{ - EConfig *config; - EMConfigTargetAccount *target; - CamelServiceClass *class; - GType service_type; - CamelURL *url; - url = emae_account_url ( service->emae, emae_service_info[service->type].account_uri_key); @@ -1585,33 +2095,56 @@ emae_setup_settings (EMAccountEditorService *service) /* Destroy any old CamelSettings instances. * Changing CamelProviders invalidates them. */ - if (service->settings != NULL) { + if (service->settings != NULL) camel_settings_save_to_url (service->settings, url); - g_object_unref (service->settings); - service->settings = NULL; + + if (g_type_is_a (settings_type, CAMEL_TYPE_SETTINGS)) { + settings = g_object_new (settings_type, NULL); + camel_settings_load_from_url (settings, url); + + g_signal_connect_swapped ( + settings, "notify", + G_CALLBACK (emae_config_target_changed_cb), + service->emae); } - g_return_if_fail (service->provider != NULL); + camel_url_free (url); - service_type = service->provider->object_types[service->type]; - g_return_if_fail (g_type_is_a (service_type, CAMEL_TYPE_SERVICE)); + if (CAMEL_PROVIDER_IS_STORE_AND_TRANSPORT (provider)) { + emae_set_store_settings (service->emae, settings); + emae_set_transport_settings (service->emae, settings); - class = g_type_class_ref (service_type); + } else if (service->type == CAMEL_PROVIDER_STORE) { + emae_set_store_settings (service->emae, settings); - if (g_type_is_a (class->settings_type, CAMEL_TYPE_SETTINGS)) { - service->settings = g_object_new (class->settings_type, NULL); - camel_settings_load_from_url (service->settings, url); + } else if (service->type == CAMEL_PROVIDER_TRANSPORT) { + emae_set_transport_settings (service->emae, settings); } - g_type_class_unref (class); - camel_url_free (url); + if (CAMEL_IS_NETWORK_SETTINGS (settings)) { + const gchar *auth_mechanism; + gboolean service_requires_auth; + + auth_mechanism = + camel_network_settings_get_auth_mechanism ( + CAMEL_NETWORK_SETTINGS (settings)); + + service_requires_auth = (auth_mechanism != NULL); + + g_object_bind_property ( + settings, "auth-mechanism", + service->authtype, "active-id", + G_BINDING_BIDIRECTIONAL | + G_BINDING_SYNC_CREATE); + + g_object_bind_property ( + settings, "host", + service->hostname, "text", + G_BINDING_BIDIRECTIONAL | + G_BINDING_SYNC_CREATE); - /* If settings implements CamelNetworkSettings, bind the - * "security-method" property to the security combo box - * and to the EPortEntry widget. */ - if (CAMEL_IS_NETWORK_SETTINGS (service->settings)) { g_object_bind_property_full ( - service->settings, "security-method", + settings, "security-method", service->use_ssl, "active-id", G_BINDING_BIDIRECTIONAL | G_BINDING_SYNC_CREATE, @@ -1620,400 +2153,270 @@ emae_setup_settings (EMAccountEditorService *service) NULL, (GDestroyNotify) NULL); g_object_bind_property ( - service->settings, "security-method", + settings, "port", + service->port, "port", + G_BINDING_BIDIRECTIONAL | + G_BINDING_SYNC_CREATE); + + g_object_bind_property ( + settings, "security-method", service->port, "security-method", G_BINDING_SYNC_CREATE); + + g_object_bind_property ( + settings, "user", + service->username, "text", + G_BINDING_BIDIRECTIONAL | + G_BINDING_SYNC_CREATE); + + switch (service->type) { + case CAMEL_PROVIDER_STORE: + emae_set_store_requires_auth ( + service->emae, service_requires_auth); + break; + + case CAMEL_PROVIDER_TRANSPORT: + emae_set_transport_requires_auth ( + service->emae, service_requires_auth); + break; + + default: + g_warn_if_reached (); + } } - /* Update the EConfigTarget so it has the latest CamelSettings. */ + if (CAMEL_IS_LOCAL_SETTINGS (settings)) { + const gchar *path; - config = E_CONFIG (service->emae->priv->config); - target = (EMConfigTargetAccount *) config->target; + path = camel_local_settings_get_path ( + CAMEL_LOCAL_SETTINGS (settings)); + gtk_file_chooser_set_filename ( + GTK_FILE_CHOOSER (service->pathentry), path); + } - em_config_target_new_account_update_settings ( - config, target, service->emae->priv->source.settings); + g_object_unref (settings); } static void emae_service_provider_changed (EMAccountEditorService *service) { - EAccount *account; - gint i, j; - gint old_port; - void (*show)(GtkWidget *); - CamelURL *url = emae_account_url (service->emae, emae_service_info[service->type].account_uri_key); + EConfig *config; + EMConfigTargetSettings *target; + CamelProvider *provider; + const gchar *description; - account = em_account_editor_get_modified_account (service->emae); + provider = camel_provider_get (service->protocol, NULL); - if (service->provider) { - gint enable; - GtkWidget *dwidget = NULL; + description = (provider != NULL) ? provider->description : ""; + gtk_label_set_text (service->description, description); - /* Remember the current port. Any following changes in SSL would overwrite it - and we don't want that since user can be using a non-standard port and we - would lost the value this way. */ - old_port = e_port_entry_get_port (service->port); + if (provider != NULL) { + gboolean visible_auth; + gboolean visible_host; + gboolean visible_path; + gboolean visible_port; + gboolean visible_user; + gboolean visible_ssl; + gboolean allows; + gboolean hidden; emae_setup_settings (service); - camel_url_set_protocol (url, service->provider->protocol); - gtk_label_set_text (service->description, service->provider->description); gtk_widget_show (service->frame); - enable = e_account_writable_option (account, service->provider->protocol, "auth"); - gtk_widget_set_sensitive ((GtkWidget *) service->authtype, enable); - gtk_widget_set_sensitive ((GtkWidget *) service->check_supported, enable); - - enable = e_account_writable_option (account, service->provider->protocol, "use_ssl"); - gtk_widget_set_sensitive ((GtkWidget *) service->use_ssl, enable); - - enable = e_account_writable (account, emae_service_info[service->type].save_passwd_key); - gtk_widget_set_sensitive ((GtkWidget *) service->remember, enable); - - for (i = 0; emae_service_info[service->type].host_info[i].flag; i++) { - GtkWidget *w; - gint hide; - struct _provider_host_info *info = &emae_service_info[service->type].host_info[i]; - - enable = CAMEL_PROVIDER_ALLOWS (service->provider, info->flag); - hide = CAMEL_PROVIDER_HIDDEN (service->provider, info->flag); - show = (enable && !hide) ? gtk_widget_show : gtk_widget_hide; - - for (j = 0; j < G_N_ELEMENTS (info->widgets); j++) { - if (info->widgets[j] && (w = G_STRUCT_MEMBER (GtkWidget *, service, info->widgets[j]))) { - show (w); - if (j == 0) { - if (dwidget == NULL && enable) - dwidget = w; - - if (info->setval && !hide) { - if (GTK_IS_ENTRY (w)) - info->setval (url, enable ? gtk_entry_get_text ((GtkEntry *) w) : NULL); - else if (E_IS_PORT_ENTRY (w)) - info->setval (url, enable ? g_strdup_printf ("%i", - e_port_entry_get_port (E_PORT_ENTRY (w))) : NULL); - } - } - } - } - } + allows = CAMEL_PROVIDER_ALLOWS (provider, CAMEL_URL_PART_AUTH); + hidden = CAMEL_PROVIDER_HIDDEN (provider, CAMEL_URL_PART_AUTH); + visible_auth = (allows && !hidden); + + allows = CAMEL_PROVIDER_ALLOWS (provider, CAMEL_URL_PART_HOST); + hidden = CAMEL_PROVIDER_HIDDEN (provider, CAMEL_URL_PART_HOST); + visible_host = (allows && !hidden); + + allows = CAMEL_PROVIDER_ALLOWS (provider, CAMEL_URL_PART_PATH); + hidden = CAMEL_PROVIDER_HIDDEN (provider, CAMEL_URL_PART_PATH); + visible_path = (allows && !hidden); + + allows = CAMEL_PROVIDER_ALLOWS (provider, CAMEL_URL_PART_PORT); + hidden = CAMEL_PROVIDER_HIDDEN (provider, CAMEL_URL_PART_PORT); + visible_port = (allows && !hidden); + + allows = CAMEL_PROVIDER_ALLOWS (provider, CAMEL_URL_PART_USER); + hidden = CAMEL_PROVIDER_HIDDEN (provider, CAMEL_URL_PART_USER); + visible_user = (allows && !hidden); + + switch (service->type) { + case CAMEL_PROVIDER_STORE: + g_object_set ( + service->emae, + "store-visible-auth", visible_auth, + "store-visible-host", visible_host, + "store-visible-path", visible_path, + "store-visible-port", visible_port, + "store-visible-user", visible_user, + NULL); + break; - if (dwidget) - gtk_widget_grab_focus (dwidget); - - if (CAMEL_PROVIDER_ALLOWS (service->provider, CAMEL_URL_PART_AUTH)) { - GList *ll; - - /* try to keep the authmech from the current url, or clear it */ - if (url->authmech) { - if (service->provider->authtypes) { - for (ll = service->provider->authtypes; ll; ll = g_list_next (ll)) - if (!strcmp (url->authmech, ((CamelServiceAuthType *) ll->data)->authproto)) - break; - if (ll == NULL) - camel_url_set_authmech (url, NULL); - } else { - camel_url_set_authmech (url, NULL); - } - } + case CAMEL_PROVIDER_TRANSPORT: + g_object_set ( + service->emae, + "transport-visible-auth", visible_auth, + "transport-visible-host", visible_host, + "transport-visible-path", visible_path, + "transport-visible-port", visible_port, + "transport-visible-user", visible_user, + NULL); + break; - emae_refresh_authtype (service->emae, service); - if (service->needs_auth && !CAMEL_PROVIDER_NEEDS (service->provider, CAMEL_URL_PART_AUTH)) + default: + g_warn_if_reached (); + } + + if (CAMEL_PROVIDER_ALLOWS (provider, CAMEL_URL_PART_AUTH)) { + if (service->needs_auth && !CAMEL_PROVIDER_NEEDS (provider, CAMEL_URL_PART_AUTH)) gtk_widget_show ((GtkWidget *) service->needs_auth); } else { if (service->needs_auth) gtk_widget_hide ((GtkWidget *) service->needs_auth); } #ifdef HAVE_SSL + visible_ssl = + (provider->flags & CAMEL_PROVIDER_SUPPORTS_SSL); + gtk_widget_set_visible (service->ssl_frame, visible_ssl); + gtk_widget_set_visible (service->ssl_hbox, visible_ssl); gtk_widget_hide (service->no_ssl); - if (service->provider->flags & CAMEL_PROVIDER_SUPPORTS_SSL) { - camel_url_set_port (url, e_port_entry_get_port (service->port)); - show = gtk_widget_show; - } else { - show = gtk_widget_hide; - } - show (service->ssl_frame); - show (service->ssl_hbox); #else gtk_widget_hide (service->ssl_hbox); gtk_widget_show (service->no_ssl); #endif - /* When everything is set it is safe to put back user's original port. */ - if (url->port && service->provider->port_entries) - e_port_entry_set_port (service->port, old_port); - } else { - camel_url_set_protocol (url, NULL); - gtk_label_set_text (service->description, ""); gtk_widget_hide (service->frame); gtk_widget_hide (service->auth_frame); gtk_widget_hide (service->ssl_frame); } - /* FIXME: linked services? */ - /* FIXME: permissions setup */ + /* Update the EConfigTarget so it has the latest CamelSettings. */ - emae_uri_changed (service, url); - camel_url_free (url); + config = E_CONFIG (service->emae->priv->config); + target = (EMConfigTargetSettings *) config->target; + + em_config_target_update_settings ( + config, target, + service->emae->priv->modified_account->id->address, + service->emae->priv->source.protocol, + service->emae->priv->source.settings, + service->emae->priv->transport.protocol, + service->emae->priv->transport.settings); } static void -emae_provider_changed (GtkComboBox *dropdown, +emae_provider_changed (GtkComboBox *combo_box, EMAccountEditorService *service) { - gint id = gtk_combo_box_get_active (dropdown); - GtkTreeModel *model; - GtkTreeIter iter; + const gchar *active_protocol; - if (id == -1) - return; + active_protocol = gtk_combo_box_get_active_id (combo_box); - model = gtk_combo_box_get_model (dropdown); - if (!gtk_tree_model_iter_nth_child (model, &iter, NULL, id)) + if (g_strcmp0 (active_protocol, service->protocol) == 0) return; - gtk_tree_model_get (model, &iter, 1, &service->provider, -1); + service->protocol = active_protocol; - g_list_free (service->auth_types); - service->auth_types = NULL; + switch (service->type) { + case CAMEL_PROVIDER_STORE: + g_object_notify ( + G_OBJECT (service->emae), + "store-provider"); + break; + case CAMEL_PROVIDER_TRANSPORT: + g_object_notify ( + G_OBJECT (service->emae), + "transport-provider"); + break; + default: + g_warn_if_reached (); + } emae_service_provider_changed (service); - e_config_target_changed ((EConfig *) service->emae->priv->config, E_CONFIG_TARGET_CHANGED_REBUILD); + e_config_target_changed ( + (EConfig *) service->emae->priv->config, + E_CONFIG_TARGET_CHANGED_REBUILD); } static void emae_refresh_providers (EMAccountEditor *emae, EMAccountEditorService *service) { - EAccount *account; - GtkListStore *store; - GtkTreeIter iter; - GList *l; - GtkCellRenderer *cell = gtk_cell_renderer_text_new (); - GtkComboBox *dropdown; - gint active = 0, i; - struct _service_info *info = &emae_service_info[service->type]; - const gchar *uri; - gchar *current = NULL; - CamelURL *url; + GtkComboBoxText *combo_box; + GList *link; - account = em_account_editor_get_modified_account (emae); - uri = e_account_get_string (account, info->account_uri_key); + combo_box = GTK_COMBO_BOX_TEXT (service->providers); - dropdown = service->providers; - gtk_widget_show ((GtkWidget *) dropdown); + g_signal_handlers_block_by_func ( + combo_box, emae_provider_changed, service); - if (uri) { - const gchar *colon = strchr (uri, ':'); - gint len; - - if (colon) { - len = colon - uri; - current = g_alloca (len + 1); - memcpy (current, uri, len); - current[len] = 0; - } - } else { - /* Promote the newer IMAP provider over the older one. */ - current = (gchar *) "imapx"; - } - - store = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_POINTER); - - i = 0; + gtk_combo_box_text_remove_all (combo_box); /* We just special case each type here, its just easier */ - if (service->type == CAMEL_PROVIDER_STORE) { - gtk_list_store_append (store, &iter); - /* Translators: "None" for receiving account type, beside of IMAP, POP3, ... */ - gtk_list_store_set (store, &iter, 0, C_("mail-receiving", "None"), 1, NULL, -1); - i++; - } + if (service->type == CAMEL_PROVIDER_STORE) + gtk_combo_box_text_append ( + combo_box, NULL, + C_("mail-receiving", "None")); + + for (link = emae->priv->providers; link != NULL; link = link->next) { + CamelProvider *provider = link->data; + gboolean mail_or_news_domain; - for (l = emae->priv->providers; l; l = l->next) { - CamelProvider *provider = l->data; + mail_or_news_domain = + (g_strcmp0 (provider->domain, "mail") == 0) || + (g_strcmp0 (provider->domain, "news") == 0); - if (!((strcmp (provider->domain, "mail") == 0 - || strcmp (provider->domain, "news") == 0) + /* FIXME This expression is awesomely unreadable! */ + if (!(mail_or_news_domain && provider->object_types[service->type] - && (service->type != CAMEL_PROVIDER_STORE || (provider->flags & CAMEL_PROVIDER_IS_SOURCE) != 0)) + && (service->type != CAMEL_PROVIDER_STORE || + (provider->flags & CAMEL_PROVIDER_IS_SOURCE) != 0)) /* hardcode not showing providers who's transport is done in the store */ || (service->type == CAMEL_PROVIDER_TRANSPORT && CAMEL_PROVIDER_IS_STORE_AND_TRANSPORT (provider))) continue; - gtk_list_store_append (store, &iter); - gtk_list_store_set (store, &iter, 0, provider->name, 1, provider, -1); - - /* find the displayed and set default */ - if (i == 0 || (current && strcmp (provider->protocol, current) == 0)) { - CamelURL *url; - - service->provider = provider; - emae_setup_settings (service); - active = i; - - url = emae_account_url (emae, info->account_uri_key); - if (current == NULL) { - /* we need to set this value on the uri too */ - camel_url_set_protocol (url, provider->protocol); - } - - emae_uri_changed (service, url); - uri = e_account_get_string (account, info->account_uri_key); - camel_url_free (url); - } - i++; + gtk_combo_box_text_append ( + combo_box, + provider->protocol, + provider->name); } - gtk_cell_layout_clear ((GtkCellLayout *) dropdown); - gtk_combo_box_set_model (dropdown, (GtkTreeModel *) store); - gtk_cell_layout_pack_start ((GtkCellLayout *) dropdown, cell, TRUE); - gtk_cell_layout_set_attributes ((GtkCellLayout *)dropdown, cell, "text", 0, NULL); - - g_signal_handlers_disconnect_by_func (dropdown, emae_provider_changed, service); - gtk_combo_box_set_active (dropdown, -1); /* needed for gtkcombo bug (?) */ - gtk_combo_box_set_active (dropdown, active); - g_signal_connect (dropdown, "changed", G_CALLBACK(emae_provider_changed), service); - - if (!uri || (url = camel_url_new (uri, NULL)) == NULL) { - return; - } + g_signal_handlers_unblock_by_func ( + combo_box, emae_provider_changed, service); - camel_url_free (url); + gtk_combo_box_set_active_id ( + GTK_COMBO_BOX (combo_box), service->protocol); } static void -emae_authtype_changed (GtkComboBox *dropdown, +emae_authtype_changed (GtkComboBox *combo_box, EMAccountEditorService *service) { - EAccount *account; - gint id = gtk_combo_box_get_active (dropdown); - GtkTreeModel *model; - GtkTreeIter iter; - CamelURL *url; + CamelServiceAuthType *authtype = NULL; + const gchar *mechanism; gboolean sensitive = FALSE; - if (id == -1) - return; + mechanism = gtk_combo_box_get_active_id (combo_box); - account = em_account_editor_get_modified_account (service->emae); - - url = emae_account_url (service->emae, emae_service_info[service->type].account_uri_key); - model = gtk_combo_box_get_model (dropdown); - if (gtk_tree_model_iter_nth_child (model, &iter, NULL, id)) { - CamelServiceAuthType *authtype; - - gtk_tree_model_get (model, &iter, 1, &authtype, -1); - if (authtype) - camel_url_set_authmech (url, authtype->authproto); - else - camel_url_set_authmech (url, NULL); - emae_uri_changed (service, url); - - sensitive = - authtype != NULL && - authtype->need_password && - e_account_writable (account, - emae_service_info[service->type].save_passwd_key); + if (mechanism != NULL && *mechanism != '\0') { + authtype = camel_sasl_authtype (mechanism); + g_warn_if_fail (authtype != NULL); } - camel_url_free (url); - gtk_widget_set_sensitive ((GtkWidget *) service->remember, sensitive); -} - -static void -emae_needs_auth (GtkToggleButton *toggle, - EMAccountEditorService *service) -{ - gint need = gtk_toggle_button_get_active (toggle); - - gtk_widget_set_sensitive (service->auth_frame, need); - - if (need) - emae_authtype_changed (service->authtype, service); - else { - CamelURL *url = emae_account_url (service->emae, emae_service_info[service->type].account_uri_key); - - camel_url_set_authmech (url, NULL); - emae_uri_changed (service, url); - camel_url_free (url); - } + sensitive = (authtype == NULL) || (authtype->need_password); + gtk_widget_set_sensitive (GTK_WIDGET (service->remember), sensitive); } static void emae_check_authtype (GtkWidget *w, EMAccountEditorService *service); static void -emae_refresh_authtype (EMAccountEditor *emae, - EMAccountEditorService *service) -{ - EAccount *account; - GtkListStore *store; - GtkTreeIter iter; - GtkComboBox *dropdown; - gint active = 0; - gint i; - struct _service_info *info = &emae_service_info[service->type]; - const gchar *uri; - GList *l, *ll; - CamelURL *url = NULL; - - account = em_account_editor_get_modified_account (emae); - uri = e_account_get_string (account, info->account_uri_key); - - dropdown = service->authtype; - gtk_widget_show ((GtkWidget *) dropdown); - - store = gtk_list_store_new (3, G_TYPE_STRING, G_TYPE_POINTER, G_TYPE_BOOLEAN); - - if (uri) - url = camel_url_new (uri, NULL); - - if (service->provider) { - for (i = 0, l = service->provider->authtypes; l; l = l->next, i++) { - CamelServiceAuthType *authtype = l->data; - gint avail; - - /* if we have some already shown */ - if (service->auth_types) { - for (ll = service->auth_types; ll; ll = g_list_next (ll)) - if (!strcmp (authtype->authproto, ((CamelServiceAuthType *) ll->data)->authproto)) - break; - avail = ll != NULL; - } else { - avail = TRUE; - } - - gtk_list_store_append (store, &iter); - gtk_list_store_set (store, &iter, 0, authtype->name, 1, authtype, 2, !avail, -1); - - if (url && url->authmech && !strcmp (url->authmech, authtype->authproto)) - active = i; - } - } - - gtk_combo_box_set_model (dropdown, (GtkTreeModel *) store); - gtk_combo_box_set_active (dropdown, -1); - - if (service->auth_changed_id == 0) { - GtkCellRenderer *cell = gtk_cell_renderer_text_new (); - - gtk_cell_layout_pack_start ((GtkCellLayout *) dropdown, cell, TRUE); - gtk_cell_layout_set_attributes ((GtkCellLayout *)dropdown, cell, "text", 0, "strikethrough", 2, NULL); - - service->auth_changed_id = g_signal_connect (dropdown, "changed", G_CALLBACK(emae_authtype_changed), service); - g_signal_connect (service->check_supported, "clicked", G_CALLBACK(emae_check_authtype), service); - } - - gtk_combo_box_set_active (dropdown, active); - - if (url) - camel_url_free (url); -} - -static void emae_check_authtype_done (CamelService *camel_service, GAsyncResult *result, EMAccountEditorService *service) @@ -2021,20 +2424,20 @@ emae_check_authtype_done (CamelService *camel_service, EMailBackend *backend; EMailSession *session; GtkWidget *editor; - GList *auth_types; + GList *available_authtypes; GError *error = NULL; - auth_types = camel_service_query_auth_types_finish ( + available_authtypes = camel_service_query_auth_types_finish ( camel_service, result, &error); editor = E_CONFIG (service->emae->config)->window; if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) { - g_warn_if_fail (auth_types == NULL); + g_warn_if_fail (available_authtypes == NULL); g_error_free (error); } else if (error != NULL) { - g_warn_if_fail (auth_types == NULL); + g_warn_if_fail (available_authtypes == NULL); e_alert_run_dialog_for_args ( GTK_WINDOW (service->check_dialog), "mail:checking-service-error", @@ -2042,9 +2445,10 @@ emae_check_authtype_done (CamelService *camel_service, g_error_free (error); } else { - g_list_free (service->auth_types); - service->auth_types = auth_types; - emae_refresh_authtype (service->emae, service); + e_auth_combo_box_update_available ( + E_AUTH_COMBO_BOX (service->authtype), + available_authtypes); + g_list_free (available_authtypes); } gtk_widget_destroy (service->check_dialog); @@ -2079,32 +2483,23 @@ emae_check_authtype (GtkWidget *w, CamelService *camel_service; EMailBackend *backend; EMailSession *session; - EAccount *account; GtkWidget *editor; gpointer parent; gchar *uid; - gchar *url_string; - CamelURL *url; GError *error = NULL; - account = em_account_editor_get_modified_account (service->emae); editor = E_CONFIG (service->emae->config)->window; backend = em_account_editor_get_backend (service->emae); session = e_mail_backend_get_session (backend); uid = g_strdup_printf ("emae-check-authtype-%p", service); - url_string = (gchar *) e_account_get_string ( - account, emae_service_info[service->type].account_uri_key); - url = camel_url_new (url_string, NULL); /* to test on actual data, not on previously used */ camel_service = camel_session_add_service ( CAMEL_SESSION (session), uid, - url->protocol, service->type, &error); + service->protocol, service->type, &error); - camel_url_free (url); - g_free (url_string); g_free (uid); if (camel_service != NULL && service->settings != NULL) @@ -2158,13 +2553,18 @@ emae_setup_service (EMAccountEditor *emae, EMAccountEditorService *service, GtkBuilder *builder) { - EAccount *account; struct _service_info *info = &emae_service_info[service->type]; - CamelURL *url = emae_account_url (emae, info->account_uri_key); + CamelProvider *provider; + CamelURL *url; - account = em_account_editor_get_modified_account (emae); + /* GtkComboBox internalizes ID strings, which for the provider + * combo box are protocol names. So we'll do the same here. */ + url = emae_account_url (emae, info->account_uri_key); + if (url != NULL && url->protocol != NULL) + service->protocol = g_intern_string (url->protocol); + camel_url_free (url); - service->provider = url && url->protocol ? camel_provider_get (url->protocol, NULL) : NULL; + provider = camel_provider_get (service->protocol, NULL); /* Extract all widgets we need from the builder file. */ @@ -2193,76 +2593,198 @@ emae_setup_service (EMAccountEditor *emae, service->authtype = (GtkComboBox *) e_builder_get_widget (builder, info->authtype); service->providers = (GtkComboBox *) e_builder_get_widget (builder, info->type_dropdown); + /* XXX GtkComboBoxText, when loaded from a GtkBuilder file, + * needs further manual configuration to be fully usable. + * Particularly the ID column has to be set explicitly. + * https://bugzilla.gnome.org/show_bug.cgi?id=612396#c53 */ + g_object_set ( + service->providers, + "entry-text-column", 0, + "id-column", 1, NULL); + service->remember = emae_account_toggle (emae, info->remember_password, info->save_passwd_key, builder); - if (info->needs_auth) + if (info->needs_auth) { service->needs_auth = (GtkToggleButton *) e_builder_get_widget (builder, info->needs_auth); - else + } else { service->needs_auth = NULL; + } - service->auth_changed_id = 0; + g_signal_connect ( + service->providers, "changed", + G_CALLBACK (emae_provider_changed), service); - g_signal_connect (service->hostname, "changed", G_CALLBACK (emae_hostname_changed), service); - g_signal_connect (service->port, "changed", G_CALLBACK (emae_port_changed), service); - g_signal_connect (service->username, "changed", G_CALLBACK (emae_username_changed), service); - if (service->pathentry) - g_signal_connect (GTK_FILE_CHOOSER (service->pathentry), "selection-changed", G_CALLBACK (emae_path_changed), service); + if (GTK_IS_FILE_CHOOSER (service->pathentry)) + g_signal_connect ( + service->pathentry, "selection-changed", + G_CALLBACK (emae_file_chooser_changed), service); - g_signal_connect (service->use_ssl, "changed", G_CALLBACK(emae_ssl_changed), service); + g_signal_connect ( + service->authtype, "changed", + G_CALLBACK (emae_authtype_changed), service); - /* configure ui for current settings */ - if (url->host) { - gtk_entry_set_text (service->hostname, url->host); - } + g_signal_connect ( + service->check_supported, "clicked", + G_CALLBACK (emae_check_authtype), service); + + switch (service->type) { + case CAMEL_PROVIDER_STORE: + g_object_bind_property ( + emae, "store-provider", + service->authtype, "provider", + G_BINDING_SYNC_CREATE); + + if (service->needs_auth != NULL) { + g_object_bind_property ( + emae, "store-requires-auth", + service->needs_auth, "active", + G_BINDING_BIDIRECTIONAL | + G_BINDING_SYNC_CREATE); + g_object_bind_property ( + emae, "store-requires-auth", + service->auth_frame, "sensitive", + G_BINDING_SYNC_CREATE); + } + + g_object_bind_property ( + emae, "store-visible-auth", + service->auth_frame, "visible", + G_BINDING_SYNC_CREATE); + + g_object_bind_property ( + emae, "store-visible-host", + service->hostname, "visible", + G_BINDING_SYNC_CREATE); + + g_object_bind_property ( + emae, "store-visible-host", + service->hostlabel, "visible", + G_BINDING_SYNC_CREATE); + + g_object_bind_property ( + emae, "store-visible-path", + service->pathentry, "visible", + G_BINDING_SYNC_CREATE); + + g_object_bind_property ( + emae, "store-visible-path", + service->pathlabel, "visible", + G_BINDING_SYNC_CREATE); + + g_object_bind_property ( + emae, "store-visible-port", + service->port, "visible", + G_BINDING_SYNC_CREATE); + + g_object_bind_property ( + emae, "store-visible-port", + service->portlabel, "visible", + G_BINDING_SYNC_CREATE); + + g_object_bind_property ( + emae, "store-visible-user", + service->username, "visible", + G_BINDING_SYNC_CREATE); + + g_object_bind_property ( + emae, "store-visible-user", + service->userlabel, "visible", + G_BINDING_SYNC_CREATE); + + break; + + case CAMEL_PROVIDER_TRANSPORT: + g_object_bind_property ( + emae, "transport-provider", + service->authtype, "provider", + G_BINDING_SYNC_CREATE); + + if (service->needs_auth != NULL) { + g_object_bind_property ( + emae, "transport-requires-auth", + service->needs_auth, "active", + G_BINDING_BIDIRECTIONAL | + G_BINDING_SYNC_CREATE); + g_object_bind_property ( + emae, "transport-requires-auth", + service->auth_frame, "sensitive", + G_BINDING_SYNC_CREATE); + } + + g_object_bind_property ( + emae, "transport-visible-auth", + service->auth_frame, "visible", + G_BINDING_SYNC_CREATE); + + g_object_bind_property ( + emae, "transport-visible-host", + service->hostname, "visible", + G_BINDING_SYNC_CREATE); + + g_object_bind_property ( + emae, "transport-visible-host", + service->hostlabel, "visible", + G_BINDING_SYNC_CREATE); + + g_object_bind_property ( + emae, "transport-visible-port", + service->port, "visible", + G_BINDING_SYNC_CREATE); + + g_object_bind_property ( + emae, "transport-visible-port", + service->portlabel, "visible", + G_BINDING_SYNC_CREATE); + + g_object_bind_property ( + emae, "transport-visible-user", + service->username, "visible", + G_BINDING_SYNC_CREATE); + + g_object_bind_property ( + emae, "transport-visible-user", + service->userlabel, "visible", + G_BINDING_SYNC_CREATE); + + break; - if (url->user && *url->user) { - gtk_entry_set_text (service->username, url->user); + default: + g_warn_if_reached (); } if (service->pathentry) { - GtkFileChooserAction action = GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER; + GtkFileChooserAction action; + gboolean need_path_dir; + const gchar *label; - if (service->provider && (service->provider->url_flags & CAMEL_URL_NEED_PATH_DIR) == 0) + need_path_dir = + (provider == NULL) || + ((provider->url_flags & CAMEL_URL_NEED_PATH_DIR) != 0); + + if (need_path_dir) { + action = GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER; + label = _("_Path:"); + } else { action = GTK_FILE_CHOOSER_ACTION_OPEN; + label = _("Fil_e:"); + } if (service->pathlabel) - gtk_label_set_text_with_mnemonic (GTK_LABEL (service->pathlabel), - action == GTK_FILE_CHOOSER_ACTION_OPEN ? _("Fil_e:") : _("_Path:")); + gtk_label_set_text_with_mnemonic ( + GTK_LABEL (service->pathlabel), label); if (action != gtk_file_chooser_get_action (GTK_FILE_CHOOSER (service->pathentry))) gtk_file_chooser_set_action (GTK_FILE_CHOOSER (service->pathentry), action); - - if (url->path) - gtk_file_chooser_set_filename (GTK_FILE_CHOOSER (service->pathentry), url->path); } /* old authtype will be destroyed when we exit */ emae_refresh_providers (emae, service); - emae_refresh_authtype (emae, service); - if (service->port && service->provider->port_entries) - e_port_entry_set_camel_entries (service->port, service->provider->port_entries); - - /* Set the port after SSL is set, because it would overwrite the - * port value (through emae_ssl_changed signal) */ - if (url->port && service->provider->port_entries) { - e_port_entry_set_port (service->port, url->port); - } - - if (service->needs_auth != NULL) { - gtk_toggle_button_set_active (service->needs_auth, url->authmech != NULL); - g_signal_connect (service->needs_auth, "toggled", G_CALLBACK(emae_needs_auth), service); - emae_needs_auth (service->needs_auth, service); - } - - if (!e_account_writable (account, info->account_uri_key)) - gtk_widget_set_sensitive (service->container, FALSE); - else - gtk_widget_set_sensitive (service->container, TRUE); + if (provider != NULL && provider->port_entries) + e_port_entry_set_camel_entries ( + service->port, provider->port_entries); emae_service_provider_changed (service); - - camel_url_free (url); } static GtkWidget * @@ -2735,12 +3257,16 @@ emae_option_options (EMAccountEditorService *service, CamelProviderConfEntry *conf, GtkLabel *label) { + CamelProvider *provider; GtkWidget *widget; GtkListStore *store; GtkTreeIter iter; const gchar *p; GtkCellRenderer *renderer; + provider = camel_provider_get (service->protocol, NULL); + g_return_val_if_fail (provider != NULL, NULL); + /* nick and caption */ store = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_STRING); @@ -2770,7 +3296,7 @@ emae_option_options (EMAccountEditorService *service, gtk_list_store_append (store, &iter); gtk_list_store_set ( store, &iter, 0, vl, 1, dgettext ( - service->provider->translation_domain, cp), -1); + provider->translation_domain, cp), -1); g_free (vl); g_free (cp); @@ -2808,11 +3334,13 @@ emae_receive_options_item (EConfig *ec, gpointer data) { EMAccountEditor *emae = data; + CamelProvider *provider; GtkWidget *w, *box, *spin; guint row; - if (emae->priv->source.provider == NULL - || emae->priv->source.provider->extra_conf == NULL) + provider = emae_get_store_provider (emae); + + if (provider == NULL || provider->extra_conf == NULL) return NULL; if (old) { @@ -2872,6 +3400,7 @@ emae_receive_options_extra_item (EConfig *ec, GtkWidget *widget; GtkLabel *label; GtkTable *table; + CamelProvider *provider; CamelProviderConfEntry *entries; guint row; GHashTable *extra; @@ -2882,12 +3411,13 @@ emae_receive_options_extra_item (EConfig *ec, service = &emae->priv->source; section_name = eitem->user_data; - if (emae->priv->source.provider == NULL) - return NULL; + provider = emae_get_store_provider (emae); - if (emae->priv->source.provider->extra_conf == NULL) + if (provider == NULL || provider->extra_conf == NULL) return NULL; + entries = provider->extra_conf; + if (emae->type == EMAE_PAGES) { GtkWidget *box; @@ -2901,7 +3431,6 @@ emae_receive_options_extra_item (EConfig *ec, GTK_BOX (emae->pages[2]), box, FALSE, FALSE, 0); } - entries = emae->priv->source.provider->extra_conf; for (ii = 0; entries && entries[ii].type != CAMEL_PROVIDER_CONF_END; ii++) if (entries[ii].type == CAMEL_PROVIDER_CONF_SECTION_START && g_strcmp0 (entries[ii].name, section_name) == 0) @@ -3044,11 +3573,17 @@ emae_send_page (EConfig *ec, { EMAccountEditor *emae = data; EMAccountEditorPrivate *priv = emae->priv; + CamelProvider *provider; GtkWidget *w; GtkBuilder *builder; + provider = emae_get_store_provider (emae); + + if (provider == NULL) + return NULL; + /* no transport options page at all for these types of providers */ - if (priv->source.provider && CAMEL_PROVIDER_IS_STORE_AND_TRANSPORT (priv->source.provider)) { + if (CAMEL_PROVIDER_IS_STORE_AND_TRANSPORT (provider)) { memset (&priv->transport.frame, 0, ((gchar *) &priv->transport.check_dialog) - ((gchar *) &priv->transport.frame)); return NULL; } @@ -3198,6 +3733,7 @@ emae_defaults_page (EConfig *ec, EMAccountEditorPrivate *priv = emae->priv; EMFolderSelectionButton *button; CamelProviderFlags flags; + CamelProvider *provider; CamelSettings *settings; CamelStore *store = NULL; EMailBackend *backend; @@ -3228,6 +3764,7 @@ emae_defaults_page (EConfig *ec, store = CAMEL_STORE (service); } + provider = emae_get_store_provider (emae); settings = emae->priv->source.settings; /* Make sure we have a valid EMailBackend. */ @@ -3287,8 +3824,9 @@ emae_defaults_page (EConfig *ec, } flags = CAMEL_PROVIDER_ALLOW_REAL_TRASH_FOLDER; - visible = (emae->priv->source.provider != NULL) && - ((emae->priv->source.provider->flags & flags) != 0); + visible = + (provider != NULL) && + ((provider->flags & flags) != 0); widget = GTK_WIDGET (priv->trash_folder_check); gtk_widget_set_visible (widget, visible); widget = GTK_WIDGET (priv->trash_folder_button); @@ -3332,8 +3870,9 @@ emae_defaults_page (EConfig *ec, } flags = CAMEL_PROVIDER_ALLOW_REAL_JUNK_FOLDER; - visible = (emae->priv->source.provider != NULL) && - ((emae->priv->source.provider->flags & flags) != 0); + visible = + (provider != NULL) && + ((provider->flags & flags) != 0); widget = GTK_WIDGET (priv->junk_folder_check); gtk_widget_set_visible (widget, visible); widget = GTK_WIDGET (priv->junk_folder_button); @@ -3349,18 +3888,12 @@ emae_defaults_page (EConfig *ec, emae_account_toggle (emae, "always_bcc", E_ACCOUNT_BCC_ALWAYS, builder); emae_account_entry (emae, "bcc_addrs", E_ACCOUNT_BCC_ADDRS, builder); - gtk_widget_set_sensitive ((GtkWidget *) priv->drafts_folder_button, e_account_writable (account, E_ACCOUNT_DRAFTS_FOLDER_URI)); - gtk_widget_set_sensitive ( (GtkWidget *) priv->sent_folder_button, - e_account_writable (account, E_ACCOUNT_SENT_FOLDER_URI) - && - (emae->priv->source.provider ? !(emae->priv->source.provider->flags & CAMEL_PROVIDER_DISABLE_SENT_FOLDER): TRUE) + (provider ? !(provider->flags & CAMEL_PROVIDER_DISABLE_SENT_FOLDER): TRUE) ); gtk_widget_set_sensitive ((GtkWidget *) priv->restore_folders_button, - (e_account_writable (account, E_ACCOUNT_SENT_FOLDER_URI) - && ((emae->priv->source.provider && !( emae->priv->source.provider->flags & CAMEL_PROVIDER_DISABLE_SENT_FOLDER)) - || e_account_writable (account, E_ACCOUNT_DRAFTS_FOLDER_URI)))); + (provider && !(provider->flags & CAMEL_PROVIDER_DISABLE_SENT_FOLDER))); /* Receipt policy */ emae_setup_receipt_policy (emae, builder); @@ -3448,7 +3981,6 @@ emae_account_hash_algo_combo (EMAccountEditor *emae, g_object_set_data (G_OBJECT (combobox), "account-item", GINT_TO_POINTER (item)); g_signal_connect (combobox, "changed", G_CALLBACK (emae_account_hash_algo_combo_changed_cb), emae); - gtk_widget_set_sensitive (GTK_WIDGET (combobox), e_account_writable (account, item)); return combobox; } @@ -3706,41 +4238,64 @@ static gboolean emae_service_complete (EMAccountEditor *emae, EMAccountEditorService *service) { - EAccount *account; - CamelURL *url; - gint ok = TRUE; - const gchar *uri; - - if (service->provider == NULL) + CamelProvider *provider; + const gchar *host = NULL; + const gchar *path = NULL; + const gchar *user = NULL; + gboolean have_host; + gboolean have_path; + gboolean have_user; + gboolean need_auth; + gboolean need_host; + gboolean need_path; + gboolean need_port; + gboolean need_user; + + provider = camel_provider_get (service->protocol, NULL); + + if (provider == NULL) return TRUE; - account = em_account_editor_get_modified_account (emae); + if (CAMEL_IS_NETWORK_SETTINGS (service->settings)) { + CamelNetworkSettings *network_settings; - uri = e_account_get_string (account, emae_service_info[service->type].account_uri_key); - if (uri == NULL || (url = camel_url_new (uri, NULL)) == NULL) - return FALSE; + network_settings = CAMEL_NETWORK_SETTINGS (service->settings); + host = camel_network_settings_get_host (network_settings); + user = camel_network_settings_get_user (network_settings); + } + + if (CAMEL_IS_LOCAL_SETTINGS (service->settings)) { + CamelLocalSettings *local_settings; - if (CAMEL_PROVIDER_NEEDS (service->provider, CAMEL_URL_PART_HOST)) { - if (url->host == NULL || url->host[0] == 0 || (!e_port_entry_is_valid (service->port) && service->provider->port_entries)) - ok = FALSE; + local_settings = CAMEL_LOCAL_SETTINGS (service->settings); + path = camel_local_settings_get_path (local_settings); } + + need_auth = CAMEL_PROVIDER_NEEDS (provider, CAMEL_URL_PART_AUTH); + need_host = CAMEL_PROVIDER_NEEDS (provider, CAMEL_URL_PART_HOST); + need_path = CAMEL_PROVIDER_NEEDS (provider, CAMEL_URL_PART_PATH); + need_port = CAMEL_PROVIDER_NEEDS (provider, CAMEL_URL_PART_PORT); + need_user = CAMEL_PROVIDER_NEEDS (provider, CAMEL_URL_PART_USER); + + have_host = (host != NULL && *host != '\0'); + have_path = (path != NULL && *path != '\0'); + have_user = (user != NULL && *user != '\0'); + + if (need_host && !have_host) + return FALSE; + + if (need_port && !e_port_entry_is_valid (service->port)) + return FALSE; + /* We only need the user if the service needs auth as well, i think */ - if (ok - && (service->needs_auth == NULL - || CAMEL_PROVIDER_NEEDS (service->provider, CAMEL_URL_PART_AUTH) - || gtk_toggle_button_get_active (service->needs_auth)) - && CAMEL_PROVIDER_NEEDS (service->provider, CAMEL_URL_PART_USER) - && (url->user == NULL || url->user[0] == 0)) - ok = FALSE; - - if (ok - && CAMEL_PROVIDER_NEEDS (service->provider, CAMEL_URL_PART_PATH) - && (url->path == NULL || url->path[0] == 0)) - ok = FALSE; + if (need_auth || service->requires_auth) + if (need_user && !have_user) + return FALSE; - camel_url_free (url); + if (need_path && !have_path) + return FALSE; - return ok; + return TRUE; } static ServerData * @@ -3759,30 +4314,6 @@ emae_check_servers (const gchar *email) return NULL; } -static void -emae_check_set_authtype (GtkComboBox *dropdown, - const gchar *auth) -{ - GtkTreeModel *model; - GtkTreeIter iter; - gint id; - gint children; - - model = gtk_combo_box_get_model (dropdown); - children = gtk_tree_model_iter_n_children (model, NULL); - for (id = 0; id < children; id++) { - CamelServiceAuthType *authtype; - - gtk_tree_model_iter_nth_child (model, &iter, NULL, id); - gtk_tree_model_get (model, &iter, 1, &authtype, -1); - if (g_ascii_strcasecmp (authtype->authproto, auth) == 0) - break; - } - - if (id < children) - gtk_combo_box_set_active (dropdown, id); -} - static gboolean emae_check_complete (EConfig *ec, const gchar *pageid, @@ -3841,7 +4372,6 @@ emae_check_complete (EConfig *ec, refresh = TRUE; if (sdata && sdata->recv_user && *sdata->recv_user) use_user = g_str_equal (sdata->recv_user, "@") ? tmp : sdata->recv_user; - camel_url_set_user (url, use_user); gtk_entry_set_text (emae->priv->source.username, use_user); if (sdata != NULL) { @@ -3865,7 +4395,9 @@ emae_check_complete (EConfig *ec, uri = camel_url_to_string (url, 0); e_account_set_string (account, E_ACCOUNT_SOURCE_URL, uri); if (sdata != NULL && sdata->recv_auth && *sdata->recv_auth) - emae_check_set_authtype (emae->priv->source.authtype, sdata->recv_auth); + gtk_combo_box_set_active_id ( + emae->priv->source.authtype, + sdata->recv_auth); camel_url_free (url); } else @@ -3908,7 +4440,6 @@ emae_check_complete (EConfig *ec, if (sdata->send_user && *sdata->send_user) use_user = g_str_equal (sdata->send_user, "@") ? tmp : sdata->send_user; - camel_url_set_user (url, use_user); gtk_entry_set_text (emae->priv->transport.username, use_user); uri = camel_url_to_string (url, 0); @@ -3917,7 +4448,9 @@ emae_check_complete (EConfig *ec, camel_url_free (url); gtk_toggle_button_set_active (emae->priv->transport.needs_auth, TRUE); if (sdata->send_auth && *sdata->send_auth) - emae_check_set_authtype (emae->priv->transport.authtype, sdata->send_auth); + gtk_combo_box_set_active_id ( + emae->priv->transport.authtype, + sdata->send_auth); else emae_authtype_changed (emae->priv->transport.authtype, &emae->priv->transport); uri = (gchar *) e_account_get_string (account, E_ACCOUNT_TRANSPORT_URL); @@ -3926,9 +4459,13 @@ emae_check_complete (EConfig *ec, } } else if (!strcmp (pageid, "20.receive_options")) { - if (emae->priv->source.provider - && emae->priv->extra_provider != emae->priv->source.provider) { - emae->priv->extra_provider = emae->priv->source.provider; + CamelProvider *provider; + + provider = emae_get_store_provider (emae); + + if (provider != NULL + && emae->priv->extra_provider != provider) { + emae->priv->extra_provider = provider; emae_auto_detect (emae); } } else if (!strcmp (pageid, "40.management")) { @@ -4060,55 +4597,67 @@ emae_commit (EConfig *ec, EAccount *account; EAccount *modified_account; EAccount *original_account; + CamelSettings *settings; CamelURL *url; - - /* the mail-config*acconts* api needs a lot of work */ + const gchar *protocol; + gboolean requires_auth; modified_account = em_account_editor_get_modified_account (emae); original_account = em_account_editor_get_original_account (emae); - url = camel_url_new (modified_account->source->url, NULL); - if (url != NULL) { - if (emae->priv->source.settings != NULL) { - gchar *host = g_strdup (url->host); - gchar *path = g_strdup (url->path); - gint port = url->port; + /* Do some last minute tweaking. */ - camel_settings_save_to_url ( - emae->priv->source.settings, url); + settings = emae->priv->source.settings; + requires_auth = emae_get_store_requires_auth (emae); - camel_url_set_host (url, host); - camel_url_set_path (url, path); - camel_url_set_port (url, port); + /* Override the selected authentication mechanism name if + * authentication is not required for the storage service. */ + if (CAMEL_IS_NETWORK_SETTINGS (settings) && !requires_auth) + g_object_set (settings, "auth-mechanism", NULL, NULL); - g_free (host); - g_free (path); - } - g_free (modified_account->source->url); - modified_account->source->url = camel_url_to_string (url, 0); - camel_url_free (url); - } + settings = emae->priv->transport.settings; + requires_auth = emae_get_transport_requires_auth (emae); - url = camel_url_new (modified_account->transport->url, NULL); - if (url != NULL) { - if (emae->priv->transport.settings != NULL) { - gchar *host = g_strdup (url->host); - gchar *path = g_strdup (url->path); - gint port = url->port; - - camel_settings_save_to_url ( - emae->priv->transport.settings, url); - camel_url_set_host (url, host); - camel_url_set_path (url, path); - camel_url_set_port (url, port); - - g_free (host); - g_free (path); - } - g_free (modified_account->transport->url); - modified_account->transport->url = camel_url_to_string (url, 0); - camel_url_free (url); - } + /* Override the selected authentication mechanism name if + * authentication is not required for the transport service. */ + if (CAMEL_IS_NETWORK_SETTINGS (settings) && !requires_auth) + g_object_set (settings, "auth-mechanism", NULL, NULL); + + /* Dump the storage service settings to a URL string. */ + + url = g_new0 (CamelURL, 1); + + protocol = emae->priv->source.protocol; + settings = emae->priv->source.settings; + + if (protocol != NULL) + camel_url_set_protocol (url, protocol); + + if (settings != NULL) + camel_settings_save_to_url (settings, url); + + g_free (modified_account->source->url); + modified_account->source->url = camel_url_to_string (url, 0); + + camel_url_free (url); + + /* Dump the transport service settings to a URL string. */ + + url = g_new0 (CamelURL, 1); + + protocol = emae->priv->transport.protocol; + settings = emae->priv->transport.settings; + + if (protocol != NULL) + camel_url_set_protocol (url, protocol); + + if (settings != NULL) + camel_settings_save_to_url (settings, url); + + g_free (modified_account->transport->url); + modified_account->transport->url = camel_url_to_string (url, 0); + + camel_url_free (url); if (original_account != NULL) { d (printf ("Committing account '%s'\n", e_account_get_string (modified_account, E_ACCOUNT_NAME))); @@ -4119,15 +4668,19 @@ emae_commit (EConfig *ec, account = original_account; e_account_list_change (accounts, account); } else { + CamelProvider *provider; + d (printf ("Adding new account '%s'\n", e_account_get_string (account, E_ACCOUNT_NAME))); e_account_list_add (accounts, modified_account); account = modified_account; + provider = emae_get_store_provider (emae); + /* HACK: this will add the account to the folder tree. * We should just be listening to the account list directly for changed events */ if (account->enabled - && emae->priv->source.provider - && (emae->priv->source.provider->flags & CAMEL_PROVIDER_IS_STORAGE)) { + && provider != NULL + && (provider->flags & CAMEL_PROVIDER_IS_STORAGE)) { EMailBackend *backend; EMailSession *session; @@ -4155,20 +4708,20 @@ em_account_editor_construct (EMAccountEditor *emae, const gchar *id) { EMAccountEditorPrivate *priv = emae->priv; - EAccount *original_account; - EAccount *modified_account; gint i, index; GSList *l; GList *prov; EMConfig *ec; - EMConfigTargetAccount *target; + EMConfigTargetSettings *target; GHashTable *have; EConfigItem *items; emae->type = type; /* sort the providers, remote first */ - priv->providers = g_list_sort (camel_provider_list (TRUE), (GCompareFunc) provider_compare); + priv->providers = g_list_sort ( + camel_provider_list (TRUE), + (GCompareFunc) provider_compare); if (type == EMAE_NOTEBOOK) { ec = em_config_new (E_CONFIG_BOOK, id); @@ -4249,11 +4802,13 @@ em_account_editor_construct (EMAccountEditor *emae, e_config_add_page_check ((EConfig *) ec, NULL, emae_check_complete, emae); - original_account = em_account_editor_get_original_account (emae); - modified_account = em_account_editor_get_modified_account (emae); - target = em_config_target_new_account ( - ec, original_account, modified_account, - emae->priv->source.settings); + target = em_config_target_new_settings ( + ec, + emae->priv->modified_account->id->address, + emae->priv->source.protocol, + emae->priv->source.settings, + emae->priv->transport.protocol, + emae->priv->transport.settings); e_config_set_target ((EConfig *) ec, (EConfigTarget *) target); } diff --git a/mail/em-config.c b/mail/em-config.c index c9bcf0a7a4..e9c1105c85 100644 --- a/mail/em-config.c +++ b/mail/em-config.c @@ -40,31 +40,6 @@ G_DEFINE_TYPE (EMConfig, em_config, E_TYPE_CONFIG) -struct _EMConfigPrivate { - gint account_changed_id; -}; - -static void -emp_account_changed (EAccount *ea, - gint id, - EMConfig *emc) -{ - e_config_target_changed ((EConfig *) emc, E_CONFIG_TARGET_CHANGED_STATE); -} - -static void -em_config_finalize (GObject *object) -{ - /* Note we can't be unreffed if a target exists, so the target - * will need to be freed first which will clean up any - * listeners */ - - g_free (((EMConfig *) object)->priv); - - /* Chain up to parent's finalize() method. */ - G_OBJECT_CLASS (em_config_parent_class)->finalize (object); -} - static void em_config_set_target (EConfig *ep, EConfigTarget *t) @@ -80,16 +55,16 @@ em_config_set_target (EConfig *ep, case EM_CONFIG_TARGET_PREFS: { /*EMConfigTargetPrefs *s = (EMConfigTargetPrefs *)t;*/ break; } - case EM_CONFIG_TARGET_ACCOUNT: { - EMConfigTargetAccount *s = (EMConfigTargetAccount *) t; - EMConfig *config = (EMConfig *) ep; - - config->priv->account_changed_id = g_signal_connect ( - s->modified_account, "changed", - G_CALLBACK (emp_account_changed), ep); - - em_config_target_new_account_update_settings ( - ep, s, s->settings); + case EM_CONFIG_TARGET_SETTINGS: { + EMConfigTargetSettings *s = (EMConfigTargetSettings *) t; + + em_config_target_update_settings ( + ep, s, + s->email_address, + s->storage_protocol, + s->storage_settings, + s->transport_protocol, + s->transport_settings); break; } } } @@ -105,18 +80,11 @@ em_config_target_free (EConfig *ep, break; case EM_CONFIG_TARGET_PREFS: break; - case EM_CONFIG_TARGET_ACCOUNT: { - EMConfigTargetAccount *s = (EMConfigTargetAccount *) t; - EMConfig *config = (EMConfig *) ep; - - if (config->priv->account_changed_id > 0) { - g_signal_handler_disconnect ( - s->modified_account, - config->priv->account_changed_id); - config->priv->account_changed_id = 0; - } - - em_config_target_new_account_update_settings (ep, s, NULL); + case EM_CONFIG_TARGET_SETTINGS: { + EMConfigTargetSettings *s = (EMConfigTargetSettings *) t; + + em_config_target_update_settings ( + ep, s, NULL, NULL, NULL, NULL, NULL); break; } } } @@ -133,15 +101,14 @@ em_config_target_free (EConfig *ep, if (s->gconf) g_object_unref (s->gconf); break; } - case EM_CONFIG_TARGET_ACCOUNT: { - EMConfigTargetAccount *s = (EMConfigTargetAccount *) t; - - if (s->original_account != NULL) - g_object_unref (s->original_account); - if (s->modified_account != NULL) - g_object_unref (s->modified_account); - if (s->settings != NULL) - g_object_unref (s->settings); + case EM_CONFIG_TARGET_SETTINGS: { + EMConfigTargetSettings *s = (EMConfigTargetSettings *) t; + + g_free (s->email_address); + if (s->storage_settings != NULL) + g_object_unref (s->storage_settings); + if (s->transport_settings != NULL) + g_object_unref (s->transport_settings); break; } } @@ -152,11 +119,8 @@ em_config_target_free (EConfig *ep, static void em_config_class_init (EMConfigClass *class) { - GObjectClass *object_class; EConfigClass *config_class; - object_class = G_OBJECT_CLASS (class); - object_class->finalize = em_config_finalize; config_class = E_CONFIG_CLASS (class); config_class->set_target = em_config_set_target; @@ -166,7 +130,6 @@ em_config_class_init (EMConfigClass *class) static void em_config_init (EMConfig *emp) { - emp->priv = g_malloc0 (sizeof (*emp->priv)); } EMConfig * @@ -212,56 +175,78 @@ em_config_target_new_prefs (EMConfig *emp, return t; } -EMConfigTargetAccount * -em_config_target_new_account (EMConfig *emp, - EAccount *original_account, - EAccount *modified_account, - CamelSettings *settings) +EMConfigTargetSettings * +em_config_target_new_settings (EMConfig *emp, + const gchar *email_address, + const gchar *storage_protocol, + CamelSettings *storage_settings, + const gchar *transport_protocol, + CamelSettings *transport_settings) { - EMConfigTargetAccount *t; + EMConfigTargetSettings *target; - t = e_config_target_new ( - &emp->config, EM_CONFIG_TARGET_ACCOUNT, sizeof (*t)); + target = e_config_target_new ( + &emp->config, EM_CONFIG_TARGET_SETTINGS, sizeof (*target)); - if (original_account != NULL) - t->original_account = g_object_ref (original_account); - else - t->original_account = NULL; + if (storage_protocol != NULL) + storage_protocol = g_intern_string (storage_protocol); - if (modified_account != NULL) - t->modified_account = g_object_ref (modified_account); - else - t->modified_account = NULL; + if (storage_settings != NULL) + g_object_ref (storage_settings); - if (settings != NULL) - t->settings = g_object_ref (settings); - else - t->settings = NULL; + if (transport_protocol != NULL) + transport_protocol = g_intern_string (transport_protocol); - return t; + if (transport_settings != NULL) + g_object_ref (transport_settings); + + target->email_address = g_strdup (email_address); + + target->storage_protocol = storage_protocol; + target->storage_settings = storage_settings; + + target->transport_protocol = transport_protocol; + target->transport_settings = transport_settings; + + return target; } void -em_config_target_new_account_update_settings (EConfig *ep, - EMConfigTargetAccount *target, - CamelSettings *settings) +em_config_target_update_settings (EConfig *ep, + EMConfigTargetSettings *target, + const gchar *email_address, + const gchar *storage_protocol, + CamelSettings *storage_settings, + const gchar *transport_protocol, + CamelSettings *transport_settings) { g_return_if_fail (ep != NULL); g_return_if_fail (target != NULL); - if (settings) - g_object_ref (settings); + if (storage_protocol != NULL) + storage_protocol = g_intern_string (storage_protocol); - if (target->settings != NULL) { - g_signal_handlers_disconnect_by_func ( - target->settings, emp_account_changed, ep); - g_object_unref (target->settings); - } + if (storage_settings != NULL) + g_object_ref (storage_settings); + + if (transport_protocol != NULL) + transport_protocol = g_intern_string (transport_protocol); + + if (transport_settings != NULL) + g_object_ref (transport_settings); + + if (target->storage_settings != NULL) + g_object_unref (target->storage_settings); + + if (target->transport_settings != NULL) + g_object_unref (target->transport_settings); + + g_free (target->email_address); + target->email_address = g_strdup (email_address); - target->settings = settings; + target->storage_protocol = storage_protocol; + target->storage_settings = storage_settings; - if (target->settings != NULL) - g_signal_connect ( - target->settings, "notify", - G_CALLBACK (emp_account_changed), ep); + target->transport_protocol = transport_protocol; + target->transport_settings = transport_settings; } diff --git a/mail/em-config.h b/mail/em-config.h index dcd5194ea5..24a75fb511 100644 --- a/mail/em-config.h +++ b/mail/em-config.h @@ -40,12 +40,12 @@ typedef struct _EMConfigPrivate EMConfigPrivate; enum _em_config_target_t { EM_CONFIG_TARGET_FOLDER, EM_CONFIG_TARGET_PREFS, - EM_CONFIG_TARGET_ACCOUNT + EM_CONFIG_TARGET_SETTINGS }; typedef struct _EMConfigTargetFolder EMConfigTargetFolder; typedef struct _EMConfigTargetPrefs EMConfigTargetPrefs; -typedef struct _EMConfigTargetAccount EMConfigTargetAccount; +typedef struct _EMConfigTargetSettings EMConfigTargetSettings; struct _EMConfigTargetFolder { EConfigTarget target; @@ -60,12 +60,16 @@ struct _EMConfigTargetPrefs { GConfClient *gconf; }; -struct _EMConfigTargetAccount { +struct _EMConfigTargetSettings { EConfigTarget target; - EAccount *original_account; - EAccount *modified_account; - CamelSettings *settings; + gchar *email_address; + + const gchar *storage_protocol; + CamelSettings *storage_settings; + + const gchar *transport_protocol; + CamelSettings *transport_settings; }; typedef struct _EConfigItem EMConfigItem; @@ -88,15 +92,21 @@ EMConfigTargetFolder * EMConfigTargetPrefs * em_config_target_new_prefs (EMConfig *emp, GConfClient *gconf); -EMConfigTargetAccount * - em_config_target_new_account (EMConfig *emp, - EAccount *original_account, - EAccount *modified_account, - CamelSettings *settings); -void em_config_target_new_account_update_settings +EMConfigTargetSettings * + em_config_target_new_settings (EMConfig *emp, + const gchar *email_address, + const gchar *storage_protocol, + CamelSettings *storage_settings, + const gchar *transport_protocol, + CamelSettings *transport_settings); +void em_config_target_update_settings (EConfig *ep, - EMConfigTargetAccount *target, - CamelSettings *settings); + EMConfigTargetSettings *target, + const gchar *email_address, + const gchar *storage_protocol, + CamelSettings *storage_settings, + const gchar *transport_protocol, + CamelSettings *transport_settings); G_END_DECLS diff --git a/mail/em-format-html.c b/mail/em-format-html.c index f3209b8b89..9a7c87f105 100644 --- a/mail/em-format-html.c +++ b/mail/em-format-html.c @@ -1614,7 +1614,7 @@ emfh_gethttp (struct _EMFormatHTMLJob *job, costream = camel_data_cache_add (emfh_http_cache, EMFH_HTTP_CACHE_PATH, job->u.uri, NULL); do { - if (camel_operation_cancel_check (CAMEL_OPERATION (cancellable))) { + if (g_cancellable_is_cancelled (cancellable)) { n = -1; break; } diff --git a/mail/em-utils.c b/mail/em-utils.c index ed57335f17..a3e9a049d6 100644 --- a/mail/em-utils.c +++ b/mail/em-utils.c @@ -1456,7 +1456,7 @@ try_open_book_client (EBookClient *book_client, E_CLIENT (book_client), only_if_exists, cancellable, try_open_book_client_cb, &data); - while (canceled = camel_operation_cancel_check (NULL), + while (canceled = g_cancellable_is_cancelled (cancellable), !canceled && !e_flag_is_set (flag)) { GTimeVal wait; @@ -1688,8 +1688,6 @@ search_address_in_addressbooks (const gchar *address, mail_cancel_hook_remove (hook_stop); - stop = stop || camel_operation_cancel_check (NULL); - if (stop && !cached_book && book_client) { g_object_unref (book_client); } else if (!stop && book_client && !cached_book) { diff --git a/mail/mail-config.ui b/mail/mail-config.ui index 616d4eab15..5a1ab0d8ad 100644 --- a/mail/mail-config.ui +++ b/mail/mail-config.ui @@ -4898,7 +4898,7 @@ For example: "Work" or "Personal"</property> </packing> </child> <child> - <object class="GtkComboBox" id="source_type_dropdown"> + <object class="GtkComboBoxText" id="source_type_dropdown"> <property name="visible">True</property> <property name="can_focus">False</property> </object> @@ -5268,7 +5268,7 @@ For example: "Work" or "Personal"</property> <property name="can_focus">False</property> <property name="spacing">6</property> <child> - <object class="GtkComboBox" id="source_auth_dropdown"> + <object class="EAuthComboBox" id="source_auth_dropdown" type-func="e_auth_combo_box_get_type"> <property name="visible">True</property> <property name="can_focus">False</property> </object> @@ -5379,7 +5379,7 @@ For example: "Work" or "Personal"</property> </packing> </child> <child> - <object class="GtkComboBox" id="transport_type_dropdown"> + <object class="GtkComboBoxText" id="transport_type_dropdown"> <property name="visible">True</property> <property name="can_focus">False</property> </object> @@ -5799,7 +5799,7 @@ For example: "Work" or "Personal"</property> <property name="can_focus">False</property> <property name="spacing">6</property> <child> - <object class="GtkComboBox" id="transport_auth_dropdown"> + <object class="EAuthComboBox" id="transport_auth_dropdown" type-func="e_auth_combo_box_get_type"> <property name="visible">True</property> <property name="can_focus">False</property> </object> diff --git a/mail/mail-mt.c b/mail/mail-mt.c index 0d05a21a86..526571f61f 100644 --- a/mail/mail-mt.c +++ b/mail/mail-mt.c @@ -283,7 +283,7 @@ mail_msg_cancel (guint msgid) g_mutex_unlock (mail_msg_lock); if (cancellable != NULL) { - camel_operation_cancel (CAMEL_OPERATION (cancellable)); + g_cancellable_cancel (cancellable); g_object_unref (cancellable); } } @@ -340,7 +340,7 @@ mail_cancel_hook_remove (GHook *hook) void mail_cancel_all (void) { - camel_operation_cancel (NULL); + camel_operation_cancel_all (); g_mutex_lock (mail_msg_lock); diff --git a/mail/mail-send-recv.c b/mail/mail-send-recv.c index 33ac977e35..167b4fd872 100644 --- a/mail/mail-send-recv.c +++ b/mail/mail-send-recv.c @@ -191,7 +191,7 @@ receive_cancel (GtkButton *button, struct _send_info *info) { if (info->state == SEND_ACTIVE) { - camel_operation_cancel (CAMEL_OPERATION (info->cancellable)); + g_cancellable_cancel (info->cancellable); if (info->status_label) gtk_label_set_text ( GTK_LABEL (info->status_label), diff --git a/mail/message-list.c b/mail/message-list.c index 35071cf0d0..cca1c44de1 100644 --- a/mail/message-list.c +++ b/mail/message-list.c @@ -4977,20 +4977,16 @@ mail_regen_cancel (MessageList *ml) { /* cancel any outstanding regeneration requests, not we don't clear, they clear themselves */ if (ml->regen) { - GList *l; + GList *link; g_mutex_lock (ml->regen_lock); - l = ml->regen; - while (l) { - MailMsg *mm = l->data; + for (link = ml->regen; link != NULL; link = link->next) { + MailMsg *mm = link->data; GCancellable *cancellable; cancellable = e_activity_get_cancellable (mm->activity); - if (CAMEL_IS_OPERATION (cancellable)) - camel_operation_cancel ( - CAMEL_OPERATION (cancellable)); - l = l->next; + g_cancellable_cancel (cancellable); } g_mutex_unlock (ml->regen_lock); diff --git a/maint/evolution.xml b/maint/evolution.xml index c072734164..bc9340c540 100644 --- a/maint/evolution.xml +++ b/maint/evolution.xml @@ -2,6 +2,8 @@ <glade-widget-classes> + <glade-widget-class name="EAuthComboBox" generic-name="auth-combo-box" title="Authentication Combo Box" get-type-function="e_auth_combo_box_get_type"/> + <glade-widget-class name="EDateEdit" generic-name="date-edit" title="Date Edit"> <property id="allow-no-date-set"/> <property id="set-none"/> @@ -39,6 +41,7 @@ </glade-widget-classes> <glade-widget-group name="evolution-widgets" title="Evolution"> + <glade-widget-class-ref name="EAuthComboBox"/> <glade-widget-class-ref name="EDateEdit"/> <glade-widget-class-ref name="EImageChooser"/> <glade-widget-class-ref name="EMailJunkOptions"/> diff --git a/modules/mail/e-mail-config-hook.c b/modules/mail/e-mail-config-hook.c index b247c90ec2..cc9734647b 100644 --- a/modules/mail/e-mail-config-hook.c +++ b/modules/mail/e-mail-config-hook.c @@ -35,7 +35,7 @@ static const EConfigHookTargetMask no_masks[] = { static const EConfigHookTargetMap targets[] = { { "folder", EM_CONFIG_TARGET_FOLDER, no_masks }, { "prefs", EM_CONFIG_TARGET_PREFS, no_masks }, - { "account", EM_CONFIG_TARGET_ACCOUNT, no_masks }, + { "settings", EM_CONFIG_TARGET_SETTINGS, no_masks }, { NULL } }; diff --git a/plugins/backup-restore/backup-restore.c b/plugins/backup-restore/backup-restore.c index acef0ae223..1a389703e9 100644 --- a/plugins/backup-restore/backup-restore.c +++ b/plugins/backup-restore/backup-restore.c @@ -52,9 +52,9 @@ gboolean e_plugin_ui_init (GtkUIManager *ui_manager, GtkWidget * backup_restore_page (EPlugin *ep, EConfigHookItemFactoryData *hook_data); void backup_restore_commit (EPlugin *ep, - EMConfigTargetAccount *target); + EMConfigTargetSettings *target); void backup_restore_abort (EPlugin *ep, - EMConfigTargetAccount *target); + EMConfigTargetSettings *target); typedef enum _br_flags { BR_OK = 1 << 0, @@ -434,7 +434,7 @@ backup_restore_page (EPlugin *ep, void backup_restore_commit (EPlugin *ep, - EMConfigTargetAccount *target) + EMConfigTargetSettings *target) { GObject *assistant; gchar *file; @@ -456,7 +456,7 @@ backup_restore_commit (EPlugin *ep, void backup_restore_abort (EPlugin *ep, - EMConfigTargetAccount *target) + EMConfigTargetSettings *target) { /* Nothing really */ } diff --git a/plugins/backup-restore/org-gnome-backup-restore.eplug.xml b/plugins/backup-restore/org-gnome-backup-restore.eplug.xml index 653ad6299f..4899b2dd8a 100644 --- a/plugins/backup-restore/org-gnome-backup-restore.eplug.xml +++ b/plugins/backup-restore/org-gnome-backup-restore.eplug.xml @@ -23,7 +23,7 @@ </hook> <hook class="org.gnome.evolution.mail.config:1.0"> - <group target="account" id="org.gnome.evolution.mail.config.accountWizard" commit="backup_restore_commit" abort="backup_restore_abort"> + <group target="settings" id="org.gnome.evolution.mail.config.accountWizard" commit="backup_restore_commit" abort="backup_restore_abort"> <item type="page" path="0.startup_page.10.backup_restore" factory="backup_restore_page"/> </group> </hook> diff --git a/plugins/imap-features/imap-headers.c b/plugins/imap-features/imap-headers.c index a496106372..f09f880b36 100644 --- a/plugins/imap-features/imap-headers.c +++ b/plugins/imap-features/imap-headers.c @@ -78,18 +78,17 @@ void imap_headers_commit (EPlugin *efp, EConfigHookItemFactoryData *data) { - EMConfigTargetAccount *target_account; + EMConfigTargetSettings *target; CamelFetchHeadersType fetch_headers; - CamelSettings *settings; - EAccount *modified_account; gboolean use_imap = g_getenv ("USE_IMAP") != NULL; + const gchar *protocol; - target_account = (EMConfigTargetAccount *) data->config->target; - modified_account = target_account->modified_account; - settings = target_account->settings; + target = (EMConfigTargetSettings *) data->config->target; + protocol = target->storage_protocol; + + if (g_strcmp0 (protocol, "imap") == 0 || + (use_imap && g_strcmp0 (protocol, "groupwise") == 0)) { - if (g_str_has_prefix (modified_account->source->url, "imap://") || - (use_imap && g_str_has_prefix (modified_account->source->url, "groupwise://"))) { GtkTreeModel *model; GtkTreeIter iter; gint n_children; @@ -123,7 +122,7 @@ imap_headers_commit (EPlugin *efp, fetch_headers = CAMEL_FETCH_HEADERS_BASIC_AND_MAILING_LIST; g_object_set ( - settings, + target->storage_settings, "fetch-headers", fetch_headers, "fetch-headers-extra", strv, NULL); @@ -249,9 +248,7 @@ GtkWidget * org_gnome_imap_headers (EPlugin *epl, EConfigHookItemFactoryData *data) { - EMConfigTargetAccount *target_account; - CamelSettings *settings; - EAccount *account; + EMConfigTargetSettings *target; GtkWidget *vbox; GtkBuilder *builder; GtkWidget *button; @@ -262,19 +259,20 @@ org_gnome_imap_headers (EPlugin *epl, CamelFetchHeadersType fetch_headers = 0; gchar **extra_headers = NULL; gboolean use_imap = g_getenv ("USE_IMAP") != NULL; + const gchar *protocol; guint ii, length = 0; ui = g_new0 (EPImapFeaturesData, 1); - target_account = (EMConfigTargetAccount *) data->config->target; - account = target_account->modified_account; - settings = target_account->settings; + target = (EMConfigTargetSettings *) data->config->target; + protocol = target->storage_protocol; - if (!g_str_has_prefix (account->source->url, "imap://") && !(use_imap && g_str_has_prefix (account->source->url, "groupwise://"))) + if (g_strcmp0 (protocol, "imap") != 0 && + !(use_imap && g_strcmp0 (protocol, "groupwise") == 0)) return NULL; g_object_get ( - settings, + target->storage_settings, "fetch-headers", &fetch_headers, "fetch-headers-extra", &extra_headers, NULL); diff --git a/plugins/imap-features/org-gnome-imap-features.eplug.xml b/plugins/imap-features/org-gnome-imap-features.eplug.xml index fdbfdc78ef..c4d27bddd0 100644 --- a/plugins/imap-features/org-gnome-imap-features.eplug.xml +++ b/plugins/imap-features/org-gnome-imap-features.eplug.xml @@ -8,7 +8,7 @@ <hook class="org.gnome.evolution.mail.config:1.0"> <group id="org.gnome.evolution.mail.config.accountEditor" - target="account" commit = "imap_headers_commit" abort="imap_headers_abort"> + target="settings" commit = "imap_headers_commit" abort="imap_headers_abort"> <item type="page" path="70.IMAP Headers" label="IMAP Headers" factory="org_gnome_imap_headers"/> </group> </hook> diff --git a/plugins/pst-import/pst-importer.c b/plugins/pst-import/pst-importer.c index 7ef82d450e..d4054b573e 100644 --- a/plugins/pst-import/pst-importer.c +++ b/plugins/pst-import/pst-importer.c @@ -798,7 +798,6 @@ static void pst_import_folders (PstImporter *m, pst_desc_tree *topitem) { - CamelOperation *co = CAMEL_OPERATION (m->cancellable); GHashTable *node_to_folderuri; /* pointers of hierarchy nodes, to them associated folder uris */ pst_desc_tree *d_ptr; @@ -809,7 +808,7 @@ pst_import_folders (PstImporter *m, g_hash_table_insert (node_to_folderuri, topitem, g_strdup (m->folder_uri)); /* Walk through folder tree */ - while (d_ptr != NULL && (camel_operation_cancel_check (co) == FALSE)) { + while (d_ptr != NULL && (g_cancellable_is_cancelled (m->cancellable) == FALSE)) { gchar *previous_folder = NULL; m->position++; @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: evolution.HEAD\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=evolution&keywords=I18N+L10N\n" -"POT-Creation-Date: 2011-10-08 13:43+0000\n" -"PO-Revision-Date: 2011-10-09 00:32+0300\n" +"POT-Creation-Date: 2011-11-03 09:52+0000\n" +"PO-Revision-Date: 2011-11-06 00:36+0300\n" "Last-Translator: Aurimas Černius <aurisc4@gmail.com>\n" "Language-Team: Lietuvių <>\n" "MIME-Version: 1.0\n" @@ -213,8 +213,8 @@ msgid "_Use as it is" msgstr "_Naudoti tokį, koks yra" #: ../addressbook/gui/contact-editor/contact-editor.ui.h:1 -#: ../addressbook/gui/widgets/eab-contact-display.c:715 -#: ../calendar/gui/e-calendar-view.c:2064 +#: ../addressbook/gui/widgets/eab-contact-display.c:717 +#: ../calendar/gui/e-calendar-view.c:2068 msgid "Anniversary" msgstr "Jubiliejus" @@ -224,9 +224,9 @@ msgstr "Jubiliejus" #. * which, so long as it has an icon. We're just interested in #. * the directory components. #: ../addressbook/gui/contact-editor/contact-editor.ui.h:2 -#: ../addressbook/gui/widgets/eab-contact-display.c:714 -#: ../calendar/gui/e-calendar-view.c:2063 -#: ../capplet/anjal-settings-main.c:79 +#: ../addressbook/gui/widgets/eab-contact-display.c:716 +#: ../calendar/gui/e-calendar-view.c:2067 +#: ../capplet/anjal-settings-main.c:78 #: ../shell/main.c:138 msgid "Birthday" msgstr "Gimtadienis" @@ -261,9 +261,9 @@ msgstr "Kontaktų redaktorius" #: ../addressbook/gui/contact-editor/contact-editor.ui.h:9 #: ../addressbook/gui/merging/eab-contact-merging.c:390 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11 -#: ../addressbook/gui/widgets/eab-contact-display.c:633 -#: ../addressbook/gui/widgets/eab-contact-display.c:641 -#: ../addressbook/gui/widgets/eab-contact-display.c:1019 +#: ../addressbook/gui/widgets/eab-contact-display.c:635 +#: ../addressbook/gui/widgets/eab-contact-display.c:643 +#: ../addressbook/gui/widgets/eab-contact-display.c:1043 #: ../smime/lib/e-cert.c:833 msgid "Email" msgstr "El. paštas" @@ -279,7 +279,7 @@ msgstr "Vis_as vardas..." #: ../addressbook/gui/contact-editor/contact-editor.ui.h:12 #: ../addressbook/gui/contact-editor/e-contact-editor.c:198 #: ../addressbook/gui/widgets/eab-contact-display.c:78 -#: ../addressbook/gui/widgets/eab-contact-display.c:1323 +#: ../addressbook/gui/widgets/eab-contact-display.c:1348 #: ../widgets/misc/e-contact-map.c:295 msgid "Home" msgstr "Namų" @@ -348,8 +348,8 @@ msgstr "Tinklalapiai" #: ../addressbook/gui/contact-editor/contact-editor.ui.h:27 #: ../addressbook/gui/contact-editor/e-contact-editor.c:197 #: ../addressbook/gui/widgets/eab-contact-display.c:77 -#: ../addressbook/gui/widgets/eab-contact-display.c:694 -#: ../addressbook/gui/widgets/eab-contact-display.c:1320 +#: ../addressbook/gui/widgets/eab-contact-display.c:696 +#: ../addressbook/gui/widgets/eab-contact-display.c:1345 #: ../widgets/misc/e-contact-map.c:303 msgid "Work" msgstr "Darbinis" @@ -456,42 +456,42 @@ msgid "_Zip/Postal Code:" msgstr "_Zip/Pašto kodas:" #: ../addressbook/gui/contact-editor/e-contact-editor.c:178 -#: ../addressbook/gui/widgets/eab-contact-display.c:655 +#: ../addressbook/gui/widgets/eab-contact-display.c:657 msgid "AIM" msgstr "AIM" #: ../addressbook/gui/contact-editor/e-contact-editor.c:179 -#: ../addressbook/gui/widgets/eab-contact-display.c:658 +#: ../addressbook/gui/widgets/eab-contact-display.c:660 msgid "Jabber" msgstr "Jabber" #: ../addressbook/gui/contact-editor/e-contact-editor.c:180 -#: ../addressbook/gui/widgets/eab-contact-display.c:660 +#: ../addressbook/gui/widgets/eab-contact-display.c:662 msgid "Yahoo" msgstr "Yahoo" #: ../addressbook/gui/contact-editor/e-contact-editor.c:181 -#: ../addressbook/gui/widgets/eab-contact-display.c:661 +#: ../addressbook/gui/widgets/eab-contact-display.c:663 msgid "Gadu-Gadu" msgstr "Gadu-Gadu" #: ../addressbook/gui/contact-editor/e-contact-editor.c:182 -#: ../addressbook/gui/widgets/eab-contact-display.c:659 +#: ../addressbook/gui/widgets/eab-contact-display.c:661 msgid "MSN" msgstr "MSN" #: ../addressbook/gui/contact-editor/e-contact-editor.c:183 -#: ../addressbook/gui/widgets/eab-contact-display.c:657 +#: ../addressbook/gui/widgets/eab-contact-display.c:659 msgid "ICQ" msgstr "ICQ" #: ../addressbook/gui/contact-editor/e-contact-editor.c:184 -#: ../addressbook/gui/widgets/eab-contact-display.c:656 +#: ../addressbook/gui/widgets/eab-contact-display.c:658 msgid "GroupWise" msgstr "GroupWise" #: ../addressbook/gui/contact-editor/e-contact-editor.c:185 -#: ../addressbook/gui/widgets/eab-contact-display.c:662 +#: ../addressbook/gui/widgets/eab-contact-display.c:664 msgid "Skype" msgstr "Skype" @@ -636,7 +636,7 @@ msgid "_Suffix:" msgstr "_Galūnė:" #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:1 -#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:746 +#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:762 msgid "Contact List Editor" msgstr "Kontaktų sąrašo redaktorius" @@ -661,7 +661,7 @@ msgstr "P_asirinkti..." msgid "_Type an email address or drag a contact into the list below:" msgstr "Įrašykite _el. pašto adresą arba nutempkite kontaktą į žemiau esantį sąrašą:" -#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:869 +#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:885 msgid "Contact List Members" msgstr "Susisiekti su sąrašo nariais" @@ -669,15 +669,15 @@ msgstr "Susisiekti su sąrašo nariais" msgid "_Members" msgstr "_Nariai" -#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1514 +#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1516 msgid "Error adding list" msgstr "Klaida pridedant sąrašą" -#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1529 +#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1531 msgid "Error modifying list" msgstr "Klaida modifikuojant sąrašą" -#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1544 +#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1546 msgid "Error removing list" msgstr "Klaida pašalinant sąrašą" @@ -844,7 +844,7 @@ msgid "Display _All Contacts" msgstr "Rodyti _visus kontaktus" #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:1 -#: ../addressbook/gui/widgets/eab-contact-display.c:685 +#: ../addressbook/gui/widgets/eab-contact-display.c:687 msgid "Assistant" msgstr "Asistento" @@ -881,7 +881,7 @@ msgid "Categories" msgstr "Kategorijos" #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:9 -#: ../addressbook/gui/widgets/eab-contact-display.c:680 +#: ../addressbook/gui/widgets/eab-contact-display.c:682 msgid "Company" msgstr "Kompanija" @@ -930,22 +930,22 @@ msgid "Journal" msgstr "Žurnalas" #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23 -#: ../addressbook/gui/widgets/eab-contact-display.c:684 +#: ../addressbook/gui/widgets/eab-contact-display.c:686 msgid "Manager" msgstr "Vadybininkas" #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:24 -#: ../addressbook/gui/widgets/eab-contact-display.c:712 +#: ../addressbook/gui/widgets/eab-contact-display.c:714 msgid "Mobile Phone" msgstr "Mobilusis telefonas" #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:25 -#: ../addressbook/gui/widgets/eab-contact-display.c:648 +#: ../addressbook/gui/widgets/eab-contact-display.c:650 msgid "Nickname" msgstr "Pravardė" #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:26 -#: ../addressbook/gui/widgets/eab-contact-display.c:739 +#: ../addressbook/gui/widgets/eab-contact-display.c:741 msgid "Note" msgstr "Pastaba" @@ -980,7 +980,7 @@ msgid "Role" msgstr "Rolė" #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34 -#: ../addressbook/gui/widgets/eab-contact-display.c:716 +#: ../addressbook/gui/widgets/eab-contact-display.c:718 msgid "Spouse" msgstr "Sutuoktinis" @@ -1142,64 +1142,64 @@ msgstr "Siųsti el. laišką šiuo adresu" msgid "Open map" msgstr "Atverti žemėlapį" -#: ../addressbook/gui/widgets/eab-contact-display.c:528 -#: ../addressbook/gui/widgets/eab-contact-display.c:556 +#: ../addressbook/gui/widgets/eab-contact-display.c:530 +#: ../addressbook/gui/widgets/eab-contact-display.c:558 msgid "List Members:" msgstr "Sąrašo nariai:" -#: ../addressbook/gui/widgets/eab-contact-display.c:681 +#: ../addressbook/gui/widgets/eab-contact-display.c:683 msgid "Department" msgstr "Padalinys" -#: ../addressbook/gui/widgets/eab-contact-display.c:682 +#: ../addressbook/gui/widgets/eab-contact-display.c:684 msgid "Profession" msgstr "Profesija" -#: ../addressbook/gui/widgets/eab-contact-display.c:683 +#: ../addressbook/gui/widgets/eab-contact-display.c:685 msgid "Position" msgstr "Postas" -#: ../addressbook/gui/widgets/eab-contact-display.c:686 +#: ../addressbook/gui/widgets/eab-contact-display.c:688 msgid "Video Chat" msgstr "Vaizdo pokalbis" -#: ../addressbook/gui/widgets/eab-contact-display.c:687 +#: ../addressbook/gui/widgets/eab-contact-display.c:689 #: ../calendar/gui/dialogs/calendar-setup.c:449 #: ../modules/calendar/e-cal-shell-view-actions.c:232 #: ../modules/calendar/e-cal-shell-view-actions.c:261 #: ../modules/calendar/e-cal-shell-view.c:523 -#: ../modules/online-accounts/e-online-accounts-google.c:294 +#: ../modules/online-accounts/e-online-accounts-google.c:296 #: ../plugins/publish-calendar/publish-calendar.ui.h:1 #: ../widgets/misc/e-send-options.c:528 msgid "Calendar" msgstr "Kalendorius" -#: ../addressbook/gui/widgets/eab-contact-display.c:688 +#: ../addressbook/gui/widgets/eab-contact-display.c:690 #: ../calendar/gui/dialogs/event-editor.c:123 #: ../calendar/gui/dialogs/event-editor.c:350 #: ../plugins/publish-calendar/publish-calendar.ui.h:6 msgid "Free/Busy" msgstr "Užimtumas" -#: ../addressbook/gui/widgets/eab-contact-display.c:689 -#: ../addressbook/gui/widgets/eab-contact-display.c:711 +#: ../addressbook/gui/widgets/eab-contact-display.c:691 +#: ../addressbook/gui/widgets/eab-contact-display.c:713 msgid "Phone" msgstr "Telefonas" -#: ../addressbook/gui/widgets/eab-contact-display.c:690 +#: ../addressbook/gui/widgets/eab-contact-display.c:692 msgid "Fax" msgstr "Faksas" -#: ../addressbook/gui/widgets/eab-contact-display.c:691 -#: ../addressbook/gui/widgets/eab-contact-display.c:713 +#: ../addressbook/gui/widgets/eab-contact-display.c:693 +#: ../addressbook/gui/widgets/eab-contact-display.c:715 msgid "Address" msgstr "Adresas" -#: ../addressbook/gui/widgets/eab-contact-display.c:708 +#: ../addressbook/gui/widgets/eab-contact-display.c:710 msgid "Home Page" msgstr "Namų tinklalapis" -#: ../addressbook/gui/widgets/eab-contact-display.c:709 +#: ../addressbook/gui/widgets/eab-contact-display.c:711 msgid "Web Log" msgstr "Tinklaraštis" @@ -1207,8 +1207,8 @@ msgstr "Tinklaraštis" #. Create the default Person calendar #. Create the default Person memo list #. Create the default Person task list -#: ../addressbook/gui/widgets/eab-contact-display.c:718 -#: ../capplet/settings/mail-capplet-shell.c:385 +#: ../addressbook/gui/widgets/eab-contact-display.c:720 +#: ../capplet/settings/mail-capplet-shell.c:384 #: ../modules/addressbook/e-book-shell-backend.c:120 #: ../modules/addressbook/e-book-shell-migrate.c:144 #: ../modules/calendar/e-cal-shell-backend.c:138 @@ -1220,23 +1220,23 @@ msgstr "Tinklaraštis" msgid "Personal" msgstr "Asmeninis" -#: ../addressbook/gui/widgets/eab-contact-display.c:986 +#: ../addressbook/gui/widgets/eab-contact-display.c:1010 msgid "List Members" msgstr "Parodyti sąrašą" -#: ../addressbook/gui/widgets/eab-contact-display.c:1004 +#: ../addressbook/gui/widgets/eab-contact-display.c:1028 msgid "Job Title" msgstr "Pareigos" -#: ../addressbook/gui/widgets/eab-contact-display.c:1041 +#: ../addressbook/gui/widgets/eab-contact-display.c:1065 msgid "Home page" msgstr "Namų puslapis" -#: ../addressbook/gui/widgets/eab-contact-display.c:1050 +#: ../addressbook/gui/widgets/eab-contact-display.c:1074 msgid "Blog" msgstr "Žurnalas" -#: ../addressbook/gui/widgets/eab-contact-display.c:1248 +#: ../addressbook/gui/widgets/eab-contact-display.c:1273 #: ../widgets/misc/e-web-view.c:980 #, c-format msgid "Click to mail %s" @@ -1319,19 +1319,19 @@ msgstr "Pasirinkti adresų knygą" msgid "list" msgstr "sąrašas" -#: ../addressbook/gui/widgets/eab-gui-util.c:559 +#: ../addressbook/gui/widgets/eab-gui-util.c:560 msgid "Move contact to" msgstr "Perkelti kontaktą į" -#: ../addressbook/gui/widgets/eab-gui-util.c:561 +#: ../addressbook/gui/widgets/eab-gui-util.c:562 msgid "Copy contact to" msgstr "Nukopijuoti kontaktą į" -#: ../addressbook/gui/widgets/eab-gui-util.c:564 +#: ../addressbook/gui/widgets/eab-gui-util.c:565 msgid "Move contacts to" msgstr "Perkelti kontaktus į" -#: ../addressbook/gui/widgets/eab-gui-util.c:566 +#: ../addressbook/gui/widgets/eab-gui-util.c:567 msgid "Copy contacts to" msgstr "Nukopijuoti kontaktus į" @@ -1411,8 +1411,8 @@ msgstr "Nepavyko gauti adresų knygų sąrašo: %s" #: ../addressbook/tools/evolution-addressbook-export-list-folders.c:79 #: ../calendar/gui/dialogs/memo-page.c:938 #: ../em-format/em-format.c:2324 -#: ../mail/em-folder-tree.c:678 -#: ../mail/mail-ops.c:662 +#: ../mail/em-folder-tree.c:679 +#: ../mail/mail-ops.c:666 #: ../plugins/caldav/caldav-browse-server.c:220 #: ../plugins/caldav/caldav-browse-server.c:1469 #: ../plugins/face/face.c:174 @@ -2375,7 +2375,7 @@ msgstr "Sp_alva:" #: ../modules/addressbook/addressbook-config.c:1077 #: ../modules/addressbook/autocompletion-config.c:240 #: ../modules/calendar/e-calendar-preferences.ui.h:17 -#: ../plugins/itip-formatter/itip-formatter.c:3038 +#: ../plugins/itip-formatter/itip-formatter.c:3039 #: ../plugins/publish-calendar/publish-calendar.ui.h:7 #: ../smime/gui/smime-ui.ui.h:21 msgid "General" @@ -2514,7 +2514,7 @@ msgstr "Užverti esamą langą" #: ../calendar/gui/dialogs/comp-editor.c:1127 #: ../mail/e-mail-browser.c:141 -#: ../shell/e-shell-window-actions.c:1455 +#: ../shell/e-shell-window-actions.c:1464 #: ../widgets/misc/e-focus-tracker.c:117 #: ../widgets/misc/e-focus-tracker.c:555 #: ../widgets/misc/e-web-view.c:459 @@ -2524,7 +2524,7 @@ msgstr "Kopijuoti pažymėjimą" #: ../calendar/gui/dialogs/comp-editor.c:1134 #: ../mail/e-mail-browser.c:148 -#: ../shell/e-shell-window-actions.c:1462 +#: ../shell/e-shell-window-actions.c:1471 #: ../widgets/misc/e-focus-tracker.c:110 #: ../widgets/misc/e-focus-tracker.c:550 #: ../widgets/misc/e-web-view.c:1300 @@ -2532,7 +2532,7 @@ msgid "Cut the selection" msgstr "Iškirpti pažymėjimą" #: ../calendar/gui/dialogs/comp-editor.c:1141 -#: ../shell/e-shell-window-actions.c:1469 +#: ../shell/e-shell-window-actions.c:1478 #: ../widgets/misc/e-focus-tracker.c:131 #: ../widgets/misc/e-focus-tracker.c:565 msgid "Delete the selection" @@ -2544,7 +2544,7 @@ msgstr "Rodyti pagalbą" #: ../calendar/gui/dialogs/comp-editor.c:1155 #: ../mail/e-mail-browser.c:155 -#: ../shell/e-shell-window-actions.c:1497 +#: ../shell/e-shell-window-actions.c:1506 #: ../widgets/misc/e-focus-tracker.c:124 #: ../widgets/misc/e-focus-tracker.c:560 #: ../widgets/misc/e-web-view.c:1312 @@ -2557,7 +2557,7 @@ msgstr "Įrašyti dabartinius pakeitimus" #: ../calendar/gui/dialogs/comp-editor.c:1183 #: ../mail/e-mail-browser.c:162 -#: ../shell/e-shell-window-actions.c:1574 +#: ../shell/e-shell-window-actions.c:1583 #: ../widgets/misc/e-focus-tracker.c:138 #: ../widgets/misc/e-focus-tracker.c:570 msgid "Select all text" @@ -2572,20 +2572,20 @@ msgstr "_Klasifikacija" #: ../filter/filter.ui.h:10 #: ../mail/e-mail-browser.c:176 #: ../plugins/publish-calendar/publish-calendar.ui.h:23 -#: ../shell/e-shell-window-actions.c:1602 +#: ../shell/e-shell-window-actions.c:1611 #: ../widgets/menus/gal-define-views.ui.h:5 msgid "_Edit" msgstr "_Keisti" #: ../calendar/gui/dialogs/comp-editor.c:1204 #: ../mail/e-mail-browser.c:169 -#: ../shell/e-shell-window-actions.c:1609 +#: ../shell/e-shell-window-actions.c:1618 #: ../widgets/misc/e-signature-editor.c:221 msgid "_File" msgstr "_Failas" #: ../calendar/gui/dialogs/comp-editor.c:1211 -#: ../shell/e-shell-window-actions.c:1616 +#: ../shell/e-shell-window-actions.c:1625 msgid "_Help" msgstr "_Žinynas" @@ -2600,7 +2600,7 @@ msgstr "_Parinktys" #: ../calendar/gui/dialogs/comp-editor.c:1232 #: ../mail/e-mail-browser.c:183 -#: ../shell/e-shell-window-actions.c:1651 +#: ../shell/e-shell-window-actions.c:1660 #: ../smime/gui/smime-ui.ui.h:46 msgid "_View" msgstr "R_odymas" @@ -3858,7 +3858,7 @@ msgstr "Ne" #: ../e-util/e-charset.c:52 #: ../modules/plugin-manager/evolution-plugin-manager.c:101 #: ../plugins/itip-formatter/itip-formatter.c:469 -#: ../plugins/itip-formatter/itip-formatter.c:2690 +#: ../plugins/itip-formatter/itip-formatter.c:2691 msgid "Unknown" msgstr "Nežinomas" @@ -3879,7 +3879,7 @@ msgstr "Atveriama %s" #: ../calendar/gui/e-meeting-list-view.c:214 #: ../calendar/gui/e-meeting-store.c:198 #: ../calendar/gui/e-meeting-store.c:221 -#: ../plugins/itip-formatter/itip-formatter.c:2678 +#: ../plugins/itip-formatter/itip-formatter.c:2679 msgid "Accepted" msgstr "Priimtas" @@ -3887,7 +3887,7 @@ msgstr "Priimtas" #: ../calendar/gui/e-meeting-list-view.c:215 #: ../calendar/gui/e-meeting-store.c:200 #: ../calendar/gui/e-meeting-store.c:223 -#: ../plugins/itip-formatter/itip-formatter.c:2684 +#: ../plugins/itip-formatter/itip-formatter.c:2685 msgid "Declined" msgstr "Atmestas" @@ -3903,7 +3903,7 @@ msgstr "Negalutinis" #: ../calendar/gui/e-meeting-list-view.c:217 #: ../calendar/gui/e-meeting-store.c:204 #: ../calendar/gui/e-meeting-store.c:227 -#: ../plugins/itip-formatter/itip-formatter.c:2687 +#: ../plugins/itip-formatter/itip-formatter.c:2688 msgid "Delegated" msgstr "Pavestas" @@ -3981,7 +3981,7 @@ msgstr "Atnaujinami objektai" #. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>" #. To Translators: It will display #. * "Organizer: NameOfTheUser <email@ofuser.com>" -#: ../calendar/gui/e-calendar-view.c:1908 +#: ../calendar/gui/e-calendar-view.c:1912 #: ../calendar/gui/e-memo-table.c:539 #: ../calendar/gui/e-task-table.c:771 #, c-format @@ -3991,7 +3991,7 @@ msgstr "Organizatorius: %s <%s>" #. With SunOne accouts, there may be no ':' in organiser.value #. With SunOne accounts, there may be no ':' in #. * organizer.value. -#: ../calendar/gui/e-calendar-view.c:1912 +#: ../calendar/gui/e-calendar-view.c:1916 #: ../calendar/gui/e-memo-table.c:544 #: ../calendar/gui/e-task-table.c:775 #, c-format @@ -3999,14 +3999,14 @@ msgid "Organizer: %s" msgstr "Organizatorius: %s" #. To Translators: It will display "Location: PlaceOfTheMeeting" -#: ../calendar/gui/e-calendar-view.c:1928 +#: ../calendar/gui/e-calendar-view.c:1932 #: ../calendar/gui/print.c:3344 #, c-format msgid "Location: %s" msgstr "Vieta: %s" #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)" -#: ../calendar/gui/e-calendar-view.c:1959 +#: ../calendar/gui/e-calendar-view.c:1963 #, c-format msgid "Time: %s %s" msgstr "Laikas: %s %s" @@ -4234,7 +4234,7 @@ msgstr "Nesėkmės priežastis: %s" #: ../calendar/gui/e-meeting-store.c:1891 #: ../plugins/caldav/caldav-browse-server.c:957 -#: ../plugins/google-account-setup/google-source.c:460 +#: ../plugins/google-account-setup/google-source.c:458 #: ../plugins/publish-calendar/publish-calendar.c:337 #: ../smime/gui/component.c:54 msgid "Enter password" @@ -4607,37 +4607,37 @@ msgstr "kalendoriaus rodinys vienai ar daugiau savaičių" msgid "Purging" msgstr "Išvaloma" -#: ../calendar/gui/itip-utils.c:511 -#: ../calendar/gui/itip-utils.c:566 -#: ../calendar/gui/itip-utils.c:669 +#: ../calendar/gui/itip-utils.c:513 +#: ../calendar/gui/itip-utils.c:568 +#: ../calendar/gui/itip-utils.c:681 msgid "An organizer must be set." msgstr "Turi būti nurodytas organizatorius." -#: ../calendar/gui/itip-utils.c:558 +#: ../calendar/gui/itip-utils.c:560 msgid "At least one attendee is necessary" msgstr "Reikalingas bent vienas dalyvis" -#: ../calendar/gui/itip-utils.c:755 -#: ../calendar/gui/itip-utils.c:916 +#: ../calendar/gui/itip-utils.c:767 +#: ../calendar/gui/itip-utils.c:928 msgid "Event information" msgstr "Įvykio informacija" -#: ../calendar/gui/itip-utils.c:758 -#: ../calendar/gui/itip-utils.c:919 +#: ../calendar/gui/itip-utils.c:770 +#: ../calendar/gui/itip-utils.c:931 msgid "Task information" msgstr "Užduoties informacija" -#: ../calendar/gui/itip-utils.c:761 -#: ../calendar/gui/itip-utils.c:922 +#: ../calendar/gui/itip-utils.c:773 +#: ../calendar/gui/itip-utils.c:934 msgid "Memo information" msgstr "Raštelio informacija" -#: ../calendar/gui/itip-utils.c:764 -#: ../calendar/gui/itip-utils.c:940 +#: ../calendar/gui/itip-utils.c:776 +#: ../calendar/gui/itip-utils.c:952 msgid "Free/Busy information" msgstr "Užimtumo informacija" -#: ../calendar/gui/itip-utils.c:767 +#: ../calendar/gui/itip-utils.c:779 msgid "Calendar information" msgstr "Kalendoriaus informacija" @@ -4645,7 +4645,7 @@ msgstr "Kalendoriaus informacija" #. * line of a meeting request or update email. #. * The full subject line would be: #. * "Accepted: Meeting Name". -#: ../calendar/gui/itip-utils.c:804 +#: ../calendar/gui/itip-utils.c:816 msgctxt "Meeting" msgid "Accepted" msgstr "Priimta" @@ -4654,7 +4654,7 @@ msgstr "Priimta" #. * line of a meeting request or update email. #. * The full subject line would be: #. * "Tentatively Accepted: Meeting Name". -#: ../calendar/gui/itip-utils.c:811 +#: ../calendar/gui/itip-utils.c:823 msgctxt "Meeting" msgid "Tentatively Accepted" msgstr "Preliminariai priimta" @@ -4666,8 +4666,8 @@ msgstr "Preliminariai priimta" #. Translators: This is part of the subject line of a #. * meeting request or update email. The full subject #. * line would be: "Declined: Meeting Name". -#: ../calendar/gui/itip-utils.c:818 -#: ../calendar/gui/itip-utils.c:866 +#: ../calendar/gui/itip-utils.c:830 +#: ../calendar/gui/itip-utils.c:878 msgctxt "Meeting" msgid "Declined" msgstr "Atmesta" @@ -4676,7 +4676,7 @@ msgstr "Atmesta" #. * line of a meeting request or update email. #. * The full subject line would be: #. * "Delegated: Meeting Name". -#: ../calendar/gui/itip-utils.c:825 +#: ../calendar/gui/itip-utils.c:837 msgctxt "Meeting" msgid "Delegated" msgstr "Pavesta" @@ -4684,7 +4684,7 @@ msgstr "Pavesta" #. Translators: This is part of the subject line of a #. * meeting request or update email. The full subject #. * line would be: "Updated: Meeting Name". -#: ../calendar/gui/itip-utils.c:838 +#: ../calendar/gui/itip-utils.c:850 msgctxt "Meeting" msgid "Updated" msgstr "Atnaujint" @@ -4692,7 +4692,7 @@ msgstr "Atnaujint" #. Translators: This is part of the subject line of a #. * meeting request or update email. The full subject #. * line would be: "Cancel: Meeting Name". -#: ../calendar/gui/itip-utils.c:845 +#: ../calendar/gui/itip-utils.c:857 msgctxt "Meeting" msgid "Cancel" msgstr "Atšaukti" @@ -4700,7 +4700,7 @@ msgstr "Atšaukti" #. Translators: This is part of the subject line of a #. * meeting request or update email. The full subject #. * line would be: "Refresh: Meeting Name". -#: ../calendar/gui/itip-utils.c:852 +#: ../calendar/gui/itip-utils.c:864 msgctxt "Meeting" msgid "Refresh" msgstr "Atnaujinti" @@ -4708,29 +4708,29 @@ msgstr "Atnaujinti" #. Translators: This is part of the subject line of a #. * meeting request or update email. The full subject #. * line would be: "Counter-proposal: Meeting Name". -#: ../calendar/gui/itip-utils.c:859 +#: ../calendar/gui/itip-utils.c:871 msgctxt "Meeting" msgid "Counter-proposal" msgstr "Kontrpasiūlymas" -#: ../calendar/gui/itip-utils.c:937 +#: ../calendar/gui/itip-utils.c:949 #, c-format msgid "Free/Busy information (%s to %s)" msgstr "Užimtumo informacija (nuo %s iki %s)" -#: ../calendar/gui/itip-utils.c:945 +#: ../calendar/gui/itip-utils.c:957 msgid "iCalendar information" msgstr "iCalendar informacija" -#: ../calendar/gui/itip-utils.c:970 +#: ../calendar/gui/itip-utils.c:984 msgid "Unable to book a resource, the new event collides with some other." msgstr "Nepavyko rezervuoti ištekliaus, naujasis įvykis kertasi su kažkuriuo kitu." -#: ../calendar/gui/itip-utils.c:974 +#: ../calendar/gui/itip-utils.c:988 msgid "Unable to book a resource, error: " msgstr "Nepavyko rezervuoti ištekliaus, klaida:" -#: ../calendar/gui/itip-utils.c:1137 +#: ../calendar/gui/itip-utils.c:1153 msgid "You must be an attendee of the event." msgstr "Turite būti įvykio dalyvis." @@ -4986,7 +4986,7 @@ msgstr "Įvykiai ir susitikimai" #: ../calendar/importers/icalendar-importer.c:435 #: ../calendar/importers/icalendar-importer.c:868 -#: ../plugins/itip-formatter/itip-formatter.c:2170 +#: ../plugins/itip-formatter/itip-formatter.c:2171 msgid "Opening calendar" msgstr "Atveriamas kalendorius" @@ -5712,7 +5712,6 @@ msgid "America/Nassau" msgstr "Amerika/Nasau" #: ../calendar/zones.h:157 -#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:1 msgid "America/New_York" msgstr "Amerika/Niujorkas" @@ -6734,7 +6733,7 @@ msgid "Open New Message window" msgstr "Atverti naujo laiško langą" #: ../composer/e-composer-actions.c:311 -#: ../shell/e-shell-window-actions.c:1511 +#: ../shell/e-shell-window-actions.c:1520 msgid "Configure Evolution" msgstr "Konfigūruoti Evolution" @@ -7089,11 +7088,11 @@ msgid "_Try Again" msgstr "_Bandyti dar kartą" #. TRANSLATORS: don't translate the terms in brackets -#: ../capplet/anjal-settings-main.c:154 +#: ../capplet/anjal-settings-main.c:153 msgid "ID of the socket to embed in" msgstr "Lizdo, kuriame įtaisyti, ID" -#: ../capplet/anjal-settings-main.c:155 +#: ../capplet/anjal-settings-main.c:154 msgid "socket" msgstr "lizdas" @@ -7120,8 +7119,8 @@ msgstr "CalDAV" #: ../capplet/settings/mail-account-view.c:361 #: ../capplet/settings/mail-account-view.c:413 -#: ../modules/online-accounts/e-online-accounts-google.c:287 -#: ../modules/online-accounts/e-online-accounts-google.c:359 +#: ../modules/online-accounts/e-online-accounts-google.c:289 +#: ../modules/online-accounts/e-online-accounts-google.c:362 #: ../plugins/google-account-setup/google-contacts-source.c:55 #: ../plugins/google-account-setup/google-source.c:87 msgid "Google" @@ -7197,8 +7196,8 @@ msgid "Time to check things over before we try and connect to the server and fet msgstr "Metas patikrinti parametrus prieš bandymą jungtis prie serverio ir atsiųsti jūsų paštą." #: ../capplet/settings/mail-account-view.c:630 -#: ../mail/em-account-editor.c:2290 -#: ../mail/em-account-editor.c:2426 +#: ../mail/em-account-editor.c:2288 +#: ../mail/em-account-editor.c:2424 msgid "Identity" msgstr "Tapatybė" @@ -7250,7 +7249,7 @@ msgid "Back - Receiving options" msgstr "Atgal – Gavimo parinktys" #: ../capplet/settings/mail-account-view.c:635 -#: ../mail/em-account-editor.c:3378 +#: ../mail/em-account-editor.c:3376 msgid "Defaults" msgstr "Numatytieji" @@ -7315,14 +7314,14 @@ msgstr "Užverti kortelę" msgid "Account Wizard" msgstr "Paskyrų vediklis" -#: ../capplet/settings/mail-capplet-shell.c:215 +#: ../capplet/settings/mail-capplet-shell.c:214 msgid "Evolution account assistant" msgstr "Evolution paskyrų vediklis" #. create the local source group -#: ../capplet/settings/mail-capplet-shell.c:377 -#: ../mail/e-mail-local.c:81 -#: ../mail/e-mail-migrate.c:748 +#: ../capplet/settings/mail-capplet-shell.c:376 +#: ../mail/e-mail-local.c:75 +#: ../mail/e-mail-migrate.c:753 #: ../mail/em-folder-tree-model.c:167 #: ../modules/addressbook/e-book-shell-backend.c:100 #: ../modules/addressbook/e-book-shell-migrate.c:136 @@ -7334,11 +7333,11 @@ msgstr "Evolution paskyrų vediklis" #: ../modules/calendar/e-task-shell-migrate.c:121 #: ../widgets/misc/e-account-tree-view.c:99 #: ../widgets/misc/e-account-tree-view.c:291 -#: ../widgets/misc/e-account-tree-view.c:922 -#: ../widgets/misc/e-account-tree-view.c:980 -#: ../widgets/misc/e-account-tree-view.c:1053 -#: ../widgets/misc/e-account-tree-view.c:1130 -#: ../widgets/misc/e-account-tree-view.c:1359 +#: ../widgets/misc/e-account-tree-view.c:925 +#: ../widgets/misc/e-account-tree-view.c:983 +#: ../widgets/misc/e-account-tree-view.c:1056 +#: ../widgets/misc/e-account-tree-view.c:1133 +#: ../widgets/misc/e-account-tree-view.c:1362 msgid "On This Computer" msgstr "Šiame kompiuteryje" @@ -7668,12 +7667,12 @@ msgstr "Nepavyko atverti nuorodos." msgid "Could not display help for Evolution." msgstr "Nepavyko parodyti Evolution žinyno." -#: ../e-util/gconf-bridge.c:1332 +#: ../e-util/gconf-bridge.c:1333 #, c-format msgid "GConf error: %s" msgstr "GConf klaida: %s" -#: ../e-util/gconf-bridge.c:1343 +#: ../e-util/gconf-bridge.c:1344 msgid "All further errors shown only on terminal." msgstr "Visos kitos klaidos rodomos tik terminale." @@ -8143,20 +8142,20 @@ msgctxt "mail-receiving" msgid "None" msgstr "Nėra" -#: ../mail/em-account-editor.c:2233 +#: ../mail/em-account-editor.c:2231 msgid "Fil_e:" msgstr "_Failas:" -#: ../mail/em-account-editor.c:2233 +#: ../mail/em-account-editor.c:2231 #: ../mail/mail-config.ui.h:158 msgid "_Path:" msgstr "_Kelias:" -#: ../mail/em-account-editor.c:2287 +#: ../mail/em-account-editor.c:2285 msgid "Mail Configuration" msgstr "Pašto nustatymai" -#: ../mail/em-account-editor.c:2288 +#: ../mail/em-account-editor.c:2286 msgid "" "Welcome to the Evolution Mail Configuration Assistant.\n" "\n" @@ -8166,34 +8165,34 @@ msgstr "" "\n" "Norėdami pradėti, spustelėkite mygtuką „Tęsti“. " -#: ../mail/em-account-editor.c:2291 +#: ../mail/em-account-editor.c:2289 msgid "Please enter your name and email address below. The \"optional\" fields below do not need to be filled in, unless you wish to include this information in email you send." msgstr "Žemiau įveskite savo vardą ir elektroninio pašto adresą. „Nebūtini“ laukai gali likti tušti, nebent pageidaujate įtraukti šią informaciją išsiunčiamame laiške." -#: ../mail/em-account-editor.c:2293 -#: ../mail/em-account-editor.c:2485 +#: ../mail/em-account-editor.c:2291 +#: ../mail/em-account-editor.c:2483 msgid "Receiving Email" msgstr "Pašto gavimas" -#: ../mail/em-account-editor.c:2294 +#: ../mail/em-account-editor.c:2292 msgid "Please configure the following account settings." msgstr "Nurodykite šiuos paskyros parametrus." -#: ../mail/em-account-editor.c:2296 -#: ../mail/em-account-editor.c:3082 +#: ../mail/em-account-editor.c:2294 +#: ../mail/em-account-editor.c:3080 msgid "Sending Email" msgstr "Pašto siuntimas" -#: ../mail/em-account-editor.c:2297 +#: ../mail/em-account-editor.c:2295 msgid "Please enter information about the way you will send mail. If you are not sure, ask your system administrator or Internet Service Provider." msgstr "Žemiau įveskite informaciją apie išsiunčiamo pašto serverį. Jei gerai nežinote, paklauskite savo sistemos administratoriaus arba interneto paslaugų tiekėjo." -#: ../mail/em-account-editor.c:2299 +#: ../mail/em-account-editor.c:2297 #: ../mail/mail-config.ui.h:1 msgid "Account Information" msgstr "Paskyros informacija" -#: ../mail/em-account-editor.c:2300 +#: ../mail/em-account-editor.c:2298 msgid "" "Please enter a descriptive name for this account below.\n" "This name will be used for display purposes only." @@ -8201,11 +8200,11 @@ msgstr "" "Žemiau įveskite šią paskyrą apibūdinantį pavadinimą.\n" "Jis naudojamas tik rodymo tikslais." -#: ../mail/em-account-editor.c:2304 +#: ../mail/em-account-editor.c:2302 msgid "Done" msgstr "Baigta" -#: ../mail/em-account-editor.c:2305 +#: ../mail/em-account-editor.c:2303 msgid "" "Congratulations, your mail configuration is complete.\n" "\n" @@ -8219,28 +8218,28 @@ msgstr "" "\n" "Norėdami išsaugoti savo parametrus, spustelėkite mygtuką „Pritaikyti“." -#: ../mail/em-account-editor.c:2844 +#: ../mail/em-account-editor.c:2842 msgid "Check for _new messages every" msgstr "Automatiškai ieškoti _naujo pašto kas" -#: ../mail/em-account-editor.c:2852 +#: ../mail/em-account-editor.c:2850 msgid "minu_tes" msgstr "_min." -#: ../mail/em-account-editor.c:3521 +#: ../mail/em-account-editor.c:3519 #: ../mail/mail-config.ui.h:102 msgid "Security" msgstr "Saugumas" #. Most sections for this is auto-generated from the camel config #. Most sections for this is auto-generated fromt the camel config -#: ../mail/em-account-editor.c:3576 -#: ../mail/em-account-editor.c:3659 +#: ../mail/em-account-editor.c:3574 +#: ../mail/em-account-editor.c:3657 msgid "Receiving Options" msgstr "Gavimo parinktys" -#: ../mail/em-account-editor.c:3577 -#: ../mail/em-account-editor.c:3660 +#: ../mail/em-account-editor.c:3575 +#: ../mail/em-account-editor.c:3658 msgid "Checking for New Messages" msgstr "Tikrinama, ar yra naujų laiškų" @@ -8268,9 +8267,9 @@ msgid "List View" msgstr "Sąrašo rodinys" #: ../mail/e-mail-browser.c:134 -#: ../shell/e-shell-window-actions.c:1427 -#: ../shell/e-shell-window-actions.c:1434 -#: ../shell/e-shell-window-actions.c:1441 +#: ../shell/e-shell-window-actions.c:1436 +#: ../shell/e-shell-window-actions.c:1443 +#: ../shell/e-shell-window-actions.c:1450 msgid "Close this window" msgstr "Uždaryti šį langą" @@ -8390,7 +8389,7 @@ msgid "_Later" msgstr "_Vėliau" #: ../mail/e-mail-label-manager.c:165 -#: ../modules/mail/e-mail-shell-view-actions.c:677 +#: ../modules/mail/e-mail-shell-view-actions.c:681 msgid "Add Label" msgstr "Pridėti žymę" @@ -8421,32 +8420,32 @@ msgstr "Vardas" #: ../mail/e-mail-local.c:41 #: ../mail/em-folder-properties.c:312 -#: ../mail/em-folder-tree-model.c:916 +#: ../mail/em-folder-tree-model.c:918 #: ../modules/mail/e-mail-shell-view-private.c:1066 #: ../modules/mail/e-mail-shell-view-private.c:1077 msgid "Inbox" msgstr "Gauti laiškai" #: ../mail/e-mail-local.c:42 -#: ../mail/em-folder-tree-model.c:909 +#: ../mail/em-folder-tree-model.c:911 #: ../modules/mail/e-mail-shell-view-private.c:1064 msgid "Drafts" msgstr "Juodraščiai" #: ../mail/e-mail-local.c:43 -#: ../mail/em-folder-tree-model.c:920 +#: ../mail/em-folder-tree-model.c:922 #: ../modules/mail/e-mail-shell-view-private.c:1068 msgid "Outbox" msgstr "Paruošti siųsti" #: ../mail/e-mail-local.c:44 -#: ../mail/em-folder-tree-model.c:924 +#: ../mail/em-folder-tree-model.c:926 #: ../modules/mail/e-mail-shell-view-private.c:1070 msgid "Sent" msgstr "Išsiųsti" #: ../mail/e-mail-local.c:45 -#: ../mail/em-folder-tree-model.c:912 +#: ../mail/em-folder-tree-model.c:914 #: ../modules/mail/e-mail-shell-view-private.c:1072 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:2 #: ../plugins/templates/templates.c:1034 @@ -8468,11 +8467,11 @@ msgstr "Perkėlimas" msgid "Migrating '%s':" msgstr "Perkeliama „%s“:" -#: ../mail/e-mail-migrate.c:726 +#: ../mail/e-mail-migrate.c:729 msgid "Migrating Folders" msgstr "Perkeliami aplankai" -#: ../mail/e-mail-migrate.c:727 +#: ../mail/e-mail-migrate.c:730 msgid "" "The summary format of the Evolution mailbox folders has been moved to SQLite since Evolution 2.24.\n" "\n" @@ -8482,7 +8481,7 @@ msgstr "" "\n" "Luktelėkite, kol Evolution perkels jūsų aplankus..." -#: ../mail/e-mail-migrate.c:1523 +#: ../mail/e-mail-migrate.c:1525 #, c-format msgid "Unable to create local mail folders at '%s': %s" msgstr "Nepavyko sukurti vietinių pašto aplankų vietoje „%s“: %s" @@ -8491,636 +8490,636 @@ msgstr "Nepavyko sukurti vietinių pašto aplankų vietoje „%s“: %s" msgid "Please select a folder" msgstr "Pasirinkite aplanką" -#: ../mail/e-mail-reader.c:308 +#: ../mail/e-mail-reader.c:309 #: ../mail/em-filter-i18n.h:11 msgid "Copy to Folder" msgstr "Kopijuoti į aplanką" -#: ../mail/e-mail-reader.c:308 +#: ../mail/e-mail-reader.c:309 #: ../mail/em-folder-utils.c:487 msgid "C_opy" msgstr "K_opijuoti" -#: ../mail/e-mail-reader.c:823 +#: ../mail/e-mail-reader.c:824 #: ../mail/em-filter-i18n.h:51 msgid "Move to Folder" msgstr "Perkelti į aplanką" -#: ../mail/e-mail-reader.c:823 +#: ../mail/e-mail-reader.c:824 #: ../mail/em-folder-utils.c:487 msgid "_Move" msgstr "_Perkelti" -#: ../mail/e-mail-reader.c:1184 -#: ../mail/e-mail-reader.c:1372 -#: ../mail/e-mail-reader.c:1412 +#: ../mail/e-mail-reader.c:1185 +#: ../mail/e-mail-reader.c:1373 +#: ../mail/e-mail-reader.c:1413 msgid "_Do not ask me again." msgstr "_Daugiau nebeklausti." -#: ../mail/e-mail-reader.c:1418 +#: ../mail/e-mail-reader.c:1419 msgid "_Always ignore Reply-To: for mailing lists." msgstr "_Nepaisyti atgalinio adreso laukelio rašant į pašto konferencijas." -#: ../mail/e-mail-reader.c:1784 +#: ../mail/e-mail-reader.c:1785 msgid "A_dd Sender to Address Book" msgstr "Į_traukti siuntėją į adresų knygą" -#: ../mail/e-mail-reader.c:1786 +#: ../mail/e-mail-reader.c:1787 msgid "Add sender to address book" msgstr "Įtraukti siuntėją į adresų knygą" -#: ../mail/e-mail-reader.c:1791 +#: ../mail/e-mail-reader.c:1792 msgid "Check for _Junk" msgstr "Filtruoti bru_kalą" -#: ../mail/e-mail-reader.c:1793 +#: ../mail/e-mail-reader.c:1794 msgid "Filter the selected messages for junk status" msgstr "Filtruoti pažymėtas žinutes norint nustatyti brukalo statusą" -#: ../mail/e-mail-reader.c:1798 +#: ../mail/e-mail-reader.c:1799 msgid "_Copy to Folder..." msgstr "K_opijuoti į aplanką..." -#: ../mail/e-mail-reader.c:1800 +#: ../mail/e-mail-reader.c:1801 msgid "Copy selected messages to another folder" msgstr "Kopijuoti pažymėtus laiškus į kitą aplanką" -#: ../mail/e-mail-reader.c:1805 +#: ../mail/e-mail-reader.c:1806 msgid "_Delete Message" msgstr "_Ištrinti laišką" -#: ../mail/e-mail-reader.c:1807 +#: ../mail/e-mail-reader.c:1808 msgid "Mark the selected messages for deletion" msgstr "Pasirinktus laiškus pažymėti ištrynimui" -#: ../mail/e-mail-reader.c:1812 +#: ../mail/e-mail-reader.c:1813 msgid "Filter on Mailing _List..." msgstr "Filtruoti pagal _konferenciją..." -#: ../mail/e-mail-reader.c:1814 +#: ../mail/e-mail-reader.c:1815 msgid "Create a rule to filter messages to this mailing list" msgstr "Sukurti taisyklę filtruoti laiškams šiai konferencijai" -#: ../mail/e-mail-reader.c:1819 +#: ../mail/e-mail-reader.c:1820 msgid "Filter on _Recipients..." msgstr "Filtruoti pagal _gavėjus..." -#: ../mail/e-mail-reader.c:1821 +#: ../mail/e-mail-reader.c:1822 msgid "Create a rule to filter messages to these recipients" msgstr "Sukurti taisyklę filtruoti laiškams šiems gavėjams" -#: ../mail/e-mail-reader.c:1826 +#: ../mail/e-mail-reader.c:1827 msgid "Filter on Se_nder..." msgstr "Filtruoti pagal siu_ntėją..." -#: ../mail/e-mail-reader.c:1828 +#: ../mail/e-mail-reader.c:1829 msgid "Create a rule to filter messages from this sender" msgstr "Sukurti taisyklę filtruoti laiškams nuo šio siuntėjo" -#: ../mail/e-mail-reader.c:1833 +#: ../mail/e-mail-reader.c:1834 msgid "Filter on _Subject..." msgstr "Filtruoti pagal _temą..." -#: ../mail/e-mail-reader.c:1835 +#: ../mail/e-mail-reader.c:1836 msgid "Create a rule to filter messages with this subject" msgstr "Sukurti taisyklę filtruoti laiškams su šia tema" -#: ../mail/e-mail-reader.c:1840 +#: ../mail/e-mail-reader.c:1841 msgid "A_pply Filters" msgstr "_Pritaikyti filtrus" -#: ../mail/e-mail-reader.c:1842 +#: ../mail/e-mail-reader.c:1843 msgid "Apply filter rules to the selected messages" msgstr "Pritaikyti filtrų taisykles pažymėtiems laiškams" -#: ../mail/e-mail-reader.c:1847 +#: ../mail/e-mail-reader.c:1848 msgid "_Find in Message..." msgstr "_Rasti laiške..." -#: ../mail/e-mail-reader.c:1849 +#: ../mail/e-mail-reader.c:1850 msgid "Search for text in the body of the displayed message" msgstr "Ieškoti eilutės rodomo laiško tekste" -#: ../mail/e-mail-reader.c:1854 +#: ../mail/e-mail-reader.c:1855 msgid "_Clear Flag" msgstr "_Pašalinti žymę" -#: ../mail/e-mail-reader.c:1856 +#: ../mail/e-mail-reader.c:1857 msgid "Remove the follow-up flag from the selected messages" msgstr "Pašalinti nuo pasirinktų laiškų žymę „tęsiniui“" -#: ../mail/e-mail-reader.c:1861 +#: ../mail/e-mail-reader.c:1862 msgid "_Flag Completed" msgstr "Pažymėti bai_gtu" -#: ../mail/e-mail-reader.c:1863 +#: ../mail/e-mail-reader.c:1864 msgid "Set the follow-up flag to completed on the selected messages" msgstr "Pažymėti pasirinktus laiškus tęsiniui kaip baigtus" -#: ../mail/e-mail-reader.c:1868 +#: ../mail/e-mail-reader.c:1869 msgid "Follow _Up..." msgstr "_Tęsinys..." -#: ../mail/e-mail-reader.c:1870 +#: ../mail/e-mail-reader.c:1871 msgid "Flag the selected messages for follow-up" msgstr "Pažymėti pasirinktus laiškus tęsiniui" -#: ../mail/e-mail-reader.c:1875 +#: ../mail/e-mail-reader.c:1876 msgid "_Attached" msgstr "_Prisegta" -#: ../mail/e-mail-reader.c:1877 -#: ../mail/e-mail-reader.c:1884 +#: ../mail/e-mail-reader.c:1878 +#: ../mail/e-mail-reader.c:1885 msgid "Forward the selected message to someone as an attachment" msgstr "Persiųsti pasirinktą laišką prisegtą kaip priedas" -#: ../mail/e-mail-reader.c:1882 +#: ../mail/e-mail-reader.c:1883 msgid "Forward As _Attached" msgstr "_Persiųsti kaip prisegtą" -#: ../mail/e-mail-reader.c:1889 +#: ../mail/e-mail-reader.c:1890 msgid "_Inline" msgstr "_Viduje" -#: ../mail/e-mail-reader.c:1891 -#: ../mail/e-mail-reader.c:1898 +#: ../mail/e-mail-reader.c:1892 +#: ../mail/e-mail-reader.c:1899 msgid "Forward the selected message in the body of a new message" msgstr "Persiųsti pasirinktą laišką naujo laiško tekste" -#: ../mail/e-mail-reader.c:1896 +#: ../mail/e-mail-reader.c:1897 msgid "Forward As _Inline" msgstr "Persiųsti kaip į_terptą" -#: ../mail/e-mail-reader.c:1903 +#: ../mail/e-mail-reader.c:1904 msgid "_Quoted" msgstr "_Cituojant" -#: ../mail/e-mail-reader.c:1905 -#: ../mail/e-mail-reader.c:1912 +#: ../mail/e-mail-reader.c:1906 +#: ../mail/e-mail-reader.c:1913 msgid "Forward the selected message quoted like a reply" msgstr "Persiųsti pasirinktą laišką cituojamą kaip atsakymas" -#: ../mail/e-mail-reader.c:1910 +#: ../mail/e-mail-reader.c:1911 msgid "Forward As _Quoted" msgstr "Persiųsti kaip _cituojamą" -#: ../mail/e-mail-reader.c:1917 +#: ../mail/e-mail-reader.c:1918 msgid "_Load Images" msgstr "Į_kelti paveikslėlius" -#: ../mail/e-mail-reader.c:1919 +#: ../mail/e-mail-reader.c:1920 msgid "Force images in HTML mail to be loaded" msgstr "Priverstinai įkelti HTML laiškuose esančius paveiksliukus" -#: ../mail/e-mail-reader.c:1924 +#: ../mail/e-mail-reader.c:1925 msgid "_Important" msgstr "_Svarbus" -#: ../mail/e-mail-reader.c:1926 +#: ../mail/e-mail-reader.c:1927 msgid "Mark the selected messages as important" msgstr "Pažymėti pasirinktus laiškus kaip svarbius" -#: ../mail/e-mail-reader.c:1931 +#: ../mail/e-mail-reader.c:1932 msgid "_Junk" msgstr "Šl_amštas" -#: ../mail/e-mail-reader.c:1933 +#: ../mail/e-mail-reader.c:1934 msgid "Mark the selected messages as junk" msgstr "Pažymėti pasirinktus laiškus kaip brukalą" -#: ../mail/e-mail-reader.c:1938 +#: ../mail/e-mail-reader.c:1939 msgid "_Not Junk" msgstr "_Ne brukalas" -#: ../mail/e-mail-reader.c:1940 +#: ../mail/e-mail-reader.c:1941 msgid "Mark the selected messages as not being junk" msgstr "Pažymėti pasirinktus laiškus kaip ne brukalą" -#: ../mail/e-mail-reader.c:1945 +#: ../mail/e-mail-reader.c:1946 msgid "_Read" msgstr "_Skaityti" -#: ../mail/e-mail-reader.c:1947 +#: ../mail/e-mail-reader.c:1948 msgid "Mark the selected messages as having been read" msgstr "Pažymėti pasirinktus laiškus kaip perskaitytus" -#: ../mail/e-mail-reader.c:1952 +#: ../mail/e-mail-reader.c:1953 msgid "Uni_mportant" msgstr "_Nesvarbus" -#: ../mail/e-mail-reader.c:1954 +#: ../mail/e-mail-reader.c:1955 msgid "Mark the selected messages as unimportant" msgstr "Pažymėti pasirinktus laiškus kaip nesvarbius" -#: ../mail/e-mail-reader.c:1959 +#: ../mail/e-mail-reader.c:1960 msgid "_Unread" msgstr "_Neskaitytas" -#: ../mail/e-mail-reader.c:1961 +#: ../mail/e-mail-reader.c:1962 msgid "Mark the selected messages as not having been read" msgstr "Pažymėti pasirinktus laiškus kaip neskaitytus" -#: ../mail/e-mail-reader.c:1966 +#: ../mail/e-mail-reader.c:1967 msgid "_Edit as New Message..." msgstr "_Redaguoti kaip naują laišką..." -#: ../mail/e-mail-reader.c:1968 +#: ../mail/e-mail-reader.c:1969 msgid "Open the selected messages in the composer for editing" msgstr "Atverti pasirinktus laiškus redaktoriuje redagavimui" -#: ../mail/e-mail-reader.c:1973 +#: ../mail/e-mail-reader.c:1974 msgid "Compose _New Message" msgstr "Sukurti _naują laišką" -#: ../mail/e-mail-reader.c:1975 +#: ../mail/e-mail-reader.c:1976 msgid "Open a window for composing a mail message" msgstr "Atverti langą rašyti naujam laiškui" -#: ../mail/e-mail-reader.c:1980 +#: ../mail/e-mail-reader.c:1981 msgid "_Open in New Window" msgstr "_Atverti naujame lange" -#: ../mail/e-mail-reader.c:1982 +#: ../mail/e-mail-reader.c:1983 msgid "Open the selected messages in a new window" msgstr "Atverti pasirinktus laiškus naujame lange" -#: ../mail/e-mail-reader.c:1987 +#: ../mail/e-mail-reader.c:1988 msgid "_Move to Folder..." msgstr "Pe_rkelti į aplanką..." -#: ../mail/e-mail-reader.c:1989 +#: ../mail/e-mail-reader.c:1990 msgid "Move selected messages to another folder" msgstr "Perkelti pažymėtus laiškus į kitą aplanką" -#: ../mail/e-mail-reader.c:1994 +#: ../mail/e-mail-reader.c:1995 msgid "_Switch to Folder" msgstr "_Perjungti į aplanką" -#: ../mail/e-mail-reader.c:1996 +#: ../mail/e-mail-reader.c:1997 msgid "Display the parent folder" msgstr "Rodyti aukštesnįjį aplanką" -#: ../mail/e-mail-reader.c:2001 +#: ../mail/e-mail-reader.c:2002 msgid "Switch to _next tab" msgstr "Perjungti į _kitą kortelę" -#: ../mail/e-mail-reader.c:2003 +#: ../mail/e-mail-reader.c:2004 msgid "Switch to the next tab" msgstr "Perjungti į kitą kortelę" -#: ../mail/e-mail-reader.c:2008 +#: ../mail/e-mail-reader.c:2009 msgid "Switch to _previous tab" msgstr "Perjungti į _ankstesnę kortelę" -#: ../mail/e-mail-reader.c:2010 +#: ../mail/e-mail-reader.c:2011 msgid "Switch to the previous tab" msgstr "Perjungti į ankstesnę kortelę" -#: ../mail/e-mail-reader.c:2015 +#: ../mail/e-mail-reader.c:2016 msgid "Cl_ose current tab" msgstr "_Užverti dabartinę kortelę" -#: ../mail/e-mail-reader.c:2017 +#: ../mail/e-mail-reader.c:2018 msgid "Close current tab" msgstr "Užverti dabartinę kortelę" -#: ../mail/e-mail-reader.c:2022 +#: ../mail/e-mail-reader.c:2023 msgid "_Next Message" msgstr "_Kitas laiškas" -#: ../mail/e-mail-reader.c:2024 +#: ../mail/e-mail-reader.c:2025 msgid "Display the next message" msgstr "Parodyti kitą laišką" -#: ../mail/e-mail-reader.c:2029 +#: ../mail/e-mail-reader.c:2030 msgid "Next _Important Message" msgstr "K_itas svarbus laiškas" -#: ../mail/e-mail-reader.c:2031 +#: ../mail/e-mail-reader.c:2032 msgid "Display the next important message" msgstr "Parodyti kitą svarbų laišką" -#: ../mail/e-mail-reader.c:2036 +#: ../mail/e-mail-reader.c:2037 msgid "Next _Thread" msgstr "Kita _gija" -#: ../mail/e-mail-reader.c:2038 +#: ../mail/e-mail-reader.c:2039 msgid "Display the next thread" msgstr "Parodyti kitą giją" -#: ../mail/e-mail-reader.c:2043 +#: ../mail/e-mail-reader.c:2044 msgid "Next _Unread Message" msgstr "Kitas _neskaitytas laiškas" -#: ../mail/e-mail-reader.c:2045 +#: ../mail/e-mail-reader.c:2046 msgid "Display the next unread message" msgstr "Parodyti kitą neskaitytą laišką" -#: ../mail/e-mail-reader.c:2050 +#: ../mail/e-mail-reader.c:2051 msgid "_Previous Message" msgstr "_Ankstesnis laiškas" -#: ../mail/e-mail-reader.c:2052 +#: ../mail/e-mail-reader.c:2053 msgid "Display the previous message" msgstr "Parodyti ankstesnį laišką" -#: ../mail/e-mail-reader.c:2057 +#: ../mail/e-mail-reader.c:2058 msgid "Pr_evious Important Message" msgstr "Ankst_esnis svarbus laiškas" -#: ../mail/e-mail-reader.c:2059 +#: ../mail/e-mail-reader.c:2060 msgid "Display the previous important message" msgstr "Parodyti ankstesnį svarbų laišką" -#: ../mail/e-mail-reader.c:2064 +#: ../mail/e-mail-reader.c:2065 msgid "Previous T_hread" msgstr "_Ankstesnė gija" -#: ../mail/e-mail-reader.c:2066 +#: ../mail/e-mail-reader.c:2067 msgid "Display the previous thread" msgstr "Parodyti ankstesnę giją" -#: ../mail/e-mail-reader.c:2071 +#: ../mail/e-mail-reader.c:2072 msgid "P_revious Unread Message" msgstr "_Ankstesnis neskaitytas laiškas" -#: ../mail/e-mail-reader.c:2073 +#: ../mail/e-mail-reader.c:2074 msgid "Display the previous unread message" msgstr "Parodyti praeitą neskaitytą laišką" -#: ../mail/e-mail-reader.c:2080 +#: ../mail/e-mail-reader.c:2081 msgid "Print this message" msgstr "Spausdinti šį laišką" -#: ../mail/e-mail-reader.c:2087 +#: ../mail/e-mail-reader.c:2088 msgid "Preview the message to be printed" msgstr "Peržiūrėti spausdintiną laišką" -#: ../mail/e-mail-reader.c:2092 +#: ../mail/e-mail-reader.c:2093 msgid "Re_direct" msgstr "Nu_kreipti" -#: ../mail/e-mail-reader.c:2094 +#: ../mail/e-mail-reader.c:2095 msgid "Redirect (bounce) the selected message to someone" msgstr "Nukreipti (permesti) pasirinktą laišką kam nors kitam" -#: ../mail/e-mail-reader.c:2099 +#: ../mail/e-mail-reader.c:2100 msgid "Remo_ve Attachments" msgstr "_Pašalinti priedus" -#: ../mail/e-mail-reader.c:2101 +#: ../mail/e-mail-reader.c:2102 msgid "Remove attachments" msgstr "Pašalinti priedus" -#: ../mail/e-mail-reader.c:2106 +#: ../mail/e-mail-reader.c:2107 msgid "Remove Du_plicate Messages" msgstr "Pašalinti _dublikuotus laiškus" -#: ../mail/e-mail-reader.c:2108 +#: ../mail/e-mail-reader.c:2109 msgid "Checks selected messages for duplicates" msgstr "Patikrina, ar tarp pažymėtų laiškų nėra dublikatų" -#: ../mail/e-mail-reader.c:2113 +#: ../mail/e-mail-reader.c:2114 #: ../mail/mail.error.xml.h:110 #: ../modules/calendar/e-cal-shell-view-actions.c:1510 #: ../modules/mail/e-mail-attachment-handler.c:177 msgid "Reply to _All" msgstr "Atsakyti _visiems" -#: ../mail/e-mail-reader.c:2115 +#: ../mail/e-mail-reader.c:2116 msgid "Compose a reply to all the recipients of the selected message" msgstr "Rašyti atsakymą visiems pasirinkto laiško gavėjams" -#: ../mail/e-mail-reader.c:2120 +#: ../mail/e-mail-reader.c:2121 #: ../mail/mail.error.xml.h:111 msgid "Reply to _List" msgstr "Atsakyti į _konferenciją" -#: ../mail/e-mail-reader.c:2122 +#: ../mail/e-mail-reader.c:2123 msgid "Compose a reply to the mailing list of the selected message" msgstr "Sukurti atsakymą pasirinkto laiško konferencijai" -#: ../mail/e-mail-reader.c:2127 +#: ../mail/e-mail-reader.c:2128 #: ../modules/mail/e-mail-attachment-handler.c:184 msgid "_Reply to Sender" msgstr "_Atsakyti siuntėjui" -#: ../mail/e-mail-reader.c:2129 +#: ../mail/e-mail-reader.c:2130 msgid "Compose a reply to the sender of the selected message" msgstr "Sukurti atsakymą pasirinkto laiško siuntėjui" -#: ../mail/e-mail-reader.c:2134 +#: ../mail/e-mail-reader.c:2135 msgid "_Save as mbox..." msgstr "Į_rašyti kaip mbox..." -#: ../mail/e-mail-reader.c:2136 +#: ../mail/e-mail-reader.c:2137 msgid "Save selected messages as an mbox file" msgstr "Įrašyti pasirinktus laiškus kaip mbox failą" -#: ../mail/e-mail-reader.c:2141 +#: ../mail/e-mail-reader.c:2142 msgid "_Message Source" msgstr "_Laiško pradinis kodas" -#: ../mail/e-mail-reader.c:2143 +#: ../mail/e-mail-reader.c:2144 msgid "Show the raw email source of the message" msgstr "Rodyti neapdorotą laiško šaltinį" -#: ../mail/e-mail-reader.c:2155 +#: ../mail/e-mail-reader.c:2156 msgid "_Undelete Message" msgstr "_Grąžinti laišką" -#: ../mail/e-mail-reader.c:2157 +#: ../mail/e-mail-reader.c:2158 msgid "Undelete the selected messages" msgstr "Sugrąžinti pažymėtus laiškus" -#: ../mail/e-mail-reader.c:2162 +#: ../mail/e-mail-reader.c:2163 msgid "_Normal Size" msgstr "_Normalus dydis" -#: ../mail/e-mail-reader.c:2164 +#: ../mail/e-mail-reader.c:2165 msgid "Reset the text to its original size" msgstr "Atstatyti teksto originalų dydį" -#: ../mail/e-mail-reader.c:2169 +#: ../mail/e-mail-reader.c:2170 msgid "_Zoom In" msgstr "_Pritraukti" -#: ../mail/e-mail-reader.c:2171 +#: ../mail/e-mail-reader.c:2172 msgid "Increase the text size" msgstr "Padidinti teksto dydį" -#: ../mail/e-mail-reader.c:2176 +#: ../mail/e-mail-reader.c:2177 msgid "Zoom _Out" msgstr "_Atitraukti" -#: ../mail/e-mail-reader.c:2178 +#: ../mail/e-mail-reader.c:2179 msgid "Decrease the text size" msgstr "Sumažinti teksto dydį" -#: ../mail/e-mail-reader.c:2185 +#: ../mail/e-mail-reader.c:2186 msgid "Create R_ule" msgstr "Sukurti _taisyklę" -#: ../mail/e-mail-reader.c:2192 +#: ../mail/e-mail-reader.c:2193 msgid "Ch_aracter Encoding" msgstr "_Simbolių koduotė" -#: ../mail/e-mail-reader.c:2199 +#: ../mail/e-mail-reader.c:2200 msgid "F_orward As" msgstr "P_ersiųsti kaip" -#: ../mail/e-mail-reader.c:2206 +#: ../mail/e-mail-reader.c:2207 msgid "_Group Reply" msgstr "_Grupinis atsakymas" -#: ../mail/e-mail-reader.c:2213 +#: ../mail/e-mail-reader.c:2214 msgid "_Go To" msgstr "_Eiti į" -#: ../mail/e-mail-reader.c:2220 +#: ../mail/e-mail-reader.c:2221 msgid "Mar_k As" msgstr "Pažymėti _kaip" -#: ../mail/e-mail-reader.c:2227 +#: ../mail/e-mail-reader.c:2228 msgid "_Message" msgstr "_Laiškas" -#: ../mail/e-mail-reader.c:2234 +#: ../mail/e-mail-reader.c:2235 msgid "_Zoom" msgstr "_Mastelis" -#: ../mail/e-mail-reader.c:2244 +#: ../mail/e-mail-reader.c:2245 msgid "Search Folder from Mailing _List..." msgstr "Paieškos aplankas pagal _konferenciją..." -#: ../mail/e-mail-reader.c:2246 +#: ../mail/e-mail-reader.c:2247 msgid "Create a search folder for this mailing list" msgstr "Sukurti paieškos aplanką šiai konferencijai" -#: ../mail/e-mail-reader.c:2251 +#: ../mail/e-mail-reader.c:2252 msgid "Search Folder from Recipien_ts..." msgstr "Paieškos aplankas pagal _gavėjus..." -#: ../mail/e-mail-reader.c:2253 +#: ../mail/e-mail-reader.c:2254 msgid "Create a search folder for these recipients" msgstr "Sukurti paieškos aplanką šiems gavėjams" -#: ../mail/e-mail-reader.c:2258 +#: ../mail/e-mail-reader.c:2259 msgid "Search Folder from Sen_der..." msgstr "Paieškos aplankas pagal siu_ntėją..." -#: ../mail/e-mail-reader.c:2260 +#: ../mail/e-mail-reader.c:2261 msgid "Create a search folder for this sender" msgstr "Sukurti paieškos aplanką šiam siuntėjui" -#: ../mail/e-mail-reader.c:2265 +#: ../mail/e-mail-reader.c:2266 msgid "Search Folder from S_ubject..." msgstr "Paieškos aplankas pagal _temą..." -#: ../mail/e-mail-reader.c:2267 +#: ../mail/e-mail-reader.c:2268 msgid "Create a search folder for this subject" msgstr "Sukurti paieškos aplanką šiai temai" -#: ../mail/e-mail-reader.c:2290 +#: ../mail/e-mail-reader.c:2291 msgid "Mark for Follo_w Up..." msgstr "Pažymėti _tęsiniui..." -#: ../mail/e-mail-reader.c:2298 +#: ../mail/e-mail-reader.c:2299 msgid "Mark as _Important" msgstr "Pažymėti svarb_iu" -#: ../mail/e-mail-reader.c:2302 +#: ../mail/e-mail-reader.c:2303 msgid "Mark as _Junk" msgstr "Pažymėti kaip b_rukalą" -#: ../mail/e-mail-reader.c:2306 +#: ../mail/e-mail-reader.c:2307 msgid "Mark as _Not Junk" msgstr "Pažymėti kaip _ne brukalą" -#: ../mail/e-mail-reader.c:2310 +#: ../mail/e-mail-reader.c:2311 msgid "Mar_k as Read" msgstr "Pažymėti s_kaitytu" -#: ../mail/e-mail-reader.c:2314 +#: ../mail/e-mail-reader.c:2315 msgid "Mark as Uni_mportant" msgstr "Pažymėti kaip nes_varbų" -#: ../mail/e-mail-reader.c:2318 +#: ../mail/e-mail-reader.c:2319 msgid "Mark as _Unread" msgstr "Pažymėti nes_kaitytu" -#: ../mail/e-mail-reader.c:2362 +#: ../mail/e-mail-reader.c:2363 msgid "_Caret Mode" msgstr "Ž_ymiklio veiksena" -#: ../mail/e-mail-reader.c:2364 +#: ../mail/e-mail-reader.c:2365 msgid "Show a blinking cursor in the body of displayed messages" msgstr "Rodyti mirksintį žymeklį išvedamų laiškų tekste" -#: ../mail/e-mail-reader.c:2370 +#: ../mail/e-mail-reader.c:2371 msgid "All Message _Headers" msgstr "Visos laiško _antraštės" -#: ../mail/e-mail-reader.c:2372 +#: ../mail/e-mail-reader.c:2373 msgid "Show messages with all email headers" msgstr "Rodyti laiškus su visomis pašto antraštėmis" -#: ../mail/e-mail-reader.c:2668 +#: ../mail/e-mail-reader.c:2699 #, c-format msgid "Retrieving message '%s'" msgstr "Atsiunčiamas laiškas „%s“" #. we changed user, thus reset the chosen calendar combo too, because #. * other user means other calendars subscribed -#: ../mail/e-mail-reader.c:3255 +#: ../mail/e-mail-reader.c:3302 #: ../mail/mail-config.ui.h:32 #: ../plugins/google-account-setup/google-source.c:316 -#: ../plugins/google-account-setup/google-source.c:565 -#: ../plugins/google-account-setup/google-source.c:704 -#: ../widgets/misc/e-account-tree-view.c:414 +#: ../plugins/google-account-setup/google-source.c:558 +#: ../plugins/google-account-setup/google-source.c:695 +#: ../widgets/misc/e-account-tree-view.c:417 msgid "Default" msgstr "Numatytasis" -#: ../mail/e-mail-reader.c:3424 +#: ../mail/e-mail-reader.c:3471 #: ../modules/mail/e-mail-attachment-handler.c:170 msgid "_Forward" msgstr "P_ersiųsti" -#: ../mail/e-mail-reader.c:3425 +#: ../mail/e-mail-reader.c:3472 msgid "Forward the selected message to someone" msgstr "Persiųsti pasirinktą laišką kažkam" -#: ../mail/e-mail-reader.c:3444 +#: ../mail/e-mail-reader.c:3491 msgid "Group Reply" msgstr "Grupinis atsakymas" -#: ../mail/e-mail-reader.c:3445 +#: ../mail/e-mail-reader.c:3492 msgid "Reply to the mailing list, or to all recipients" msgstr "Atsakyti į pašto konferenciją arba visiems gavėjams" -#: ../mail/e-mail-reader.c:3498 +#: ../mail/e-mail-reader.c:3545 #: ../mail/em-filter-i18n.h:14 msgid "Delete" msgstr "Ištrinti" -#: ../mail/e-mail-reader.c:3531 +#: ../mail/e-mail-reader.c:3578 #: ../modules/calendar/e-cal-shell-view-actions.c:1356 #: ../widgets/misc/e-calendar.c:202 msgid "Next" msgstr "Kitas" -#: ../mail/e-mail-reader.c:3535 +#: ../mail/e-mail-reader.c:3582 #: ../modules/calendar/e-cal-shell-view-actions.c:1349 #: ../widgets/misc/e-calendar.c:178 msgid "Previous" msgstr "Praeitas" -#: ../mail/e-mail-reader.c:3544 +#: ../mail/e-mail-reader.c:3591 #: ../mail/mail-dialogs.ui.h:17 msgid "Reply" msgstr "Atsakyti" -#: ../mail/e-mail-reader.c:4214 +#: ../mail/e-mail-reader.c:4265 #, c-format msgid "Folder '%s'" msgstr "Aplankas „%s“" @@ -9158,54 +9157,64 @@ msgstr[0] "Laiškas" msgstr[1] "Laiškai" msgstr[2] "Laiškai" -#: ../mail/e-mail-session.c:798 +#: ../mail/e-mail-session.c:833 #, c-format msgid "Enter Passphrase for %s" msgstr "Įveskite %s slaptažodį" -#: ../mail/e-mail-session.c:802 +#: ../mail/e-mail-session.c:837 msgid "Enter Passphrase" msgstr "Įveskite slaptažodį" -#: ../mail/e-mail-session.c:806 +#: ../mail/e-mail-session.c:841 #, c-format msgid "Enter Password for %s" msgstr "Įveskite %s slaptažodį" -#: ../mail/e-mail-session.c:810 +#: ../mail/e-mail-session.c:845 msgid "Enter Password" msgstr "Įveskite slaptažodį" -#: ../mail/e-mail-session.c:861 +#: ../mail/e-mail-session.c:896 #, c-format msgid "User canceled operation." msgstr "Naudotojas nutraukė operaciją." -#: ../mail/e-mail-session.c:974 +#: ../mail/e-mail-session.c:1009 #, c-format msgid "No destination address provided, forward of the message has been cancelled." msgstr "Nenurodytas paskirties adresas, laiško persiuntimas buvo atšauktas." -#: ../mail/e-mail-session.c:983 +#: ../mail/e-mail-session.c:1018 #, c-format msgid "No account found to use, forward of the message has been cancelled." msgstr "Nerasta naudotina paskyra, laiško persiuntimas buvo atšauktas." +#: ../mail/e-mail-session.c:1169 +#, c-format +msgid "%s authentication failed" +msgstr "%s tapatybės nustatyti nepavyko" + +#: ../mail/e-mail-session.c:1243 +#, c-format +msgid "No password was provided" +msgstr "Nenurodytas slaptažodis" + #: ../mail/e-mail-session-utils.c:415 #, c-format msgid "Cannot get transport for account '%s'" msgstr "Nepavyko gauti transporto paskyrai „%s“" #: ../mail/e-mail-session-utils.c:500 -#: ../mail/mail-ops.c:638 +#: ../mail/mail-ops.c:642 #, c-format msgid "Failed to apply outgoing filters: %s" msgstr "Nepavyko pritaikyti išsiuntimo filtrų: %s" #: ../mail/e-mail-session-utils.c:524 #: ../mail/e-mail-session-utils.c:558 -#: ../mail/mail-ops.c:657 -#: ../mail/mail-ops.c:691 +#: ../mail/mail-ops.c:661 +#: ../mail/mail-ops.c:695 #, c-format msgid "" "Failed to append to %s: %s\n" @@ -9215,14 +9224,14 @@ msgstr "" "Vietoj to įrašoma vietiniame aplanke „Išsiųsti“." #: ../mail/e-mail-session-utils.c:578 -#: ../mail/mail-ops.c:711 +#: ../mail/mail-ops.c:715 #, c-format msgid "Failed to append to local 'Sent' folder: %s" msgstr "Nepavyko įrašyti į vietinį aplanką „Išsiųsti“: %s" #: ../mail/e-mail-session-utils.c:788 -#: ../mail/mail-ops.c:832 -#: ../mail/mail-ops.c:928 +#: ../mail/mail-ops.c:836 +#: ../mail/mail-ops.c:932 msgid "Sending message" msgstr "Siunčiamas laiškas" @@ -9274,15 +9283,15 @@ msgstr "Jūsų %3$s rašytas laiškas adresatui %1$s tema „%2$s“ buvo perska msgid "Delivery Notification for: \"%s\"" msgstr "Pristatymo pranešimas: „%s“" -#: ../mail/em-composer-utils.c:2600 +#: ../mail/em-composer-utils.c:2602 msgid "an unknown sender" msgstr "nežinomas siuntėjas" -#: ../mail/em-composer-utils.c:3006 +#: ../mail/em-composer-utils.c:3008 msgid "Posting destination" msgstr "Paskirties vieta" -#: ../mail/em-composer-utils.c:3007 +#: ../mail/em-composer-utils.c:3009 msgid "Choose folders to post the message to." msgstr "Pasirinkite aplanką, kuriame bus paskelbtas laiškas." @@ -9586,59 +9595,59 @@ msgstr "Suku_rti" msgid "Folder _name:" msgstr "Aplanko _vardas:" -#: ../mail/em-folder-tree.c:647 +#: ../mail/em-folder-tree.c:648 msgid "Folder names cannot contain '/'" msgstr "Aplanko varde negali būti simbolio „/“" -#: ../mail/em-folder-tree.c:768 +#: ../mail/em-folder-tree.c:773 #, c-format msgctxt "folder-display" msgid "%s (%u%s)" msgstr "%s (%u%s)" -#: ../mail/em-folder-tree.c:1590 +#: ../mail/em-folder-tree.c:1595 msgid "Mail Folder Tree" msgstr "Pašto aplankų medis" -#: ../mail/em-folder-tree.c:2067 +#: ../mail/em-folder-tree.c:2093 #: ../mail/em-folder-utils.c:115 #, c-format msgid "Moving folder %s" msgstr "Perkeliamas aplankas %s" -#: ../mail/em-folder-tree.c:2070 +#: ../mail/em-folder-tree.c:2096 #: ../mail/em-folder-utils.c:117 #, c-format msgid "Copying folder %s" msgstr "Kopijuojamas aplankas %s" -#: ../mail/em-folder-tree.c:2077 +#: ../mail/em-folder-tree.c:2103 #: ../mail/message-list.c:2303 #, c-format msgid "Moving messages into folder %s" msgstr "Laiškai perkeliami į aplanką %s" -#: ../mail/em-folder-tree.c:2081 +#: ../mail/em-folder-tree.c:2107 #: ../mail/message-list.c:2305 #, c-format msgid "Copying messages into folder %s" msgstr "Laiškai kopijuojami į aplanką %s" -#: ../mail/em-folder-tree.c:2100 +#: ../mail/em-folder-tree.c:2126 #, c-format msgid "Cannot drop message(s) into toplevel store" msgstr "Nepavyko perkelti žinutės(čių) į aukščiausią aukštą" #: ../mail/em-folder-tree-model.c:168 -#: ../mail/mail-vfolder.c:1125 -#: ../mail/mail-vfolder.c:1239 +#: ../mail/mail-vfolder.c:1122 +#: ../mail/mail-vfolder.c:1234 #: ../widgets/misc/e-account-tree-view.c:100 #: ../widgets/misc/e-account-tree-view.c:301 -#: ../widgets/misc/e-account-tree-view.c:924 -#: ../widgets/misc/e-account-tree-view.c:983 -#: ../widgets/misc/e-account-tree-view.c:1055 -#: ../widgets/misc/e-account-tree-view.c:1132 -#: ../widgets/misc/e-account-tree-view.c:1387 +#: ../widgets/misc/e-account-tree-view.c:927 +#: ../widgets/misc/e-account-tree-view.c:986 +#: ../widgets/misc/e-account-tree-view.c:1058 +#: ../widgets/misc/e-account-tree-view.c:1135 +#: ../widgets/misc/e-account-tree-view.c:1390 msgid "Search Folders" msgstr "Paieškos aplankai" @@ -9648,8 +9657,8 @@ msgstr "Paieškos aplankai" msgid "UNMATCHED" msgstr "NEATITIKO" -#: ../mail/em-folder-tree-model.c:986 -#: ../mail/em-folder-tree-model.c:1278 +#: ../mail/em-folder-tree-model.c:988 +#: ../mail/em-folder-tree-model.c:1282 msgid "Loading..." msgstr "Įkeliama..." @@ -9876,61 +9885,82 @@ msgstr "Puslapis %d iš %d" msgid "No HTML stream available" msgstr "Nėra prieinamo HTML srauto" -#: ../mail/em-subscription-editor.c:1165 +#: ../mail/em-subscription-editor.c:832 +msgid "_Subscribe" +msgstr "_Užsisakyti" + +#: ../mail/em-subscription-editor.c:839 +msgid "Su_bscribe to shown" +msgstr "_Užsisakyti rodomas" + +#: ../mail/em-subscription-editor.c:846 +msgid "Subscribe to _all" +msgstr "Užsakyti _visas" + +#: ../mail/em-subscription-editor.c:933 +#: ../mail/em-subscription-editor.c:1772 +#: ../modules/mail/e-mail-shell-view-actions.c:1214 +msgid "_Unsubscribe" +msgstr "_Atsisakyti" + +#: ../mail/em-subscription-editor.c:940 +msgid "Unsu_bscribe from hidden" +msgstr "Atsisak_yti paslėptų" + +#: ../mail/em-subscription-editor.c:947 +msgid "Unsubscribe from _all" +msgstr "Atsisak_yti visų" + +#: ../mail/em-subscription-editor.c:1618 msgid "Folder Subscriptions" msgstr "Aplankų užsisakymai" -#: ../mail/em-subscription-editor.c:1204 +#: ../mail/em-subscription-editor.c:1657 msgid "_Account:" msgstr "_Paskyra:" -#: ../mail/em-subscription-editor.c:1219 +#: ../mail/em-subscription-editor.c:1672 msgid "Clear Search" msgstr "Išvalyti paiešką" -#: ../mail/em-subscription-editor.c:1237 +#: ../mail/em-subscription-editor.c:1690 msgid "Sho_w items that contain:" msgstr "Ro_dyti elementus, kuriuose yra:" -#: ../mail/em-subscription-editor.c:1276 +#: ../mail/em-subscription-editor.c:1735 msgid "Subscribe to the selected folder" msgstr "Užsisakyti pasirinktą aplanką" -#: ../mail/em-subscription-editor.c:1277 +#: ../mail/em-subscription-editor.c:1736 msgid "Su_bscribe" msgstr "_Užsisakyti" -#: ../mail/em-subscription-editor.c:1288 -#: ../modules/mail/e-mail-shell-view-actions.c:1212 +#: ../mail/em-subscription-editor.c:1771 +#: ../modules/mail/e-mail-shell-view-actions.c:1216 msgid "Unsubscribe from the selected folder" msgstr "Atsisakyti pasirinkto aplanko" -#: ../mail/em-subscription-editor.c:1289 -#: ../modules/mail/e-mail-shell-view-actions.c:1210 -msgid "_Unsubscribe" -msgstr "_Atsisakyti" - -#: ../mail/em-subscription-editor.c:1300 +#: ../mail/em-subscription-editor.c:1801 msgid "Collapse all folders" msgstr "Sutraukti visus aplankus" -#: ../mail/em-subscription-editor.c:1301 +#: ../mail/em-subscription-editor.c:1802 msgid "C_ollapse All" msgstr "Sutraukti _visus" -#: ../mail/em-subscription-editor.c:1311 +#: ../mail/em-subscription-editor.c:1812 msgid "Expand all folders" msgstr "Išplėsti visus aplankus" -#: ../mail/em-subscription-editor.c:1312 +#: ../mail/em-subscription-editor.c:1813 msgid "E_xpand All" msgstr "Iš_plėsti visus" -#: ../mail/em-subscription-editor.c:1322 +#: ../mail/em-subscription-editor.c:1823 msgid "Refresh the folder list" msgstr "Atnaujinti aplankų sąrašą" -#: ../mail/em-subscription-editor.c:1334 +#: ../mail/em-subscription-editor.c:1835 msgid "Stop the current operation" msgstr "Sustabdyti dabartinę operaciją" @@ -10933,13 +10963,13 @@ msgstr "_Paskirties aplankas:" #: ../mail/importers/evolution-mbox-importer.c:145 #: ../plugins/dbx-import/dbx-importer.c:260 -#: ../plugins/pst-import/pst-importer.c:462 +#: ../plugins/pst-import/pst-importer.c:546 msgid "Select folder" msgstr "Pasirinkite aplanką" #: ../mail/importers/evolution-mbox-importer.c:146 #: ../plugins/dbx-import/dbx-importer.c:261 -#: ../plugins/pst-import/pst-importer.c:463 +#: ../plugins/pst-import/pst-importer.c:547 msgid "Select folder to import into" msgstr "Pasirinkite aplanką, į kurį importuosite" @@ -10969,7 +10999,7 @@ msgstr "Importuojama pašto dėžutė" #. Destination folder, was set in our widget #: ../mail/importers/mail-importer.c:153 #: ../plugins/dbx-import/dbx-importer.c:610 -#: ../plugins/pst-import/pst-importer.c:663 +#: ../plugins/pst-import/pst-importer.c:753 #, c-format msgid "Importing '%s'" msgstr "Importuojama „%s“" @@ -11800,67 +11830,67 @@ msgstr "Filtruojami pažymėti laiškai" msgid "Fetching Mail" msgstr "Gaunamas paštas" -#: ../mail/mail-ops.c:843 +#: ../mail/mail-ops.c:847 #, c-format msgid "Sending message %d of %d" msgstr "Siunčiamas laiškas %d iš %d" -#: ../mail/mail-ops.c:891 +#: ../mail/mail-ops.c:895 #, c-format msgid "Failed to send %d of %d messages" msgstr "Nepavyko išsiųsti %d iš %d laiškų" -#: ../mail/mail-ops.c:895 +#: ../mail/mail-ops.c:899 #: ../mail/mail-send-recv.c:840 msgid "Canceled." msgstr "Atšaukta." -#: ../mail/mail-ops.c:897 +#: ../mail/mail-ops.c:901 #: ../mail/mail-send-recv.c:842 msgid "Complete." msgstr "Užbaigta." -#: ../mail/mail-ops.c:1012 +#: ../mail/mail-ops.c:1016 #, c-format msgid "Moving messages to '%s'" msgstr "Laiškai perkeliami į „%s“" -#: ../mail/mail-ops.c:1013 +#: ../mail/mail-ops.c:1017 #, c-format msgid "Copying messages to '%s'" msgstr "Laiškai kopijuojami į „%s“" -#: ../mail/mail-ops.c:1131 +#: ../mail/mail-ops.c:1135 #, c-format msgid "Storing folder '%s'" msgstr "Įrašomas aplankas „%s“" -#: ../mail/mail-ops.c:1206 +#: ../mail/mail-ops.c:1211 #, c-format msgid "Expunging and storing account '%s'" msgstr "Išvaloma ir saugoma paskyra „%s“" -#: ../mail/mail-ops.c:1207 +#: ../mail/mail-ops.c:1212 #, c-format msgid "Storing account '%s'" msgstr "Saugoma paskyra „%s“" -#: ../mail/mail-ops.c:1269 +#: ../mail/mail-ops.c:1274 #, c-format msgid "Refreshing folder '%s'" msgstr "Atnaujinamas aplankas „%s“" -#: ../mail/mail-ops.c:1459 +#: ../mail/mail-ops.c:1464 #, c-format msgid "Expunging folder '%s'" msgstr "Išvalomas aplankas „%s“" -#: ../mail/mail-ops.c:1544 +#: ../mail/mail-ops.c:1549 #, c-format msgid "Emptying trash in '%s'" msgstr "Išvaloma šiukšlinė esanti „%s“" -#: ../mail/mail-ops.c:1646 +#: ../mail/mail-ops.c:1651 #, c-format msgid "Disconnecting %s" msgstr "Atsijungiama nuo %s" @@ -11897,17 +11927,17 @@ msgstr "Ieškoma naujo pašto" msgid "Could not create spool directory '%s': %s" msgstr "Nepavyko sukurti kaupo aplanko „%s“: %s" -#: ../mail/mail-tools.c:106 +#: ../mail/mail-tools.c:113 #, c-format msgid "Trying to movemail a non-mbox source '%s'" msgstr "Bandoma perkelti paštą į ne mbox šaltinį „%s“" -#: ../mail/mail-tools.c:215 +#: ../mail/mail-tools.c:225 #, c-format msgid "Forwarded message - %s" msgstr "Persiųstas laiškas – %s" -#: ../mail/mail-tools.c:217 +#: ../mail/mail-tools.c:227 msgid "Forwarded message" msgstr "Persiųstas laiškas" @@ -11947,11 +11977,11 @@ msgstr[2] "" "%s buvo pakeisti atsižvelgiant į ištrintą aplanką\n" "„%s“." -#: ../mail/mail-vfolder.c:1314 +#: ../mail/mail-vfolder.c:1309 msgid "Edit Search Folder" msgstr "Keisti paieškos aplankus" -#: ../mail/mail-vfolder.c:1423 +#: ../mail/mail-vfolder.c:1418 msgid "New Search Folder" msgstr "Naujas paieškos aplankas" @@ -12555,7 +12585,7 @@ msgid "_Discard changes" msgstr "A_tsisakyti pakeitimų" #: ../mail/mail.error.xml.h:160 -#: ../modules/mail/e-mail-shell-view-actions.c:1112 +#: ../modules/mail/e-mail-shell-view-actions.c:1116 msgid "_Empty Trash" msgstr "Iš_valyti šiukšlinę" @@ -12725,27 +12755,27 @@ msgid "Subject - Trimmed" msgstr "Tema – patrumpinta" #: ../mail/searchtypes.xml.h:1 -#: ../modules/mail/e-mail-shell-view-actions.c:1552 +#: ../modules/mail/e-mail-shell-view-actions.c:1556 msgid "Body contains" msgstr "Laiške yra" #: ../mail/searchtypes.xml.h:2 -#: ../modules/mail/e-mail-shell-view-actions.c:1559 +#: ../modules/mail/e-mail-shell-view-actions.c:1563 msgid "Message contains" msgstr "Žinutėje yra" #: ../mail/searchtypes.xml.h:3 -#: ../modules/mail/e-mail-shell-view-actions.c:1566 +#: ../modules/mail/e-mail-shell-view-actions.c:1570 msgid "Recipients contain" msgstr "Gavėjų sąraše yra" #: ../mail/searchtypes.xml.h:4 -#: ../modules/mail/e-mail-shell-view-actions.c:1573 +#: ../modules/mail/e-mail-shell-view-actions.c:1577 msgid "Sender contains" msgstr "Siuntėjo lauke yra" #: ../mail/searchtypes.xml.h:5 -#: ../modules/mail/e-mail-shell-view-actions.c:1580 +#: ../modules/mail/e-mail-shell-view-actions.c:1584 msgid "Subject contains" msgstr "Temoje yra" @@ -12959,10 +12989,10 @@ msgstr "Sukurti naują adresų knygą" #. Create the contacts group #: ../modules/addressbook/e-book-shell-backend.c:338 -#: ../modules/addressbook/e-book-shell-view.c:405 +#: ../modules/addressbook/e-book-shell-view.c:402 #: ../modules/calendar/e-cal-shell-backend.c:115 #: ../modules/calendar/e-cal-shell-migrate.c:63 -#: ../modules/online-accounts/e-online-accounts-google.c:366 +#: ../modules/online-accounts/e-online-accounts-google.c:369 msgid "Contacts" msgstr "Kontaktai" @@ -13024,7 +13054,7 @@ msgstr "Rodyti žemėlapį su visais adresatais iš pasirinktos adresų knygos" #: ../modules/calendar/e-cal-shell-view-actions.c:1405 #: ../modules/calendar/e-memo-shell-view-actions.c:640 #: ../modules/calendar/e-task-shell-view-actions.c:764 -#: ../modules/mail/e-mail-shell-view-actions.c:1189 +#: ../modules/mail/e-mail-shell-view-actions.c:1193 msgid "_Rename..." msgstr "Pe_rvadinti..." @@ -13105,7 +13135,7 @@ msgstr "_Veiksmai" #: ../modules/addressbook/e-book-shell-view-actions.c:940 #: ../modules/calendar/e-memo-shell-view-actions.c:677 #: ../modules/calendar/e-task-shell-view-actions.c:829 -#: ../modules/mail/e-mail-shell-view-actions.c:1347 +#: ../modules/mail/e-mail-shell-view-actions.c:1351 msgid "_Preview" msgstr "_Peržiūra" @@ -13143,7 +13173,7 @@ msgstr "Rodyti žemėlapius adresatų peržiūros lange" #: ../modules/addressbook/e-book-shell-view-actions.c:1018 #: ../modules/calendar/e-memo-shell-view-actions.c:747 #: ../modules/calendar/e-task-shell-view-actions.c:911 -#: ../modules/mail/e-mail-shell-view-actions.c:1462 +#: ../modules/mail/e-mail-shell-view-actions.c:1466 msgid "_Classic View" msgstr "_Klasikinis rodinys" @@ -13154,7 +13184,7 @@ msgstr "Rodyti kontakto peržiūrą po kontaktų sąrašu" #: ../modules/addressbook/e-book-shell-view-actions.c:1025 #: ../modules/calendar/e-memo-shell-view-actions.c:754 #: ../modules/calendar/e-task-shell-view-actions.c:918 -#: ../modules/mail/e-mail-shell-view-actions.c:1469 +#: ../modules/mail/e-mail-shell-view-actions.c:1473 msgid "_Vertical View" msgstr "_Vertikalus rodinys" @@ -13180,7 +13210,7 @@ msgstr "Neatitinkantys" #: ../modules/calendar/e-cal-shell-view-actions.c:1727 #: ../modules/calendar/e-memo-shell-view-actions.c:781 #: ../modules/calendar/e-task-shell-view-actions.c:980 -#: ../modules/mail/e-mail-shell-view-actions.c:1545 +#: ../modules/mail/e-mail-shell-view-actions.c:1549 #: ../shell/e-shell-content.c:664 msgid "Advanced Search" msgstr "Sudėtingesnė paieška" @@ -13215,23 +13245,23 @@ msgstr "Į_rašyti kaip vCard..." msgid "Save selected contacts as a vCard" msgstr "Įrašyti pažymėtus kontaktus kaip vCard" -#: ../modules/addressbook/e-book-shell-view.c:349 +#: ../modules/addressbook/e-book-shell-view.c:346 msgid "_Forward Contacts" msgstr "_Persiųsti kontaktus" -#: ../modules/addressbook/e-book-shell-view.c:351 +#: ../modules/addressbook/e-book-shell-view.c:348 msgid "_Forward Contact" msgstr "_Persiųsti kontaktą" -#: ../modules/addressbook/e-book-shell-view.c:382 +#: ../modules/addressbook/e-book-shell-view.c:379 msgid "_Send Message to Contacts" msgstr "_Siųsti laišką kontaktams" -#: ../modules/addressbook/e-book-shell-view.c:384 +#: ../modules/addressbook/e-book-shell-view.c:381 msgid "_Send Message to List" msgstr "_Siųsti laišką į konferenciją" -#: ../modules/addressbook/e-book-shell-view.c:386 +#: ../modules/addressbook/e-book-shell-view.c:383 msgid "_Send Message to Contact" msgstr "_Siųsti laišką kontaktui" @@ -14694,7 +14724,7 @@ msgstr[1] "%d rašteliai" msgstr[2] "%d raštelių" #: ../modules/calendar/e-memo-shell-view-private.c:428 -#: ../modules/calendar/e-task-shell-view-private.c:585 +#: ../modules/calendar/e-task-shell-view-private.c:583 #, c-format msgid "%d selected" msgstr "pasirinkta %d" @@ -14860,7 +14890,7 @@ msgstr "Ištrinti užduotį" msgid "Expunging" msgstr "Išvaloma" -#: ../modules/calendar/e-task-shell-view-private.c:581 +#: ../modules/calendar/e-task-shell-view-private.c:579 #, c-format msgid "%d task" msgid_plural "%d tasks" @@ -14868,11 +14898,11 @@ msgstr[0] "%d užduotis" msgstr[1] "%d užduotys" msgstr[2] "%d užduočių" -#: ../modules/mail/em-account-prefs.c:258 +#: ../modules/mail/em-account-prefs.c:263 msgid "Evolution Account Assistant" msgstr "Evolution paskyrų vediklis" -#: ../modules/mail/em-account-prefs.c:307 +#: ../modules/mail/em-account-prefs.c:312 msgid "Account Editor" msgstr "Paskyrų rengyklė" @@ -14900,311 +14930,311 @@ msgstr "Pašto _aplankas" msgid "Create a new mail folder" msgstr "Sukurti naują pašto aplanką" -#: ../modules/mail/e-mail-shell-backend.c:409 +#: ../modules/mail/e-mail-shell-backend.c:414 msgid "Mail Accounts" msgstr "Pašto paskyros" -#: ../modules/mail/e-mail-shell-backend.c:417 +#: ../modules/mail/e-mail-shell-backend.c:422 msgid "Mail Preferences" msgstr "Pašto nustatymai" -#: ../modules/mail/e-mail-shell-backend.c:425 +#: ../modules/mail/e-mail-shell-backend.c:430 msgid "Composer Preferences" msgstr "Rašymo nustatymai" -#: ../modules/mail/e-mail-shell-backend.c:433 +#: ../modules/mail/e-mail-shell-backend.c:438 msgid "Network Preferences" msgstr "Tinklo nustatymai" -#: ../modules/mail/e-mail-shell-view-actions.c:1105 +#: ../modules/mail/e-mail-shell-view-actions.c:1109 #: ../modules/mail/e-mail-shell-view.c:960 msgid "_Disable Account" msgstr "_Išjungti paskyrą" -#: ../modules/mail/e-mail-shell-view-actions.c:1107 +#: ../modules/mail/e-mail-shell-view-actions.c:1111 msgid "Disable this account" msgstr "Išjungti šią paskyrą" -#: ../modules/mail/e-mail-shell-view-actions.c:1114 +#: ../modules/mail/e-mail-shell-view-actions.c:1118 msgid "Permanently remove all the deleted messages from all folders" msgstr "Visam laikui pašalinti visus ištrintus laiškus iš visų aplankų" -#: ../modules/mail/e-mail-shell-view-actions.c:1119 +#: ../modules/mail/e-mail-shell-view-actions.c:1123 msgid "_Download Messages for Offline Usage" msgstr "_Atsiųsti laiškus darbui atsijungus" -#: ../modules/mail/e-mail-shell-view-actions.c:1121 +#: ../modules/mail/e-mail-shell-view-actions.c:1125 msgid "Download messages of accounts and folders marked for offline usage" msgstr "Atsiųsti paskyrų ir aplankų, pažymėtų naudojimui atsijungus, laiškus" -#: ../modules/mail/e-mail-shell-view-actions.c:1126 +#: ../modules/mail/e-mail-shell-view-actions.c:1130 msgid "Fl_ush Outbox" msgstr "Išsiųsti _visus" -#: ../modules/mail/e-mail-shell-view-actions.c:1133 +#: ../modules/mail/e-mail-shell-view-actions.c:1137 msgid "_Copy Folder To..." msgstr "_Kopijuoti aplanką į..." -#: ../modules/mail/e-mail-shell-view-actions.c:1135 +#: ../modules/mail/e-mail-shell-view-actions.c:1139 msgid "Copy the selected folder into another folder" msgstr "Kopijuoti pažymėtą aplanką į kitą aplanką" -#: ../modules/mail/e-mail-shell-view-actions.c:1142 +#: ../modules/mail/e-mail-shell-view-actions.c:1146 msgid "Permanently remove this folder" msgstr "Visam laikui pašalinti šį aplanką" -#: ../modules/mail/e-mail-shell-view-actions.c:1147 +#: ../modules/mail/e-mail-shell-view-actions.c:1151 msgid "E_xpunge" msgstr "Išval_yti" -#: ../modules/mail/e-mail-shell-view-actions.c:1149 +#: ../modules/mail/e-mail-shell-view-actions.c:1153 msgid "Permanently remove all deleted messages from this folder" msgstr "Visam laikui pašalinti visus ištrintus laiškus iš šio aplanko" -#: ../modules/mail/e-mail-shell-view-actions.c:1154 +#: ../modules/mail/e-mail-shell-view-actions.c:1158 msgid "Mar_k All Messages as Read" msgstr "Paž_ymėti visus laiškus skaitytais" -#: ../modules/mail/e-mail-shell-view-actions.c:1156 +#: ../modules/mail/e-mail-shell-view-actions.c:1160 msgid "Mark all messages in the folder as read" msgstr "Pažymėti visus laiškus aplanke kaip skaitytus" -#: ../modules/mail/e-mail-shell-view-actions.c:1161 +#: ../modules/mail/e-mail-shell-view-actions.c:1165 msgid "_Move Folder To..." msgstr "P_erkelti aplanką į..." -#: ../modules/mail/e-mail-shell-view-actions.c:1163 +#: ../modules/mail/e-mail-shell-view-actions.c:1167 msgid "Move the selected folder into another folder" msgstr "Perkelti pažymėtą aplanką į kitą aplanką" -#: ../modules/mail/e-mail-shell-view-actions.c:1168 +#: ../modules/mail/e-mail-shell-view-actions.c:1172 msgid "_New..." msgstr "_Naujas..." -#: ../modules/mail/e-mail-shell-view-actions.c:1170 +#: ../modules/mail/e-mail-shell-view-actions.c:1174 msgid "Create a new folder for storing mail" msgstr "Sukurti naują aplanką pašto saugojimui" -#: ../modules/mail/e-mail-shell-view-actions.c:1177 +#: ../modules/mail/e-mail-shell-view-actions.c:1181 msgid "Change the properties of this folder" msgstr "Keisti šio aplanko savybes" -#: ../modules/mail/e-mail-shell-view-actions.c:1184 +#: ../modules/mail/e-mail-shell-view-actions.c:1188 msgid "Refresh the folder" msgstr "Atnaujinti aplanką" -#: ../modules/mail/e-mail-shell-view-actions.c:1191 +#: ../modules/mail/e-mail-shell-view-actions.c:1195 msgid "Change the name of this folder" msgstr "Keisti šio aplanko pavadinimą" -#: ../modules/mail/e-mail-shell-view-actions.c:1196 +#: ../modules/mail/e-mail-shell-view-actions.c:1200 msgid "Select Message _Thread" msgstr "Pažymėti laiško _giją" -#: ../modules/mail/e-mail-shell-view-actions.c:1198 +#: ../modules/mail/e-mail-shell-view-actions.c:1202 msgid "Select all messages in the same thread as the selected message" msgstr "Pažymėti visus laiškus toje gijoje, kur yra pasirinktas laiškas" -#: ../modules/mail/e-mail-shell-view-actions.c:1203 +#: ../modules/mail/e-mail-shell-view-actions.c:1207 msgid "Select Message S_ubthread" msgstr "Pažymėti laiško s_ubgiją" -#: ../modules/mail/e-mail-shell-view-actions.c:1205 +#: ../modules/mail/e-mail-shell-view-actions.c:1209 msgid "Select all replies to the currently selected message" msgstr "Pažymėti visus atsakymus į pasirinktą laišką" -#: ../modules/mail/e-mail-shell-view-actions.c:1217 +#: ../modules/mail/e-mail-shell-view-actions.c:1221 msgid "Empty _Trash" msgstr "Išval_yti šiukšlinę" -#: ../modules/mail/e-mail-shell-view-actions.c:1219 +#: ../modules/mail/e-mail-shell-view-actions.c:1223 msgid "Permanently remove all the deleted messages from all accounts" msgstr "Visam laikui pašalinti visus ištrintus laiškus iš visų paskyrų" -#: ../modules/mail/e-mail-shell-view-actions.c:1224 +#: ../modules/mail/e-mail-shell-view-actions.c:1228 msgid "_New Label" msgstr "_Nauja etiketė" -#: ../modules/mail/e-mail-shell-view-actions.c:1233 +#: ../modules/mail/e-mail-shell-view-actions.c:1237 msgid "N_one" msgstr "_Nėra" -#: ../modules/mail/e-mail-shell-view-actions.c:1247 +#: ../modules/mail/e-mail-shell-view-actions.c:1251 msgid "_Manage Subscriptions" msgstr "_Tvarkyti prenumeratas" -#: ../modules/mail/e-mail-shell-view-actions.c:1249 -#: ../modules/mail/e-mail-shell-view-actions.c:1326 +#: ../modules/mail/e-mail-shell-view-actions.c:1253 +#: ../modules/mail/e-mail-shell-view-actions.c:1330 msgid "Subscribe or unsubscribe to folders on remote servers" msgstr "Užsisakyti ar atsisakyti aplankų nutolusiuose serveriuose" -#: ../modules/mail/e-mail-shell-view-actions.c:1254 -#: ../modules/mail/e-mail-shell-view-actions.c:1275 +#: ../modules/mail/e-mail-shell-view-actions.c:1258 +#: ../modules/mail/e-mail-shell-view-actions.c:1279 msgid "Send / _Receive" msgstr "Siųsti / _gauti" -#: ../modules/mail/e-mail-shell-view-actions.c:1256 +#: ../modules/mail/e-mail-shell-view-actions.c:1260 msgid "Send queued items and retrieve new items" msgstr "Išsiųsti laukiantį paštą ir paimti naują paštą" -#: ../modules/mail/e-mail-shell-view-actions.c:1261 +#: ../modules/mail/e-mail-shell-view-actions.c:1265 msgid "R_eceive All" msgstr "_Gauti visus" -#: ../modules/mail/e-mail-shell-view-actions.c:1263 +#: ../modules/mail/e-mail-shell-view-actions.c:1267 msgid "Receive new items from all accounts" msgstr "Gauti naujus elementus iš visų paskyrų" -#: ../modules/mail/e-mail-shell-view-actions.c:1268 +#: ../modules/mail/e-mail-shell-view-actions.c:1272 msgid "_Send All" msgstr "_Siųsti visus" -#: ../modules/mail/e-mail-shell-view-actions.c:1270 +#: ../modules/mail/e-mail-shell-view-actions.c:1274 msgid "Send queued items in all accounts" msgstr "Išsiųsti laukiančius elementus visose paskyrose" -#: ../modules/mail/e-mail-shell-view-actions.c:1296 +#: ../modules/mail/e-mail-shell-view-actions.c:1300 #: ../widgets/misc/e-activity-proxy.c:310 msgid "Cancel" msgstr "Atšaukti" -#: ../modules/mail/e-mail-shell-view-actions.c:1298 +#: ../modules/mail/e-mail-shell-view-actions.c:1302 msgid "Cancel the current mail operation" msgstr "Nutraukti vykdomą pašto operaciją" -#: ../modules/mail/e-mail-shell-view-actions.c:1303 +#: ../modules/mail/e-mail-shell-view-actions.c:1307 msgid "Collapse All _Threads" msgstr "Sutraukti visas _gijas" -#: ../modules/mail/e-mail-shell-view-actions.c:1305 +#: ../modules/mail/e-mail-shell-view-actions.c:1309 msgid "Collapse all message threads" msgstr "Sutraukti visas laiškų gijas" -#: ../modules/mail/e-mail-shell-view-actions.c:1310 +#: ../modules/mail/e-mail-shell-view-actions.c:1314 msgid "E_xpand All Threads" msgstr "_Išplėsti visas gijas" -#: ../modules/mail/e-mail-shell-view-actions.c:1312 +#: ../modules/mail/e-mail-shell-view-actions.c:1316 msgid "Expand all message threads" msgstr "Išplėsti visas laiškų gijas" -#: ../modules/mail/e-mail-shell-view-actions.c:1317 +#: ../modules/mail/e-mail-shell-view-actions.c:1321 msgid "_Message Filters" msgstr "Laiškų _filtrai" -#: ../modules/mail/e-mail-shell-view-actions.c:1319 +#: ../modules/mail/e-mail-shell-view-actions.c:1323 msgid "Create or edit rules for filtering new mail" msgstr "Sukurti ar keisti pašto filtravimo taisykles" -#: ../modules/mail/e-mail-shell-view-actions.c:1324 +#: ../modules/mail/e-mail-shell-view-actions.c:1328 msgid "_Subscriptions..." msgstr "_Prenumeratos..." -#: ../modules/mail/e-mail-shell-view-actions.c:1333 +#: ../modules/mail/e-mail-shell-view-actions.c:1337 msgid "F_older" msgstr "_Aplankas" -#: ../modules/mail/e-mail-shell-view-actions.c:1340 +#: ../modules/mail/e-mail-shell-view-actions.c:1344 msgid "_Label" msgstr "_Etiketė" -#: ../modules/mail/e-mail-shell-view-actions.c:1357 +#: ../modules/mail/e-mail-shell-view-actions.c:1361 msgid "C_reate Search Folder From Search..." msgstr "Suku_rti paieškos aplanką pagal paiešką..." -#: ../modules/mail/e-mail-shell-view-actions.c:1364 +#: ../modules/mail/e-mail-shell-view-actions.c:1368 msgid "Search F_olders" msgstr "Paiešk_os aplankai" -#: ../modules/mail/e-mail-shell-view-actions.c:1366 +#: ../modules/mail/e-mail-shell-view-actions.c:1370 msgid "Create or edit search folder definitions" msgstr "Kurti ar taisyti paieškos aplankų apibrėžimus" -#: ../modules/mail/e-mail-shell-view-actions.c:1397 +#: ../modules/mail/e-mail-shell-view-actions.c:1401 msgid "_New Folder..." msgstr "_Naujas aplankas..." -#: ../modules/mail/e-mail-shell-view-actions.c:1425 +#: ../modules/mail/e-mail-shell-view-actions.c:1429 msgid "Show Message _Preview" msgstr "Rodyti laiško _peržiūrą" -#: ../modules/mail/e-mail-shell-view-actions.c:1427 +#: ../modules/mail/e-mail-shell-view-actions.c:1431 msgid "Show message preview pane" msgstr "Rodyti laiško peržiūros polangį" -#: ../modules/mail/e-mail-shell-view-actions.c:1433 +#: ../modules/mail/e-mail-shell-view-actions.c:1437 msgid "Show _Deleted Messages" msgstr "Rodyti _ištrintus laiškus" -#: ../modules/mail/e-mail-shell-view-actions.c:1435 +#: ../modules/mail/e-mail-shell-view-actions.c:1439 msgid "Show deleted messages with a line through them" msgstr "Rodyti ištrintus laiškus juos perbraukiant" -#: ../modules/mail/e-mail-shell-view-actions.c:1441 +#: ../modules/mail/e-mail-shell-view-actions.c:1445 msgid "_Group By Threads" msgstr "_Grupuoti pagal gijas" -#: ../modules/mail/e-mail-shell-view-actions.c:1443 +#: ../modules/mail/e-mail-shell-view-actions.c:1447 msgid "Threaded message list" msgstr "Grupuojamas pagal gijas laiškų sąrašas" -#: ../modules/mail/e-mail-shell-view-actions.c:1464 +#: ../modules/mail/e-mail-shell-view-actions.c:1468 msgid "Show message preview below the message list" msgstr "Rodyti laiško peržiūrą po laiškų sąrašu" -#: ../modules/mail/e-mail-shell-view-actions.c:1471 +#: ../modules/mail/e-mail-shell-view-actions.c:1475 msgid "Show message preview alongside the message list" msgstr "Rodyti laiškų peržiūrą šalia laiškų sąrašo" -#: ../modules/mail/e-mail-shell-view-actions.c:1479 +#: ../modules/mail/e-mail-shell-view-actions.c:1483 msgid "All Messages" msgstr "Visi laiškai" -#: ../modules/mail/e-mail-shell-view-actions.c:1486 +#: ../modules/mail/e-mail-shell-view-actions.c:1490 msgid "Important Messages" msgstr "Svarbūs laiškai" -#: ../modules/mail/e-mail-shell-view-actions.c:1493 +#: ../modules/mail/e-mail-shell-view-actions.c:1497 msgid "Last 5 Days' Messages" msgstr "Paskutinių 5 dienų laiškai" -#: ../modules/mail/e-mail-shell-view-actions.c:1500 +#: ../modules/mail/e-mail-shell-view-actions.c:1504 msgid "Messages Not Junk" msgstr "Laiškai ne brukalas" -#: ../modules/mail/e-mail-shell-view-actions.c:1507 +#: ../modules/mail/e-mail-shell-view-actions.c:1511 msgid "Messages with Attachments" msgstr "Laiškai su priedais" -#: ../modules/mail/e-mail-shell-view-actions.c:1514 +#: ../modules/mail/e-mail-shell-view-actions.c:1518 msgid "No Label" msgstr "Be užrašo" -#: ../modules/mail/e-mail-shell-view-actions.c:1521 +#: ../modules/mail/e-mail-shell-view-actions.c:1525 msgid "Read Messages" msgstr "Perskaityti laiškai" -#: ../modules/mail/e-mail-shell-view-actions.c:1528 +#: ../modules/mail/e-mail-shell-view-actions.c:1532 msgid "Recent Messages" msgstr "Naujausi laiškai" -#: ../modules/mail/e-mail-shell-view-actions.c:1535 +#: ../modules/mail/e-mail-shell-view-actions.c:1539 msgid "Unread Messages" msgstr "Neskaityti laiškai" -#: ../modules/mail/e-mail-shell-view-actions.c:1587 +#: ../modules/mail/e-mail-shell-view-actions.c:1591 msgid "Subject or Addresses contain" msgstr "Temos arba adreso lauke yra" -#: ../modules/mail/e-mail-shell-view-actions.c:1597 +#: ../modules/mail/e-mail-shell-view-actions.c:1601 msgid "All Accounts" msgstr "Visos paskyros" -#: ../modules/mail/e-mail-shell-view-actions.c:1604 +#: ../modules/mail/e-mail-shell-view-actions.c:1608 msgid "Current Account" msgstr "Dabartinė paskyra" -#: ../modules/mail/e-mail-shell-view-actions.c:1611 +#: ../modules/mail/e-mail-shell-view-actions.c:1615 msgid "Current Folder" msgstr "Dabartinis aplankas" @@ -15296,7 +15326,7 @@ msgstr "Siųsti / gauti" #: ../modules/mail/em-composer-prefs.c:498 #: ../modules/plugin-manager/evolution-plugin-manager.c:360 #: ../plugins/publish-calendar/publish-calendar.c:849 -#: ../widgets/misc/e-account-tree-view.c:385 +#: ../widgets/misc/e-account-tree-view.c:388 msgid "Enabled" msgstr "Įjungta" @@ -15365,15 +15395,15 @@ msgstr "Evolution dabar yra atsijungus." msgid "Evolution will return to online mode once a network connection is established." msgstr "Evolution grįš į prisijungimo veikseną, kai atsiras tinklo ryšys." -#: ../modules/online-accounts/camel-sasl-xoauth.c:374 +#: ../modules/online-accounts/camel-sasl-xoauth.c:388 msgid "Cannot find a corresponding account in the org.gnome.OnlineAccounts service from which to obtain an authentication token." msgstr "Nepavyko rasti atitinkamos paskyros org.gnome.OnlineAccounts tarnyboje, iš kurios reikia gauti tapatybės patvirtinimo leksemą." -#: ../modules/online-accounts/camel-sasl-xoauth.c:461 +#: ../modules/online-accounts/camel-sasl-xoauth.c:475 msgid "OAuth" msgstr "OAuth" -#: ../modules/online-accounts/camel-sasl-xoauth.c:463 +#: ../modules/online-accounts/camel-sasl-xoauth.c:477 msgid "This option will connect to the server by way of the GNOME Online Accounts service" msgstr "Ši parinktis prisijungs prie serverio per GNOME Online Accounts tarnybą" @@ -15509,16 +15539,10 @@ msgid "Welcome" msgstr "Sveiki" #: ../modules/startup-wizard/evolution-startup-wizard.c:508 -msgid "" -"Welcome to Evolution. The next few screens will allow Evolution to connect to your email accounts, and to import files from other applications. \n" -"\n" -"Please click the \"Forward\" button to continue. " -msgstr "" -"Sveikiname paleidus Evolution. Keliuose kituose Evolution languose galėsite prisijungti prie savo el. pašto paskyrų ir importuoti failus iš kitų programų.\n" -"\n" -"Norėdami tęsti spustelėkite mygtuką „Pirmyn“. " +msgid "Welcome to Evolution. The next few screens will allow Evolution to connect to your email accounts, and to import files from other applications." +msgstr "Sveikiname paleidus Evolution. Keliuose kituose Evolution languose galėsite prisijungti prie savo el. pašto paskyrų ir importuoti failus iš kitų programų." -#: ../modules/startup-wizard/evolution-startup-wizard.c:613 +#: ../modules/startup-wizard/evolution-startup-wizard.c:612 msgid "Loading accounts..." msgstr "Įkeliamos paskyros..." @@ -15742,7 +15766,7 @@ msgid "Are you sure you want to close Evolution?" msgstr "Ar tikrai norite užverti Evolution?" #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:2 -msgid "Are you sure you want to restore Evolution from the selected back up file?" +msgid "Are you sure you want to restore Evolution from the selected backup file?" msgstr "Ar tikrai norite atkurti Evolution duomenis iš pasirinkto atsarginio failo?" #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:3 @@ -15758,11 +15782,11 @@ msgid "Insufficient Permissions" msgstr "Nepakanka teisių" #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:6 -msgid "Invalid Evolution back up file" +msgid "Invalid Evolution backup file" msgstr "Netinkamas Evolution atsarginis failas" #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:7 -msgid "Please select a valid back up file to restore." +msgid "Please select a valid backup file to restore." msgstr "Pasirinkite tinkamą atstatytiną atsarginį failą." #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:8 @@ -15774,7 +15798,7 @@ msgid "To back up your data and settings, you must first close Evolution. Please msgstr "Norėdami sukurti atsarginę savo duomenų ir nustatymų kopiją, pirma turite užverti Evolution programą. Įsitikinkite, jog įrašėte visus neįrašytus duomenis." #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:10 -msgid "To restore your data and settings, you must first close Evolution. Please make sure that you save any unsaved data before proceeding. This will delete all your current Evolution data and settings and restore them from your back up." +msgid "To restore your data and settings, you must first close Evolution. Please make sure that you save any unsaved data before proceeding. This will delete all your current Evolution data and settings and restore them from your backup." msgstr "Norėdami atstatyti savo duomenis ir nustatymus, pirma turite užverti Evolution programą. Įsitikinkite, jog įrašėte visus neįrašytus duomenis. Šios operacijos metu bus ištrinti visi dabartiniai jūsų Evolution programos duomenys bei nustatymai ir atkurti iš atsarginių kopijų." #: ../plugins/bbdb/bbdb.c:686 @@ -15939,7 +15963,7 @@ msgstr "Na_udoti saugų ryšį" #: ../plugins/caldav/caldav-source.c:249 #: ../plugins/google-account-setup/google-contacts-source.c:337 -#: ../plugins/google-account-setup/google-source.c:669 +#: ../plugins/google-account-setup/google-source.c:660 #: ../plugins/webdav-account-setup/webdav-contacts-source.c:269 msgid "User_name:" msgstr "Naudotojo _vardas:" @@ -15953,7 +15977,7 @@ msgstr "Naršyti s_erveryje kalendoriaus" #: ../plugins/calendar-http/calendar-http.c:129 #: ../plugins/calendar-weather/calendar-weather.c:421 #: ../plugins/google-account-setup/google-contacts-source.c:377 -#: ../plugins/google-account-setup/google-source.c:675 +#: ../plugins/google-account-setup/google-source.c:666 msgid "Re_fresh:" msgstr "_Atnaujinti:" @@ -16334,12 +16358,12 @@ msgstr "Jūsų pasirinktas failas neatrodo kaip tinkamas .png paveikslėlis. Kla msgid "Server" msgstr "Serveris" -#: ../plugins/google-account-setup/google-source.c:459 +#: ../plugins/google-account-setup/google-source.c:457 #, c-format msgid "Enter password for user %s to access list of subscribed calendars." msgstr "Įveskite naudotojo %s slaptažodį, kad gautumėt užsakytų kalendorių sąrašą." -#: ../plugins/google-account-setup/google-source.c:576 +#: ../plugins/google-account-setup/google-source.c:569 #, c-format msgid "" "Cannot read data from Google server.\n" @@ -16348,17 +16372,17 @@ msgstr "" "Nepavyko perskaityti duomenų iš Google serverio.\n" "%s" -#: ../plugins/google-account-setup/google-source.c:576 -#: ../plugins/mail-to-task/mail-to-task.c:820 -#: ../plugins/mail-to-task/mail-to-task.c:1084 +#: ../plugins/google-account-setup/google-source.c:569 +#: ../plugins/mail-to-task/mail-to-task.c:819 +#: ../plugins/mail-to-task/mail-to-task.c:1083 msgid "Unknown error." msgstr "Nežinoma klaida." -#: ../plugins/google-account-setup/google-source.c:679 +#: ../plugins/google-account-setup/google-source.c:670 msgid "Cal_endar:" msgstr "Kal_endorius:" -#: ../plugins/google-account-setup/google-source.c:714 +#: ../plugins/google-account-setup/google-source.c:705 msgid "Retrieve _List" msgstr "Gauti _sąrašą" @@ -16461,174 +16485,174 @@ msgstr "Nepavyko rasti šios užduoties jokiame užduočių sąraše" msgid "Unable to find this memo in any memo list" msgstr "Nepavyko rasti šio raštelio jokiame raštelių sąraše" -#: ../plugins/itip-formatter/itip-formatter.c:1082 +#: ../plugins/itip-formatter/itip-formatter.c:1083 msgid "Opening the calendar. Please wait..." msgstr "Atveriamas kalendorius. Luktelėkite..." -#: ../plugins/itip-formatter/itip-formatter.c:1085 +#: ../plugins/itip-formatter/itip-formatter.c:1086 msgid "Searching for an existing version of this appointment" msgstr "Ieškoma egzistuojančios šio paskyrimo versijos" -#: ../plugins/itip-formatter/itip-formatter.c:1362 +#: ../plugins/itip-formatter/itip-formatter.c:1363 msgid "Unable to parse item" msgstr "Nepavyko apdoroti elemento" -#: ../plugins/itip-formatter/itip-formatter.c:1451 +#: ../plugins/itip-formatter/itip-formatter.c:1452 #, c-format msgid "Unable to send item to calendar '%s'. %s" msgstr "Nepavyko nusiųsti elemento į kalendorių „%s“. %s" -#: ../plugins/itip-formatter/itip-formatter.c:1463 +#: ../plugins/itip-formatter/itip-formatter.c:1464 #, c-format msgid "Sent to calendar '%s' as accepted" msgstr "Siųsti į kalendorių „%s“ kaip priimtą" -#: ../plugins/itip-formatter/itip-formatter.c:1467 +#: ../plugins/itip-formatter/itip-formatter.c:1468 #, c-format msgid "Sent to calendar '%s' as tentative" msgstr "Siųsti į kalendorių „%s“ kaip bandomąjį" -#: ../plugins/itip-formatter/itip-formatter.c:1472 +#: ../plugins/itip-formatter/itip-formatter.c:1473 #, c-format msgid "Sent to calendar '%s' as declined" msgstr "Siųsti į kalendorių „%s“ kaip atmestą" -#: ../plugins/itip-formatter/itip-formatter.c:1477 +#: ../plugins/itip-formatter/itip-formatter.c:1478 #, c-format msgid "Sent to calendar '%s' as canceled" msgstr "Siųsti į kalendorių „%s“ kaip atšauktą" -#: ../plugins/itip-formatter/itip-formatter.c:1579 +#: ../plugins/itip-formatter/itip-formatter.c:1580 #, c-format msgid "Organizer has removed the delegate %s " msgstr "Organizatorius pašalino atstovą %s " -#: ../plugins/itip-formatter/itip-formatter.c:1586 +#: ../plugins/itip-formatter/itip-formatter.c:1587 msgid "Sent a cancelation notice to the delegate" msgstr "Atstovui išsiųstas pranešimas apie atšaukimą" -#: ../plugins/itip-formatter/itip-formatter.c:1588 +#: ../plugins/itip-formatter/itip-formatter.c:1589 msgid "Could not send the cancelation notice to the delegate" msgstr "Nepavyko išsiųsti pranešimo apie atšaukimą atstovui" -#: ../plugins/itip-formatter/itip-formatter.c:1700 +#: ../plugins/itip-formatter/itip-formatter.c:1701 msgid "Attendee status could not be updated because the status is invalid" msgstr "Nepavyko atnaujinti dalyvio būsenos, nes būsena yra neteisinga" -#: ../plugins/itip-formatter/itip-formatter.c:1729 +#: ../plugins/itip-formatter/itip-formatter.c:1730 #, c-format msgid "Unable to update attendee. %s" msgstr "Nepavyko atnaujinti dalyvio. %s" -#: ../plugins/itip-formatter/itip-formatter.c:1733 +#: ../plugins/itip-formatter/itip-formatter.c:1734 msgid "Attendee status updated" msgstr "Dalyvio būsena atnaujinta" -#: ../plugins/itip-formatter/itip-formatter.c:1737 +#: ../plugins/itip-formatter/itip-formatter.c:1738 msgid "Attendee status can not be updated because the item no longer exists" msgstr "Dalyvio būsena negali būti atnaujinta, nes pasirinko elemento nebėra" -#: ../plugins/itip-formatter/itip-formatter.c:1759 +#: ../plugins/itip-formatter/itip-formatter.c:1760 msgid "Meeting information sent" msgstr "Susitikimo informacija išsiųsta" -#: ../plugins/itip-formatter/itip-formatter.c:1762 +#: ../plugins/itip-formatter/itip-formatter.c:1763 msgid "Task information sent" msgstr "Užduoties informacija išsiųsta" -#: ../plugins/itip-formatter/itip-formatter.c:1765 +#: ../plugins/itip-formatter/itip-formatter.c:1766 msgid "Memo information sent" msgstr "Raštelio informacija išsiųsta" -#: ../plugins/itip-formatter/itip-formatter.c:1774 +#: ../plugins/itip-formatter/itip-formatter.c:1775 msgid "Unable to send meeting information, the meeting does not exist" msgstr "Nepavyko išsiųsti susitikimo informacijos, nes susitikimas neegzistuoja" -#: ../plugins/itip-formatter/itip-formatter.c:1777 +#: ../plugins/itip-formatter/itip-formatter.c:1778 msgid "Unable to send task information, the task does not exist" msgstr "Nepavyko išsiųsti užduoties informacijos, nes užduotis neegzistuoja" -#: ../plugins/itip-formatter/itip-formatter.c:1780 +#: ../plugins/itip-formatter/itip-formatter.c:1781 msgid "Unable to send memo information, the memo does not exist" msgstr "Nepavyko išsiųsti raštelio informacijos, nes raštelis neegzistuoja" #. Translators: This is a default filename for a calendar. -#: ../plugins/itip-formatter/itip-formatter.c:1846 +#: ../plugins/itip-formatter/itip-formatter.c:1847 msgid "calendar.ics" msgstr "kalendorius.ics" -#: ../plugins/itip-formatter/itip-formatter.c:1851 +#: ../plugins/itip-formatter/itip-formatter.c:1852 msgid "Save Calendar" msgstr "Įrašyti kalendorių" -#: ../plugins/itip-formatter/itip-formatter.c:1914 -#: ../plugins/itip-formatter/itip-formatter.c:1925 +#: ../plugins/itip-formatter/itip-formatter.c:1915 +#: ../plugins/itip-formatter/itip-formatter.c:1926 msgid "The calendar attached is not valid" msgstr "Prisegtas kalendorius yra netinkamas" -#: ../plugins/itip-formatter/itip-formatter.c:1915 -#: ../plugins/itip-formatter/itip-formatter.c:1926 +#: ../plugins/itip-formatter/itip-formatter.c:1916 +#: ../plugins/itip-formatter/itip-formatter.c:1927 msgid "The message claims to contain a calendar, but the calendar is not a valid iCalendar." msgstr "Laiške nurodoma, kad jame yra kalendorius, bet kalendorius nėra tinkamas iCalendar." -#: ../plugins/itip-formatter/itip-formatter.c:1966 -#: ../plugins/itip-formatter/itip-formatter.c:1994 -#: ../plugins/itip-formatter/itip-formatter.c:2103 -msgid "The item in the calendar is not valid" -msgstr "Elementas kalendoriuje yra netinkamas" - #: ../plugins/itip-formatter/itip-formatter.c:1967 #: ../plugins/itip-formatter/itip-formatter.c:1995 #: ../plugins/itip-formatter/itip-formatter.c:2104 +msgid "The item in the calendar is not valid" +msgstr "Elementas kalendoriuje yra netinkamas" + +#: ../plugins/itip-formatter/itip-formatter.c:1968 +#: ../plugins/itip-formatter/itip-formatter.c:1996 +#: ../plugins/itip-formatter/itip-formatter.c:2105 msgid "The message does contain a calendar, but the calendar contains no events, tasks or free/busy information" msgstr "Šiame laiške yra kalendorius, bet kalendoriuje nėra jokių įvykių, užduočių ar užimtumo informacijos" -#: ../plugins/itip-formatter/itip-formatter.c:2008 +#: ../plugins/itip-formatter/itip-formatter.c:2009 msgid "The calendar attached contains multiple items" msgstr "Prisegtame kalendoriuje yra keletas elementų" -#: ../plugins/itip-formatter/itip-formatter.c:2009 +#: ../plugins/itip-formatter/itip-formatter.c:2010 msgid "To process all of these items, the file should be saved and the calendar imported" msgstr "Norint apdoroti visus šiuos elementus, failas turėtų būti išsaugotas ir kalendorius importuotas" -#: ../plugins/itip-formatter/itip-formatter.c:2665 +#: ../plugins/itip-formatter/itip-formatter.c:2666 msgctxt "cal-itip" msgid "None" msgstr "Nėra" -#: ../plugins/itip-formatter/itip-formatter.c:2681 +#: ../plugins/itip-formatter/itip-formatter.c:2682 msgid "Tentatively Accepted" msgstr "Preliminariai priimtas" -#: ../plugins/itip-formatter/itip-formatter.c:2799 +#: ../plugins/itip-formatter/itip-formatter.c:2800 msgid "This meeting recurs" msgstr "Šis įvykis pasikartoja" -#: ../plugins/itip-formatter/itip-formatter.c:2802 +#: ../plugins/itip-formatter/itip-formatter.c:2803 msgid "This task recurs" msgstr "Ši užduotis pasikartoja" -#: ../plugins/itip-formatter/itip-formatter.c:2805 +#: ../plugins/itip-formatter/itip-formatter.c:2806 msgid "This memo recurs" msgstr "Šis raštelis pasikartoja" -#: ../plugins/itip-formatter/itip-formatter.c:3029 +#: ../plugins/itip-formatter/itip-formatter.c:3030 msgid "Meeting Invitations" msgstr "Susitikimų kvietimai" #. Delete message after acting #. FIXME Need a schema for this -#: ../plugins/itip-formatter/itip-formatter.c:3054 +#: ../plugins/itip-formatter/itip-formatter.c:3055 msgid "_Delete message after acting" msgstr "_Po įvykio laišką ištrinti" -#: ../plugins/itip-formatter/itip-formatter.c:3064 -#: ../plugins/itip-formatter/itip-formatter.c:3097 +#: ../plugins/itip-formatter/itip-formatter.c:3065 +#: ../plugins/itip-formatter/itip-formatter.c:3098 msgid "Conflict Search" msgstr "Konfliktų paieška" #. Source selector -#: ../plugins/itip-formatter/itip-formatter.c:3079 +#: ../plugins/itip-formatter/itip-formatter.c:3080 msgid "Select the calendars to search for meeting conflicts" msgstr "Pasirinkite kalendorius, kuriuose ieškosite susitikimų konfliktų" @@ -17254,113 +17278,113 @@ msgid "Notifies you when new mail messages arrive." msgstr "Informuoja jus, kai gaunama naujų laiškų." #. To Translators: The full sentence looks like: "Created from a mail by John Doe <john.doe@myco.example>" -#: ../plugins/mail-to-task/mail-to-task.c:239 +#: ../plugins/mail-to-task/mail-to-task.c:238 #, c-format msgid "Created from a mail by %s" msgstr "Sukurta iš laiško, kurį atsiuntė %s" -#: ../plugins/mail-to-task/mail-to-task.c:610 +#: ../plugins/mail-to-task/mail-to-task.c:609 #, c-format msgid "Selected calendar contains event '%s' already. Would you like to edit the old event?" msgstr "Pasirinktame kalendoriuje jau yra įvykis „%s“. Ar norite taisyti senąjį įvykį?" -#: ../plugins/mail-to-task/mail-to-task.c:613 +#: ../plugins/mail-to-task/mail-to-task.c:612 #, c-format msgid "Selected task list contains task '%s' already. Would you like to edit the old task?" msgstr "Pasirinktame užduočių sąraše jau yra užduotis „%s“. Ar norite taisyti senąją užduotį?" -#: ../plugins/mail-to-task/mail-to-task.c:616 +#: ../plugins/mail-to-task/mail-to-task.c:615 #, c-format msgid "Selected memo list contains memo '%s' already. Would you like to edit the old memo?" msgstr "Pasirinktame raštelių sąraše jau yra raštelis „%s“. Ar norite taisyti senąjį raštelį?" -#: ../plugins/mail-to-task/mail-to-task.c:633 +#: ../plugins/mail-to-task/mail-to-task.c:632 #, c-format msgid "You have selected %d mails to be converted to events. Do you really want to add them all?" msgstr "Jūs pasirinkote %d laiškų konvertavimui į įvykius. Ar tikrai norite pridėti juos visus?" -#: ../plugins/mail-to-task/mail-to-task.c:636 +#: ../plugins/mail-to-task/mail-to-task.c:635 #, c-format msgid "You have selected %d mails to be converted to tasks. Do you really want to add them all?" msgstr "Jūs pasirinkote %d laiškų konvertavimui į užduotis. Ar tikrai norite pridėti juos visus?" -#: ../plugins/mail-to-task/mail-to-task.c:639 +#: ../plugins/mail-to-task/mail-to-task.c:638 #, c-format msgid "You have selected %d mails to be converted to memos. Do you really want to add them all?" msgstr "Jūs pasirinkote %d laiškų konvertavimui į įsiminimus. Ar tikrai norite pridėti juos visus?" -#: ../plugins/mail-to-task/mail-to-task.c:658 +#: ../plugins/mail-to-task/mail-to-task.c:657 msgid "Do you wish to continue converting remaining mails?" msgstr "Ar norite tęsti likusių laiškų konvertavimą?" -#: ../plugins/mail-to-task/mail-to-task.c:733 +#: ../plugins/mail-to-task/mail-to-task.c:732 msgid "[No Summary]" msgstr "[Nėra santraukos]" -#: ../plugins/mail-to-task/mail-to-task.c:745 +#: ../plugins/mail-to-task/mail-to-task.c:744 msgid "Invalid object returned from a server" msgstr "Netinkamas objektas grąžintas iš serverio" -#: ../plugins/mail-to-task/mail-to-task.c:795 +#: ../plugins/mail-to-task/mail-to-task.c:794 #, c-format msgid "An error occurred during processing: %s" msgstr "Apdorojant įvyko klaida: %s" -#: ../plugins/mail-to-task/mail-to-task.c:820 +#: ../plugins/mail-to-task/mail-to-task.c:819 #, c-format msgid "Cannot open calendar. %s" msgstr "Nepavyko atverti kalendoriaus. %s" -#: ../plugins/mail-to-task/mail-to-task.c:827 +#: ../plugins/mail-to-task/mail-to-task.c:826 msgid "Selected source is read only, thus cannot create event there. Select other source, please." msgstr "Pažymėtasis šaltinis skirtas tik skaitymui, todėl jame negalima kurti įvykių. Pasirinkite kitą šaltinį." -#: ../plugins/mail-to-task/mail-to-task.c:830 +#: ../plugins/mail-to-task/mail-to-task.c:829 msgid "Selected source is read only, thus cannot create task there. Select other source, please." msgstr "Pažymėtasis šaltinis skirtas tik skaitymui, todėl jame negalima kurti užduočių. Pasirinkite kitą šaltinį." -#: ../plugins/mail-to-task/mail-to-task.c:833 +#: ../plugins/mail-to-task/mail-to-task.c:832 msgid "Selected source is read only, thus cannot create memo there. Select other source, please." msgstr "Pažymėtasis šaltinis skirtas tik skaitymui, todėl jame negalima kurti raštelių. Pasirinkite kitą šaltinį." -#: ../plugins/mail-to-task/mail-to-task.c:1084 +#: ../plugins/mail-to-task/mail-to-task.c:1083 #, c-format msgid "Cannot get source list. %s" msgstr "Nepavyko gauti šaltinio sąrašo. %s" -#: ../plugins/mail-to-task/mail-to-task.c:1147 +#: ../plugins/mail-to-task/mail-to-task.c:1146 msgid "No writable calendar is available." msgstr "Nėra rašomo kalendoriaus." -#: ../plugins/mail-to-task/mail-to-task.c:1239 +#: ../plugins/mail-to-task/mail-to-task.c:1238 msgid "Create an _Event" msgstr "Sukurti į_vykį" -#: ../plugins/mail-to-task/mail-to-task.c:1241 +#: ../plugins/mail-to-task/mail-to-task.c:1240 msgid "Create a new event from the selected message" msgstr "Sukurti naują įvykį iš pasirinkto laiško" -#: ../plugins/mail-to-task/mail-to-task.c:1246 +#: ../plugins/mail-to-task/mail-to-task.c:1245 msgid "Create a Mem_o" msgstr "Sukurti _raštelį" -#: ../plugins/mail-to-task/mail-to-task.c:1248 +#: ../plugins/mail-to-task/mail-to-task.c:1247 msgid "Create a new memo from the selected message" msgstr "Sukurti naują raštelį iš pasirinkto laiško" -#: ../plugins/mail-to-task/mail-to-task.c:1253 +#: ../plugins/mail-to-task/mail-to-task.c:1252 msgid "Create a _Task" msgstr "Sukurti _užduotį" -#: ../plugins/mail-to-task/mail-to-task.c:1255 +#: ../plugins/mail-to-task/mail-to-task.c:1254 msgid "Create a new task from the selected message" msgstr "Sukurti naują užduotį iš pasirinkto laiško" -#: ../plugins/mail-to-task/mail-to-task.c:1263 +#: ../plugins/mail-to-task/mail-to-task.c:1262 msgid "Create a _Meeting" msgstr "Sukurti _susitikimą" -#: ../plugins/mail-to-task/mail-to-task.c:1265 +#: ../plugins/mail-to-task/mail-to-task.c:1264 msgid "Create a new meeting from the selected message" msgstr "Sukurti naują susitikimą iš pasirinkto laiško" @@ -17510,7 +17534,7 @@ msgstr "Esamame aplanke ir _poaplankiuose" msgid "In Current _Folder Only" msgstr "Tik esamame _aplanke" -#: ../plugins/mark-all-read/mark-all-read.c:575 +#: ../plugins/mark-all-read/mark-all-read.c:569 msgid "Mark Me_ssages as Read" msgstr "Pažy_mėti laiškus skaitytais" @@ -17579,32 +17603,32 @@ msgstr "Outlook PST importavimas" msgid "Outlook personal folders (.pst)" msgstr "Outlook asmeniniai aplankai (.pst)" -#: ../plugins/pst-import/pst-importer.c:452 +#: ../plugins/pst-import/pst-importer.c:536 msgid "_Mail" msgstr "_Paštas" -#: ../plugins/pst-import/pst-importer.c:471 +#: ../plugins/pst-import/pst-importer.c:556 msgid "Destination folder:" msgstr "Paskirties aplankas:" -#: ../plugins/pst-import/pst-importer.c:478 +#: ../plugins/pst-import/pst-importer.c:564 msgid "_Address Book" msgstr "_Adresų knyga" -#: ../plugins/pst-import/pst-importer.c:482 +#: ../plugins/pst-import/pst-importer.c:569 msgid "A_ppointments" msgstr "_Paskyrimai" -#: ../plugins/pst-import/pst-importer.c:486 +#: ../plugins/pst-import/pst-importer.c:574 #: ../views/tasks/galview.xml.h:3 msgid "_Tasks" msgstr "_Užduotys" -#: ../plugins/pst-import/pst-importer.c:490 +#: ../plugins/pst-import/pst-importer.c:579 msgid "_Journal entries" msgstr "_Žurnalo įrašai" -#: ../plugins/pst-import/pst-importer.c:600 +#: ../plugins/pst-import/pst-importer.c:690 msgid "Importing Outlook data" msgstr "Importuojami Outlook duomenys" @@ -17757,8 +17781,8 @@ msgstr "Naudotojo _vardas:" msgid "iCal" msgstr "iCal" -#: ../plugins/publish-calendar/publish-format-fb.c:95 -#: ../plugins/publish-calendar/publish-format-ical.c:92 +#: ../plugins/publish-calendar/publish-format-fb.c:94 +#: ../plugins/publish-calendar/publish-format-ical.c:91 #, c-format msgid "Could not publish calendar: Calendar backend no longer exists" msgstr "Nepavyko paskelbti kalendoriaus: nebėra kalendoriaus posistemės" @@ -18284,266 +18308,271 @@ msgstr "" msgid "Evolution Website" msgstr "Evolution svetainė" -#: ../shell/e-shell-window-actions.c:902 +#: ../shell/e-shell-window-actions.c:911 msgid "Categories Editor" msgstr "Kategorijų redaktorius" -#: ../shell/e-shell-window-actions.c:1237 +#: ../shell/e-shell-window-actions.c:1246 msgid "Bug Buddy is not installed." msgstr "Neįdiegta programa Bug Buddy." -#: ../shell/e-shell-window-actions.c:1239 +#: ../shell/e-shell-window-actions.c:1248 msgid "Bug Buddy could not be run." msgstr "Nepavyko paleisti Bug Buddy." -#: ../shell/e-shell-window-actions.c:1420 +#: ../shell/e-shell-window-actions.c:1429 msgid "Show information about Evolution" msgstr "Rodyti informaciją apie Evolution" -#: ../shell/e-shell-window-actions.c:1425 -#: ../shell/e-shell-window-actions.c:1439 +#: ../shell/e-shell-window-actions.c:1434 +#: ../shell/e-shell-window-actions.c:1448 msgid "_Close Window" msgstr "_Užverti langą" -#: ../shell/e-shell-window-actions.c:1446 +#: ../shell/e-shell-window-actions.c:1455 msgid "_Contents" msgstr "_Turinys" -#: ../shell/e-shell-window-actions.c:1448 +#: ../shell/e-shell-window-actions.c:1457 msgid "Open the Evolution User Guide" msgstr "Atverti Evolution naudotojo vadovą" -#: ../shell/e-shell-window-actions.c:1474 +#: ../shell/e-shell-window-actions.c:1483 msgid "_Forget Passwords" msgstr "_Užmiršti slaptažodžius" -#: ../shell/e-shell-window-actions.c:1476 +#: ../shell/e-shell-window-actions.c:1485 msgid "Forget all remembered passwords" msgstr "Užmiršti visus įsimintus slaptažodžius" -#: ../shell/e-shell-window-actions.c:1481 +#: ../shell/e-shell-window-actions.c:1490 msgid "I_mport..." msgstr "I_mportuoti..." -#: ../shell/e-shell-window-actions.c:1483 +#: ../shell/e-shell-window-actions.c:1492 msgid "Import data from other programs" msgstr "Importuoti duomenis iš kitų programų" -#: ../shell/e-shell-window-actions.c:1488 +#: ../shell/e-shell-window-actions.c:1497 msgid "New _Window" msgstr "Naujas _langas" -#: ../shell/e-shell-window-actions.c:1490 +#: ../shell/e-shell-window-actions.c:1499 msgid "Create a new window displaying this view" msgstr "Sukurti naują langą, rodantį šį rodinį" -#: ../shell/e-shell-window-actions.c:1502 +#: ../shell/e-shell-window-actions.c:1511 msgid "Available Cate_gories" msgstr "Esamos _kategorijos" -#: ../shell/e-shell-window-actions.c:1504 +#: ../shell/e-shell-window-actions.c:1513 msgid "Manage available categories" msgstr "Tvarkyti esamas kategorijas" -#: ../shell/e-shell-window-actions.c:1516 +#: ../shell/e-shell-window-actions.c:1525 msgid "_Quick Reference" msgstr "_Trumpas žinynas" -#: ../shell/e-shell-window-actions.c:1518 +#: ../shell/e-shell-window-actions.c:1527 msgid "Show Evolution's shortcut keys" msgstr "Rodyti Evolution sparčiuosius klavišus" -#: ../shell/e-shell-window-actions.c:1525 +#: ../shell/e-shell-window-actions.c:1534 msgid "Exit the program" msgstr "Išeiti iš programos" -#: ../shell/e-shell-window-actions.c:1530 +#: ../shell/e-shell-window-actions.c:1539 msgid "_Advanced Search..." msgstr "_Sudėtingesnė paieška..." -#: ../shell/e-shell-window-actions.c:1532 +#: ../shell/e-shell-window-actions.c:1541 msgid "Construct a more advanced search" msgstr "Sudaryti sudėtingesnę paiešką" -#: ../shell/e-shell-window-actions.c:1539 +#: ../shell/e-shell-window-actions.c:1548 msgid "Clear the current search parameters" msgstr "Išvalyti dabartinės paieškos parametrus" -#: ../shell/e-shell-window-actions.c:1544 +#: ../shell/e-shell-window-actions.c:1553 msgid "_Edit Saved Searches..." msgstr "_Taisyti išsaugotas paieškas..." -#: ../shell/e-shell-window-actions.c:1546 +#: ../shell/e-shell-window-actions.c:1555 msgid "Manage your saved searches" msgstr "Tvarkykite savo išsaugotas paieškas" -#: ../shell/e-shell-window-actions.c:1553 +#: ../shell/e-shell-window-actions.c:1562 msgid "Click here to change the search type" msgstr "Spustelėkite čia, jei norite pakeisti paieškos tipą" -#: ../shell/e-shell-window-actions.c:1558 +#: ../shell/e-shell-window-actions.c:1567 msgid "_Find Now" msgstr "_Surasti" #. Block the default Ctrl+F. -#: ../shell/e-shell-window-actions.c:1560 +#: ../shell/e-shell-window-actions.c:1569 msgid "Execute the current search parameters" msgstr "Vykdyti dabartinės paieškos parametrus" -#: ../shell/e-shell-window-actions.c:1565 +#: ../shell/e-shell-window-actions.c:1574 msgid "_Save Search..." msgstr "Įrašyti _paiešką..." -#: ../shell/e-shell-window-actions.c:1567 +#: ../shell/e-shell-window-actions.c:1576 msgid "Save the current search parameters" msgstr "Įrašyti dabartinės paieškos parametrus" -#: ../shell/e-shell-window-actions.c:1579 +#: ../shell/e-shell-window-actions.c:1588 msgid "Submit _Bug Report..." msgstr "Iš_siųsti pranešimą apie klaidą..." -#: ../shell/e-shell-window-actions.c:1581 +#: ../shell/e-shell-window-actions.c:1590 msgid "Submit a bug report using Bug Buddy" msgstr "Pranešti apie klaidą, naudojant Bug Buddy" -#: ../shell/e-shell-window-actions.c:1586 +#: ../shell/e-shell-window-actions.c:1595 msgid "_Work Offline" msgstr "_Dirbti atsijungus" -#: ../shell/e-shell-window-actions.c:1588 +#: ../shell/e-shell-window-actions.c:1597 msgid "Put Evolution into offline mode" msgstr "Perjungti Evolution į atsijungimo veikseną" -#: ../shell/e-shell-window-actions.c:1593 +#: ../shell/e-shell-window-actions.c:1602 msgid "_Work Online" msgstr "_Dirbti prisijungus" -#: ../shell/e-shell-window-actions.c:1595 +#: ../shell/e-shell-window-actions.c:1604 msgid "Put Evolution into online mode" msgstr "Perjungti Evolution į prisijungimo veikseną" -#: ../shell/e-shell-window-actions.c:1623 +#: ../shell/e-shell-window-actions.c:1632 msgid "Lay_out" msgstr "Išdėst_ymas" -#: ../shell/e-shell-window-actions.c:1630 +#: ../shell/e-shell-window-actions.c:1639 msgid "_New" msgstr "_Naujas" -#: ../shell/e-shell-window-actions.c:1637 +#: ../shell/e-shell-window-actions.c:1646 msgid "_Search" msgstr "_Paieška" -#: ../shell/e-shell-window-actions.c:1644 +#: ../shell/e-shell-window-actions.c:1653 msgid "_Switcher Appearance" msgstr "_Perjungiklio išvaizda" -#: ../shell/e-shell-window-actions.c:1658 +#: ../shell/e-shell-window-actions.c:1667 msgid "_Window" msgstr "_Langas" -#: ../shell/e-shell-window-actions.c:1687 +#: ../shell/e-shell-window-actions.c:1696 msgid "Show Side _Bar" msgstr "Rodyti šoninį _skydelį" -#: ../shell/e-shell-window-actions.c:1689 +#: ../shell/e-shell-window-actions.c:1698 msgid "Show the side bar" msgstr "Rodyti šoninį skydelį" -#: ../shell/e-shell-window-actions.c:1695 +#: ../shell/e-shell-window-actions.c:1704 msgid "Show _Buttons" msgstr "Rodyti _mygtukus" -#: ../shell/e-shell-window-actions.c:1697 +#: ../shell/e-shell-window-actions.c:1706 msgid "Show the switcher buttons" msgstr "Rodyti perjungiklio mygtukus" -#: ../shell/e-shell-window-actions.c:1703 +#: ../shell/e-shell-window-actions.c:1712 msgid "Show _Status Bar" msgstr "Rodyti _būsenos juostą" -#: ../shell/e-shell-window-actions.c:1705 +#: ../shell/e-shell-window-actions.c:1714 msgid "Show the status bar" msgstr "Rodyti būsenos juostą" -#: ../shell/e-shell-window-actions.c:1711 +#: ../shell/e-shell-window-actions.c:1720 msgid "Show _Tool Bar" msgstr "Rodyti į_rankinę" -#: ../shell/e-shell-window-actions.c:1713 +#: ../shell/e-shell-window-actions.c:1722 msgid "Show the tool bar" msgstr "Rodyti įrankinę" -#: ../shell/e-shell-window-actions.c:1735 +#: ../shell/e-shell-window-actions.c:1744 msgid "_Icons Only" msgstr "_Tik piktogramos" -#: ../shell/e-shell-window-actions.c:1737 +#: ../shell/e-shell-window-actions.c:1746 msgid "Display window buttons with icons only" msgstr "Rodyti langų mygtukus tik su piktogramomis" -#: ../shell/e-shell-window-actions.c:1742 +#: ../shell/e-shell-window-actions.c:1751 msgid "_Text Only" msgstr "_Tik tekstas" -#: ../shell/e-shell-window-actions.c:1744 +#: ../shell/e-shell-window-actions.c:1753 msgid "Display window buttons with text only" msgstr "Rodyti langų mygtukus tik su tekstu" -#: ../shell/e-shell-window-actions.c:1749 +#: ../shell/e-shell-window-actions.c:1758 msgid "Icons _and Text" msgstr "Piktogramos _ir tekstas" -#: ../shell/e-shell-window-actions.c:1751 +#: ../shell/e-shell-window-actions.c:1760 msgid "Display window buttons with icons and text" msgstr "Rodyti langų mygtukus su piktogramomis ir tekstu" -#: ../shell/e-shell-window-actions.c:1756 +#: ../shell/e-shell-window-actions.c:1765 msgid "Tool_bar Style" msgstr "Įrankinės s_tilius" -#: ../shell/e-shell-window-actions.c:1758 +#: ../shell/e-shell-window-actions.c:1767 msgid "Display window buttons using the desktop toolbar setting" msgstr "Rodyti langų mygtukus naudojant aplinkos įrankinių nustatymus" -#: ../shell/e-shell-window-actions.c:1766 +#: ../shell/e-shell-window-actions.c:1775 msgid "Define Views..." msgstr "Nurodyti rodinius..." -#: ../shell/e-shell-window-actions.c:1768 +#: ../shell/e-shell-window-actions.c:1777 msgid "Create or edit views" msgstr "Sukurti ar keisti rodinius" -#: ../shell/e-shell-window-actions.c:1773 +#: ../shell/e-shell-window-actions.c:1782 msgid "Save Custom View..." msgstr "Įrašyti pasirinktinį rodinį..." -#: ../shell/e-shell-window-actions.c:1775 +#: ../shell/e-shell-window-actions.c:1784 msgid "Save current custom view" msgstr "Įrašyti dabartinį pasirinktinį rodinį..." -#: ../shell/e-shell-window-actions.c:1782 +#: ../shell/e-shell-window-actions.c:1791 msgid "C_urrent View" msgstr "_Dabartinis rodinys" -#: ../shell/e-shell-window-actions.c:1792 +#: ../shell/e-shell-window-actions.c:1801 msgid "Custom View" msgstr "Pasirinktinis rodinys" -#: ../shell/e-shell-window-actions.c:1794 +#: ../shell/e-shell-window-actions.c:1803 msgid "Current view is a customized view" msgstr "Dabartinis rodinys yra pasirinktinis rodinys" -#: ../shell/e-shell-window-actions.c:1804 +#: ../shell/e-shell-window-actions.c:1813 msgid "Change the page settings for your current printer" msgstr "Pakeisti puslapio parametrus dabartiniam spausdintuvui" -#: ../shell/e-shell-window-actions.c:2194 +#: ../shell/e-shell-window-actions.c:2203 #, c-format msgid "Switch to %s" msgstr "Perjungti į %s" -#: ../shell/e-shell-window-actions.c:2414 +#: ../shell/e-shell-window-actions.c:2323 +#, c-format +msgid "Select view: %s" +msgstr "Pasirinkite rodinį: %s" + +#: ../shell/e-shell-window-actions.c:2423 msgid "Execute these search parameters" msgstr "Vykdyti šiuos paieškos parametrus" @@ -18664,12 +18693,12 @@ msgstr "Importuoti URI ar failų vardus, pateiktus kaip argumentų liekana." msgid "Request a running Evolution process to quit" msgstr "Nurodyti veikiančiam Evolution procesui baigti darbą" -#: ../shell/main.c:508 -#: ../shell/main.c:516 +#: ../shell/main.c:506 +#: ../shell/main.c:514 msgid "- The Evolution PIM and Email Client" msgstr "– Evolution PIM ir el. pašto klientas" -#: ../shell/main.c:579 +#: ../shell/main.c:577 #, c-format msgid "" "%s: --online and --offline cannot be used together.\n" @@ -18678,7 +18707,7 @@ msgstr "" "%s: negalima naudoti --online ir --offline tuo pačiu metu.\n" " Naudokite „%s --help“ norėdami gauti daugiau informacijos.\n" -#: ../shell/main.c:585 +#: ../shell/main.c:583 #, c-format msgid "" "%s: --force-online and --offline cannot be used together.\n" @@ -19087,16 +19116,16 @@ msgid "Trust the authenticity of this certificate" msgstr "Pasitikėti šio liudijimo autentiškumu" #: ../smime/gui/smime-ui.ui.h:35 -msgid "Trust this CA to identify email users." -msgstr "Pasitikėti šia liudijimų įstaiga atpažįstant el. pašto naudotojus." +msgid "Trust this CA to identify _email users." +msgstr "Pasitikėti šia liudijimų įstaiga atpažįstant e_l. pašto naudotojus." #: ../smime/gui/smime-ui.ui.h:36 -msgid "Trust this CA to identify software developers." -msgstr "Pasitikėti šia liudijimų įstaiga atpažįstant programų kūrėjus." +msgid "Trust this CA to identify _software developers." +msgstr "Pasitikėti šia liudijimų įstaiga atpažįstant _programų kūrėjus." #: ../smime/gui/smime-ui.ui.h:37 -msgid "Trust this CA to identify websites." -msgstr "Pasitikėti šia liudijimų įstaiga žiniatinklio svetainėms atpažinti." +msgid "Trust this CA to identify _websites." +msgstr "Pasitikėti šia liudijimų įstaiga žiniatinklio svetainėms _atpažinti." #: ../smime/gui/smime-ui.ui.h:38 msgid "Validity" @@ -19413,19 +19442,19 @@ msgstr "Su _būsena" msgid "UTC" msgstr "UTC" -#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:2 +#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:1 msgid "Select a Time Zone" msgstr "Pasirinkite laiko juostą" -#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:3 +#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:2 msgid "Time Zones" msgstr "Laiko juostos" -#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:4 +#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:3 msgid "Timezone drop-down combination box" msgstr "Laiko juostos išskleidžiamas langas" -#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:5 +#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:4 msgid "" "Use the left mouse button to zoom in on an area of the map and select a time zone.\n" "Use the right mouse button to zoom out." @@ -19433,7 +19462,7 @@ msgstr "" "Naudodami kairįjį pelės mygtuką padidinkite žemėlapio sritį ir pasirinkite\n" "laiko juostą. Dešiniuoju pelės mygtuku galite ją sumažinti." -#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:7 +#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:6 msgid "_Selection" msgstr "_Pažymėjimas" @@ -19493,11 +19522,11 @@ msgstr "Paskyrom naudoti numatytąjį Evolution _rikiavimą" msgid "De_fault" msgstr "_Numatytasis" -#: ../widgets/misc/e-account-tree-view.c:404 +#: ../widgets/misc/e-account-tree-view.c:407 msgid "Account Name" msgstr "Paskyros pavadinimas" -#: ../widgets/misc/e-account-tree-view.c:435 +#: ../widgets/misc/e-account-tree-view.c:438 msgid "Protocol" msgstr "Protokolas" @@ -20433,685 +20462,11 @@ msgstr "spustelėti" msgid "sort" msgstr "rikiuoti" -#: ../widgets/text/e-text.c:2325 +#: ../widgets/text/e-text.c:2328 msgid "Select All" msgstr "Pažymėti visus" -#: ../widgets/text/e-text.c:2337 +#: ../widgets/text/e-text.c:2340 msgid "Input Methods" msgstr "Įvesties metodai" -#~ msgid "Composer load/attach directory" -#~ msgstr "Rašymo lango priedų aplankas" - -#~ msgid "Directory for loading/attaching files to composer." -#~ msgstr "Failų įkėlimo / prisegimo laiško rašymo lange aplankas." - -#~ msgid "Initial file chooser folder" -#~ msgstr "Pradinis failų parinkiklio aplankas" - -#~ msgid "Initial folder for GtkFileChooser dialogs." -#~ msgstr "Pradinis GtkFileChooser dialogų aplankas." - -#~ msgid "Local Folders" -#~ msgstr "Vietiniai aplankai" - -#~ msgid "Alarms" -#~ msgstr "Perspėjimai" - -#~ msgid "Save as iCalendar..." -#~ msgstr "Įrašyti kaip iCalendar..." - -#~ msgid "Invalid object" -#~ msgstr "Netinkamas objektas" - -#~ msgid "Edit Alarm" -#~ msgstr "Keisti perspėjimą" - -#~ msgid "Add Alarm" -#~ msgstr "Pridėti perspėjimą" - -#~ msgid "Alarm" -#~ msgstr "Perspėjimas" - -#~ msgid "Click here to close the current window" -#~ msgstr "Norėdami užverti šį langą, spustelėkite čia" - -#~ msgid "Click here to view help available" -#~ msgstr "Norėdami pamatyti žinyną, spustelėkite čia" - -#~ msgid "Click here to save the current window" -#~ msgstr "Norėdami išsaugoti šį langą, spustelėkite čia" - -#~ msgid "Click here to attach a file" -#~ msgstr "Norėdami prisegti failą, spustelėkite čia" - -#~ msgid "_Alarms" -#~ msgstr "_Perspėjimai" - -#~ msgid "The organizer selected no longer has an account." -#~ msgstr "Pasirinktas organizatorius nebeturi sąskaitos." -#~ msgctxt "cal-alarms" - -#~ msgid "None" -#~ msgstr "Nėra" - -#~ msgid "Custom Alarm:" -#~ msgstr "Kitas perspėjimas:" - -#~ msgid "_Alarm" -#~ msgstr "Perspėjim_as" - -#~ msgid "_Group:" -#~ msgstr "_Grupė:" - -#~ msgid "It has alarms." -#~ msgstr "Jame yra perspėjimų." -#~ msgctxt "iCalImp" - -#~ msgid "has alarms" -#~ msgstr "su perspėjimais" - -#~ msgid "Run Anjal in a window" -#~ msgstr "Paleisti Anjal lange" - -#~ msgid "Make Anjal the default email client" -#~ msgstr "Padaryti Anjal numatytuoju elektroninio pašto klientu" - -#~ msgid "Anjal email client" -#~ msgstr "Anjal elektroninio pašto klientas" - -#~ msgid "Opening folder '%s'" -#~ msgstr "Atveriamas aplankas „%s“" - -#~ msgid "Please select a folder from the current account." -#~ msgstr "Pasirinkite dabartinei paskyrai priklausantį aplanką." - -#~ msgid "Scanning folders in \"%s\"" -#~ msgstr "Skenuojami aplankai, esantys „%s“" - -#~ msgid "Creating folder '%s'" -#~ msgstr "Kuriamas aplankas „%s“" - -#~ msgid "_Default junk plugin:" -#~ msgstr "_Numatytasis brukalo įskiepis" - -#~ msgid "_Use Secure Connection:" -#~ msgstr "Na_udoti saugią jungtį:" - -#~ msgid "Scanning folders in '%s'" -#~ msgstr "Skenuojami aplankai, esantys „%s“" - -#~ msgid "Retrieving quota information for folder '%s'" -#~ msgstr "Gaunama aplanko „%s“ kvotos informacija" - -#~ msgid "Opening store '%s'" -#~ msgstr "Atveriama saugykla „%s“" - -#~ msgid "Error saving messages to: %s:\n" -#~ msgstr "Klaida rašant laiškus į: %s:\n" - -#~ msgid "Checking Service" -#~ msgstr "Tikrinama paslauga" - -#~ msgid "Updating Search Folders for '%s'" -#~ msgstr "Atnaujinami paieškos aplankai skirti „%s“" - -#~ msgid "Delete messages in Search Folder \"{0}\"?" -#~ msgstr "Ištrinti paieškos aplanke „{0}“ esančius laiškus?" - -#~ msgid "Alarm programs" -#~ msgstr "Perspėjimų programos" -#~ msgctxt "mail-junk-hook" - -#~ msgid "None" -#~ msgstr "Nėra" - -#~ msgid "Header Value Contains:" -#~ msgstr "Antraštės reikšmėje yra:" - -#~ msgid "%s plugin is available and the binary is installed." -#~ msgstr "%s įskiepis prieinamas ir programa yra įdiegta." - -#~ msgid "" -#~ "%s plugin is not available. Please check whether the package is installed." -#~ msgstr "Įskiepis %s neprieinamas. Patikrinkite, ar paketas yra įdiegtas." - -#~ msgid "No junk plugin available" -#~ msgstr "Nėra brukalo tikrinimo įskiepių" - -#~ msgid "Bogofilter is not available. Please install it first." -#~ msgstr "Bogofilter neprieinamas. Iš pradžių jį įdiekite." - -#~ msgid "Error occurred while spawning %s: %s." -#~ msgstr "Klaida įjungiant %s: %s." - -#~ msgid "Bogofilter child process does not respond, killing..." -#~ msgstr "Bogofiltro antrinis procesas neatsako, nutraukiamas..." - -#~ msgid "Wait for Bogofilter child process interrupted, terminating..." -#~ msgstr "Bogofiltro antrinio proceso laukimas pertrauktas, nutraukiama..." - -#~ msgid "Pipe to Bogofilter failed, error code: %d." -#~ msgstr "Nepavyko sukurti konvejerio į Bogofiltrą, klaidos kodas: %d." - -#~ msgid "Bogofilter Junk Filter" -#~ msgstr "Bogofiltro brukalo filtras" - -#~ msgid "Filter junk messages using Bogofilter." -#~ msgstr "Filtruoti brukalo laiškus naudojant Bogofilter." - -#~ msgid "Use _SSL" -#~ msgstr "Naudoti _SSL" - -#~ msgid "_Secure connection" -#~ msgstr "_Saugus ryšys" - -#~ msgid "Show a map of all the contacts" -#~ msgstr "Rodyti visų kontaktų žemėlapį" - -#~ msgid "Add a map showing the location of contacts when possible." -#~ msgstr "Pridėti žemėlapį, rodantį kontaktų vietovę, kai įmanoma." - -#~ msgid "Map for contacts" -#~ msgstr "Kontaktų žemėlapis" - -#~ msgid "Checklist" -#~ msgstr "Sąrašas" - -#~ msgid "Enter password for %s (user %s)" -#~ msgstr "Įveskite %s slaptažodį (naudotojas %s)" - -#~ msgid "Failed to authenticate.\n" -#~ msgstr "Autorizacija nepavyko.\n" - -#~ msgid "New _Shared Folder..." -#~ msgstr "Naujas _viešinamas aplankas..." - -#~ msgid "_Proxy Login..." -#~ msgstr "Į_galiotinio prisijungimo vardas..." - -#~ msgid "Junk Mail Settings..." -#~ msgstr "Brukalo parametrai..." - -#~ msgid "Track Message Status..." -#~ msgstr "Sekti laiško būseną..." - -#~ msgid "Retract Mail" -#~ msgstr "Atšaukti paštą" - -#~ msgid "Accept" -#~ msgstr "Priimti" - -#~ msgid "Accept Tentatively" -#~ msgstr "Laikinai priimti" - -#~ msgid "Decline" -#~ msgstr "Atsisakyti" - -#~ msgid "Rese_nd Meeting..." -#~ msgstr "Siųsti susitikimą iš _naujo..." - -#~ msgid "Create folder" -#~ msgstr "Sukurti aplanką" - -#~ msgid "" -#~ "The user '%s' has shared a folder with you\n" -#~ "\n" -#~ "Message from '%s'\n" -#~ "\n" -#~ "\n" -#~ "%s\n" -#~ "\n" -#~ "\n" -#~ "Click 'Apply' to install the shared folder\n" -#~ "\n" -#~ msgstr "" -#~ "Naudotojas „%s“ su jumis naudoja bendrą aplanką\n" -#~ "\n" -#~ "Laiškas iš „%s“\n" -#~ "\n" -#~ "\n" -#~ "%s\n" -#~ "\n" -#~ "\n" -#~ "Norėdami įdiegti bendrinamą aplanką, spustelėkite „Pritaikyti“\n" -#~ "\n" - -#~ msgid "Install the shared folder" -#~ msgstr "Įdiegti bendrinamą aplanką" - -#~ msgid "Shared Folder Installation" -#~ msgstr "Bendrinamo aplanko diegimas" - -#~ msgid "Junk Settings" -#~ msgstr "Brukalo parametrai" - -#~ msgid "Junk Mail Settings" -#~ msgstr "Brukalo parametrai" - -#~ msgid "Email:" -#~ msgstr "El. paštas:" - -#~ msgid "Junk List:" -#~ msgstr "Brukalo sąrašas:" - -#~ msgid "_Enable" -#~ msgstr "Į_jungti" - -#~ msgid "_Junk List" -#~ msgstr "Š_lamšto sąrašas" - -#~ msgid "Message Retract" -#~ msgstr "Laiško atšaukimas" - -#~ msgid "" -#~ "Retracting a message may remove it from the recipient's mailbox. Are you " -#~ "sure you want to do this?" -#~ msgstr "" -#~ "Atšaukiant laišką jis gali būti pašalintas iš gavėjo pašto dėžutės. Ar " -#~ "tikrai norite tai padaryti?" - -#~ msgid "Message retracted successfully" -#~ msgstr "Laiškas sėkmingai atšauktas" - -#~ msgid "Insert Send options" -#~ msgstr "Įterpti siuntimo parinktis" - -#~ msgid "The participants will receive the following notification.\n" -#~ msgstr "Dalyviai gaus šiuos pranešimus.\n" - -#~ msgid "Add Send Options to GroupWise messages" -#~ msgstr "Pridėti siuntimo parinktis GroupWise žinutėse" - -#~ msgid "Fine-tune your GroupWise accounts." -#~ msgstr "Konfigūruoti savo GroupWise paskyras." - -#~ msgid "GroupWise Features" -#~ msgstr "GroupWise funkcijos" - -#~ msgid "Message retract failed" -#~ msgstr "Nepavyko atšaukti laiško" - -#~ msgid "The server did not allow the selected message to be retracted." -#~ msgstr "Serveris neleido atšaukti pasirinko laiško." - -#~ msgid "" -#~ "Account "{0}" already exists. Please check your folder tree." -#~ msgstr "Paskyra „{1}“ jau yra. Patikrinkite savo aplankų medį." - -#~ msgid "Account Already Exists" -#~ msgstr "Paskyra jau yra" - -#~ msgid "Invalid user" -#~ msgstr "Netinkamas naudotojas" - -#~ msgid "" -#~ "Proxy login as "{0}" was unsuccessful. Please check your email " -#~ "address and try again." -#~ msgstr "" -#~ "Prisijungti prie tarpinio serverio kaip „{0}“ nepavyko. Patikrinkite savo " -#~ "el. pašto adresą ir bandykite dar kartą." - -#~ msgid "Proxy access cannot be given to user "{0}"" -#~ msgstr "Įgaliotinio prieiga naudotojui „{0}“ negali būti suteikta;" - -#~ msgid "Specify User" -#~ msgstr "Nurodykite naudotoją" - -#~ msgid "You have already given proxy permissions to this user." -#~ msgstr "Jau suteikėte šiam naudotojui įgaliotinio teises." - -#~ msgid "You have to specify a valid user name to give proxy rights." -#~ msgstr "" -#~ "Norėdami suteikti įgaliotinio teises turite nurodyti tinkamą naudotojo " -#~ "vardą." - -#~ msgid "You cannot share this folder with the specified user "{0}"" -#~ msgstr "Negalite viešinti šio aplanko nurodytajam naudotojui „{0}“" - -#~ msgid "You have to specify a user name which you want to add to the list" -#~ msgstr "Turite nurodyti naudotojo vardą, kurį norite įtraukti į sąrašą" - -#~ msgid "Do you want to resend the meeting?" -#~ msgstr "Ar tikrai norite iš naujo išsiųsti šį susitikimą?" - -#~ msgid "Do you want to resend the recurring meeting?" -#~ msgstr "Ar tikrai norite iš naujo išsiųsti pasikartojantį susitikimą?" - -#~ msgid "Do you want to retract the original item?" -#~ msgstr "Ar norite grąžinti pradinį elementą?" - -#~ msgid "The original will be removed from the recipient's mailbox." -#~ msgstr "Pradinis elementas bus ištrintas iš gavėjo dėžutės." - -#~ msgid "This is a recurring meeting" -#~ msgstr "Tai yra pasikartojantis įvykis" - -#~ msgid "This will create a new meeting using the existing meeting details." -#~ msgstr "" -#~ "Bus sukurtas naujas susitikimas, naudojant esamo susitikimo informaciją." - -#~ msgid "" -#~ "This will create a new meeting with the existing meeting details. The " -#~ "recurrence rule needs to be re-entered." -#~ msgstr "" -#~ "Bus sukurtas naujas susitikimas, naudojant esamo susitikimo informaciją. " -#~ "Reikės iš naujo įvesti pasikartojimo taisyklę." - -#~ msgid "Would you like to accept it?" -#~ msgstr "Ar norite jį priimti?" - -#~ msgid "Would you like to decline it?" -#~ msgstr "Ar norite jo atsisakyti?" - -#~ msgid "C_ustomize notification message" -#~ msgstr "_Taisyti pranešimo tekstą" - -#~ msgid "Con_tacts..." -#~ msgstr "Kon_taktai..." - -#~ msgid "Shared Folder Notification" -#~ msgstr "Viešinamo aplanko pranešimas" - -#~ msgid "Users:" -#~ msgstr "Naudotojai:" - -#~ msgid "_Not Shared" -#~ msgstr "_Nepaviešinta" - -#~ msgid "_Shared With..." -#~ msgstr "_Viešinama su ..." - -#~ msgid "Access Rights" -#~ msgstr "Prieigos teisės" - -#~ msgid "Add/Edit" -#~ msgstr "Pridėti / keisti" - -#~ msgid "Con_tacts" -#~ msgstr "Kon_taktai" - -#~ msgid "Modify _folders/options/rules/" -#~ msgstr "Keisti _aplankus / parinktis / taisykles" - -#~ msgid "Read items marked _private" -#~ msgstr "Skaityti elementus pažymėtus _privačiais" - -#~ msgid "Subscribe to my _alarms" -#~ msgstr "Užsakyti mano _perspėjimus" - -#~ msgid "Subscribe to my _notifications" -#~ msgstr "Užsakyti mano _pranešimus" - -#~ msgid "_Write" -#~ msgstr "_Rašyti" - -#~ msgid "permission to read|_Read" -#~ msgstr "_Skaityti" - -#~ msgid "Proxy" -#~ msgstr "Įgaliotinis" - -#~ msgid "Proxy Login" -#~ msgstr "Įgaliotinio prisijungimo vardas" - -#~ msgid "%sEnter password for %s (user %s)" -#~ msgstr "%sĮveskite %s slaptažodį (naudotojas %s)" - -#~ msgid "The Proxy tab will be available only when the account is online." -#~ msgstr "" -#~ "Įgaliotinio kortelė bus prieinama tik tada, kai paskyra bus prisijungimo " -#~ "veiksenoje." - -#~ msgid "The Proxy tab will be available only when the account is enabled." -#~ msgstr "Įgaliotinio kortelė bus prieinama tik tada, kai paskyra įjungta." -#~ msgctxt "GW" - -#~ msgid "Proxy" -#~ msgstr "Įgaliotinis" - -#~ msgid "Add User" -#~ msgstr "Pridėti naudotoją" - -#~ msgid "Advanced send options" -#~ msgstr "Sudėtingesnės siuntimo parinktys" - -#~ msgid "Users" -#~ msgstr "Naudotojai" - -#~ msgid "Enter the users and set permissions" -#~ msgstr "Įveskite naudotojus ir nurodykite teises" - -#~ msgid "Sharing" -#~ msgstr "Viešinimas" - -#~ msgid "Custom Notification" -#~ msgstr "Pasirinktinis pranešimas" - -#~ msgid "Add " -#~ msgstr "Pridėti " - -#~ msgid "Modify" -#~ msgstr "Keisti" - -#~ msgid "Message Status" -#~ msgstr "Laiško būsena" - -#~ msgid "Subject:" -#~ msgstr "Tema:" - -#~ msgid "From:" -#~ msgstr "Nuo:" - -#~ msgid "Creation date:" -#~ msgstr "Sukūrimo data:" - -#~ msgid "Recipient: " -#~ msgstr "Gavėjas:" - -#~ msgid "Delivered: " -#~ msgstr "Pristatyta:" - -#~ msgid "Opened: " -#~ msgstr "Atverta:" - -#~ msgid "Accepted: " -#~ msgstr "Priimta:" - -#~ msgid "Deleted: " -#~ msgstr "Ištrinta:" - -#~ msgid "Declined: " -#~ msgstr "Atmesta:" - -#~ msgid "Completed: " -#~ msgstr "Baigta:" - -#~ msgid "Undelivered: " -#~ msgstr "Nepristatyta:" - -#~ msgid "Enable D-Bus messages." -#~ msgstr "Įjungti D-Bus pranešimus." - -#~ msgid "Generates a D-Bus message when new mail messages arrive." -#~ msgstr "Gavus naują paštą sukuria D-BUS žinutę." - -#~ msgid "Popup message together with the icon." -#~ msgstr "Rodyti iššokantį pranešimą kartu su piktograma." - -#~ msgid "Whether show message over the icon when new messages arrive." -#~ msgstr "Ar rodyti pranešimą virš piktogramos gavus naujų laiškų." - -#~ msgid "Show icon in _notification area" -#~ msgstr "Rodyti piktogramą _pranešimų srityje" - -#~ msgid "Popup _message together with the icon" -#~ msgstr "Iškeliamas _pranešimas kartu su piktograma" - -#~ msgid "Generate a _D-Bus message" -#~ msgstr "Generuoti _D-Bus pranešimą" - -#~ msgid "" -#~ "Selected calendar contains some events for the given mails already. Would " -#~ "you like to create new events anyway?" -#~ msgstr "" -#~ "Pasirinktame kalendoriuje jau yra įvykių, susijusių su nurodytais " -#~ "laiškais. Ar vistiek pageidaujate sukurti naujų įvykių?" - -#~ msgid "" -#~ "Selected task list contains some tasks for the given mails already. Would " -#~ "you like to create new tasks anyway?" -#~ msgstr "" -#~ "Pasirinktame užduočių sąraše jau yra užduočių, susijusių su nurodytais " -#~ "laiškais. Ar vistiek pageidaujate sukurti naujų užduočių?" - -#~ msgid "" -#~ "Selected memo list contains some memos for the given mails already. Would " -#~ "you like to create new memos anyway?" -#~ msgstr "" -#~ "Pasirinktame raštelių sąraše jau yra raštelių, susijusių su nurodytais " -#~ "laiškais. Ar vistiek pageidaujate sukurti naujų raštelių?" - -#~ msgid "" -#~ "Selected calendar contains an event for the given mail already. Would you " -#~ "like to create new event anyway?" - -#~ msgid_plural "" -#~ "Selected calendar contains events for the given mails already. Would you " -#~ "like to create new events anyway?" -#~ msgstr[0] "" -#~ "Pasirinktame kalendoriuje jau yra įvykis, susijęs su nurodytu laišku. Ar " -#~ "vistiek pageidaujate sukurti naują įvykių?" -#~ msgstr[1] "" -#~ "Pasirinktame kalendoriuje jau yra įvykių, susijusių su nurodytais " -#~ "laiškais. Ar vistiek pageidaujate sukurti naujų įvykių?" -#~ msgstr[2] "" -#~ "Pasirinktame kalendoriuje jau yra įvykių, susijusių su nurodytais " -#~ "laiškais. Ar vistiek pageidaujate sukurti naujų įvykių?" - -#~ msgid "" -#~ "Selected task list contains a task for the given mail already. Would you " -#~ "like to create new task anyway?" - -#~ msgid_plural "" -#~ "Selected task list contains tasks for the given mails already. Would you " -#~ "like to create new tasks anyway?" -#~ msgstr[0] "" -#~ "Pasirinktame užduočių sąraše jau yra užduotis, susijusi su nurodytu " -#~ "laišku. Ar vistiek pageidaujate sukurti naują užduotį?" -#~ msgstr[1] "" -#~ "Pasirinktame užduočių sąraše jau yra užduočių, susijusių su nurodytais " -#~ "laiškais. Ar vistiek pageidaujate sukurti naujų užduočių?" -#~ msgstr[2] "" -#~ "Pasirinktame užduočių sąraše jau yra užduočių, susijusių su nurodytais " -#~ "laiškais. Ar vistiek pageidaujate sukurti naujų užduočių?" - -#~ msgid "" -#~ "Selected memo list contains a memo for the given mail already. Would you " -#~ "like to create new memo anyway?" - -#~ msgid_plural "" -#~ "Selected memo list contains memos for the given mails already. Would you " -#~ "like to create new memos anyway?" -#~ msgstr[0] "" -#~ "Pasirinktame raštelių sąraše jau yra raštelis, susijęs su nurodytu " -#~ "laišku. Ar vistiek pageidaujate sukurti naują raštelį?" -#~ msgstr[1] "" -#~ "Pasirinktame raštelių sąraše jau yra raštelių, susijusių su nurodytais " -#~ "laiškais. Ar vistiek pageidaujate sukurti naujų raštelių?" -#~ msgstr[2] "" -#~ "Pasirinktame raštelių sąraše jau yra raštelių, susijusių su nurodytais " -#~ "laiškais. Ar vistiek pageidaujate sukurti naujų raštelių?" - -#~ msgid "Evolution Profiler" -#~ msgstr "Evolution profiliavimas" - -#~ msgid "Profile data events in Evolution (for developers only)." -#~ msgstr "" -#~ "Profilio duomenų įvykiai Evolution programoje (tik programuotojams)." - -#~ msgid "SpamAssassin not found, code: %d" -#~ msgstr "SpamAssassin nerastas, kodas: %d" - -#~ msgid "Failed to create pipe: %s" -#~ msgstr "Nepavyko sukurti konvejerio: %s" - -#~ msgid "Error after fork: %s" -#~ msgstr "Klaida po atšakojimo: %s" - -#~ msgid "SpamAssassin child process does not respond, killing..." -#~ msgstr "SpamAssassin antrinis procesas neatsako, nutraukiamas..." - -#~ msgid "Wait for SpamAssassin child process interrupted, terminating..." -#~ msgstr "SpamAssassin antrinio proceso laukimas nutrauktas, nutraukiama..." - -#~ msgid "Pipe to SpamAssassin failed, error code: %d" -#~ msgstr "Nepavyko sukurti konvejerio į SpamAssassin, klaidos kodas: %d" - -#~ msgid "SpamAssassin is not available. Please install it first." -#~ msgstr "SpamAssassin neprieinamas. Iš pradžių jį įdiekite." - -#~ msgid "SpamAssassin Junk Filter" -#~ msgstr "SpamAssassin brukalo filtras" - -#~ msgid "iCalendar format (.ics)" -#~ msgstr "iCalendar formatas (.ics)" - -#~ msgid "Drafts based template plugin" -#~ msgstr "Juodraščiais pagrįstas šablonų įskiepis" - -#~ msgid "Evolution _FAQ" -#~ msgstr "Evolution _DUK" - -#~ msgid "Open the Frequently Asked Questions webpage" -#~ msgstr "Atverti dažniausiai užduodamų klausimų tinklalapį" - -#~ msgid "Failed to import contact's certificate" -#~ msgstr "Nepavyko importuoti kontakto liudijimo" - -#~ msgid "E-Mail Address" -#~ msgstr "El. pašto adresas" - -#~ msgid "Failed to import certificate authority's certificate" -#~ msgstr "Nepavyko importuoti liudijimų įstaigos liudijimo" - -#~ msgid "(map)" -#~ msgstr "(žemėlapis)" - -#~ msgid "map" -#~ msgstr "žemėlapis" - -#~ msgid "Accessing LDAP Server anonymously" -#~ msgstr "Susisiekiama su LDAP serveriu anonimiškai" - -#~ msgid "Count of default recurrence for a new event. -1 means forever." -#~ msgstr "Naujo įvykio numatytasis pasikartojimų skaičius. -1 – amžinai." - -#~ msgid "Default recurrence count" -#~ msgstr "Numatytasis pasikartojimų skaičius" - -#~ msgid "Event Gradient" -#~ msgstr "Įvykio perėjimas" - -#~ msgid "Event Transparency" -#~ msgstr "Įvykio permatomumas" - -#~ msgid "Gradient of the events in calendar views." -#~ msgstr "Įvykių perėjimas kalendoriaus vaizde." - -#~ msgid "" -#~ "Transparency of the events in calendar views, a value between 0 " -#~ "(transparent) and 1 (opaque)." -#~ msgstr "" -#~ "Įvykių permatomumas kalendoriaus rodinyje, reikšmė tarp 0 (permatoma) ir " -#~ "1 (nepermatoma)." - -#~ msgid "URI of the highlighted (\"primary\") calendar" -#~ msgstr "Paryškinto („pirminio“) kalendoriaus URI" - -#~ msgid "URI of the highlighted (\"primary\") memo list" -#~ msgstr "Paryškinto („pirminio“) raštelių sąrašo URI" - -#~ msgid "URI of the highlighted (\"primary\") task list" -#~ msgstr "Paryškinto („pirminio“) užduočių sąrašo URI" diff --git a/shell/main.c b/shell/main.c index 0b042d4d40..c8ce8a014a 100644 --- a/shell/main.c +++ b/shell/main.c @@ -57,6 +57,7 @@ #include <libxml/tree.h> #include <libedataserver/e-categories.h> +#include <libedataserver/e-gdbus-templates.h> #include <libedataserverui/e-passwords.h> #include "e-shell.h" @@ -514,6 +515,8 @@ main (gint argc, ical_set_unknown_token_handling_setting (ICAL_DISCARD_TOKEN); #endif + e_gdbus_templates_init_main_thread (); + #ifdef G_OS_WIN32 path = g_build_path (";", _e_get_bindir (), g_getenv ("PATH"), NULL); diff --git a/widgets/misc/Makefile.am b/widgets/misc/Makefile.am index 79bc14bcbe..5235c1ca54 100644 --- a/widgets/misc/Makefile.am +++ b/widgets/misc/Makefile.am @@ -23,6 +23,7 @@ widgetsinclude_HEADERS = \ e-attachment-store.h \ e-attachment-tree-view.h \ e-attachment-view.h \ + e-auth-combo-box.h \ e-buffer-tagger.h \ e-calendar.h \ e-calendar-item.h \ @@ -107,6 +108,7 @@ libemiscwidgets_la_SOURCES = \ e-attachment-store.c \ e-attachment-tree-view.c \ e-attachment-view.c \ + e-auth-combo-box.c \ e-buffer-tagger.c \ e-calendar.c \ e-calendar-item.c \ diff --git a/widgets/misc/e-auth-combo-box.c b/widgets/misc/e-auth-combo-box.c new file mode 100644 index 0000000000..182e171c00 --- /dev/null +++ b/widgets/misc/e-auth-combo-box.c @@ -0,0 +1,260 @@ +/* + * e-auth-combo-box.c + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) version 3. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with the program; if not, see <http://www.gnu.org/licenses/> + * + */ + +#include "e-auth-combo-box.h" + +#define E_AUTH_COMBO_BOX_GET_PRIVATE(obj) \ + (G_TYPE_INSTANCE_GET_PRIVATE \ + ((obj), E_TYPE_AUTH_COMBO_BOX, EAuthComboBoxPrivate)) + +struct _EAuthComboBoxPrivate { + CamelProvider *provider; +}; + +enum { + PROP_0, + PROP_PROVIDER +}; + +enum { + COLUMN_MECHANISM, + COLUMN_DISPLAY_NAME, + COLUMN_STRIKETHROUGH, + COLUMN_AUTHTYPE, + NUM_COLUMNS +}; + +G_DEFINE_TYPE ( + EAuthComboBox, + e_auth_combo_box, + GTK_TYPE_COMBO_BOX) + +static void +auth_combo_box_rebuild_model (EAuthComboBox *combo_box) +{ + GtkComboBox *gtk_combo_box; + CamelProvider *provider; + GtkTreeModel *model; + GList *link; + const gchar *active_id; + + provider = e_auth_combo_box_get_provider (combo_box); + + gtk_combo_box = GTK_COMBO_BOX (combo_box); + model = gtk_combo_box_get_model (gtk_combo_box); + active_id = gtk_combo_box_get_active_id (gtk_combo_box); + + gtk_list_store_clear (GTK_LIST_STORE (model)); + + if (provider == NULL) + return; + + for (link = provider->authtypes; link != NULL; link = link->next) { + CamelServiceAuthType *authtype = link->data; + GtkTreeIter iter; + + gtk_list_store_append (GTK_LIST_STORE (model), &iter); + + gtk_list_store_set ( + GTK_LIST_STORE (model), &iter, + COLUMN_MECHANISM, authtype->authproto, + COLUMN_DISPLAY_NAME, authtype->name, + COLUMN_AUTHTYPE, authtype, + -1); + } + + /* Try selecting the previous mechanism. */ + if (active_id != NULL) + gtk_combo_box_set_active_id (gtk_combo_box, active_id); + + /* Or else fall back to the first mechanism. */ + if (gtk_combo_box_get_active (gtk_combo_box) == -1) + gtk_combo_box_set_active (gtk_combo_box, 0); +} + +static void +auth_combo_box_set_property (GObject *object, + guint property_id, + const GValue *value, + GParamSpec *pspec) +{ + switch (property_id) { + case PROP_PROVIDER: + e_auth_combo_box_set_provider ( + E_AUTH_COMBO_BOX (object), + g_value_get_pointer (value)); + return; + } + + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); +} + +static void +auth_combo_box_get_property (GObject *object, + guint property_id, + GValue *value, + GParamSpec *pspec) +{ + switch (property_id) { + case PROP_PROVIDER: + g_value_set_pointer ( + value, + e_auth_combo_box_get_provider ( + E_AUTH_COMBO_BOX (object))); + return; + } + + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); +} + +static void +auth_combo_box_constructed (GObject *object) +{ + GtkComboBox *combo_box; + GtkListStore *list_store; + GtkCellLayout *cell_layout; + GtkCellRenderer *cell_renderer; + + /* Chain up to parent's constructed() method. */ + G_OBJECT_CLASS (e_auth_combo_box_parent_class)->constructed (object); + + list_store = gtk_list_store_new ( + NUM_COLUMNS, + G_TYPE_STRING, /* COLUMN_MECHANISM */ + G_TYPE_STRING, /* COLUMN_DISPLAY_NAME */ + G_TYPE_BOOLEAN, /* COLUMN_STRIKETHROUGH */ + G_TYPE_POINTER); /* COLUMN_AUTHTYPE */ + + combo_box = GTK_COMBO_BOX (object); + gtk_combo_box_set_model (combo_box, GTK_TREE_MODEL (list_store)); + gtk_combo_box_set_id_column (combo_box, COLUMN_MECHANISM); + g_object_unref (list_store); + + cell_layout = GTK_CELL_LAYOUT (object); + cell_renderer = gtk_cell_renderer_text_new (); + gtk_cell_layout_pack_start (cell_layout, cell_renderer, TRUE); + + gtk_cell_layout_set_attributes ( + cell_layout, cell_renderer, + "text", COLUMN_DISPLAY_NAME, + "strikethrough", COLUMN_STRIKETHROUGH, + NULL); +} + +static void +e_auth_combo_box_class_init (EAuthComboBoxClass *class) +{ + GObjectClass *object_class; + + g_type_class_add_private (class, sizeof (EAuthComboBoxPrivate)); + + object_class = G_OBJECT_CLASS (class); + object_class->set_property = auth_combo_box_set_property; + object_class->get_property = auth_combo_box_get_property; + object_class->constructed = auth_combo_box_constructed; + + g_object_class_install_property ( + object_class, + PROP_PROVIDER, + g_param_spec_pointer ( + "provider", + "Provider", + "The provider to query for auth mechanisms", + G_PARAM_READWRITE | + G_PARAM_STATIC_STRINGS)); +} + +static void +e_auth_combo_box_init (EAuthComboBox *combo_box) +{ + combo_box->priv = E_AUTH_COMBO_BOX_GET_PRIVATE (combo_box); +} + +CamelProvider * +e_auth_combo_box_get_provider (EAuthComboBox *combo_box) +{ + g_return_val_if_fail (E_IS_AUTH_COMBO_BOX (combo_box), NULL); + + return combo_box->priv->provider; +} + +void +e_auth_combo_box_set_provider (EAuthComboBox *combo_box, + CamelProvider *provider) +{ + g_return_if_fail (E_IS_AUTH_COMBO_BOX (combo_box)); + + if (provider == combo_box->priv->provider) + return; + + combo_box->priv->provider = provider; + + g_object_notify (G_OBJECT (combo_box), "provider"); + + auth_combo_box_rebuild_model (combo_box); +} + +void +e_auth_combo_box_update_available (EAuthComboBox *combo_box, + GList *available_authtypes) +{ + GtkComboBox *gtk_combo_box; + GtkTreeModel *model; + GtkTreeIter iter; + gint active_index; + gint available_index = -1; + gint index = 0; + gboolean iter_set; + + g_return_if_fail (E_IS_AUTH_COMBO_BOX (combo_box)); + + gtk_combo_box = GTK_COMBO_BOX (combo_box); + model = gtk_combo_box_get_model (gtk_combo_box); + active_index = gtk_combo_box_get_active (gtk_combo_box); + + iter_set = gtk_tree_model_get_iter_first (model, &iter); + + while (iter_set) { + CamelServiceAuthType *authtype; + gboolean available; + + gtk_tree_model_get ( + model, &iter, COLUMN_AUTHTYPE, &authtype, -1); + + available = (g_list_find ( + available_authtypes, authtype) != NULL); + + gtk_list_store_set ( + GTK_LIST_STORE (model), &iter, + COLUMN_STRIKETHROUGH, !available, -1); + + if (index == active_index && !available) + active_index = -1; + + if (available && available_index == -1) + available_index = index; + + iter_set = gtk_tree_model_iter_next (model, &iter); + index++; + } + + /* If the active combo_box item turned out to be unavailable + * (or there was no active item), select the first available. */ + if (active_index == -1 && available_index != -1) + gtk_combo_box_set_active (gtk_combo_box, available_index); +} diff --git a/widgets/misc/e-auth-combo-box.h b/widgets/misc/e-auth-combo-box.h new file mode 100644 index 0000000000..e449f1c06b --- /dev/null +++ b/widgets/misc/e-auth-combo-box.h @@ -0,0 +1,71 @@ +/* + * e-auth-combo-box.h + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) version 3. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with the program; if not, see <http://www.gnu.org/licenses/> + * + */ + +#ifndef E_AUTH_COMBO_BOX_H +#define E_AUTH_COMBO_BOX_H + +#include <gtk/gtk.h> +#include <camel/camel.h> + +/* Standard GObject macros */ +#define E_TYPE_AUTH_COMBO_BOX \ + (e_auth_combo_box_get_type ()) +#define E_AUTH_COMBO_BOX(obj) \ + (G_TYPE_CHECK_INSTANCE_CAST \ + ((obj), E_TYPE_AUTH_COMBO_BOX, EAuthComboBox)) +#define E_AUTH_COMBO_BOX_CLASS(cls) \ + (G_TYPE_CHECK_CLASS_CAST \ + ((cls), E_TYPE_AUTH_COMBO_BOX, EAuthComboBoxClass)) +#define E_IS_AUTH_COMBO_BOX(obj) \ + (G_TYPE_CHECK_INSTANCE_TYPE \ + ((obj), E_TYPE_AUTH_COMBO_BOX)) +#define E_IS_AUTH_COMBO_BOX_CLASS(cls) \ + (G_TYPE_CHECK_CLASS_TYPE \ + ((cls), E_TYPE_AUTH_COMBO_BOX)) +#define E_AUTH_COMBO_BOX_GET_CLASS(obj) \ + (G_TYPE_INSTANCE_GET_CLASS \ + ((obj), E_TYPE_AUTH_COMBO_BOX, EAuthComboBoxClass)) + +G_BEGIN_DECLS + +typedef struct _EAuthComboBox EAuthComboBox; +typedef struct _EAuthComboBoxClass EAuthComboBoxClass; +typedef struct _EAuthComboBoxPrivate EAuthComboBoxPrivate; + +struct _EAuthComboBox { + GtkComboBox parent; + EAuthComboBoxPrivate *priv; +}; + +struct _EAuthComboBoxClass { + GtkComboBoxClass parent_class; +}; + +GType e_auth_combo_box_get_type (void) G_GNUC_CONST; +GtkWidget * e_auth_combo_box_new (void); +CamelProvider * e_auth_combo_box_get_provider (EAuthComboBox *combo_box); +void e_auth_combo_box_set_provider (EAuthComboBox *combo_box, + CamelProvider *provider); +void e_auth_combo_box_update_available + (EAuthComboBox *combo_box, + GList *available_authtypes); + +G_END_DECLS + +#endif /* E_AUTH_COMBO_BOX_H */ + diff --git a/widgets/misc/e-port-entry.c b/widgets/misc/e-port-entry.c index dd27ffa371..cc90302771 100644 --- a/widgets/misc/e-port-entry.c +++ b/widgets/misc/e-port-entry.c @@ -11,19 +11,20 @@ * Dan Vratil <dvratil@redhat.com> */ -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - #include "e-port-entry.h" +#include <config.h> +#include <errno.h> #include <stddef.h> #include <string.h> +#define E_PORT_ENTRY_GET_PRIVATE(obj) \ + (G_TYPE_INSTANCE_GET_PRIVATE \ + ((obj), E_TYPE_PORT_ENTRY, EPortEntryPrivate)) + struct _EPortEntryPrivate { - guint port; - gboolean is_valid; CamelNetworkSecurityMethod method; + CamelProviderPortEntry *entries; }; enum { @@ -44,89 +45,98 @@ G_DEFINE_TYPE ( e_port_entry, GTK_TYPE_COMBO_BOX) -static void -port_entry_set_is_valid (EPortEntry *port_entry, - gboolean is_valid) +static GtkEntry * +port_entry_get_entry (EPortEntry *port_entry) { - g_return_if_fail (E_IS_PORT_ENTRY (port_entry)); - - port_entry->priv->is_valid = is_valid; - - g_object_notify (G_OBJECT (port_entry), "is-valid"); + return GTK_ENTRY (gtk_bin_get_child (GTK_BIN (port_entry))); } -/** - * Returns number of port currently selected in the widget, no matter - * what value is in the PORT property - */ -static gint -port_entry_get_model_active_port (EPortEntry *port_entry) +static gboolean +port_entry_get_numeric_port (EPortEntry *port_entry, + gint *out_port) { - const gchar *port; + GtkEntry *entry; + const gchar *port_string; + gboolean valid; + gint port; - port = gtk_combo_box_get_active_id (GTK_COMBO_BOX (port_entry)); + entry = port_entry_get_entry (port_entry); - if (!port) { - GtkWidget *entry = gtk_bin_get_child (GTK_BIN (port_entry)); - port = gtk_entry_get_text (GTK_ENTRY (entry)); - } + port_string = gtk_entry_get_text (entry); + g_return_val_if_fail (port_string != NULL, FALSE); + + errno = 0; + port = strtol (port_string, NULL, 10); + valid = (errno == 0) && (port == CLAMP (port, 1, G_MAXUINT16)); - return atoi (port); + if (valid && out_port != NULL) + *out_port = port; + + return valid; } static void -port_entry_port_changed (EPortEntry *port_entry) +port_entry_text_changed (GtkEditable *editable, + EPortEntry *port_entry) { - GtkTreeModel *model; - GtkTreeIter iter; - const gchar *port; - const gchar *tooltip; - - g_return_if_fail (E_IS_PORT_ENTRY (port_entry)); - - model = gtk_combo_box_get_model (GTK_COMBO_BOX (port_entry)); - g_return_if_fail (model); - - if (!gtk_combo_box_get_active_iter (GTK_COMBO_BOX (port_entry), &iter)) { - GtkWidget *entry = gtk_bin_get_child (GTK_BIN (port_entry)); - port = gtk_entry_get_text (GTK_ENTRY (entry)); - - /* Try if user just haven't happened to enter a default port */ - gtk_combo_box_set_active_id (GTK_COMBO_BOX (port_entry), port); - } else { - gtk_tree_model_get (model, &iter, PORT_NUM_COLUMN, &port, -1); + GObject *object = G_OBJECT (port_entry); + const gchar *desc = NULL; + gint port = 0; + gint ii = 0; + + g_object_freeze_notify (object); + + port_entry_get_numeric_port (port_entry, &port); + + if (port_entry->priv->entries != NULL) { + while (port_entry->priv->entries[ii].port > 0) { + if (port == port_entry->priv->entries[ii].port) { + desc = port_entry->priv->entries[ii].desc; + break; + } + ii++; + } } - if (gtk_combo_box_get_active_iter (GTK_COMBO_BOX (port_entry), &iter)) { - gtk_tree_model_get (model, &iter, PORT_DESC_COLUMN, &tooltip, -1); - gtk_widget_set_tooltip_text (GTK_WIDGET (port_entry), tooltip); - } else { + if (desc != NULL) + gtk_widget_set_tooltip_text (GTK_WIDGET (port_entry), desc); + else gtk_widget_set_has_tooltip (GTK_WIDGET (port_entry), FALSE); - } - if (port == NULL || *port == '\0') { - port_entry->priv->port = 0; - port_entry_set_is_valid (port_entry, FALSE); - } else { - port_entry->priv->port = atoi (port); - if ((port_entry->priv->port <= 0) || - (port_entry->priv->port > G_MAXUINT16)) { - port_entry->priv->port = 0; - port_entry_set_is_valid (port_entry, FALSE); - } else { - port_entry_set_is_valid (port_entry, TRUE); - } - } + g_object_notify (object, "port"); + g_object_notify (object, "is-valid"); - g_object_notify (G_OBJECT (port_entry), "port"); + g_object_thaw_notify (object); } static void port_entry_method_changed (EPortEntry *port_entry) { CamelNetworkSecurityMethod method; + gboolean standard_port = FALSE; + gboolean valid; + gint port = 0; + gint ii = 0; method = e_port_entry_get_security_method (port_entry); + valid = port_entry_get_numeric_port (port_entry, &port); + + /* Only change the port number if it's currently on a standard + * port (i.e. listed in a CamelProviderPortEntry). Otherwise, + * leave custom port numbers alone. */ + + if (valid && port_entry->priv->entries != NULL) { + while (port_entry->priv->entries[ii].port > 0) { + if (port == port_entry->priv->entries[ii].port) { + standard_port = TRUE; + break; + } + ii++; + } + } + + if (valid && !standard_port) + return; switch (method) { case CAMEL_NETWORK_SECURITY_METHOD_SSL_ON_ALTERNATE_PORT: @@ -145,12 +155,6 @@ port_entry_set_property (GObject *object, GParamSpec *pspec) { switch (property_id) { - case PROP_IS_VALID: - port_entry_set_is_valid ( - E_PORT_ENTRY (object), - g_value_get_boolean (value)); - return; - case PROP_PORT: e_port_entry_set_port ( E_PORT_ENTRY (object), @@ -197,6 +201,21 @@ port_entry_get_property (GObject *object, } static void +port_entry_constructed (GObject *object) +{ + GtkEntry *entry; + + /* Chain up to parent's constructed() method. */ + G_OBJECT_CLASS (e_port_entry_parent_class)->constructed (object); + + entry = port_entry_get_entry (E_PORT_ENTRY (object)); + + g_signal_connect_after ( + entry, "changed", + G_CALLBACK (port_entry_text_changed), object); +} + +static void port_entry_get_preferred_width (GtkWidget *widget, gint *minimum_size, gint *natural_size) @@ -204,7 +223,7 @@ port_entry_get_preferred_width (GtkWidget *widget, PangoContext *context; PangoFontMetrics *metrics; PangoFontDescription *font_desc; - GtkStyleContext *style_context; + GtkStyleContext *style_context; GtkStateFlags state; gint digit_width; gint parent_entry_width_min; @@ -257,6 +276,7 @@ e_port_entry_class_init (EPortEntryClass *class) object_class = G_OBJECT_CLASS (class); object_class->set_property = port_entry_set_property; object_class->get_property = port_entry_get_property; + object_class->constructed = port_entry_constructed; widget_class = GTK_WIDGET_CLASS (class); widget_class->get_preferred_width = port_entry_get_preferred_width; @@ -304,10 +324,7 @@ e_port_entry_init (EPortEntry *port_entry) GtkCellRenderer *renderer; GtkListStore *store; - port_entry->priv = G_TYPE_INSTANCE_GET_PRIVATE ( - port_entry, E_TYPE_PORT_ENTRY, EPortEntryPrivate); - port_entry->priv->port = 0; - port_entry->priv->is_valid = FALSE; + port_entry->priv = E_PORT_ENTRY_GET_PRIVATE (port_entry); store = gtk_list_store_new ( 3, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_BOOLEAN); @@ -335,11 +352,6 @@ e_port_entry_init (EPortEntry *port_entry) GTK_CELL_LAYOUT (port_entry), renderer, "text", PORT_DESC_COLUMN); - /* Update the port property when port is changed */ - g_signal_connect ( - port_entry, "changed", - G_CALLBACK (port_entry_port_changed), NULL); - g_signal_connect ( port_entry, "notify::security-method", G_CALLBACK (port_entry_method_changed), NULL); @@ -356,22 +368,31 @@ void e_port_entry_set_camel_entries (EPortEntry *port_entry, CamelProviderPortEntry *entries) { + GtkComboBox *combo_box; GtkTreeIter iter; GtkTreeModel *model; GtkListStore *store; + gint port = 0; gint i = 0; g_return_if_fail (E_IS_PORT_ENTRY (port_entry)); g_return_if_fail (entries); - model = gtk_combo_box_get_model (GTK_COMBO_BOX (port_entry)); - store = GTK_LIST_STORE (model); + port_entry->priv->entries = entries; + + combo_box = GTK_COMBO_BOX (port_entry); + model = gtk_combo_box_get_model (combo_box); + store = GTK_LIST_STORE (model); gtk_list_store_clear (store); while (entries[i].port > 0) { gchar *port_string; + /* Grab the first port number. */ + if (port == 0) + port = entries[i].port; + port_string = g_strdup_printf ("%i", entries[i].port); gtk_list_store_append (store, &iter); @@ -386,49 +407,34 @@ e_port_entry_set_camel_entries (EPortEntry *port_entry, g_free (port_string); } - /* Activate the first port */ - if (i > 0) - e_port_entry_set_port (port_entry, entries[0].port); + e_port_entry_set_port (port_entry, port); } gint e_port_entry_get_port (EPortEntry *port_entry) { + gint port = 0; + g_return_val_if_fail (E_IS_PORT_ENTRY (port_entry), 0); - return port_entry->priv->port; + port_entry_get_numeric_port (port_entry, &port); + + return port; } void e_port_entry_set_port (EPortEntry *port_entry, gint port) { - g_return_if_fail (E_IS_PORT_ENTRY (port_entry)); - - port_entry->priv->port = port; - if ((port <= 0) || (port > G_MAXUINT16)) - port_entry_set_is_valid (port_entry, FALSE); - else { - gchar *port_string; - - port_string = g_strdup_printf ("%i", port); - - gtk_combo_box_set_active_id ( - GTK_COMBO_BOX (port_entry), port_string); + GtkEntry *entry; + gchar *port_string; - if (port_entry_get_model_active_port (port_entry) != port) { - GtkWidget *entry; - - entry = gtk_bin_get_child (GTK_BIN (port_entry)); - gtk_entry_set_text (GTK_ENTRY (entry), port_string); - } - - port_entry_set_is_valid (port_entry, TRUE); - - g_free (port_string); - } + g_return_if_fail (E_IS_PORT_ENTRY (port_entry)); - g_object_notify (G_OBJECT (port_entry), "port"); + entry = port_entry_get_entry (port_entry); + port_string = g_strdup_printf ("%i", port); + gtk_entry_set_text (entry, port_string); + g_free (port_string); } gboolean @@ -436,7 +442,7 @@ e_port_entry_is_valid (EPortEntry *port_entry) { g_return_val_if_fail (E_IS_PORT_ENTRY (port_entry), FALSE); - return port_entry->priv->is_valid; + return port_entry_get_numeric_port (port_entry, NULL); } CamelNetworkSecurityMethod |