fix alt folder concat, undefined properties in checkboxes warning

diff --git a/ChangeLog b/ChangeLog
index 54917dc9852da7334c9076966414c5698e4086cf..fb0185e79fe35020f12eb7722b54e9b82171fb9a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-06-26 08:59  mones   0.4.0svn115
+
+       * clawsker
+               Fix alternate folder option behaviour
+               Fix warning when boolean properties don't exist
+

 2008-06-12 13:20  mones   0.4.0svn102
 
        * clawsker
 2008-06-12 13:20  mones   0.4.0svn102
 
        * clawsker

diff --git a/VERSION b/VERSION
index 62b5f1cce47db21793fb11f8ded323344a5f7ed1..ed15c4be29c3abb817c46423c867c36d8494b8d5 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.4.0svn102
+0.4.0svn115

diff --git a/clawsker b/clawsker
index 84821f98d1626c4963fe7357566fe0c4bd71a401..6e17806f02c534a3399ec246d46aea6f726ffec2 100755 (executable)
--- a/clawsker
+++ b/clawsker
@@ -371,7 +371,9 @@ sub new_check_button_for {
     my $hbox = Gtk2::HBox->new (FALSE, 5);
     my $cb = Gtk2::CheckButton->new ($label);
     $$hash{$key}[GUI] = $cb;
     my $hbox = Gtk2::HBox->new (FALSE, 5);
     my $cb = Gtk2::CheckButton->new ($label);
     $$hash{$key}[GUI] = $cb;

-    $cb->set_active ($HPVALUE{$name} eq '1');
+    if (defined ($HPVALUE{$name})) {
+        $cb->set_active ($HPVALUE{$name} eq '1');
+    }

     $cb->signal_connect (clicked => sub {
             my ($w, $e) = @_;
            &handle_bool_value($w, $e, \$HPVALUE{$name});
     $cb->signal_connect (clicked => sub {
             my ($w, $e) = @_;
            &handle_bool_value($w, $e, \$HPVALUE{$name});


@@ -989,6 +991,8 @@ sub parse_command_line() {
                &command_line_fatal ($xl::s{e_notadir})
                    unless -d $ARGV[$arg];
                $CONFIGDIR = $ARGV[$arg];
                &command_line_fatal ($xl::s{e_notadir})
                    unless -d $ARGV[$arg];
                $CONFIGDIR = $ARGV[$arg];

+               $CONFIGDIR .= "/" 
+                   unless ($CONFIGDIR =~ /.*\/$/);

                $ALTCONFIGDIR = TRUE;
                last;
            };
                $ALTCONFIGDIR = TRUE;
                last;
            };