diff options
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/addressbook/ldap-config.ui | 6 | ||||
| -rw-r--r-- | modules/mail/e-mail-shell-backend.c | 7 | ||||
| -rw-r--r-- | modules/mail/e-mail-shell-view-actions.c | 2 | ||||
| -rw-r--r-- | modules/mail/e-mail-shell-view.c | 2 | ||||
| -rw-r--r-- | modules/online-accounts/e-online-accounts-google.c | 13 |
5 files changed, 17 insertions, 13 deletions
diff --git a/modules/addressbook/ldap-config.ui b/modules/addressbook/ldap-config.ui index 99cc668efb..864e9389cf 100644 --- a/modules/addressbook/ldap-config.ui +++ b/modules/addressbook/ldap-config.ui @@ -247,7 +247,7 @@ <object class="GtkLabel" id="label556"> <property name="visible">True</property> <property name="xalign">0</property> - <property name="label" translatable="yes">_Server:</property> + <property name="label" translatable="yes">Ser_ver:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">server-name-entry</property> </object> @@ -263,7 +263,7 @@ <child> <object class="GtkLabel" id="label555"> <property name="visible">True</property> - <property name="label" translatable="yes">_Use secure connection:</property> + <property name="label" translatable="yes">Use secure _connection:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">ssl-combobox</property> </object> @@ -504,7 +504,7 @@ <object class="GtkLabel" id="label581"> <property name="visible">True</property> <property name="xalign">0</property> - <property name="label" translatable="yes">Search _filter:</property> + <property name="label" translatable="yes">S_earch filter:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">search-filter-entry</property> </object> diff --git a/modules/mail/e-mail-shell-backend.c b/modules/mail/e-mail-shell-backend.c index bc801dabf8..f498621852 100644 --- a/modules/mail/e-mail-shell-backend.c +++ b/modules/mail/e-mail-shell-backend.c @@ -160,9 +160,6 @@ action_mail_message_new_cb (GtkAction *action, shell = e_shell_window_get_shell (shell_window); - if (!em_utils_check_user_can_send_mail ()) - return; - /* Take care not to unnecessarily load the mail shell view. */ view_name = e_shell_window_get_active_view (shell_window); if (g_strcmp0 (view_name, BACKEND_NAME) != 0) @@ -268,9 +265,7 @@ mail_shell_backend_handle_uri_cb (EShell *shell, gboolean handled = FALSE; if (g_str_has_prefix (uri, "mailto:")) { - if (em_utils_check_user_can_send_mail ()) - em_utils_compose_new_message_with_mailto ( - shell, uri, NULL); + em_utils_compose_new_message_with_mailto (shell, uri, NULL); handled = TRUE; } diff --git a/modules/mail/e-mail-shell-view-actions.c b/modules/mail/e-mail-shell-view-actions.c index dc94c5c9ed..2427fc1ffd 100644 --- a/modules/mail/e-mail-shell-view-actions.c +++ b/modules/mail/e-mail-shell-view-actions.c @@ -123,6 +123,8 @@ action_mail_account_disable_cb (GtkAction *action, e_account_list_remove (account_list, account); e_account_list_save (account_list); + + e_shell_view_update_actions (shell_view); } static void diff --git a/modules/mail/e-mail-shell-view.c b/modules/mail/e-mail-shell-view.c index 5759b5830f..1e80e77a3c 100644 --- a/modules/mail/e-mail-shell-view.c +++ b/modules/mail/e-mail-shell-view.c @@ -990,7 +990,7 @@ mail_shell_view_update_actions (EShellView *shell_view) gtk_action_set_sensitive (action, sensitive); action = ACTION (MAIL_FOLDER_PROPERTIES); - sensitive = !folder_is_store; + sensitive = !folder_is_store && uri != NULL; gtk_action_set_sensitive (action, sensitive); action = ACTION (MAIL_FOLDER_REFRESH); diff --git a/modules/online-accounts/e-online-accounts-google.c b/modules/online-accounts/e-online-accounts-google.c index 666c407511..07c8923609 100644 --- a/modules/online-accounts/e-online-accounts-google.c +++ b/modules/online-accounts/e-online-accounts-google.c @@ -139,6 +139,15 @@ online_accounts_google_sync_mail (GoaObject *goa_object, const gchar *string; gboolean new_account = FALSE; + account_list = e_get_account_list (); + account = e_get_account_by_uid (evo_id); + + if (account) { + /* the account is already configured, + do not change user's changes */ + return; + } + /* XXX There's nothing particularly GMail-specific about this. * Maybe break this off into a more generic IMAP/SMTP sync * function and then apply any GMail-specific tweaks. */ @@ -146,9 +155,6 @@ online_accounts_google_sync_mail (GoaObject *goa_object, goa_mail = goa_object_get_mail (goa_object); goa_account = goa_object_get_account (goa_object); - account_list = e_get_account_list (); - account = e_get_account_by_uid (evo_id); - if (account == NULL) { account = g_object_new (E_TYPE_ACCOUNT, NULL); account->uid = g_strdup (evo_id); @@ -308,6 +314,7 @@ online_accounts_google_sync_calendar (GoaObject *goa_object, uri_string = g_strdup_printf ( "caldav://%s@www.google.com/calendar/dav/%s/events", encoded, string); + e_source_set_relative_uri (source, uri_string); e_source_set_absolute_uri (source, uri_string); g_free (uri_string); g_free (encoded); |