Moved all relevant typedefs into these files.

[platform/upstream/glib.git] / gio / giomodule.h

diff --git a/gio/giomodule.h b/gio/giomodule.h
index 76c27ce..0d8c5ab 100644 (file)
--- a/gio/giomodule.h
+++ b/gio/giomodule.h
@@ -27,7 +27,7 @@
 #ifndef __G_IO_MODULE_H__
 #define __G_IO_MODULE_H__
 
-#include <glib-object.h>
+#include <gio/giotypes.h>
 #include <gmodule.h>
 
 G_BEGIN_DECLS
@@ -44,19 +44,15 @@ G_BEGIN_DECLS
  * 
  * Opaque module base class for extending GIO.
  **/
-typedef struct _GIOModule GIOModule;
 typedef struct _GIOModuleClass GIOModuleClass;
 
-typedef struct _GIOExtensionPoint GIOExtensionPoint;
-typedef struct _GIOExtension GIOExtension;
-
 GType      g_io_module_get_type (void) G_GNUC_CONST;
 GIOModule *g_io_module_new      (const gchar *filename);
 
 GList *g_io_modules_load_all_in_directory            (const char *dirname);
 
-GIOExtensionPoint *g_io_extension_point_register              (const char        *extension_point);
-GIOExtensionPoint *g_io_extension_point_lookup                (const char        *extension_point);
+GIOExtensionPoint *g_io_extension_point_register              (const char        *name);
+GIOExtensionPoint *g_io_extension_point_lookup                (const char        *name);
 void               g_io_extension_point_set_required_type     (GIOExtensionPoint *extension_point,
                                                               GType              type);
 GType              g_io_extension_point_get_required_type     (GIOExtensionPoint *extension_point);
@@ -78,8 +74,9 @@ GTypeClass*             g_io_extension_ref_class    (GIOExtension *extension);
  * g_io_module_load:
  * @module: a #GIOModule.
  * 
- * Required API for GIO modules to implement. This function is ran after the module
- * has been loaded into GIO, to initialize the module.
+ * Required API for GIO modules to implement. 
+ * This function is ran after the module has been loaded into GIO, 
+ * to initialize the module.
  **/
 void        g_io_module_load     (GIOModule   *module);
 
@@ -87,8 +84,9 @@ void        g_io_module_load     (GIOModule   *module);
  * g_io_module_unload:
  * @module: a #GIOModule.
  * 
- * Required API for GIO modules to implement. This function is ran when the module
- * is being unloaded from GIO, to finalize the module.
+ * Required API for GIO modules to implement. 
+ * This function is ran when the module is being unloaded from GIO, 
+ * to finalize the module.
  **/
 void        g_io_module_unload   (GIOModule   *module);