[gthumb: 10/11] Merge branch 'flicker'

[Paolo Bacchilega <paobac src gnome org>]

commit 22414e790afed56d556a6d6be0b3380efcf79861
Merge: adb6db4 f46520c
Author: Paolo Bacchilega <paobac src gnome org>
Date:   Thu Mar 11 17:35:25 2010 +0100

    Merge branch 'flicker'

 configure.ac                                       |    3 +
 data/icons/hicolor/16x16/actions/Makefile.am       |    2 +
 data/icons/hicolor/16x16/actions/flickr.png        |  Bin 0 -> 312 bytes
 data/icons/hicolor/16x16/actions/picasaweb.png     |  Bin 0 -> 742 bytes
 extensions/Makefile.am                             |    1 +
 extensions/catalogs/gth-catalog.c                  |   41 +-
 extensions/flicker/Makefile.am                     |   53 +
 extensions/flicker/actions.c                       |   45 +
 extensions/flicker/actions.h                       |   32 +
 extensions/flicker/callbacks.c                     |   94 ++
 extensions/flicker/callbacks.h                     |   30 +
 extensions/flicker/data/Makefile.am                |    3 +
 extensions/flicker/data/ui/Makefile.am             |   12 +
 extensions/flicker/data/ui/export-to-flickr.ui     |  433 ++++++++
 .../flicker/data/ui/flicker-account-chooser.ui     |   56 +
 .../flicker/data/ui/flicker-account-manager.ui     |  103 ++
 .../flicker/data/ui/flicker-ask-authorization.ui   |   78 ++
 .../data/ui/flicker-complete-authorization.ui      |   79 ++
 .../flicker/data/ui/flicker-export-completed.ui    |   70 ++
 extensions/flicker/dlg-export-to-flickr.c          |  884 +++++++++++++++
 extensions/flicker/dlg-export-to-flickr.h          |   31 +
 extensions/flicker/flicker.extension.in.in         |   12 +
 extensions/flicker/flickr-account-chooser-dialog.c |  184 ++++
 extensions/flicker/flickr-account-chooser-dialog.h |   61 +
 extensions/flicker/flickr-account-manager-dialog.c |  247 +++++
 extensions/flicker/flickr-account-manager-dialog.h |   59 +
 extensions/flicker/flickr-account.c                |  180 +++
 extensions/flicker/flickr-account.h                |   66 ++
 extensions/flicker/flickr-connection.c             |  552 ++++++++++
 extensions/flicker/flickr-connection.h             |  106 ++
 extensions/flicker/flickr-photoset.c               |  278 +++++
 extensions/flicker/flickr-photoset.h               |   84 ++
 extensions/flicker/flickr-service.c                | 1160 ++++++++++++++++++++
 extensions/flicker/flickr-service.h                |  131 +++
 extensions/flicker/flickr-types.h                  |   43 +
 extensions/flicker/flickr-user.c                   |  245 +++++
 extensions/flicker/flickr-user.h                   |   84 ++
 extensions/flicker/main.c                          |   53 +
 extensions/picasaweb/callbacks.c                   |    4 +-
 extensions/picasaweb/dlg-export-to-picasaweb.c     |    4 +-
 extensions/picasaweb/picasa-web-service.c          |    2 +-
 extensions/picasaweb/picasaweb.extension.in.in     |    1 +
 gthumb/gth-nav-window.c                            |    1 +
 43 files changed, 5601 insertions(+), 6 deletions(-)
---
diff --cc gthumb/gth-nav-window.c
index 47a30d0,4a13f76..dde50c4
--- a/gthumb/gth-nav-window.c
+++ b/gthumb/gth-nav-window.c
@@@ -26,8 -26,8 +26,9 @@@
  #include "gth-nav-window.h"
  #include "gth-image-viewer.h"
  #include "gtk-utils.h"
+ #include "pixbuf-utils.h"
  #include "icons/nav_button.xpm"
 +#include "pixbuf-utils.h"
  
  #define GTH_NAV_WINDOW_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GTH_TYPE_NAV_WINDOW, GthNavWindowPrivate))