diff -ruN claws-mail-3.11.0-orig/src/plugins/python/clawsmailmodule.c claws-mail-3.11.0/src/plugins/python/clawsmailmodule.c
--- claws-mail-3.11.0-orig/src/plugins/python/clawsmailmodule.c	2014-10-20 15:05:31.000000000 -0500
+++ claws-mail-3.11.0/src/plugins/python/clawsmailmodule.c	2014-10-24 05:37:03.000000000 -0500
@@ -33,7 +33,9 @@
 #include "accounttype.h"
 #include "mailboxtype.h"
 
+#define NO_IMPORT_PYGOBJECT
 #include <pygobject.h>
+#define NO_IMPORT_PYGTK
 #include <pygtk/pygtk.h>
 
 #include "main.h"
From aab231b16fd07a9196fe882205658d33c78752d2 Mon Sep 17 00:00:00 2001
From: Andrej Kacian <ticho@claws-mail.org>
Date: Mon, 20 Jul 2015 19:57:05 +0200
Subject: [PATCH] Fix building on GLib older than 2.25.

---
 src/common/utils.h |    8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/common/utils.h b/src/common/utils.h
index ff01d83..3771d45 100644
--- a/src/common/utils.h
+++ b/src/common/utils.h
@@ -75,6 +75,14 @@ typedef gint64 goffset;
   #define HAVE_U32_TYPEDEF
 #endif
 
+#if !GLIB_CHECK_VERSION(2, 25, 0)
+# ifdef G_OS_WIN32
+	typedef _g_stat_struct GStatBuf;
+# else
+	typedef struct stat GStatBuf;
+# endif
+#endif
+
 #ifndef BIG_ENDIAN_HOST
   #if (G_BYTE_ORDER == G_BIG_ENDIAN)
     #define BIG_ENDIAN_HOST 1
-- 
1.7.10.4