gnome-scan r782 - in trunk: . lib

[bersace svn gnome org]

Author: bersace
Date: Thu Jan 15 17:38:36 2009
New Revision: 782
URL: http://svn.gnome.org/viewvc/gnome-scan?rev=782&view=rev

Log:
Compute module path for development version.

Modified:
   trunk/ChangeLog
   trunk/lib/gnome-scan-init.vala

Modified: trunk/lib/gnome-scan-init.vala
==============================================================================
--- trunk/lib/gnome-scan-init.vala	(original)
+++ trunk/lib/gnome-scan-init.vala	Thu Jan 15 17:38:36 2009
@@ -45,9 +45,18 @@
 		option_manager.register_rule_by_type(typeof(OptionEnum), typeof(ComboBoxWidget));
 		option_manager.register_rule_by_name("page-orientation", typeof(PageOrientationWidget));
 
-		module_path = string.join(GLib.Path.SEARCHPATH_SEPARATOR_S, MODULE_DIR,
-								  "modules/gsfile", "modules/gsane",
-								  "../modules/gsfile", "../modules/gsane");
+		// If we are in source tree.
+		if (GLib.FileUtils.test("modules/gsfile", GLib.FileTest.IS_DIR)
+			|| GLib.FileUtils.test("../modules/gsfile", GLib.FileTest.IS_DIR)) {
+			module_path = string.join(GLib.Path.SEARCHPATH_SEPARATOR_S,
+									  "modules/gsfile", "modules/gsane",
+									  "../modules/gsfile", "../modules/gsane");
+		}
+		// Installed
+		else {
+			module_path = MODULE_DIR;
+		}
+
 		module_manager = new ModuleManager(module_path);
 		module_manager.query_modules();