diff options
| -rw-r--r-- | calendar/gui/dialogs/calendar-setup.c | 16 | ||||
| -rw-r--r-- | modules/addressbook/addressbook-config.c | 5 | ||||
| -rw-r--r-- | modules/addressbook/e-book-shell-backend.c | 2 | ||||
| -rw-r--r-- | modules/calendar/e-cal-shell-backend.c | 4 | ||||
| -rw-r--r-- | modules/calendar/e-memo-shell-backend.c | 2 | ||||
| -rw-r--r-- | modules/calendar/e-task-shell-backend.c | 2 |
6 files changed, 25 insertions, 6 deletions
diff --git a/calendar/gui/dialogs/calendar-setup.c b/calendar/gui/dialogs/calendar-setup.c index 0ffdb4cf1f..8aa82c29e5 100644 --- a/calendar/gui/dialogs/calendar-setup.c +++ b/calendar/gui/dialogs/calendar-setup.c @@ -224,7 +224,21 @@ name_changed (GtkEntry *entry, ECalConfigTargetSource *t) { ESource *source = t->source; - e_source_set_name (source, gtk_entry_get_text (GTK_ENTRY (entry))); + ESourceGroup *group; + gboolean is_birthdays = FALSE; + gboolean changed; + const gchar *name; + + name = gtk_entry_get_text (GTK_ENTRY (entry)); + + changed = g_strcmp0 (name, e_source_peek_name (source)) != 0; + e_source_set_name (source, name); + + group = e_source_peek_group (source); + is_birthdays = group && g_strcmp0 (e_source_group_peek_base_uri (group), "contacts://") == 0; + + if (changed && (g_strcmp0 ("system", e_source_peek_relative_uri (source)) == 0 || is_birthdays)) + e_source_set_property (source, "name-changed", "true"); } static GtkWidget * diff --git a/modules/addressbook/addressbook-config.c b/modules/addressbook/addressbook-config.c index e3120246b3..028b7508c7 100644 --- a/modules/addressbook/addressbook-config.c +++ b/modules/addressbook/addressbook-config.c @@ -564,12 +564,17 @@ name_changed_cb (GtkWidget *w, { const gchar *text; gchar *stripped_name; + gboolean changed; text = gtk_entry_get_text (GTK_ENTRY (sdialog->display_name)); stripped_name = g_strstrip (g_strdup (text)); + changed = g_strcmp0 (stripped_name, e_source_peek_name (sdialog->source)) != 0; e_source_set_name (sdialog->source, stripped_name); g_free (stripped_name); + + if (changed && g_strcmp0 ("system", e_source_peek_relative_uri (sdialog->source)) == 0) + e_source_set_property (sdialog->source, "name-changed", "true"); } static GtkWidget * diff --git a/modules/addressbook/e-book-shell-backend.c b/modules/addressbook/e-book-shell-backend.c index 8ea434d344..ea65ce360f 100644 --- a/modules/addressbook/e-book-shell-backend.c +++ b/modules/addressbook/e-book-shell-backend.c @@ -128,7 +128,7 @@ book_shell_backend_ensure_sources (EShellBackend *shell_backend) e_source_set_property (source, "completion", "true"); g_object_unref (source); e_source_list_sync (priv->source_list, NULL); - } else { + } else if (!e_source_get_property (personal, "name-changed")) { /* Force the source name to the current locale. */ e_source_set_name (personal, name); e_source_list_sync (priv->source_list, NULL); diff --git a/modules/calendar/e-cal-shell-backend.c b/modules/calendar/e-cal-shell-backend.c index af1ca215fd..74bc62daa8 100644 --- a/modules/calendar/e-cal-shell-backend.c +++ b/modules/calendar/e-cal-shell-backend.c @@ -169,7 +169,7 @@ cal_shell_backend_ensure_sources (EShellBackend *shell_backend) g_slist_foreach (selected, (GFunc) g_free, NULL); g_slist_free (selected); g_free (primary); - } else { + } else if (!e_source_get_property (personal, "name-changed")) { /* Force the source name to the current locale. */ e_source_set_name (personal, name); } @@ -215,7 +215,7 @@ cal_shell_backend_ensure_sources (EShellBackend *shell_backend) /* This is now a borrowed reference. */ birthdays = source; - } else { + } else if (!e_source_get_property (birthdays, "name-changed")) { /* Force the source name to the current locale. */ e_source_set_name (birthdays, name); } diff --git a/modules/calendar/e-memo-shell-backend.c b/modules/calendar/e-memo-shell-backend.c index c31689fec9..c83c0fdfd9 100644 --- a/modules/calendar/e-memo-shell-backend.c +++ b/modules/calendar/e-memo-shell-backend.c @@ -153,7 +153,7 @@ memo_shell_backend_ensure_sources (EShellBackend *shell_backend) g_slist_foreach (selected, (GFunc) g_free, NULL); g_slist_free (selected); g_free (primary); - } else { + } else if (!e_source_get_property (personal, "name-changed")) { /* Force the source name to the current locale. */ e_source_set_name (personal, name); } diff --git a/modules/calendar/e-task-shell-backend.c b/modules/calendar/e-task-shell-backend.c index deca594c08..84500e4427 100644 --- a/modules/calendar/e-task-shell-backend.c +++ b/modules/calendar/e-task-shell-backend.c @@ -153,7 +153,7 @@ task_shell_backend_ensure_sources (EShellBackend *shell_backend) g_slist_foreach (selected, (GFunc) g_free, NULL); g_slist_free (selected); g_free (primary); - } else { + } else if (!e_source_get_property (personal, "name-changed")) { /* Force the source name to the current locale. */ e_source_set_name (personal, name); } |