diff -Nru unity-greeter-14.04.9/configure.ac unity-greeter-14.04.10/configure.ac --- unity-greeter-14.04.9/configure.ac 2014-04-08 03:56:54.000000000 +0000 +++ unity-greeter-14.04.10/configure.ac 2014-04-30 03:34:19.000000000 +0000 @@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT(unity-greeter, 14.04.9) +AC_INIT(unity-greeter, 14.04.10) AC_CONFIG_MACRO_DIR(m4) AM_INIT_AUTOMAKE AM_PROG_CC_C_O diff -Nru unity-greeter-14.04.9/debian/changelog unity-greeter-14.04.10/debian/changelog --- unity-greeter-14.04.9/debian/changelog 2014-04-08 03:58:47.000000000 +0000 +++ unity-greeter-14.04.10/debian/changelog 2014-11-02 18:13:59.000000000 +0000 @@ -1,3 +1,21 @@ +unity-greeter (14.04.10-0ubuntu1+x2go1) trusty; urgency=medium + + * Non-maintainer upload. + * Add X2Go support to RLS. + * Turn package into format 3.0 (quilt). + * Provide via ppa:x2go/ppa and ppa:x2go/stable on Launchpad. + + + -- Mike Gabriel Sun, 02 Nov 2014 19:12:50 +0100 + +unity-greeter (14.04.10-0ubuntu1) trusty; urgency=medium + + * New upstream release: + - Require user to acknowledge messages received after authentication is + complete, for example if their password is about to expire. (LP: #1304866) + + -- Robert Ancell Wed, 30 Apr 2014 15:33:19 +1200 + unity-greeter (14.04.9-0ubuntu1) trusty; urgency=medium * New upstream release: diff -Nru unity-greeter-14.04.9/debian/patches/01_x2go+rls.patch unity-greeter-14.04.10/debian/patches/01_x2go+rls.patch --- unity-greeter-14.04.9/debian/patches/01_x2go+rls.patch 1970-01-01 00:00:00.000000000 +0000 +++ unity-greeter-14.04.10/debian/patches/01_x2go+rls.patch 2014-11-02 18:09:24.000000000 +0000 @@ -0,0 +1,39 @@ +=== modified file 'src/user-list.vala' +--- a/src/user-list.vala ++++ b/src/user-list.vala +@@ -20,7 +20,7 @@ + + int remote_server_field_sort_function (RemoteServerField? item1, RemoteServerField? item2) + { +- string[] sorted_fields = { "domain", "username", "email", "password" }; ++ string[] sorted_fields = { "domain", "x2gosession" , "username", "email", "password"}; + foreach (var field in sorted_fields) + { + if (item1.type == field) +@@ -702,6 +702,13 @@ + entry.text = default_value; + widget = entry; + } ++ else if (field.type == "x2gosession") ++ { ++ var prompt = add_prompt (_("X2Go Session:")); ++ prompt.text = default_value; ++ prompt.sensitive = true; ++ widget = prompt; ++ } + else if (field.type == "domain") + { + string[] domainsArray = {}; +@@ -1077,6 +1084,12 @@ + var answer = field != null ? field.text : ""; + UnityGreeter.singleton.respond (answer); + } ++ else if (text == "x2gosession:") ++ { ++ Gtk.Entry field = current_remote_fields.get ("x2gosession") as Gtk.Entry; ++ var answer = field != null ? field.text : ""; ++ UnityGreeter.singleton.respond (answer); ++ } + } + else + base.show_prompt_cb (text, type); diff -Nru unity-greeter-14.04.9/debian/patches/series unity-greeter-14.04.10/debian/patches/series --- unity-greeter-14.04.9/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ unity-greeter-14.04.10/debian/patches/series 2014-11-02 18:08:51.000000000 +0000 @@ -0,0 +1 @@ +01_x2go+rls.patch diff -Nru unity-greeter-14.04.9/debian/source/format unity-greeter-14.04.10/debian/source/format --- unity-greeter-14.04.9/debian/source/format 2014-02-20 04:30:12.000000000 +0000 +++ unity-greeter-14.04.10/debian/source/format 2014-11-02 18:11:56.000000000 +0000 @@ -1 +1 @@ -3.0 (native) +3.0 (quilt) diff -Nru unity-greeter-14.04.9/NEWS unity-greeter-14.04.10/NEWS --- unity-greeter-14.04.9/NEWS 2014-04-08 03:58:13.000000000 +0000 +++ unity-greeter-14.04.10/NEWS 2014-04-30 03:37:56.000000000 +0000 @@ -1,3 +1,8 @@ +Overview of changes in unity-greeter 14.04.10 + + - Require user to acknowledge messages received after authentication is + complete, for example if their password is about to expire. + Overview of changes in unity-greeter 14.04.9 - Correctly handle SIGTERM and quit cleanly. We were previously not stopping diff -Nru unity-greeter-14.04.9/src/greeter-list.vala unity-greeter-14.04.10/src/greeter-list.vala --- unity-greeter-14.04.9/src/greeter-list.vala 2014-04-08 02:07:37.000000000 +0000 +++ unity-greeter-14.04.10/src/greeter-list.vala 2014-04-30 03:02:28.000000000 +0000 @@ -774,6 +774,7 @@ protected bool will_clear = false; protected bool prompted = false; + protected bool unacknowledged_messages = false; protected void connect_to_lightdm () { @@ -784,6 +785,7 @@ protected void show_message_cb (string text, LightDM.MessageType type) { + unacknowledged_messages = true; show_message (text, type == LightDM.MessageType.ERROR); } @@ -828,8 +830,8 @@ if (is_authenticated) { - /* Login immediately if prompted */ - if (prompted) + /* Login immediately if prompted and user has acknowledged all messages */ + if (prompted && !unacknowledged_messages) { login_complete (); if (UnityGreeter.singleton.test_mode) @@ -876,6 +878,7 @@ protected virtual void start_authentication () { prompted = false; + unacknowledged_messages = false; /* Reset manual username */ manual_name = null; diff -Nru unity-greeter-14.04.9/src/user-list.vala unity-greeter-14.04.10/src/user-list.vala --- unity-greeter-14.04.9/src/user-list.vala 2014-03-26 21:24:46.000000000 +0000 +++ unity-greeter-14.04.10/src/user-list.vala 2014-04-30 03:02:28.000000000 +0000 @@ -874,6 +874,7 @@ { selected_entry.sensitive = false; will_clear = true; + unacknowledged_messages = false; foreach (var response in responses) { @@ -888,6 +889,7 @@ { debug ("Start session for %s", selected_entry.id); + unacknowledged_messages = false; var is_authenticated = false; if (UnityGreeter.singleton.test_mode) is_authenticated = test_is_authenticated; @@ -1118,6 +1120,7 @@ { "unicode", "가나다라마", "*" }, { "no-response", "No Response", "*" }, { "no-badge", "No Badge", "*" }, + { "messages-after-login", "Messages After Login", "*" }, { "" } }; private List test_backgrounds; @@ -1520,6 +1523,12 @@ show_message_cb ("Account is locked", LightDM.MessageType.ERROR); authentication_complete_cb (); break; + case "messages-after-login": + test_is_authenticated = text == "password"; + if (test_is_authenticated) + show_message_cb ("Congratulations on logging in!", LightDM.MessageType.INFO); + authentication_complete_cb (); + break; default: test_is_authenticated = text == "password"; authentication_complete_cb ();