fix spacing

diff --git a/ChangeLog b/ChangeLog
index 21b05ec6bac21d71ceea94614dfaa439d682b842..0ab9bce89518a4f5a78f724f2ff3b2da4ad11af6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-06-07 10:28  mones   0.7.1svn374
+
+       * clawsker
+               Fix spacing, it was becoming annoying
+
 2010-04-09 21:23  mones   0.7.1
 
        * VERSION

diff --git a/VERSION b/VERSION
index 39e898a4f952d339c155a7939d571a5fdd6c8cfc..8639a4e56556ec8a244916a3d759770a445a83c9 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.7.1
+0.7.1svn374

diff --git a/clawsker b/clawsker
index 34a3a3fa522f94c32a27049bdfdaa08590a2235d..ae9913e32010cbb0245752dd20092abc5991a2a8 100755 (executable)
--- a/clawsker
+++ b/clawsker
@@ -189,20 +189,20 @@ use constant PAGE_SPC => 5;
 # version functions
 
 sub version_greater_or_equal() {
-  my ($version, $refvers) = @_;
-  my @version = split (/\./, $version);
-  my @refvers = split (/\./, $refvers);
-  while ($#version < $#refvers) {
-    push (@version, '0');
-  }
-  my $idx = 0;
-  while (($idx <= $#refvers) 
-         and (int ($version[$idx]) == int ($refvers[$idx]))) {
-    ++$idx;
-  }
-  return TRUE if (($idx > $#refvers) 
-               or (int ($version[$idx]) >= int ($refvers[$idx])));
-  return FALSE;
+    my ($version, $refvers) = @_;
+    my @version = split (/\./, $version);
+    my @refvers = split (/\./, $refvers);
+    while ($#version < $#refvers) {
+        push (@version, '0');
+    }
+    my $idx = 0;
+    while (($idx <= $#refvers) 
+            and (int ($version[$idx]) == int ($refvers[$idx]))) {
+        ++$idx;
+    }
+    return TRUE if (($idx > $#refvers)
+        or (int ($version[$idx]) >= int ($refvers[$idx])));
+    return FALSE;
 }
 
 sub get_claws_version() {
@@ -246,7 +246,7 @@ sub handle_int_value {
     s/\s+$//;
     if (/^[0-9]+$/) {
         $$dataref = $_;
-       $widget->set_text ($_);
+        $widget->set_text ($_);
     }
     else {
         $widget->set_text ($$dataref);
@@ -329,9 +329,8 @@ sub check_claws_not_running() {
         my $emsg = "$xl::s{e_error}$xl::s{e_running}";
         log_message ($emsg);
         error_dialog ($emsg);
-       return FALSE;
+        return FALSE;
      };
-
      return TRUE;
 }
 
@@ -341,9 +340,8 @@ sub check_rc_file() {
        my $emsg = "$xl::s{e_error}$xl::s{e_noclawsrc}\n";
         log_message ($emsg);
         error_dialog ($emsg);
-       return FALSE;
+        return FALSE;
     };
-
     return TRUE;
 }
 
@@ -375,7 +373,7 @@ sub new_check_button_for {
     }
     $cb->signal_connect (clicked => sub {
             my ($w, $e) = @_;
-           &handle_bool_value($w, $e, \$HPVALUE{$name});
+            &handle_bool_value($w, $e, \$HPVALUE{$name});
         });
     &set_widget_hint ($cb, $$hash{$key}[DESC]);
     &set_widget_sens ($cb, $$hash{$key}[CMVER]);
@@ -399,7 +397,7 @@ sub new_text_box_for_int {
     $$hash{$key}[GUI] = $gentry;
     $gentry->signal_connect('value-changed' => sub {
             my ($w, $e) = @_;
-           &handle_int_value($w, $e, \$HPVALUE{$name});
+            &handle_int_value($w, $e, \$HPVALUE{$name});
         });
     &set_widget_hint ($gentry, $$hash{$key}[DESC]);
     &set_widget_sens ($gentry, $$hash{$key}[CMVER]);
@@ -424,7 +422,7 @@ sub new_color_button_for {
     $button->set_relief ('none');
     $button->signal_connect ('color-set' => sub {
             my ($w, $e) = @_;
-           &handle_color_value($w, $e, \$HPVALUE{$name}); 
+            &handle_color_value($w, $e, \$HPVALUE{$name}); 
         });
     &set_widget_hint ($button, $$hash{$key}[DESC]);
     &set_widget_sens ($button, $$hash{$key}[CMVER]);
@@ -451,7 +449,7 @@ sub new_selection_box_for {
     }
     $combo->signal_connect ('changed' => sub {
             my ($w, $e) = @_;
-           &handle_selection_value($w, $e, \$HPVALUE{$name});
+            &handle_selection_value($w, $e, \$HPVALUE{$name});
         });
     $combo->set_active ($HPVALUE{$name});
     &set_widget_hint ($combo, $$hash{$key}[DESC]);
@@ -505,39 +503,39 @@ sub new_subpage_frame () {
 %pr::oth = ( # other preferences
     use_dlg => [ 
         'addressbook_use_editaddress_dialog',
-       $xl::s{l_oth_use_dlg},
+        $xl::s{l_oth_use_dlg},
         $xl::s{h_oth_use_dlg},
-       'bool',
-       '2.7.0',
-       '0',
-       undef,
+        'bool',
+        '2.7.0',
+        '0',
+        undef,
     ],
     max_use => [
-       'cache_max_mem_usage',
-       $xl::s{l_oth_max_use},
-       $xl::s{h_oth_max_use},
-       'int,0,262144', # 0 Kb - 256 Mb
-       '0.0.0',
-       '4096',
-       undef,
+        'cache_max_mem_usage',
+        $xl::s{l_oth_max_use},
+        $xl::s{h_oth_max_use},
+        'int,0,262144', # 0 Kb - 256 Mb
+        '0.0.0',
+        '4096',
+        undef,
     ],
     min_time => [
         'cache_min_keep_time',
-       $xl::s{l_oth_min_time},
-       $xl::s{h_oth_min_time},
-       'int,0,120', # 0 minutes - 2 hours
-       '0.0.0',
-       '15',
-       undef,
+        $xl::s{l_oth_min_time},
+        $xl::s{h_oth_min_time},
+        'int,0,120', # 0 minutes - 2 hours
+        '0.0.0',
+        '15',
+        undef,
     ],
     use_netm => [
         'use_networkmanager',
-       $xl::s{l_oth_use_netm},
-       $xl::s{h_oth_use_netm},
-       'bool',
-       '3.3.1',
-       '1',
-       undef,
+        $xl::s{l_oth_use_netm},
+        $xl::s{h_oth_use_netm},
+        'bool',
+        '3.3.1',
+        '1',
+        undef,
     ],
 );
 
@@ -564,10 +562,10 @@ sub new_other_page() {
         'bold_unread',
         $xl::s{l_gui_b_unread},
         $xl::s{h_gui_b_unread},
-       'bool',
-       '0.0.0',
-       '1',
-       undef,
+        'bool',
+        '0.0.0',
+        '1',
+        undef,
     ],
     no_markup => [
         'compose_no_markup',
@@ -576,97 +574,97 @@ sub new_other_page() {
         'bool',
         '0.0.0',
         '0',
-       undef,
+        undef,
     ],
     dot_lines => [
         'enable_dotted_lines',
         $xl::s{l_gui_dot_lines},
         $xl::s{h_gui_dot_lines},
-       'bool',
-       '0.0.0',
-       '0',
-       undef,
+        'bool',
+        '0.0.0',
+        '0',
+        undef,
     ],
     h_scroll => [
         'enable_hscrollbar',
         $xl::s{l_gui_h_scroll},
         $xl::s{h_gui_h_scroll},
-       'bool',
-       '0.0.0',
-       '1',
-       undef,
+        'bool',
+        '0.0.0',
+        '1',
+        undef,
     ],
     swp_from => [
         'enable_swap_from',
         $xl::s{l_gui_swp_from},
         $xl::s{h_gui_swp_from},
-       'bool',
-       '0.0.0',
-       '0',
-       undef,
+        'bool',
+        '0.0.0',
+        '0',
+        undef,
     ],
     v_scroll => [
         'folderview_vscrollbar_policy',
         $xl::s{l_gui_v_scroll},
         $xl::s{h_gui_v_scroll},
-       '0=l_gui_v_scroll_show;1=l_gui_v_scroll_auto;2=l_gui_v_scroll_hide',
-       '0.0.0',
-       '0',
-       undef,
+        '0=l_gui_v_scroll_show;1=l_gui_v_scroll_auto;2=l_gui_v_scroll_hide',
+        '0.0.0',
+        '0',
+        undef,
     ],
     strip_off => [
         'stripes_color_offset',
-       $xl::s{l_gui_strip_off},
-       $xl::s{h_gui_strip_off},
-       'int,0,10000', # no idea what this number means
-       '0.0.0',
-       '4000',
-       undef,
+        $xl::s{l_gui_strip_off},
+        $xl::s{h_gui_strip_off},
+        'int,0,10000', # no idea what this number means
+        '0.0.0',
+        '4000',
+        undef,
     ],
     cursor_v => [
         'textview_cursor_visible',
         $xl::s{l_gui_cursor_v},
         $xl::s{h_gui_cursor_v},
-       'bool',
-       '0.0.0',
-       '0',
-       undef,
+        'bool',
+        '0.0.0',
+        '0',
+        undef,
     ],
     toolbar_d => [
         'toolbar_detachable',
         $xl::s{l_gui_toolbar_d},
         $xl::s{h_gui_toolbar_d},
-       'bool',
-       '0.0.0',
-       '0',
-       undef,
+        'bool',
+        '0.0.0',
+        '0',
+        undef,
     ],
     strip_all => [
         'use_stripes_everywhere',
         $xl::s{l_gui_strip_all},
         $xl::s{h_gui_strip_all},
-       'bool',
-       '0.0.0',
-       '1',
-       undef,
+        'bool',
+        '0.0.0',
+        '1',
+        undef,
     ],
     strip_sum => [
         'use_stripes_in_summaries',
         $xl::s{l_gui_strip_sum},
         $xl::s{h_gui_strip_sum},
-       'bool',
-       '0.0.0',
-       '1',
-       undef,
+        'bool',
+        '0.0.0',
+        '1',
+        undef,
     ],
     two_linev => [
         'two_line_vertical',
-       $xl::s{l_gui_two_line_v},
-       $xl::s{h_gui_two_line_v},
-       'bool',
-       '3.4.0.7',
-       '0',
-       undef,
+        $xl::s{l_gui_two_line_v},
+        $xl::s{h_gui_two_line_v},
+        'bool',
+        '3.4.0.7',
+        '0',
+        undef,
     ],
 );
 
@@ -713,100 +711,100 @@ sub new_gui_page() {
         'hover_timeout',
         $xl::s{l_beh_hover_t},
         $xl::s{h_beh_hover_t},
-       'int,100,3000', # 0.1 seconds - 3 seconds
-       '0.0.0',
-       '500',
-       undef,
+        'int,100,3000', # 0.1 seconds - 3 seconds
+        '0.0.0',
+        '500',
+        undef,
     ],
     dangerous => [
         'live_dangerously',
         $xl::s{l_beh_dangerous},
         $xl::s{h_beh_dangerous},
-       'bool',
-       '0.0.0',
-       '0',
-       undef,
+        'bool',
+        '0.0.0',
+        '0',
+        undef,
     ],
     flowed => [
         'respect_flowed_format',
         $xl::s{l_beh_flowed},
         $xl::s{h_beh_flowed},
-       'bool',
-       '0.0.0',
-       '0',
-       undef,
+        'bool',
+        '0.0.0',
+        '0',
+        undef,
     ],
     parts_rw => [
         'save_parts_readwrite',
         $xl::s{l_beh_parts_rw},
         $xl::s{h_beh_parts_rw},
-       'bool',
-       '0.0.0',
-       '0',
-       undef,
+        'bool',
+        '0.0.0',
+        '0',
+        undef,
     ],
     skip_ssl => [
         'skip_ssl_cert_check',
         $xl::s{l_beh_skip_ssl},
         $xl::s{h_beh_skip_ssl},
-       'bool',
-       '0.0.0',
-       '0',
-       undef,
+        'bool',
+        '0.0.0',
+        '0',
+        undef,
     ],
     up_step => [
         'statusbar_update_step',
         $xl::s{l_beh_up_step},
         $xl::s{h_beh_up_step},
-       'int,1,200', # 1 item - 200 items
-       '0.0.0',
-       '10',
-       undef,
+        'int,1,200', # 1 item - 200 items
+        '0.0.0',
+        '10',
+        undef,
     ],
     thread_a => [
         'thread_by_subject_max_age',
         $xl::s{l_beh_thread_a},
         $xl::s{h_beh_thread_a},
-       'int,1,30', # 1 day - 30 days
-       '0.0.0',
-       '10',
-       undef,
+        'int,1,30', # 1 day - 30 days
+        '0.0.0',
+        '10',
+        undef,
     ],
     unsafe_ssl => [
         'unsafe_ssl_certs',
         $xl::s{l_beh_unsafe_ssl},
         $xl::s{h_beh_unsafe_ssl},
-       'bool',
-       '0.0.0',
-       '0',
-       undef,
+        'bool',
+        '0.0.0',
+        '0',
+        undef,
     ],
     use_utf8 => [
         'utf8_instead_of_locale_for_broken_mail',
         $xl::s{l_beh_use_utf8},
         $xl::s{h_beh_use_utf8},
-       'bool',
-       '0.0.0',
-       '0',
-       undef,
+        'bool',
+        '0.0.0',
+        '0',
+        undef,
     ],
     warn_dnd => [
         'warn_dnd',
         $xl::s{l_beh_warn_dnd},
         $xl::s{h_beh_warn_dnd},
-       'bool',
-       '0.0.0',
-       '1',
-       undef,
+        'bool',
+        '0.0.0',
+        '1',
+        undef,
     ],
     out_ascii => [
         'outgoing_fallback_to_ascii',
-       $xl::s{l_beh_out_ascii},
-       $xl::s{h_beh_out_ascii},
-       'bool',
-       '3.4.0.37',
-       '1',
-       undef,
+        $xl::s{l_beh_out_ascii},
+        $xl::s{h_beh_out_ascii},
+        'bool',
+        '3.4.0.37',
+        '1',
+        undef,
     ],
     pp_unsel => [
         'primary_paste_unselects',
@@ -859,18 +857,18 @@ sub new_behaviour_page() {
         'emphasis_color',
         $xl::s{l_col_emphasis},
         $xl::s{h_col_emphasis},
-       'color',
-       '0.0.0',
-       '#0000cf',
-       undef,
+        'color',
+        '0.0.0',
+        '#0000cf',
+        undef,
     ],
     log_err => [
         'log_error_color',
         $xl::s{l_col_log_err},
         $xl::s{h_col_log_err},
         'color',
-       '0.0.0',
-       '#af0000',
+        '0.0.0',
+        '#af0000',
         undef,
     ],
     log_in => [
@@ -878,8 +876,8 @@ sub new_behaviour_page() {
         $xl::s{l_col_log_in},
         $xl::s{h_col_log_in},
         'color',
-       '0.0.0',
-       '#000000',
+        '0.0.0',
+        '#000000',
         undef,
     ],
     log_msg => [
@@ -887,8 +885,8 @@ sub new_behaviour_page() {
         $xl::s{l_col_log_msg},
         $xl::s{h_col_log_msg},
         'color',
-       '0.0.0',
-       '#00af00',
+        '0.0.0',
+        '#00af00',
         undef,
     ],
     log_out => [
@@ -896,8 +894,8 @@ sub new_behaviour_page() {
         $xl::s{l_col_log_out},
         $xl::s{h_col_log_out},
         'color',
-       '0.0.0',
-       '#0000ef',
+        '0.0.0',
+        '#0000ef',
         undef,
     ],
     log_warn => [
@@ -905,8 +903,8 @@ sub new_behaviour_page() {
         $xl::s{l_col_log_warn},
         $xl::s{h_col_log_warn},
         'color',
-       '0.0.0',
-       '#af0000',
+        '0.0.0',
+        '#af0000',
         undef,
     ],
 );
@@ -933,37 +931,37 @@ sub new_colours_page() {
         'mainwin_x',
         $xl::s{l_win_x},
         $xl::s{h_win_x},
-       'int,0,3000', # 0 pixels - 3000 pixels
-       '0.0.0',
-       '16',
-       undef,
+        'int,0,3000', # 0 pixels - 3000 pixels
+        '0.0.0',
+        '16',
+        undef,
     ],
     main_y => [
         'mainwin_y',
         $xl::s{l_win_y},
         $xl::s{h_win_y},
-       'int,0,3000', # 0 pixels - 3000 pixels
-       '0.0.0',
-       '16',
-       undef,
+        'int,0,3000', # 0 pixels - 3000 pixels
+        '0.0.0',
+        '16',
+        undef,
     ],
     main_w => [
         'mainwin_width',
         $xl::s{l_win_w},
         $xl::s{h_win_w},
-       'int,0,3000', # 0 pixels - 3000 pixels
-       '0.0.0',
-       '779',
-       undef,
+        'int,0,3000', # 0 pixels - 3000 pixels
+        '0.0.0',
+        '779',
+        undef,
     ],
     main_h => [
         'mainwin_height',
         $xl::s{l_win_h},
         $xl::s{h_win_h},
-       'int,0,3000', # 0 pixels - 3000 pixels
-       '0.0.0',
-       '568',
-       undef,
+        'int,0,3000', # 0 pixels - 3000 pixels
+        '0.0.0',
+        '568',
+        undef,
     ],
     main_mx => [
         'mainwin_maximised',
@@ -987,43 +985,43 @@ sub new_colours_page() {
         'main_messagewin_x',
         $xl::s{l_win_x},
         $xl::s{h_win_x},
-       'int,0,3000', # 0 pixels - 3000 pixels
-       '0.0.0',
-       '256',
-       undef,
+        'int,0,3000', # 0 pixels - 3000 pixels
+        '0.0.0',
+        '256',
+        undef,
     ],
     msgs_y => [
         'main_messagewin_y',
         $xl::s{l_win_y},
         $xl::s{h_win_y},
-       'int,0,3000', # 0 pixels - 3000 pixels
-       '0.0.0',
-       '210',
-       undef,
+        'int,0,3000', # 0 pixels - 3000 pixels
+        '0.0.0',
+        '210',
+        undef,
     ],
     msgs_w => [
         'messagewin_width',
         $xl::s{l_win_w},
         $xl::s{h_win_w},
-       'int,0,3000', # 0 pixels - 3000 pixels
-       '0.0.0',
-       '600',
-       undef,
+        'int,0,3000', # 0 pixels - 3000 pixels
+        '0.0.0',
+        '600',
+        undef,
     ],
     msgs_h => [
         'messagewin_height',
         $xl::s{l_win_h},
         $xl::s{h_win_h},
-       'int,0,3000', # 0 pixels - 3000 pixels
-       '0.0.0',
-       '540',
-       undef,
+        'int,0,3000', # 0 pixels - 3000 pixels
+        '0.0.0',
+        '540',
+        undef,
     ],
     send_w => [
         'sendwin_width',
         $xl::s{l_win_w},
         $xl::s{h_win_w},
-       'int,0,3000', # 0 pixels - 3000 pixels
+        'int,0,3000', # 0 pixels - 3000 pixels
         '0.0.0',
         '460',
         undef,
@@ -1032,7 +1030,7 @@ sub new_colours_page() {
         'sendwin_height',
         $xl::s{l_win_h},
         $xl::s{h_win_h},
-       'int,0,3000', # 0 pixels - 3000 pixels
+        'int,0,3000', # 0 pixels - 3000 pixels
         '0.0.0',
         '-1',
         undef,
@@ -1041,7 +1039,7 @@ sub new_colours_page() {
         'receivewin_width',
         $xl::s{l_win_w},
         $xl::s{h_win_w},
-       'int,0,3000', # 0 pixels - 3000 pixels
+        'int,0,3000', # 0 pixels - 3000 pixels
         '0.0.0',
         '460',
         undef,
@@ -1050,7 +1048,7 @@ sub new_colours_page() {
         'receivewin_height',
         $xl::s{l_win_h},
         $xl::s{h_win_h},
-       'int,0,3000', # 0 pixels - 3000 pixels
+        'int,0,3000', # 0 pixels - 3000 pixels
         '0.0.0',
         '-1',
         undef,
@@ -1059,397 +1057,397 @@ sub new_colours_page() {
         'folderwin_x',
         $xl::s{l_win_x},
         $xl::s{h_win_x},
-       'int,0,3000', # 0 pixels - 3000 pixels
-       '0.0.0',
-       '16',
-       undef,
+        'int,0,3000', # 0 pixels - 3000 pixels
+        '0.0.0',
+        '16',
+        undef,
     ],
     fold_y => [
         'folderwin_y',
         $xl::s{l_win_y},
         $xl::s{h_win_y},
-       'int,0,3000', # 0 pixels - 3000 pixels
-       '0.0.0',
-       '16',
-       undef,
+        'int,0,3000', # 0 pixels - 3000 pixels
+        '0.0.0',
+        '16',
+        undef,
     ],
     fold_w => [
         'folderitemwin_width',
         $xl::s{l_win_w},
         $xl::s{h_win_w},
-       'int,0,3000', # 0 pixels - 3000 pixels
-       '0.0.0',
-       '500',
-       undef,
+        'int,0,3000', # 0 pixels - 3000 pixels
+        '0.0.0',
+        '500',
+        undef,
     ],
     fold_h => [
         'folderitemwin_height',
         $xl::s{l_win_h},
         $xl::s{h_win_h},
-       'int,0,3000', # 0 pixels - 3000 pixels
-       '0.0.0',
-       '-1',
-       undef,
+        'int,0,3000', # 0 pixels - 3000 pixels
+        '0.0.0',
+        '-1',
+        undef,
     ],
     fsel_w => [
         'folderselwin_width',
         $xl::s{l_win_w},
         $xl::s{h_win_w},
-       'int,0,3000', # 0 pixels - 3000 pixels
-       '0.0.0',
-       '300',
-       undef,
+        'int,0,3000', # 0 pixels - 3000 pixels
+        '0.0.0',
+        '300',
+        undef,
     ],
     fsel_h => [
         'folderselwin_height',
         $xl::s{l_win_h},
         $xl::s{h_win_h},
-       'int,0,3000', # 0 pixels - 3000 pixels
-       '0.0.0',
-       '-1',
-       undef,
+        'int,0,3000', # 0 pixels - 3000 pixels
+        '0.0.0',
+        '-1',
+        undef,
     ],
     sour_w => [
         'sourcewin_width',
         $xl::s{l_win_w},
         $xl::s{h_win_w},
-       'int,0,3000', # 0 pixels - 3000 pixels
-       '0.0.0',
-       '600',
-       undef,
+        'int,0,3000', # 0 pixels - 3000 pixels
+        '0.0.0',
+        '600',
+        undef,
     ],
     sour_h => [
         'sourcewin_height',
         $xl::s{l_win_h},
         $xl::s{h_win_h},
-       'int,0,3000', # 0 pixels - 3000 pixels
-       '0.0.0',
-       '500',
-       undef,
+        'int,0,3000', # 0 pixels - 3000 pixels
+        '0.0.0',
+        '500',
+        undef,
     ],
     addr_w => [
         'addressbookwin_width',
         $xl::s{l_win_w},
         $xl::s{h_win_w},
-       'int,0,3000', # 0 pixels - 3000 pixels
-       '0.0.0',
-       '520',
-       undef,
+        'int,0,3000', # 0 pixels - 3000 pixels
+        '0.0.0',
+        '520',
+        undef,
     ],
     addr_h => [
         'addressbookwin_height',
         $xl::s{l_win_h},
         $xl::s{h_win_h},
-       'int,0,3000', # 0 pixels - 3000 pixels
-       '0.0.0',
-       '-1',
-       undef,
+        'int,0,3000', # 0 pixels - 3000 pixels
+        '0.0.0',
+        '-1',
+        undef,
     ],
     adep_w => [
         'addressbookeditpersonwin_width',
         $xl::s{l_win_w},
         $xl::s{h_win_w},
-       'int,0,3000', # 0 pixels - 3000 pixels
-       '0.0.0',
-       '640',
-       undef,
+        'int,0,3000', # 0 pixels - 3000 pixels
+        '0.0.0',
+        '640',
+        undef,
     ],
     adep_h => [
         'addressbookeditpersonwin_height',
         $xl::s{l_win_h},
         $xl::s{h_win_h},
-       'int,0,3000', # 0 pixels - 3000 pixels
-       '0.0.0',
-       '320',
-       undef,
+        'int,0,3000', # 0 pixels - 3000 pixels
+        '0.0.0',
+        '320',
+        undef,
     ],
     adeg_w => [
         'addressbookeditgroupwin_width',
         $xl::s{l_win_w},
         $xl::s{h_win_w},
-       'int,0,3000', # 0 pixels - 3000 pixels
-       '0.0.0',
-       '580',
-       undef,
+        'int,0,3000', # 0 pixels - 3000 pixels
+        '0.0.0',
+        '580',
+        undef,
     ],
     adeg_h => [
         'addressbookeditgroupwin_height',
         $xl::s{l_win_h},
         $xl::s{h_win_h},
-       'int,0,3000', # 0 pixels - 3000 pixels
-       '0.0.0',
-       '340',
-       undef,
+        'int,0,3000', # 0 pixels - 3000 pixels
+        '0.0.0',
+        '340',
+        undef,
     ],
     adda_w => [
         'addressaddwin_width',
         $xl::s{l_win_w},
         $xl::s{h_win_w},
-       'int,0,3000', # 0 pixels - 3000 pixels
-       '0.0.0',
-       '300',
-       undef,
+        'int,0,3000', # 0 pixels - 3000 pixels
+        '0.0.0',
+        '300',
+        undef,
     ],
     adda_h => [
         'addressaddwin_height',
         $xl::s{l_win_h},
         $xl::s{h_win_h},
-       'int,0,3000', # 0 pixels - 3000 pixels
-       '0.0.0',
-       '-1',
-       undef,
+        'int,0,3000', # 0 pixels - 3000 pixels
+        '0.0.0',
+        '-1',
+        undef,
     ],
     addf_w => [
         'addressbook_folderselwin_width',
         $xl::s{l_win_w},
         $xl::s{h_win_w},
-       'int,0,3000', # 0 pixels - 3000 pixels
-       '0.0.0',
-       '300',
-       undef,
+        'int,0,3000', # 0 pixels - 3000 pixels
+        '0.0.0',
+        '300',
+        undef,
     ],
     addf_h => [
         'addressbook_folderselwin_height',
         $xl::s{l_win_h},
         $xl::s{h_win_h},
-       'int,0,3000', # 0 pixels - 3000 pixels
-       '0.0.0',
-       '-1',
-       undef,
+        'int,0,3000', # 0 pixels - 3000 pixels
+        '0.0.0',
+        '-1',
+        undef,
     ],
     acce_w => [
         'editaccountwin_width',
         $xl::s{l_win_w},
         $xl::s{h_win_w},
-       'int,0,3000', # 0 pixels - 3000 pixels
-       '0.0.0',
-       '500',
-       undef,
+        'int,0,3000', # 0 pixels - 3000 pixels
+        '0.0.0',
+        '500',
+        undef,
     ],
     acce_h => [
         'editaccountwin_height',
         $xl::s{l_win_h},
         $xl::s{h_win_h},
-       'int,0,3000', # 0 pixels - 3000 pixels
-       '0.0.0',
-       '-1',
-       undef,
+        'int,0,3000', # 0 pixels - 3000 pixels
+        '0.0.0',
+        '-1',
+        undef,
     ],
     acco_w => [
         'accountswin_width',
         $xl::s{l_win_w},
         $xl::s{h_win_w},
-       'int,0,3000', # 0 pixels - 3000 pixels
-       '0.0.0',
-       '500',
-       undef,
+        'int,0,3000', # 0 pixels - 3000 pixels
+        '0.0.0',
+        '500',
+        undef,
     ],
     acco_h => [
         'accountswin_height',
         $xl::s{l_win_h},
         $xl::s{h_win_h},
-       'int,0,3000', # 0 pixels - 3000 pixels
-       '0.0.0',
-       '-1',
-       undef,
+        'int,0,3000', # 0 pixels - 3000 pixels
+        '0.0.0',
+        '-1',
+        undef,
     ],
     filt_w => [
         'filteringwin_width',
         $xl::s{l_win_w},
         $xl::s{h_win_w},
-       'int,0,3000', # 0 pixels - 3000 pixels
-       '0.0.0',
-       '500',
-       undef,
+        'int,0,3000', # 0 pixels - 3000 pixels
+        '0.0.0',
+        '500',
+        undef,
     ],
     filt_h => [
         'filteringwin_height',
         $xl::s{l_win_h},
         $xl::s{h_win_h},
-       'int,0,3000', # 0 pixels - 3000 pixels
-       '0.0.0',
-       '-1',
-       undef,
+        'int,0,3000', # 0 pixels - 3000 pixels
+        '0.0.0',
+        '-1',
+        undef,
     ],
     fila_w => [
         'filteringactionwin_width',
         $xl::s{l_win_w},
         $xl::s{h_win_w},
-       'int,0,3000', # 0 pixels - 3000 pixels
-       '0.0.0',
-       '490',
-       undef,
+        'int,0,3000', # 0 pixels - 3000 pixels
+        '0.0.0',
+        '490',
+        undef,
     ],
     fila_h => [
         'filteringactionwin_height',
         $xl::s{l_win_h},
         $xl::s{h_win_h},
-       'int,0,3000', # 0 pixels - 3000 pixels
-       '0.0.0',
-       '-1',
-       undef,
+        'int,0,3000', # 0 pixels - 3000 pixels
+        '0.0.0',
+        '-1',
+        undef,
     ],
     fild_w => [
         'filtering_debugwin_width',
         $xl::s{l_win_w},
         $xl::s{h_win_w},
-       'int,0,3000', # 0 pixels - 3000 pixels
-       '0.0.0',
-       '600',
-       undef,
+        'int,0,3000', # 0 pixels - 3000 pixels
+        '0.0.0',
+        '600',
+        undef,
     ],
     fild_h => [
         'filtering_debugwin_height',
         $xl::s{l_win_h},
         $xl::s{h_win_h},
-       'int,0,3000', # 0 pixels - 3000 pixels
-       '0.0.0',
-       '-1',
-       undef,
+        'int,0,3000', # 0 pixels - 3000 pixels
+        '0.0.0',
+        '-1',
+        undef,
     ],
     matc_w => [
         'matcherwin_width',
         $xl::s{l_win_w},
         $xl::s{h_win_w},
-       'int,0,3000', # 0 pixels - 3000 pixels
-       '0.0.0',
-       '520',
-       undef,
+        'int,0,3000', # 0 pixels - 3000 pixels
+        '0.0.0',
+        '520',
+        undef,
     ],
     matc_h => [
         'matcherwin_height',
         $xl::s{l_win_h},
         $xl::s{h_win_h},
-       'int,0,3000', # 0 pixels - 3000 pixels
-       '0.0.0',
-       '-1',
-       undef,
+        'int,0,3000', # 0 pixels - 3000 pixels
+        '0.0.0',
+        '-1',
+        undef,
     ],
     pref_w => [
         'prefswin_width',
         $xl::s{l_win_w},
         $xl::s{h_win_w},
-       'int,0,3000', # 0 pixels - 3000 pixels
-       '0.0.0',
-       '600',
-       undef,
+        'int,0,3000', # 0 pixels - 3000 pixels
+        '0.0.0',
+        '600',
+        undef,
     ],
     pref_h => [
         'prefswin_height',
         $xl::s{l_win_h},
         $xl::s{h_win_h},
-       'int,0,3000', # 0 pixels - 3000 pixels
-       '0.0.0',
-       '-1',
-       undef,
+        'int,0,3000', # 0 pixels - 3000 pixels
+        '0.0.0',
+        '-1',
+        undef,
     ],
     temp_w => [
         'templateswin_width',
         $xl::s{l_win_w},
         $xl::s{h_win_w},
-       'int,0,3000', # 0 pixels - 3000 pixels
-       '0.0.0',
-       '480',
-       undef,
+        'int,0,3000', # 0 pixels - 3000 pixels
+        '0.0.0',
+        '480',
+        undef,
     ],
     temp_h => [
         'templateswin_height',
         $xl::s{l_win_h},
         $xl::s{h_win_h},
-       'int,0,3000', # 0 pixels - 3000 pixels
-       '0.0.0',
-       '-1',
-       undef,
+        'int,0,3000', # 0 pixels - 3000 pixels
+        '0.0.0',
+        '-1',
+        undef,
     ],
     acti_w => [
         'actionswin_width',
         $xl::s{l_win_w},
         $xl::s{h_win_w},
-       'int,0,3000', # 0 pixels - 3000 pixels
-       '0.0.0',
-       '486',
-       undef,
+        'int,0,3000', # 0 pixels - 3000 pixels
+        '0.0.0',
+        '486',
+        undef,
     ],
     acti_h => [
         'actionswin_height',
         $xl::s{l_win_h},
         $xl::s{h_win_h},
-       'int,0,3000', # 0 pixels - 3000 pixels
-       '0.0.0',
-       '-1',
-       undef,
+        'int,0,3000', # 0 pixels - 3000 pixels
+        '0.0.0',
+        '-1',
+        undef,
     ],
     tags_w => [
         'tagswin_width',
         $xl::s{l_win_w},
         $xl::s{h_win_w},
-       'int,0,3000', # 0 pixels - 3000 pixels
-       '0.0.0',
-       '486',
-       undef,
+        'int,0,3000', # 0 pixels - 3000 pixels
+        '0.0.0',
+        '486',
+        undef,
     ],
     tags_h => [
         'tagswin_height',
         $xl::s{l_win_h},
         $xl::s{h_win_h},
-       'int,0,3000', # 0 pixels - 3000 pixels
-       '0.0.0',
-       '-1',
-       undef,
+        'int,0,3000', # 0 pixels - 3000 pixels
+        '0.0.0',
+        '-1',
+        undef,
     ],
     plug_w => [
         'pluginswin_width',
         $xl::s{l_win_w},
         $xl::s{h_win_w},
-       'int,0,3000', # 0 pixels - 3000 pixels
-       '0.0.0',
-       '-1',
-       undef,
+        'int,0,3000', # 0 pixels - 3000 pixels
+        '0.0.0',
+        '-1',
+        undef,
     ],
     plug_h => [
         'pluginswin_height',
         $xl::s{l_win_h},
         $xl::s{h_win_h},
-       'int,0,3000', # 0 pixels - 3000 pixels
-       '0.0.0',
-       '-1',
-       undef,
+        'int,0,3000', # 0 pixels - 3000 pixels
+        '0.0.0',
+        '-1',
+        undef,
     ],
     logw_w => [
         'logwin_width',
         $xl::s{l_win_w},
         $xl::s{h_win_w},
-       'int,0,3000', # 0 pixels - 3000 pixels
-       '0.0.0',
-       '520',
-       undef,
+        'int,0,3000', # 0 pixels - 3000 pixels
+        '0.0.0',
+        '520',
+        undef,
     ],
     logw_h => [
         'logwin_height',
         $xl::s{l_win_h},
         $xl::s{h_win_h},
-       'int,0,3000', # 0 pixels - 3000 pixels
-       '0.0.0',
-       '-1',
-       undef,
+        'int,0,3000', # 0 pixels - 3000 pixels
+        '0.0.0',
+        '-1',
+        undef,
     ],
     prin_w => [
         'print_previewwin_width',
         $xl::s{l_win_w},
         $xl::s{h_win_w},
-       'int,0,3000', # 0 pixels - 3000 pixels
-       '0.0.0',
-       '600',
-       undef,
+        'int,0,3000', # 0 pixels - 3000 pixels
+        '0.0.0',
+        '600',
+        undef,
     ],
     prin_h => [
         'print_previewwin_height',
         $xl::s{l_win_h},
         $xl::s{h_win_h},
-       'int,0,3000', # 0 pixels - 3000 pixels
-       '0.0.0',
-       '-1',
-       undef,
+        'int,0,3000', # 0 pixels - 3000 pixels
+        '0.0.0',
+        '-1',
+        undef,
     ],
 );
 
@@ -1660,14 +1658,14 @@ sub print_version() {
     if ($Glib::VERSION >= 1.040) {
         print _(", built for ") . join(".", Glib->GET_VERSION_INFO) 
               . _(", running with ") . join(".", &Glib::major_version, 
-                 &Glib::minor_version, &Glib::micro_version);
+              &Glib::minor_version, &Glib::micro_version);
     }
     print "\n";
     print "Perl-GTK2 " . $Gtk2::VERSION;
     if ($Gtk2::VERSION >= 1.040) {
         print _(", built for ") . join(".", Gtk2->GET_VERSION_INFO)
-             . _(", running with ") . join(".", &Gtk2::major_version, 
-                 &Gtk2::minor_version, &Gtk2::micro_version);
+              . _(", running with ") . join(".", &Gtk2::major_version, 
+              &Gtk2::minor_version, &Gtk2::micro_version);
     }
     print "\n";
     my $clawsver = ($CLAWSV eq "") ? 
@@ -1707,51 +1705,51 @@ sub parse_command_line() {
     while (defined($ARGV[$arg])) {
         for ($ARGV[$arg]) {
             /--help/ && do { 
-               &print_help; 
+                &print_help; 
                 return FALSE;
-           };
+            };
             /--version/ && do { 
-               &print_version; 
+                &print_version; 
                 return FALSE;
-           };
-           /--verbose/ && do {
-               $VERBOSE = TRUE;
-               last;
-           };
-           /--use-claws-version/ && do {
-               ++$arg;
-               &command_line_fatal ("required version")
-                   unless defined($ARGV[$arg]);
-               &command_line_fatal ("required a dotted numeric value")
-                   unless ($ARGV[$arg] =~ /[\d\.]+/);
-               $CLAWSV = $ARGV[$arg];
-               last;
-           };
-           /--alternate-config-dir/ && do {
-               ++$arg;
-               &command_line_fatal ($xl::s{e_requireddir})
-                   unless defined($ARGV[$arg]);
-               &command_line_fatal ($xl::s{e_notadir})
-                   unless -d $ARGV[$arg];
-               $CONFIGDIR = $ARGV[$arg];
-               $CONFIGDIR .= "/" 
-                   unless ($CONFIGDIR =~ /.*\/$/);
-               $ALTCONFIGDIR = TRUE;
-               last;
-           };
-           /--clawsrc/ && do {
-               ++$arg;
-               &command_line_fatal($xl::s{e_requiredfile}) 
-                   unless defined($ARGV[$arg]);
-               &command_line_fatal($xl::s{e_notafile}) 
-                   unless -f $ARGV[$arg];
-               &set_rc_filename ($ARGV[$arg]);
-               last;
-           };
-           /.*/ && &command_line_fatal (
-                       _("unknown option '{opt}'.\n", opt => $ARGV[$arg]));
-       }
-       ++$arg;
+            };
+            /--verbose/ && do {
+                $VERBOSE = TRUE;
+                last;
+            };
+            /--use-claws-version/ && do {
+                ++$arg;
+                &command_line_fatal ("required version")
+                    unless defined($ARGV[$arg]);
+                &command_line_fatal ("required a dotted numeric value")
+                    unless ($ARGV[$arg] =~ /[\d\.]+/);
+                $CLAWSV = $ARGV[$arg];
+                last;
+            };
+            /--alternate-config-dir/ && do {
+                ++$arg;
+                &command_line_fatal ($xl::s{e_requireddir})
+                    unless defined($ARGV[$arg]);
+                &command_line_fatal ($xl::s{e_notadir})
+                    unless -d $ARGV[$arg];
+                $CONFIGDIR = $ARGV[$arg];
+                $CONFIGDIR .= "/" 
+                    unless ($CONFIGDIR =~ /.*\/$/);
+                $ALTCONFIGDIR = TRUE;
+                last;
+            };
+            /--clawsrc/ && do {
+                ++$arg;
+                &command_line_fatal($xl::s{e_requiredfile}) 
+                    unless defined($ARGV[$arg]);
+                &command_line_fatal($xl::s{e_notafile}) 
+                    unless -f $ARGV[$arg];
+                &set_rc_filename ($ARGV[$arg]);
+                last;
+            };
+            /.*/ && &command_line_fatal (
+                _("unknown option '{opt}'.\n", opt => $ARGV[$arg]));
+        }
+        ++$arg;
     }
     # eveything continues...
     return TRUE;
@@ -1761,7 +1759,7 @@ sub parse_command_line() {
 sub init_hidden_preferences() {
     foreach my $hash (\%pr::beh, \%pr::col, \%pr::gui, \%pr::oth, \%pr::win) {
         foreach my $key (keys %$hash) { 
-           $HPVALUE{${$hash}{$key}[NAME]} = $PREFS{${$hash}{$key}[NAME]};
+            $HPVALUE{${$hash}{$key}[NAME]} = $PREFS{${$hash}{$key}[NAME]};
         }
     }
     return TRUE;
@@ -1775,9 +1773,9 @@ sub load_preferences() {
     return FALSE unless &check_claws_not_running;
     open (RCF, "<$rc");
     while (<RCF>) {
-       chomp;
-       if (/^([8a-z_]+)=(.*)$/) {
-           $PREFS{$1} = "$2";
+        chomp;
+        if (/^([8a-z_]+)=(.*)$/) {
+            $PREFS{$1} = "$2";
         }
     }
     close (RCF);
@@ -1795,18 +1793,18 @@ sub save_preferences() {
     open (RCF, ">$rc");
     open (RCB, "<$rcbak");
     while (<RCB>) {
-       chomp;
-       if (/^([8a-z_]+)=(.*)$/) {
-           if (defined($HPVALUE{$1})) {
-               print RCF $1 . "=" . $HPVALUE{$1} . "\n";
-           }
-           else {
-               print RCF $_ . "\n";
-           }
+        chomp;
+        if (/^([8a-z_]+)=(.*)$/) {
+            if (defined($HPVALUE{$1})) {
+                print RCF $1 . "=" . $HPVALUE{$1} . "\n";
+            }
+            else {
+                print RCF $_ . "\n";
+            }
+        }
+        else {
+            print RCF $_ . "\n";
         }
-       else {
-           print RCF $_ . "\n";
-       }
     }
     close (RCB);
     close (RCF);
@@ -1851,13 +1849,13 @@ along with this program.  If not, see &lt;http://www.gnu.org/licenses/&gt;.";
 
     my $dialog = Gtk2::MessageDialog->new_with_markup ($parent, 
                     [qw/modal destroy-with-parent/], 
-                   'info', 'close', 
-                   "<span size=\"x-large\" weight=\"bold\">$title</span>\n"
-                   . "<span size=\"large\">$vers</span>\n\n"
-                   . "<span color=\"blue\" size=\"large\">$url</span>\n\n"
-                   . "<span>Copyright $year by $holder</span>\n\n"
-                   . "<span size=\"large\">$lic</span>\n\n"
-                   . "<span size=\"small\">$license</span>");
+                    'info', 'close', 
+                    "<span size=\"x-large\" weight=\"bold\">$title</span>\n"
+                    . "<span size=\"large\">$vers</span>\n\n"
+                    . "<span color=\"blue\" size=\"large\">$url</span>\n\n"
+                    . "<span>Copyright $year by $holder</span>\n\n"
+                    . "<span size=\"large\">$lic</span>\n\n"
+                    . "<span size=\"small\">$license</span>");
     $dialog->set_title ($xl::s{about});
     #
     return $dialog;