[Pkg-mc-commits] r227 - in trunk/debian: . patches/bugs

[Patrick Winnertz]

Author: winnie
Date: 2009-08-07 10:52:23 +0000 (Fri, 07 Aug 2009)
New Revision: 227

Added:
   trunk/debian/patches/bugs/1461_line_feeds_info_panel.patch
Modified:
   trunk/debian/changelog
Log:
Fix information dialog linefeeds



Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2009-08-05 19:51:16 UTC (rev 226)
+++ trunk/debian/changelog	2009-08-07 10:52:23 UTC (rev 227)
@@ -1,3 +1,9 @@
+mc (2:4.7.0-pre1-3) unstable; urgency=low
+
+  * Fix layout issue in the info page (Closes: #539958)
+
+ -- Patrick Winnertz <winnie at debian.org>  Fri, 07 Aug 2009 12:45:59 +0200
+
 mc (2:4.7.0-pre1-2) unstable; urgency=low
 
   [ Denis Briand ]

Added: trunk/debian/patches/bugs/1461_line_feeds_info_panel.patch
===================================================================
--- trunk/debian/patches/bugs/1461_line_feeds_info_panel.patch	                        (rev 0)
+++ trunk/debian/patches/bugs/1461_line_feeds_info_panel.patch	2009-08-07 10:52:23 UTC (rev 227)
@@ -0,0 +1,68 @@
+commit 11cc7a700912dfc73a0c499def67282564c36ab0
+Author: Andrew Borodin <aborodin at vmail.ru>
+Date:   Fri Aug 7 11:38:28 2009 +0400
+
+    Ticket 1461: missing line feeds in Info panel.
+    
+    Thanks to Denis Briand.
+    
+    Signed-off-by: Andrew Borodin <aborodin at vmail.ru>
+
+diff --git a/src/info.c b/src/info.c
+index b0f6dd5..ecae194 100644
+--- a/src/info.c
++++ b/src/info.c
+@@ -114,7 +114,7 @@ info_show_info (struct WInfo *info)
+ 		    myfs_stats.nodes);
+ 	else
+ 	    addstr (_("No node information"));
+-	
++
+     case 15:
+ 	widget_move (&info->widget, 15, 3);
+ 	if (myfs_stats.avail > 0 || myfs_stats.total > 0){
+@@ -139,20 +139,23 @@ info_show_info (struct WInfo *info)
+         str_printf (buff, _("Device:    %s"), 
+                 str_trunc (myfs_stats.device, info->widget.cols - i18n_adjust));
+         addstr (str_term_form (buff->str));
+-        g_string_set_size(buff,0);
++        g_string_set_size(buff, 0);
+     case 12:
+ 	widget_move (&info->widget, 12, 3);
+         str_printf (buff, _("Filesystem: %s"),
+ 		str_trunc (myfs_stats.mpoint, info->widget.cols - i18n_adjust));
+         addstr (str_term_form (buff->str));
++        g_string_set_size(buff, 0);
+     case 11:
+ 	widget_move (&info->widget, 11, 3);
+         str_printf (buff, _("Accessed:  %s"), file_date (st.st_atime));
+         addstr (str_term_form (buff->str));
++        g_string_set_size(buff, 0);
+     case 10:
+ 	widget_move (&info->widget, 10, 3);
+         str_printf (buff, _("Modified:  %s"), file_date (st.st_mtime));
+         addstr (str_term_form (buff->str));
++        g_string_set_size(buff, 0);
+     case 9:
+ 	widget_move (&info->widget, 9, 3);
+ 	/* TRANSLATORS: "Status changed", like in the stat(2) man page */
+@@ -177,7 +180,7 @@ info_show_info (struct WInfo *info)
+ 		(long int) st.st_blocks);
+ #endif
+ 	}
+-	
++
+     case 7:
+ 	widget_move (&info->widget, 7, 3);
+ 	tty_printf (_("Owner:     %s/%s"),
+@@ -206,8 +209,8 @@ info_show_info (struct WInfo *info)
+ 				    info->widget.cols - i18n_adjust));
+             addstr (str_term_form (buff->str));
+ 	} else
+-		addstr (_("File:       None"));
+-     
++	    addstr (_("File:       None"));
++
+     case 2:
+     case 1:
+     case 0: