diff -Naur f-spot-0.6.1.4.src/src/Imaging/Ciff.cs f-spot-0.6.1.4/src/Imaging/Ciff.cs --- f-spot-0.6.1.4.src/src/Imaging/Ciff.cs 2009-08-14 09:12:25.000000000 -0500 +++ f-spot-0.6.1.4/src/Imaging/Ciff.cs 2009-11-07 19:28:53.963031108 -0600 @@ -441,7 +441,7 @@ return base.Date; } - return new CaptureTime (date, little).LocalTime.ToUniversalTime (); + return new CaptureTime (date, little).LocalTime; } } diff -Naur f-spot-0.6.1.4.src/src/Imaging/JpegFile.cs f-spot-0.6.1.4/src/Imaging/JpegFile.cs --- f-spot-0.6.1.4.src/src/Imaging/JpegFile.cs 2009-08-19 05:57:51.000000000 -0500 +++ f-spot-0.6.1.4/src/Imaging/JpegFile.cs 2009-11-07 19:30:33.831062044 -0600 @@ -333,13 +333,13 @@ e = sub.Directory [0].Lookup (TagId.DateTimeOriginal); if (e != null) - return DirectoryEntry.DateTimeFromString (e.StringValue).ToUniversalTime (); + return DirectoryEntry.DateTimeFromString (e.StringValue); } e = ExifHeader.Directory.Lookup (TagId.DateTime); if (e != null) - return DirectoryEntry.DateTimeFromString (e.StringValue).ToUniversalTime (); + return DirectoryEntry.DateTimeFromString (e.StringValue); return base.Date; #else @@ -349,7 +349,7 @@ if (time_str == null || time_str == "") time_str = ExifData.LookupFirstValue (Exif.Tag.DateTime); - time = Exif.ExifUtil.DateTimeFromString (time_str).ToUniversalTime (); + time = Exif.ExifUtil.DateTimeFromString (time_str); #endif } catch (System.Exception e) { Console.WriteLine (e); diff -Naur f-spot-0.6.1.4.src/src/Imaging/MrwFile.cs f-spot-0.6.1.4/src/Imaging/MrwFile.cs --- f-spot-0.6.1.4.src/src/Imaging/MrwFile.cs 2009-08-14 09:12:25.000000000 -0500 +++ f-spot-0.6.1.4/src/Imaging/MrwFile.cs 2009-11-07 19:30:46.055059713 -0600 @@ -201,7 +201,7 @@ DirectoryEntry e = this.Header.Directory.Lookup (TagId.DateTime); if (e != null) - return DirectoryEntry.DateTimeFromString (e.StringValue).ToUniversalTime (); + return DirectoryEntry.DateTimeFromString (e.StringValue); else return base.Date; } diff -Naur f-spot-0.6.1.4.src/src/Imaging/PngFile.cs f-spot-0.6.1.4/src/Imaging/PngFile.cs --- f-spot-0.6.1.4.src/src/Imaging/PngFile.cs 2009-08-14 09:12:25.000000000 -0500 +++ f-spot-0.6.1.4/src/Imaging/PngFile.cs 2009-11-07 19:31:00.059030534 -0600 @@ -1418,7 +1418,7 @@ foreach (Chunk chunk in Chunks) { TimeChunk time = chunk as TimeChunk; if (time != null) - return time.Time.ToUniversalTime (); + return time.Time; } return base.Date; } diff -Naur f-spot-0.6.1.4.src/src/Imaging/Tiff.cs f-spot-0.6.1.4/src/Imaging/Tiff.cs --- f-spot-0.6.1.4.src/src/Imaging/Tiff.cs 2009-08-21 09:44:42.000000000 -0500 +++ f-spot-0.6.1.4/src/Imaging/Tiff.cs 2009-11-07 19:31:18.000000000 -0600 @@ -2066,13 +2066,13 @@ e = sub.Directory [0].Lookup (TagId.DateTimeOriginal); if (e != null) - return DirectoryEntry.DateTimeFromString (e.StringValue).ToUniversalTime (); + return DirectoryEntry.DateTimeFromString (e.StringValue); } e = this.Header.Directory.Lookup (TagId.DateTime); if (e != null) - return DirectoryEntry.DateTimeFromString (e.StringValue).ToUniversalTime (); + return DirectoryEntry.DateTimeFromString (e.StringValue); else return base.Date; } diff -Naur f-spot-0.6.1.4.src/src/Jobs/SyncMetadataJob.cs f-spot-0.6.1.4/src/Jobs/SyncMetadataJob.cs --- f-spot-0.6.1.4.src/src/Jobs/SyncMetadataJob.cs 2009-05-02 07:15:48.000000000 -0500 +++ f-spot-0.6.1.4/src/Jobs/SyncMetadataJob.cs 2009-11-07 19:31:56.000000000 -0600 @@ -53,7 +53,7 @@ FSpot.JpegFile jimg = img as FSpot.JpegFile; jimg.SetDescription (photo.Description); - jimg.SetDateTimeOriginal (photo.Time.ToLocalTime ()); + jimg.SetDateTimeOriginal (photo.Time); jimg.SetXmp (UpdateXmp (photo, jimg.Header.GetXmp ())); jimg.SaveMetaData (path); diff -Naur f-spot-0.6.1.4.src/src/UI.Dialog/AdjustTimeDialog.cs f-spot-0.6.1.4/src/UI.Dialog/AdjustTimeDialog.cs --- f-spot-0.6.1.4.src/src/UI.Dialog/AdjustTimeDialog.cs 2009-10-25 13:32:02.000000000 -0500 +++ f-spot-0.6.1.4/src/UI.Dialog/AdjustTimeDialog.cs 2009-11-07 19:33:21.091031963 -0600 @@ -122,7 +122,7 @@ IBrowsableItem item = Item.Current; name_label.Text = System.Uri.UnescapeDataString(item.Name); - old_label.Text = item.Time.ToLocalTime ().ToString (); + old_label.Text = (item.Time).ToString (); int i = collection.Count > 0 ? Item.Index + 1: 0; // Note for translators: This indicates the current photo is photo {0} of {1} out of photos diff -Naur f-spot-0.6.1.4.src/src/Utils/DbUtils.cs f-spot-0.6.1.4/src/Utils/DbUtils.cs --- f-spot-0.6.1.4.src/src/Utils/DbUtils.cs 2009-05-02 07:15:48.000000000 -0500 +++ f-spot-0.6.1.4/src/Utils/DbUtils.cs 2009-11-07 19:35:38.587030190 -0600 @@ -17,23 +17,23 @@ public static DateTime DateTimeFromUnixTime (long unix_time) { DateTime date_time = new DateTime (1970, 1, 1); - return date_time.AddSeconds (unix_time).ToLocalTime (); + return date_time.AddSeconds (unix_time); } public static long UnixTimeFromDateTime (DateTime date_time) { - return (long) (date_time.ToUniversalTime () - new DateTime (1970, 1, 1)).TotalSeconds; + return (long) (date_time - new DateTime (1970, 1, 1)).TotalSeconds; } #else public static DateTime DateTimeFromUnixTime (long unix_time) { - DateTime date_time = new DateTime (1970, 1, 1).ToLocalTime (); + DateTime date_time = new DateTime (1970, 1, 1); return date_time.AddSeconds (unix_time); } public static long UnixTimeFromDateTime (DateTime date_time) { - return (long) (date_time - new DateTime (1970, 1, 1).ToLocalTime ()).TotalSeconds; + return (long) (date_time - new DateTime (1970, 1, 1)).TotalSeconds; } #endif } diff -Naur f-spot-0.6.1.4.src/src/Widgets/IconView.cs f-spot-0.6.1.4/src/Widgets/IconView.cs --- f-spot-0.6.1.4.src/src/Widgets/IconView.cs 2009-08-19 15:30:37.000000000 -0500 +++ f-spot-0.6.1.4/src/Widgets/IconView.cs 2009-11-07 19:36:16.251032879 -0600 @@ -899,9 +899,9 @@ if (DisplayDates) { string date; if (cell_width > 200) { - date = photo.Time.ToLocalTime ().ToString (); + date = photo.Time.ToString (); } else { - date = photo.Time.ToLocalTime ().ToShortDateString (); + date = photo.Time.ToShortDateString (); } Pango.Layout layout = (Pango.Layout)date_layouts [date]; diff -Naur f-spot-0.6.1.4.src/src/Widgets/InfoBox.cs f-spot-0.6.1.4/src/Widgets/InfoBox.cs --- f-spot-0.6.1.4.src/src/Widgets/InfoBox.cs 2009-10-29 05:19:58.000000000 -0500 +++ f-spot-0.6.1.4/src/Widgets/InfoBox.cs 2009-11-07 19:37:22.963029078 -0600 @@ -337,7 +337,7 @@ height = real_height.ToString (); } #if USE_EXIF_DATE - date = img.Date.ToLocalTime (); + date = img.Date; #endif } @@ -521,7 +521,7 @@ #if USE_EXIF_DATE date_value_label.Text = info.Date; #else - DateTime local_time = photo.Time.ToLocalTime (); + DateTime local_time = photo.Time; date_value_label.Text = String.Format ("{0}{2}{1}", local_time.ToShortDateString (), local_time.ToShortTimeString (), @@ -629,13 +629,13 @@ if (first.Time.Date == last.Time.Date) { //Note for translators: {0} is a date, {1} and {2} are times. date_value_label.Text = String.Format(Catalog.GetString("On {0} between \n{1} and {2}"), - first.Time.ToLocalTime ().ToShortDateString (), - first.Time.ToLocalTime ().ToShortTimeString (), - last.Time.ToLocalTime ().ToShortTimeString ()); + first.Time.ToShortDateString (), + first.Time.ToShortTimeString (), + last.Time.ToShortTimeString ()); } else { date_value_label.Text = String.Format(Catalog.GetString("Between {0} \nand {1}"), - first.Time.ToLocalTime ().ToShortDateString (), - last.Time.ToLocalTime ().ToShortDateString ()); + first.Time.ToShortDateString (), + last.Time.ToShortDateString ()); } } date_label.Visible = show_date;