[Rawstudio-commit] r3238 - trunk/librawstudio

[Anders Kvist]

Author: akv
Date: 2010-02-15 23:03:54 +0100 (Mon, 15 Feb 2010)
New Revision: 3238

Modified:
   trunk/librawstudio/rs-profile-factory.c
   trunk/librawstudio/rs-profile-factory.h
Log:
Prepared rs-profile-factory for usage in test().

Modified: trunk/librawstudio/rs-profile-factory.c
===================================================================
--- trunk/librawstudio/rs-profile-factory.c	2010-02-15 20:30:58 UTC (rev 3237)
+++ trunk/librawstudio/rs-profile-factory.c	2010-02-15 22:03:54 UTC (rev 3238)
@@ -7,12 +7,6 @@
 
 #define PROFILE_FACTORY_DEFAULT_SEARCH_PATH PACKAGE_DATA_DIR "/" PACKAGE "/profiles/"
 
-struct _RSProfileFactory {
-	GObject parent;
-
-	GtkListStore *profiles;
-};
-
 G_DEFINE_TYPE(RSProfileFactory, rs_profile_factory, G_TYPE_OBJECT)
 
 static void
@@ -76,8 +70,8 @@
 	return readable;
 }
 
-static void
-load_profiles(RSProfileFactory *factory, const gchar *path, gboolean load_dcp, gboolean load_icc)
+void
+rs_profile_factory_load_profiles(RSProfileFactory *factory, const gchar *path, gboolean load_dcp, gboolean load_icc)
 {
 	const gchar *basename;
 	gchar *filename;
@@ -91,7 +85,7 @@
 		filename = g_build_filename(path, basename, NULL);
 
 		if (g_file_test(filename, G_FILE_TEST_IS_DIR))
-			load_profiles(factory, filename, load_dcp, load_icc);
+			rs_profile_factory_load_profiles(factory, filename, load_dcp, load_icc);
 
 		else if (g_file_test(filename, G_FILE_TEST_IS_REGULAR))
 		{
@@ -116,7 +110,7 @@
 {
 	RSProfileFactory *factory = g_object_new(RS_TYPE_PROFILE_FACTORY, NULL);
 	
-	load_profiles(factory, search_path, TRUE, FALSE);
+	rs_profile_factory_load_profiles(factory, search_path, TRUE, FALSE);
 
 	GtkTreeIter iter;
 	RSIccProfile *srgb = rs_icc_profile_new_from_file(PACKAGE_DATA_DIR "/" PACKAGE "/profiles/sRGB.icc");
@@ -149,7 +143,7 @@
 		factory = rs_profile_factory_new(PROFILE_FACTORY_DEFAULT_SEARCH_PATH);
 
 		const gchar *user_profiles = rs_profile_factory_get_user_profile_directory();
-		load_profiles(factory, user_profiles, TRUE, TRUE);
+		rs_profile_factory_load_profiles(factory, user_profiles, TRUE, TRUE);
 	}
 	g_static_mutex_unlock(&lock);
 

Modified: trunk/librawstudio/rs-profile-factory.h
===================================================================
--- trunk/librawstudio/rs-profile-factory.h	2010-02-15 20:30:58 UTC (rev 3237)
+++ trunk/librawstudio/rs-profile-factory.h	2010-02-15 22:03:54 UTC (rev 3238)
@@ -19,6 +19,12 @@
 	RS_PROFILE_FACTORY_NUM_FIELDS
 };
 
+struct _RSProfileFactory {
+	GObject parent;
+
+	GtkListStore *profiles;
+};
+
 typedef struct _RSProfileFactory RSProfileFactory;
 
 typedef struct {
@@ -27,6 +33,8 @@
 
 GType rs_profile_factory_get_type(void);
 
+void rs_profile_factory_load_profiles(RSProfileFactory *factory, const gchar *path, gboolean load_dcp, gboolean load_icc);
+
 RSProfileFactory *rs_profile_factory_new(const gchar *search_path);
 
 RSProfileFactory *rs_profile_factory_new_default(void);