Merge lp:~mardy/shotwell/update-uoa into lp:~robert-ancell/shotwell/update-0.12.90

[Alberto Mardegan]

Updated UOA patch.

[Sebastien Bacher (seb128)]

Thanks mardy, I got that merged into the Ubuntu branch

=== modified file 'debian/patches/06_uoa.patch'
--- debian/patches/06_uoa.patch	2012-08-24 03:46:31 +0000
+++ debian/patches/06_uoa.patch	2012-08-28 08:16:23 +0000
@@ -1,8 +1,11 @@
+Description: use Ubuntu Online Accounts for Picasa, Facebook and Flickr export plugins
+Author: Alberto Mardegan <[e-mail]>
+
 === modified file 'Makefile'
 Index: shotwell-0.12.90/Makefile
 ===================================================================
---- shotwell-0.12.90.orig/Makefile	2012-08-24 15:04:46.000000000 +1200
-+++ shotwell-0.12.90/Makefile	2012-08-24 15:15:23.963988123 +1200
+--- shotwell-0.12.90.orig/Makefile	2012-08-28 10:25:15.248034132 +0300
++++ shotwell-0.12.90/Makefile	2012-08-28 10:25:15.288033628 +0300
 @@ -151,6 +151,7 @@
  	trash.ui 
  
@@ -22,8 +25,8 @@
  	mkdir -p $(DESTDIR)$(PREFIX)/share/icons/hicolor/scalable/apps
 Index: shotwell-0.12.90/misc/org.yorba.shotwell.gschema.xml
 ===================================================================
---- shotwell-0.12.90.orig/misc/org.yorba.shotwell.gschema.xml	2012-08-24 09:03:04.000000000 +1200
-+++ shotwell-0.12.90/misc/org.yorba.shotwell.gschema.xml	2012-08-24 15:15:23.963988123 +1200
+--- shotwell-0.12.90.orig/misc/org.yorba.shotwell.gschema.xml	2012-08-24 00:03:04.000000000 +0300
++++ shotwell-0.12.90/misc/org.yorba.shotwell.gschema.xml	2012-08-28 10:25:15.288033628 +0300
 @@ -304,6 +304,12 @@
          <description>Facebook user i.d. for the currently logged in user, if any</description>
      </key>
@@ -40,7 +43,7 @@
 Index: shotwell-0.12.90/misc/shotwell.application
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ shotwell-0.12.90/misc/shotwell.application	2012-08-24 15:15:23.967988123 +1200
++++ shotwell-0.12.90/misc/shotwell.application	2012-08-28 10:25:15.292033578 +0300
 @@ -0,0 +1,18 @@
 +<?xml version="1.0" encoding="UTF-8" ?>
 +<application id="shotwell">
@@ -62,8 +65,8 @@
 +</application>
 Index: shotwell-0.12.90/plugins/Makefile
 ===================================================================
---- shotwell-0.12.90.orig/plugins/Makefile	2012-08-24 09:03:04.000000000 +1200
-+++ shotwell-0.12.90/plugins/Makefile	2012-08-24 15:15:23.967988123 +1200
+--- shotwell-0.12.90.orig/plugins/Makefile	2012-08-24 00:03:04.000000000 +0300
++++ shotwell-0.12.90/plugins/Makefile	2012-08-28 10:25:15.292033578 +0300
 @@ -4,7 +4,10 @@
  DIST_FILES := \
  	Makefile \
@@ -78,8 +81,8 @@
  all: $(ALL_PLUGINS)
 Index: shotwell-0.12.90/plugins/Makefile.plugin.mk
 ===================================================================
---- shotwell-0.12.90.orig/plugins/Makefile.plugin.mk	2012-08-24 09:03:04.000000000 +1200
-+++ shotwell-0.12.90/plugins/Makefile.plugin.mk	2012-08-24 15:15:23.967988123 +1200
+--- shotwell-0.12.90.orig/plugins/Makefile.plugin.mk	2012-08-24 00:03:04.000000000 +0300
++++ shotwell-0.12.90/plugins/Makefile.plugin.mk	2012-08-28 10:25:15.292033578 +0300
 @@ -27,6 +27,8 @@
  # automatically include the shotwell-plugin-dev-1.0 package as a local dependency
  EXT_PKGS := $(PKGS)
@@ -91,8 +94,8 @@
  SRC_FILES := ../common/Resources.vala $(SRC_FILES)
 Index: shotwell-0.12.90/plugins/common/RESTSupport.vala
 ===================================================================
---- shotwell-0.12.90.orig/plugins/common/RESTSupport.vala	2012-08-24 09:03:04.000000000 +1200
-+++ shotwell-0.12.90/plugins/common/RESTSupport.vala	2012-08-24 15:15:23.967988123 +1200
+--- shotwell-0.12.90.orig/plugins/common/RESTSupport.vala	2012-08-24 00:03:04.000000000 +0300
++++ shotwell-0.12.90/plugins/common/RESTSupport.vala	2012-08-28 10:25:15.296033528 +0300
 @@ -314,7 +314,7 @@
              old_url = message.get_uri().to_string(false);
              url_with_query = get_endpoint_url() + "?" + formdata_string;
