Merge lp:~mterry/unity-greeter/dbus-interface into lp:unity-greeter

[Michael Terry]

Expose a dbus session interface for setting active users.

Expose a dbus session interface for setting active users. This could be useful for custom indicators (which can only happen after https://code.launchpad.net/~mterry/unity-greeter/indicator-gsettings/+merge/151573 )

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:776
http://jenkins.qa.ubuntu.com/job/unity-greeter-ci/6/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-greeter-ci/./label=precise/6/console

Click here to trigger a rebuild:
http://jenkins.qa.ubuntu.com/job/unity-greeter-ci/6//rebuild/?

review: Needs Fixing (continuous-integration)

[Michael Terry (mterry)]

Wait, I'm just now realizing you said elsewhere: "there could potentially be more than one greeter running at the same time so the bus address would need to be unique"

When does LightDM spawn more than one? I can rework patch to fit.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:778
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~mterry/unity-greeter/dbus-interface/+merge/151594/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/unity-greeter-ci/7/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-greeter-ci/./label=precise/7/console

Click here to trigger a rebuild:
http://jenkins.qa.ubuntu.com/job/unity-greeter-ci/7//rebuild/?

review: Needs Fixing (continuous-integration)

[Allan LeSage (allanlesage)]

Updated our Jenkins config and tested separately, appears ok--this should ameliorate PS Jenkins bot's complaints.

[Robert Ancell (robert-ancell)]

Looks good.

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'src/greeter-list.vala'
--- src/greeter-list.vala	2013-01-03 15:15:54 +0000
+++ src/greeter-list.vala	2013-03-04 19:11:26 +0000
@@ -24,6 +24,22 @@
     return (int) (size % grid_size) / 2;
 }
 
+[DBus (name="com.canonical.UnityGreeter.List")]
+public class ListDBusInterface : Object
+{
+    private GreeterList list;
+
+    public ListDBusInterface (GreeterList list)
+    {
+        this.list = list;
+    }
+
+    public void set_active_entry (string entry_name)
+    {
+        list.set_active_entry (entry_name);
+    }
+}
+
 public abstract class GreeterList : FadableBox
 {
     public Background background { get; construct; }
@@ -49,6 +65,7 @@
 
     protected List<PromptBox> entries = null;
 
+    private ListDBusInterface dbus_object;
 
     private double scroll_target_location;
     private double scroll_start_location;
@@ -152,6 +169,29 @@
 
         scroll_timer = new AnimateTimer (AnimateTimer.ease_out_quint, AnimateTimer.FAST);
         scroll_timer.animate.connect (animate_scrolling);
+
+        try
+        {
+            Bus.get.begin (BusType.SESSION, null, on_bus_acquired);
+        }
+        catch (IOError e)
+        {
+            debug ("Error getting session bus: %s", e.message);
+        }
+    }
+
+    private void on_bus_acquired (Object? obj, AsyncResult res)
+    {
+        try
+        {
+            var conn = Bus.get.end (res);
+            this.dbus_object = new ListDBusInterface (this);
+            conn.register_object ("/list", this.dbus_object);
+        }
+        catch (IOError e)
+        {
+            debug ("Error registering user list dbus object: %s", e.message);
+        }
     }
 
     public enum ScrollTarget
@@ -354,7 +394,15 @@
     {
         var e = find_entry (name);
         if (e != null)
-            select_entry (e, 1.0);
+        {
+            var direction = 1.0;
+            if (selected_entry != null &&
+                entries.index (selected_entry) > entries.index (e))
+            {
+                direction = -1.0;
+            }
+            select_entry (e, direction);
+        }
     }
 
     public void set_active_first_entry_with_prefix (string prefix)

=== modified file 'src/menubar.vala'
--- src/menubar.vala	2013-03-04 19:11:26 +0000
+++ src/menubar.vala	2013-03-04 19:11:26 +0000
@@ -370,6 +370,17 @@
         /* Hint to have gnome-settings-daemon run in greeter mode */
         greeter_set_env ("RUNNING_UNDER_GDM", "1");
 
+        /* Let indicators know about our unique dbus name */
+        try
+        {
+            var conn = Bus.get_sync (BusType.SESSION);
+            greeter_set_env ("UNITY_GREETER_DBUS_NAME", conn.get_unique_name ());
+        }
+        catch (IOError e)
+        {
+            debug ("Could not set DBUS_NAME: %s", e.message);
+        }
+
         debug ("LANG=%s LANGUAGE=%s", Environment.get_variable ("LANG"), Environment.get_variable ("LANGUAGE"));
 
         var indicator_list = UGSettings.get_strv(UGSettings.KEY_INDICATORS);