X-Git-Url: http://git.maemo.org/git/?p=browser-switch;a=blobdiff_plain;f=main.c;h=c148bacae7390b9448d28b7bcddc2a7339510e9e;hp=99b2fadeb586bf90d060074210ff6f2b968b5316;hb=534cd85acbc5979b385f75e08e33724649825043;hpb=4e09868aec19cdc25a5d991fff8d93ec90c013d8

diff --git a/main.c b/main.c
index 99b2fad..c148bac 100644
--- a/main.c
+++ b/main.c
@@ -66,6 +66,9 @@ static void read_config(int signalnum) {
 	} else
 		ctx.other_browser_cmd = NULL;
 	update_default_browser(&ctx, cfg.default_browser);
+#ifdef FREMANTLE
+	ctx.autostart_microb = cfg.autostart_microb;
+#endif
 
 	log_msg("continuous_mode: %d\n", cfg.continuous_mode);
 	log_msg("default_browser: '%s'\n", cfg.default_browser);
@@ -78,8 +81,9 @@ static void read_config(int signalnum) {
 }
 
 int main() {
-	OssoBrowser *obj_osso_browser, *obj_osso_browser_req;
-	OssoBrowser *obj_osso_browser_sys, *obj_osso_browser_sys_req;
+	OssoBrowser *obj_osso_browser, *obj_osso_browser_sys;
+        OssoBrowser *obj_osso_browser_req, *obj_osso_browser_sys_req;
+	OssoBrowser *obj_osso_browser_root, *obj_osso_browser_sys_root;
 	GMainLoop *mainloop;
 	GError *error = NULL;
 	int reqname_result;
@@ -142,7 +146,7 @@ int main() {
 			error->message);
 		return 1;
 	}
-	if (reqname_result != DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER) {  
+	if (reqname_result != DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER) {
 		log_msg("Another browser-switchboard already running\n");
 		return 1;
 	}
@@ -166,19 +170,25 @@ int main() {
 	/* Register ourselves to handle the osso_browser D-Bus methods */
 	obj_osso_browser = g_object_new(OSSO_BROWSER_TYPE, NULL);
 	obj_osso_browser_req = g_object_new(OSSO_BROWSER_TYPE, NULL);
+	obj_osso_browser_root = g_object_new(OSSO_BROWSER_TYPE, NULL);
 	obj_osso_browser_sys = g_object_new(OSSO_BROWSER_TYPE, NULL);
 	obj_osso_browser_sys_req = g_object_new(OSSO_BROWSER_TYPE, NULL);
+	obj_osso_browser_sys_root = g_object_new(OSSO_BROWSER_TYPE, NULL);
 	dbus_g_connection_register_g_object(ctx.session_bus,
 			"/com/nokia/osso_browser", G_OBJECT(obj_osso_browser));
 	dbus_g_connection_register_g_object(ctx.session_bus,
 			"/com/nokia/osso_browser/request",
 			G_OBJECT(obj_osso_browser_req));
+	dbus_g_connection_register_g_object(ctx.session_bus,
+			"/", G_OBJECT(obj_osso_browser_root));
 	dbus_g_connection_register_g_object(ctx.system_bus,
 			"/com/nokia/osso_browser",
 			G_OBJECT(obj_osso_browser_sys));
 	dbus_g_connection_register_g_object(ctx.system_bus,
 			"/com/nokia/osso_browser/request",
 			G_OBJECT(obj_osso_browser_sys_req));
+	dbus_g_connection_register_g_object(ctx.system_bus,
+			"/", G_OBJECT(obj_osso_browser_sys_root));
 
 	mainloop = g_main_loop_new(NULL, FALSE);
 	log_msg("Starting main loop\n");