remove the hilightFirst option since it wasnt actually used in the code

diff --git a/openbox/config.c b/openbox/config.c
index 9156c8885d1a9dbd9841b2d09a02f45fb48cad17..768cc600ba9af38e0967e1834556545b0420d8e9 100644 (file)
--- a/openbox/config.c
+++ b/openbox/config.c
@@ -65,7 +65,6 @@ gint config_mouse_dclicktime;
 
 gboolean config_menu_warppointer;
 gboolean config_menu_xorstyle;
-gboolean config_menu_hilightfirst;
 guint    config_menu_hide_delay;
 
 GSList *config_menu_files;
@@ -407,8 +406,6 @@ static void parse_menu(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
             config_menu_warppointer = parse_bool(doc, n);
         if ((n = parse_find_node("xorStyle", node)))
             config_menu_xorstyle = parse_bool(doc, n);
-        if ((n = parse_find_node("hilightFirst", node)))
-            config_menu_hilightfirst = parse_bool(doc, n);
         if ((n = parse_find_node("hideDelay", node)))
             config_menu_hide_delay = parse_int(doc, n);
     }
@@ -599,7 +596,6 @@ void config_startup(ObParseInst *i)
 
     config_menu_warppointer = TRUE;
     config_menu_xorstyle = TRUE;
-    config_menu_hilightfirst = TRUE;
     config_menu_hide_delay = 250;
     config_menu_files = NULL;
 

diff --git a/openbox/config.h b/openbox/config.h
index 3117a710859f327e30a0e51ee5d3cb922b80f8ad..c7df90f0f19960d8a4039e0becc4d5d9bb76fdb3 100644 (file)
--- a/openbox/config.h
+++ b/openbox/config.h
@@ -111,8 +111,6 @@ extern gboolean config_resist_layers_below;
 extern gboolean config_menu_warppointer;
 /*! make menus jump around a lot */
 extern gboolean config_menu_xorstyle;
-/*! hilight first entry in menu */
-extern gboolean config_menu_hilightfirst;
 /*! delay for hiding menu when opening */
 extern guint    config_menu_hide_delay;
 /*! User-specified menu files */

diff --git a/openbox/menu.c b/openbox/menu.c
index e200654a6543ebd6631a6a6a2960ac1ecae60d43..fce49a6feb565ee8092d52c74e68358e8208e33b 100644 (file)
--- a/openbox/menu.c
+++ b/openbox/menu.c
@@ -305,12 +305,8 @@ void menu_show(gchar *name, gint x, gint y, ObClient *client)
     else
         menu_frame_move(frame,
                         x - ob_rr_theme->bwidth, y - ob_rr_theme->bwidth);
-    if (!menu_frame_show(frame, NULL)) {
+    if (!menu_frame_show(frame, NULL))
         menu_frame_free(frame);
-    } else {
-        if (frame->entries)
-            menu_frame_select_next(frame);
-    }
 }
 
 static ObMenuEntry* menu_entry_new(ObMenu *menu, ObMenuEntryType type, gint id)