M Makefile.am → Makefile.am

@@ -244,6 +244,7 @@ openbox/grab.c \
 	openbox/grab.h \
 	openbox/group.c \
 	openbox/group.h \
+	openbox/imageload.c \
 	openbox/imageload.h \
 	openbox/keyboard.c \
 	openbox/keyboard.h \
@@ -284,9 +285,6 @@ openbox/translate.h \
 	openbox/window.c \
 	openbox/window.h
 
-if USE_IMLIB2
-    openbox_openbox_SOURCES += openbox/imageload.c
-endif
 
 ## gnome-panel-control ##
 

M openbox/imageload.c → openbox/imageload.c

@@ -26,6 +26,12 @@ #include "obrender/imagecache.h"
 #include "imageload.h"
 #include <Imlib2.h>
 
+#ifndef USE_IMLIB2
+RrImage* RrImageFetchFromFile(RrImageCache *cache, const gchar *name)
+{
+    return NULL;
+}
+#else
 
 static void CreateFileNameTable(RrImageCache *self)
 {
@@ -133,3 +139,5 @@ imlib_free_image();
 
     return rr_image;
 }
+
+#endif

M openbox/imageload.h → openbox/imageload.h

@@ -1,11 +1,7 @@ 
 #ifndef __imageload_h
 #define __imageload_h
 
-#ifdef USE_IMLIB2
 #include "obrender/render.h"
 RrImage* RrImageFetchFromFile(RrImageCache *cache, const gchar *name);
-#else
-#define RrImageFetchFromFile(cache, name) NULL
-#endif
 
 #endif

M openbox/menu.c → openbox/menu.c

@@ -270,19 +270,17 @@ static void parse_menu_item(xmlNodePtr node,  gpointer data)
 {
     ObMenuParseState *state = data;
     gchar *label;
-    #ifdef USE_IMLIB2
     gchar *icon;
-    #endif
     ObMenuEntry *e;
 
     if (state->parent) {
-        #ifdef USE_IMLIB2
         /* Don't try to extract "icon" attribute if icons in user-defined
 	   menus are not enabled. */
         if (!(config_menu_user_show_icons &&
             obt_xml_attr_string(node, "icon", &icon)))
-               icon = NULL;
-        #endif
+        {
+            icon = NULL;
+        }
 
         if (obt_xml_attr_string(node, "label", &label)) {
             GSList *acts = NULL;
@@ -296,17 +294,12 @@ node = obt_xml_find_node(node->next, "action");
             }
             e = menu_add_normal(state->parent, -1, label, acts, TRUE);
             
-            #ifdef USE_IMLIB2
             if (icon) { /* Icon will be used. */
                 e->data.normal.icon = RrImageFetchFromFile(ob_rr_icons, icon);
-                if (e->data.normal.icon) {
+                if (e->data.normal.icon)
                     e->data.normal.icon_alpha = 0xff;
-                }
                 g_free(icon);
             }
-
-            menu_add_normal(state->parent, -1, label, acts, TRUE);
-            #endif
             g_free(label);
         }
     }