evolution r37117 - in trunk: addressbook addressbook/gui/component calendar calendar/gui

[mcrha svn gnome org]

Author: mcrha
Date: Wed Jan 21 19:30:36 2009
New Revision: 37117
URL: http://svn.gnome.org/viewvc/evolution?rev=37117&view=rev

Log:
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.



Modified:
   trunk/addressbook/ChangeLog
   trunk/addressbook/gui/component/addressbook-component.c
   trunk/calendar/ChangeLog
   trunk/calendar/gui/calendar-component.c
   trunk/calendar/gui/memos-component.c
   trunk/calendar/gui/tasks-component.c

Modified: trunk/addressbook/gui/component/addressbook-component.c
==============================================================================
--- trunk/addressbook/gui/component/addressbook-component.c	(original)
+++ trunk/addressbook/gui/component/addressbook-component.c	Wed Jan 21 19:30:36 2009
@@ -137,6 +137,9 @@
 		       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 @@
 		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 @@
 		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);

Modified: trunk/calendar/gui/calendar-component.c
==============================================================================
--- trunk/calendar/gui/calendar-component.c	(original)
+++ trunk/calendar/gui/calendar-component.c	Wed Jan 21 19:30:36 2009
@@ -238,6 +238,9 @@
 		       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 @@
 		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 @@
 		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 @@
 				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 @@
 		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 @@
 	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);

Modified: trunk/calendar/gui/memos-component.c
==============================================================================
--- trunk/calendar/gui/memos-component.c	(original)
+++ trunk/calendar/gui/memos-component.c	Wed Jan 21 19:30:36 2009
@@ -193,6 +193,9 @@
 		       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 @@
 		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 @@
 		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);
 

Modified: trunk/calendar/gui/tasks-component.c
==============================================================================
--- trunk/calendar/gui/tasks-component.c	(original)
+++ trunk/calendar/gui/tasks-component.c	Wed Jan 21 19:30:36 2009
@@ -189,6 +189,9 @@
 		       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 @@
 		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 @@
 		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;