From: Paul Mangan Date: Wed, 17 Jan 2007 08:55:14 +0000 (+0000) Subject: 2007-01-17 [paul] 2.7.1cvs13 X-Git-Tag: rel_2_8_0~126 X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=31272f177648503404b151f5cda976b0ae09e88c 2007-01-17 [paul] 2.7.1cvs13 * src/common/defs.h * tools/make.themes.project rename .sylpheed_themeinfo to .claws_themeinfo and use it * src/etpan/etpan-errors.h * src/etpan/etpan-log.c * src/etpan/etpan-log.h * src/etpan/etpan-thread-manager-types.h * src/etpan/etpan-thread-manager.c * src/etpan/etpan-thread-manager.h * src/etpan/imap-thread.c * src/etpan/imap-thread.h add copyright header --- diff --git a/ChangeLog b/ChangeLog index 6f5928852..4abdf9553 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,19 @@ +2007-01-17 [paul] 2.7.1cvs13 + + * src/common/defs.h + * tools/make.themes.project + rename .sylpheed_themeinfo to .claws_themeinfo + and use it + * src/etpan/etpan-errors.h + * src/etpan/etpan-log.c + * src/etpan/etpan-log.h + * src/etpan/etpan-thread-manager-types.h + * src/etpan/etpan-thread-manager.c + * src/etpan/etpan-thread-manager.h + * src/etpan/imap-thread.c + * src/etpan/imap-thread.h + add copyright header + 2007-01-17 [colin] 2.7.1cvs12 * src/plugins/pgpcore/select-keys.c diff --git a/PATCHSETS b/PATCHSETS index 25a4aef9e..e60cae38c 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -2270,3 +2270,4 @@ ( cvs diff -u -r 1.207.2.142 -r 1.207.2.143 src/folderview.c; ) > 2.7.1cvs10.patchset ( cvs diff -u -r 1.179.2.152 -r 1.179.2.153 src/imap.c; cvs diff -u -r 1.34.2.11 -r 1.34.2.12 src/imap.h; cvs diff -u -r 1.1.2.39 -r 1.1.2.40 src/imap_gtk.c; ) > 2.7.1cvs11.patchset ( cvs diff -u -r 1.1.2.15 -r 1.1.2.16 src/plugins/pgpcore/select-keys.c; cvs diff -u -r 1.5.2.41 -r 1.5.2.42 src/gtk/pluginwindow.c; cvs diff -u -r 1.105.2.80 -r 1.105.2.81 src/prefs_account.c; ) > 2.7.1cvs12.patchset +( cvs diff -u -r 1.9.2.33 -r 1.9.2.34 src/common/defs.h; cvs diff -u -r 1.1.4.2 -r 1.1.4.3 src/etpan/etpan-errors.h; cvs diff -u -r 1.1.4.4 -r 1.1.4.5 src/etpan/etpan-log.c; cvs diff -u -r 1.1.4.2 -r 1.1.4.3 src/etpan/etpan-log.h; cvs diff -u -r 1.1.4.3 -r 1.1.4.4 src/etpan/etpan-thread-manager-types.h; cvs diff -u -r 1.1.4.3 -r 1.1.4.4 src/etpan/etpan-thread-manager.c; cvs diff -u -r 1.1.4.2 -r 1.1.4.3 src/etpan/etpan-thread-manager.h; cvs diff -u -r 1.1.4.71 -r 1.1.4.72 src/etpan/imap-thread.c; cvs diff -u -r 1.1.4.13 -r 1.1.4.14 src/etpan/imap-thread.h; cvs diff -u -r 1.1.2.5 -r 1.1.2.6 tools/make.themes.project; ) > 2.7.1cvs13.patchset diff --git a/configure.ac b/configure.ac index b67332a0c..20b2eb534 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ MINOR_VERSION=7 MICRO_VERSION=1 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=12 +EXTRA_VERSION=13 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/src/common/defs.h b/src/common/defs.h index 39dfa27c0..68da84320 100644 --- a/src/common/defs.h +++ b/src/common/defs.h @@ -88,7 +88,7 @@ #define DONATE_URI "http://www.claws-mail.org/sponsors.php" #define OPENSSL_URI "http://www.openssl.org/" #define RELEASE_NOTES_FILE "RELEASE_NOTES" -#define THEMEINFO_FILE ".sylpheed_themeinfo" +#define THEMEINFO_FILE ".claws_themeinfo" #define FOLDER_LIST "folderlist.xml" #define CACHE_FILE ".sylpheed_claws_cache" #define MARK_FILE ".sylpheed_mark" diff --git a/src/etpan/etpan-errors.h b/src/etpan/etpan-errors.h index a2c879110..1a1001da6 100644 --- a/src/etpan/etpan-errors.h +++ b/src/etpan/etpan-errors.h @@ -1,36 +1,20 @@ /* - * etPan! -- a mail user agent + * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client + * Copyright (C) 2005-2007 DINH Viet Hoa and the Claws Mail team * - * Copyright (C) 2001, 2002 - DINH Viet Hoa - * All rights reserved. + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the libEtPan! project nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -/* - * $Id$ + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #ifndef ETPAN_ERRORS_H diff --git a/src/etpan/etpan-log.c b/src/etpan/etpan-log.c index d0e7a7545..f611a3a0e 100644 --- a/src/etpan/etpan-log.c +++ b/src/etpan/etpan-log.c @@ -1,3 +1,22 @@ +/* + * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client + * Copyright (C) 2005-2007 DINH Viet Hoa and 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + #ifdef HAVE_CONFIG_H # include "config.h" #endif diff --git a/src/etpan/etpan-log.h b/src/etpan/etpan-log.h index c0950fc95..357f45131 100644 --- a/src/etpan/etpan-log.h +++ b/src/etpan/etpan-log.h @@ -1,3 +1,22 @@ +/* + * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client + * Copyright (C) 2005-2007 DINH Viet Hoa and 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + #ifndef ETPAN_LOG_H #define ETPAN_LOG_H diff --git a/src/etpan/etpan-thread-manager-types.h b/src/etpan/etpan-thread-manager-types.h index 3a2b6a82d..93f47138b 100644 --- a/src/etpan/etpan-thread-manager-types.h +++ b/src/etpan/etpan-thread-manager-types.h @@ -1,3 +1,22 @@ +/* + * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client + * Copyright (C) 2005-2007 DINH Viet Hoa and 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + #ifndef ETPAN_THREAD_MANAGER_TYPES_H #define ETPAN_THREAD_MANAGER_TYPES_H diff --git a/src/etpan/etpan-thread-manager.c b/src/etpan/etpan-thread-manager.c index 37a1daaab..f10e9a68d 100644 --- a/src/etpan/etpan-thread-manager.c +++ b/src/etpan/etpan-thread-manager.c @@ -1,3 +1,22 @@ +/* + * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client + * Copyright (C) 2005-2007 DINH Viet Hoa and 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + #ifdef HAVE_CONFIG_H # include "config.h" #endif diff --git a/src/etpan/etpan-thread-manager.h b/src/etpan/etpan-thread-manager.h index 9b89b8f85..8eb1a7f81 100644 --- a/src/etpan/etpan-thread-manager.h +++ b/src/etpan/etpan-thread-manager.h @@ -1,3 +1,22 @@ +/* + * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client + * Copyright (C) 2005-2007 DINH Viet Hoa and 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + #ifndef ETPAN_THREAD_MANAGER_H #define ETPAN_THREAD_MANAGER_H diff --git a/src/etpan/imap-thread.c b/src/etpan/imap-thread.c index c03e9c6fb..5967c898a 100644 --- a/src/etpan/imap-thread.c +++ b/src/etpan/imap-thread.c @@ -1,3 +1,22 @@ +/* + * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client + * Copyright (C) 2005-2007 DINH Viet Hoa and 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + #ifdef HAVE_CONFIG_H # include "config.h" #endif diff --git a/src/etpan/imap-thread.h b/src/etpan/imap-thread.h index 3e33f3166..f226fa45e 100644 --- a/src/etpan/imap-thread.h +++ b/src/etpan/imap-thread.h @@ -1,3 +1,22 @@ +/* + * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client + * Copyright (C) 2005-2007 DINH Viet Hoa and 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + #ifndef IMAP_THREAD_H #define IMAP_THREAD_H diff --git a/tools/make.themes.project b/tools/make.themes.project index 51f873d61..4ef55671c 100644 --- a/tools/make.themes.project +++ b/tools/make.themes.project @@ -3,8 +3,8 @@ # Generate the source directory for claws-mail-themes package # from the theme tarballs in http://claws-mail.org/themes.php # -# Copyright (c) 2006 Ricardo Mones -# Paul Mangan +# Copyright (c) 2006-2007 Ricardo Mones +# Paul Mangan # # 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 @@ -103,8 +103,8 @@ function createThemeMakefileAm() echo 'themedir = $(prefix)/share/claws-mail/themes/'${dir} > $MA echo "" >> $MA echo -n 'dist_theme_DATA =' >> $MA - test -f .sylpheed_themeinfo \ - && echo " .sylpheed_themeinfo \\" >> $MA; + test -f .claws_themeinfo \ + && echo " .claws_themeinfo \\" >> $MA; count=`ls *.xpm | wc -l `; i=1; for px in `ls -1 *.xpm `;