#include "dbus-server-glue.h"
-static void open_address(const char * uri) {
- char * new_uri;
+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;
+
+ if (uri[0] == '/') {
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,
* The com.nokia.osso_browser D-Bus interface
*/
gboolean osso_browser_load_url(OssoBrowser *obj,
- const char * uri, GError **error) {
+ const char *uri, GError **error) {
open_address(uri);
return TRUE;
}
gboolean osso_browser_mime_open(OssoBrowser *obj,
- const char * uri, GError **error) {
+ const char *uri, GError **error) {
open_address(uri);
return TRUE;
}
gboolean osso_browser_open_new_window(OssoBrowser *obj,
- const char * uri, GError **error) {
+ const char *uri, GError **error) {
open_address(uri);
return TRUE;
}
/* This is a "undocumented", non-standard extension to the API, ONLY
for use by /usr/bin/browser wrapper to implement --url */
gboolean osso_browser_switchboard_launch_microb(OssoBrowser *obj,
- const char * uri, GError **error) {
+ const char *uri, GError **error) {
launch_microb(&ctx, (char *)uri);
return TRUE;
}
/* Register the name com.nokia.osso_browser on the D-Bus session bus */
-void dbus_request_osso_browser_name(struct swb_context * ctx) {
- GError * error = NULL;
+void dbus_request_osso_browser_name(struct swb_context *ctx) {
+ GError *error = NULL;
guint result;
if (!ctx || !ctx->dbus_proxy)
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);
}
}
/* Release the name com.nokia.osso_browser on the D-Bus session bus */
-void dbus_release_osso_browser_name(struct swb_context * ctx) {
- GError * error = NULL;
+void dbus_release_osso_browser_name(struct swb_context *ctx) {
+ GError *error = NULL;
guint result;
if (!ctx || !ctx->dbus_proxy)
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);
}