@@ -105,7 +108,7 @@
 Index: shotwell-0.12.90/plugins/common/accounts.vala
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ shotwell-0.12.90/plugins/common/accounts.vala	2012-08-24 15:15:23.967988123 +1200
++++ shotwell-0.12.90/plugins/common/accounts.vala	2012-08-28 10:25:15.296033528 +0300
 @@ -0,0 +1,54 @@
 +/* Copyright 2009-2011 Yorba Foundation
 + *
@@ -163,8 +166,8 @@
 +
 Index: shotwell-0.12.90/plugins/shotwell-publishing/FacebookPublishing.vala
 ===================================================================
---- shotwell-0.12.90.orig/plugins/shotwell-publishing/FacebookPublishing.vala	2012-08-24 15:07:12.024005156 +1200
-+++ shotwell-0.12.90/plugins/shotwell-publishing/FacebookPublishing.vala	2012-08-24 15:15:23.967988123 +1200
+--- shotwell-0.12.90.orig/plugins/shotwell-publishing/FacebookPublishing.vala	2012-08-24 00:03:04.000000000 +0300
++++ shotwell-0.12.90/plugins/shotwell-publishing/FacebookPublishing.vala	2012-08-28 11:11:00.554691926 +0300
 @@ -4,6 +4,8 @@
   * (version 2.1 or later).  See the COPYING file in this distribution.
   */
@@ -186,7 +189,7 @@
  }
  
  namespace Publishing.Facebook {
-@@ -163,14 +170,103 @@
+@@ -163,11 +170,11 @@
      private int publish_to_album = NO_ALBUM;
      private weak Spit.Publishing.PluginHost host = null;
      private FacebookRESTSession session = null;
@@ -199,99 +202,7 @@
  
      private Resolution target_resolution = Resolution.HIGH;
  
-+    private struct 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;
-+    }
-+
-+    private const LocaleLookup[] locale_lookup_table = {
-+        { "es", "es-la", "ES", "es-es" },
-+        { "en", "en-gb", "US", "en-us" },
-+        { "fr", "fr-fr", "CA", "fr-ca" },
-+        { "pt", "pt-br", "PT", "pt-pt" },
-+        { "zh", "zh-cn", "HK", "zh-hk", "TW", "zh-tw" },
-+        { "af", "af-za" },
-+        { "ar", "ar-ar" },
-+        { "nb", "nb-no" },
-+        { "no", "nb-no" },
-+        { "id", "id-id" },
-+        { "ms", "ms-my" },
-+        { "ca", "ca-es" },
-+        { "cs", "cs-cz" },
-+        { "cy", "cy-gb" },
-+        { "da", "da-dk" },
-+        { "de", "de-de" },
-+        { "tl", "tl-ph" },
-+        { "ko", "ko-kr" },
-+        { "hr", "hr-hr" },
-+        { "it", "it-it" },
-+        { "lt", "lt-lt" },
-+        { "hu", "hu-hu" },
-+        { "nl", "nl-nl" },
-+        { "ja", "ja-jp" },
-+        { "nb", "nb-no" },
-+        { "no", "nb-no" },
-+        { "pl", "pl-pl" },
-+        { "ro", "ro-ro" },
-+        { "ru", "ru-ru" },
-+        { "sk", "sk-sk" },
-+        { "sl", "sl-sl" },
-+        { "sv", "sv-se" },
-+        { "th", "th-th" },
-+        { "vi", "vi-vn" },
-+        { "tr", "tr-tr" },
-+        { "el", "el-gr" },
-+        { "bg", "bg-bg" },
-+        { "sr", "sr-rs" },
-+        { "he", "he-il" },
-+        { "hi", "hi-in" },
-+        { "bn", "bn-in" },
-+        { "pa", "pa-in" },
-+        { "ta", "ta-in" },
-+        { "te", "te-in" },
-+        { "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";
-+    }
-+
-     public FacebookPublisher(Spit.Publishing.Service service,
-         Spit.Publishing.PluginHost host) {
-         debug("FacebookPublisher instantiated.");
-@@ -402,37 +498,80 @@
+@@ -402,37 +409,56 @@
          start();
      }
  
@@ -347,46 +258,22 @@
 +                data = account.get_session_parameters(out mechanism);
 +                debug("Got account data");
 +            } catch (GLib.Error e) {
-+                debug("EVENT: couldn't create session for account: %s",
-+                      e.message);
-+            }
-+        }
-+
-+        if (auth_session == null) {
-+            debug("Creating unbound session");
-+            try {
-+                auth_session = new Signon.AuthSession(0, "oauth2");
-+            } catch (GLib.Error e) {
-+                debug("EVENT: AuthSession creation failed: %s", e.message);
++                warning("EVENT: couldn't create session for account: %s",
++                        e.message);
 +                return;
 +            }
          }
 +
 +        if (data == null) {
-+            debug("Using own params");
-+            data = new HashTable<string,Value?>(str_hash, str_equal);
-+            string facebook_locale = get_system_locale_as_facebook_locale();
-+            string host_name = "%s.facebook.com".printf(facebook_locale);
-+            data.insert("Host", host_name);
-+            data.insert("AuthPath", "/dialog/oauth");
-+            data.insert("ClientId", APPLICATION_ID);
-+            data.insert("RedirectUri", "https://www.facebook.com/connect/login_success.html");
-+            string[] scopes = {
-+                "offline_access",
-+                "publish_stream",
-+                "user_photos",
-+                "user_videos"
-+            };
-+            data.insert("Scope", scopes);
-+            string[] response_type = {
-+                "token"
-+            };
-+            data.insert("ResponseType", response_type);
++            warning ("No account authentication data");
++            host.post_error(new Spit.Publishing.PublishingError.SERVICE_ERROR(
++                "Error while accessing the account"));
++            return;
 +        }
 +
 +        var windowId = host.get_dialog_xid();
 +        if (windowId != 0) {
-+            data.insert("WindowId", windowId);
++            data.insert("WindowId", (uint)windowId);
 +        }
 +
 +        auth_session.process(data, mechanism, on_processed);
