evolution-data-server r9609 - in trunk/addressbook: . backends/file backends/google backends/groupwise backends/ldap backends/vcf backends/webdav

[rbradford svn gnome org]

Author: rbradford
Date: Thu Sep 25 09:21:11 2008
New Revision: 9609
URL: http://svn.gnome.org/viewvc/evolution-data-server?rev=9609&view=rev

Log:
2008-09-25  Rob Bradford  <rob linux intel com>

	* addressbook/backends/file/e-book-backend-file.c:
	* addressbook/backends/google/e-book-backend-google.c:
	* addressbook/backends/groupwise/e-book-backend-groupwise.c:
	* addressbook/backends/ldap/e-book-backend-ldap.c:
	* addressbook/backends/vcf/e-book-backend-vcf.c:
	* addressbook/backends/webdav/e-book-backend-webdav.c:
	Use transition functions for reffing/unreffing the EDataBookView.

Modified:
   trunk/addressbook/ChangeLog
   trunk/addressbook/backends/file/e-book-backend-file.c
   trunk/addressbook/backends/google/e-book-backend-google.c
   trunk/addressbook/backends/groupwise/e-book-backend-groupwise.c
   trunk/addressbook/backends/ldap/e-book-backend-ldap.c
   trunk/addressbook/backends/vcf/e-book-backend-vcf.c
   trunk/addressbook/backends/webdav/e-book-backend-webdav.c

Modified: trunk/addressbook/backends/file/e-book-backend-file.c
==============================================================================
--- trunk/addressbook/backends/file/e-book-backend-file.c	(original)
+++ trunk/addressbook/backends/file/e-book-backend-file.c	Thu Sep 25 09:21:11 2008
@@ -546,7 +546,7 @@
 
 	/* ref the book view because it'll be removed and unrefed
 	   when/if it's stopped */
-	bonobo_object_ref (book_view);
+	e_data_book_view_ref (book_view);
 
 	db = bf->priv->file_db;
 	query = e_data_book_view_get_card_query (book_view);
@@ -638,7 +638,7 @@
 
 	/* unref the */
 	printf("book_view file uref \n");
-	bonobo_object_unref (book_view);
+	e_data_book_view_unref (book_view);
 
 	d(printf ("finished population of book view\n"));
 

Modified: trunk/addressbook/backends/google/e-book-backend-google.c
==============================================================================
--- trunk/addressbook/backends/google/e-book-backend-google.c	(original)
+++ trunk/addressbook/backends/google/e-book-backend-google.c	Thu Sep 25 09:21:11 2008
@@ -308,7 +308,7 @@
 
     priv->bookviews = g_list_append (priv->bookviews, bookview);
 
-    bonobo_object_ref (bookview);
+    e_data_book_view_ref (bookview);
     e_data_book_view_notify_status_message (bookview, "Loading...");
 
     google_book_set_live_mode (priv->book, TRUE);
@@ -333,7 +333,7 @@
     priv = GET_PRIVATE (backend);
 
     priv->bookviews = g_list_remove (priv->bookviews, bookview);
-    bonobo_object_unref (bookview);
+    e_data_book_view_unref (bookview);
 
     if (NULL == priv->bookviews) {
         google_book_set_live_mode (priv->book, FALSE);
@@ -607,7 +607,7 @@
     __debug__ (G_STRFUNC);
 
     while (priv->bookviews) {
-        bonobo_object_unref (priv->bookviews->data);
+        e_data_book_view_unref (priv->bookviews->data);
         priv->bookviews = g_list_delete_link (priv->bookviews,
                                               priv->bookviews);
     }

Modified: trunk/addressbook/backends/groupwise/e-book-backend-groupwise.c
==============================================================================
--- trunk/addressbook/backends/groupwise/e-book-backend-groupwise.c	(original)
+++ trunk/addressbook/backends/groupwise/e-book-backend-groupwise.c	Thu Sep 25 09:21:11 2008
@@ -2176,7 +2176,7 @@
 
 	if (enable_debug)
 		printf ("start book view for %s \n", gwb->priv->book_name);
-       	bonobo_object_ref (book_view);
+	e_data_book_view_ref (book_view);
 	e_flag_set (closure->running);
 
 	query = e_data_book_view_get_card_query (book_view);
@@ -2199,7 +2199,7 @@
 				get_contacts_from_cache (gwb, query, ids, book_view, closure);
 				g_ptr_array_free (ids, TRUE);
 			}
