gnome-scan r711 - in trunk: . lib

[bersace svn gnome org]

Author: bersace
Date: Sat Dec 20 15:21:15 2008
New Revision: 711
URL: http://svn.gnome.org/viewvc/gnome-scan?rev=711&view=rev

Log:
Manually query modules.

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

Modified: trunk/lib/gnome-scan-init.vala
==============================================================================
--- trunk/lib/gnome-scan-init.vala	(original)
+++ trunk/lib/gnome-scan-init.vala	Sat Dec 20 15:21:15 2008
@@ -35,8 +35,6 @@
 		// TODO: i18n
 		// TODO: install stock items
 
-		Gegl.init(ref argv);
-
 		option_manager = new OptionManager();
 		option_manager.register_rule_by_type(typeof(OptionBool), typeof(CheckboxWidget));
 		option_manager.register_rule_by_type(typeof(OptionInt), typeof(ScaleWidget));
@@ -48,6 +46,11 @@
 								  "modules/gsfile", "modules/gsane",
 								  "../modules/gsfile", "../modules/gsane");
 		module_manager = new ModuleManager(module_path);
+		module_manager.query_modules();
+
+		// init Gegl after query_module so that modules can provide
+		// gegl operation.
+		Gegl.init(ref argv);
     }
 
     public void exit()

Modified: trunk/lib/gnome-scan-module-manager.vala
==============================================================================
--- trunk/lib/gnome-scan-module-manager.vala	(original)
+++ trunk/lib/gnome-scan-module-manager.vala	Sat Dec 20 15:21:15 2008
@@ -35,12 +35,6 @@
 		 * plateform that GNU/Linux.
 		 **/
 		public class ModuleManager : Object {
-			
-			construct {
-				if (path != null)
-					query_modules ();
-			}
-			
 			/**
 			 * GnomeScanModuleManager:path:
 			 *