Merge lp:~mardy/shotwell/lp1060586 into lp:~ubuntu-desktop/shotwell/ubuntu

[Alberto Mardegan]

Better handling of missing publishing services

When there are no publishing services available:
- if all plugins are disabled, show the error message to instruct the user
  about re-enabling them.
- if some plugins are enabled but they miss a corresponding account (or the
  account is disabled), bring up the Online Accounts panel.

=== modified file 'debian/patches/06_uoa.patch'
--- debian/patches/06_uoa.patch	2012-09-24 08:34:40 +0000
+++ debian/patches/06_uoa.patch	2012-10-03 12:25:18 +0000
@@ -2606,10 +2606,18 @@
        </packing>
      </child>
 diff --git a/po/shotwell-core/shotwell.pot b/po/shotwell-core/shotwell.pot
-index df41958..cee8286 100644
+index df41958..7c8619c 100644
 --- a/po/shotwell-core/shotwell.pot
 +++ b/po/shotwell-core/shotwell.pot
-@@ -2326,6 +2326,10 @@ msgstr ""
+@@ -2122,6 +2122,7 @@ msgid "RAW"
+ msgstr ""
+ 
+ #: src/photos/RawSupport.vala:297 src/MediaPage.vala:413
++#: misc/shotwell.application:2
+ msgid "Shotwell"
+ msgstr ""
+ 
+@@ -2326,6 +2327,10 @@ msgstr ""
  msgid "Publish photos and videos _to"
  msgstr ""
  
@@ -2620,15 +2628,11 @@
  #: src/publishing/PublishingUI.vala:354
  msgid "Unable to publish"
  msgstr ""
-@@ -3932,3 +3936,19 @@ msgstr ""
+@@ -3932,3 +3937,15 @@ msgstr ""
  #: 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 ""
@@ -2720,7 +2724,7 @@
  
  }
 diff --git a/src/publishing/PublishingUI.vala b/src/publishing/PublishingUI.vala
-index b7f7f75..a3d404c 100644
+index b7f7f75..2a72b43 100644
 --- a/src/publishing/PublishingUI.vala
 +++ b/src/publishing/PublishingUI.vala
 @@ -130,6 +130,11 @@ public class LoginWaitPane : StaticMessagePane {
@@ -2753,6 +2757,15 @@
          publishables = new Spit.Publishing.Publishable[0];
          bool has_photos = false;
          bool has_videos = false;
+@@ -198,7 +207,7 @@ public class PublishingDialog : Gtk.Dialog {
+         // 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 @@ public class PublishingDialog : Gtk.Dialog {
              if (last_used_service != null && last_used_service == curr_service_id)
                  last_used_index = ticker;
@@ -2784,15 +2797,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 @@ public class PublishingDialog : Gtk.Dialog {
+         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 @@ public class PublishingDialog : Gtk.Dialog {
+         Gee.ArrayList<Video> videos = new Gee.ArrayList<Video>();
+         MediaSourceCollection.filter_media(to_publish, photos, videos);
+         
++        bool has_disabled_services = false;
+         Spit.Publishing.Service[] avail_services =
+-            load_services((photos.size > 0), (videos.size > 0));
++            load_services((photos.size > 0), (videos.size > 0), out has_disabled_services);
+         
+         if (avail_services.length == 0) {
+-            // There are no enabled publishing services that accept this media type,
+-            // warn the user.
+-            AppWindow.error_message_with_title(_("Unable to publish"),
+-                _("Shotwell cannot publish the selected items because you do not have a compatible publishing plugin enabled. To correct this, choose <b>Edit %s Preferences</b> and enable one or more of the publishing plugins on the <b>Plugins</b> tab.").printf("▸"),
+-                null, false);
++            if (has_disabled_services) {
++                try
++                {
++                    DesktopAppInfo app_info =
++                        new DesktopAppInfo ("gnome-credentials-panel.desktop");
++                    GLib.Process.spawn_command_line_async(app_info.get_commandline() + " application=shotwell");
++                }
++                catch (Error e)
++                {
++                    warning ("Error launching Online Accounts: %s", e.message);
++                }
++            } else {
++                // There are no enabled publishing services that accept this media type,
++                // warn the user.
++                AppWindow.error_message_with_title(_("Unable to publish"),
++                    _("Shotwell cannot publish the selected items because you do not have a compatible publishing plugin enabled. To correct this, choose <b>Edit %s Preferences</b> and enable one or more of the publishing plugins on the <b>Plugins</b> tab.").printf("▸"),
++                    null, false);
++            }
+ 
+             return;
+         }
+@@ -384,21 +437,34 @@ public class PublishingDialog : Gtk.Dialog {
      }
  
      private void on_service_changed() {