From: Paul Mangan <paul@claws-mail.org>
Date: Mon, 15 Jan 2007 06:34:43 +0000 (+0000)
Subject: 2007-01-15 [paul]	2.7.0cvs30
X-Git-Tag: rel_2_8_0~140
X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=2e25c52300e4a327103f0e64b84891bf365aa613;ds=sidebyside

2007-01-15 [paul]	2.7.0cvs30

	* src/mainwindow.c
		fix compiler warning
	* src/plugins/pgpcore/prefs_gpg.c
	* src/plugins/pgpcore/prefs_gpg.h
		add missing include
		fix copyright header
---

diff --git a/ChangeLog b/ChangeLog
index 2b5e6d4ab..d5110bca2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2007-01-15 [paul]	2.7.0cvs30
+
+	* src/mainwindow.c
+		fix compiler warning
+	* src/plugins/pgpcore/prefs_gpg.c
+	* src/plugins/pgpcore/prefs_gpg.h
+		add missing include
+		fix copyright header
+
 2007-01-14 [colin]	2.7.0cvs29
 
 	* src/gtk/filesel.c
diff --git a/PATCHSETS b/PATCHSETS
index bc4195e7c..84ffb6726 100644
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2256,3 +2256,4 @@
 ( cvs diff -u -r 1.2.2.21 -r 1.2.2.22 src/gtk/inputdialog.c;  ) > 2.7.0cvs27.patchset
 ( cvs diff -u -r 1.1.4.67 -r 1.1.4.68 src/etpan/imap-thread.c;  ) > 2.7.0cvs28.patchset
 ( cvs diff -u -r 1.2.2.30 -r 1.2.2.31 src/gtk/filesel.c;  ) > 2.7.0cvs29.patchset
+( cvs diff -u -r 1.274.2.163 -r 1.274.2.164 src/mainwindow.c;  cvs diff -u -r 1.1.2.16 -r 1.1.2.17 src/plugins/pgpcore/prefs_gpg.c;  cvs diff -u -r 1.1.2.5 -r 1.1.2.6 src/plugins/pgpcore/prefs_gpg.h;  ) > 2.7.0cvs30.patchset
diff --git a/configure.ac b/configure.ac
index 33b8a9680..6aecca63a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=7
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=29
+EXTRA_VERSION=30
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/mainwindow.c b/src/mainwindow.c
index 37dca7ab2..3de1ec5e3 100644
--- a/src/mainwindow.c
+++ b/src/mainwindow.c
@@ -3266,7 +3266,6 @@ static void toggle_work_offline_cb (MainWindow *mainwin, guint action, GtkWidget
 static gboolean any_folder_want_synchronise(void)
 {
 	GList *folderlist = folder_get_list();
-	gboolean found = FALSE;
 
 	/* see if there are synchronised folders */
 	for (; folderlist; folderlist = folderlist->next) {
@@ -3277,7 +3276,6 @@ static gboolean any_folder_want_synchronise(void)
 	}
 	
 	return FALSE;
-
 }
 
 static void mainwindow_check_synchronise(MainWindow *mainwin, gboolean ask)
diff --git a/src/plugins/pgpcore/prefs_gpg.c b/src/plugins/pgpcore/prefs_gpg.c
index c065974c7..5743f2913 100644
--- a/src/plugins/pgpcore/prefs_gpg.c
+++ b/src/plugins/pgpcore/prefs_gpg.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2004 Hiroyuki Yamamoto & the Claws Mail team
+ * Copyright (C) 2004-2007 Hiroyuki Yamamoto & the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -23,6 +23,7 @@
 
 #include "defs.h"
 #include "utils.h"
+#include "gtk/gtkutils.h"
 #include "prefs.h"
 #include "prefs_gtk.h"
 #include "prefs_gpg.h"
diff --git a/src/plugins/pgpcore/prefs_gpg.h b/src/plugins/pgpcore/prefs_gpg.h
index 50fb8a9f8..9bb597a46 100644
--- a/src/plugins/pgpcore/prefs_gpg.h
+++ b/src/plugins/pgpcore/prefs_gpg.h
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2004 Hiroyuki Yamamoto & the Claws Mail team
+ * Copyright (C) 2004-2007 Hiroyuki Yamamoto & the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by