@@ -394,7 +281,7 @@
      }
  
      private void do_save_session_information() {
-@@ -562,30 +701,6 @@
+@@ -562,30 +588,6 @@
          host.post_error(err);
      }
  
@@ -425,7 +312,7 @@
      private void on_session_authenticated() {
          if (!is_running())
              return;
-@@ -773,14 +888,8 @@
+@@ -773,14 +775,8 @@
                  get_persistent_uid(), get_persistent_user_name());
              on_session_authenticated();
          } else {
@@ -442,13 +329,12 @@
          }
      }
  
-@@ -909,39 +1018,14 @@
+@@ -909,39 +905,14 @@
          return (access_token != null && uid != null && user_name != null);
      }
  
 -    public void authenticate_with_parameters(string access_token, string uid, string user_name) {
-+    public void authenticate_with_parameters(string access_token, string? uid, string? user_name) {
-         this.access_token = access_token;
+-        this.access_token = access_token;
 -        this.uid = uid;
 -        this.user_name = user_name;
 -    }
@@ -477,7 +363,8 @@
 -        access_token = access_token.replace("#access_token=", "");
 -        
 -        // we've got an access token!
--        this.access_token = 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) {
@@ -489,7 +376,7 @@
      }
  
      public string get_endpoint_url() {
-@@ -1335,190 +1419,6 @@
+@@ -1335,190 +1306,6 @@
      }
  }
  
@@ -682,8 +569,8 @@
      private Gtk.Box pane_widget = null;
 Index: shotwell-0.12.90/plugins/shotwell-publishing/FlickrPublishing.vala
 ===================================================================
---- shotwell-0.12.90.orig/plugins/shotwell-publishing/FlickrPublishing.vala	2012-08-24 15:12:30.611994126 +1200
-+++ shotwell-0.12.90/plugins/shotwell-publishing/FlickrPublishing.vala	2012-08-24 15:15:23.971988123 +1200
+--- shotwell-0.12.90.orig/plugins/shotwell-publishing/FlickrPublishing.vala	2012-08-24 00:03:04.000000000 +0300
++++ shotwell-0.12.90/plugins/shotwell-publishing/FlickrPublishing.vala	2012-08-28 11:11:16.866844467 +0300
 @@ -4,6 +4,8 @@
   * (version 2.1 or later).  See the COPYING file in this distribution. 
   */
@@ -748,8 +635,8 @@
 +                data = account.get_session_parameters(out mechanism);
 +                debug("Got account data");
 +            } catch (GLib.Error e) {
-+                debug("EVENT: couldn't create session for account: %s",
-+                      e.message);
++                warning("EVENT: couldn't create session for account: %s",
++                        e.message);
 +            }
 +        }
  
@@ -774,7 +661,7 @@
 -        session.set_request_phase_credentials(token, token_secret);
 +        var windowId = host.get_dialog_xid();
 +        if (windowId != 0) {
-+            data.insert("WindowId", windowId);
++            data.insert("WindowId", (uint)windowId);
 +        }
  
 -        do_launch_system_browser(token);
@@ -1099,8 +986,8 @@
          return access_phase_token;
 Index: shotwell-0.12.90/plugins/shotwell-publishing/Makefile
 ===================================================================
---- shotwell-0.12.90.orig/plugins/shotwell-publishing/Makefile	2012-08-24 15:13:53.000000000 +1200
-+++ shotwell-0.12.90/plugins/shotwell-publishing/Makefile	2012-08-24 15:15:23.971988123 +1200
+--- shotwell-0.12.90.orig/plugins/shotwell-publishing/Makefile	2012-08-24 00:03:04.000000000 +0300
++++ shotwell-0.12.90/plugins/shotwell-publishing/Makefile	2012-08-28 10:25:15.300033478 +0300
 @@ -18,6 +18,7 @@
  	FlickrPublishing.vala \
  	YouTubePublishing.vala \
@@ -1111,8 +998,8 @@
  	../common/ui.vala
 Index: shotwell-0.12.90/plugins/shotwell-publishing/PicasaPublishing.vala
 ===================================================================
---- shotwell-0.12.90.orig/plugins/shotwell-publishing/PicasaPublishing.vala	2012-08-24 15:15:13.435988488 +1200
-+++ shotwell-0.12.90/plugins/shotwell-publishing/PicasaPublishing.vala	2012-08-24 15:15:23.971988123 +1200
+--- shotwell-0.12.90.orig/plugins/shotwell-publishing/PicasaPublishing.vala	2012-08-24 00:03:04.000000000 +0300
++++ shotwell-0.12.90/plugins/shotwell-publishing/PicasaPublishing.vala	2012-08-28 11:10:22.379612657 +0300
 @@ -4,6 +4,8 @@
   * (version 2.1 or later).  See the COPYING file in this distribution. 
   */
@@ -1142,173 +1029,170 @@
  
      public PicasaPublisher(Spit.Publishing.Service service,
          Spit.Publishing.PluginHost host) {
-@@ -123,6 +131,29 @@
+@@ -83,18 +91,6 @@
+             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 +129,6 @@
          return result;
      }
      
