X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fscreen_keydef.c;h=ba229ec87ab98ec4827ebc6fb4d149b37b9417f0;hb=1006a43225842d77e5fdb32e9d02bada5cdc2377;hp=cea71b49d6462fdc53a744e80e277ce3f983a39b;hpb=2d5758c66089501bd41015c718dfb3eeb934373f;p=ncmpc.git

diff --git a/src/screen_keydef.c b/src/screen_keydef.c
index cea71b4..ba229ec 100644
--- a/src/screen_keydef.c
+++ b/src/screen_keydef.c
@@ -1,21 +1,21 @@
 /* ncmpc (Ncurses MPD Client)
- * (c) 2004-2009 The Music Player Daemon Project
+ * (c) 2004-2010 The Music Player Daemon Project
  * Project homepage: http://musicpd.org
-
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License along
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-*/
+ */
 
 #include "screen_keydef.h"
 #include "screen_interface.h"
@@ -190,7 +190,7 @@ assign_new_key(int cmd_index, int key_index)
 }
 
 static const char *
-list_callback(unsigned idx, bool *highlight, G_GNUC_UNUSED char** sc, G_GNUC_UNUSED void *data)
+list_callback(unsigned idx, G_GNUC_UNUSED void *data)
 {
 	static char buf[BUFSIZE];
 
@@ -202,8 +202,6 @@ list_callback(unsigned idx, bool *highlight, G_GNUC_UNUSED char** sc, G_GNUC_UNU
 
 		assert(idx < (unsigned)command_list_length);
 
-		if (cmds[idx].flags & COMMAND_KEY_CONFLICT)
-			*highlight = true;
 		return cmds[idx].name;
 	} else {
 		if (idx == 0)