diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2013-02-17 23:06:18 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2013-02-18 02:36:38 +0800 |
| commit | b117764a5017f9b6a70a964b8aed469eaef488b5 (patch) | |
| tree | ab5ceee526179e2b2fdab1a77b70cc4fe4c36eb6 /modules | |
| parent | 30d711da21ca466697b844095a3c4ecfbb60606f (diff) | |
| download | gsoc2013-evolution-b117764a5017f9b6a70a964b8aed469eaef488b5.tar gsoc2013-evolution-b117764a5017f9b6a70a964b8aed469eaef488b5.tar.gz gsoc2013-evolution-b117764a5017f9b6a70a964b8aed469eaef488b5.tar.bz2 gsoc2013-evolution-b117764a5017f9b6a70a964b8aed469eaef488b5.tar.lz gsoc2013-evolution-b117764a5017f9b6a70a964b8aed469eaef488b5.tar.xz gsoc2013-evolution-b117764a5017f9b6a70a964b8aed469eaef488b5.tar.zst gsoc2013-evolution-b117764a5017f9b6a70a964b8aed469eaef488b5.zip | |
EBookShellBackend: Use EClientCache to obtain an EClient.
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/addressbook/e-book-shell-backend.c | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/modules/addressbook/e-book-shell-backend.c b/modules/addressbook/e-book-shell-backend.c index 4de01f9e1c..30a8691fc9 100644 --- a/modules/addressbook/e-book-shell-backend.c +++ b/modules/addressbook/e-book-shell-backend.c @@ -99,7 +99,8 @@ book_shell_backend_new_contact_cb (GObject *source_object, EABEditor *editor; GError *error = NULL; - client = e_book_client_connect_finish (result, &error); + client = e_client_cache_get_client_finish ( + E_CLIENT_CACHE (source_object), result, &error); /* Sanity check. */ g_return_if_fail ( @@ -138,7 +139,8 @@ book_shell_backend_new_contact_list_cb (GObject *source_object, EABEditor *editor; GError *error = NULL; - client = e_book_client_connect_finish (result, &error); + client = e_client_cache_get_client_finish ( + E_CLIENT_CACHE (source_object), result, &error); /* Sanity check. */ g_return_if_fail ( @@ -173,11 +175,13 @@ action_contact_new_cb (GtkAction *action, EShell *shell; ESource *source = NULL; ESourceRegistry *registry; + EClientCache *client_cache; const gchar *action_name; /* This callback is used for both contacts and contact lists. */ shell = e_shell_window_get_shell (shell_window); + client_cache = e_shell_get_client_cache (shell); if (g_strcmp0 (e_shell_window_get_active_view (shell_window), "addressbook") == 0) { EShellView *shell_view = e_shell_window_get_shell_view (shell_window, "addressbook"); @@ -213,13 +217,17 @@ action_contact_new_cb (GtkAction *action, /* Use a callback function appropriate for the action. */ action_name = gtk_action_get_name (action); if (strcmp (action_name, "contact-new") == 0) - e_book_client_connect ( - source, NULL, + e_client_cache_get_client ( + client_cache, source, + E_SOURCE_EXTENSION_ADDRESS_BOOK, + NULL, book_shell_backend_new_contact_cb, g_object_ref (shell)); if (strcmp (action_name, "contact-new-list") == 0) - e_book_client_connect ( - source, NULL, + e_client_cache_get_client ( + client_cache, source, + E_SOURCE_EXTENSION_ADDRESS_BOOK, + NULL, book_shell_backend_new_contact_list_cb, g_object_ref (shell)); |