Merge lp:~tintou/pantheon-photos/google-photos into lp:~pantheon-photos/pantheon-photos/trunk

[Corentin Noël]

Use latest Google Photo API

Use latest Google Photo API (a.k.a remove functionalities)

=== modified file 'plugins/pantheon-photos-publishing/PicasaPublishing.vala'
--- plugins/pantheon-photos-publishing/PicasaPublishing.vala	2016-02-19 19:55:55 +0000
+++ plugins/pantheon-photos-publishing/PicasaPublishing.vala	2016-07-30 17:14:55 +0000
@@ -5,7 +5,7 @@
  */
 
 public class PicasaService : Object, Spit.Pluggable, Spit.Publishing.Service {
-    private const string ICON_FILENAME = "picasa.png";
+    private const string ICON_FILENAME = "google-photos.svg";
     private GLib.Icon icon;
 
     public PicasaService (GLib.File resource_directory) {
@@ -22,7 +22,7 @@
     }
 
     public unowned string get_pluggable_name () {
-        return "Picasa Web Albums";
+        return "Google Photos";
     }
 
     public void get_info (ref Spit.PluggableInfo info) {
@@ -53,8 +53,7 @@
 namespace Publishing.Picasa {
 
 internal const string SERVICE_WELCOME_MESSAGE =
-    _ ("You are not currently logged into Picasa Web Albums.\n\nClick Login to log into Picasa Web Albums in your Web browser. You will have to authorize Shotwell Connect to link to your Picasa Web Albums account.");
-internal const string DEFAULT_ALBUM_NAME = _ ("Shotwell Connect");
+    _ ("You are not currently logged into Google Photos.\n\nClick Login to log into Google Photos in your Web browser. You will have to authorize elementary OS to link to your Google Photos account.");
 
 public class PicasaPublisher : Publishing.RESTSupport.GooglePublisher {
     private bool running;
@@ -78,55 +77,14 @@
         this.progress_reporter = null;
     }
 
-    private Album[] extract_albums_helper (Xml.Node *document_root)
-    throws Spit.Publishing.PublishingError {
-        Album[] result = new Album[0];
-
-        Xml.Node *doc_node_iter = null;
-        if (document_root->name == "feed")
-            doc_node_iter = document_root->children;
-        else if (document_root->name == "entry")
-            doc_node_iter = document_root;
-        else
-            throw new Spit.Publishing.PublishingError.MALFORMED_RESPONSE ("response root node " +
-            "isn't a <feed> or <entry>");
-
-        for ( ; doc_node_iter != null; doc_node_iter = doc_node_iter->next) {
-            if (doc_node_iter->name != "entry")
-                continue;
-
-            string name_val = null;
-            string url_val = null;
-            Xml.Node *album_node_iter = doc_node_iter->children;
-            for ( ; album_node_iter != null; album_node_iter = album_node_iter->next) {
-                if (album_node_iter->name == "title") {
-                    name_val = album_node_iter->get_content ();
-                } else if (album_node_iter->name == "id") {
-                    // we only want nodes in the default namespace -- the feed that we get back
-                    // from Google also defines <entry> child nodes named <id> in the gphoto and
-                    // media namespaces
-                    if (album_node_iter->ns->prefix != null)
-                        continue;
-                    url_val = album_node_iter->get_content ();
-                }
-            }
-
-            result += new Album (name_val, url_val);
-        }
-
-        return result;
-    }
-
     private void load_parameters_from_configuration_system (PublishingParameters parameters) {
         parameters.set_major_axis_size_selection_id (get_host ().get_config_int ("default-size", 0));
         parameters.set_strip_metadata (get_host ().get_config_bool ("strip-metadata", false));
-        parameters.set_target_album_name (get_host ().get_config_string ("last-album", null));
     }
 
     private void save_parameters_to_configuration_system (PublishingParameters parameters) {
         get_host ().set_config_int ("default-size", parameters.get_major_axis_size_selection_id ());
         get_host ().set_config_bool ("strip_metadata", parameters.get_strip_metadata ());
-        get_host ().set_config_string ("last-album", parameters.get_target_album_name ());
     }
 
     private void on_service_welcome_login () {
@@ -148,37 +106,6 @@
         do_fetch_account_information ();
     }
 
-    private void on_initial_album_fetch_complete (Publishing.RESTSupport.Transaction txn) {
-        txn.completed.disconnect (on_initial_album_fetch_complete);
-        txn.network_error.disconnect (on_initial_album_fetch_error);
-
-        if (!is_running ())
-            return;
-
-        debug ("EVENT: finished fetching account and album information.");
-
-        do_parse_and_display_account_information ((AlbumDirectoryTransaction) txn);
-    }
-
-    private void on_initial_album_fetch_error (Publishing.RESTSupport.Transaction bad_txn,
-            Spit.Publishing.PublishingError err) {
-        bad_txn.completed.disconnect (on_initial_album_fetch_complete);
-        bad_txn.network_error.disconnect (on_initial_album_fetch_error);
-
-        if (!is_running ())
-            return;
-
-        debug ("EVENT: fetching account and album information failed; response = '%s'.",
-               bad_txn.get_response ());
-
-        if (bad_txn.get_status_code () == 403 || bad_txn.get_status_code () == 404) {
-            do_logout ();
-        } else {
-            // If we get any other kind of error, we can't recover, so just post it to the user
-            get_host ().post_error (err);
-        }
-    }
-
     private void on_publishing_options_logout () {
         if (!is_running ())
             return;
@@ -195,67 +122,9 @@
         debug ("EVENT: user clicked 'Publish' in the publishing options pane.");
 
         save_parameters_to_configuration_system (publishing_parameters);
-
-        if (publishing_parameters.is_to_new_album ()) {
-            do_create_album ();
-        } else {
-            do_upload ();
-        }
-    }
-
-    private void on_album_creation_complete (Publishing.RESTSupport.Transaction txn) {
-        txn.completed.disconnect (on_album_creation_complete);
-        txn.network_error.disconnect (on_album_creation_error);
-
-        if (!is_running ())
-            return;
-
-        debug ("EVENT: finished creating album on remote server.");
-
-        AlbumCreationTransaction downcast_txn = (AlbumCreationTransaction) txn;
-        Publishing.RESTSupport.XmlDocument response_doc;
-        try {
-            response_doc = Publishing.RESTSupport.XmlDocument.parse_string (
-                               downcast_txn.get_response (), AlbumDirectoryTransaction.validate_xml);
-        } catch (Spit.Publishing.PublishingError err) {
-            get_host ().post_error (err);
-            return;
-        }
-
-        Album[] response_albums;
-        try {
-            response_albums = extract_albums_helper (response_doc.get_root_node ());
-        } catch (Spit.Publishing.PublishingError err) {
-            get_host ().post_error (err);
-            return;
-        }
-
-        if (response_albums.length != 1) {
-            get_host ().post_error (new Spit.Publishing.PublishingError.MALFORMED_RESPONSE ("album " +
-                                   "creation transaction responses must contain one and only one album directory " +
-                                   "entry"));
-            return;
-        }
-
-        publishing_parameters.set_target_album_entry_url (response_albums[0].url);
-
         do_upload ();
     }
 
-    private void on_album_creation_error (Publishing.RESTSupport.Transaction bad_txn,
-                                          Spit.Publishing.PublishingError err) {
-        bad_txn.completed.disconnect (on_album_creation_complete);
-        bad_txn.network_error.disconnect (on_album_creation_error);
-
-        if (!is_running ())
-            return;
-
-        debug ("EVENT: creating album on remote server failed; response = '%s'.",
-               bad_txn.get_response ());
-
-        get_host ().post_error (err);
-    }
-
     private void on_upload_status_updated (int file_number, double completed_fraction) {
         if (!is_running ())
             return;
@@ -305,40 +174,6 @@
         get_host ().install_account_fetch_wait_pane ();
         get_host ().set_service_locked (true);
 
-        AlbumDirectoryTransaction directory_trans =
-            new AlbumDirectoryTransaction (get_session ());
-        directory_trans.network_error.connect (on_initial_album_fetch_error);
-        directory_trans.completed.connect (on_initial_album_fetch_complete);
-
-        try {
-            directory_trans.execute ();
-        } catch (Spit.Publishing.PublishingError err) {
-            // don't post the error here -- some errors are recoverable so let's let the error
-            // handler function sort out whether the error is recoverable or not. If the error
-            // isn't recoverable, the error handler will post the error to the host
-            on_initial_album_fetch_error (directory_trans, err);
-        }
-    }
-
-    private void do_parse_and_display_account_information (AlbumDirectoryTransaction transaction) {
-        debug ("ACTION: parsing account and album information from server response XML");
-
-        Publishing.RESTSupport.XmlDocument response_doc;
-        try {
-            response_doc = Publishing.RESTSupport.XmlDocument.parse_string (
-                               transaction.get_response (), AlbumDirectoryTransaction.validate_xml);
-        } catch (Spit.Publishing.PublishingError err) {
-            get_host ().post_error (err);
-            return;
-        }
-
-        try {
-            publishing_parameters.set_albums (extract_albums_helper (response_doc.get_root_node ()));
-        } catch (Spit.Publishing.PublishingError err) {
-            get_host ().post_error (err);
-            return;
-        }
-
         do_show_publishing_options_pane ();
     }
 
@@ -368,27 +203,6 @@
         get_host ().set_service_locked (false);
     }
 
-    private void do_create_album () {
-        assert (publishing_parameters.is_to_new_album ());
-
-        debug ("ACTION: creating new album '%s' on remote server.",
-               publishing_parameters.get_target_album_name ());
-
-        get_host ().install_static_message_pane (_ ("Creating album..."));
-
-        get_host ().set_service_locked (true);
-
-        AlbumCreationTransaction creation_trans = new AlbumCreationTransaction (get_session (),
-                publishing_parameters);
-        creation_trans.network_error.connect (on_album_creation_error);
-        creation_trans.completed.connect (on_album_creation_complete);
-        try {
-            creation_trans.execute ();
-        } catch (Spit.Publishing.PublishingError err) {
-            get_host ().post_error (err);
-        }
-    }
-
     private void do_upload () {
         debug ("ACTION: uploading media items to remote server.");
 
@@ -459,52 +273,6 @@
     }
 }
 
-internal class Album {
-    public string name;
-    public string url;
-
-    public Album (string name, string url) {
-        this.name = name;
-        this.url = url;
-    }
-}
-
-internal class AlbumDirectoryTransaction :
-    Publishing.RESTSupport.GooglePublisher.AuthenticatedTransaction {
-    private const string ENDPOINT_URL = "http://picasaweb.google.com/data/feed/api/user/" +
-                                        "default";
-
-    public AlbumDirectoryTransaction (Publishing.RESTSupport.GoogleSession session) {
-        base (session, ENDPOINT_URL, Publishing.RESTSupport.HttpMethod.GET);
-    }
-
-    public static string? validate_xml (Publishing.RESTSupport.XmlDocument doc) {
-        Xml.Node *document_root = doc.get_root_node ();
-        if ((document_root->name == "feed") || (document_root->name == "entry"))
-            return null;
-        else
-            return "response root node isn't a <feed> or <entry>";
-    }
-}
-
-private class AlbumCreationTransaction :
-    Publishing.RESTSupport.GooglePublisher.AuthenticatedTransaction {
-    private const string ENDPOINT_URL = "http://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>";
-
-    public AlbumCreationTransaction (Publishing.RESTSupport.GoogleSession session,
-                                     PublishingParameters parameters) {
-        base (session, ENDPOINT_URL, Publishing.RESTSupport.HttpMethod.POST);
-
-        string post_body = ALBUM_ENTRY_TEMPLATE.printf (Publishing.RESTSupport.decimal_entity_encode (
-                               parameters.get_target_album_name ()), parameters.is_new_album_public () ?
-                           "public" : "private");
-
-        set_custom_payload (post_body, "application/atom+xml");
-    }
-}
-
 internal class UploadTransaction :
     Publishing.RESTSupport.GooglePublisher.AuthenticatedTransaction {
     private PublishingParameters parameters;
@@ -516,7 +284,7 @@
 
     public UploadTransaction (Publishing.RESTSupport.GoogleSession session,
                               PublishingParameters parameters, Spit.Publishing.Publishable publishable) {
-        base (session, parameters.get_target_album_feed_url (),
+        base (session, "https://picasaweb.google.com/data/feed/api/user/default/albumid/default",
               Publishing.RESTSupport.HttpMethod.POST);
         assert (session.is_authenticated ());
         this.session = session;
@@ -614,12 +382,6 @@
     private Gtk.Builder builder = null;
     private Gtk.Box pane_widget = null;
     private Gtk.Label login_identity_label = null;
-    private Gtk.Label publish_to_label = null;
-    private Gtk.RadioButton use_existing_radio = null;
-    private Gtk.ComboBoxText existing_albums_combo = null;
-    private Gtk.RadioButton create_new_radio = null;
-    private Gtk.Entry new_album_entry = null;
-    private Gtk.CheckButton public_check = null;
     private Gtk.ComboBoxText size_combo = null;
     private Gtk.CheckButton strip_metadata_check = null;
     private Gtk.Button publish_button = null;
@@ -642,12 +404,6 @@
         // pull in all widgets from builder.
         pane_widget = (Gtk.Box) builder.get_object ("picasa_pane_widget");
         login_identity_label = (Gtk.Label) builder.get_object ("login_identity_label");
-        publish_to_label = (Gtk.Label) builder.get_object ("publish_to_label");
-        use_existing_radio = (Gtk.RadioButton) builder.get_object ("use_existing_radio");
-        existing_albums_combo = (Gtk.ComboBoxText) builder.get_object ("existing_albums_combo");
-        create_new_radio = (Gtk.RadioButton) builder.get_object ("create_new_radio");
-        new_album_entry = (Gtk.Entry) builder.get_object ("new_album_entry");
-        public_check = (Gtk.CheckButton) builder.get_object ("public_check");
         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");
@@ -660,11 +416,9 @@
 
 
         if ((parameters.get_media_type () & Spit.Publishing.Publisher.MediaType.PHOTO) == 0) {
-            publish_to_label.set_label (_ ("Videos will appear in:"));
             size_combo.set_visible (false);
             size_combo.set_sensitive (false);
         } else {
-            publish_to_label.set_label (_ ("Photos will appear in:"));
             foreach (SizeDescription desc in size_descriptions) {
                 size_combo.append_text (desc.name);
             }
@@ -674,9 +428,6 @@
         }
 
         // connect all signals.
-        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);
     }
@@ -691,52 +442,13 @@
         parameters.set_major_axis_size_pixels (
             size_descriptions[size_combo_last_active].major_axis_pixels);
         parameters.set_strip_metadata (strip_metadata_check.get_active ());
-
-        Album[] albums = parameters.get_albums ();
-
-        if (create_new_radio.get_active ()) {
-            parameters.set_target_album_name (new_album_entry.get_text ());
-            parameters.set_is_to_new_album (true);
-            parameters.set_is_new_album_public (public_check.get_active ());
-            publish ();
-        } else {
-            parameters.set_target_album_name (albums[existing_albums_combo.get_active ()].name);
-            parameters.set_is_to_new_album (false);
-            parameters.set_target_album_entry_url (albums[existing_albums_combo.get_active ()].url);
-            publish ();
-        }
-    }
-
-    private void on_use_existing_radio_clicked () {
-        existing_albums_combo.set_sensitive (true);
-        new_album_entry.set_sensitive (false);
-        existing_albums_combo.grab_focus ();
-        update_publish_button_sensitivity ();
-        public_check.set_sensitive (false);
-    }
-
-    private void on_create_new_radio_clicked () {
-        new_album_entry.set_sensitive (true);
-        existing_albums_combo.set_sensitive (false);
-        new_album_entry.grab_focus ();
-        update_publish_button_sensitivity ();
-        public_check.set_sensitive (true);
+        publish ();
     }
 
     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 () == "" &&
-                                         create_new_radio.get_active ()));
-    }
-
-    private void on_new_album_entry_changed () {
-        update_publish_button_sensitivity ();
-    }
-
     private SizeDescription[] create_size_descriptions () {
         SizeDescription[] result = new SizeDescription[0];
 
@@ -749,42 +461,6 @@
         return result;
     }
 
