r47049 - in /desktop/unstable/gnome-shell/debian: changelog patches/revert-browser-plugin-set-windowless-mode.patch patches/series

[darkxst-guest at users.alioth.debian.org]

Author: darkxst-guest
Date: Mon Nov 16 01:30:31 2015
New Revision: 47049

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=47049
Log:
debian/patches/revert-browser-plugin-set-windowless-mode.patch: 
This caused the browser plugin to crash in firefox (bgo: #758035)

Added:
    desktop/unstable/gnome-shell/debian/patches/revert-browser-plugin-set-windowless-mode.patch
Modified:
    desktop/unstable/gnome-shell/debian/changelog
    desktop/unstable/gnome-shell/debian/patches/series

Modified: desktop/unstable/gnome-shell/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-shell/debian/changelog?rev=47049&op=diff
==============================================================================
--- desktop/unstable/gnome-shell/debian/changelog	[utf-8] (original)
+++ desktop/unstable/gnome-shell/debian/changelog	[utf-8] Mon Nov 16 01:30:31 2015
@@ -1,3 +1,10 @@
+gnome-shell (3.18.2-2) UNRELEASED; urgency=medium
+
+  * debian/patches/revert-browser-plugin-set-windowless-mode.patch: 
+    This caused the browser plugin to crash in firefox (bgo: #758035)
+
+ -- Tim Lunn <tim at feathertop.org>  Mon, 16 Nov 2015 12:26:07 +1100
+
 gnome-shell (3.18.2-1) unstable; urgency=medium
 
   * New upstream release.

Added: desktop/unstable/gnome-shell/debian/patches/revert-browser-plugin-set-windowless-mode.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-shell/debian/patches/revert-browser-plugin-set-windowless-mode.patch?rev=47049&op=file
==============================================================================
--- desktop/unstable/gnome-shell/debian/patches/revert-browser-plugin-set-windowless-mode.patch	(added)
+++ desktop/unstable/gnome-shell/debian/patches/revert-browser-plugin-set-windowless-mode.patch	[utf-8] Mon Nov 16 01:30:31 2015
@@ -0,0 +1,40 @@
+From 8ebccbf7247d8edbf9227a9b533f1a087035ff15 Mon Sep 17 00:00:00 2001
+From: Tim Lunn <tim at feathertop.org>
+Date: Mon, 16 Nov 2015 12:08:25 +1100
+Subject: [PATCH] Revert "browser-plugin: Set windowless mode and don't claim
+ to need XEmbed"
+
+This reverts commit 88c1fa8a3e9f34bda512999618c7fe54b182af36.
+---
+ browser-plugin/browser-plugin.c | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/browser-plugin/browser-plugin.c b/browser-plugin/browser-plugin.c
+index 290b224..e8b5cf6 100644
+--- a/browser-plugin/browser-plugin.c
++++ b/browser-plugin/browser-plugin.c
+@@ -218,9 +218,6 @@ NPP_New(NPMIMEType    mimetype,
+   data = g_slice_new (PluginData);
+   instance->pdata = data;
+ 
+-  /* set windowless mode */
+-  funcs.setvalue(instance, NPPVpluginWindowBool, NULL);
+-
+   data->proxy = g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SESSION,
+                                                G_DBUS_PROXY_FLAGS_NONE,
+                                                NULL, /* interface info */
+@@ -1051,6 +1048,10 @@ NPP_GetValue(NPP          instance,
+     *(NPObject**)value = funcs.createobject (instance, &plugin_class);
+     break;
+ 
++  case NPPVpluginNeedsXEmbed:
++    *(bool *)value = TRUE;
++    break;
++
+   default:
+     ;
+   }
+-- 
+2.6.2
+
+

Modified: desktop/unstable/gnome-shell/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-shell/debian/patches/series?rev=47049&op=diff
==============================================================================
--- desktop/unstable/gnome-shell/debian/patches/series	[utf-8] (original)
+++ desktop/unstable/gnome-shell/debian/patches/series	[utf-8] Mon Nov 16 01:30:31 2015
@@ -1,3 +1,4 @@
 27-nm-libexec-path.patch
 #30-remoteMenu-Prevent-the-shell-from-becoming-unrespons.patch
 41-handle-logind-fail.patch
+revert-browser-plugin-set-windowless-mode.patch