rev 12263 - in kde-extras/kipi-plugins/trunk/debian: . patches
Mark Purcell
msp at alioth.debian.org
Sat Sep 27 13:58:37 UTC 2008
Author: msp
Date: 2008-09-27 13:58:36 +0000 (Sat, 27 Sep 2008)
New Revision: 12263
Added:
kde-extras/kipi-plugins/trunk/debian/patches/40_kdesvn853437_PicasaWebExport.patch
Modified:
kde-extras/kipi-plugins/trunk/debian/changelog
kde-extras/kipi-plugins/trunk/debian/control
Log:
* Add 40_kdesvn853437_PicasaWebExport.patch
- kipi plugins - picasa bug (Closes: #497232)
Modified: kde-extras/kipi-plugins/trunk/debian/changelog
===================================================================
--- kde-extras/kipi-plugins/trunk/debian/changelog 2008-09-27 13:50:14 UTC (rev 12262)
+++ kde-extras/kipi-plugins/trunk/debian/changelog 2008-09-27 13:58:36 UTC (rev 12263)
@@ -5,8 +5,10 @@
* Update 50_images2mpg_default_bin_folder.diff
- [kipi-plugins] images2mpg not posix compatible but only depends on
/bin/sh (Closes: #499713)
+ * Add 40_kdesvn853437_PicasaWebExport.patch
+ - kipi plugins - picasa bug (Closes: #497232)
- -- Mark Purcell <msp at debian.org> Sat, 27 Sep 2008 22:39:45 +1000
+ -- Mark Purcell <msp at debian.org> Sat, 27 Sep 2008 23:56:43 +1000
kipi-plugins (0.1.5-2) unstable; urgency=low
Modified: kde-extras/kipi-plugins/trunk/debian/control
===================================================================
--- kde-extras/kipi-plugins/trunk/debian/control 2008-09-27 13:50:14 UTC (rev 12262)
+++ kde-extras/kipi-plugins/trunk/debian/control 2008-09-27 13:58:36 UTC (rev 12263)
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>
Uploaders: Mark Purcell <msp at debian.org>, Achim Bohnet <ach at mpe.mpg.de>, Fathi Boudra <fabo at debian.org>
-Build-Depends: cdbs, debhelper (>= 5), quilt, pkg-config, kdelibs4-dev,
+Build-Depends: cdbs, debhelper (>= 5), pkg-config, kdelibs4-dev,
libexiv2-dev (>= 0.16), libgphoto2-2-dev, libgpod-nogtk-dev,
libkcal2-dev, libkdcraw-dev (>= 0.1.4), libkexiv2-dev (>= 0.1.6),
libkipi0-dev (>= 0.1.5), libltdl3-dev, libtiff4-dev, libxslt1-dev
Added: kde-extras/kipi-plugins/trunk/debian/patches/40_kdesvn853437_PicasaWebExport.patch
===================================================================
--- kde-extras/kipi-plugins/trunk/debian/patches/40_kdesvn853437_PicasaWebExport.patch (rev 0)
+++ kde-extras/kipi-plugins/trunk/debian/patches/40_kdesvn853437_PicasaWebExport.patch 2008-09-27 13:58:36 UTC (rev 12263)
@@ -0,0 +1,88 @@
+diff -Nur -x '*.orig' -x '*~' kipi-plugins-0.1.5/kipi-plugins/picasawebexport/picasawebtalker.cpp kipi-plugins-0.1.5.new/kipi-plugins/picasawebexport/picasawebtalker.cpp
+--- kipi-plugins-0.1.5/kipi-plugins/picasawebexport/picasawebtalker.cpp 2008-03-11 01:49:37.000000000 +1100
++++ kipi-plugins-0.1.5.new/kipi-plugins/picasawebexport/picasawebtalker.cpp 2008-09-27 23:22:41.000000000 +1000
+@@ -37,6 +37,7 @@
+ #include <qlineedit.h>
+ #include <qmessagebox.h>
+ #include <kio/jobclasses.h>
++#include <kurl.h>
+ #include <qdom.h>
+ #include <cstring>
+ #include <cstdio>
+@@ -330,7 +331,7 @@
+ }
+
+ bool PicasawebTalker::addPhoto( const QString& photoPath,
+- FPhotoInfo& info, const QString& albumName,
++ FPhotoInfo& info, const QString& albumId,
+ bool rescale, int maxDim, int imageQuality )
+ {
+ // Disabling this totally may be checking the m_state and doing selecting
+@@ -340,11 +341,11 @@
+ m_job->kill();
+ m_job = 0;
+ }*/
+- QString album_name = albumName;
+- if (album_name.length() == 0)
+- album_name = "test";
+- QString postUrl = "http://www.picasaweb.google.com/data/feed/api/user/" + m_username + "/album/" + album_name;
+- QString path = photoPath;
++ QString album_id = albumId;
++ if (album_id.length() == 0)
++ album_id = "test";
++ QString postUrl = "http://www.picasaweb.google.com/data/feed/api/user/" + KURL::encode_string(m_username) + "/albumid/" + album_id;
++ QString path = postUrl;
+ QStringList headers;
+ MPForm form;
+ QString auth_string = "GoogleLogin auth=" + m_token;
+@@ -616,8 +617,12 @@
+ while(!detailsNode.isNull()){
+ if(detailsNode.isElement()){
+ if(detailsNode.nodeName() == "id"){
+- album_id = detailsNode.toElement().text();
+- //this is what is obtained from data.
++ // The node data is a URL of which album id is the string following the last /
++ // like <id>http://www.picasaweb.google.com/.../AlbumID<id>
++ QString albumIdUrl = detailsNode.toElement().text();
++ int index = albumIdUrl.findRev("/");
++ int length = albumIdUrl.length();
++ QString album_id = albumIdUrl.right(length - index - 1);
+ fps.id = album_id;
+ }
+ if(detailsNode.nodeName() == "title"){
+diff -Nur -x '*.orig' -x '*~' kipi-plugins-0.1.5/kipi-plugins/picasawebexport/picasawebwindow.cpp kipi-plugins-0.1.5.new/kipi-plugins/picasawebexport/picasawebwindow.cpp
+--- kipi-plugins-0.1.5/kipi-plugins/picasawebexport/picasawebwindow.cpp 2008-03-11 01:49:37.000000000 +1100
++++ kipi-plugins-0.1.5.new/kipi-plugins/picasawebexport/picasawebwindow.cpp 2008-09-27 23:26:56.000000000 +1000
+@@ -420,6 +420,7 @@
+ slotAddPhotoNext();
+ }
+
++
+ void PicasawebWindow::slotAddPhotoNext()
+ {
+ if ( m_uploadQueue.isEmpty() )
+@@ -436,8 +437,23 @@
+ int upload_image_size;
+ int upload_image_quality;
+
++ // Get the albums' Id from the name.
++ QString albumId = "";
++ QString selectedAlbumName = m_albumsListComboBox->currentText();
++
++ QValueList<PicasaWebAlbum>::iterator it = m_talker->m_albumsList->begin();
++ while(it != m_talker->m_albumsList->end()) {
++ PicasaWebAlbum pwa=*it;
++ QString name = pwa.title;
++ if (name == selectedAlbumName) {
++ albumId = pwa.id;
++ break;
++ }
++ it++;
++ }
++
+ bool res = m_talker->addPhoto( pathComments.first, //the file path
+- info, m_albumsListComboBox->currentText(),
++ info, albumId,
+ m_resizeCheckBox->isChecked(),
+ m_dimensionSpinBox->value(), m_imageQualitySpinBox->value() );
+ if (!res)
More information about the pkg-kde-commits
mailing list