From: Max Kellermann <max@duempel.org>
Date: Fri, 3 Oct 2008 12:26:27 +0000 (+0200)
Subject: screen_search: removed the FUTURE macro
X-Git-Tag: v0.12_alpha1~82
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=182a5fe764a50a35738ee2ea5f8a5b8f5c31144c;p=ncmpc.git

screen_search: removed the FUTURE macro

The future is now!
---

diff --git a/src/screen_search.c b/src/screen_search.c
index a1f5045..ba5b1c0 100644
--- a/src/screen_search.c
+++ b/src/screen_search.c
@@ -34,11 +34,6 @@
 #include <glib.h>
 #include <ncurses.h>
 
-/* new search stuff with qball's libmpdclient */
-#define FUTURE
-
-#ifdef FUTURE
-
 extern gint mpdclient_finish_command(mpdclient_t *c);
 
 typedef struct {
@@ -77,8 +72,6 @@ search_get_tag_id(char *name)
 	return -1;
 }
 
-#endif
-
 #define SEARCH_TITLE    0
 #define SEARCH_ARTIST   1
 #define SEARCH_ALBUM    2
@@ -189,7 +182,6 @@ search_clear(mpd_unused screen_t *screen, mpdclient_t *c,
 	}
 }
 
-#ifdef FUTURE
 static mpdclient_filelist_t *
 filelist_search(mpdclient_t *c, mpd_unused int exact_match, int table,
 		gchar *local_pattern)
@@ -313,9 +305,6 @@ search_advanced_query(char *query, mpdclient_t *c)
 
 	return fl;
 }
-#else
-#define search_advanced_query(pattern,c) (NULL)
-#endif
 
 static void
 search_new(screen_t *screen, mpdclient_t *c)