[gthumb: 10/10] Merge branch 'flickr-changes'

[Paolo Bacchilega <paobac src gnome org>]

commit 3723ffe149a62dfb1094e3b225b784f0cb631d1d
Merge: ea9d9df 3813bb7
Author: Paolo Bacchilega <paobac src gnome org>
Date:   Wed Apr 7 01:14:01 2010 +0200

    Merge branch 'flickr-changes'

 extensions/flicker/Makefile.am                     |    6 +-
 extensions/flicker/actions.c                       |   16 +-
 extensions/flicker/data/ui/export-to-flickr.ui     |   10 +-
 .../flicker/data/ui/flicker-ask-authorization.ui   |    6 +-
 .../data/ui/flicker-complete-authorization.ui      |    6 +-
 .../flicker/data/ui/flicker-export-completed.ui    |    4 +-
 extensions/flicker/data/ui/import-from-flickr.ui   |    1 -
 extensions/flicker/dlg-export-to-flickr.c          |  476 +++------------
 extensions/flicker/dlg-export-to-flickr.h          |    6 +-
 extensions/flicker/dlg-import-from-flickr.c        |  455 +++-----------
 extensions/flicker/dlg-import-from-flickr.h        |    4 +-
 extensions/flicker/flickr-account-manager-dialog.c |    3 +
 extensions/flicker/flickr-account.c                |   18 +-
 extensions/flicker/flickr-authentication.c         |  663 ++++++++++++++++++++
 extensions/flicker/flickr-authentication.h         |   77 +++
 extensions/flicker/flickr-connection.c             |   32 +-
 extensions/flicker/flickr-connection.h             |    4 +-
 extensions/flicker/flickr-service.c                |   12 +-
 extensions/flicker/flickr-types.h                  |   10 +
 19 files changed, 988 insertions(+), 821 deletions(-)
---