Merge lp:~larsu/unity-greeter/indicator-ng into lp:unity-greeter

[Lars Karlitski]

Support new indicator services

Indicator files are read from /usr/share/unity/indicators. They're shown in the greeter's panel if export a menu for the 'desktop_greeter' profile.

Support new indicator services

Indicator files are read from /usr/share/unity/indicators. They're shown in the greeter's panel if export a menu for the 'desktop_greeter' profile.

[Sebastien Bacher (seb128)]

Thanks Lars, the code looks fine to me but:
- it seems to not work (and I built indicator-session-ng and indicator-datetime which both use gmenu and have a desktop_greeter profile)
- how does the new indicators play with the gsettings indicators list added in https://code.launchpad.net/~mterry/unity-greeter/indicator-gsettings/+merge/151573 ?

[Lars Karlitski (larsu)]

> Thanks Lars, the code looks fine to me but:
> - it seems to not work (and I built indicator-session-ng and indicator-
> datetime which both use gmenu and have a desktop_greeter profile)

Oops :) Fixed in r899.

> - how does the new indicators play with the gsettings indicators list added in
> https://code.launchpad.net/~mterry/unity-greeter/indicator-
> gsettings/+merge/151573 ?

Fixed in r900, as discussed on irc. I didn't test it yet, because I couldn't figure out how to change settings for the lightdm user.

Thanks for testing!

[Sebastien Bacher (seb128)]

> Fixed in r900, as discussed on irc. I didn't test it yet, because I couldn't figure out how to change settings for the lightdm user.

usually I just change the system default, e.g edit the schemas or add a .override and run glib-compile-schemas. If you want to edit the lightdm user config, you need to do something around the lines of "sudo su lightdm -s /bin/sh gsettings set..."

[Sebastien Bacher (seb128)]

I've been running that for some days and it works fine for me, code looks fine as well

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
No commit message was specified in the merge proposal. Hit 'Add commit message' on the merge proposal web page or follow the link below. You can approve the merge proposal yourself to rerun.
https://code.launchpad.net/~larsu/unity-greeter/indicator-ng/+merge/173082/+edit-commit-message

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'configure.ac'
--- configure.ac	2013-06-20 18:17:28 +0000
+++ configure.ac	2013-07-05 22:43:22 +0000
@@ -21,6 +21,7 @@
     gtk+-3.0
     gdk-x11-3.0
     indicator3-0.4
+    libido3-0.1 >= 13.10.0
     liblightdm-gobject-1 >= 1.4.0
     freetype2
     cairo-ft
@@ -28,6 +29,8 @@
     x11
 ])
 
+AC_DEFINE_UNQUOTED([INDICATOR_FILE_DIR], ["${prefix}/share/unity/indicators"], [Indicator files are searched for in this directory])
+
 INDICATORDIR=`$PKG_CONFIG --variable=indicatordir indicator3-0.4`
 AC_SUBST(INDICATORDIR)
 

=== modified file 'debian/control'
--- debian/control	2013-02-20 16:35:10 +0000
+++ debian/control	2013-07-05 22:43:22 +0000
@@ -13,6 +13,7 @@
                libcanberra-dev,
                libgtk-3-dev,
                libindicator3-dev,
+               libido3-0.1-dev (>= 13.10.0),
                liblightdm-gobject-1-dev (>= 1.4.0),
                valac-0.16,
                xvfb,

=== modified file 'src/config.vapi'
--- src/config.vapi	2013-01-30 20:31:38 +0000
+++ src/config.vapi	2013-07-05 22:43:22 +0000
@@ -5,6 +5,7 @@
   public const string LOCALEDIR;
   public const string VERSION;
   public const string CONFIG_FILE;
+  public const string INDICATOR_FILE_DIR;
   public const string PKGDATADIR;
   public const string INDICATORDIR;
   public const string GSD_BINARY;

=== modified file 'src/indicator.vapi'
--- src/indicator.vapi	2011-07-08 01:08:52 +0000
+++ src/indicator.vapi	2013-07-05 22:43:22 +0000
@@ -1,5 +1,3 @@
-/* indicator3.vapi generated by vapigen, do not modify. */
-
 [CCode (cprefix = "Indicator", lower_case_cprefix = "indicator_")]
 namespace Indicator {
 	[CCode (cheader_filename = "gtk/gtk.h,libindicator/indicator.h,libindicator/indicator-desktop-shortcuts.h,libindicator/indicator-image-helper.h,libindicator/indicator-object.h,libindicator/indicator-service.h,libindicator/indicator-service-manager.h")]
@@ -38,6 +36,7 @@
 		[NoWrapper]
 		public virtual unowned string get_name_hint ();
 		public virtual bool get_show_now (Indicator.ObjectEntry entry);
+		public virtual int get_position ();
 		[NoWrapper]
 		public virtual void reserved1 ();
 		[NoWrapper]
@@ -48,8 +47,6 @@
 		public virtual void reserved4 ();
 		[NoWrapper]
 		public virtual void reserved5 ();
-		[NoWrapper]
-		public virtual void reserved6 ();
 		public void set_environment (string[] env);
 		public virtual signal void accessible_desc_update (Indicator.ObjectEntry entry);
 		public virtual signal void entry_added (Indicator.ObjectEntry entry);
@@ -59,6 +56,11 @@
 		public virtual signal void menu_show (Indicator.ObjectEntry entry, uint timestamp);
 		public virtual signal void show_now_changed (Indicator.ObjectEntry entry, bool show_now_state);
 	}
