Hiroyuki Ikezoe
ikezo****@users*****
Mon Jan 15 09:16:36 JST 2007
Index: kazehakase/src/kz-app.c
diff -u kazehakase/src/kz-app.c:1.21 kazehakase/src/kz-app.c:1.22
--- kazehakase/src/kz-app.c:1.21 Sat Jan 6 11:29:43 2007
+++ kazehakase/src/kz-app.c Mon Jan 15 09:16:36 2007
@@ -39,7 +39,6 @@
#include "kz-session.h"
#include "kz-tab-label.h"
#include "kz-window.h"
-#include "mozilla.h"
#include "glib-utils.h"
#include "utils.h"
@@ -223,8 +222,6 @@
"proxyrc", NULL);
priv->proxy = kz_profile_open(proxy_file, sysproxy_file);
- mozilla_init(priv->profile);
-
#if USE_MIGEMO
priv->migemo = kz_migemo_new();
#endif
@@ -303,8 +300,6 @@
gtk_accel_map_save(accel_prefs_file);
g_free(accel_prefs_file);
- mozilla_exit();
-
/* clean history cache */
clean_history_cache();
Index: kazehakase/src/main.c
diff -u kazehakase/src/main.c:1.134 kazehakase/src/main.c:1.135
--- kazehakase/src/main.c:1.134 Fri Jan 5 21:22:23 2007
+++ kazehakase/src/main.c Mon Jan 15 09:16:36 2007
@@ -33,6 +33,7 @@
#include "kz-window.h"
#include "kz-actions-tab.h"
#include "utils.h"
+#include "mozilla.h"
KzApp *kz_app = NULL;
@@ -472,6 +473,9 @@
kz_app = kz_app_new();
+#warning FIXME! Initializaton of mozilla should be called somewhere else.
+ mozilla_init(KZ_GET_GLOBAL_PROFILE);
+
/* create window */
KZ_CONF_GET("Session", "restore", restore, BOOL);
if (restore)
@@ -505,6 +509,8 @@
gtk_widget_destroy(dupl_check_server);
dupl_check_server = NULL;
+ mozilla_exit();
+
g_object_unref(kz_app);
return 0;