-    public void installed () {
-        int default_album_id = -1;
-        string last_album = parameters.get_target_album_name ();
-
-        Album[] albums = parameters.get_albums ();
-
-        for (int i = 0; i < albums.length; i++) {
-            existing_albums_combo.append_text (albums[i].name);
-            if (albums[i].name == last_album ||
-                    (albums[i].name == DEFAULT_ALBUM_NAME && default_album_id == -1))
-                default_album_id = i;
-        }
-
-        if (albums.length == 0) {
-            existing_albums_combo.set_sensitive (false);
-            use_existing_radio.set_sensitive (false);
-            create_new_radio.set_active (true);
-            new_album_entry.grab_focus ();
-            new_album_entry.set_text (DEFAULT_ALBUM_NAME);
-        } else {
-            if (default_album_id >= 0) {
-                use_existing_radio.set_active (true);
-                existing_albums_combo.set_active (default_album_id);
-                new_album_entry.set_sensitive (false);
-                public_check.set_sensitive (false);
-            } else {
-                create_new_radio.set_active (true);
-                existing_albums_combo.set_active (0);
-                new_album_entry.set_text (DEFAULT_ALBUM_NAME);
-                new_album_entry.grab_focus ();
-                public_check.set_sensitive (true);
-            }
-        }
-        update_publish_button_sensitivity ();
-    }
-
     public Gtk.Widget get_widget () {
         return pane_widget;
     }
