From: Dana Jansens <danakj@orodu.net>
Date: Sun, 11 Aug 2013 02:24:08 +0000 (-0400)
Subject: Change the message about no icons in menus.
X-Git-Tag: release-3.5.1~44
X-Git-Url: http://git.openbox.org/?p=mikachu%2Fopenbox.git;a=commitdiff_plain;h=b73f419001740e8f9fd37f88f3df205f66404d18

Change the message about no icons in menus.

The message used to mention Imlib2, but now there are two libraries
that can be used to support icons. So make the message more generic
and show it only when both libraries are not present.
---

diff --git a/openbox/config.c b/openbox/config.c
index 03fc96b..49fc29b 100644
--- a/openbox/config.c
+++ b/openbox/config.c
@@ -930,9 +930,9 @@ static void parse_menu(xmlNodePtr node, gpointer d)
         config_menu_manage_desktops = obt_xml_node_bool(n);
     if ((n = obt_xml_find_node(node, "showIcons"))) {
         config_menu_show_icons = obt_xml_node_bool(n);
-#ifndef USE_IMLIB2
+#if !defined(USE_IMLIB2) && !defined(USE_LIBRSVG)
         if (config_menu_show_icons)
-            g_message(_("Openbox was compiled without Imlib2 image loading support. Icons in menus will not be loaded."));
+            g_message(_("Openbox was compiled without image loading support. Icons in menus will not be loaded."));
 #endif
     }