support detection of newer claws-mail

diff --git a/ChangeLog b/ChangeLog
index 57ee32edbea63af8690a4e75ad4fd4836d2abc7f..4ae1c8771e630912d05c9814befcb7f5492c39cd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2013-03-08 00:23  mones   0.7.8git462
+
+       * clawsker
+               Detect running claws-mail equal or greater
+               than 3.9.0cvs36 version, when location and
+               format of lock socket changed
+
 2013-03-08 00:08  mones   0.7.8git461
 
        * clawsker

diff --git a/VC b/VC
index 408b885ce545ac09e5d6133f7a6e833785e483ad..bf7aeeb3e2e7eb5219e91f121fc9a07e5be77dbc 100644 (file)
--- a/VC
+++ b/VC
@@ -1 +1 @@
-461
+462

diff --git a/VERSION b/VERSION
index 4eae46c4c063844721567748b20fbe82e5d9062d..772b5e258bc8031e5f831f545317737915f5742d 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.7.8git461
+0.7.8git462

diff --git a/clawsker b/clawsker
index c71a1b7dd3d7fda0d41ae0be7379e51ce9e0ccc9..e3590e1dc1089a7ad1a4bd1e855ed183d415a132 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@';
@@ -352,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() {