-+    private string? extract_username(Xml.Node* document_root) throws Spit.Publishing.PublishingError {
-+        Xml.Node* doc_node_iter = null;
-+        if (document_root->name == "feed")
-+            doc_node_iter = document_root->children;
-+        else
-+            throw new Spit.Publishing.PublishingError.MALFORMED_RESPONSE("response root node " +
-+                "isn't a <feed>");
-+
-+        for ( ; doc_node_iter != null; doc_node_iter = doc_node_iter->next) {
-+            if (doc_node_iter->name != "author")
-+                continue;
-+
-+            Xml.Node* author_node_iter = doc_node_iter->children;
-+            for ( ; author_node_iter != null; author_node_iter = author_node_iter->next) {
-+                if (author_node_iter->name == "name")
-+                    return author_node_iter->get_content();
-+            }
-+
-+        }
-+
-+        return null;
-+    }
-+
-     internal string? get_persistent_username() {
-         return host.get_config_string("user_name", null);
-     }
-@@ -131,6 +162,10 @@
-         return host.get_config_string("auth_token", null);
-     }
-     
-+    internal string? get_persistent_auth_method() {
-+        return host.get_config_string("auth_method", null);
-+    }
-+
-     internal void set_persistent_username(string username) {
-         host.set_config_string("user_name", username);
-     }
-@@ -139,11 +174,16 @@
-         host.set_config_string("auth_token", auth_token);
-     }
- 
-+    internal void set_persistent_auth_method(string auth_method) {
-+        host.set_config_string("auth_method", auth_method);
-+    }
-+
-     internal void invalidate_persistent_session() {
-         debug("invalidating persisted Picasa Web Albums session.");
- 
--        host.unset_config_key("user_name");
--        host.unset_config_key("auth_token");
-+        set_persistent_username("");
-+        set_persistent_auth_token("");
-+        set_persistent_auth_method("");
-     }
-     
-     internal bool is_persistent_session_available() {
-@@ -164,76 +204,89 @@
+-    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 +137,6 @@
+         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;
+     }
+@@ -173,92 +151,69 @@
          
          debug("EVENT: user clicked 'Login' in welcome pane.");
  
--        do_show_credentials_pane(CredentialsPane.Mode.INTRO);
--    }
--
--    private void on_credentials_go_back() {
--        if (!is_running())
--            return;
--            
--        debug("EVENT: user clicked 'Go Back' in credentials pane.");
--
--        do_show_service_welcome_pane();
--    }
--
--    private void on_credentials_login(string username, string password) {
--        if (!is_running())
--            return;    
--    
--        debug("EVENT: user clicked 'Login' in credentials pane.");
--
--        this.username = username;
--
--        do_network_login(username, password);
--    }
--
--    private void on_token_fetch_complete(Publishing.RESTSupport.Transaction txn) {
--        txn.completed.disconnect(on_token_fetch_complete);
--        txn.network_error.disconnect(on_token_fetch_error);
--
--        if (!is_running())
--            return;
--
--        if (session.is_authenticated()) // ignore these events if the session is already auth'd
--            return;
--
--        debug("EVENT: network transaction to fetch token for login completed successfully.");
--        
--        int index = txn.get_response().index_of("Auth=");
--        string auth_substring = (index >= 0) ? txn.get_response()[index:txn.get_response().length] : "";
--        auth_substring = auth_substring.chomp();
--        string auth_token = auth_substring.substring(5);
+-        do_launch_browser_for_authorization();
 +        do_hosted_web_authentication();
-+    }
-+
+     }
+     
+-    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);
 +    public void on_processed(Signon.AuthSession self, owned HashTable<string,Value?>? session_data, GLib.Error error){
 +        if (error != null) {
 +            debug("got error: %s", error.message);
 +            /* TODO: handle errors */
 +            return;
 +        }
-+
+ 
+-        debug("EVENT: network transaction to exchange authorization code for access tokens " +
+-            "completed successfully.");
 +        host.set_service_locked(true);
 +        host.install_account_fetch_wait_pane();
  
-         session.authenticated.connect(on_session_authenticated);
--        session.authenticate(auth_token, username);
-+
+-        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);
++        session.authenticated.connect(on_session_authenticated);
+ 
+-        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();
 +        if (session_data.lookup("AccessToken") != null) {
 +            string token = session_data.lookup("AccessToken").get_string();
 +            debug("OAuth Access Token: %s", token);
-+            session.authenticate(token, null, "OAuth2");
++            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, null, "ClientLogin");
++            session.authenticate(token, "ClientLogin");
 +        } else {
 +            debug("Access token not present!");
 +        }
      }
+-    
+-    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;
  
