[gthumb: 22/22] Merge branch 'picasaweb'

[Paolo Bacchilega <paobac src gnome org>]

commit c6421baf86cedf8443955e55c6d6dad01aaad25a
Merge: 05ce38c eee063c
Author: Paolo Bacchilega <paobac src gnome org>
Date:   Sun Jan 31 00:06:26 2010 +0100

    Merge branch 'picasaweb'

 configure.ac                                       |   60 ++-
 data/gthumb.schemas.in                             |   93 ++
 extensions/Makefile.am                             |    2 +
 extensions/catalogs/actions.c                      |   31 +-
 extensions/catalogs/dlg-add-to-catalog.c           |   19 +-
 extensions/catalogs/dlg-catalog-properties.c       |   15 +-
 extensions/catalogs/gth-catalog.c                  |   24 +-
 extensions/catalogs/gth-file-source-catalogs.c     |   63 +-
 extensions/exiv2/Makefile.am                       |    2 +-
 extensions/exiv2/exiv2-utils.cpp                   |    9 +
 extensions/exiv2/gth-metadata-provider-exiv2.c     |    2 +-
 extensions/file_viewer/gth-file-viewer-page.c      |    2 +-
 extensions/image_rotation/rotation-utils.c         |   21 +-
 extensions/importer/Makefile.am                    |   66 ++
 extensions/importer/data/Makefile.am               |   18 +
 .../importer/data/gthumb-importer.schemas.in       |   96 ++
 extensions/importer/data/ui/Makefile.am            |    5 +
 extensions/importer/data/ui/import-preferences.ui  |  240 +++++
 .../importer/gth-import-preferences-dialog.c       |  439 +++++++++
 .../importer/gth-import-preferences-dialog.h       |   59 ++
 .../{photo_importer => importer}/gth-import-task.c |  228 ++----
 .../{photo_importer => importer}/gth-import-task.h |   35 +-
 extensions/importer/importer.extension.in.in       |    7 +
 extensions/importer/importer.h                     |   33 +
 extensions/importer/main.c                         |   51 +
 extensions/importer/preferences.h                  |   40 +
 extensions/importer/utils.c                        |  133 +++
 extensions/importer/utils.h                        |   54 ++
 extensions/jpeg_utils/jpeg_utils.extension.in.in   |    2 +-
 extensions/list_tools/gth-script.c                 |    2 +-
 extensions/photo_importer/Makefile.am              |   43 +-
 extensions/photo_importer/callbacks.c              |   12 +-
 .../data/gthumb_photo_importer.schemas.in          |   95 +--
 .../photo_importer/data/ui/photo-importer.ui       |  303 +------
 extensions/photo_importer/dlg-photo-importer.c     |  316 +------
 .../photo_importer/photo_importer.extension.in.in  |    2 +-
 extensions/photo_importer/preferences.h            |   31 +-
 extensions/picasaweb/Makefile.am                   |   60 ++
 extensions/picasaweb/actions.c                     |   54 ++
 extensions/picasaweb/actions.h                     |   33 +
 extensions/picasaweb/callbacks.c                   |  103 ++
 extensions/picasaweb/callbacks.h                   |   30 +
 extensions/picasaweb/data/Makefile.am              |   18 +
 .../picasaweb/data/gthumb-picasaweb.schemas.in     |   17 +
 extensions/picasaweb/data/ui/Makefile.am           |   11 +
 .../picasaweb/data/ui/export-to-picasaweb.ui       |  388 ++++++++
 .../picasaweb/data/ui/import-from-picasaweb.ui     |  265 ++++++
 .../data/ui/picasa-web-account-chooser.ui          |   70 ++
 .../data/ui/picasa-web-account-manager.ui          |  120 +++
 .../data/ui/picasa-web-account-properties.ui       |  143 +++
 .../data/ui/picasa-web-album-properties.ui         |  127 +++
 extensions/picasaweb/dlg-export-to-picasaweb.c     |  904 ++++++++++++++++++
 extensions/picasaweb/dlg-export-to-picasaweb.h     |   31 +
 extensions/picasaweb/dlg-import-from-picasaweb.c   |  985 ++++++++++++++++++++
 extensions/picasaweb/dlg-import-from-picasaweb.h   |   30 +
 extensions/picasaweb/google-connection.c           |  397 ++++++++
 extensions/picasaweb/google-connection.h           |   97 ++
 extensions/picasaweb/main.c                        |   53 ++
 .../picasaweb/picasa-account-chooser-dialog.c      |  196 ++++
 .../picasaweb/picasa-account-chooser-dialog.h      |   60 ++
 .../picasaweb/picasa-account-manager-dialog.c      |  271 ++++++
 .../picasaweb/picasa-account-manager-dialog.h      |   59 ++
 .../picasaweb/picasa-account-properties-dialog.c   |  220 +++++
 .../picasaweb/picasa-account-properties-dialog.h   |   61 ++
 .../picasaweb/picasa-album-properties-dialog.c     |  166 ++++
 .../picasaweb/picasa-album-properties-dialog.h     |   62 ++
 extensions/picasaweb/picasa-web-album.c            |  348 +++++++
 extensions/picasaweb/picasa-web-album.h            |   92 ++
 extensions/picasaweb/picasa-web-photo.c            |  444 +++++++++
 extensions/picasaweb/picasa-web-photo.h            |  109 +++
 extensions/picasaweb/picasa-web-service.c          |  829 ++++++++++++++++
 extensions/picasaweb/picasa-web-service.h          |   96 ++
 extensions/picasaweb/picasa-web-types.h            |   39 +
 extensions/picasaweb/picasa-web-user.c             |  239 +++++
 extensions/picasaweb/picasa-web-user.h             |   75 ++
 extensions/picasaweb/picasaweb.extension.in.in     |   11 +
 extensions/picasaweb/preferences.h                 |   28 +
 extensions/raw_files/main.c                        |   20 +-
 extensions/search/actions.c                        |   10 +-
 extensions/search/gth-search-task.c                |   17 +-
 gthumb/Makefile.am                                 |    2 +
 gthumb/dlg-extensions.c                            |    2 +-
 gthumb/gio-utils.c                                 |   11 +-
 gthumb/gio-utils.h                                 |    2 +-
 gthumb/glib-utils.c                                |   11 +-
 gthumb/gth-browser-actions-entries.h               |    3 +-
 gthumb/gth-browser-ui.h                            |   10 +-
 gthumb/gth-extensions.c                            |    1 +
 gthumb/gth-extensions.h                            |    1 +
 gthumb/gth-file-list.c                             |   17 +-
 gthumb/gth-file-list.h                             |  105 ++-
 gthumb/gth-file-view.c                             |    8 +
 gthumb/gth-file-view.h                             |    4 +
 gthumb/gth-icon-cache.c                            |   11 +-
 gthumb/gth-icon-view.c                             |   19 +-
 gthumb/gth-image-loader.c                          |    2 +-
 gthumb/gth-main.c                                  |    3 +-
 gthumb/gth-main.h                                  |    5 +-
 gthumb/gth-pixbuf-list-task.c                      |   10 +-
 gthumb/gth-preferences.h                           |   88 +-
 gthumb/gth-thumb-loader.c                          |  474 +++++-----
 gthumb/gth-thumb-loader.h                          |   33 +-
 gthumb/pixbuf-io.c                                 |   33 +-
 gthumb/pixbuf-io.h                                 |   10 +-
 po/POTFILES.in                                     |   53 +-
 105 files changed, 9487 insertions(+), 1472 deletions(-)
---
diff --cc configure.ac
index e6b8468,52e6341..95ef661
--- a/configure.ac
+++ b/configure.ac
@@@ -277,11 -262,8 +278,8 @@@ AM_CONDITIONAL(ENABLE_JPEG_TOOLS, test 
  
  dnl ===========================================================================
  
- AC_MSG_CHECKING(TIFF Support)
  AC_ARG_ENABLE([tiff],
 -	      [AC_HELP_STRING([--disable-tiff],[do not compile code that uses the libtiff library])],,
 +	      [AS_HELP_STRING([--disable-tiff],[do not compile code that uses the libtiff library])],,
  	      [enable_tiff=yes])
  if test x$enable_tiff = xyes ; then
  	AC_CHECK_LIB(tiff, TIFFWriteScanline,