Kouhei Sutou
kous****@users*****
Sun Dec 31 22:59:20 JST 2006
Index: kazehakase/src/Makefile.am
diff -u kazehakase/src/Makefile.am:1.124 kazehakase/src/Makefile.am:1.125
--- kazehakase/src/Makefile.am:1.124 Sun Dec 31 22:19:38 2006
+++ kazehakase/src/Makefile.am Sun Dec 31 22:59:19 2006
@@ -84,7 +84,8 @@
kz-search.h \
kz-statusbar.h \
kz-migemo.h \
- kz-ext.h
+ kz-ext.h \
+ kz-ext-impl.h
enum_source_prefix = kz-enum-types
Index: kazehakase/src/kz-app.c
diff -u kazehakase/src/kz-app.c:1.6 kazehakase/src/kz-app.c:1.7
--- kazehakase/src/kz-app.c:1.6 Sun Dec 31 22:19:38 2006
+++ kazehakase/src/kz-app.c Sun Dec 31 22:59:19 2006
@@ -231,7 +231,7 @@
gnutls_global_init();
#endif
- kz_ext_init();
+ kz_ext_init(kzapp);
/* make dirs */
prepare_dir();
Index: kazehakase/src/kz-ext.c
diff -u kazehakase/src/kz-ext.c:1.7 kazehakase/src/kz-ext.c:1.8
--- kazehakase/src/kz-ext.c:1.7 Sat Dec 2 18:55:54 2006
+++ kazehakase/src/kz-ext.c Sun Dec 31 22:59:19 2006
@@ -19,14 +19,12 @@
*/
#include "kz-ext.h"
+#include "kz-ext-impl.h"
#include "glib-utils.h"
#include "kz-marshalers.h"
#define EXT_NAME "kzext"
-#define EXT_INIT_FUNC "kz_ext_init"
-#define EXT_SETUP_FUNC "kz_ext_setup"
-#define EXT_EXIT_FUNC "kz_ext_exit"
static GList *extensions = NULL;
static gboolean initted = FALSE;
@@ -84,7 +82,7 @@
exit_func_p = &exit_func;
p = (gpointer *)exit_func_p;
- if (kz_ext_load_func(module, EXT_EXIT_FUNC, p))
+ if (kz_ext_load_func(module, G_STRINGIFY(KZ_EXT_IMPL_EXIT), p))
exit_func(success);
else
kz_ext_show_error(module);
@@ -116,7 +114,7 @@
}
static KzExtInfo *
-kz_ext_info_load(const char *name)
+kz_ext_info_load(const char *name, KzApp *app)
{
gchar *mod_dir;
gchar *mod_path;
@@ -135,9 +133,9 @@
init_func_p = &init_func;
p = (gpointer *)init_func_p;
- if (kz_ext_load_func(module, EXT_INIT_FUNC, p))
+ if (kz_ext_load_func(module, G_STRINGIFY(KZ_EXT_IMPL_INIT), p))
{
- init_func();
+ init_func(app);
info = g_new0(KzExtInfo, 1);
info->name = g_strdup(name);
info->path = g_strdup(mod_path);
@@ -160,7 +158,7 @@
}
void
-kz_ext_init(void)
+kz_ext_init(KzApp *app)
{
GDir *dir;
@@ -175,7 +173,7 @@
while ((entry = g_dir_read_name(dir)))
{
- info = kz_ext_info_load(entry);
+ info = kz_ext_info_load(entry, app);
if (info)
extensions = g_list_append(extensions, info);
}
@@ -195,7 +193,7 @@
setup_func_p = &setup_func;
p = (gpointer *)setup_func_p;
- if (kz_ext_load_func(info->module, EXT_SETUP_FUNC, p))
+ if (kz_ext_load_func(info->module, G_STRINGIFY(KZ_EXT_IMPL_SETUP), p))
setup_func(kz);
else
kz_ext_show_error(info->module);
Index: kazehakase/src/kz-ext.h
diff -u kazehakase/src/kz-ext.h:1.3 kazehakase/src/kz-ext.h:1.4
--- kazehakase/src/kz-ext.h:1.3 Sun Feb 12 00:29:53 2006
+++ kazehakase/src/kz-ext.h Sun Dec 31 22:59:19 2006
@@ -28,11 +28,7 @@
G_BEGIN_DECLS
-typedef void (*KzExtInitFunc) (void);
-typedef void (*KzExtSetupFunc) (KzWindow *window);
-typedef void (*KzExtExitFunc) (gboolean success);
-
-void kz_ext_init (void);
+void kz_ext_init (KzApp *app);
void kz_ext_setup (KzWindow *kz);
void kz_ext_exit (void);