** Fix for bug #362754

2009-01-21  Milan Crha  <mcrha@redhat.com>

	** Fix for bug #362754

	* addressbook/gui/component/addressbook-component.c: (ensure_sources):
	* calendar/gui/tasks-component.c: (ensure_sources):
	* calendar/gui/memos-component.c: (ensure_sources):
	* calendar/gui/calendar-component.c: (ensure_sources):
	Ensure to show default groups and sources with actual
	localized name, not the one it was stored last time.


svn path=/trunk/; revision=37117

6 files changed, 75 insertions, 12 deletions

diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index 2255936197..a47ad53c04 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,11 @@
+2009-01-21  Milan Crha  <mcrha@redhat.com>
+
+	** Fix for bug #362754
+
+	* gui/component/addressbook-component.c: (ensure_sources):
+	Ensure to show default groups and sources with actual
+	localized name, not the one it was stored last time.
+
 2009-01-11  Matthew Barnes  <mbarnes@redhat.com>
 
 	* gui/widgets/eab-contact-display.c (eab_uri_popup_link_open),
diff --git a/addressbook/gui/component/addressbook-component.c b/addressbook/gui/component/addressbook-component.c
index bd522b97d3..13c386fbba 100644
--- a/addressbook/gui/component/addressbook-component.c
+++ b/addressbook/gui/component/addressbook-component.c
@@ -137,6 +137,9 @@ ensure_sources (AddressbookComponent *component)
 		       and too late to prevent user seeing "Can not Open ... because of invalid uri" error.*/
 		    e_source_list_sync (source_list,NULL);
 		}
+
+		/* ensure the group name is in current locale, not read from configuration */
+		e_source_group_set_name (on_this_computer, _("On This Computer"));
 	}
 	else {
 		/* create the local source group */
@@ -146,7 +149,10 @@ ensure_sources (AddressbookComponent *component)
 		on_this_computer = group;
 	}
 
