diff options
| author | Jörg Frings-Fürst <debian@jff.email> | 2019-04-28 16:46:41 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff.email> | 2019-04-28 16:46:41 +0200 |
| commit | 6d3354ff2e7ce13feeae1b75d94a186d86f82d89 (patch) | |
| tree | 2d908584bfb663268004e19a23e02ce6c65034c5 /src/publishing | |
| parent | 6dd5e6966c6ec10d38d4b620a053ae262ac60d86 (diff) | |
| parent | 7385922cd37e4ffe65f4af34b2795307a76670c4 (diff) | |
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'src/publishing')
| -rw-r--r-- | src/publishing/Publishing.vala | 2 | ||||
| -rw-r--r-- | src/publishing/PublishingUI.vala | 1 |
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() { |