aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2013-02-25 23:37:26 +0800
committerMatthew Barnes <mbarnes@redhat.com>2013-02-25 23:50:10 +0800
commitaa17db517535c3bc341c81cb24fa27fcfda140ea (patch)
tree69a7a936258c8db853d7925ddeb985d42c31231d
parent8dd670b6df691ad8acc0e53fd66ecb6846da0dba (diff)
downloadgsoc2013-evolution-aa17db517535c3bc341c81cb24fa27fcfda140ea.tar
gsoc2013-evolution-aa17db517535c3bc341c81cb24fa27fcfda140ea.tar.gz
gsoc2013-evolution-aa17db517535c3bc341c81cb24fa27fcfda140ea.tar.bz2
gsoc2013-evolution-aa17db517535c3bc341c81cb24fa27fcfda140ea.tar.lz
gsoc2013-evolution-aa17db517535c3bc341c81cb24fa27fcfda140ea.tar.xz
gsoc2013-evolution-aa17db517535c3bc341c81cb24fa27fcfda140ea.tar.zst
gsoc2013-evolution-aa17db517535c3bc341c81cb24fa27fcfda140ea.zip
ECalShellSidebar: Show a unique display name while connecting.
Use e_source_registry_dup_unique_display_name() in the status message.
-rw-r--r--modules/calendar/e-cal-shell-sidebar.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/modules/calendar/e-cal-shell-sidebar.c b/modules/calendar/e-cal-shell-sidebar.c
index a9ba205a1f..544197e9d9 100644
--- a/modules/calendar/e-cal-shell-sidebar.c
+++ b/modules/calendar/e-cal-shell-sidebar.c
@@ -853,22 +853,28 @@ void
e_cal_shell_sidebar_add_source (ECalShellSidebar *cal_shell_sidebar,
ESource *source)
{
+ ESourceRegistry *registry;
ESourceSelector *selector;
- const gchar *display_name;
+ gchar *display_name;
gchar *message;
g_return_if_fail (E_IS_CAL_SHELL_SIDEBAR (cal_shell_sidebar));
g_return_if_fail (E_IS_SOURCE (source));
selector = e_cal_shell_sidebar_get_selector (cal_shell_sidebar);
+ registry = e_source_selector_get_registry (selector);
e_source_selector_select_source (selector, source);
- display_name = e_source_get_display_name (source);
+ display_name = e_source_registry_dup_unique_display_name (
+ registry, source, E_SOURCE_EXTENSION_CALENDAR);
+
message = g_strdup_printf (_("Opening calendar '%s'"), display_name);
cal_shell_sidebar_emit_status_message (cal_shell_sidebar, message);
g_free (message);
+ g_free (display_name);
+
e_client_selector_get_client (
E_CLIENT_SELECTOR (selector), source,
cal_shell_sidebar->priv->loading_clients,