-	if (!personal_source) {
+	if (personal_source) {
+		/* ensure the source name is in current locale, not read from configuration */
+		e_source_set_name (personal_source, _("Personal"));
+	} else {
 		/* Create the default Person addressbook */
 		ESource *source = e_source_new (_("Personal"), PERSONAL_RELATIVE_URI);
 		e_source_group_add_source (on_this_computer, source, -1);
@@ -157,7 +163,10 @@ ensure_sources (AddressbookComponent *component)
 		personal_source = source;
 	}
 
-	if (!on_ldap_servers) {
+	if (on_ldap_servers) {
+		/* ensure the group name is in current locale, not read from configuration */
+		e_source_group_set_name (on_ldap_servers, _("On LDAP Servers"));
+	} else {
 		/* Create the LDAP source group */
 		group = e_source_group_new (_("On LDAP Servers"), LDAP_BASE_URI);
 		e_source_list_add_group (source_list, group, -1);
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 2b7f4ec612..8b39b3b09a 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,13 @@
+2009-01-21  Milan Crha  <mcrha@redhat.com>
+
+	** Fix for bug #362754
+
+	* gui/tasks-component.c: (ensure_sources):
+	* gui/memos-component.c: (ensure_sources):
+	* gui/calendar-component.c: (ensure_sources):
+	Ensure to show default groups and sources with actual
+	localized name, not the one it was stored last time.
+
 2009-01-21  Suman Manjunath  <msuman@novell.com>
 
 	** Fix for bug #541209
diff --git a/calendar/gui/calendar-component.c b/calendar/gui/calendar-component.c
index 0e1550b5f0..a3a9a8b345 100644
--- a/calendar/gui/calendar-component.c
+++ b/calendar/gui/calendar-component.c
@@ -238,6 +238,9 @@ ensure_sources (CalendarComponent *component)
 		       and too late to prevent user seeing "Can not Open ... because of invalid uri" error.*/
 		    e_source_list_sync (source_list,NULL);
 		}
+
+		/* ensure the group name is in current locale, not read from configuration */
+		e_source_group_set_name (on_this_computer, _("On This Computer"));
 	}
 	else {
 		/* create the local source group */
@@ -247,7 +250,10 @@ ensure_sources (CalendarComponent *component)
 		on_this_computer = group;
 	}
 
-	if (!personal_source) {
+	if (personal_source) {
+		/* ensure the source name is in current locale, not read from configuration */
+		e_source_set_name (personal_source, _("Personal"));
+	} else {
 		char *primary_calendar = calendar_config_get_primary_calendar();
 		GSList *calendars_selected;
 
@@ -276,13 +282,17 @@ ensure_sources (CalendarComponent *component)
 		e_source_set_color_spec (personal_source, "#BECEDD");
 	}
 
-	if (!on_the_web) {
+	if (on_the_web) {
+		/* ensure the group name is in current locale, not read from configuration */
+		e_source_group_set_name (on_the_web, _("On The Web"));
+	} else {
 		/* Create the On the web source group */
 		group = e_source_group_new (_("On The Web"), WEB_BASE_URI);
 		e_source_list_add_group (source_list, group, -1);
 
 		on_the_web = group;
 	}
+
 	if (contacts) {
 		GSList *sources = e_source_group_peek_sources (contacts);
 		if (sources) {
@@ -301,8 +311,10 @@ ensure_sources (CalendarComponent *component)
 				g_slist_free (l);
 			}
 		}
-	}
-	else  {
+
+		/* ensure the group name is in current locale, not read from configuration */
+		e_source_group_set_name (contacts, _("Contacts"));
+	} else {
 		/* Create the contacts group */
 		group = e_source_group_new (_("Contacts"), CONTACTS_BASE_URI);
 		e_source_list_add_group (source_list, group, -1);
@@ -314,7 +326,10 @@ ensure_sources (CalendarComponent *component)
 		e_source_group_set_property (contacts, "create_source", "no");
 	g_free (create_source);
 
-	if (!birthdays_source) {
+	if (birthdays_source) {
+		/* ensure the source name is in current locale, not read from configuration */
+		e_source_set_name (birthdays_source, _("Birthdays & Anniversaries"));
+	} else {
 		birthdays_source = e_source_new (_("Birthdays & Anniversaries"), "/");
 		e_source_group_add_source (contacts, birthdays_source, -1);
 		g_object_unref (birthdays_source);
@@ -326,7 +341,10 @@ ensure_sources (CalendarComponent *component)
 	if (e_source_peek_color_spec (birthdays_source) == NULL)
 		e_source_set_color_spec (birthdays_source, "#DDBECE");
 
-	if (!weather) {
+	if (weather) {
+		/* ensure the group name is in current locale, not read from configuration */
+		e_source_group_set_name (weather, _("Weather"));
+	} else {
 		/* Create the weather group */
 		group = e_source_group_new (_("Weather"), WEATHER_BASE_URI);
 		e_source_list_add_group (source_list, group, -1);
diff --git a/calendar/gui/memos-component.c b/calendar/gui/memos-component.c
index fea1a53fff..02c1df50ff 100644
--- a/calendar/gui/memos-component.c
+++ b/calendar/gui/memos-component.c
@@ -193,6 +193,9 @@ ensure_sources (MemosComponent *component)
 		       and too late to prevent user seeing "Can not Open ... because of invalid uri" error.*/
 		    e_source_list_sync (source_list,NULL);
 		}
+
+		/* ensure the group name is in current locale, not read from configuration */
+		e_source_group_set_name (on_this_computer, _("On This Computer"));
 	}
 	else {
 		/* create the local source group */
@@ -202,7 +205,10 @@ ensure_sources (MemosComponent *component)
 		on_this_computer = group;
 	}
 
-	if (!personal_source) {
+	if (personal_source) {
+		/* ensure the source name is in current locale, not read from configuration */
+		e_source_set_name (personal_source, _("Personal"));
+	} else {
 		GSList *memos_selected;
 		/* Create the default Person addressbook */
 		ESource *source = e_source_new (_("Personal"), PERSONAL_RELATIVE_URI);
@@ -230,8 +236,11 @@ ensure_sources (MemosComponent *component)
 		personal_source = source;
 	}
 
-	if (!on_the_web) {
-		/* Create the LDAP source group */
+	if (on_the_web) {
+		/* ensure the group name is in current locale, not read from configuration */
+		e_source_group_set_name (on_the_web, _("On The Web"));
+	} else {
+		/* Create the source group */
 		group = e_source_group_new (_("On The Web"), WEB_BASE_URI);
 		e_source_list_add_group (source_list, group, -1);
 
diff --git a/calendar/gui/tasks-component.c b/calendar/gui/tasks-component.c
index 823b4ffa11..9300068796 100644
--- a/calendar/gui/tasks-component.c
+++ b/calendar/gui/tasks-component.c
@@ -189,6 +189,9 @@ ensure_sources (TasksComponent *component)
 		       and too late to prevent user seeing "Can not Open ... because of invalid uri" error.*/
 		    e_source_list_sync (source_list,NULL);
 		}
+
+		/* ensure the group name is in current locale, not read from configuration */
+		e_source_group_set_name (on_this_computer, _("On This Computer"));
 	}
 	else {
 		/* create the local source group */
@@ -198,7 +201,10 @@ ensure_sources (TasksComponent *component)
 		on_this_computer = group;
 	}
 
-	if (!personal_source) {
+	if (personal_source) {
+		/* ensure the source name is in current locale, not read from configuration */
+		e_source_set_name (personal_source, _("Personal"));
+	} else {
 		GSList *tasks_selected;
 		/* Create the default Person addressbook */
 		ESource *source = e_source_new (_("Personal"), PERSONAL_RELATIVE_URI);
@@ -232,6 +238,9 @@ ensure_sources (TasksComponent *component)
 		e_source_list_add_group (source_list, group, -1);
 
 		on_the_web = group;
+	} else {
+		/* ensure the group name is in current locale, not read from configuration */
+		e_source_group_set_name (on_the_web, _("On The Web"));
 	}
 
 	component->priv->source_list = source_list;