Merge lp:~tintou/slingshot/avoid-crash into lp:~elementary-pantheon/slingshot/trunk

[Corentin Noël]

* Fix startup libzeitgeist-2.0 crash
* Added an exception to App.vala
* Removed modularity check to set the right view at slingshot show ()

Fix crash at startup from libzeitgeist-2.0, it seems that the library isn't thread-safe…

[Corentin Noël (tintou)]

I'm sorry, I included some unrelated changes (but tiny)
 * Added an exception to App.vala
 * Removed modularity check to set the right view at slingshot show ()

=== modified file 'src/Backend/App.vala'
--- src/Backend/App.vala	2014-07-07 17:01:47 +0000
+++ src/Backend/App.vala	2014-07-10 09:45:25 +0000
@@ -156,8 +156,12 @@
                 warning ("Failed to load icon: %s\n", e.message);
             }
 
-            return Slingshot.icon_theme.load_icon ("application-default-icon",
-                size, Gtk.IconLookupFlags.FORCE_SIZE);
+            try {
+                return Slingshot.icon_theme.load_icon ("application-default-icon",
+                    size, Gtk.IconLookupFlags.FORCE_SIZE);
+            } catch (Error e) {
+                critical (e.message);
+            }
         }
 
         Gdk.Pixbuf icon = null;
@@ -276,4 +280,4 @@
         return true;
     }
 
-}
+}
 \ No newline at end of file
 
=== modified file 'src/Backend/RelevancyService.vala'
--- src/Backend/RelevancyService.vala	2014-01-31 15:20:32 +0000
+++ src/Backend/RelevancyService.vala	2014-07-10 09:45:25 +0000
@@ -24,6 +24,7 @@
     private Zeitgeist.DataSourceRegistry zg_dsr;
     private Gee.HashMap<string, int> app_popularity;
     private bool has_datahub_gio_module = false;
+    private bool refreshing = false;
 
     private const float MULTIPLIER = 65535.0f;
     
@@ -82,6 +83,14 @@
         Idle.add (load_application_relevancies.callback, Priority.HIGH);
         yield;
 
+        /* 
+         * Dont reload everything if a refresh is already running.
+         * This avoids a double free exception in libzeitgeist-2.0.
+         */
+        if (refreshing == true)
+            return;
+
+        refreshing = true;
         int64 end = Zeitgeist.Timestamp.from_now ();
         int64 start = end - Zeitgeist.Timestamp.WEEK * 4;
         Zeitgeist.TimeRange tr = new Zeitgeist.TimeRange (start, end);
@@ -96,11 +105,8 @@
         var ptr_arr = new GLib.GenericArray<Zeitgeist.Event> ();
         ptr_arr.add (event);
 
-        Zeitgeist.ResultSet rs;
-
         try {
-
-            rs = yield zg_log.find_events (tr, (owned) ptr_arr,
+            Zeitgeist.ResultSet rs = yield zg_log.find_events (tr, ptr_arr,
                     Zeitgeist.StorageState.ANY,
                     256,
                     Zeitgeist.ResultType.MOST_POPULAR_SUBJECTS,
@@ -123,8 +129,10 @@
                 index++;
             }
             update_complete ();
+            refreshing = false;
         } catch (Error err) {
-            warning ("%s", err.message);
+            critical (err.message);
+            refreshing = false;
             return;
         }
     }
 
=== modified file 'src/SlingshotView.vala'
--- src/SlingshotView.vala	2014-07-07 17:01:47 +0000
+++ src/SlingshotView.vala	2014-07-10 09:45:25 +0000
@@ -709,10 +709,6 @@
         }
 
         private void set_modality (Modality new_modality) {
-
-            if (modality == new_modality)
-                return;
-
             modality = new_modality;
 
             switch (modality) {
@@ -929,4 +925,4 @@
         }
     }
 
-}
+}
 \ No newline at end of file