Merge lp:~aacid/unity-greeter/no_servers_configured into lp:unity-greeter

[Albert Astals Cid]

Add the dialog when credentials are right but no servers are configured

Add the dialog the spec says we have to show when credentials are right but no servers are configured

[lp:~aacid/unity-greeter/no_servers_configured]

513. By Albert Astals Cid on 2012-08-22

Move to a separate function

514. By Albert Astals Cid on 2012-08-22

Add a "HELP" icon to the "*remote_directory" entries that shows the same dialog you get when you have no uccs servers setup

515. By Albert Astals Cid on 2012-08-22

Merge bzr+ssh://bazaar.launchpad.net/~aacid/unity-greeter/lightdm_api_change/

516. By Albert Astals Cid on 2012-08-22

Split code from get_lightdm_session and create is_supported_remote_session

517. By Albert Astals Cid on 2012-08-22

Merge++

518. By Albert Astals Cid on 2012-08-22

Start uccsconfigure in the "Set up..." button

519. By Albert Astals Cid on 2012-08-23

Use proper ellipsis

520. By Albert Astals Cid on 2012-08-23

Compile (or at least use the same way of api the other call to remote_authenticate uses :D)

521. By Albert Astals Cid on 2012-08-23

Set the focus on the "Set Up..." button as suggested by mterry

522. By Albert Astals Cid on 2012-08-23

Load the icon properly (even if it does not exist yet)

523. By Albert Astals Cid on 2012-08-23

Do not use a stop help icon but a stock one (which we don't have yet)

524. By Albert Astals Cid on 2012-08-23

Add _ here too

525. By Albert Astals Cid on 2012-08-23

Add the "remote-login" help badge to the session list cache so we don't have to load it everytime as suggested by mterry

Unmerged revisions

=== modified file 'configure.ac'
--- configure.ac	2012-08-20 09:09:07 +0000
+++ configure.ac	2012-08-22 15:04:44 +0000
@@ -30,6 +30,8 @@
 INDICATORDIR=`$PKG_CONFIG --variable=indicatordir indicator3-0.4`
 AC_SUBST(INDICATORDIR)
 
+AC_CHECK_LIB(lightdm-gobject-1, lightdm_get_remote_sessions, AC_SUBST(HAVE_REMOTE_LIGHTDM_FLAGS, ["-D HAVE_REMOTE_LIGHTDM"]))
+
 dnl ###########################################################################
 dnl Internationalization
 dnl ###########################################################################

=== modified file 'src/Makefile.am'
--- src/Makefile.am	2012-08-21 18:58:51 +0000
+++ src/Makefile.am	2012-08-22 15:04:44 +0000
@@ -42,6 +42,7 @@
 
 unity_greeter_VALAFLAGS = \
 	--pkg posix \
+	$(HAVE_REMOTE_LIGHTDM_FLAGS) \
 	--pkg gtk+-3.0 \
 	--pkg gdk-x11-3.0 \
 	--pkg gio-unix-2.0 \
@@ -54,5 +55,7 @@
 unity_greeter_LDADD = \
 	$(UNITY_GREETER_LIBS)
 
+unity_greeter_vala.stamp: $(top_srcdir)/config.h
+
 DISTCLEANFILES = \
 	Makefile.in

=== modified file 'src/user-list.vala'
--- src/user-list.vala	2012-08-22 10:27:22 +0000
+++ src/user-list.vala	2012-08-22 15:04:44 +0000
@@ -192,6 +192,7 @@
                 var e = new PromptBox (list_name);
                 e.label = remote_server.name;
                 e.respond.connect (remote_directory_respond_cb);
+                e.show_options.connect (show_remote_account_dialog);
                 add_entry (e);
 
                 remote_directory_server_list.append (remote_server);
@@ -381,18 +382,25 @@
             }
             if (login_success)
             {
-                string last_used_server_list_name = "";
-                foreach (RemoteServer remote_server in server_list)
-                {
-                    var e = create_prompt_for_login_server (remote_server);
-                    if (remote_server.last_used_server)
-                        last_used_server_list_name = e.id;
-                }
-                if (last_used_server_list_name != "")
-                    set_active_entry (last_used_server_list_name);
-                else
-                    set_active_first_entry_with_prefix ("*remote_login");
                 password_field.did_respond = false;
+                if (server_list.length == 0)
+                {
+                    show_remote_account_dialog();
+                }
+                else
+                {
+                    string last_used_server_list_name = "";
+                    foreach (RemoteServer remote_server in server_list)
+                    {
+                        var e = create_prompt_for_login_server (remote_server);
+                        if (remote_server.last_used_server)
+                            last_used_server_list_name = e.id;
+                    }
+                    if (last_used_server_list_name != "")
+                        set_active_entry (last_used_server_list_name);
+                    else
+                        set_active_first_entry_with_prefix ("*remote_login");
+                }
             }
             else
             {
@@ -419,11 +427,64 @@
         }
         else
         {
-            UnityGreeter.greeter.authenticate ();
+#if HAVE_REMOTE_LIGHTDM
+            UnityGreeter.greeter.authenticate_remote (get_lightdm_session(), null);
+#endif
             remote_login_service.set_last_used_server (currently_browsing_server_url, url_from_remote_loding_server_list_name (selected_entry.id));
         }
     }
 
