Accepting request 89020 from GNOME:Factory

Fix bugs

OBS-URL: https://build.opensuse.org/request/show/89020
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gnome-shell-extensions?expand=0&rev=13
This commit is contained in:
Stephan Kulow 2011-10-25 13:58:59 +00:00 committed by Git OBS Bridge
commit dafd924a80
4 changed files with 88 additions and 0 deletions

View File

@ -0,0 +1,33 @@
From 967aee7aad2accfb38d91ab56b6c5e91d86a2722 Mon Sep 17 00:00:00 2001
From: Stefan 'psYchotic' Zwanenburg <stefanhetzwaantje@gmail.com>
Date: Wed, 12 Oct 2011 01:16:18 +0000
Subject: dock: Fix popup menus
The dock popup menus weren't working because a signal had been renamed
('popup' -> 'open-state-changed').
https://bugzilla.gnome.org/show_bug.cgi?id=661484
---
diff --git a/extensions/dock/extension.js b/extensions/dock/extension.js
index 47cd76f..240f8a8 100644
--- a/extensions/dock/extension.js
+++ b/extensions/dock/extension.js
@@ -682,7 +682,7 @@ DockIcon.prototype = {
this._menu.connect('activate-window', Lang.bind(this, function (menu, window) {
this.activateWindow(window);
}));
- this._menu.connect('popup', Lang.bind(this, function (menu, isPoppedUp) {
+ this._menu.connect('open-state-changed', Lang.bind(this, function (menu, isPoppedUp) {
if (!isPoppedUp){
//Restore value of autohidedock
this._dock._restoreHideDock();
@@ -776,7 +776,6 @@ DockIconMenu.prototype = {
this._source = source;
this.connect('activate', Lang.bind(this, this._onActivate));
- this.connect('open-state-changed', Lang.bind(this, this._onOpenStateChanged));
this.actor.add_style_class_name('dock-menu');
--
cgit v0.9.0.2

View File

@ -0,0 +1,39 @@
From 66242aa76a5d59fb4659551575c1fbb42e50b8fb Mon Sep 17 00:00:00 2001
From: Giovanni Campagna <gcampagna@src.gnome.org>
Date: Tue, 18 Oct 2011 08:19:50 +0000
Subject: [PATCH 1/2] Make dock extension actually work with gnome-3.2
Without this patch dock is invisible, but reacts on mouse clicks
Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com>
---
diff --git a/extensions/dock/extension.js b/extensions/dock/extension.js
index 240f8a8..02c9650 100644
--- a/extensions/dock/extension.js
+++ b/extensions/dock/extension.js
@@ -304,7 +304,6 @@ Dock.prototype = {
this.actor.show();
}));
Main.layoutManager.addChrome(this.actor);
- this.actor.lower_bottom();
//hidden
this._settings.connect('changed::'+DOCK_POSITION_KEY, Lang.bind(this, function (){
@@ -372,6 +371,8 @@ Dock.prototype = {
this.actor.connect('leave-event', Lang.bind(this, this._hideDock));
this.actor.connect('enter-event', Lang.bind(this, this._showDock));
+
+ this._hideDock();
},
destroy: function() {
@@ -861,4 +862,4 @@ function enable() {
function disable() {
dock.destroy();
dock = null;
-}
\ No newline at end of file
+}
--
cgit v0.9.0.2

View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Thu Oct 20 14:23:41 UTC 2011 - malcolmlewis@opensuse.org
- Add gnome-shell-extensions-fix-popup-menus.patch: the dock
popup menus weren't working because a signal had been renamed
('popup' -> 'open-state-changed') (bgo#661484).
- Add gnome-shell-extensions-make-dock-extension-work.patch:
without this patch, dock is invisible, but reacts on mouse
clicks.
-------------------------------------------------------------------
Mon Oct 3 20:12:10 CEST 2011 - malcolmlewis@opensuse.org

View File

@ -27,6 +27,10 @@ Url: http://live.gnome.org/GnomeShell/Extensions
Group: System/GUI/GNOME
Source: http://download.gnome.org/sources/gnome-shell-extensions/3.2/%{name}-%{version}.tar.bz2
Source1: README.SUSE
# PATCH-FIX-UPSTREAM gnome-shell-extensions-fix-popup-menus.patch bgo#661484 malcolmlewis@opensuse-org -- The dock popup menus weren't working because a signal had been renamed ('popup' -> 'open-state-changed').
Patch0: gnome-shell-extensions-fix-popup-menus.patch
# PATCH-FIX-UPSTREAM gnome-shell-extensions-make-dock-extension-work.patch malcolmlewis@opensuse-org -- Without this patch dock is invisible, but reacts on mouse clicks.
Patch1: gnome-shell-extensions-make-dock-extension-work.patch
# Needed for directory ownership
BuildRequires: gnome-shell
# gobject-introspection is needed for the typelib() rpm magic.
@ -217,6 +221,8 @@ laptop monitor and open display preferences quickly.
%lang_package
%prep
%setup -q
%patch0 -p1
%patch1 -p1
cp %{S:1} .
%build