diff libmenu/menu_cmdlist.c @ 25505:8d329f7bbc3c

Remove redundant option 'auto-close' from cmdlist and filesel.
author ulion
date Fri, 28 Dec 2007 03:45:01 +0000
parents 4852e5553d4e
children 36948c17c4af
line wrap: on
line diff
--- a/libmenu/menu_cmdlist.c	Thu Dec 27 12:27:10 2007 +0000
+++ b/libmenu/menu_cmdlist.c	Fri Dec 28 03:45:01 2007 +0000
@@ -35,20 +35,17 @@
 
 struct menu_priv_s {
   menu_list_priv_t p;
-  int auto_close;
 };
 
 #define ST_OFF(m) M_ST_OFF(struct menu_priv_s, m)
 
 static struct menu_priv_s cfg_dflt = {
   MENU_LIST_PRIV_DFLT,
-  0,
 };
 
 static m_option_t cfg_fields[] = {
   MENU_LIST_PRIV_FIELDS,
   { "title",M_ST_OFF(struct menu_priv_s,p.title), CONF_TYPE_STRING, 0, 0, 0, NULL },
-  { "auto-close", ST_OFF(auto_close), CONF_TYPE_FLAG, 0, 0, 1, NULL },
   { NULL, NULL, NULL, 0,0,0,NULL }
 };
 
@@ -62,13 +59,8 @@
       break;
     } // fallback on ok if right is not defined
   case MENU_CMD_OK:
-    if(mpriv->p.current->ok) {
-      if (mp_input_parse_and_queue_cmds(mpriv->p.current->ok))
-        {
-          if (mpriv->auto_close)
-              mp_input_queue_cmd (mp_input_parse_cmd ("menu hide"));
-        }
-    }
+    if (mpriv->p.current->ok)
+      mp_input_parse_and_queue_cmds(mpriv->p.current->ok);
     break;
   case MENU_CMD_LEFT:
     if(mpriv->p.current->left) {