Re: Import from disk and auto-tag

["Dotan Cohen" <dotancohen gmail com>]

Well, I took the initiative and tried to apply the patch as I
described before. This is what I got:
dotancohen ubuntu:~/development/f-spot/f-spot$ patch -p0 < thepatch.diff
patching file ChangeLog
Hunk #1 FAILED at 1.
1 out of 1 hunk FAILED -- saving rejects to file ChangeLog.rej
patching file src/FileImportBackend.cs
Hunk #1 FAILED at 3.
Hunk #2 succeeded at 14 (offset 1 line).
Hunk #3 succeeded at 100 (offset 3 lines).
Hunk #4 succeeded at 185 with fuzz 1 (offset 7 lines).
Hunk #5 FAILED at 195.
Hunk #6 succeeded at 269 (offset 23 lines).
Hunk #7 succeeded at 285 (offset 23 lines).
2 out of 7 hunks FAILED -- saving rejects to file src/FileImportBackend.cs.rej
patching file src/ImportCommand.cs
Hunk #8 FAILED at 737.
Hunk #9 succeeded at 764 (offset 5 lines).
1 out of 9 hunks FAILED -- saving rejects to file src/ImportCommand.cs.rej
patching file src/Makefile.am
patching file src/XmpTagsImporter.cs
patching file src/XmpTagsMetadata.cs
dotancohen ubuntu:~/development/f-spot/f-spot$ cat ChangeLog.rej
***************
*** 1,3 ****
 2006-05-04  Arangel Angov <arangel linux net mk>

       * configure.in: Added 'mk.po' to ALL_LINGUAS
--- 1,16 ----
+ 2006-05-25  Bengt Thuree <bengt thuree com>
+
+       * src/XmpTagsMetadata.cs: Reads the XMP tags from a photo during import
+
+       * src/XmpTagsImporter.cs: Creates XMP tags during import
+
+       * src/FileImportBackend.cs: Calls XmpTagsImporter during import.
+
+       * src/Makefile.am: Added XmpTagsMetadata.cs and XmpTagsImporter.cs
+
+       * src/ImportCommand.cs: disable DisplayTags since otherwise we
get a crash.
+       Cancel do not seem to remove all...
+
 2006-05-04  Arangel Angov <arangel linux net mk>

       * configure.in: Added 'mk.po' to ALL_LINGUAS
dotancohen ubuntu:~/development/f-spot/f-spot$ cat src/ImportCommand.cs.rej
***************
*** 735,741 ****
               if (collection == null)
                       return false;

-               DoImport (new FileImportBackend (store, pathimport,
copy, recurse, null));
               return false;
       }

--- 737,743 ----
               if (collection == null)
                       return false;

+               DoImport (new FileImportBackend (this.Dialog, store,
pathimport, copy, recurse, null));
               return false;
       }

dotancohen ubuntu:~/development/f-spot/f-spot$