Merge documentation updates from 2.2 into c-implementation

[browser-switch] / main.c

diff --git a/main.c b/main.c
index e84c2be..73ca570 100644 (file)
--- a/main.c
+++ b/main.c
@@ -160,7 +160,7 @@ out_noopen:
 }
 
 int main() {
-       OssoBrowser *obj;
+       OssoBrowser *obj_osso_browser, *obj_osso_browser_req;
        GMainLoop *mainloop;
        GError *error = NULL;
 
@@ -169,6 +169,7 @@ int main() {
        if (ctx.continuous_mode) {
                struct sigaction act;
                act.sa_flags = SA_RESTART;
+               sigemptyset(&(act.sa_mask));
 
                act.sa_handler = waitforzombies;
                if (sigaction(SIGCHLD, &act, NULL) == -1) {
@@ -203,11 +204,13 @@ int main() {
 
        dbus_request_osso_browser_name(&ctx);
 
-       obj = g_object_new(OSSO_BROWSER_TYPE, NULL);
+       obj_osso_browser = g_object_new(OSSO_BROWSER_TYPE, NULL);
+       obj_osso_browser_req = g_object_new(OSSO_BROWSER_TYPE, NULL);
        dbus_g_connection_register_g_object(ctx.session_bus,
-                       "/com/nokia/osso_browser", G_OBJECT(obj));
+                       "/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));
+                       "/com/nokia/osso_browser/request",
+                       G_OBJECT(obj_osso_browser_req));
 
        mainloop = g_main_loop_new(NULL, FALSE);
        printf("Starting main loop\n");