Merge lp:~unity-team/libunity/x-sru1 into lp:libunity/xenial

[Marco Trevisan (Treviño)]

Releasing SRU1 for Xenial

[Andrea Azzarone (azzar1)]

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2015-12-15 08:19:15 +0000
+++ debian/changelog	2016-06-29 15:59:43 +0000
@@ -1,3 +1,9 @@
+libunity (7.1.4+15.10.20151002-0ubuntu3) UNRELEASED; urgency=medium
+
+  * Process GFileMonitors signals with a small timeout. (LP: #1506744)
+
+ -- Andrea Azzarone <[e-mail]>  Wed, 29 Jun 2016 17:58:46 +0200
+
 libunity (7.1.4+15.10.20151002-0ubuntu2) xenial; urgency=medium
 
   * Set dash online search option to off by default (LP: #1521208)

=== modified file 'src/unity-appinfo-manager.vala'
--- src/unity-appinfo-manager.vala	2014-02-03 17:22:39 +0000
+++ src/unity-appinfo-manager.vala	2016-06-29 15:59:43 +0000
@@ -62,13 +62,15 @@
     private HashTable<string, StringArrayWrapper> categories_by_id; /* desktop id or path -> xdg cats */
     private HashTable<string, StringArrayWrapper> keywords_by_id; /* desktop id or path -> X-GNOME-Keywords and X-AppInstall-Keywords */
     private HashTable<string,string?> paths_by_id; /* desktop id -> full path to desktop file */
-    
+    private List<uint> timeout_handlers;
+
     private AppInfoManager ()
     {
       appinfo_by_id = new HashTable<string,AppInfo?> (str_hash, str_equal);
       categories_by_id = new HashTable<string,StringArrayWrapper> (str_hash, str_equal);
       keywords_by_id = new HashTable<string,StringArrayWrapper> (str_hash, str_equal);
       paths_by_id = new HashTable<string,string?> (str_hash, str_equal);
+      timeout_handlers = new List<uint> ();
 
       monitors = new HashTable<string,FileMonitor> (str_hash, str_equal);
       
@@ -86,7 +88,15 @@
           }
         }
     }
-    
+
+    ~AppInfoManager ()
+    {
+      timeout_handlers.foreach ((id) =>
+        {
+          Source.remove (id);
+        });
+    }
+
     [Deprecated (replacement = "AppInfoManager.get_default")]
     public static AppInfoManager get_instance ()
     {
@@ -114,21 +124,31 @@
      * we remove it from the cache */
     private void on_dir_changed (FileMonitor mon, File file, File? other_file, FileMonitorEvent e)
     {
-      var desktop_id = file.get_basename ();
-      var path = file.get_path ();
-      AppInfo? appinfo;
-      
-      if (appinfo_by_id.remove (desktop_id))
-        {
-          appinfo = lookup (desktop_id);
-          changed (desktop_id, appinfo);
-        }
-      
-      if (appinfo_by_id.remove (path))
-        {
-          appinfo = lookup (path);
-          changed (path, appinfo);
-        }
+      uint timeout_handler = 0;
+
+      timeout_handler = Timeout.add_seconds (2, () =>
+      {
+        var desktop_id = file.get_basename ();
+        var path = file.get_path ();
+        AppInfo? appinfo;
+
+        if (appinfo_by_id.remove (desktop_id))
+          {
+            appinfo = lookup (desktop_id);
+            changed (desktop_id, appinfo);
+          }
+      
+        if (appinfo_by_id.remove (path))
+          {
+            appinfo = lookup (path);
+            changed (path, appinfo);
+          }
+
+        timeout_handlers.remove (timeout_handler);
+        return false;
+      });
+
+      timeout_handlers.append (timeout_handler);
     }
     
     /**