Merge lp:~kamstrup/libunity/gi-friendly-api-tweaks into lp:libunity

[Mikkel Kamstrup Erlandsen]

See attached bug. There's an API break here and branches for the lenses (and unity tests) are coming in hot.

I also fixed some string properties to be GIcons because that is better in line with the rest of the libunity api (now that we break api anyway).

[lp:~kamstrup/libunity/gi-friendly-api-tweaks]

76. By Mikkel Kamstrup Erlandsen on 2011-09-08

Bump soname, and bump to an odd micro version number (to indicate dev version)

[Neil J. Patel (njpatel)]

Looks good, approved.

review: Approve

=== modified file 'configure.ac'
--- configure.ac	2011-08-04 09:49:49 +0000
+++ configure.ac	2011-09-08 14:01:10 +0000
@@ -1,5 +1,5 @@
 # When releasing also remember to update the soname as instructed below
-AC_INIT(libunity, 4.0.0)
+AC_INIT(libunity, 4.0.1)
 
 AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
 AM_CONFIG_HEADER(config.h)
@@ -16,7 +16,7 @@
 # - If binary compatibility has been broken (eg removed or changed interfaces)
 #   change to C+1:0:0
 # - If the interface is the same as the previous version, change to C:R+1:A
-LIBUNITY_LT_CURRENT=5
+LIBUNITY_LT_CURRENT=6
 LIBUNITY_LT_REV=0
 LIBUNITY_LT_AGE=0
 LIBUNITY_LT_VERSION="$LIBUNITY_LT_CURRENT:$LIBUNITY_LT_REV:$LIBUNITY_LT_AGE"

