[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    extragear/office/tellico/src
From:       Robby Stephenson <robby () periapsis ! org>
Date:       2009-12-31 20:00:52
Message-ID: 1262289652.371708.21044.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1068310 by rstephenson:

revert some bits of my previous work that got mixed in

 M  +0 -2      core/netaccess.cpp  
 M  +3 -8      fetch/discogsfetcher.cpp  


--- trunk/extragear/office/tellico/src/core/netaccess.cpp #1068309:1068310
@@ -61,8 +61,6 @@
     flags |= KIO::HideProgressInfo;
   }
   KIO::Job* getJob = KIO::file_copy(url_, dest, -1, flags);
-  // discogs, for one, might return gzip
-  getJob->addMetaData(QLatin1String("Accept-Encoding"), QLatin1String("gzip"));
   if(KIO::NetAccess::synchronousRun(getJob, window_)) {
     return true;
   }
--- trunk/extragear/office/tellico/src/fetch/discogsfetcher.cpp #1068309:1068310
@@ -36,7 +36,6 @@
 #include <kstandarddirs.h>
 #include <kio/job.h>
 #include <kio/jobuidelegate.h>
-#include <kio/netaccess.h>
 #include <KConfigGroup>
 
 #include <QLabel>
@@ -257,22 +256,18 @@
   u.addQueryItem(QLatin1String("f"), QLatin1String("xml"));
   u.addQueryItem(QLatin1String("api_key"), m_apiKey);
 #endif
-  myDebug() << "url: " << u;
+//  myDebug() << "url: " << u;
 
   // quiet, utf8, allowCompressed
   QString output = FileHandler::readTextFile(u, true, true, true);
 
-  KIO::StoredTransferJob* getJob = KIO::storedGet(u, KIO::NoReload, KIO::HideProgressInfo);
-  KIO::NetAccess::synchronousRun(getJob, 0);
-  QByteArray outputData = getJob->data();
-
-#if 1
+#if 0
   myWarning() << "Remove output debug from discogsfetcher.cpp";
   QFile f(QLatin1String("/tmp/test2.xml"));
   if(f.open(QIODevice::WriteOnly)) {
     QTextStream t(&f);
     t.setCodec(QTextCodec::codecForName("UTF-8"));
-    t << outputData;
+    t << output;
   }
   f.close();
 #endif
[prev in list] [next in list] [prev in thread] [next in thread]