svnno****@sourc*****
svnno****@sourc*****
Thu Feb 21 10:27:19 JST 2008
Revision: 3374 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=kazehakase&view=rev&rev=3374 Author: ikezoe Date: 2008-02-21 10:27:19 +0900 (Thu, 21 Feb 2008) Log Message: ----------- * module/embed/gecko/kz-gecko-embed-module.cpp: Do not invoke gtk_moz_embed_set_comp_path() if XPCOM_GLUE is defined. Modified Paths: -------------- kazehakase/trunk/ChangeLog kazehakase/trunk/module/embed/gecko/kz-gecko-embed-module.cpp Modified: kazehakase/trunk/ChangeLog =================================================================== --- kazehakase/trunk/ChangeLog 2008-02-21 01:25:42 UTC (rev 3373) +++ kazehakase/trunk/ChangeLog 2008-02-21 01:27:19 UTC (rev 3374) @@ -7,6 +7,8 @@ * module/embed/gecko/mozilla.[cpp|h]: Added codes for xulrunner-1.9. * module/embed/gecko/mozilla.cpp: Use ADD_REF. * module/embed/gecko/mozilla.cpp: Invoke GTKEmbedGlueStartupInternal(). + * module/embed/gecko/kz-gecko-embed-module.cpp: Do not invoke + gtk_moz_embed_set_comp_path() if XPCOM_GLUE is defined. 2008-02-20 Hiroyuki Ikezoe <poinc****@ikezo*****> Modified: kazehakase/trunk/module/embed/gecko/kz-gecko-embed-module.cpp =================================================================== --- kazehakase/trunk/module/embed/gecko/kz-gecko-embed-module.cpp 2008-02-21 01:25:42 UTC (rev 3373) +++ kazehakase/trunk/module/embed/gecko/kz-gecko-embed-module.cpp 2008-02-21 01:27:19 UTC (rev 3374) @@ -32,14 +32,15 @@ { #ifdef XPCOM_GLUE xulrunner_init(); +#else + gtk_moz_embed_set_comp_path(MOZILLA_HOME); #endif mozilla_prefs_init(); - gtk_moz_embed_set_comp_path(MOZILLA_HOME); - gtk_moz_embed_push_startup(); gecko_single = kz_gecko_single_new(kz_app_get()); + kz_gecko_embed_register_type(module); }