You have been requested to review the proposed merge of lp:~darkxst/ubuntu/saucy/gnome-shell/lp1219188 into lp:ubuntu/gnome-shell.
For more details, see: https://code.launchpad.net/~darkxst/ubuntu/saucy/gnome-shell/lp1219188/+merge/183319 -- https://code.launchpad.net/~darkxst/ubuntu/saucy/gnome-shell/lp1219188/+merge/183319 Your team Ubuntu GNOME Developers is requested to review the proposed merge of lp:~darkxst/ubuntu/saucy/gnome-shell/lp1219188 into lp:ubuntu/gnome-shell.
=== modified file 'debian/changelog' --- debian/changelog 2013-07-31 21:29:20 +0000 +++ debian/changelog 2013-08-31 11:09:17 +0000 @@ -1,3 +1,12 @@ +gnome-shell (3.8.4-0ubuntu2) UNRELEASED; urgency=low + + * debian/patches: + - git_fix_calendar_wrapping.patch: fixes wrapping of long calender events + - git_background_schema.patch, git_use_screensaver_bg.patch: git patches + to allow using seperate bg for lock screen (LP: #1219188) + + -- Tim Lunn <t...@feathertop.org> Sat, 31 Aug 2013 21:07:20 +1000 + gnome-shell (3.8.4-0ubuntu1) saucy; urgency=low * New upstream release. === added file 'debian/patches/git_background_schema.patch' --- debian/patches/git_background_schema.patch 1970-01-01 00:00:00 +0000 +++ debian/patches/git_background_schema.patch 2013-08-31 11:09:17 +0000 @@ -0,0 +1,57 @@ +From 4413f816e6016e3759e7e0b2d8188ee62aa1ab6a Mon Sep 17 00:00:00 2001 +From: Giovanni Campagna <gcampa...@src.gnome.org> +Date: Mon, 19 Aug 2013 22:48:56 +0000 +Subject: Background: allow passing the settings schema from outside + +This way it is possible to use different settings for different +backgrounds. + +https://bugzilla.gnome.org/show_bug.cgi?id=688210 +--- +diff --git a/js/ui/background.js b/js/ui/background.js +index 1d9ab7c..246060a 100644 +--- a/js/ui/background.js ++++ b/js/ui/background.js +@@ -295,14 +295,15 @@ const Background = new Lang.Class({ + _init: function(params) { + params = Params.parse(params, { monitorIndex: 0, + layoutManager: Main.layoutManager, +- effects: Meta.BackgroundEffects.NONE }); ++ effects: Meta.BackgroundEffects.NONE, ++ settings: null }); + this.actor = new Meta.BackgroundGroup(); + this.actor._delegate = this; + + this._destroySignalId = this.actor.connect('destroy', + Lang.bind(this, this._destroy)); + +- this._settings = new Gio.Settings({ schema: BACKGROUND_SCHEMA }); ++ this._settings = params.settings; + this._monitorIndex = params.monitorIndex; + this._layoutManager = params.layoutManager; + this._effects = params.effects; +@@ -716,8 +717,10 @@ const BackgroundManager = new Lang.Class({ + layoutManager: Main.layoutManager, + monitorIndex: null, + effects: Meta.BackgroundEffects.NONE, +- controlPosition: true }); ++ controlPosition: true, ++ settingsSchema: BACKGROUND_SCHEMA }); + ++ this._settings = new Gio.Settings({ schema: params.settingsSchema }); + this._container = params.container; + this._layoutManager = params.layoutManager; + this._effects = params.effects; +@@ -776,7 +779,8 @@ const BackgroundManager = new Lang.Class({ + _createBackground: function() { + let background = new Background({ monitorIndex: this._monitorIndex, + layoutManager: this._layoutManager, +- effects: this._effects }); ++ effects: this._effects, ++ settings: this._settings }); + this._container.add_child(background.actor); + + let monitor = this._layoutManager.monitors[this._monitorIndex]; +-- +cgit v0.9.2 + === added file 'debian/patches/git_fix_calendar_wrapping.patch' --- debian/patches/git_fix_calendar_wrapping.patch 1970-01-01 00:00:00 +0000 +++ debian/patches/git_fix_calendar_wrapping.patch 2013-08-31 11:09:17 +0000 @@ -0,0 +1,24 @@ +From cb45a38838eb441d4d3184560263ace5cc79057b Mon Sep 17 00:00:00 2001 +From: Florian Müllner <fmuell...@gnome.org> +Date: Tue, 09 Jul 2013 17:59:06 +0000 +Subject: calendar: Fix line-wrapping of calendar events + +Commit 929636ebd0b8f428 broke line-wrapping of longish calendar events, +add back the required CSS width. + +https://bugzilla.gnome.org/show_bug.cgi?id=703893 +--- +--- a/data/theme/gnome-shell.css ++++ b/data/theme/gnome-shell.css +@@ -1153,6 +1153,11 @@ + min-width: 320px; + } + ++#calendarArea { ++ /* this is the total width of the popup */ ++ max-width: 720px; ++} ++ + .calendar-vertical-separator { + -stipple-width: 1px; + -stipple-color: #505050; === added file 'debian/patches/git_use_screensaver_bg.patch' --- debian/patches/git_use_screensaver_bg.patch 1970-01-01 00:00:00 +0000 +++ debian/patches/git_use_screensaver_bg.patch 2013-08-31 11:09:17 +0000 @@ -0,0 +1,27 @@ +From fdc08325065d464ea05e669d6f2a4889fe0b1d58 Mon Sep 17 00:00:00 2001 +From: Giovanni Campagna <gcampa...@src.gnome.org> +Date: Mon, 19 Aug 2013 22:51:34 +0000 +Subject: ScreenShield: use the screensaver background + +Now that that's configurable in the control center, we should +use the appropriate background here. + +https://bugzilla.gnome.org/show_bug.cgi?id=688210 +--- +diff --git a/js/ui/screenShield.js b/js/ui/screenShield.js +index f375735..942f3eb 100644 +--- a/js/ui/screenShield.js ++++ b/js/ui/screenShield.js +@@ -599,7 +599,8 @@ const ScreenShield = new Lang.Class({ + + let bgManager = new Background.BackgroundManager({ container: widget, + monitorIndex: monitorIndex, +- controlPosition: false }); ++ controlPosition: false, ++ settingsSchema: SCREENSAVER_SCHEMA }); + + this._bgManagers.push(bgManager); + +-- +cgit v0.9.2 + === modified file 'debian/patches/series' --- debian/patches/series 2013-07-31 21:29:20 +0000 +++ debian/patches/series 2013-08-31 11:09:17 +0000 @@ -10,3 +10,6 @@ revert-power-dbus-name-update.patch revert-disable-periodic-gc.patch git_gjs_api_change.patch +git_fix_calendar_wrapping.patch +git_background_schema.patch +git_use_screensaver_bg.patch
-- Mailing list: https://launchpad.net/~ubuntu-gnome-dev Post to : ubuntu-gnome-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~ubuntu-gnome-dev More help : https://help.launchpad.net/ListHelp
