f-spot r4567 - in trunk: . src

[sdelcroix svn gnome org]

Author: sdelcroix
Date: Tue Nov  4 14:28:13 2008
New Revision: 4567
URL: http://svn.gnome.org/viewvc/f-spot?rev=4567&view=rev

Log:
2008-11-04  Stephane Delcroix  <sdelcroix novell com>

	* src/ImportCommand.cs: use a FilechooserDialog instead of the deprecated
	CompatFilechooser

Removed:
   trunk/src/CompatFileChooser.cs
Modified:
   trunk/ChangeLog
   trunk/src/ImportCommand.cs
   trunk/src/Makefile.am

Modified: trunk/src/ImportCommand.cs
==============================================================================
--- trunk/src/ImportCommand.cs	(original)
+++ trunk/src/ImportCommand.cs	Tue Nov  4 14:28:13 2008
@@ -536,24 +536,24 @@
 	{
 		string path = null;
 
-		CompatFileChooserDialog file_selector =
-			new CompatFileChooserDialog ("Import", this.Dialog,
-						     CompatFileChooserDialog.Action.SelectFolder);
+		FileChooserDialog file_chooser =
+			new FileChooserDialog (Catalog.GetString ("Import"), this.Dialog,
+						     FileChooserAction.SelectFolder);
 
-		file_selector.SelectMultiple = false;
+		file_chooser.SelectMultiple = false;
 
 		if (ImportPath != null)
-			file_selector.Filename = ImportPath;
+			file_chooser.SetFilename (ImportPath);
 		else
-			file_selector.Filename = FSpot.Global.HomeDirectory;
+			file_chooser.SetFilename (FSpot.Global.HomeDirectory);
 
-		int response = file_selector.Run ();
+		int response = file_chooser.Run ();
 
 		if ((ResponseType) response == ResponseType.Ok) {
-			path = file_selector.Filename;
+			path = file_chooser.Filename;
 		}
 
-		file_selector.Destroy ();
+		file_chooser.Destroy ();
 		return path;
 	}
 

Modified: trunk/src/Makefile.am
==============================================================================
--- trunk/src/Makefile.am	(original)
+++ trunk/src/Makefile.am	Tue Nov  4 14:28:13 2008
@@ -96,7 +96,6 @@
 	$(srcdir)/ColorAdjustment/Desaturate.cs		\
 	$(srcdir)/ColorAdjustment/FullColorAdjustment.cs		\
 	$(srcdir)/ColorAdjustment/SepiaTone.cs		\
-	$(srcdir)/CompatFileChooser.cs		\
 	$(srcdir)/ControlOverlay.cs		\
 	$(srcdir)/Core.cs			\
 	$(srcdir)/Core/ColorManagement.cs	\