talons

commit fcc24631d8ce0fe49b00f25fe9d9ae4835af1906
parent 9429105abbc1356c3fd57ca72f2c65ae2af18ea5
Author: Colin Leroy <colin@colino.net>
Date:   Fri, 25 Nov 2011 19:34:40 +0000

2011-11-25 [colin]	3.7.10cvs104

	* src/imap_gtk.c
	* src/mh_gtk.c
		Warning fixes

Diffstat:
M
ChangeLog
 | 
6
++++++
M
PATCHSETS
 | 
1
+
M
configure.ac
 | 
2
+-
M
src/imap_gtk.c
 | 
1
+
M
src/mh_gtk.c
 | 
1
+

5 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,9 @@
+2011-11-25 [colin]	3.7.10cvs104
+
+	* src/imap_gtk.c
+	* src/mh_gtk.c
+		Warning fixes
+
 2011-11-24 [pawel]	3.7.10cvs103
 
 	* src/prefs_filtering.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -4307,3 +4307,4 @@
 ( cvs diff -u -r 1.1.2.25 -r 1.1.2.26 src/gtk/gtkcmctree.c;  ) > 3.7.10cvs101.patchset
 ( cvs diff -u -r 1.61.2.103 -r 1.61.2.104 src/account.c;  cvs diff -u -r 1.60.2.59 -r 1.60.2.60 src/filtering.c;  cvs diff -u -r 1.21.2.20 -r 1.21.2.21 src/filtering.h;  cvs diff -u -r 1.1.2.67 -r 1.1.2.68 src/imap_gtk.c;  cvs diff -u -r 1.2.2.39 -r 1.2.2.40 src/mh_gtk.c;  cvs diff -u -r 1.60.2.77 -r 1.60.2.78 src/prefs_actions.c;  cvs diff -u -r 1.5.2.7 -r 1.5.2.8 src/prefs_actions.h;  ) > 3.7.10cvs102.patchset
 ( cvs diff -u -r 1.59.2.87 -r 1.59.2.88 src/prefs_filtering.c;  ) > 3.7.10cvs103.patchset
+( cvs diff -u -r 1.1.2.68 -r 1.1.2.69 src/imap_gtk.c;  cvs diff -u -r 1.2.2.40 -r 1.2.2.41 src/mh_gtk.c;  ) > 3.7.10cvs104.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=103
+EXTRA_VERSION=104
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/imap_gtk.c b/src/imap_gtk.c
@@ -42,6 +42,7 @@
 #include "prefs_common.h"
 #include "statusbar.h"
 #include "summaryview.h"
+#include "prefs_actions.h"
 
 static void new_folder_cb(GtkAction *action, gpointer data);
 static void rename_folder_cb(GtkAction *action, gpointer data);
diff --git a/src/mh_gtk.c b/src/mh_gtk.c
@@ -38,6 +38,7 @@
 #include "mh.h"
 #include "foldersel.h"
 #include "prefs_common.h"
+#include "prefs_actions.h"
 
 static void new_folder_cb(GtkAction *action, gpointer data);
 static void delete_folder_cb(GtkAction *action, gpointer data);