rpms/galeon/F-8 galeon-2.0.3-plugin-wrapper.patch, 1.2, 1.3 galeon.spec, 1.40, 1.41

[Martin Stransky (stransky)]

Author: stransky

Update of /cvs/pkgs/rpms/galeon/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8435

Modified Files:
	galeon-2.0.3-plugin-wrapper.patch galeon.spec 
Log Message:
Updated patch for wrapped plugins

galeon-2.0.3-plugin-wrapper.patch:

Index: galeon-2.0.3-plugin-wrapper.patch
===================================================================
RCS file: /cvs/pkgs/rpms/galeon/F-8/galeon-2.0.3-plugin-wrapper.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- galeon-2.0.3-plugin-wrapper.patch	19 Nov 2007 11:11:59 -0000	1.2
+++ galeon-2.0.3-plugin-wrapper.patch	29 Nov 2007 10:33:09 -0000	1.3
@@ -1,48 +1,27 @@
 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)
+--- galeon-2.0.3/mozilla/mozilla-embed-shell.cpp.wrapper	2007-11-29 10:39:45.000000000 +0100
++++ galeon-2.0.3/mozilla/mozilla-embed-shell.cpp	2007-11-29 11:10:44.000000000 +0100
+@@ -211,6 +214,19 @@ mozilla_init_profile (void)
          g_free (profile_path);
  }
  
 +static int
 +mozilla_setup_wrapped_plugin (void)
 +{
-+	char *p_viewer = "/usr/bin/mozilla-plugin-config";
++	char 	*p_viewer = "/usr/bin/mozilla-plugin-config";
++	gboolean  ret;
 +
-+	if(access(p_viewer, X_OK) != 0)
++	if(g_file_test(p_viewer, G_FILE_TEST_EXISTS) == FALSE)
 +		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);
-+	}	 
++	ret = g_spawn_command_line_sync(p_viewer,NULL,NULL,NULL,NULL);
++	return(ret); 
 +}
 +
  static void
  mozilla_init_plugin_path ()
  {
-@@ -229,7 +256,12 @@ mozilla_init_plugin_path ()
+@@ -229,7 +245,12 @@ mozilla_init_plugin_path ()
  	g_string_append (new_path, "/.mozilla/plugins");
  
  	/* Add /usr/lib/mozilla/plugins (bug 149812) */


Index: galeon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/galeon/F-8/galeon.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- galeon.spec	27 Nov 2007 08:15:26 -0000	1.40
+++ galeon.spec	29 Nov 2007 10:33:09 -0000	1.41
@@ -3,7 +3,7 @@
 Summary:	GNOME2 Web browser based on Mozilla
 Name:		galeon
 Version:	2.0.3
-Release:	16%{?dist}
+Release:	17%{?dist}
 License:	GPLv2+
 Group:		Applications/Internet
 URL:		http://galeon.sourceforge.net/
@@ -121,6 +121,9 @@
 
 
 %changelog
+* Thu Nov 29 2007 Martin Stransky <stransky at redhat.com> - 2.0.3-17
+- Updated patch for wrapped plugins
+
 * Tue Nov 27 2007 Denis Leroy <denis at poolshark.org> - 2.0.3-16
 - Rebuild with gecko lib 1.8.1.10