* src/main.c

	add command line option "--config-dir" to get the current
	configuration dir

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 464625c7b292d5082b3284752f7b42bedba20c61..56efbb57237216e8765a0825b3009468b4b3c582 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,8 @@
+2003-07-13 [alfons]    0.9.3claws2
+       
+       * src/main.c
+               add command line option "--config-dir" to get the current 
+               configuration dir

 
 2003-07-12 [alfons]    0.9.3claws1
 
 
 2003-07-12 [alfons]    0.9.3claws1
 

diff --git a/configure.ac b/configure.ac
index 827031751821dae080f1af207a073269a9500acf..2e6a19825306da2f86677c5dacbf49eb051b2401 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=claws1
+EXTRA_VERSION=claws2

 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 804bde4853cc4649a61881f52051061913350dd0..dfa2005367d5316db05fcd9853575f75cf9f4be9 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -111,6 +111,7 @@ 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[]);


@@ -197,6 +198,11 @@ 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);
 


@@ -474,12 +480,15 @@ static void parse_cmd_opt(int argc, char *argv[])
                        puts(_("  --debug                debug mode"));
                        puts(_("  --help                 display this help and exit"));
                        puts(_("  --version              output version information and exit"));
                        puts(_("  --debug                debug mode"));
                        puts(_("  --help                 display this help and exit"));
                        puts(_("  --version              output version information and exit"));

+                       puts(_("  --config-dir           output configuration directory"));

 
                        exit(1);
                } else if (!strncmp(argv[i], "--crash", 7)) {
                        cmd.crash = TRUE;
                        cmd.crash_params = g_strdup(argv[i + 1]);
                        i++;
 
                        exit(1);
                } else if (!strncmp(argv[i], "--crash", 7)) {
                        cmd.crash = TRUE;
                        cmd.crash_params = g_strdup(argv[i + 1]);
                        i++;

+               } else if (!strncmp(argv[i], "--config-dir", sizeof "--config-dir" - 1)) {
+                       cmd.config_dir = TRUE;

                }
                
        }
                }
                
        }