Ticket #158: msg-codes.001.diff

edit/editcmd.c

@@ -2051 +2051 @@
             edit->force |= REDRAW_PAGE;
             edit_render_keypress (edit);
             if (times_replaced) {
-                message (0, msg, _(" %ld replacements made. "),
+                message (D_NORMAL, msg, _(" %ld replacements made. "),
                          times_replaced);
             } else
                 query_dialog (msg, _(" Search string not found "),
@@ -2130 +2130 @@
                 }
                 if (found) {
 /* in response to number of bookmarks added because of string being found %d times */
-                    message (0, _("Search"), _(" %d items found, %d bookmarks added "), found, books);
+                    message (D_NORMAL, _("Search"), _(" %d items found, %d bookmarks added "), found, books);
                 } else {
                     edit_error_dialog (_ ("Search"), _ (" Search string not found "));
                 }
@@ -2584 +2584 @@
                          quoted_name, (char *) NULL));
     }
     g_free (quoted_name);
-    close_error_pipe (0, 0);
+    close_error_pipe (D_NORMAL, NULL);
 
     edit_refresh_cmd (edit);
     edit->force |= REDRAW_COMPLETELY;

src/achown.c

@@ -627 +627 @@
     fname = current_panel->dir.list[current_file].fname;
     need_update = end_chown = 1;
     if (mc_chmod (fname, get_mode ()) == -1)
