Merge lp:~mardy/shotwell/uoa-update into lp:ubuntu/quantal/shotwell

[Alberto Mardegan]

Update the UOA patch
* Support multiple accounts per service
* Attempt automatic login
* Remove logout buttons

[lp:~mardy/shotwell/uoa-update]

85. By Alberto Mardegan on 2012-09-20

i18n update

* Allow translating the shotwell.application file
* Add the "Add more accounts..." string for translations.

86. By Alberto Mardegan on 2012-09-21

Avoid critical warnings

Vala was generating an enumerated type, but all we want is an int.

87. By Alberto Mardegan on 2012-09-21

Do not make warnings fatal when building plugins

Gtk.Table, which is used all over the place, has been deprecated.

88. By Alberto Mardegan on 2012-09-24

* New upstream bugfix release
* debian/watch:
  - Watch for stable versions

Unmerged revisions

88. By Alberto Mardegan on 2012-09-24

* New upstream bugfix release
* debian/watch:
  - Watch for stable versions

87. By Alberto Mardegan on 2012-09-21

Do not make warnings fatal when building plugins

Gtk.Table, which is used all over the place, has been deprecated.

86. By Alberto Mardegan on 2012-09-21

Avoid critical warnings

Vala was generating an enumerated type, but all we want is an int.

85. By Alberto Mardegan on 2012-09-20

i18n update

* Allow translating the shotwell.application file
* Add the "Add more accounts..." string for translations.

84. By Alberto Mardegan on 2012-09-12

Update UOA patch

* Support multiple accounts per service
* Remove login/logout buttons

83. By Alberto Mardegan on 2012-09-11

UOA: handle multiple accounts per service

82. By Sebastien Bacher on 2012-08-28

releasing version 0.12.90-0ubuntu1

81. By Sebastien Bacher on 2012-08-28

[ Alberto Mardegan ]
* debian/patches/06_uoa.patch:
  - updated for the new version

80. By Robert Ancell on 2012-08-24

