[maemo-commits] [maemo-commits] r12354 - in projects/haf/trunk/hildon-theme-tools: . scripts src

[From: subversion at stage.maemo.org]

Author: mdk
Date: 2007-06-19 12:11:32 +0300 (Tue, 19 Jun 2007)
New Revision: 12354

Modified:
   projects/haf/trunk/hildon-theme-tools/ChangeLog
   projects/haf/trunk/hildon-theme-tools/scripts/hildon-theme-bootstrap
   projects/haf/trunk/hildon-theme-tools/src/common.c
   projects/haf/trunk/hildon-theme-tools/src/slicer.c
Log:
Free the keyfile using proper deallocator.
Fix the confusion with logical vs. bitewise operator.


Modified: projects/haf/trunk/hildon-theme-tools/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-theme-tools/ChangeLog	2007-06-19 09:04:34 UTC (rev 12353)
+++ projects/haf/trunk/hildon-theme-tools/ChangeLog	2007-06-19 09:11:32 UTC (rev 12354)
@@ -1,3 +1,11 @@
+2007-06-19  Michael Dominic Kostrzewa  <michael.kostrzewa at nokia.com> 
+
+	* scripts/hildon-theme-bootstrap: Updating.
+
+	* src/common.c: Free the keyfile using proper deallocator.
+
+	* src/slicer.c: Fix the confusion with logical vs. bitewise operator.
+
 2007-05-09  Michael Dominic Kostrzewa  <michael.kostrzewa at nokia.com> 
 
 	[0.5.0-1 release]

Modified: projects/haf/trunk/hildon-theme-tools/scripts/hildon-theme-bootstrap
===================================================================
--- projects/haf/trunk/hildon-theme-tools/scripts/hildon-theme-bootstrap	2007-06-19 09:04:34 UTC (rev 12353)
+++ projects/haf/trunk/hildon-theme-tools/scripts/hildon-theme-bootstrap	2007-06-19 09:11:32 UTC (rev 12354)
@@ -47,7 +47,7 @@
                         return
                 elif [ "$opt" == "hildon-theme-layout-4" ]; then
                         LAYOUT="hildon-theme-layout-4"
-                        SVN_ADDRESS="https://stage.maemo.org/svn/maemo/projects/haf/tags/hildon-theme-plankton/4.2.0-1/"
+                        SVN_ADDRESS="https://stage.maemo.org/svn/maemo/projects/haf/tags/hildon-theme-plankton/4.9.0-1/"
                         return
                 else
                         echo "Bad selection!"

Modified: projects/haf/trunk/hildon-theme-tools/src/common.c
===================================================================
--- projects/haf/trunk/hildon-theme-tools/src/common.c	2007-06-19 09:04:34 UTC (rev 12353)
+++ projects/haf/trunk/hildon-theme-tools/src/common.c	2007-06-19 09:11:32 UTC (rev 12354)
@@ -107,7 +107,7 @@
         }
 
         if (key_file != NULL)
-                g_free (key_file);
+                g_key_file_free (key_file);
         
         if (element_keys != NULL)
                 g_strfreev (element_keys);

Modified: projects/haf/trunk/hildon-theme-tools/src/slicer.c
===================================================================
--- projects/haf/trunk/hildon-theme-tools/src/slicer.c	2007-06-19 09:04:34 UTC (rev 12353)
+++ projects/haf/trunk/hildon-theme-tools/src/slicer.c	2007-06-19 09:11:32 UTC (rev 12354)
@@ -269,9 +269,9 @@
         /* Check the optional directory argument */
         if (argc >= 4 && argv [3] != NULL) {
                 directory = argv [3];
-                if (! g_file_test (directory, G_FILE_TEST_IS_DIR || G_FILE_TEST_EXISTS)) {
+                if (! g_file_test (directory, G_FILE_TEST_IS_DIR | G_FILE_TEST_EXISTS)) {
                         g_print ("Creating directory %s\n", directory);
-                        if (g_mkdir_with_parents (directory, 493) != 0) {
+                        if (g_mkdir_with_parents (directory, 0755) != 0) {
                                 g_printerr ("ERROR: Failed to create directory!\n");
                                 goto Error;
                         }