aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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);