--    private void on_token_fetch_error(Publishing.RESTSupport.Transaction bad_txn,
--        Spit.Publishing.PublishingError err) {
--        bad_txn.completed.disconnect(on_token_fetch_complete);
--        bad_txn.network_error.disconnect(on_token_fetch_error);
--
--        if (!is_running())
--            return;
--
 -        if (session.is_authenticated()) // ignore these events if the session is already auth'd
 -            return;
--
--        debug("EVENT: network transaction to fetch token for login failed; response = '%s'.",
--            bad_txn.get_response());
--
--        // HTTP error 403 is invalid authentication -- if we get this error during token fetch
--        // then we can just show the login screen again with a retry message; if we get any error
--        // other than 403 though, we can't recover from it, so just post the error to the user
--        if (bad_txn.get_status_code() == 403) {
--            if (bad_txn.get_response().contains("CaptchaRequired"))
--                do_show_credentials_pane(CredentialsPane.Mode.ADDITIONAL_SECURITY);
--            else
--                do_show_credentials_pane(CredentialsPane.Mode.FAILED_RETRY);
--        }
--        else {
--            host.post_error(err);
--        }
 +    private void do_hosted_web_authentication() {
 +        debug("ACTION: doing hosted web authentication.");
-+
+ 
+-        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;
 +        HashTable<string,Value?> data = null;
 +        string mechanism = "user_agent";
 +
 +        SharingAccounts accounts =
 +            new SharingAccounts();
-+
+ 
+-        if (session.is_authenticated()) // ignore these events if the session is already auth'd
 +        SharingAccount? account = accounts.get_account_for_provider("google");
 +        if (account != null) {
 +            try {
@@ -1316,41 +1200,24 @@
 +                data = account.get_session_parameters(out mechanism);
 +                debug("Got account data");
 +            } catch (GLib.Error e) {
-+                debug("EVENT: couldn't create session for account: %s",
-+                      e.message);
-+            }
-+        }
-+
-+        if (auth_session == null) {
-+            debug("Creating unbound session");
-+            try {
-+                auth_session = new Signon.AuthSession(0, "oauth2");
-+            } catch (GLib.Error e) {
-+                debug("EVENT: AuthSession creation failed: %s", e.message);
-+                return;
++                warning("EVENT: couldn't create session for account: %s",
++                        e.message);
 +            }
 +        }
 +
 +        if (data == null) {
-+            debug("Using own params");
-+            data = new HashTable<string,Value?>(str_hash, str_equal);
-+            data.insert("Host", "accounts.google.com");
-+            data.insert("AuthPath", "o/oauth2/auth");
-+            data.insert("ClientId", "1041829795610-htf69c529db58qcq8jvf58bijn1ie3oi.apps.googleusercontent.com");
-+            data.insert("RedirectUri", "http://www.mardy.it/oauth2callback");
-+            string[] scopes = {
-+                "https://picasaweb.google.com/data/"
-+            };
-+            data.insert("Scope", scopes);
-+            string[] response_type = {
-+                "token"
-+            };
-+            data.insert("ResponseType", response_type);
++            warning ("No account authentication data");
++            host.post_error(new Spit.Publishing.PublishingError.SERVICE_ERROR(
++                "Error while accessing the account"));
+             return;
 +        }
-+
+ 
+-        debug("EVENT: refresh access token transaction caused a network error.");
+-        
+-        host.post_error(err);       
 +        var windowId = host.get_dialog_xid();
 +        if (windowId != 0) {
-+            data.insert("WindowId", windowId);
++            data.insert("WindowId", (uint)windowId);
 +        }
 +
 +        auth_session.process(data, mechanism, on_processed);
@@ -1358,7 +1225,7 @@
      }
  
      private void on_session_authenticated() {
-@@ -271,25 +324,7 @@
+@@ -313,19 +268,7 @@
          debug("EVENT: fetching account and album information failed; response = '%s'.",
              bad_txn.get_response());
  
@@ -1366,161 +1233,286 @@
 -            // 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
--            // re-display the credentials capture pane with an "account not set up" message.
--            // In addition, we deauthenticate the session. Deauth is neccessary because we
--            // did previously auth the user's account. If we get any other kind of error, we can't
--            // recover, so just post it to the user
--            session.deauthenticate();
--            do_show_credentials_pane(CredentialsPane.Mode.NOT_SET_UP);
--        } else if (bad_txn.get_status_code() == 403) {
--            // if we get a 403 error (authentication failed) then we need to return to the login
--            // screen because the user's auth token is no longer valid and he or she needs to
--            // login again to obtain a new one
--            session.deauthenticate();
--            do_show_credentials_pane(CredentialsPane.Mode.INTRO);
+-            // 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);
 -        }
 +        host.post_error(err);
      }
  
      private void on_publishing_options_logout() {
-@@ -414,34 +449,6 @@
+@@ -335,7 +278,6 @@
+         debug("EVENT: user clicked 'Logout' in the publishing options pane.");
+ 
+         session.deauthenticate();
+-        invalidate_persistent_session();
+ 
+         do_show_service_welcome_pane();
+     }
+@@ -453,94 +395,6 @@
          host.install_welcome_pane(SERVICE_WELCOME_MESSAGE, on_service_welcome_login);
      }
      
--    private void do_show_credentials_pane(CredentialsPane.Mode mode) {
--        debug("ACTION: showing credentials capture pane in %s mode.", mode.to_string());
--        
--        CredentialsPane creds_pane = new CredentialsPane(host, mode);
--        creds_pane.go_back.connect(on_credentials_go_back);
--        creds_pane.login.connect(on_credentials_login);
--
--        host.install_dialog_pane(creds_pane);
--    }
--
--    private void do_network_login(string username, string password) {
--        debug("ACTION: running network login transaction for user = '%s'.", username);
+-    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 +416,8 @@
+             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();
--
--        TokenFetchTransaction fetch_trans = new TokenFetchTransaction(session, username, password);
--        fetch_trans.network_error.connect(on_token_fetch_error);
--        fetch_trans.completed.connect(on_token_fetch_complete);
--
+-        
+-        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 {
--            fetch_trans.execute();
+-            txn.execute();
 -        } catch (Spit.Publishing.PublishingError err) {
--            // 403 errors are recoverable, so don't post the error to our host immediately;
--            // instead, try to recover from it
--            on_token_fetch_error(fetch_trans, err);
--        }
--    }
--    
-     private void do_save_auth_info() {
-         debug("ACTION: saving authentication information to configuration system.");
-         
-@@ -449,6 +456,7 @@
-         
-         set_persistent_auth_token(session.get_auth_token());
-         set_persistent_username(session.get_username());
-+        set_persistent_auth_method(session.get_auth_method());
+-            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.");
+ 
+@@ -771,11 +567,7 @@
+         
+         running = true;
+ 
+-        if (is_persistent_session_available()) {
+-            do_refresh_session(get_persistent_refresh_token());
+-        } else {
+-            do_show_service_welcome_pane();
+-        }
++        do_show_service_welcome_pane();
      }
  
