gnome-desktop r5341 - trunk/libgnome-desktop

[vuntz svn gnome org]

Author: vuntz
Date: Wed Jan  7 14:26:21 2009
New Revision: 5341
URL: http://svn.gnome.org/viewvc/gnome-desktop?rev=5341&view=rev

Log:
2009-01-07  Vincent Untz  <vuntz gnome org>

	* gnome-bg.c: (gnome_bg_set_color): use gdk_color_equal() instead of
	custom colors_equal()
	Fix bug #566900


Modified:
   trunk/libgnome-desktop/ChangeLog
   trunk/libgnome-desktop/gnome-bg.c

Modified: trunk/libgnome-desktop/gnome-bg.c
==============================================================================
--- trunk/libgnome-desktop/gnome-bg.c	(original)
+++ trunk/libgnome-desktop/gnome-bg.c	Wed Jan  7 14:26:21 2009
@@ -427,14 +427,6 @@
 	return g_object_new (GNOME_TYPE_BG, NULL);
 }
 
-static gboolean
-colors_equal (const GdkColor *primary, const GdkColor *secondary)
-{
-	return  primary->red   == secondary->red	&&
-		primary->green == secondary->green  &&
-		primary->blue  == secondary->blue;
-}
-
 void
 gnome_bg_set_color (GnomeBG *bg,
 		    GnomeBGColorType type,
@@ -444,8 +436,8 @@
 	g_return_if_fail (bg != NULL);
 
 	if (bg->color_type != type			||
-	    !colors_equal (&bg->primary, primary)			||
-	    (secondary && !colors_equal (&bg->secondary, secondary))) {
+	    !gdk_color_equal (&bg->primary, primary)			||
+	    (secondary && !gdk_color_equal (&bg->secondary, secondary))) {
 
 		bg->color_type = type;
 		bg->primary = *primary;