Enabled qpdf in main Makfile

Fixed import of wrong version gooStub.cpp

2 files changed, 3 insertions, 3 deletions

diff --git a/Makefile b/Makefile
index 4925974..7c5197a 100644
--- a/Makefile
+++ b/Makefile
@@ -39,7 +39,7 @@ APPS=$(LOCALAPPS) core/addressbook calculator clock datebook \
     todo wordgame embeddedkonsole launcher sysinfo \
     parashoot snake citytime showimg netsetup tableviewer \
     qipkg mindbreaker go qasteroids qcop fifteen keypebble  today opiemail/converter opiemail \
-    noncore/tictac noncore/opieftp noncore/drawpad noncore/kcheckers noncore/appskey
+    noncore/tictac noncore/opieftp noncore/drawpad noncore/kcheckers noncore/appskey noncore/qpdf
 
 DOCS = docs/src/opie-policy
 single: mpegplayer/libmpeg3
diff --git a/noncore/unsupported/qpdf/gooStub.cpp b/noncore/unsupported/qpdf/gooStub.cpp
index cc29685..edbea55 100644
--- a/noncore/unsupported/qpdf/gooStub.cpp
+++ b/noncore/unsupported/qpdf/gooStub.cpp
@@ -40,13 +40,13 @@ GBool openTempFile ( GString **name, FILE **f, char *mode, char *ext )
         if (!( s = tmpnam ( 0 ))) 
                 return gFalse;
                         
-        *name = new GString ( "qpdf_" );
-        (*name)-> append ( s );
+        *name = new GString ( s );
 
         s = (*name)-> getCString ( );
         if (( p = strrchr ( s, '.' ))) 
                 (*name)-> del ( p - s, (*name)-> getLength ( ) - ( p - s ));
         
+        (*name)-> append ( "_qpdf" );
         (*name)-> append ( ext );
         
         fd = open ((*name)-> getCString ( ), O_WRONLY | O_CREAT | O_EXCL, 0600 );