rpms/kdepim/F-11 kdepim-4.3.1-kmail-saveAttachments.patch, NONE, 1.1 kdepim.spec, 1.220, 1.221

[Lukas Tinkl]

Author: ltinkl

Update of /cvs/extras/rpms/kdepim/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6487/F-11

Modified Files:
	kdepim.spec 
Added Files:
	kdepim-4.3.1-kmail-saveAttachments.patch 
Log Message:
an attempt to fix #496988 -  kmail default save dir regression


kdepim-4.3.1-kmail-saveAttachments.patch:
 kmcommands.cpp |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

--- NEW FILE kdepim-4.3.1-kmail-saveAttachments.patch ---
Index: kmail/kmcommands.cpp
===================================================================
--- kmail/kmcommands.cpp	(revision 1010021)
+++ kmail/kmcommands.cpp	(working copy)
@@ -2412,7 +2412,11 @@
   KUrl url, dirUrl;
   if ( mAttachmentMap.count() > 1 ) {
     // get the dir
-    dirUrl = KFileDialog::getExistingDirectoryUrl( KUrl( "kfiledialog:///saveAttachment" ),
+    QString dummy;
+    KUrl startUrl = KFileWidget::getStartUrl( KUrl( "kfiledialog:///saveAttachment" ), &dummy );
+    if ( !startUrl.isValid() || startUrl.isEmpty() )
+      startUrl = KUrl( KGlobalSettings::documentPath() );
+    dirUrl = KFileDialog::getExistingDirectoryUrl( startUrl,
                                                    parentWidget(),
                                                    i18n( "Save Attachments To" ) );
     if ( !dirUrl.isValid() ) {


Index: kdepim.spec
===================================================================
RCS file: /cvs/extras/rpms/kdepim/F-11/kdepim.spec,v
retrieving revision 1.220
retrieving revision 1.221
diff -u -p -r1.220 -r1.221
--- kdepim.spec	9 Aug 2009 15:44:43 -0000	1.220
+++ kdepim.spec	11 Aug 2009 14:30:58 -0000	1.221
@@ -6,13 +6,15 @@ Name:    kdepim
 Summary: PIM (Personal Information Manager) applications
 Epoch:   6
 Version: 4.3.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 License: GPLv2
 Group:   Applications/Productivity
 URL:     http://www.kde.org/
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
 Patch0:  kdepim-4.1.80-libqgpgme-link-fix.patch
+# http://bugzilla.redhat.com/show_bug.cgi?id=496988
+Patch1:  kdepim-4.3.1-kmail-saveAttachments.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -92,6 +94,7 @@ Requires: %{name} = %{?epoch:%{epoch}:}%
 %prep
 %setup -q
 %patch0 -p1 -b .libqgpgme-link-fix
+%patch1 -p0 -b .kmail-saveAttachments
 
 # omit conflict with oxygen-icons, working on a better long-term fix with
 # oxygen folk to get all the icons/temporary stuff out of kdepim
@@ -214,6 +217,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Aug 11 2009 Lukáš Tinkl <ltinkl at redhat.com> - 4.3.0-3
+- fix kmail default save dir regression (#496988)
+
 * Sat Aug 08 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-2
 - -libs: move designer plugins here
 - %%check: desktop-file-validate