diff -Nru shotwell-0.13.0/Makefile shotwell-0.13.1/Makefile --- shotwell-0.13.0/Makefile 2012-09-19 23:24:26.000000000 +0000 +++ shotwell-0.13.1/Makefile 2012-10-05 18:07:37.000000000 +0000 @@ -2,7 +2,7 @@ PROGRAM_THUMBNAILER = shotwell-video-thumbnailer PROGRAM_MIGRATOR = shotwell-settings-migrator -VERSION = 0.13.0 +VERSION = 0.13.1 GETTEXT_PACKAGE = $(PROGRAM) BUILD_ROOT = 1 @@ -558,7 +558,8 @@ mkdir -p $(DESTDIR)$(PREFIX)/bin $(INSTALL_PROGRAM) $(PROGRAM) $(DESTDIR)$(PREFIX)/bin $(INSTALL_PROGRAM) $(THUMBNAILER_BIN) $(DESTDIR)$(PREFIX)/bin - $(INSTALL_PROGRAM) $(MIGRATOR_BIN) $(DESTDIR)$(PREFIX)/bin + mkdir -p $(DESTDIR)$(PREFIX)/libexec/shotwell + $(INSTALL_PROGRAM) $(MIGRATOR_BIN) $(DESTDIR)$(PREFIX)/libexec/shotwell mkdir -p $(DESTDIR)$(PREFIX)/share/shotwell/icons $(INSTALL_DATA) icons/* $(DESTDIR)$(PREFIX)/share/shotwell/icons mkdir -p $(DESTDIR)$(PREFIX)/share/icons/hicolor/scalable/apps diff -Nru shotwell-0.13.0/NEWS shotwell-0.13.1/NEWS --- shotwell-0.13.0/NEWS 2012-09-19 23:07:03.000000000 +0000 +++ shotwell-0.13.1/NEWS 2012-10-05 18:22:34.000000000 +0000 @@ -1,3 +1,27 @@ +Shotwell 0.13.1 - 5 October 2012 - "A Date at the Diplomat's Club" +---------------------------------------------------------------------------- + + * Fixes an issue in which Shotwell would crash after deleting + all photos present in a view + * Fixes an issue where Shotwell would not include all + selected photos during a Nautilus "Send To..." export + operation + * Corrects a problem in which the file chooser dialog + used to select Shotwell's library location would + inappropriately select the parent directory of the chosen + directory + * Shotwell now properly inhibits the system screensaver when + playing a slideshow + * Fixes an issue in which the search filter bar could become + invisible even though a filter was being applied + * A progress bar now correctly appears during long batch + rotate and auto-enhance operations + * Shotwell no longer crashes when certain kinds of malformed + responses are received from remote servers during photo + publishing + * Corrected translation and desktop integration errors + + Shotwell 0.13.0 - 19 September 2012 - "Peanuts, Coffee, Soda, and Magazines" ---------------------------------------------------------------------------- diff -Nru shotwell-0.13.0/THANKS shotwell-0.13.1/THANKS --- shotwell-0.13.0/THANKS 2012-09-19 19:08:59.000000000 +0000 +++ shotwell-0.13.1/THANKS 2012-10-05 17:56:28.000000000 +0000 @@ -59,6 +59,7 @@ Alexander Wilms Timo Witte Shan Xiong +Damien Lallement Translations courtesy of: diff -Nru shotwell-0.13.0/debian/changelog shotwell-0.13.1/debian/changelog --- shotwell-0.13.0/debian/changelog 2012-09-24 15:10:58.000000000 +0000 +++ shotwell-0.13.1/debian/changelog 2012-10-31 16:57:28.000000000 +0000 @@ -1,3 +1,27 @@ +shotwell (0.13.1-0ubuntu1) quantal-proposed; urgency=low + + * New upstream version: + - "does not check response from fb assumes it is html/xml" (lp: #1050793) + - Fixes an issue where Shotwell would not include all selected photos + during a Nautilus "Send To..." export operation (lp: #1002537) + - Shotwell now properly inhibits the system screensaver when playing a + slideshow (lp: #1034412) + * debian/patches/06_uoa.patch: new version update + * debian/patches/dont_set_hardcoded_libexec.patch: revert upstream change, + changing the directory this way in a SRU is wrong + + -- Sebastien Bacher Wed, 31 Oct 2012 16:58:47 +0100 + +shotwell (0.13.0-0ubuntu3) quantal; urgency=low + + [ Alberto Mardegan] + * debian/patches/06_uoa.patch: + - Remove duplicate "Shotwell" entry from .pot translation template + (lp: #1056698) + - Better handling of missing publishing services (lp: #1060586) + + -- Sebastien Bacher Wed, 03 Oct 2012 23:00:11 +0200 + shotwell (0.13.0-0ubuntu2) quantal-proposed; urgency=low [ Alberto Mardegan ] diff -Nru shotwell-0.13.0/debian/patches/06_uoa.patch shotwell-0.13.1/debian/patches/06_uoa.patch --- shotwell-0.13.0/debian/patches/06_uoa.patch 2012-09-24 15:10:58.000000000 +0000 +++ shotwell-0.13.1/debian/patches/06_uoa.patch 2012-10-31 16:57:28.000000000 +0000 @@ -2,11 +2,11 @@ Author: Alberto Mardegan --- -diff --git a/Makefile b/Makefile -index 70bdc96..f5ac032 100644 ---- a/Makefile -+++ b/Makefile -@@ -152,6 +152,7 @@ RESOURCE_FILES = \ +Index: shotwell-0.13.1/Makefile +=================================================================== +--- shotwell-0.13.1.orig/Makefile 2012-10-11 11:15:47.496233505 +0200 ++++ shotwell-0.13.1/Makefile 2012-10-11 11:15:47.516233504 +0200 +@@ -152,6 +152,7 @@ trash.ui SYS_INTEGRATION_FILES = \ @@ -14,20 +14,19 @@ shotwell.desktop.head \ shotwell-viewer.desktop.head \ org.yorba.shotwell.gschema.xml \ -@@ -546,6 +547,8 @@ install: - $(INSTALL_PROGRAM) $(PROGRAM) $(DESTDIR)$(PREFIX)/bin +@@ -547,6 +548,8 @@ $(INSTALL_PROGRAM) $(THUMBNAILER_BIN) $(DESTDIR)$(PREFIX)/bin - $(INSTALL_PROGRAM) $(MIGRATOR_BIN) $(DESTDIR)$(PREFIX)/bin + mkdir -p $(DESTDIR)$(PREFIX)/libexec/shotwell + $(INSTALL_PROGRAM) $(MIGRATOR_BIN) $(DESTDIR)$(PREFIX)/libexec/shotwell + mkdir -p $(DESTDIR)$(PREFIX)/share/accounts/applications + $(INSTALL_DATA) misc/shotwell.application $(DESTDIR)$(PREFIX)/share/accounts/applications mkdir -p $(DESTDIR)$(PREFIX)/share/shotwell/icons $(INSTALL_DATA) icons/* $(DESTDIR)$(PREFIX)/share/shotwell/icons mkdir -p $(DESTDIR)$(PREFIX)/share/icons/hicolor/scalable/apps -diff --git a/misc/shotwell.application b/misc/shotwell.application -new file mode 100644 -index 0000000..815345f ---- /dev/null -+++ b/misc/shotwell.application +Index: shotwell-0.13.1/misc/shotwell.application +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ shotwell-0.13.1/misc/shotwell.application 2012-10-11 11:15:47.516233504 +0200 @@ -0,0 +1,19 @@ + + @@ -48,11 +47,11 @@ + + + -diff --git a/plugins/Makefile b/plugins/Makefile -index c622063..255e9cc 100644 ---- a/plugins/Makefile -+++ b/plugins/Makefile -@@ -4,7 +4,10 @@ include plugins.mk +Index: shotwell-0.13.1/plugins/Makefile +=================================================================== +--- shotwell-0.13.1.orig/plugins/Makefile 2012-10-05 19:51:09.000000000 +0200 ++++ shotwell-0.13.1/plugins/Makefile 2012-10-11 11:15:47.516233504 +0200 +@@ -4,7 +4,10 @@ DIST_FILES := \ Makefile \ Makefile.plugin.mk \ @@ -64,11 +63,11 @@ .PHONY: all all: $(ALL_PLUGINS) -diff --git a/plugins/Makefile.plugin.mk b/plugins/Makefile.plugin.mk -index d76433b..211c02a 100644 ---- a/plugins/Makefile.plugin.mk -+++ b/plugins/Makefile.plugin.mk -@@ -27,6 +27,8 @@ PKGS := $(shell sed ':a;N;$$!ba;s/\n/ /g' ../shotwell-plugin-dev-1.0.deps) $(PKG +Index: shotwell-0.13.1/plugins/Makefile.plugin.mk +=================================================================== +--- shotwell-0.13.1.orig/plugins/Makefile.plugin.mk 2012-10-05 19:51:09.000000000 +0200 ++++ shotwell-0.13.1/plugins/Makefile.plugin.mk 2012-10-11 11:15:47.524233503 +0200 +@@ -27,6 +27,8 @@ # automatically include the shotwell-plugin-dev-1.0 package as a local dependency EXT_PKGS := $(PKGS) PKGS := shotwell-plugin-dev-1.0 $(PKGS) $(PLUGIN_PKGS) @@ -77,11 +76,11 @@ # automatically include the Resources.vala common file SRC_FILES := ../common/Resources.vala $(SRC_FILES) -diff --git a/plugins/common/RESTSupport.vala b/plugins/common/RESTSupport.vala -index 3f5ed21..3e90828 100644 ---- a/plugins/common/RESTSupport.vala -+++ b/plugins/common/RESTSupport.vala -@@ -314,7 +314,7 @@ public class Transaction { +Index: shotwell-0.13.1/plugins/common/RESTSupport.vala +=================================================================== +--- shotwell-0.13.1.orig/plugins/common/RESTSupport.vala 2012-10-05 19:59:25.000000000 +0200 ++++ shotwell-0.13.1/plugins/common/RESTSupport.vala 2012-10-11 11:15:47.524233503 +0200 +@@ -314,7 +314,7 @@ old_url = message.get_uri().to_string(false); url_with_query = get_endpoint_url() + "?" + formdata_string; message.set_uri(new Soup.URI(url_with_query)); @@ -90,11 +89,10 @@ message.set_request("application/x-www-form-urlencoded", Soup.MemoryUse.COPY, formdata_string.data); } -diff --git a/plugins/common/accounts.vala b/plugins/common/accounts.vala -new file mode 100644 -index 0000000..ee2d9da ---- /dev/null -+++ b/plugins/common/accounts.vala +Index: shotwell-0.13.1/plugins/common/accounts.vala +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ shotwell-0.13.1/plugins/common/accounts.vala 2012-10-11 11:15:47.532233503 +0200 @@ -0,0 +1,226 @@ +/* Copyright 2009-2011 Yorba Foundation + * @@ -322,11 +320,11 @@ + +} + -diff --git a/plugins/shotwell-publishing-extras/TumblrPublishing.vala b/plugins/shotwell-publishing-extras/TumblrPublishing.vala -index c65e19a..e3cfb79 100644 ---- a/plugins/shotwell-publishing-extras/TumblrPublishing.vala -+++ b/plugins/shotwell-publishing-extras/TumblrPublishing.vala -@@ -48,7 +48,7 @@ public class TumblrService : Object, Spit.Pluggable, Spit.Publishing.Service { +Index: shotwell-0.13.1/plugins/shotwell-publishing-extras/TumblrPublishing.vala +=================================================================== +--- shotwell-0.13.1.orig/plugins/shotwell-publishing-extras/TumblrPublishing.vala 2012-10-05 19:54:36.000000000 +0200 ++++ shotwell-0.13.1/plugins/shotwell-publishing-extras/TumblrPublishing.vala 2012-10-11 11:15:47.532233503 +0200 +@@ -48,7 +48,7 @@ public void activation(bool enabled) { } @@ -335,11 +333,11 @@ return new Publishing.Tumblr.TumblrPublisher(this, host); } -diff --git a/plugins/shotwell-publishing-extras/YandexPublishing.vala b/plugins/shotwell-publishing-extras/YandexPublishing.vala -index 1370690..760a8f3 100644 ---- a/plugins/shotwell-publishing-extras/YandexPublishing.vala -+++ b/plugins/shotwell-publishing-extras/YandexPublishing.vala -@@ -30,7 +30,7 @@ public class YandexService : Object, Spit.Pluggable, Spit.Publishing.Service { +Index: shotwell-0.13.1/plugins/shotwell-publishing-extras/YandexPublishing.vala +=================================================================== +--- shotwell-0.13.1.orig/plugins/shotwell-publishing-extras/YandexPublishing.vala 2012-10-05 19:51:09.000000000 +0200 ++++ shotwell-0.13.1/plugins/shotwell-publishing-extras/YandexPublishing.vala 2012-10-11 11:15:47.532233503 +0200 +@@ -30,7 +30,7 @@ info.license = Resources.LICENSE; } @@ -348,10 +346,10 @@ return new Publishing.Yandex.YandexPublisher(this, host); } -diff --git a/plugins/shotwell-publishing/FacebookPublishing.vala b/plugins/shotwell-publishing/FacebookPublishing.vala -index fa9d8f2..bd3cd08 100644 ---- a/plugins/shotwell-publishing/FacebookPublishing.vala -+++ b/plugins/shotwell-publishing/FacebookPublishing.vala +Index: shotwell-0.13.1/plugins/shotwell-publishing/FacebookPublishing.vala +=================================================================== +--- shotwell-0.13.1.orig/plugins/shotwell-publishing/FacebookPublishing.vala 2012-10-05 19:51:09.000000000 +0200 ++++ shotwell-0.13.1/plugins/shotwell-publishing/FacebookPublishing.vala 2012-10-11 11:15:47.536233504 +0200 @@ -4,30 +4,28 @@ * (version 2.1 or later). See the COPYING file in this distribution. */ @@ -390,7 +388,7 @@ info.authors = "Lucas Beeler"; info.copyright = _("Copyright 2009-2012 Yorba Foundation"); info.translators = Resources.TRANSLATORS; -@@ -39,14 +37,12 @@ public class FacebookService : Object, Spit.Pluggable, Spit.Publishing.Service { +@@ -39,14 +37,12 @@ info.icons = icon_pixbuf_set; } @@ -409,7 +407,7 @@ return (Spit.Publishing.Publisher.MediaType.PHOTO | Spit.Publishing.Publisher.MediaType.VIDEO); } -@@ -66,8 +62,6 @@ internal const string PHOTO_ENDPOINT_URL = "https://api.facebook.com/restserver. +@@ -66,8 +62,6 @@ internal const string VIDEO_ENDPOINT_URL = "https://api-video.facebook.com/restserver.php"; internal const string SERVICE_WELCOME_MESSAGE = _("You are not currently logged into Facebook.\n\nIf you don't yet have a Facebook account, you can create one during the login process. During login, Shotwell Connect may ask you for permission to upload photos and publish to your feed. These permissions are required for Shotwell Connect to function."); @@ -418,7 +416,7 @@ // as of mid-November 2010, the privacy the simple string "SELF" is no longer a valid // privacy value; "SELF" must be simulated by a "CUSTOM" setting; see the discussion // http://forum.developers.facebook.net/viewtopic.php?pid=289287 -@@ -163,19 +157,23 @@ public class FacebookPublisher : Spit.Publishing.Publisher, GLib.Object { +@@ -163,19 +157,23 @@ private int publish_to_album = NO_ALBUM; private weak Spit.Publishing.PluginHost host = null; private FacebookRESTSession session = null; @@ -443,7 +441,7 @@ } private bool is_running() { -@@ -190,49 +188,10 @@ public class FacebookPublisher : Spit.Publishing.Publisher, GLib.Object { +@@ -190,49 +188,10 @@ return NO_ALBUM; } @@ -493,7 +491,7 @@ private void set_persistent_strip_metadata(bool strip_metadata) { host.set_config_bool("strip_metadata", strip_metadata); } -@@ -247,39 +206,6 @@ public class FacebookPublisher : Spit.Publishing.Publisher, GLib.Object { +@@ -247,39 +206,6 @@ host.set_config_int("default_size", size); } @@ -533,7 +531,7 @@ private void do_fetch_album_descriptions() { debug("ACTION: fetching album descriptions from remote endpoint."); -@@ -387,7 +313,6 @@ public class FacebookPublisher : Spit.Publishing.Publisher, GLib.Object { +@@ -387,7 +313,6 @@ PublishingOptionsPane publishing_options_pane = new PublishingOptionsPane( session.get_user_name(), albums, host.get_publishable_media_type(), this, builder, get_persistent_strip_metadata()); @@ -541,7 +539,7 @@ publishing_options_pane.publish.connect(on_publishing_options_pane_publish); host.install_dialog_pane(publishing_options_pane, Spit.Publishing.PluginHost.ButtonMode.CANCEL); -@@ -396,51 +321,20 @@ public class FacebookPublisher : Spit.Publishing.Publisher, GLib.Object { +@@ -396,51 +321,20 @@ private void do_logout() { debug("ACTION: clearing persistent session information and restaring interaction."); @@ -597,7 +595,7 @@ } private void do_upload(bool strip_metadata) { -@@ -528,64 +422,6 @@ public class FacebookPublisher : Spit.Publishing.Publisher, GLib.Object { +@@ -528,64 +422,6 @@ host.install_success_pane(); } @@ -662,7 +660,7 @@ private void on_session_authenticated() { if (!is_running()) return; -@@ -593,7 +429,6 @@ public class FacebookPublisher : Spit.Publishing.Publisher, GLib.Object { +@@ -593,7 +429,6 @@ assert(session.is_authenticated()); debug("EVENT: an authenticated session has become available."); @@ -670,7 +668,7 @@ do_fetch_album_descriptions(); } -@@ -638,15 +473,6 @@ public class FacebookPublisher : Spit.Publishing.Publisher, GLib.Object { +@@ -638,15 +473,6 @@ do_show_publishing_options_pane(); } @@ -686,7 +684,7 @@ public void on_publishing_options_pane_publish(string? target_album, string privacy_setting, Resolution target_resolution, bool strip_metadata) { if (!is_running()) -@@ -762,26 +588,8 @@ public class FacebookPublisher : Spit.Publishing.Publisher, GLib.Object { +@@ -762,26 +588,8 @@ albums = null; publish_to_album = NO_ALBUM; @@ -715,7 +713,7 @@ } public void stop() { -@@ -909,39 +717,14 @@ internal class FacebookRESTSession { +@@ -909,39 +717,14 @@ return (access_token != null && uid != null && user_name != null); } @@ -762,7 +760,7 @@ } public string get_endpoint_url() { -@@ -1335,190 +1118,6 @@ internal class FacebookCreateAlbumTransaction : FacebookRESTTransaction { +@@ -1335,190 +1118,6 @@ } } @@ -953,7 +951,7 @@ internal class PublishingOptionsPane : Spit.Publishing.DialogPane, GLib.Object { private Gtk.Builder builder; private Gtk.Box pane_widget = null; -@@ -1529,7 +1128,6 @@ internal class PublishingOptionsPane : Spit.Publishing.DialogPane, GLib.Object { +@@ -1529,7 +1128,6 @@ private Gtk.Entry new_album_entry = null; private Gtk.CheckButton strip_metadata_check = null; private Gtk.Button publish_button = null; @@ -961,7 +959,7 @@ private Gtk.Label how_to_label = null; private FacebookAlbum[] albums = null; private FacebookPublisher publisher = null; -@@ -1546,7 +1144,6 @@ internal class PublishingOptionsPane : Spit.Publishing.DialogPane, GLib.Object { +@@ -1546,7 +1144,6 @@ private const int CONTENT_GROUP_SPACING = 32; private const int STANDARD_ACTION_BUTTON_WIDTH = 128; @@ -969,7 +967,7 @@ public signal void publish(string? target_album, string privacy_setting, Resolution target_resolution, bool strip_metadata); private class PrivacyDescription { -@@ -1586,7 +1183,6 @@ internal class PublishingOptionsPane : Spit.Publishing.DialogPane, GLib.Object { +@@ -1586,7 +1183,6 @@ existing_albums_combo = (Gtk.ComboBoxText) this.builder.get_object("existing_albums_combo"); visibility_combo = (Gtk.ComboBoxText) this.builder.get_object("visibility_combo"); publish_button = (Gtk.Button) this.builder.get_object("publish_button"); @@ -977,7 +975,7 @@ new_album_entry = (Gtk.Entry) this.builder.get_object("new_album_entry"); resolution_combo = (Gtk.ComboBoxText) this.builder.get_object("resolution_combo"); how_to_label = (Gtk.Label) this.builder.get_object("how_to_label"); -@@ -1605,7 +1201,6 @@ internal class PublishingOptionsPane : Spit.Publishing.DialogPane, GLib.Object { +@@ -1605,7 +1201,6 @@ visibility_combo.set_active(0); publish_button.clicked.connect(on_publish_button_clicked); @@ -985,7 +983,7 @@ // Ticket #2916 - if the user is uploading photographs, allow // them to choose what resolution they should be uploaded at. -@@ -1669,10 +1264,6 @@ internal class PublishingOptionsPane : Spit.Publishing.DialogPane, GLib.Object { +@@ -1669,10 +1264,6 @@ publisher.set_persistent_default_size(resolution_combo.get_active()); } @@ -996,7 +994,7 @@ private void on_publish_button_clicked() { string album_name; string privacy_setting = privacy_descriptions[visibility_combo.get_active()].privacy_setting; -@@ -1747,10 +1338,6 @@ internal class PublishingOptionsPane : Spit.Publishing.DialogPane, GLib.Object { +@@ -1747,10 +1338,6 @@ publish_button.grab_focus(); } @@ -1007,7 +1005,7 @@ private void notify_publish(string? target_album, string privacy_setting, Resolution target_resolution) { publish(target_album, privacy_setting, target_resolution, strip_metadata_check.get_active()); } -@@ -1764,14 +1351,12 @@ internal class PublishingOptionsPane : Spit.Publishing.DialogPane, GLib.Object { +@@ -1764,14 +1351,12 @@ } public void on_pane_installed() { @@ -1022,10 +1020,10 @@ publish.disconnect(notify_publish); } } -diff --git a/plugins/shotwell-publishing/FlickrPublishing.vala b/plugins/shotwell-publishing/FlickrPublishing.vala -index a6f8b45..abaf0b2 100644 ---- a/plugins/shotwell-publishing/FlickrPublishing.vala -+++ b/plugins/shotwell-publishing/FlickrPublishing.vala +Index: shotwell-0.13.1/plugins/shotwell-publishing/FlickrPublishing.vala +=================================================================== +--- shotwell-0.13.1.orig/plugins/shotwell-publishing/FlickrPublishing.vala 2012-10-05 19:51:09.000000000 +0200 ++++ shotwell-0.13.1/plugins/shotwell-publishing/FlickrPublishing.vala 2012-10-11 11:15:47.540233504 +0200 @@ -4,32 +4,30 @@ * (version 2.1 or later). See the COPYING file in this distribution. */ @@ -1066,7 +1064,7 @@ info.authors = "Lucas Beeler"; info.copyright = _("Copyright 2009-2012 Yorba Foundation"); info.translators = Resources.TRANSLATORS; -@@ -41,14 +39,12 @@ public class FlickrService : Object, Spit.Pluggable, Spit.Publishing.Service { +@@ -41,14 +39,12 @@ info.icons = icon_pixbuf_set; } @@ -1085,7 +1083,7 @@ return (Spit.Publishing.Publisher.MediaType.PHOTO | Spit.Publishing.Publisher.MediaType.VIDEO); } -@@ -105,60 +101,33 @@ public class FlickrPublisher : Spit.Publishing.Publisher, GLib.Object { +@@ -105,60 +101,33 @@ private bool was_started = false; private Session session = null; private PublishingOptionsPane publishing_options_pane = null; @@ -1155,7 +1153,7 @@ private bool get_persistent_strip_metadata() { return host.get_config_bool("strip_metadata", false); } -@@ -167,94 +136,17 @@ public class FlickrPublisher : Spit.Publishing.Publisher, GLib.Object { +@@ -167,94 +136,17 @@ host.set_config_bool("strip_metadata", strip_metadata); } @@ -1258,7 +1256,7 @@ private void on_session_authenticated() { if (!is_running()) return; -@@ -263,10 +155,6 @@ public class FlickrPublisher : Spit.Publishing.Publisher, GLib.Object { +@@ -263,10 +155,6 @@ parameters.username = session.get_username(); @@ -1269,7 +1267,7 @@ do_fetch_account_info(); } -@@ -303,7 +191,6 @@ public class FlickrPublisher : Spit.Publishing.Publisher, GLib.Object { +@@ -303,7 +191,6 @@ private void on_publishing_options_pane_publish(bool strip_metadata) { publishing_options_pane.publish.disconnect(on_publishing_options_pane_publish); @@ -1277,7 +1275,7 @@ if (!is_running()) return; -@@ -312,18 +199,6 @@ public class FlickrPublisher : Spit.Publishing.Publisher, GLib.Object { +@@ -312,18 +199,6 @@ do_publish(strip_metadata); } @@ -1296,7 +1294,7 @@ private void on_upload_status_updated(int file_number, double completed_fraction) { if (!is_running()) return; -@@ -361,148 +236,6 @@ public class FlickrPublisher : Spit.Publishing.Publisher, GLib.Object { +@@ -361,148 +236,6 @@ host.post_error(err); } @@ -1445,7 +1443,7 @@ private void do_fetch_account_info() { debug("ACTION: running network transaction to fetch account information"); -@@ -568,7 +301,6 @@ public class FlickrPublisher : Spit.Publishing.Publisher, GLib.Object { +@@ -568,7 +301,6 @@ debug("ACTION: logging user out, deauthenticating session, and erasing stored credentials"); session.deauthenticate(); @@ -1453,7 +1451,7 @@ running = false; -@@ -599,7 +331,6 @@ public class FlickrPublisher : Spit.Publishing.Publisher, GLib.Object { +@@ -599,7 +331,6 @@ publishing_options_pane = new PublishingOptionsPane(this, parameters, host.get_publishable_media_type(), builder, get_persistent_strip_metadata()); publishing_options_pane.publish.connect(on_publishing_options_pane_publish); @@ -1461,7 +1459,7 @@ host.install_dialog_pane(publishing_options_pane); } -@@ -674,16 +405,7 @@ public class FlickrPublisher : Spit.Publishing.Publisher, GLib.Object { +@@ -674,16 +405,7 @@ running = true; was_started = true; @@ -1479,7 +1477,7 @@ } public void start() { -@@ -772,7 +494,7 @@ internal class Transaction : Publishing.RESTSupport.Transaction { +@@ -772,7 +494,7 @@ add_argument("oauth_version", "1.0"); add_argument("oauth_callback", "oob"); add_argument("oauth_timestamp", session.get_oauth_timestamp()); @@ -1488,7 +1486,7 @@ } public Transaction.with_uri(Session session, string uri, -@@ -784,7 +506,7 @@ internal class Transaction : Publishing.RESTSupport.Transaction { +@@ -784,7 +506,7 @@ add_argument("oauth_version", "1.0"); add_argument("oauth_callback", "oob"); add_argument("oauth_timestamp", session.get_oauth_timestamp()); @@ -1497,7 +1495,7 @@ } public override void execute() throws Spit.Publishing.PublishingError { -@@ -842,22 +564,6 @@ internal class Transaction : Publishing.RESTSupport.Transaction { +@@ -842,22 +564,6 @@ } } @@ -1520,7 +1518,7 @@ internal class AccountInfoFetchTransaction : Transaction { public AccountInfoFetchTransaction(Session session) { base(session, Publishing.RESTSupport.HttpMethod.GET); -@@ -884,7 +590,7 @@ private class UploadTransaction : Publishing.RESTSupport.UploadTransaction { +@@ -884,7 +590,7 @@ add_authorization_header_field("oauth_version", "1.0"); add_authorization_header_field("oauth_callback", "oob"); add_authorization_header_field("oauth_timestamp", session.get_oauth_timestamp()); @@ -1529,7 +1527,7 @@ add_authorization_header_field("oauth_token", session.get_access_phase_token()); add_argument("is_public", ("%d".printf(parameters.visibility_specification.everyone_level))); -@@ -944,11 +650,11 @@ private class UploadTransaction : Publishing.RESTSupport.UploadTransaction { +@@ -944,11 +650,11 @@ } internal class Session : Publishing.RESTSupport.Session { @@ -1543,7 +1541,7 @@ public Session() { base(ENDPOINT_URL); -@@ -959,15 +665,6 @@ internal class Session : Publishing.RESTSupport.Session { +@@ -959,15 +665,6 @@ username != null); } @@ -1559,7 +1557,7 @@ public void deauthenticate() { access_phase_token = null; access_phase_token_secret = null; -@@ -1008,16 +705,12 @@ internal class Session : Publishing.RESTSupport.Session { +@@ -1008,16 +705,12 @@ if (access_phase_token_secret != null) { debug("access phase token secret available; using it as signing key"); @@ -1579,7 +1577,7 @@ } string signature_base_string = http_method + "&" + Soup.URI.encode( -@@ -1040,11 +733,11 @@ internal class Session : Publishing.RESTSupport.Session { +@@ -1040,11 +733,11 @@ txn.add_argument("oauth_signature", signature); } @@ -1595,7 +1593,7 @@ public void set_access_phase_credentials(string token, string secret, string username) { this.access_phase_token = token; this.access_phase_token_secret = secret; -@@ -1065,21 +758,16 @@ internal class Session : Publishing.RESTSupport.Session { +@@ -1065,21 +758,16 @@ return GLib.get_real_time().to_string().substring(0, 10); } @@ -1621,7 +1619,7 @@ public string get_username() { assert(is_authenticated()); return username; -@@ -1112,7 +800,6 @@ internal class PublishingOptionsPane : Spit.Publishing.DialogPane, GLib.Object { +@@ -1112,7 +800,6 @@ private Gtk.Label visibility_label = null; private Gtk.Label upload_info_label = null; private Gtk.Label size_label = null; @@ -1629,7 +1627,7 @@ private Gtk.Button publish_button = null; private Gtk.ComboBoxText visibility_combo = null; private Gtk.ComboBoxText size_combo = null; -@@ -1124,7 +811,6 @@ internal class PublishingOptionsPane : Spit.Publishing.DialogPane, GLib.Object { +@@ -1124,7 +811,6 @@ private Spit.Publishing.Publisher.MediaType media_type; public signal void publish(bool strip_metadata); @@ -1637,7 +1635,7 @@ public PublishingOptionsPane(FlickrPublisher publisher, PublishingParameters parameters, Spit.Publishing.Publisher.MediaType media_type, Gtk.Builder builder, bool strip_metadata) { -@@ -1136,7 +822,6 @@ internal class PublishingOptionsPane : Spit.Publishing.DialogPane, GLib.Object { +@@ -1136,7 +822,6 @@ pane_widget = (Gtk.Box) this.builder.get_object("flickr_pane"); visibility_label = (Gtk.Label) this.builder.get_object("visibility_label"); upload_info_label = (Gtk.Label) this.builder.get_object("upload_info_label"); @@ -1645,7 +1643,7 @@ publish_button = (Gtk.Button) this.builder.get_object("publish_button"); visibility_combo = (Gtk.ComboBoxText) this.builder.get_object("visibility_combo"); size_combo = (Gtk.ComboBoxText) this.builder.get_object("size_combo"); -@@ -1183,14 +868,9 @@ internal class PublishingOptionsPane : Spit.Publishing.DialogPane, GLib.Object { +@@ -1183,14 +868,9 @@ strip_metadata_check.set_active(strip_metadata); @@ -1660,7 +1658,7 @@ private void on_publish_clicked() { parameters.visibility_specification = visibilities[visibility_combo.get_active()].specification; -@@ -1257,10 +937,6 @@ internal class PublishingOptionsPane : Spit.Publishing.DialogPane, GLib.Object { +@@ -1257,10 +937,6 @@ publish(strip_metadata_check.get_active()); } @@ -1671,7 +1669,7 @@ public Gtk.Widget get_widget() { return pane_widget; } -@@ -1271,12 +947,10 @@ internal class PublishingOptionsPane : Spit.Publishing.DialogPane, GLib.Object { +@@ -1271,12 +947,10 @@ public void on_pane_installed() { publish.connect(notify_publish); @@ -1684,11 +1682,11 @@ } } -diff --git a/plugins/shotwell-publishing/Makefile b/plugins/shotwell-publishing/Makefile -index e939a77..bacfff4 100644 ---- a/plugins/shotwell-publishing/Makefile -+++ b/plugins/shotwell-publishing/Makefile -@@ -18,6 +18,7 @@ SRC_FILES := \ +Index: shotwell-0.13.1/plugins/shotwell-publishing/Makefile +=================================================================== +--- shotwell-0.13.1.orig/plugins/shotwell-publishing/Makefile 2012-10-05 19:51:09.000000000 +0200 ++++ shotwell-0.13.1/plugins/shotwell-publishing/Makefile 2012-10-11 11:15:47.540233504 +0200 +@@ -18,6 +18,7 @@ FlickrPublishing.vala \ YouTubePublishing.vala \ PiwigoPublishing.vala \ @@ -1696,10 +1694,10 @@ ../../src/util/string.vala \ ../common/RESTSupport.vala \ ../common/ui.vala -diff --git a/plugins/shotwell-publishing/PicasaPublishing.vala b/plugins/shotwell-publishing/PicasaPublishing.vala -index 397503d..a428a30 100644 ---- a/plugins/shotwell-publishing/PicasaPublishing.vala -+++ b/plugins/shotwell-publishing/PicasaPublishing.vala +Index: shotwell-0.13.1/plugins/shotwell-publishing/PicasaPublishing.vala +=================================================================== +--- shotwell-0.13.1.orig/plugins/shotwell-publishing/PicasaPublishing.vala 2012-10-05 19:51:09.000000000 +0200 ++++ shotwell-0.13.1/plugins/shotwell-publishing/PicasaPublishing.vala 2012-10-11 11:15:47.548233502 +0200 @@ -4,30 +4,28 @@ * (version 2.1 or later). See the COPYING file in this distribution. */ @@ -1738,7 +1736,7 @@ info.authors = "Lucas Beeler"; info.copyright = _("Copyright 2009-2012 Yorba Foundation"); info.translators = Resources.TRANSLATORS; -@@ -39,17 +37,15 @@ public class PicasaService : Object, Spit.Pluggable, Spit.Publishing.Service { +@@ -39,17 +37,15 @@ info.icons = icon_pixbuf_set; } @@ -1760,7 +1758,7 @@ } namespace Publishing.Picasa { -@@ -72,29 +68,22 @@ public class PicasaPublisher : Spit.Publishing.Publisher, GLib.Object { +@@ -72,29 +68,22 @@ private PublishingParameters parameters = null; private Spit.Publishing.Publisher.MediaType media_type = Spit.Publishing.Publisher.MediaType.NONE; @@ -1795,7 +1793,7 @@ private Album[] extract_albums(Xml.Node* document_root) throws Spit.Publishing.PublishingError { Album[] result = new Album[0]; -@@ -133,14 +122,6 @@ public class PicasaPublisher : Spit.Publishing.Publisher, GLib.Object { +@@ -133,14 +122,6 @@ return result; } @@ -1810,7 +1808,7 @@ internal bool get_persistent_strip_metadata() { return host.get_config_bool("strip_metadata", false); } -@@ -149,16 +130,6 @@ public class PicasaPublisher : Spit.Publishing.Publisher, GLib.Object { +@@ -149,16 +130,6 @@ host.set_config_bool("strip_metadata", strip_metadata); } @@ -1827,7 +1825,7 @@ public bool is_running() { return running; } -@@ -167,98 +138,22 @@ public class PicasaPublisher : Spit.Publishing.Publisher, GLib.Object { +@@ -167,98 +138,22 @@ return service; } @@ -1940,7 +1938,7 @@ } private void on_session_authenticated() { -@@ -313,31 +208,7 @@ public class PicasaPublisher : Spit.Publishing.Publisher, GLib.Object { +@@ -313,31 +208,7 @@ debug("EVENT: fetching account and album information failed; response = '%s'.", bad_txn.get_response()); @@ -1973,7 +1971,7 @@ } private void on_publishing_options_publish(PublishingParameters parameters, -@@ -447,100 +318,6 @@ public class PicasaPublisher : Spit.Publishing.Publisher, GLib.Object { +@@ -447,100 +318,6 @@ host.post_error(err); } @@ -2074,7 +2072,7 @@ private void do_extract_username(string response_body) { debug("ACTION: extracting username from body of server response"); -@@ -562,66 +339,8 @@ public class PicasaPublisher : Spit.Publishing.Publisher, GLib.Object { +@@ -562,66 +339,8 @@ if (username != "") this.username = username; } @@ -2141,7 +2139,7 @@ private void do_fetch_username() { debug("ACTION: running network transaction to fetch username."); -@@ -701,7 +420,6 @@ public class PicasaPublisher : Spit.Publishing.Publisher, GLib.Object { +@@ -701,7 +420,6 @@ PublishingOptionsPane opts_pane = new PublishingOptionsPane(host, username, albums, media_type, builder, get_persistent_strip_metadata()); opts_pane.publish.connect(on_publishing_options_publish); @@ -2149,7 +2147,7 @@ host.install_dialog_pane(opts_pane); host.set_service_locked(false); -@@ -770,12 +488,7 @@ public class PicasaPublisher : Spit.Publishing.Publisher, GLib.Object { +@@ -770,12 +488,7 @@ debug("PicasaPublisher: starting interaction."); running = true; @@ -2163,7 +2161,7 @@ } public void stop() { -@@ -801,6 +514,7 @@ internal class Album { +@@ -801,6 +514,7 @@ internal class Session : Publishing.RESTSupport.Session { private string? auth_token = null; @@ -2171,7 +2169,7 @@ public Session() { } -@@ -809,45 +523,19 @@ internal class Session : Publishing.RESTSupport.Session { +@@ -809,45 +523,19 @@ return (auth_token != null); } @@ -2221,7 +2219,7 @@ } } -@@ -862,7 +550,13 @@ internal class AuthenticatedTransaction : Publishing.RESTSupport.Transaction { +@@ -862,7 +550,13 @@ base.with_endpoint_url(session, endpoint_url, method); assert(session.is_authenticated()); @@ -2236,7 +2234,7 @@ } } -@@ -875,7 +569,7 @@ internal class UsernameFetchTransaction : AuthenticatedTransaction { +@@ -875,7 +569,7 @@ } internal class AlbumDirectoryTransaction : AuthenticatedTransaction { @@ -2245,7 +2243,7 @@ "default"; public AlbumDirectoryTransaction(Session session) { -@@ -892,7 +586,7 @@ internal class AlbumDirectoryTransaction : AuthenticatedTransaction { +@@ -892,7 +586,7 @@ } private class AlbumCreationTransaction : AuthenticatedTransaction { @@ -2254,7 +2252,7 @@ "default"; private const string ALBUM_ENTRY_TEMPLATE = "%s%s"; -@@ -971,9 +665,14 @@ internal class UploadTransaction : AuthenticatedTransaction { +@@ -971,9 +665,14 @@ // that we've been building up Soup.Message outbound_message = soup_form_request_new_from_multipart(get_endpoint_url(), message_parts); @@ -2271,7 +2269,7 @@ // send the message and get its response set_is_executed(true); -@@ -981,95 +680,6 @@ internal class UploadTransaction : AuthenticatedTransaction { +@@ -981,95 +680,6 @@ } } @@ -2367,7 +2365,7 @@ internal class PublishingOptionsPane : Spit.Publishing.DialogPane, GLib.Object { private class SizeDescription { public string name; -@@ -1097,7 +707,6 @@ internal class PublishingOptionsPane : Spit.Publishing.DialogPane, GLib.Object { +@@ -1097,7 +707,6 @@ private Gtk.ComboBoxText size_combo = null; private Gtk.CheckButton strip_metadata_check = null; private Gtk.Button publish_button = null; @@ -2375,7 +2373,7 @@ private Album[] albums; private SizeDescription[] size_descriptions; -@@ -1105,7 +714,6 @@ internal class PublishingOptionsPane : Spit.Publishing.DialogPane, GLib.Object { +@@ -1105,7 +714,6 @@ private weak Spit.Publishing.PluginHost host; public signal void publish(PublishingParameters parameters, bool strip_metadata); @@ -2383,7 +2381,7 @@ public PublishingOptionsPane(Spit.Publishing.PluginHost host, string username, Album[] albums, Spit.Publishing.Publisher.MediaType media_type, Gtk.Builder builder, -@@ -1131,7 +739,6 @@ internal class PublishingOptionsPane : Spit.Publishing.DialogPane, GLib.Object { +@@ -1131,7 +739,6 @@ 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"); @@ -2391,7 +2389,7 @@ // populate any widgets whose contents are programmatically-generated. login_identity_label.set_label(_("You are logged into Picasa Web Albums as %s.").printf(username)); -@@ -1157,7 +764,6 @@ internal class PublishingOptionsPane : Spit.Publishing.DialogPane, GLib.Object { +@@ -1157,7 +764,6 @@ 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); @@ -2399,7 +2397,7 @@ publish_button.clicked.connect(on_publish_clicked); } -@@ -1200,10 +806,6 @@ internal class PublishingOptionsPane : Spit.Publishing.DialogPane, GLib.Object { +@@ -1200,10 +806,6 @@ public_check.set_sensitive(true); } @@ -2410,7 +2408,7 @@ private void update_publish_button_sensitivity() { string album_name = new_album_entry.get_text(); publish_button.set_sensitive(!(album_name.strip() == "" && -@@ -1263,10 +865,6 @@ internal class PublishingOptionsPane : Spit.Publishing.DialogPane, GLib.Object { +@@ -1263,10 +865,6 @@ publish(parameters, strip_metadata_check.get_active()); } @@ -2421,7 +2419,7 @@ public Gtk.Widget get_widget() { return pane_widget; } -@@ -1279,12 +877,10 @@ internal class PublishingOptionsPane : Spit.Publishing.DialogPane, GLib.Object { +@@ -1279,12 +877,10 @@ installed(); publish.connect(notify_publish); @@ -2434,11 +2432,11 @@ } } -diff --git a/plugins/shotwell-publishing/PiwigoPublishing.vala b/plugins/shotwell-publishing/PiwigoPublishing.vala -index d75b922..0fdf800 100644 ---- a/plugins/shotwell-publishing/PiwigoPublishing.vala -+++ b/plugins/shotwell-publishing/PiwigoPublishing.vala -@@ -42,7 +42,7 @@ public class PiwigoService : Object, Spit.Pluggable, Spit.Publishing.Service { +Index: shotwell-0.13.1/plugins/shotwell-publishing/PiwigoPublishing.vala +=================================================================== +--- shotwell-0.13.1.orig/plugins/shotwell-publishing/PiwigoPublishing.vala 2012-10-05 19:51:09.000000000 +0200 ++++ shotwell-0.13.1/plugins/shotwell-publishing/PiwigoPublishing.vala 2012-10-11 11:15:47.548233502 +0200 +@@ -42,7 +42,7 @@ public void activation(bool enabled) { } @@ -2447,11 +2445,11 @@ return new Publishing.Piwigo.PiwigoPublisher(this, host); } -diff --git a/plugins/shotwell-publishing/YouTubePublishing.vala b/plugins/shotwell-publishing/YouTubePublishing.vala -index 9319eb9..fc03fe7 100644 ---- a/plugins/shotwell-publishing/YouTubePublishing.vala -+++ b/plugins/shotwell-publishing/YouTubePublishing.vala -@@ -39,7 +39,7 @@ public class YouTubeService : Object, Spit.Pluggable, Spit.Publishing.Service { +Index: shotwell-0.13.1/plugins/shotwell-publishing/YouTubePublishing.vala +=================================================================== +--- shotwell-0.13.1.orig/plugins/shotwell-publishing/YouTubePublishing.vala 2012-10-05 19:51:09.000000000 +0200 ++++ shotwell-0.13.1/plugins/shotwell-publishing/YouTubePublishing.vala 2012-10-11 11:15:47.552233502 +0200 +@@ -39,7 +39,7 @@ info.icons = icon_pixbuf_set; } @@ -2460,11 +2458,11 @@ return new Publishing.YouTube.YouTubePublisher(this, host); } -diff --git a/plugins/shotwell-publishing/facebook_publishing_options_pane.glade b/plugins/shotwell-publishing/facebook_publishing_options_pane.glade -index 0ba57ad..567b8c8 100644 ---- a/plugins/shotwell-publishing/facebook_publishing_options_pane.glade -+++ b/plugins/shotwell-publishing/facebook_publishing_options_pane.glade -@@ -196,29 +196,14 @@ anything put into this field won't display) +Index: shotwell-0.13.1/plugins/shotwell-publishing/facebook_publishing_options_pane.glade +=================================================================== +--- shotwell-0.13.1.orig/plugins/shotwell-publishing/facebook_publishing_options_pane.glade 2012-10-05 19:51:09.000000000 +0200 ++++ shotwell-0.13.1/plugins/shotwell-publishing/facebook_publishing_options_pane.glade 2012-10-11 11:15:47.552233502 +0200 +@@ -196,29 +196,14 @@ True False @@ -2496,7 +2494,7 @@ True True True -@@ -229,13 +214,13 @@ anything put into this field won't display) +@@ -229,13 +214,13 @@ False True 80 @@ -2512,11 +2510,11 @@ 2 3 -diff --git a/plugins/shotwell-publishing/flickr_publishing_options_pane.glade b/plugins/shotwell-publishing/flickr_publishing_options_pane.glade -index e39a52e..b9edd04 100644 ---- a/plugins/shotwell-publishing/flickr_publishing_options_pane.glade -+++ b/plugins/shotwell-publishing/flickr_publishing_options_pane.glade -@@ -135,24 +135,6 @@ so changes made here will not display) +Index: shotwell-0.13.1/plugins/shotwell-publishing/flickr_publishing_options_pane.glade +=================================================================== +--- shotwell-0.13.1.orig/plugins/shotwell-publishing/flickr_publishing_options_pane.glade 2012-10-05 19:51:09.000000000 +0200 ++++ shotwell-0.13.1/plugins/shotwell-publishing/flickr_publishing_options_pane.glade 2012-10-11 11:15:47.556233503 +0200 +@@ -135,24 +135,6 @@ 64 True @@ -2541,7 +2539,7 @@ _Publish False -@@ -167,7 +149,7 @@ so changes made here will not display) +@@ -167,7 +149,7 @@ False True 24 @@ -2550,10 +2548,10 @@ -diff --git a/plugins/shotwell-publishing/picasa_publishing_options_pane.glade b/plugins/shotwell-publishing/picasa_publishing_options_pane.glade -index 07af67d..4d2cfb4 100644 ---- a/plugins/shotwell-publishing/picasa_publishing_options_pane.glade -+++ b/plugins/shotwell-publishing/picasa_publishing_options_pane.glade +Index: shotwell-0.13.1/plugins/shotwell-publishing/picasa_publishing_options_pane.glade +=================================================================== +--- shotwell-0.13.1.orig/plugins/shotwell-publishing/picasa_publishing_options_pane.glade 2012-10-05 19:51:09.000000000 +0200 ++++ shotwell-0.13.1/plugins/shotwell-publishing/picasa_publishing_options_pane.glade 2012-10-11 11:15:47.556233503 +0200 @@ -226,32 +226,16 @@ True @@ -2605,11 +2603,19 @@ 4 -diff --git a/po/shotwell-core/shotwell.pot b/po/shotwell-core/shotwell.pot -index df41958..cee8286 100644 ---- a/po/shotwell-core/shotwell.pot -+++ b/po/shotwell-core/shotwell.pot -@@ -2326,6 +2326,10 @@ msgstr "" +Index: shotwell-0.13.1/po/shotwell-core/shotwell.pot +=================================================================== +--- shotwell-0.13.1.orig/po/shotwell-core/shotwell.pot 2012-10-05 19:51:09.000000000 +0200 ++++ shotwell-0.13.1/po/shotwell-core/shotwell.pot 2012-10-11 11:15:47.564233502 +0200 +@@ -2122,6 +2122,7 @@ + msgstr "" + + #: src/photos/RawSupport.vala:297 src/MediaPage.vala:413 ++#: misc/shotwell.application:2 + msgid "Shotwell" + msgstr "" + +@@ -2326,6 +2327,10 @@ msgid "Publish photos and videos _to" msgstr "" @@ -2620,15 +2626,11 @@ #: src/publishing/PublishingUI.vala:354 msgid "Unable to publish" msgstr "" -@@ -3932,3 +3936,19 @@ msgstr "" +@@ -3932,3 +3937,15 @@ #: ui/shotwell.glade:995 msgid "Plugins" msgstr "" + -+#: misc/shotwell.application:2 -+msgid "Shotwell" -+msgstr "" -+ +#: misc/shotwell.application:9 +msgid "Publish your pictures to Picasa" +msgstr "" @@ -2640,11 +2642,11 @@ +#: misc/shotwell.application:15 +msgid "Publish your pictures to Flickr" +msgstr "" -diff --git a/src/plugins/PublishingInterfaces.vala b/src/plugins/PublishingInterfaces.vala -index 339cc9d..4ed2bec 100644 ---- a/src/plugins/PublishingInterfaces.vala -+++ b/src/plugins/PublishingInterfaces.vala -@@ -494,6 +494,7 @@ public interface PluginHost : GLib.Object, Spit.HostInterface { +Index: shotwell-0.13.1/src/plugins/PublishingInterfaces.vala +=================================================================== +--- shotwell-0.13.1.orig/src/plugins/PublishingInterfaces.vala 2012-10-05 19:51:09.000000000 +0200 ++++ shotwell-0.13.1/src/plugins/PublishingInterfaces.vala 2012-10-11 11:15:47.564233502 +0200 +@@ -494,6 +494,7 @@ */ public abstract Spit.Publishing.Publisher.MediaType get_publishable_media_type(); @@ -2652,7 +2654,7 @@ // // For future expansion. // -@@ -579,18 +580,26 @@ public interface Service : Object, Spit.Pluggable { +@@ -579,18 +580,26 @@ * A factory method that instantiates and returns a new {@link Publisher} object that * encapsulates a connection to the remote publishing service that this Service describes. */ @@ -2682,11 +2684,11 @@ protected virtual void reserved2() {} protected virtual void reserved3() {} protected virtual void reserved4() {} -diff --git a/src/publishing/PublishingPluginHost.vala b/src/publishing/PublishingPluginHost.vala -index 7be7bed..c0417f8 100644 ---- a/src/publishing/PublishingPluginHost.vala -+++ b/src/publishing/PublishingPluginHost.vala -@@ -21,7 +21,8 @@ public class ConcretePublishingHost : Plugins.StandardHostInterface, +Index: shotwell-0.13.1/src/publishing/PublishingPluginHost.vala +=================================================================== +--- shotwell-0.13.1.orig/src/publishing/PublishingPluginHost.vala 2012-10-05 19:51:09.000000000 +0200 ++++ shotwell-0.13.1/src/publishing/PublishingPluginHost.vala 2012-10-11 11:15:47.568233502 +0200 +@@ -21,7 +21,8 @@ private Spit.Publishing.Publisher.MediaType media_type = Spit.Publishing.Publisher.MediaType.NONE; @@ -2696,7 +2698,7 @@ Publishable[] publishables) { base(service, "sharing"); this.dialog = dialog; -@@ -30,7 +31,7 @@ public class ConcretePublishingHost : Plugins.StandardHostInterface, +@@ -30,7 +31,7 @@ foreach (Publishable curr_publishable in publishables) this.media_type |= curr_publishable.get_media_type(); @@ -2705,7 +2707,7 @@ } private void on_login_clicked() { -@@ -232,6 +233,13 @@ public class ConcretePublishingHost : Plugins.StandardHostInterface, +@@ -232,6 +233,13 @@ return report_plugin_upload_progress; } @@ -2719,11 +2721,11 @@ } } -diff --git a/src/publishing/PublishingUI.vala b/src/publishing/PublishingUI.vala -index b7f7f75..a3d404c 100644 ---- a/src/publishing/PublishingUI.vala -+++ b/src/publishing/PublishingUI.vala -@@ -130,6 +130,11 @@ public class LoginWaitPane : StaticMessagePane { +Index: shotwell-0.13.1/src/publishing/PublishingUI.vala +=================================================================== +--- shotwell-0.13.1.orig/src/publishing/PublishingUI.vala 2012-10-05 19:51:09.000000000 +0200 ++++ shotwell-0.13.1/src/publishing/PublishingUI.vala 2012-10-11 11:15:47.568233502 +0200 +@@ -130,6 +130,11 @@ } public class PublishingDialog : Gtk.Dialog { @@ -2735,7 +2737,7 @@ private const int LARGE_WINDOW_WIDTH = 860; private const int LARGE_WINDOW_HEIGHT = 688; private const int COLOSSAL_WINDOW_WIDTH = 1024; -@@ -151,6 +156,8 @@ public class PublishingDialog : Gtk.Dialog { +@@ -151,6 +156,8 @@ private Spit.Publishing.DialogPane active_pane; private Spit.Publishing.Publishable[] publishables; private Spit.Publishing.ConcretePublishingHost host; @@ -2744,7 +2746,7 @@ protected PublishingDialog(Gee.Collection to_publish) { assert(to_publish.size > 0); -@@ -158,6 +165,8 @@ public class PublishingDialog : Gtk.Dialog { +@@ -158,6 +165,8 @@ resizable = false; delete_event.connect(on_window_close); @@ -2753,7 +2755,16 @@ publishables = new Spit.Publishing.Publishable[0]; bool has_photos = false; bool has_videos = false; -@@ -206,9 +215,28 @@ public class PublishingDialog : Gtk.Dialog { +@@ -198,7 +207,7 @@ + // get the name of the service the user last used + string? last_used_service = Config.Facade.get_instance().get_last_used_service(); + +- Spit.Publishing.Service[] loaded_services = load_services(has_photos, has_videos); ++ Spit.Publishing.Service[] loaded_services = load_services(has_photos, has_videos, null); + int ticker = 0; + int last_used_index = -1; + foreach (Spit.Publishing.Service service in loaded_services) { +@@ -206,9 +215,28 @@ if (last_used_service != null && last_used_service == curr_service_id) last_used_index = ticker; @@ -2784,15 +2795,82 @@ if (last_used_index >= 0) service_selector_box.set_active(last_used_index); else -@@ -296,6 +324,7 @@ public class PublishingDialog : Gtk.Dialog { +@@ -289,24 +317,35 @@ + return loaded_services; + } + +- private static Spit.Publishing.Service[] load_services(bool has_photos, bool has_videos) { ++ private static Spit.Publishing.Service[] load_services(bool has_photos, bool has_videos, ++ out bool has_disabled_services) { + assert (has_photos || has_videos); + + Spit.Publishing.Service[] filtered_services = new Spit.Publishing.Service[0]; Spit.Publishing.Service[] all_services = load_all_services(); ++ has_disabled_services = false; foreach (Spit.Publishing.Service service in all_services) { -+ if (!service.is_enabled()) continue; ++ bool supports_media = false; if (has_photos && !has_videos) { if ((service.get_supported_media() & Spit.Publishing.Publisher.MediaType.PHOTO) != 0) -@@ -384,21 +413,34 @@ public class PublishingDialog : Gtk.Dialog { +- filtered_services += service; ++ supports_media = true; + } else if (!has_photos && has_videos) { + if ((service.get_supported_media() & Spit.Publishing.Publisher.MediaType.VIDEO) != 0) +- filtered_services += service; ++ supports_media = true; + } else { + if (((service.get_supported_media() & Spit.Publishing.Publisher.MediaType.PHOTO) != 0) && + ((service.get_supported_media() & Spit.Publishing.Publisher.MediaType.VIDEO) != 0)) ++ supports_media = true; ++ } ++ ++ if (supports_media) { ++ if (service.is_enabled()) { + filtered_services += service; ++ } else { ++ has_disabled_services = true; ++ } + } + } + +@@ -345,15 +384,29 @@ + Gee.ArrayList