Merge lp:~ken-vandine/gwibber/libdee_libunity_port into lp:gwibber

[Ken VanDine]

Ported to latest libunity and libdee

[Michael Terry (mterry)]

Seems fine. I'm not a dee expert, but nothing seems egregiously wrong and tests work.

review: Approve

=== modified file 'configure.ac'
--- configure.ac	2012-01-05 19:33:08 +0000
+++ configure.ac	2012-01-13 08:24:36 +0000
@@ -126,11 +126,11 @@
 GLIB_REQUIRED=2.26
 GTK_REQUIRED=3.2
 GDK_REQUIRED=3.2
-DEE_REQUIRED=0.5.19
+DEE_REQUIRED=1.0.0
 DBUSMENU_REQUIRED=0.4
 INDICATE_REQUIRED=0.5
 LIBNOTIFY_REQUIRED=0.7
-UNITY_REQUIRED=4.0.0
+UNITY_REQUIRED=4.99.99
 PKG_CHECK_MODULES(BASE,
                   glib-2.0 >= $GLIB_REQUIRED
                   gobject-2.0 >= $GLIB_REQUIRED

=== modified file 'lens/src/daemon.vala'
--- lens/src/daemon.vala	2011-10-25 18:52:53 +0000
+++ lens/src/daemon.vala	2012-01-13 08:24:36 +0000
@@ -41,11 +41,9 @@
     private Gwibber.Utils utils;
     private Dee.Model? _model;
     private Dee.Model? _streams_model;
-    private Dee.Filter *_sort_filter;
+    private Dee.Filter _sort_filter;
     /* Keep track of the previous search, so we can determine when to
      * filter down the result set instead of rebuilding it */
-    private LensSearch? previous_search;
-    private bool is_dirty;
     private unowned Dee.ModelIter _stream_iter_first = null;
     private unowned Dee.ModelIter _stream_iter_last = null;
 
@@ -69,39 +67,38 @@
       lens.add_local_scope (scope);
 
       /* Listen for filter changes */
-      scope.filters_changed.connect (() => {
-        if (scope.active_search != null)
+      scope.notify["active"].connect(() =>
+      {
+        if (scope.active)
         {
-          is_dirty = true;
-          scope.notify_property ("active-search");
+          scope.queue_search_changed (SearchType.DEFAULT);
         }
       });
 
+      scope.search_changed.connect ((lens_search, search_type, cancellable) =>
+      {
+        if (search_type == SearchType.DEFAULT)
+          update_scope_search.begin (lens_search, cancellable);
+        else
+          update_global_search.begin (lens_search, cancellable);
+      });
+
       lens.notify["active"].connect ((obj, pspec) => {
-        if (lens.active && scope.active_search != null)
+        if (lens.active && scope.active)
         {
           if (_stream_iter_first != _model.get_first_iter () || _stream_iter_last != _model.get_last_iter ())
           {
-            is_dirty = true;
-            scope.notify_property ("active-search");
+            if (scope.active)
+            {
+              scope.queue_search_changed (SearchType.DEFAULT);
+            }
           }
         }
       });
 
-      /* Listen for changes to the lens entry search */
-      scope.notify["active-search"].connect ((obj, pspec) => {
-        var search = scope.active_search;
-        is_dirty = false;
-        update_search (search);
-        previous_search = search;
-      });
-     
-      scope.notify["active-global-search"].connect ((obj, pspec) => {
-        var search = scope.active_global_search;
-        if (search_is_invalid (search))
-          return;
-        update_global_search (search);
-        previous_search = search;
+      scope.filters_changed.connect (() =>
+      {
+        scope.queue_search_changed (SearchType.DEFAULT);
       });
 
       try
@@ -114,8 +111,8 @@
 
       _streams_model = streams_service.stream_model;
       Intl.setlocale(LocaleCategory.COLLATE, "C");
-      _sort_filter = new Dee.Filter.collator_desc(StreamModelColumn.TIMESTAMP);
-      _model = new Dee.FilterModel (_sort_filter, _streams_model);
+      _sort_filter = Dee.Filter.new_collator_desc (StreamModelColumn.TIMESTAMP);
+      _model = new Dee.FilterModel (_streams_model, _sort_filter);
     }
 
     private void populate_filters ()
@@ -245,7 +242,7 @@
     }
 
 
-    private void update_global_search (LensSearch search)
+    private async void update_global_search (LensSearch search, Cancellable cancellable)
     {
       var results_model = scope.global_results_model;
 
@@ -254,49 +251,21 @@
           return;
         }
 
-      /* Prevent concurrent searches and concurrent updates of our models,
-       * by preventing any notify signals from propagating to us.
-       * Important: Remeber to thaw the notifys again! */
-      scope.freeze_notify ();
-
       var search_string = prepare_search_string (search);
 
       update_results_model (results_model, search_string, null);
 
-      /* Allow new searches once we enter an idle again.
-       * We don't do it directly from here as that could mean we start
-       * changing the model even before we had flushed out current changes
-       */
-      Idle.add (() => {
-        scope.thaw_notify ();
-        return false;
-      });
-
       search.finished ();
     }
 
-    private void update_search  (LensSearch search)
+    private async void update_scope_search  (LensSearch search, Cancellable cancellable)
     {
-      var results_model = scope.results_model;
-
-      /* Prevent concurrent searches and concurrent updates of our models,
-       * by preventing any notify signals from propagating to us.
-       * Important: Remeber to thaw the notifys again! */
-      scope.freeze_notify ();
+      var results_model = search.results_model;
 
       var search_string = prepare_search_string (search);
 
       update_results_model (results_model, search_string, null);
 
-      /* Allow new searches once we enter an idle again.
-       * We don't do it directly from here as that could mean we start
-       * changing the model even before we had flushed out current changes
-       */
-      Idle.add (() => {
-        scope.thaw_notify ();
-        return false;
-      });
-
       search.finished ();
     }
 

=== modified file 'libgwibber-gtk/stream-view.vala'
--- libgwibber-gtk/stream-view.vala	2011-10-22 02:32:35 +0000
+++ libgwibber-gtk/stream-view.vala	2012-01-13 08:24:36 +0000
@@ -55,8 +55,7 @@
 
     private Dee.Model? _model = null;
     private Dee.Model? _stream_filter_model = null;
-    private Dee.Filter *stream_filter;
-    private Dee.Filter *sort_filter;
+    private Dee.Filter sort_filter;
     private int _position = 0;
     private string _stream = "home";
     private int _sort_order = 1;
@@ -94,11 +93,13 @@
       get { return _stream_filter_model; }
       set {
         if (sort_order == 0)
-          sort_filter = new Dee.Filter.collator(StreamModelColumn.TIMESTAMP);
+          sort_filter = Dee.Filter.new_collator (StreamModelColumn.TIMESTAMP);
         else
-          sort_filter = new Dee.Filter.collator_desc(StreamModelColumn.TIMESTAMP);
-        _stream_filter_model = new Dee.FilterModel (sort_filter, model);
-        
+          sort_filter = Dee.Filter.new_collator_desc (StreamModelColumn.TIMESTAMP);
+        Timer timer = new Timer();
+        _stream_filter_model = new Dee.FilterModel (model, sort_filter);
+        debug ("Applied sorting filter in %fms", timer.elapsed()*1000);
+
         refresh ();
         Idle.add (() => {
           adjustment.set_upper ((double)(_stream_filter_model.get_n_rows ()));

=== modified file 'libgwibber/streams.vala'
--- libgwibber/streams.vala	2011-12-08 22:04:59 +0000
+++ libgwibber/streams.vala	2012-01-13 08:24:36 +0000
@@ -167,17 +167,17 @@
             if (stream == "home") {
               return model;
             } else {
-              stream_filter = new Dee.Filter.for_key_column (StreamModelColumn.STREAM, stream);
+              stream_filter = Dee.Filter.new_for_key_column (StreamModelColumn.STREAM, stream);
             }
-            var filtered_model = new Dee.FilterModel (stream_filter, model);
+            var filtered_model = new Dee.FilterModel (model, stream_filter);
             return filtered_model;
         }
 
         public Dee.Model? transient_filter_model (Dee.Model model, string transient)
         {
             Dee.Filter transient_filter;
-            transient_filter = new Dee.Filter.for_key_column (StreamModelColumn.TRANSIENT, transient);
-            var filtered_model = new Dee.FilterModel (transient_filter, model);
+            transient_filter = Dee.Filter.new_for_key_column (StreamModelColumn.TRANSIENT, transient);
+            var filtered_model = new Dee.FilterModel (model, transient_filter);
             return filtered_model;
         }
 
@@ -198,7 +198,10 @@
             {
               debug ("Getting non-transient model");
               Dee.SequenceModel? model = resources.load ("gwibber.stream_model") as Dee.SequenceModel;
-              debug ("stream_model from resources has %u rows", model.get_n_rows ());
+              if (model is Dee.Model)
+                debug ("stream_model from resources has %u rows", model.get_n_rows ());
+              else
+                debug ("stream_model from resources isn't valid");
               if (!(model is Dee.SequenceModel))
               {
                 debug ("Didn't get model from resource manager, creating a new one");