gegl r2064 - in trunk: . gegl

[neo svn gnome org]

Author: neo
Date: Tue Feb 19 15:56:35 2008
New Revision: 2064
URL: http://svn.gnome.org/viewvc/gegl?rev=2064&view=rev

Log:
2008-02-19  Sven Neumann  <sven gimp org>

	* gegl/gegl-init.c: fixed broken filename handling.



Modified:
   trunk/ChangeLog
   trunk/gegl/gegl-init.c

Modified: trunk/gegl/gegl-init.c
==============================================================================
--- trunk/gegl/gegl-init.c	(original)
+++ trunk/gegl/gegl-init.c	Tue Feb 19 15:56:35 2008
@@ -192,7 +192,9 @@
             {
               if (g_pattern_match_string (pattern, name))
                 {
-                  gchar *fname = g_strdup_printf ("%s/%s", gegl_swap_dir (), name);
+                  gchar *fname = g_build_filename (gegl_swap_dir (),
+                                                   name,
+                                                   NULL);
                   g_unlink (fname);
                   g_free (fname);
                 }
@@ -268,22 +270,29 @@
 
           /* also load plug-ins from ~/.gegl-0.0/plug-ins */
           g_free (module_path);
-          module_path = g_build_filename (g_get_home_dir (), "." GEGL_LIBRARY, "plug-ins", NULL);
-          if (g_mkdir_with_parents (module_path, S_IRUSR | S_IWUSR | S_IXUSR)==0)
+
+          module_path = g_build_filename (g_get_home_dir (),
+                                          "." GEGL_LIBRARY,
+                                          "plug-ins",
+                                          NULL);
+
+          if (g_mkdir_with_parents (module_path,
+                                    S_IRUSR | S_IWUSR | S_IXUSR) == 0)
             {
-              gchar *makefile_path = g_malloc (strlen (module_path) + 20);
-              g_sprintf (makefile_path, "%s/Makefile", module_path);
-              if (!g_file_test (makefile_path, G_FILE_TEST_EXISTS))
+              gchar *makefile_path = g_build_filename (module_path,
+                                                       "Makefile",
+                                                       NULL);
+
+              if (! g_file_test (makefile_path, G_FILE_TEST_EXISTS))
                 g_file_set_contents (makefile_path, makefile (), -1, NULL);
+
               g_free (makefile_path);
             }
+
           gegl_module_db_load (module_db, module_path);
           g_free (module_path);
         }
 
-
-
-
       gegl_instrument ("gegl_init", "load modules", gegl_ticks () - time);
     }