talons

commit a4bbca4efbc79a0313fc1bc4f0ed9c34380ddd33
parent fadecf4344c3dfeff4106c86cefa94b5dae52dac
Author: Colin Leroy <colin@colino.net>
Date:   Mon, 31 Oct 2011 20:51:36 +0000

2011-10-31 [colin]	3.7.10cvs65

	* src/common/defs.h
		Fix build with GLib 2.31. Thanks to Charles A. Edwards

Diffstat:
M
ChangeLog
 | 
5
+++++
M
PATCHSETS
 | 
1
+
M
configure.ac
 | 
2
+-
M
src/common/defs.h
 | 
2
+-

4 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,8 @@
+2011-10-31 [colin]	3.7.10cvs65
+
+	* src/common/defs.h
+		Fix build with GLib 2.31. Thanks to Charles A. Edwards
+
 2011-10-31 [pawel]	3.7.10cvs64
 
 	* src/summaryview.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -4268,3 +4268,4 @@
 ( cvs diff -u -r 1.382.2.590 -r 1.382.2.591 src/compose.c;  ) > 3.7.10cvs62.patchset
 ( cvs diff -u -r 1.12.2.78 -r 1.12.2.79 src/prefs_template.c;  ) > 3.7.10cvs63.patchset
 ( cvs diff -u -r 1.395.2.434 -r 1.395.2.435 src/summaryview.c;  cvs diff -u -r 1.5.2.100 -r 1.5.2.101 src/gtk/gtkutils.c;  ) > 3.7.10cvs64.patchset
+( cvs diff -u -r 1.9.2.52 -r 1.9.2.53 src/common/defs.h;  ) > 3.7.10cvs65.patchset
diff --git a/configure.ac b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=7
 MICRO_VERSION=10
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=64
+EXTRA_VERSION=65
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/common/defs.h b/src/common/defs.h
@@ -24,7 +24,7 @@
 #  include "config.h"
 #endif
 
-#include <glibconfig.h>
+#include <glib.h>
 
 #ifdef G_OS_WIN32
 #  include <glib/gwin32.h>