Merge lp:~voldyman/maya/contractor-fix into lp:~elementary-apps/maya/trunk

[Akshay Shekher]

now using the new Contractor API from granite.

now using the new Contractor API from granite.

[Corentin Noël (tintou)]

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2013-06-09 23:29:58 +0000
+++ CMakeLists.txt	2013-07-12 13:28:00 +0000
@@ -86,7 +86,6 @@
     Maya/Application.vala
     Maya/Model/CalendarModel.vala
     Maya/Model/SourceManager.vala
-    Maya/Services/Contractor.vala
     Maya/Services/Dexter.vala
     Maya/Settings/MayaSettings.vala
     Maya/Settings/SavedState.vala
 
=== removed file 'Maya/Services/Contractor.vala'
--- Maya/Services/Contractor.vala	2012-03-18 03:12:54 +0000
+++ Maya/Services/Contractor.vala	1970-01-01 00:00:00 +0000
@@ -1,27 +0,0 @@
-//
-//  Copyright (C) 2011-2012 Jaap Broekhuizen <[e-mail]>
-//
-//  This program is free software: you can redistribute it and/or modify
-//  it under the terms of the GNU General Public License as published by
-//  the Free Software Foundation, either version 3 of the License, or
-//  (at your option) any later version.
-//
-//  This program is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//  GNU General Public License for more details.
-//
-//  You should have received a copy of the GNU General Public License
-//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
-//
-
-namespace Maya.Services {
-
-	[DBus (name = "org.elementary.contractor")]
-    public interface Contractor : Object
-    {
-        public abstract GLib.HashTable<string,string>[] GetServicesByLocation (string strlocation, string? file_mime="text/calendar") throws IOError;
-    }
-
-}
-
 
=== modified file 'Maya/View/Widgets/ContractorButtonWithMenu.vala'
--- Maya/View/Widgets/ContractorButtonWithMenu.vala	2013-02-17 17:04:21 +0000
+++ Maya/View/Widgets/ContractorButtonWithMenu.vala	2013-07-12 13:28:00 +0000
@@ -17,55 +17,50 @@
 
 namespace Maya.View.Widgets {
 
+    public class ContractorMenuItem : Gtk.MenuItem {
+        private Granite.Services.Contract contract;
+
+        public ContractorMenuItem (Granite.Services.Contract cont) {
+            this.contract = cont;
+
+            label = cont.get_display_name ();
+        }
+
+        public override void activate () {
+            /* creates a .ics file */
+            Util.save_temp_selected_calendars ();
+
+            string file_path = GLib.Environment.get_tmp_dir () + "/calendar.ics";
+            File cal_file = File.new_for_path(file_path);
+
+            try {
+                contract.execute_with_file (cal_file);
+            } catch (Error err) {
+                warning (err.message);
+            }
+        }
+    }
+
     public class ContractorButtonWithMenu : Granite.Widgets.ToolButtonWithMenu {
 
-        private Maya.Services.Contractor contract;
-        private HashTable<string,string>[] services;
         private Gtk.FileChooserDialog filechooser;
 
         public ContractorButtonWithMenu (string tooltiptext) {
 
             base (new Gtk.Image.from_icon_name ("document-export", Gtk.IconSize.MENU), tooltiptext, new Gtk.Menu());
-
-            // try to connect
-            try {
-                contract = Bus.get_proxy_sync (BusType.SESSION,
-                                               "org.elementary.contractor",
-                                               "/org/elementary/contractor");
-
-                // get the list and parse it into the menu
-                services = contract.GetServicesByLocation (GLib.Environment.get_tmp_dir () + "/calendar.ics");
-                foreach (HashTable<string,string> service in services) {
-                    Gtk.MenuItem item = new Gtk.MenuItem.with_label(service.lookup ("Description"));
-                    item.activate.connect (activate_contract);
-                    menu.append (item);
-                }
-                    Gtk.MenuItem item = new Gtk.MenuItem.with_label(_("Export Calendar..."));
-                    item.activate.connect (savecal);
-                    menu.append (item);
-            } catch (IOError e) {
-                stderr.printf ("%s\n", e.message);
-            }
-
-        }
-
-        private void activate_contract () {
-            /* creates a .ics file */
-            Util.save_temp_selected_calendars ();
-            Gtk.MenuItem menuitem = (Gtk.MenuItem) menu.get_active();
-            string app_menu = menuitem.get_label();
-
-            foreach (HashTable<string,string> service in services) {
-                if (app_menu == service.lookup ("Description")) {
-                    try {
-                        GLib.Process.spawn_command_line_async (service.lookup ("Exec"));
-                    } catch (SpawnError e) {
-                        warning (e.message);
-                    }
-
-                    break;
-                }
-            }
+            var contracts = Granite.Services.ContractorProxy.get_contracts_by_mime ("text/calender");
+
+            for (int i = 0; i < contracts.size; i++) {
+                var contract = contracts.get (i);
+                Gtk.MenuItem menu_item;
+
+                menu_item = new ContractorMenuItem (contract);
+                menu.append (menu_item);
+            }
+            Gtk.MenuItem item = new Gtk.MenuItem.with_label(_("Export Calendar..."));
+            item.activate.connect (savecal);
+            menu.append (item);
+
         }
 
         private void savecal () {