rpms/kdepim/devel kdepim-3.5.7-kde#140549.patch, NONE, 1.1 kdepim.spec, 1.129, 1.130

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/pkgs/rpms/kdepim/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19775

Modified Files:
	kdepim.spec 
Added Files:
	kdepim-3.5.7-kde#140549.patch 
Log Message:
* Mon Aug 29 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.7-7
- templates for forwarding do not work with inline mails (kde#140549)


kdepim-3.5.7-kde#140549.patch:

--- NEW FILE kdepim-3.5.7-kde#140549.patch ---
diff -up kdepim-3.5.7/kmail/kmcommands.cpp.kde#140549 kdepim-3.5.7/kmail/kmcommands.cpp
--- kdepim-3.5.7/kmail/kmcommands.cpp.kde#140549	2007-05-14 02:54:39.000000000 -0500
+++ kdepim-3.5.7/kmail/kmcommands.cpp	2007-08-29 06:29:11.000000000 -0500
@@ -1242,7 +1242,7 @@ KMCommand::Result KMForwardInlineCommand
     {
       KMail::Composer * win = KMail::makeComposer( fwdMsg, id );
       win->setCharset( fwdMsg->codec()->mimeName(), true );
-      // win->setBody( QString::fromUtf8( msg->createForwardBody() ) );
+      win->setBody( fwdMsg->bodyToUnicode() );
       win->show();
     }
   }


Index: kdepim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim/devel/kdepim.spec,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -r1.129 -r1.130
--- kdepim.spec	22 Aug 2007 13:30:24 -0000	1.129
+++ kdepim.spec	30 Aug 2007 01:57:27 -0000	1.130
@@ -12,7 +12,7 @@
 Summary: PIM (Personal Information Manager) for KDE
 Epoch:   6
 Version: 3.5.7
-Release: 6%{?dist}
+Release: 7%{?dist}
 
 License: GPLv2
 Group: Applications/Productivity
@@ -27,6 +27,8 @@
 Patch2: kdepim-3.4.0-s390.patch
 Patch3: kdepim-3.4.0-kandy-icons.patch
 Patch4: kdepim-3.4.92-libz.patch
+#upstream
+Patch140549: kdepim-3.5.7-kde#140549.patch
 
 Provides: kdepim3 = %{version}-%{release}
 
@@ -105,6 +107,8 @@
 %patch3 -p1 -b .kandy-icons
 %patch4 -p1 -b .libz
 
+%patch140549 -p1 -b .kde#140549
+
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
@@ -228,6 +232,9 @@
 
 
 %changelog
+* Mon Aug 29 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.7-7
+- templates for forwarding do not work with inline mails (kde#140549)
+
 * Mon Aug 20 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.7-6
 - License: GPLv2
 - Provides: kdepim3(-devel)