summaryrefslogtreecommitdiff
path: root/src/publishing
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff.email>2019-07-12 16:16:34 +0200
committerJörg Frings-Fürst <debian@jff.email>2019-07-12 16:16:34 +0200
commite905afb102569e93e2f6ece9a9ab515ac1fd4f04 (patch)
tree56c764f3a3fe3848ef2aa161d143f33cb2eaeb8e /src/publishing
parent71137cc5832110d91599d68790402cf196762ed3 (diff)
parentcb774d1baf242adcc03a1df5eed6d100f7e3bd55 (diff)
Merge branch 'release/debian/0.30.4-1'debian/0.30.4-1
Diffstat (limited to 'src/publishing')
-rw-r--r--src/publishing/Publishing.vala2
-rw-r--r--src/publishing/PublishingUI.vala1
2 files changed, 2 insertions, 1 deletions
diff --git a/src/publishing/Publishing.vala b/src/publishing/Publishing.vala
index 6c30b91..455013c 100644
--- a/src/publishing/Publishing.vala
+++ b/src/publishing/Publishing.vala
@@ -9,9 +9,9 @@ namespace Publishing {
public void init() throws Error {
string[] core_ids = new string[0];
core_ids += "org.yorba.shotwell.publishing.facebook";
- core_ids += "org.yorba.shotwell.publishing.picasa";
core_ids += "org.yorba.shotwell.publishing.flickr";
core_ids += "org.yorba.shotwell.publishing.youtube";
+ core_ids += "org.yorba.shotwell.publishing.gnome-photos";
Plugins.register_extension_point(typeof(Spit.Publishing.Service), _("Publishing"),
Resources.PUBLISH, core_ids);
diff --git a/src/publishing/PublishingUI.vala b/src/publishing/PublishingUI.vala
index 3d4f609..d3d4a69 100644
--- a/src/publishing/PublishingUI.vala
+++ b/src/publishing/PublishingUI.vala
@@ -527,6 +527,7 @@ public class PublishingDialog : Gtk.Dialog {
public void set_cancel_button_mode() {
close_cancel_button.set_label(_("_Cancel"));
+ set_default(null);
}
public void lock_service() {