aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2013-02-25 23:40:18 +0800
committerMatthew Barnes <mbarnes@redhat.com>2013-02-25 23:50:10 +0800
commitac698896d0da608ba68d8356954dd996eea01a2a (patch)
treebe2211eeab4c5068479a692e35aeee382996025b
parentaa17db517535c3bc341c81cb24fa27fcfda140ea (diff)
downloadgsoc2013-evolution-ac698896d0da608ba68d8356954dd996eea01a2a.tar
gsoc2013-evolution-ac698896d0da608ba68d8356954dd996eea01a2a.tar.gz
gsoc2013-evolution-ac698896d0da608ba68d8356954dd996eea01a2a.tar.bz2
gsoc2013-evolution-ac698896d0da608ba68d8356954dd996eea01a2a.tar.lz
gsoc2013-evolution-ac698896d0da608ba68d8356954dd996eea01a2a.tar.xz
gsoc2013-evolution-ac698896d0da608ba68d8356954dd996eea01a2a.tar.zst
gsoc2013-evolution-ac698896d0da608ba68d8356954dd996eea01a2a.zip
EMemoShellSidebar: 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-memo-shell-sidebar.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/modules/calendar/e-memo-shell-sidebar.c b/modules/calendar/e-memo-shell-sidebar.c
index 9f36552388..48b962ab47 100644
--- a/modules/calendar/e-memo-shell-sidebar.c
+++ b/modules/calendar/e-memo-shell-sidebar.c
@@ -740,22 +740,28 @@ void
e_memo_shell_sidebar_add_source (EMemoShellSidebar *memo_shell_sidebar,
ESource *source)
{
+ ESourceRegistry *registry;
ESourceSelector *selector;
- const gchar *display_name;
+ gchar *display_name;
gchar *message;
g_return_if_fail (E_IS_MEMO_SHELL_SIDEBAR (memo_shell_sidebar));
g_return_if_fail (E_IS_SOURCE (source));
selector = e_memo_shell_sidebar_get_selector (memo_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_MEMO_LIST);
+
message = g_strdup_printf (_("Opening memo list '%s'"), display_name);
memo_shell_sidebar_emit_status_message (memo_shell_sidebar, message);
g_free (message);
+ g_free (display_name);
+
e_client_selector_get_client (
E_CLIENT_SELECTOR (selector), source,
memo_shell_sidebar->priv->loading_clients,