r45865 - in /desktop/unstable/gnome-shell/debian: changelog patches/10_background_race.patch patches/series

[biebl at users.alioth.debian.org]

Author: biebl
Date: Mon Sep  7 04:42:37 2015
New Revision: 45865

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=45865
Log:
Update and re-enable debian/patches/10_background_race.patch to fix a race
condition when loading two backgrounds made of different XML files.
Closes: #789123

Modified:
    desktop/unstable/gnome-shell/debian/changelog
    desktop/unstable/gnome-shell/debian/patches/10_background_race.patch
    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=45865&op=diff
==============================================================================
--- desktop/unstable/gnome-shell/debian/changelog	[utf-8] (original)
+++ desktop/unstable/gnome-shell/debian/changelog	[utf-8] Mon Sep  7 04:42:37 2015
@@ -1,3 +1,11 @@
+gnome-shell (3.16.3-2) UNRELEASED; urgency=medium
+
+  * Update and re-enable debian/patches/10_background_race.patch to fix a race
+    condition when loading two backgrounds made of different XML files.
+    Closes: #789123
+
+ -- Michael Biebl <biebl at debian.org>  Thu, 02 Jul 2015 19:49:52 +0200
+
 gnome-shell (3.16.3-1) unstable; urgency=medium
 
   * New upstream release.

Modified: desktop/unstable/gnome-shell/debian/patches/10_background_race.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-shell/debian/patches/10_background_race.patch?rev=45865&op=diff
==============================================================================
--- desktop/unstable/gnome-shell/debian/patches/10_background_race.patch	[utf-8] (original)
+++ desktop/unstable/gnome-shell/debian/patches/10_background_race.patch	[utf-8] Mon Sep  7 04:42:37 2015
@@ -1,4 +1,4 @@
-From 07180bef4d7264789b389b3ac9c6426ce269436b Mon Sep 17 00:00:00 2001
+From 4f5b9022de5896c06ef0a3e3920de27db415e282 Mon Sep 17 00:00:00 2001
 From: Josselin Mouette <joss at debian.org>
 Date: Fri, 12 Dec 2014 21:57:11 +0100
 Subject: [PATCH] background: fix a race condition when loading several
@@ -16,26 +16,26 @@
  1 file changed, 7 insertions(+), 5 deletions(-)
 
 diff --git a/js/ui/background.js b/js/ui/background.js
-index ad0cacc..ad75c65 100644
+index 5acff9f..52732b4 100644
 --- a/js/ui/background.js
 +++ b/js/ui/background.js
-@@ -134,6 +134,7 @@ const BackgroundCache = new Lang.Class({
+@@ -144,6 +144,7 @@ const BackgroundCache = new Lang.Class({
          this._pendingFileLoads = [];
          this._fileMonitors = {};
          this._backgroundSources = {};
 +        this._animations = {};
      },
  
-     monitorFile: function(filename) {
-@@ -152,12 +153,13 @@ const BackgroundCache = new Lang.Class({
+     monitorFile: function(file) {
+@@ -162,12 +163,13 @@ const BackgroundCache = new Lang.Class({
  
      getAnimation: function(params) {
-         params = Params.parse(params, { filename: null,
+         params = Params.parse(params, { file: null,
 +                                        settingsSchema: null,
                                          onLoaded: null });
  
--        if (this._animationFilename == params.filename) {
-+        if (this._animations[params.settingsSchema] && this._animations[params.settingsSchema].filename == params.filename) {
+-        if (_fileEqual0(this._animationFile, params.file)) {
++        if (this._animations[params.settingsSchema] && _fileEqual0(this._animationFile, params.file)) {
              if (params.onLoaded) {
                  let id = GLib.idle_add(GLib.PRIORITY_DEFAULT, Lang.bind(this, function() {
 -                    params.onLoaded(this._animation);
@@ -43,11 +43,11 @@
                      return GLib.SOURCE_REMOVE;
                  }));
                  GLib.Source.set_name_by_id(id, '[gnome-shell] params.onLoaded');
-@@ -168,12 +170,11 @@ const BackgroundCache = new Lang.Class({
-         let animation = new Animation({ filename: params.filename });
+@@ -178,12 +180,11 @@ const BackgroundCache = new Lang.Class({
+         let animation = new Animation({ file: params.file });
  
          animation.load(Lang.bind(this, function() {
--                           this._animationFilename = params.filename;
+-                           this._animationFile = params.file;
 -                           this._animation = animation;
 +                           this._animations[params.settingsSchema] = animation;
  
@@ -58,14 +58,14 @@
                                     return GLib.SOURCE_REMOVE;
                                 }));
                                 GLib.Source.set_name_by_id(id, '[gnome-shell] params.onLoaded');
-@@ -392,6 +393,7 @@ const Background = new Lang.Class({
+@@ -403,6 +404,7 @@ const Background = new Lang.Class({
  
-     _loadAnimation: function(filename) {
-         this._cache.getAnimation({ filename: filename,
+     _loadAnimation: function(file) {
+         this._cache.getAnimation({ file: file,
 +                                   settingsSchema: this._settings.schema_id,
-                                              onLoaded: Lang.bind(this, function(animation) {
-                                                  this._animation = animation;
+                                          onLoaded: Lang.bind(this, function(animation) {
+                                              this._animation = animation;
  
 -- 
-2.1.3
+2.5.1
 

Modified: desktop/unstable/gnome-shell/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-shell/debian/patches/series?rev=45865&op=diff
==============================================================================
--- desktop/unstable/gnome-shell/debian/patches/series	[utf-8] (original)
+++ desktop/unstable/gnome-shell/debian/patches/series	[utf-8] Mon Sep  7 04:42:37 2015
@@ -1,4 +1,4 @@
-#10_background_race.patch
+10_background_race.patch
 27-nm-libexec-path.patch
 #30-remoteMenu-Prevent-the-shell-from-becoming-unrespons.patch
 41-handle-logind-fail.patch