applied_patches/0289-fpicker-kde-dont-overwrite.diff

   1 diff --git fpicker/source/unx/kde/.kdefilepicker.cxx.swp fpicker/source/unx/kde/.kdefilepicker.cxx.swp
   2 index 6b29b66..7ed80d0 100644
   3 Binary files fpicker/source/unx/kde/.kdefilepicker.cxx.swp and fpicker/source/unx/kde/.kdefilepicker.cxx.swp differ
   4 diff --git fpicker/source/unx/kde/kdefilepicker.cxx fpicker/source/unx/kde/kdefilepicker.cxx
   5 index 5d21699..62e453b 100644
   6 --- fpicker/source/unx/kde/kdefilepicker.cxx
   7 +++ fpicker/source/unx/kde/kdefilepicker.cxx
   8 @@ -315,7 +315,6 @@ void FileDialog::customEvent( QCustomEvent *pEvent )
   9              case CommandEvent::Exec:
  10                  {
  11                      filterWidget->setEditable( false );
  12 -                    QString qSelectedURL;
  13                      setIsExecuting( true );
  14                      bool bCanExit = false;
  15                      do {
  16 @@ -323,19 +322,18 @@ void FileDialog::customEvent( QCustomEvent *pEvent )
  17                          exec();
  18
  19                          KURL qLocalSelectedURL = mostLocalURL( selectedURL() );
  20 -
  21 -                        qSelectedURL = addExtension( qLocalSelectedURL.url() );
  22                          QString qProtocol( qLocalSelectedURL.protocol() );
  23
  24                          if ( isSave() && result() == QDialog::Accepted )
  25                          {
  26 -                            if ( qSelectedURL.startsWith( "file:" ) )
  27 +                            if ( qProtocol == "file" )
  28                              {
  29 +                                QString qFileName( addExtension( qLocalSelectedURL.path() ) );
  30                                  bCanExit =
  31 -                                    !QFile::exists( qSelectedURL.mid( 5 ) ) ||
  32 +                                    !QFile::exists( qFileName ) ||
  33                                      ( KMessageBox::warningYesNo( 0,
  34                                                                   i18n( "A file named \"%1\" already exists. "
  35 -                                                                     "Are you sure you want to overwrite it?" ).arg( qSelectedURL ),
  36 +                                                                     "Are you sure you want to overwrite it?" ).arg( qFileName ),
  37                                                                   i18n( "Overwrite File?" ),
  38                                                                   i18n( "Overwrite" ), KStdGuiItem::cancel() ) == KMessageBox::Yes );
  39                              }