Merge documentation updates from 2.2 into c-implementation

[browser-switch] / main.c

diff --git a/main.c b/main.c
index 5429a59..73ca570 100644 (file)
--- a/main.c
+++ b/main.c
@@ -40,7 +40,7 @@
 
 struct swb_context ctx;
 
-static void set_config_defaults(struct swb_context * ctx) {
+static void set_config_defaults(struct swb_context *ctx) {
        if (!ctx)
                return;
        free(ctx->other_browser_cmd);
@@ -71,8 +71,7 @@ static void read_config(int signalnum) {
        len = strlen(homedir) + strlen(CONFIGFILE_LOC) + 1;
        if (!(configfile = calloc(len, sizeof(char))))
                goto out_noopen;
-       strncpy(configfile, homedir, strlen(homedir));
-       strncat(configfile, CONFIGFILE_LOC, strlen(CONFIGFILE_LOC));
+       snprintf(configfile, len, "%s%s", homedir, CONFIGFILE_LOC);
 
        if (!(fp = fopen(configfile, "r")))
                goto out_noopen;
@@ -101,7 +100,6 @@ static void read_config(int signalnum) {
        /* Read in the config file one line at a time and parse it
           XXX doesn't deal with lines longer than MAXLINE */
        while (fgets(buf, MAXLINE, fp)) {
-               printf("%s", buf);
                /* skip blank lines and comments */
                if (!regexec(&re_ignore, buf, 0, NULL, 0))
                        continue;
@@ -162,15 +160,16 @@ out_noopen:
 }
 
 int main() {
-       OssoBrowser * obj;
-       GMainLoop * mainloop;
-       GError * error = NULL;
+       OssoBrowser *obj_osso_browser, *obj_osso_browser_req;
+       GMainLoop *mainloop;
+       GError *error = NULL;
 
        read_config(0);
 
        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) {
@@ -205,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");