f-spot r3702 - trunk/src
- From: sdelcroix svn gnome org
- To: svn-commits-list gnome org
- Subject: f-spot r3702 - trunk/src
- Date: Wed, 20 Feb 2008 15:05:04 +0000 (GMT)
Author: sdelcroix
Date: Wed Feb 20 15:05:04 2008
New Revision: 3702
URL: http://svn.gnome.org/viewvc/f-spot?rev=3702&view=rev
Log:
removing dead bits, and fix for bgo 517234
Modified:
trunk/src/FileImportBackend.cs
trunk/src/TimeDialog.cs
Modified: trunk/src/FileImportBackend.cs
==============================================================================
--- trunk/src/FileImportBackend.cs (original)
+++ trunk/src/FileImportBackend.cs Wed Feb 20 15:05:04 2008
@@ -2,6 +2,7 @@
using Gtk;
using Gnome;
using System.Collections;
+using System.Collections.Generic;
using System;
using FSpot;
using FSpot.Xmp;
@@ -73,22 +74,16 @@
private void GetListing (System.IO.DirectoryInfo dirinfo, System.IO.FileInfo [] files, bool recurse)
{
System.Console.WriteLine ("Scanning {0}", dirinfo.FullName);
- Hashtable exiting_entries = new Hashtable ();
+ List<Uri> existing_entries = new List<Uri> ();
foreach (Photo p in store.Query (dirinfo)) {
foreach (uint id in p.VersionIds) {
- string name;
- if (id == Photo.OriginalVersionId)
- name = p.Name;
- else
- name = (new System.IO.FileInfo (p.VersionUri (id).LocalPath)).Name;
-
- exiting_entries [name] = p;
+ existing_entries.Add (p.VersionUri (id));
}
}
-
+
foreach (System.IO.FileInfo f in files) {
- if (! exiting_entries.Contains (f.Name)) {
+ if (! existing_entries.Contains (new System.Uri (f.FullName))) {
AddPath (f.FullName);
}
}
Modified: trunk/src/TimeDialog.cs
==============================================================================
--- trunk/src/TimeDialog.cs (original)
+++ trunk/src/TimeDialog.cs Wed Feb 20 15:05:04 2008
@@ -120,14 +120,7 @@
if (! offset_entry.HasFocus)
offset_entry.Text = span.ToString ();
- // The preceding text here is the second checkbutton in the Time dialog
- // that says "Space all photos by []"
-#if false
- starting_label.Text = String.Format (Catalog.GetString ("min. Starting at {0}"),
- EditTime);
-#else
starting_label.Text = "min.";
-#endif
difference_check.Label = String.Format (Catalog.GetString ("Shift all photos by {0}"),
Offset);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]