drop the stupid xterm.h header.

Signed-off-by: Pierre Habouzit <madcoder@debian.org>

diff --git a/lib-ui/curs_main.c b/lib-ui/curs_main.c
index 6e20d66..ddb5be5 100644 (file)
--- a/lib-ui/curs_main.c
+++ b/lib-ui/curs_main.c
@@ -14,6 +14,7 @@
 
 #include <lib-ui/sidebar.h>
 #include <lib-mx/mx.h>
+#include <lib-crypt/crypt.h>
 
 #include <pop/pop.h>
 
@@ -26,14 +27,11 @@
 #include "recvattach.h"
 #include "buffy.h"
 #include "thread.h"
-#include "xterm.h"
 
 #include <imap/imap_private.h>
 
-#include <lib-crypt/crypt.h>
-
 #ifdef USE_NNTP
-#include "nntp/nntp.h"
+#include <nntp/nntp.h>
 #endif
 
 #ifdef USE_SASL
@@ -549,10 +547,11 @@ int mutt_index_menu (void)
         sidebar_set_buffystats (Context);
         menu->redraw &= ~REDRAW_STATUS;
         if (option (OPTXTERMSETTITLES)) {
-          menu_status_line (buf, sizeof (buf), menu, NONULL (XtermTitle));
-          mutt_xterm_set_title (buf);
-          menu_status_line (buf, sizeof (buf), menu, NONULL (XtermIcon));
-          mutt_xterm_set_icon (buf);
+          menu_status_line(buf, sizeof(buf), menu, NONULL(XtermTitle));
+          printf("\033]2;%s\007", buf);
+          menu_status_line(buf, sizeof(buf), menu, NONULL(XtermIcon));
+          printf("\033]1;%s\007", buf);
+          fflush(stdout);
         }
       }
 

diff --git a/main.c b/main.c
index 3624bb6..23af035 100644 (file)
--- a/main.c
+++ b/main.c
@@ -859,7 +859,7 @@ int main (int argc, char **argv)
         || !explicit_folder) {
       mutt_index_menu ();
       if (option (OPTXTERMSETTITLES))
-        mutt_xterm_set_title (NONULL (XtermLeave));
+        printf("\033]2;%s\007", NONULL(XtermLeave));
       if (Context)
         p_delete(&Context);
     }

diff --git a/xterm.h b/xterm.h
deleted file mode 100644 (file)
index ffb162d..0000000
--- a/xterm.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * This file is part of mutt-ng, see http://www.muttng.org/.
- * It's licensed under the GNU General Public License,
- * please see the file GPL in the top level source directory.
- */
-#ifndef MUTT_XTERM_H
-#define MUTT_XTERM_H
-
-#include <lib-lib/lib-lib.h>
-
-/* sets the current xterm's title */
-static inline void mutt_xterm_set_title(const char *title) {
-    printf("\033]2;%s\007", NONULL(title));
-    fflush(stdout);
-}
-
-/* sets the current xterm's icon */
-static inline void mutt_xterm_set_icon(const char *name) {
-    printf("\033]1;%s\007", NONULL(name));
-    fflush(stdout);
-}
-
-#endif /* !MUTT_XTERM_H */