Remove e_data_book_view_ref/unref().

These are just old wrappers for g_object_ref/unref().

diff --git a/addressbook/backends/file/e-book-backend-file.c b/addressbook/backends/file/e-book-backend-file.c
index b90a38a..79cb96b 100644 (file)
--- a/addressbook/backends/file/e-book-backend-file.c
+++ b/addressbook/backends/file/e-book-backend-file.c
@@ -1553,7 +1553,7 @@ book_view_thread (gpointer data)
 
        /* ref the book view because it'll be removed and unrefed
         * when/if it's stopped */
-       e_data_book_view_ref (book_view);
+       g_object_ref (book_view);
 
        db                 = bf->priv->file_db;
        query              = e_data_book_view_get_card_query (book_view);
@@ -1561,7 +1561,7 @@ book_view_thread (gpointer data)
 
        if (!db) {
                e_data_book_view_notify_complete (book_view, EDB_NOT_OPENED_ERROR);
-               e_data_book_view_unref (book_view);
+               g_object_unref (book_view);
                return NULL;
        }
 
@@ -1658,7 +1658,7 @@ book_view_thread (gpointer data)
        if (e_flag_is_set (closure->running))
                e_data_book_view_notify_complete (book_view, NULL /* Success */);
 
-       e_data_book_view_unref (book_view);
+       g_object_unref (book_view);
 
        d (printf ("finished population of book view\n"));
 

