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

[Ken VanDine]

Fixes bug 1046360
* Don't do anything to trigger starting gwibber-service unless data is needed.
* Show/Hide the lens based on enabled accounts

[Didier Roche-Tolomelli (didrocks)]

Looks totally legitimate to me. +1 :)
(great that we can hide lenses ;))

review: Approve

=== modified file 'lens/src/Makefile.am'
--- lens/src/Makefile.am	2012-09-03 14:47:33 +0000
+++ lens/src/Makefile.am	2012-10-04 14:08:24 +0000
@@ -36,6 +36,7 @@
   --pkg gio-2.0 \
   --pkg gio-unix-2.0 \
   --pkg json-glib-1.0 \
+  --pkg accounts \
   --basedir=.
 
 unity_gwibber_daemon_LDADD = \

=== modified file 'lens/src/daemon.vala'
--- lens/src/daemon.vala	2012-10-03 00:10:30 +0000
+++ lens/src/daemon.vala	2012-10-04 14:08:24 +0000
@@ -41,8 +41,8 @@
     private Gwibber.Service service;
     private Gwibber.Accounts accounts;
     private Gwibber.Utils utils;
-    private Dee.Model? _model;
-    private Dee.Model? _streams_model;
+    private Dee.Model? _model = null;
+    private Dee.Model? _streams_model = null;
     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 */
@@ -52,24 +52,65 @@
     private Dee.Analyzer _analyzer;
     private Dee.Index _index;
     private Dee.ICUTermFilter _ascii_filter;
+    private Ag.Manager _account_manager;
+    private bool _has_accounts = false;
 
     construct
     {
-      streams_service = new Gwibber.Streams();
-      service = new Gwibber.Service();
-      utils = new Gwibber.Utils();
-      accounts = new Gwibber.Accounts();
-
+      lens = new Unity.Lens("/com/canonical/unity/lens/gwibber", "gwibber");
+      lens.search_in_global = false;
+      lens.search_hint = _("Enter name or content you would like to search for");
+      lens.visible = false;
+      try
+      {
+        lens.export ();
+      } catch (GLib.IOError e)
+      {
+        warning ("failed to export lens: %s", e.message);
+      }
+
+
+      // Check for accounts
+      _account_manager = new Ag.Manager.for_service_type("microblogging");
+      GLib.List<Ag.AccountService> accts = _account_manager.get_enabled_account_services();
+      foreach (Ag.AccountService account_service in accts) {
+        Ag.Account account = account_service.get_account();
+        account.set_enabled (false);
+        message ("ACCOUNT PROVIDER: %s", account.get_provider_name());
+      }
+
+      // We only want to trigger starting gwibber-service if there are accounts
+      if (accts.length() > 0)
+      {
+        _has_accounts = true;
+        setup ();
+      }
+
+      _account_manager.enabled_event.connect ((id) =>
+      {
+        accts = _account_manager.get_enabled_account_services();
+        if (accts.length() > 0 && !_has_accounts)
+        {
+          _has_accounts = true;
+          setup ();
+        }
+        else if (accts.length() == 0)
+        {
+          lens.visible = false;
+          _has_accounts = false;
+        }
+      });
+    }
+
+
+    void setup ()
+    {
       scope = new Unity.Scope ("/com/canonical/unity/scope/gwibber");
       scope.search_in_global = false;
       scope.preview_uri.connect (preview);
 
-      lens = new Unity.Lens("/com/canonical/unity/lens/gwibber", "gwibber");
-      lens.search_in_global = false;
-      lens.search_hint = _("Enter name or content you would like to search for");
       lens.visible = true;
-      populate_categories ();
-      populate_filters();
+
       lens.add_local_scope (scope);
 
       /* Listen for filter changes */
@@ -116,13 +157,17 @@
         scope.queue_search_changed (SearchType.DEFAULT);
       });
 
-      try
-      {
-        lens.export ();
-      } catch (GLib.IOError e)
-      {
-        warning ("failed to export lens: %s", e.message);
-      }
+    }
+
+    private void setup_gwibber ()
+    {
+      streams_service = new Gwibber.Streams();
+      service = new Gwibber.Service();
+      utils = new Gwibber.Utils();
+      accounts = new Gwibber.Accounts();
+
+      populate_categories ();
+      populate_filters();
 
       _streams_model = streams_service.stream_model;
       Intl.setlocale(LocaleCategory.COLLATE, "C");
@@ -335,6 +380,9 @@
 
       results_model.clear ();
 
+      if (_model == null)
+        setup_gwibber ();
+
       iter = _model.get_first_iter ();
       end = _model.get_last_iter ();
 
@@ -492,6 +540,9 @@
       Icon icon;
       string retweet_str, like_str, _img_uri = null;
 
+      if (_streams_model == null)
+        setup_gwibber ();
+
       var model = _streams_model;
       unowned Dee.ModelIter iter, end;
       iter = model.get_first_iter ();