svnno****@sourc*****
svnno****@sourc*****
Fri Mar 30 21:28:49 JST 2007
Revision: 3114
http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=kazehakase&view=rev&rev=3114
Author: ikezoe
Date: 2007-03-30 21:28:49 +0900 (Fri, 30 Mar 2007)
Log Message:
-----------
* src/Makefile.am: Removed GTK_LIBS from kazehakase_LDADD.
* src/main.c, module/embed/gtk-webcore/kz-gtk-webcore-module.cpp:
g_thread_init() is called in initialization process of GTK+-WebCore
module.
Modified Paths:
--------------
kazehakase/trunk/ChangeLog
kazehakase/trunk/module/embed/gtk-webcore/kz-gtk-webcore-module.cpp
kazehakase/trunk/src/Makefile.am
kazehakase/trunk/src/main.c
Modified: kazehakase/trunk/ChangeLog
===================================================================
--- kazehakase/trunk/ChangeLog 2007-03-30 12:18:36 UTC (rev 3113)
+++ kazehakase/trunk/ChangeLog 2007-03-30 12:28:49 UTC (rev 3114)
@@ -1,5 +1,12 @@
2007-03-30 Hiroyuki Ikezoe <poinc****@ikezo*****>
+ * src/Makefile.am: Removed GTK_LIBS from kazehakase_LDADD.
+ * src/main.c, module/embed/gtk-webcore/kz-gtk-webcore-module.cpp:
+ g_thread_init() is called in initialization process of GTK+-WebCore
+ module.
+
+2007-03-30 Hiroyuki Ikezoe <poinc****@ikezo*****>
+
* src/Makefile.am: Append GTK_LIBS to kazehakase_LDADD for -lgthread.
Kouhei, nice work!
Modified: kazehakase/trunk/module/embed/gtk-webcore/kz-gtk-webcore-module.cpp
===================================================================
--- kazehakase/trunk/module/embed/gtk-webcore/kz-gtk-webcore-module.cpp 2007-03-30 12:18:36 UTC (rev 3113)
+++ kazehakase/trunk/module/embed/gtk-webcore/kz-gtk-webcore-module.cpp 2007-03-30 12:28:49 UTC (rev 3114)
@@ -28,6 +28,8 @@
G_MODULE_EXPORT void
KZ_MODULE_IMPL_INIT (GTypeModule *module)
{
+ if (!g_thread_supported()) g_thread_init(NULL);
+
kz_gtk_webcore_register_type(module);
}
Modified: kazehakase/trunk/src/Makefile.am
===================================================================
--- kazehakase/trunk/src/Makefile.am 2007-03-30 12:18:36 UTC (rev 3113)
+++ kazehakase/trunk/src/Makefile.am 2007-03-30 12:28:49 UTC (rev 3114)
@@ -57,8 +57,7 @@
KASEHAKASE_RES =
endif
-kazehakase_LDADD = libkazehakase.la $(KAZEHAKASE_RES) \
- $(GTK_LIBS)
+kazehakase_LDADD = libkazehakase.la $(KAZEHAKASE_RES)
if WITH_GECKO
kazehakase_LDFLAGS = -R$(MOZILLA_HOME)
Modified: kazehakase/trunk/src/main.c
===================================================================
--- kazehakase/trunk/src/main.c 2007-03-30 12:18:36 UTC (rev 3113)
+++ kazehakase/trunk/src/main.c 2007-03-30 12:28:49 UTC (rev 3114)
@@ -441,8 +441,6 @@
bind_textdomain_codeset(PACKAGE, "UTF-8");
textdomain(PACKAGE);
- g_thread_init(NULL);
-
/* initialize goption */
context = g_option_context_new (parameter_string);
g_option_context_add_main_entries (context, entries, NULL);