Merge lp:~stolowski/libunity/libunity.private-content into lp:libunity

[Paweł Stołowski]

Implemented provides_private_content flag.

Implemented provides_private_content flag.

[lp:~stolowski/libunity/libunity.private-content]

169. By Paweł Stołowski on 2012-08-28

Use hints hastable to carry provides_private_content flag rather than a new attribute in LensInfo / ScopeInfo; this doesn't break ABI.

170. By Paweł Stołowski on 2012-08-28

Support provides_private_content property notification in ScopeProxyLocal.

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

Added test case for provides_private_content property.

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

Merged trunk.

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

Bumped micro version for provides_private_content change.

[Michal Hruby (mhr3)]

Looking good, there's one issue though:

17 info.hints = new HashTable<string, Variant> (null, null);

Now that the hints are actually used, the funcs should be str_hash and str_equal.

review: Needs Fixing

[lp:~stolowski/libunity/libunity.private-content]

174. By Paweł Stołowski on 2012-08-29

Properly initialize info_hints hashtable.

[Michal Hruby (mhr3)]

Great!

review: Approve

=== modified file 'configure.ac'
--- configure.ac	2012-08-27 16:24:45 +0000
+++ configure.ac	2012-08-29 11:40:31 +0000
@@ -1,5 +1,5 @@
 # When releasing also remember to update the soname as instructed below
-AC_INIT(libunity, 5.97.0)
+AC_INIT(libunity, 5.97.1)
 
 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-06-25 09:02:44 +0000
+++ src/unity-lens-private.vala	2012-08-29 11:40:31 +0000
@@ -215,7 +215,19 @@
     info.global_results_model_name = _global_results_model.get_swarm_name ();
     info.categories_model_name = _categories_model.get_swarm_name ();
     info.filters_model_name = _filters_model.get_swarm_name ();
-    info.hints = new HashTable<string, Variant> (null, null);
+    info.hints = new HashTable<string, Variant> (str_hash, str_equal);
+    
+    // lenses provide private content if at least one of its scopes has provides_private_content = true
+    bool provides_private_content = false;
+    foreach (var scope in _scope_factory.scopes)
+    {
+      if (scope.provides_private_content)
+      {
+        provides_private_content = true;
+        break;
+      }
+    }
+    info.hints.insert ("provides-private-content", provides_private_content);
     
     changed (info);
 
@@ -242,6 +254,7 @@
     scope.notify["global-results-model"].connect (on_scope_global_results_model_changed);
     scope.notify["filters-model"].connect (on_scope_filters_model_changed);
     scope.notify["sources"].connect (on_scope_sources_updated);
+    scope.notify["provides-private-content"].connect (on_scope_private_content_flag_changed);
   }
 
   private void on_scope_results_model_changed (Object obj, ParamSpec? pspec)
@@ -288,6 +301,11 @@
     _filters_sync.remove_receiver (filter_model);
   }
 
