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

[From: subversion at stage.maemo.org]

Author: mitch
Date: 2006-12-15 14:57:25 +0200 (Fri, 15 Dec 2006)
New Revision: 8782

Modified:
   projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog
   projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkrc.c
Log:
2006-12-15  Michael Natterer  <mitch at imendio.com>

	* gtk/gtkrc.c: added support for logical colors as they were in
	maemo-gtk-2-6, so we now parse both the new upstream format and
	the old one.



Modified: projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog
===================================================================
--- projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog	2006-12-15 12:54:53 UTC (rev 8781)
+++ projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog	2006-12-15 12:57:25 UTC (rev 8782)
@@ -1,5 +1,11 @@
 2006-12-15  Michael Natterer  <mitch at imendio.com>
 
+	* gtk/gtkrc.c: added support for logical colors as they were in
+	maemo-gtk-2-6, so we now parse both the new upstream format and
+	the old one.
+
+2006-12-15  Michael Natterer  <mitch at imendio.com>
+
 	* gtk/gtkwidget.h
 	* gtk/gtktreeview.h
 	* gtk/gtktoolbutton.h

Modified: projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkrc.c
===================================================================
--- projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkrc.c	2006-12-15 12:54:53 UTC (rev 8781)
+++ projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkrc.c	2006-12-15 12:57:25 UTC (rev 8782)
@@ -2205,6 +2205,12 @@
 
   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));
+
+  /* MAEMO START */
+  g_scanner_scope_add_symbol (scanner, 0, "logical_color",
+                              GINT_TO_POINTER (GTK_RC_TOKEN_COLOR));
+  /* MAEMO END */
+
   done = FALSE;
   while (!done)
     {
@@ -3856,9 +3862,16 @@
     case G_TOKEN_STRING:
       if (!gdk_color_parse (scanner->value.v_string, color))
 	{
+          /* MAEMO START */
+          if (!(style && lookup_color (style, scanner->value.v_string, color)))
+            {
+          /* MAEMO END */
           g_scanner_warn (scanner, "Invalid color constant '%s'",
                           scanner->value.v_string);
           return G_TOKEN_STRING;
+          /* MAEMO START */
+            }
+          /* MAEMO_END */
 	}
       return G_TOKEN_NONE;