summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIain Lane <[email protected]>2016-08-18 16:46:28 +0100
committergit-ubuntu importer <[email protected]>2016-08-18 16:03:13 +0000
commit304feae1f732494cf52aeaec99e2d0edecb993b8 (patch)
tree804e3b768c15e06dabea0de9021fdcb15ee8b094
parent27a5616d008d8cfb3c962b626c5c189dadcce256 (diff)
16.10.2.1 (patches unapplied)import/16.10.2.1
Imported using git-ubuntu import.
Notes
Notes: * Apply the Gtk.ResizeMode.QUEUE fix to another place, so that the shutdown dialog is positioned correctly again.
-rw-r--r--debian/changelog7
-rw-r--r--src/background.vala2
2 files changed, 9 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 2a452882..061f47d7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+unity-greeter (16.10.2.1) yakkety; urgency=medium
+
+ * Apply the Gtk.ResizeMode.QUEUE fix to another place, so that the shutdown
+ dialog is positioned correctly again.
+
+ -- Iain Lane <[email protected]> Thu, 18 Aug 2016 16:46:28 +0100
+
unity-greeter (16.10.2-0ubuntu2) yakkety; urgency=medium
* Add back in accidentally lost changes from 16.10.1-0ubuntu2:
diff --git a/src/background.vala b/src/background.vala
index d87af47c..11c5a4f7 100644
--- a/src/background.vala
+++ b/src/background.vala
@@ -425,6 +425,8 @@ public class Background : Gtk.Fixed
timer = new AnimateTimer (AnimateTimer.ease_in_out, 700);
timer.animate.connect (animate_cb);
+ resize_mode = Gtk.ResizeMode.QUEUE;
+
loaders = new HashTable<string?, BackgroundLoader> (str_hash, str_equal);
notify["current-background"].connect (() => { reload (); });