[f-spot/taglib-metadata: 33/33] Merge branch 'master' into taglib-metadata

[Ruben Vermeersch <rubenv src gnome org>]

commit 8ae1ec8a79b3ab3cba734267d50b906fc50e1b86
Merge: 8786bda 6efec97
Author: Ruben Vermeersch <ruben savanne be>
Date:   Tue Jun 22 23:14:05 2010 +0200

    Merge branch 'master' into taglib-metadata

 Makefile.am                                        |    4 +
 autogen.sh                                         |   11 +-
 build/build.environment.mk                         |    6 +-
 build/m4/shamrock/gnome-doc.m4                     |   20 +-
 configure.ac                                       |    8 +-
 .../Exporters/FacebookExport/FacebookExport.cs     |    1 +
 .../FacebookExport/FacebookExportDialog.cs         |    3 +-
 extensions/Exporters/FlickrExport/FlickrExport.cs  |    1 +
 .../Exporters/GalleryExport/GalleryExport.cs       |    1 +
 .../Exporters/GalleryExport/GalleryRemote.cs       |    1 +
 .../Exporters/PicasaWebExport/PicasaWebExport.cs   |    1 +
 extensions/Exporters/ZipExport/ZipExport.cs        |    1 +
 .../Tools/ChangePhotoPath/ChangePhotoPathGui.cs    |    1 +
 extensions/Tools/MergeDb/MergeDb.cs                |    1 +
 extensions/Tools/RawPlusJpeg/RawPlusJpeg.cs        |    1 +
 help/.gitignore                                    |    2 +
 help/Makefile.am                                   |    2 +-
 po/LINGUAS                                         |    1 +
 po/POTFILES.in                                     |    4 +
 po/ast.po                                          | 4453 ++++++++++++++++++++
 po/gl.po                                           |  602 ++--
 po/sl.po                                           |  790 ++--
 src/Core/App.cs                                    |   44 +-
 src/Import/ImportController.cs                     |   11 +-
 src/Loupe.cs                                       |   29 +-
 src/MainWindow.cs                                  |    7 +-
 src/Makefile.am                                    |   10 +-
 src/PhotoVersionCommands.cs                        |    1 +
 src/RotateCommand.cs                               |    1 +
 src/SendEmail.cs                                   |    3 +-
 src/Sharpener.cs                                   |    1 +
 src/SingleView.cs                                  |   93 +-
 src/TagCommands.cs                                 |   71 +-
 src/TagSelectionWidget.cs                          |    1 +
 src/UI.Dialog/EditExceptionDialog.cs               |    1 +
 src/UI.Dialog/EditTagIconDialog.cs                 |    5 +-
 src/UI.Dialog/HigMessageDialog.cs                  |  187 -
 src/UI.Dialog/ImportDialog.cs                      |    2 +-
 src/UI.Dialog/RepairDbDialog.cs                    |    1 +
 src/UI.Dialog/RepairDialog.cs                      |   10 +-
 src/UI.Dialog/ui/CreateTagDialog.ui                |  169 +
 src/UI.Dialog/ui/RepairDialog.ui                   |   83 +
 src/Widgets/EditorPage.cs                          |    3 +-
 src/f-spot.glade                                   |  875 ----
 src/main.cs                                        |  108 +-
 src/ui/single_view.ui                              |  425 ++
 src/ui/viewer_preferences.ui                       |  248 ++
 47 files changed, 6378 insertions(+), 1926 deletions(-)
---
diff --cc build/build.environment.mk
index dc0891f,865be84..dddb4af
--- a/build/build.environment.mk
+++ b/build/build.environment.mk
@@@ -132,7 -126,7 +132,7 @@@ REF_FSPOT = $(LINK_FSPOT_WIDGETS_DEPS) 
              $(LINK_GLIB) $(LINK_MONO_ADDINS_DEPS) $(LINK_UNIQUE_DEPS) $(LINK_MONO_ADDINS_SETUP_DEPS) \
              $(LINK_SEMWEB_DEPS) $(LINK_GLADE) $(LINK_MONODATA) $(LINK_MONO_DATA_SQLITECLIENT) \
              $(LINK_MONO_ADDINS_GUI_DEPS) $(LINK_FSPOT_JOB_SCHEDULER_DEPS) $(LINK_ICSHARP_ZIP_LIB) \
-             $(LINK_GNOME) $(LINK_TAGLIB)
 -            $(LINK_GNOME) $(LINK_HYENA_GUI_DEPS)
++            $(LINK_GNOME) $(LINK_HYENA_GUI_DEPS) $(LINK_TAGLIB)
  # FIXME: do not link executables
  LINK_FSPOT = -r:$(DIR_BIN)/f-spot.exe
  LINK_FSPOT_DEPS = $(REF_FSPOT) $(LINK_FSPOT)