aboutsummaryrefslogtreecommitdiffstats
path: root/camel
diff options
context:
space:
mode:
authorEttore Perazzoli <ettore@src.gnome.org>2001-10-28 00:59:46 +0800
committerEttore Perazzoli <ettore@src.gnome.org>2001-10-28 00:59:46 +0800
commit08fb7329cb73d64ee5eed4e7506b84641c432678 (patch)
treef03749a0c85af63321dd260cafbadcc895521d01 /camel
parent0d1d16f053987fd894172cc43add7da102926f63 (diff)
downloadgsoc2013-evolution-08fb7329cb73d64ee5eed4e7506b84641c432678.tar.gz
gsoc2013-evolution-08fb7329cb73d64ee5eed4e7506b84641c432678.tar.zst
gsoc2013-evolution-08fb7329cb73d64ee5eed4e7506b84641c432678.zip
Fixing the license text.
svn path=/trunk/; revision=14212
Diffstat (limited to 'camel')
-rw-r--r--camel/camel-charset-map.c1
-rw-r--r--camel/camel-data-wrapper.c1
-rw-r--r--camel/camel-data-wrapper.h1
-rw-r--r--camel/camel-disco-diary.c1
-rw-r--r--camel/camel-disco-diary.h1
-rw-r--r--camel/camel-disco-folder.c1
-rw-r--r--camel/camel-disco-folder.h1
-rw-r--r--camel/camel-disco-store.h1
-rw-r--r--camel/camel-exception.c1
-rw-r--r--camel/camel-exception.h1
-rw-r--r--camel/camel-file-utils.c1
-rw-r--r--camel/camel-file-utils.h1
-rw-r--r--camel/camel-folder.c1
-rw-r--r--camel/camel-folder.h1
-rw-r--r--camel/camel-lock-client.c1
-rw-r--r--camel/camel-lock-client.h1
-rw-r--r--camel/camel-lock-helper.c1
-rw-r--r--camel/camel-lock-helper.h1
-rw-r--r--camel/camel-lock.c1
-rw-r--r--camel/camel-lock.h1
-rw-r--r--camel/camel-medium.c1
-rw-r--r--camel/camel-medium.h1
-rw-r--r--camel/camel-mime-message.c1
-rw-r--r--camel/camel-mime-message.h1
-rw-r--r--camel/camel-mime-part-utils.c1
-rw-r--r--camel/camel-mime-part-utils.h1
-rw-r--r--camel/camel-mime-part.c1
-rw-r--r--camel/camel-mime-part.h1
-rw-r--r--camel/camel-movemail.c1
-rw-r--r--camel/camel-movemail.h1
-rw-r--r--camel/camel-multipart.c1
-rw-r--r--camel/camel-multipart.h1
-rw-r--r--camel/camel-object.c1
-rw-r--r--camel/camel-object.h1
-rw-r--r--camel/camel-operation.h1
-rw-r--r--camel/camel-private.h1
-rw-r--r--camel/camel-provider.c1
-rw-r--r--camel/camel-provider.h1
-rw-r--r--camel/camel-remote-store.h1
-rw-r--r--camel/camel-seekable-stream.c1
-rw-r--r--camel/camel-seekable-stream.h1
-rw-r--r--camel/camel-seekable-substream.c1
-rw-r--r--camel/camel-seekable-substream.h1
-rw-r--r--camel/camel-service.c1
-rw-r--r--camel/camel-service.h1
-rw-r--r--camel/camel-session.c1
-rw-r--r--camel/camel-session.h1
-rw-r--r--camel/camel-store.c1
-rw-r--r--camel/camel-store.h1
-rw-r--r--camel/camel-stream-buffer.c1
-rw-r--r--camel/camel-stream-buffer.h1
-rw-r--r--camel/camel-stream-fs.c1
-rw-r--r--camel/camel-stream-fs.h1
-rw-r--r--camel/camel-stream-mem.c1
-rw-r--r--camel/camel-stream-mem.h1
-rw-r--r--camel/camel-stream-null.c1
-rw-r--r--camel/camel-stream.c1
-rw-r--r--camel/camel-stream.h1
-rw-r--r--camel/camel-transport.c1
-rw-r--r--camel/camel-transport.h1
-rw-r--r--camel/camel-types.h1
-rw-r--r--camel/camel-uid-cache.c1
-rw-r--r--camel/camel-uid-cache.h1
-rw-r--r--camel/camel-url.c1
-rw-r--r--camel/camel-url.h1
-rw-r--r--camel/camel.c1
-rw-r--r--camel/camel.h1
-rw-r--r--camel/gstring-util.c1
-rw-r--r--camel/gstring-util.h1
-rw-r--r--camel/hash-table-utils.c1
-rw-r--r--camel/hash-table-utils.h1
-rw-r--r--camel/providers/imap/camel-imap-command.h1
-rw-r--r--camel/providers/imap/camel-imap-folder.c1
-rw-r--r--camel/providers/imap/camel-imap-folder.h1
-rw-r--r--camel/providers/imap/camel-imap-message-cache.c1
-rw-r--r--camel/providers/imap/camel-imap-message-cache.h1
-rw-r--r--camel/providers/imap/camel-imap-private.h1
-rw-r--r--camel/providers/imap/camel-imap-store.h1
-rw-r--r--camel/providers/imap/camel-imap-types.h1
-rw-r--r--camel/providers/imap/camel-imap-wrapper.c1
-rw-r--r--camel/providers/imap/camel-imap-wrapper.h1
-rw-r--r--camel/providers/local/camel-local-folder.c1
-rw-r--r--camel/providers/local/camel-local-folder.h1
-rw-r--r--camel/providers/local/camel-local-private.h1
-rw-r--r--camel/providers/local/camel-local-provider.c1
-rw-r--r--camel/providers/local/camel-local-store.c1
-rw-r--r--camel/providers/local/camel-local-store.h1
-rw-r--r--camel/providers/local/camel-maildir-folder.c1
-rw-r--r--camel/providers/local/camel-maildir-folder.h1
-rw-r--r--camel/providers/local/camel-maildir-store.c1
-rw-r--r--camel/providers/local/camel-maildir-store.h1
-rw-r--r--camel/providers/local/camel-mbox-folder.c1
-rw-r--r--camel/providers/local/camel-mbox-folder.h1
-rw-r--r--camel/providers/local/camel-mbox-store.c1
-rw-r--r--camel/providers/local/camel-mbox-store.h1
-rw-r--r--camel/providers/local/camel-mh-folder.c1
-rw-r--r--camel/providers/local/camel-mh-folder.h1
-rw-r--r--camel/providers/local/camel-mh-store.c1
-rw-r--r--camel/providers/local/camel-mh-store.h1
-rw-r--r--camel/providers/local/camel-spool-folder.c1
-rw-r--r--camel/providers/local/camel-spool-folder.h1
-rw-r--r--camel/providers/local/camel-spool-store.c1
-rw-r--r--camel/providers/local/camel-spool-store.h1
-rw-r--r--camel/providers/nntp/camel-nntp-auth.c1
-rw-r--r--camel/providers/nntp/camel-nntp-auth.h1
-rw-r--r--camel/providers/nntp/camel-nntp-folder.c1
-rw-r--r--camel/providers/nntp/camel-nntp-folder.h1
-rw-r--r--camel/providers/nntp/camel-nntp-grouplist.c1
-rw-r--r--camel/providers/nntp/camel-nntp-grouplist.h1
-rw-r--r--camel/providers/nntp/camel-nntp-newsrc.c1
-rw-r--r--camel/providers/nntp/camel-nntp-provider.c1
-rw-r--r--camel/providers/nntp/camel-nntp-resp-codes.h1
-rw-r--r--camel/providers/nntp/camel-nntp-store.c1
-rw-r--r--camel/providers/nntp/camel-nntp-store.h1
-rw-r--r--camel/providers/nntp/camel-nntp-types.h1
-rw-r--r--camel/providers/nntp/camel-nntp-utils.c1
-rw-r--r--camel/providers/nntp/camel-nntp-utils.h1
-rw-r--r--camel/providers/pop3/camel-pop3-folder.c1
-rw-r--r--camel/providers/pop3/camel-pop3-folder.h1
-rw-r--r--camel/providers/pop3/camel-pop3-provider.c1
-rw-r--r--camel/providers/pop3/camel-pop3-store.c1
-rw-r--r--camel/providers/pop3/camel-pop3-store.h1
-rw-r--r--camel/providers/sendmail/camel-sendmail-provider.c1
-rw-r--r--camel/providers/sendmail/camel-sendmail-transport.c1
-rw-r--r--camel/providers/sendmail/camel-sendmail-transport.h1
-rw-r--r--camel/providers/smtp/camel-smtp-provider.c1
-rw-r--r--camel/providers/smtp/camel-smtp-transport.c1
-rw-r--r--camel/providers/smtp/camel-smtp-transport.h1
-rw-r--r--camel/string-utils.c1
-rw-r--r--camel/string-utils.h1
130 files changed, 0 insertions, 130 deletions
diff --git a/camel/camel-charset-map.c b/camel/camel-charset-map.c
index 687345ba6d..10897b2025 100644
--- a/camel/camel-charset-map.c
+++ b/camel/camel-charset-map.c
@@ -9,7 +9,6 @@
*
* This program is free software; you can redistribute it and/or
* 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 as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
diff --git a/camel/camel-data-wrapper.c b/camel/camel-data-wrapper.c
index 7cfa5d37d4..541b140de1 100644
--- a/camel/camel-data-wrapper.c
+++ b/camel/camel-data-wrapper.c
@@ -9,7 +9,6 @@
*
* This program is free software; you can redistribute it and/or
* 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 as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
diff --git a/camel/camel-data-wrapper.h b/camel/camel-data-wrapper.h
index a72448c284..329304e143 100644
--- a/camel/camel-data-wrapper.h
+++ b/camel/camel-data-wrapper.h
@@ -10,7 +10,6 @@
*
* This program is free software; you can redistribute it and/or
* 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 as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
diff --git a/camel/camel-disco-diary.c b/camel/camel-disco-diary.c
index 463dfe8ff8..a437f5aa09 100644
--- a/camel/camel-disco-diary.c
+++ b/camel/camel-disco-diary.c
@@ -8,7 +8,6 @@
*
* This program is free software; you can redistribute it and/or
* 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 as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
diff --git a/camel/camel-disco-diary.h b/camel/camel-disco-diary.h
index 80ab205304..e2094adc8a 100644
--- a/camel/camel-disco-diary.h
+++ b/camel/camel-disco-diary.h
@@ -8,7 +8,6 @@
*
* This program is free software; you can redistribute it and/or
* 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 as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
diff --git a/camel/camel-disco-folder.c b/camel/camel-disco-folder.c
index ce9465cef7..eb3d8633aa 100644
--- a/camel/camel-disco-folder.c
+++ b/camel/camel-disco-folder.c
@@ -8,7 +8,6 @@
*
* This program is free software; you can redistribute it and/or
* 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 as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
diff --git a/camel/camel-disco-folder.h b/camel/camel-disco-folder.h
index b128b10719..b35c913f5f 100644
--- a/camel/camel-disco-folder.h
+++ b/camel/camel-disco-folder.h
@@ -8,7 +8,6 @@
*
* This program is free software; you can redistribute it and/or
* 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 as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
diff --git a/camel/camel-disco-store.h b/camel/camel-disco-store.h
index 1d1cbd58a6..575ce1a5ba 100644
--- a/camel/camel-disco-store.h
+++ b/camel/camel-disco-store.h
@@ -8,7 +8,6 @@
*
* This program is free software; you can redistribute it and/or
* 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 as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
diff --git a/camel/camel-exception.c b/camel/camel-exception.c
index 7c24b22f03..c5eec66908 100644
--- a/camel/camel-exception.c
+++ b/camel/camel-exception.c
@@ -10,7 +10,6 @@
*
* This program is free software; you can redistribute it and/or
* 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 as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
diff --git a/camel/camel-exception.h b/camel/camel-exception.h
index 0eaf7a813a..77c2c16066 100644
--- a/camel/camel-exception.h
+++ b/camel/camel-exception.h
@@ -10,7 +10,6 @@
*
* This program is free software; you can redistribute it and/or
* 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 as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
diff --git a/camel/camel-file-utils.c b/camel/camel-file-utils.c
index 85c2301c71..9331c64bfa 100644
--- a/camel/camel-file-utils.c
+++ b/camel/camel-file-utils.c
@@ -9,7 +9,6 @@
*
* This program is free software; you can redistribute it and/or
* 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 as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
diff --git a/camel/camel-file-utils.h b/camel/camel-file-utils.h
index 17b7c8384b..b45063752a 100644
--- a/camel/camel-file-utils.h
+++ b/camel/camel-file-utils.h
@@ -9,7 +9,6 @@
*
* This program is free software; you can redistribute it and/or
* 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 as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
diff --git a/camel/camel-folder.c b/camel/camel-folder.c
index 9bc38df846..405107e2a8 100644
--- a/camel/camel-folder.c
+++ b/camel/camel-folder.c
@@ -9,7 +9,6 @@
*
* This program is free software; you can redistribute it and/or
* 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 as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
diff --git a/camel/camel-folder.h b/camel/camel-folder.h
index 4ba36e9d03..fb987922c6 100644
--- a/camel/camel-folder.h
+++ b/camel/camel-folder.h
@@ -9,7 +9,6 @@
*
* This program is free software; you can redistribute it and/or
* 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 as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
diff --git a/camel/camel-lock-client.c b/camel/camel-lock-client.c
index 05a70f06cc..b73ca68b1d 100644
--- a/camel/camel-lock-client.c
+++ b/camel/camel-lock-client.c
@@ -6,7 +6,6 @@
*
* This program is free software; you can redistribute it and/or
* 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 as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
diff --git a/camel/camel-lock-client.h b/camel/camel-lock-client.h
index 7e02223b08..fc45e1d127 100644
--- a/camel/camel-lock-client.h
+++ b/camel/camel-lock-client.h
@@ -6,7 +6,6 @@
*
* This program is free software; you can redistribute it and/or
* 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 as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
diff --git a/camel/camel-lock-helper.c b/camel/camel-lock-helper.c
index 1e7179f089..9e5dc012a3 100644
--- a/camel/camel-lock-helper.c
+++ b/camel/camel-lock-helper.c
@@ -6,7 +6,6 @@
*
* This program is free software; you can redistribute it and/or
* 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 as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
diff --git a/camel/camel-lock-helper.h b/camel/camel-lock-helper.h
index 07307e1d7a..c61a097642 100644
--- a/camel/camel-lock-helper.h
+++ b/camel/camel-lock-helper.h
@@ -6,7 +6,6 @@
*
* This program is free software; you can redistribute it and/or
* 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 as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
diff --git a/camel/camel-lock.c b/camel/camel-lock.c
index c9010d6f71..8faae9f2aa 100644
--- a/camel/camel-lock.c
+++ b/camel/camel-lock.c
@@ -6,7 +6,6 @@
*
* This program is free software; you can redistribute it and/or
* 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 as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
diff --git a/camel/camel-lock.h b/camel/camel-lock.h
index 55e0bb781d..d54f7ed071 100644
--- a/camel/camel-lock.h
+++ b/camel/camel-lock.h
@@ -6,7 +6,6 @@
*
* This program is free software; you can redistribute it and/or
* 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 as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
diff --git a/camel/camel-medium.c b/camel/camel-medium.c
index fee9858f1d..2537989639 100644
--- a/camel/camel-medium.c
+++ b/camel/camel-medium.c
@@ -9,7 +9,6 @@
*
* This program is free software; you can redistribute it and/or
* 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 as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
diff --git a/camel/camel-medium.h b/camel/camel-medium.h
index 81be789683..26040b2a94 100644
--- a/camel/camel-medium.h
+++ b/camel/camel-medium.h
@@ -10,7 +10,6 @@
*
* This program is free software; you can redistribute it and/or
* 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 as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
diff --git a/camel/camel-mime-message.c b/camel/camel-mime-message.c
index 19c24a4b3e..02ed187929 100644
--- a/camel/camel-mime-message.c
+++ b/camel/camel-mime-message.c
@@ -10,7 +10,6 @@
*
* This program is free software; you can redistribute it and/or
* 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 as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
diff --git a/camel/camel-mime-message.h b/camel/camel-mime-message.h
index 3401f91188..7e8687a57d 100644
--- a/camel/camel-mime-message.h
+++ b/camel/camel-mime-message.h
@@ -8,7 +8,6 @@
*
* This program is free software; you can redistribute it and/or
* 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 as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
diff --git a/camel/camel-mime-part-utils.c b/camel/camel-mime-part-utils.c
index cff58ce15c..3bad8de1b6 100644
--- a/camel/camel-mime-part-utils.c
+++ b/camel/camel-mime-part-utils.c
@@ -8,7 +8,6 @@
*
* This program is free software; you can redistribute it and/or
* 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 as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
diff --git a/camel/camel-mime-part-utils.h b/camel/camel-mime-part-utils.h
index 516e147a68..576f7bd3e4 100644
--- a/camel/camel-mime-part-utils.h
+++ b/camel/camel-mime-part-utils.h
@@ -11,7 +11,6 @@
*
* This program is free software; you can redistribute it and/or
* 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 as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
diff --git a/camel/camel-mime-part.c b/camel/camel-mime-part.c
index efb4cee74b..637973a6e6 100644
--- a/camel/camel-mime-part.c
+++ b/camel/camel-mime-part.c
@@ -9,7 +9,6 @@
*
* This program is free software; you can redistribute it and/or
* 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 as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
diff --git a/camel/camel-mime-part.h b/camel/camel-mime-part.h
index 605bf1d64a..785fecf9d9 100644
--- a/camel/camel-mime-part.h
+++ b/camel/camel-mime-part.h
@@ -10,7 +10,6 @@
*
* This program is free software; you can redistribute it and/or
* 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 as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
diff --git a/camel/camel-movemail.c b/camel/camel-movemail.c
index b8d0711809..c4f22b6332 100644
--- a/camel/camel-movemail.c
+++ b/camel/camel-movemail.c
@@ -9,7 +9,6 @@
*
* This program is free software; you can redistribute it and/or
* 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 as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
diff --git a/camel/camel-movemail.h b/camel/camel-movemail.h
index a5d5207cae..3e5206f672 100644
--- a/camel/camel-movemail.h
+++ b/camel/camel-movemail.h
@@ -9,7 +9,6 @@
*
* This program is free software; you can redistribute it and/or
* 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 as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
diff --git a/camel/camel-multipart.c b/camel/camel-multipart.c
index 83cafbd9d9..a9e95c230e 100644
--- a/camel/camel-multipart.c
+++ b/camel/camel-multipart.c
@@ -14,7 +14,6 @@
*
* This program is free software; you can redistribute it and/or
* 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 as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
diff --git a/camel/camel-multipart.h b/camel/camel-multipart.h
index aa2f87a79c..dfa8908bb2 100644
--- a/camel/camel-multipart.h
+++ b/camel/camel-multipart.h
@@ -10,7 +10,6 @@
*
* This program is free software; you can redistribute it and/or
* 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 as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
diff --git a/camel/camel-object.c b/camel/camel-object.c
index 9e508c079c..6d8b301f80 100644
--- a/camel/camel-object.c
+++ b/camel/camel-object.c
@@ -9,7 +9,6 @@
*
* This program is free software; you can redistribute it and/or
* 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 as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
diff --git a/camel/camel-object.h b/camel/camel-object.h
index b8f2e14951..63f3520809 100644
--- a/camel/camel-object.h
+++ b/camel/camel-object.h
@@ -9,7 +9,6 @@
*
* This program is free software; you can redistribute it and/or
* 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 as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
diff --git a/camel/camel-operation.h b/camel/camel-operation.h
index 4b6a608ba2..08da410b68 100644
--- a/camel/camel-operation.h
+++ b/camel/camel-operation.h
@@ -6,7 +6,6 @@
*
* This program is free software; you can redistribute it and/or
* 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 as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
diff --git a/camel/camel-private.h b/camel/camel-private.h
index f3986cb75c..c6a31575e0 100644
--- a/camel/camel-private.h
+++ b/camel/camel-private.h
@@ -7,7 +7,6 @@
*
* This program is free software; you can redistribute it and/or
* 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 as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
diff --git a/camel/camel-provider.c b/camel/camel-provider.c
index 7f1d3b0e2f..68ceccb0c0 100644
--- a/camel/camel-provider.c
+++ b/camel/camel-provider.c
@@ -12,7 +12,6 @@
*
* This program is free software; you can redistribute it and/or
* 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 as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
diff --git a/camel/camel-provider.h b/camel/camel-provider.h
index 8a13e5a101..9269745786 100644
--- a/camel/camel-provider.h
+++ b/camel/camel-provider.h
@@ -11,7 +11,6 @@
*
* This program is free software; you can redistribute it and/or
* 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 as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
diff --git a/camel/camel-remote-store.h b/camel/camel-remote-store.h
index 5b21ad07c3..a596ed7235 100644
--- a/camel/camel-remote-store.h
+++ b/camel/camel-remote-store.h
@@ -8,7 +8,6 @@
*
* This program is free software; you can redistribute it and/or
* 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 as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
diff --git a/camel/camel-seekable-stream.c b/camel/camel-seekable-stream.c
index 78b979eb8d..874d68e40c 100644
--- a/camel/camel-seekable-stream.c
+++ b/camel/camel-seekable-stream.c
@@ -8,7 +8,6 @@
*
* This program is free software; you can redistribute it and/or
* 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 as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
diff --git a/camel/camel-seekable-stream.h b/camel/camel-seekable-stream.h
index 8c3cb61d77..9ac73c7ee8 100644
--- a/camel/camel-seekable-stream.h
+++ b/camel/camel-seekable-stream.h
@@ -9,7 +9,6 @@
*
* This program is free software; you can redistribute it and/or
* 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 as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
diff --git a/camel/camel-seekable-substream.c b/camel/camel-seekable-substream.c
index e15714f7eb..c51b52b99f 100644
--- a/camel/camel-seekable-substream.c
+++ b/camel/camel-seekable-substream.c
@@ -8,7 +8,6 @@
*
* This program is free software; you can redistribute it and/or
* 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 as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
diff --git a/camel/camel-seekable-substream.h b/camel/camel-seekable-substream.h
index 871f2a54e3..897342c737 100644
--- a/camel/camel-seekable-substream.h
+++ b/camel/camel-seekable-substream.h
@@ -9,7 +9,6 @@
*
* This program is free software; you can redistribute it and/or
* 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 as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
diff --git a/camel/camel-service.c b/camel/camel-service.c
index e0304f2232..ade9a1d5b2 100644
--- a/camel/camel-service.c
+++ b/camel/camel-service.c
@@ -10,7 +10,6 @@
*
* This program is free software; you can redistribute it and/or
* 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 as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
diff --git a/camel/camel-service.h b/camel/camel-service.h
index fd34d144fa..98d3de41f3 100644
--- a/camel/camel-service.h
+++ b/camel/camel-service.h
@@ -10,7 +10,6 @@
*
* This program is free software; you can redistribute it and/or
* 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 as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
diff --git a/camel/camel-session.c b/camel/camel-session.c
index 061c62a95f..bcd680299a 100644
--- a/camel/camel-session.c
+++ b/camel/camel-session.c
@@ -11,7 +11,6 @@
*
* This program is free software; you can redistribute it and/or
* 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 as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
diff --git a/camel/camel-session.h b/camel/camel-session.h
index 583339d3e0..00083fcdf8 100644
--- a/camel/camel-session.h
+++ b/camel/camel-session.h
@@ -10,7 +10,6 @@
*
* This program is free software; you can redistribute it and/or
* 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 as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
diff --git a/camel/camel-store.c b/camel/camel-store.c
index f4b15a045c..c6ffdcdaae 100644
--- a/camel/camel-store.c
+++ b/camel/camel-store.c
@@ -10,7 +10,6 @@
*
* This program is free software; you can redistribute it and/or
* 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 as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
diff --git a/camel/camel-store.h b/camel/camel-store.h
index 157bc196a0..6b66811e24 100644
--- a/camel/camel-store.h
+++ b/camel/camel-store.h
@@ -9,7 +9,6 @@
*
* This program is free software; you can redistribute it and/or
* 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 as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
diff --git a/camel/camel-stream-buffer.c b/camel/camel-stream-buffer.c
index 8695a5db48..ff7df172ae 100644
--- a/camel/camel-stream-buffer.c
+++ b/camel/camel-stream-buffer.c
@@ -8,7 +8,6 @@
*
* This program is free software; you can redistribute it and/or
* 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 as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
diff --git a/camel/camel-stream-buffer.h b/camel/camel-stream-buffer.h
index 5d0244d13c..db93971fd2 100644
--- a/camel/camel-stream-buffer.h
+++ b/camel/camel-stream-buffer.h
@@ -10,7 +10,6 @@
*
* This program is free software; you can redistribute it and/or
* 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 as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
diff --git a/camel/camel-stream-fs.c b/camel/camel-stream-fs.c
index 7fb43aac5c..230d3ba6bd 100644
--- a/camel/camel-stream-fs.c
+++ b/camel/camel-stream-fs.c
@@ -9,7 +9,6 @@
*
* This program is free software; you can redistribute it and/or
* 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 as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
diff --git a/camel/camel-stream-fs.h b/camel/camel-stream-fs.h
index eb1cc5ba78..7db13ac244 100644
--- a/camel/camel-stream-fs.h
+++ b/camel/camel-stream-fs.h
@@ -9,7 +9,6 @@
*
* This program is free software; you can redistribute it and/or
* 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 as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
diff --git a/camel/camel-stream-mem.c b/camel/camel-stream-mem.c
index 5e491f28fa..d81b304231 100644
--- a/camel/camel-stream-mem.c
+++ b/camel/camel-stream-mem.c
@@ -9,7 +9,6 @@
*
* This program is free software; you can redistribute it and/or
* 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 as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
diff --git a/camel/camel-stream-mem.h b/camel/camel-stream-mem.h
index 011c540232..af51c36ff7 100644
--- a/camel/camel-stream-mem.h
+++ b/camel/camel-stream-mem.h
@@ -9,7 +9,6 @@
*
* This program is free software; you can redistribute it and/or
* 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 as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
diff --git a/camel/camel-stream-null.c b/camel/camel-stream-null.c
index 1519fb7409..3c0fdee47b 100644
--- a/camel/camel-stream-null.c
+++ b/camel/camel-stream-null.c
@@ -9,7 +9,6 @@
*
* This program is free software; you can redistribute it and/or
* 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 as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
diff --git a/camel/camel-stream.c b/camel/camel-stream.c
index fe35c4175e..709bfe107c 100644
--- a/camel/camel-stream.c
+++ b/camel/camel-stream.c
@@ -9,7 +9,6 @@
*
* This program is free software; you can redistribute it and/or
* 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 as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
diff --git a/camel/camel-stream.h b/camel/camel-stream.h
index c0a4a05af3..f75e882a70 100644
--- a/camel/camel-stream.h
+++ b/camel/camel-stream.h
@@ -9,7 +9,6 @@
*
* This program is free software; you can redistribute it and/or
* 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 as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
diff --git a/camel/camel-transport.c b/camel/camel-transport.c
index 33f22683b8..0dc56a8d67 100644
--- a/camel/camel-transport.c
+++ b/camel/camel-transport.c
@@ -10,7 +10,6 @@
*
* This program is free software; you can redistribute it and/or
* 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 as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
diff --git a/camel/camel-transport.h b/camel/camel-transport.h
index 5b50eb0401..5951d1145c 100644
--- a/camel/camel-transport.h
+++ b/camel/camel-transport.h
@@ -10,7 +10,6 @@
*
* This program is free software; you can redistribute it and/or
* 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 as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
diff --git a/camel/camel-types.h b/camel/camel-types.h
index ec63948bcf..6765424b39 100644
--- a/camel/camel-types.h
+++ b/camel/camel-types.h
@@ -5,7 +5,6 @@
*
* This program is free software; you can redistribute it and/or
* 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 as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
diff --git a/camel/camel-uid-cache.c b/camel/camel-uid-cache.c
index 48bfa98d20..933f8b68e1 100644
--- a/camel/camel-uid-cache.c
+++ b/camel/camel-uid-cache.c
@@ -9,7 +9,6 @@
*
* This program is free software; you can redistribute it and/or
* 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 as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
diff --git a/camel/camel-uid-cache.h b/camel/camel-uid-cache.h
index 072e036ac0..e4327c9b12 100644
--- a/camel/camel-uid-cache.h
+++ b/camel/camel-uid-cache.h
@@ -9,7 +9,6 @@
*
* This program is free software; you can redistribute it and/or
* 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 as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
diff --git a/camel/camel-url.c b/camel/camel-url.c
index ea707b38cc..a2d4e73dac 100644
--- a/camel/camel-url.c
+++ b/camel/camel-url.c
@@ -11,7 +11,6 @@
*
* This program is free software; you can redistribute it and/or
* 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 as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
diff --git a/camel/camel-url.h b/camel/camel-url.h
index 56724425a9..d60c9594c2 100644
--- a/camel/camel-url.h
+++ b/camel/camel-url.h
@@ -10,7 +10,6 @@
*
* This program is free software; you can redistribute it and/or
* 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 as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
diff --git a/camel/camel.c b/camel/camel.c
index 05daa30d83..2bdc67b1a3 100644
--- a/camel/camel.c
+++ b/camel/camel.c
@@ -9,7 +9,6 @@
*
* This program is free software; you can redistribute it and/or
* 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 as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
diff --git a/camel/camel.h b/camel/camel.h
index 4fd01a609b..07d0cb9c7c 100644
--- a/camel/camel.h
+++ b/camel/camel.h
@@ -9,7 +9,6 @@
*
* This program is free software; you can redistribute it and/or
* 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 as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
diff --git a/camel/gstring-util.c b/camel/gstring-util.c
index 6cb6b3cda6..e0d404aede 100644
--- a/camel/gstring-util.c
+++ b/camel/gstring-util.c
@@ -10,7 +10,6 @@
*
* This program is free software; you can redistribute it and/or
* 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 as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
diff --git a/camel/gstring-util.h b/camel/gstring-util.h
index 1d60aefe87..39fdf32fd1 100644
--- a/camel/gstring-util.h
+++ b/camel/gstring-util.h
@@ -10,7 +10,6 @@
*
* This program is free software; you can redistribute it and/or
* 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 as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
diff --git a/camel/hash-table-utils.c b/camel/hash-table-utils.c
index 35a6425af7..f17f6ce5d5 100644
--- a/camel/hash-table-utils.c
+++ b/camel/hash-table-utils.c
@@ -10,7 +10,6 @@
*
* This program is free software; you can redistribute it and/or
* 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 as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
diff --git a/camel/hash-table-utils.h b/camel/hash-table-utils.h
index f977271c88..80e9a6057c 100644
--- a/camel/hash-table-utils.h
+++ b/camel/hash-table-utils.h
@@ -10,7 +10,6 @@
*
* This program is free software; you can redistribute it and/or
* 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 as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
diff --git a/camel/providers/imap/camel-imap-command.h b/camel/providers/imap/camel-imap-command.h
index da7ce3f9f6..69c28237cc 100644
--- a/camel/providers/imap/camel-imap-command.h
+++ b/camel/providers/imap/camel-imap-command.h
@@ -10,7 +10,6 @@
*
* This program is free software; you can redistribute it and/or
* 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 as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
diff --git a/camel/providers/imap/camel-imap-folder.c b/camel/providers/imap/camel-imap-folder.c
index 6df3833db1..e1bd4bc101 100644
--- a/camel/providers/imap/camel-imap-folder.c
+++ b/camel/providers/imap/camel-imap-folder.c
@@ -10,7 +10,6 @@
*
* This program is free software; you can redistribute it and/or
* 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 as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
diff --git a/camel/providers/imap/camel-imap-folder.h b/camel/providers/imap/camel-imap-folder.h
index 888c5d8f0a..05e46ce6a1 100644
--- a/camel/providers/imap/camel-imap-folder.h
+++ b/camel/providers/imap/camel-imap-folder.h
@@ -10,7 +10,6 @@
*
* This program is free software; you can redistribute it and/or
* 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 as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
diff --git a/camel/providers/imap/camel-imap-message-cache.c b/camel/providers/imap/camel-imap-message-cache.c
index 1758377696..ab5d125d6e 100644
--- a/camel/providers/imap/camel-imap-message-cache.c
+++ b/camel/providers/imap/camel-imap-message-cache.c
@@ -9,7 +9,6 @@
*
* This program is free software; you can redistribute it and/or
* 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 as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
diff --git a/camel/providers/imap/camel-imap-message-cache.h b/camel/providers/imap/camel-imap-message-cache.h
index 5f05e337e0..efdc832694 100644
--- a/camel/providers/imap/camel-imap-message-cache.h
+++ b/camel/providers/imap/camel-imap-message-cache.h
@@ -9,7 +9,6 @@
*
* This program is free software; you can redistribute it and/or
* 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 as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
diff --git a/camel/providers/imap/camel-imap-private.h b/camel/providers/imap/camel-imap-private.h
index 187b145e00..07b790c6a1 100644
--- a/camel/providers/imap/camel-imap-private.h
+++ b/camel/providers/imap/camel-imap-private.h
@@ -7,7 +7,6 @@
*
* This program is free software; you can redistribute it and/or
* 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 as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
diff --git a/camel/providers/imap/camel-imap-store.h b/camel/providers/imap/camel-imap-store.h
index adbbf7ba34..66ebe13f1d 100644
--- a/camel/providers/imap/camel-imap-store.h
+++ b/camel/providers/imap/camel-imap-store.h
@@ -8,7 +8,6 @@
*
* This program is free software; you can redistribute it and/or
* 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 as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
diff --git a/camel/providers/imap/camel-imap-types.h b/camel/providers/imap/camel-imap-types.h
index 9714fd21be..c5ea41acff 100644
--- a/camel/providers/imap/camel-imap-types.h
+++ b/camel/providers/imap/camel-imap-types.h
@@ -6,7 +6,6 @@
*
* This program is free software; you can redistribute it and/or
* 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 as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
diff --git a/camel/providers/imap/camel-imap-wrapper.c b/camel/providers/imap/camel-imap-wrapper.c
index f75c7070e8..53646bb201 100644
--- a/camel/providers/imap/camel-imap-wrapper.c
+++ b/camel/providers/imap/camel-imap-wrapper.c
@@ -8,7 +8,6 @@
*
* This program is free software; you can redistribute it and/or
* 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 as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
diff --git a/camel/providers/imap/camel-imap-wrapper.h b/camel/providers/imap/camel-imap-wrapper.h
index f0b6ceff24..4f7ca5097a 100644
--- a/camel/providers/imap/camel-imap-wrapper.h
+++ b/camel/providers/imap/camel-imap-wrapper.h
@@ -6,7 +6,6 @@
*
* This program is free software; you can redistribute it and/or
* 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 as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
diff --git a/camel/providers/local/camel-local-folder.c b/camel/providers/local/camel-local-folder.c
index 985081a266..6077a66da0 100644
--- a/camel/providers/local/camel-local-folder.c
+++ b/camel/providers/local/camel-local-folder.c
@@ -6,7 +6,6 @@
*
* This program is free software; you can redistribute it and/or
* 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 as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
diff --git a/camel/providers/local/camel-local-folder.h b/camel/providers/local/camel-local-folder.h
index cb4cabe641..3eb4b02c32 100644
--- a/camel/providers/local/camel-local-folder.h
+++ b/camel/providers/local/camel-local-folder.h
@@ -6,7 +6,6 @@
*
* This program is free software; you can redistribute it and/or
* 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 as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
diff --git a/camel/providers/local/camel-local-private.h b/camel/providers/local/camel-local-private.h
index d193524a3c..4dfe9f635c 100644
--- a/camel/providers/local/camel-local-private.h
+++ b/camel/providers/local/camel-local-private.h
@@ -7,7 +7,6 @@
*
* This program is free software; you can redistribute it and/or
* 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 as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
diff --git a/camel/providers/local/camel-local-provider.c b/camel/providers/local/camel-local-provider.c
index a5bb651d27..f4a4301022 100644
--- a/camel/providers/local/camel-local-provider.c
+++ b/camel/providers/local/camel-local-provider.c
@@ -6,7 +6,6 @@
*
* This program is free software; you can redistribute it and/or
* 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 as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
diff --git a/camel/providers/local/camel-local-store.c b/camel/providers/local/camel-local-store.c
index 912494232d..918b8db420 100644
--- a/camel/providers/local/camel-local-store.c
+++ b/camel/providers/local/camel-local-store.c
@@ -6,7 +6,6 @@
*
* This program is free software; you can redistribute it and/or
* 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 as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
diff --git a/camel/providers/local/camel-local-store.h b/camel/providers/local/camel-local-store.h
index 3c8eb35a1a..21d854c562 100644
--- a/camel/providers/local/camel-local-store.h
+++ b/camel/providers/local/camel-local-store.h
@@ -7,7 +7,6 @@
*
* This program is free software; you can redistribute it and/or
* 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 as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
diff --git a/camel/providers/local/camel-maildir-folder.c b/camel/providers/local/camel-maildir-folder.c
index e786833074..fc9ab999cb 100644
--- a/camel/providers/local/camel-maildir-folder.c
+++ b/camel/providers/local/camel-maildir-folder.c
@@ -6,7 +6,6 @@
*
* This program is free software; you can redistribute it and/or
* 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 as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
diff --git a/camel/providers/local/camel-maildir-folder.h b/camel/providers/local/camel-maildir-folder.h
index 6e93aa4ab1..c495d9b14d 100644
--- a/camel/providers/local/camel-maildir-folder.h
+++ b/camel/providers/local/camel-maildir-folder.h
@@ -7,7 +7,6 @@
*
* This program is free software; you can redistribute it and/or
* 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 as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
diff --git a/camel/providers/local/camel-maildir-store.c b/camel/providers/local/camel-maildir-store.c
index ae06d372b8..4d754e5f12 100644
--- a/camel/providers/local/camel-maildir-store.c
+++ b/camel/providers/local/camel-maildir-store.c
@@ -6,7 +6,6 @@
*
* This program is free software; you can redistribute it and/or
* 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 as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
diff --git a/camel/providers/local/camel-maildir-store.h b/camel/providers/local/camel-maildir-store.h
index 9882485d2a..f7725bc189 100644
--- a/camel/providers/local/camel-maildir-store.h
+++ b/camel/providers/local/camel-maildir-store.h
@@ -6,7 +6,6 @@
*
* This program is free software; you can redistribute it and/or
* 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 as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
diff --git a/camel/providers/local/camel-mbox-folder.c b/camel/providers/local/camel-mbox-folder.c
index 7f1162d538..534269d455 100644
--- a/camel/providers/local/camel-mbox-folder.c
+++ b/camel/providers/local/camel-mbox-folder.c
@@ -6,7 +6,6 @@
*
* This program is free software; you can redistribute it and/or
* 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 as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
diff --git a/camel/providers/local/camel-mbox-folder.h b/camel/providers/local/camel-mbox-folder.h
index fa521f904e..aa0b67201f 100644
--- a/camel/providers/local/camel-mbox-folder.h
+++ b/camel/providers/local/camel-mbox-folder.h
@@ -6,7 +6,6 @@
*
* This program is free software; you can redistribute it and/or
* 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 as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
diff --git a/camel/providers/local/camel-mbox-store.c b/camel/providers/local/camel-mbox-store.c
index 280e9d049c..f401632b8d 100644
--- a/camel/providers/local/camel-mbox-store.c
+++ b/camel/providers/local/camel-mbox-store.c
@@ -6,7 +6,6 @@
*
* This program is free software; you can redistribute it and/or
* 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 as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
diff --git a/camel/providers/local/camel-mbox-store.h b/camel/providers/local/camel-mbox-store.h
index 6cce47538d..5b6fbdd926 100644
--- a/camel/providers/local/camel-mbox-store.h
+++ b/camel/providers/local/camel-mbox-store.h
@@ -6,7 +6,6 @@
*
* This program is free software; you can redistribute it and/or
* 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 as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
diff --git a/camel/providers/local/camel-mh-folder.c b/camel/providers/local/camel-mh-folder.c
index 109d1232f5..6795ab3fbf 100644
--- a/camel/providers/local/camel-mh-folder.c
+++ b/camel/providers/local/camel-mh-folder.c
@@ -6,7 +6,6 @@
*
* This program is free software; you can redistribute it and/or
* 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 as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
diff --git a/camel/providers/local/camel-mh-folder.h b/camel/providers/local/camel-mh-folder.h
index 544ef271cd..125f8c8ac5 100644
--- a/camel/providers/local/camel-mh-folder.h
+++ b/camel/providers/local/camel-mh-folder.h
@@ -7,7 +7,6 @@
*
* This program is free software; you can redistribute it and/or
* 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 as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
diff --git a/camel/providers/local/camel-mh-store.c b/camel/providers/local/camel-mh-store.c
index dd44f015e7..8b8c2e5f0e 100644
--- a/camel/providers/local/camel-mh-store.c
+++ b/camel/providers/local/camel-mh-store.c
@@ -6,7 +6,6 @@
*
* This program is free software; you can redistribute it and/or
* 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 as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
diff --git a/camel/providers/local/camel-mh-store.h b/camel/providers/local/camel-mh-store.h
index f83404f85e..b69bddb7c2 100644
--- a/camel/providers/local/camel-mh-store.h
+++ b/camel/providers/local/camel-mh-store.h
@@ -6,7 +6,6 @@
*
* This program is free software; you can redistribute it and/or
* 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 as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
diff --git a/camel/providers/local/camel-spool-folder.c b/camel/providers/local/camel-spool-folder.c
index afec08382d..298f04428e 100644
--- a/camel/providers/local/camel-spool-folder.c
+++ b/camel/providers/local/camel-spool-folder.c
@@ -6,7 +6,6 @@
*
* This program is free software; you can redistribute it and/or
* 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 as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
diff --git a/camel/providers/local/camel-spool-folder.h b/camel/providers/local/camel-spool-folder.h
index 04a79b274b..717ec4abd9 100644
--- a/camel/providers/local/camel-spool-folder.h
+++ b/camel/providers/local/camel-spool-folder.h
@@ -6,7 +6,6 @@
*
* This program is free software; you can redistribute it and/or
* 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 as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
diff --git a/camel/providers/local/camel-spool-store.c b/camel/providers/local/camel-spool-store.c
index c16d106f07..fdf5640d99 100644
--- a/camel/providers/local/camel-spool-store.c
+++ b/camel/providers/local/camel-spool-store.c
@@ -6,7 +6,6 @@
*
* This program is free software; you can redistribute it and/or
* 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 as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
diff --git a/camel/providers/local/camel-spool-store.h b/camel/providers/local/camel-spool-store.h
index 74a8495d91..677f6aa0ed 100644
--- a/camel/providers/local/camel-spool-store.h
+++ b/camel/providers/local/camel-spool-store.h
@@ -6,7 +6,6 @@
*
* This program is free software; you can redistribute it and/or
* 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 as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
diff --git a/camel/providers/nntp/camel-nntp-auth.c b/camel/providers/nntp/camel-nntp-auth.c
index b3f788269f..f8d3a62e27 100644
--- a/camel/providers/nntp/camel-nntp-auth.c
+++ b/camel/providers/nntp/camel-nntp-auth.c
@@ -7,7 +7,6 @@
*
* This program is free software; you can redistribute it and/or
* 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 as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
diff --git a/camel/providers/nntp/camel-nntp-auth.h b/camel/providers/nntp/camel-nntp-auth.h
index 67636dbc21..fc96cf6a4e 100644
--- a/camel/providers/nntp/camel-nntp-auth.h
+++ b/camel/providers/nntp/camel-nntp-auth.h
@@ -9,7 +9,6 @@
*
* This program is free software; you can redistribute it and/or
* 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 as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
diff --git a/camel/providers/nntp/camel-nntp-folder.c b/camel/providers/nntp/camel-nntp-folder.c
index 1de28c16ab..9f291d9fb8 100644
--- a/camel/providers/nntp/camel-nntp-folder.c
+++ b/camel/providers/nntp/camel-nntp-folder.c
@@ -8,7 +8,6 @@
*
* This program is free software; you can redistribute it and/or
* 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 as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
diff --git a/camel/providers/nntp/camel-nntp-folder.h b/camel/providers/nntp/camel-nntp-folder.h
index 6acbf09f9e..223323cb95 100644
--- a/camel/providers/nntp/camel-nntp-folder.h
+++ b/camel/providers/nntp/camel-nntp-folder.h
@@ -9,7 +9,6 @@
*
* This program is free software; you can redistribute it and/or
* 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 as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
diff --git a/camel/providers/nntp/camel-nntp-grouplist.c b/camel/providers/nntp/camel-nntp-grouplist.c
index ff2bf7b2e5..7f3850f9c1 100644
--- a/camel/providers/nntp/camel-nntp-grouplist.c
+++ b/camel/providers/nntp/camel-nntp-grouplist.c
@@ -8,7 +8,6 @@
*
* This program is free software; you can redistribute it and/or
* 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 as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
diff --git a/camel/providers/nntp/camel-nntp-grouplist.h b/camel/providers/nntp/camel-nntp-grouplist.h
index 6ee18a5320..edd1e64cb9 100644
--- a/camel/providers/nntp/camel-nntp-grouplist.h
+++ b/camel/providers/nntp/camel-nntp-grouplist.h
@@ -8,7 +8,6 @@
*
* This program is free software; you can redistribute it and/or
* 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 as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
diff --git a/camel/providers/nntp/camel-nntp-newsrc.c b/camel/providers/nntp/camel-nntp-newsrc.c
index 3e0d0ac206..8c7ef1d5cd 100644
--- a/camel/providers/nntp/camel-nntp-newsrc.c
+++ b/camel/providers/nntp/camel-nntp-newsrc.c
@@ -6,7 +6,6 @@
*
* This program is free software; you can redistribute it and/or
* 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 as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
diff --git a/camel/providers/nntp/camel-nntp-provider.c b/camel/providers/nntp/camel-nntp-provider.c
index e529c9b1e1..773e3d7e0e 100644
--- a/camel/providers/nntp/camel-nntp-provider.c
+++ b/camel/providers/nntp/camel-nntp-provider.c
@@ -9,7 +9,6 @@
*
* This program is free software; you can redistribute it and/or
* 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 as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
diff --git a/camel/providers/nntp/camel-nntp-resp-codes.h b/camel/providers/nntp/camel-nntp-resp-codes.h
index 6c00c5745d..d9aace81ef 100644
--- a/camel/providers/nntp/camel-nntp-resp-codes.h
+++ b/camel/providers/nntp/camel-nntp-resp-codes.h
@@ -7,7 +7,6 @@
*
* This program is free software; you can redistribute it and/or
* 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 as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
diff --git a/camel/providers/nntp/camel-nntp-store.c b/camel/providers/nntp/camel-nntp-store.c
index c2ee46348b..9ff097f7f5 100644
--- a/camel/providers/nntp/camel-nntp-store.c
+++ b/camel/providers/nntp/camel-nntp-store.c
@@ -7,7 +7,6 @@
*
* This program is free software; you can redistribute it and/or
* 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 as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
diff --git a/camel/providers/nntp/camel-nntp-store.h b/camel/providers/nntp/camel-nntp-store.h
index 02cca63e46..0f373dd0bc 100644
--- a/camel/providers/nntp/camel-nntp-store.h
+++ b/camel/providers/nntp/camel-nntp-store.h
@@ -7,7 +7,6 @@
*
* This program is free software; you can redistribute it and/or
* 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 as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
diff --git a/camel/providers/nntp/camel-nntp-types.h b/camel/providers/nntp/camel-nntp-types.h
index 81cc334a67..a37179c521 100644
--- a/camel/providers/nntp/camel-nntp-types.h
+++ b/camel/providers/nntp/camel-nntp-types.h
@@ -8,7 +8,6 @@
*
* This program is free software; you can redistribute it and/or
* 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 as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
diff --git a/camel/providers/nntp/camel-nntp-utils.c b/camel/providers/nntp/camel-nntp-utils.c
index 46dac10bf6..5f26d7100f 100644
--- a/camel/providers/nntp/camel-nntp-utils.c
+++ b/camel/providers/nntp/camel-nntp-utils.c
@@ -8,7 +8,6 @@
*
* This program is free software; you can redistribute it and/or
* 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 as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
diff --git a/camel/providers/nntp/camel-nntp-utils.h b/camel/providers/nntp/camel-nntp-utils.h
index 7d648bff5c..48fd7490c9 100644
--- a/camel/providers/nntp/camel-nntp-utils.h
+++ b/camel/providers/nntp/camel-nntp-utils.h
@@ -9,7 +9,6 @@
*
* This program is free software; you can redistribute it and/or
* 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 as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
diff --git a/camel/providers/pop3/camel-pop3-folder.c b/camel/providers/pop3/camel-pop3-folder.c
index 0801d6d83f..5452144eab 100644
--- a/camel/providers/pop3/camel-pop3-folder.c
+++ b/camel/providers/pop3/camel-pop3-folder.c
@@ -9,7 +9,6 @@
*
* This program is free software; you can redistribute it and/or
* 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 as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
diff --git a/camel/providers/pop3/camel-pop3-folder.h b/camel/providers/pop3/camel-pop3-folder.h
index 15a29585bb..0b6296a09c 100644
--- a/camel/providers/pop3/camel-pop3-folder.h
+++ b/camel/providers/pop3/camel-pop3-folder.h
@@ -9,7 +9,6 @@
*
* This program is free software; you can redistribute it and/or
* 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 as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
diff --git a/camel/providers/pop3/camel-pop3-provider.c b/camel/providers/pop3/camel-pop3-provider.c
index 91b9a94137..9e7a022482 100644
--- a/camel/providers/pop3/camel-pop3-provider.c
+++ b/camel/providers/pop3/camel-pop3-provider.c
@@ -9,7 +9,6 @@
*
* This program is free software; you can redistribute it and/or
* 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 as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
diff --git a/camel/providers/pop3/camel-pop3-store.c b/camel/providers/pop3/camel-pop3-store.c
index 42a35794d1..e959aa2de3 100644
--- a/camel/providers/pop3/camel-pop3-store.c
+++ b/camel/providers/pop3/camel-pop3-store.c
@@ -9,7 +9,6 @@
*
* This program is free software; you can redistribute it and/or
* 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 as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
diff --git a/camel/providers/pop3/camel-pop3-store.h b/camel/providers/pop3/camel-pop3-store.h
index 89814845a3..fcc488f3e8 100644
--- a/camel/providers/pop3/camel-pop3-store.h
+++ b/camel/providers/pop3/camel-pop3-store.h
@@ -9,7 +9,6 @@
*
* This program is free software; you can redistribute it and/or
* 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 as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
diff --git a/camel/providers/sendmail/camel-sendmail-provider.c b/camel/providers/sendmail/camel-sendmail-provider.c
index 4f0ad07766..4d546a081d 100644
--- a/camel/providers/sendmail/camel-sendmail-provider.c
+++ b/camel/providers/sendmail/camel-sendmail-provider.c
@@ -9,7 +9,6 @@
*
* This program is free software; you can redistribute it and/or
* 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 as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
diff --git a/camel/providers/sendmail/camel-sendmail-transport.c b/camel/providers/sendmail/camel-sendmail-transport.c
index f218dacb24..28bc488c1d 100644
--- a/camel/providers/sendmail/camel-sendmail-transport.c
+++ b/camel/providers/sendmail/camel-sendmail-transport.c
@@ -9,7 +9,6 @@
*
* This program is free software; you can redistribute it and/or
* 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 as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
diff --git a/camel/providers/sendmail/camel-sendmail-transport.h b/camel/providers/sendmail/camel-sendmail-transport.h
index 74b58811d9..056be03bc8 100644
--- a/camel/providers/sendmail/camel-sendmail-transport.h
+++ b/camel/providers/sendmail/camel-sendmail-transport.h
@@ -10,7 +10,6 @@
*
* This program is free software; you can redistribute it and/or
* 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 as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
diff --git a/camel/providers/smtp/camel-smtp-provider.c b/camel/providers/smtp/camel-smtp-provider.c
index 9c25186e83..13f0cb6369 100644
--- a/camel/providers/smtp/camel-smtp-provider.c
+++ b/camel/providers/smtp/camel-smtp-provider.c
@@ -9,7 +9,6 @@
*
* This program is free software; you can redistribute it and/or
* 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 as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
diff --git a/camel/providers/smtp/camel-smtp-transport.c b/camel/providers/smtp/camel-smtp-transport.c
index 2b35f49e15..c37b35ce44 100644
--- a/camel/providers/smtp/camel-smtp-transport.c
+++ b/camel/providers/smtp/camel-smtp-transport.c
@@ -8,7 +8,6 @@
*
* This program is free software; you can redistribute it and/or
* 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 as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
diff --git a/camel/providers/smtp/camel-smtp-transport.h b/camel/providers/smtp/camel-smtp-transport.h
index dba6369bb4..7a6b631c46 100644
--- a/camel/providers/smtp/camel-smtp-transport.h
+++ b/camel/providers/smtp/camel-smtp-transport.h
@@ -9,7 +9,6 @@
*
* This program is free software; you can redistribute it and/or
* 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 as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
diff --git a/camel/string-utils.c b/camel/string-utils.c
index 0331d6209d..1e2fa103ef 100644
--- a/camel/string-utils.c
+++ b/camel/string-utils.c
@@ -10,7 +10,6 @@
*
* This program is free software; you can redistribute it and/or
* 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 as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
diff --git a/camel/string-utils.h b/camel/string-utils.h
index 7b4e900c93..0402eb15ad 100644
--- a/camel/string-utils.h
+++ b/camel/string-utils.h
@@ -10,7 +10,6 @@
*
* This program is free software; you can redistribute it and/or
* 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 as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,