Merge lp:~azzar1/unity/fix-trash-li-blocking into lp:unity

[Andrea Azzarone]

[TrashLauncherIcon] Create GFileMonitor in an idle to avoid blocking calls.

[Marco Trevisan (Treviño) (3v1n0)]

You can just use _source_manager from LauncherIcon.h (which is protected)

[Marco Trevisan (Treviño) (3v1n0)]

Thanks

review: Approve

=== modified file 'launcher/TrashLauncherIcon.cpp'
--- launcher/TrashLauncherIcon.cpp	2015-12-11 15:15:47 +0000
+++ launcher/TrashLauncherIcon.cpp	2016-07-13 18:14:25 +0000
@@ -55,23 +55,27 @@
   SkipQuirkAnimation(Quirk::VISIBLE);
   SetShortcut('t');
 
-  glib::Object<GFile> location(g_file_new_for_uri(TRASH_URI.c_str()));
-
-  glib::Error err;
-  trash_monitor_ = g_file_monitor_directory(location, G_FILE_MONITOR_NONE, cancellable_, &err);
-  g_file_monitor_set_rate_limit(trash_monitor_, 1000);
-
-  if (err)
-  {
-    LOG_ERROR(logger) << "Could not create file monitor for trash uri: " << err;
-  }
-  else
-  {
-    glib_signals_.Add<void, GFileMonitor*, GFile*, GFile*, GFileMonitorEvent>(trash_monitor_, "changed",
-    [this] (GFileMonitor*, GFile*, GFile*, GFileMonitorEvent) {
-      UpdateTrashIcon();
-    });
-  }
+  _source_manager.AddIdle([this]{
+    glib::Object<GFile> location(g_file_new_for_uri(TRASH_URI.c_str()));
+
+    glib::Error err;
+    trash_monitor_ = g_file_monitor_directory(location, G_FILE_MONITOR_NONE, cancellable_, &err);
+    g_file_monitor_set_rate_limit(trash_monitor_, 1000);
+
+    if (err)
+    {
+      LOG_ERROR(logger) << "Could not create file monitor for trash uri: " << err;
+    }
+    else
+    {
+      glib_signals_.Add<void, GFileMonitor*, GFile*, GFile*, GFileMonitorEvent>(trash_monitor_, "changed",
+      [this] (GFileMonitor*, GFile*, GFile*, GFileMonitorEvent) {
+        UpdateTrashIcon();
+      });
+    }
+
+    return false;
+  });
 
   UpdateTrashIcon();
   UpdateStorageWindows();