-			bonobo_object_unref (book_view);
+			e_data_book_view_unref (book_view);
 			return NULL;
 		}
 
@@ -2221,7 +2221,7 @@
 			e_data_book_view_notify_complete (book_view, GNOME_Evolution_Addressbook_Success);
 		if (temp_list)
 			g_list_free (temp_list);
-		bonobo_object_unref (book_view);
+		e_data_book_view_unref (book_view);
 		return NULL;
 
 	case GNOME_Evolution_Addressbook_MODE_REMOTE :
@@ -2229,7 +2229,7 @@
 		if (gwb->priv->cnc == NULL) {
 			e_data_book_view_notify_complete (book_view,
 						          GNOME_Evolution_Addressbook_AuthenticationRequired);
-			bonobo_object_unref (book_view);
+			e_data_book_view_unref (book_view);
 			return NULL;
 		}
 
@@ -2258,7 +2258,7 @@
 		if (!gwb->priv->is_writable && !filter && (g_getenv ("GW_HIDE_SYSBOOK") || (!gwb->priv->is_cache_ready))) {
 
 				e_data_book_view_notify_complete (book_view, GNOME_Evolution_Addressbook_Success);
-				bonobo_object_unref (book_view);
+				e_data_book_view_unref (book_view);
 				if (filter)
 					g_object_unref (filter);
 				return NULL; 
@@ -2293,7 +2293,7 @@
 										_("Searching..."));
 				get_contacts_from_cache (gwb, query, ids, book_view, closure);
 				g_ptr_array_free (ids, TRUE);
