Merge lp:~mhr3/libunity/fix-1235342 into lp:libunity

[Michal Hruby]

libunity-tool: Use protocol library to get scope information

Use protocol library to get scope information.

[Paweł Stołowski (stolowski)]

+1

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'tools/unity-tool.vala'
--- tools/unity-tool.vala	2013-09-02 11:38:31 +0000
+++ tools/unity-tool.vala	2013-10-04 16:15:36 +0000
@@ -116,13 +116,20 @@
     }
   };
 
-  public static void get_scope_params_from_file(string filename) throws GLib.KeyFileError, GLib.FileError
+  public static void get_scope_params_from_file(string filename) throws Error
   {
-      var keyfile = new KeyFile ();
-      keyfile.load_from_file(filename, 0);
+    Unity.Protocol.ScopeRegistry.ScopeMetadata metadata;
+    if (Path.is_absolute (filename))
+    {
+      metadata = Unity.Protocol.ScopeRegistry.ScopeMetadata.for_path (filename);
+    }
+    else
+    {
+      metadata = Unity.Protocol.ScopeRegistry.ScopeMetadata.for_id (filename);
+    }
 
-      Options.scope_dbus_name = keyfile.get_string ("Scope", "DBusName");
-      Options.scope_dbus_path = keyfile.get_string ("Scope", "DBusPath");
+    Options.scope_dbus_name = metadata.dbus_name;
+    Options.scope_dbus_path = metadata.dbus_path;
   }
 
   public static void warn (string format, ...)