1 files changed, 7 insertions, 13 deletions

diff --git a/src/Icon.cc b/src/Icon.cc
index 6578bc8..7e3b53d 100644
--- a/src/Icon.cc
+++ b/src/Icon.cc
@@ -19,8 +19,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// stupid macros needed to access some functions in version 2 of the GNU C
-// library
+//Use GNU extensions
 #ifndef  _GNU_SOURCE
 #define  _GNU_SOURCE
 #endif // _GNU_SOURCE
@@ -40,25 +39,20 @@ Iconmenu::Iconmenu(BScreen *scrn) : Basemenu(scrn) {
 
         screen = scrn;  
         setLabel(I18n::instance()->getMessage(
-#ifdef          NLS
-                                        IconSet, IconIcons,
-#else // !NLS
-                                        0, 0,
-#endif // NLS
-                                        "Icons"));
+                FBNLS::IconSet, FBNLS::IconIcons,
+                "Icons"));
         update();
 }
 
 
-void Iconmenu::itemSelected(int button, int index) {
+void Iconmenu::itemSelected(int button, unsigned int index) {
         if (button == 1) {
-                if (index >= 0 && index < screen->getIconCount()) {
+                if (index < screen->getIconCount()) {
                         FluxboxWindow *win = screen->getIcon(index);
 
-                        if (win) {
+                        if (win)
                                 win->deiconify();
-                                win->setInputFocus();
-                        }
+
                 }
 
                 if (! (screen->getWorkspacemenu()->isTorn() || isTorn()))