summaryrefslogtreecommitdiff
path: root/plugins/shotwell-publishing-extras/TumblrPublishing.vala
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2016-11-25 04:11:58 +0100
committerJörg Frings-Fürst <debian@jff-webhosting.net>2016-11-25 04:11:58 +0100
commitccff5442184e84d511c2bd25ed3da53e4336a272 (patch)
tree8402a0ba68852e0aec5841ed4519ccfe88352223 /plugins/shotwell-publishing-extras/TumblrPublishing.vala
parenta1e1833f48ed618273dab9198b547148a89832a7 (diff)
parent4a3f1fdfe1eb3743564adcee35d5513224339260 (diff)
Merge tag 'upstream/0.25.1'
Upstream version 0.25.1
Diffstat (limited to 'plugins/shotwell-publishing-extras/TumblrPublishing.vala')
-rw-r--r--plugins/shotwell-publishing-extras/TumblrPublishing.vala9
1 files changed, 5 insertions, 4 deletions
diff --git a/plugins/shotwell-publishing-extras/TumblrPublishing.vala b/plugins/shotwell-publishing-extras/TumblrPublishing.vala
index bc6fcec..183bc31 100644
--- a/plugins/shotwell-publishing-extras/TumblrPublishing.vala
+++ b/plugins/shotwell-publishing-extras/TumblrPublishing.vala
@@ -308,7 +308,7 @@ public class TumblrPublisher : Spit.Publishing.Publisher, GLib.Object {
if (split_pair.length != 2)
host.post_error(new Spit.Publishing.PublishingError.MALFORMED_RESPONSE(
- _("“%s” isn’t a valid response to an OAuth authentication request")));
+ _("“%s” isn’t a valid response to an OAuth authentication request"), response));
if (split_pair[0] == "oauth_token")
oauth_token = split_pair[1];
@@ -318,7 +318,7 @@ public class TumblrPublisher : Spit.Publishing.Publisher, GLib.Object {
if (oauth_token == null || oauth_token_secret == null)
host.post_error(new Spit.Publishing.PublishingError.MALFORMED_RESPONSE(
- _("“%s” isn’t a valid response to an OAuth authentication request")));
+ _("“%s” isn’t a valid response to an OAuth authentication request"), response));
session.set_access_phase_credentials(oauth_token, oauth_token_secret);
}
@@ -602,7 +602,7 @@ internal class AuthenticationPane : Spit.Publishing.DialogPane, Object {
builder = new Gtk.Builder();
builder.add_from_resource (Resources.RESOURCE_PATH + "/tumblr_authentication_pane.ui");
builder.connect_signals(null);
- Gtk.Alignment align = builder.get_object("alignment") as Gtk.Alignment;
+ var content = builder.get_object ("content") as Gtk.Widget;
Gtk.Label message_label = builder.get_object("message_label") as Gtk.Label;
switch (mode) {
@@ -628,7 +628,8 @@ internal class AuthenticationPane : Spit.Publishing.DialogPane, Object {
password_entry.changed.connect(on_password_changed);
login_button.clicked.connect(on_login_button_clicked);
- align.reparent(pane_widget);
+ content.parent.remove (content);
+ pane_widget.add (content);
publisher.get_host().set_dialog_default_widget(login_button);
} catch (Error e) {
warning(_("Could not load UI: %s"), e.message);