Try legacy config file location if config file not found

[browser-switch] / main.c

diff --git a/main.c b/main.c
index e84c2be..66591c6 100644 (file)
--- a/main.c
+++ b/main.c
@@ -36,6 +36,7 @@
 
 #define DEFAULT_HOMEDIR "/home/user"
 #define CONFIGFILE_LOC "/.config/browser-switchboard"
 
 #define DEFAULT_HOMEDIR "/home/user"
 #define CONFIGFILE_LOC "/.config/browser-switchboard"

+#define CONFIGFILE_LOC_OLD "/.config/browser-proxy"

 #define MAXLINE 1024
 
 struct swb_context ctx;
 #define MAXLINE 1024
 
 struct swb_context ctx;

@@ -73,8 +74,14 @@ static void read_config(int signalnum) {
                goto out_noopen;
        snprintf(configfile, len, "%s%s", homedir, CONFIGFILE_LOC);
 
                goto out_noopen;
        snprintf(configfile, len, "%s%s", homedir, CONFIGFILE_LOC);
 

-       if (!(fp = fopen(configfile, "r")))
-               goto out_noopen;
+       if (!(fp = fopen(configfile, "r"))) {
+               /* Try the legacy config file location before giving up
+                  XXX we assume here that CONFIGFILE_LOC_OLD is shorter
+                  than CONFIGFILE_LOC! */
+               snprintf(configfile, len, "%s%s", homedir, CONFIGFILE_LOC_OLD);
+               if (!(fp = fopen(configfile, "r")))
+                       goto out_noopen;
+       }

 
        /* compile regex matching blank lines or comments */
        if (regcomp(&re_ignore, "^[[:space:]]*(#|$)", REG_EXTENDED|REG_NOSUB))
 
        /* compile regex matching blank lines or comments */
        if (regcomp(&re_ignore, "^[[:space:]]*(#|$)", REG_EXTENDED|REG_NOSUB))

@@ -160,7 +167,7 @@ out_noopen:
 }
 
 int main() {
 }
 
 int main() {

-       OssoBrowser *obj;
+       OssoBrowser *obj_osso_browser, *obj_osso_browser_req;

        GMainLoop *mainloop;
        GError *error = NULL;
 
        GMainLoop *mainloop;
        GError *error = NULL;
 

@@ -169,6 +176,7 @@ int main() {
        if (ctx.continuous_mode) {
                struct sigaction act;
                act.sa_flags = SA_RESTART;
        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) {
 
                act.sa_handler = waitforzombies;
                if (sigaction(SIGCHLD, &act, NULL) == -1) {

@@ -203,11 +211,13 @@ int main() {
 
        dbus_request_osso_browser_name(&ctx);
 
 
        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,
        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,
        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");
 
        mainloop = g_main_loop_new(NULL, FALSE);
        printf("Starting main loop\n");