-				bonobo_object_unref (book_view);
+				e_data_book_view_unref (book_view);
 				if (enable_debug) {
 					g_get_current_time(&end);
 					diff = end.tv_sec * 1000 + end.tv_usec/1000;
@@ -2342,7 +2342,7 @@
 					e_data_book_view_notify_complete (book_view, GNOME_Evolution_Addressbook_Success);
 				if (temp_list)
 					g_list_free (temp_list);
-				bonobo_object_unref (book_view);
+				e_data_book_view_unref (book_view);
 				
 				if (filter)	
 					g_object_unref (filter);
@@ -2370,7 +2370,7 @@
 
 		if (status != E_GW_CONNECTION_STATUS_OK) {
 			e_data_book_view_notify_complete (book_view, GNOME_Evolution_Addressbook_OtherError);
-			bonobo_object_unref (book_view);
+			e_data_book_view_unref (book_view);
 			if (filter)
 				g_object_unref (filter);
 			return NULL;
@@ -2404,7 +2404,7 @@
 			e_data_book_view_notify_complete (book_view, GNOME_Evolution_Addressbook_Success);
 		if (filter)
 			g_object_unref (filter);
-		bonobo_object_unref (book_view);
+		e_data_book_view_unref (book_view);
 
 		if (enable_debug) {
 			g_get_current_time(&end);
@@ -2684,7 +2684,7 @@
 	book_view = find_book_view (ebgw);
 	if (book_view) {
 		closure = get_closure (book_view);
-		bonobo_object_ref (book_view);
+		e_data_book_view_ref (book_view);
 		if (closure)
 			e_flag_set (closure->running);
 	}
@@ -2749,7 +2749,7 @@
 	if (book_view) {
 		e_data_book_view_notify_complete (book_view,
 						  GNOME_Evolution_Addressbook_Success);
-		bonobo_object_unref (book_view);
+		e_data_book_view_unref (book_view);
 	}
 
 	e_gw_connection_destroy_cursor (priv->cnc, priv->container_id, cursor);
@@ -2833,7 +2833,7 @@
 	book_view = find_book_view (ebgw);
 	if (book_view) {
 		closure = get_closure (book_view);
-		bonobo_object_ref (book_view);
+		e_data_book_view_ref (book_view);
 		if (closure)
 			e_flag_set (closure->running);
 	}
@@ -2852,7 +2852,7 @@
 					    "name email default members", filter, &gw_items);
 	if (status != E_GW_CONNECTION_STATUS_OK) {
 		if (book_view)
-			bonobo_object_unref (book_view);
+			e_data_book_view_unref (book_view);
 		if (enable_debug)
 			printf("No connection with the server \n");
 		g_mutex_unlock (ebgw->priv->update_cache_mutex);
@@ -2897,7 +2897,7 @@
 	if (book_view) {
 		e_data_book_view_notify_complete (book_view,
 						  GNOME_Evolution_Addressbook_Success);
-		bonobo_object_unref (book_view);
+		e_data_book_view_unref (book_view);
 	}
 	g_object_unref (filter);
 	g_list_free (gw_items);
@@ -2994,7 +2994,7 @@
 	book_view = find_book_view (ebgw);
 	if (book_view) {
 		closure = get_closure (book_view);
-		bonobo_object_ref (book_view);
+		e_data_book_view_ref (book_view);
 		if (closure)
 			e_flag_set (closure->running);
 	}
@@ -3144,7 +3144,7 @@
 	if (book_view) {
 		e_data_book_view_notify_complete (book_view,
 						  GNOME_Evolution_Addressbook_Success);
-		bonobo_object_unref (book_view);
+		e_data_book_view_unref (book_view);
 	}
 
 	if (enable_debug) {

Modified: trunk/addressbook/backends/ldap/e-book-backend-ldap.c
==============================================================================
--- trunk/addressbook/backends/ldap/e-book-backend-ldap.c	(original)
+++ trunk/addressbook/backends/ldap/e-book-backend-ldap.c	Thu Sep 25 09:21:11 2008
@@ -4219,7 +4219,7 @@
 	/* unhook us from our EDataBookView */
 	g_object_set_data (G_OBJECT (search_op->view), "EBookBackendLDAP.BookView::search_op", NULL);
 
-	bonobo_object_unref (search_op->view);
+	e_data_book_view_unref (search_op->view);
 
 	if (!search_op->aborted)
 		g_free (search_op);
@@ -4317,7 +4317,7 @@
 
 				op->view = view;
 				op->aborted = FALSE;
-				bonobo_object_ref (view);
+				e_data_book_view_ref (view);
 
 				ldap_op_add ((LDAPOp*)op, E_BOOK_BACKEND(bl), book, view,
 					     0, search_msgid,

Modified: trunk/addressbook/backends/vcf/e-book-backend-vcf.c
==============================================================================
--- trunk/addressbook/backends/vcf/e-book-backend-vcf.c	(original)
+++ trunk/addressbook/backends/vcf/e-book-backend-vcf.c	Thu Sep 25 09:21:11 2008
@@ -467,7 +467,7 @@
 
 	/* ref the book view because it'll be removed and unrefed
 	   when/if it's stopped */
-	bonobo_object_ref (book_view);
+	e_data_book_view_ref (book_view);
 
 	query = e_data_book_view_get_card_query (book_view);
 
@@ -493,7 +493,7 @@
 		e_data_book_view_notify_complete (closure->view, GNOME_Evolution_Addressbook_Success);
 
 	/* unref the book view */
-	bonobo_object_unref (book_view);
+	e_data_book_view_unref (book_view);
 
 	d(printf ("finished initial population of book view\n"));
 

Modified: trunk/addressbook/backends/webdav/e-book-backend-webdav.c
==============================================================================
--- trunk/addressbook/backends/webdav/e-book-backend-webdav.c	(original)
+++ trunk/addressbook/backends/webdav/e-book-backend-webdav.c	Thu Sep 25 09:21:11 2008
@@ -650,19 +650,19 @@
 		GNOME_Evolution_Addressbook_CallStatus res
 			= e_book_backend_handle_auth_request(webdav);
 		g_object_unref(message);
-		bonobo_object_unref(book_view);
+		e_data_book_view_unref(book_view);
 		return res;
 	}
 	if (status != 207) {
 		g_warning("PROPFIND on webdav failed with http status %d", status);
 		g_object_unref(message);
-		bonobo_object_unref(book_view);
+		e_data_book_view_unref(book_view);
 		return GNOME_Evolution_Addressbook_OtherError;
 	}
 	if (message->response_body == NULL) {
 		g_warning("No response body in webdav PROPEFIND result");
 		g_object_unref(message);
-		bonobo_object_unref(book_view);
+		e_data_book_view_unref(book_view);
 		return GNOME_Evolution_Addressbook_OtherError;
 	}
 
@@ -761,11 +761,11 @@
 
 	/* ref the book view because it'll be removed and unrefed when/if
 	 * it's stopped */
-	bonobo_object_ref(book_view);
+	e_data_book_view_ref(book_view);
 
 	status = download_contacts(webdav, closure->running, book_view);
 
-	bonobo_object_unref(book_view);
+	e_data_book_view_unref(book_view);
 
 	/* report back status if query wasn't aborted */
 	e_data_book_view_notify_complete(book_view, status);