rpms/epiphany/devel epiphany-2.20.1-wrapped-plugins.patch, 1.2, 1.3 epiphany.spec, 1.170, 1.171

[Martin Stransky (stransky)]

Author: stransky

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

Modified Files:
	epiphany-2.20.1-wrapped-plugins.patch epiphany.spec 
Log Message:
Polished the wrapper patch

epiphany-2.20.1-wrapped-plugins.patch:

Index: epiphany-2.20.1-wrapped-plugins.patch
===================================================================
RCS file: /cvs/pkgs/rpms/epiphany/devel/epiphany-2.20.1-wrapped-plugins.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- epiphany-2.20.1-wrapped-plugins.patch	19 Nov 2007 12:15:23 -0000	1.2
+++ epiphany-2.20.1-wrapped-plugins.patch	29 Nov 2007 11:01:39 -0000	1.3
@@ -1,47 +1,27 @@
-diff -up epiphany-2.20.1/embed/mozilla/mozilla-embed-single.cpp.wrapped-plugins epiphany-2.20.1/embed/mozilla/mozilla-embed-single.cpp
---- epiphany-2.20.1/embed/mozilla/mozilla-embed-single.cpp.wrapped-plugins	2007-08-27 22:19:02.000000000 +0200
-+++ epiphany-2.20.1/embed/mozilla/mozilla-embed-single.cpp	2007-11-19 13:03:39.000000000 +0100
-@@ -26,6 +26,8 @@
- #include "config.h"
- 
- #include <stdlib.h>
-+#include <unistd.h>
-+#include <sys/wait.h>
- 
- #include <glib.h>
- #include <glib/gi18n.h>
-@@ -294,6 +296,30 @@ mozilla_init_plugin_add_unique_paths (GL
+diff -up epiphany-2.20.2/embed/mozilla/mozilla-embed-single.cpp.wrapped-plugins epiphany-2.20.2/embed/mozilla/mozilla-embed-single.cpp
+--- epiphany-2.20.2/embed/mozilla/mozilla-embed-single.cpp.wrapped-plugins	2007-11-27 00:36:42.000000000 +0100
++++ epiphany-2.20.2/embed/mozilla/mozilla-embed-single.cpp	2007-11-29 11:38:19.000000000 +0100
+@@ -294,6 +296,19 @@ mozilla_init_plugin_add_unique_paths (GL
  	return list;
  }
  
 +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)
-+                return(FALSE);
++	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 ()
  {
-@@ -307,8 +333,17 @@ mozilla_init_plugin_path ()
+@@ -307,8 +322,17 @@ mozilla_init_plugin_path ()
  						    MOZILLA_PREFIX "/lib/mozilla/plugins");
  	list = mozilla_init_plugin_add_unique_path (list,
  						    MOZILLA_HOME "/plugins");


Index: epiphany.spec
===================================================================
RCS file: /cvs/pkgs/rpms/epiphany/devel/epiphany.spec,v
retrieving revision 1.170
retrieving revision 1.171
diff -u -r1.170 -r1.171
--- epiphany.spec	29 Nov 2007 10:50:33 -0000	1.170
+++ epiphany.spec	29 Nov 2007 11:01:39 -0000	1.171
@@ -196,6 +196,9 @@
 %{_datadir}/pygtk/2.0/defs/epiphany.defs
 
 %changelog
+* Thu Nov 29 2007 Martin Stransky <stransky at redhat.com>
+- Polished the wrapper patch
+
 * Tue Nov 27 2007 Matthias Clasen <mclasen at redhat.com> - 2.20.2-1
 - Update to 2.20.2