SOURCES: kdesdk-kompare-encoding.patch (NEW) - read default encodi...

charles charles at pld-linux.org
Mon Feb 20 01:39:29 CET 2006


Author: charles                      Date: Mon Feb 20 00:39:29 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- read default encoding from locale (not C/POSIX)

---- Files affected:
SOURCES:
   kdesdk-kompare-encoding.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: SOURCES/kdesdk-kompare-encoding.patch
diff -u /dev/null SOURCES/kdesdk-kompare-encoding.patch:1.1
--- /dev/null	Mon Feb 20 01:39:29 2006
+++ SOURCES/kdesdk-kompare-encoding.patch	Mon Feb 20 01:39:24 2006
@@ -0,0 +1,45 @@
+--- kdesdk-3.5.1/kompare/libdiff2/kompareprocess.cpp.orig	2005-09-10 10:21:04.000000000 +0200
++++ kdesdk-3.5.1/kompare/libdiff2/kompareprocess.cpp	2006-02-20 01:30:11.000000000 +0100
+@@ -46,8 +46,6 @@
+ 	connect( this, SIGNAL( processExited( KProcess* ) ),
+ 	         SLOT  ( slotProcessExited( KProcess* ) ) );
+ 
+-	*this << "LANG=C";
+-
+ 	// Write command and options
+ 	if( m_mode == Kompare::Default )
+ 	{
+--- kdesdk-3.5.1/kompare/kompare_shell.cpp.orig	2005-09-10 10:21:05.000000000 +0200
++++ kdesdk-3.5.1/kompare/kompare_shell.cpp	2006-02-20 01:30:57.000000000 +0100
+@@ -192,7 +192,6 @@
+ {
+ 	kdDebug(8102) << "Url = " << url.prettyURL() << endl;
+ 	m_diffURL = url;
+-	m_viewPart->setEncoding( "Default" );
+ 	m_viewPart->openDiff( url );
+ }
+ 
+@@ -207,7 +206,6 @@
+ 
+ 	file.close();
+ 
+-	m_viewPart->setEncoding( "Default" );
+ 	m_viewPart->openDiff( diff );
+ 
+ }
+@@ -217,7 +215,6 @@
+ 	m_sourceURL = source;
+ 	m_destinationURL = destination;
+ 
+-	m_viewPart->setEncoding( "Default" );
+ 	m_viewPart->compare( source, destination );
+ }
+ 
+@@ -226,7 +223,6 @@
+ 	m_sourceURL = url1;
+ 	m_destinationURL = diff;
+ 
+-	m_viewPart->setEncoding( "Default" );
+ 	m_viewPart->openDirAndDiff( url1, diff );
+ }
+ 
================================================================


More information about the pld-cvs-commit mailing list