update copyright year and pot file

[clawsker.git] / clawsker

diff --git a/clawsker b/clawsker
index 2086375669bdf709cc9de22fe0bf23cfd93d20d8..7447d732a7bc7c83a1df40dc3558ec134e8ab6f7 100755 (executable)
--- a/clawsker
+++ b/clawsker
@@ -9,6 +9,7 @@ use Gtk2 -init;
 use POSIX qw(setlocale);
 use Locale::gettext;
 use Encode;
+use Digest::MD5 qw(md5_hex);
 
 my $NAME = 'clawsker';
 my $PREFIX = '@PREFIX@';
@@ -66,6 +67,7 @@ sub _ {
     mview_frame => _('Message View'),
     compo_frame => _('Compose window'),
     netm_frame => _('NetworkManager'),
+    diff_frame => _('Viewing patches'),
 
     l_oth_use_dlg => _('Use detached address book edit dialogue'),
     h_oth_use_dlg => _('If true use a separate dialogue to edit a person\'s details. Otherwise will use a form embedded in the address book\'s main window.'),
@@ -155,6 +157,13 @@ sub _ {
     l_col_log_warn => _('Warnings'),
     h_col_log_warn => _('Colour for warning messages in log window.'),
 
+    l_col_diff_add => _('Added lines'),
+    h_col_diff_add => _('Colour for added lines in patches.'),
+    l_col_diff_del => _('Deleted lines'),
+    h_col_diff_del => _('Colour for deleted lines in patches.'),
+    l_col_diff_hunk => _('Hunk lines'),
+    h_col_diff_hunk => _('Color for hunk headers in patches.'),
+
     l_win_x => _('X position'),
     h_win_x => _('X coordinate for window\'s top-left corner.'),
     l_win_y => _('Y position'),
@@ -344,16 +353,26 @@ sub error_dialog {
     $errordlg->destroy;
 }
 
+sub claws_is_running() {
+    my $emsg = "$xl::s{e_error}$xl::s{e_running}";
+    log_message ($emsg);
+    error_dialog ($emsg);
+    return FALSE;
+}
+
 sub check_claws_not_running() {
     my $socket = (not $ALTCONFIGDIR)? "/tmp/": $CONFIGDIR;
     $socket .= "claws-mail-$<";
-    -S $socket and do {
-        my $emsg = "$xl::s{e_error}$xl::s{e_running}";
-        log_message ($emsg);
-        error_dialog ($emsg);
-        return FALSE;
-     };
-     return TRUE;
+    -S $socket and return &claws_is_running;
+    # since 3.9.0cvs36
+    my $lockdir = "/tmp/claws-mail-$<";
+    -d $lockdir and do { 
+       $_ = $CONFIGDIR;
+       s/\/$//;
+        $socket = "$lockdir/" . md5_hex($_);
+       -S $socket and return &claws_is_running;
+    };
+    return TRUE;
 }
 
 sub check_rc_file() {
@@ -376,8 +395,16 @@ sub set_widget_hint() {
 }
 
 sub set_widget_sens() {
-    my ($wdgt, $minver) = @_;
-    $wdgt->set_sensitive (&version_greater_or_equal ($CLAWSV, $minver));
+    my ($wdgt, $versions) = @_;
+    @ver = split(/,/, $versions);
+    if ($#ver == 1) {
+      $wdgt->set_sensitive (
+        &version_greater_or_equal ($CLAWSV, $ver[0])
+        and &version_greater_or_equal ($ver[1], $CLAWSV)
+      );
+    } else {
+        $wdgt->set_sensitive (&version_greater_or_equal ($CLAWSV, $ver[0]));
+    }
 }
 
 # graphic element creation 
@@ -1011,6 +1038,33 @@ sub new_behaviour_page() {
         '#af0000',
         undef,
     ],
+    diff_add => [
+        'diff_added_color',
+        $xl::s{l_col_diff_add},
+        $xl::s{h_col_diff_add},
+        'color',
+        '3.8.0.54',
+        '#008b8b',
+        undef,
+    ],
+    diff_del => [
+        'diff_deleted_color',
+        $xl::s{l_col_diff_del},
+        $xl::s{h_col_diff_del},
+        'color',
+        '3.8.0.54',
+        '#6a5acd',
+        undef,
+    ],
+    diff_hunk => [
+        'diff_hunk_color',
+        $xl::s{l_col_diff_hunk},
+        $xl::s{h_col_diff_hunk},
+        'color',
+        '3.8.0.54',
+        '#a52a2a',
+        undef,
+    ],
 );
 
 sub new_colours_page() {
@@ -1026,7 +1080,13 @@ sub new_colours_page() {
                        &new_color_button_for (\%pr::col, 'log_msg'),
                        &new_color_button_for (\%pr::col, 'log_out'),
                        &new_color_button_for (\%pr::col, 'log_warn')),
-                   $xl::s{log_frame}, 'not-packed')
+                   $xl::s{log_frame}, 'not-packed'),
+               &new_subpage_frame (
+                   &new_vbox_pack (
+                       &new_color_button_for (\%pr::col, 'diff_add'),
+                       &new_color_button_for (\%pr::col, 'diff_del'),
+                       &new_color_button_for (\%pr::col, 'diff_hunk')),
+                   $xl::s{diff_frame}, 'not-packed')
            );
 }
 
@@ -1947,9 +2007,9 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program.  If not, see &lt;http://www.gnu.org/licenses/&gt;.";
-    my $year = "2007-2012";
+    my $year = "2007-2013";
     my $holder = "Ricardo Mones &lt;ricardo\@mones.org&gt;";
-    my $url = "http://www.claws-mail.org/clawsker";
+    my $url = "http://www.claws-mail.org/clawsker.php";
 
     my $dialog = Gtk2::MessageDialog->new_with_markup ($parent, 
                     [qw/modal destroy-with-parent/],