eel r2191 - in trunk: . eel

[alexl svn gnome org]

Author: alexl
Date: Thu Oct  9 09:30:24 2008
New Revision: 2191
URL: http://svn.gnome.org/viewvc/eel?rev=2191&view=rev

Log:
2008-10-09  Alexander Larsson  <alexl redhat com>

        * eel/eel-gdk-extensions.[ch]:
	Remove old now unused function eel_gdk_color_parse()



Modified:
   trunk/ChangeLog
   trunk/eel/eel-gdk-extensions.c
   trunk/eel/eel-gdk-extensions.h

Modified: trunk/eel/eel-gdk-extensions.c
==============================================================================
--- trunk/eel/eel-gdk-extensions.c	(original)
+++ trunk/eel/eel-gdk-extensions.c	Thu Oct  9 09:30:24 2008
@@ -358,7 +358,7 @@
 
 	got_color = FALSE;
 	if (color_spec != NULL) {
-		if (eel_gdk_color_parse (color_spec, color)) {
+		if (gdk_color_parse (color_spec, color)) {
 			got_color = TRUE;
 		}
 	}
@@ -735,41 +735,6 @@
 				     text_color, NULL);
 }
 
-/* Color specifications have changed in gdk 2.0.  Unfortunately, nautilus has
-   the old rgb:RRRR/BBBB/GGGG format scattered about in various xml files and
-   the new gdk_color_parse () is not fully backward compatible. */
-
-/* 2002-13-02 FIXME: Someday we should remove this compatibility code. */
-
-gboolean
-eel_gdk_color_parse (const gchar *spec,
-		     GdkColor *color)
-{
-	Colormap xcolormap;
-	XColor xcolor;
-
-	g_return_val_if_fail (spec != NULL, FALSE);
-	g_return_val_if_fail (color != NULL, FALSE);
-
-	/* First try to use the new gdk code. */
-	if (gdk_color_parse (spec, color)) {
-		return TRUE;
-	}
-
-	/* If that failed, fallback to the old gdk code. */
-	xcolormap = DefaultColormap (GDK_DISPLAY (),
-				     gdk_x11_get_default_screen ());
-
-	if (XParseColor (GDK_DISPLAY (), xcolormap, spec, &xcolor)) {
-		color->red = xcolor.red;
-		color->green = xcolor.green;
-		color->blue = xcolor.blue;
-		return TRUE;
-	}
-
-	return FALSE;
-}
-
 #if ! defined (EEL_OMIT_SELF_CHECK)
 
 static char *

Modified: trunk/eel/eel-gdk-extensions.h
==============================================================================
--- trunk/eel/eel-gdk-extensions.h	(original)
+++ trunk/eel/eel-gdk-extensions.h	Thu Oct  9 09:30:24 2008
@@ -117,9 +117,6 @@
 GdkColor            eel_gdk_rgb_to_color                   (guint32              color);
 char *              eel_gdk_rgb_to_color_spec              (guint32              color);
 
-gboolean            eel_gdk_color_parse                    (const gchar         *spec,
-							    GdkColor            *color);
-
 gboolean            eel_gdk_color_is_dark                  (GdkColor            *color);
 
 /* A routine to get a 50% gray stippled bitmap for use in some types of highlighting. */