X-Git-Url: http://git.maemo.org/git/?p=browser-switch;a=blobdiff_plain;f=main.c;h=545f9f2c25fd14d33379e3a78e53bac35a5dfb1f;hp=7f2f7db53330d198e72a8ff8a122a44bb91163b0;hb=846e68b8ffa979d30ed331c43020212ffdee2bf2;hpb=bdea97be42be2df37d6e0d29bbaa8114f3f727de

diff --git a/main.c b/main.c
index 7f2f7db..545f9f2 100644
--- a/main.c
+++ b/main.c
@@ -90,24 +90,27 @@ static void read_config(int signalnum) {
 	}
 	parse_config_file_end();
 
+out:
+	fclose(fp);
+out_noopen:
+	log_config(logger_name);
+	update_default_browser(&ctx, default_browser);
+
 	log_msg("continuous_mode: %d\n", ctx.continuous_mode);
 	log_msg("default_browser: '%s'\n",
 		default_browser?default_browser:"NULL");
 	log_msg("other_browser_cmd: '%s'\n",
 		ctx.other_browser_cmd?ctx.other_browser_cmd:"NULL");
+	log_msg("logging: '%s'\n",
+		logger_name?logger_name:"NULL");
 
-out:
-	fclose(fp);
-out_noopen:
-	log_config(logger_name);
-	update_default_browser(&ctx, default_browser);
 	free(logger_name);
 	free(default_browser);
 	return;
 }
 
 int main() {
-	OssoBrowser *obj_osso_browser, *obj_osso_browser_req;
+	OssoBrowser *obj_osso_browser, *obj_osso_browser_req, *obj_switchboard;
 	GMainLoop *mainloop;
 	GError *error = NULL;
 	int reqname_result;
@@ -154,14 +157,14 @@ int main() {
 		return 1;
 	}
 
-	/* Get the org.maemo.garage.browser-switchboard name from D-Bus, as
+	/* Get the org.maemo.garage.browser_switchboard name from D-Bus, as
 	   a form of locking to ensure that not more than one
 	   browser-switchboard process is active at any time.  With
 	   DBUS_NAME_FLAG_DO_NOT_QUEUE set and DBUS_NAME_FLAG_REPLACE_EXISTING
 	   not set, getting the name succeeds if and only if no other
 	   process owns the name. */
 	if (!dbus_g_proxy_call(ctx.dbus_proxy, "RequestName", &error,
-			       G_TYPE_STRING, "org.maemo.garage.browser-switchboard",
+			       G_TYPE_STRING, "org.maemo.garage.browser_switchboard",
 			       G_TYPE_UINT, DBUS_NAME_FLAG_DO_NOT_QUEUE,
 			       G_TYPE_INVALID,
 			       G_TYPE_UINT, &reqname_result,
@@ -180,11 +183,15 @@ 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_switchboard = 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,
+			"/org/maemo/garage/browser_switchboard",
+			G_OBJECT(obj_switchboard));
 
 	mainloop = g_main_loop_new(NULL, FALSE);
 	log_msg("Starting main loop\n");