X-Git-Url: http://git.maemo.org/git/?p=browser-switch;a=blobdiff_plain;f=dbus-server-bindings.c;h=939056b87824910fe95c99eee6625907dfccd9df;hp=c61088131d6bd54d73a8009b7385604d8640dd94;hb=ccafdc8aa381ffd2c295f920e897472536dd9b28;hpb=42f0af690415fc59317203a187501c00c012c9d9

diff --git a/dbus-server-bindings.c b/dbus-server-bindings.c
index c610881..939056b 100644
--- a/dbus-server-bindings.c
+++ b/dbus-server-bindings.c
@@ -47,19 +47,24 @@ static void open_address(const char *uri) {
 	char *new_uri;
 	size_t new_uri_len;
 
-	if (!uri && uri[0] == '/') {
+	if (!uri)
+		/* Not much to do in this case ... */
+		return;
+
+	printf("open_address '%s'\n", uri);
+	if (uri[0] == '/') {
+		/* URI begins with a '/' -- assume it points to a local file
+		   and prefix with "file://" */
 		new_uri_len = strlen("file://") + strlen(uri) + 1;
 		if (!(new_uri = calloc(new_uri_len, sizeof(char))))
 			exit(1);
-		strncpy(new_uri, "file://", strlen("file://"));
-		strncat(new_uri, uri, strlen(uri));
+		snprintf(new_uri, new_uri_len, "%s%s", "file://", uri);
 
 		launch_browser(&ctx, new_uri);
 		/* If launch_browser didn't exec something in this process,
 		   we need to clean up after ourselves */
 		free(new_uri);
 	} else {
-		printf("open_address '%s'\n", uri);
 		launch_browser(&ctx, (char *)uri);
 	}
 }
@@ -110,11 +115,11 @@ void dbus_request_osso_browser_name(struct swb_context *ctx) {
 		return;
 
 	if (!dbus_g_proxy_call(ctx->dbus_proxy, "RequestName", &error,
-				G_TYPE_STRING, "com.nokia.osso_browser",
-				G_TYPE_UINT, DBUS_NAME_FLAG_REPLACE_EXISTING|DBUS_NAME_FLAG_DO_NOT_QUEUE,
-				G_TYPE_INVALID,
-				G_TYPE_UINT, &result,
-				G_TYPE_INVALID)) {
+			       G_TYPE_STRING, "com.nokia.osso_browser",
+			       G_TYPE_UINT, DBUS_NAME_FLAG_REPLACE_EXISTING|DBUS_NAME_FLAG_DO_NOT_QUEUE,
+			       G_TYPE_INVALID,
+			       G_TYPE_UINT, &result,
+			       G_TYPE_INVALID)) {
 		printf("Couldn't acquire name com.nokia.osso_browser\n");
 		exit(1);
 	}
@@ -133,8 +138,8 @@ void dbus_release_osso_browser_name(struct swb_context *ctx) {
 		return;
 
 	dbus_g_proxy_call(ctx->dbus_proxy, "ReleaseName", &error,
-				G_TYPE_STRING, "com.nokia.osso_browser",
-				G_TYPE_INVALID,
-				G_TYPE_UINT, &result,
-				G_TYPE_INVALID);
+			  G_TYPE_STRING, "com.nokia.osso_browser",
+			  G_TYPE_INVALID,
+			  G_TYPE_UINT, &result,
+			  G_TYPE_INVALID);
 }