[gnome-shell-extensions/f16] Add patch to restore strut management for dock extension

[Mohamed ElMorabity]

commit 1a5d880281484ec8b051e1b87fa8a38d05075639
Author: Mohamed El Morabity <melmorabity at fedoraproject.org>
Date:   Fri Dec 23 20:32:55 2011 +0100

    Add patch to restore strut management for dock extension

 gnome-shell-extensions-3.2.3-dock_strut.patch |   35 +++++++++++++++++++++++++
 gnome-shell-extensions.spec                   |   13 +++++++--
 2 files changed, 45 insertions(+), 3 deletions(-)
---
diff --git a/gnome-shell-extensions-3.2.3-dock_strut.patch b/gnome-shell-extensions-3.2.3-dock_strut.patch
new file mode 100644
index 0000000..a69f496
--- /dev/null
+++ b/gnome-shell-extensions-3.2.3-dock_strut.patch
@@ -0,0 +1,35 @@
+From 5bf1339ef1dbe48c68ea103c5a3753477ac33b92 Mon Sep 17 00:00:00 2001
+From: Giovanni Campagna <gcampagna at src.gnome.org>
+Date: Tue, 20 Dec 2011 17:59:20 +0000
+Subject: dock: restore strut management
+
+When configured not to auto-hide, the dock should modify struts
+so that it doesn't cover maximized windows.
+---
+diff --git a/extensions/dock/extension.js b/extensions/dock/extension.js
+index 387d784..2fe5147 100644
+--- a/extensions/dock/extension.js
++++ b/extensions/dock/extension.js
+@@ -381,7 +381,8 @@ Dock.prototype = {
+         this._overviewHiddenId = Main.overview.connect('hidden', Lang.bind(this, function() {
+             this.actor.show();
+         }));
+-        Main.layoutManager.addChrome(this.actor);
++        Main.layoutManager.addChrome(this.actor,
++                                     { affectsStruts: !this._settings.get_boolean(DOCK_HIDE_KEY) });
+ 
+         //hidden
+         this._settings.connect('changed::'+DOCK_POSITION_KEY, Lang.bind(this, function (){
+@@ -406,6 +407,10 @@ Dock.prototype = {
+                 if (!this._settings)
+                     return;
+ 
++                Main.layoutManager.removeChrome(this.actor);
++                Main.layoutManager.addChrome(this.actor,
++                                             { affectsStruts: !this._settings.get_boolean(DOCK_HIDE_KEY) });
++
+                 hideable = this._settings.get_boolean(DOCK_HIDE_KEY);
+                 if (hideable){
+                         hideDock=false;
+--
+cgit v0.9.0.2
diff --git a/gnome-shell-extensions.spec b/gnome-shell-extensions.spec
index 7d5d5b3..da805b3 100644
--- a/gnome-shell-extensions.spec
+++ b/gnome-shell-extensions.spec
@@ -3,7 +3,7 @@
 
 Name:           gnome-shell-extensions
 Version:        %{major_version}.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Modify and extend GNOME Shell functionality and behavior
 
 Group:          User Interface/Desktops
@@ -22,6 +22,9 @@ Patch0:         %{name}-3.2.3-reenable_localedir.patch
 # (except for the user-theme extension). The following patch will be *reverted*
 # to re-enable GSettings settings (taken from commit 374abed)
 Patch1:         %{name}-3.2.3-disable_GSettings.patch
+# Restore strut management for dock extension (taken from commit 5bf1339; fix
+# RHBZ #744227)
+Patch2:         %{name}-3.2.3-dock_strut.patch
 BuildRequires:  glib2-devel
 BuildRequires:  gnome-common
 BuildRequires:  intltool
@@ -250,13 +253,14 @@ This extension adds a systems status menu for rotating monitors
 %patch0 -p1 -b .reenable_localedir
 # Patch reverted to *re-enable* GSettings settings
 %patch1 -p1 -R -b .enable_GSettings
+%patch2 -p1 -b .dock_strut
 
 
 %build
 # Since we build from a Git checkout
-[ -x autogen.sh ] && NOCONFIGURE=1 ./autogen.sh --disable-schemas-compile
+[ -x autogen.sh ] && NOCONFIGURE=1 ./autogen.sh
 
-%configure  --enable-extensions="alternate-tab alternative-status-menu apps-menu auto-move-windows dock drive-menu native-window-placement places-menu systemMonitor user-theme windowsNavigator workspace-indicator xrandr-indicator"
+%configure --enable-extensions="alternate-tab alternative-status-menu apps-menu auto-move-windows dock drive-menu native-window-placement places-menu systemMonitor user-theme windowsNavigator workspace-indicator xrandr-indicator" --disable-schemas-compile
 make %{?_smp_mflags}
 
 
@@ -385,6 +389,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 
 
 %changelog
+* Fri Dec 23 2011 Mohamed El Morabity <melmorabity at fedoraproject.org> - 3.2.3-2
+- Add patch to restore strut management for dock extension
+
 * Sun Dec 18 2011 Mohamed El Morabity <melmorabity at fedoraproject.org> - 3.2.3-1
 - Update to 3.2.3
 - Remove workaround to fix alternative-status-menu extension crash when login