diff --git a/addressbook/backends/google/e-book-backend-google.c b/addressbook/backends/google/e-book-backend-google.c
index 3d946e2..a1c6c5e 100644 (file)
--- a/addressbook/backends/google/e-book-backend-google.c
+++ b/addressbook/backends/google/e-book-backend-google.c
@@ -1805,7 +1805,7 @@ e_book_backend_google_start_book_view (EBookBackend *backend,
 
        priv->bookviews = g_list_append (priv->bookviews, bookview);
 
-       e_data_book_view_ref (bookview);
+       g_object_ref (bookview);
        e_data_book_view_notify_progress (bookview, -1, _("Loading…"));
 
        /* Ensure that we're ready to support a view */
@@ -1840,7 +1840,7 @@ e_book_backend_google_stop_book_view (EBookBackend *backend,
        /* Remove the view from the list of active views */
        if ((view = g_list_find (priv->bookviews, bookview)) != NULL) {
                priv->bookviews = g_list_delete_link (priv->bookviews, view);
-               e_data_book_view_unref (bookview);
+               g_object_unref (bookview);
        }
 }
 
@@ -2131,7 +2131,7 @@ e_book_backend_google_dispose (GObject *object)
        google_cancel_all_operations (E_BOOK_BACKEND (object));
 
        while (priv->bookviews) {
-               e_data_book_view_unref (priv->bookviews->data);
+               g_object_unref (priv->bookviews->data);
                priv->bookviews = g_list_delete_link (priv->bookviews, priv->bookviews);
        }
 

diff --git a/addressbook/backends/ldap/e-book-backend-ldap.c b/addressbook/backends/ldap/e-book-backend-ldap.c
index ad4296a..eba4ebe 100644 (file)
--- a/addressbook/backends/ldap/e-book-backend-ldap.c
+++ b/addressbook/backends/ldap/e-book-backend-ldap.c
@@ -4816,7 +4816,7 @@ ldap_search_dtor (LDAPOp *op)
        /* unhook us from our EDataBookView */
        g_object_set_data (G_OBJECT (search_op->view), "EBookBackendLDAP.BookView::search_op", NULL);
 
-       e_data_book_view_unref (search_op->view);
+       g_object_unref (search_op->view);
 
        if (!search_op->aborted)
                g_free (search_op);
@@ -4913,7 +4913,7 @@ e_book_backend_ldap_search (EBookBackendLDAP *bl,
 
                        op->view = view;
                        op->aborted = FALSE;
-                       e_data_book_view_ref (view);
+                       g_object_ref (view);
 
                        ldap_op_add ((LDAPOp *) op, E_BOOK_BACKEND (bl), book, view,
                                     0, search_msgid,

diff --git a/addressbook/backends/vcf/e-book-backend-vcf.c b/addressbook/backends/vcf/e-book-backend-vcf.c
index e6a68d3..4da4959 100644 (file)
--- a/addressbook/backends/vcf/e-book-backend-vcf.c
+++ b/addressbook/backends/vcf/e-book-backend-vcf.c
@@ -500,7 +500,7 @@ book_view_thread (gpointer data)
 
        /* ref the book view because it'll be removed and unrefed
         * when/if it's stopped */
-       e_data_book_view_ref (book_view);
+       g_object_ref (book_view);
 
        query = e_data_book_view_get_card_query (book_view);
 
@@ -526,7 +526,7 @@ book_view_thread (gpointer data)
                e_data_book_view_notify_complete (closure->view, NULL /* Success */);
 
        /* unref the book view */
-       e_data_book_view_unref (book_view);
+       g_object_unref (book_view);
 
        d (printf ("finished initial population of book view\n"));
 

diff --git a/addressbook/backends/webdav/e-book-backend-webdav.c b/addressbook/backends/webdav/e-book-backend-webdav.c
index b8d5d11..29067d7 100644 (file)
--- a/addressbook/backends/webdav/e-book-backend-webdav.c
+++ b/addressbook/backends/webdav/e-book-backend-webdav.c
@@ -1051,11 +1051,11 @@ book_view_thread (gpointer data)
 
        /* ref the book view because it'll be removed and unrefed when/if
         * it's stopped */
-       e_data_book_view_ref (book_view);
+       g_object_ref (book_view);
 
        error = download_contacts (webdav, closure->running, book_view);
 
-       e_data_book_view_unref (book_view);
+       g_object_unref (book_view);
 
        if (error)
                g_error_free (error);

diff --git a/addressbook/libedata-book/e-book-backend.c b/addressbook/libedata-book/e-book-backend.c
index 83fd371..dd91ba3 100644 (file)
--- a/addressbook/libedata-book/e-book-backend.c
+++ b/addressbook/libedata-book/e-book-backend.c
@@ -763,7 +763,7 @@ e_book_backend_add_book_view (EBookBackend *backend,
 
        g_mutex_lock (backend->priv->views_mutex);
 
-       e_data_book_view_ref (view);
+       g_object_ref (view);
        backend->priv->views = g_slist_append (backend->priv->views, view);
 
        g_mutex_unlock (backend->priv->views_mutex);
@@ -785,7 +785,7 @@ e_book_backend_remove_book_view (EBookBackend *backend,
        g_mutex_lock (backend->priv->views_mutex);
 
        backend->priv->views = g_slist_remove (backend->priv->views, view);
-       e_data_book_view_unref (view);
+       g_object_unref (view);
 
        g_mutex_unlock (backend->priv->views_mutex);
 }

diff --git a/addressbook/libedata-book/e-data-book-view.c b/addressbook/libedata-book/e-data-book-view.c
index 63afd06..0e1d474 100644 (file)
--- a/addressbook/libedata-book/e-data-book-view.c
+++ b/addressbook/libedata-book/e-data-book-view.c
@@ -920,32 +920,3 @@ e_data_book_view_get_fields_of_interest (EDataBookView *view)
        return view->priv->fields_of_interest;
 }
 
-/**
- * e_data_book_view_ref
- * @book_view: an #EBookView
- *
- * Increase the reference count of the book view. This is a function to aid
- * the transition from Bonobo to DBUS.
- *
- * Since: 2.26
- */
-void
-e_data_book_view_ref (EDataBookView *book_view)
-{
-       g_object_ref (book_view);
-}
-
-/**
- * e_data_book_view_unref
- * @book_view: an #EBookView
- *
- * Decrease the reference count of the book view. This is a function to aid
- * the transition from Bonobo to DBUS.
- *
- * Since: 2.26
- */
-void
-e_data_book_view_unref (EDataBookView *book_view)
-{
-       g_object_unref (book_view);
-}

diff --git a/addressbook/libedata-book/e-data-book-view.h b/addressbook/libedata-book/e-data-book-view.h
index fc5bb84..ea2d03e 100644 (file)
--- a/addressbook/libedata-book/e-data-book-view.h
+++ b/addressbook/libedata-book/e-data-book-view.h
@@ -107,8 +107,6 @@ void                e_data_book_view_notify_progress
                                                (EDataBookView *book_view,
                                                 guint percent,
                                                 const gchar *message);
-void           e_data_book_view_ref            (EDataBookView *book_view);
-void           e_data_book_view_unref          (EDataBookView *book_view);
 
 GHashTable *   e_data_book_view_get_fields_of_interest
                                                (EDataBookView *view);

diff --git a/docs/reference/addressbook/libedata-book/libedata-book-sections.txt b/docs/reference/addressbook/libedata-book/libedata-book-sections.txt
index 2b63436..28e7c23 100644 (file)
--- a/docs/reference/addressbook/libedata-book/libedata-book-sections.txt
+++ b/docs/reference/addressbook/libedata-book/libedata-book-sections.txt
@@ -339,8 +339,6 @@ e_data_book_view_notify_update_prefiltered_vcard
 e_data_book_view_notify_remove
 e_data_book_view_notify_complete
 e_data_book_view_notify_progress
-e_data_book_view_ref
-e_data_book_view_unref
 e_data_book_view_get_fields_of_interest
 <SUBSECTION Standard>
 E_DATA_BOOK_VIEW