diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2013-01-26 04:18:25 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2013-01-26 04:47:51 +0800 |
| commit | 3fa4dfc54dd08d75076d4881207bdc45c3ee29ee (patch) | |
| tree | ab03a20fd4febb44c34d7f09092af3edbce8f1cb /e-util | |
| parent | 60c5c7170f5642a78a4fd2092e4e78caae8475d6 (diff) | |
| download | gsoc2013-evolution-3fa4dfc54dd08d75076d4881207bdc45c3ee29ee.tar gsoc2013-evolution-3fa4dfc54dd08d75076d4881207bdc45c3ee29ee.tar.gz gsoc2013-evolution-3fa4dfc54dd08d75076d4881207bdc45c3ee29ee.tar.bz2 gsoc2013-evolution-3fa4dfc54dd08d75076d4881207bdc45c3ee29ee.tar.lz gsoc2013-evolution-3fa4dfc54dd08d75076d4881207bdc45c3ee29ee.tar.xz gsoc2013-evolution-3fa4dfc54dd08d75076d4881207bdc45c3ee29ee.tar.zst gsoc2013-evolution-3fa4dfc54dd08d75076d4881207bdc45c3ee29ee.zip | |
Remove usage of deprecated e_client_is_opened().
e_client_is_opened() always returns TRUE, so skip it.
Diffstat (limited to 'e-util')
| -rw-r--r-- | e-util/e-client-utils.c | 7 | ||||
| -rw-r--r-- | e-util/e-contact-store.c | 14 |
2 files changed, 5 insertions, 16 deletions
diff --git a/e-util/e-client-utils.c b/e-util/e-client-utils.c index 04efbe8177..167c1afcf5 100644 --- a/e-util/e-client-utils.c +++ b/e-util/e-client-utils.c @@ -312,12 +312,7 @@ client_utils_open_new_async_cb (GObject *source_object, return; } - if (e_client_is_opened (async_data->client)) { - client_utils_open_new_done (async_data); - return; - } - - /* wait for 'opened' signal, which is received in client_utils_opened_cb */ + client_utils_open_new_done (async_data); } /** diff --git a/e-util/e-contact-store.c b/e-util/e-contact-store.c index 4e49399e82..acfbe71e79 100644 --- a/e-util/e-contact-store.c +++ b/e-util/e-contact-store.c @@ -881,7 +881,7 @@ static void query_contact_source (EContactStore *contact_store, ContactSource *source) { - gboolean is_opened; + gchar *query_str; g_assert (source->book_client != NULL); @@ -890,8 +890,6 @@ query_contact_source (EContactStore *contact_store, return; } - is_opened = e_client_is_opened (E_CLIENT (source->book_client)); - if (source->client_view) { if (source->client_view_pending) { stop_view (contact_store, source->client_view_pending); @@ -902,13 +900,9 @@ query_contact_source (EContactStore *contact_store, } } - if (is_opened) { - gchar *query_str; - - query_str = e_book_query_to_string (contact_store->priv->query); - e_book_client_get_view (source->book_client, query_str, NULL, client_view_ready_cb, g_object_ref (contact_store)); - g_free (query_str); - } + query_str = e_book_query_to_string (contact_store->priv->query); + e_book_client_get_view (source->book_client, query_str, NULL, client_view_ready_cb, g_object_ref (contact_store)); + g_free (query_str); } /* ----------------- * |