+  private void on_scope_private_content_flag_changed (Object obj, ParamSpec pspec)
+  {
+    queue_info_changed ();
+  }
+
   private void on_scope_sources_updated (Object obj, ParamSpec pspec)
   {
     ScopeProxy? scope = obj as ScopeProxy;

=== modified file 'src/unity-scope-private.vala'
--- src/unity-scope-private.vala	2012-08-16 07:54:51 +0000
+++ src/unity-scope-private.vala	2012-08-29 11:40:31 +0000
@@ -53,6 +53,7 @@
   {
     owner.notify["search-in-global"].connect (queue_info_changed);
     owner.notify["visible"].connect (queue_info_changed);
+    owner.notify["provides-private-content"].connect (queue_info_changed);
     owner.sources.changed.connect (queue_info_changed);
 
     _action_map = new HashTable<string, PreviewAction> (str_hash, str_equal);
@@ -169,6 +170,7 @@
     info.global_results_model_name = get_model_name (_global_results_model);
     info.filters_model_name = get_model_name (_filters_model);
     info.hints = new HashTable<string, Variant> (str_hash, str_equal);
+    info.hints.insert ("provides-private-content", new GLib.Variant.boolean (owner.provides_private_content));
 
     changed (info);
 

=== modified file 'src/unity-scope-proxy-local.vala'
--- src/unity-scope-proxy-local.vala	2012-06-25 09:02:44 +0000
+++ src/unity-scope-proxy-local.vala	2012-08-29 11:40:31 +0000
@@ -35,6 +35,10 @@
     get { return scope.search_in_global; }
     set {}
   }
+  public bool provides_private_content {
+    get { return scope.provides_private_content; }
+    set {}
+  }
   public Dee.SerializableModel results_model {
     get { return scope.results_model; }
     set { }
@@ -60,6 +64,7 @@
   {
     scope.bind_property ("search-in-global", this, "search-in-global", BindingFlags.DEFAULT);
     scope.sources.changed.connect (() => { this.notify_property ("sources"); });
+    scope.bind_property ("provides-private-content", this, "provides-private-content", BindingFlags.DEFAULT);
 
     this.notify["view-type"].connect (() =>
     {
@@ -72,6 +77,7 @@
     {
       notify_property ("search-in-global");
       notify_property ("sources");
+      notify_property ("provides-private-content");
 
       return false;
     });

=== modified file 'src/unity-scope-proxy-remote.vala'
--- src/unity-scope-proxy-remote.vala	2012-06-25 09:02:44 +0000
+++ src/unity-scope-proxy-remote.vala	2012-08-29 11:40:31 +0000
@@ -31,6 +31,7 @@
 
   public OptionsFilter sources { get; set; }
   public bool search_in_global { get; set; }
+  public bool provides_private_content { get; set; }
 
   public Dee.SerializableModel results_model {
     get { return _results_model; }
@@ -125,6 +126,7 @@
 
     synchronized = false;
     search_in_global = false;
+    provides_private_content = false;
     sources = new CheckOptionFilter ("sources", "Sources", null, true);
     if (_results_model != null)
       _results_model.clear ();
@@ -289,6 +291,15 @@
     Trace.log_object (this, "Processing changed signal for %s", dbus_path);
     search_in_global = scope_info.search_in_global;
 
+    if (scope_info.hints.contains ("provides-private-content"))
+    {
+      provides_private_content = scope_info.hints["provides-private-content"].get_boolean ();
+    }
+    else
+    {
+      provides_private_content = false;
+    }
+
     if (results_model == null ||
         _results_model.get_swarm_name () != scope_info.results_model_name)
     {

=== modified file 'src/unity-scope-proxy.vala'
--- src/unity-scope-proxy.vala	2012-06-25 09:02:44 +0000
+++ src/unity-scope-proxy.vala	2012-08-29 11:40:31 +0000
@@ -31,6 +31,7 @@
 {
   public abstract OptionsFilter sources { get; set; }
   public abstract bool search_in_global { get; set; }
+  public abstract bool provides_private_content { get; set; }
   public abstract ViewType view_type { get; set; }
   public abstract Dee.SerializableModel results_model { get; set; }
   public abstract Dee.SerializableModel global_results_model { get; set; }

=== modified file 'src/unity-scope.vala'
--- src/unity-scope.vala	2012-06-25 09:02:44 +0000
+++ src/unity-scope.vala	2012-08-29 11:40:31 +0000
@@ -35,6 +35,7 @@
   public bool active { get; set; default = false; }
   public bool exported { get; private set; default = false; }
   public bool search_in_global { get; set; default = true; }
+  public bool provides_private_content { get; set; default = false; }
   public string dbus_path { get; construct; }
   public OptionsFilter sources { get; internal set; }
   public List<Filter> filters { get { return _filters; } }

=== modified file 'test/vala/test-lens.vala'
--- test/vala/test-lens.vala	2012-08-16 07:54:51 +0000
+++ test/vala/test-lens.vala	2012-08-29 11:40:31 +0000
@@ -58,6 +58,7 @@
     Test.add_data_func ("/Unit/Lens/Preview/Async", test_lens_preview_async);
     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.run ();
 
@@ -193,6 +194,39 @@
     });
   }
 
+  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)
   {
@@ -1065,4 +1099,25 @@
 
     assert (got_closed_signal == 1);
   }
+
+  public static void test_lens_private_content_flag ()
+  {
+    SignalWrapper[] signals = null;
+    assert (local_scope != null);
+    assert (exported_lens != null);
+
+    // check default value of provides_private_content
+    Unity.Protocol.LensInfo? info = get_lens_info ();
+    assert (info != null);
+    assert (info.hints.contains ("provides-private-content"));
+    assert (info.hints["provides-private-content"].get_boolean () == false);
+
+    local_scope.provides_private_content = true;
+
+    info = get_lens_info ();
+    assert (info != null);
+    assert (info.hints.contains ("provides-private-content"));
+    assert (info.hints["provides-private-content"].get_boolean () == true);
+  }
+
 }