From d3ebf089c47ccdd3a8afc83d2a7578fb9ec0f52b Mon Sep 17 00:00:00 2001
From: Albert Astals Cid <tsdgeos@terra.es>
Date: Thu, 11 Aug 2011 16:17:24 +0100
Subject: [PATCH] Do not rely on extension but on output format for conversion

BUGS: 277801
---
 core/fileprinter.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/fileprinter.cpp b/core/fileprinter.cpp
index b70b66433..28d283998 100644
--- a/core/fileprinter.cpp
+++ b/core/fileprinter.cpp
@@ -118,12 +118,12 @@ int FilePrinter::doPrintFiles( QPrinter &printer, QStringList fileList, FileDele
                     ret = -5;
                 }
             }
-        } else if ( inputFileInfo.suffix() == "ps" && outputFileInfo.suffix() == "pdf" && ps2pdfAvailable() ) {
+        } else if ( inputFileInfo.suffix() == "ps" && printer.outputFormat() == QPrinter::PdfFormat && ps2pdfAvailable() ) {
             exe = "ps2pdf";
             argList << fileList[0] << printer.outputFileName();
             kDebug(OkularDebug) << "Executing" << exe << "with arguments" << argList;
             ret = KProcess::execute( exe, argList );
-        } else if ( inputFileInfo.suffix() == "pdf" && outputFileInfo.suffix() == "ps" && pdf2psAvailable() ) {
+        } else if ( inputFileInfo.suffix() == "pdf" && printer.outputFormat() == QPrinter::PostScriptFormat && pdf2psAvailable() ) {
             exe = "pdf2ps";
             argList << fileList[0] << printer.outputFileName();
             kDebug(OkularDebug) << "Executing" << exe << "with arguments" << argList;