[gthumb: 8/20] Merge branch 'embedded-metadata-option'

[Paolo Bacchilega <paobac src gnome org>]

commit 74719c6521556ad366ef7b89d2aa9c103b7806a3
Merge: 44c2b17 4d258f3
Author: Paolo Bacchilega <paobac src gnome org>
Date:   Sun Mar 28 17:27:34 2010 +0200

    Merge branch 'embedded-metadata-option'

 data/gthumb.schemas.in                             |  141 +-------------------
 data/ui/preferences.ui                             |   15 ++-
 extensions/comments/gth-comment.c                  |   47 +++++++
 extensions/comments/gth-comment.h                  |    7 +-
 .../comments/gth-metadata-provider-comment.c       |   51 ++------
 extensions/comments/main.c                         |   12 ++
 .../exiv2_tools/gth-metadata-provider-exiv2.c      |    3 +
 gthumb/dlg-preferences.c                           |    3 +
 gthumb/gth-metadata.c                              |   19 +++
 gthumb/gth-metadata.h                              |    8 +-
 gthumb/gth-preferences.h                           |    6 +-
 11 files changed, 126 insertions(+), 186 deletions(-)
---