# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: wst.public.mail@gmail.com-20130228194133-\ # i0xehnb7g0uuqw98 # target_branch: bzr+ssh://bazaar.launchpad.net/+branch/unity-\ # launcher-editor/ # testament_sha1: 911c76a676ffe95064637072347f994a6ba8f01c # timestamp: 2013-02-28 22:42:04 +0300 # base_revision_id: laudeci@gmail.com-20120309124250-wrqd3n7naybguqwt # # Begin patch === modified file 'unitylaunchereditor/core/iconmanager.py' --- unitylaunchereditor/core/iconmanager.py 2011-11-26 14:36:43 +0000 +++ unitylaunchereditor/core/iconmanager.py 2013-02-28 19:41:33 +0000 @@ -28,6 +28,7 @@ class IconManager: def __init__(self): self.icontheme = Gtk.IconTheme.get_default() + search_paths = self.icontheme.get_search_path() # add the humanity icon theme to the iconpath, as not all icon # themes contain all the icons we need # this *shouldn't* lead to any performance regressions @@ -38,7 +39,7 @@ if isdir(subpath): for subsubpath in listdir(subpath): subsubpath = join(subpath, subsubpath) - if isdir(subsubpath): + if isdir(subsubpath) and subsubpath not in search_paths: self.icontheme.append_search_path(subsubpath) def get_icon_with_type(self,filepath, size=24): # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWcasLQIAAYH/gEQQBABYc//3 UwIAAL////BQA36uJVDVUAMoJomUbUflTxkapk/Uh6QyPKHqGTGGhoAAANAAAAADJGgmTU0yZR6T ah6RoaDQNABhoaAAADQAAAAAkkCT00Jpk0xJlPKY1GmRP1J6mg2pdHdxKad9FjlMMqtbkGlRo9+r obUnHpXv7SYZjv7BothRSEAJrm0jm3hxz5q68ntz/El3rQoQjU6xSZwlAN9TU7Rh0+MaH6EPNm4W 7GU22qPVOdmkUy5pTSot19tkcppSALUbmWRwJVAXAvx4jEOLISibHmZqWMjLcVLhqZtBzBZYDFIB MuZxfyibGyKJXvg+DjQo9bY9TgaA1KPN3E6m/NLXmpg4P2dq6weSgu0bjs3lRjgarOG9kKidsavm Zi0MqlKE17OVwuOVSHYwIlDzUJMKdWRAVSdhbKKTMt49VkSNJS3XrXfFU0uFc+tYxe25nPCRcosF rsyrihXRC3WrKZ2iZlDBJM0oL8n0eDhOS3XzYuIryc4L7qUV9o6wXiszkMWtQqFpDaVCTZ2DOSiB vwm0VgX3QB/Qb6KUrY2vOE9r5jSjoRuaT0/WBJyaTSJhKpoy9jeduMeDm0bn39Ley4JWTBj3daZ3 PtYPstGgmCkBu3I46x8GJ+YUVeAgwfb+oKV/lWoWo6OHIbIK1quuvDGa5nz5ExdOJ2X0/5BRjf0R qlzzJhf9OfbiVUv8FR0VR8PqkbXhnIqt2bbe5Y5HVRQbaDfBbDiKXbw41s2js10lcNlu1OyTTx9A rXLGd2hJ1Jh0O2Zirhy+OPH1j4+FzcNgtdl+bZ+7jbfM+ExS4turnjGAn1AMKlvlEYJQLph+y3vQ PMbng1ADGz+SPFYLxRmH5pCD+Qnm0H+QoQIrTNJsPTu18/2ujqeThlYSBEzCAaA7TC1VwFT6PEBX hbznhkcOBRLcy8HnAF1D7RCt4QSxXJyfilxy8+E/wkWpHVLJW+Sso+0znCA0B5imHqzsvET9rVB+ FU7GL1ssHMosmXz7rbbq5gUQ9XA88gc1S9XLfSW/O7JmWvJmIlVeEtBFa6qCDPDJKYWQBwyJ+FxK 6Slufdt91VUHF7Vc7pNP92F3gxCINumYNOxJqgwK+z8L870nu2dyFY5qVmmxbGU86FYbpBBk44JQ C/Yr9XTjgLqrPyKxYh0F6aB9z7jWesljWKa371m4+FiK1NsKv/F3JFOFCQxqwtAg