valadoc: ModuleLoader: Fix dispose error

diff --git a/src/doclets/devhelp/doclet.vala b/src/doclets/devhelp/doclet.vala
index a5da48f7c864d367f53a1b8a123df16890ea8a90..b75b8d58191be5c6aab6c03a504001d13964c48d 100755 (executable)
--- a/src/doclets/devhelp/doclet.vala
+++ b/src/doclets/devhelp/doclet.vala
@@ -232,8 +232,8 @@ public class Valadoc.Devhelp.Doclet : Valadoc.Html.BasicDoclet {
        }
 }
 
-[ModuleInit]
-public Type register_plugin (GLib.TypeModule module) {
+
+public Type register_plugin (Valadoc.ModuleLoader module_loader) {
        return typeof (Valadoc.Devhelp.Doclet);
 }
 

diff --git a/src/doclets/gtkdoc/doclet.vala b/src/doclets/gtkdoc/doclet.vala
index 4845ba64b96ce0155b29ebe25c6d6b81d932e6bb..bdf20e8b52f1ae73b0837059781882e67ad48605 100755 (executable)
--- a/src/doclets/gtkdoc/doclet.vala
+++ b/src/doclets/gtkdoc/doclet.vala
@@ -417,8 +417,8 @@ public class Gtkdoc.Director : Valadoc.Doclet, Object {
        }
 }
 
-[ModuleInit]
-public Type register_plugin (GLib.TypeModule module) {
+
+public Type register_plugin (Valadoc.ModuleLoader module_loader) {
        return typeof (Gtkdoc.Director);
 }
 

diff --git a/src/doclets/htm/doclet.vala b/src/doclets/htm/doclet.vala
index 6f20dd86005d52673980cd60afdfb3f10bd23351..08cf09d70613435899586281ba4e4d3ebcd4db0e 100755 (executable)
--- a/src/doclets/htm/doclet.vala
+++ b/src/doclets/htm/doclet.vala
@@ -179,8 +179,8 @@ public class Valadoc.HtmlDoclet : Valadoc.Html.BasicDoclet {
        }
 }
 
