* src/main.c

	make --config-dir do something useful

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 79db22d196682676f186f9cc383215e5e1a9e1c3..7d71743a3f5e6e55873dc448e02ac7bcd2ef039a 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,8 @@
+2003-07-15 [alfons]    0.9.3claws9
+
+       * src/main.c
+               make --config-dir do something useful
+

 2003-07-15 [alfons]    0.9.3claws8
 
        * src/procmsg.c
 2003-07-15 [alfons]    0.9.3claws8
 
        * src/procmsg.c

diff --git a/configure.ac b/configure.ac
index 26afbdcaa7548005811ced1ba52898c523e2aa3c..5607ef8c53ff9191314f85c800dd12bf002c2392 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=3
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=3
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=claws8
+EXTRA_VERSION=claws9

 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target

diff --git a/src/main.c b/src/main.c
index dfa2005367d5316db05fcd9853575f75cf9f4be9..41ac373d23747e505ad5799b653b510fbb4020c6 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -111,7 +111,6 @@ static struct RemoteCmd {
        gboolean crash;
        int online_mode;
        gchar   *crash_params;
        gboolean crash;
        int online_mode;
        gchar   *crash_params;

-       gboolean config_dir;

 } cmd;
 
 static void parse_cmd_opt(int argc, char *argv[]);
 } cmd;
 
 static void parse_cmd_opt(int argc, char *argv[]);


@@ -198,11 +197,6 @@ int main(int argc, char *argv[])
                return 0;
        }
 
                return 0;
        }
 

-       if (cmd.config_dir) {
-               puts(RC_DIR);
-               return 0;
-       }
-

        gtk_set_locale();
        gtk_init(&argc, &argv);
 
        gtk_set_locale();
        gtk_init(&argc, &argv);
 


@@ -488,7 +482,8 @@ static void parse_cmd_opt(int argc, char *argv[])
                        cmd.crash_params = g_strdup(argv[i + 1]);
                        i++;
                } else if (!strncmp(argv[i], "--config-dir", sizeof "--config-dir" - 1)) {
                        cmd.crash_params = g_strdup(argv[i + 1]);
                        i++;
                } else if (!strncmp(argv[i], "--config-dir", sizeof "--config-dir" - 1)) {

-                       cmd.config_dir = TRUE;
+                       puts(RC_DIR);
+                       exit(0);

                }
                
        }
                }
                
        }