X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=init.c;h=04f45e8f8b19dd6688e1e64c9d70e18be10bd765;hp=a0d194dff292bf451e4f2ea6dadf084fdf542d9a;hb=cfd213639e7ba03079d9dd76b77b0c972e844e1a;hpb=5ef16452ce43a12e467e7004a6a240aefb87a774

diff --git a/init.c b/init.c
index a0d194d..04f45e8 100644
--- a/init.c
+++ b/init.c
@@ -14,7 +14,7 @@
 
 #include <lib-lua/lib-lua.h>
 #include <lib-sys/unix.h>
-#include <lib-ui/curses.h>
+#include <lib-ui/lib-ui.h>
 #include <lib-ui/history.h>
 #include <lib-mx/mx.h>
 
@@ -81,9 +81,6 @@ static struct {
   int (*check) (const char* option, unsigned long val,
                 char* errbuf, ssize_t errlen);
 } SpecialVars[] = {
-#ifdef USE_LIBESMTP
-  { "smtp_use_tls",             send_smtp_check_usetls },
-#endif
   { "history",                  check_history },
   { "pager_index_lines",        check_num },
   /* last */
@@ -437,7 +434,7 @@ int query_quadoption2(int v, const char *prompt)
 
   default:
     v = mutt_yesorno(prompt, (v == M_ASKYES));
-    CLEARLINE (LINES - 1);
+    CLEARLINE(main_w, LINES - 1);
     return (v);
   }
 }
@@ -453,7 +450,7 @@ int query_quadoption (int opt, const char *prompt)
 
   default:
     v = mutt_yesorno (prompt, (v == M_ASKYES));
-    CLEARLINE (LINES - 1);
+    CLEARLINE(main_w, LINES - 1);
     return (v);
   }
 
@@ -1632,36 +1629,6 @@ int mutt_var_value_complete (char *buffer, ssize_t len, int pos)
   return 0;
 }
 
-/* Implement the -Q command line flag */
-int mutt_query_variables (string_list_t * queries)
-{
-  string_list_t *p;
-
-  char errbuff[STRING];
-  char command[STRING];
-
-  BUFFER err, token;
-
-  p_clear(&err, 1);
-  p_clear(&token, 1);
-
-  err.data = errbuff;
-  err.dsize = sizeof(errbuff);
-
-  for (p = queries; p; p = p->next) {
-    snprintf (command, sizeof(command), "set ?%s\n", p->data);
-    if (mutt_parse_rc_line (command, &token, &err) == -1) {
-      fprintf (stderr, "%s\n", err.data);
-      p_delete(&token.data);
-      return 1;
-    }
-    printf ("%s\n", err.data);
-  }
-
-  p_delete(&token.data);
-  return 0;
-}
-
 static int mutt_execute_commands (string_list_t * p)
 {
   BUFFER err, token;
@@ -1761,13 +1728,6 @@ void mutt_init (int skip_sys_rc, string_list_t * commands)
   hash_map (ConfigOptions, mutt_restore_default, 0);
 
   CurrentMenu = MENU_MAIN;
-
-#ifdef HAVE_GETSID
-  /* Unset suspend by default if we're the session leader */
-  if (getsid (0) == getpid ())
-    unset_option (OPTSUSPEND);
-#endif
-
   mutt_init_history ();
 
   if (!Muttrc) {
@@ -1870,26 +1830,3 @@ int mutt_get_hook_type (const char *name)
   return 0;
 }
 
-/* dump out the value of all the variables we have */
-int mutt_dump_variables (int full) {
-    ssize_t i = 0;
-
-    /* get all non-synonyms into list... */
-    for (i = 0; MuttVars[i].option; i++) {
-        struct option_t *option = MuttVars + i;
-        char buf[LONG_STRING];
-
-        if (!full) {
-            mutt_option_value(option->option, buf, sizeof(buf));
-            if (!m_strcmp(buf, option->init))
-                continue;
-        }
-
-        printf("set ");
-        FuncTable[DTYPE(option->type)].opt_tostr(buf, sizeof(buf), option);
-        printf ("%s\n", buf);
-    }
-
-    printf ("\n# vi""m:set ft=muttrc:\n");
-    return 0;
-}