-     private void do_fetch_account_information() {
-@@ -485,6 +493,8 @@
- 
-         try {
-             albums = extract_albums(response_doc.get_root_node());
-+            username = extract_username(response_doc.get_root_node());
-+            set_persistent_username(username);
-         } catch (Spit.Publishing.PublishingError err) {
-             host.post_error(err);
-             return;
-@@ -567,7 +577,8 @@
- 
-         if (is_persistent_session_available()) {
-             username = get_persistent_username();
--            session.authenticate(get_persistent_auth_token(), get_persistent_username());
-+            session.authenticate(get_persistent_auth_token(), get_persistent_username(),
-+                                 get_persistent_auth_method());
-             do_fetch_account_information();
-         } else {
-             do_show_service_welcome_pane();
-@@ -598,6 +609,7 @@
+     public void stop() {
+@@ -801,6 +593,7 @@
+ 
  internal class Session : Publishing.RESTSupport.Session {
      private string? auth_token = null;
-     private string? username = null;
 +    private string? auth_method = null;
  
      public Session() {
      }
-@@ -606,9 +618,10 @@
+@@ -809,45 +602,24 @@
          return (auth_token != null);
      }
  
--    public void authenticate(string auth_token, string username) {
-+    public void authenticate(string auth_token, string? username, string auth_method) {
+-    public void authenticate(string auth_token) {
++    public void authenticate(string auth_token, string auth_method) {
          this.auth_token = auth_token;
-         this.username = username;
 +        this.auth_method = auth_method;
          
          notify_authenticated();
      }
-@@ -616,6 +629,7 @@
+     
      public void deauthenticate() {
          auth_token = null;
-         username = null;
 +        auth_method = null;
      }
- 
-     public string? get_username() {
-@@ -625,19 +639,9 @@
+     
      public string? get_auth_token() {
          return auth_token;
      }
 -}
--
--internal class TokenFetchTransaction : Publishing.RESTSupport.Transaction {
--    private const string ENDPOINT_URL = "https://www.google.com/accounts/ClientLogin";
--
--    public TokenFetchTransaction(Session session, string username, string password) {
--        base.with_endpoint_url(session, ENDPOINT_URL);
--
--        add_argument("accountType", "HOSTED_OR_GOOGLE");
--        add_argument("Email", username);
--        add_argument("Passwd", password);
--        add_argument("service", "lh2");
--        add_argument("source", "yorba-shotwell-" + _VERSION);
-+
+ 
+-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;
      }
  }
  
-@@ -652,12 +656,19 @@
+@@ -862,7 +634,13 @@
          base.with_endpoint_url(session, endpoint_url, method);
          assert(session.is_authenticated());
  
--        add_header("Authorization", "GoogleLogin auth=%s".printf(session.get_auth_token()));
+-        add_header("Authorization", "Bearer " + session.get_auth_token());
 +        if (session.get_auth_method() == "ClientLogin") {
 +            add_header("Authorization",
-+                       "GoogleLogin auth=%s".printf(session.get_auth_token()));
++                       "GoogleLogin auth=" + session.get_auth_token());
 +        } else {
-+            add_argument("access_token", session.get_auth_token());
 +            add_header("Authorization",
-+                       "Bearer %s".printf(session.get_auth_token()));
++                       "Bearer " + session.get_auth_token());
 +        }
      }
  }
  
+@@ -875,7 +653,7 @@
+ }
+ 
  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) {
-@@ -674,7 +685,7 @@
+@@ -892,7 +670,7 @@
  }
  
  private class AlbumCreationTransaction : AuthenticatedTransaction {
@@ -1529,227 +1521,123 @@
          "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>";
      
-@@ -747,8 +758,14 @@
+@@ -971,9 +749,14 @@
          // 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", "GoogleLogin auth=%s".printf(session.get_auth_token()));
+-        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=%s".printf(session.get_auth_token()));
++                       "GoogleLogin auth=" + session.get_auth_token());
 +        } else {
 +            add_header("Authorization",
-+                       "Bearer %s".printf(session.get_auth_token()));
++                       "Bearer " + session.get_auth_token());
 +        }
  
          // send the message and get its response
          set_is_executed(true);
-@@ -756,199 +773,6 @@
+@@ -981,95 +764,6 @@
      }
  }
  