New upstream release (LP: #1041011)

79. By Robert Ancell on 2012-08-24

* New upstream release
* debian/watch:
  - Watch for unstable versions
  - Releases now in .xz format

=== added directory '.bzr-builddeb'
=== added file '.bzr-builddeb/default.conf'
--- .bzr-builddeb/default.conf	1970-01-01 00:00:00 +0000
+++ .bzr-builddeb/default.conf	2012-09-17 10:22:22 +0000
@@ -0,0 +1,3 @@
+[BUILDDEB]
+merge = True
+ignore-unknowns = True

=== added directory 'debian'
=== renamed directory 'debian' => 'debian.moved'
=== added file 'debian/changelog'
--- debian/changelog	1970-01-01 00:00:00 +0000
+++ debian/changelog	2012-09-17 10:22:22 +0000
@@ -0,0 +1,424 @@
+shotwell (0.12.90-0ubuntu1) quantal; urgency=low
+
+  [ Robert Ancell ]
+  * New upstream release (LP: #1041011)
+  * debian/watch:
+    - Watch for unstable versions
+    - Releases now in .xz format
+
+  [ Alberto Mardegan ]
+  * debian/patches/06_uoa.patch:
+    - updated for the new version
+
+ -- Sebastien Bacher <[e-mail]>  Tue, 28 Aug 2012 16:57:19 +0200
+
+shotwell (0.12.3-0ubuntu2) quantal; urgency=low
+
+  * debian/patches/06_uoa.patch
+    - Added UOA support
+  * debian/control
+    - added build depends libsignon-glib-dev and libaccounts-glib-dev 
+
+ -- Ken VanDine <[e-mail]>  Tue, 21 Aug 2012 15:40:58 -0400
+
+shotwell (0.12.3-0ubuntu1) quantal; urgency=low
+
+  * New upstream version, fixes:
+    - Shotwell deletes tags at random (lp: #999108)
+    - shotwell's unity progress bar hangs halfway across (lp: #987046)
+    - Shotwell will not detect mts moviefiles on memory card (lp: #990725)
+
+ -- Sebastien Bacher <[e-mail]>  Wed, 16 May 2012 15:18:16 +0200
+
+shotwell (0.12.2-0ubuntu3) quantal; urgency=low
+
+  * debian/control:
+    - Use standards version 3.9.3
+    - Drop dependency on liblaunchpad-integration-3.0-dev
+  * debian/patches/01_lpi.patch:
+    - Dropped, we no longer do Launchpad integration
+
+ -- Robert Ancell <[e-mail]>  Mon, 14 May 2012 16:14:15 +1200
+
+shotwell (0.12.2-0ubuntu2) precise; urgency=low
+
+  * debian/control:
+    - Add build-depends on libunity-dev
+  * debian/rules:
+    - Build with --unity-support (LP: #980532)
+
+ -- Robert Ancell <[e-mail]>  Fri, 13 Apr 2012 09:11:15 +1000
+
+shotwell (0.12.2-0ubuntu1) precise; urgency=low
+
+  * New upstream release:
+    - Corrects an issue where graphical corruption of the UI could
+      occur if the user navigated away from a camera page while camera
+      previews were being generated.
+    - Adds enhanced support for the Unity desktop environment.
+    - Clarified several strings.
+    - The application now recovers gracefully from corrupted tag data.
+
+ -- Robert Ancell <[e-mail]>  Thu, 12 Apr 2012 10:44:07 +1000
+
+shotwell (0.12.1-0ubuntu2) precise; urgency=low
+
+  * debian/control: 
+    - build with current gexiv2 to pick the current soname (lp: #971468)
+
+ -- Sebastien Bacher <[e-mail]>  Mon, 02 Apr 2012 15:35:03 +0200
+
+shotwell (0.12.1-0ubuntu1) precise-proposed; urgency=low
+
+  * New upstream release:
+    - Corrects a critical issue where the application could not be started in
+      direct-edit mode.  
+
+ -- Robert Ancell <[e-mail]>  Thu, 29 Mar 2012 11:37:01 +1100
+
+shotwell (0.12.0-0ubuntu1) precise-proposed; urgency=low
+
+  * New upstream release:
+    (Changes since 0.11.6)
+    - Adds straighten tool
+    - Ported from GTK 2 to GTK 3
+    - Better handling of importing from Android devices
+    - Facebook and Flickr login now use OAuth authentication
+    - Numerous enhancements to the plugin subsystem
+    - The F-Spot importer is now implemented as a plugin
+    - Many, many bugfixes and stability enhancements
+  * debian/control:
+    - Bump build-depends on gexiv2
+
+ -- Robert Ancell <[e-mail]>  Wed, 28 Mar 2012 11:59:51 +1100
+
+shotwell (0.11.93-0ubuntu2) precise; urgency=low
+
+  * debian/control: build-depends on librest-dev, the publishing makefile
+    requires it
+
+ -- Sebastien Bacher <[e-mail]>  Wed, 07 Mar 2012 16:08:00 +0100
+
+shotwell (0.11.93-0ubuntu1) precise; urgency=low
+
+  * New upstream release
+
+ -- Robert Ancell <[e-mail]>  Wed, 07 Mar 2012 10:27:48 +1100
+
+shotwell (0.11.92-0ubuntu1) precise; urgency=low
+
+  * New upstream release
+
+ -- Robert Ancell <[e-mail]>  Tue, 21 Feb 2012 13:52:58 +1100
+
+shotwell (0.11.91-0ubuntu2) precise; urgency=low
+
+  * debian/control: use the correct liblaunchpad-integration version
+
+ -- Sebastien Bacher <[e-mail]>  Thu, 12 Jan 2012 11:58:24 +0100
+
+shotwell (0.11.91-0ubuntu1) precise; urgency=low
+
+  * New upstream version using GTK3 (lp: #871034),
+    should fix lp: #800459, #881896, #887357, #888363, #898028
+  * Refreshed patches for the new version
+  * debian/control:
+    - updated build-dependencies for GTK3
+  * debian/patches/99git_libraw_api.patch:
+    - dropped, the patch is in the new version
+
+ -- Sebastien Bacher <[e-mail]>  Wed, 11 Jan 2012 15:59:04 +0100
+
+shotwell (0.11.6-0ubuntu2) precise; urgency=low
+
+  * debian/patches/99git_libraw_api.patch: cherry-pick changes from git to work
+    with libraw 0.14.0.
+  * debian/patches/05-gomp-linking.patch: we also need to link shotwell against
+    GOMP now, apparently, so add -fopenmp to the Makefile's relevant rule.
+  * debian/shotwell-video-thumbnailer.1: added, it was missing from the previous
+    upload and referred to by debian/manpages.
+
+ -- Mathieu Trudel-Lapierre <[e-mail]>  Fri, 25 Nov 2011 12:31:19 -0500
+
+shotwell (0.11.6-0ubuntu1) precise; urgency=low
+
+  * New upstream version
+  * Resynchronize on Debian
+  * debian/control.in:
+    - build-depends on python-scour, liblaunchpad-integration-dev
+    - don't build-depends on locales-all
+  * debian/rules:
+    - use configure option --disable-icon-update and dh option --with-scour
+
+ -- Sebastien Bacher <[e-mail]>  Wed, 23 Nov 2011 21:19:35 +0100
+
+shotwell (0.11.5-1) unstable; urgency=low
+
+  * New upstream release (Closes: 645942).
+  * Show translations in GNOME menu, thanks to Hideki Yamane
+    <[e-mail]> for this (Closes: 644905).
+
+  [ Luca Falavigna ]
+  * Enable DM upload.
+
+ -- Devid Antonio Filoni <[e-mail]>  Sun, 23 Oct 2011 01:39:38 +0200
+
+shotwell (0.11.2-1) unstable; urgency=low
+
+  * Team upload.
+  * New upstream bugfix release.
+  * debian/rules:
+    - Do not compile GConf schema (Closes: #641677).
+
+ -- Luca Falavigna <[e-mail]>  Sat, 24 Sep 2011 14:27:33 +0200
+
+shotwell (0.11.1-1) unstable; urgency=low
+
+  * Team upload.
+  * New upstream bugfix release.
+  * debian/patches/sidebar-bg-color.patch:
+    - Refresh for new upstream release.
+
+ -- Luca Falavigna <[e-mail]>  Tue, 13 Sep 2011 20:53:25 +0200
+
+shotwell (0.11.0-1) unstable; urgency=low
+
+  * Team upload.
+  * New upstream release (Closes: #639863).
+  * debian/patches/sidebar-bg-color.patch:
+    - Refresh for new upstream release.
+  * debian/control:
+    - Build-depend on libgstreamer-plugins-base0.10-dev.
+
+ -- Luca Falavigna <[e-mail]>  Thu, 01 Sep 2011 19:59:07 +0200
+
+shotwell (0.10.1-1) unstable; urgency=low
+
+  * Team upload
+  * New upstream release (Closes: #629311).
+  * debian/patches/non-linux-fixes.patch:
+    - Removed, waiting for proper upstream porting efforts.
+  * debian/patches/sidebar-bg-color.patch:
+    - Refresh for new upstream release.
+  * debian/control:
+    - Add Debian Shotwell Maintainers to Maintainers.
+    - Move Devid to Uploaders.
+    - libwebkitgtk-dev transition (Closes: #635426).
+    - Set Architecture to linux-any, shotwell is currently unsupported
+      outside of Linux platform, and require some porting.
+  * debian/shotwell-video-thumbnailer.1:
+    - Provide a minimal man page for shotwell-video-thumbnailer
+
+ -- Luca Falavigna <[e-mail]>  Sun, 21 Aug 2011 15:38:31 +0200
+
+shotwell (0.9.3-1) unstable; urgency=low
+
+  * New upstream release (Closes: #622705).
+  * Update debian/patches/non-linux-fixes.patch patch.
+  * Bump Standards-Version to 3.9.2.
+
+ -- Devid Antonio Filoni <[e-mail]>  Sun, 01 May 2011 13:09:48 +0200
+
+shotwell (0.9.1-1) unstable; urgency=low
+
+  * Upload to unstable.
+  * New upstream release (Closes: #620765).
+  * debian/control: modify libgexiv2-dev (>= 0.3.1) to libgexiv2-dev
+    (>= 0.2.2-4) in Build-Depends field.
+  * Update debian/patches/non-linux-fixes.patch patch.
+
+ -- Devid Antonio Filoni <[e-mail]>  Fri, 08 Apr 2011 23:28:01 +0200
+
+shotwell (0.9.0-1) experimental; urgency=low
+
+  * New upstream release (Closes: #614730, #593660, #619478).
+  * debian/control: modify valac-0.10 (>= 0.10.4) to valac-0.12 (>= 0.11.7)
+    in Build-Depends field.
+  * debian/control: add m4 and libgnomevfs2-dev (>= 2.24.2) to Build-Depends
+    field.
+  * debian/control: modify libgexiv2-dev (>= 0.2.0) to libgexiv2-dev
+    (>= 0.3.1) in Build-Depends field.
+  * Remove debian/patches/vala-0_10_4.patch patch, fixed upstream.
+  * Update debian/patches/non-linux-fixes.patch patch.
+  * Update debian/copyright file.
+  * Override library-not-linked-against-libc lintian warnings.
+  * Override image-file-in-usr-lib lintian warnings.
+
+ -- Devid Antonio Filoni <[e-mail]>  Sun, 27 Mar 2011 15:07:13 +0200
+
+shotwell (0.8.1-4) unstable; urgency=low
+
+  * A patch was reverting some changes introduced in 0.8.1-3, apply them.
+
+ -- Devid Antonio Filoni <[e-mail]>  Sun, 27 Mar 2011 12:42:49 +0200
+
+shotwell (0.8.1-3) unstable; urgency=low
+
+  * Update debian/patches/non-linux-fixes.patch patch (Closes: #619682).
+  * Add debian/patches/vala-0_10_4.patch patch, fix FTBFS caused by 
+    valac 0.10.4.
+  * debian/control: modify valac-0.10 (>= 0.9.8) to valac-0.10 (>= 0.10.4)
+    in Build-Depends field.
+
+ -- Devid Antonio Filoni <[e-mail]>  Sat, 26 Mar 2011 23:45:32 +0100
+
+shotwell (0.8.1-2) unstable; urgency=low
+
+  * Upload to unstable (Closes: #614445).
+  * debian/control: modify libjson-glib-dev (>= 0.10.28) to libjson-glib-dev
+    (>= 0.7.6)
+  * debian/control: modify libgstreamer0.10-dev (>= 0.7.6) to
+    libgstreamer0.10-dev (>= 0.10.28)
+  * debian/control: modify libraw-dev to libraw-dev (>= 0.13.1-2).
+
+ -- Devid Antonio Filoni <[e-mail]>  Mon, 28 Feb 2011 22:16:51 +0100
+
+shotwell (0.8.1-1) experimental; urgency=low
+
+  * New upstream release.
+  * debian/control: modify valac-0.10 (>= 0.9.7) to valac-0.10 (>= 0.9.8) in
+    Build-Depends field.
+  * Update debian/copyright.
+
+ -- Devid Antonio Filoni <[e-mail]>  Thu, 27 Jan 2011 23:05:40 +0100
+
+shotwell (0.8.0-1) experimental; urgency=low
+
+  * New upstream release.
+  * debian/control: modify valac (>= 0.9.5) to valac-0.10 (>= 0.9.7) in
+    Build-Depends field.
+  * debian/control: add libjson-glib-dev and libgstreamer0.10-dev to
+    Build-Depends field.
+  * Update debian/patches/sidebar-bg-color.patch patch.
+  * Update debian/patches/non-linux-fixes.patch patch.
+
+ -- Devid Antonio Filoni <[e-mail]>  Fri, 07 Jan 2011 15:14:41 +0100
+
+shotwell (0.7.2-1) experimental; urgency=low
+
+  * New upstream release.
+  * Update debian/patches/sidebar-bg-color.patch patch.
+
+ -- Devid Antonio Filoni <[e-mail]>  Wed, 15 Sep 2010 14:56:23 +0200
+
+shotwell (0.7.0-1) experimental; urgency=low
+
+  * New upstream release.
+  * debian/control: remove Luca Falavigna from Uploaders field.
+  * debian/control: update valac version to >= 0.9.5.
+  * debian/control: update libgexiv2-dev version to >= 0.2.0.
+  * Update debian/patches/non-linux-fixes.patch patch.
+  * debian/patches/sidebar-bg-color.patch: don't set sidebar background color
+    (Closes: #594170).
+  * Bump Standards-Version to 3.9.1.
+
+ -- Devid Antonio Filoni <[e-mail]>  Tue, 24 Aug 2010 17:34:23 +0200
+
+shotwell (0.6.1-1) unstable; urgency=low
+
+  * New upstream release.
+  * debian/control:
+    - Build-depend on libusb-dev.
+    - Bump libgexiv2-dev version to be at least 0.1.0.
+
+ -- Luca Falavigna <[e-mail]>  Mon, 05 Jul 2010 20:05:18 +0200
+
+shotwell (0.6.0-1) unstable; urgency=low
+
+  * New upstream release.
+  * debian/patches/non-linux-fixes.patch:
+    - Refresh for new upstream release.
+  * debian/control:
+    - Bump Standards-Version to 3.9.0, no changes required.
+
+ -- Luca Falavigna <[e-mail]>  Wed, 30 Jun 2010 20:48:44 +0200
+
+shotwell (0.5.91-2) experimental; urgency=low
+
+  * debian/patches/non-linux-fixes.patch:
+    - Let libraw to be available under non-Linux architectures, fix FTBFS
+      on kFreeBSD (Closes: #586634).
+
+ -- Luca Falavigna <[e-mail]>  Mon, 21 Jun 2010 23:24:16 +0200
+
+shotwell (0.5.91-1) experimental; urgency=low
+
+  * New upstream development release.
+  * debian/patches/non-linux-fixes.patch:
+    - Refresh for new upstream release.
+  * debian/control:
+    - Build-depend on libgexiv2-dev and libraw-dev.
+    - No longer build-depend on libhal-dev.
+    - Adjust build-dependencies versioning.
+  * debian/README.source:
+    - Upstream clarified licensing of some icons with their authors, now
+      they are released under CC-BY-SA-3.0, so there is no need to repack
+      upstream tarball anymore, thus removing this file.
+
+ -- Luca Falavigna <[e-mail]>  Sun, 20 Jun 2010 16:09:43 +0200
+
+shotwell (0.5.2+dfsg-2) unstable; urgency=low
+
+  * debian/patches/non-linux-fixes.patch:
+    - Add Hurd bits to allow build on that architecture.
+
+ -- Luca Falavigna <[e-mail]>  Mon, 07 Jun 2010 23:41:52 +0200
+
+shotwell (0.5.2+dfsg-1) unstable; urgency=low
+
+  * New upstream release (Closes: #578903).
+  * Drop vala_0.8.0.patch patch, already applied by upstream.
+  * debian/control: add Luca Falavigna to Uploaders field.
+  * Add debian/patches/non-linux-fixes.patch patch from Peter Green to add
+    support for kfreebsd and hurd (Closes: #581662).
+  * debian/control: replace "libgudev-1.0-dev (>= 145)" with "libgudev-1.0-dev
+    (>= 145) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386]" as suggested by
+    Peter Green.
+
+ -- Devid Antonio Filoni <[e-mail]>  Sun, 23 May 2010 18:40:49 +0200
+
+shotwell (0.5.0+dfsg-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * debian/patches/vala_0.8.0.patch:
+    - Build with vala 0.8.0 (Closes: #577913).
+  * debian/control:
+    - Depend on librsvg2-common and dbus-x11 (Closes: #574112).
+    - Bump minimum valac version to 0.8.0.
+
+ -- Luca Falavigna <[e-mail]>  Sun, 18 Apr 2010 23:16:32 +0200
+
+shotwell (0.5.0+dfsg-1) unstable; urgency=low
+
+  * New upstream release.
+  * Update debian/copyright.
+  * Remove debian/patches directory, patches already applied upstream.
+  * debian/control: add libgudev-1.0-dev (>= 145) to Build-Depends field.
+  * Bump Standards-Version to 3.8.4.
+
+ -- Devid Antonio Filoni <[e-mail]>  Mon, 15 Mar 2010 15:59:23 +0100
+
+shotwell (0.4.3+dfsg-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * debian/patches/02_vala_0.7.10.patch:
+    - Fix build with vala 0.7.10 (Closes: #569370).
+  * debian/control:
+    - Bump minimum valac version to 0.7.10.
+
+ -- Luca Falavigna <[e-mail]>  Sat, 20 Feb 2010 18:03:45 +0100
+
+shotwell (0.4.3+dfsg-1) unstable; urgency=low
+
+  * New upstream release.
+  * Switch to format 3.0 (quilt).
+  * Add debian/patches/01_GNU-kFreeBSD.diff patch from Cyril Brulebois to fix
+    FTBFS on GNU/kFreeBSD (Closes: #564306).
+
+ -- Devid Antonio Filoni <[e-mail]>  Sat, 23 Jan 2010 18:56:33 +0100
+
+shotwell (0.4.2+dfsg-1) unstable; urgency=low
+
+  * Initial release (Closes: #561788).
+
+ -- Devid Antonio Filoni <[e-mail]>  Wed, 06 Jan 2010 14:08:43 +0100

=== added file 'debian/compat'
--- debian/compat	1970-01-01 00:00:00 +0000
+++ debian/compat	2012-09-17 10:22:22 +0000
@@ -0,0 +1,1 @@
+7

=== added file 'debian/control'
--- debian/control	1970-01-01 00:00:00 +0000
+++ debian/control	2012-09-17 10:22:22 +0000
@@ -0,0 +1,47 @@
+Source: shotwell
+Section: gnome
+Priority: optional
+Maintainer: Ubuntu Desktop Team <[e-mail]>
+XSBC-Original-Maintainer: Debian Shotwell Maintainers <[e-mail]>
+Uploaders: Devid Antonio Filoni <[e-mail]>
+Build-Depends: debhelper (>= 7.0.50~),
+               m4,
+               valac-0.18 (>= 0.17.2),
+               libgee-dev (>= 0.5.0),
+               libglib2.0-dev (>= 2.30.0),
+               libgtk-3-dev (>= 3.0.11),
+               libexif-dev (>= 0.6.16),
+               libsqlite3-dev (>= 3.5.9),
+               libgexiv2-dev (>= 0.4.1-1build1),
+               libgnomevfs2-dev (>= 2.24.2),
+               libgphoto2-2-dev (>= 2.4.2),
+               libsoup2.4-dev (>= 2.26.0),
+               libxml2 (>= 2.6.32),
+               libunique-3.0-dev (>= 1.0.0),
+               libwebkitgtk-3.0-dev (>= 1.1.5),
+               libgudev-1.0-dev (>= 145),
+               libdbus-glib-1-dev (>= 0.80),
+               libraw-dev (>= 0.13.2),
+               libusb-dev,
+               libjson-glib-dev (>= 0.7.6),
+               libgstreamer0.10-dev (>= 0.10.28),
+               libgstreamer-plugins-base0.10-dev (>= 0.10.32),
+               python-scour,
+               libunity-dev,
+               librest-dev,
+               libsignon-glib-dev,
+               libaccounts-glib-dev
+DM-Upload-Allowed: yes
+Standards-Version: 3.9.3
+Homepage: http://yorba.org/shotwell/
+Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/shotwell/ubuntu
+
+Package: shotwell
+Architecture: linux-any
+Depends: ${shlibs:Depends}, ${misc:Depends}, librsvg2-common, dbus-x11
+Recommends: account-plugin-facebook, account-plugin-google, account-plugin-flickr
+Description: digital photo organizer
+ Shotwell is a digital photo organizer designed for the GNOME desktop
+ environment. It allows you to import photos from disk or camera, organize
+ them in various ways, view them in full-window or fullscreen mode, and
+ export them to share with others.

=== added file 'debian/copyright'
--- debian/copyright	1970-01-01 00:00:00 +0000
+++ debian/copyright	2012-09-17 10:22:22 +0000
@@ -0,0 +1,435 @@
+This work was packaged for Debian by:
+
+    Devid Antonio Filoni <[e-mail]> on Wed, 06 Jan 2010 14:08:43 +0100
+
+It was downloaded from http://yorba.org/download/shotwell/
+
+
+
+Upstream Authors:
+
+    Jim Nelson <[e-mail]>
+    Lucas Beeler <[e-mail]>
+    Allison Barlow <[e-mail]>
+
+Copyright:
+
+    Copyright © 2009-2011 Yorba Foundation
+    Copyright © 2010 Evgeniy Polyakov
+    Copyright © 2010 Guillaume Viguier-Just
+    Copyright © 2010 Maxim Kartashev
+
+License:
+
+    This package is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this package; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+
+On Debian systems, the complete text of the GNU Lesser General
+Public License can be found in `/usr/share/common-licenses/LGPL-2.1'.
+
+
+
+The Debian packaging is:
+
+    Copyright © 2009-2011 Devid Antonio Filoni <[e-mail]>
+
+and is licensed under the GPL version 2, 
+see `/usr/share/common-licenses/GPL-2'.
+
+
+
+Authors of vapi/ige-mac-integration.vapi:
+
+    Michael Natterer <[e-mail]>
+    Richard Hult <[e-mail]>
+    Mikael Hallendal <[e-mail]>
+    John Ralls <[e-mail]>
+
+
+
+icons/pin-toolbar.png, icons/hidden.svg, icons/crop.* and icons/import.* are
+taken from Breathe Icon Set (https://launchpad.net/breathe-icon-set).
+
+icons/import-all.png is a derivate work of icons/import.svg and is licensed
+under Creative Commons Attribution-ShareAlike 3.0.
+
+Upstream Authors of Breathe Icon Set:
+
+    Sebastian Porta <[e-mail]>
+    Cory Kontros <[e-mail]>
+    Oliver Scholtz <[e-mail]>
+    Daniel Planas <[e-mail]>
+
+Copyright of Breathe Icon Set:
+
+    © 2009, Sebastian Porta <[e-mail]>
+    © 2009, Cory Kontros <[e-mail]>
+    © 2009, Oliver Scholtz <[e-mail]>
+    © 2009, Daniel Planas <[e-mail]>
+    © 2007, David Vignoni <[e-mail]>
+    © 2007, Johann Ollivier Lapeyre <[e-mail]>
+    © 2007, Kenneth Wimer <[e-mail]>
+    © 2007, Nuno Fernades Pinheiro <[e-mail]>
+    © 2007, Riccardo Iaconelli <[e-mail]>
+    © 2007, David Miller <[e-mail]>
+    © 2009, Rosetta Contributors and Canonical Ltd.
+
+License of Breathe Icon Set:
+
+    Creative Commons Attribution-ShareAlike 3.0
+
+    THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS 
+    CREATIVE COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS 
+    PROTECTED BY COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE 
+    WORK OTHER THAN AS AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS 
+    PROHIBITED.
+
+    BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND 
+    AGREE TO BE BOUND BY THE TERMS OF THIS LICENSE. TO THE EXTENT THIS 
+    LICENSE MAY BE CONSIDERED TO BE A CONTRACT, THE LICENSOR GRANTS YOU 
+    THE RIGHTS CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH 
+    TERMS AND CONDITIONS.
+
+    1. Definitions
+
+    1. "Adaptation" means a work based upon the Work, or upon the Work and 
+    other pre-existing works, such as a translation, adaptation, derivative 
+    work, arrangement of music or other alterations of a literary or artistic 
+    work, or phonogram or performance and includes cinematographic adaptations 
+    or any other form in which the Work may be recast, transformed, or adapted 
+    including in any form recognizably derived from the original, except that a 
+    work that constitutes a Collection will not be considered an Adaptation for 
+    the purpose of this License. For the avoidance of doubt, where the Work is 
+    a musical work, performance or phonogram, the synchronization of the Work 
+    in timed-relation with a moving image ("synching") will be considered an 
+    Adaptation for the purpose of this License.
+
+    2. "Collection" means a collection of literary or artistic works, such as 
+    encyclopedias and anthologies, or performances, phonograms or broadcasts,
+    or other works or subject matter other than works listed in Section 1(f) 
+    below, which, by reason of the selection and arrangement of their contents,
+    constitute intellectual creations, in which the Work is included in its 
+    entirety in unmodified form along with one or more other contributions, 
+    each constituting separate and independent works in themselves, which 
+    together are assembled into a collective whole. A work that constitutes a 
+    Collection will not be considered an Adaptation (as defined above) for the
+    purposes of this License.
+
+    3. "Creative Commons Compatible License" means a license that is listed at 
+    http://creativecommons.org/compatiblelicenses that has been approved by
+    Creative Commons as being essentially equivalent to this License, including,
+    at a minimum, because that license: (i) contains terms that have the same
+    purpose, meaning and effect as the License Elements of this License; and,
+    (ii) explicitly permits the relicensing of adaptations of works made 
+    available under that license under this License or a Creative Commons 
+    jurisdiction license with the same License Elements as this License.
+
+    4. "Distribute" means to make available to the public the original and 
+    copies of the Work or Adaptation, as appropriate, through sale or other 
+    transfer of ownership.
+
+    5. "License Elements" means the following high-level license attributes
+    as selected by Licensor and indicated in the title of this License:
+    Attribution, ShareAlike.
+
+    6. "Licensor" means the individual, individuals, entity or entities that
+    offer(s) the Work under the terms of this License.
+
+    7. "Original Author" means, in the case of a literary or artistic work, 
+    the individual, individuals, entity or entities who created the Work or 
+    if no individual or entity can be identified, the publisher; and in 
+    addition (i) in the case of a performance the actors, singers, musicians, 
+    dancers, and other persons who act, sing, deliver, declaim, play in, 
+    interpret or otherwise perform literary or artistic works or expressions 
+    of folklore; (ii) in the case of a phonogram the producer being the person 
+    or legal entity who first fixes the sounds of a performance or other 
+    sounds; and, (iii) in the case of broadcasts, the organization that 
+    transmits the broadcast.
+
+    8. "Work" means the literary and/or artistic work offered under the 
+    terms of this License including without limitation any production in 
+    the literary, scientific and artistic domain, whatever may be the mode 
+    or form of its expression including digital form, such as a book, 
+    pamphlet and other writing; a lecture, address, sermon or other 
+    work of the same nature; a dramatic or dramatico-musical work; a 
+    choreographic work or entertainment in dumb show; a musical composition 
+    with or without words; a cinematographic work to which are assimilated 
+    works expressed by a process analogous to cinematography; a work of 
+    drawing, painting, architecture, sculpture, engraving or lithography; a 
+    photographic work to which are assimilated works expressed by a 
+    process analogous to photography; a work of applied art; an illustration, 
+    map, plan, sketch or three-dimensional work relative to geography, 
+    topography, architecture or science; a performance; a broadcast; a 
+    phonogram; a compilation of data to the extent it is protected as a 
+    copyrightable work; or a work performed by a variety or circus performer 
+    to the extent it is not otherwise considered a literary or artistic work.
+
+    9. "You" means an individual or entity exercising rights under this 
+    License who has not previously violated the terms of this License with 
+    respect to the Work, or who has received express permission from the 
+    Licensor to exercise rights under this License despite a previous 
+    violation.
+
+    10. "Publicly Perform" means to perform public recitations of the Work 
+    and to communicate to the public those public recitations, by any means 
+    or process, including by wire or wireless means or public digital 
+    performances; to make available to the public Works in such a way that 
+    members of the public may access these Works from a place and at a place 
+    individually chosen by them; to perform the Work to the public by any 
+    means or process and the communication to the public of the performances 
+    of the Work, including by public digital performance; to broadcast and 
+    rebroadcast the Work by any means including signs, sounds or images.
+
+    11. "Reproduce" means to make copies of the Work by any means including
+    without limitation by sound or visual recordings and the right of 
+    fixation and reproducing fixations of the Work, including storage of 
+    a protected performance or phonogram in digital form or other electronic 
+    medium.
+
+    2. Fair Dealing Rights. Nothing in this License is intended to reduce, 
+    limit, or restrict any uses free from copyright or rights arising from 
+    limitations or exceptions that are provided for in connection with the 
+    copyright protection under copyright law or other applicable laws.
+
+    3. License Grant. Subject to the terms and conditions of this License,
+    Licensor hereby grants You a worldwide, royalty-free, non-exclusive, 
+    perpetual (for the duration of the applicable copyright) license to 
+    exercise the rights in the Work as stated below:
+
+    1. to Reproduce the Work, to incorporate the Work into one or more 
+    Collections, and to Reproduce the Work as incorporated in the Collections;
+    2. to create and Reproduce Adaptations provided that any such Adaptation, 
+    including any translation in any medium, takes reasonable steps to 
+    clearly label, demarcate or otherwise identify that changes were made to 
+    the original Work. For example, a translation could be marked "The 
+    original work was translated from English to Spanish," or a modification 
+    could indicate "The original work has been modified.";
+    3. to Distribute and Publicly Perform the Work including as incorporated 
+    in Collections; and,
+    4. to Distribute and Publicly Perform Adaptations.
+    5. For the avoidance of doubt:
+         1. Non-waivable Compulsory License Schemes. In those jurisdictions 
+    in which the right to collect royalties through any statutory or 
+    compulsory licensing scheme cannot be waived, the Licensor reserves 
+    the exclusive right to collect such royalties for any exercise by You 
+    of the rights granted under this License;
+         2. Waivable Compulsory License Schemes. In those jurisdictions in 
+    which the right to collect royalties through any statutory or compulsory 
+    licensing scheme can be waived, the Licensor waives the exclusive right 
+    to collect such royalties for any exercise by You of the rights granted 
+    under this License; and,
+         3. Voluntary License Schemes. The Licensor waives the right to 
+    collect royalties, whether individually or, in the event that the Licensor 
+    is a member of a collecting society that administers voluntary licensing 
+    schemes, via that society, from any exercise by You of the rights granted 
+    under this License.
+
+    The above rights may be exercised in all media and formats whether now 
+    known or hereafter devised. The above rights include the right to make 
+    such modifications as are technically necessary to exercise the rights 
+    in other media and formats. Subject to Section 8(f), all rights not 
+    expressly granted by Licensor are hereby reserved.
+
+    4. Restrictions. The license granted in Section 3 above is expressly 
+    made subject to and limited by the following restrictions:
+
+    1. You may Distribute or Publicly Perform the Work only under the terms
+    of this License. You must include a copy of, or the Uniform Resource
+    Identifier (URI) for, this License with every copy of the Work You
+    Distribute or Publicly Perform. You may not offer or impose any terms on
+    the Work that restrict the terms of this License or the ability of the
+    recipient of the Work to exercise the rights granted to that recipient
+    under the terms of the License. You may not sublicense the Work. You must
+    keep intact all notices that refer to this License and to the disclaimer of
+    warranties with every copy of the Work You Distribute or Publicly Perform.
+    When You Distribute or Publicly Perform the Work, You may not impose any
+    effective technological measures on the Work that restrict the ability of a
+    recipient of the Work from You to exercise the rights granted to that
+    recipient under the terms of the License. This Section 4(a) applies to the
+    Work as incorporated in a Collection, but this does not require the 
+    Collection apart from the Work itself to be made subject to the terms of
+    this License. If You create a Collection, upon notice from any Licensor You
+    must, to the extent practicable, remove from the Collection any credit as 
+    required by Section 4(c), as requested. If You create an Adaptation, upon
+    notice from any Licensor You must, to the extent practicable, remove from
+    the Adaptation any credit as required by Section 4(c), as requested.
+
+    2. You may Distribute or Publicly Perform an Adaptation only under the
+    terms of: (i) this License; (ii) a later version of this License with the
+    same License Elements as this License; (iii) a Creative Commons
+    jurisdiction license (either this or a later license version) that contains
+    the same License Elements as this License (e.g., Attribution-ShareAlike
+    3.0 US)); (iv) a Creative Commons Compatible License. If you license the
+    Adaptation under one of the licenses mentioned in (iv), you must comply
+    with the terms of that license. If you license the Adaptation under the
+    terms of any of the licenses mentioned in (i), (ii) or (iii) (the
+    "Applicable License"), you must comply with the terms of the Applicable
+    License generally and the following provisions: (I) You must include a
+    copy of, or the URI for, the Applicable License with every copy of each
+    Adaptation You Distribute or Publicly Perform; (II) You may not offer or
+    impose any terms on the Adaptation that restrict the terms of the
+    Applicable License or the ability of the recipient of the Adaptation to
+    exercise the rights granted to that recipient under the terms of the 
+    Applicable License; (III) You must keep intact all notices that refer to
+    the Applicable License and to the disclaimer of warranties with every copy
+    of the Work as included in the Adaptation You Distribute or Publicly
+    Perform; (IV) when You Distribute or Publicly Perform the Adaptation, You
+    may not impose any effective technological measures on the Adaptation that
+    restrict the ability of a recipient of the Adaptation from You to exercise
+    the rights granted to that recipient under the terms of the Applicable 
+    License. This Section 4(b) applies to the Adaptation as incorporated in a
+    Collection, but this does not require the Collection apart from the 
+    Adaptation itself to be made subject to the terms of the Applicable 
+    License.
+
+    3. If You Distribute, or Publicly Perform the Work or any Adaptations or
+    Collections, You must, unless a request has been made pursuant to Section
+    4(a), keep intact all copyright notices for the Work and provide, 
+    reasonable to the medium or means You are utilizing: (i) the name of the
+    Original Author (or pseudonym, if applicable) if supplied, and/or if the
+    Original Author and/or Licensor designate another party or parties (e.g.,
+    a sponsor institute, publishing entity, journal) for attribution
+    ("Attribution Parties") in Licensor's copyright notice, terms of service
+    or by other reasonable means, the name of such party or parties; (ii) the
+    title of the Work if supplied; (iii) to the extent reasonably practicable,
+    the URI, if any, that Licensor specifies to be associated with the Work, 
+    unless such URI does not refer to the copyright notice or licensing
+    information for the Work; and (iv) , consistent with Ssection 3(b), in the
+    case of an Adaptation, a credit identifying the use of the Work in the
+    Adaptation (e.g., "French translation of the Work by Original Author," or
+    "Screenplay based on original Work by Original Author"). The credit
+    required by this Section 4(c) may be implemented in any reasonable manner;
+    provided, however, that in the case of a Adaptation or Collection, at a
+    minimum such credit will appear, if a credit for all contributing authors
+    of the Adaptation or Collection appears, then as part of these credits and
+    in a manner at least as prominent as the credits for the other contributing
+    authors. For the avoidance of doubt, You may only use the credit required by
+    this Section for the purpose of attribution in the manner set out above and,
+    by exercising Your rights under this License, You may not implicitly or
+    explicitly assert or imply any connection with, sponsorship or endorsement
+    by the Original Author, Licensor and/or Attribution Parties, as 
+    appropriate, of You or Your use of the Work, without the separate, express
+    prior written permission of the Original Author, Licensor and/or 
+    Attribution Parties.
+
+    4. Except as otherwise agreed in writing by the Licensor or as may be
+    otherwise permitted by applicable law, if You Reproduce, Distribute or
+    Publicly Perform the Work either by itself or as part of any Adaptations
+    or Collections, You must not distort, mutilate, modify or take other
+    derogatory action in relation to the Work which would be prejudicial to
+    the Original Author's honor or reputation. Licensor agrees that in those
+    jurisdictions (e.g. Japan), in which any exercise of the right granted in
+    Section 3(b) of this License (the right to make Adaptations) would be
+    deemed to be a distortion, mutilation, modification or other derogatory
+    action prejudicial to the Original Author's honor and reputation, the
+    Licensor will waive or not assert, as appropriate, this Section, to the
+    fullest extent permitted by the applicable national law, to enable You to
+    reasonably exercise Your right under Section 3(b) of this License (right
+    to make Adaptations) but not otherwise.
+
+    5. Representations, Warranties and Disclaimer
+
+    UNLESS OTHERWISE MUTUALLY AGREED TO BY THE PARTIES IN WRITING, LICENSOR 
+    OFFERS THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY 
+    KIND CONCERNING THE WORK, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE, 
+    INCLUDING, WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTIBILITY, 
+    FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF 
+    LATENT OR OTHER DEFECTS, ACCURACY, OR THE PRESENCE OF ABSENCE OF ERRORS, 
+    WHETHER OR NOT DISCOVERABLE. SOME JURISDICTIONS DO NOT ALLOW THE 
+    EXCLUSION OF IMPLIED WARRANTIES, SO SUCH EXCLUSION MAY NOT APPLY TO YOU.
+
+    6. Limitation on Liability. EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE
+     LAW, IN NO EVENT WILL LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY FOR 
+    ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES 
+    ARISING OUT OF THIS LICENSE OR THE USE OF THE WORK, EVEN IF LICENSOR HAS 
+    BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+    7. Termination
+
+    1. This License and the rights granted hereunder will terminate 
+    automatically upon any breach by You of the terms of this License. 
+    Individuals or entities who have received Adaptations or Collections 
+    from You under this License, however, will not have their licenses 
+    terminated provided such individuals or entities remain in full 
+    compliance with those licenses. Sections 1, 2, 5, 6, 7, and 8 will 
+    survive any termination of this License.
+    2. Subject to the above terms and conditions, the license granted 
+    here is perpetual (for the duration of the applicable copyright in 
+    the Work). Notwithstanding the above, Licensor reserves the right to 
+    release the Work under different license terms or to stop distributing 
+    the Work at any time; provided, however that any such election will 
+    not serve to withdraw this License (or any other license that has been, 
+    or is required to be, granted under the terms of this License), and this 
+    License will continue in full force and effect unless terminated as stated
+    above.
+
+    8. Miscellaneous
+
+    1. Each time You Distribute or Publicly Perform the Work or a Collection, 
+    the Licensor offers to the recipient a license to the Work on the same 
+    terms and conditions as the license granted to You under this License.
+    2. Each time You Distribute or Publicly Perform an Adaptation, Licensor 
+    offers to the recipient a license to the original Work on the same terms 
+    and conditions as the license granted to You under this License.
+    3. If any provision of this License is invalid or unenforceable under 
+    applicable law, it shall not affect the validity or enforceability of 
+    the remainder of the terms of this License, and without further action 
+    by the parties to this agreement, such provision shall be reformed to 
+    the minimum extent necessary to make such provision valid and enforceable.
+    4. No term or provision of this License shall be deemed waived and no 
+    breach consented to unless such waiver or consent shall be in writing 
+    and signed by the party to be charged with such waiver or consent.
+    5. This License constitutes the entire agreement between the parties 
+    with respect to the Work licensed here. There are no understandings, 
+    agreements or representations with respect to the Work not specified 
+    here. Licensor shall not be bound by any additional provisions that 
+    may appear in any communication from You. This License may not be 
+    modified without the mutual written agreement of the Licensor and You.
+    6. The rights granted under, and the subject matter referenced, in this 
+    License were drafted utilizing the terminology of the Berne Convention 
+    for the Protection of Literary and Artistic Works (as amended on 
+    September 28, 1979), the Rome Convention of 1961, the WIPO Copyright 
+    Treaty of 1996, the WIPO Performances and Phonograms Treaty of 1996 
+    and the Universal Copyright Convention (as revised on July 24, 1971). 
+    These rights and subject matter take effect in the relevant jurisdiction 
+    in which the License terms are sought to be enforced according to the 
+    corresponding provisions of the implementation of those treaty 
+    provisions in the applicable national law. If the standard suite of 
+    rights granted under applicable copyright law includes additional rights 
+    not granted under this License, such additional rights are deemed to be 
+    included in the License; this License is not intended to restrict the 
+    license of any rights under applicable law.
+
+    Creative Commons Notice
+
+    Creative Commons is not a party to this License, and makes no warranty 
+    whatsoever in connection with the Work. Creative Commons will not be 
+    liable to You or any party on any legal theory for any damages whatsoever, 
+    vincluding without limitation any general, special, incidental or 
+    consequential damages arising in connection to this license. 
+    Notwithstanding the foregoing two (2) sentences, if Creative Commons has 
+    expressly identified itself as the Licensor hereunder, it shall have all 
+    rights and obligations of Licensor.
+
+    Except for the limited purpose of indicating to the public that the 
+    Work is licensed under the CCPL, Creative Commons does not authorize 
+    the use by either party of the trademark "Creative Commons" or any 
+    related trademark or logo of Creative Commons without the prior written 
+    consent of Creative Commons. Any permitted use will be in compliance 
+    with Creative Commons' then-current trademark usage guidelines, as may 
+    be published on its website or otherwise made available upon request 
+    from time to time. For the avoidance of doubt, this trademark restriction
+    does not form part of this License.
+
+    Creative Commons may be contacted at http://creativecommons.org/.

=== added file 'debian/docs'
--- debian/docs	1970-01-01 00:00:00 +0000
+++ debian/docs	2012-09-17 10:22:22 +0000
@@ -0,0 +1,2 @@
+README
+THANKS

=== added file 'debian/manpages'
--- debian/manpages	1970-01-01 00:00:00 +0000
+++ debian/manpages	2012-09-17 10:22:22 +0000
@@ -0,0 +1,2 @@
+debian/shotwell.1
+debian/shotwell-video-thumbnailer.1

=== added file 'debian/menu'
--- debian/menu	1970-01-01 00:00:00 +0000
+++ debian/menu	2012-09-17 10:22:22 +0000
@@ -0,0 +1,2 @@
+?package(shotwell):needs="X11" section="Applications/Viewers"\
+  title="Shotwell" command="/usr/bin/shotwell"

=== added directory 'debian/patches'
=== added file 'debian/patches/02_desktop_translations.patch'
--- debian/patches/02_desktop_translations.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/02_desktop_translations.patch	2012-09-17 10:22:22 +0000
@@ -0,0 +1,25 @@
+Description: Don't translate the .desktop files, they work with gettext and the build system translates them all into English
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/760978
+
+Index: shotwell-0.12.90/Makefile
+===================================================================
+--- shotwell-0.12.90.orig/Makefile	2012-08-24 10:38:39.000000000 +1200
++++ shotwell-0.12.90/Makefile	2012-08-24 15:03:05.212013701 +1200
+@@ -536,17 +536,6 @@
+ install:
+ 	cp misc/shotwell.desktop.head misc/shotwell.desktop
+ 	cp misc/shotwell-viewer.desktop.head misc/shotwell-viewer.desktop
+-	$(foreach lang,$(CORE_SUPPORTED_LANGUAGES), echo X-GNOME-FullName[$(lang)]=`TEXTDOMAINDIR=locale-langpack \
+-		LANGUAGE=$(lang) gettext --domain=shotwell $(DESKTOP_APP_FULL_NAME)` \
+-		>> misc/shotwell.desktop ; \
+-		echo GenericName[$(lang)]=`TEXTDOMAINDIR=locale-langpack LANGUAGE=$(lang) \
+-		gettext --domain=shotwell $(DESKTOP_APPLICATION_CLASS)` >> misc/shotwell.desktop ; \
+-		echo Comment[$(lang)]=`TEXTDOMAINDIR=locale-langpack LANGUAGE=$(lang) gettext \
+-		--domain=shotwell $(DESKTOP_APPLICATION_COMMENT)` >> misc/shotwell.desktop ; \
+-		echo X-GNOME-FullName[$(lang)]=`TEXTDOMAINDIR=locale-langpack LANGUAGE=$(lang) gettext \
+-		--domain=shotwell $(DIRECT_EDIT_DESKTOP_APP_FULL_NAME)` >> misc/shotwell-viewer.desktop ; \
+-		echo GenericName[$(lang)]=`TEXTDOMAINDIR=locale-langpack LANGUAGE=$(lang) gettext \
+-		--domain=shotwell $(DIRECT_EDIT_DESKTOP_APPLICATION_CLASS)` >> misc/shotwell-viewer.desktop ;)
+ 	touch $(LANG_STAMP)
+ 	mkdir -p $(DESTDIR)$(PREFIX)/bin
+ 	$(INSTALL_PROGRAM) $(PROGRAM) $(DESTDIR)$(PREFIX)/bin

=== added file 'debian/patches/03_appmenu_no_stubs.patch'
--- debian/patches/03_appmenu_no_stubs.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/03_appmenu_no_stubs.patch	2012-09-17 10:22:22 +0000
@@ -0,0 +1,9 @@
+Index: shotwell-0.11.91/misc/shotwell.desktop.head
+===================================================================
+--- shotwell-0.11.91.orig/misc/shotwell.desktop.head	2012-01-06 02:26:06.000000000 +0100
++++ shotwell-0.11.91/misc/shotwell.desktop.head	2012-01-11 15:11:14.909408671 +0100
+@@ -12,3 +12,4 @@
+ X-GIO-NoFuse=true
+ X-GNOME-Gettext-Domain=shotwell
+ X-GNOME-FullName=Shotwell Photo Manager
++X-Ayatana-Appmenu-Show-Stubs=false

=== added file 'debian/patches/04_no_resize_grip.patch'
--- debian/patches/04_no_resize_grip.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/04_no_resize_grip.patch	2012-09-17 10:22:22 +0000
@@ -0,0 +1,26 @@
+Description: Disable the resize grip, it conflicts with widgets in the bottom corner
+Author: Robert Ancell <[e-mail]>
+Bug: https://launchpad.net/bugs/740274
+
+Index: shotwell-0.12.0/src/AppWindow.vala
+===================================================================
+--- shotwell-0.12.0.orig/src/AppWindow.vala	2012-03-28 05:43:09.000000000 +1100
++++ shotwell-0.12.0/src/AppWindow.vala	2012-03-28 12:05:48.691285125 +1100
+@@ -413,6 +413,8 @@
+     
+ }
+ 
++extern static void gtk_window_set_has_resize_grip (Gtk.Window window, bool has_grip);
++
+ // AppWindow is the parent window for most windows in Shotwell (FullscreenWindow is the exception).
+ // There are multiple types of AppWindows (LibraryWindow, DirectWindow) for different tasks, but only 
+ // one AppWindow may exist per process.  Thus, if the user closes an AppWindow, the program exits.
+@@ -442,6 +444,8 @@
+         assert(instance == null);
+         instance = this;
+ 
++        gtk_window_set_has_resize_grip (this, false);
++        
+         title = Resources.APP_TITLE;
+         
+         GLib.List<Gdk.Pixbuf> pixbuf_list = new GLib.List<Gdk.Pixbuf>();

=== added file 'debian/patches/05-gomp-linking.patch'
--- debian/patches/05-gomp-linking.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/05-gomp-linking.patch	2012-09-17 10:22:22 +0000
@@ -0,0 +1,16 @@
+From: Mathieu Trudel-Lapierre <[e-mail]>
+Subject: Link against gomp as well (-lgomp)
+
+Index: shotwell-0.12.90/Makefile
+===================================================================
+--- shotwell-0.12.90.orig/Makefile	2012-08-24 15:03:05.000000000 +1200
++++ shotwell-0.12.90/Makefile	2012-08-24 15:04:46.356010199 +1200
+@@ -679,7 +679,7 @@
+ 	$(CC) -c $(VALA_CFLAGS) $(CFLAGS) -o $@ $<
+ 
+ $(PROGRAM): $(EXPANDED_OBJ_FILES) $(RESOURCES) $(LANG_STAMP) $(THUMBNAILER_BIN)
+-	$(CC) $(EXPANDED_OBJ_FILES) $(CFLAGS) $(LDFLAGS) $(RESOURCES) $(VALA_LDFLAGS) $(EXPORT_FLAGS) -o $@
++	$(CC) $(EXPANDED_OBJ_FILES) $(CFLAGS) $(LDFLAGS) $(RESOURCES) -fopenmp $(VALA_LDFLAGS) $(EXPORT_FLAGS) -o $@
+ 	glib-compile-schemas misc
+ 
+ $(THUMBNAILER_BIN): $(EXPANDED_THUMBNAILER_SRC_FILES)

=== added file 'debian/patches/06_uoa.patch'
--- debian/patches/06_uoa.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/06_uoa.patch	2012-09-17 10:22:22 +0000
@@ -0,0 +1,2790 @@
+Description: use Ubuntu Online Accounts for Picasa, Facebook and Flickr export plugins
+Author: Alberto Mardegan <[e-mail]>
+
+---
+diff --git a/Makefile b/Makefile
+index ff15b71..b848b7f 100644
+--- a/Makefile
++++ b/Makefile
+@@ -151,6 +151,7 @@ RESOURCE_FILES = \
+ 	trash.ui 
+ 
+ SYS_INTEGRATION_FILES = \
++	shotwell.application \
+ 	shotwell.desktop.head \
+ 	shotwell-viewer.desktop.head \
+ 	org.yorba.shotwell.gschema.xml \
+@@ -540,6 +541,8 @@ install:
+ 	mkdir -p $(DESTDIR)$(PREFIX)/bin
+ 	$(INSTALL_PROGRAM) $(PROGRAM) $(DESTDIR)$(PREFIX)/bin
+ 	$(INSTALL_PROGRAM) $(THUMBNAILER_BIN) $(DESTDIR)$(PREFIX)/bin
++	mkdir -p $(DESTDIR)$(PREFIX)/share/accounts/applications
++	$(INSTALL_DATA) misc/shotwell.application $(DESTDIR)$(PREFIX)/share/accounts/applications
+ 	mkdir -p $(DESTDIR)$(PREFIX)/share/shotwell/icons
+ 	$(INSTALL_DATA) icons/* $(DESTDIR)$(PREFIX)/share/shotwell/icons
+ 	mkdir -p $(DESTDIR)$(PREFIX)/share/icons/hicolor/scalable/apps
+diff --git a/misc/shotwell.application b/misc/shotwell.application
+new file mode 100644
+index 0000000..b121198
+--- /dev/null
++++ b/misc/shotwell.application
+@@ -0,0 +1,18 @@
++<?xml version="1.0" encoding="UTF-8" ?>
++<application id="shotwell">
++  <description>Shotwell</description>
++  <desktop-entry>shotwell.desktop</desktop-entry>
++
++  <services>
++    <service id="picasa">
++      <description>Publish your pictures to Picasa</description>
++    </service>
++    <service id="facebook-sharing">
++      <description>Publish your pictures to Facebook</description>
++    </service>
++    <service id="flickr-sharing">
++      <description>Publish your pictures to Flickr</description>
++    </service>
++  </services>
++
++</application>
+diff --git a/plugins/Makefile b/plugins/Makefile
+index c622063..255e9cc 100644
+--- a/plugins/Makefile
++++ b/plugins/Makefile
+@@ -4,7 +4,10 @@ include plugins.mk
+ DIST_FILES := \
+ 	Makefile \
+ 	Makefile.plugin.mk \
+-	plugins.mk
++	plugins.mk \
++	Accounts.vapi \
++	Accounts.deps \
++	Signon.vapi
+ 
+ .PHONY: all
+ all: $(ALL_PLUGINS)
+diff --git a/plugins/Makefile.plugin.mk b/plugins/Makefile.plugin.mk
+index 51a0426..d82cc0f 100644
+--- a/plugins/Makefile.plugin.mk
++++ b/plugins/Makefile.plugin.mk
+@@ -27,6 +27,8 @@ PKGS := $(shell sed ':a;N;$$!ba;s/\n/ /g' ../shotwell-plugin-dev-1.0.deps) $(PKG
+ # automatically include the shotwell-plugin-dev-1.0 package as a local dependency
+ EXT_PKGS := $(PKGS)
+ PKGS := shotwell-plugin-dev-1.0 $(PKGS) $(PLUGIN_PKGS)
++EXT_PKGS := libsignon-glib libaccounts-glib $(EXT_PKGS)
++PKGS := signon accounts $(PKGS)
+ 
+ # automatically include the Resources.vala common file
+ SRC_FILES := ../common/Resources.vala $(SRC_FILES)
+diff --git a/plugins/common/RESTSupport.vala b/plugins/common/RESTSupport.vala
+index 12b4180..d4be236 100644
+--- a/plugins/common/RESTSupport.vala
++++ b/plugins/common/RESTSupport.vala
+@@ -314,7 +314,7 @@ public class Transaction {
+             old_url = message.get_uri().to_string(false);
+             url_with_query = get_endpoint_url() + "?" + formdata_string;
+             message.set_uri(new Soup.URI(url_with_query));
+-        } else {
++        } else if (get_method() == HttpMethod.POST) {
+             message.set_request("application/x-www-form-urlencoded", Soup.MemoryUse.COPY,
+                 formdata_string.data);
+         }
+diff --git a/plugins/common/accounts.vala b/plugins/common/accounts.vala
+new file mode 100644
+index 0000000..d614be6
+--- /dev/null
++++ b/plugins/common/accounts.vala
+@@ -0,0 +1,226 @@
++/* Copyright 2009-2011 Yorba Foundation
++ *
++ * This software is licensed under the GNU Lesser General Public License
++ * (version 2.1 or later).  See the COPYING file in this distribution.
++ */
++
++namespace Publishing.Accounts {
++
++public class SharingAccount {
++    private Ag.AccountService account_service = null;
++
++    public SharingAccount(Ag.AccountService account_service) {
++        this.account_service = account_service;
++    }
++
++    public Signon.AuthSession create_auth_session() throws GLib.Error {
++        var auth_data = account_service.get_auth_data();
++
++        debug("Signon-id: %u", auth_data.get_credentials_id());
++
++        return new Signon.AuthSession(auth_data.get_credentials_id(),
++                                      auth_data.get_method());
++    }
++
++    public HashTable<string,Value?> get_session_parameters(out string mechanism) {
++        var auth_data = account_service.get_auth_data();
++        mechanism = auth_data.get_mechanism();
++        return auth_data.get_parameters();
++    }
++}
++
++public class SharingAccounts {
++    private static Ag.Manager manager = null;
++    private string provider_name;
++    private Ag.AccountService[] all_accounts;
++
++    public SharingAccounts(string provider_name) {
++        if (manager == null) {
++            manager = new Ag.Manager.for_service_type("sharing");
++        }
++        manager.enabled_event.connect(on_account_enabled);
++
++        this.provider_name = provider_name;
++        all_accounts = get_accounts();
++    }
++
++    private void on_account_enabled(uint account_id) {
++        /* To keep the implementation simple, just rebuild the account
++         * list from scratch */
++        all_accounts = get_accounts();
++    }
++
++    private Ag.AccountService[] get_accounts() {
++        GLib.List<Ag.AccountService> accounts =
++            manager.get_enabled_account_services();
++
++        Ag.AccountService[] list = {};
++
++        foreach (Ag.AccountService account_service in accounts) {
++            Ag.Account account = account_service.get_account();
++            if (account.get_provider_name() == provider_name) {
++                list += account_service;
++            }
++        }
++        return list;
++    }
++
++    public bool has_enabled_accounts() {
++        return all_accounts.length > 0;
++    }
++
++    public string[] list_account_names() {
++        string[] names = {};
++        foreach (Ag.AccountService account_service in all_accounts) {
++            names += account_service.get_account().get_display_name();
++        }
++        return names;
++    }
++
++    public SharingAccount? find_account(string? account_name) {
++        foreach (Ag.AccountService account_service in all_accounts)
++            if (account_service.get_account().get_display_name() == account_name) {
++                return new SharingAccount(account_service);
++            }
++
++        return null;
++    }
++}
++
++public abstract class UOAPublishingService : Object, Spit.Pluggable, Spit.Publishing.Service {
++    private SharingAccounts account_manager;
++
++    public UOAPublishingService(string provider_name) {
++        account_manager = new SharingAccounts(provider_name);
++    }
++
++    public virtual int get_pluggable_interface(int min_host_interface, int max_host_interface) {
++        return Spit.negotiate_interfaces(min_host_interface, max_host_interface,
++            Spit.Publishing.CURRENT_INTERFACE);
++    }
++
++    public abstract unowned string get_id();
++
++    public abstract unowned string get_pluggable_name();
++
++    public abstract void get_info(ref Spit.PluggableInfo info);
++
++    public virtual void activation(bool enabled) {
++    }
++
++    public abstract Spit.Publishing.Publisher create_publisher(string? account_name, Spit.Publishing.PluginHost host);
++
++    public abstract Spit.Publishing.Publisher.MediaType get_supported_media();
++
++    public SharingAccount? find_account(string? account_name) {
++        return account_manager.find_account(account_name);
++    }
++
++    public bool is_enabled() {
++        return account_manager.has_enabled_accounts();
++    }
++
++    public string[] list_account_names() {
++        return account_manager.list_account_names();
++    }
++}
++
++public class UOAPublisherAuthenticator : Object {
++    private weak Spit.Publishing.PluginHost host = null;
++    private Signon.AuthSession auth_session = null;
++    private SharingAccount account = null;
++    private bool firstLoginAttempt = true;
++    private string welcome_message = null;
++
++    public UOAPublisherAuthenticator(SharingAccount account,
++                                     Spit.Publishing.PluginHost host,
++                                     string welcome_message)
++    {
++        this.host = host;
++        this.account = account;
++        this.welcome_message = welcome_message;
++    }
++
++    public signal void authenticated(owned HashTable<string,Value?> session_data);
++
++    public void authenticate() {
++        debug("ACTION: authentication requested.");
++
++        do_authentication();
++    }
++
++    public HashTable<string,Value?>? get_authentication_data() {
++        if (account == null) return null;
++        string mechanism = null;
++        return account.get_session_parameters(out mechanism);
++    }
++
++    private void do_authentication() {
++        debug("ACTION: authenticating.");
++
++        HashTable<string,Value?> data = null;
++        string mechanism = null;
++
++        if (account != null) {
++            try {
++                auth_session = account.create_auth_session();
++                data = account.get_session_parameters(out mechanism);
++                debug("Got account data");
++            } catch (GLib.Error e) {
++                warning("EVENT: couldn't create session for account: %s",
++                        e.message);
++            }
++        }
++
++        if (data == null) {
++            warning ("No account authentication data");
++            host.post_error(new Spit.Publishing.PublishingError.SERVICE_ERROR(
++                "Error while accessing the account"));
++            return;
++        }
++
++        if (firstLoginAttempt) {
++            firstLoginAttempt = false;
++            data.insert("UiPolicy", Signon.SessionDataUiPolicy.NO_USER_INTERACTION);
++        } else {
++            var windowId = host.get_dialog_xid();
++            if (windowId != 0) {
++                data.insert("WindowId", (uint)windowId);
++            }
++        }
++
++        auth_session.process(data, mechanism, on_processed);
++        host.set_service_locked(true);
++    }
++
++    private void on_processed(Signon.AuthSession self, owned HashTable<string,Value?>? session_data, GLib.Error error){
++        host.set_service_locked(false);
++        if (error != null) {
++            debug("got error: %s", error.message);
++            if (error is Signon.Error.USER_INTERACTION) {
++                debug("User interaction!");
++                do_show_service_welcome_pane();
++            } else {
++                host.post_error(new Spit.Publishing.PublishingError.SERVICE_ERROR("Authentication failed"));
++            }
++            return;
++        }
++
++        authenticated(session_data);
++    }
++
++    private void do_show_service_welcome_pane() {
++        debug("ACTION: showing service welcome pane.");
++
++        host.install_welcome_pane(welcome_message, on_service_welcome_login);
++    }
++
++    private void on_service_welcome_login() {
++        debug("EVENT: user clicked 'Login' in welcome pane.");
++
++        do_authentication();
++    }
++}
++
++}
++
+diff --git a/plugins/shotwell-publishing-extras/YandexPublishing.vala b/plugins/shotwell-publishing-extras/YandexPublishing.vala
+index 1370690..760a8f3 100644
+--- a/plugins/shotwell-publishing-extras/YandexPublishing.vala
++++ b/plugins/shotwell-publishing-extras/YandexPublishing.vala
+@@ -30,7 +30,7 @@ public class YandexService : Object, Spit.Pluggable, Spit.Publishing.Service {
+         info.license = Resources.LICENSE;
+     }
+     
+-    public Spit.Publishing.Publisher create_publisher(Spit.Publishing.PluginHost host) {
++    public Spit.Publishing.Publisher create_publisher(string? account, Spit.Publishing.PluginHost host) {
+         return new Publishing.Yandex.YandexPublisher(this, host);
+     }
+ 
+diff --git a/plugins/shotwell-publishing/FacebookPublishing.vala b/plugins/shotwell-publishing/FacebookPublishing.vala
+index fa9d8f2..bd3cd08 100644
+--- a/plugins/shotwell-publishing/FacebookPublishing.vala
++++ b/plugins/shotwell-publishing/FacebookPublishing.vala
+@@ -4,30 +4,28 @@
+  * (version 2.1 or later).  See the COPYING file in this distribution.
+  */
+ 
+-public class FacebookService : Object, Spit.Pluggable, Spit.Publishing.Service {
++using Publishing.Accounts;
++
++public class FacebookService : UOAPublishingService, Spit.Pluggable, Spit.Publishing.Service {
+     private const string ICON_FILENAME = "facebook.png";
+ 
+     private static Gdk.Pixbuf[] icon_pixbuf_set = null;
+     
+     public FacebookService(GLib.File resource_directory) {
++        base("facebook");
+         if (icon_pixbuf_set == null)
+             icon_pixbuf_set = Resources.load_icon_set(resource_directory.get_child(ICON_FILENAME));
+     }
+     
+-    public int get_pluggable_interface(int min_host_interface, int max_host_interface) {
+-        return Spit.negotiate_interfaces(min_host_interface, max_host_interface,
+-            Spit.Publishing.CURRENT_INTERFACE);
+-    }
+-
+-    public unowned string get_id() {
++    public override unowned string get_id() {
+         return "org.yorba.shotwell.publishing.facebook";
+     }
+ 
+-    public unowned string get_pluggable_name() {
++    public override unowned string get_pluggable_name() {
+         return "Facebook";
+     }
+ 
+-    public void get_info(ref Spit.PluggableInfo info) {
++    public override void get_info(ref Spit.PluggableInfo info) {
+         info.authors = "Lucas Beeler";
+         info.copyright = _("Copyright 2009-2012 Yorba Foundation");
+         info.translators = Resources.TRANSLATORS;
+@@ -39,14 +37,12 @@ public class FacebookService : Object, Spit.Pluggable, Spit.Publishing.Service {
+         info.icons = icon_pixbuf_set;
+     }
+ 
+-    public void activation(bool enabled) {
++    public override Spit.Publishing.Publisher create_publisher(string? account_name, Spit.Publishing.PluginHost host) {
++        SharingAccount account = find_account(account_name);
++        return new Publishing.Facebook.FacebookPublisher(this, account, host);
+     }
+ 
+-    public Spit.Publishing.Publisher create_publisher(Spit.Publishing.PluginHost host) {
+-        return new Publishing.Facebook.FacebookPublisher(this, host);
+-    }
+-
+-    public Spit.Publishing.Publisher.MediaType get_supported_media() {
++    public override Spit.Publishing.Publisher.MediaType get_supported_media() {
+         return (Spit.Publishing.Publisher.MediaType.PHOTO |
+             Spit.Publishing.Publisher.MediaType.VIDEO);
+     }
+@@ -66,8 +62,6 @@ internal const string PHOTO_ENDPOINT_URL = "https://api.facebook.com/restserver.
+ internal const string VIDEO_ENDPOINT_URL = "https://api-video.facebook.com/restserver.php";
+ internal const string SERVICE_WELCOME_MESSAGE =
+     _("You are not currently logged into Facebook.\n\nIf you don't yet have a Facebook account, you can create one during the login process. During login, Shotwell Connect may ask you for permission to upload photos and publish to your feed. These permissions are required for Shotwell Connect to function.");
+-internal const string RESTART_ERROR_MESSAGE =
+-    _("You have already logged in and out of Facebook during this Shotwell session.\nTo continue publishing to Facebook, quit and restart Shotwell, then try publishing again.");
+ // as of mid-November 2010, the privacy the simple string "SELF" is no longer a valid
+ // privacy value; "SELF" must be simulated by a "CUSTOM" setting; see the discussion
+ // http://forum.developers.facebook.net/viewtopic.php?pid=289287
+@@ -163,19 +157,23 @@ public class FacebookPublisher : Spit.Publishing.Publisher, GLib.Object {
+     private int publish_to_album = NO_ALBUM;
+     private weak Spit.Publishing.PluginHost host = null;
+     private FacebookRESTSession session = null;
+-    private WebAuthenticationPane web_auth_pane = null;
+     private Spit.Publishing.ProgressCallback progress_reporter = null;
+     private weak Spit.Publishing.Service service = null;
+     private bool strip_metadata = false;
+     private bool running = false;
++    private UOAPublisherAuthenticator authenticator = null;
+ 
+     private Resolution target_resolution = Resolution.HIGH;
+ 
+     public FacebookPublisher(Spit.Publishing.Service service,
++        SharingAccount account,
+         Spit.Publishing.PluginHost host) {
+         debug("FacebookPublisher instantiated.");
+         this.service = service;
+         this.host = host;
++        authenticator = new UOAPublisherAuthenticator(account, host,
++                                                      SERVICE_WELCOME_MESSAGE);
++        authenticator.authenticated.connect(on_authenticator_authenticated);
+     }
+ 
+     private bool is_running() {
+@@ -190,49 +188,10 @@ public class FacebookPublisher : Spit.Publishing.Publisher, GLib.Object {
+         return NO_ALBUM;
+     }
+ 
+-    private bool is_persistent_session_valid() {
+-        string? access_token = get_persistent_access_token();
+-        string? uid = get_persistent_uid();
+-        string? user_name = get_persistent_user_name();
+-
+-        bool valid = ((access_token != null) && (uid != null) && (user_name != null));
+-
+-        if (valid)
+-            debug("existing Facebook session for user = '%s' found in configuration database; using it.", user_name);
+-        else
+-            debug("no persisted Facebook session exists.");
+-
+-        return valid;
+-    }
+-
+-    private string? get_persistent_access_token() {
+-        return host.get_config_string("access_token", null);
+-    }
+-
+-    private string? get_persistent_uid() {
+-        return host.get_config_string("uid", null);
+-    }
+-
+-    private string? get_persistent_user_name() {
+-        return host.get_config_string("user_name", null);
+-    }
+-    
+     private bool get_persistent_strip_metadata() {
+         return host.get_config_bool("strip_metadata", false);
+     }
+ 
+-    private void set_persistent_access_token(string access_token) {
+-        host.set_config_string("access_token", access_token);
+-    }
+-
+-    private void set_persistent_uid(string uid) {
+-        host.set_config_string("uid", uid);
+-    }
+-
+-    private void set_persistent_user_name(string user_name) {
+-        host.set_config_string("user_name", user_name);
+-    }
+-    
+     private void set_persistent_strip_metadata(bool strip_metadata) {
+         host.set_config_bool("strip_metadata", strip_metadata);
+     }
+@@ -247,39 +206,6 @@ public class FacebookPublisher : Spit.Publishing.Publisher, GLib.Object {
+         host.set_config_int("default_size", size);
+     }
+ 
+-    private void invalidate_persistent_session() {
+-        debug("invalidating persisted Facebook session.");
+-
+-        set_persistent_access_token("");
+-        set_persistent_uid("");
+-        set_persistent_user_name("");
+-    }
+-
+-    private void do_show_service_welcome_pane() {
+-        debug("ACTION: showing service welcome pane.");
+-
+-        host.install_welcome_pane(SERVICE_WELCOME_MESSAGE, on_login_clicked);
+-        host.set_service_locked(false);
+-    }
+-
+-    private void do_test_connection_to_endpoint() {
+-        debug("ACTION: testing connection to Facebook endpoint.");
+-        host.set_service_locked(true);
+-        
+-        host.install_static_message_pane(_("Testing connection to Facebook..."));
+-
+-        FacebookEndpointTestTransaction txn = new FacebookEndpointTestTransaction(session);
+-        txn.completed.connect(on_endpoint_test_completed);
+-        txn.network_error.connect(on_endpoint_test_error);
+-
+-        try {
+-            txn.execute();
+-        } catch (Spit.Publishing.PublishingError err) {
+-            if (is_running())
+-                host.post_error(err);
+-        }
+-    }
+-
+     private void do_fetch_album_descriptions() {
+         debug("ACTION: fetching album descriptions from remote endpoint.");
+ 
+@@ -387,7 +313,6 @@ public class FacebookPublisher : Spit.Publishing.Publisher, GLib.Object {
+         PublishingOptionsPane publishing_options_pane = new PublishingOptionsPane(
+             session.get_user_name(), albums, host.get_publishable_media_type(), this, builder,
+             get_persistent_strip_metadata());
+-        publishing_options_pane.logout.connect(on_publishing_options_pane_logout);
+         publishing_options_pane.publish.connect(on_publishing_options_pane_publish);
+         host.install_dialog_pane(publishing_options_pane,
+             Spit.Publishing.PluginHost.ButtonMode.CANCEL);
+@@ -396,51 +321,20 @@ public class FacebookPublisher : Spit.Publishing.Publisher, GLib.Object {
+     private void do_logout() {
+         debug("ACTION: clearing persistent session information and restaring interaction.");
+ 
+-        invalidate_persistent_session();
+-
+         running = false;
+         start();
+     }
+ 
+-    private void do_hosted_web_authentication() {
+-        debug("ACTION: doing hosted web authentication.");
+-
+-        host.set_service_locked(false);
+-
+-        web_auth_pane = new WebAuthenticationPane();
+-        web_auth_pane.login_succeeded.connect(on_web_auth_pane_login_succeeded);
+-        web_auth_pane.login_failed.connect(on_web_auth_pane_login_failed);
+-
+-        host.install_dialog_pane(web_auth_pane,
+-            Spit.Publishing.PluginHost.ButtonMode.CANCEL);
+-    }
+-
+-    private void do_authenticate_session(string success_url) {
+-        debug("ACTION: preparing to extract session information encoded in url = '%s'",
+-            success_url);
+-
++    public void on_authenticator_authenticated(owned HashTable<string,Value?> session_data) {
+         host.set_service_locked(true);
+         host.install_account_fetch_wait_pane();
+ 
+         session.authenticated.connect(on_session_authenticated);
+         session.authentication_failed.connect(on_session_authentication_failed);
+ 
+-        try {
+-            session.authenticate_from_uri(success_url);
+-        } catch (Spit.Publishing.PublishingError err) {
+-            // only post an error if we're running; errors tend to come in groups, so it's possible
+-            // another error has already posted and caused us to stop
+-            if (is_running())
+-                host.post_error(err);
+-        }
+-    }
+-
+-    private void do_save_session_information() {
+-        debug("ACTION: saving session information to configuration system.");
+-
+-        set_persistent_access_token(session.get_access_token());
+-        set_persistent_uid(session.get_user_id());
+-        set_persistent_user_name(session.get_user_name());
++        string token = session_data.lookup("AccessToken").get_string();
++        debug("Access Token: %s", token);
++        session.authenticate_with_parameters(token, null, null);
+     }
+ 
+     private void do_upload(bool strip_metadata) {
+@@ -528,64 +422,6 @@ public class FacebookPublisher : Spit.Publishing.Publisher, GLib.Object {
+         host.install_success_pane();
+     }
+ 
+-    private void on_login_clicked() {
+-        if (!is_running())
+-            return;
+-
+-        debug("EVENT: user clicked 'Login' on welcome pane.");
+-
+-        do_test_connection_to_endpoint();
+-    }
+-
+-    private void on_endpoint_test_completed(FacebookRESTTransaction txn) {
+-        txn.completed.disconnect(on_endpoint_test_completed);
+-        txn.network_error.disconnect(on_endpoint_test_error);
+-
+-        if (!is_running())
+-            return;
+-
+-        debug("EVENT: endpoint test transaction detected that the Facebook endpoint is alive.");
+-
+-        do_hosted_web_authentication();
+-    }
+-
+-    private void on_endpoint_test_error(FacebookRESTTransaction bad_txn,
+-        Spit.Publishing.PublishingError err) {
+-        bad_txn.completed.disconnect(on_endpoint_test_completed);
+-        bad_txn.network_error.disconnect(on_endpoint_test_error);
+-
+-        if (!is_running())
+-            return;
+-
+-        debug("EVENT: endpoint test transaction failed to detect a connection to the Facebook endpoint");
+-
+-        host.post_error(err);
+-    }
+-
+-    private void on_web_auth_pane_login_succeeded(string success_url) {
+-        if (!is_running())
+-            return;
+-
+-        debug("EVENT: hosted web login succeeded.");
+-
+-        do_authenticate_session(success_url);
+-    }
+-
+-    private void on_web_auth_pane_login_failed() {
+-        if (!is_running())
+-            return;
+-
+-        debug("EVENT: hosted web login failed.");
+-
+-        // In this case, "failed" doesn't mean that the user didn't enter the right username and
+-        // password -- Facebook handles that case inside the Facebook Connect web control. Instead,
+-        // it means that no session was initiated in response to our login request. The only
+-        // way this happens is if the user clicks the "Cancel" button that appears inside
+-        // the web control. In this case, the correct behavior is to return the user to the
+-        // service welcome pane so that they can start the web interaction again.
+-        do_show_service_welcome_pane();
+-    }
+-
+     private void on_session_authenticated() {
+         if (!is_running())
+             return;
+@@ -593,7 +429,6 @@ public class FacebookPublisher : Spit.Publishing.Publisher, GLib.Object {
+         assert(session.is_authenticated());
+         debug("EVENT: an authenticated session has become available.");
+ 
+-        do_save_session_information();
+         do_fetch_album_descriptions();
+     }
+ 
+@@ -638,15 +473,6 @@ public class FacebookPublisher : Spit.Publishing.Publisher, GLib.Object {
+         do_show_publishing_options_pane();
+     }
+ 
+-    public void on_publishing_options_pane_logout() {
+-        if (!is_running())
+-            return;
+-
+-        debug("EVENT: user clicked 'Logout' in publishing options pane.");
+-
+-        do_logout();
+-    }
+-
+     public void on_publishing_options_pane_publish(string? target_album, string privacy_setting,
+         Resolution target_resolution, bool strip_metadata) {
+         if (!is_running())
+@@ -762,26 +588,8 @@ public class FacebookPublisher : Spit.Publishing.Publisher, GLib.Object {
+         albums = null;
+         publish_to_album = NO_ALBUM;
+ 
+-        // determine whether a user is logged in; if so, then show the publishing options pane
+-        // for that user; otherwise, show the welcome pane
+-        if (is_persistent_session_valid()) {
+-            // if valid session information has been saved in the configuration system, build
+-            // a Session object and pre-authenticate it with the saved information, then simulate an
+-            // on_session_authenticated event to drive the rest of the interaction
+-            session = new FacebookRESTSession(PHOTO_ENDPOINT_URL, USER_AGENT);
+-            session.authenticate_with_parameters(get_persistent_access_token(),
+-                get_persistent_uid(), get_persistent_user_name());
+-            on_session_authenticated();
+-        } else {
+-            if (WebAuthenticationPane.is_cache_dirty()) {
+-                host.set_service_locked(false);
+-                host.install_static_message_pane(RESTART_ERROR_MESSAGE,
+-                    Spit.Publishing.PluginHost.ButtonMode.CANCEL);
+-            } else {
+-                session = new FacebookRESTSession(PHOTO_ENDPOINT_URL, USER_AGENT);
+-                do_show_service_welcome_pane();
+-            }
+-        }
++        session = new FacebookRESTSession(PHOTO_ENDPOINT_URL, USER_AGENT);
++        authenticator.authenticate();
+     }
+ 
+     public void stop() {
+@@ -909,39 +717,14 @@ internal class FacebookRESTSession {
+         return (access_token != null && uid != null && user_name != null);
+     }
+ 
+-    public void authenticate_with_parameters(string access_token, string uid, string user_name) {
+-        this.access_token = access_token;
+-        this.uid = uid;
+-        this.user_name = user_name;
+-    }
+-
+-    public void authenticate_from_uri(string good_login_uri) throws Spit.Publishing.PublishingError {
+-        // the raw uri is percent-encoded, so decode it
+-        string decoded_uri = Soup.URI.decode(good_login_uri);
+-
+-        // locate the access token within the URI
+-        string? access_token = null;
+-        int index = decoded_uri.index_of("#access_token=");
+-        if (index >= 0)
+-            access_token = decoded_uri[index:decoded_uri.length];
+-        if (access_token == null)
+-            throw new Spit.Publishing.PublishingError.MALFORMED_RESPONSE("Server redirect URL contained no access token");
+-
+-        // remove any trailing parameters from the session description string
+-        string? trailing_params = null;
+-        index = access_token.index_of_char('&');
+-        if (index >= 0)
+-            trailing_params = access_token[index:access_token.length];
+-        if (trailing_params != null)
+-            access_token = access_token.replace(trailing_params, "");
+-
+-        // remove the key from the session description string
+-        access_token = access_token.replace("#access_token=", "");
+-        
+-        // we've got an access token!
++    public void authenticate_with_parameters(string access_token, string? uid, string? user_name) {
+         this.access_token = access_token;
+-        
+-        do_user_id_fetch_transaction();
++        if (uid == null) {
++            do_user_id_fetch_transaction();
++        } else {
++            this.uid = uid;
++            this.user_name = user_name;
++        }
+     }
+ 
+     public string get_endpoint_url() {
+@@ -1335,190 +1118,6 @@ internal class FacebookCreateAlbumTransaction : FacebookRESTTransaction {
+     }
+ }
+ 
+-internal class WebAuthenticationPane : Spit.Publishing.DialogPane, Object {
+-    private WebKit.WebView webview = null;
+-    private Gtk.Box pane_widget = null;
+-    private Gtk.ScrolledWindow webview_frame = null;
+-    private static bool cache_dirty = false;
+-
+-    public signal void login_succeeded(string success_url);
+-    public signal void login_failed();
+-
+-    public WebAuthenticationPane() {
+-        pane_widget = new Gtk.Box(Gtk.Orientation.VERTICAL, 0);
+-
+-        webview_frame = new Gtk.ScrolledWindow(null, null);
+-        webview_frame.set_shadow_type(Gtk.ShadowType.ETCHED_IN);
+-        webview_frame.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC);
+-
+-        webview = new WebKit.WebView();
+-        webview.get_settings().enable_plugins = false;
+-        webview.get_settings().enable_default_context_menu = false;
+-
+-        webview.load_finished.connect(on_page_load);
+-        webview.load_started.connect(on_load_started);
+-
+-        webview_frame.add(webview);
+-        pane_widget.pack_start(webview_frame, true, true, 0);
+-    }
+-    
+-    private class LocaleLookup {
+-        public string prefix;
+-        public string translation;
+-        public string? exception_code;
+-        public string? exception_translation;
+-        public string? exception_code_2;
+-        public string? exception_translation_2;
+-        
+-        public LocaleLookup(string prefix, string translation, string? exception_code = null, 
+-            string? exception_translation  = null, string? exception_code_2  = null, 
+-            string? exception_translation_2 = null) {
+-            this.prefix = prefix;
+-            this.translation = translation;
+-            this.exception_code = exception_code;
+-            this.exception_translation = exception_translation;
+-            this.exception_code_2 = exception_code_2;
+-            this.exception_translation_2 = exception_translation_2;
+-        }
+-        
+-    }
+-    
+-    private LocaleLookup[] locale_lookup_table = {
+-        new LocaleLookup( "es", "es-la", "ES", "es-es" ),
+-        new LocaleLookup( "en", "en-gb", "US", "en-us" ),
+-        new LocaleLookup( "fr", "fr-fr", "CA", "fr-ca" ),
+-        new LocaleLookup( "pt", "pt-br", "PT", "pt-pt" ),
+-        new LocaleLookup( "zh", "zh-cn", "HK", "zh-hk", "TW", "zh-tw" ),
+-        new LocaleLookup( "af", "af-za" ),
+-        new LocaleLookup( "ar", "ar-ar" ),
+-        new LocaleLookup( "nb", "nb-no" ),
+-        new LocaleLookup( "no", "nb-no" ),
+-        new LocaleLookup( "id", "id-id" ),
+-        new LocaleLookup( "ms", "ms-my" ),
+-        new LocaleLookup( "ca", "ca-es" ),
+-        new LocaleLookup( "cs", "cs-cz" ),
+-        new LocaleLookup( "cy", "cy-gb" ),
+-        new LocaleLookup( "da", "da-dk" ),
+-        new LocaleLookup( "de", "de-de" ),
+-        new LocaleLookup( "tl", "tl-ph" ),
+-        new LocaleLookup( "ko", "ko-kr" ),
+-        new LocaleLookup( "hr", "hr-hr" ),
+-        new LocaleLookup( "it", "it-it" ),
+-        new LocaleLookup( "lt", "lt-lt" ),
+-        new LocaleLookup( "hu", "hu-hu" ),
+-        new LocaleLookup( "nl", "nl-nl" ),
+-        new LocaleLookup( "ja", "ja-jp" ),
+-        new LocaleLookup( "nb", "nb-no" ),
+-        new LocaleLookup( "no", "nb-no" ),
+-        new LocaleLookup( "pl", "pl-pl" ),
+-        new LocaleLookup( "ro", "ro-ro" ),
+-        new LocaleLookup( "ru", "ru-ru" ),
+-        new LocaleLookup( "sk", "sk-sk" ),
+-        new LocaleLookup( "sl", "sl-si" ),
+-        new LocaleLookup( "sv", "sv-se" ),
+-        new LocaleLookup( "th", "th-th" ),
+-        new LocaleLookup( "vi", "vi-vn" ),
+-        new LocaleLookup( "tr", "tr-tr" ),
+-        new LocaleLookup( "el", "el-gr" ),
+-        new LocaleLookup( "bg", "bg-bg" ),
+-        new LocaleLookup( "sr", "sr-rs" ),
+-        new LocaleLookup( "he", "he-il" ),
+-        new LocaleLookup( "hi", "hi-in" ),
+-        new LocaleLookup( "bn", "bn-in" ),
+-        new LocaleLookup( "pa", "pa-in" ),
+-        new LocaleLookup( "ta", "ta-in" ),
+-        new LocaleLookup( "te", "te-in" ),
+-        new LocaleLookup( "ml", "ml-in" )
+-    };
+-    
+-    private string get_system_locale_as_facebook_locale() {
+-        unowned string? raw_system_locale = Intl.setlocale(LocaleCategory.ALL, "");
+-        if (raw_system_locale == null || raw_system_locale == "")
+-            return "www";
+-        
+-        string system_locale = raw_system_locale.split(".")[0];
+-        
+-        foreach (LocaleLookup locale_lookup in locale_lookup_table) {
+-            if (!system_locale.has_prefix(locale_lookup.prefix))
+-                continue;
+-            
+-            if (locale_lookup.exception_code != null) {
+-                assert(locale_lookup.exception_translation != null);
+-                
+-                if (system_locale.contains(locale_lookup.exception_code))
+-                    return locale_lookup.exception_translation;
+-            }
+-            
+-            if (locale_lookup.exception_code_2 != null) {
+-                assert(locale_lookup.exception_translation_2 != null);
+-                
+-                if (system_locale.contains(locale_lookup.exception_code_2))
+-                    return locale_lookup.exception_translation_2;
+-            }
+-            
+-            return locale_lookup.translation;
+-        }
+-        
+-        // default
+-        return "www";
+-    }
+-
+-    private string get_login_url() {
+-        string facebook_locale = get_system_locale_as_facebook_locale();
+-
+-        return "https://%s.facebook.com/dialog/oauth?client_id=%s&redirect_uri=https://www.facebook.com/connect/login_success.html&scope=offline_access,publish_stream,user_photos,user_videos&response_type=token".printf(facebook_locale, APPLICATION_ID);
+-    }
+-
+-    private void on_page_load(WebKit.WebFrame origin_frame) {
+-        pane_widget.get_window().set_cursor(new Gdk.Cursor(Gdk.CursorType.LEFT_PTR));
+-
+-        string loaded_url = origin_frame.get_uri().dup();
+-
+-        // strip parameters from the loaded url
+-        if (loaded_url.contains("?")) {
+-            int index = loaded_url.index_of_char('?');
+-            string params = loaded_url[index:loaded_url.length];
+-            loaded_url = loaded_url.replace(params, "");
+-        }
+-
+-        // were we redirected to the facebook login success page?
+-        if (loaded_url.contains("login_success")) {
+-            cache_dirty = true;
+-            login_succeeded(origin_frame.get_uri());
+-            return;
+-        }
+-
+-        // were we redirected to the login total failure page?
+-        if (loaded_url.contains("login_failure")) {
+-            login_failed();
+-            return;
+-        }
+-    }
+-
+-    private void on_load_started(WebKit.WebFrame frame) {
+-        pane_widget.get_window().set_cursor(new Gdk.Cursor(Gdk.CursorType.WATCH));
+-    }
+-
+-    public static bool is_cache_dirty() {
+-        return cache_dirty;
+-    }
+-
+-    public Gtk.Widget get_widget() {
+-        return pane_widget;
+-    }
+-
+-    public Spit.Publishing.DialogPane.GeometryOptions get_preferred_geometry() {
+-        return Spit.Publishing.DialogPane.GeometryOptions.COLOSSAL_SIZE;
+-    }
+-
+-    public void on_pane_installed() {
+-        webview.open(get_login_url());
+-    }
+-
+-    public void on_pane_uninstalled() {
+-    }
+-}
+-
+ internal class PublishingOptionsPane : Spit.Publishing.DialogPane, GLib.Object {
+     private Gtk.Builder builder;
+     private Gtk.Box pane_widget = null;
+@@ -1529,7 +1128,6 @@ internal class PublishingOptionsPane : Spit.Publishing.DialogPane, GLib.Object {
+     private Gtk.Entry new_album_entry = null;
+     private Gtk.CheckButton strip_metadata_check = null;
+     private Gtk.Button publish_button = null;
+-    private Gtk.Button logout_button = null;
+     private Gtk.Label how_to_label = null;
+     private FacebookAlbum[] albums = null;
+     private FacebookPublisher publisher = null;
+@@ -1546,7 +1144,6 @@ internal class PublishingOptionsPane : Spit.Publishing.DialogPane, GLib.Object {
+     private const int CONTENT_GROUP_SPACING = 32;
+     private const int STANDARD_ACTION_BUTTON_WIDTH = 128;
+ 
+-    public signal void logout();
+     public signal void publish(string? target_album, string privacy_setting, Resolution target_resolution, bool strip_metadata);
+ 
+     private class PrivacyDescription {
+@@ -1586,7 +1183,6 @@ internal class PublishingOptionsPane : Spit.Publishing.DialogPane, GLib.Object {
+         existing_albums_combo = (Gtk.ComboBoxText) this.builder.get_object("existing_albums_combo");
+         visibility_combo = (Gtk.ComboBoxText) this.builder.get_object("visibility_combo");
+         publish_button = (Gtk.Button) this.builder.get_object("publish_button");
+-        logout_button = (Gtk.Button) this.builder.get_object("logout_button");
+         new_album_entry = (Gtk.Entry) this.builder.get_object("new_album_entry");
+         resolution_combo = (Gtk.ComboBoxText) this.builder.get_object("resolution_combo");
+         how_to_label = (Gtk.Label) this.builder.get_object("how_to_label");
+@@ -1605,7 +1201,6 @@ internal class PublishingOptionsPane : Spit.Publishing.DialogPane, GLib.Object {
+         visibility_combo.set_active(0);
+ 
+         publish_button.clicked.connect(on_publish_button_clicked);
+-        logout_button.clicked.connect(on_logout_button_clicked);
+ 
+         // Ticket #2916 - if the user is uploading photographs, allow
+         // them to choose what resolution they should be uploaded at.
+@@ -1669,10 +1264,6 @@ internal class PublishingOptionsPane : Spit.Publishing.DialogPane, GLib.Object {
+         publisher.set_persistent_default_size(resolution_combo.get_active());
+     }
+ 
+-    private void on_logout_button_clicked() {
+-        logout();
+-    }
+-
+     private void on_publish_button_clicked() {
+         string album_name;
+         string privacy_setting = privacy_descriptions[visibility_combo.get_active()].privacy_setting;
+@@ -1747,10 +1338,6 @@ internal class PublishingOptionsPane : Spit.Publishing.DialogPane, GLib.Object {
+         publish_button.grab_focus();
+     }
+ 
+-    private void notify_logout() {
+-        logout();
+-    }
+-
+     private void notify_publish(string? target_album, string privacy_setting, Resolution target_resolution) {
+         publish(target_album, privacy_setting, target_resolution, strip_metadata_check.get_active());
+     }
+@@ -1764,14 +1351,12 @@ internal class PublishingOptionsPane : Spit.Publishing.DialogPane, GLib.Object {
+     }
+ 
+     public void on_pane_installed() {
+-        logout.connect(notify_logout);
+         publish.connect(notify_publish);
+ 
+         installed();
+     }
+ 
+     public void on_pane_uninstalled() {
+-        logout.disconnect(notify_logout);
+         publish.disconnect(notify_publish);
+     }
+ }
+diff --git a/plugins/shotwell-publishing/FlickrPublishing.vala b/plugins/shotwell-publishing/FlickrPublishing.vala
+index a6f8b45..abaf0b2 100644
+--- a/plugins/shotwell-publishing/FlickrPublishing.vala
++++ b/plugins/shotwell-publishing/FlickrPublishing.vala
+@@ -4,32 +4,30 @@
+  * (version 2.1 or later).  See the COPYING file in this distribution. 
+  */
+ 
++using Publishing.Accounts;
++
+ extern string hmac_sha1(string key, string message);
+ 
+-public class FlickrService : Object, Spit.Pluggable, Spit.Publishing.Service {
++public class FlickrService : UOAPublishingService, Spit.Pluggable, Spit.Publishing.Service {
+     private const string ICON_FILENAME = "flickr.png";
+ 
+     private static Gdk.Pixbuf[] icon_pixbuf_set = null;
+     
+     public FlickrService(GLib.File resource_directory) {
++        base("flickr");
+         if (icon_pixbuf_set == null)
+             icon_pixbuf_set = Resources.load_icon_set(resource_directory.get_child(ICON_FILENAME));
+     }
+ 
+-    public int get_pluggable_interface(int min_host_interface, int max_host_interface) {
+-        return Spit.negotiate_interfaces(min_host_interface, max_host_interface,
+-            Spit.Publishing.CURRENT_INTERFACE);
+-    }
+-    
+-    public unowned string get_id() {
++    public override unowned string get_id() {
+         return "org.yorba.shotwell.publishing.flickr";
+     }
+     
+-    public unowned string get_pluggable_name() {
++    public override unowned string get_pluggable_name() {
+         return "Flickr";
+     }
+     
+-    public void get_info(ref Spit.PluggableInfo info) {
++    public override void get_info(ref Spit.PluggableInfo info) {
+         info.authors = "Lucas Beeler";
+         info.copyright = _("Copyright 2009-2012 Yorba Foundation");
+         info.translators = Resources.TRANSLATORS;
+@@ -41,14 +39,12 @@ public class FlickrService : Object, Spit.Pluggable, Spit.Publishing.Service {
+         info.icons = icon_pixbuf_set;
+     }
+ 
+-    public void activation(bool enabled) {
+-    }
+-
+-    public Spit.Publishing.Publisher create_publisher(Spit.Publishing.PluginHost host) {
+-        return new Publishing.Flickr.FlickrPublisher(this, host);
++    public override Spit.Publishing.Publisher create_publisher(string? account_name, Spit.Publishing.PluginHost host) {
++        SharingAccount account = find_account(account_name);
++        return new Publishing.Flickr.FlickrPublisher(this, account, host);
+     }
+     
+-    public Spit.Publishing.Publisher.MediaType get_supported_media() {
++    public override Spit.Publishing.Publisher.MediaType get_supported_media() {
+         return (Spit.Publishing.Publisher.MediaType.PHOTO |
+             Spit.Publishing.Publisher.MediaType.VIDEO);
+     }
+@@ -105,60 +101,33 @@ public class FlickrPublisher : Spit.Publishing.Publisher, GLib.Object {
+     private bool was_started = false;
+     private Session session = null;
+     private PublishingOptionsPane publishing_options_pane = null;
++    private UOAPublisherAuthenticator authenticator = null;
+    
+     private PublishingParameters parameters = null;
+ 
+     public FlickrPublisher(Spit.Publishing.Service service,
++        SharingAccount account,
+         Spit.Publishing.PluginHost host) {
+         debug("FlickrPublisher instantiated.");
+         this.service = service;
+         this.host = host;
+         this.session = new Session();
++        authenticator = new UOAPublisherAuthenticator(account, host,
++                                                      SERVICE_WELCOME_MESSAGE);
+         this.parameters = new PublishingParameters();
+         
+         session.authenticated.connect(on_session_authenticated);
++        HashTable<string,Value?> data =
++            authenticator.get_authentication_data();
++        session.set_api_credentials(data.lookup("ConsumerKey").get_string(),
++                                    data.lookup("ConsumerSecret").get_string());
++        authenticator.authenticated.connect(on_authenticator_authenticated);
+     }
+     
+     ~FlickrPublisher() {
+         session.authenticated.disconnect(on_session_authenticated);
+     }
+     
+-    private void invalidate_persistent_session() {
+-        set_persistent_access_phase_token("");
+-        set_persistent_access_phase_token_secret("");
+-        set_persistent_access_phase_username("");
+-    }
+-    
+-    private bool is_persistent_session_valid() {
+-        return (get_persistent_access_phase_username() != null &&
+-                get_persistent_access_phase_token() != null &&
+-                get_persistent_access_phase_token_secret() != null);
+-    }
+-    
+-    private string? get_persistent_access_phase_username() {
+-        return host.get_config_string("access_phase_username", null);
+-    }
+-    
+-    private void set_persistent_access_phase_username(string username) {
+-        host.set_config_string("access_phase_username", username);
+-    }
+-
+-    private string? get_persistent_access_phase_token() {
+-        return host.get_config_string("access_phase_token", null);
+-    }
+-
+-    private void set_persistent_access_phase_token(string token) {
+-        host.set_config_string("access_phase_token", token);
+-    }
+-
+-    private string? get_persistent_access_phase_token_secret() {
+-        return host.get_config_string("access_phase_token_secret", null);
+-    }
+-
+-    private void set_persistent_access_phase_token_secret(string secret) {
+-        host.set_config_string("access_phase_token_secret", secret);
+-    }
+-
+     private bool get_persistent_strip_metadata() {
+         return host.get_config_bool("strip_metadata", false);
+     }
+@@ -167,94 +136,17 @@ public class FlickrPublisher : Spit.Publishing.Publisher, GLib.Object {
+         host.set_config_bool("strip_metadata", strip_metadata);
+     }    
+ 
+-    private void on_welcome_pane_login_clicked() {
+-        if (!running)
+-            return;
+-
+-        debug("EVENT: user clicked 'Login' button in the welcome pane");
+-        
+-        do_run_authentication_request_transaction();
+-    }
+-
+-    private void on_auth_request_txn_completed(Publishing.RESTSupport.Transaction txn) {
+-        txn.completed.disconnect(on_auth_request_txn_completed);
+-        txn.network_error.disconnect(on_auth_request_txn_error);
+-
+-        if (!is_running())
+-            return;
+-
+-        debug("EVENT: OAuth authentication request transaction completed; response = '%s'",
+-            txn.get_response());
+-
+-        do_parse_token_info_from_auth_request(txn.get_response());
+-    }
+-
+-    private void on_auth_request_txn_error(Publishing.RESTSupport.Transaction txn,
+-        Spit.Publishing.PublishingError err) {
+-        txn.completed.disconnect(on_auth_request_txn_completed);
+-        txn.network_error.disconnect(on_auth_request_txn_error);
+-
+-        if (!is_running())
+-            return;
+-
+-        debug("EVENT: OAuth authentication request transaction caused a network error");
+-        host.post_error(err);
+-    }
+-    
+-    private void on_authentication_token_available(string token, string token_secret) {
+-        debug("EVENT: OAuth authentication token (%s) and token secret (%s) available",
+-            token, token_secret);
+-
+-        session.set_request_phase_credentials(token, token_secret);
+-
+-        do_launch_system_browser(token);
+-    }
+-    
+-    private void on_system_browser_launched() {
+-        if (!is_running())
+-            return;
+-
+-        debug("EVENT: system browser launched.");
+-        
+-        do_show_pin_entry_pane();
+-    }
+-    
+-    private void on_pin_entry_proceed(PinEntryPane sender, string pin) {
+-        sender.proceed.disconnect(on_pin_entry_proceed);
+-        
+-        if (!is_running())
+-            return;
+-
+-        debug("EVENT: user clicked 'Continue' in PIN entry pane.");
+-        
+-        do_verify_pin(pin);
+-    }
++    public void on_authenticator_authenticated(owned HashTable<string,Value?> session_data) {
++        host.set_service_locked(true);
++        host.install_account_fetch_wait_pane();
+ 
+-    private void on_access_token_fetch_txn_completed(Publishing.RESTSupport.Transaction txn) {
+-        txn.completed.disconnect(on_access_token_fetch_txn_completed);
+-        txn.network_error.disconnect(on_access_token_fetch_error);
+-        
+-        if (!is_running())
+-            return;
+-        
+-        debug("EVENT: fetching OAuth access token over the network succeeded");
+-        
+-        do_extract_access_phase_credentials_from_reponse(txn.get_response());
++        string token = session_data.lookup("AccessToken").get_string();
++        string token_secret = session_data.lookup("TokenSecret").get_string();
++        string username = session_data.lookup("username").get_string();
++        debug("Access Token: %s, %s, %s", token, token_secret, username);
++        session.set_access_phase_credentials(token, token_secret, username);
+     }
+ 
+-    private void on_access_token_fetch_error(Publishing.RESTSupport.Transaction txn,
+-        Spit.Publishing.PublishingError err) {
+-        txn.completed.disconnect(on_access_token_fetch_txn_completed);
+-        txn.network_error.disconnect(on_access_token_fetch_error);
+-        
+-        if (!is_running())
+-            return;
+-
+-        debug("EVENT: fetching OAuth access token over the network caused an error.");
+-        
+-        host.post_error(err);
+-    }
+-    
+     private void on_session_authenticated() {
+         if (!is_running())
+             return;
+@@ -263,10 +155,6 @@ public class FlickrPublisher : Spit.Publishing.Publisher, GLib.Object {
+         
+         parameters.username = session.get_username();
+         
+-        set_persistent_access_phase_token(session.get_access_phase_token());
+-        set_persistent_access_phase_token_secret(session.get_access_phase_token_secret());
+-        set_persistent_access_phase_username(session.get_username());
+-        
+         do_fetch_account_info();
+     }
+ 
+@@ -303,7 +191,6 @@ public class FlickrPublisher : Spit.Publishing.Publisher, GLib.Object {
+ 
+     private void on_publishing_options_pane_publish(bool strip_metadata) {
+         publishing_options_pane.publish.disconnect(on_publishing_options_pane_publish);
+-        publishing_options_pane.logout.disconnect(on_publishing_options_pane_logout);
+         
+         if (!is_running())
+             return;
+@@ -312,18 +199,6 @@ public class FlickrPublisher : Spit.Publishing.Publisher, GLib.Object {
+         do_publish(strip_metadata);
+     }
+ 
+-    private void on_publishing_options_pane_logout() {
+-        publishing_options_pane.publish.disconnect(on_publishing_options_pane_publish);
+-        publishing_options_pane.logout.disconnect(on_publishing_options_pane_logout);
+-
+-        if (!is_running())
+-            return;
+-
+-        debug("EVENT: user clicked the 'Logout' button in the publishing options pane");
+-
+-        do_logout();
+-    }
+-
+     private void on_upload_status_updated(int file_number, double completed_fraction) {
+         if (!is_running())
+             return;
+@@ -361,148 +236,6 @@ public class FlickrPublisher : Spit.Publishing.Publisher, GLib.Object {
+         host.post_error(err);
+     }
+ 
+-    private void do_show_login_welcome_pane() {
+-        debug("ACTION: installing login welcome pane");
+-
+-        host.set_service_locked(false);
+-        host.install_welcome_pane(SERVICE_WELCOME_MESSAGE, on_welcome_pane_login_clicked);
+-    }
+-    
+-    private void do_run_authentication_request_transaction() {
+-        debug("ACTION: running authentication request transaction");
+-
+-        host.set_service_locked(true);
+-        host.install_static_message_pane(_("Preparing for login..."));
+-
+-        AuthenticationRequestTransaction txn = new AuthenticationRequestTransaction(session);
+-        txn.completed.connect(on_auth_request_txn_completed);
+-        txn.network_error.connect(on_auth_request_txn_error);
+-        
+-        try {
+-            txn.execute();
+-        } catch (Spit.Publishing.PublishingError err) {
+-            host.post_error(err);
+-        }
+-    }
+-    
+-    private void do_parse_token_info_from_auth_request(string response) {
+-        debug("ACTION: parsing authorization request response '%s' into token and secret", response);
+-        
+-        string? oauth_token = null;
+-        string? oauth_token_secret = null;
+-        
+-        string[] key_value_pairs = response.split("&");
+-        foreach (string pair in key_value_pairs) {
+-            string[] split_pair = pair.split("=");
+-            
+-            if (split_pair.length != 2)
+-                host.post_error(new Spit.Publishing.PublishingError.MALFORMED_RESPONSE(
+-                    "'%s' isn't a valid response to an OAuth authentication request"));
+-
+-            if (split_pair[0] == "oauth_token")
+-                oauth_token = split_pair[1];
+-            else if (split_pair[0] == "oauth_token_secret")
+-                oauth_token_secret = split_pair[1];
+-        }
+-        
+-        if (oauth_token == null || oauth_token_secret == null)
+-            host.post_error(new Spit.Publishing.PublishingError.MALFORMED_RESPONSE(
+-                "'%s' isn't a valid response to an OAuth authentication request"));
+-        
+-        
+-        on_authentication_token_available(oauth_token, oauth_token_secret);
+-    }
+-    
+-    private void do_launch_system_browser(string token) {
+-        string login_uri = "http://www.flickr.com/services/oauth/authorize?oauth_token=" + token +
+-            "&perms=write";
+-        
+-        debug("ACTION: launching system browser with uri = '%s'", login_uri);
+-        
+-        try {
+-            Process.spawn_command_line_async("xdg-open " + login_uri);
+-        } catch (SpawnError e) {
+-            host.post_error(new Spit.Publishing.PublishingError.LOCAL_FILE_ERROR(
+-                "couldn't launch system web browser to complete Flickr login"));
+-            return;
+-        }
+-        
+-        on_system_browser_launched();
+-    }
+-    
+-    private void do_show_pin_entry_pane() {
+-        debug("ACTION: showing PIN entry pane");
+-        
+-        Gtk.Builder builder = new Gtk.Builder();
+-        
+-        try {
+-            builder.add_from_file(host.get_module_file().get_parent().get_child("flickr_pin_entry_pane.glade").get_path());
+-        } catch (Error e) {
+-            warning("Could not parse UI file! Error: %s.", e.message);
+-            host.post_error(
+-                new Spit.Publishing.PublishingError.LOCAL_FILE_ERROR(
+-                    _("A file required for publishing is unavailable. Publishing to Flickr can't continue.")));
+-            return;        
+-        }
+-        
+-        PinEntryPane pin_entry_pane = new PinEntryPane(builder);
+-        pin_entry_pane.proceed.connect(on_pin_entry_proceed);
+-        host.install_dialog_pane(pin_entry_pane);
+-    }
+-    
+-    private void do_verify_pin(string pin) {
+-        debug("ACTION: validating authorization PIN %s", pin);
+-        
+-        host.set_service_locked(true);
+-        host.install_static_message_pane(_("Verifying authorization..."));
+-        
+-        AccessTokenFetchTransaction txn = new AccessTokenFetchTransaction(session, pin);
+-        txn.completed.connect(on_access_token_fetch_txn_completed);
+-        txn.network_error.connect(on_access_token_fetch_error);
+-        
+-        try {
+-            txn.execute();
+-        } catch (Spit.Publishing.PublishingError err) {
+-            host.post_error(err);
+-        }
+-    }
+-    
+-    private void do_extract_access_phase_credentials_from_reponse(string response) {
+-        debug("ACTION: extracting access phase credentials from '%s'", response);
+-        
+-        string[] key_value_pairs = response.split("&");
+-
+-        string? token = null;
+-        string? token_secret = null;
+-        string? username = null;
+-        foreach (string key_value_pair in key_value_pairs) {
+-            string[] split_pair = key_value_pair.split("=");
+-
+-            if (split_pair.length != 2)
+-                continue;
+-
+-            string key = split_pair[0];
+-            string value = split_pair[1];
+-            
+-            if (key == "oauth_token")
+-                token = value;
+-            else if (key == "oauth_token_secret")
+-                token_secret = value;
+-            else if (key == "username")
+-                username = value;
+-        }
+-        
+-        debug("access phase credentials: { token = '%s'; token_secret = '%s'; username = '%s' }",
+-            token, token_secret, username);
+-        
+-        if (token == null || token_secret == null || username == null)
+-            host.post_error(new Spit.Publishing.PublishingError.MALFORMED_RESPONSE("expected " +
+-                "access phase credentials to contain token, token secret, and username but at " +
+-                "least one of these is absent"));
+-
+-        session.set_access_phase_credentials(token, token_secret, username);
+-    }
+-
+     private void do_fetch_account_info() {
+         debug("ACTION: running network transaction to fetch account information");
+ 
+@@ -568,7 +301,6 @@ public class FlickrPublisher : Spit.Publishing.Publisher, GLib.Object {
+         debug("ACTION: logging user out, deauthenticating session, and erasing stored credentials");
+ 
+         session.deauthenticate();
+-        invalidate_persistent_session();
+ 
+         running = false;
+ 
+@@ -599,7 +331,6 @@ public class FlickrPublisher : Spit.Publishing.Publisher, GLib.Object {
+         publishing_options_pane = new PublishingOptionsPane(this, parameters,
+             host.get_publishable_media_type(), builder, get_persistent_strip_metadata());
+         publishing_options_pane.publish.connect(on_publishing_options_pane_publish);
+-        publishing_options_pane.logout.connect(on_publishing_options_pane_logout);
+         host.install_dialog_pane(publishing_options_pane);
+     }
+     
+@@ -674,16 +405,7 @@ public class FlickrPublisher : Spit.Publishing.Publisher, GLib.Object {
+         running = true;
+         was_started = true;
+         
+-        if (is_persistent_session_valid()) {
+-            debug("attempt start: a persistent session is available; using it");
+-
+-            session.authenticate_from_persistent_credentials(get_persistent_access_phase_token(),
+-                get_persistent_access_phase_token_secret(), get_persistent_access_phase_username());
+-        } else {
+-            debug("attempt start: no persistent session available; showing login welcome pane");
+-
+-            do_show_login_welcome_pane();
+-        }
++        authenticator.authenticate();
+     }
+     
+     public void start() {
+@@ -772,7 +494,7 @@ internal class Transaction : Publishing.RESTSupport.Transaction {
+         add_argument("oauth_version", "1.0");
+         add_argument("oauth_callback", "oob");
+         add_argument("oauth_timestamp", session.get_oauth_timestamp());
+-        add_argument("oauth_consumer_key", API_KEY);
++        add_argument("oauth_consumer_key", session.get_api_key());
+     }
+     
+     public Transaction.with_uri(Session session, string uri,
+@@ -784,7 +506,7 @@ internal class Transaction : Publishing.RESTSupport.Transaction {
+         add_argument("oauth_version", "1.0");
+         add_argument("oauth_callback", "oob");
+         add_argument("oauth_timestamp", session.get_oauth_timestamp());
+-        add_argument("oauth_consumer_key", API_KEY);
++        add_argument("oauth_consumer_key", session.get_api_key());
+     }
+ 
+     public override void execute() throws Spit.Publishing.PublishingError {
+@@ -842,22 +564,6 @@ internal class Transaction : Publishing.RESTSupport.Transaction {
+     }
+ }
+ 
+-internal class AuthenticationRequestTransaction : Transaction {
+-    public AuthenticationRequestTransaction(Session session) {
+-        base.with_uri(session, "http://www.flickr.com/services/oauth/request_token",
+-            Publishing.RESTSupport.HttpMethod.GET);
+-    }
+-}
+-
+-internal class AccessTokenFetchTransaction : Transaction {
+-    public AccessTokenFetchTransaction(Session session, string user_verifier) {
+-        base.with_uri(session, "http://www.flickr.com/services/oauth/access_token",
+-            Publishing.RESTSupport.HttpMethod.GET);
+-        add_argument("oauth_verifier", user_verifier);
+-        add_argument("oauth_token", session.get_request_phase_token());
+-    }
+-}
+-
+ internal class AccountInfoFetchTransaction : Transaction {
+     public AccountInfoFetchTransaction(Session session) {
+         base(session, Publishing.RESTSupport.HttpMethod.GET);
+@@ -884,7 +590,7 @@ private class UploadTransaction : Publishing.RESTSupport.UploadTransaction {
+         add_authorization_header_field("oauth_version", "1.0");
+         add_authorization_header_field("oauth_callback", "oob");
+         add_authorization_header_field("oauth_timestamp", session.get_oauth_timestamp());
+-        add_authorization_header_field("oauth_consumer_key", API_KEY);
++        add_authorization_header_field("oauth_consumer_key", session.get_api_key());
+         add_authorization_header_field("oauth_token", session.get_access_phase_token());
+         
+         add_argument("is_public", ("%d".printf(parameters.visibility_specification.everyone_level)));
+@@ -944,11 +650,11 @@ private class UploadTransaction : Publishing.RESTSupport.UploadTransaction {
+ }
+ 
+ internal class Session : Publishing.RESTSupport.Session {
+-    private string? request_phase_token = null;
+-    private string? request_phase_token_secret = null;
+     private string? access_phase_token = null;
+     private string? access_phase_token_secret = null;
+     private string? username = null;
++    private string? api_key = API_KEY;
++    private string? api_secret = API_SECRET;
+ 
+     public Session() {
+         base(ENDPOINT_URL);
+@@ -959,15 +665,6 @@ internal class Session : Publishing.RESTSupport.Session {
+             username != null);
+     }
+ 
+-    public void authenticate_from_persistent_credentials(string token, string secret,
+-        string username) {
+-        this.access_phase_token = token;
+-        this.access_phase_token_secret = secret;
+-        this.username = username;
+-        
+-        authenticated();
+-    }
+-    
+     public void deauthenticate() {
+         access_phase_token = null;
+         access_phase_token_secret = null;
+@@ -1008,16 +705,12 @@ internal class Session : Publishing.RESTSupport.Session {
+         if (access_phase_token_secret != null) {
+             debug("access phase token secret available; using it as signing key");
+ 
+-            signing_key = API_SECRET + "&" + access_phase_token_secret;
+-        } else if (request_phase_token_secret != null) {
+-            debug("request phase token secret available; using it as signing key");
+-
+-            signing_key = API_SECRET + "&" + request_phase_token_secret;
++            signing_key = api_secret + "&" + access_phase_token_secret;
+         } else {
+-            debug("neither access phase nor request phase token secrets available; using API " +
++            debug("access token secret not available; using API " +
+                 "key as signing key");
+ 
+-            signing_key = API_SECRET + "&";
++            signing_key = api_secret + "&";
+         }
+         
+         string signature_base_string = http_method + "&" + Soup.URI.encode(
+@@ -1040,11 +733,11 @@ internal class Session : Publishing.RESTSupport.Session {
+             txn.add_argument("oauth_signature", signature);
+     }
+     
+-    public void set_request_phase_credentials(string token, string secret) {
+-        this.request_phase_token = token;
+-        this.request_phase_token_secret = secret;
++    public void set_api_credentials(string api_key, string api_secret) {
++        this.api_key = api_key;
++        this.api_secret = api_secret;
+     }
+-    
++
+     public void set_access_phase_credentials(string token, string secret, string username) {
+         this.access_phase_token = token;
+         this.access_phase_token_secret = secret;
+@@ -1065,21 +758,16 @@ internal class Session : Publishing.RESTSupport.Session {
+         return GLib.get_real_time().to_string().substring(0, 10);
+     }
+     
+-    public string get_request_phase_token() {
+-        assert(request_phase_token != null);
+-        return request_phase_token;
++    public string get_api_key() {
++        assert(api_key != null);
++        return api_key;
+     }
+-    
++
+     public string get_access_phase_token() {
+         assert(access_phase_token != null);
+         return access_phase_token;
+     }
+     
+-    public string get_access_phase_token_secret() {
+-        assert(access_phase_token_secret != null);
+-        return access_phase_token_secret;
+-    }
+-    
+     public string get_username() {
+         assert(is_authenticated());
+         return username;
+@@ -1112,7 +800,6 @@ internal class PublishingOptionsPane : Spit.Publishing.DialogPane, GLib.Object {
+     private Gtk.Label visibility_label = null;
+     private Gtk.Label upload_info_label = null;
+     private Gtk.Label size_label = null;
+-    private Gtk.Button logout_button = null;
+     private Gtk.Button publish_button = null;
+     private Gtk.ComboBoxText visibility_combo = null;
+     private Gtk.ComboBoxText size_combo = null;
+@@ -1124,7 +811,6 @@ internal class PublishingOptionsPane : Spit.Publishing.DialogPane, GLib.Object {
+     private Spit.Publishing.Publisher.MediaType media_type;
+ 
+     public signal void publish(bool strip_metadata);
+-    public signal void logout();
+ 
+     public PublishingOptionsPane(FlickrPublisher publisher, PublishingParameters parameters,
+         Spit.Publishing.Publisher.MediaType media_type, Gtk.Builder builder, bool strip_metadata) {
+@@ -1136,7 +822,6 @@ internal class PublishingOptionsPane : Spit.Publishing.DialogPane, GLib.Object {
+         pane_widget = (Gtk.Box) this.builder.get_object("flickr_pane");
+         visibility_label = (Gtk.Label) this.builder.get_object("visibility_label");
+         upload_info_label = (Gtk.Label) this.builder.get_object("upload_info_label");
+-        logout_button = (Gtk.Button) this.builder.get_object("logout_button");
+         publish_button = (Gtk.Button) this.builder.get_object("publish_button");
+         visibility_combo = (Gtk.ComboBoxText) this.builder.get_object("visibility_combo");
+         size_combo = (Gtk.ComboBoxText) this.builder.get_object("size_combo");
+@@ -1183,14 +868,9 @@ internal class PublishingOptionsPane : Spit.Publishing.DialogPane, GLib.Object {
+         
+         strip_metadata_check.set_active(strip_metadata);
+ 
+-        logout_button.clicked.connect(on_logout_clicked);
+         publish_button.clicked.connect(on_publish_clicked);
+     }
+ 
+-    private void on_logout_clicked() {
+-        logout();
+-    }
+-
+     private void on_publish_clicked() {
+         parameters.visibility_specification =
+             visibilities[visibility_combo.get_active()].specification;
+@@ -1257,10 +937,6 @@ internal class PublishingOptionsPane : Spit.Publishing.DialogPane, GLib.Object {
+         publish(strip_metadata_check.get_active());
+     }
+     
+-    protected void notify_logout() {
+-        logout();
+-    }
+-
+     public Gtk.Widget get_widget() {
+         return pane_widget;
+     }
+@@ -1271,12 +947,10 @@ internal class PublishingOptionsPane : Spit.Publishing.DialogPane, GLib.Object {
+     
+     public void on_pane_installed() {        
+         publish.connect(notify_publish);
+-        logout.connect(notify_logout);
+     }
+     
+     public void on_pane_uninstalled() {
+         publish.disconnect(notify_publish);
+-        logout.disconnect(notify_logout);
+     }
+ }
+ 
+diff --git a/plugins/shotwell-publishing/Makefile b/plugins/shotwell-publishing/Makefile
+index e939a77..bacfff4 100644
+--- a/plugins/shotwell-publishing/Makefile
++++ b/plugins/shotwell-publishing/Makefile
+@@ -18,6 +18,7 @@ SRC_FILES := \
+ 	FlickrPublishing.vala \
+ 	YouTubePublishing.vala \
+ 	PiwigoPublishing.vala \
++	../common/accounts.vala \
+ 	../../src/util/string.vala \
+ 	../common/RESTSupport.vala \
+ 	../common/ui.vala
+diff --git a/plugins/shotwell-publishing/PicasaPublishing.vala b/plugins/shotwell-publishing/PicasaPublishing.vala
+index 397503d..a428a30 100644
+--- a/plugins/shotwell-publishing/PicasaPublishing.vala
++++ b/plugins/shotwell-publishing/PicasaPublishing.vala
+@@ -4,30 +4,28 @@
+  * (version 2.1 or later).  See the COPYING file in this distribution. 
+  */
+ 
+-public class PicasaService : Object, Spit.Pluggable, Spit.Publishing.Service {
++using Publishing.Accounts;
++
++public class PicasaService : UOAPublishingService, Spit.Pluggable, Spit.Publishing.Service {
+     private const string ICON_FILENAME = "picasa.png";
+ 
+     private static Gdk.Pixbuf[] icon_pixbuf_set = null;
+     
+     public PicasaService(GLib.File resource_directory) {
++        base("google");
+         if (icon_pixbuf_set == null)
+             icon_pixbuf_set = Resources.load_icon_set(resource_directory.get_child(ICON_FILENAME));
+     }
+ 
+-    public int get_pluggable_interface(int min_host_interface, int max_host_interface) {
+-        return Spit.negotiate_interfaces(min_host_interface, max_host_interface,
+-            Spit.Publishing.CURRENT_INTERFACE);
+-    }
+-    
+-    public unowned string get_id() {
++    public override unowned string get_id() {
+         return "org.yorba.shotwell.publishing.picasa";
+     }
+     
+-    public unowned string get_pluggable_name() {
++    public override unowned string get_pluggable_name() {
+         return "Picasa Web Albums";
+     }
+     
+-    public void get_info(ref Spit.PluggableInfo info) {
++    public override void get_info(ref Spit.PluggableInfo info) {
+         info.authors = "Lucas Beeler";
+         info.copyright = _("Copyright 2009-2012 Yorba Foundation");
+         info.translators = Resources.TRANSLATORS;
+@@ -39,17 +37,15 @@ public class PicasaService : Object, Spit.Pluggable, Spit.Publishing.Service {
+         info.icons = icon_pixbuf_set;
+     }
+     
+-    public Spit.Publishing.Publisher create_publisher(Spit.Publishing.PluginHost host) {
+-        return new Publishing.Picasa.PicasaPublisher(this, host);
++    public override Spit.Publishing.Publisher create_publisher(string? account_name, Spit.Publishing.PluginHost host) {
++        SharingAccount account = find_account(account_name);
++        return new Publishing.Picasa.PicasaPublisher(this, account, host);
+     }
+ 
+-    public Spit.Publishing.Publisher.MediaType get_supported_media() {
++    public override Spit.Publishing.Publisher.MediaType get_supported_media() {
+         return (Spit.Publishing.Publisher.MediaType.PHOTO |
+             Spit.Publishing.Publisher.MediaType.VIDEO);
+     }
+-    
+-    public void activation(bool enabled) {
+-    }
+ }
+ 
+ namespace Publishing.Picasa {
+@@ -72,29 +68,22 @@ public class PicasaPublisher : Spit.Publishing.Publisher, GLib.Object {
+     private PublishingParameters parameters = null;
+     private Spit.Publishing.Publisher.MediaType media_type =
+         Spit.Publishing.Publisher.MediaType.NONE;
++    private UOAPublisherAuthenticator authenticator = null;
+ 
+     public PicasaPublisher(Spit.Publishing.Service service,
++        SharingAccount account,
+         Spit.Publishing.PluginHost host) {
+         this.service = service;
+         this.host = host;
+         this.session = new Session();
++        authenticator = new UOAPublisherAuthenticator(account, host,
++                                                      SERVICE_WELCOME_MESSAGE);
++        authenticator.authenticated.connect(on_authenticator_authenticated);
+         
+         foreach(Spit.Publishing.Publishable p in host.get_publishables())
+             media_type |= p.get_media_type();
+     }
+     
+-    private string get_user_authorization_url() {
+-        return "https://accounts.google.com/o/oauth2/auth?" +
+-            "response_type=code&" +
+-            "client_id=" + OAUTH_CLIENT_ID + "&" +
+-            "redirect_uri=" + Soup.URI.encode("urn:ietf:wg:oauth:2.0:oob", null) + "&" +
+-            "scope=" + Soup.URI.encode("http://picasaweb.google.com/data/", null) + "+" +
+-            Soup.URI.encode("https://www.googleapis.com/auth/userinfo.profile", null) + "&" +
+-            "state=connect&" +
+-            "access_type=offline&" +
+-            "approval_prompt=force";
+-    }
+-    
+     private Album[] extract_albums(Xml.Node* document_root) throws Spit.Publishing.PublishingError {
+         Album[] result = new Album[0];
+ 
+@@ -133,14 +122,6 @@ public class PicasaPublisher : Spit.Publishing.Publisher, GLib.Object {
+         return result;
+     }
+     
+-    internal string? get_persistent_refresh_token() {
+-        return host.get_config_string("refresh_token", null);
+-    }
+-   
+-    internal void set_persistent_refresh_token(string token) {
+-        host.set_config_string("refresh_token", token);
+-    }
+-
+     internal bool get_persistent_strip_metadata() {
+         return host.get_config_bool("strip_metadata", false);
+     }
+@@ -149,16 +130,6 @@ public class PicasaPublisher : Spit.Publishing.Publisher, GLib.Object {
+         host.set_config_bool("strip_metadata", strip_metadata);
+     }    
+ 
+-    internal void invalidate_persistent_session() {
+-        debug("invalidating persisted Picasa Web Albums session.");
+-
+-        host.unset_config_key("refresh_token");
+-    }
+-    
+-    internal bool is_persistent_session_available() {
+-        return get_persistent_refresh_token() != null;
+-    }
+-
+     public bool is_running() {
+         return running;
+     }
+@@ -167,98 +138,22 @@ public class PicasaPublisher : Spit.Publishing.Publisher, GLib.Object {
+         return service;
+     }
+ 
+-    private void on_service_welcome_login() {
+-        if (!is_running())
+-            return;
+-        
+-        debug("EVENT: user clicked 'Login' in welcome pane.");
+-
+-        do_launch_browser_for_authorization();
+-    }
+-    
+-    private void on_auth_code_entry_pane_proceed(AuthCodeEntryPane sender, string code) {
+-        debug("EVENT: user clicked 'Continue' in authorization code entry pane.");
+-        
+-        sender.proceed.disconnect(on_auth_code_entry_pane_proceed);
+-        
+-        do_get_access_tokens(code);
+-    }
+-    
+-    private void on_browser_launched() {
+-        debug("EVENT: system web browser launched to solicit user authorization.");
+-        
+-        do_show_auth_code_entry_pane();
+-    }
+-    
+-    private void on_get_access_tokens_completed(Publishing.RESTSupport.Transaction txn) {
+-        txn.completed.disconnect(on_get_access_tokens_completed);
+-        txn.network_error.disconnect(on_get_access_tokens_error);
+-
+-        debug("EVENT: network transaction to exchange authorization code for access tokens " +
+-            "completed successfully.");
+-
+-        do_extract_tokens(txn.get_response());
+-    }
+-    
+-    private void on_get_access_tokens_error(Publishing.RESTSupport.Transaction txn,
+-        Spit.Publishing.PublishingError err) {
+-        txn.completed.disconnect(on_get_access_tokens_completed);
+-        txn.network_error.disconnect(on_get_access_tokens_error);
+-
+-        debug("EVENT: network transaction to exchange authorization code for access tokens " +
+-            "failed; response = '%s'", txn.get_response());
+-    }
+-    
+-    private void on_refresh_token_available(string token) {
+-        debug("EVENT: an OAuth refresh token has become available.");
+-        
+-        do_save_refresh_token_to_configuration_system(token);
+-    }
+-    
+-    private void on_access_token_available(string token) {
+-        debug("EVENT: an OAuth access token has become available.");
+-        
+-        do_authenticate_session(token);
+-    }
+-    
+-    private void on_not_set_up_pane_proceed(NotSetUpMessagePane sender) {
+-        debug("EVENT: user clicked 'Continue' in Account Not Set Up Message Pane.");
+-        
+-        sender.proceed.disconnect(on_not_set_up_pane_proceed);
+-    
+-        do_launch_browser_for_authorization();
+-    }
+-    
+-    private void on_refresh_access_token_transaction_completed(Publishing.RESTSupport.Transaction
+-        txn) {
+-        txn.completed.disconnect(on_refresh_access_token_transaction_completed);
+-        txn.network_error.disconnect(on_refresh_access_token_transaction_error);
+-        
+-        if (!is_running())
+-            return;
+-
+-        if (session.is_authenticated()) // ignore these events if the session is already auth'd
+-            return;
+-
+-        debug("EVENT: refresh access token transaction completed successfully.");
+-        
+-        do_extract_tokens(txn.get_response());
+-    }
+-    
+-    private void on_refresh_access_token_transaction_error(Publishing.RESTSupport.Transaction txn,
+-        Spit.Publishing.PublishingError err) {
+-        txn.completed.disconnect(on_refresh_access_token_transaction_completed);
+-        txn.network_error.disconnect(on_refresh_access_token_transaction_error);
+-        
+-        if (!is_running())
+-            return;
++    public void on_authenticator_authenticated(owned HashTable<string,Value?> session_data) {
++        host.install_account_fetch_wait_pane();
+ 
+-        if (session.is_authenticated()) // ignore these events if the session is already auth'd
+-            return;
++        session.authenticated.connect(on_session_authenticated);
+ 
+-        debug("EVENT: refresh access token transaction caused a network error.");
+-        
+-        host.post_error(err);       
++        if (session_data.lookup("AccessToken") != null) {
++            string token = session_data.lookup("AccessToken").get_string();
++            debug("OAuth Access Token: %s", token);
++            session.authenticate(token, "OAuth2");
++        } else if (session_data.lookup("AuthToken") != null) {
++            string token = session_data.lookup("AuthToken").get_string();
++            debug("ClientLogin Access Token: %s", token);
++            session.authenticate(token, "ClientLogin");
++        } else {
++            debug("Access token not present!");
++        }
+     }
+ 
+     private void on_session_authenticated() {
+@@ -313,31 +208,7 @@ public class PicasaPublisher : Spit.Publishing.Publisher, GLib.Object {
+         debug("EVENT: fetching account and album information failed; response = '%s'.",
+             bad_txn.get_response());
+ 
+-        if (bad_txn.get_status_code() == 404) {
+-            // if we get a 404 error (resource not found) on the initial album fetch, then the
+-            // user's album feed doesn't exist -- this occurs when the user has a valid Google
+-            // account but it hasn't yet been set up for use with Picasa. In this case, we
+-            // display an informational pane with an "account not set up" message. In addition, we
+-            // deauthenticate the session. Deauth is neccessary because must've previously auth'd
+-            // the user's account to even be able to query the album feed.
+-            session.deauthenticate();
+-            do_show_not_set_up_pane();
+-        } else {
+-            // If we get any other kind of error, we can't recover, so just post it to the user
+-            host.post_error(err);
+-        }
+-    }
+-
+-    private void on_publishing_options_logout() {
+-        if (!is_running())
+-            return;
+-
+-        debug("EVENT: user clicked 'Logout' in the publishing options pane.");
+-
+-        session.deauthenticate();
+-        invalidate_persistent_session();
+-
+-        do_show_service_welcome_pane();
++        host.post_error(err);
+     }
+ 
+     private void on_publishing_options_publish(PublishingParameters parameters, 
+@@ -447,100 +318,6 @@ public class PicasaPublisher : Spit.Publishing.Publisher, GLib.Object {
+         host.post_error(err);
+     }
+ 
+-    private void do_show_service_welcome_pane() {
+-        debug("ACTION: showing service welcome pane.");
+-
+-        host.install_welcome_pane(SERVICE_WELCOME_MESSAGE, on_service_welcome_login);
+-    }
+-    
+-    private void do_launch_browser_for_authorization() {
+-        string auth_url = get_user_authorization_url();
+-        
+-        debug("ACTION: launching external web browser to get user authorization; " +
+-            "authorization URL = '%s'", auth_url);
+-
+-        try {
+-            Process.spawn_command_line_async("xdg-open " + auth_url);
+-        } catch (SpawnError e) {
+-            host.post_error(new Spit.Publishing.PublishingError.LOCAL_FILE_ERROR(
+-                _("couldn't launch system web browser to complete Picasa Web Albums login")));
+-            return;
+-        }
+-        
+-        on_browser_launched();
+-    }
+-    
+-    private void do_show_auth_code_entry_pane() {
+-        debug("ACTION: showing OAuth authorization code entry pane.");
+-        
+-        Gtk.Builder builder = new Gtk.Builder();
+-        
+-        try {
+-            builder.add_from_file(host.get_module_file().get_parent().get_child(
+-                "picasa_auth_code_entry_pane.glade").get_path());
+-        } catch (Error e) {
+-            warning("Could not parse UI file! Error: %s.", e.message);
+-            host.post_error(
+-                new Spit.Publishing.PublishingError.LOCAL_FILE_ERROR(
+-                    _("A file required for publishing is unavailable. Publishing to Picasa Web Albums can't continue.")));
+-            return;        
+-        }
+-        
+-        AuthCodeEntryPane pane = new AuthCodeEntryPane(builder);
+-        pane.proceed.connect(on_auth_code_entry_pane_proceed);
+-        host.install_dialog_pane(pane);
+-    }
+-    
+-    private void do_get_access_tokens(string code) {
+-        debug("ACTION: exchanging OAuth authorization code '%s' for access token.", code);
+-        
+-        GetAccessTokensTransaction txn = new GetAccessTokensTransaction(session, code);
+-        txn.completed.connect(on_get_access_tokens_completed);
+-        txn.network_error.connect(on_get_access_tokens_error);
+-        
+-        try {
+-            txn.execute();
+-        } catch (Spit.Publishing.PublishingError err) {
+-            host.post_error(err);
+-        }
+-    }
+-    
+-    private void do_extract_tokens(string response_body) {
+-        debug("ACTION: extracting OAuth tokens from body of server response");
+-        
+-        Json.Parser parser = new Json.Parser();
+-        
+-        try {
+-            parser.load_from_data(response_body);
+-        } catch (Error err) {
+-            host.post_error(new Spit.Publishing.PublishingError.MALFORMED_RESPONSE(
+-                "Couldn't parse JSON response: " + err.message));
+-            return;
+-        }
+-        
+-        Json.Object response_obj = parser.get_root().get_object();
+-        
+-        if ((!response_obj.has_member("access_token")) && (!response_obj.has_member("refresh_token"))) {
+-            host.post_error(new Spit.Publishing.PublishingError.MALFORMED_RESPONSE(
+-                "neither access_token nor refresh_token not present in server response"));
+-            return;
+-        }
+-
+-        if (response_obj.has_member("refresh_token")) {
+-            string refresh_token = response_obj.get_string_member("refresh_token");
+-
+-            if (refresh_token != "")
+-                on_refresh_token_available(refresh_token);
+-        }
+-        
+-        if (response_obj.has_member("access_token")) {
+-            string access_token = response_obj.get_string_member("access_token");
+-
+-            if (access_token != "")
+-                on_access_token_available(access_token);
+-        }
+-    }
+-    
+     private void do_extract_username(string response_body) {
+         debug("ACTION: extracting username from body of server response");
+         
+@@ -562,66 +339,8 @@ public class PicasaPublisher : Spit.Publishing.Publisher, GLib.Object {
+             if (username != "")
+                 this.username = username;
+         }
+-        
+-        if (response_obj.has_member("access_token")) {
+-            string access_token = response_obj.get_string_member("access_token");
+-
+-            if (access_token != "")
+-                on_access_token_available(access_token);
+-        }
+     }
+     
+-    private void do_save_refresh_token_to_configuration_system(string token) {
+-        debug("ACTION: saving OAuth refresh token to configuration system");
+-        
+-        set_persistent_refresh_token(token);
+-    }
+-    
+-    private void do_refresh_session(string refresh_token) {
+-        debug("ACTION: using OAuth refresh token to refresh session.");
+-        
+-        host.install_login_wait_pane();
+-        
+-        RefreshAccessTokenTransaction txn = new RefreshAccessTokenTransaction(session, refresh_token);
+-        
+-        txn.completed.connect(on_refresh_access_token_transaction_completed);
+-        txn.network_error.connect(on_refresh_access_token_transaction_error);
+-        
+-        try {
+-            txn.execute();
+-        } catch (Spit.Publishing.PublishingError err) {
+-            host.post_error(err);
+-        }
+-    }
+-    
+-    private void do_authenticate_session(string token) {
+-        debug("ACTION: authenticating session.");
+-        
+-        session.authenticated.connect(on_session_authenticated);
+-        session.authenticate(token);
+-    }
+-    
+-    private void do_show_not_set_up_pane() {
+-        debug("ACTION: showing account not set up message pane");
+-        
+-        Gtk.Builder builder = new Gtk.Builder();
+-        
+-        try {
+-            builder.add_from_file(host.get_module_file().get_parent().get_child(
+-                "picasa_not_set_up_pane.glade").get_path());
+-        } catch (Error e) {
+-            warning("Could not parse UI file! Error: %s.", e.message);
+-            host.post_error(
+-                new Spit.Publishing.PublishingError.LOCAL_FILE_ERROR(
+-                    _("A file required for publishing is unavailable. Publishing to Picasa Web Albums can't continue.")));
+-            return;        
+-        }
+-        
+-        NotSetUpMessagePane pane = new NotSetUpMessagePane(builder);
+-        pane.proceed.connect(on_not_set_up_pane_proceed);
+-        host.install_dialog_pane(pane);
+-    }
+-
+     private void do_fetch_username() {
+         debug("ACTION: running network transaction to fetch username.");
+ 
+@@ -701,7 +420,6 @@ public class PicasaPublisher : Spit.Publishing.Publisher, GLib.Object {
+         PublishingOptionsPane opts_pane = new PublishingOptionsPane(host, username, albums, media_type, builder,
+             get_persistent_strip_metadata());
+         opts_pane.publish.connect(on_publishing_options_publish);
+-        opts_pane.logout.connect(on_publishing_options_logout);
+         host.install_dialog_pane(opts_pane);
+ 
+         host.set_service_locked(false);
+@@ -770,12 +488,7 @@ public class PicasaPublisher : Spit.Publishing.Publisher, GLib.Object {
+         debug("PicasaPublisher: starting interaction.");
+         
+         running = true;
+-
+-        if (is_persistent_session_available()) {
+-            do_refresh_session(get_persistent_refresh_token());
+-        } else {
+-            do_show_service_welcome_pane();
+-        }
++        authenticator.authenticate();
+     }
+ 
+     public void stop() {
+@@ -801,6 +514,7 @@ internal class Album {
+ 
+ internal class Session : Publishing.RESTSupport.Session {
+     private string? auth_token = null;
++    private string? auth_method = null;
+ 
+     public Session() {
+     }
+@@ -809,45 +523,19 @@ internal class Session : Publishing.RESTSupport.Session {
+         return (auth_token != null);
+     }
+ 
+-    public void authenticate(string auth_token) {
++    public void authenticate(string auth_token, string auth_method) {
+         this.auth_token = auth_token;
++        this.auth_method = auth_method;
+         
+         notify_authenticated();
+     }
+     
+-    public void deauthenticate() {
+-        auth_token = null;
+-    }
+-    
+     public string? get_auth_token() {
+         return auth_token;
+     }
+-}
+ 
+-internal class GetAccessTokensTransaction : Publishing.RESTSupport.Transaction {
+-    private const string ENDPOINT_URL = "https://accounts.google.com/o/oauth2/token";
+-    
+-    public GetAccessTokensTransaction(Session session, string auth_code) {
+-        base.with_endpoint_url(session, ENDPOINT_URL);
+-        
+-        add_argument("code", auth_code);
+-        add_argument("client_id", OAUTH_CLIENT_ID);
+-        add_argument("client_secret", OAUTH_CLIENT_SECRET);
+-        add_argument("redirect_uri", "urn:ietf:wg:oauth:2.0:oob");
+-        add_argument("grant_type", "authorization_code");
+-    }
+-}
+-
+-internal class RefreshAccessTokenTransaction : Publishing.RESTSupport.Transaction {
+-    private const string ENDPOINT_URL = "https://accounts.google.com/o/oauth2/token";
+-    
+-    public RefreshAccessTokenTransaction(Session session, string refresh_token) {
+-        base.with_endpoint_url(session, ENDPOINT_URL);
+-    
+-        add_argument("client_id", OAUTH_CLIENT_ID);
+-        add_argument("client_secret", OAUTH_CLIENT_SECRET);
+-        add_argument("refresh_token", refresh_token);
+-        add_argument("grant_type", "refresh_token");
++    public string? get_auth_method() {
++        return auth_method;
+     }
+ }
+ 
+@@ -862,7 +550,13 @@ internal class AuthenticatedTransaction : Publishing.RESTSupport.Transaction {
+         base.with_endpoint_url(session, endpoint_url, method);
+         assert(session.is_authenticated());
+ 
+-        add_header("Authorization", "Bearer " + session.get_auth_token());
++        if (session.get_auth_method() == "ClientLogin") {
++            add_header("Authorization",
++                       "GoogleLogin auth=" + session.get_auth_token());
++        } else {
++            add_header("Authorization",
++                       "Bearer " + session.get_auth_token());
++        }
+     }
+ }
+ 
+@@ -875,7 +569,7 @@ internal class UsernameFetchTransaction : AuthenticatedTransaction {
+ }
+ 
+ internal class AlbumDirectoryTransaction : AuthenticatedTransaction {
+-    private const string ENDPOINT_URL = "http://picasaweb.google.com/data/feed/api/user/" +
++    private const string ENDPOINT_URL = "https://picasaweb.google.com/data/feed/api/user/" +
+         "default";
+ 
+     public AlbumDirectoryTransaction(Session session) {
+@@ -892,7 +586,7 @@ internal class AlbumDirectoryTransaction : AuthenticatedTransaction {
+ }
+ 
+ private class AlbumCreationTransaction : AuthenticatedTransaction {
+-    private const string ENDPOINT_URL = "http://picasaweb.google.com/data/feed/api/user/" +
++    private const string ENDPOINT_URL = "https://picasaweb.google.com/data/feed/api/user/" +
+         "default";
+     private const string ALBUM_ENTRY_TEMPLATE = "<?xml version='1.0' encoding='utf-8'?><entry xmlns='http://www.w3.org/2005/Atom' xmlns:gphoto='http://schemas.google.com/photos/2007'><title type='text'>%s</title><gphoto:access>%s</gphoto:access><category scheme='http://schemas.google.com/g/2005#kind' term='http://schemas.google.com/photos/2007#album'></category></entry>";
+     
+@@ -971,9 +665,14 @@ internal class UploadTransaction : AuthenticatedTransaction {
+         // that we've been building up
+         Soup.Message outbound_message =
+             soup_form_request_new_from_multipart(get_endpoint_url(), message_parts);
+-        outbound_message.request_headers.append("Authorization", "Bearer " +
+-            session.get_auth_token());
+         set_message(outbound_message);
++        if (session.get_auth_method() == "ClientLogin") {
++            add_header("Authorization",
++                       "GoogleLogin auth=" + session.get_auth_token());
++        } else {
++            add_header("Authorization",
++                       "Bearer " + session.get_auth_token());
++        }
+ 
+         // send the message and get its response
+         set_is_executed(true);
+@@ -981,95 +680,6 @@ internal class UploadTransaction : AuthenticatedTransaction {
+     }
+ }
+ 
+-internal class AuthCodeEntryPane : Spit.Publishing.DialogPane, GLib.Object {
+-    private Gtk.Box pane_widget = null;
+-    private Gtk.Button continue_button = null;
+-    private Gtk.Entry entry = null;
+-    private Gtk.Label entry_caption = null;
+-    private Gtk.Label explanatory_text = null;
+-
+-    public signal void proceed(AuthCodeEntryPane sender, string authorization_code);
+-
+-    public AuthCodeEntryPane(Gtk.Builder builder) {
+-        assert(builder != null);
+-        assert(builder.get_objects().length() > 0);        
+-        
+-        explanatory_text = builder.get_object("explanatory_text") as Gtk.Label;
+-        entry_caption = builder.get_object("entry_caption") as Gtk.Label;
+-        entry = builder.get_object("entry") as Gtk.Entry;
+-        continue_button = builder.get_object("continue_button") as Gtk.Button;
+-        
+-        pane_widget = builder.get_object("pane_widget") as Gtk.Box;
+-        
+-        pane_widget.show_all();
+-        
+-        on_entry_contents_changed();
+-    }
+-    
+-    private void on_continue_clicked() {
+-        proceed(this, entry.get_text());
+-    }
+-    
+-    private void on_entry_contents_changed() {
+-        continue_button.set_sensitive(entry.text_length > 0);
+-    }
+-
+-    public Gtk.Widget get_widget() {
+-        return pane_widget;
+-    }
+-    
+-    public Spit.Publishing.DialogPane.GeometryOptions get_preferred_geometry() {
+-        return Spit.Publishing.DialogPane.GeometryOptions.NONE;
+-    }
+-
+-    public void on_pane_installed() {
+-        continue_button.clicked.connect(on_continue_clicked);
+-        entry.changed.connect(on_entry_contents_changed);
+-    }
+-
+-    public void on_pane_uninstalled() {
+-        continue_button.clicked.disconnect(on_continue_clicked);
+-        entry.changed.disconnect(on_entry_contents_changed);
+-    }
+-}
+-
+-internal class NotSetUpMessagePane : Spit.Publishing.DialogPane, GLib.Object {
+-    private Gtk.Box pane_widget = null;
+-    private Gtk.Button continue_button = null;
+-    
+-    public signal void proceed(NotSetUpMessagePane sender);
+-
+-    public NotSetUpMessagePane(Gtk.Builder builder) {
+-        assert(builder != null);
+-        assert(builder.get_objects().length() > 0);
+-        
+-        continue_button = builder.get_object("continue_button") as Gtk.Button;
+-        pane_widget = builder.get_object("pane_widget") as Gtk.Box;
+-        
+-        pane_widget.show_all();
+-    }
+-    
+-    private void on_continue_clicked() {
+-        proceed(this);
+-    }
+-
+-    public Gtk.Widget get_widget() {
+-        return pane_widget;
+-    }
+-    
+-    public Spit.Publishing.DialogPane.GeometryOptions get_preferred_geometry() {
+-        return Spit.Publishing.DialogPane.GeometryOptions.NONE;
+-    }
+-
+-    public void on_pane_installed() {
+-        continue_button.clicked.connect(on_continue_clicked);
+-    }
+-
+-    public void on_pane_uninstalled() {
+-        continue_button.clicked.disconnect(on_continue_clicked);
+-    }
+-}
+-
+ internal class PublishingOptionsPane : Spit.Publishing.DialogPane, GLib.Object {
+     private class SizeDescription {
+         public string name;
+@@ -1097,7 +707,6 @@ internal class PublishingOptionsPane : Spit.Publishing.DialogPane, GLib.Object {
+     private Gtk.ComboBoxText size_combo = null;
+     private Gtk.CheckButton strip_metadata_check = null;
+     private Gtk.Button publish_button = null;
+-    private Gtk.Button logout_button = null;
+     
+     private Album[] albums;
+     private SizeDescription[] size_descriptions;
+@@ -1105,7 +714,6 @@ internal class PublishingOptionsPane : Spit.Publishing.DialogPane, GLib.Object {
+     private weak Spit.Publishing.PluginHost host;
+ 
+     public signal void publish(PublishingParameters parameters, bool strip_metadata);
+-    public signal void logout();
+ 
+     public PublishingOptionsPane(Spit.Publishing.PluginHost host, string username, 
+         Album[] albums, Spit.Publishing.Publisher.MediaType media_type, Gtk.Builder builder,
+@@ -1131,7 +739,6 @@ internal class PublishingOptionsPane : Spit.Publishing.DialogPane, GLib.Object {
+         size_combo = (Gtk.ComboBoxText) builder.get_object("size_combo");
+         strip_metadata_check = (Gtk.CheckButton) this.builder.get_object("strip_metadata_check");
+         publish_button = (Gtk.Button) builder.get_object("publish_button");
+-        logout_button = (Gtk.Button) builder.get_object("logout_button");
+ 
+         // populate any widgets whose contents are programmatically-generated.
+         login_identity_label.set_label(_("You are logged into Picasa Web Albums as %s.").printf(username));
+@@ -1157,7 +764,6 @@ internal class PublishingOptionsPane : Spit.Publishing.DialogPane, GLib.Object {
+         use_existing_radio.clicked.connect(on_use_existing_radio_clicked);
+         create_new_radio.clicked.connect(on_create_new_radio_clicked);
+         new_album_entry.changed.connect(on_new_album_entry_changed);
+-        logout_button.clicked.connect(on_logout_clicked);
+         publish_button.clicked.connect(on_publish_clicked);
+     }
+ 
+@@ -1200,10 +806,6 @@ internal class PublishingOptionsPane : Spit.Publishing.DialogPane, GLib.Object {
+         public_check.set_sensitive(true);
+     }
+ 
+-    private void on_logout_clicked() {
+-        logout();
+-    }
+-
+     private void update_publish_button_sensitivity() {
+         string album_name = new_album_entry.get_text();
+         publish_button.set_sensitive(!(album_name.strip() == "" &&
+@@ -1263,10 +865,6 @@ internal class PublishingOptionsPane : Spit.Publishing.DialogPane, GLib.Object {
+         publish(parameters, strip_metadata_check.get_active());
+     }
+     
+-    protected void notify_logout() {
+-        logout();
+-    }
+-
+     public Gtk.Widget get_widget() {
+         return pane_widget;
+     }
+@@ -1279,12 +877,10 @@ internal class PublishingOptionsPane : Spit.Publishing.DialogPane, GLib.Object {
+         installed();
+          
+         publish.connect(notify_publish);
+-        logout.connect(notify_logout);
+     }
+     
+     public void on_pane_uninstalled() {
+         publish.disconnect(notify_publish);
+-        logout.disconnect(notify_logout);
+     }
+ }
+ 
+diff --git a/plugins/shotwell-publishing/PiwigoPublishing.vala b/plugins/shotwell-publishing/PiwigoPublishing.vala
+index 772536c..0c96d84 100644
+--- a/plugins/shotwell-publishing/PiwigoPublishing.vala
++++ b/plugins/shotwell-publishing/PiwigoPublishing.vala
+@@ -42,7 +42,7 @@ public class PiwigoService : Object, Spit.Pluggable, Spit.Publishing.Service {
+     public void activation(bool enabled) {
+     }
+ 
+-    public Spit.Publishing.Publisher create_publisher(Spit.Publishing.PluginHost host) {
++    public Spit.Publishing.Publisher create_publisher(string? account, Spit.Publishing.PluginHost host) {
+         return new Publishing.Piwigo.PiwigoPublisher(this, host);
+     }
+     
+diff --git a/plugins/shotwell-publishing/YouTubePublishing.vala b/plugins/shotwell-publishing/YouTubePublishing.vala
+index 9319eb9..fc03fe7 100644
+--- a/plugins/shotwell-publishing/YouTubePublishing.vala
++++ b/plugins/shotwell-publishing/YouTubePublishing.vala
+@@ -39,7 +39,7 @@ public class YouTubeService : Object, Spit.Pluggable, Spit.Publishing.Service {
+         info.icons = icon_pixbuf_set;
+     }
+ 
+-    public Spit.Publishing.Publisher create_publisher(Spit.Publishing.PluginHost host) {
++    public Spit.Publishing.Publisher create_publisher(string? account, Spit.Publishing.PluginHost host) {
+         return new Publishing.YouTube.YouTubePublisher(this, host);
+     }
+ 
+diff --git a/plugins/shotwell-publishing/facebook_publishing_options_pane.glade b/plugins/shotwell-publishing/facebook_publishing_options_pane.glade
+index 0ba57ad..567b8c8 100644
+--- a/plugins/shotwell-publishing/facebook_publishing_options_pane.glade
++++ b/plugins/shotwell-publishing/facebook_publishing_options_pane.glade
+@@ -196,29 +196,14 @@ anything put into this field won't display)</property>
+           <object class="GtkBox" id="box2">
+             <property name="visible">True</property>
+             <property name="can_focus">False</property>
++            <property name="halign">center</property>
+             <property name="spacing">32</property>
+             <property name="homogeneous">True</property>
+             <child>
+-              <object class="GtkButton" id="logout_button">
+-                <property name="label" translatable="yes">_Logout</property>
+-                <property name="use_action_appearance">False</property>
+-                <property name="visible">True</property>
+-                <property name="can_focus">True</property>
+-                <property name="receives_default">True</property>
+-                <property name="use_action_appearance">False</property>
+-                <property name="use_underline">True</property>
+-              </object>
+-              <packing>
+-                <property name="expand">False</property>
+-                <property name="fill">True</property>
+-                <property name="padding">80</property>
+-                <property name="position">0</property>
+-              </packing>
+-            </child>
+-            <child>
+               <object class="GtkButton" id="publish_button">
+                 <property name="label" translatable="yes">_Publish</property>
+                 <property name="use_action_appearance">False</property>
++                <property name="width_request">96</property>
+                 <property name="visible">True</property>
+                 <property name="can_focus">True</property>
+                 <property name="receives_default">True</property>
+@@ -229,13 +214,13 @@ anything put into this field won't display)</property>
+                 <property name="expand">False</property>
+                 <property name="fill">True</property>
+                 <property name="padding">80</property>
+-                <property name="position">1</property>
++                <property name="position">0</property>
+               </packing>
+             </child>
+           </object>
+           <packing>
+             <property name="expand">False</property>
+-            <property name="fill">True</property>
++            <property name="fill">False</property>
+             <property name="padding">2</property>
+             <property name="position">3</property>
+           </packing>
+diff --git a/plugins/shotwell-publishing/flickr_publishing_options_pane.glade b/plugins/shotwell-publishing/flickr_publishing_options_pane.glade
+index e39a52e..b9edd04 100644
+--- a/plugins/shotwell-publishing/flickr_publishing_options_pane.glade
++++ b/plugins/shotwell-publishing/flickr_publishing_options_pane.glade
+@@ -135,24 +135,6 @@ so changes made here will not display)</property>
+             <property name="spacing">64</property>
+             <property name="homogeneous">True</property>
+             <child>
+-              <object class="GtkButton" id="logout_button">
+-                <property name="label" translatable="yes">_Logout</property>
+-                <property name="use_action_appearance">False</property>
+-                <property name="width_request">96</property>
+-                <property name="visible">True</property>
+-                <property name="can_focus">True</property>
+-                <property name="receives_default">True</property>
+-                <property name="use_action_appearance">False</property>
+-                <property name="use_underline">True</property>
+-              </object>
+-              <packing>
+-                <property name="expand">False</property>
+-                <property name="fill">True</property>
+-                <property name="padding">24</property>
+-                <property name="position">0</property>
+-              </packing>
+-            </child>
+-            <child>
+               <object class="GtkButton" id="publish_button">
+                 <property name="label" translatable="yes">_Publish</property>
+                 <property name="use_action_appearance">False</property>
+@@ -167,7 +149,7 @@ so changes made here will not display)</property>
+                 <property name="expand">False</property>
+                 <property name="fill">True</property>
+                 <property name="padding">24</property>
+-                <property name="position">1</property>
++                <property name="position">0</property>
+               </packing>
+             </child>
+           </object>
+diff --git a/plugins/shotwell-publishing/picasa_publishing_options_pane.glade b/plugins/shotwell-publishing/picasa_publishing_options_pane.glade
+index 07af67d..4d2cfb4 100644
+--- a/plugins/shotwell-publishing/picasa_publishing_options_pane.glade
++++ b/plugins/shotwell-publishing/picasa_publishing_options_pane.glade
+@@ -226,32 +226,16 @@
+       <object class="GtkBox" id="button_area_box">
+         <property name="visible">True</property>
+         <property name="can_focus">False</property>
+-        <property name="margin_left">112</property>
+-        <property name="margin_right">112</property>
++        <property name="halign">center</property>
+         <property name="margin_top">48</property>
+         <property name="margin_bottom">24</property>
+         <property name="spacing">128</property>
+         <property name="homogeneous">True</property>
+         <child>
+-          <object class="GtkButton" id="logout_button">
+-            <property name="label" translatable="yes">_Logout</property>
+-            <property name="use_action_appearance">False</property>
+-            <property name="visible">True</property>
+-            <property name="can_focus">True</property>
+-            <property name="receives_default">True</property>
+-            <property name="use_action_appearance">False</property>
+-            <property name="use_underline">True</property>
+-          </object>
+-          <packing>
+-            <property name="expand">False</property>
+-            <property name="fill">True</property>
+-            <property name="position">0</property>
+-          </packing>
+-        </child>
+-        <child>
+           <object class="GtkButton" id="publish_button">
+             <property name="label" translatable="yes">_Publish</property>
+             <property name="use_action_appearance">False</property>
++            <property name="width_request">96</property>
+             <property name="visible">True</property>
+             <property name="can_focus">True</property>
+             <property name="receives_default">True</property>
+@@ -261,13 +245,13 @@
+           <packing>
+             <property name="expand">False</property>
+             <property name="fill">True</property>
+-            <property name="position">1</property>
++            <property name="position">0</property>
+           </packing>
+         </child>
+       </object>
+       <packing>
+         <property name="expand">False</property>
+-        <property name="fill">True</property>
++        <property name="fill">False</property>
+         <property name="position">4</property>
+       </packing>
+     </child>
+diff --git a/src/plugins/PublishingInterfaces.vala b/src/plugins/PublishingInterfaces.vala
+index 339cc9d..4ed2bec 100644
+--- a/src/plugins/PublishingInterfaces.vala
++++ b/src/plugins/PublishingInterfaces.vala
+@@ -494,6 +494,7 @@ public interface PluginHost : GLib.Object, Spit.HostInterface {
+      */
+     public abstract Spit.Publishing.Publisher.MediaType get_publishable_media_type();
+     
++    public abstract ulong get_dialog_xid();
+     //
+     // For future expansion.
+     //
+@@ -579,18 +580,26 @@ public interface Service : Object, Spit.Pluggable {
+      * A factory method that instantiates and returns a new {@link Publisher} object that
+      * encapsulates a connection to the remote publishing service that this Service describes.
+      */
+-    public abstract Spit.Publishing.Publisher create_publisher(Spit.Publishing.PluginHost host);
++    public abstract Spit.Publishing.Publisher create_publisher(string? account, Spit.Publishing.PluginHost host);
+ 
+     /**
+      * Returns the kinds of media that this service can work with.
+      */
+     public abstract Spit.Publishing.Publisher.MediaType get_supported_media();
+     
++    /**
++     * Checks whether the service is enabled.
++     */
++    public virtual bool is_enabled() { return true; }
++
++    /**
++     * List the accounts available for this service.
++     */
++    public virtual string[] list_account_names() { return {}; }
++
+     //
+     // For future expansion.
+     //
+-    protected virtual void reserved0() {}
+-    protected virtual void reserved1() {}
+     protected virtual void reserved2() {}
+     protected virtual void reserved3() {}
+     protected virtual void reserved4() {}
+diff --git a/src/publishing/PublishingPluginHost.vala b/src/publishing/PublishingPluginHost.vala
+index 7be7bed..c0417f8 100644
+--- a/src/publishing/PublishingPluginHost.vala
++++ b/src/publishing/PublishingPluginHost.vala
+@@ -21,7 +21,8 @@ public class ConcretePublishingHost : Plugins.StandardHostInterface,
+     private Spit.Publishing.Publisher.MediaType media_type =
+         Spit.Publishing.Publisher.MediaType.NONE;
+     
+-    public ConcretePublishingHost(Service service, PublishingUI.PublishingDialog dialog,
++    public ConcretePublishingHost(Service service, string? account,
++        PublishingUI.PublishingDialog dialog,
+         Publishable[] publishables) {
+         base(service, "sharing");
+         this.dialog = dialog;
+@@ -30,7 +31,7 @@ public class ConcretePublishingHost : Plugins.StandardHostInterface,
+         foreach (Publishable curr_publishable in publishables)
+             this.media_type |= curr_publishable.get_media_type();
+         
+-        this.active_publisher = service.create_publisher(this);
++        this.active_publisher = service.create_publisher(account, this);
+     }
+     
+     private void on_login_clicked() {
+@@ -232,6 +233,13 @@ public class ConcretePublishingHost : Plugins.StandardHostInterface,
+         
+         return report_plugin_upload_progress;
+     }
++
++    public ulong get_dialog_xid() {
++        if (dialog == null) return 0;
++
++        Gdk.Window window = dialog.get_window();
++        return Gdk.X11Window.get_xid(window);
++    }
+ }
+ 
+ }
+diff --git a/src/publishing/PublishingUI.vala b/src/publishing/PublishingUI.vala
+index b7f7f75..37f2713 100644
+--- a/src/publishing/PublishingUI.vala
++++ b/src/publishing/PublishingUI.vala
+@@ -130,6 +130,11 @@ public class LoginWaitPane : StaticMessagePane {
+ }
+ 
+ public class PublishingDialog : Gtk.Dialog {
++    private struct AccountService {
++        Spit.Publishing.Service service;
++        string? account;
++    }
++
+     private const int LARGE_WINDOW_WIDTH = 860;
+     private const int LARGE_WINDOW_HEIGHT = 688;
+     private const int COLOSSAL_WINDOW_WIDTH = 1024;
+@@ -151,6 +156,8 @@ public class PublishingDialog : Gtk.Dialog {
+     private Spit.Publishing.DialogPane active_pane;
+     private Spit.Publishing.Publishable[] publishables;
+     private Spit.Publishing.ConcretePublishingHost host;
++    private Gee.HashMap<string,AccountService?> services;
++    private int service_selector_add_accounts_index;
+ 
+     protected PublishingDialog(Gee.Collection<MediaSource> to_publish) {
+         assert(to_publish.size > 0);
+@@ -158,6 +165,8 @@ public class PublishingDialog : Gtk.Dialog {
+         resizable = false;
+         delete_event.connect(on_window_close);
+         
++        services = new Gee.HashMap<string,AccountService?>();
++
+         publishables = new Spit.Publishing.Publishable[0];
+         bool has_photos = false;
+         bool has_videos = false;
+@@ -206,9 +215,28 @@ public class PublishingDialog : Gtk.Dialog {
+             if (last_used_service != null && last_used_service == curr_service_id)
+                 last_used_index = ticker;
+ 
+-            service_selector_box.append_text(service.get_pluggable_name());
+-            ticker++;
++            var account_names = service.list_account_names();
++            if (account_names.length == 0) {
++                account_names += null;
++            }
++
++            foreach (string? account_name in account_names) {
++                string service_name = service.get_pluggable_name();
++                if (account_name != null) {
++                    service_name += " (%s)".printf(account_name);
++                }
++
++                AccountService account_service = {
++                    service: service,
++                    account: account_name
++                };
++                services.set(service_name, account_service);
++                service_selector_box.append_text(service_name);
++                ticker++;
++            }
+         }
++        service_selector_box.append_text(_("Add more accounts…"));
++        service_selector_add_accounts_index = ticker;
+         if (last_used_index >= 0)
+             service_selector_box.set_active(last_used_index);
+         else
+@@ -296,6 +324,7 @@ public class PublishingDialog : Gtk.Dialog {
+         Spit.Publishing.Service[] all_services = load_all_services();
+ 
+         foreach (Spit.Publishing.Service service in all_services) {
++            if (!service.is_enabled()) continue;
+             
+             if (has_photos && !has_videos) {
+                 if ((service.get_supported_media() & Spit.Publishing.Publisher.MediaType.PHOTO) != 0)
+@@ -384,21 +413,34 @@ public class PublishingDialog : Gtk.Dialog {
+     }
+ 
+     private void on_service_changed() {
+-        string service_name = service_selector_box.get_active_text();
+-        
+-        Spit.Publishing.Service? selected_service = null;
+-        Spit.Publishing.Service[] services = load_all_services();
+-        foreach (Spit.Publishing.Service service in services) {
+-            if (service.get_pluggable_name() == service_name) {
+-                selected_service = service;
+-                break;
++        if (service_selector_box.get_active() ==
++            service_selector_add_accounts_index) {
++            debug("Starting Online Accounts...");
++            try
++            {
++                DesktopAppInfo app_info =
++                    new DesktopAppInfo ("gnome-credentials-panel.desktop");
++                GLib.Process.spawn_command_line_async(app_info.get_commandline() + " application=shotwell");
++            }
++            catch (Error e)
++            {
++                warning ("Error launching Online Accounts: %s", e.message);
+             }
++
++            on_close_cancel_clicked();
++            return;
+         }
+-        assert(selected_service != null);
++
++        string service_name = service_selector_box.get_active_text();
++
++        AccountService account_service = services.get(service_name);
++        Spit.Publishing.Service? selected_service = account_service.service;
+ 
+         Config.Facade.get_instance().set_last_used_service(selected_service.get_id());
+ 
+-        host = new Spit.Publishing.ConcretePublishingHost(selected_service, this, publishables);
++        host = new Spit.Publishing.ConcretePublishingHost(selected_service,
++                                                          account_service.account,
++                                                          this, publishables);
+         host.start_publishing();
+     }
+     

=== added file 'debian/patches/series'
--- debian/patches/series	1970-01-01 00:00:00 +0000
+++ debian/patches/series	2012-09-17 10:22:22 +0000
@@ -0,0 +1,6 @@
+02_desktop_translations.patch
+03_appmenu_no_stubs.patch
+04_no_resize_grip.patch
+05-gomp-linking.patch
+
+06_uoa.patch

=== added file 'debian/rules'
--- debian/rules	1970-01-01 00:00:00 +0000
+++ debian/rules	2012-09-17 10:22:22 +0000
@@ -0,0 +1,10 @@
+#!/usr/bin/make -f
+
+%:
+	dh $@ --with-scour
+
+override_dh_auto_configure:
+	dh_auto_configure -- --disable-schemas-compile --disable-icon-update --unity-support
+
+override_dh_installchangelogs:
+	dh_installchangelogs NEWS

=== added file 'debian/shotwell-video-thumbnailer.1'
--- debian/shotwell-video-thumbnailer.1	1970-01-01 00:00:00 +0000
+++ debian/shotwell-video-thumbnailer.1	2012-09-17 10:22:22 +0000
@@ -0,0 +1,13 @@
+.TH shotwell-video-thumbnailer 1 "August 21, 2011"
+.SH NAME
+shotwell-video-thumbnailer \- writes video thumbnail to stdout
+.SH DESCRIPTION
+Writes video thumbnail to stdout.
+.PP
+This program is designed to be called by shotwell directly, normally it is not
+of any use for shotwell users.
+.SH COPYRIGHT
+This manual page is Copyright 2011 Luca Falavigna <[e-mail]>.
+Permission is granted to copy, distribute and/or modify this document
+under the terms of the GNU Lesser General Public License, Version 2.1 or any
+later version published by the Free Software Foundation.

=== added file 'debian/shotwell.1'
--- debian/shotwell.1	1970-01-01 00:00:00 +0000
+++ debian/shotwell.1	2012-09-17 10:22:22 +0000
@@ -0,0 +1,14 @@
+.TH shotwell 1 "December 30, 2009"
+.SH NAME
+shotwell \- a digital photo organizer
+.SH DESCRIPTION
+.B shotwell
+is a digital photo organizer designed for the GNOME desktop environment. It
+allows you to import photos from disk or camera, organize them in various ways,
+view them in full-window or fullscreen mode, and export them to share with
+others.
+.SH AUTHOR
+shotwell was written by Jim Nelson, Lucas Beeler and Allison Barlow.
+.PP
+This manual page was written by Devid Antonio Filoni <[e-mail]>,
+for the Debian project (and may be used by others).

=== added file 'debian/shotwell.lintian-overrides'
--- debian/shotwell.lintian-overrides	1970-01-01 00:00:00 +0000
+++ debian/shotwell.lintian-overrides	2012-09-17 10:22:22 +0000
@@ -0,0 +1,2 @@
+library-not-linked-against-libc
+image-file-in-usr-lib

=== added directory 'debian/source'
=== added file 'debian/source/format'
--- debian/source/format	1970-01-01 00:00:00 +0000
+++ debian/source/format	2012-09-17 10:22:22 +0000
@@ -0,0 +1,1 @@
+3.0 (quilt)

=== added file 'debian/watch'
--- debian/watch	1970-01-01 00:00:00 +0000
+++ debian/watch	2012-09-17 10:22:22 +0000
@@ -0,0 +1,3 @@
+version=3
+opts=dversionmangle=s/\+dfsg// \
+  http://yorba.org/download/shotwell/([\d\.]+)/unstable/shotwell-(.*)\.tar\.xz