Imported Upstream version 0.6.4upstream/0.6.4

2 files changed, 9 insertions, 6 deletions

diff --git a/src/utilities/bindingManager.vala b/src/utilities/bindingManager.vala
index 6ca73cf..ac5a8fb 100644
--- a/src/utilities/bindingManager.vala
+++ b/src/utilities/bindingManager.vala
@@ -279,14 +279,15 @@ public class BindingManager : GLib.Object {
     /////////////////////////////////////////////////////////////////////
 
     public string get_assigned_id(Trigger trigger) {
-        foreach (var binding in bindings) {
-            var first = Trigger.remove_optional(binding.trigger.name);
-            var second = Trigger.remove_optional(trigger.name);
-            if (first == second) {
-                return binding.id;
+        var second = Trigger.remove_optional(trigger.name);
+        if (second != "") {
+            foreach (var binding in bindings) {
+                var first = Trigger.remove_optional(binding.trigger.name);
+                if (first == second) {
+                    return binding.id;
+                }
             }
         }
-
         return "";
     }
 
diff --git a/src/utilities/paths.vala b/src/utilities/paths.vala
index 61111e3..96bce0a 100644
--- a/src/utilities/paths.vala
+++ b/src/utilities/paths.vala
@@ -129,6 +129,8 @@ public class Paths : GLib.Object {
         }
 
         Gtk.IconTheme.get_default().append_search_path("/usr/share/pixmaps/");
+        Gtk.IconTheme.get_default().append_search_path("/usr/share/icons/hicolor/scalable/apps");
+        Gtk.IconTheme.get_default().append_search_path("/usr/local/share/icons/hicolor/scalable/apps");
 
         // get global paths
         var default_dir = GLib.File.new_for_path("/usr/share/gnome-pie/");