[Commits] [SCM] claws branch, master, updated. 3.9.2-32-g7aa5fcb

[mones at claws-mail.org]

The branch master of project "claws" (Claws Mail) has been updated
       via  7aa5fcbf3d01efdc5fb9afe795b295d138f84f5c (commit)
      from  50116eb9aed6b5294cb30317e83ea388a9e41434 (commit)


- Log -----------------------------------------------------------------
commit 7aa5fcbf3d01efdc5fb9afe795b295d138f84f5c
Author: Ricardo Mones <ricardo at mones.org>
Date:   Thu Jul 25 13:10:15 2013 +0200

    Fix bug #2982 'variable declaration behind FLOCK conditional'
    
    Patch by Richard Palo <richard at NetBSD.org>, added to AUTHORS.
    Also synchronize authors.h with AUTHORS while we're at it.

diff --git a/AUTHORS b/AUTHORS
index 27c6f8a..0c4e1b6 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -297,3 +297,4 @@ contributors (in addition to the above; based on Changelog)
 	Ben Deering
 	Henri Bauer
 	Michal Gorny
+	Richard Palo
diff --git a/src/gtk/authors.h b/src/gtk/authors.h
index 7d2d2bd..209a426 100644
--- a/src/gtk/authors.h
+++ b/src/gtk/authors.h
@@ -283,5 +283,7 @@ static char *CONTRIBS_LIST[] = {
 "Gál Zoltán",
 "Marien Zwart",
 "Martin Zwickel",
+"Michal Gorny",
+"Richard Palo",
 NULL
 };
diff --git a/src/main.c b/src/main.c
index 131c807..f7a2eaa 100644
--- a/src/main.c
+++ b/src/main.c
@@ -2190,10 +2190,10 @@ static gint prohibit_duplicate_launch(void)
 		x_display = g_strdup(g_getenv("DISPLAY"));
 
 	if (uxsock < 0) {
+		gint ret;
 #if HAVE_FLOCK
 		gchar *socket_lock;
 		gint lock_fd;
-		gint ret;
 		/* If connect failed, no other process is running.
 		 * Unlink the potentially existing socket, then
 		 * open it. This has to be done locking a temporary

-----------------------------------------------------------------------

Summary of changes:
 AUTHORS           |    1 +
 src/gtk/authors.h |    2 ++
 src/main.c        |    2 +-
 3 files changed, 4 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
Claws Mail