[evolution-mapi] BUGFIX 593637: Get rid of Bonobo in MAPI



commit f96ed1ec8e21554963fb907328bf3854e107f542
Author: Bharath Acharya <abharath novell com>
Date:   Mon Sep 7 14:40:30 2009 +0530

    BUGFIX 593637: Get rid of Bonobo in MAPI
    
    evolution-mapi depends on Bonobo. Bonobo will be removed for GNOME 3

 src/addressbook/e-book-backend-mapi-gal.c |   11 +++++------
 src/addressbook/e-book-backend-mapi.c     |   21 ++++++++++-----------
 2 files changed, 15 insertions(+), 17 deletions(-)
---
diff --git a/src/addressbook/e-book-backend-mapi-gal.c b/src/addressbook/e-book-backend-mapi-gal.c
index e707c96..948d6bb 100644
--- a/src/addressbook/e-book-backend-mapi-gal.c
+++ b/src/addressbook/e-book-backend-mapi-gal.c
@@ -20,7 +20,6 @@
 #include <libedata-book/e-book-backend-cache.h>
 #include <libedata-book/e-book-backend-summary.h>
 #include "e-book-backend-mapi-gal.h"
-#include "bonobo/bonobo-object.h"
 
 static EBookBackendClass *e_book_backend_mapi_gal_parent_class;
 static gboolean enable_debug = TRUE;
@@ -692,7 +691,7 @@ book_view_thread (gpointer data)
 	if (enable_debug)
 		printf("mapi: book view\n");
 	
-	bonobo_object_ref (book_view);
+	g_object_ref (book_view);
 	e_flag_set (closure->running);
 						
 	e_data_book_view_notify_status_message (book_view, "Searching...");
@@ -705,7 +704,7 @@ book_view_thread (gpointer data)
 				e_book_backend_notify_auth_required (E_BOOK_BACKEND (backend));
 				e_data_book_view_notify_complete (book_view,
 							GNOME_Evolution_Addressbook_AuthenticationRequired);
-				bonobo_object_unref (book_view);
+				g_object_unref (book_view);
 				return;
 			}
 		
@@ -720,7 +719,7 @@ book_view_thread (gpointer data)
 						get_contacts_from_cache (backend, query, ids, book_view, closure);
 						g_ptr_array_free (ids, TRUE);
 					}
-					bonobo_object_unref (book_view);
+					g_object_unref (book_view);
 					return;
 				}
 			
@@ -745,7 +744,7 @@ book_view_thread (gpointer data)
 									  GNOME_Evolution_Addressbook_Success);
 				if (temp_list)
 					 g_list_free (temp_list);
-				bonobo_object_unref (book_view);
+				g_object_unref (book_view);
 				return;
 			}
 		
@@ -761,7 +760,7 @@ book_view_thread (gpointer data)
 			if (e_flag_is_set (closure->running))
 				e_data_book_view_notify_complete (book_view,
 								  GNOME_Evolution_Addressbook_Success);
-			bonobo_object_unref (book_view);
+			g_object_unref (book_view);
 			break;
 		}
 	}
diff --git a/src/addressbook/e-book-backend-mapi.c b/src/addressbook/e-book-backend-mapi.c
index 9aae3dd..f83f323 100644
--- a/src/addressbook/e-book-backend-mapi.c
+++ b/src/addressbook/e-book-backend-mapi.c
@@ -46,7 +46,6 @@
 #include <libedata-book/e-book-backend-cache.h>
 #include <libedata-book/e-book-backend-summary.h>
 #include "e-book-backend-mapi.h"
-#include "bonobo/bonobo-object.h"
 
 static EBookBackendClass *e_book_backend_mapi_parent_class;
 static gboolean enable_debug = TRUE;
@@ -1198,7 +1197,7 @@ book_view_thread (gpointer data)
 	if (enable_debug)
 		printf("mapi: book view\n");
 	
-	bonobo_object_ref (book_view);
+	g_object_ref (book_view);
 	e_flag_set (closure->running);
 						
 	e_data_book_view_notify_status_message (book_view, "Searching...");
@@ -1210,7 +1209,7 @@ book_view_thread (gpointer data)
 		if (!priv->marked_for_offline) {
 			e_data_book_view_notify_complete (book_view, 
 					GNOME_Evolution_Addressbook_OfflineUnavailable);
-			bonobo_object_unref (book_view);
+			g_object_unref (book_view);
 			return;
 		}
 		if (!priv->cache) {
@@ -1229,7 +1228,7 @@ book_view_thread (gpointer data)
 				get_contacts_from_cache (backend, query, ids, book_view, closure);
 				g_ptr_array_free (ids, TRUE);
 			}
-			bonobo_object_unref (book_view);
+			g_object_unref (book_view);
 			return;
 		}
 
@@ -1255,7 +1254,7 @@ book_view_thread (gpointer data)
 							  GNOME_Evolution_Addressbook_Success);
 		if (temp_list)
 			 g_list_free (temp_list);
-		bonobo_object_unref (book_view);
+		g_object_unref (book_view);
 		return;
 		
 	case GNOME_Evolution_Addressbook_MODE_REMOTE:
@@ -1264,7 +1263,7 @@ book_view_thread (gpointer data)
 			e_book_backend_notify_auth_required (E_BOOK_BACKEND (backend));
 			e_data_book_view_notify_complete (book_view,
 						GNOME_Evolution_Addressbook_AuthenticationRequired);
-			bonobo_object_unref (book_view);
+			g_object_unref (book_view);
 			return;
 		}
 		
@@ -1279,7 +1278,7 @@ book_view_thread (gpointer data)
 					get_contacts_from_cache (backend, query, ids, book_view, closure);
 					g_ptr_array_free (ids, TRUE);
 				}
-				bonobo_object_unref (book_view);
+				g_object_unref (book_view);
 				return;
 			}
 			
@@ -1304,7 +1303,7 @@ book_view_thread (gpointer data)
 								  GNOME_Evolution_Addressbook_Success);
 			if (temp_list)
 				 g_list_free (temp_list);
-			bonobo_object_unref (book_view);
+			g_object_unref (book_view);
 			return;
 		}
 		
@@ -1326,7 +1325,7 @@ book_view_thread (gpointer data)
         	                if (e_flag_is_set (closure->running))
                 	                e_data_book_view_notify_complete (book_view, 
                         	                                          GNOME_Evolution_Addressbook_OtherError);      
-	                        bonobo_object_unref (book_view);
+	                        g_object_unref (book_view);
 					
 				if (or_res)
 					g_free(or_res);
@@ -1342,7 +1341,7 @@ book_view_thread (gpointer data)
 				if (e_flag_is_set (closure->running))
 					e_data_book_view_notify_complete (book_view, 
 									  GNOME_Evolution_Addressbook_OtherError);      
-				bonobo_object_unref (book_view);
+				g_object_unref (book_view);
 				return;
 			}
 		}
@@ -1350,7 +1349,7 @@ book_view_thread (gpointer data)
 		if (e_flag_is_set (closure->running))
 			e_data_book_view_notify_complete (book_view,
 							  GNOME_Evolution_Addressbook_Success);
-		bonobo_object_unref (book_view);
+		g_object_unref (book_view);
 
 		
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]