Kouhei Sutou
kous****@users*****
Tue Mar 13 09:13:10 JST 2007
Index: kazehakase/src/kz-app.c
diff -u kazehakase/src/kz-app.c:1.26 kazehakase/src/kz-app.c:1.27
--- kazehakase/src/kz-app.c:1.26 Sun Mar 4 23:35:57 2007
+++ kazehakase/src/kz-app.c Tue Mar 13 09:13:10 2007
@@ -327,8 +327,6 @@
kz_icons_init();
- kz_ext_init(app);
-
/* make dirs */
prepare_dir();
@@ -393,8 +391,6 @@
gchar *accel_prefs_file;
KzAppPrivate *priv = KZ_APP_GET_PRIVATE(object);
- kz_ext_exit();
-
accel_prefs_file = g_build_filename(g_get_home_dir(),
"."PACKAGE,
"keyaccelrc",
Index: kazehakase/src/kz-ext-impl.h
diff -u kazehakase/src/kz-ext-impl.h:1.2 kazehakase/src/kz-ext-impl.h:1.3
--- kazehakase/src/kz-ext-impl.h:1.2 Mon Jan 1 08:58:04 2007
+++ kazehakase/src/kz-ext-impl.h Tue Mar 13 09:13:10 2007
@@ -28,7 +28,7 @@
#include "kz-app.h"
#include "kz-window.h"
-typedef void (*KzExtInitFunc) (KzApp *app);
+typedef void (*KzExtInitFunc) (KzApp *app, void *init_address);
typedef void (*KzExtSetupFunc) (KzWindow *window);
typedef void (*KzExtExitFunc) (gboolean success);
@@ -37,7 +37,7 @@
#define KZ_EXT_IMPL_EXIT kz_ext_impl_exit
-void KZ_EXT_IMPL_INIT (KzApp *app);
+void KZ_EXT_IMPL_INIT (KzApp *app, void *init_address);
void KZ_EXT_IMPL_SETUP (KzWindow *kz);
void KZ_EXT_IMPL_EXIT (gboolean success);
Index: kazehakase/src/kz-ext.c
diff -u kazehakase/src/kz-ext.c:1.8 kazehakase/src/kz-ext.c:1.9
--- kazehakase/src/kz-ext.c:1.8 Sun Dec 31 22:59:19 2006
+++ kazehakase/src/kz-ext.c Tue Mar 13 09:13:10 2007
@@ -114,7 +114,7 @@
}
static KzExtInfo *
-kz_ext_info_load(const char *name, KzApp *app)
+kz_ext_info_load(const char *name, KzApp *app, void *init_address)
{
gchar *mod_dir;
gchar *mod_path;
@@ -135,7 +135,7 @@
p = (gpointer *)init_func_p;
if (kz_ext_load_func(module, G_STRINGIFY(KZ_EXT_IMPL_INIT), p))
{
- init_func(app);
+ init_func(app, init_address);
info = g_new0(KzExtInfo, 1);
info->name = g_strdup(name);
info->path = g_strdup(mod_path);
@@ -158,7 +158,7 @@
}
void
-kz_ext_init(KzApp *app)
+kz_ext_init(KzApp *app, void *init_address)
{
GDir *dir;
@@ -173,7 +173,7 @@
while ((entry = g_dir_read_name(dir)))
{
- info = kz_ext_info_load(entry, app);
+ info = kz_ext_info_load(entry, app, init_address);
if (info)
extensions = g_list_append(extensions, info);
}
Index: kazehakase/src/kz-ext.h
diff -u kazehakase/src/kz-ext.h:1.4 kazehakase/src/kz-ext.h:1.5
--- kazehakase/src/kz-ext.h:1.4 Sun Dec 31 22:59:19 2006
+++ kazehakase/src/kz-ext.h Tue Mar 13 09:13:10 2007
@@ -28,7 +28,7 @@
G_BEGIN_DECLS
-void kz_ext_init (KzApp *app);
+void kz_ext_init (KzApp *app, void *init_address);
void kz_ext_setup (KzWindow *kz);
void kz_ext_exit (void);
Index: kazehakase/src/main.c
diff -u kazehakase/src/main.c:1.136 kazehakase/src/main.c:1.137
--- kazehakase/src/main.c:1.136 Tue Jan 23 20:50:33 2007
+++ kazehakase/src/main.c Tue Mar 13 09:13:10 2007
@@ -31,6 +31,7 @@
#include "kazehakase.h"
#include "kz-window.h"
+#include "kz-ext.h"
#include "kz-actions-tab.h"
#include "utils.h"
#include "mozilla.h"
@@ -417,6 +418,7 @@
int
main (int argc, char *argv[])
{
+ int init_address;
GtkWidget *window = NULL;
GtkWidget *dupl_check_server = NULL;
gchar **argv_copy;
@@ -472,6 +474,7 @@
}
kz_app = kz_app_new(argc, argv);
+ kz_ext_init(kz_app, &init_address);
#warning FIXME! Initializaton of mozilla should be called somewhere else.
mozilla_init(KZ_GET_GLOBAL_PROFILE);
@@ -509,6 +512,7 @@
gtk_widget_destroy(dupl_check_server);
dupl_check_server = NULL;
+ kz_ext_exit();
mozilla_exit();
g_object_unref(kz_app);