[maemo-commits] [maemo-commits] r10525 - in projects/haf/branches/gtk+/maemo-gtk-2-10: . gtk

[From: subversion at stage.maemo.org]

Author: xan
Date: 2007-03-13 14:52:47 +0200 (Tue, 13 Mar 2007)
New Revision: 10525

Modified:
   projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog
   projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkrc.c
   projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkstyle.h
Log:
	* gtk/gtkrc.c:
	* gtk/gtkstyle.h:

	Remove support for logical colors with the maemo gtk+ 2.6 format.


Modified: projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog
===================================================================
--- projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog	2007-03-13 12:47:19 UTC (rev 10524)
+++ projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog	2007-03-13 12:52:47 UTC (rev 10525)
@@ -1,3 +1,10 @@
+2007-03-13  Xan Lopez  <xan.lopez at nokia.com>
+
+	* gtk/gtkrc.c:
+	* gtk/gtkstyle.h:
+
+	Remove support for logical colors with the maemo gtk+ 2.6 format.
+
 2007-03-08  Xan Lopez  <xan.lopez at nokia.com>
 
 	* gtk/gtkentry.c: Remove the icon-width property, it's unused.

Modified: projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkrc.c
===================================================================
--- projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkrc.c	2007-03-13 12:47:19 UTC (rev 10524)
+++ projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkrc.c	2007-03-13 12:52:47 UTC (rev 10525)
@@ -2228,12 +2228,6 @@
 
   for (i = 0; i < G_N_ELEMENTS (symbols); i++)
     g_scanner_scope_add_symbol (scanner, 0, symbol_names + symbols[i].name_offset, GINT_TO_POINTER (symbols[i].token));
-
-#ifdef MAEMO_CHANGES
-  g_scanner_scope_add_symbol (scanner, 0, "logical_color",
-                              GINT_TO_POINTER (GTK_RC_TOKEN_COLOR));
-#endif /* MAEMO_CHANGES */
-
   done = FALSE;
   while (!done)
     {
@@ -3885,16 +3879,9 @@
     case G_TOKEN_STRING:
       if (!gdk_color_parse (scanner->value.v_string, color))
 	{
-#ifdef MAEMO_CHANGES
-          if (!(style && lookup_color (style, scanner->value.v_string, color)))
-            {
-#endif /* MAEMO_CHANGES */
           g_scanner_warn (scanner, "Invalid color constant '%s'",
                           scanner->value.v_string);
           return G_TOKEN_STRING;
-#ifdef MAEMO_CHANGES
-            }
-#endif /* MAEMO_CHANGES */
 	}
       return G_TOKEN_NONE;
 

Modified: projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkstyle.h
===================================================================
--- projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkstyle.h	2007-03-13 12:47:19 UTC (rev 10524)
+++ projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkstyle.h	2007-03-13 12:52:47 UTC (rev 10525)
@@ -900,11 +900,11 @@
 				  GtkTextDirection  direction,
 				  gboolean          draw_arrow);
 
-#ifdef MAEMO_CHANGES
+/* MAEMO START */
 gboolean  gtk_style_lookup_logical_color     (GtkStyle     *style,
                                               const gchar  *color_name,
                                               GdkColor     *color);
-#endif /* MAEMO_CHANGES */
+/* MAEMO END */
 
 G_END_DECLS