r31725 - in /packages/unstable/gnome-shell/debian: changelog patches/05_fix_glib_2.30_compat.patch

[sjoerd at users.alioth.debian.org]

Author: sjoerd
Date: Mon Nov 21 15:03:12 2011
New Revision: 31725

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=31725
Log:
* debian/patches/05_fix_glib_2.30_compat.patch:
  + Updated. Small mistake in the patch causes gnome-shell to fail to load
    the dim window shared, instead of which it just hangs. Fixed now..

Modified:
    packages/unstable/gnome-shell/debian/changelog
    packages/unstable/gnome-shell/debian/patches/05_fix_glib_2.30_compat.patch

Modified: packages/unstable/gnome-shell/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gnome-shell/debian/changelog?rev=31725&op=diff
==============================================================================
--- packages/unstable/gnome-shell/debian/changelog [utf-8] (original)
+++ packages/unstable/gnome-shell/debian/changelog [utf-8] Mon Nov 21 15:03:12 2011
@@ -1,3 +1,11 @@
+gnome-shell (3.0.2-8) UNRELEASED; urgency=low
+
+  * debian/patches/05_fix_glib_2.30_compat.patch:
+    + Updated. Small mistake in the patch causes gnome-shell to fail to load
+      the dim window shared, instead of which it just hangs. Fixed now..
+
+ -- Sjoerd Simons <sjoerd at debian.org>  Mon, 21 Nov 2011 15:02:14 +0000
+
 gnome-shell (3.0.2-7) unstable; urgency=low
 
   * debian/patches/06-polkit-Find-the-best-user-to-authenticate-as.patch:

Modified: packages/unstable/gnome-shell/debian/patches/05_fix_glib_2.30_compat.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gnome-shell/debian/patches/05_fix_glib_2.30_compat.patch?rev=31725&op=diff
==============================================================================
--- packages/unstable/gnome-shell/debian/patches/05_fix_glib_2.30_compat.patch [utf-8] (original)
+++ packages/unstable/gnome-shell/debian/patches/05_fix_glib_2.30_compat.patch [utf-8] Mon Nov 21 15:03:12 2011
@@ -10,10 +10,10 @@
     https://bugzilla.gnome.org/show_bug.cgi?id=649981
 
 diff --git a/js/ui/placeDisplay.js b/js/ui/placeDisplay.js
-index 59ca4a6..9354247 100644
+index c50c281..8592ee1 100644
 --- a/js/ui/placeDisplay.js
 +++ b/js/ui/placeDisplay.js
-@@ -268,10 +268,7 @@ PlacesManager.prototype = {
+@@ -270,10 +270,7 @@ PlacesManager.prototype = {
          if (!GLib.file_test(this._bookmarksPath, GLib.FileTest.EXISTS))
              return;
  
@@ -26,10 +26,18 @@
          let bookmarks = bookmarksContent.split('\n');
  
 diff --git a/js/ui/windowManager.js b/js/ui/windowManager.js
-index b113a1a..52a00da 100644
+index b113a1a..a3e2918 100644
 --- a/js/ui/windowManager.js
 +++ b/js/ui/windowManager.js
-@@ -22,8 +22,7 @@ function getDimShader() {
+@@ -6,6 +6,7 @@ const Gio = imports.gi.Gio;
+ const Lang = imports.lang;
+ const Meta = imports.gi.Meta;
+ const St = imports.gi.St;
++const Shell = imports.gi.Shell;
+ 
+ const AltTab = imports.ui.altTab;
+ const WorkspaceSwitcherPopup = imports.ui.workspaceSwitcherPopup;
+@@ -22,8 +23,7 @@ function getDimShader() {
      if (dimShader === null)
          return null;
      if (!dimShader) {