rpms/mc/devel mc-showfree.patch,1.5,1.6 mc.spec,1.84,1.85

[fedora-cvs-commits at redhat.com]

Author: jnovy

Update of /cvs/dist/rpms/mc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32071

Modified Files:
	mc-showfree.patch mc.spec 
Log Message:
* Thu Mar 16 2006 Jindrich Novy <jnovy at redhat.com> 4.6.1a-11
- display the Layout dialog correctly on console (#185189)


mc-showfree.patch:
 layout.c |   59 +++++++++++++++++++++++++++++++++--------------------------
 layout.h |    1 +
 screen.c |   45 +++++++++++++++++++++++++++++++++++++++++++++
 setup.c  |    1 +
 4 files changed, 80 insertions(+), 26 deletions(-)

Index: mc-showfree.patch
===================================================================
RCS file: /cvs/dist/rpms/mc/devel/mc-showfree.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- mc-showfree.patch	28 Feb 2006 11:14:11 -0000	1.5
+++ mc-showfree.patch	16 Mar 2006 12:40:46 -0000	1.6
@@ -237,3 +237,39 @@
  
  extern int horizontal_split;
  extern int nice_rotating_dash;
+--- mc-4.6.1a/src/layout.c.jn	2006-03-16 10:20:31.000000000 +0100
++++ mc-4.6.1a/src/layout.c	2006-03-16 10:23:14.000000000 +0100
+@@ -296,9 +296,9 @@ layout_callback (struct Dlg_head *h, dlg
+ 	    if (old_output_lines != _output_lines){
+ 		old_output_lines = _output_lines;
+ 		attrset (COLOR_NORMAL);
+-		dlg_move (h, 9, 16 + first_width);
++		dlg_move (h, 10, 16 + first_width);
+ 		addstr (output_lines_label);
+-		dlg_move (h, 9, 10 + first_width);
++		dlg_move (h, 10, 10 + first_width);
+ 		tty_printf ("%02d", _output_lines);
+ 	    }
+ 	}
+@@ -341,7 +341,7 @@ layout_callback (struct Dlg_head *h, dlg
+ 	    if (old_output_lines != _output_lines){
+ 		old_output_lines = _output_lines;
+ 		attrset (COLOR_NORMAL);
+-		dlg_move (h, 9, 10 + first_width);
++		dlg_move (h, 10, 10 + first_width);
+ 		tty_printf ("%02d", _output_lines);
+ 	    }
+ 	}
+@@ -452,10 +452,10 @@ init_layout (void)
+ 			    0));
+     if (console_flag) {
+ 	add_widget (layout_dlg,
+-		    button_new (9, 12 + first_width, B_MINUS,
++		    button_new (10, 12 + first_width, B_MINUS,
+ 				NARROW_BUTTON, "&-", bminus_cback));
+ 	add_widget (layout_dlg,
+-		    button_new (9, 7 + first_width, B_PLUS, NARROW_BUTTON,
++		    button_new (10, 7 + first_width, B_PLUS, NARROW_BUTTON,
+ 				"&+", bplus_cback));
+     }
+ #define XTRACT(i) *check_options[i].variable, check_options[i].text


Index: mc.spec
===================================================================
RCS file: /cvs/dist/rpms/mc/devel/mc.spec,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- mc.spec	8 Mar 2006 11:13:51 -0000	1.84
+++ mc.spec	16 Mar 2006 12:40:46 -0000	1.85
@@ -1,7 +1,7 @@
 Summary:	User-friendly text console file manager and visual shell.
 Name:		mc
 Version:	4.6.1a
-Release:	10
+Release:	11
 Epoch:		1
 License:	GPL
 Group:		System Environment/Shells
@@ -192,6 +192,9 @@
 %dir %{_sysconfdir}/mc
 
 %changelog
+* Thu Mar 16 2006 Jindrich Novy <jnovy at redhat.com> 4.6.1a-11
+- display the Layout dialog correctly on console (#185189)
+
 * Wed Mar  8 2006 Jindrich Novy <jnovy at redhat.com> 4.6.1a-10
 - fix typo in extensions patch so that C sources are
   highlighted correctly (#184228)