ECalShellSidebar: Use e_source_registry_dup_unique_display_name().

Use a standard format for naming an ESource in user-visible messages.

2 files changed, 15 insertions, 29 deletions

diff --git a/calendar/calendar.error.xml b/calendar/calendar.error.xml
index 441a3a45e4..7865badfd7 100644
--- a/calendar/calendar.error.xml
+++ b/calendar/calendar.error.xml
@@ -241,9 +241,8 @@
   </error>
 
   <error id="prompt-no-contents-offline-calendar" type="error" default="GTK_RESPONSE_YES">
-    <!-- Translators: {0} is replaced with a group name, like CalDAV, Google, or such;
-     {1} is replaced with a calendar/task/memo list name, where the error happened -->
-    <_primary>Error loading calendar '{0}: {1}'</_primary>
+    <!-- Translators: {0} is the name of the calendar. -->
+    <_primary>Error loading calendar '{0}'</_primary>
     <_secondary>The calendar is not marked for offline usage.</_secondary>
   </error>
 
@@ -274,10 +273,9 @@
   </error>
 
   <error id="failed-open-calendar" type="error" default="GTK_RESPONSE_YES">
-    <!-- Translators: {0} is replaced with a group name, like CalDAV, Google, or such;
-     {1} is replaced with a calendar/task/memo list name, where the error happened -->
-    <_primary>Error loading calendar '{0}: {1}'</_primary>
-    <secondary>{2}</secondary>
+    <!-- Translators: {0} is the name of the calendar. -->
+    <_primary>Error loading calendar '{0}'</_primary>
+    <secondary>{1}</secondary>
   </error>
 
   <error id="failed-open-tasks" type="error" default="GTK_RESPONSE_YES">
diff --git a/modules/calendar/e-cal-shell-sidebar.c b/modules/calendar/e-cal-shell-sidebar.c
index a9e2b73254..a9ba205a1f 100644
--- a/modules/calendar/e-cal-shell-sidebar.c
+++ b/modules/calendar/e-cal-shell-sidebar.c
@@ -67,8 +67,7 @@ struct _ConnectClosure {
 	ECalShellSidebar *cal_shell_sidebar;
 
 	/* For error messages. */
-	gchar *source_display_name;
-	gchar *parent_display_name;
+	gchar *unique_display_name;
 };
 
 enum {
@@ -99,20 +98,15 @@ connect_closure_new (ECalShellSidebar *cal_shell_sidebar,
 	ConnectClosure *closure;
 	ESourceRegistry *registry;
 	ESourceSelector *selector;
-	ESource *parent;
-	const gchar *parent_uid;
 
 	selector = e_cal_shell_sidebar_get_selector (cal_shell_sidebar);
 	registry = e_source_selector_get_registry (selector);
-	parent_uid = e_source_get_parent (source);
-	parent = e_source_registry_ref_source (registry, parent_uid);
 
 	closure = g_slice_new0 (ConnectClosure);
 	closure->cal_shell_sidebar = g_object_ref (cal_shell_sidebar);
-	closure->source_display_name = e_source_dup_display_name (source);
-	closure->parent_display_name = e_source_dup_display_name (parent);
-
-	g_object_unref (parent);
+	closure->unique_display_name =
+		e_source_registry_dup_unique_display_name (
+		registry, source, E_SOURCE_EXTENSION_CALENDAR);
 
 	return closure;
 }
@@ -122,8 +116,7 @@ connect_closure_free (ConnectClosure *closure)
 {
 	g_object_unref (closure->cal_shell_sidebar);
 
-	g_free (closure->source_display_name);
-	g_free (closure->parent_display_name);
+	g_free (closure->unique_display_name);
 
 	g_slice_free (ConnectClosure, closure);
 }
@@ -157,8 +150,7 @@ cal_shell_sidebar_emit_status_message (ECalShellSidebar *cal_shell_sidebar,
 
 static void
 cal_shell_sidebar_handle_connect_error (ECalShellSidebar *cal_shell_sidebar,
-                                        const gchar *parent_display_name,
-                                        const gchar *source_display_name,
+                                        const gchar *unique_display_name,
                                         const GError *error)
 {
 	EShellView *shell_view;
@@ -185,15 +177,13 @@ cal_shell_sidebar_handle_connect_error (ECalShellSidebar *cal_shell_sidebar,
 		e_alert_submit (
 			E_ALERT_SINK (shell_content),
 			"calendar:prompt-no-contents-offline-calendar",
-			parent_display_name,
-			source_display_name,
+			unique_display_name,
 			NULL);
 	} else {
 		e_alert_submit (
 			E_ALERT_SINK (shell_content),
 			"calendar:failed-open-calendar",
-			parent_display_name,
-			source_display_name,
+			unique_display_name,
 			error->message,
 			NULL);
 	}
@@ -219,8 +209,7 @@ cal_shell_sidebar_client_connect_cb (GObject *source_object,
 	if (error != NULL) {
 		cal_shell_sidebar_handle_connect_error (
 			closure->cal_shell_sidebar,
-			closure->parent_display_name,
-			closure->source_display_name,
+			closure->unique_display_name,
 			error);
 		g_error_free (error);
 		goto exit;
@@ -263,8 +252,7 @@ cal_shell_sidebar_default_connect_cb (GObject *source_object,
 	if (error != NULL) {
 		cal_shell_sidebar_handle_connect_error (
 			closure->cal_shell_sidebar,
-			closure->parent_display_name,
-			closure->source_display_name,
+			closure->unique_display_name,
 			error);
 		g_error_free (error);
 		goto exit;