--internal class CredentialsPane : Spit.Publishing.DialogPane, GLib.Object {
--    public enum Mode {
--        INTRO,
--        FAILED_RETRY,
--        NOT_SET_UP,
--        ADDITIONAL_SECURITY;
--
--        public string to_string() {
--            switch (this) {
--                case Mode.INTRO:
--                    return "INTRO";
--
--                case Mode.FAILED_RETRY:
--                    return "FAILED_RETRY";
--
--                case Mode.NOT_SET_UP:
--                    return "NOT_SET_UP";
--
--                case Mode.ADDITIONAL_SECURITY:
--                    return "ADDITIONAL_SECURITY";
--
--                default:
--                    error("unrecognized CredentialsPane.Mode enumeration value");
--            }
--        }
--    }
--
--    private LegacyCredentialsPane wrapped = null;
--
--    public signal void go_back();
--    public signal void login(string email, string password);
--
--    public CredentialsPane(Spit.Publishing.PluginHost host, Mode mode = Mode.INTRO,
--        string? username = null) {
--            wrapped = new LegacyCredentialsPane(host, mode, username);
--    }
--    
--    protected void notify_go_back() {
--        go_back();
--    }
--    
--    protected void notify_login(string email, string password) {
--        login(email, password);
+-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 wrapped;
+-        return pane_widget;
 -    }
 -    
 -    public Spit.Publishing.DialogPane.GeometryOptions get_preferred_geometry() {
 -        return Spit.Publishing.DialogPane.GeometryOptions.NONE;
 -    }
--    
--    public void on_pane_installed() {        
--        wrapped.go_back.connect(notify_go_back);
--        wrapped.login.connect(notify_login);
--        
--        wrapped.installed();
+-
+-    public void on_pane_installed() {
+-        continue_button.clicked.connect(on_continue_clicked);
+-        entry.changed.connect(on_entry_contents_changed);
 -    }
--    
+-
 -    public void on_pane_uninstalled() {
--        wrapped.go_back.disconnect(notify_go_back);
--        wrapped.login.disconnect(notify_login);
+-        continue_button.clicked.disconnect(on_continue_clicked);
+-        entry.changed.disconnect(on_entry_contents_changed);
 -    }
 -}
 -
--internal class LegacyCredentialsPane : Gtk.VBox {
--    private const string INTRO_MESSAGE = _("Enter the email address and password associated with your Picasa Web Albums account.");
--    private const string FAILED_RETRY_MESSAGE = _("Picasa Web Albums didn't recognize the email address and password you entered. To try again, re-enter your email address and password below.");
--    private const string NOT_SET_UP_MESSAGE = _("The email address and password you entered correspond to a Google account that isn't set up for use with Picasa Web Albums. You can set up most accounts by using your browser to log into the Picasa Web Albums site at least once. To try again, re-enter your email address and password below.");
--    private const string ADDITIONAL_SECURITY_MESSAGE = _("The email address and password you entered correspond to a Google account that has been tagged as requiring additional security. You can clear this tag by using your browser to log into Picasa Web Albums. To try again, re-enter your email address and password below.");
--    
--    private const int UNIFORM_ACTION_BUTTON_WIDTH = 102;
--    private const int VERTICAL_SPACE_HEIGHT = 32;
--    public const int STANDARD_CONTENT_LABEL_WIDTH = 500;
--
--    private weak Spit.Publishing.PluginHost host = null;
--    private Gtk.Entry email_entry;
--    private Gtk.Entry password_entry;
--    private Gtk.Button login_button;
--    private Gtk.Button go_back_button;
--    private string? username = null;
--
--    public signal void go_back();
--    public signal void login(string email, string password);
--
--    public LegacyCredentialsPane(Spit.Publishing.PluginHost host, CredentialsPane.Mode mode =
--        CredentialsPane.Mode.INTRO, string? username = null) {
--        this.host = host;
--        this.username = username;
--
--        add(gtk_vspacer(VERTICAL_SPACE_HEIGHT));
--
--        Gtk.Label intro_message_label = new Gtk.Label("");
--        intro_message_label.set_line_wrap(true);
--        add(intro_message_label);
--        intro_message_label.set_size_request(STANDARD_CONTENT_LABEL_WIDTH, -1);
--        intro_message_label.set_alignment(0.5f, 0.0f);
--        switch (mode) {
--            case CredentialsPane.Mode.INTRO:
--                intro_message_label.set_text(INTRO_MESSAGE);
--            break;
--
--            case CredentialsPane.Mode.FAILED_RETRY:
--                intro_message_label.set_markup("<b>%s</b>\n\n%s".printf(_(
--                    "Unrecognized User"), FAILED_RETRY_MESSAGE));
--            break;
--
--            case CredentialsPane.Mode.NOT_SET_UP:
--                intro_message_label.set_markup("<b>%s</b>\n\n%s".printf(_("Account Not Ready"),
--                    NOT_SET_UP_MESSAGE));
--                add(gtk_vspacer(VERTICAL_SPACE_HEIGHT));
--            break;
--
--            case CredentialsPane.Mode.ADDITIONAL_SECURITY:
--                intro_message_label.set_markup("<b>%s</b>\n\n%s".printf(_("Additional Security Required"),
--                    ADDITIONAL_SECURITY_MESSAGE));
--                add(gtk_vspacer(VERTICAL_SPACE_HEIGHT));
--            break;
--        }
--
--        Gtk.Alignment entry_widgets_table_aligner = new Gtk.Alignment(0.5f, 0.5f, 0.0f, 0.0f);
--        Gtk.Table entry_widgets_table = new Gtk.Table(3,2, false);
--        Gtk.Label email_entry_label = new Gtk.Label.with_mnemonic(_("_Email address:"));
--        email_entry_label.set_alignment(0.0f, 0.5f);
--        Gtk.Label password_entry_label = new Gtk.Label.with_mnemonic(_("_Password:"));
--        password_entry_label.set_alignment(0.0f, 0.5f);
--        email_entry = new Gtk.Entry();
--        if (username != null)
--            email_entry.set_text(username);
--        email_entry.changed.connect(on_email_changed);
--        password_entry = new Gtk.Entry();
--        password_entry.set_visibility(false);
--        entry_widgets_table.attach(email_entry_label, 0, 1, 0, 1,
--            Gtk.AttachOptions.EXPAND | Gtk.AttachOptions.FILL,
--            Gtk.AttachOptions.EXPAND | Gtk.AttachOptions.FILL, 6, 6);
--        entry_widgets_table.attach(password_entry_label, 0, 1, 1, 2,
--            Gtk.AttachOptions.EXPAND | Gtk.AttachOptions.FILL,
--            Gtk.AttachOptions.EXPAND | Gtk.AttachOptions.FILL, 6, 6);
--        entry_widgets_table.attach(email_entry, 1, 2, 0, 1,
--            Gtk.AttachOptions.EXPAND | Gtk.AttachOptions.FILL,
--            Gtk.AttachOptions.EXPAND | Gtk.AttachOptions.FILL, 6, 6);
--        entry_widgets_table.attach(password_entry, 1, 2, 1, 2,
--            Gtk.AttachOptions.EXPAND | Gtk.AttachOptions.FILL,
--            Gtk.AttachOptions.EXPAND | Gtk.AttachOptions.FILL, 6, 6);
--        go_back_button = new Gtk.Button.with_mnemonic(_("Go _Back"));
--        go_back_button.clicked.connect(on_go_back_button_clicked);
--        Gtk.Alignment go_back_button_aligner = new Gtk.Alignment(0.0f, 0.5f, 0.0f, 0.0f);
--        go_back_button_aligner.add(go_back_button);
--        go_back_button.set_size_request(UNIFORM_ACTION_BUTTON_WIDTH, -1);
--        login_button = new Gtk.Button.with_mnemonic(_("_Login"));
--        login_button.clicked.connect(on_login_button_clicked);
--        login_button.set_sensitive(username != null);
--        Gtk.Alignment login_button_aligner = new Gtk.Alignment(1.0f, 0.5f, 0.0f, 0.0f);
--        login_button_aligner.add(login_button);
--        login_button.set_size_request(UNIFORM_ACTION_BUTTON_WIDTH, -1);
--        entry_widgets_table.attach(go_back_button_aligner, 0, 1, 2, 3,
--            Gtk.AttachOptions.EXPAND | Gtk.AttachOptions.FILL,
--            Gtk.AttachOptions.EXPAND | Gtk.AttachOptions.FILL, 6, VERTICAL_SPACE_HEIGHT);
--        entry_widgets_table.attach(login_button_aligner, 1, 2, 2, 3,
--            Gtk.AttachOptions.EXPAND | Gtk.AttachOptions.FILL,
--            Gtk.AttachOptions.EXPAND | Gtk.AttachOptions.FILL, 6, VERTICAL_SPACE_HEIGHT);
--        entry_widgets_table_aligner.add(entry_widgets_table);
--        add(entry_widgets_table_aligner);
--
--        email_entry_label.set_mnemonic_widget(email_entry);
--        password_entry_label.set_mnemonic_widget(password_entry);
--
--        add(gtk_vspacer(VERTICAL_SPACE_HEIGHT));
--    }
--
--    private void on_login_button_clicked() {
--        login(email_entry.get_text(), password_entry.get_text());
--    }
--
--    private void on_go_back_button_clicked() {
--        go_back();
--    }
--
--    private void on_email_changed() {
--        login_button.set_sensitive(email_entry.get_text() != "");
--    }
--
--    public void installed() {
--        host.set_service_locked(false);
--
--        email_entry.grab_focus();
--        password_entry.set_activates_default(true);
--        login_button.can_default = true;
--        host.set_dialog_default_widget(login_button);
+-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 LegacyPublishingOptionsPane wrapped = null;
- 
-
+     private class SizeDescription {
+         public string name;
 Index: shotwell-0.12.90/src/plugins/PublishingInterfaces.vala
 ===================================================================
---- shotwell-0.12.90.orig/src/plugins/PublishingInterfaces.vala	2012-08-24 09:03:04.000000000 +1200
-+++ shotwell-0.12.90/src/plugins/PublishingInterfaces.vala	2012-08-24 15:15:23.971988123 +1200
+--- shotwell-0.12.90.orig/src/plugins/PublishingInterfaces.vala	2012-08-24 00:03:04.000000000 +0300
++++ shotwell-0.12.90/src/plugins/PublishingInterfaces.vala	2012-08-28 10:25:15.300033478 +0300
 @@ -494,6 +494,7 @@
       */
      public abstract Spit.Publishing.Publisher.MediaType get_publishable_media_type();
@@ -1776,8 +1664,8 @@
      protected virtual void reserved3() {}
 Index: shotwell-0.12.90/src/publishing/PublishingPluginHost.vala
 ===================================================================
---- shotwell-0.12.90.orig/src/publishing/PublishingPluginHost.vala	2012-08-24 09:03:04.000000000 +1200
-+++ shotwell-0.12.90/src/publishing/PublishingPluginHost.vala	2012-08-24 15:15:23.971988123 +1200
+--- shotwell-0.12.90.orig/src/publishing/PublishingPluginHost.vala	2012-08-24 00:03:04.000000000 +0300
++++ shotwell-0.12.90/src/publishing/PublishingPluginHost.vala	2012-08-28 10:25:15.300033478 +0300
 @@ -232,6 +232,13 @@
          
          return report_plugin_upload_progress;
@@ -1794,8 +1682,8 @@
  }
 Index: shotwell-0.12.90/src/publishing/PublishingUI.vala
 ===================================================================
---- shotwell-0.12.90.orig/src/publishing/PublishingUI.vala	2012-08-24 09:03:04.000000000 +1200
-+++ shotwell-0.12.90/src/publishing/PublishingUI.vala	2012-08-24 15:15:23.971988123 +1200
+--- shotwell-0.12.90.orig/src/publishing/PublishingUI.vala	2012-08-24 00:03:04.000000000 +0300
++++ shotwell-0.12.90/src/publishing/PublishingUI.vala	2012-08-28 10:25:15.300033478 +0300
 @@ -296,6 +296,7 @@
          Spit.Publishing.Service[] all_services = load_all_services();