rev 6121 - in kde-extras/kipi-plugins/trunk/debian: . patches

[Achim Bohnet]

Author: ach-guest
Date: 2007-05-10 17:11:41 +0000 (Thu, 10 May 2007)
New Revision: 6121

Added:
   kde-extras/kipi-plugins/trunk/debian/patches/15_kdesvn_655231_fix-gallery-2.2-export.diff
Modified:
   kde-extras/kipi-plugins/trunk/debian/changelog
Log:
kipi-plugins:
 * Add debian/patches/15_kdesvn_655231_fix-gallery-2.2-export.diff
   Fixes export to gallery 2.2: http://bugs.kde.org/show_bug.cgi?id=142259

Modified: kde-extras/kipi-plugins/trunk/debian/changelog
===================================================================
--- kde-extras/kipi-plugins/trunk/debian/changelog	2007-05-10 15:15:59 UTC (rev 6120)
+++ kde-extras/kipi-plugins/trunk/debian/changelog	2007-05-10 17:11:41 UTC (rev 6121)
@@ -1,15 +1,22 @@
-kipi-plugins (0.1.3-5) unstable; urgency=low
+kipi-plugins (0.1.3-5) UNRELEASED; urgency=low
 
+  * NOT RELEASED YET
+
   [ Achim Bohnet ]
   * debian/control: set kipi-plugins-doc section to doc. Fixes override
     disparity on uploads.
+  * Add debian/patches/15_kdesvn_655231_fix-gallery-2.2-export.diff
+    Fixes export to gallery 2.2: http://bugs.kde.org/show_bug.cgi?id=142259
 
   [ Mark Purcell ]
   * Include gcc4.3 patch from Martin (Closes: #417297)
   * Include icedove patch from Gonéri (Closes: #410479)
 
- -- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>  Tue, 08 May 2007 21:16:51 +0100
+  [ Debian KDE Extras Team ]
+  * 
 
+ -- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>  Thu, 10 May 2007 19:08:52 +0200
+
 kipi-plugins (0.1.3-4) unstable; urgency=low
 
   [ Mark Purcell ]

Added: kde-extras/kipi-plugins/trunk/debian/patches/15_kdesvn_655231_fix-gallery-2.2-export.diff
===================================================================
--- kde-extras/kipi-plugins/trunk/debian/patches/15_kdesvn_655231_fix-gallery-2.2-export.diff	2007-05-10 15:15:59 UTC (rev 6120)
+++ kde-extras/kipi-plugins/trunk/debian/patches/15_kdesvn_655231_fix-gallery-2.2-export.diff	2007-05-10 17:11:41 UTC (rev 6121)
@@ -0,0 +1,82 @@
+Index: kipi-plugins/galleryexport/gallerytalker.cpp
+===================================================================
+--- kipi-plugins/galleryexport/gallerytalker.cpp	(revision 655230)
++++ kipi-plugins/galleryexport/gallerytalker.cpp	(revision 655231)
+@@ -72,7 +72,7 @@
+     GalleryMPForm form;
+ 
+     form.addPair("cmd",              "login");
+-    form.addPair("protocol_version", "2.3");
++    form.addPair("protocol_version", "2.11");
+     form.addPair("uname",            name);
+     form.addPair("password",         passwd);
+     form.finish();
+@@ -100,7 +100,7 @@
+       task = "fetch-albums-prune";
+ 
+     form.addPair("cmd",              task);
+-    form.addPair("protocol_version", "2.3");
++    form.addPair("protocol_version", "2.11");
+     form.finish();
+ 
+     KIO::TransferJob* job = KIO::http_post(m_url, form.formData(), false);
+@@ -129,7 +129,7 @@
+     GalleryMPForm form;
+ 
+     form.addPair("cmd",              "fetch-album-images");
+-    form.addPair("protocol_version", "2.3");
++    form.addPair("protocol_version", "2.11");
+     form.addPair("set_albumName",    albumName);
+     form.finish();
+ 
+@@ -162,7 +162,7 @@
+     GalleryMPForm form;
+ 
+     form.addPair("cmd", "new-album");
+-    form.addPair("protocol_version", "2.3");
++    form.addPair("protocol_version", "2.11");
+     form.addPair("set_albumName", parentAlbumName);
+     if (!albumName.isEmpty())
+         form.addPair("newAlbumName", albumName);
+@@ -204,7 +204,7 @@
+     GalleryMPForm form;
+ 
+     form.addPair("cmd", "add-item");
+-    form.addPair("protocol_version", "2.3");
++    form.addPair("protocol_version", "2.11");
+     form.addPair("set_albumName", albumName);
+ 
+     if (!caption.isEmpty())
+@@ -318,7 +318,7 @@
+         m_cookie = "Cookie:";
+         for (QStringList::Iterator it = cookielist.begin(); it != cookielist.end(); ++it)
+         {
+-            QRegExp rx("^Set-Cookie: ([^;]+)");
++            QRegExp rx("^Set-Cookie: ([^;]+=[^;]+)");
+             if (rx.search(*it) > -1)
+                 m_cookie += " " + rx.cap(1) + ";";
+         }
+@@ -453,6 +453,10 @@
+                     if (iter != albumList.end())
+                         (*iter).create_sub = (value == "true");
+                 }
++                else if (key == "auth_token")
++                {
++                  s_authToken = value;
++                }
+             }
+         }
+     }
+Index: kipi-plugins/galleryexport/gallerympform.cpp
+===================================================================
+--- kipi-plugins/galleryexport/gallerympform.cpp	(revision 655230)
++++ kipi-plugins/galleryexport/gallerympform.cpp	(revision 655231)
+@@ -70,7 +70,7 @@
+ 
+     QTextStream ts(m_buffer, IO_Append|IO_WriteOnly);
+     ts.setEncoding(QTextStream::UnicodeUTF8);
+-    ts << str;
++    ts << str << '\0';
+ }
+ 
+ bool GalleryMPForm::addPair(const QString& name, const QString& value)