evolution-data-server r10041 - in trunk: . libedataserver

[mcrha svn gnome org]

Author: mcrha
Date: Mon Feb  9 11:12:31 2009
New Revision: 10041
URL: http://svn.gnome.org/viewvc/evolution-data-server?rev=10041&view=rev

Log:
2009-02-09  Milan Crha  <mcrha redhat com>

	** Part of fix for bug #567861

	* libedataserver/e-source.c: (e_source_equal):
	Two sources also differ when one has set color_spec and the other not.



Modified:
   trunk/ChangeLog
   trunk/libedataserver/e-source.c

Modified: trunk/libedataserver/e-source.c
==============================================================================
--- trunk/libedataserver/e-source.c	(original)
+++ trunk/libedataserver/e-source.c	Mon Feb  9 11:12:31 2009
@@ -810,6 +810,8 @@
 	g_return_val_if_fail (E_IS_SOURCE (a), FALSE); 
 	g_return_val_if_fail (E_IS_SOURCE (b), FALSE); 
 
+	#define ONLY_ONE_NULL(aa, bb) (((aa) == NULL && (bb) != NULL) || ((aa) != NULL && (bb) == NULL))
+
 	/* Compare source stuff */
 	if (a->priv->uid 
 	 && b->priv->uid 
@@ -831,9 +833,10 @@
 	 && g_ascii_strcasecmp (a->priv->absolute_uri, b->priv->absolute_uri))
 		return FALSE; 
 
-	if (a->priv->color_spec 
+	if ((a->priv->color_spec 
 	 && b->priv->color_spec 
-	 && g_ascii_strcasecmp (a->priv->color_spec, b->priv->color_spec))
+	 && g_ascii_strcasecmp (a->priv->color_spec, b->priv->color_spec)) ||
+	 (ONLY_ONE_NULL (a->priv->color_spec, b->priv->color_spec)))
 		return FALSE; 
 
 	if (a->priv->readonly != b->priv->readonly)
@@ -842,6 +845,8 @@
 	if (!compare_str_hashes (a->priv->properties, b->priv->properties))
 		return FALSE; 
 
+	#undef ONLY_ONE_NULL
+
 	return TRUE; 
 }