@@ -794,7 +470,7 @@
     }
 
     public void on_pane_installed () {
-        installed ();
+        
     }
 
     public void on_pane_uninstalled () {
@@ -804,67 +480,18 @@
 internal class PublishingParameters {
     public const int ORIGINAL_SIZE = -1;
 
-    private string? target_album_name;
-    private string? target_album_url;
-    private bool album_public;
     private bool strip_metadata;
     private int major_axis_size_pixels;
     private int major_axis_size_selection_id;
     private string user_name;
-    private Album[] albums;
     private Spit.Publishing.Publisher.MediaType media_type;
-    private bool to_new_album;
 
     public PublishingParameters () {
         this.user_name = "[unknown]";
-        this.target_album_name = null;
         this.major_axis_size_selection_id = 0;
         this.major_axis_size_pixels = ORIGINAL_SIZE;
-        this.target_album_url = null;
-        this.album_public = false;
-        this.albums = null;
         this.strip_metadata = false;
         this.media_type = Spit.Publishing.Publisher.MediaType.PHOTO;
-        this.to_new_album = true;
-    }
-
-    public bool is_to_new_album () {
-        return to_new_album;
-    }
-
-    public void set_is_to_new_album (bool to_new_album) {
-        this.to_new_album = to_new_album;
-    }
-
-    public void set_is_new_album_public (bool album_public) {
-        this.album_public = album_public;
-    }
-
-    public bool is_new_album_public () {
-        return album_public;
-    }
-
-    public string get_target_album_name () {
-        return target_album_name;
-    }
-
-    public void set_target_album_name (string target_album_name) {
-        this.target_album_name = target_album_name;
-    }
-
-    public void set_target_album_entry_url (string target_album_url) {
-        this.target_album_url = target_album_url;
-    }
-
-    public string get_target_album_entry_url () {
-        return target_album_url;
-    }
-
-    public string get_target_album_feed_url () {
-        string entry_url = get_target_album_entry_url ();
-        string feed_url = entry_url.replace ("entry", "feed");
-
-        return feed_url;
     }
 
     public string get_user_name () {
@@ -875,14 +502,6 @@
         this.user_name = user_name;
     }
 
-    public Album[] get_albums () {
-        return albums;
-    }
-
-    public void set_albums (Album[] albums) {
-        this.albums = albums;
-    }
-
     public void set_major_axis_size_pixels (int pixels) {
         this.major_axis_size_pixels = pixels;
     }

=== modified file 'plugins/pantheon-photos-publishing/RESTSupport.vala'
--- plugins/pantheon-photos-publishing/RESTSupport.vala	2016-01-14 12:35:35 +0000
+++ plugins/pantheon-photos-publishing/RESTSupport.vala	2016-07-30 17:14:55 +0000
@@ -1138,7 +1138,7 @@
             do_exchange_refresh_token_for_access_token ();
         } else {
             if (WebAuthenticationPane.is_cache_dirty ()) {
-                host.install_static_message_pane (_ ("You have already logged in and out of a Google service during this Shotwell session.\n\nTo continue publishing to Google services, quit and restart Shotwell, then try publishing again."));
+                host.install_static_message_pane (_ ("You have already logged in and out of a Google service during this session.\n\nTo continue publishing to Google services, quit and restart this software, then try publishing again."));
                 return;
             }
 

=== added file 'plugins/pantheon-photos-publishing/google-photos.svg'
--- plugins/pantheon-photos-publishing/google-photos.svg	1970-01-01 00:00:00 +0000
+++ plugins/pantheon-photos-publishing/google-photos.svg	2016-07-30 17:14:55 +0000
@@ -0,0 +1,146 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xml:space="preserve"
+   height="96"
+   width="96"
+   version="1.1"
+   y="0px"
+   x="0px"
+   viewBox="0 0 96 96"
+   enable-background="new 0 0 96 96"
+   id="svg2"><metadata
+     id="metadata86"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+     id="defs84" /><g
+     id="g4"><defs
+       id="defs6"><path
+         d="M 95,48 73,48 73,23 49.71,0.3 C 49.53,0.11 49.28,0 49,0 48.45,0 48,0.45 48,1 L 48,23 23,23 0.3,46.29 C 0.11,46.47 0,46.72 0,47 c 0,0.55 0.45,1 1,1 l 22,0 0,25 23.29,22.7 c 0.18,0.19 0.43,0.3 0.71,0.3 0.55,0 1,-0.45 1,-1 L 48,73 73,73 95.7,49.71 C 95.89,49.53 96,49.28 96,49 96,48.45 95.55,48 95,48 Z"
+         id="path8" /></defs><clipPath
+       id="clipPath10"><use
+         height="100%"
+         width="100%"
+         y="0"
+         x="0"
+         style="overflow:visible"
+         overflow="visible"
+         xlink:href="#SVGID_63_"
+         id="use12" /></clipPath><radialGradient
+       gradientUnits="userSpaceOnUse"
+       cy="23"
+       cx="22.860001"
+       r="77.190002"
+       id="radialGradient74"><stop
+         stop-color="#fff"
+         offset="0"
+         id="stop76" /><stop
+         stop-color="#fff"
+         stop-opacity="0"
+         offset="1"
+         id="stop78" /></radialGradient><g
+       transform="translate(-21.152542,61.830508)"
+       id="g4284"><g
+         id="g14"
+         clip-path="url(#SVGID_2_)"
+         transform="translate(21.152542,-61.830508)"><path
+           style="fill:#4285f4"
+           id="path16"
+           d="M 95.7,49.71 C 95.89,49.53 96,49.28 96,49 96,48.45 95.55,48 95,48 l -47,0 0,25 25,0 22.7,-23.29 z" /><image
+           style="overflow:visible;opacity:0.2"
+           id="image18"
+           overflow="visible"
+           width="37"
+           height="38"
+           transform="translate(44,44)"
+           xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACUAAAAmCAYAAABDClKtAAAACXBIWXMAAAsSAAALEgHS3X78AAAA GXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAABNJJREFUeNrMmEtv20YQx2dml6Qe kfyUk9RFoaY+RafCyD1A0I+gez+Kv0+O/QK+G4FPziGHIEDTtKlQ144smRK5M/2TUhw7duIngwqg uCT38duZ2dmZJfof/viK7+xbQvkLgJj6/U9gz3sA2vqmcO4s0BY/fUriX73ybe/d4njs1ps73Ov1 +M2bX1Fl+5uqrwTa3PzN/UkU1XDV09hRm+h4Og1LRFmapvne48eBnj/XqiX2UVKFhNzvgFkcuTpe N7Xm7mWZNRLz8Sj3EpoRLb929uzZz/by5cvK1ce0tcXNnR3HUZSEYPd8LEtB8yXH1jbhOrM5yYRC 44P+kef2y5MnlYKVUP1OR97A6OMsq0mgBWVdZXZrxrxipC1RiYgDmWO1cazvdFwpmHwsrAyHMmH2 KlRXkkUzui9mP7DKjzC4LjleZ3WdpsvbdEC1ncEg6vf78gUXcntJra2tyWjU8mTDOvlkiZQeQGXf MdNDfF4itkZR14yNKWgiHLJjCVVJrITqdrtydBSirG51y3SJme9j+BkU8yobNXGPizXHBBVSCFWC yRm3rcrOiUAfEbPWoEI4BVsFyTqAugD7CertQmLrwbLKVCnn9pNCR8QCoUR4rAGmjXIH5XV86IpS 5WBy4VuMiN9MYnMwjNUpJKZcPZh8zdufSIwBRlaosoPRKgeTr3+GxACGe6lKjFKqsmowuayCAQwG LihEVoJZ5WBypVpWeIKyLiTGlYPJNeoWHc9XZbVgck3JwsaqB5Mb2GHlYHLDVVspmNzCx1UGJrfc ESoBkzvYP+8c7C6grg0ml4D5r7pMKoK6YntGEGNlBmOXODKe9ckJCq1yn6KicdnatIhB8IxQTDma mA3Vdt++NeSZ+eksyZ+fcrkPo0IoYhgEdCiQBXwJ/OUM+vNseu79ERyiPTiKtgFvcy76CrizBOFa LkkrbL5+rS8+TdhO1OdcbCximISqFRCUodYUlJPyIkuBk+L9ZRfqol0BMQuDYvy3ALXCSg+LiBaz fYDAaNnySSs0x8k/rZbrn8rKz0jKTaeqvp4j2p0AaAyIIXo95FnAUOMylDG+2nZZVlT8ZYWUoDdf xvrMbYAtYtptZX8gGR81B4PJgCg/A9XpdGwyeasjruc+BZDKkTjdhw7/mtf7gM7juVr4qhtlYZMI LwoTyND+GM8jmERebPBYAB7a9CFGBNJY5OFwyPNmVkL1ej3b3T3S7MEww7uxMO9j/HfFVCHyQ2Nt QEqI2+1aq1Xn1g07xfw0A9Ax+jnEGAcIOsYFrJt69UeIimrpubME2dzcdGmaJtRo3JvksixssAFe hmxaJJIgqXBGiJDN+BqOwmaDQFjIcMnztAQz+qCO95GN/+t4ejCO49FGkmTb29thtmJP4PqysbHr aWUlSVQbE42azkLT1CXKuXeGVeCMb+bEYEU5Wy4wWUgnD5p6dqNMZVwL8ZhoMN3bg1ugLTsNRfNz KdnY3fVJ8n0kkkdj1sg79iHkyJtnKdiNvSvmJCnm5b1mSnluLmvrfhZCyD4/zeFztgkw+A05PFyT tHMgy6NRaUchLN86dXJu36IosvdxbLXBoi4s/K0vHj3SORBdBHX2NK84vevv8dPB4M7PCrax2k+d EJ7bKfia56F3/btw2/pPgAEAo6srCUabVPkAAAAASUVORK5CYII=" /><polygon
+           style="fill:#3367d6"
+           id="polygon20"
+           points="48,73 73,73 48,48 " /><path
+           style="fill:#263238;fill-opacity:0.2"
+           id="path22"
+           d="M 73,73 95.7,49.71 C 95.89,49.53 96,49.28 96,49 c 0,-0.09 -0.03,-0.17 -0.05,-0.25 -0.05,0.17 -0.12,0.34 -0.24,0.46 L 73,72.5 l -25,0 0,0.5 25,0 z" /><polygon
+           style="fill:#263238;fill-opacity:0.1"
+           id="polygon24"
+           points="48,48 48,48.5 72.5,73 73,73 " /><path
+           style="fill:#ffffff;fill-opacity:0.2"
+           id="path26"
+           d="M 95.95,49.25 C 95.97,49.17 96,49.09 96,49 96,48.45 95.55,48 95,48 l -47,0 0,0.5 47,0 c 0.46,0 0.84,0.32 0.95,0.75 z" /></g><g
+         id="g28"
+         clip-path="url(#SVGID_2_)"
+         transform="translate(21.152542,-61.830508)"><path
+           style="fill:#8bc34a"
+           id="path32"
+           d="m 46.29,95.7 c 0.18,0.19 0.43,0.3 0.71,0.3 0.55,0 1,-0.45 1,-1 l 0,-47 -25,0 0,25 23.29,22.7 z" /><image
+           style="overflow:visible;opacity:0.2"
+           id="image34"
+           overflow="visible"
+           width="37"
+           height="38"
+           transform="translate(17,42)"
+           xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACUAAAAmCAYAAABDClKtAAAACXBIWXMAAAsSAAALEgHS3X78AAAA GXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAABRpJREFUeNrMmN1OG0cUx8+Zmd01 Bupg6jZNclOUqlIiVYpQ77nvNfe962vwFH2C3PES3FZRlSunqpQiUhqgMRjwxvZ+zMzpf9YOgQbC R9iqRoOXY++ZH+d7luniF1P9L7nqxjxZa0SrXV7p9W4dbqPTEVp/LNUeEzC5CGpyvbqqljc31fHx FyrrHKn2cKiC2Ln2J8Np3ZcoiuTvOJZG745vtd74X5eWPK2v+9OWOwsFoIfPn5skeRApZaMR+8ho Ns5ZRTO4w/sbg7FSojIl2hhferJWdPmZ75fOubL76JGbgp2BwjuAHj43tLiYJN43cx/NanGz4nXi 2Rot0KrlRlDMLGxZrPLeEJXW+cywHpZejRouHhH1im531cKdlSvfbaKWl5d1lmUJNZtzuVVtxbLI ntukaJ6USmAlLaSY5BpggJn8x17IsyfDBSRjrIHX3HdODjUXR6M4Hj5MknJjY8MFKBPuWVtbo6dP f1HF3TSKRm5OEX8OqAdO0z2oaov4JhNHkKnr5KQP3gi/WHlRvmQnY2x3LCQ9dorhCUA2Rq1BlKWN 1E49V0FRt9vlDoL6jefIkG9aUW1N/h6M/jW+dhdA81Afw7DqlHUvNxRBAwvMJCX+GuPOAcRvoKKE 7AjKIhcjXpv4avb+vgqqh7QfDueV0T0jZiZhcnOIujY+uot1H6sFkzeYSckV65dU9HA6Ygg3ZMFl YHRwadhToMh6MVYX7M3bI5kPZWIa6Oa0IhfHyhTWeNIJs2+KIJ6YW/ivFqAwAY4OzrgKEwfHBSCB DRjvTBZSBDXiKVhJ80CXdgT758NWxz6aQNEZKBfci5QXrZXyrCGKoDgWAQyFxQ0A6StUeqEpULWY C4hSCA+QNLu43kEC7cGpfWWSVA11vuhSt76xcQKlPtCI7EJgqyp1mBXSWVeLKqDLlppCv4MaYvVh oT0YeFs8vfLC28i8Pav9YU6jUZ7/VVYF9FRlNx/vfcJVDMm71nOyzrXQJI7gJpIct6S43ofrd0D6 Ch9sIo5eQdlOIebA2ySlO5QvLy3Zl6cK57mWumljDcnPlXUkA9AA1z3IXgNkC3b/Q3nagu1fa456 3pkBgLLvO51y/V9AtwV1LaDhJUC3AXXrQJ8KVQvQp0DVBnRTqFqBLisJH0v72oCuC1VV6mkdqg3o 6lChfHr8cKjUVWGsDehKMRXGDzjNV00V3b5uoCtYCm0Q4wfeq+YK7cNJ66gP6DKoah6qYKrxI3R7 6le9rEagi6Gwk1TzWWWhah4K40fo9qG51gl0LlQ4eYQY4om7AtAAEhvmIZhuu+r2NQJ9ABXOZq7A pMeqxMCasZIBAtsBcoiU2MOhZKsaP2oEOgOldSy6OMbYPGPFSo4YTyHexzaHsM4x9nuNoW87zEN1 Ap1AdTAfp+mmpCZ2UWELHFrewm4HAHChpSjhPiZ9jLK0pynarxPojKUO5ud9YzSyKI9j0v6IWGv4 cSDsS3HqkJzsi/H9YdlI6wQ6KZ7rjx/LbK/nLXNpceLQyhx68Xs4SWwrUn9iKN4hr/eRkIO6gc48 S1hZWdEv8zxqDWimNDRDsU6ccyrGwbFwOGrPuIwO2vmTJ3O2TiCankAqqK2tH+mbL3+jnnGilHPJ WBVmlsaZL8YLGkCjUfH7d/fdi5qBTkOFR1m0u/uTLH+761O4Mv+qbUtjyuZgUC4sLNhnz35w9OJn qRvovCd5PH1O9V4+eeImH3scWDfURbL/BOZ//fpHgAEAH/AR7cEXvmwAAAAASUVORK5CYII=" /><polygon
+           style="fill:#0f9d58"
+           id="polygon36"
+           points="23,73 48,48 23,48 " /><path
+           style="fill:#3e2723;fill-opacity:0.1"
+           id="path38"
+           d="m 47,95.5 c -0.28,0 -0.53,-0.11 -0.71,-0.3 L 23.25,72.75 23,73 46.29,95.7 c 0.18,0.19 0.43,0.3 0.71,0.3 0.55,0 1,-0.45 1,-1 l 0,-0.5 c 0,0.55 -0.45,1 -1,1 z" /><polygon
+           style="fill:#3e2723;fill-opacity:0.05"
+           id="polygon40"
+           points="48,48.5 47.5,48.5 23,73 23,73.5 " /></g><g
+         id="g42"
+         clip-path="url(#SVGID_2_)"
+         transform="translate(21.152542,-61.830508)"><path
+           style="fill:#ffbc00"
+           id="path46"
+           d="M 0.3,46.29 C 0.11,46.47 0,46.72 0,47 c 0,0.55 0.45,1 1,1 L 48,48 48,23 23,23 0.3,46.29 Z" /><image
+           style="overflow:visible;opacity:0.2"
+           id="image48"
+           overflow="visible"
+           width="34"
+           height="35"
+           transform="translate(19.5,18.5)"
+           xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACMAAAAkCAYAAAAD3IPhAAAACXBIWXMAAAsSAAALEgHS3X78AAAA GXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA9ZJREFUeNrMmFtvEzsQgGfGzm4u mwKBJgKKEEKnErz2D/Sn88YTT7xxXhBNqXqhSZvmsvHac8ZZbxoQaUOypMeSY8e3+Ty+zSzCzwEP 5Wf/AOCo/Q+Oxy+h7FCrHcOrs3/5yyeAD3kRz4UXGYHAwYsXFBFR0iBK4xqCIawwY1kgBpGh4jhO x3x1Y93QGFc9O3OfAhAWILu7u9RrNitjokgjxlIs3ZgIGYlgYyCHwM75wdARsLHMU2YzrZ4PTK/X sx5Ie6B0bw+v4lhbtHUBeSSYjwA5AYJY8mQxh2FYT0vSPZ85ggMPATyUSfadoivYbQ6blQqDaMjD wDSKaIJYAUWJKKHNzHsiti2Sm1IdMYMKw+KaKuI8spV0JJlzmVfX68iiMqpVzw7fv89hVJoiNWIl LUUT/Fim8lKEvpGqtsRE8hVJaXGP/SmMdJQ5sZEhruX/N08nizZgxGuq1SZv9/chh5FNUVHEsqi+ g2/my5MA80xiA26BYA0oGVeWCHAq+V4Y4Fx+voGcEbQWj46OZkIh3tlxSqkM07Go0PWl6CJ06vBs qaG2IZCfocBAGrruSFFdRohQDgkbI9fIeKYZHlSrvqGByWQoDT2xCGcfq7L5/MlajOsAFTA+RGEM JaXkV9CFgzHbmCcnJ5gpxTWt5Xj5bQWZiLFBngoDFCA69Cv2UJHeFyEAjYPmu4x8TIwXiGrESZLp grzb7cLTTidrNhoj1jMS9CvEtxqY5TFP/ZJJq7mG7j/dywHnQS+q8snpqXve6Zj+s8ZoJMTW/nxf Y8iHtMG3QKXc0osw/q3gQwF6BR0DHkhtF0j/WvCQQPp3hQ8FpJdVPASQvqty20D6vgbbBNKrNNoW kF614YZA5cKUAMSlwqwLtCCHS4VZB0hCvXiU7wLS615Qfwj0lHObyOEdQHqT63tVoPDUPwny3DIN bQSzKhDw3LhKZkZcACq8hiKoMp7+rxJbwyF0KGLbqDiLaMTo9UKzINifJu3dHlGSt4MvheRYYlcq LhDU2BtXpcCsCORtaQya6UvuRNJjcnihSI1cktjSYO4C4hzAzo1yhJ6UeZjvhHSpongctVrlwiwD coBG9scUc+9gJOklzmD4FIj7Kqqlr9+9Kx/md0ApUyZbOJV18sb4tYD98F6IuAU/MusGKZC5mkzc X4H5FWgQxeKmOaM8DJJ4keB9s75yOIgcTIY3N/bj58/812AWgdJ63UWtqSXUBpy49c6N2OEoZp48 HgyyTK6GrwDlfXu5z1U5OADxEdsE1zE1nAMbxxxNpy7udvnD4veZLQZc4m3+/8J/AgwA3MF+EysI U+8AAAAASUVORK5CYII=" /><polygon
+           style="fill:#ff9800"
+           id="polygon50"
+           points="48,23 23,23 48,48 " /><path
+           style="fill:#ffffff;fill-opacity:0.2"
+           id="path52"
+           d="M 23,23 0.3,46.29 C 0.11,46.47 0,46.72 0,47 0,47.09 0.03,47.17 0.05,47.25 0.1,47.08 0.17,46.91 0.29,46.79 L 23,23.5 l 25,0 0,-0.5 -25,0 z" /><path
+           style="fill:#3e2723;fill-opacity:0.05"
+           id="path54"
+           d="M 0.05,47.25 C 0.03,47.33 0,47.41 0,47.5 c 0,0.55 0.45,1 1,1 l 47,0 L 48,48 1,48 C 0.54,48 0.16,47.68 0.05,47.25 Z" /><polygon
+           style="fill:#3e2723;fill-opacity:0.1"
+           id="polygon56"
+           points="48,48 48,47.5 23.5,23 23,23 " /></g><g
+         id="g58"
+         clip-path="url(#SVGID_2_)"
+         transform="translate(21.152542,-61.830508)"><path
+           style="fill:#db4437"
+           id="path60"
+           d="M 49.71,0.3 C 49.53,0.11 49.28,0 49,0 48.45,0 48,0.45 48,1 L 48,48 73,48 73,23 49.71,0.3 Z" /><path
+           style="fill:#ffffff;fill-opacity:0.2"
+           id="path62"
+           d="M 49.71,0.3 C 49.53,0.11 49.28,0 49,0 48.45,0 48,0.45 48,1 l 0,0.5 c 0,-0.55 0.45,-1 1,-1 0.28,0 0.53,0.11 0.71,0.3 L 72.49,23.01 73,23 49.71,0.3 Z" /><polygon
+           style="fill:#ad1457"
+           id="polygon64"
+           points="73,23 48,48 73,48 " /><g
+           style="opacity:0.2"
+           id="g66"><polygon
+             style="fill:#ffffff"
+             id="polygon68"
+             points="48,47.5 48.5,47.5 73,23 72.49,23.01 " /></g><rect
+           style="fill:#3e2723;fill-opacity:0.1"
+           id="rect70"
+           x="48"
+           y="47.5"
+           width="25"
+           height="0.5" /><polygon
+           style="fill:#f1f1f1"
+           id="polygon72"
+           points="45,45 48,38 51,45 58,48 51,51 48,58 45,51 38,48 " /></g></g></g></svg>
\ No newline at end of file

=== modified file 'plugins/pantheon-photos-publishing/picasa_publishing_options_pane.ui'
--- plugins/pantheon-photos-publishing/picasa_publishing_options_pane.ui	2016-01-29 03:10:35 +0000
+++ plugins/pantheon-photos-publishing/picasa_publishing_options_pane.ui	2016-07-30 17:14:55 +0000
@@ -1,235 +1,103 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.18.3 -->
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
+  <requires lib="gtk+" version="3.0"/>
   <object class="GtkBox" id="picasa_pane_widget">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
+    <property name="halign">center</property>
+    <property name="margin_left">12</property>
+    <property name="margin_right">12</property>
+    <property name="margin_top">12</property>
+    <property name="margin_bottom">12</property>
+    <property name="vexpand">True</property>
     <property name="orientation">vertical</property>
-    <property name="spacing">1</property>
-    <child>
-      <placeholder/>
-    </child>
+    <property name="spacing">12</property>
     <child>
       <object class="GtkLabel" id="login_identity_label">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="margin_top">12</property>
-        <property name="margin_bottom">32</property>
         <property name="label" translatable="yes">'you are logged in as $name'
 (populated in the application code)</property>
-      </object>
-      <packing>
-        <property name="expand">False</property>
-        <property name="fill">True</property>
-        <property name="padding">4</property>
+        <style>
+          <class name="h3"/>
+        </style>
+      </object>
+      <packing>
+        <property name="expand">False</property>
+        <property name="fill">True</property>
+        <property name="position">0</property>
+      </packing>
+    </child>
+    <child>
+      <object class="GtkGrid" id="album_choice_area_grid">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="row_spacing">6</property>
+        <property name="column_spacing">12</property>
+        <property name="column_homogeneous">True</property>
+        <child>
+          <object class="GtkCheckButton" id="strip_metadata_check">
+            <property name="label" translatable="yes">_Remove location, camera, and other identifying information before uploading</property>
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="receives_default">False</property>
+            <property name="halign">center</property>
+            <property name="hexpand">True</property>
+            <property name="use_underline">True</property>
+            <property name="xalign">0.20000000298023224</property>
+            <property name="draw_indicator">True</property>
+          </object>
+          <packing>
+            <property name="left_attach">0</property>
+            <property name="top_attach">1</property>
+            <property name="width">2</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkComboBoxText" id="size_combo">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+          </object>
+          <packing>
+            <property name="left_attach">1</property>
+            <property name="top_attach">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkLabel" id="label1">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="label" translatable="yes">Photo _size preset:</property>
+            <property name="use_underline">True</property>
+            <property name="mnemonic_widget">size_combo</property>
+            <property name="xalign">1</property>
+          </object>
+          <packing>
+            <property name="left_attach">0</property>
+            <property name="top_attach">0</property>
+          </packing>
+        </child>
+      </object>
+      <packing>
+        <property name="expand">False</property>
+        <property name="fill">True</property>
+        <property name="padding">3</property>
         <property name="position">1</property>
       </packing>
     </child>
     <child>
-      <object class="GtkBox" id="album_gallery_layout_box">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="margin_left">32</property>
-        <property name="margin_right">32</property>
-        <property name="orientation">vertical</property>
-        <child>
-          <placeholder/>
-        </child>
-        <child>
-          <object class="GtkGrid" id="album_choice_area_grid">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="margin_left">24</property>
-            <property name="margin_right">24</property>
-            <property name="row_spacing">8</property>
-            <property name="column_homogeneous">True</property>
-            <child>
-              <object class="GtkComboBoxText" id="existing_albums_combo">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="entry_text_column">0</property>
-                <property name="id_column">1</property>
-              </object>
-              <packing>
-                <property name="left_attach">1</property>
-                <property name="top_attach">1</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkEntry" id="new_album_entry">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="invisible_char">•</property>
-              </object>
-              <packing>
-                <property name="left_attach">1</property>
-                <property name="top_attach">2</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkRadioButton" id="use_existing_radio">
-                <property name="label" translatable="yes">An _existing album:</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">False</property>
-                <property name="use_underline">True</property>
-                <property name="xalign">0</property>
-                <property name="active">True</property>
-                <property name="draw_indicator">True</property>
-                <property name="group">create_new_radio</property>
-              </object>
-              <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">1</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkRadioButton" id="create_new_radio">
-                <property name="label" translatable="yes">A _new album named:</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">False</property>
-                <property name="use_underline">True</property>
-                <property name="xalign">0</property>
-                <property name="yalign">0.47999998927116394</property>
-                <property name="active">True</property>
-                <property name="draw_indicator">True</property>
-              </object>
-              <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">2</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkCheckButton" id="public_check">
-                <property name="label" translatable="yes">L_ist album in public gallery</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">False</property>
-                <property name="use_underline">True</property>
-                <property name="xalign">0</property>
-                <property name="draw_indicator">True</property>
-              </object>
-              <packing>
-                <property name="left_attach">1</property>
-                <property name="top_attach">3</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkLabel" id="publish_to_label">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="margin_top">32</property>
-                <property name="xalign">0</property>
-                <property name="label" translatable="yes">$mediatype will appear in
-(populated in code)</property>
-              </object>
-              <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">0</property>
-                <property name="width">2</property>
-                <property name="height">1</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkLabel" id="label1">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="margin_top">32</property>
-                <property name="xalign">0</property>
-                <property name="label" translatable="yes">Photo _size preset:</property>
-                <property name="use_underline">True</property>
-                <property name="mnemonic_widget">size_combo</property>
-              </object>
-              <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">4</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkComboBoxText" id="size_combo">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="margin_top">32</property>
-                <property name="entry_text_column">0</property>
-                <property name="id_column">1</property>
-              </object>
-              <packing>
-                <property name="left_attach">1</property>
-                <property name="top_attach">4</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkCheckButton" id="strip_metadata_check">
-                <property name="label" translatable="yes">_Remove location, camera, and other identifying information before uploading</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">False</property>
-                <property name="halign">center</property>
-                <property name="margin_top">16</property>
-                <property name="hexpand">True</property>
-                <property name="use_underline">True</property>
-                <property name="xalign">0.20000000298023224</property>
-                <property name="draw_indicator">True</property>
-              </object>
-              <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">5</property>
-                <property name="width">2</property>
-                <property name="height">1</property>
-              </packing>
-            </child>
-            <child>
-              <placeholder/>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="padding">4</property>
-            <property name="position">1</property>
-          </packing>
-        </child>
-      </object>
-      <packing>
-        <property name="expand">False</property>
-        <property name="fill">True</property>
-        <property name="position">2</property>
-      </packing>
-    </child>
-    <child>
-      <placeholder/>
-    </child>
-    <child>
-      <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="margin_top">48</property>
-        <property name="margin_bottom">24</property>
-        <property name="spacing">128</property>
-        <property name="homogeneous">True</property>
+      <object class="GtkButtonBox" id="button_area_box">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="layout_style">start</property>
         <child>
           <object class="GtkButton" id="logout_button">
             <property name="label" translatable="yes">_Logout</property>
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="receives_default">True</property>
+            <property name="halign">start</property>
             <property name="use_underline">True</property>
           </object>
           <packing>
@@ -244,19 +112,26 @@
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="receives_default">True</property>
+            <property name="halign">end</property>
             <property name="use_underline">True</property>
+            <style>
+              <class name="suggested-action"/>
+            </style>
           </object>
           <packing>
             <property name="expand">False</property>
             <property name="fill">True</property>
+            <property name="pack_type">end</property>
             <property name="position">1</property>
+            <property name="secondary">True</property>
           </packing>
         </child>
       </object>
       <packing>
         <property name="expand">False</property>
         <property name="fill">True</property>
-        <property name="position">4</property>
+        <property name="pack_type">end</property>
+        <property name="position">2</property>
       </packing>
     </child>
   </object>

=== modified file 'schemas/org.pantheon.photos.gschema.xml'
--- schemas/org.pantheon.photos.gschema.xml	2016-01-14 12:35:35 +0000
+++ schemas/org.pantheon.photos.gschema.xml	2016-07-30 17:14:55 +0000
@@ -403,12 +403,6 @@
         <summary>default size</summary>
         <description>A numeric code representing the default size for photos uploaded to Picasa Web Albums</description>
     </key>
-    
-    <key name="last-album" type="s">
-        <default>""</default>
-        <summary>last album</summary>
-        <description>The name of the last album the user published photos to, if any</description>
-    </key>
 
     <key name="strip-metadata" type="b">
         <default>false</default>