gimp r24651 - in branches/weskaggs: . app/core app/widgets libgimpconfig

[weskaggs svn gnome org]

Author: weskaggs
Date: Fri Jan 18 18:24:13 2008
New Revision: 24651
URL: http://svn.gnome.org/viewvc/gimp?rev=24651&view=rev

Log:
Bill Skaggs  <weskaggs primate ucdavis edu>

	* app/core/gimpdatafactory.c
	* app/widgets/gimpdatachooserdialog.c
	* libgimpconfig/gimpconfig-path.c: further development
	of data chooser.


Modified:
   branches/weskaggs/ChangeLog
   branches/weskaggs/app/core/gimpdatafactory.c
   branches/weskaggs/app/widgets/gimpdatachooserdialog.c
   branches/weskaggs/libgimpconfig/gimpconfig-path.c

Modified: branches/weskaggs/app/core/gimpdatafactory.c
==============================================================================
--- branches/weskaggs/app/core/gimpdatafactory.c	(original)
+++ branches/weskaggs/app/core/gimpdatafactory.c	Fri Jan 18 18:24:13 2008
@@ -143,6 +143,10 @@
   g_return_val_if_fail (loader_entries != NULL, NULL);
   g_return_val_if_fail (n_loader_entries > 0, NULL);
 
+  g_print ("Creating data factory\n");
+  g_print ("Path property is '%s'\n", path_property_name);
+  g_print ("Writable property is '%s'\n", writable_property_name);
+
   factory = g_object_new (GIMP_TYPE_DATA_FACTORY, NULL);
 
   factory->gimp                   = gimp;
@@ -299,7 +303,7 @@
                              WRITABLE_PATH_KEY, writable_list);
         }
 
-      gimp_datafiles_read_directories (path, G_FILE_TEST_EXISTS,
+      gimp_datafiles_read_directories (writable_path, G_FILE_TEST_EXISTS,
                                        gimp_data_factory_load_data, &context);
 
       if (writable_path)

Modified: branches/weskaggs/app/widgets/gimpdatachooserdialog.c
==============================================================================
--- branches/weskaggs/app/widgets/gimpdatachooserdialog.c	(original)
+++ branches/weskaggs/app/widgets/gimpdatachooserdialog.c	Fri Jan 18 18:24:13 2008
@@ -108,6 +108,7 @@
   GType            data_type;
   gint             view_size = 32;
   gchar           *path      = NULL;
+  gchar           *writable_path = NULL;
   gchar           *tmp;
   GimpContext     *context;
   gchar           *dirname;
@@ -120,7 +121,13 @@
 
   g_object_get (working_factory->gimp->config,
                 working_factory->path_property_name,     &path,
+                working_factory->writable_property_name, &writable_path,
                 NULL);
+
+  g_print ("In data chooser dialog, for working factory:\n");
+  g_print ("Path is '%s'\n", path);
+  g_print ("Writable path is '%s'\n", writable_path);
+
   tmp = gimp_config_path_expand (path, TRUE, NULL);
   g_free (path);
   path = tmp;
@@ -137,7 +144,7 @@
   factory = gimp_data_factory_new (working_factory->gimp,
                                    data_type,
                                    working_factory->path_property_name,
-                                   working_factory->writable_property_name,
+                                   working_factory->path_property_name,
                                    working_factory->loader_entries,
                                    working_factory->n_loader_entries,
                                    NULL,
@@ -349,9 +356,12 @@
       return FALSE;
     }
 
-  g_object_get (factory->gimp->config,
-                factory->writable_property_name, &writable_path,
+  g_object_get (working_factory->gimp->config,
+                working_factory->writable_property_name, &writable_path,
                 NULL);
+
+  g_print ("writable path before expansion is '%s'\n", writable_path);
+
   tmp = gimp_config_path_expand (writable_path, TRUE, NULL);
   g_free (writable_path);
   writable_path = tmp;
@@ -379,6 +389,7 @@
     }
 
   g_stat (new_filename, &filestat);
+  g_print ("loading new file %s\n", new_filename);
 
   file_data.filename = new_filename;
   file_data.dirname  = writable_path;

Modified: branches/weskaggs/libgimpconfig/gimpconfig-path.c
==============================================================================
--- branches/weskaggs/libgimpconfig/gimpconfig-path.c	(original)
+++ branches/weskaggs/libgimpconfig/gimpconfig-path.c	Fri Jan 18 18:24:13 2008
@@ -203,9 +203,11 @@
 gchar *
 gimp_config_build_data_path (const gchar *name)
 {
-  return g_strconcat ("${gimp_dir}", G_DIR_SEPARATOR_S, name,
-                      G_SEARCHPATH_SEPARATOR_S,
-                      "${gimp_data_dir}", G_DIR_SEPARATOR_S, name,
+/*   return g_strconcat ("${gimp_dir}", G_DIR_SEPARATOR_S, name, */
+/*                       G_SEARCHPATH_SEPARATOR_S, */
+/*                       "${gimp_data_dir}", G_DIR_SEPARATOR_S, name, */
+/*                       NULL); */
+  return g_strconcat ("${gimp_data_dir}", G_DIR_SEPARATOR_S, name,
                       NULL);
 }