diff -aburN kipi-plugins-0.1.0-rc1/AUTHORS kipi-plugins-0.1.0-rc2/AUTHORS
--- kipi-plugins-0.1.0-rc1/AUTHORS	2005-09-14 20:38:09.000000000 +0200
+++ kipi-plugins-0.1.0-rc2/AUTHORS	2006-03-04 14:34:42.000000000 +0100
@@ -13,3 +13,4 @@
 Tudor Calin <tudor@1xtech.com>
 Todd Shoemaker <todd at theshoemakers.net>                     
 Gregory Kokanosky <gregory dot kokanosky at free.fr>           
+Boris Kavod <kavod at jjgfamille dot com>
\ Pas de fin de ligne �la fin du fichier.
diff -aburN kipi-plugins-0.1.0-rc1/kipi-plugins/galleryexport/gallerympform.cpp kipi-plugins-0.1.0-rc2/kipi-plugins/galleryexport/gallerympform.cpp
--- kipi-plugins-0.1.0-rc1/kipi-plugins/galleryexport/gallerympform.cpp	2005-09-14 20:38:09.000000000 +0200
+++ kipi-plugins-0.1.0-rc2/kipi-plugins/galleryexport/gallerympform.cpp	2006-03-04 11:03:47.000000000 +0100
@@ -111,7 +111,7 @@
     str += m_boundary;
     str += "\r\n";
     str += "Content-Disposition: form-data; name=\"";
-    str += "userfile";
+    str += "g2_userfile";
     str += "\"; ";
     str += "filename=\"";
     str += QFile::encodeName(KURL(path).filename());
diff -aburN kipi-plugins-0.1.0-rc1/kipi-plugins/galleryexport/gallerytalker.cpp kipi-plugins-0.1.0-rc2/kipi-plugins/galleryexport/gallerytalker.cpp
--- kipi-plugins-0.1.0-rc1/kipi-plugins/galleryexport/gallerytalker.cpp	2005-09-14 20:38:09.000000000 +0200
+++ kipi-plugins-0.1.0-rc2/kipi-plugins/galleryexport/gallerytalker.cpp	2006-03-04 14:33:45.000000000 +0100
@@ -62,10 +62,11 @@
     m_url = url;
 
     GalleryMPForm form;
-    form.addPair("cmd", "login");
-    form.addPair("protocol_version", "2.3");
-    form.addPair("uname", name);
-    form.addPair("password", passwd);
+    form.addPair("g2_form[cmd]", "login");
+    form.addPair("g2_controller", "remote:GalleryRemote");
+    form.addPair("g2_form[protocol_version]", "2.3");
+    form.addPair("g2_form[uname]", name);
+    form.addPair("g2_form[password]", passwd);
     form.finish();
 
     KIO::TransferJob* job = KIO::http_post(m_url, form.formData(), false);
@@ -85,8 +86,9 @@
 void GalleryTalker::listAlbums()
 {
     GalleryMPForm form;
-    form.addPair("cmd", "fetch-albums");
-    form.addPair("protocol_version", "2.3");
+    form.addPair("g2_form[cmd]", "fetch-albums-prune");
+    form.addPair("g2_controller", "remote:GalleryRemote");
+    form.addPair("g2_form[protocol_version]", "2.3");
     form.finish();
 
     KIO::TransferJob* job = KIO::http_post(m_url, form.formData(), false);
@@ -113,9 +115,10 @@
     }
         
     GalleryMPForm form;
-    form.addPair("cmd", "fetch-album-images");
-    form.addPair("protocol_version", "2.3");
-    form.addPair("set_albumName", albumName);
+    form.addPair("g2_form[cmd]", "fetch-album-images");
+    form.addPair("g2_controller", "remote:GalleryRemote");
+    form.addPair("g2_form[protocol_version]", "2.3");
+    form.addPair("g2_form[set_albumName]", albumName);
     form.finish();
 
     KIO::TransferJob* job = KIO::http_post(m_url, form.formData(), false);
@@ -145,15 +148,16 @@
     }
 
     GalleryMPForm form;
-    form.addPair("cmd", "new-album");
-    form.addPair("protocol_version", "2.3");
-    form.addPair("set_albumName", parentAlbumName);
+    form.addPair("g2_form[cmd]", "new-album");
+    form.addPair("g2_controller", "remote:GalleryRemote");
+    form.addPair("g2_form[protocol_version", "2.3");
+    form.addPair("g2_form[set_albumName]", parentAlbumName);
     if (!albumName.isEmpty())
-        form.addPair("newAlbumName", albumName);
+        form.addPair("g2_form[newAlbumName]", albumName);
     if (!albumTitle.isEmpty())
-        form.addPair("newAlbumTitle", albumTitle);
+        form.addPair("g2_form[newAlbumTitle]", albumTitle);
     if (!albumCaption.isEmpty())
-        form.addPair("newAlbumDesc", albumCaption);
+        form.addPair("g2_form[newAlbumDesc]", albumCaption);
     form.finish();
 
     KIO::TransferJob* job = KIO::http_post(m_url, form.formData(), false);
@@ -185,12 +189,13 @@
     QString path = photoPath;
     
     GalleryMPForm form;
-    form.addPair("cmd", "add-item");
-    form.addPair("protocol_version", "2.3");
-    form.addPair("set_albumName", albumName);
-    form.addPair("userfile_name", QFile::encodeName(KURL(path).filename()));
+    form.addPair("g2_form[cmd]", "add-item");
+    form.addPair("g2_controller", "remote:GalleryRemote");
+    form.addPair("g2_form[protocol_version]", "2.3");
+    form.addPair("g2_form[set_albumName]", albumName);
+    form.addPair("g2_userfile_name", QFile::encodeName(KURL(path).filename()));
     if (!caption.isEmpty())
-        form.addPair("caption", caption);
+        form.addPair("g2_form[caption]", caption);
 
     QImage image(photoPath);
 
@@ -371,7 +376,8 @@
                 {
                     GAlbum album;
                     album.name    = value;
-                    album.ref_num = key.section(".", 2, 2).toInt();
+                    album.ref_num = value.toInt();
+                    //album.ref_num = key.section(".", 2, 2).toInt();
                     iter = albumList.append(album);
                 }
                 else if (key.startsWith("album.title"))
diff -aburN kipi-plugins-0.1.0-rc1/kipi-plugins/galleryexport/gallerywindow.cpp kipi-plugins-0.1.0-rc2/kipi-plugins/galleryexport/gallerywindow.cpp
--- kipi-plugins-0.1.0-rc1/kipi-plugins/galleryexport/gallerywindow.cpp	2005-09-14 20:38:09.000000000 +0200
+++ kipi-plugins-0.1.0-rc2/kipi-plugins/galleryexport/gallerywindow.cpp	2006-03-04 11:34:45.000000000 +0100
@@ -238,7 +238,7 @@
         url.setHost(dlg.url());
     }
     if (!url.url().endsWith(".php"))
-        url.addPath("gallery_remote2.php");
+        url.addPath("main.php");
 
     m_url    = url.url();
     m_user   = dlg.name();
@@ -327,7 +327,7 @@
             {
                 kdWarning() << "Failed to find parent for album "
                             << album.name
-                            << "with id " << album.ref_num;
+                            << " with id " << album.ref_num;
             }
         }
     }