[maemo-commits] [maemo-commits] r13856 - in projects/haf/trunk/gtk+: . gtk

[From: subversion at stage.maemo.org]

Author: mitch
Date: 2007-09-17 17:25:49 +0300 (Mon, 17 Sep 2007)
New Revision: 13856

Modified:
   projects/haf/trunk/gtk+/ChangeLog
   projects/haf/trunk/gtk+/gtk/gtkrc.c
Log:
2007-09-17  Michael Natterer  <mitch at imendio.com>

	Reintroduce GScanner cache. Addresses NB#61907:

	* gtk/gtkrc.c (gtk_rc_parse_any): call the reintroduced
	hildon_g_scanner_cache_open()

	(is_c_identifier): speed up by replacing strchr() by an if()
	construct. See upstream bug #476903.



Modified: projects/haf/trunk/gtk+/ChangeLog
===================================================================
--- projects/haf/trunk/gtk+/ChangeLog	2007-09-17 14:24:53 UTC (rev 13855)
+++ projects/haf/trunk/gtk+/ChangeLog	2007-09-17 14:25:49 UTC (rev 13856)
@@ -1,3 +1,13 @@
+2007-09-17  Michael Natterer  <mitch at imendio.com>
+
+	Reintroduce GScanner cache. Addresses NB#61907:
+
+	* gtk/gtkrc.c (gtk_rc_parse_any): call the reintroduced
+	hildon_g_scanner_cache_open()
+
+	(is_c_identifier): speed up by replacing strchr() by an if()
+	construct. See upstream bug #476903.
+
 2007-09-14 13:24:14  Tim Janik  <timj at imendio.com>
 
 	* gtk/gtklabel.c (gtk_label_ensure_layout): constrain wrap width by 85%

Modified: projects/haf/trunk/gtk+/gtk/gtkrc.c
===================================================================
--- projects/haf/trunk/gtk+/gtk/gtkrc.c	2007-09-17 14:24:53 UTC (rev 13855)
+++ projects/haf/trunk/gtk+/gtk/gtkrc.c	2007-09-17 14:25:49 UTC (rev 13856)
@@ -2221,6 +2221,11 @@
       g_assert (input_string == NULL);
       
       g_scanner_input_file (scanner, input_fd);
+
+#ifdef MAEMO_CHANGES
+      if (input_name)
+        hildon_g_scanner_cache_open (scanner, input_name);
+#endif /* MAEMO_CHANGES */
     }
   else
     {
@@ -2799,6 +2804,25 @@
 static gboolean
 is_c_identifier (const gchar *string)
 {
+#ifdef MAEMO_CHANGES
+  if ((string[0] >= 'a' && string[0] <= 'z') ||
+      (string[0] >= 'A' && string[0] <= 'Z') ||
+      string[0] == '_')
+    {
+      const gchar *p;
+
+      for (p = string + 1; *p ; p++)
+        if (! ((*p >= 'a' && *p <= 'z') ||
+               (*p >= 'A' && *p <= 'Z') ||
+               (*p >= '0' && *p <= '9') ||
+               *p == '-' || *p == '_'))
+          return FALSE;
+
+      return TRUE;
+    }
+
+  return FALSE;
+#else /* !MAEMO_CHANGES */
   const gchar *p;
   gboolean is_varname;
 
@@ -2807,6 +2831,7 @@
     is_varname &= strchr (G_CSET_DIGITS "-_" G_CSET_a_2_z G_CSET_A_2_Z, *p) != NULL;
 
   return is_varname;
+#endif /* MAEMO_CHANGES */
 }
 
 static void