evolution-data-server r9747 - in branches/camel-gobject: . camel

[mbarnes svn gnome org]

Author: mbarnes
Date: Sun Nov  9 15:59:39 2008
New Revision: 9747
URL: http://svn.gnome.org/viewvc/evolution-data-server?rev=9747&view=rev

Log:
Add another minimal patch for Evolution-Exchange.
Remove all the g_debug() calls from CamelObjectBag.


Added:
   branches/camel-gobject/evolution-exchange.patch
Modified:
   branches/camel-gobject/camel/camel-object-bag.c

Modified: branches/camel-gobject/camel/camel-object-bag.c
==============================================================================
--- branches/camel-gobject/camel/camel-object-bag.c	(original)
+++ branches/camel-gobject/camel/camel-object-bag.c	Sun Nov  9 15:59:39 2008
@@ -51,8 +51,6 @@
 	reservation->owner = g_thread_self ();
 	reservation->cond = g_cond_new ();
 
-	g_debug ("%s: R = %p: owner = %p", G_STRFUNC, reservation, reservation->owner);
-
 	bag->reserved = g_slist_prepend (bag->reserved, reservation);
 
 	return reservation;
@@ -123,8 +121,6 @@
 	g_return_if_fail (reservation != NULL);
 	g_return_if_fail (reservation->owner == g_thread_self ());
 
-	g_debug ("%s: R = %p: waiters = %d", G_STRFUNC, reservation, reservation->waiters);
-
 	if (reservation->waiters > 0) {
 		reservation->owner = NULL;
 		g_cond_signal (reservation->cond);
@@ -221,8 +217,6 @@
 		return NULL;
 	}
 
-	g_debug ("%s: R = %p: owner = %p", G_STRFUNC, reservation, reservation->owner);
-
 	/* Wait for the key to be unreserved. */
 	reservation->waiters++;
 	while (reservation->owner != NULL)
@@ -320,8 +314,6 @@
 		return NULL;
 	}
 
-	g_debug ("%s: R = %p: owner = %p", G_STRFUNC, reservation, reservation->owner);
-
 	/* Wait for the reservation to be committed or aborted. */
 	reservation->waiters++;
 	while (reservation->owner != NULL)

Added: branches/camel-gobject/evolution-exchange.patch
==============================================================================
--- (empty file)
+++ branches/camel-gobject/evolution-exchange.patch	Sun Nov  9 15:59:39 2008
@@ -0,0 +1,13 @@
+Index: camel/camel-exchange-search.c
+===================================================================
+--- camel/camel-exchange-search.c	(revision 1838)
++++ camel/camel-exchange-search.c	(working copy)
+@@ -46,7 +46,7 @@ camel_exchange_search_class_init (CamelE
+ 	CamelFolderSearchClass *camel_folder_search_class =
+ 		CAMEL_FOLDER_SEARCH_CLASS (camel_exchange_search_class);
+ 
+-	parent_class = (CamelFolderSearchClass *) camel_folder_search_get_type ();
++	parent_class = (CamelFolderSearchClass *) camel_type_get_global_class_funcs (camel_folder_search_get_type ());
+ 
+ 	/* virtual method overload */
+ 	camel_folder_search_class->body_contains = exchange_body_contains;