[gthumb: 15/20] Merge branch 'misc-bugs'

[Paolo Bacchilega <paobac src gnome org>]

commit de3280afa77309b09bcc3a396286692145d2867d
Merge: 758362a 09ae81a
Author: Paolo Bacchilega <paobac src gnome org>
Date:   Tue Mar 30 16:39:12 2010 +0200

    Merge branch 'misc-bugs'
    
    Conflicts:
    	extensions/exiv2_tools/exiv2-utils.cpp

 data/gthumb.schemas.in                             |  154 ++----------
 data/ui/preferences.ui                             |   15 +-
 extensions/catalogs/gth-catalog.c                  |   13 +-
 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 +
 extensions/flicker/dlg-export-to-flickr.c          |    8 +-
 extensions/picasaweb/dlg-export-to-picasaweb.c     |   11 +-
 gthumb/dlg-preferences.c                           |    3 +
 gthumb/gth-browser-actions-callbacks.c             |    8 +
 gthumb/gth-browser-actions-callbacks.h             |    1 +
 gthumb/gth-browser-actions-entries.h               |    5 +
 gthumb/gth-browser-ui.h                            |    3 +
 gthumb/gth-browser.c                               |  280 +++++++++++++++-----
 gthumb/gth-browser.h                               |    1 +
 gthumb/gth-cell-renderer-thumbnail.c               |   24 ++-
 gthumb/gth-file-data.c                             |    3 -
 gthumb/gth-file-data.h                             |   12 +-
 gthumb/gth-file-list.c                             |  156 +++++++++---
 gthumb/gth-file-list.h                             |    3 +-
 gthumb/gth-file-source-vfs.c                       |    2 +-
 gthumb/gth-icon-view.c                             |  120 ++++++++-
 gthumb/gth-metadata.c                              |   19 ++
 gthumb/gth-metadata.h                              |    8 +-
 gthumb/gth-preferences.h                           |    7 +-
 27 files changed, 663 insertions(+), 313 deletions(-)
---