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 2b5e6d4ab9716a49ed776a9c7521c0c4a08cbfe5..d5110bca24def67e8cf6e8babc30a7e0d6e48a0c 100644 (file)
--- 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 bc4195e7c284be6de669045b9c427e6543700c23..84ffb6726f3f96128c935d7da73655ed3c43ce99 100644 (file)
--- 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 33b8a9680518663c5a8cf3e6be9a39bff063d0fc..6aecca63af2f26dc4d7885842a9735e9de227bfa 100644 (file)
--- 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 37dca7ab274abd499d3d42191fae96c3bcf0a32e..3de1ec5e394cd205467046bac9c40db4ace9611a 100644 (file)
--- 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 c065974c72aa86c930b508fcd742a7ec054a9237..5743f2913d99c987caa66df380d8b4826e610a73 100644 (file)
--- 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 50fb8a9f8576b4e2efd2bb071feddcfbf5897de0..9bb597a469417e97a9f271eb2dcbf63a62127444 100644 (file)
--- 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