From 6881071bf63810ac68b143cfec4bec14188919dc Mon Sep 17 00:00:00 2001 From: Ettore Perazzoli Date: Sat, 27 Oct 2001 00:10:09 +0000 Subject: Update the licensing information to require version 2 of the GPL explicitly. svn path=/trunk/; revision=14188 --- addressbook/backend/ebook/e-book-util.c | 4 ++-- addressbook/backend/ebook/e-book-util.h | 4 ++-- addressbook/backend/ebook/e-card-compare.c | 4 ++-- addressbook/backend/ebook/e-card-compare.h | 4 ++-- addressbook/backend/ebook/e-destination.c | 4 ++-- addressbook/backend/ebook/e-destination.h | 4 ++-- addressbook/gui/component/addressbook-component.c | 4 ++-- addressbook/gui/component/addressbook-component.h | 4 ++-- addressbook/gui/component/addressbook-config.h | 4 ++-- addressbook/gui/component/addressbook-storage.c | 4 ++-- addressbook/gui/component/addressbook-storage.h | 4 ++-- addressbook/gui/component/e-address-popup.c | 4 ++-- addressbook/gui/component/e-address-popup.h | 4 ++-- addressbook/gui/component/e-address-widget.c | 4 ++-- addressbook/gui/component/e-address-widget.h | 4 ++-- addressbook/gui/component/select-names/e-select-names-bonobo.c | 4 ++-- addressbook/gui/component/select-names/e-select-names-bonobo.h | 4 ++-- addressbook/gui/component/select-names/e-select-names-completion.c | 4 ++-- addressbook/gui/component/select-names/e-select-names-completion.h | 4 ++-- addressbook/gui/component/select-names/e-select-names-factory.c | 4 ++-- addressbook/gui/component/select-names/e-select-names-factory.h | 4 ++-- addressbook/gui/component/select-names/e-select-names-popup.c | 4 ++-- addressbook/gui/component/select-names/e-select-names-popup.h | 4 ++-- addressbook/gui/component/select-names/e-select-names.c | 4 ++-- addressbook/gui/component/select-names/e-select-names.h | 4 ++-- addressbook/gui/contact-editor/e-contact-editor-address.c | 4 ++-- addressbook/gui/contact-editor/e-contact-editor-address.h | 4 ++-- addressbook/gui/contact-editor/e-contact-editor-fullname.c | 4 ++-- addressbook/gui/contact-editor/e-contact-editor-fullname.h | 4 ++-- addressbook/gui/contact-editor/e-contact-editor.c | 4 ++-- addressbook/gui/contact-editor/e-contact-editor.h | 4 ++-- addressbook/gui/contact-editor/e-contact-quick-add.c | 4 ++-- addressbook/gui/contact-editor/e-contact-quick-add.h | 4 ++-- addressbook/gui/contact-editor/e-contact-save-as.c | 4 ++-- addressbook/gui/contact-editor/e-contact-save-as.h | 4 ++-- addressbook/gui/contact-editor/test-editor.c | 4 ++-- addressbook/gui/contact-list-editor/e-contact-list-editor.c | 4 ++-- addressbook/gui/contact-list-editor/e-contact-list-editor.h | 4 ++-- addressbook/gui/search/e-addressbook-search-dialog.c | 4 ++-- addressbook/gui/search/e-addressbook-search-dialog.h | 4 ++-- addressbook/gui/widgets/e-addressbook-util.c | 4 ++-- addressbook/gui/widgets/e-addressbook-util.h | 4 ++-- addressbook/gui/widgets/e-addressbook-view.c | 4 ++-- addressbook/gui/widgets/e-addressbook-view.h | 4 ++-- addressbook/gui/widgets/e-minicard-label.c | 4 ++-- addressbook/gui/widgets/e-minicard-label.h | 4 ++-- addressbook/gui/widgets/e-minicard-view-widget.c | 4 ++-- addressbook/gui/widgets/e-minicard-view-widget.h | 4 ++-- addressbook/gui/widgets/e-minicard-view.c | 4 ++-- addressbook/gui/widgets/e-minicard-view.h | 4 ++-- addressbook/gui/widgets/e-minicard-widget.c | 4 ++-- addressbook/gui/widgets/e-minicard-widget.h | 4 ++-- addressbook/gui/widgets/e-minicard.c | 4 ++-- addressbook/gui/widgets/e-minicard.h | 4 ++-- addressbook/printing/e-contact-print-envelope.c | 4 ++-- addressbook/printing/e-contact-print-envelope.h | 4 ++-- addressbook/printing/e-contact-print-style-editor.c | 4 ++-- addressbook/printing/e-contact-print-style-editor.h | 4 ++-- addressbook/printing/e-contact-print-types.h | 4 ++-- addressbook/printing/e-contact-print.c | 4 ++-- addressbook/printing/e-contact-print.h | 4 ++-- addressbook/printing/test-contact-print-style-editor.c | 4 ++-- addressbook/printing/test-print.c | 4 ++-- 63 files changed, 126 insertions(+), 126 deletions(-) (limited to 'addressbook') diff --git a/addressbook/backend/ebook/e-book-util.c b/addressbook/backend/ebook/e-book-util.c index 2470d72950..ffe18c62f8 100644 --- a/addressbook/backend/ebook/e-book-util.c +++ b/addressbook/backend/ebook/e-book-util.c @@ -10,9 +10,9 @@ /* * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as + * modify it under the terms of version 2 of the GNU General Public * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. + * License as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/addressbook/backend/ebook/e-book-util.h b/addressbook/backend/ebook/e-book-util.h index 69965c8363..5a729fccfd 100644 --- a/addressbook/backend/ebook/e-book-util.h +++ b/addressbook/backend/ebook/e-book-util.h @@ -10,9 +10,9 @@ /* * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as + * modify it under the terms of version 2 of the GNU General Public * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. + * License as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/addressbook/backend/ebook/e-card-compare.c b/addressbook/backend/ebook/e-card-compare.c index 7f0534e2c4..22ea8e7a87 100644 --- a/addressbook/backend/ebook/e-card-compare.c +++ b/addressbook/backend/ebook/e-card-compare.c @@ -10,9 +10,9 @@ /* * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as + * modify it under the terms of version 2 of the GNU General Public * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. + * License as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/addressbook/backend/ebook/e-card-compare.h b/addressbook/backend/ebook/e-card-compare.h index 355dc814a9..b78211497b 100644 --- a/addressbook/backend/ebook/e-card-compare.h +++ b/addressbook/backend/ebook/e-card-compare.h @@ -10,9 +10,9 @@ /* * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as + * modify it under the terms of version 2 of the GNU General Public * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. + * License as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/addressbook/backend/ebook/e-destination.c b/addressbook/backend/ebook/e-destination.c index ff674e41a6..2419cb8efb 100644 --- a/addressbook/backend/ebook/e-destination.c +++ b/addressbook/backend/ebook/e-destination.c @@ -10,9 +10,9 @@ /* * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as + * modify it under the terms of version 2 of the GNU General Public * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. + * License as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/addressbook/backend/ebook/e-destination.h b/addressbook/backend/ebook/e-destination.h index 807ab51b8e..c8771aa216 100644 --- a/addressbook/backend/ebook/e-destination.h +++ b/addressbook/backend/ebook/e-destination.h @@ -10,9 +10,9 @@ /* * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as + * modify it under the terms of version 2 of the GNU General Public * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. + * License as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/addressbook/gui/component/addressbook-component.c b/addressbook/gui/component/addressbook-component.c index 62ef784ecd..03425e56b4 100644 --- a/addressbook/gui/component/addressbook-component.c +++ b/addressbook/gui/component/addressbook-component.c @@ -4,9 +4,9 @@ * Copyright (C) 2000 Ximian, Inc. * * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as + * modify it under the terms of version 2 of the GNU General Public * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. + * License as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/addressbook/gui/component/addressbook-component.h b/addressbook/gui/component/addressbook-component.h index e5dc74e17e..7c05006942 100644 --- a/addressbook/gui/component/addressbook-component.h +++ b/addressbook/gui/component/addressbook-component.h @@ -4,9 +4,9 @@ * Copyright (C) 2000 Ximian, Inc. * * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as + * modify it under the terms of version 2 of the GNU General Public * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. + * License as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/addressbook/gui/component/addressbook-config.h b/addressbook/gui/component/addressbook-config.h index 980fe2e5eb..1f488ddfa9 100644 --- a/addressbook/gui/component/addressbook-config.h +++ b/addressbook/gui/component/addressbook-config.h @@ -4,9 +4,9 @@ * Copyright (C) 2000 Ximian, Inc. * * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as + * modify it under the terms of version 2 of the GNU General Public * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. + * License as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/addressbook/gui/component/addressbook-storage.c b/addressbook/gui/component/addressbook-storage.c index eb2b2bc29a..434343afbc 100644 --- a/addressbook/gui/component/addressbook-storage.c +++ b/addressbook/gui/component/addressbook-storage.c @@ -4,9 +4,9 @@ * Copyright (C) 2000 Ximian, Inc. * * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as + * modify it under the terms of version 2 of the GNU General Public * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. + * License as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/addressbook/gui/component/addressbook-storage.h b/addressbook/gui/component/addressbook-storage.h index d4a918fe50..305915a8d3 100644 --- a/addressbook/gui/component/addressbook-storage.h +++ b/addressbook/gui/component/addressbook-storage.h @@ -4,9 +4,9 @@ * Copyright (C) 2000 Ximian, Inc. * * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as + * modify it under the terms of version 2 of the GNU General Public * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. + * License as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/addressbook/gui/component/e-address-popup.c b/addressbook/gui/component/e-address-popup.c index f9e54c4b9e..506b373066 100644 --- a/addressbook/gui/component/e-address-popup.c +++ b/addressbook/gui/component/e-address-popup.c @@ -10,9 +10,9 @@ /* * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as + * modify it under the terms of version 2 of the GNU General Public * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. + * License as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/addressbook/gui/component/e-address-popup.h b/addressbook/gui/component/e-address-popup.h index ef51437551..72512471c4 100644 --- a/addressbook/gui/component/e-address-popup.h +++ b/addressbook/gui/component/e-address-popup.h @@ -10,9 +10,9 @@ /* * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as + * modify it under the terms of version 2 of the GNU General Public * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. + * License as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/addressbook/gui/component/e-address-widget.c b/addressbook/gui/component/e-address-widget.c index 2f81c70b36..50facda037 100644 --- a/addressbook/gui/component/e-address-widget.c +++ b/addressbook/gui/component/e-address-widget.c @@ -10,9 +10,9 @@ /* * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as + * modify it under the terms of version 2 of the GNU General Public * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. + * License as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/addressbook/gui/component/e-address-widget.h b/addressbook/gui/component/e-address-widget.h index 8cf425d5c9..934d6ff56b 100644 --- a/addressbook/gui/component/e-address-widget.h +++ b/addressbook/gui/component/e-address-widget.h @@ -10,9 +10,9 @@ /* * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as + * modify it under the terms of version 2 of the GNU General Public * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. + * License as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/addressbook/gui/component/select-names/e-select-names-bonobo.c b/addressbook/gui/component/select-names/e-select-names-bonobo.c index 3130d1c9c9..0fe4dc9261 100644 --- a/addressbook/gui/component/select-names/e-select-names-bonobo.c +++ b/addressbook/gui/component/select-names/e-select-names-bonobo.c @@ -4,9 +4,9 @@ * Copyright (C) 2000 Ximian, Inc. * * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as + * modify it under the terms of version 2 of the GNU General Public * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. + * License as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/addressbook/gui/component/select-names/e-select-names-bonobo.h b/addressbook/gui/component/select-names/e-select-names-bonobo.h index c06e8fa0e0..3847109837 100644 --- a/addressbook/gui/component/select-names/e-select-names-bonobo.h +++ b/addressbook/gui/component/select-names/e-select-names-bonobo.h @@ -4,9 +4,9 @@ * Copyright (C) 2000 Ximian, Inc. * * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as + * modify it under the terms of version 2 of the GNU General Public * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. + * License as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/addressbook/gui/component/select-names/e-select-names-completion.c b/addressbook/gui/component/select-names/e-select-names-completion.c index 9650551f57..d091489dc1 100644 --- a/addressbook/gui/component/select-names/e-select-names-completion.c +++ b/addressbook/gui/component/select-names/e-select-names-completion.c @@ -10,9 +10,9 @@ /* * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as + * modify it under the terms of version 2 of the GNU General Public * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. + * License as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/addressbook/gui/component/select-names/e-select-names-completion.h b/addressbook/gui/component/select-names/e-select-names-completion.h index cfa496ca69..d3a860c037 100644 --- a/addressbook/gui/component/select-names/e-select-names-completion.h +++ b/addressbook/gui/component/select-names/e-select-names-completion.h @@ -10,9 +10,9 @@ /* * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as + * modify it under the terms of version 2 of the GNU General Public * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. + * License as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/addressbook/gui/component/select-names/e-select-names-factory.c b/addressbook/gui/component/select-names/e-select-names-factory.c index 7f65110c2a..d685d191e3 100644 --- a/addressbook/gui/component/select-names/e-select-names-factory.c +++ b/addressbook/gui/component/select-names/e-select-names-factory.c @@ -4,9 +4,9 @@ * Copyright (C) 2000 Ximian, Inc. * * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as + * modify it under the terms of version 2 of the GNU General Public * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. + * License as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/addressbook/gui/component/select-names/e-select-names-factory.h b/addressbook/gui/component/select-names/e-select-names-factory.h index dbdec8a182..49e05288a1 100644 --- a/addressbook/gui/component/select-names/e-select-names-factory.h +++ b/addressbook/gui/component/select-names/e-select-names-factory.h @@ -4,9 +4,9 @@ * Copyright (C) 2000 Ximian, Inc. * * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as + * modify it under the terms of version 2 of the GNU General Public * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. + * License as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/addressbook/gui/component/select-names/e-select-names-popup.c b/addressbook/gui/component/select-names/e-select-names-popup.c index 4b34ff2d01..87205d3e74 100644 --- a/addressbook/gui/component/select-names/e-select-names-popup.c +++ b/addressbook/gui/component/select-names/e-select-names-popup.c @@ -10,9 +10,9 @@ /* * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as + * modify it under the terms of version 2 of the GNU General Public * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. + * License as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/addressbook/gui/component/select-names/e-select-names-popup.h b/addressbook/gui/component/select-names/e-select-names-popup.h index cc93534181..f0afd43c0c 100644 --- a/addressbook/gui/component/select-names/e-select-names-popup.h +++ b/addressbook/gui/component/select-names/e-select-names-popup.h @@ -10,9 +10,9 @@ /* * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as + * modify it under the terms of version 2 of the GNU General Public * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. + * License as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/addressbook/gui/component/select-names/e-select-names.c b/addressbook/gui/component/select-names/e-select-names.c index 726f9bda5f..c51171d67a 100644 --- a/addressbook/gui/component/select-names/e-select-names.c +++ b/addressbook/gui/component/select-names/e-select-names.c @@ -4,9 +4,9 @@ * Author: Chris Lahey * * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as + * modify it under the terms of version 2 of the GNU General Public * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. + * License as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/addressbook/gui/component/select-names/e-select-names.h b/addressbook/gui/component/select-names/e-select-names.h index d4da9c9892..6109feae5b 100644 --- a/addressbook/gui/component/select-names/e-select-names.h +++ b/addressbook/gui/component/select-names/e-select-names.h @@ -4,9 +4,9 @@ * Author: Chris Lahey * * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as + * modify it under the terms of version 2 of the GNU General Public * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. + * License as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/addressbook/gui/contact-editor/e-contact-editor-address.c b/addressbook/gui/contact-editor/e-contact-editor-address.c index f07b483c21..30136f70a1 100644 --- a/addressbook/gui/contact-editor/e-contact-editor-address.c +++ b/addressbook/gui/contact-editor/e-contact-editor-address.c @@ -5,9 +5,9 @@ * Author: Chris Lahey * * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as + * modify it under the terms of version 2 of the GNU General Public * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. + * License as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/addressbook/gui/contact-editor/e-contact-editor-address.h b/addressbook/gui/contact-editor/e-contact-editor-address.h index f4031bea2f..611449cb4a 100644 --- a/addressbook/gui/contact-editor/e-contact-editor-address.h +++ b/addressbook/gui/contact-editor/e-contact-editor-address.h @@ -4,9 +4,9 @@ * Author: Chris Lahey * * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as + * modify it under the terms of version 2 of the GNU General Public * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. + * License as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/addressbook/gui/contact-editor/e-contact-editor-fullname.c b/addressbook/gui/contact-editor/e-contact-editor-fullname.c index ddf69d861c..9c5bd75509 100644 --- a/addressbook/gui/contact-editor/e-contact-editor-fullname.c +++ b/addressbook/gui/contact-editor/e-contact-editor-fullname.c @@ -5,9 +5,9 @@ * Author: Chris Lahey * * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as + * modify it under the terms of version 2 of the GNU General Public * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. + * License as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/addressbook/gui/contact-editor/e-contact-editor-fullname.h b/addressbook/gui/contact-editor/e-contact-editor-fullname.h index 82411c0606..0048870160 100644 --- a/addressbook/gui/contact-editor/e-contact-editor-fullname.h +++ b/addressbook/gui/contact-editor/e-contact-editor-fullname.h @@ -4,9 +4,9 @@ * Author: Chris Lahey * * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as + * modify it under the terms of version 2 of the GNU General Public * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. + * License as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/addressbook/gui/contact-editor/e-contact-editor.c b/addressbook/gui/contact-editor/e-contact-editor.c index c60ad8abe1..7273d4b094 100644 --- a/addressbook/gui/contact-editor/e-contact-editor.c +++ b/addressbook/gui/contact-editor/e-contact-editor.c @@ -5,9 +5,9 @@ * Author: Chris Lahey * * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as + * modify it under the terms of version 2 of the GNU General Public * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. + * License as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/addressbook/gui/contact-editor/e-contact-editor.h b/addressbook/gui/contact-editor/e-contact-editor.h index 5f9ac77435..3670ce4fe1 100644 --- a/addressbook/gui/contact-editor/e-contact-editor.h +++ b/addressbook/gui/contact-editor/e-contact-editor.h @@ -4,9 +4,9 @@ * Author: Chris Lahey * * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as + * modify it under the terms of version 2 of the GNU General Public * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. + * License as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/addressbook/gui/contact-editor/e-contact-quick-add.c b/addressbook/gui/contact-editor/e-contact-quick-add.c index 637c4019aa..85fde1aaed 100644 --- a/addressbook/gui/contact-editor/e-contact-quick-add.c +++ b/addressbook/gui/contact-editor/e-contact-quick-add.c @@ -10,9 +10,9 @@ /* * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as + * modify it under the terms of version 2 of the GNU General Public * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. + * License as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/addressbook/gui/contact-editor/e-contact-quick-add.h b/addressbook/gui/contact-editor/e-contact-quick-add.h index e01256a163..7fa92cf53f 100644 --- a/addressbook/gui/contact-editor/e-contact-quick-add.h +++ b/addressbook/gui/contact-editor/e-contact-quick-add.h @@ -10,9 +10,9 @@ /* * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as + * modify it under the terms of version 2 of the GNU General Public * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. + * License as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/addressbook/gui/contact-editor/e-contact-save-as.c b/addressbook/gui/contact-editor/e-contact-save-as.c index 2573eab1b3..b321c0342b 100644 --- a/addressbook/gui/contact-editor/e-contact-save-as.c +++ b/addressbook/gui/contact-editor/e-contact-save-as.c @@ -4,9 +4,9 @@ * Author: Chris Lahey * * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as + * modify it under the terms of version 2 of the GNU General Public * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. + * License as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/addressbook/gui/contact-editor/e-contact-save-as.h b/addressbook/gui/contact-editor/e-contact-save-as.h index 75bd6ce957..2b61873cd8 100644 --- a/addressbook/gui/contact-editor/e-contact-save-as.h +++ b/addressbook/gui/contact-editor/e-contact-save-as.h @@ -4,9 +4,9 @@ * Author: Chris Lahey * * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as + * modify it under the terms of version 2 of the GNU General Public * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. + * License as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/addressbook/gui/contact-editor/test-editor.c b/addressbook/gui/contact-editor/test-editor.c index c45f6c2720..aef23e14fc 100644 --- a/addressbook/gui/contact-editor/test-editor.c +++ b/addressbook/gui/contact-editor/test-editor.c @@ -5,9 +5,9 @@ * Author: Chris Lahey * * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as + * modify it under the terms of version 2 of the GNU General Public * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. + * License as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/addressbook/gui/contact-list-editor/e-contact-list-editor.c b/addressbook/gui/contact-list-editor/e-contact-list-editor.c index 041bf6d9d8..a7680bae83 100644 --- a/addressbook/gui/contact-list-editor/e-contact-list-editor.c +++ b/addressbook/gui/contact-list-editor/e-contact-list-editor.c @@ -4,9 +4,9 @@ * Author: Chris Toshok * * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as + * modify it under the terms of version 2 of the GNU General Public * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. + * License as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/addressbook/gui/contact-list-editor/e-contact-list-editor.h b/addressbook/gui/contact-list-editor/e-contact-list-editor.h index 6c67fc6468..b8dd83fdee 100644 --- a/addressbook/gui/contact-list-editor/e-contact-list-editor.h +++ b/addressbook/gui/contact-list-editor/e-contact-list-editor.h @@ -4,9 +4,9 @@ * Author: Chris Toshok * * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as + * modify it under the terms of version 2 of the GNU General Public * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. + * License as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/addressbook/gui/search/e-addressbook-search-dialog.c b/addressbook/gui/search/e-addressbook-search-dialog.c index 5c90ce767a..62221e9db0 100644 --- a/addressbook/gui/search/e-addressbook-search-dialog.c +++ b/addressbook/gui/search/e-addressbook-search-dialog.c @@ -5,9 +5,9 @@ * Author: Chris Lahey * * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as + * modify it under the terms of version 2 of the GNU General Public * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. + * License as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/addressbook/gui/search/e-addressbook-search-dialog.h b/addressbook/gui/search/e-addressbook-search-dialog.h index 86b30056d3..02e5910c01 100644 --- a/addressbook/gui/search/e-addressbook-search-dialog.h +++ b/addressbook/gui/search/e-addressbook-search-dialog.h @@ -4,9 +4,9 @@ * Author: Chris Lahey * * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as + * modify it under the terms of version 2 of the GNU General Public * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. + * License as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/addressbook/gui/widgets/e-addressbook-util.c b/addressbook/gui/widgets/e-addressbook-util.c index 6ecf00cbf5..12df794c56 100644 --- a/addressbook/gui/widgets/e-addressbook-util.c +++ b/addressbook/gui/widgets/e-addressbook-util.c @@ -5,9 +5,9 @@ * Author: Chris Toshok * * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as + * modify it under the terms of version 2 of the GNU General Public * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. + * License as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/addressbook/gui/widgets/e-addressbook-util.h b/addressbook/gui/widgets/e-addressbook-util.h index 1f3ffe074d..92212f6db0 100644 --- a/addressbook/gui/widgets/e-addressbook-util.h +++ b/addressbook/gui/widgets/e-addressbook-util.h @@ -4,9 +4,9 @@ * Author: Chris Toshok * * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as + * modify it under the terms of version 2 of the GNU General Public * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. + * License as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/addressbook/gui/widgets/e-addressbook-view.c b/addressbook/gui/widgets/e-addressbook-view.c index 4fca71d0a6..a8783a7f84 100644 --- a/addressbook/gui/widgets/e-addressbook-view.c +++ b/addressbook/gui/widgets/e-addressbook-view.c @@ -5,9 +5,9 @@ * Author: Chris Lahey * * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as + * modify it under the terms of version 2 of the GNU General Public * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. + * License as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/addressbook/gui/widgets/e-addressbook-view.h b/addressbook/gui/widgets/e-addressbook-view.h index c2fe0588b4..556058af76 100644 --- a/addressbook/gui/widgets/e-addressbook-view.h +++ b/addressbook/gui/widgets/e-addressbook-view.h @@ -4,9 +4,9 @@ * Author: Chris Lahey * * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as + * modify it under the terms of version 2 of the GNU General Public * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. + * License as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/addressbook/gui/widgets/e-minicard-label.c b/addressbook/gui/widgets/e-minicard-label.c index cdb16ef68d..710b7e8256 100644 --- a/addressbook/gui/widgets/e-minicard-label.c +++ b/addressbook/gui/widgets/e-minicard-label.c @@ -5,9 +5,9 @@ * Author: Chris Lahey * * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as + * modify it under the terms of version 2 of the GNU General Public * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. + * License as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/addressbook/gui/widgets/e-minicard-label.h b/addressbook/gui/widgets/e-minicard-label.h index eed6e1da21..6bdf800d21 100644 --- a/addressbook/gui/widgets/e-minicard-label.h +++ b/addressbook/gui/widgets/e-minicard-label.h @@ -4,9 +4,9 @@ * Author: Chris Lahey * * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as + * modify it under the terms of version 2 of the GNU General Public * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. + * License as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/addressbook/gui/widgets/e-minicard-view-widget.c b/addressbook/gui/widgets/e-minicard-view-widget.c index 73d76ade73..657e57a34c 100644 --- a/addressbook/gui/widgets/e-minicard-view-widget.c +++ b/addressbook/gui/widgets/e-minicard-view-widget.c @@ -5,9 +5,9 @@ * Author: Chris Lahey * * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as + * modify it under the terms of version 2 of the GNU General Public * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. + * License as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/addressbook/gui/widgets/e-minicard-view-widget.h b/addressbook/gui/widgets/e-minicard-view-widget.h index 2d94f15ec5..f56503d889 100644 --- a/addressbook/gui/widgets/e-minicard-view-widget.h +++ b/addressbook/gui/widgets/e-minicard-view-widget.h @@ -4,9 +4,9 @@ * Author: Chris Lahey * * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as + * modify it under the terms of version 2 of the GNU General Public * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. + * License as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/addressbook/gui/widgets/e-minicard-view.c b/addressbook/gui/widgets/e-minicard-view.c index fa1f2bbced..28f3f0a4d8 100644 --- a/addressbook/gui/widgets/e-minicard-view.c +++ b/addressbook/gui/widgets/e-minicard-view.c @@ -5,9 +5,9 @@ * Author: Chris Lahey * * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as + * modify it under the terms of version 2 of the GNU General Public * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. + * License as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/addressbook/gui/widgets/e-minicard-view.h b/addressbook/gui/widgets/e-minicard-view.h index b735cc1ea7..5043435433 100644 --- a/addressbook/gui/widgets/e-minicard-view.h +++ b/addressbook/gui/widgets/e-minicard-view.h @@ -4,9 +4,9 @@ * Author: Chris Lahey * * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as + * modify it under the terms of version 2 of the GNU General Public * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. + * License as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/addressbook/gui/widgets/e-minicard-widget.c b/addressbook/gui/widgets/e-minicard-widget.c index 1a8912e19d..85af04e7bb 100644 --- a/addressbook/gui/widgets/e-minicard-widget.c +++ b/addressbook/gui/widgets/e-minicard-widget.c @@ -5,9 +5,9 @@ * Author: Chris Lahey * * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as + * modify it under the terms of version 2 of the GNU General Public * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. + * License as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/addressbook/gui/widgets/e-minicard-widget.h b/addressbook/gui/widgets/e-minicard-widget.h index 6daf7f6fa3..ef82d5049c 100644 --- a/addressbook/gui/widgets/e-minicard-widget.h +++ b/addressbook/gui/widgets/e-minicard-widget.h @@ -4,9 +4,9 @@ * Author: Chris Lahey * * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as + * modify it under the terms of version 2 of the GNU General Public * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. + * License as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/addressbook/gui/widgets/e-minicard.c b/addressbook/gui/widgets/e-minicard.c index 9122fd49b0..89a6b85b8b 100644 --- a/addressbook/gui/widgets/e-minicard.c +++ b/addressbook/gui/widgets/e-minicard.c @@ -5,9 +5,9 @@ * Author: Chris Lahey * * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as + * modify it under the terms of version 2 of the GNU General Public * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. + * License as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/addressbook/gui/widgets/e-minicard.h b/addressbook/gui/widgets/e-minicard.h index 434f7637a1..7066457a44 100644 --- a/addressbook/gui/widgets/e-minicard.h +++ b/addressbook/gui/widgets/e-minicard.h @@ -4,9 +4,9 @@ * Author: Chris Lahey * * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as + * modify it under the terms of version 2 of the GNU General Public * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. + * License as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/addressbook/printing/e-contact-print-envelope.c b/addressbook/printing/e-contact-print-envelope.c index 057ae63b9e..aadf3fe489 100644 --- a/addressbook/printing/e-contact-print-envelope.c +++ b/addressbook/printing/e-contact-print-envelope.c @@ -5,9 +5,9 @@ * Author: Chris Lahey * * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as + * modify it under the terms of version 2 of the GNU General Public * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. + * License as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/addressbook/printing/e-contact-print-envelope.h b/addressbook/printing/e-contact-print-envelope.h index 9197d4452d..4cb2c8ff63 100644 --- a/addressbook/printing/e-contact-print-envelope.h +++ b/addressbook/printing/e-contact-print-envelope.h @@ -5,9 +5,9 @@ * Author: Chris Lahey * * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as + * modify it under the terms of version 2 of the GNU General Public * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. + * License as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/addressbook/printing/e-contact-print-style-editor.c b/addressbook/printing/e-contact-print-style-editor.c index adb974607c..88218773b7 100644 --- a/addressbook/printing/e-contact-print-style-editor.c +++ b/addressbook/printing/e-contact-print-style-editor.c @@ -5,9 +5,9 @@ * Author: Chris Lahey * * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as + * modify it under the terms of version 2 of the GNU General Public * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. + * License as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/addressbook/printing/e-contact-print-style-editor.h b/addressbook/printing/e-contact-print-style-editor.h index 987c4edbf3..1bb30014fd 100644 --- a/addressbook/printing/e-contact-print-style-editor.h +++ b/addressbook/printing/e-contact-print-style-editor.h @@ -4,9 +4,9 @@ * Author: Chris Lahey * * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as + * modify it under the terms of version 2 of the GNU General Public * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. + * License as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/addressbook/printing/e-contact-print-types.h b/addressbook/printing/e-contact-print-types.h index c0f76da818..3c640d922b 100644 --- a/addressbook/printing/e-contact-print-types.h +++ b/addressbook/printing/e-contact-print-types.h @@ -5,9 +5,9 @@ * Author: Chris Lahey * * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as + * modify it under the terms of version 2 of the GNU General Public * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. + * License as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/addressbook/printing/e-contact-print.c b/addressbook/printing/e-contact-print.c index 42c7718379..79afa215e1 100644 --- a/addressbook/printing/e-contact-print.c +++ b/addressbook/printing/e-contact-print.c @@ -5,9 +5,9 @@ * Author: Chris Lahey * * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as + * modify it under the terms of version 2 of the GNU General Public * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. + * License as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/addressbook/printing/e-contact-print.h b/addressbook/printing/e-contact-print.h index 9918248b3a..b8a22504bb 100644 --- a/addressbook/printing/e-contact-print.h +++ b/addressbook/printing/e-contact-print.h @@ -5,9 +5,9 @@ * Author: Chris Lahey * * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as + * modify it under the terms of version 2 of the GNU General Public * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. + * License as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/addressbook/printing/test-contact-print-style-editor.c b/addressbook/printing/test-contact-print-style-editor.c index 0a27e91d20..578a840fc4 100644 --- a/addressbook/printing/test-contact-print-style-editor.c +++ b/addressbook/printing/test-contact-print-style-editor.c @@ -5,9 +5,9 @@ * Author: Chris Lahey * * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as + * modify it under the terms of version 2 of the GNU General Public * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. + * License as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/addressbook/printing/test-print.c b/addressbook/printing/test-print.c index 1cb5bb0905..ebad26a48e 100644 --- a/addressbook/printing/test-print.c +++ b/addressbook/printing/test-print.c @@ -5,9 +5,9 @@ * Author: Chris Lahey * * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as + * modify it under the terms of version 2 of the GNU General Public * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. + * License as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of -- cgit v1.2.3