[gthumb: 9/9] Merge branch 'DnD'

[Paolo Bacchilega <paobac src gnome org>]

commit 68ca66d344c6e31ff8ea32b8a86023388085d013
Merge: fb6c4da 85496b5
Author: Paolo Bacchilega <paobac src gnome org>
Date:   Tue Apr 27 21:21:22 2010 +0200

    Merge branch 'DnD'

 extensions/catalogs/actions.c                    |   28 +--
 extensions/catalogs/gth-organize-task.c          |    2 +-
 extensions/facebook/dlg-export-to-facebook.c     |    2 +-
 extensions/file_manager/actions.c                |   26 ++--
 extensions/file_manager/callbacks.c              |   49 +++++-
 extensions/file_manager/callbacks.h              |   31 ++--
 extensions/file_manager/main.c                   |    1 +
 extensions/flicker/dlg-export-to-flickr.c        |    2 +-
 extensions/flicker/dlg-import-from-flickr.c      |    2 +-
 extensions/photo_importer/dlg-photo-importer.c   |    2 +-
 extensions/picasaweb/dlg-export-to-picasaweb.c   |    2 +-
 extensions/picasaweb/dlg-import-from-picasaweb.c |    2 +-
 gthumb/gth-browser-actions-callbacks.c           |    8 +-
 gthumb/gth-browser.c                             |  142 +++++++++++++-
 gthumb/gth-browser.h                             |    1 +
 gthumb/gth-file-list.c                           |   51 +++---
 gthumb/gth-file-list.h                           |    3 +-
 gthumb/gth-folder-tree.c                         |  220 +++++++++++++++++++---
 gthumb/gth-folder-tree.h                         |   84 +++++----
 gthumb/gth-hook.c                                |   31 +++-
 gthumb/gth-icon-view.c                           |   69 +++----
 gthumb/gth-main-default-hooks.c                  |   11 +
 22 files changed, 568 insertions(+), 201 deletions(-)
---