Merge lp:~stolowski/libunity/home-lens-category-name into lp:libunity

[Paweł Stołowski]

Implemented home-lens-default-name lens property.

Implemented home-lens-default-name lens property.

[lp:~stolowski/libunity/home-lens-category-name]

171. By Paweł Stołowski on 2012-08-30

Don't send empty/null home_lens_default_name.

172. By Paweł Stołowski on 2012-08-30

Bumped micro version for new home_lens_default_name property.

173. By Paweł Stołowski on 2012-08-30

provides_private_content and home_lens_default_name test cases: property handle Changed() signal to avoid race on multiple Chaged() notifications.

[Michal Hruby (mhr3)]

Looking good now. +1

review: Approve

=== modified file 'configure.ac'
--- configure.ac	2012-08-28 14:39:06 +0000
+++ configure.ac	2012-08-30 10:06:54 +0000
@@ -1,5 +1,5 @@
 # When releasing also remember to update the soname as instructed below
-AC_INIT(libunity, 5.97.1)
+AC_INIT(libunity, 5.97.2)
 
 AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
 AM_CONFIG_HEADER(config.h)

=== modified file 'src/unity-lens-private.vala'
--- src/unity-lens-private.vala	2012-08-29 10:32:57 +0000
+++ src/unity-lens-private.vala	2012-08-30 10:06:54 +0000
@@ -70,6 +70,7 @@
     _owner.notify["visible"].connect (queue_info_changed);
     _owner.notify["search-hint"].connect (queue_info_changed);
     _owner.notify["sources-display-name"].connect (sources_display_name_changed);
+    _owner.notify["home-lens-default-name"].connect (queue_info_changed);
 
     _sources = new CheckOptionFilter (Lens.SOURCES_FILTER_ID,
                                       _owner.sources_display_name,
@@ -228,6 +229,8 @@
       }
     }
     info.hints.insert ("provides-private-content", provides_private_content);
+    if (_owner.home_lens_default_name != null && _owner.home_lens_default_name != "")
+      info.hints.insert ("home-lens-default-name", _owner.home_lens_default_name);
     
     changed (info);
 

=== modified file 'src/unity-lens.vala'
--- src/unity-lens.vala	2012-01-09 11:19:46 +0000
+++ src/unity-lens.vala	2012-08-30 10:06:54 +0000
@@ -29,6 +29,9 @@
   public bool searching { get; private set; default = false; }
   public bool exported { get; private set; default = false; }
   public bool search_in_global { get; set; default = true; }
+  
+  // default category name to be used by Home Lens when no search query is provided
+  public string home_lens_default_name { get; set; default = ""; }
   public string id { get; construct; }
   public string dbus_path { get; construct; }
   public string search_hint { get; set; }

=== modified file 'test/vala/test-lens.vala'
--- test/vala/test-lens.vala	2012-08-28 14:20:34 +0000
+++ test/vala/test-lens.vala	2012-08-30 10:06:54 +0000
@@ -59,6 +59,7 @@
     Test.add_data_func ("/Unit/Lens/Preview/Signal", test_lens_preview_signal);
     Test.add_data_func ("/Unit/Lens/Preview/ClosedSignal", test_lens_preview_closed_signal);
     Test.add_data_func ("/Unit/Lens/PrivateContentFlag", test_lens_private_content_flag);
+    Test.add_data_func ("/Unit/Lens/HomeLensDefaultName", test_lens_home_lens_default_name);
 
     Test.run ();
 
@@ -194,39 +195,6 @@
     });
   }
 
