# # # patch "fdo/icontheme.py" # from [407d0730a7313c980f87814164bc3fe4229877ca] # to [610d56a3c7f98b95ba7ddfe69279b50fc7a72d4a] # ============================================================ --- fdo/icontheme.py 407d0730a7313c980f87814164bc3fe4229877ca +++ fdo/icontheme.py 610d56a3c7f98b95ba7ddfe69279b50fc7a72d4a @@ -68,6 +68,8 @@ class IconTheme: contexts = self.dir_by_size.keys() for context in contexts: + if not self.dir_by_size.has_key(context): + continue for dir_size in self.dir_by_size[context]: if size == None or size == dir_size: for path in self.dir_by_size[context][dir_size]: @@ -98,7 +100,7 @@ class MimeIcon: # iff we are a inode/ type, then let's look in 'Places' instead if mime_type.startswith('inode/'): gnome_name = 'gnome-fs-' + mime_type.split('/')[-1] - rv = self.icon_theme.lookup(gnome_name, contexts=['Places'], size=self.size) + rv = self.icon_theme.lookup(gnome_name, contexts=['Places', 'FileSystems'], size=self.size) if rv: return rv # stolen from gnome-ui; it's rather unfortunate but there is not a standard # on how to name mime icons! @@ -121,4 +123,4 @@ if __name__ == '__main__': if __name__ == '__main__': it = IconTheme('gnome') mi = MimeIcon(it, size="16") + print mi.lookup('inode/directory') - print mi.lookup('text/plain')