EBookClient: Remove set_proxy_gone_error().

EBookClient now keeps its GDBusProxy alive until dispose(), regardless
of what happens on the server side.  So we don't need to check whether
the GDBusProxy is still present in every method call anymore.  If the
bus name vanishes, let subsequent GDBusProxy calls fail on their own.

diff --git a/addressbook/libebook/e-book-client.c b/addressbook/libebook/e-book-client.c
index 5e16504..da5f690 100644 (file)
--- a/addressbook/libebook/e-book-client.c
+++ b/addressbook/libebook/e-book-client.c
@@ -277,13 +277,6 @@ unwrap_dbus_error (GError *error,
        return FALSE;
 }
 
-static void
-set_proxy_gone_error (GError **error)
-{
-       /* do not translate this string, it should ideally never happen */
-       g_set_error_literal (error, E_CLIENT_ERROR, E_CLIENT_ERROR_DBUS_ERROR, "D-Bus book proxy gone");
-}
-
 static volatile gint active_book_clients = 0;
 static guint book_factory_watcher_id = 0;
 static EDBusAddressBookFactory *book_factory = NULL;
@@ -830,11 +823,6 @@ book_client_open_sync (EClient *client,
 
        book_client = E_BOOK_CLIENT (client);
 
-       if (book_client->priv->dbus_proxy == NULL) {
-               set_proxy_gone_error (error);
-               return FALSE;
-       }
-
        return e_dbus_address_book_call_open_sync (
                book_client->priv->dbus_proxy, cancellable, error);
 }
@@ -850,11 +838,6 @@ book_client_refresh_sync (EClient *client,
 
        book_client = E_BOOK_CLIENT (client);
 
-       if (book_client->priv->dbus_proxy == NULL) {
-               set_proxy_gone_error (error);
-               return FALSE;
-       }
-
        return e_dbus_address_book_call_refresh_sync (
                book_client->priv->dbus_proxy, cancellable, error);
 }
@@ -1657,11 +1640,6 @@ e_book_client_add_contact_sync (EBookClient *client,
        g_return_val_if_fail (E_IS_BOOK_CLIENT (client), FALSE);
        g_return_val_if_fail (E_IS_CONTACT (contact), FALSE);
 
-       if (client->priv->dbus_proxy == NULL) {
-               set_proxy_gone_error (error);
-               return FALSE;
-       }
-
        success = e_book_client_add_contacts_sync (
                client, &link, &uids, cancellable, error);
 
@@ -1836,11 +1814,6 @@ e_book_client_add_contacts_sync (EBookClient *client,
        g_return_val_if_fail (E_IS_BOOK_CLIENT (client), FALSE);
        g_return_val_if_fail (contacts != NULL, FALSE);
 
-       if (client->priv->dbus_proxy == NULL) {
-               set_proxy_gone_error (error);
-               return FALSE;
-       }
-
        /* Build a string array, ensuring each element is valid UTF-8. */
        strv = g_new0 (gchar *, g_slist_length (contacts) + 1);
        for (link = contacts; link != NULL; link = g_slist_next (link)) {
@@ -2137,11 +2110,6 @@ e_book_client_modify_contacts_sync (EBookClient *client,
        g_return_val_if_fail (E_IS_BOOK_CLIENT (client), FALSE);
        g_return_val_if_fail (contacts != NULL, FALSE);
 
-       if (client->priv->dbus_proxy == NULL) {
-               set_proxy_gone_error (error);
-               return FALSE;
-       }
-
        /* Build a string array, ensuring each element is valid UTF-8. */
        strv = g_new0 (gchar *, g_slist_length (contacts) + 1);
        for (link = contacts; link != NULL; link = g_slist_next (link)) {
@@ -2544,11 +2512,6 @@ e_book_client_remove_contacts_sync (EBookClient *client,
        g_return_val_if_fail (E_IS_BOOK_CLIENT (client), FALSE);
        g_return_val_if_fail (uids != NULL, FALSE);
 
-       if (client->priv->dbus_proxy == NULL) {
-               set_proxy_gone_error (error);
-               return FALSE;
-       }
-
        strv = g_new0 (gchar *, g_slist_length ((GSList *) uids) + 1);
        while (uids != NULL) {
                strv[ii++] = e_util_utf8_make_valid (uids->data);
@@ -2706,11 +2669,6 @@ e_book_client_get_contact_sync (EBookClient *client,
        g_return_val_if_fail (uid != NULL, FALSE);
        g_return_val_if_fail (out_contact != NULL, FALSE);
 
-       if (client->priv->dbus_proxy == NULL) {
-               set_proxy_gone_error (error);
-               return FALSE;
-       }
-
        utf8_uid = e_util_utf8_make_valid (uid);
 
        success = e_dbus_address_book_call_get_contact_sync (
@@ -2882,11 +2840,6 @@ e_book_client_get_contacts_sync (EBookClient *client,
        g_return_val_if_fail (sexp != NULL, FALSE);
        g_return_val_if_fail (out_contacts != NULL, FALSE);
 
-       if (client->priv->dbus_proxy == NULL) {
-               set_proxy_gone_error (error);
-               return FALSE;
-       }
-
        utf8_sexp = e_util_utf8_make_valid (sexp);
 
        success = e_dbus_address_book_call_get_contact_list_sync (
@@ -3067,11 +3020,6 @@ e_book_client_get_contacts_uids_sync (EBookClient *client,
        g_return_val_if_fail (sexp != NULL, FALSE);
        g_return_val_if_fail (out_contact_uids != NULL, FALSE);
 
-       if (client->priv->dbus_proxy == NULL) {
-               set_proxy_gone_error (error);
-               return FALSE;
-       }
-
        utf8_sexp = e_util_utf8_make_valid (sexp);
 
        success = e_dbus_address_book_call_get_contact_list_uids_sync (
@@ -3253,11 +3201,6 @@ e_book_client_get_view_sync (EBookClient *client,
        g_return_val_if_fail (sexp != NULL, FALSE);
        g_return_val_if_fail (out_view != NULL, FALSE);
 
-       if (client->priv->dbus_proxy == NULL) {
-               set_proxy_gone_error (error);
-               return FALSE;
-       }
-
        utf8_sexp = e_util_utf8_make_valid (sexp);
 
        success = e_dbus_address_book_call_get_view_sync (