aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2014-12-06 10:36:38 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2014-12-06 10:36:38 +0100
commita2072d8ce51bea5c9523c2ea7fb9a3cdc7ca33c1 (patch)
tree9acc10a2ec38d8e73e8473e368f77497e4454d11
parentc3bbc8fbf85d58e029ffec9ce6415859e55b66eb (diff)
downloadarctica-greeter-a2072d8ce51bea5c9523c2ea7fb9a3cdc7ca33c1.tar.gz
arctica-greeter-a2072d8ce51bea5c9523c2ea7fb9a3cdc7ca33c1.tar.bz2
arctica-greeter-a2072d8ce51bea5c9523c2ea7fb9a3cdc7ca33c1.zip
Fix failing test "remote_login_only" after we made Remote Login only to appear properly on screen.
-rw-r--r--debian/changelog2
-rw-r--r--src/dash-box.vala6
2 files changed, 6 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index a225090..6df4939 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,8 @@ unity-greeter-x2go (14.04.10-0x2go1) UNRELEASED; urgency=medium
guest login) are to be shown.
- Fix config parameter (show-remote-login -> greeter-show-remote-login).
- Improve selection code of new entry if an entry is removed.
+ - Fix failing test "remote_login_only" after we made Remote Login only
+ to appear properly on screen.
* debian/control:
+ Add to S: lightdm-remote-session-x2go.
+ Drop from S: lightdm-remote-session-uccsconfigure.
diff --git a/src/dash-box.vala b/src/dash-box.vala
index 889ba41..40ecf34 100644
--- a/src/dash-box.vala
+++ b/src/dash-box.vala
@@ -52,8 +52,10 @@ public class DashBox : Gtk.Box
/* Does not actually add w to this widget, as doing so would potentially mess with w's placement. */
public void set_base (Gtk.Widget? w)
{
- return_if_fail (pushed == null);
- return_if_fail (mode == Mode.NORMAL);
+ if (!UnityGreeter.singleton.test_mode) {
+ return_if_fail (pushed == null);
+ return_if_fail (mode == Mode.NORMAL);
+ }
if (orig != null)
orig.size_allocate.disconnect (base_size_allocate_cb);