rev 11488 - in trunk/packages/kdepim/debian: . patches

[Ana Beatriz Guerrero López]

Author: ana
Date: 2008-07-13 23:42:10 +0000 (Sun, 13 Jul 2008)
New Revision: 11488

Modified:
   trunk/packages/kdepim/debian/changelog
   trunk/packages/kdepim/debian/patches/01_kdepim_branch_r825749.diff
Log:
Update 01_kdepim_branch_r825749 to remove regression with email To|Cc
name fields using not ascii characters.



Modified: trunk/packages/kdepim/debian/changelog
===================================================================
--- trunk/packages/kdepim/debian/changelog	2008-07-13 23:02:02 UTC (rev 11487)
+++ trunk/packages/kdepim/debian/changelog	2008-07-13 23:42:10 UTC (rev 11488)
@@ -1,5 +1,8 @@
-kdepim (4:3.5.9-5) UNRELEASED; urgency=low
-
+kdepim (4:3.5.9-5) unstable; urgency=medium
+  
+  * Update 01_kdepim_branch_r825749 to remove regression with email To|Cc
+    name fields using not ascii characters. Thanks to Frans Pop for looking 
+    at this and updating the patch. (Closes: #489994)
   * Use wildcards when installing kdepim-apidocs. (Closes: #483327)
   * Add patch by Felipe Sateler to reduce the number of interrupts in knode.
     (Closes: #472054)

Modified: trunk/packages/kdepim/debian/patches/01_kdepim_branch_r825749.diff
===================================================================
--- trunk/packages/kdepim/debian/patches/01_kdepim_branch_r825749.diff	2008-07-13 23:02:02 UTC (rev 11487)
+++ trunk/packages/kdepim/debian/patches/01_kdepim_branch_r825749.diff	2008-07-13 23:42:10 UTC (rev 11488)
@@ -1242,10 +1242,6 @@
  Name[zh_CN]=其它密钥
  Name[zh_TW]=其他金鑰
  
-Index: libkmime/kmime_util.cpp
-===================================================================
-Index: libkmime/kmime_util.h
-===================================================================
 Index: karm/idletimedetector.cpp
 ===================================================================
 --- karm/idletimedetector.cpp.orig	2007-05-14 09:54:33.000000000 +0200
@@ -3231,70 +3227,6 @@
 ===================================================================
 --- kmail/kmmessage.cpp.orig	2008-02-13 10:39:37.000000000 +0100
 +++ kmail/kmmessage.cpp	2008-06-29 20:10:36.000000000 +0200
-@@ -1875,7 +1875,12 @@
- QString KMMessage::to() const
- {
-   // handle To same as Cc below, bug 80747
--  return KPIM::normalizeAddressesAndDecodeIDNs( headerFields( "To" ).join( ", " ) );
-+  QValueList<QCString> rawHeaders = rawHeaderFields( "To" );
-+  QStringList headers;
-+  for ( QValueList<QCString>::Iterator it = rawHeaders.begin(); it != rawHeaders.end(); ++it ) {
-+    headers << *it;
-+  }
-+  return KPIM::normalizeAddressesAndDecodeIDNs( headers.join( ", " ) );
- }
- 
- 
-@@ -1894,7 +1899,7 @@
- //-----------------------------------------------------------------------------
- QString KMMessage::replyTo() const
- {
--  return KPIM::normalizeAddressesAndDecodeIDNs( headerField("Reply-To") );
-+  return KPIM::normalizeAddressesAndDecodeIDNs( rawHeaderField("Reply-To") );
- }
- 
- 
-@@ -1917,7 +1922,12 @@
- {
-   // get the combined contents of all Cc headers (as workaround for invalid
-   // messages with multiple Cc headers)
--  return KPIM::normalizeAddressesAndDecodeIDNs( headerFields( "Cc" ).join( ", " ) );
-+  QValueList<QCString> rawHeaders = rawHeaderFields( "Cc" );
-+  QStringList headers;
-+  for ( QValueList<QCString>::Iterator it = rawHeaders.begin(); it != rawHeaders.end(); ++it ) {
-+    headers << *it;
-+  }
-+  return KPIM::normalizeAddressesAndDecodeIDNs( headers.join( ", " ) );
- }
- 
- 
-@@ -1938,7 +1948,7 @@
- //-----------------------------------------------------------------------------
- QString KMMessage::bcc() const
- {
--  return KPIM::normalizeAddressesAndDecodeIDNs( headerField("Bcc") );
-+  return KPIM::normalizeAddressesAndDecodeIDNs( rawHeaderField("Bcc") );
- }
- 
- 
-@@ -1977,7 +1987,7 @@
- QString KMMessage::who() const
- {
-   if (mParent)
--    return KPIM::normalizeAddressesAndDecodeIDNs( headerField(mParent->whoField().utf8()) );
-+    return KPIM::normalizeAddressesAndDecodeIDNs( rawHeaderField(mParent->whoField().utf8()) );
-   return from();
- }
- 
-@@ -1985,7 +1995,7 @@
- //-----------------------------------------------------------------------------
- QString KMMessage::from() const
- {
--  return KPIM::normalizeAddressesAndDecodeIDNs( headerField("From") );
-+  return KPIM::normalizeAddressesAndDecodeIDNs( rawHeaderField("From") );
- }
- 
- 
 @@ -3126,12 +3136,6 @@
    mMsg->Body().DeleteBodyParts();
  }
@@ -8412,14 +8344,6 @@
  	mSubRepetition->set(0, 0, true, 364*24*60);
  	QWhatsThis::add(mSubRepetition, i18n("Set up an additional alarm repetition"));
  	layout->addWidget(mSubRepetition);
-Index: libemailfunctions/tests/testemail.cpp
-===================================================================
-Index: libemailfunctions/tests/Makefile.am
-===================================================================
-Index: libemailfunctions/email.cpp
-===================================================================
-Index: libemailfunctions/Makefile.am
-===================================================================
 Index: korn/KOrn.desktop
 ===================================================================
 --- korn/KOrn.desktop.orig	2007-10-08 11:50:45.000000000 +0200