+    private void show_remote_account_dialog ()
+    {
+        Gtk.Dialog d = new Gtk.Dialog();
+        d.set_position(Gtk.WindowPosition.CENTER_ALWAYS);
+        string label1_text;
+        if (offer_guest)
+        {
+            d.add_button(_("Cancel"), 0);
+            d.add_button(_("Set Up..."), 1);
+            label1_text = _("<b>You need an Ubuntu Remote Login\naccount to use this service. Would you\nlike to set up an account now?</b>");
+        }
+        else
+        {
+            d.add_button(_("OK"), 0);
+            label1_text = _("<b>You need an Ubuntu Remote Login\naccount to use this service. Visit\nuccs.canonical.com to set up an account.</b>");
+        }
+
+        Gtk.HBox hb = new Gtk.HBox(false, 10);
+        Gtk.Image im = new Gtk.Image.from_file("remote-login-dialog.png");
+        im.set_alignment(0.5f, 0);
+        Gtk.VBox vb = new Gtk.VBox(false, 10);
+        hb.pack_start(im, true, true, 5);
+        hb.pack_end(vb, true, true, 5);
+
+        Gtk.Label l1 = new Gtk.Label(null);
+        l1.set_markup(label1_text);
+        l1.set_alignment(0, 0.5f);
+        Gtk.Label l2 = new Gtk.Label(_("If you have an account on an RDP or\nCitrix server, Remote Login lets you run\napplications from that server."));
+        l2.set_alignment(0, 0.5f);
+        vb.pack_start(l1);
+        vb.pack_end(l2);
+
+        d.get_content_area().pack_start(hb);
+
+        d.show_all();
+        d.response.connect((id) => {
+            if (id == 1)
+            {
+                var config_session = "uccsconfigure";
+                if (is_supported_remote_session(config_session))
+                {
+#if HAVE_REMOTE_LIGHTDM
+                    UnityGreeter.greeter.authenticate_remote (config_session);
+#endif
+                }
+            }
+            d.destroy();
+        });
+        d.run();
+    }
+
     private bool change_background_timeout_cb ()
     {
         string new_background_file;
@@ -748,8 +809,27 @@
         }
         else
         {
-            return null;
-        }
+            if (selected_entry.id.has_prefix ("*remote_directory"))
+                return render_icon(Gtk.Stock.HELP, Gtk.IconSize.BUTTON, null);
+            else
+                return null;
+        }
+    }
+
+    private bool is_supported_remote_session (string session_name)
+    {
+        bool found = false;
+#if HAVE_REMOTE_LIGHTDM
+        foreach (var session in LightDM.get_remote_sessions ())
+        {
+            if (session.name == session_name)
+            {
+                found = true;
+                break;
+            }
+        }
+#endif
+        return found;
     }
 
     protected override string get_lightdm_session ()
@@ -768,7 +848,10 @@
                 }
                 it = it.next;
             }
-            return answer;
+            if (is_supported_remote_session(answer))
+                return answer;
+            else
+                return "";
         }
         else
             return session;