@@ -4,7 +4,7 @@ project(

   'c',

   license: 'GPL-3.0',

   meson_version: '>=0.55.0',

-  version: '0.1.0'

+  version: '0.2.0'

 )

 vala = meson.get_compiler('vala')

@@ -15,6 +15,8 @@ glib_dep = dependency('gtk+-3.0')

 conf = configuration_data()

 conf.set_quoted('APP_ID', meson.project_name())

+conf.set_quoted('BRIDGE_DBUS_SERVICE_NAME', 'com.paysonwallach.amber.bridge')

+conf.set_quoted('BRIDGE_DBUS_OBJECT_PATH', '/com/paysonwallach/amber/bridge')

 config_h = configure_file(

   output: 'config.h',

@@ -17,13 +17,13 @@

 namespace Amber {

     [DBus (name = "com.paysonwallach.amber.bridge")]

-    public interface HostConnectorBusIFace : Object {

+    public interface BrowserProxyBusIFace : Object {

         public abstract bool open (string[] urls) throws DBusError, IOError;

     }

     public class Helper : Application {

-        private HostConnectorBusIFace? host_connector;

+        private uint watch_id = 0U;

         public Helper () {

             Object (

@@ -31,24 +31,63 @@ namespace Amber {

                 flags: ApplicationFlags.HANDLES_OPEN);

         }

-        public override void open (File[] files, string hint) {

-            var i = 0;

-            var uris = new string[files.length];

-            foreach (File file in files) {

-                uris[i++] = file.get_uri ();

-            }

+        private void request_proxy_open (string[] uris) throws DBusError, IOError {

+            BrowserProxyBusIFace? browser_proxy = Bus.get_proxy_sync (

+                BusType.SESSION,

+                Config.BRIDGE_DBUS_SERVICE_NAME,

+                Config.BRIDGE_DBUS_OBJECT_PATH);

+

+            browser_proxy.open (uris);

+            release ();

+        }

+

+        private void request_browser_launch (string[] uris) {

+            var app_info = AppInfo.get_default_for_type ("text/html", false);

+            if (app_info == null)

+                return;

             try {

-                host_connector = Bus.get_proxy_sync (

+                app_info.launch_uris (null, null);

+                watch_id = Bus.watch_name (

                     BusType.SESSION,

-                    "com.paysonwallach.amber.bridge",

-                    "/com/paysonwallach/amber/bridge");

-                host_connector.open (uris);

+                    Config.BRIDGE_DBUS_SERVICE_NAME, BusNameWatcherFlags.NONE,

+                    () => on_name_acquired (uris));

+            } catch (Error err) {

+                warning (@"unable to get default type: $(err.message)");

+            }

+        }

+

+        private void on_name_acquired (string[] uris) {

+            try {

+                request_proxy_open (uris);

             } catch (DBusError err) {

                 warning (@"DBusError: $(err.message)");

             } catch (IOError err) {

                 warning (@"IOError: $(err.message)");

             }

+

+            if (watch_id != 0U)

+                Bus.unwatch_name (watch_id);

+        }

+

+        public override void open (File[] files, string hint) {

+            hold ();

+

+            var uris = new string[files.length];

+            for (var i = 0 ; i < files.length ; i++)

+                uris[i] = files[i].get_uri ();

+

+            try {

+                request_proxy_open (uris);

+            } catch (DBusError err) {

+                if (err.code == DBusError.SERVICE_UNKNOWN) {

+                    request_browser_launch (uris);

+                } else {

+                    warning (@"DBusError: $(err.message)");

+                }

+            } catch (IOError err) {

+                warning (@"IOError: $(err.message)");

+            }

         }

     }

@@ -1,4 +1,6 @@

 [CCode (cprefix = "", lower_case_cprefix = "", cheader_filename = "config.h")]

 namespace Config {

     public const string APP_ID;

+    public const string BRIDGE_DBUS_SERVICE_NAME;

+    public const string BRIDGE_DBUS_OBJECT_PATH;

 }