+	[CCode (cheader_filename = "libindicator/indicator-ng.h")]
+	public class Ng : Object {
+		[CCode (has_construct_function = false)]
+		public Ng.for_profile (string filename, string profile) throws GLib.Error;
+	}
 	[Compact]
 	[CCode (cheader_filename = "gtk/gtk.h,libindicator/indicator.h,libindicator/indicator-desktop-shortcuts.h,libindicator/indicator-image-helper.h,libindicator/indicator-object.h,libindicator/indicator-service.h,libindicator/indicator-service-manager.h")]
 	public class ObjectEntry {
@@ -156,3 +158,8 @@
 	[CCode (cheader_filename = "gtk/gtk.h,libindicator/indicator.h,libindicator/indicator-desktop-shortcuts.h,libindicator/indicator-image-helper.h,libindicator/indicator-object.h,libindicator/indicator-service.h,libindicator/indicator-service-manager.h")]
 	public static void image_helper_update (Gtk.Image image, string name);
 }
+
+[CCode (cheader_filename="libido/libido.h", lower_case_cprefix = "ido_")]
+namespace Ido {
+	public void init ();
+}

=== modified file 'src/menubar.vala'
--- src/menubar.vala	2013-03-04 19:10:23 +0000
+++ src/menubar.vala	2013-07-05 22:43:22 +0000
@@ -322,6 +322,53 @@
         return keyboard_item;
     }
 
+    private Indicator.Object? load_indicator_file (string indicator_name)
+    {
+        string dir = Config.INDICATOR_FILE_DIR;
+        string path;
+        Indicator.Object io;
+
+        /* To stay backwards compatible, use com.canonical.indicator as the default prefix */
+        if (indicator_name.index_of_char ('.') < 0)
+            path = @"$dir/com.canonical.indicator.$indicator_name";
+        else
+            path = @"$dir/$indicator_name";
+
+        try
+        {
+            io = new Indicator.Ng.for_profile (path, "desktop_greeter");
+        }
+        catch (FileError error)
+        {
+            /* the calling code handles file-not-found; don't warn here */
+            return null;
+        }
+        catch (Error error)
+        {
+            warning ("unable to load %s: %s", indicator_name, error.message);
+            return null;
+        }
+
+        return io;
+    }
+
+    private Indicator.Object? load_indicator_library (string indicator_name)
+    {
+        // Find file, if it exists
+        string[] names_to_try = {"lib" + indicator_name + ".so",
+                                 indicator_name + ".so",
+                                 indicator_name};
+        foreach (var filename in names_to_try)
+        {
+            var full_path = Path.build_filename (Config.INDICATORDIR, filename);
+            var io = new Indicator.Object.from_file (full_path);
+            if (io != null)
+                return io;
+        }
+
+        return null;
+    }
+
     private void load_indicator (string indicator_name)
     {
         if (indicator_name == "ug-keyboard")
@@ -336,24 +383,18 @@
         }
         else
         {
-            // Find file, if it exists
-            string[] names_to_try = {"lib" + indicator_name + ".so",
-                                     indicator_name + ".so",
-                                     indicator_name};
-            foreach (var filename in names_to_try)
+            var io = load_indicator_file (indicator_name);
+
+            if (io == null)
+                io = load_indicator_library (indicator_name);
+
+            if (io != null)
             {
-                var full_path = Path.build_filename (Config.INDICATORDIR, filename);
-                var io = new Indicator.Object.from_file (full_path);
-                if (io == null)
-                    continue;
-
                 indicator_objects.append (io);
                 io.entry_added.connect (indicator_added_cb);
                 io.entry_removed.connect (indicator_removed_cb);
                 foreach (var entry in io.get_entries ())
                     indicator_added_cb (io, entry);
-
-                break;
             }
         }
     }
@@ -387,6 +428,18 @@
         foreach (var indicator in indicator_list)
             load_indicator(indicator);
 
+        indicator_objects.sort((a, b) => {
+            int pos_a = a.get_position ();
+            int pos_b = b.get_position ();
+
+            if (pos_a < 0)
+                pos_a = 1000;
+            if (pos_b < 0)
+                pos_b = 1000;
+
+            return pos_a - pos_b;
+        });
+
         debug ("LANG=%s LANGUAGE=%s", Environment.get_variable ("LANG"), Environment.get_variable ("LANGUAGE"));
     }
 

=== modified file 'src/unity-greeter.vala'
--- src/unity-greeter.vala	2013-02-20 16:17:42 +0000
+++ src/unity-greeter.vala	2013-07-05 22:43:22 +0000
@@ -434,6 +434,7 @@
         }
 
         Gtk.init (ref args);
+        Ido.init ();
 
         log_timer = new Timer ();
         Log.set_default_handler (log_cb);