Merge lp:~elementary-apps/pantheon-files/contractor-supports-multiple into lp:~elementary-apps/pantheon-files/trunk

[Tom Beckmann]

This branch implements the new functionality provided by contractor's support_multiple_files field by filtering out contracts which only support a single file, if multiple have been selected.

Depends on https://code.launchpad.net/~elementary-apps/granite/contractor-supports-multiple/+merge/231133
which depends on https://code.launchpad.net/~elementary-apps/contractor/multiple-files/+merge/231132

Unmerged revisions

1579. By Tom Beckmann on 2014-08-17

add support for contractor's support_multiple_files field

=== modified file 'plugins/contractor/plugin.vala'
--- plugins/contractor/plugin.vala	2013-05-12 05:49:12 +0000
+++ plugins/contractor/plugin.vala	2014-08-17 21:26:01 +0000
@@ -56,6 +56,8 @@
         File[] files = null;
         Gee.List<Granite.Services.Contract> contracts = null;
 
+        bool needs_multiple_support;
+
         try {
             if (gof_files == null) {
                 if (current_directory == null)
@@ -69,9 +71,11 @@
                 if (mimetype == null)
                     return;
 
+                needs_multiple_support = false;
                 contracts = Granite.Services.ContractorProxy.get_contracts_by_mime (mimetype);
             } else {
                 files = get_file_array (gof_files);
+                needs_multiple_support = gof_files.length () > 1;
                 var mimetypes = get_mimetypes (gof_files);
                 contracts = Granite.Services.ContractorProxy.get_contracts_by_mimelist (mimetypes);
             }
@@ -81,6 +85,10 @@
 
             for (int i = 0; i < contracts.size; i++) {
                 var contract = contracts.get (i);
+
+                if (needs_multiple_support && !contract.supports_multiple_files ())
+                    continue;
+
                 Gtk.MenuItem menu_item;
 
                 // insert separator if we got at least 1 contract