-        message (1, MSG_ERROR, _(" Cannot chmod \"%s\" \n %s "),
+        message (D_ERROR, MSG_ERROR, _(" Cannot chmod \"%s\" \n %s "),
                  fname, unix_error_string (errno));
     /* call mc_chown only, if mc_chmod didn't fail */
     else if (mc_chown (fname, (ch_flags[9] == '+') ? sf->st_uid : (uid_t) -1,
                        (ch_flags[10] == '+') ? sf->st_gid : (gid_t) -1) == -1)
-        message (1, MSG_ERROR, _(" Cannot chown \"%s\" \n %s "),
+        message (D_ERROR, MSG_ERROR, _(" Cannot chown \"%s\" \n %s "),
                  fname, unix_error_string (errno));
     do_file_mark (current_panel, current_file, 0);
 
@@ -643 +643 @@
             break;
         ch_cmode = sf->st_mode;
         if (mc_chmod (fname, get_mode ()) == -1)
-            message (1, MSG_ERROR, _(" Cannot chmod \"%s\" \n %s "),
+            message (D_ERROR, MSG_ERROR, _(" Cannot chmod \"%s\" \n %s "),
                      fname, unix_error_string (errno));
         /* call mc_chown only, if mc_chmod didn't fail */
         else if (mc_chown (fname, (ch_flags[9] == '+') ? a_uid : (uid_t) -1,
                            (ch_flags[10] == '+') ? a_gid : (gid_t) -1) == -1)
-            message (1, MSG_ERROR, _(" Cannot chown \"%s\" \n %s "),
+            message (D_ERROR, MSG_ERROR, _(" Cannot chown \"%s\" \n %s "),
                      fname, unix_error_string (errno));
 
         do_file_mark (current_panel, current_file, 0);
@@ -690 +690 @@
         case B_ENTER:
             need_update = 1;
             if (mc_chmod (fname, get_mode ()) == -1)
-                message (1, MSG_ERROR, _(" Cannot chmod \"%s\" \n %s "),
+                message (D_ERROR, MSG_ERROR, _(" Cannot chmod \"%s\" \n %s "),
                          fname, unix_error_string (errno));
             /* call mc_chown only, if mc_chmod didn't fail */
             else if (mc_chown (fname, (ch_flags[9] == '+') ? sf_stat->st_uid : (uid_t) -1,
                                (ch_flags[10] == '+') ? sf_stat->st_gid : (gid_t) -1) == -1)
-                message (1, MSG_ERROR, _(" Cannot chown \"%s\" \n %s "),
+                message (D_ERROR, MSG_ERROR, _(" Cannot chown \"%s\" \n %s "),
                          fname, unix_error_string (errno));
             break;
         case B_SETALL:

src/background.c

@@ -213 +213 @@
         if (!waitpid (ctx->pid, &status, WNOHANG)) {
             /* the process is still running, but it misbehaves - kill it */
             kill (ctx->pid, SIGTERM);
-            message (1, background_process_error, _(" Unknown error in child "));
+            message (D_ERROR, background_process_error, _(" Unknown error in child "));
             return 0;
         }
 
@@ -221 +221 @@
         if (WIFEXITED (status) && (WEXITSTATUS (status) == 0))
             return 0;
 
-        message (1, background_process_error, _(" Child died unexpectedly "));
+        message (D_ERROR, background_process_error, _(" Child died unexpectedly "));
 
         return 0;
     }
 
     read (fd, &argc, sizeof (argc));
     if (argc > MAXCALLARGS){
-        message (1, _(" Background protocol error "),
+        message (D_ERROR, _(" Background protocol error "),
                  _(" Background process sent us a request for more arguments \n"
                  " than we can handle. \n"));
     }

src/boxes.c

@@ -629 +629 @@
         errmsg =
             init_translation_table (source_codepage, display_codepage);
         if (errmsg)
-            message (1, MSG_ERROR, "%s", errmsg);
+            message (D_ERROR, MSG_ERROR, "%s", errmsg);
 #ifndef HAVE_SLANG
         meta (stdscr, display_codepage != 0);
 #else

src/chmod.c

@@ -243 +243 @@
     sf->st_mode &= and_mask;
     sf->st_mode |= or_mask;
     if (mc_chmod (current_panel->dir.list [c_file].fname, sf->st_mode) == -1)
-        message (1, MSG_ERROR, _(" Cannot chmod \"%s\" \n %s "),
+        message (D_ERROR, MSG_ERROR, _(" Cannot chmod \"%s\" \n %s "),
              current_panel->dir.list [c_file].fname, unix_error_string (errno));
 
     do_file_mark (current_panel, c_file, 0);
@@ -313 +313 @@
         case B_ENTER:
             if (mode_change)
                 if (mc_chmod (fname, c_stat) == -1)
-                    message (1, MSG_ERROR, _(" Cannot chmod \"%s\" \n %s "),
+                    message (D_ERROR, MSG_ERROR, _(" Cannot chmod \"%s\" \n %s "),
                          fname, unix_error_string (errno));
             need_update = 1;
             break;

src/chown.c

@@ -211 +211 @@
 do_chown (uid_t u, gid_t g)
 {
     if (mc_chown (current_panel->dir.list [current_file].fname, u, g) == -1)
-        message (1, MSG_ERROR, _(" Cannot chown \"%s\" \n %s "),
+        message (D_ERROR, MSG_ERROR, _(" Cannot chown \"%s\" \n %s "),
              current_panel->dir.list [current_file].fname, unix_error_string (errno));
 
     do_file_mark (current_panel, current_file, 0);
@@ -319 +319 @@
             if (ch_dlg->ret_value==B_ENTER) {
                 need_update = 1;
                 if (mc_chown (fname, new_user, new_group) == -1)
-                    message (1, MSG_ERROR, _(" Cannot chown \"%s\" \n %s "),
+                    message (D_ERROR, MSG_ERROR, _(" Cannot chown \"%s\" \n %s "),
                          fname, unix_error_string (errno));
             } else
                 apply_chowns (new_user, new_group);

src/cmd.c

@@ -189 +189 @@
         || link_isdir (selection (current_panel))) {
         if (confirm_view_dir && (current_panel->marked || current_panel->dirs_marked)) {
             if (query_dialog
-                (_(" Confirmation "), _("Files tagged, want to cd?"), 0, 2,
+                (_(" Confirmation "), _("Files tagged, want to cd?"), D_NORMAL, 2,
                  _("&Yes"), _("&No")) != 0) {
                 return;
             }
         }
         if (!do_cd (selection (current_panel)->fname, cd_exact))
-            message (1, MSG_ERROR, _("Cannot change directory"));
+            message (D_ERROR, MSG_ERROR, _("Cannot change directory"));
 
         return;
 
@@ -365 +365 @@
         repaint_screen ();
         select_item (current_panel);
     } else {
-        message (1, MSG_ERROR, "  %s  ", unix_error_string (errno));
+        message (D_ERROR, MSG_ERROR, "  %s  ", unix_error_string (errno));
     }
 
     g_free (absdir);
@@ -508 +508 @@
         c = regexp_match (reg_exp_t, current_panel->dir.list[i].fname,
                           match_file);
         if (c == -1) {
-            message (1, MSG_ERROR, _("  Malformed regular expression  "));
+            message (D_ERROR, MSG_ERROR, _("  Malformed regular expression  "));
             g_free (reg_exp);
             return;
         }
@@ -560 +560 @@
     dir = 0;
     if (geteuid () == 0){
         dir = query_dialog (_("Extension file edit"),
-                            _(" Which extension file you want to edit? "), 0, 2,
+                            _(" Which extension file you want to edit? "), D_NORMAL, 2,
                             _("&User"), _("&System Wide"));
     }
     extdir = concat_dir_and_file (mc_home, MC_LIB_EXT);
@@ -589 +589 @@
     dir = query_dialog (
         _(" Menu edit "),
         _(" Which menu file do you want to edit? "), 
-        0, geteuid() ? 2 : 3,
+        D_NORMAL, geteuid() ? 2 : 3,
         _("&Local"), _("&User"), _("&System Wide")
     );
 
@@ -633 +633 @@
         tree_chdir (the_tree, target);
     else
         if (!do_cd (target, cd_exact))
-            message (1, MSG_ERROR, _("Cannot change directory") );
+            message (D_ERROR, MSG_ERROR, _("Cannot change directory") );
     g_free (target);
 }
 
@@ -663 +663 @@
     if (geteuid () == 0) {
         dir =
             query_dialog (_("Syntax file edit"),
-                          _(" Which syntax file you want to edit? "), 0, 2,
+                          _(" Which syntax file you want to edit? "), D_NORMAL, 2,
                           _("&User"), _("&System Wide"));
     }
     extdir = concat_dir_and_file (mc_home, "syntax" PATH_SEP_STR "Syntax");
@@ -690 +690 @@
         return;
 
     if (!do_cd (target, cd_exact))
-        message (1, MSG_ERROR, _("Cannot change directory") );
+        message (D_ERROR, MSG_ERROR, _("Cannot change directory") );
     g_free (target);
 }
 #endif /* USE_VFS */
@@ -818 +818 @@
 
     choice =
         query_dialog (_(" Compare directories "),
-                      _(" Select compare method: "), 0, 3, _("&Quick"),
-                      _("&Size only"), _("&Thorough"), _("&Cancel"));
+                      _(" Select compare method: "), 0, D_NORMAL, 
+                      _("&Quick"), _("&Size only"), _("&Thorough"), _("&Cancel"));
 
     if (choice < 0 || choice > 2)
         return;
@@ -831 +831 @@
         compare_dir (current_panel, other_panel, thorough_flag);
         compare_dir (other_panel, current_panel, thorough_flag);
     } else {
-        message (1, MSG_ERROR,
+        message (D_ERROR, MSG_ERROR,
                  _(" Both panels should be in the "
                    "listing mode to use this command "));
     }
@@ -848 +848 @@
             cmdline->need_push = 0;
     }
     if (!cmdline->history) {
-        message (1, MSG_ERROR, _(" The command history is empty "));
+        message (D_ERROR, MSG_ERROR, _(" The command history is empty "));
         return;
     }
     current = g_list_first (cmdline->history);
@@ -887 +887 @@
 
     if (!xterm_flag && !console_flag && !use_subshell && !output_starts_shell) {
         if (message_flag)
-            message (1, MSG_ERROR,
+            message (D_ERROR, MSG_ERROR,
                      _(" Not an xterm or Linux console; \n"
                        " the panels cannot be toggled. "));
         message_flag = FALSE;
@@ -908 +908 @@
             goto cleanup;
         save_cwds_stat ();
         if (-1 == mc_link (fname, dest))
-            message (1, MSG_ERROR, _(" link: %s "),
+            message (D_ERROR, MSG_ERROR, _(" link: %s "),
                      unix_error_string (errno));
     } else {
         char *s;
@@ -931 +931 @@
             goto cleanup;
         save_cwds_stat ();
         if (-1 == mc_symlink (dest, src))
-            message (1, MSG_ERROR, _(" symlink: %s "),
+            message (D_ERROR, MSG_ERROR, _(" symlink: %s "),
                      unix_error_string (errno));
     }
     update_panels (UP_OPTIMIZE, UP_KEEPSEL);
@@ -977 +977 @@
                 if (*dest && strcmp (buffer, dest)) {
                     save_cwds_stat ();
                     if (-1 == mc_unlink (p)){
-                        message (1, MSG_ERROR, _(" edit symlink, unable to remove %s: %s "),
+                        message (D_ERROR, MSG_ERROR, _(" edit symlink, unable to remove %s: %s "),
                                  p, unix_error_string (errno));
                     } else {
                             if (-1 == mc_symlink (dest, p))
-                                    message (1, MSG_ERROR, _(" edit symlink: %s "),
+                                    message (D_ERROR, MSG_ERROR, _(" edit symlink: %s "),
                                              unix_error_string (errno));
                     }
                     update_panels (UP_OPTIMIZE, UP_KEEPSEL);
@@ -992 +992 @@
         }
         g_free (q);
     } else {
-        message (1, MSG_ERROR, _("`%s' is not a symbolic link"),
+        message (D_ERROR, MSG_ERROR, _("`%s' is not a symbolic link"),
                  selection (current_panel)->fname);
     }
 }
@@ -1110 +1110 @@
     if (do_panel_cd (MENU_PANEL, cd_path, 0))
         directory_history_add (MENU_PANEL, (MENU_PANEL)->cwd);
     else
-        message (1, MSG_ERROR, _(" Cannot chdir to %s "), cd_path);
+        message (D_ERROR, MSG_ERROR, _(" Cannot chdir to %s "), cd_path);
     g_free (cd_path);
     g_free (machine);
 }
@@ -1223 +1223 @@
 void
 save_setup_cmd (void)
 {
-    char *str;
-    
     save_setup ();
     sync_profiles ();
     
-    message (0, _(" Setup "), _(" Setup saved to ~/%s"), PROFILE_NAME);
+    message (D_NORMAL, _(" Setup "), _(" Setup saved to ~/%s"), PROFILE_NAME);
 }
 
 static void

src/command.c

@@ -183 +183 @@
     } else
         if (!examine_cd (&cmd [3])) {
             char *d = strip_password (g_strdup (&cmd [3]), 1);
-            message (1, MSG_ERROR, _(" Cannot chdir to \"%s\" \n %s "),
+            message (D_ERROR, MSG_ERROR, _(" Cannot chdir to \"%s\" \n %s "),
                      d, unix_error_string (errno));
             g_free (d);
             return;
@@ -215 +215 @@
         size_t i, j, cmd_len;
 
         if (!vfs_current_is_local ()) {
-            message (1, MSG_ERROR,
+            message (D_ERROR, MSG_ERROR,
                      _
                      (" Cannot execute commands on non-local filesystems"));
 
@@ -225 +225 @@
         /* Check this early before we clean command line
          * (will be checked again by shell_execute) */
         if (use_subshell && subshell_state != INACTIVE) {
-            message (1, MSG_ERROR,
+            message (D_ERROR, MSG_ERROR,
                      _(" The shell is already running a command "));
             return MSG_NOT_HANDLED;
         }

src/dir.c

@@ -397 +397 @@
 
     dirp = mc_opendir (path);
     if (!dirp) {
-        message (1, MSG_ERROR, _("Cannot read directory contents"));
+        message (D_ERROR, MSG_ERROR, _("Cannot read directory contents"));
         return next_free;
     }
     tree_store_start_check (path);
@@ -496 +496 @@
 
     dirp = mc_opendir (path);
     if (!dirp) {
-        message (1, MSG_ERROR, _("Cannot read directory contents"));
+        message (D_ERROR, MSG_ERROR, _("Cannot read directory contents"));
         clean_dir (list, count);
         return set_zero_dir (list);
     }

src/execute.c

@@ -189 +189 @@
         if (subshell_state == INACTIVE)
             do_execute (shell, cmd ? cmd : command, flags | EXECUTE_AS_SHELL);
         else
-            message (1, MSG_ERROR,
+            message (D_ERROR, MSG_ERROR,
                      _(" The shell is already running a command "));
     else
 #endif                          /* HAVE_SUBSHELL_SUPPORT */
@@ -352 +352 @@
 
     localcopy = mc_getlocalcopy (filename);
     if (localcopy == NULL) {
-        message (1, MSG_ERROR, _(" Cannot fetch a local copy of %s "),
+        message (D_ERROR, MSG_ERROR, _(" Cannot fetch a local copy of %s "),
                  filename);
         return;
     }

src/ext.c

@@ -100 +100 @@
     cmd_file_fd = mc_mkstemps (&file_name, "mcext", SCRIPT_SUFFIX);
 
     if (cmd_file_fd == -1) {
-        message (1, MSG_ERROR,
+        message (D_ERROR, MSG_ERROR,
                  _(" Cannot create temporary command file \n %s "),
                  unix_error_string (errno));
         return;
@@ -464 +464 @@
                     char *title =
                         g_strdup_printf (_(" %s%s file error"),
                             mc_home, MC_LIB_EXT);
-                    message (1, title, _("The format of the %smc.ext "
+                    message (D_ERROR, title, _("The format of the %smc.ext "
                         "file has changed with version 3.0.  It seems that "
                         "the installation failed.  Please fetch a fresh "
                         "copy from the Midnight Commander package."),
@@ -477 +477 @@
         if (home_error) {
             char *title =
                 g_strdup_printf (_(" ~/%s file error "), MC_USER_EXT);
-            message (1, title, _("The format of the ~/%s file has "
+            message (D_ERROR, title, _("The format of the ~/%s file has "
                 "changed with version 3.0.  You may either want to copy "
                 "it from %smc.ext or use that file as an example of how "
                 "to write it."), MC_USER_EXT, mc_home);

src/file.c

@@ -212 +212 @@
         case '*':
             if (next_reg < 0 || next_reg >= RE_NREGS
                 || ctx->regs.start[next_reg] < 0) {
-                message (1, MSG_ERROR, _(" Invalid target mask "));
+                message (D_ERROR, MSG_ERROR, _(" Invalid target mask "));
                 transform_error = FILE_ABORT;
                 return NULL;
             }
@@ -312 +312 @@
                     }
                 }
             }
-            message (1, MSG_ERROR, _(" Cannot make the hardlink "));
+            message (D_ERROR, MSG_ERROR, _(" Cannot make the hardlink "));
             return 0;
         }
     lp = (struct link *) g_malloc (sizeof (struct link) + strlen (src_name)
@@ -366 +366 @@
 
     if (ctx->stable_symlinks)
         if (!vfs_file_is_local (src_path) || !vfs_file_is_local (dst_path)) {
-            message (1, MSG_ERROR,
+            message (D_ERROR, MSG_ERROR,
                         _(" Cannot make stable symlinks across "
                           "non-local filesystems: \n\n"
                           " Option Stable Symlinks will be disabled "));
@@ -510 +510 @@
     if (dst_exists) {
         /* Destination already exists */
         if (sb.st_dev == sb2.st_dev && sb.st_ino == sb2.st_ino) {
-            message (1, MSG_ERROR,
+            message (D_ERROR, MSG_ERROR,
                     _(" `%s' and `%s' are the same file "), src_path, dst_path);
             do_refresh ();
             return FILE_SKIP;
@@ -586 +586 @@
 
     if (ctx->do_reget) {
         if (mc_lseek (src_desc, ctx->do_reget, SEEK_SET) != ctx->do_reget) {
-            message (1, _("Warning"),
+            message (D_ERROR, _("Warning"),
                         _(" Reget failed, about to overwrite file "));
             ctx->do_reget = ctx->do_append = 0;
         }
@@ -868 +868 @@
 
     if (is_in_linklist (parent_dirs, s, &cbuf)) {
         /* we found a cyclic symbolic link */
-        message (1, MSG_ERROR,
+        message (D_ERROR, MSG_ERROR,
                     _(" Cannot copy cyclic symbolic link \n `%s' "), s);
         return FILE_SKIP;
     }
@@ -1052 +1052 @@
 
             strcpy (st, path_trunc (s, msize));
             strcpy (dt, path_trunc (d, msize));
-            message (1, MSG_ERROR,
+            message (D_ERROR, MSG_ERROR,
                         _(" `%s' and `%s' are the same file "), st, dt);
             do_refresh ();
             return FILE_SKIP;
         }
 
         if (S_ISDIR (dst_stats.st_mode)) {
-            message (1, MSG_ERROR,
+            message (D_ERROR, MSG_ERROR,
                         _(" Cannot overwrite directory `%s' "), d);
             do_refresh ();
             return FILE_SKIP;
@@ -1175 +1175 @@
 
         strcpy (st, path_trunc (s, msize));
         strcpy (dt, path_trunc (d, msize));
-        message (1, MSG_ERROR,
+        message (D_ERROR, MSG_ERROR,
                     _(" `%s' and `%s' are the same directory "), st, dt);
         do_refresh ();
         return FILE_SKIP;
@@ -1753 +1753 @@
         }
 
         if (!strcmp (source, "..")) {
-            message (1, MSG_ERROR, _(" Cannot operate on \"..\"! "));
+            message (D_ERROR, MSG_ERROR, _(" Cannot operate on \"..\"! "));
             return 0;
         }
     }
@@ -1808 +1808 @@
                            g_strconcat (op_names[operation], ": ",
                                         panel->cwd, NULL));
         if (v == -1) {
-            message (1, MSG_ERROR,
+            message (D_ERROR, MSG_ERROR,
                      _(" Sorry, I could not put the job in background "));
         }
 

src/filegui.c

@@ -868 +868 @@
 
     g_return_val_if_fail (ctx != NULL, NULL);
 #if 0
-    message (1, __FUNCTION__, "text = `%s' \n def_text = `%s'", text,
+    message (D_ERROR, __FUNCTION__, "text = `%s' \n def_text = `%s'", text,
                 def_text);
 #endif
     fmd_init_i18n (FALSE);
@@ -946 +946 @@
                                 &ctx->rx);
 
     if (error) {
-        message (1, MSG_ERROR, _("Invalid source pattern `%s' \n %s "),
+        message (D_ERROR, MSG_ERROR, _("Invalid source pattern `%s' \n %s "),
                     orig_mask, error);
         g_free (orig_mask);
         goto ask_file_mask;

src/find.c

@@ -166 +166 @@
             flags |= REG_ICASE;
 
         if (regcomp (r, in_with->buffer, flags)) {
-            message (1, MSG_ERROR, _("  Malformed regular expression  "));
+            message (D_ERROR, MSG_ERROR, _("  Malformed regular expression  "));
             dlg_select_widget (in_with);
             h->running = 1;     /* Don't stop the dialog */
         }

src/help.c

@@ -292 +292 @@
     Link_Area *new;
 
     if (inside_link_area)
-        message (0, _("Warning"), _(" Internal bug: Double start of link area "));
+        message (D_NORMAL, _("Warning"), _(" Internal bug: Double start of link area "));
 
     /* Allocate memory for a new link area */
     new = g_new (Link_Area, 1);
@@ -540 +540 @@
     const char *new_item;
 
     if (!(new_item = search_string (data, "[Contents]"))) {
-        message (1, MSG_ERROR, _(" Cannot find node %s in help file "),
+        message (D_ERROR, MSG_ERROR, _(" Cannot find node %s in help file "),
                  "[Contents]");
         return;
     }
@@ -769 +769 @@
         data = load_mc_home_file ("mc.hlp", &hlpfile);
 
     if (data == NULL) {
-        message (1, MSG_ERROR, _(" Cannot open file %s \n %s "), filename ? filename : hlpfile,
+        message (D_ERROR, MSG_ERROR, _(" Cannot open file %s \n %s "), filename ? filename : hlpfile,
                  unix_error_string (errno));
     }
 
@@ -783 +783 @@
         node = "[main]";
 
     if (!(main_node = search_string (data, node))) {
-        message (1, MSG_ERROR, _(" Cannot find node %s in help file "),
+        message (D_ERROR, MSG_ERROR, _(" Cannot find node %s in help file "),
                  node);
 
         /* Fallback to [main], return if it also cannot be found */

src/learn.c

@@ -113 +113 @@
         }
 
         if (!seq_ok) {
-            message (0, _(" Cannot accept this key "),
+            message (D_NORMAL, _(" Cannot accept this key "),
                 _(" You have entered \"%s\""), seq);
         }
         
@@ -172 +172 @@
                 if (query_dialog (learn_title,
                                   _
                                   ("It seems that all your keys already\n"
-                                   "work fine. That's great."), 1, 2,
+                                   "work fine. That's great."), D_ERROR, 2,
                                   _("&Save"), _("&Discard")) == 0)
                     learn_dlg->ret_value = B_ENTER;
             } else {
-                message (1, learn_title,
+                message (D_ERROR, learn_title,
                          _
                          ("Great! You have a complete terminal database!\n"
                           "All your keys work well."));

src/main.c

@@ -425 +425 @@
 do_possible_cd (const char *new_dir)
 {
     if (!do_cd (new_dir, cd_exact))
-        message (1, _("Warning"),
+        message (D_ERROR, _("Warning"),
                  _(" The Commander can't change to the directory that \n"
                    " the subshell claims you are in.  Perhaps you have \n"
                    " deleted your working directory, or given yourself \n"
@@ -471 +471 @@
     } else {
         if (query_dialog
             (_(" The Midnight Commander "),
-             _(" Do you really want to quit the Midnight Commander? "), 0,
+             _(" Do you really want to quit the Midnight Commander? "), D_NORMAL,
              2, _("&Yes"), _("&No")) == 0)
             q = 1;
     }
@@ -685 +685 @@
     if (_do_panel_cd (panel, s, cd_exact))
         directory_history_add (panel, panel->cwd);
     else
-        message (1, MSG_ERROR, _("Cannot change directory"));
+        message (D_ERROR, MSG_ERROR, _("Cannot change directory"));
     g_free (s);
 }
 
@@ -990 +990 @@
 {
     fast_reload = !fast_reload;
     if (fast_reload_w == 0 && fast_reload) {
-        message (0, _(" Information "),
+        message (D_NORMAL, _(" Information "),
                  _
                  (" Using the fast reload option may not reflect the exact \n"
                   " directory contents. In this case you'll need to do a   \n"

src/panelize.c

@@ -264 +264 @@
     char *target = NULL;
 
     if (!vfs_current_is_local ()){
-        message (1, MSG_ERROR,
+        message (D_ERROR, MSG_ERROR,
                  _(" Cannot run external panelize in a non-local directory "));
         return;
     }
@@ -367 +367 @@
     open_error_pipe ();
     external = popen (command, "r");
     if (!external){
-        close_error_pipe (1, _("Cannot invoke command."));
+        close_error_pipe (D_ERROR, _("Cannot invoke command."));
         return;
     }
     /* Clear the counters and the directory list */
@@ -418 +418 @@
         current_panel->count = set_zero_dir (list);
     }
     if (pclose (external) < 0)
-        message (0, _("External panelize"), _("Pipe close failed"));
-    close_error_pipe (0, 0);
+        message (D_NORMAL, _("External panelize"), _("Pipe close failed"));
+    close_error_pipe (D_NORMAL, NULL);
     try_to_select (current_panel, NULL);
     panel_re_sort (current_panel);
 }

src/screen.c

@@ -1964 +1964 @@
     if (S_ISDIR (fe->st.st_mode) || link_isdir (fe)
         || (fe->st.st_mode == 0)) {
         if (!do_cd (fe->fname, cd_exact))
-            message (1, MSG_ERROR, _("Cannot change directory"));
+            message (D_ERROR, MSG_ERROR, _("Cannot change directory"));
         return 1;
     }
 
@@ -1983 +1983 @@
     if (confirm_execute) {
         if (query_dialog
             (_(" The Midnight Commander "),
-             _(" Do you really want to execute? "), 0, 2, _("&Yes"),
+             _(" Do you really want to execute? "), D_NORMAL, 2, _("&Yes"),
              _("&No")) != 0)
             return 1;
     }
@@ -2251 +2251 @@
         panel->active = 1;
         if (mc_chdir (panel->cwd) != 0) {
             char *cwd = strip_password (g_strdup (panel->cwd), 1);
-            message (1, MSG_ERROR, _(" Cannot chdir to \"%s\" \n %s "),
+            message (D_ERROR, MSG_ERROR, _(" Cannot chdir to \"%s\" \n %s "),
                      cwd, unix_error_string (errno));
             g_free(cwd);
         } else

src/selcodepage.c

@@ -99 +99 @@
         errmsg =
             init_translation_table (source_codepage, display_codepage);
         if (errmsg) {
-            message (1, MSG_ERROR, "%s", errmsg);
+            message (D_ERROR, MSG_ERROR, "%s", errmsg);
             return -1;
         }
     } else {
-        message (1, _("Warning"),
+        message (D_ERROR, _("Warning"),
                  _("To use this feature select your codepage in\n"
                    "Setup / Display Bits dialog!\n"
                    "Do not forget to save options."));

src/subshell.c

@@ -655 +655 @@
 int
 exit_subshell (void)
 {
-    int quit = TRUE;
+    int subshell_quit = TRUE;
 
     if (subshell_state != INACTIVE && subshell_alive)
-        quit =
+        subshell_quit =
             !query_dialog (_("Warning"),
                            _(" The shell is still active. Quit anyway? "),
-                           0, 2, _("&Yes"), _("&No"));
+                           D_NORMAL, 2, _("&Yes"), _("&No"));
 
-    if (quit) {
+    if (subshell_quit) {
         if (subshell_type == TCSH) {
             if (unlink (tcsh_fifo) == -1)
                 fprintf (stderr, "Cannot remove named pipe %s: %s\r\n",
@@ -676 +676 @@
         pty_buffer = NULL;
     }
 
-    return quit;
+    return subshell_quit;
 }
 
 

src/tree.c

@@ -649 +649 @@
         return;
     }
     if (stat (dest, &buf)){
-        message (1, MSG_ERROR, _(" Cannot stat the destination \n %s "),
+        message (D_ERROR, MSG_ERROR, _(" Cannot stat the destination \n %s "),
                  unix_error_string (errno));
         g_free (dest);
         return;
@@ -714 +714 @@
             g_strdup_printf (_("  Delete %s?  "),
                              tree->selected_ptr->name);
         result =
-            query_dialog (_(" Delete "), buf, 3, 2, _("&Yes"), _("&No"));
+            query_dialog (_(" Delete "), buf, D_ERROR, 2, _("&Yes"), _("&No"));
         g_free (buf);
         if (result != 0)
             return;
@@ -831 +831 @@
     if (do_cd (tree->selected_ptr->name, cd_exact)) {
         select_item (current_panel);
     } else {
-        message (1, MSG_ERROR, _(" Cannot chdir to \"%s\" \n %s "),
+        message (D_ERROR, MSG_ERROR, _(" Cannot chdir to \"%s\" \n %s "),
                  tree->selected_ptr->name, unix_error_string (errno));
     }
     change_panel ();

src/user.c

@@ -130 +130 @@
             return 0;
 
         if (!dots || dots == q+5){
-            message (1,
+            message (D_ERROR,
                      _(" Format error on file Extensions File "),
                      !dots ? _(" The %%var macro has no default ")
                      :       _(" The %%var macro has no variable "));
@@ -463 +463 @@
             len = strlen (msg);
             if (len)
                 msg [len - 1] = 0;
-            message (0, _(" Debug "), "%s", msg);
+            message (D_NORMAL, _(" Debug "), "%s", msg);
 
         }
         debug_flag = 0;
@@ -580 +580 @@
     cmd_file_fd = mc_mkstemps (&file_name, "mcusr", SCRIPT_SUFFIX);
 
     if (cmd_file_fd == -1){
-        message (1, MSG_ERROR, _(" Cannot create temporary command file \n %s "),
+        message (D_ERROR, MSG_ERROR, _(" Cannot create temporary command file \n %s "),
                  unix_error_string (errno));
         return;
     }
@@ -688 +688 @@
     }
     if (verbose)
     {
-        message (0, _(" Warning -- ignoring file "),
+        message (D_NORMAL, _(" Warning -- ignoring file "),
                     _("File %s is not owned by root or you or is world writable.\n"
                     "Using it may compromise your security"),
                 path
@@ -712 +712 @@
     Listbox *listbox;
     
     if (!vfs_current_is_local ()){
-        message (1, MSG_ERROR,
+        message (D_ERROR, MSG_ERROR,
                  _(" Cannot execute commands on non-local filesystems"));
         return;
     }
@@ -730 +730 @@
     }
 
     if ((data = load_file (menu)) == NULL){
-        message (1, MSG_ERROR, _(" Cannot open file %s \n %s "),
+        message (D_ERROR, MSG_ERROR, _(" Cannot open file %s \n %s "),
                  menu, unix_error_string (errno));
         g_free (menu);
         menu = NULL;
@@ -811 +811 @@
     }
 
     if (menu_lines == 0) {
-        message (1, MSG_ERROR, _(" No suitable entries found in %s "), menu);
+        message (D_ERROR, MSG_ERROR, _(" No suitable entries found in %s "), menu);
     } else {
 
     max_cols = min (max (max_cols, col), MAX_ENTRY_LEN);

src/utilunix.c

@@ -339 +339 @@
 void open_error_pipe (void)
 {
     if (pipe (error_pipe) < 0){
-        message (0, _("Warning"), _(" Pipe failed "));
+        message (D_NORMAL, _("Warning"), _(" Pipe failed "));
     }
     old_error = dup (2);
     if(old_error < 0 || close(2) || dup (error_pipe[1]) != 2){
-        message (0, _("Warning"), _(" Dup failed "));
+        message (D_NORMAL, _("Warning"), _(" Dup failed "));
         close (error_pipe[0]);
         close (error_pipe[1]);
     }

src/view.c

@@ -432 +432 @@
                 view->growbuf_finished = TRUE;
                 (void) pclose (view->ds_stdio_pipe);
                 display (view);
-                close_error_pipe (0, NULL);
+                close_error_pipe (D_NORMAL, NULL);
                 view->ds_stdio_pipe = NULL;
                 return;
             }
@@ -690 +690 @@
             if (view->ds_stdio_pipe != NULL) {
                 (void) pclose (view->ds_stdio_pipe);
                 display (view);
-                close_error_pipe (0, NULL);
+                close_error_pipe (D_NORMAL, NULL);
                 view->ds_stdio_pipe = NULL;
             }
             view_growbuf_free (view);
@@ -1450 +1450 @@
     if (view_is_in_panel (view)) {
         view_set_datasource_string (view, msg);
     } else {
-        message (1, MSG_ERROR, "%s", msg);
+        message (D_ERROR, MSG_ERROR, "%s", msg);
     }
 }
 
@@ -1465 +1465 @@
     if ((fp = popen (command, "r")) == NULL) {
         /* Avoid two messages.  Message from stderr has priority.  */
         display (view);
-        if (!close_error_pipe (view_is_in_panel (view) ? -1 : 1, NULL))
+        if (!close_error_pipe (view_is_in_panel (view) ? -1 : D_ERROR, NULL))
             view_show_error (view, _(" Cannot spawn child process "));
         return FALSE;
     }
@@ -1477 +1477 @@
 
         /* Avoid two messages.  Message from stderr has priority.  */
         display (view);
-        if (!close_error_pipe (view_is_in_panel (view) ? -1 : 1, NULL))
+        if (!close_error_pipe (view_is_in_panel (view) ? -1 : D_ERROR, NULL))
             view_show_error (view, _("Empty output from child filter"));
         return FALSE;
     }
@@ -2445 +2445 @@
         destroy_dlg (d);
     }
     if (!s) {
-        message (0, _("Search"), _(" Search string not found "));
+        message (D_NORMAL, _("Search"), _(" Search string not found "));
         view->search_length = 0;
     }
 }
@@ -2596 +2596 @@
 
     /* No valid bytes in the user input */
     if (block_len <= 0 || parse_error) {
-        message (0, _("Search"), _("Invalid hex search expression"));
+        message (D_NORMAL, _("Search"), _("Invalid hex search expression"));
         g_free (buffer);
         view->search_length = 0;
         return;
@@ -2608 +2608 @@
     g_free (buffer);
 
     if (pos == INVALID_OFFSET) {
-        message (0, _("Search"), _(" Search string not found "));
+        message (D_NORMAL, _("Search"), _(" Search string not found "));
         view->search_length = 0;
         return;
     }
@@ -2648 +2648 @@
         }
         flags |= REG_EXTENDED;
         if (regcomp (&r, pattern, flags)) {
-            message (1, MSG_ERROR, _(" Invalid regular expression "));
+            message (D_ERROR, MSG_ERROR, _(" Invalid regular expression "));
             return -1;
         }
         old_pattern = g_strdup (pattern);

vfs/cpio.c

@@ -157 +157 @@
     struct vfs_s_inode *root;
 
     if ((fd = mc_open (name, O_RDONLY)) == -1) {
-        message (1, MSG_ERROR, _("Cannot open cpio archive\n%s"), name);
+        message (D_ERROR, MSG_ERROR, _("Cannot open cpio archive\n%s"), name);
         return -1;
     }
 
@@ -173 +173 @@
         mc_close (fd);
         s = g_strconcat (name, decompress_extension (type), (char *) NULL);
         if ((fd = mc_open (s, O_RDONLY)) == -1) {
-            message (1, MSG_ERROR, _("Cannot open cpio archive\n%s"), s);
+            message (D_ERROR, MSG_ERROR, _("Cannot open cpio archive\n%s"), s);
             g_free (s);
             return -1;
         }
@@ -239 +239 @@
                 top = 128;
             }
             if((tmp = mc_read(super->u.arch.fd, buf, top)) == 0 || tmp == -1) {
-                message (1, MSG_ERROR, _("Premature end of cpio archive\n%s"), super->name);
+                message (D_ERROR, MSG_ERROR, _("Premature end of cpio archive\n%s"), super->name);
                 cpio_free_archive(me, super);
                 return CPIO_UNKNOWN;
             }
@@ -284 +284 @@
     g_assert(u.buf.c_magic == 070707);
 
     if (u.buf.c_namesize == 0 || u.buf.c_namesize > MC_MAXPATHLEN) {
-        message (1, MSG_ERROR, _("Corrupted cpio header encountered in\n%s"), 
+        message (D_ERROR, MSG_ERROR, _("Corrupted cpio header encountered in\n%s"), 
                 super->name);
         return STATUS_FAIL;
     }
@@ -336 +336 @@
               &hd.c_dev, &hd.c_ino, &hd.c_mode, &hd.c_uid, &hd.c_gid,
               &hd.c_nlink, &hd.c_rdev, &hd.c_mtime,
               &hd.c_namesize, &hd.c_filesize) < 10) {
-        message (1, MSG_ERROR, _("Corrupted cpio header encountered in\n%s"),
+        message (D_ERROR, MSG_ERROR, _("Corrupted cpio header encountered in\n%s"),
                     super->name);
         return STATUS_FAIL;
     }
 
     if (hd.c_namesize == 0 || hd.c_namesize > MC_MAXPATHLEN) {
-        message (1, MSG_ERROR, _("Corrupted cpio header encountered in\n%s"),
+        message (D_ERROR, MSG_ERROR, _("Corrupted cpio header encountered in\n%s"),
                     super->name);
         return STATUS_FAIL;
     }
@@ -396 +396 @@
               &hd.c_nlink,  &hd.c_mtime, &hd.c_filesize,
               &hd.c_dev, &hd.c_devmin, &hd.c_rdev, &hd.c_rdevmin,
               &hd.c_namesize, &hd.c_chksum) < 14) {
-        message (1, MSG_ERROR, _("Corrupted cpio header encountered in\n%s"),
+        message (D_ERROR, MSG_ERROR, _("Corrupted cpio header encountered in\n%s"),
                    super->name);
         return STATUS_FAIL;
     }
@@ -406 +406 @@
         return STATUS_FAIL;
 
     if (hd.c_namesize == 0 || hd.c_namesize > MC_MAXPATHLEN) {
-        message (1, MSG_ERROR, _("Corrupted cpio header encountered in\n%s"),
+        message (D_ERROR, MSG_ERROR, _("Corrupted cpio header encountered in\n%s"),
                     super->name);
         return STATUS_FAIL;
     }
@@ -480 +480 @@
             inode = l->inode;
             if (inode->st.st_size && st->st_size
                 && (inode->st.st_size != st->st_size)) {
-                message (1, MSG_ERROR,
+                message (D_ERROR, MSG_ERROR,
                          _
                          ("Inconsistent hardlinks of\n%s\nin cpio archive\n%s"),
                          name, super->name);
@@ -507 +507 @@
                                    'No such file or directory' is such case) */
 
         if (!S_ISDIR (entry->ino->st.st_mode)) {        /* This can be considered archive inconsistency */
-            message (1, MSG_ERROR,
+            message (D_ERROR, MSG_ERROR,
                      _("%s contains duplicate entries! Skipping!"),
                      super->name);
         } else {
@@ -579 +579 @@
 
         switch (status) {
         case STATUS_EOF:
-            message (1, MSG_ERROR, _("Unexpected end of file\n%s"), name);
+            message (D_ERROR, MSG_ERROR, _("Unexpected end of file\n%s"), name);
             return 0;
         case STATUS_OK:
             continue;

vfs/direntry.c

@@ -431 +431 @@
 #if 0
     /* FIXME: We currently leak small ammount of memory, sometimes. Fix it if you can. */
     if (super->ino_usage)
-        message (1, " Direntry warning ",
+        message (D_ERROR, " Direntry warning ",
                          "Super ino_usage is %d, memory leak",
                          super->ino_usage);
 
     if (super->want_stale)
-        message (1, " Direntry warning ", "Super has want_stale set");
+        message (D_ERROR, " Direntry warning ", "Super has want_stale set");
 #endif
 
     if (super->prevp){

vfs/extfs.c

@@ -256 +256 @@
     result = popen (cmd, "r");
     g_free (cmd);
     if (result == NULL) {
-        close_error_pipe (1, NULL);
+        close_error_pipe (D_ERROR, NULL);
         if (local_name) {
             mc_ungetlocalcopy (name, local_name, 0);
             g_free(local_name);
@@ -314 +314 @@
 
     if ((extfsd =
          extfs_open_archive (fstype, name, &current_archive)) == NULL) {
-        message (1, MSG_ERROR, _("Cannot open %s archive\n%s"),
+        message (D_ERROR, MSG_ERROR, _("Cannot open %s archive\n%s"),
                  extfs_prefixes[fstype], name);
         return -1;
     }
@@ -354 +354 @@
                     /* FIXME: Should clean everything one day */
                     g_free (buffer);
                     pclose (extfsd);
-                    close_error_pipe (1, _("Inconsistent extfs archive"));
+                    close_error_pipe (D_ERROR, _("Inconsistent extfs archive"));
                     return -1;
                 }
                 entry = g_new (struct entry, 1);
@@ -373 +373 @@
                         /* FIXME: Should clean everything one day */
                         g_free (buffer);
                         pclose (extfsd);
-                        close_error_pipe (1,
+                        close_error_pipe (D_ERROR,
                                           _("Inconsistent extfs archive"));
                         return -1;
                     } else {
@@ -425 +425 @@
     /* Check if extfs 'list' returned 0 */
     if (pclose (extfsd) != 0) {
         extfs_free (current_archive);
-        close_error_pipe (1, _("Inconsistent extfs archive"));
+        close_error_pipe (D_ERROR, _("Inconsistent extfs archive"));
         return -1;
     }
 
-    close_error_pipe (1, NULL);
+    close_error_pipe (D_ERROR, NULL);
     *pparc = current_archive;
     return 0;
 }
@@ -633 +633 @@
     open_error_pipe ();
     retval = my_system (EXECUTE_AS_SHELL, shell, cmd);
     g_free (cmd);
-    close_error_pipe (1, NULL);
+    close_error_pipe (D_ERROR, NULL);
     return retval;
 }
 

vfs/fish.c

@@ -239 +239 @@
             /* Currently, this does not work. ssh reads passwords from
                /dev/tty, not from stdin :-(. */
 
-            message (1, MSG_ERROR,
+            message (D_ERROR, MSG_ERROR,
                      _
                      ("Sorry, we cannot do password authenticated connections for now."));
             ERRNOR (EPERM, -1);

vfs/ftpfs.c

@@ -527 +527 @@
             goto login_fail;
         }
     }
-    message (1, MSG_ERROR, _("ftpfs: Login incorrect for user %s "),
+    message (D_ERROR, MSG_ERROR, _("ftpfs: Login incorrect for user %s "),
              SUP.user);
   login_fail:
     wipe_password (pass);
@@ -1786 +1786 @@
 
     if (stat (netrcname, &mystat) >= 0 && (mystat.st_mode & 077)) {
         if (be_angry) {
-            message (1, MSG_ERROR,
+            message (D_ERROR, MSG_ERROR,
                         _("~/.netrc file has incorrect mode.\n"
                           "Remove password or correct mode."));
             be_angry = 0;

vfs/mcfs.c

@@ -130 +130 @@
         return 0;
 
     if (result != MC_VERSION_OK) {
-        message (1, _(" MCFS "),
+        message (D_ERROR, _(" MCFS "),
                     _(" The server does not support this version "));
         close (my_socket);
         return 0;
@@ -151 +151 @@
                               (" The remote server is not running on a system port \n"
                                " you need a password to log in, but the information may \n"
                                " not be safe on the remote side.  Continue? \n"),
-                              3, 2, _("&Yes"), _("&No"));
+                              D_ERROR, 2, _("&Yes"), _("&No"));
 
             if (v == 1) {
                 close (my_socket);
@@ -175 +175 @@
             return 0;
 
         if (result != MC_LOGINOK) {
-            message (1, _(" MCFS "), _(" Invalid password "));
+            message (D_ERROR, _(" MCFS "), _(" Invalid password "));
             rpc_send (my_socket, RPC_INT, MC_QUIT, RPC_END);
             close (my_socket);
             return 0;
@@ -235 +235 @@
                 sizeof (inaddr));
     else {
         if ((hp = gethostbyname (host)) == NULL) {
-            message (1, caller, _(" Cannot locate hostname: %s "),
+            message (D_ERROR, caller, _(" Cannot locate hostname: %s "),
                         host);
             return 0;
         }
@@ -254 +254 @@
     server_address.sin_port = htons (*port);
 
     if ((my_socket = socket (AF_INET, SOCK_STREAM, 0)) < 0) {
-        message (1, caller, _(" Cannot create socket: %s "),
+        message (D_ERROR, caller, _(" Cannot create socket: %s "),
                     unix_error_string (errno));
         return 0;
     }
     if (connect (my_socket, (struct sockaddr *) &server_address,
                  sizeof (server_address)) < 0) {
-        message (1, caller, _(" Cannot connect to server: %s "),
+        message (D_ERROR, caller, _(" Cannot connect to server: %s "),
                     unix_error_string (errno));
         close (my_socket);
         return 0;
@@ -330 +330 @@
                 return &mcfs_connections[i];
         }
     if (mcfs_open_connections == MCFS_MAX_CONNECTIONS) {
-        message (1, MSG_ERROR, _(" Too many open connections "));
+        message (D_ERROR, MSG_ERROR, _(" Too many open connections "));
         return 0;
     }
 

vfs/sfs.c

@@ -147 +147 @@
     g_free (pqname);
     open_error_pipe ();
     if (my_system (EXECUTE_AS_SHELL, "/bin/sh", pad)) {
-        close_error_pipe (1, NULL);
+        close_error_pipe (D_ERROR, NULL);
         return -1;
     }
 
-    close_error_pipe (0, NULL);
+    close_error_pipe (D_NORMAL, NULL);
     return 0;                   /* OK */
 }
 

vfs/smbfs.c

@@ -604 +604 @@
         cli_shutdown(conn->cli);
 
         if (!(conn->cli = smbfs_do_connect(host, conn->service))) {
-                message (1, MSG_ERROR,
+                message (D_ERROR, MSG_ERROR,
                         _(" reconnect to %s failed\n "), conn->host);
                 g_free(host);
                 return False;
@@ -1162 +1162 @@
 
         if (my_errno != EPERM)
             return 0;
-        message (1, MSG_ERROR, _(" Authentication failed "));
+        message (D_ERROR, MSG_ERROR, _(" Authentication failed "));
 
         /* authentication failed, try again */
         smbfs_auth_remove (bucket->host, bucket->service);
@@ -1685 +1685 @@
 
     if (!cli_mkdir (sc->cli, cpath)) {
         my_errno = cli_error (sc->cli, NULL, &err, NULL);
-        message (1, MSG_ERROR, _(" Error %s creating directory %s "),
+        message (D_ERROR, MSG_ERROR, _(" Error %s creating directory %s "),
                     cli_errstr (sc->cli), CNV_LANG (cpath));
         g_free (cpath);
         return -1;
@@ -1711 +1711 @@
 
         if (!cli_rmdir(sc->cli, cpath)) {
                 my_errno = cli_error(sc->cli, NULL, &err, NULL);
-                message (1, MSG_ERROR, _(" Error %s removing directory %s "), 
+                message (D_ERROR, MSG_ERROR, _(" Error %s removing directory %s "), 
                         cli_errstr(sc->cli), CNV_LANG(cpath));
                 g_free (cpath);
                 return -1;
@@ -1813 +1813 @@
                   flags : O_RDONLY, DENY_NONE);
 #endif
     if (remote_handle->fnum == -1) {
-        message (1, MSG_ERROR, _(" %s opening remote file %s "),
+        message (D_ERROR, MSG_ERROR, _(" %s opening remote file %s "),
                     cli_errstr (remote_handle->cli), CNV_LANG (rname));
         DEBUG (1, ("smbfs_open(rname:%s) error:%s\n",
                    rname, cli_errstr (remote_handle->cli)));
@@ -1829 +1829 @@
                         NULL)
         && !cli_getattrE (remote_handle->cli, remote_handle->fnum,
                           &remote_handle->attr, &size, NULL, NULL, NULL)) {
-        message (1, MSG_ERROR, " getattrib: %s ",
+        message (D_ERROR, MSG_ERROR, " getattrib: %s ",
                     cli_errstr (remote_handle->cli));
         DEBUG (1,
                ("smbfs_open(rname:%s) getattrib:%s\n", rname,
@@ -1892 +1892 @@
     remote_file = free_after(smbfs_convert_path (remote_file, FALSE), remote_file);
 
     if (!cli_unlink(sc->cli, remote_file)) {
-        message (1, MSG_ERROR, _(" %s removing remote file %s "), 
+        message (D_ERROR, MSG_ERROR, _(" %s removing remote file %s "), 
                         cli_errstr(sc->cli), CNV_LANG(remote_file));
         g_free (remote_file);
         return -1;
@@ -1927 +1927 @@
     g_free (rb);
 
     if (!retval) {
-        message (1, MSG_ERROR, _(" %s renaming files\n"), 
+        message (D_ERROR, MSG_ERROR, _(" %s renaming files\n"), 
                         cli_errstr(sc->cli));
         return -1;
     }   

vfs/tar.c

@@ -223 +223 @@
 
     result = mc_open (name, O_RDONLY);
     if (result == -1) {
-        message (1, MSG_ERROR, _("Cannot open tar archive\n%s"), name);
+        message (D_ERROR, MSG_ERROR, _("Cannot open tar archive\n%s"), name);
         ERRNOR (ENOENT, -1);
     }
 
@@ -241 +241 @@
         s = g_strconcat (archive->name, decompress_extension (type), (char *) NULL);
         result = mc_open (s, O_RDONLY);
         if (result == -1)
-            message (1, MSG_ERROR, _("Cannot open tar archive\n%s"), s);
+            message (D_ERROR, MSG_ERROR, _("Cannot open tar archive\n%s"), s);
         g_free (s);
         if (result == -1)
             ERRNOR (ENOENT, -1);
@@ -483 +483 @@
             archive->u.arch.type = TAR_GNU;
 
         if (*h_size > MC_MAXPATHLEN) {
-            message (1, MSG_ERROR, _("Inconsistent tar archive"));
+            message (D_ERROR, MSG_ERROR, _("Inconsistent tar archive"));
             return STATUS_BADCHECKSUM;
         }
 
@@ -498 +498 @@
             if (data == NULL) {
                 g_free (*longp);
                 *longp = NULL;
-                message (1, MSG_ERROR,
+                message (D_ERROR, MSG_ERROR,
                          _("Unexpected EOF on archive file"));
                 return STATUS_BADCHECKSUM;
             }
@@ -513 +513 @@
         if (bp - *longp == MC_MAXPATHLEN && bp[-1] != '\0') {
             g_free (*longp);
             *longp = NULL;
-            message (1, MSG_ERROR, _("Inconsistent tar archive"));
+            message (D_ERROR, MSG_ERROR, _("Inconsistent tar archive"));
             return STATUS_BADCHECKSUM;
         }
         *bp = 0;
@@ -588 +588 @@
         parent =
             vfs_s_find_inode (me, archive, q, LINK_NO_FOLLOW, FL_MKDIR);
         if (parent == NULL) {
-            message (1, MSG_ERROR, _("Inconsistent tar archive"));
+            message (D_ERROR, MSG_ERROR, _("Inconsistent tar archive"));
             return STATUS_BADCHECKSUM;
         }
 
@@ -597 +597 @@
                 vfs_s_find_inode (me, archive, current_link_name,
                                   LINK_NO_FOLLOW, 0);
             if (inode == NULL) {
-                message (1, MSG_ERROR, _("Inconsistent tar archive"));
+                message (D_ERROR, MSG_ERROR, _("Inconsistent tar archive"));
             } else {
                 entry = vfs_s_new_entry (me, p, inode);
                 vfs_s_insert_entry (me, parent, entry);
@@ -678 +678 @@
 
                 /* Error on first record */
             case STATUS_EOFMARK:
-                message (1, MSG_ERROR,
+                message (D_ERROR, MSG_ERROR,
                          _
                          ("Hmm,...\n%s\ndoesn't look like a tar archive."),
                          name);

vfs/undelfs.c

@@ -188 +188 @@
     num_delarray = 0;
     delarray = g_try_malloc (sizeof (struct deleted_info) * max_delarray);
     if (!delarray) {
-        message (1, undelfserr, _(" not enough memory "));
+        message (D_ERROR, undelfserr, _(" not enough memory "));
         return 0;
     }
     block_buf = g_try_malloc (fs->blocksize * 3);
     if (!block_buf) {
-        message (1, undelfserr, _(" while allocating block buffer "));
+        message (D_ERROR, undelfserr, _(" while allocating block buffer "));
         goto free_delarray;
     }
     if ((retval = ext2fs_open_inode_scan (fs, 0, &scan))) {
-        message (1, undelfserr, _(" open_inode_scan: %d "), retval);
+        message (D_ERROR, undelfserr, _(" open_inode_scan: %d "), retval);
         goto free_block_buf;
     }
     if ((retval = ext2fs_get_next_inode (scan, &ino, &inode))) {
-        message (1, undelfserr, _(" while starting inode scan %d "),
+        message (D_ERROR, undelfserr, _(" while starting inode scan %d "),
                  retval);
         goto error_out;
     }
@@ -227 +227 @@
             ext2fs_block_iterate (fs, ino, 0, block_buf,
                                   undelfs_lsdel_proc, &lsd);
         if (retval) {
-            message (1, undelfserr,
+            message (D_ERROR, undelfserr,
                      _(" while calling ext2_block_iterate %d "), retval);
             goto next;
         }
@@ -238 +238 @@
                                    sizeof (struct deleted_info) *
                                    (max_delarray + 50));
                 if (!delarray_new) {
-                    message (1, undelfserr,
+                    message (D_ERROR, undelfserr,
                              _
                              (" no more memory while reallocating array "));
                     goto error_out;
@@ -261 +261 @@
       next:
         retval = ext2fs_get_next_inode (scan, &ino, &inode);
         if (retval) {
-            message (1, undelfserr, _(" while doing inode scan %d "),
+            message (D_ERROR, undelfserr, _(" while doing inode scan %d "),
                      retval);
             goto error_out;
         }
@@ -296 +296 @@
     str = g_strdup_vprintf (fmt, ap);
     va_end (ap);
 
-    message (1, _(" Ext2lib error "), " %s (%s: %ld) ", str, whoami,
+    message (D_ERROR, _(" Ext2lib error "), " %s (%s: %ld) ", str, whoami,
              err_code);
     g_free (str);
 }
@@ -324 +324 @@
     }
 
     if (ext2fs_open (ext2_fname, 0, 0, 0, unix_io_manager, &fs)){
-        message (1, undelfserr, _(" Cannot open file %s "), ext2_fname);
+        message (D_ERROR, undelfserr, _(" Cannot open file %s "), ext2_fname);
         return 0;
     }
     print_vfs_message (_("undelfs: reading inode bitmap..."));
     if (ext2fs_read_inode_bitmap (fs)){
-        message (1, undelfserr,
+        message (D_ERROR, undelfserr,
                  _(" Cannot load inode bitmap from: \n %s \n"), ext2_fname);
         goto quit_opendir;
     }
     print_vfs_message (_("undelfs: reading block bitmap..."));
     if (ext2fs_read_block_bitmap (fs)){
-        message (1, undelfserr,
+        message (D_ERROR, undelfserr,
                  _(" Cannot load block bitmap from: \n %s \n"), ext2_fname);
         goto quit_opendir;
     }
@@ -359 +359 @@
     static char *const dirent_dest = undelfs_readdir_data.dent.d_name;
 
     if (vfs_info != fs) {
-        message (1, undelfserr, _(" vfs_info is not fs! "));
+        message (D_ERROR, undelfserr, _(" vfs_info is not fs! "));
         return NULL;
     }
     if (readdir_ptr == num_delarray)
@@ -413 +413 @@
         return 0;
 
     if (!ext2_fname || strcmp (ext2_fname, file)) {
-        message (1, undelfserr,
+        message (D_ERROR, undelfserr,
                  _(" You have to chdir to extract files first "));
         g_free (file);
         g_free (f);
@@ -537 +537 @@
     retval = ext2fs_block_iterate(fs, p->inode, 0, NULL,
                                   undelfs_dump_read, p);
     if (retval){
-        message (1, undelfserr, _(" while iterating over blocks "));
+        message (D_ERROR, undelfserr, _(" while iterating over blocks "));
         return -1;
     }
     if (p->error_code && !p->finished)
@@ -598 +598 @@
     }
         
     if (!ext2_fname || strcmp (ext2_fname, file)){
-        message (1, undelfserr, _(" You have to chdir to extract files first "));
+        message (D_ERROR, undelfserr, _(" You have to chdir to extract files first "));
         g_free (file);
         g_free (f);
         return 0;
@@ -637 +637 @@
     /* this could be fixed by making an ext2fs io manager to use */
     /* our vfs, but that is left as an excercise for the reader */
     if ((fd = open (file, O_RDONLY)) == -1){
-        message (1, undelfserr, _(" Cannot open file %s "), file);
+        message (D_ERROR, undelfserr, _(" Cannot open file %s "), file);
         g_free (f);
         g_free (file);
         return -1;

vfs/utilvfs.c

@@ -818 +818 @@
         static int errorcount = 0;
 
         if (++errorcount < 5) {
-            message (1, _("Cannot parse:"), "%s",
+            message (D_ERROR, _("Cannot parse:"), "%s",
                      (p_copy && *p_copy) ? p_copy : line);
         } else if (errorcount == 5)
-            message (1, MSG_ERROR,
+            message (D_ERROR, MSG_ERROR,
                      _("More parsing errors will be ignored."));
     }
 
@@ -832 +832 @@
 void
 vfs_die (const char *m)
 {
-    message (1, _("Internal error:"), "%s", m);
+    message (D_ERROR, _("Internal error:"), "%s", m);
     exit (1);
 }
 

vfs/vfs.c

@@ -841 +841 @@
     return 0;
 
   failed:
-    message (1, _("Changes to file lost"), "%s", filename);
+    message (D_ERROR, _("Changes to file lost"), "%s", filename);
     if (fdout != -1)
         mc_close (fdout);
     if (fdin != -1)