=== modified file 'src/unity-lens-category.vala'
--- src/unity-lens-category.vala	2011-08-02 07:49:39 +0000
+++ src/unity-lens-category.vala	2011-09-08 14:01:10 +0000
@@ -33,11 +33,11 @@
 public class Category : GLib.Object
 {
   public string name { get; construct; }
-  public string icon_hint { get; construct; }
+  public Icon? icon_hint { get; construct; }
   public CategoryRenderer default_renderer { get; construct; }
 
   public Category (string name,
-                   string icon_hint,
+                   Icon icon_hint,
                    CategoryRenderer renderer=CategoryRenderer.VERTICAL_TILE)
   {
     Object(name:name, icon_hint:icon_hint, default_renderer:renderer);

=== modified file 'src/unity-lens-filters.vala'
--- src/unity-lens-filters.vala	2011-08-05 15:04:52 +0000
+++ src/unity-lens-filters.vala	2011-09-08 14:01:10 +0000
@@ -47,7 +47,7 @@
 {
   public string id { get; construct; }
   public string display_name { get; construct; }
-  public string icon_hint { get; construct; }
+  public Icon? icon_hint { get; construct; }
   public string renderer_name { get; construct set; }
   public bool visible { get; construct set; }
   public bool collapsed { get; construct; }
@@ -88,10 +88,10 @@
 {
   public string id { get; construct; }
   public string display_name { get; construct; }
-  public string icon_hint { get; construct; }
+  public Icon icon_hint { get; construct; }
   public bool active { get; internal construct set; }
 
-  public FilterOption (string id, string display_name, string icon_hint="", bool active=false)
+  public FilterOption (string id, string display_name, Icon? icon_hint=null, bool active=false)
   {
     Object(id:id, display_name:display_name, icon_hint:icon_hint, active:active);
   }
@@ -104,7 +104,7 @@
 {
   public List<FilterOption> options;
 
-  public FilterOption add_option (string id, string display_name, string icon_hint="")
+  public FilterOption add_option (string id, string display_name, Icon? icon_hint=null)
   {
     var option = new FilterOption(id, display_name, icon_hint);
     options.append (option);
@@ -159,7 +159,7 @@
     }
   }
 
-  internal void find_and_update_option (string id, string name, string icon_hint, bool active)
+  internal void find_and_update_option (string id, string name, string icon_hint_s, bool active)
   {
     foreach (FilterOption option in options)
     {
@@ -171,6 +171,16 @@
     }
 
     // Create one as we didn't find it
+    Icon? icon_hint = null;
+    try
+      {
+        if (icon_hint_s != "")
+          icon_hint = Icon.new_for_string (icon_hint_s);
+      }
+    catch (Error e)
+      {
+        warning ("Unable to parse GIcon data '%s': %s", icon_hint_s, e.message);
+      }
     var option = new FilterOption (id, name, icon_hint, active);
     options.append (option);
   }
@@ -181,7 +191,8 @@
 
     foreach (FilterOption option in options)
     {
-      b.add ("(sssb)", option.id, option.display_name, option.icon_hint, option.active);
+      var icon_string = option.icon_hint != null ? option.icon_hint.to_string () : "";
+      b.add ("(sssb)", option.id, option.display_name, icon_string, option.active);
     }
 
     var hash = new HashTable<string, Variant> (null, null);
@@ -200,7 +211,7 @@
 {
   public RadioOptionFilter (string id,
                             string display_name,
-                            string icon_hint="",
+                            Icon? icon_hint=null,
                             bool collapsed=false)
   {
     Object (id:id, display_name:display_name,
@@ -234,7 +245,7 @@
 {
   public CheckOptionFilter (string id,
                             string display_name,
-                            string icon_hint="",
+                            Icon? icon_hint=null,
                             bool collapsed=false)
   {
     Object (id:id, display_name:display_name,
@@ -253,7 +264,7 @@
 
   public RatingsFilter(string id,
                        string display_name,
-                       string icon_hint="",
+                       Icon? icon_hint=null,
                        bool collapsed=false)
   {
     Object (id:id, display_name:display_name, icon_hint:icon_hint, collapsed:collapsed,
@@ -304,7 +315,7 @@
 {
   public MultiRangeFilter (string id,
                            string display_name,
-                           string icon_hint="",
+                           Icon? icon_hint=null,
                            bool collapsed=false)
   {
     Object (id:id, display_name:display_name,

=== modified file 'src/unity-lens-private.vala'
--- src/unity-lens-private.vala	2011-08-06 08:29:54 +0000
+++ src/unity-lens-private.vala	2011-09-08 14:01:10 +0000
@@ -104,24 +104,28 @@
     queue_info_changed ();
   }
 
-  public void load_categories (Category[] categories)
+  public void load_categories (List<Category> categories)
   {
     foreach (Category category in categories)
     {
+      string icon_hint_s = category.icon_hint != null ?
+                                         category.icon_hint.to_string() : "";
       _categories_model.append (category.name,
-                                category.icon_hint,
+                                icon_hint_s,
                                 category.renderer,
                                 Tools.hash_table_to_asv (category.hints));
     }
   }
 
-  public void load_filters (Filter[] filters)
+  public void load_filters (List<Filter> filters)
   {
     foreach (Filter filter in filters)
     {
+      string icon_hint_s = filter.icon_hint != null ?
+                                         filter.icon_hint.to_string() : "";
       _filters_model.append (filter.id,
                              filter.display_name,
-                             filter.icon_hint,
+                             icon_hint_s,
                              filter.renderer_name,
                              Tools.hash_table_to_asv (filter.get_hints()),
                              filter.visible,

=== modified file 'src/unity-lens.vala'
--- src/unity-lens.vala	2011-08-03 17:59:59 +0000
+++ src/unity-lens.vala	2011-09-08 14:01:10 +0000
@@ -32,14 +32,17 @@
   public string id { get; construct; }
   public string dbus_path { get; construct; }
   public string search_hint { get; set; }
-  public Filter[] filters {
+  public List<Filter> filters {
     get {
       return _filters;
     }
     set {
       if (_filters == null)
       {
-        _filters = value;
+        _filters = new List<Filter> ();
+        foreach (Filter f in value)
+          _filters.prepend (f);
+        _filters.reverse ();
         _pimpl.load_filters (_filters);
       }
       else
@@ -48,14 +51,17 @@
       }
     }
   }
-  public Category[] categories { 
+  public List<Category> categories { 
     get {
       return _categories;
     }
     set {
       if (_categories == null)
       {
-        _categories = value;
+        _categories = new List<Category> ();
+        foreach (Category cat in value)
+          _categories.prepend (cat);
+        _categories.reverse ();
         _pimpl.load_categories (_categories);
       }
       else
@@ -64,8 +70,8 @@
   }
 
   private LensImpl _pimpl;
-  private Category[] _categories = null;
-  private Filter[] _filters = null;
+  private List<Category> _categories = null;
+  private List<Filter> _filters = null;
 
   public Lens (string dbus_path_, string id_)
   {

=== modified file 'src/unity-scope-private.vala'
--- src/unity-scope-private.vala	2011-08-06 08:29:54 +0000
+++ src/unity-scope-private.vala	2011-09-08 14:01:10 +0000
@@ -136,32 +136,44 @@
   private void on_filter_added (Dee.Model model, Dee.ModelIter iter)
   {
     string renderer_name = model.get_string (iter, FilterColumn.RENDERER_NAME);
-
+    string icon_hint_s = model.get_string (iter, FilterColumn.ICON_HINT);
+    
+    Icon? icon_hint = null;
+    try
+      {
+        if (icon_hint_s != "")
+          icon_hint = Icon.new_for_string (icon_hint_s);
+      }
+    catch (Error e)
+      {
+        warning ("Error parsing GIcon data '%s': %s", icon_hint_s, e.message);
+      }
+    
     Filter? filter = null;
     if (renderer_name == "filter-ratings")
     {
       filter = new RatingsFilter (model.get_string (iter, FilterColumn.ID),
                                   model.get_string (iter, FilterColumn.NAME),
-                                  model.get_string (iter, FilterColumn.ICON_HINT));
+                                  icon_hint);
     }
     else if (renderer_name == "filter-radiooption")
     {
       filter = new RadioOptionFilter (model.get_string (iter, FilterColumn.ID),
                                       model.get_string (iter, FilterColumn.NAME),
-                                      model.get_string (iter, FilterColumn.ICON_HINT));
+                                      icon_hint);
                                       
     }
     else if (renderer_name == "filter-checkoption")
     {
       filter = new CheckOptionFilter (model.get_string (iter, FilterColumn.ID),
                                       model.get_string (iter, FilterColumn.NAME),
-                                      model.get_string (iter, FilterColumn.ICON_HINT));
+                                      icon_hint);
     }
     else if (renderer_name == "filter-multirange")
     {
       filter = new MultiRangeFilter (model.get_string (iter, FilterColumn.ID),
                                      model.get_string (iter, FilterColumn.NAME),
-                                     model.get_string (iter, FilterColumn.ICON_HINT));
+                                     icon_hint);
     }
 
     if (filter is Filter)