Merge branch '3035_cleanup'

* 3035_cleanup:
  (hline_callback): fix of MSG_INIT and MSG_RESIZE messages handling.
  src/filemanager/find.c: type accuracy.
  (menubar_new): add 3rd 'visible' argument.
  rpm extfs: fix rpm file name in status message.
  Ticket #3035: prepare to 4.8.10 release.

lib/widget/hline.c

@@ -79,6 +79,7 @@ hline_callback (Widget * w, Widget * sender, widget_msg_t msg, int parm, void *d
                 w->cols = wo->cols - 2;
             }
         }
+        return MSG_HANDLED;
 
     case MSG_FOCUS:
         /* We don't want to get the focus */

lib/widget/menu.c

@@ -836,7 +836,7 @@ destroy_menu (menu_t * menu)
 /* --------------------------------------------------------------------------------------------- */
 
 WMenuBar *
-menubar_new (int y, int x, int cols, GList * menu)
+menubar_new (int y, int x, int cols, GList * menu, gboolean visible)
 {
     WMenuBar *menubar;
     Widget *w;
@@ -845,7 +845,7 @@ menubar_new (int y, int x, int cols, GList * menu)
     w = WIDGET (menubar);
     widget_init (w, y, x, 1, cols, menubar_callback, menubar_event);
 
-    menubar->is_visible = TRUE; /* by default */
+    menubar->is_visible = visible;
     widget_want_cursor (w, FALSE);
     menubar_set_menu (menubar, menu);
 

lib/widget/menu.h

@@ -49,7 +49,7 @@ menu_t *create_menu (const char *name, GList * entries, const char *help_node);
 void menu_set_name (menu_t * menu, const char *name);
 void destroy_menu (menu_t * menu);
 
-WMenuBar *menubar_new (int y, int x, int cols, GList * menu);
+WMenuBar *menubar_new (int y, int x, int cols, GList * menu, gboolean visible);
 void menubar_set_menu (WMenuBar * menubar, GList * menu);
 void menubar_add_menu (WMenuBar * menubar, menu_t * menu);
 void menubar_arrange (WMenuBar * menubar);

src/editor/editwidget.c

@@ -1217,7 +1217,7 @@ edit_files (const GList * files)
     edit_dlg->get_shortcut = edit_get_shortcut;
     edit_dlg->get_title = edit_get_title;
 
-    menubar = menubar_new (0, 0, COLS, NULL);
+    menubar = menubar_new (0, 0, COLS, NULL, TRUE);
     add_widget (edit_dlg, menubar);
     edit_init_menu (menubar);
 

src/filemanager/file.c

@@ -2378,7 +2378,14 @@ move_dir_dir (FileOpTotalContext * tctx, FileOpContext * ctx, const char *s, con
     mc_refresh ();
     if (ctx->erase_at_end)
     {
-        for (; erase_list != NULL && return_status != FILE_ABORT;)
+        /* remove files after move */
+        if (erase_list != NULL)
+        {
+            file_op_context_destroy_ui (ctx);
+            file_op_context_create_ui (ctx, FALSE, FILEGUI_DIALOG_DELETE_ITEM);
+        }
+
+        while (erase_list != NULL && return_status != FILE_ABORT)
         {
             struct link *lp = (struct link *) erase_list->data;
 

src/filemanager/find.c

@@ -150,7 +150,7 @@ static gboolean is_start = FALSE;       /* Status of the start/stop toggle butto
 static char *old_dir = NULL;
 
 /* Where did we stop */
-static int resuming;
+static gboolean resuming;
 static int last_line;
 static int last_pos;
 
@@ -1068,7 +1068,7 @@ search_content (WDialog * h, const char *directory, const char *filename)
         if (resuming)
         {
             /* We've been previously suspended, start from the previous position */
-            resuming = 0;
+            resuming = FALSE;
             line = last_line;
             pos = last_pos;
         }
@@ -1106,7 +1106,7 @@ search_content (WDialog * h, const char *directory, const char *filename)
                     ret_val = TRUE;
                     break;
                 case FIND_SUSPEND:
-                    resuming = 1;
+                    resuming = TRUE;
                     last_line = line;
                     last_pos = pos;
                     ret_val = TRUE;
@@ -1382,7 +1382,7 @@ init_find_vars (void)
 /* --------------------------------------------------------------------------------------------- */
 
 static void
-find_do_view_edit (int unparsed_view, int edit, char *dir, char *file)
+find_do_view_edit (gboolean unparsed_view, gboolean edit, char *dir, char *file)
 {
     char *fullname = NULL;
     const char *filename = NULL;
@@ -1404,7 +1404,7 @@ find_do_view_edit (int unparsed_view, int edit, char *dir, char *file)
     if (edit)
         do_edit_at_line (fullname_vpath, use_internal_edit, line);
     else
-        view_file_at_line (fullname_vpath, unparsed_view, use_internal_view, line);
+        view_file_at_line (fullname_vpath, unparsed_view ? 1 : 0, use_internal_view, line);
     vfs_path_free (fullname_vpath);
     g_free (fullname);
 }
@@ -1412,7 +1412,7 @@ find_do_view_edit (int unparsed_view, int edit, char *dir, char *file)
 /* --------------------------------------------------------------------------------------------- */
 
 static cb_ret_t
-view_edit_currently_selected_file (int unparsed_view, int edit)
+view_edit_currently_selected_file (gboolean unparsed_view, gboolean edit)
 {
     char *dir = NULL;
     char *text = NULL;
@@ -1477,11 +1477,12 @@ find_callback (Widget * w, Widget * sender, widget_msg_t msg, int parm, void *da
     case MSG_KEY:
         if (parm == KEY_F (3) || parm == KEY_F (13))
         {
-            int unparsed_view = (parm == KEY_F (13));
-            return view_edit_currently_selected_file (unparsed_view, 0);
+            gboolean unparsed_view = (parm == KEY_F (13));
+
+            return view_edit_currently_selected_file (unparsed_view, FALSE);
         }
         if (parm == KEY_F (4))
-            return view_edit_currently_selected_file (0, 1);
+            return view_edit_currently_selected_file (FALSE, TRUE);
         return MSG_NOT_HANDLED;
 
     case MSG_RESIZE:
@@ -1530,7 +1531,7 @@ find_do_view_file (WButton * button, int action)
     (void) button;
     (void) action;
 
-    view_edit_currently_selected_file (0, 0);
+    view_edit_currently_selected_file (FALSE, FALSE);
     return 0;
 }
 
@@ -1543,7 +1544,7 @@ find_do_edit_file (WButton * button, int action)
     (void) button;
     (void) action;
 
-    view_edit_currently_selected_file (0, 1);
+    view_edit_currently_selected_file (FALSE, TRUE);
     return 0;
 }
 
@@ -1639,7 +1640,7 @@ run_process (void)
     search_file_handle->is_all_charsets = options.file_all_charsets;
     search_file_handle->is_entire_line = options.file_pattern;
 
-    resuming = 0;
+    resuming = FALSE;
 
     widget_want_idle (WIDGET (find_dlg), TRUE);
     ret = dlg_run (find_dlg);

src/filemanager/midnight.c

@@ -711,7 +711,7 @@ create_panels (void)
     the_hint->auto_adjust_cols = 0;
     WIDGET (the_hint)->cols = COLS;
 
-    the_menubar = menubar_new (0, 0, COLS, NULL);
+    the_menubar = menubar_new (0, 0, COLS, NULL, menubar_visible);
 }
 
 /* --------------------------------------------------------------------------------------------- */

src/vfs/extfs/helpers/rpm

@@ -288,8 +288,8 @@ mcrpmfs_copyout ()
 mcrpmfs_run ()
 {
     case "$1" in
-	INSTALL) echo "Installing \"\"$f\"\""; $RPM -ivh "${rpm_filename}"; exit 0;;
-	UPGRADE) echo "Upgrading \"\"$f\"\""; $RPM -Uvh "${rpm_filename}"; exit 0;;
+	INSTALL) echo "Installing \"${rpm_filename}\""; $RPM -ivh "${rpm_filename}"; exit 0;;
+	UPGRADE) echo "Upgrading \"${rpm_filename}\""; $RPM -Uvh "${rpm_filename}"; exit 0;;
 	REBUILD) echo "Rebuilding \"${rpm_filename}\""; $RPMBUILD --rebuild "${rpm_filename}"; exit 0;;
     esac
 }