X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=lib-ui%2Fcurs_main.c;h=780daf1c8838893b4dd76de59c8b585216e98f6b;hp=fdce20e261297a049455c6b11330a7872728888d;hb=928ca0d87eb15bfa4c150abdadadaf3b177f95bd;hpb=74697a5c38af6a85ce3b0062d781c35814a9f536

diff --git a/lib-ui/curs_main.c b/lib-ui/curs_main.c
index fdce20e..780daf1 100644
--- a/lib-ui/curs_main.c
+++ b/lib-ui/curs_main.c
@@ -13,6 +13,8 @@
 #include <lib-lib/lib-lib.h>
 
 #include <lib-ui/sidebar.h>
+#include <lib-mx/mx.h>
+#include <lib-crypt/crypt.h>
 
 #include <pop/pop.h>
 
@@ -21,20 +23,15 @@
 
 #include "mutt.h"
 #include "alias.h"
-#include "mx.h"
 #include "sort.h"
 #include "recvattach.h"
 #include "buffy.h"
-#include "mx.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
@@ -550,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);
         }
       }
 
@@ -926,15 +924,14 @@ int mutt_index_menu (void)
       if (op == OP_TOGGLE_READ) {
         char buffer[LONG_STRING];
 
-        if (!Context->pattern
-            || strncmp (Context->pattern, "!~R!~D~s", 8) != 0) {
+        if (m_strncmp (Context->pattern, "!~R!~D~s", 8) != 0) {
           snprintf (buffer, sizeof (buffer), "!~R!~D~s%s",
                     Context->pattern ? Context->pattern : ".*");
           set_option (OPTHIDEREAD);
         }
         else {
           m_strcpy(buf, sizeof(buf), Context->pattern + 8);
-          if (!*buf || strncmp (buf, ".*", 2) == 0)
+          if (m_strncmp (buf, ".*", 2) == 0)
             snprintf (buf, sizeof (buf), "~A");
           unset_option (OPTHIDEREAD);
         }
@@ -2318,9 +2315,6 @@ int mutt_index_menu (void)
     if (menu->menu == MENU_PAGER) {
       menu->menu = MENU_MAIN;
       menu->redraw = REDRAW_FULL;
-#if 0
-      set_option (OPTWEED);     /* turn header weeding back on. */
-#endif
     }
 
     if (done)