Merge lp:~alexlauni/libunity/clear-models-on-vanish-859760 into lp:libunity

[Alex Launi]

Clears the models before making new ones so that old results don't get stuck

[Mikkel Kamstrup Erlandsen (kamstrup)]

Hmmmm... I am a bit split on this...

Keeping the model around is actually by design. It allows for a
lens/scope to exit, but keep useful state around - which it can pick
up automagically when it starts again. The idea being that it
shouldn't matter whether the lens/scope is running or not; it will be
transparently restarted by DBus activation when needed.

Those noble ideas aside I agree that it adds some unwelcome complexity
when not using this feature. So I agree somewhat on the intent of this
patch, but not so much in it's implementation.

Also at this point in the cycle I think we need to keep a consistent
behavior of the API. So I'd rather see a solution along the lines of:

 * Add a new property "state-type" on lenses and scopes which has
values in a Unity.LensStateType enum

public enum Unity.LensStateType {
  STATELESS,
  RETAINED
}

(This opens the possibility for some nastiness in P where we can add a
PERSISTENT/CACHED statetype, that will transparently store and load
the model state on disk)

[Mikkel Kamstrup Erlandsen (kamstrup)]

(and the aforementioned property would have a default value of
Unity.LensStateType.RETAINED, which means that behavior will remain as
it is now by default)

[Neil J. Patel (njpatel)]

Fwiw, with new Lens stuff, a scope can't retain state as a Scope always creates unique model names on the bus, so clearing is the best thing to do. What we're missing, I think, is setting the properties of the preview instance (namely Search and GlobalSearch) on the new one, but probably not a good idea to do that as we're trying really hard to not initiate a million searches when we bring up the scopes (so maybe only of results_model_ != null?).

Also, Mikkel, no appreciation of me remembering you through the dark days when you weren't around and embedding my emotions into the libunity code?!

[Neil J. Patel (njpatel)]

s/preview/previous

[Neil J. Patel (njpatel)]

review: Approve

[Mikkel Kamstrup Erlandsen (kamstrup)]

Ok, sorry Alex, appears I live in the past :-) In light of Neil's comment I think this makes total sense.

review: Approve

=== modified file 'src/unity-scope-proxy-remote.vala'
--- src/unity-scope-proxy-remote.vala	2011-09-15 09:39:03 +0000
+++ src/unity-scope-proxy-remote.vala	2011-09-26 16:41:22 +0000
@@ -114,12 +114,21 @@
     
     search_in_global = false;
     sources = {};
+    if (_results_model != null)
+      _results_model.clear ();	
+
     _results_model = new Dee.SharedModel ("where.in.the.world.is.kamstrup");;
     _results_model.set_schema ("s", "s", "u", "s", "s", "s", "s");
 
+    if (_global_results_model != null)
+      _global_results_model.clear ();
+
     _global_results_model = new Dee.SharedModel ("where.in.the.world.is.kamstrup");
     _global_results_model.set_schema ("s", "s", "u", "s", "s", "s", "s");
      
+    if (_filters_model != null)
+      _filters_model.clear ();	
+
     _filters_model = new Dee.SharedModel ("where.in.the.world.is.kamstrup");
     _filters_model.set_schema ("s", "s", "s", "s", "a{sv}", "b", "b", "b");