← Back to branch summary

~gnome15-team/gnome15/trunk

« back to all changes in this revision

Viewing changes to gnome15/src/main/python/gnome15/g15profile.py

  • Committer: tanktarta
  • Date: 2012-11-24 10:27:36 UTC
  • Revision ID: tanktarta-20121124102736-0drhasy3jdn862wx
0.9.2

Show diffs side-by-side

added added

removed removed

Lines of Context:
gnome15/src/main/python/gnome15/g15profile.py
903
903
        height        --    preferred height
904
904
        """
905
905
        icon = self.icon
906
 
        if icon == None or icon == "":
907
 
            icon = "preferences-desktop-keyboard-shortcuts"
908
 
        if icon.startswith("/"):
 
906
        if icon is not None and icon.startswith("/"):
909
907
            return icon
910
 
        else:
911
 
            path = self.get_resource_path(icon)
912
 
            if path is None:
913
 
                return g15util.get_icon_path(icon, height)
 
908
        
 
909
        path = self.get_resource_path(icon)
 
910
        if path is None:
 
911
            if icon == None or icon == "":
 
912
                icon = [ "preferences-desktop-keyboard-shortcuts", "preferences-desktop-keyboard" ]
 
913
            
 
914
            return g15util.get_icon_path(icon, height)
 
915
        
914
916
        return path
915
917
        
916
918
    def get_resource_path(self, resource_name):