[gthumb/ext: 15/15] Merge branch 'catalog-properties' into ext

[Paolo Bacchilega <paobac src gnome org>]

commit d2d0c2988b19e9e3df9b3afff2f85075d60e6dff
Merge: 2d1d39f... 58540af...
Author: Paolo Bacchilega <paobac src gnome org>
Date:   Tue Dec 15 20:32:28 2009 +0100

    Merge branch 'catalog-properties' into ext

 extensions/catalogs/Makefile.am                    |    6 +
 extensions/catalogs/actions.c                      |   16 +
 extensions/catalogs/actions.h                      |    1 +
 extensions/catalogs/callbacks.c                    |   90 +++-
 extensions/catalogs/callbacks.h                    |   25 +-
 extensions/catalogs/data/ui/Makefile.am            |    5 +-
 extensions/catalogs/data/ui/catalog-properties.ui  |  187 +++++
 extensions/catalogs/data/ui/organize-files-task.ui |  376 ++++++++++
 extensions/catalogs/data/ui/organize-files.ui      |  275 +++++++
 extensions/catalogs/dlg-catalog-properties.c       |  247 +++++++
 extensions/catalogs/dlg-catalog-properties.h       |   31 +
 extensions/catalogs/dlg-organize-files.c           |  149 ++++
 extensions/catalogs/dlg-organize-files.h           |   31 +
 extensions/catalogs/gth-catalog.c                  |  385 ++++++++--
 extensions/catalogs/gth-catalog.h                  |  110 ++--
 extensions/catalogs/gth-file-source-catalogs.c     |   35 +-
 extensions/catalogs/gth-organize-task.c            |  777 ++++++++++++++++++++
 extensions/catalogs/gth-organize-task.h            |   67 ++
 extensions/catalogs/main.c                         |   28 +
 extensions/search/Makefile.am                      |    2 +
 extensions/search/actions.c                        |  106 +---
 extensions/search/actions.h                        |    1 -
 extensions/search/callbacks.c                      |  204 +++---
 extensions/search/callbacks.h                      |   19 +-
 extensions/search/data/ui/search-editor.ui         |   26 +-
 extensions/search/gth-search-editor-dialog.c       |  192 +-----
 extensions/search/gth-search-editor.c              |  317 ++++++++
 extensions/search/gth-search-editor.h              |   56 ++
 extensions/search/gth-search-task.c                |   30 +-
 extensions/search/gth-search.c                     |  202 ++----
 extensions/search/main.c                           |    5 +-
 gthumb/gedit-message-area.c                        |   53 +-
 gthumb/gio-utils.c                                 |  153 +++-
 gthumb/glib-utils.c                                |   47 ++-
 gthumb/glib-utils.h                                |    5 +
 gthumb/gth-browser.c                               |   68 +-
 gthumb/gth-browser.h                               |    3 +-
 gthumb/gth-embedded-dialog.c                       |   25 +-
 gthumb/gth-embedded-dialog.h                       |    2 +
 gthumb/gth-file-source-vfs.c                       |    6 +
 gthumb/gth-folder-tree.c                           |    8 +-
 gthumb/gth-main-default-hooks.c                    |    7 +
 gthumb/gth-main.c                                  |    2 +-
 gthumb/gth-progress-dialog.c                       |    5 +-
 gthumb/gth-time-selector.c                         |   60 ++-
 gthumb/gth-time-selector.h                         |    2 +
 gthumb/gth-time.c                                  |    4 +-
 po/POTFILES.in                                     |   32 +-
 48 files changed, 3651 insertions(+), 832 deletions(-)
---