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

List:       kde-commits
Subject:    branches/extragear/kde3/libs/kipi-plugins/flickrexport
From:       Gilles Caulier <caulier.gilles () gmail ! com>
Date:       2008-05-21 11:06:27
Message-ID: 1211367987.343844.506.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 810696 by cgilles:

getFrob method use getApiSig method based on KURL


 M  +8 -11     flickrtalker.cpp  
 M  +0 -8      flickrwidget.cpp  
 M  +0 -1      flickrwidget.h  


--- branches/extragear/kde3/libs/kipi-plugins/flickrexport/flickrtalker.cpp #810695:810696
@@ -90,7 +90,7 @@
         m_job->kill();
 }
 
-/** Compute MD5 signature using url queries key and values following Flickr notice:
+/** Compute MD5 signature using url queries keys and values following Flickr notice:
     http://www.flickr.com/services/api/auth.spec.html
 */
 QString FlickrTalker::getApiSig(const QString& secret, const KURL& url)
@@ -139,16 +139,13 @@
         m_job = 0;
     }
 
-    QString url = "http://www.flickr.com/services/rest/?";
-    QStringList headers;
-    headers.append("method=flickr.auth.getFrob");
-    headers.append("api_key=" + m_apikey);
-    QString md5 = getApiSig(m_secret, headers);
-    headers.append("api_sig=" + md5);
-    QString queryStr = headers.join("&");
-    QString postUrl  = url+queryStr;
+    KURL url("http://www.flickr.com/services/rest/");
+    url.addQueryItem("method", "flickr.auth.getFrob");
+    url.addQueryItem("api_key", m_apikey);
+    QString md5 = getApiSig(m_secret, url);
+    url.addQueryItem("api_sig", md5);
     QByteArray tmp;
-    KIO::TransferJob* job = KIO::http_post(postUrl, tmp, false);
+    KIO::TransferJob* job = KIO::http_post(url, tmp, false);
 
     job->addMetaData("content-type", "Content-Type: application/x-www-form-urlencoded");
 
@@ -163,7 +160,7 @@
     m_authProgressDlg->setProgress(1, 4);
     m_job   = job;
     m_buffer.resize(0);
-    emit signalBusy( true );
+    emit signalBusy(true);
 }
 
 void FlickrTalker::checkToken(const QString& token) 
--- branches/extragear/kde3/libs/kipi-plugins/flickrexport/flickrwidget.cpp #810695:810696
@@ -221,9 +221,6 @@
     connect(m_resizeCheckBox, SIGNAL(clicked()),
             this, SLOT(slotResizeChecked()));
 
-    connect(headerLabel, SIGNAL(leftClickedURL(const QString&)),
-            this, SLOT(slotOpenUrl(const QString&)));
-
     // ------------------------------------------------------------------------
 
     setName("FlickrWidget");
@@ -235,11 +232,6 @@
 {
 }
 
-void FlickrWidget::slotOpenUrl(const QString& url)
-{
-    KApplication::kApplication()->invokeBrowser(url);
-}
-
 void FlickrWidget::slotSelectionChecked()
 {
     kdDebug() << "Slot Selection Checked" << endl;
--- branches/extragear/kde3/libs/kipi-plugins/flickrexport/flickrwidget.h #810695:810696
@@ -53,7 +53,6 @@
 
     void slotResizeChecked();
     void slotSelectionChecked();
-    void slotOpenUrl(const QString&);
 
 private:
 
[prev in list] [next in list] [prev in thread] [next in thread]