rpms/chmsee/devel chmsee-1.0.0-gecko-1.9.patch, NONE, 1.1 chmsee.spec, 1.15, 1.16

[Yuan Yijun (bbbush)]

Author: bbbush

Update of /cvs/extras/rpms/chmsee/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18059

Modified Files:
	chmsee.spec 
Added Files:
	chmsee-1.0.0-gecko-1.9.patch 
Log Message:
try initialize gecko-1.9 according to http://benjamin.smedbergs.us/blog/2005-12-23/whats-coming-for-gtkmozembed/

chmsee-1.0.0-gecko-1.9.patch:

--- NEW FILE chmsee-1.0.0-gecko-1.9.patch ---
diff -up chmsee-1.0.0/src/gecko_utils.cpp.orig chmsee-1.0.0/src/gecko_utils.cpp
--- chmsee-1.0.0/src/gecko_utils.cpp.orig	2007-11-25 12:23:33.000000000 +0800
+++ chmsee-1.0.0/src/gecko_utils.cpp	2007-11-25 12:24:15.000000000 +0800
@@ -193,7 +193,9 @@ gecko_utils_init(void)
 		g_thread_init(NULL);
 
 #ifdef HAVE_GECKO_1_9
-	NS_LogInit();
+  GRE_GetGREWithProperties("gtkmozembed=1");
+  XPCOMGlueStartup();
+  XPCOMGlueLoadXULFunctions("all those pesky gtkmozembed APIs");
 	gtk_moz_embed_set_path(GECKO_LIB_ROOT);
 #else
 	gtk_moz_embed_set_comp_path(GECKO_LIB_ROOT);
@@ -217,7 +219,7 @@ gecko_utils_shutdown(void)
 	gtk_moz_embed_pop_startup();
 
 #ifdef HAVE_GECKO_1_9
-	NS_LogTerm();
+  XPCOMGluShutdown();
 #endif
 }
 


Index: chmsee.spec
===================================================================
RCS file: /cvs/extras/rpms/chmsee/devel/chmsee.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- chmsee.spec	25 Nov 2007 01:52:56 -0000	1.15
+++ chmsee.spec	25 Nov 2007 04:28:17 -0000	1.16
@@ -1,6 +1,6 @@
 Name:		chmsee
 Version:	1.0.0
-Release:	1.30%{?dist}
+Release:	1.31%{?dist}
 Summary(zh_CN):	CHM 文件阅读工具, 基于 Gtk2+
 Summary:	A Gtk+2 CHM document viewer
 Group:		Applications/Publishing
@@ -10,6 +10,7 @@
 # this file comes from gnochm package
 Source1:	gnochm-chmfile.png
 Patch1:		chmsee-1.0.0-desktop-icon.patch
+Patch2:   chmsee-1.0.0-gecko-1.9.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	intltool >= 0.34 pkgconfig >= 0.9 gettext 
@@ -55,6 +56,7 @@
 %prep
 %setup -q 
 %patch1 -p1 -b .desktop-mimetype
+%patch2 -p1 -b .gecko
 
 %build
 %configure --disable-static 
@@ -106,8 +108,10 @@
 %{_datadir}/icons/hicolor/*/apps/chmsee.png
 
 %changelog
-* Sun Nov 25 2007 bbbush <bbbush.yuan at gmail.com> - 1.0.0-1.30
+* Sun Nov 25 2007 bbbush <bbbush.yuan at gmail.com> - 1.0.0-1.31
 - now gecko-libs = 1.9 provided by xulrunner has offered its ld.so.conf file so RPATH is no longer required
+- fix xpcom initialize and shutdown according to
+  http://benjamin.smedbergs.us/blog/2005-12-23/whats-coming-for-gtkmozembed/
 
 * Sat Nov 10 2007 bbbush <bbbush.yuan at gmail.com> - 1.0.0-1.29
 - should be BuildRequires: gecko-devel