Blame kdepim-4.3.1-kmail-saveAttachments.patch
|
Lukas Tinkl |
aa65960 |
Index: kmail/kmcommands.cpp
|
|
Lukas Tinkl |
1f5a9a1 |
===================================================================
|
|
Lukas Tinkl |
aa65960 |
--- kmail/kmcommands.cpp (revision 1010021)
|
|
Lukas Tinkl |
aa65960 |
+++ kmail/kmcommands.cpp (working copy)
|
|
Lukas Tinkl |
fee8a90 |
@@ -54,6 +54,7 @@
|
|
Lukas Tinkl |
fee8a90 |
#include <kdbusservicestarter.h>
|
|
Lukas Tinkl |
fee8a90 |
#include <kdebug.h>
|
|
Lukas Tinkl |
fee8a90 |
#include <kfiledialog.h>
|
|
Lukas Tinkl |
fee8a90 |
+#include <kfilewidget.h>
|
|
Lukas Tinkl |
fee8a90 |
#include <kabc/stdaddressbook.h>
|
|
Lukas Tinkl |
fee8a90 |
#include <kabc/addresseelist.h>
|
|
Lukas Tinkl |
fee8a90 |
#include <klocale.h>
|
|
Lukas Tinkl |
fee8a90 |
@@ -2412,7 +2413,11 @@
|
|
Lukas Tinkl |
1f5a9a1 |
KUrl url, dirUrl;
|
|
Lukas Tinkl |
1f5a9a1 |
if ( mAttachmentMap.count() > 1 ) {
|
|
Lukas Tinkl |
1f5a9a1 |
// get the dir
|
|
Lukas Tinkl |
1f5a9a1 |
- dirUrl = KFileDialog::getExistingDirectoryUrl( KUrl( "kfiledialog:///saveAttachment" ),
|
|
Lukas Tinkl |
1f5a9a1 |
+ QString dummy;
|
|
Lukas Tinkl |
1126895 |
+ KUrl startUrl = KFileWidget::getStartUrl( KUrl( "kfiledialog:///saveAttachment" ), dummy );
|
|
Lukas Tinkl |
1f5a9a1 |
+ if ( !startUrl.isValid() || startUrl.isEmpty() )
|
|
Lukas Tinkl |
1f5a9a1 |
+ startUrl = KUrl( KGlobalSettings::documentPath() );
|
|
Lukas Tinkl |
1f5a9a1 |
+ dirUrl = KFileDialog::getExistingDirectoryUrl( startUrl,
|
|
Lukas Tinkl |
1f5a9a1 |
parentWidget(),
|
|
Lukas Tinkl |
1f5a9a1 |
i18n( "Save Attachments To" ) );
|
|
Lukas Tinkl |
1f5a9a1 |
if ( !dirUrl.isValid() ) {
|
|
Lukas Tinkl |
1126895 |
Index: kmail/CMakeLists.txt
|
|
Lukas Tinkl |
1126895 |
===================================================================
|
|
Lukas Tinkl |
1126895 |
--- kmail/CMakeLists.txt (revision 1010021)
|
|
Lukas Tinkl |
1126895 |
+++ kmail/CMakeLists.txt (working copy)
|
|
Lukas Tinkl |
1126895 |
@@ -371,6 +371,7 @@
|
|
Lukas Tinkl |
1126895 |
kpgp
|
|
Lukas Tinkl |
1126895 |
kdepim
|
|
Lukas Tinkl |
1126895 |
${KDE4_KIO_LIBS}
|
|
Lukas Tinkl |
1126895 |
+ ${KDE4_KFILE_LIBS}
|
|
Lukas Tinkl |
1126895 |
${KDEPIMLIBS_KABC_LIBS}
|
|
Lukas Tinkl |
1126895 |
${KDEPIMLIBS_KPIMUTILS_LIBS}
|
|
Lukas Tinkl |
1126895 |
${KDEPIMLIBS_KPIMTEXTEDIT_LIBS}
|