[gthumb: 19/20] Merge branch 'gtk-2-24'

[Paolo Bacchilega <paobac src gnome org>]

commit bd0035332f65bceed2264aa4bcd97d55b6074b67
Merge: e238e7e bab5929
Author: Paolo Bacchilega <paobac src gnome org>
Date:   Thu May 12 13:17:09 2011 +0200

    Merge branch 'gtk-2-24'

 configure.ac                                       |   26 ++++++--
 copy-n-paste/eggsmclient-private.h                 |    2 +-
 copy-n-paste/eggsmclient-xsmp.c                    |    3 +-
 .../contact_sheet/gth-contact-sheet-theme-dialog.c |    9 +--
 extensions/edit_metadata/gth-edit-comment-page.c   |    4 +-
 .../edit_metadata/gth-edit-metadata-dialog.c       |    1 -
 extensions/edit_metadata/gth-tag-chooser-dialog.c  |    1 -
 .../facebook/facebook-account-chooser-dialog.c     |    1 -
 .../facebook/facebook-account-manager-dialog.c     |    1 -
 .../facebook/facebook-album-properties-dialog.c    |    1 -
 extensions/file_tools/callbacks.c                  |   14 ++--
 extensions/file_tools/gth-file-tool-crop.c         |    6 +-
 extensions/file_tools/gth-file-tool-resize.c       |    6 +-
 extensions/flicker/dlg-export-to-flickr.c          |    2 +-
 extensions/flicker/flickr-account-chooser-dialog.c |    1 -
 extensions/flicker/flickr-account-manager-dialog.c |    1 -
 extensions/image_viewer/gth-image-viewer-page.c    |    3 +-
 .../importer/gth-import-preferences-dialog.c       |    1 -
 extensions/list_tools/dlg-personalize-scripts.c    |    4 +-
 extensions/list_tools/gth-script-editor-dialog.c   |   13 ++--
 extensions/oauth/oauth-account-chooser-dialog.c    |    1 -
 extensions/oauth/oauth-account-manager-dialog.c    |    1 -
 extensions/photo_importer/dlg-photo-importer.c     |    5 +-
 .../photobucket-album-properties-dialog.c          |    1 -
 .../picasaweb/picasa-account-chooser-dialog.c      |    1 -
 .../picasaweb/picasa-account-manager-dialog.c      |    1 -
 .../picasaweb/picasa-account-properties-dialog.c   |    1 -
 .../picasaweb/picasa-album-properties-dialog.c     |    1 -
 .../rename_series/gth-template-editor-dialog.c     |    1 -
 extensions/search/gth-search-editor-dialog.c       |    1 -
 extensions/search/gth-search-editor.c              |    4 +-
 gthumb/Makefile.am                                 |    2 +
 gthumb/dlg-personalize-filters.c                   |    4 +-
 gthumb/gedit-message-area.c                        |   62 +-------------------
 gthumb/gth-browser.c                               |   46 +++++++++------
 gthumb/gth-filter-editor-dialog.c                  |   13 ++--
 gthumb/gth-filter.c                                |    5 +-
 gthumb/gth-icon-view.c                             |    9 +--
 gthumb/gth-image-viewer.c                          |   30 +++++-----
 gthumb/gth-main.c                                  |   42 -------------
 gthumb/gth-overwrite-dialog.c                      |    1 -
 gthumb/gth-progress-dialog.c                       |    1 -
 gthumb/gth-test-category.c                         |    7 +-
 gthumb/gth-test-simple.c                           |   20 ++++---
 gthumb/gth-time-selector.c                         |    6 +-
 gthumb/gth-toggle-menu-tool-button.c               |    3 +-
 gthumb/gtk-utils.c                                 |   15 ++---
 gthumb/gtk-utils.h                                 |    2 +-
 gthumb/main.c                                      |   34 ++++++++++-
 49 files changed, 174 insertions(+), 246 deletions(-)
---