[maemo-commits] [maemo-commits] r14188 - in projects/haf/trunk/hildon-theme-cacher: . debian src

[From: subversion at stage.maemo.org]

Author: mdk
Date: 2007-09-28 16:19:17 +0300 (Fri, 28 Sep 2007)
New Revision: 14188

Modified:
   projects/haf/trunk/hildon-theme-cacher/ChangeLog
   projects/haf/trunk/hildon-theme-cacher/NEWS
   projects/haf/trunk/hildon-theme-cacher/configure.ac
   projects/haf/trunk/hildon-theme-cacher/debian/changelog
   projects/haf/trunk/hildon-theme-cacher/src/cacher.c
   projects/haf/trunk/hildon-theme-cacher/src/cacher.h
Log:
[0.4.3 release]


Modified: projects/haf/trunk/hildon-theme-cacher/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-theme-cacher/ChangeLog	2007-09-28 13:11:27 UTC (rev 14187)
+++ projects/haf/trunk/hildon-theme-cacher/ChangeLog	2007-09-28 13:19:17 UTC (rev 14188)
@@ -1,3 +1,13 @@
+2007-09-28  Michael Dominic Kostrzewa  <michael.kostrzewa at nokia.com> 
+
+	[0.4.3 release]
+
+	* NEWS:
+	* configure.ac:
+	* debian/changelog:
+	* src/cacher.c:
+	* src/cacher.h: Adding sorted gtkrc processing.
+
 2007-09-17  Fernando Herrera  <fernando.herrera-de-las-heras at nokia.com>
 
 	[0.4.2 release]

Modified: projects/haf/trunk/hildon-theme-cacher/NEWS
===================================================================
--- projects/haf/trunk/hildon-theme-cacher/NEWS	2007-09-28 13:11:27 UTC (rev 14187)
+++ projects/haf/trunk/hildon-theme-cacher/NEWS	2007-09-28 13:19:17 UTC (rev 14188)
@@ -1,3 +1,6 @@
+[0.4.3 release]
+* Adding sorted gtkrc processing
+
 [0.4.1 release]
 * Sh hotfix (silly mistake)
 

Modified: projects/haf/trunk/hildon-theme-cacher/configure.ac
===================================================================
--- projects/haf/trunk/hildon-theme-cacher/configure.ac	2007-09-28 13:11:27 UTC (rev 14187)
+++ projects/haf/trunk/hildon-theme-cacher/configure.ac	2007-09-28 13:19:17 UTC (rev 14188)
@@ -1,5 +1,5 @@
 AC_INIT(Makefile.am)
-AM_INIT_AUTOMAKE(hildon-theme-cacher, 0.4.2)
+AM_INIT_AUTOMAKE(hildon-theme-cacher, 0.4.3)
 AM_CONFIG_HEADER(config.h)
 
 AC_CANONICAL_HOST

Modified: projects/haf/trunk/hildon-theme-cacher/debian/changelog
===================================================================
--- projects/haf/trunk/hildon-theme-cacher/debian/changelog	2007-09-28 13:11:27 UTC (rev 14187)
+++ projects/haf/trunk/hildon-theme-cacher/debian/changelog	2007-09-28 13:19:17 UTC (rev 14188)
@@ -1,3 +1,9 @@
+hildon-theme-cacher (0.4.3-1) unstable; urgency=low
+
+  * Adding sorted gtkrc processing
+
+ -- Michael Dominic Kostrzewa <michael.kostrzewa at nokia.com>  Fri, 28 Sep 2007 16:12:39 +0300
+
 hildon-theme-cacher (0.4.2-1) unstable; urgency=low
 
   * Use HILDON_SCANNER_CACHE_CREATE env variable for creating the cache.

Modified: projects/haf/trunk/hildon-theme-cacher/src/cacher.c
===================================================================
--- projects/haf/trunk/hildon-theme-cacher/src/cacher.c	2007-09-28 13:11:27 UTC (rev 14187)
+++ projects/haf/trunk/hildon-theme-cacher/src/cacher.c	2007-09-28 13:19:17 UTC (rev 14188)
@@ -76,6 +76,20 @@
                  "the gtk rc files found.\n\n");
 }
 
+/* The string that has less character is the first one. 
+ * Ugly way to make sure that the gtkrc gets processed before other gtkrc-depending files.
+ * Really really bad and can break, but well... "product is the priority" (TM) ;) */
+gint                            sort_paths (const char *a, 
+                                            const char *b)
+{
+        if (strlen (a) < strlen (b)) 
+                return -1;
+        if (strlen (a) > strlen (b))
+                return 1;
+        else
+                return 0;
+}
+
 int                             main (int argc, char **argv)
 {
         GtkSettings *settings;
@@ -95,11 +109,15 @@
 
         gtk_init_check (&argc, &argv);
 
-	g_setenv ("HILDON_SCANNER_CACHE_CREATE", "1", TRUE);
+        g_setenv ("HILDON_SCANNER_CACHE_CREATE", "1", TRUE);
 
         /* Get the list of all gtkrc files */
         rc_list = parse_dir (argv [1], NULL, 1);
 
+        /* Sort the list so that we make sure to process files in 
+         * correct order. A bit hackish. */
+        rc_list = g_slist_sort (rc_list, (GCompareFunc) sort_paths);
+
         /* Iterate through all themes and generate cache */
         iterator = rc_list;
         while (iterator != NULL) {

Modified: projects/haf/trunk/hildon-theme-cacher/src/cacher.h
===================================================================
--- projects/haf/trunk/hildon-theme-cacher/src/cacher.h	2007-09-28 13:11:27 UTC (rev 14187)
+++ projects/haf/trunk/hildon-theme-cacher/src/cacher.h	2007-09-28 13:19:17 UTC (rev 14188)
@@ -30,5 +30,8 @@
 
 void                            show_usage (void);
 
+gint                            sort_paths (const char *a, 
+                                            const char *b);
+
 int                             main (int argc, char **argv);