From 9f648e1c7b39cedbfa4dff857860aab6a47b8d9e Mon Sep 17 00:00:00 2001
From: Ricardo Mones <ricardo@mones.org>
Date: Sat, 12 Jan 2008 00:40:52 +0000
Subject: [PATCH] fix some return values and logic

---
 ChangeLog |  5 +++++
 VERSION   |  2 +-
 clawsker  | 21 +++++++++++++--------
 3 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 192e55f..cd1d671 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-01-12 01:23  mones   0.2.0svn44
+
+	* clawsker
+		Oops, fix wrong conditions for exit
+
 2008-01-09 22:58  mones   0.2.0svn40
 
 	* clawsker
diff --git a/VERSION b/VERSION
index bdeb4f5..bc40ee2 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.2.0svn40
+0.2.0svn44
diff --git a/clawsker b/clawsker
index 50220e1..ef02f19 100755
--- a/clawsker
+++ b/clawsker
@@ -828,7 +828,7 @@ sub parse_command_line() {
         for ($ARGV[$arg]) {
             /--help/ && do { 
 	        &print_help; 
-                exit 0;
+                return FALSE;
 	    };
 	    /--verbose/ && do {
 	        $VERBOSE = TRUE;
@@ -858,6 +858,8 @@ sub parse_command_line() {
 	}
 	++$arg;
     }
+    # eveything continues...
+    return TRUE;
 }
 
 # update the hidden preferences status from loaded values
@@ -867,13 +869,15 @@ sub init_hidden_preferences() {
 	    $HPVALUE{${$hash}{$key}[NAME]} = $PREFS{${$hash}{$key}[NAME]};
         }
     }
+    return TRUE;
 }
 
 # load current status from disc
 sub load_preferences() {
     my $rc = &get_rc_filename;
-    &check_rc_file ($rc) or return FALSE;
-    &check_claws_not_running or return FALSE;
+    &log_message ("Loading preferences from $rc\n");
+    return FALSE unless &check_rc_file ($rc);
+    return FALSE unless &check_claws_not_running;
     open (RCF, "<$rc");
     while (<RCF>) {
 	chomp;
@@ -888,8 +892,9 @@ sub load_preferences() {
 # save current preferences to disc
 sub save_preferences() {
     my $rc = &get_rc_filename;
-    &check_rc_file ($rc) or return FALSE;
-    &check_claws_not_running or return FALSE;
+    &log_message ("Saving preferences to $rc\n");
+    return FALSE unless &check_rc_file ($rc);
+    return FALSE unless &check_claws_not_running;
     my $rcbak = "$rc.backup";
     rename ($rc, $rcbak);
     open (RCF, ">$rc");
@@ -985,9 +990,9 @@ sub new_button_box() {
 
 # initialise
 $main_window = Gtk2::Window->new ('toplevel');
-&parse_command_line;
-&load_preferences or exit;
-&init_hidden_preferences or exit;
+exit unless &parse_command_line;
+exit unless &load_preferences;
+exit unless &init_hidden_preferences;
 # create main GUI
 my $box = Gtk2::VBox->new (FALSE, 5);
 $box->set_border_width(3);
-- 
2.25.1