Changeset 3022c329cd01edbd7dfa3400d41a87dfbf59e56e

Show
Ignore:
Timestamp:
04/06/2007 11:06:12 AM (2 years ago)
Author:
syscrash <syscrash>
git-committer:
syscrash <syscrash> 1175882772 +0000
git-parent:

[83eaf6b382796aac54ee69d428707cddeddeb98b]

git-author:
syscrash <syscrash> 1175882772 +0000
Message:

trying to fix icon theme problem

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • ChangeLog

    r83eaf6b r3022c32  
     1Fri Apr  6 14:04:46 EDT 2007    Javeed Shaikh <syscrash2k@gmail.com> 
     2        * Trying to fix a bug where icons are not being found, causing 
     3                nitrogen to abort. Dave should probably look into this further. 
     4 
    15Thu Apr  5 18:01:16 EDT 2007    Dave Foster <daf@minuslab.net> 
    26        * Added new icons from Craig Duquette, split out images 

  • src/NWindow.cc

    r83eaf6b r3022c32  
    149149 
    150150        // modes 
    151         icon = icontheme->load_icon("wallpaper-scaled", 16, Gtk::ICON_LOOKUP_NO_SVG); 
    152         if (!icon) icon = genericicon; 
     151        try { 
     152                icon = icontheme->load_icon("wallpaper-scaled", 16, Gtk::ICON_LOOKUP_NO_SVG); 
     153                if (!icon) icon = genericicon; 
     154        } catch (...) { 
     155                icon = genericicon; 
     156        } 
    153157        this->select_mode.add_image_row( icon, "Scaled", SetBG::mode_to_string(SetBG::SET_SCALE), true ); 
    154158 
    155         icon = icontheme->load_icon("wallpaper-centered", 16, Gtk::ICON_LOOKUP_NO_SVG); 
    156         if (!icon) icon = genericicon; 
     159        try { 
     160                icon = icontheme->load_icon("wallpaper-centered", 16, Gtk::ICON_LOOKUP_NO_SVG); 
     161                if (!icon) icon = genericicon; 
     162        } catch (...) { 
     163                icon = genericicon; 
     164        } 
    157165        this->select_mode.add_image_row( icon, "Centered", SetBG::mode_to_string(SetBG::SET_CENTER), false ); 
    158166 
    159         icon = icontheme->load_icon("wallpaper-tiled", 16, Gtk::ICON_LOOKUP_NO_SVG); 
    160         if (!icon) icon = genericicon; 
     167        try { 
     168                icon = icontheme->load_icon("wallpaper-tiled", 16, Gtk::ICON_LOOKUP_NO_SVG); 
     169                if (!icon) icon = genericicon; 
     170        } catch (...) { 
     171                icon = genericicon; 
     172        } 
    161173        this->select_mode.add_image_row( icon, "Tiled", SetBG::mode_to_string(SetBG::SET_TILE), false ); 
    162174 
    163         icon = icontheme->load_icon("wallpaper-bestfit", 16, Gtk::ICON_LOOKUP_NO_SVG); 
    164         if (!icon) icon = genericicon; 
     175        try { 
     176                icon = icontheme->load_icon("wallpaper-bestfit", 16, Gtk::ICON_LOOKUP_NO_SVG); 
     177                if (!icon) icon = genericicon; 
     178        } catch (...) { 
     179                icon = genericicon; 
     180        } 
     181 
    165182        this->select_mode.add_image_row( icon, "Best Fit", SetBG::mode_to_string(SetBG::SET_BEST), false ); 
    166183