rpms/epiphany/devel 0001-Setup-nspluginwrapper-if-available.patch, NONE, 1.1 epiphany.spec, 1.243, 1.244 epiphany-2.20.1-wrapped-plugins.patch, 1.3, NONE

[Bastien Nocera]

Author: hadess

Update of /cvs/pkgs/rpms/epiphany/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16945

Modified Files:
	epiphany.spec 
Added Files:
	0001-Setup-nspluginwrapper-if-available.patch 
Removed Files:
	epiphany-2.20.1-wrapped-plugins.patch 
Log Message:
* Mon Sep 14 2009 Bastien Nocera <bnocera at redhat.com> 2.27.92-2
- Call nspluginwrapper's config tool if available


0001-Setup-nspluginwrapper-if-available.patch:
 ephy-embed-single.c |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

--- NEW FILE 0001-Setup-nspluginwrapper-if-available.patch ---
>From bd03e748e07dd300015fdfee111420162f346e5f Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess at hadess.net>
Date: Mon, 14 Sep 2009 19:30:03 +0100
Subject: [PATCH] Setup nspluginwrapper if available

By calling mozilla-plugin-config on startup.
---
 embed/ephy-embed-single.c |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/embed/ephy-embed-single.c b/embed/ephy-embed-single.c
index 4930f8e..aba0916 100644
--- a/embed/ephy-embed-single.c
+++ b/embed/ephy-embed-single.c
@@ -21,6 +21,7 @@
 #include "config.h"
 
 #define LIBSOUP_I_HAVE_READ_BUG_594377_AND_KNOW_SOUP_PASSWORD_MANAGER_MIGHT_GO_AWAY
+#define NSPLUGINWRAPPER_SETUP "/usr/bin/mozilla-plugin-config"
 
 #include "ephy-embed-single.h"
 #include "ephy-embed-prefs.h"
@@ -333,6 +334,10 @@ ephy_embed_single_initialize (EphyEmbedSingle *single)
   SoupCookieJar *jar;
   char *filename;
 
+  /* Initialise nspluginwrapper's plugins if available */
+  if (g_file_test (NSPLUGINWRAPPER_SETUP, G_FILE_TEST_EXISTS) != FALSE)
+    g_spawn_command_line_sync (NSPLUGINWRAPPER_SETUP, NULL, NULL, NULL, NULL);
+
   ephy_embed_prefs_init ();
 
   session = webkit_get_default_session ();
-- 
1.6.2.5



Index: epiphany.spec
===================================================================
RCS file: /cvs/pkgs/rpms/epiphany/devel/epiphany.spec,v
retrieving revision 1.243
retrieving revision 1.244
diff -u -p -r1.243 -r1.244
--- epiphany.spec	8 Sep 2009 19:32:02 -0000	1.243
+++ epiphany.spec	14 Sep 2009 18:32:24 -0000	1.244
@@ -8,7 +8,7 @@
 Summary: Web browser for GNOME
 Name: epiphany
 Version: 2.27.92
-Release: 1%{?dist}
+Release: 2%{?dist}
 %define major_version 2.27
 Provides: epiphany(abi) = %{major_version}
 License: GPLv2+ and GFDL
@@ -51,6 +51,7 @@ BuildRequires: nss-devel
 
 # Patches
 Patch0: epiphany-1.0.1-home-page.patch
+Patch1: 0001-Setup-nspluginwrapper-if-available.patch
 Patch2: epiphany-default-bookmarks.patch
 
 %description
@@ -96,6 +97,7 @@ Install epiphany-devel if you want to wr
 %setup -q
 
 %patch0 -p1 -b .homepage
+%patch1 -p1 -b .nspluginwrapper
 %patch2 -p1 -b .default-bookmarks
 
 # Fedora Epiphany version
@@ -245,6 +247,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/gtk-doc/html/epiphany
 
 %changelog
+* Mon Sep 14 2009 Bastien Nocera <bnocera at redhat.com> 2.27.92-2
+- Call nspluginwrapper's config tool if available
+
 * Tue Sep  8 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.92-1
 - Update to 2.27.92
 


--- epiphany-2.20.1-wrapped-plugins.patch DELETED ---