rpms/galeon/devel galeon-2.0.3-plugin-wrapper.patch, NONE, 1.1 galeon.spec, 1.37, 1.38

[Martin Stransky (stransky)]

Author: stransky

Update of /cvs/pkgs/rpms/galeon/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8444

Modified Files:
	galeon.spec 
Added Files:
	galeon-2.0.3-plugin-wrapper.patch 
Log Message:
* Mon Nov 19 2007 Martin Stransky <stransky at redhat.com> - 2.0.3-15
- Added support for wrapped plugins



galeon-2.0.3-plugin-wrapper.patch:

--- NEW FILE galeon-2.0.3-plugin-wrapper.patch ---
diff -up galeon-2.0.3/mozilla/mozilla-embed-shell.cpp.wrapper galeon-2.0.3/mozilla/mozilla-embed-shell.cpp
--- galeon-2.0.3/mozilla/mozilla-embed-shell.cpp.wrapper	2007-11-19 10:30:53.000000000 +0100
+++ galeon-2.0.3/mozilla/mozilla-embed-shell.cpp	2007-11-19 10:37:01.000000000 +0100
@@ -52,6 +52,9 @@
 #include <time.h>
 #include <glib/gi18n.h>
 #include <string.h>
+#include <unistd.h>
+#include <sys/wait.h>
+#include <stdlib.h>
 
 #include <nsIConsoleService.h>
 #include <nsIJSConsoleService.h>
@@ -211,6 +214,30 @@ mozilla_init_profile (void)
         g_free (profile_path);
 }
 
+static int
+mozilla_setup_wrapped_plugin (void)
+{
+	char *p_viewer = "/usr/bin/mozilla-plugin-config";
+
+	if(access(p_viewer, X_OK) != 0)
+		return(FALSE);
+
+	int pid = fork ();
+	if (pid < 0) {
+		return(FALSE);
+	} 
+	else if (pid == 0) {
+		execlp(p_viewer,p_viewer,NULL);
+		exit(1);
+	}
+	else {
+		int status;
+		while (waitpid(pid, &status, 0) != pid)
+			;
+		return(TRUE);
+	}	 
+}
+
 static void
 mozilla_init_plugin_path ()
 {
@@ -229,7 +256,12 @@ mozilla_init_plugin_path ()
 	g_string_append (new_path, "/.mozilla/plugins");
 
 	/* Add /usr/lib/mozilla/plugins (bug 149812) */
-	g_string_append (new_path, ":" TOP_LIB_DIR "/mozilla/plugins");
+	if(mozilla_setup_wrapped_plugin()) {
+		g_string_append (new_path, ":" TOP_LIB_DIR "/mozilla/plugins-wrapped");
+	}
+	else {
+		g_string_append (new_path, ":" TOP_LIB_DIR "/mozilla/plugins");
+	}
 
 	/* Add the current mozilla build's plugins dir */
 	g_string_append (new_path, ":" GALEON_MOZILLA_HOME "/plugins");


Index: galeon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/galeon/devel/galeon.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- galeon.spec	11 Nov 2007 21:40:08 -0000	1.37
+++ galeon.spec	19 Nov 2007 11:14:59 -0000	1.38
@@ -3,7 +3,7 @@
 Summary:	GNOME2 Web browser based on Mozilla
 Name:		galeon
 Version:	2.0.3
-Release:	14%{?dist}
+Release:	15%{?dist}
 License:	GPLv2+
 Group:		Applications/Internet
 URL:		http://galeon.sourceforge.net/
@@ -12,6 +12,7 @@
 Patch1:		galeon-2.0.3-plugins.patch
 Patch2:		galeon-2.0.3-imgload.patch
 Patch3:		galeon-2.0.3-printdial.patch
+Patch4:		galeon-2.0.3-plugin-wrapper.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n)
 
 BuildRequires:	gettext desktop-file-utils
@@ -45,6 +46,7 @@
 %patch1 -p1 -b .plugins
 %patch2 -p1 -b .imgload
 %patch3 -p1 -b .printdial
+%patch4 -p1 -b .wrapper
 
 
 %build
@@ -119,6 +121,9 @@
 
 
 %changelog
+* Mon Nov 19 2007 Martin Stransky <stransky at redhat.com> - 2.0.3-15
+- Added support for wrapped plugins
+
 * Fri Nov 09 2007 Alex Lancaster <alexl at users.sourceforge.net> - 2.0.3-14
 - Rebuild with gecko lib 1.8.1.9