From: Florian Brosch <flo.brosch@gmail.com>
Date: Mon, 25 Jul 2011 07:40:26 +0000 (+0200)
Subject: valadoc: ModuleLoader: Fix dispose error
X-Git-Tag: 0.37.1~3^2~314
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=d46d45d6b2b3d90186e760d15bd07b93b5c04be6;p=thirdparty%2Fvala.git

valadoc: ModuleLoader: Fix dispose error
---

diff --git a/src/doclets/devhelp/doclet.vala b/src/doclets/devhelp/doclet.vala
index a5da48f7c..b75b8d581 100755
--- 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 4845ba64b..bdf20e8b5 100755
--- 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 6f20dd860..08cf09d70 100755
--- 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 4bbb94050..75d4c6b51 100755
--- 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 4bbb94050..75d4c6b51 100755
--- 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 4bbb94050..75d4c6b51 100755
--- 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 4bbb94050..75d4c6b51 100755
--- 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 4bbb94050..75d4c6b51 100755
--- 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 0bcfc63e5..8ad4a5e03 100755
--- 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 83abba2ff..c8c580444 100755
--- 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 72297a9ea..bb1e9e9b1 100755
--- 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;
 	}