-  private static Unity.Protocol.LensInfo? get_lens_info ()
-  {
-    var ml = new MainLoop ();
-    Unity.Protocol.LensInfo? info = null;
-
-    try
-    {
-      var bus = Bus.get_sync (BusType.SESSION);
-      var sig_id = bus.signal_subscribe (null,
-                                         "com.canonical.Unity.Lens",
-                                         "Changed",
-                                         "/com/canonical/Unity/Lens/Test",
-                                         null,
-                                         0,
-                                         (conn, sender, obj_path, ifc_name, sig_name, parameters) =>
-      {
-        info = (Unity.Protocol.LensInfo) parameters.get_child_value (0);
-        ml.quit ();
-      });
-
-      call_lens_method ("InfoRequest", null, null);
-
-      run_with_timeout (ml, 5000);
-
-      bus.signal_unsubscribe (sig_id);
-    }
-    catch (Error e) {
-      warning ("%s", e.message);
-    }
-
-    return info;
-  }
-
   private static void call_lens_search (string search_string,
                                         Func<Variant?>? cb = null)
   {
@@ -1102,22 +1070,89 @@
 
   public static void test_lens_private_content_flag ()
   {
-    SignalWrapper[] signals = null;
     assert (local_scope != null);
     assert (exported_lens != null);
+    var ml = new MainLoop ();
+
+    Unity.Protocol.LensInfo? info = null;
+
+    var bus = Bus.get_sync (BusType.SESSION);
+    var sig_id = bus.signal_subscribe (null,
+                                       "com.canonical.Unity.Lens",
+                                       "Changed",
+                                       "/com/canonical/Unity/Lens/Test",
+                                       null,
+                                       0,
+                                       (conn, sender, obj_path, ifc_name, sig_name, parameters) =>
+                                       {
+                                         info = (Unity.Protocol.LensInfo) parameters.get_child_value (0);
+                                         ml.quit ();
+                                       });
 
     // check default value of provides_private_content
-    Unity.Protocol.LensInfo? info = get_lens_info ();
+    info = null;
+    call_lens_method ("InfoRequest", null, null);
+
+    run_with_timeout (ml, 5000);
+
     assert (info != null);
     assert (info.hints.contains ("provides-private-content"));
     assert (info.hints["provides-private-content"].get_boolean () == false);
 
+    info = null;
     local_scope.provides_private_content = true;
 
-    info = get_lens_info ();
+    run_with_timeout (ml, 5000);
+   
     assert (info != null);
     assert (info.hints.contains ("provides-private-content"));
     assert (info.hints["provides-private-content"].get_boolean () == true);
-  }
-
+
+    bus.signal_unsubscribe (sig_id);
+  }
+
+  public static void test_lens_home_lens_default_name ()
+  {
+    assert (exported_lens != null);
+    var ml = new MainLoop ();
+
+    // check default value of home_lens_default_name
+    Unity.Protocol.LensInfo? info = null;
+
+    var bus = Bus.get_sync (BusType.SESSION);
+    var sig_id = bus.signal_subscribe (null,
+                                       "com.canonical.Unity.Lens",
+                                       "Changed",
+                                       "/com/canonical/Unity/Lens/Test",
+                                       null,
+                                       0,
+                                       (conn, sender, obj_path, ifc_name, sig_name, parameters) =>
+                                       {
+                                         info = (Unity.Protocol.LensInfo) parameters.get_child_value (0);
+                                         ml.quit ();
+                                       });
+    
+    call_lens_method ("InfoRequest", null, null);
+
+    run_with_timeout (ml, 5000);
+    assert (info != null);
+    assert (info.hints.contains ("home-lens-default-name") == false);
+
+    info = null;
+    exported_lens.home_lens_default_name = null;
+    run_with_timeout (ml, 5000);
+
+    assert (info != null);
+    assert (info.hints.contains ("home-lens-default-name") == false);
+
+    info = null;
+    exported_lens.home_lens_default_name = "Foo Bar";
+    run_with_timeout (ml, 5000);
+
+    assert (info != null);
+    assert (info.hints.contains ("home-lens-default-name"));
+    assert (info.hints["home-lens-default-name"].get_string () == "Foo Bar");
+
+    bus.signal_unsubscribe (sig_id);
+  }
 }