-[ModuleInit]
-public Type register_plugin (GLib.TypeModule module) {
+
+public Type register_plugin (Valadoc.ModuleLoader module_loader) {
        return typeof ( Valadoc.HtmlDoclet );
 }
 

diff --git a/src/driver/0.10.x/driver.vala b/src/driver/0.10.x/driver.vala
index 4bbb940500caac9549d55864b280ce61d09c125b..75d4c6b5175142d63ab405c7ea369eeb16958385 100755 (executable)
--- a/src/driver/0.10.x/driver.vala
+++ b/src/driver/0.10.x/driver.vala
@@ -48,8 +48,7 @@ public class Valadoc.Drivers.Driver : Object, Valadoc.Driver {
 }
 
 
-[ModuleInit]
-public Type register_plugin (GLib.TypeModule module) {
+public Type register_plugin (Valadoc.ModuleLoader module_loader) {
        return typeof (Valadoc.Drivers.Driver);
 }
 

diff --git a/src/driver/0.11.0/driver.vala b/src/driver/0.11.0/driver.vala
index 4bbb940500caac9549d55864b280ce61d09c125b..75d4c6b5175142d63ab405c7ea369eeb16958385 100755 (executable)
--- a/src/driver/0.11.0/driver.vala
+++ b/src/driver/0.11.0/driver.vala
@@ -48,8 +48,7 @@ public class Valadoc.Drivers.Driver : Object, Valadoc.Driver {
 }
 
 
-[ModuleInit]
-public Type register_plugin (GLib.TypeModule module) {
+public Type register_plugin (Valadoc.ModuleLoader module_loader) {
        return typeof (Valadoc.Drivers.Driver);
 }
 

diff --git a/src/driver/0.11.x/driver.vala b/src/driver/0.11.x/driver.vala
index 4bbb940500caac9549d55864b280ce61d09c125b..75d4c6b5175142d63ab405c7ea369eeb16958385 100755 (executable)
--- a/src/driver/0.11.x/driver.vala
+++ b/src/driver/0.11.x/driver.vala
@@ -48,8 +48,7 @@ public class Valadoc.Drivers.Driver : Object, Valadoc.Driver {
 }
 
 
-[ModuleInit]
-public Type register_plugin (GLib.TypeModule module) {
+public Type register_plugin (Valadoc.ModuleLoader module_loader) {
        return typeof (Valadoc.Drivers.Driver);
 }
 

diff --git a/src/driver/0.12.x/driver.vala b/src/driver/0.12.x/driver.vala
index 4bbb940500caac9549d55864b280ce61d09c125b..75d4c6b5175142d63ab405c7ea369eeb16958385 100755 (executable)
--- a/src/driver/0.12.x/driver.vala
+++ b/src/driver/0.12.x/driver.vala
@@ -48,8 +48,7 @@ public class Valadoc.Drivers.Driver : Object, Valadoc.Driver {
 }
 
 
-[ModuleInit]
-public Type register_plugin (GLib.TypeModule module) {
+public Type register_plugin (Valadoc.ModuleLoader module_loader) {
        return typeof (Valadoc.Drivers.Driver);
 }
 

diff --git a/src/driver/0.13.x/driver.vala b/src/driver/0.13.x/driver.vala
index 4bbb940500caac9549d55864b280ce61d09c125b..75d4c6b5175142d63ab405c7ea369eeb16958385 100755 (executable)
--- a/src/driver/0.13.x/driver.vala
+++ b/src/driver/0.13.x/driver.vala
@@ -48,8 +48,7 @@ public class Valadoc.Drivers.Driver : Object, Valadoc.Driver {
 }
 
 
-[ModuleInit]
-public Type register_plugin (GLib.TypeModule module) {
+public Type register_plugin (Valadoc.ModuleLoader module_loader) {
        return typeof (Valadoc.Drivers.Driver);
 }
 

diff --git a/src/libvaladoc/api/driver.vala b/src/libvaladoc/api/driver.vala
index 0bcfc63e57a19e7ae75791fc4f8545d84e129273..8ad4a5e03a4a6683aaf286779fa883fa6d5fd8e4 100755 (executable)
--- a/src/libvaladoc/api/driver.vala
+++ b/src/libvaladoc/api/driver.vala
@@ -30,7 +30,7 @@ using Gee;
  * @see ModuleLoader
  */
 [CCode (has_target = false)]
-public delegate Type Valadoc.DriverRegisterFunction (GLib.TypeModule module);
+public delegate Type Valadoc.DriverRegisterFunction (ModuleLoader module_loader);
 
 
 

diff --git a/src/libvaladoc/doclet.vala b/src/libvaladoc/doclet.vala
index 83abba2ffe9a3d1a0d00c2c7051ca1215fa076ec..c8c5804445bdb8892face33b34298ff3f1685970 100755 (executable)
--- a/src/libvaladoc/doclet.vala
+++ b/src/libvaladoc/doclet.vala
@@ -28,7 +28,7 @@ using Gee;
  * @see ModuleLoader
  */
 [CCode (has_target = false)]
-public delegate Type Valadoc.DocletRegisterFunction (GLib.TypeModule module);
+public delegate Type Valadoc.DocletRegisterFunction (ModuleLoader module_loader);
 
 
 

diff --git a/src/libvaladoc/moduleloader.vala b/src/libvaladoc/moduleloader.vala
index 72297a9ea94e70c6130b490d0b8ee1825bbaaf6e..bb1e9e9b1d5b575ba6a8b372c0cae948e2d2b451 100755 (executable)
--- a/src/libvaladoc/moduleloader.vala
+++ b/src/libvaladoc/moduleloader.vala
@@ -30,7 +30,7 @@ public delegate void Valadoc.TagletRegisterFunction (ModuleLoader loader);
 
 
 
-public class Valadoc.ModuleLoader : TypeModule {
+public class Valadoc.ModuleLoader : Object {
        public HashMap<string, GLib.Type> taglets = new HashMap<string, Type> (GLib.str_hash, GLib.str_equal);
 
        private Module drivermodule;
@@ -41,17 +41,6 @@ public class Valadoc.ModuleLoader : TypeModule {
        private Type doclettype;
        public Doclet doclet;
 
-       public ModuleLoader () {
-               Object ();
-       }
-
-       public override bool load () {
-               return true;
-       }
-
-       public override void unload() {
-       }
-
        public Content.Taglet? create_taglet (string keyword) {
                return (taglets.has_key (keyword))? (Content.Taglet) GLib.Object.new (taglets.get (keyword)) : null;
        }