[fusion-commits] Compizconfig Settings Manager in Python: Changes to 'master' (ac6f859c1221e32723bec97f60af7bae8de71046)

[crdlb at server.opencompositing.org]

New commits:
commit ac6f859c1221e32723bec97f60af7bae8de71046
Author: Christopher Williams <christopherw at verizon.net>
Date:   Thu Mar 27 18:28:17 2008 -0400

    Fix image mimetype plugin loader in FileButton


 ccm/Settings.py |    2 --
 ccm/Widgets.py  |    8 +++++---
 2 files changed, 5 insertions(+), 5 deletions(-)


Modified: fusion/compizconfig/ccsm/ccm/Settings.py
===================================================================
--- fusion/compizconfig/ccsm/ccm/Settings.py
+++ fusion/compizconfig/ccsm/ccm/Settings.py
@@ -24,8 +24,6 @@ import pygtk
 import gtk
 import gobject
 import os
-import mimetypes
-mimetypes.init()
 
 from ccm.Constants import *
 from ccm.Conflicts import *

Modified: fusion/compizconfig/ccsm/ccm/Widgets.py
===================================================================
--- fusion/compizconfig/ccsm/ccm/Widgets.py
+++ fusion/compizconfig/ccsm/ccm/Widgets.py
@@ -28,6 +28,8 @@ import cairo, pangocairo
 from math import pi, sqrt
 import time
 import re
+import mimetypes
+mimetypes.init()
 
 from ccm.Utils import *
 from ccm.Constants import *
@@ -1152,11 +1154,11 @@ class FileButton (gtk.Button):
         ext = filename.split (".") [-1]
 
         try:
-            mime = mimetypes.types_map ["." + ext]
-        except:
+            mime = mimetypes.types_map [".%s" %ext]
+        except KeyError:
             return True
 
-        if self.self._image:
+        if self._image:
             require = FeatureRequirement (self._context, 'imagemime:' + mime)
             return require.Resolve ()