fix interesting buglet and clean up coding style
authorAlfons Hoogervorst <alfons@proteus.demon.nl>
Mon, 28 Jan 2002 20:55:09 +0000 (20:55 +0000)
committerAlfons Hoogervorst <alfons@proteus.demon.nl>
Mon, 28 Jan 2002 20:55:09 +0000 (20:55 +0000)
ChangeLog.claws
configure.in
src/compose.c

index 1bc441731a29484fcf263a7a39e840a6177a7225..3455b899ce4659777baed51c79053313d9844640 100644 (file)
@@ -1,3 +1,8 @@
+2002-01-28 [alfons]    0.7.0claws37
+
+       * src/compose.c
+               fix buglet and make code comply with sylpheed code style
+
 2002-01-28 [paul]      0.7.0claws36
 
        * sync with sylpheed 0.7.0cvs19
index 80865857be126521970301bcb910e3968cfba25c..46f379009182c83cc4d3420f947b66a83d2a0cb6 100644 (file)
@@ -8,7 +8,7 @@ MINOR_VERSION=7
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws36
+EXTRA_VERSION=claws37
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target
index 0a8fc298ee7d649591c9ff9a5958d7008ba81e0e..835a4fada4de3013b8273e821687544b25df39ce 100644 (file)
@@ -1922,12 +1922,11 @@ static void compose_insert_sig(Compose *compose)
 
        if (compose->account && compose->account->sig_path)
                sigfile = g_strdup(compose->account->sig_path);
-       else {
+       else
                sigfile = g_strconcat(get_home_dir(), G_DIR_SEPARATOR_S,
                                      DEFAULT_SIGNATURE, NULL);
-       }
 
-       if (!is_file_or_fifo_exist(sigfile) & (sigfile[0] != '|')) {
+       if (!is_file_or_fifo_exist(sigfile) && sigfile[0] != '|') {
                g_free(sigfile);
                return;
        }
@@ -1941,13 +1940,9 @@ static void compose_insert_sig(Compose *compose)
        }
 
        if (sigfile[0] == '|')
-       {
                compose_exec_sig(compose, sigfile);
-       }
        else
-       {
                compose_insert_file(compose, sigfile);
-       }
        g_free(sigfile);
 }