Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/f-spot/ChangeLog,v
retrieving revision 1.1548
diff -u -r1.1548 ChangeLog
--- ChangeLog	6 Sep 2006 20:47:01 -0000	1.1548
+++ ChangeLog	11 Sep 2006 19:28:30 -0000
@@ -1,3 +1,7 @@
+2006-09-11  Gautier Portet <kassoulet gmail com>
+
+	* src/MainWindow.cs: Export to flickr in correct order. Fixes bgo #345864
+
 2006-09-05  Stephane Delcroix  <stephane@delcroix.org>
  
  	* google-sharp/PicasaWeb.cs: Apply latest changes from google-sharp to
@@ -83,6 +87,7 @@
 
 	* configure.in: Make 0.2.0 release.
 
+>>>>>>> 1.1548
 2006-08-11  Gabriel Burt  <gabriel.burt@gmail.com>
 
 	* src/FolderExport.cs: Internationalize several strings in generated HTML
Index: src/MainWindow.cs
===================================================================
RCS file: /cvs/gnome/f-spot/src/MainWindow.cs,v
retrieving revision 1.306
diff -u -r1.306 MainWindow.cs
--- src/MainWindow.cs	6 Sep 2006 20:55:47 -0000	1.306
+++ src/MainWindow.cs	11 Sep 2006 19:28:35 -0000
@@ -1415,7 +1415,10 @@
 
 	void HandleExportToFlickr (object sender, EventArgs args)
 	{
+		bool save = group_selector.Adaptor.OrderAscending;
+		group_selector.Adaptor.OrderAscending = true;
 		new FSpot.FlickrExport (new FSpot.PhotoArray (SelectedPhotos ()));
+		group_selector.Adaptor.OrderAscending = save;
 	}
 	
 	void HandleExportToFotki (object sender, EventArgs args)
