diff --git a/debian/changelog b/debian/changelog index 2acc2bea..2184a1b2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -16,8 +16,11 @@ gnome-shell-extensions (3.2.3-1) UNRELEASED; urgency=low [ Michael Biebl ] * New upstream release. + * Drop patches which have been merged upstream: + - debian/patches/upstream/* + - debian/patches/fix-* - -- Michael Biebl Sat, 11 Feb 2012 22:42:44 +0100 + -- Michael Biebl Sat, 11 Feb 2012 22:49:58 +0100 gnome-shell-extensions (3.2.0-1) experimental; urgency=low diff --git a/debian/patches/fix_alternate-tab_661281.diff b/debian/patches/fix_alternate-tab_661281.diff deleted file mode 100644 index 814a1914..00000000 --- a/debian/patches/fix_alternate-tab_661281.diff +++ /dev/null @@ -1,144 +0,0 @@ -From 37c96f6a8a6898c56c633c3a0e158e5b5ecd774b Mon Sep 17 00:00:00 2001 -From: Joachim Bargsten -Date: Tue, 4 Oct 2011 00:40:59 +0200 -Subject: [PATCH 1/3] alternate-tab: workspace and icons part 3.2 ready - -The workspace and icons switcher is now gnome 3.2 ready. ---- a/extensions/alternate-tab/extension.js -+++ b/extensions/alternate-tab/extension.js -@@ -23,21 +23,26 @@ - const _ = Gettext.gettext; - const N_ = function(e) { return e }; - --const POPUP_FADE_TIME = 0.1; // seconds -+const POPUP_DELAY_TIMEOUT = 150; // milliseconds - - const SETTINGS_SCHEMA = 'org.gnome.shell.extensions.alternate-tab'; - const SETTINGS_BEHAVIOUR_KEY = 'behaviour'; - const SETTINGS_FIRST_TIME_KEY = 'first-time'; - - const MODES = { -- native: function() { -- Main.wm._startAppSwitcher(); -+ native: function(shellwm, binding, mask, window, backwards) { -+ shellwm._startAppSwitcher(shellwm, binding, mask, window, backwards); - }, - all_thumbnails: function() { - new AltTabPopup2(); - }, -- workspace_icons: function() { -- new AltTabPopupW().show(); -+ workspace_icons: function(shellwm, binding, mask, window, backwards) { -+ if (shellwm._workspaceSwitcherPopup != null) -+ shellwm._workspaceSwitcherPopup.actor.hide(); -+ -+ let tabPopup = new AltTabPopupW(); -+ if (!tabPopup.show(backwards, binding, mask)) -+ tabPopup.destroy(); - } - }; - -@@ -68,7 +73,9 @@ - AltTabPopupW.prototype = { - __proto__ : AltTab.AltTabPopup.prototype, - -- show : function(backward, switch_group) { -+ _windowActivated : function(thumbnailList, n) { }, -+ -+ show : function(backward, binding, mask) { - let appSys = Shell.AppSystem.get_default(); - let apps = appSys.get_running (); - -@@ -78,6 +85,7 @@ - if (!Main.pushModal(this.actor)) - return false; - this._haveModal = true; -+ this._modifierMask = AltTab.primaryModifier(mask); - - this.actor.connect('key-press-event', Lang.bind(this, this._keyPressEvent)); - this.actor.connect('key-release-event', Lang.bind(this, this._keyReleaseEvent)); -@@ -92,16 +100,22 @@ - - this._appIcons = this._appSwitcher.icons; - -+ // Need to force an allocation so we can figure out whether we -+ // need to scroll when selecting -+ this.actor.opacity = 0; -+ this.actor.show(); -+ this.actor.get_allocation_box(); -+ - // Make the initial selection -- if (switch_group) { -- if (backward) { -- this._select(0, this._appIcons[0].cachedWindows.length - 1); -- } else { -- if (this._appIcons[0].cachedWindows.length > 1) -- this._select(0, 1); -- else -- this._select(0, 0); -- } -+ if (binding == 'switch_group') { -+ //see AltTab.AltTabPopup.show function -+ //cached windows are always of length one, so select first app and the window -+ //the direction doesn't matter, so ignore backward -+ this._select(0, 0); -+ } else if (binding == 'switch_group_backward') { -+ this._select(0, 0); -+ } else if (binding == 'switch_windows_backward') { -+ this._select(this._appIcons.length - 1); - } else if (this._appIcons.length == 1) { - this._select(0); - } else if (backward) { -@@ -110,24 +124,25 @@ - this._select(1); - } - -+ - // There's a race condition; if the user released Alt before - // we got the grab, then we won't be notified. (See - // https://bugzilla.gnome.org/show_bug.cgi?id=596695 for - // details.) So we check now. (Have to do this after updating - // selection.) - let [x, y, mods] = global.get_pointer(); -- if (!(mods & Gdk.ModifierType.MOD1_MASK)) { -+ if (!(mods & this._modifierMask)) { - this._finish(); - return false; - } - -- this.actor.opacity = 0; -- this.actor.show(); -- Tweener.addTween(this.actor, -- { opacity: 255, -- time: POPUP_FADE_TIME, -- transition: 'easeOutQuad' -- }); -+ // We delay showing the popup so that fast Alt+Tab users aren't -+ // disturbed by the popup briefly flashing. -+ this._initialDelayTimeoutId = Mainloop.timeout_add(POPUP_DELAY_TIMEOUT, -+ Lang.bind(this, function () { -+ this.actor.opacity = 255; -+ this._initialDelayTimeoutId = 0; -+ })); - - return true; - }, -@@ -545,15 +560,16 @@ - imports.gettext.bindtextdomain('gnome-shell-extensions', metadata.localedir); - } - --function doAltTab(shellwm, binding, window, backwards) { -+function doAltTab(shellwm, binding, mask, window, backwards) { - let settings = new Gio.Settings({ schema: SETTINGS_SCHEMA }); - -+ - if(settings.get_boolean(SETTINGS_FIRST_TIME_KEY)) { - new AltTabSettingsDialog().open(); - } else { - let behaviour = settings.get_string(SETTINGS_BEHAVIOUR_KEY); - if(behaviour in MODES) { -- MODES[behaviour](binding, backwards); -+ MODES[behaviour](shellwm, binding, mask, window, backwards); - } - } - } diff --git a/debian/patches/fix_alternate-tab_gnome-shell_version.diff b/debian/patches/fix_alternate-tab_gnome-shell_version.diff deleted file mode 100644 index 5d3104b4..00000000 --- a/debian/patches/fix_alternate-tab_gnome-shell_version.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- a/extensions/alternate-tab/metadata.json.in -+++ b/extensions/alternate-tab/metadata.json.in -@@ -3,7 +3,7 @@ - "name": "AlternateTab", - "description": "A replacement for Alt-Tab, allows to cycle between windows and does not group by application", - "original-authors": [ "jw@bargsten.org", "thomas.bouffon@gmail.com" ], --"shell-version": [ "@shell_current@" ], -+"shell-version": [ "3.2" ], - "localedir": "@LOCALEDIR@", - "url": "@url@" - } diff --git a/debian/patches/fix_dock_gnome-shell_version.diff b/debian/patches/fix_dock_gnome-shell_version.diff deleted file mode 100644 index c5cf47a2..00000000 --- a/debian/patches/fix_dock_gnome-shell_version.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- a/extensions/dock/metadata.json.in -+++ b/extensions/dock/metadata.json.in -@@ -3,7 +3,7 @@ - "name": "Dock", - "description": "A dock for the GNOME Shell -- displays favorite and running applications", - "original-author": "tclaesson@gmail.com", --"shell-version": [ "@shell_current@" ], -+"shell-version": [ "3.2" ], - "localedir": "@LOCALEDIR@", - "url": "@url@" - } diff --git a/debian/patches/series b/debian/patches/series index 2b0dfb48..63ea7f47 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,8 +1 @@ -upstream/patch_967aee7aad2accfb38d91ab56b6c5e91d86a2722.diff -upstream/patch_66242aa76a5d59fb4659551575c1fbb42e50b8fb.diff -upstream/patch_4c5a36e4c0cbe38f2e26b6b3c8b02e88b4b939f7.diff -upstream/patch_2bba98d6214cffae2eb5cecb9d7c1f6b6d244052.diff -fix_dock_gnome-shell_version.diff -fix_alternate-tab_661281.diff -fix_alternate-tab_gnome-shell_version.diff 01_status-menu_disable_accounts.patch diff --git a/debian/patches/upstream/patch_2bba98d6214cffae2eb5cecb9d7c1f6b6d244052.diff b/debian/patches/upstream/patch_2bba98d6214cffae2eb5cecb9d7c1f6b6d244052.diff deleted file mode 100644 index 621e160b..00000000 --- a/debian/patches/upstream/patch_2bba98d6214cffae2eb5cecb9d7c1f6b6d244052.diff +++ /dev/null @@ -1,42 +0,0 @@ -From 2bba98d6214cffae2eb5cecb9d7c1f6b6d244052 Mon Sep 17 00:00:00 2001 -From: Jasper St. Pierre -Date: Tue, 25 Oct 2011 18:21:01 +0000 -Subject: systemMonitor: Properly enable/disable - -https://bugzilla.gnome.org/show_bug.cgi?id=662705 ---- -diff --git a/extensions/systemMonitor/extension.js b/extensions/systemMonitor/extension.js -index 39801ab..6aa117a 100644 ---- a/extensions/systemMonitor/extension.js -+++ b/extensions/systemMonitor/extension.js -@@ -35,13 +35,18 @@ Indicator.prototype = { - reactive: true}); - this.actor.add_actor(this.drawing_area); - -- Mainloop.timeout_add(INDICATOR_UPDATE_INTERVAL, Lang.bind(this, function () { -+ this._timeout = Mainloop.timeout_add(INDICATOR_UPDATE_INTERVAL, Lang.bind(this, function () { - this._updateValues(); - this.drawing_area.queue_repaint(); - return true; - })); - }, - -+ destroy: function() { -+ Mainloop.source_remove(this._timeout); -+ this.actor.destroy(); -+ }, -+ - _initValues: function() { - }, - -@@ -239,6 +244,8 @@ function enable() { - - function disable() { - _cpuIndicator.destroy(); -+ _cpuIndicator = null; - _memIndicator.destroy(); -+ _memIndicator = null; - _box.destroy(); - } --- -cgit v0.9.0.2 diff --git a/debian/patches/upstream/patch_4c5a36e4c0cbe38f2e26b6b3c8b02e88b4b939f7.diff b/debian/patches/upstream/patch_4c5a36e4c0cbe38f2e26b6b3c8b02e88b4b939f7.diff deleted file mode 100644 index fdeca120..00000000 --- a/debian/patches/upstream/patch_4c5a36e4c0cbe38f2e26b6b3c8b02e88b4b939f7.diff +++ /dev/null @@ -1,311 +0,0 @@ -From 4c5a36e4c0cbe38f2e26b6b3c8b02e88b4b939f7 Mon Sep 17 00:00:00 2001 -From: Jason Siefken -Date: Tue, 11 Oct 2011 09:15:05 +0000 -Subject: Added prettier drawing operations and css colors - -https://bugzilla.gnome.org/show_bug.cgi?id=661443 ---- -diff --git a/extensions/systemMonitor/extension.js b/extensions/systemMonitor/extension.js -index db7fe59..39801ab 100644 ---- a/extensions/systemMonitor/extension.js -+++ b/extensions/systemMonitor/extension.js -@@ -9,6 +9,9 @@ const Shell = imports.gi.Shell; - - const Main = imports.ui.main; - -+const INDICATOR_UPDATE_INTERVAL = 500; -+const INDICATOR_NUM_GRID_LINES = 3; -+ - let _cpuIndicator; - let _memIndicator; - let _box; -@@ -19,29 +22,24 @@ function Indicator() { - - Indicator.prototype = { - _init: function() { -- this._initValues(); -- this.actor = new St.DrawingArea({ style_class: "extension-systemMonitor-indicator-area", -- reactive: true}); -- this.actor.connect('repaint', Lang.bind(this, this._draw)); -- this.actor.connect('button-press-event', function() { -+ this._initValues(); -+ this.drawing_area = new St.DrawingArea({ reactive: true }); -+ this.drawing_area.width = 100; this.drawing_area.height = 100; -+ this.drawing_area.connect('repaint', Lang.bind(this, this._draw)); -+ this.drawing_area.connect('button-press-event', function() { - let app = Shell.AppSystem.get_default().lookup_app('gnome-system-monitor.desktop'); - app.open_new_window(-1); - }); - -- this._timeoutId = Mainloop.timeout_add(250, Lang.bind(this, function () { -- this._updateValues(); -- this.actor.queue_repaint(); -- return true; -- })); -- }, -+ this.actor = new St.Bin({ style_class: "extension-systemMonitor-indicator-area", -+ reactive: true}); -+ this.actor.add_actor(this.drawing_area); - -- destroy: function() { -- if (this._timeoutId) { -- Mainloop.source_remove(this._timeoutId); -- this._timeoutId = 0; -- } -- -- this.actor.destroy(); -+ Mainloop.timeout_add(INDICATOR_UPDATE_INTERVAL, Lang.bind(this, function () { -+ this._updateValues(); -+ this.drawing_area.queue_repaint(); -+ return true; -+ })); - }, - - _initValues: function() { -@@ -54,23 +52,83 @@ Indicator.prototype = { - let [width, height] = area.get_surface_size(); - let themeNode = this.actor.get_theme_node(); - let cr = area.get_context(); -- for (let i = this.values.length - 1; i >= 0; i--) { -- let color = themeNode.get_color(this.values[i].color); -- cr.moveTo(0, height); -- let k; -- for (k = 0; k < this.values[i].values.length; k++) { -- cr.lineTo(k, (1 - this.values[i].values[k]) * height); -+ -+ //draw the background grid -+ let color = themeNode.get_color(this.gridColor); -+ let gridOffset = Math.floor(height / (INDICATOR_NUM_GRID_LINES + 1)); -+ for (let i = 1; i <= INDICATOR_NUM_GRID_LINES; ++i) { -+ cr.moveTo(0, i * gridOffset + .5); -+ cr.lineTo(width, i * gridOffset + .5); -+ } -+ Clutter.cairo_set_source_color(cr, color); -+ cr.setLineWidth(1); -+ cr.setDash([4,1], 0); -+ cr.stroke(); -+ -+ //draw the foreground -+ -+ function makePath(values, reverse, nudge) { -+ if (nudge == null) { -+ nudge = 0; - } -- if (k > width) -- this.values[i].values.shift(); -- cr.lineTo(k, height); -- cr.lineTo(0, height); -- cr.closePath(); -- Clutter.cairo_set_source_color(cr, color); -+ //if we are going in reverse, we are completing the bottom of a chart, so use lineTo -+ if (reverse) { -+ cr.lineTo(values.length - 1, (1 - values[values.length - 1]) * height + nudge); -+ for (let k = values.length - 2; k >= 0; --k) { -+ cr.lineTo(k, (1 - values[k]) * height + nudge); -+ } -+ } else { -+ cr.moveTo(0, (1 - values[0]) * height + nudge); -+ for (let k = 1; k < values.length; ++k) { -+ cr.lineTo(k, (1 - values[k]) * height + nudge); -+ } - -- cr.fill(); -+ } -+ } -+ -+ let renderStats = this.renderStats; -+ -+ // Make sure we don't have more sample points than pixels -+ renderStats.map(Lang.bind(this, function(k){ -+ let stat = this.stats[k]; -+ if (stat.values.length > width) { -+ stat.values = stat.values.slice(stat.values.length - width, stat.values.length); -+ } -+ })); -+ -+ for (let i = 0; i < renderStats.length; ++i) { -+ let stat = this.stats[renderStats[i]]; -+ // We outline at full opacity and fill with 40% opacity -+ let outlineColor = themeNode.get_color(stat.color); -+ let color = new Clutter.Color(outlineColor); -+ color.alpha = color.alpha * .4; -+ -+ // Render the background between us and the next level -+ makePath(stat.values, false); -+ // If there is a process below us, render the cpu between us and it, otherwise, -+ // render to the bottom of the chart -+ if (i == renderStats.length - 1) { -+ cr.lineTo(stat.values.length - 1, height); -+ cr.lineTo(0, height); -+ cr.closePath(); -+ } else { -+ let nextStat = this.stats[renderStats[i+1]]; -+ makePath(nextStat.values, true); -+ } -+ cr.closePath() -+ Clutter.cairo_set_source_color(cr, color); -+ cr.fill(); -+ -+ // Render the outline of this level -+ makePath(stat.values, false, .5); -+ Clutter.cairo_set_source_color(cr, outlineColor); -+ cr.setLineWidth(1.0); -+ cr.setDash([], 0); -+ cr.stroke(); - } -+ - } -+ - }; - - function CpuIndicator() { -@@ -80,14 +138,28 @@ function CpuIndicator() { - CpuIndicator.prototype = { - __proto__: Indicator.prototype, - -+ _init: function() { -+ Indicator.prototype._init.call(this); -+ this.gridColor = '-grid-color'; -+ this.renderStats = [ 'cpu-user', 'cpu-sys', 'cpu-iowait' ]; -+ -+ // Make sure renderStats is sorted as necessary for rendering -+ let renderStatOrder = {'cpu-total': 0, 'cpu-user': 1, 'cpu-sys': 2, 'cpu-iowait': 3}; -+ this.renderStats = this.renderStats.sort(function(a,b) { -+ return renderStatOrder[a] - renderStatOrder[b]; -+ }); -+ }, -+ - _initValues: function() { - this._prev = new GTop.glibtop_cpu; - GTop.glibtop_get_cpu(this._prev); - -- this.values = []; -- this.values.push({color: "-cpu-user-color", values: []}); -- this.values.push({color: "-cpu-sys-color", values: []}); -- this.values.push({color: "-cpu-iowait-color", values: []}); -+ this.stats = { -+ 'cpu-user': {color: '-cpu-user-color', values: []}, -+ 'cpu-sys': {color: '-cpu-sys-color', values: []}, -+ 'cpu-iowait': {color: '-cpu-iowait-color', values: []}, -+ 'cpu-total': {color: '-cpu-total-color', values: []} -+ }; - }, - - _updateValues: function() { -@@ -98,15 +170,16 @@ CpuIndicator.prototype = { - let user = cpu.user - this._prev.user; - let sys = cpu.sys - this._prev.sys; - let iowait = cpu.iowait - this._prev.iowait; -+ let idle = cpu.idle - this._prev.idle; - -- t = user / total; -- this.values[0].values.push(t); -- -- t += sys / total; -- this.values[1].values.push(t); - t += iowait / total; -- this.values[2].values.push(t); -- -+ this.stats['cpu-iowait'].values.push(t); -+ t += sys / total; -+ this.stats['cpu-sys'].values.push(t); -+ t += user / total; -+ this.stats['cpu-user'].values.push(t); -+ this.stats['cpu-total'].values.push(1 - idle / total); -+ - this._prev = cpu; - } - }; -@@ -117,24 +190,37 @@ function MemoryIndicator() { - - MemoryIndicator.prototype = { - __proto__: Indicator.prototype, -+ -+ _init: function() { -+ Indicator.prototype._init.call(this); -+ this.gridColor = '-grid-color'; -+ this.renderStats = [ 'mem-user', 'mem-other', 'mem-cached' ]; -+ -+ // Make sure renderStats is sorted as necessary for rendering -+ let renderStatOrder = { 'mem-cached': 0, 'mem-other': 1, 'mem-user': 2 }; -+ this.renderStats = this.renderStats.sort(function(a,b) { -+ return renderStatOrder[a] - renderStatOrder[b]; -+ }); -+ }, - - _initValues: function() { - this.mem = new GTop.glibtop_mem; -- this.values = []; -- this.values.push({ color: "-mem-user-color", values: [] }); -- this.values.push({ color: "-mem-other-color", values: [] }); -- this.values.push({ color: "-mem-cached-color", values: [] }); -+ this.stats = { -+ 'mem-user': { color: "-mem-user-color", values: [] }, -+ 'mem-other': { color: "-mem-other-color", values: [] }, -+ 'mem-cached': { color: "-mem-cached-color", values: [] } -+ }; - }, - - _updateValues: function() { - GTop.glibtop_get_mem(this.mem); - - let t = this.mem.user / this.mem.total; -- this.values[0].values.push(t); -+ this.stats['mem-user'].values.push(t); - t += (this.mem.used - this.mem.user - this.mem.cached) / this.mem.total; -- this.values[1].values.push(t); -+ this.stats['mem-other'].values.push(t); - t += this.mem.cached / this.mem.total; -- this.values[2].values.push(t); -+ this.stats['mem-cached'].values.push(t); - } - }; - -@@ -143,7 +229,7 @@ function init() { - } - - function enable() { -- _cpuIndicator = new CpuIndicator(); -+ _cpuIndicator = new CpuIndicator(); - _memIndicator = new MemoryIndicator(); - _box = new St.BoxLayout({ style_class: 'extension-systemMonitor-container' }); - _box.add(_cpuIndicator.actor); -diff --git a/extensions/systemMonitor/stylesheet.css b/extensions/systemMonitor/stylesheet.css -index 26aad6b..daad48d 100644 ---- a/extensions/systemMonitor/stylesheet.css -+++ b/extensions/systemMonitor/stylesheet.css -@@ -1,16 +1,23 @@ - .extension-systemMonitor-container { - spacing: 5px; -+ padding-left: 5px; -+ padding-right: 5px; -+ padding-bottom: 1px; -+ padding-top: 0px; - } - - .extension-systemMonitor-indicator-area { -- border: 1px solid #000; -+ border: 1px solid #8d8d8d; -+ border-radius: 3px; - width: 100px; -- height: 34px; -- -cpu-user-color: #f00; -- -cpu-sys-color: #0f0; -- -cpu-iowait-color: #00f; -- -mem-user-color: #ff0; -- -mem-cached-color: #0ff; -- -mem-other-color: #111; -- background-color: #fff; -+ height: 30px; -+ -grid-color: #575757; -+ -cpu-total-color: rgb(0,154,62); -+ -cpu-user-color: rgb(69,154,0); -+ -cpu-sys-color: rgb(255,253,81); -+ -cpu-iowait-color: rgb(210,148,0); -+ -mem-user-color: rgb(210,148,0); -+ -mem-cached-color: rgb(90,90,90); -+ -mem-other-color: rgb(205,203,41); -+ background-color: #1e1e1e; - } --- -cgit v0.9.0.2 diff --git a/debian/patches/upstream/patch_66242aa76a5d59fb4659551575c1fbb42e50b8fb.diff b/debian/patches/upstream/patch_66242aa76a5d59fb4659551575c1fbb42e50b8fb.diff deleted file mode 100644 index 25705c88..00000000 --- a/debian/patches/upstream/patch_66242aa76a5d59fb4659551575c1fbb42e50b8fb.diff +++ /dev/null @@ -1,39 +0,0 @@ -From 66242aa76a5d59fb4659551575c1fbb42e50b8fb Mon Sep 17 00:00:00 2001 -From: Giovanni Campagna -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 ---- -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 diff --git a/debian/patches/upstream/patch_967aee7aad2accfb38d91ab56b6c5e91d86a2722.diff b/debian/patches/upstream/patch_967aee7aad2accfb38d91ab56b6c5e91d86a2722.diff deleted file mode 100644 index e2cc380f..00000000 --- a/debian/patches/upstream/patch_967aee7aad2accfb38d91ab56b6c5e91d86a2722.diff +++ /dev/null @@ -1,33 +0,0 @@ -From 967aee7aad2accfb38d91ab56b6c5e91d86a2722 Mon Sep 17 00:00:00 2001 -From: Stefan 'psYchotic' Zwanenburg -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