[evolution-data-server] Fix excessive whitespace.



commit c88e9c9f9c1f2079cbac92cf897584be8c448370
Author: Matthew Barnes <mbarnes redhat com>
Date:   Sun Jul 12 23:31:41 2009 -0400

    Fix excessive whitespace.

 addressbook/backends/file/e-book-backend-file.c    |    4 -
 addressbook/backends/google/google-book.c          |    3 -
 addressbook/backends/google/util.c                 |    1 -
 .../backends/groupwise/e-book-backend-groupwise.c  |    9 --
 .../backends/groupwise/e-book-backend-groupwise.h  |    2 -
 addressbook/backends/ldap/e-book-backend-ldap.c    |   16 +---
 addressbook/backends/ldap/openldap-extract.h       |    1 -
 addressbook/backends/vcf/e-book-backend-vcf.c      |    2 -
 addressbook/libebook/e-address-western.c           |    8 --
 addressbook/libebook/e-address-western.h           |    1 -
 addressbook/libebook/e-book-listener.c             |    1 -
 addressbook/libebook/e-book-listener.h             |    1 -
 addressbook/libebook/e-book-query.c                |    1 -
 addressbook/libebook/e-book-types.h                |    1 -
 addressbook/libebook/e-book-view-listener.h        |    1 -
 addressbook/libebook/e-book-view.c                 |    1 -
 addressbook/libebook/e-book.c                      |   10 --
 addressbook/libebook/e-book.h                      |    2 -
 addressbook/libebook/e-contact.c                   |    1 -
 addressbook/libebook/e-contact.h                   |    3 -
 addressbook/libebook/e-destination.h               |    1 -
 addressbook/libebook/e-name-western.c              |    1 -
 addressbook/libebook/e-vcard.c                     |    3 -
 addressbook/libebook/e-vcard.h                     |    1 -
 addressbook/libedata-book/e-book-backend-cache.c   |    8 --
 addressbook/libedata-book/e-book-backend-cache.h   |    3 -
 addressbook/libedata-book/e-book-backend-factory.h |    1 -
 addressbook/libedata-book/e-book-backend-sexp.c    |    1 -
 addressbook/libedata-book/e-book-backend.c         |    3 -
 addressbook/libedata-book/e-book-backend.h         |    1 -
 addressbook/libedata-book/e-data-book-factory.c    |    2 -
 addressbook/libedata-book/e-data-book-view.h       |    1 -
 addressbook/libedata-book/e-data-book.c            |    4 -
 addressbook/libedata-book/e-data-book.h            |    1 -
 addressbook/tests/ebook/test-changes.c             |    1 -
 calendar/backends/caldav/e-cal-backend-caldav.c    |    9 +--
 calendar/backends/caldav/e-cal-backend-caldav.h    |    2 -
 .../backends/contacts/e-cal-backend-contacts.c     |    1 -
 calendar/backends/file/e-cal-backend-file.c        |    4 -
 .../backends/google/e-cal-backend-google-utils.c   |    8 --
 calendar/backends/google/e-cal-backend-google.c    |   12 ---
 .../groupwise/e-cal-backend-groupwise-utils.c      |   15 ---
 .../groupwise/e-cal-backend-groupwise-utils.h      |    2 -
 .../backends/groupwise/e-cal-backend-groupwise.c   |   13 ---
 calendar/backends/http/e-cal-backend-http.c        |    9 --
 calendar/backends/weather/e-cal-backend-weather.c  |    1 -
 calendar/libecal/e-cal-check-timezones.c           |    1 -
 calendar/libecal/e-cal-component.c                 |   17 ----
 calendar/libecal/e-cal-component.h                 |    2 -
 calendar/libecal/e-cal-recur.c                     |   96 --------------------
 calendar/libecal/e-cal-system-timezone.c           |    2 -
 calendar/libecal/e-cal-time-util.c                 |   19 ----
 calendar/libecal/e-cal-time-util.h                 |    3 -
 calendar/libecal/e-cal-util.c                      |    4 -
 calendar/libecal/e-cal.c                           |   18 ----
 calendar/libedata-cal/e-cal-backend-cache.h        |    2 -
 calendar/libedata-cal/e-cal-backend-sexp.h         |    2 -
 calendar/libedata-cal/e-cal-backend-sync.h         |    1 -
 calendar/libedata-cal/e-cal-backend.c              |    2 -
 calendar/libedata-cal/e-data-cal-factory.c         |    3 -
 calendar/libedata-cal/e-data-cal-view.c            |    1 -
 calendar/libedata-cal/e-data-cal.c                 |    1 -
 calendar/tests/ecal/test-ecal.c                    |    6 --
 camel/camel-address.c                              |   10 --
 camel/camel-block-file.c                           |    1 -
 camel/camel-certdb.c                               |   16 ----
 camel/camel-certdb.h                               |    3 -
 camel/camel-charset-map.c                          |    2 -
 camel/camel-data-cache.c                           |    1 -
 camel/camel-data-cache.h                           |    1 -
 camel/camel-data-wrapper.c                         |   15 ---
 camel/camel-data-wrapper.h                         |    1 -
 camel/camel-db.c                                   |   16 ----
 camel/camel-db.h                                   |    5 -
 camel/camel-debug.c                                |    1 -
 camel/camel-digest-store.c                         |    3 -
 camel/camel-digest-summary.c                       |    4 -
 camel/camel-digest-summary.h                       |    1 -
 camel/camel-disco-diary.c                          |    1 -
 camel/camel-disco-diary.h                          |    1 -
 camel/camel-disco-folder.c                         |    3 -
 camel/camel-disco-folder.h                         |    1 -
 camel/camel-disco-store.c                          |    3 -
 camel/camel-disco-store.h                          |    4 -
 camel/camel-exception.c                            |    2 -
 camel/camel-exception.h                            |    4 -
 camel/camel-file-utils.c                           |   13 ---
 camel/camel-file-utils.h                           |    2 -
 camel/camel-filter-driver.c                        |    8 --
 camel/camel-filter-search.c                        |    2 -
 camel/camel-folder-search.c                        |    1 -
 camel/camel-folder-summary.c                       |   75 ---------------
 camel/camel-folder-summary.h                       |    1 -
 camel/camel-folder.c                               |   63 -------------
 camel/camel-folder.h                               |    8 --
 camel/camel-gpg-context.c                          |    7 --
 camel/camel-gpg-context.h                          |    2 -
 camel/camel-html-parser.c                          |    2 -
 camel/camel-http-stream.h                          |    2 -
 camel/camel-iconv.c                                |    5 -
 camel/camel-iconv.h                                |    1 -
 camel/camel-internet-address.c                     |    7 --
 camel/camel-lock-helper.c                          |    1 -
 camel/camel-medium.c                               |   12 ---
 camel/camel-medium.h                               |    1 -
 camel/camel-mime-filter-basic.c                    |    3 -
 camel/camel-mime-filter-bestenc.c                  |    4 -
 camel/camel-mime-filter-bestenc.h                  |    1 -
 camel/camel-mime-filter-canon.c                    |    2 -
 camel/camel-mime-filter-charset.c                  |    3 -
 camel/camel-mime-filter-crlf.c                     |    2 -
 camel/camel-mime-filter-crlf.h                     |    1 -
 camel/camel-mime-filter-enriched.c                 |    7 --
 camel/camel-mime-filter-enriched.h                 |    1 -
 camel/camel-mime-filter-from.c                     |    4 -
 camel/camel-mime-filter-from.h                     |    1 -
 camel/camel-mime-filter-gzip.c                     |    7 --
 camel/camel-mime-filter-gzip.h                     |    2 -
 camel/camel-mime-filter-html.c                     |    4 -
 camel/camel-mime-filter-html.h                     |    1 -
 camel/camel-mime-filter-index.c                    |    3 -
 camel/camel-mime-filter-index.h                    |    1 -
 camel/camel-mime-filter-linewrap.c                 |    3 -
 camel/camel-mime-filter-progress.c                 |    2 -
 camel/camel-mime-filter-progress.h                 |    2 -
 camel/camel-mime-filter-save.c                     |    4 -
 camel/camel-mime-filter-save.h                     |    1 -
 camel/camel-mime-filter-tohtml.c                   |    5 -
 camel/camel-mime-filter-tohtml.h                   |    3 -
 camel/camel-mime-filter-windows.c                  |    4 -
 camel/camel-mime-filter-windows.h                  |    2 -
 camel/camel-mime-filter-yenc.c                     |   14 ---
 camel/camel-mime-filter-yenc.h                     |    3 -
 camel/camel-mime-filter.c                          |    6 --
 camel/camel-mime-message.c                         |   17 ----
 camel/camel-mime-message.h                         |    5 -
 camel/camel-mime-parser.c                          |    3 -
 camel/camel-mime-parser.h                          |    1 -
 camel/camel-mime-part-utils.h                      |    1 -
 camel/camel-mime-part.c                            |   23 -----
 camel/camel-mime-part.h                            |    1 -
 camel/camel-mime-utils.c                           |   31 -------
 camel/camel-mime-utils.h                           |    1 -
 camel/camel-movemail.c                             |    1 -
 camel/camel-movemail.h                             |    1 -
 camel/camel-multipart-encrypted.c                  |    5 -
 camel/camel-multipart-encrypted.h                  |    1 -
 camel/camel-multipart-signed.c                     |    1 -
 camel/camel-multipart.c                            |   15 ---
 camel/camel-multipart.h                            |    2 -
 camel/camel-net-utils.c                            |    1 -
 camel/camel-news-address.c                         |    2 -
 camel/camel-object.c                               |    3 -
 camel/camel-offline-folder.c                       |    5 -
 camel/camel-offline-folder.h                       |    2 -
 camel/camel-offline-journal.c                      |    6 --
 camel/camel-offline-journal.h                      |    2 -
 camel/camel-offline-store.c                        |    6 --
 camel/camel-offline-store.h                        |    3 -
 camel/camel-operation.c                            |    1 -
 camel/camel-partition-table.c                      |    7 --
 camel/camel-private.h                              |    9 --
 camel/camel-process.c                              |    3 -
 camel/camel-provider.c                             |    2 -
 camel/camel-provider.h                             |    4 -
 camel/camel-sasl-anonymous.c                       |    3 -
 camel/camel-sasl-anonymous.h                       |    2 -
 camel/camel-sasl-cram-md5.h                        |    2 -
 camel/camel-sasl-digest-md5.c                      |    1 -
 camel/camel-sasl-digest-md5.h                      |    2 -
 camel/camel-sasl-gssapi.c                          |    5 -
 camel/camel-sasl-gssapi.h                          |    1 -
 camel/camel-sasl-kerberos4.c                       |    1 -
 camel/camel-sasl-kerberos4.h                       |    2 -
 camel/camel-sasl-login.c                           |    1 -
 camel/camel-sasl-login.h                           |    2 -
 camel/camel-sasl-ntlm.c                            |    6 --
 camel/camel-sasl-ntlm.h                            |    2 -
 camel/camel-sasl-plain.h                           |    2 -
 camel/camel-sasl-popb4smtp.h                       |    2 -
 camel/camel-sasl.c                                 |    4 -
 camel/camel-sasl.h                                 |    2 -
 camel/camel-search-sql-sexp.c                      |    6 --
 camel/camel-search-sql.c                           |    7 --
 camel/camel-seekable-stream.c                      |    7 --
 camel/camel-seekable-stream.h                      |    1 -
 camel/camel-seekable-substream.c                   |    1 -
 camel/camel-seekable-substream.h                   |    1 -
 camel/camel-service.c                              |   14 ---
 camel/camel-session.c                              |    5 -
 camel/camel-session.h                              |    3 -
 camel/camel-store-summary.c                        |   23 -----
 camel/camel-store-summary.h                        |    1 -
 camel/camel-store.c                                |    6 --
 camel/camel-stream-buffer.c                        |    3 -
 camel/camel-stream-buffer.h                        |    4 -
 camel/camel-stream-filter.c                        |    1 -
 camel/camel-stream-filter.h                        |    1 -
 camel/camel-stream-fs.c                            |    2 -
 camel/camel-stream-fs.h                            |    1 -
 camel/camel-stream-mem.c                           |    7 --
 camel/camel-stream-mem.h                           |    1 -
 camel/camel-stream-null.h                          |    1 -
 camel/camel-stream-process.c                       |    2 -
 camel/camel-stream-process.h                       |    1 -
 camel/camel-stream-vfs.c                           |    1 -
 camel/camel-stream-vfs.h                           |    1 -
 camel/camel-stream.c                               |    9 --
 camel/camel-stream.h                               |    1 -
 camel/camel-string-utils.c                         |    4 -
 camel/camel-string-utils.h                         |    1 -
 camel/camel-tcp-stream-openssl.c                   |    9 --
 camel/camel-tcp-stream-raw.c                       |    3 -
 camel/camel-tcp-stream-raw.h                       |    1 -
 camel/camel-tcp-stream-ssl.c                       |    7 --
 camel/camel-tcp-stream-ssl.h                       |    1 -
 camel/camel-tcp-stream.c                           |    1 -
 camel/camel-tcp-stream.h                           |    1 -
 camel/camel-text-index.c                           |    5 -
 camel/camel-transport.c                            |    3 -
 camel/camel-transport.h                            |    4 -
 camel/camel-trie.c                                 |    5 -
 camel/camel-uid-cache.c                            |    8 --
 camel/camel-url-scanner.c                          |   12 ---
 camel/camel-url-scanner.h                          |    1 -
 camel/camel-url.c                                  |   14 ---
 camel/camel-url.h                                  |    1 -
 camel/camel-utf8.c                                 |    1 -
 camel/camel-vee-folder.c                           |   13 ---
 camel/camel-vee-folder.h                           |    1 -
 camel/camel-vee-store.h                            |    1 -
 camel/camel-vee-summary.c                          |    5 +-
 camel/camel-vtrash-folder.h                        |    1 -
 camel/camel.c                                      |    1 -
 camel/camel.h                                      |    1 -
 camel/db-scrap-tools/db.c                          |    1 -
 camel/providers/groupwise/camel-groupwise-folder.c |   20 ----
 camel/providers/groupwise/camel-groupwise-folder.h |    3 -
 .../providers/groupwise/camel-groupwise-journal.c  |    6 --
 .../providers/groupwise/camel-groupwise-journal.h  |    2 -
 .../providers/groupwise/camel-groupwise-provider.c |    3 -
 .../groupwise/camel-groupwise-store-summary.c      |   16 ----
 .../groupwise/camel-groupwise-store-summary.h      |    1 -
 camel/providers/groupwise/camel-groupwise-store.c  |    8 --
 camel/providers/groupwise/camel-groupwise-store.h  |    3 -
 .../providers/groupwise/camel-groupwise-summary.c  |   13 ---
 .../providers/groupwise/camel-groupwise-summary.h  |    4 -
 .../groupwise/camel-groupwise-transport.c          |    6 --
 .../groupwise/camel-groupwise-transport.h          |    3 -
 camel/providers/groupwise/camel-groupwise-utils.c  |    2 -
 camel/providers/groupwise/camel-groupwise-utils.h  |    2 -
 camel/providers/hula/camel-hula-provider.c         |    4 -
 camel/providers/imap/camel-imap-command.c          |    1 -
 camel/providers/imap/camel-imap-command.h          |    1 -
 camel/providers/imap/camel-imap-folder.c           |    5 -
 camel/providers/imap/camel-imap-folder.h           |    2 -
 camel/providers/imap/camel-imap-journal.c          |    2 -
 camel/providers/imap/camel-imap-journal.h          |    1 -
 camel/providers/imap/camel-imap-message-cache.c    |    5 -
 camel/providers/imap/camel-imap-message-cache.h    |    3 -
 camel/providers/imap/camel-imap-search.c           |    2 -
 camel/providers/imap/camel-imap-store-summary.h    |    1 -
 camel/providers/imap/camel-imap-store.c            |    2 -
 camel/providers/imap/camel-imap-store.h            |    3 -
 camel/providers/imap/camel-imap-summary.c          |    1 -
 camel/providers/imap/camel-imap-utils.c            |    7 --
 camel/providers/imap/camel-imap-wrapper.c          |    4 -
 camel/providers/imap/camel-imap-wrapper.h          |    1 -
 camel/providers/imap4/camel-imap4-command.c        |    5 -
 camel/providers/imap4/camel-imap4-command.h        |    1 -
 camel/providers/imap4/camel-imap4-engine.c         |   28 ------
 camel/providers/imap4/camel-imap4-engine.h         |    4 -
 camel/providers/imap4/camel-imap4-folder.c         |    8 --
 camel/providers/imap4/camel-imap4-folder.h         |    2 -
 camel/providers/imap4/camel-imap4-journal.c        |    8 --
 camel/providers/imap4/camel-imap4-journal.h        |    2 -
 camel/providers/imap4/camel-imap4-provider.c       |    3 -
 camel/providers/imap4/camel-imap4-search.c         |    6 --
 camel/providers/imap4/camel-imap4-search.h         |    2 -
 camel/providers/imap4/camel-imap4-specials.c       |    3 -
 camel/providers/imap4/camel-imap4-specials.h       |    1 -
 camel/providers/imap4/camel-imap4-store-summary.c  |   13 ---
 camel/providers/imap4/camel-imap4-store-summary.h  |    4 -
 camel/providers/imap4/camel-imap4-store.c          |    5 -
 camel/providers/imap4/camel-imap4-store.h          |    2 -
 camel/providers/imap4/camel-imap4-stream.c         |   11 ---
 camel/providers/imap4/camel-imap4-stream.h         |    2 -
 camel/providers/imap4/camel-imap4-summary.c        |    6 --
 camel/providers/imap4/camel-imap4-summary.h        |    2 -
 camel/providers/imap4/camel-imap4-utils.c          |   13 ---
 camel/providers/imap4/camel-imap4-utils.h          |    3 -
 camel/providers/imapp/camel-imapp-driver.c         |    2 -
 camel/providers/imapp/camel-imapp-engine.c         |   11 +--
 camel/providers/imapp/camel-imapp-folder.c         |    1 -
 camel/providers/imapp/camel-imapp-store-summary.h  |    1 -
 camel/providers/imapp/camel-imapp-store.c          |    1 -
 camel/providers/imapp/camel-imapp-store.h          |    2 -
 camel/providers/imapp/camel-imapp-stream.c         |    1 -
 camel/providers/imapp/camel-imapp-summary.c        |    2 -
 camel/providers/imapp/camel-imapp-utils.c          |    5 -
 camel/providers/local/camel-local-folder.h         |    1 -
 camel/providers/local/camel-local-private.h        |    1 -
 camel/providers/local/camel-local-store.h          |    1 -
 camel/providers/local/camel-local-summary.c        |    2 -
 camel/providers/local/camel-maildir-folder.c       |    1 -
 camel/providers/local/camel-maildir-summary.c      |    2 -
 camel/providers/local/camel-mbox-folder.c          |    1 -
 camel/providers/local/camel-mbox-store.h           |    1 -
 camel/providers/local/camel-mbox-summary.c         |    6 --
 camel/providers/local/camel-mh-folder.c            |    1 -
 camel/providers/local/camel-mh-summary.c           |    1 -
 camel/providers/local/camel-spool-store.h          |    5 -
 camel/providers/local/camel-spool-summary.c        |    2 -
 camel/providers/nntp/camel-nntp-auth.h             |    1 -
 camel/providers/nntp/camel-nntp-folder.c           |    1 -
 camel/providers/nntp/camel-nntp-folder.h           |    1 -
 camel/providers/nntp/camel-nntp-grouplist.c        |    1 -
 camel/providers/nntp/camel-nntp-newsrc.c           |    2 -
 camel/providers/nntp/camel-nntp-private.h          |    1 -
 camel/providers/nntp/camel-nntp-store-summary.h    |    1 -
 camel/providers/nntp/camel-nntp-store.c            |    1 -
 camel/providers/nntp/camel-nntp-store.h            |    2 -
 camel/providers/nntp/camel-nntp-stream.h           |    1 -
 camel/providers/nntp/camel-nntp-summary.c          |    2 -
 camel/providers/nntp/camel-nntp-utils.c            |    1 -
 camel/providers/nntp/camel-nntp-utils.h            |    1 -
 camel/providers/pop3/camel-pop3-engine.c           |    2 -
 camel/providers/pop3/camel-pop3-store.c            |    2 -
 camel/providers/pop3/camel-pop3-store.h            |    5 -
 camel/providers/pop3/camel-pop3-stream.c           |    1 -
 camel/providers/pop3/camel-pop3-stream.h           |    1 -
 camel/providers/sendmail/camel-sendmail-provider.c |    2 -
 .../providers/sendmail/camel-sendmail-transport.c  |    2 -
 .../providers/sendmail/camel-sendmail-transport.h  |    3 -
 camel/providers/smtp/camel-smtp-provider.c         |    1 -
 camel/providers/smtp/camel-smtp-transport.c        |    1 -
 camel/tests/folder/test9.c                         |    1 -
 camel/tests/lib/camel-test.c                       |    5 -
 camel/tests/lib/folders.c                          |    1 -
 camel/tests/message/test1.c                        |    1 -
 camel/tests/message/test2.c                        |    1 -
 camel/tests/message/test4.c                        |    2 -
 camel/tests/misc/rfc2047.c                         |    1 -
 camel/tests/misc/test1.c                           |    1 -
 camel/tests/misc/test2.c                           |    1 -
 camel/tests/misc/url-scan.c                        |    1 -
 camel/tests/smime/pgp-mime.c                       |    5 -
 camel/tests/smime/pgp.c                            |    4 -
 camel/tests/smime/pkcs7.c                          |    4 -
 libedataserver/e-account-list.h                    |    1 -
 libedataserver/e-account.c                         |    4 -
 libedataserver/e-account.h                         |    2 -
 libedataserver/e-data-server-util.c                |    1 -
 libedataserver/e-iconv.c                           |    5 -
 libedataserver/e-list-iterator.c                   |    1 -
 libedataserver/e-memory.c                          |    3 -
 libedataserver/e-proxy.c                           |    2 -
 libedataserver/e-sexp.c                            |    4 -
 libedataserver/e-sexp.h                            |    3 -
 libedataserver/e-source-group.c                    |    6 --
 libedataserver/e-source-group.h                    |    2 -
 libedataserver/e-source-list.c                     |    8 --
 libedataserver/e-source-list.h                     |    2 -
 libedataserver/e-source.c                          |   14 ---
 libedataserver/e-source.h                          |    2 -
 libedataserver/e-time-utils.c                      |   19 +----
 libedataserver/e-time-utils.h                      |    2 -
 libedataserver/e-trie.c                            |    6 --
 libedataserver/e-xml-hash-utils.c                  |    2 -
 libedataserver/e-xml-hash-utils.h                  |    2 -
 libedataserver/e-xml-utils.c                       |    1 -
 libedataserver/md5-utils.c                         |   16 ----
 libedataserver/md5-utils.h                         |    2 -
 libedataserver/test-source-list.c                  |    7 --
 libedataserverui/e-cell-renderer-color.h           |    1 -
 libedataserverui/e-name-selector-dialog.c          |    3 -
 libedataserverui/e-name-selector-dialog.h          |    1 -
 libedataserverui/e-name-selector-list.c            |    2 -
 libedataserverui/e-passwords.c                     |    3 -
 libedataserverui/e-source-option-menu.c            |    7 --
 libedataserverui/e-source-option-menu.h            |    2 -
 libedataserverui/e-source-selector-dialog.h        |    1 -
 libedataserverui/e-source-selector.c               |    6 --
 libedataserverui/e-source-selector.h               |    2 -
 libedataserverui/test-source-combo-box.c           |    2 -
 libedataserverui/test-source-selector.c            |    1 -
 servers/exchange/lib/e2k-action.c                  |    1 -
 servers/exchange/lib/e2k-action.h                  |    1 -
 servers/exchange/lib/e2k-autoconfig.c              |    4 -
 servers/exchange/lib/e2k-autoconfig.h              |    1 -
 servers/exchange/lib/e2k-context.c                 |    7 --
 servers/exchange/lib/e2k-context.h                 |    1 -
 servers/exchange/lib/e2k-global-catalog.c          |    4 -
 servers/exchange/lib/e2k-global-catalog.h          |    2 -
 servers/exchange/lib/e2k-operation.c               |    2 -
 servers/exchange/lib/e2k-operation.h               |    1 -
 servers/exchange/lib/e2k-path.c                    |    2 -
 servers/exchange/lib/e2k-properties.c              |    4 -
 servers/exchange/lib/e2k-properties.h              |    2 -
 servers/exchange/lib/e2k-restriction.c             |    2 -
 servers/exchange/lib/e2k-result.c                  |    2 -
 servers/exchange/lib/e2k-result.h                  |    2 -
 servers/exchange/lib/e2k-rule-xml.c                |    1 -
 servers/exchange/lib/e2k-rule.c                    |    2 -
 servers/exchange/lib/e2k-security-descriptor.c     |    3 -
 servers/exchange/lib/e2k-security-descriptor.h     |    1 -
 servers/exchange/lib/e2k-sid.c                     |    1 -
 servers/exchange/lib/e2k-sid.h                     |    1 -
 servers/exchange/lib/e2k-uri.c                     |    1 -
 servers/exchange/lib/e2k-uri.h                     |    1 -
 servers/exchange/lib/e2k-validate.h                |    1 -
 servers/exchange/lib/ebrowse.c                     |    2 -
 servers/exchange/lib/gctest.c                      |    1 -
 servers/exchange/lib/test-utils.h                  |    1 -
 servers/exchange/storage/e-folder-exchange.c       |    4 -
 servers/exchange/storage/e-folder-exchange.h       |    4 -
 servers/exchange/storage/e-folder-tree.c           |    1 -
 servers/exchange/storage/e-folder-type-registry.h  |    1 -
 servers/exchange/storage/e-folder.c                |    1 -
 servers/exchange/storage/exchange-account.c        |    7 --
 servers/exchange/storage/exchange-account.h        |    2 -
 servers/exchange/storage/exchange-constants.h      |    1 -
 servers/exchange/storage/exchange-folder-size.c    |    1 -
 servers/exchange/storage/exchange-folder-size.h    |    1 -
 .../exchange/storage/exchange-hierarchy-foreign.c  |    1 -
 servers/exchange/storage/exchange-hierarchy-gal.c  |    1 -
 .../exchange/storage/exchange-hierarchy-somedav.c  |    2 -
 .../exchange/storage/exchange-hierarchy-somedav.h  |    1 -
 .../exchange/storage/exchange-hierarchy-webdav.c   |    3 -
 .../exchange/storage/exchange-hierarchy-webdav.h   |    1 -
 servers/exchange/storage/exchange-hierarchy.c      |    6 --
 servers/exchange/xntlm/xntlm-des.c                 |    2 -
 servers/exchange/xntlm/xntlm.c                     |    5 -
 .../google/libgdata-google/gdata-google-service.c  |   11 ---
 servers/google/libgdata/gdata-entry.c              |    5 -
 servers/google/libgdata/gdata-entry.h              |    6 --
 servers/google/libgdata/gdata-feed.c               |   11 ---
 servers/google/libgdata/gdata-feed.h               |    2 -
 servers/groupwise/e-gw-connection.c                |   26 ------
 servers/groupwise/e-gw-connection.h                |    3 -
 servers/groupwise/e-gw-container.c                 |    2 -
 servers/groupwise/e-gw-filter.c                    |    7 --
 servers/groupwise/e-gw-filter.h                    |    2 -
 servers/groupwise/e-gw-item.c                      |   11 ---
 servers/groupwise/e-gw-item.h                      |    4 -
 servers/groupwise/e-gw-message.h                   |    1 -
 servers/groupwise/e-gw-proxy.h                     |    1 -
 servers/groupwise/e-gw-recur-utils.c               |    2 -
 servers/groupwise/e-gw-recur-utils.h               |    4 -
 servers/groupwise/e-gw-sendoptions.c               |    3 -
 servers/groupwise/soup-soap-message.c              |    1 -
 servers/groupwise/soup-soap-response.c             |    2 -
 servers/groupwise/soup-soap-response.h             |    1 -
 src/offline-listener.c                             |    8 --
 src/offline-listener.h                             |    2 -
 src/server.c                                       |    1 -
 456 files changed, 10 insertions(+), 1926 deletions(-)
---
diff --git a/addressbook/backends/file/e-book-backend-file.c b/addressbook/backends/file/e-book-backend-file.c
index 09e6e54..20e9054 100644
--- a/addressbook/backends/file/e-book-backend-file.c
+++ b/addressbook/backends/file/e-book-backend-file.c
@@ -638,7 +638,6 @@ book_view_thread (gpointer data)
 			abort ();
 		}
 
-
 	}
 done:
 	if (e_flag_is_set (closure->running))
@@ -899,7 +898,6 @@ e_book_backend_file_get_required_fields (EBookBackendSync *backend,
 	return GNOME_Evolution_Addressbook_Success;
 }
 
-
 static EBookBackendSyncStatus
 e_book_backend_file_get_supported_fields (EBookBackendSync *backend,
 					  EDataBook *book,
@@ -1059,7 +1057,6 @@ file_errcall (const gchar *buf1, gchar *buf2)
 	g_warning ("libdb error: %s", buf2);
 }
 
-
 static GNOME_Evolution_Addressbook_CallStatus
 e_book_backend_file_load_source (EBookBackend           *backend,
 				 ESource                *source,
@@ -1518,7 +1515,6 @@ e_book_backend_file_class_init (EBookBackendFileClass *klass)
 	sync_class->get_supported_fields_sync  = e_book_backend_file_get_supported_fields;
 	sync_class->get_required_fields_sync   = e_book_backend_file_get_required_fields;
 
-
 	object_class->dispose = e_book_backend_file_dispose;
 	object_class->finalize = e_book_backend_file_finalize;
 
diff --git a/addressbook/backends/google/google-book.c b/addressbook/backends/google/google-book.c
index 875c381..f6086c4 100644
--- a/addressbook/backends/google/google-book.c
+++ b/addressbook/backends/google/google-book.c
@@ -425,7 +425,6 @@ on_refresh_timeout (gpointer user_data)
     return FALSE;
 }
 
-
 static void
 google_book_cache_destroy (GoogleBook *book)
 {
@@ -621,7 +620,6 @@ google_book_emit_auth_required (GoogleBook *book)
     g_signal_emit (book, google_book_signals [AUTH_REQUIRED], 0);
 }
 
-
 static void
 google_book_class_init (GoogleBookClass *klass)
 {
@@ -1088,7 +1086,6 @@ out:
     return rv;
 }
 
-
 EContact*
 google_book_get_contact (GoogleBook *book,
                          const gchar *uid,
diff --git a/addressbook/backends/google/util.c b/addressbook/backends/google/util.c
index 6fc0646..98c610a 100644
--- a/addressbook/backends/google/util.c
+++ b/addressbook/backends/google/util.c
@@ -546,7 +546,6 @@ get_google_primary_type_label (EVCardAttribute *attr,
     return types;
 }
 
-
 static EVCardAttribute*
 attribute_from_gdata_entry_email_address (GDataEntryEmailAddress *email)
 {
diff --git a/addressbook/backends/groupwise/e-book-backend-groupwise.c b/addressbook/backends/groupwise/e-book-backend-groupwise.c
index 6258bc7..87df614 100644
--- a/addressbook/backends/groupwise/e-book-backend-groupwise.c
+++ b/addressbook/backends/groupwise/e-book-backend-groupwise.c
@@ -584,7 +584,6 @@ populate_emails (EContact *contact, gpointer data)
 	}
 }
 
-
 static void
 set_emails_in_gw_item (EGwItem *item, gpointer data)
 {
@@ -907,7 +906,6 @@ set_members_in_gw_item (EGwItem  *item, EContact *contact, EBookBackendGroupwise
 		g_object_unref (temp_item);
 	}
 
-
 	/* In groupwise there is no way to put arbitrary members into a group. There's no
 	 * mechanism for a group to contain members that are not already present in a system
 	 * or personal addressbook as a contact, and so they cant be saved and will be lost.
@@ -2593,7 +2591,6 @@ build_cache (EBookBackendGroupwise *ebgw)
 	if (status != E_GW_CONNECTION_STATUS_OK)
 		return FALSE;
 
-
 	for (; gw_items != NULL; gw_items = g_list_next(gw_items)) {
 		contact_num++;
 		contact = e_contact_new ();
@@ -2618,7 +2615,6 @@ build_cache (EBookBackendGroupwise *ebgw)
 	return NULL;
 }*/
 
-
 /*FIXME using cursors for address book seems to be crashing server
 till it gets fixed we will use get items. cursor implementation is below */
 
@@ -2908,7 +2904,6 @@ update_address_book_deltas (EBookBackendGroupwise *ebgw)
 	struct stat buf;
 	time_t mod_time;
 
-
 	if (!ebgw)
 		return FALSE;
 
@@ -3114,7 +3109,6 @@ update_address_book_deltas (EBookBackendGroupwise *ebgw)
 	if (sync_required)
 		ebgw->priv->file_db->sync(ebgw->priv->file_db, 0);
 
-
 	if (book_view) {
 		e_data_book_view_notify_complete (book_view,
 						  GNOME_Evolution_Addressbook_Success);
@@ -3224,7 +3218,6 @@ e_book_backend_groupwise_authenticate_user (EBookBackend *backend,
 			printf("book_name:%s\n", priv->book_name);
 	}
 
-
 	switch (ebgw->priv->mode) {
 	case GNOME_Evolution_Addressbook_MODE_LOCAL:
 		/* load summary file for offline use */
@@ -3466,7 +3459,6 @@ e_book_backend_groupwise_load_source (EBookBackend           *backend,
 	const gchar *use_ssl;
 	const gchar *offline;
 
-
 	if (enable_debug)
 		printf("\ne_book_backend_groupwise_load_source.. \n");
 	ebgw = E_BOOK_BACKEND_GROUPWISE (backend);
@@ -3865,7 +3857,6 @@ static void
 e_book_backend_groupwise_class_init (EBookBackendGroupwiseClass *klass)
 {
 
-
 	GObjectClass  *object_class = G_OBJECT_CLASS (klass);
 	EBookBackendClass *parent_class;
 
diff --git a/addressbook/backends/groupwise/e-book-backend-groupwise.h b/addressbook/backends/groupwise/e-book-backend-groupwise.h
index bfd0435..bc3299d 100644
--- a/addressbook/backends/groupwise/e-book-backend-groupwise.h
+++ b/addressbook/backends/groupwise/e-book-backend-groupwise.h
@@ -49,5 +49,3 @@ GType       e_book_backend_groupwise_get_type (void);
 
 #endif /* ! __E_BOOK_BACKEND_GROUPWISE_H__ */
 
-
-
diff --git a/addressbook/backends/ldap/e-book-backend-ldap.c b/addressbook/backends/ldap/e-book-backend-ldap.c
index 74f60b6..7eb8653 100644
--- a/addressbook/backends/ldap/e-book-backend-ldap.c
+++ b/addressbook/backends/ldap/e-book-backend-ldap.c
@@ -110,7 +110,6 @@
 #include "openldap-extract.h"
 #endif
 
-
 #endif
 
 #include <sys/time.h>
@@ -671,7 +670,6 @@ check_schema_support (EBookBackendLDAP *bl)
 	}
 }
 
-
 #ifndef SUNLDAP
 static void
 get_ldap_library_info (void)
@@ -925,7 +923,7 @@ e_book_backend_ldap_connect (EBookBackendLDAP *bl)
 				(PFN_ldap_start_tls_s) GetProcAddress (GetModuleHandle ("wldap32.dll"), "ldap_start_tls_s");
 				if (!pldap_start_tls_s)
 					(PFN_ldap_start_tls_s) GetProcAddress (GetModuleHandle ("wldap32.dll"), "ldap_start_tls_sA");
-				
+
 				if (!pldap_start_tls_s)
 					ldap_error = LDAP_NOT_SUPPORTED;
 				else
@@ -1739,7 +1737,6 @@ e_book_backend_ldap_create_contact (EBookBackend *backend,
 	}
 }
 
-
 typedef struct {
 	LDAPOp op;
 	gchar *id;
@@ -2260,7 +2257,6 @@ e_book_backend_ldap_modify_contact (EBookBackend *backend,
 	gint modify_contact_msgid;
 	EDataBookView *book_view;
 
-
 	switch (bl->priv->mode) {
 
 	case GNOME_Evolution_Addressbook_MODE_LOCAL :
@@ -2312,7 +2308,6 @@ e_book_backend_ldap_modify_contact (EBookBackend *backend,
 	}
 }
 
-
 typedef struct {
 	LDAPOp op;
 } LDAPGetContactOp;
@@ -2518,7 +2513,6 @@ e_book_backend_ldap_get_contact (EBookBackend *backend,
 	}
 }
 
-
 typedef struct {
 	LDAPOp op;
 	GList *contacts;
@@ -2641,7 +2635,6 @@ contact_list_dtor (LDAPOp *op)
 	g_free (contact_list_op);
 }
 
-
 static void
 e_book_backend_ldap_get_contact_list (EBookBackend *backend,
 				      EDataBook    *book,
@@ -2824,7 +2817,6 @@ email_compare (EContact *contact1, EContact *contact2)
 	return TRUE;
 }
 
-
 static void
 member_populate (EContact *contact, gchar **values)
 {
@@ -3294,8 +3286,6 @@ static EContactAddress * getormakeEContactAddress(EContact * card, EContactField
     return contact_addr;
 }
 
-
-
 static void
 address_populate(EContact * card, gchar **values, EContactField field, EContactField other_field)
 {
@@ -3540,7 +3530,6 @@ photo_compare(EContact * ecard1, EContact * ecard2)
 	photo1 = e_contact_get(ecard1, E_CONTACT_PHOTO);
 	photo2 = e_contact_get(ecard2, E_CONTACT_PHOTO);
 
-
 	if (photo1 && photo2) {
 		if (photo1->type == photo2->type && photo1->type == E_CONTACT_PHOTO_TYPE_INLINED) {
 			equal = ((photo1->data.inlined.length == photo2->data.inlined.length)
@@ -4971,14 +4960,12 @@ e_book_backend_ldap_get_required_fields (EBookBackend *backend,
 {
 	GList *fields = NULL;
 
-
 	/*FIMEME we should look at mandatory attributs in the schema
 	  and return all those fields here */
 	fields = g_list_append (fields, (gchar *)e_contact_field_name (E_CONTACT_FILE_AS));
 	fields = g_list_append (fields, (gchar *)e_contact_field_name (E_CONTACT_FULL_NAME));
 	fields = g_list_append (fields, (gchar *)e_contact_field_name (E_CONTACT_FAMILY_NAME));
 
-
 	e_data_book_respond_get_required_fields (book,
 						  opid,
 						  GNOME_Evolution_Addressbook_Success,
@@ -4986,7 +4973,6 @@ e_book_backend_ldap_get_required_fields (EBookBackend *backend,
 	g_list_free (fields);
 }
 
-
 static void
 e_book_backend_ldap_get_supported_fields (EBookBackend *backend,
 					  EDataBook    *book,
diff --git a/addressbook/backends/ldap/openldap-extract.h b/addressbook/backends/ldap/openldap-extract.h
index 9ef2653..92a0e4c 100644
--- a/addressbook/backends/ldap/openldap-extract.h
+++ b/addressbook/backends/ldap/openldap-extract.h
@@ -112,7 +112,6 @@ typedef struct ldap_objectclass {
 	gchar **oc_at_oids_may;	/* OPTIONAL */
 } LDAPObjectClass;
 
-
 static void
 vfree(gpointer *vec)
 {
diff --git a/addressbook/backends/vcf/e-book-backend-vcf.c b/addressbook/backends/vcf/e-book-backend-vcf.c
index 0b72997..39618e6 100644
--- a/addressbook/backends/vcf/e-book-backend-vcf.c
+++ b/addressbook/backends/vcf/e-book-backend-vcf.c
@@ -380,7 +380,6 @@ e_book_backend_vcf_get_contact (EBookBackendSync *backend,
 	}
 }
 
-
 typedef struct {
 	EBookBackendVCF      *bvcf;
 	gboolean            search_needed;
@@ -500,7 +499,6 @@ book_view_thread (gpointer data)
 	return NULL;
 }
 
-
 static void
 e_book_backend_vcf_start_book_view (EBookBackend  *backend,
 				    EDataBookView *book_view)
diff --git a/addressbook/libebook/e-address-western.c b/addressbook/libebook/e-address-western.c
index 2f7763f..63b5c8c 100644
--- a/addressbook/libebook/e-address-western.c
+++ b/addressbook/libebook/e-address-western.c
@@ -23,8 +23,6 @@ static const gchar *extended_keywords[] = {
 	"apt", "apartment", "suite", NULL
 };
 
-
-
 static gboolean
 e_address_western_is_line_blank (gchar *line)
 {
@@ -42,8 +40,6 @@ e_address_western_is_line_blank (gchar *line)
 	return blank;
 }
 
-
-
 /* In the array of lines, `lines', we will erase the line at line_num, and
  shift the remaining lines, up to line number num_lines, up one position. */
 
@@ -62,7 +58,6 @@ e_address_western_shift_line (gchar *lines[], gint line_num, gint num_lines)
 	}
 }
 
-
 static void
 e_address_western_remove_blank_lines (gchar *lines[], gint *linecntr)
 {
@@ -84,7 +79,6 @@ e_address_western_remove_blank_lines (gchar *lines[], gint *linecntr)
 	}
 }
 
-
 static gboolean
 e_address_western_is_po_box (gchar *line)
 {
@@ -93,7 +87,6 @@ e_address_western_is_po_box (gchar *line)
 	/* In which phase of processing are we? */
 	enum State { FIRSTCHAR, SECONDCHAR, WHITESPACE } state;
 
-
 	/* If the first two letters of the line are `p' and `o', and these
 	 are in turn followed by whitespace before another letter, then I
 	 will deem the line a representation of a PO Box address. */
@@ -216,7 +209,6 @@ e_address_western_extract_locality (gchar *line)
 		return g_strndup (line, index);
 }
 
-
 /* Whatever resides between the comma and the start of the
   postal code is deemed to be the region. */
 
diff --git a/addressbook/libebook/e-address-western.h b/addressbook/libebook/e-address-western.h
index 98c0e03..d72c8f0 100644
--- a/addressbook/libebook/e-address-western.h
+++ b/addressbook/libebook/e-address-western.h
@@ -24,4 +24,3 @@ G_END_DECLS
 
 #endif  /* ! __E_ADDRESS_WESTERN_H__ */
 
-
diff --git a/addressbook/libebook/e-book-listener.c b/addressbook/libebook/e-book-listener.c
index 4c4b45e..3e45a02 100644
--- a/addressbook/libebook/e-book-listener.c
+++ b/addressbook/libebook/e-book-listener.c
@@ -301,7 +301,6 @@ impl_BookListener_respond_get_required_fields (PortableServer_Servant servant,
 	g_signal_emit (listener, e_book_listener_signals [RESPONSE], 0, &response);
 }
 
-
 static void
 impl_BookListener_respond_get_supported_fields (PortableServer_Servant servant,
 						const CORBA_long opid,
diff --git a/addressbook/libebook/e-book-listener.h b/addressbook/libebook/e-book-listener.h
index 3d16c40..71e000f 100644
--- a/addressbook/libebook/e-book-listener.h
+++ b/addressbook/libebook/e-book-listener.h
@@ -110,7 +110,6 @@ struct _EBookListenerResponse {
 	gchar                   *vcard;
 };
 
-
 EBookListener         *e_book_listener_new            (void);
 GType                  e_book_listener_get_type       (void);
 void                   e_book_listener_stop           (EBookListener *listener);
diff --git a/addressbook/libebook/e-book-query.c b/addressbook/libebook/e-book-query.c
index 2e9e5cb..f250e86 100644
--- a/addressbook/libebook/e-book-query.c
+++ b/addressbook/libebook/e-book-query.c
@@ -719,7 +719,6 @@ e_book_query_to_string    (EBookQuery *q)
 		break;
 	}
 
-
 	g_string_append (str, ")");
 
 	g_string_free (encoded, TRUE);
diff --git a/addressbook/libebook/e-book-types.h b/addressbook/libebook/e-book-types.h
index 00a814e..f6ec3db 100644
--- a/addressbook/libebook/e-book-types.h
+++ b/addressbook/libebook/e-book-types.h
@@ -48,7 +48,6 @@ typedef enum {
 	E_BOOK_ERROR_NO_SPACE
 } EBookStatus;
 
-
 typedef enum {
 	E_BOOK_VIEW_STATUS_OK,
 	E_BOOK_VIEW_STATUS_TIME_LIMIT_EXCEEDED,
diff --git a/addressbook/libebook/e-book-view-listener.h b/addressbook/libebook/e-book-view-listener.h
index 6d4bf78..3ab1216 100644
--- a/addressbook/libebook/e-book-view-listener.h
+++ b/addressbook/libebook/e-book-view-listener.h
@@ -48,7 +48,6 @@ struct _EBookViewListenerClass {
 	 */
 	void (*response) (EBookViewListener *listener, EBookViewListenerResponse *response);
 
-
 	/* Padding for future expansion */
 	void (*_ebook_reserved0) (void);
 	void (*_ebook_reserved1) (void);
diff --git a/addressbook/libebook/e-book-view.c b/addressbook/libebook/e-book-view.c
index 1ebe549..03c2327 100644
--- a/addressbook/libebook/e-book-view.c
+++ b/addressbook/libebook/e-book-view.c
@@ -78,7 +78,6 @@ e_book_view_do_status_message_event (EBookView                 *book_view,
 		       resp->message);
 }
 
-
 static void
 e_book_view_handle_response (EBookViewListener *listener, EBookViewListenerResponse *resp, EBookView *book_view)
 {
diff --git a/addressbook/libebook/e-book.c b/addressbook/libebook/e-book.c
index 0e7370d..f604adb 100644
--- a/addressbook/libebook/e-book.c
+++ b/addressbook/libebook/e-book.c
@@ -259,7 +259,6 @@ e_book_clear_op (EBook *book,
 	e_book_op_free (op);
 }
 
-
 static gboolean
 do_add_contact (gboolean          sync,
 		EBook            *book,
@@ -569,7 +568,6 @@ do_commit_contact (gboolean        sync,
 	}
 }
 
-
 /**
  * e_book_commit_contact:
  * @book: an #EBook
@@ -687,7 +685,6 @@ do_get_required_fields (gboolean             sync,
 		return FALSE;
 	}
 
-
 	CORBA_exception_free (&ev);
 
 	if (sync) {
@@ -778,7 +775,6 @@ do_get_supported_fields (gboolean             sync,
 		return FALSE;
 	}
 
-
 	CORBA_exception_free (&ev);
 
 	if (sync) {
@@ -1075,7 +1071,6 @@ do_get_supported_auth_methods (gboolean             sync,
 		return FALSE;
 	}
 
-
 	CORBA_exception_free (&ev);
 
 	if (sync) {
@@ -2205,7 +2200,6 @@ emit_async_get_contacts_response (gpointer data)
 	return FALSE;
 }
 
-
 static void
 e_book_response_get_contacts (EBook       *book,
 			      guint32      opid,
@@ -3073,7 +3067,6 @@ e_book_idle_auth_required (gpointer data)
 
 	return FALSE;
 
-
 }
 
 static void
@@ -3205,7 +3198,6 @@ e_book_unload_uri (EBook   *book,
 
 
 
-
 /* Set a flag for operation from the operation hash table */
 static void
 find_key_value (gpointer key, gpointer value, gpointer data)
@@ -3327,7 +3319,6 @@ fetch_corba_book (EBook       *book,
 		return FALSE;
 	}
 
-
 	/*
 	 * Create our local BookListener interface.
 	 */
@@ -3700,7 +3691,6 @@ e_book_set_default_addressbook (EBook *book, GError **error)
 	return e_book_set_default_source (source, error);
 }
 
-
 /**
  * e_book_set_default_source:
  * @source: An #ESource pointer
diff --git a/addressbook/libebook/e-book.h b/addressbook/libebook/e-book.h
index 8374b70..de8731b 100644
--- a/addressbook/libebook/e-book.h
+++ b/addressbook/libebook/e-book.h
@@ -46,7 +46,6 @@ typedef void (*EBookListCallback)     (EBook *book, EBookStatus status, GList *l
 typedef void (*EBookBookViewCallback) (EBook *book, EBookStatus status, EBookView *book_view, gpointer closure);
 typedef void (*EBookEListCallback)   (EBook *book, EBookStatus status, EList *list, gpointer closure);
 
-
 struct _EBook {
 	GObject       parent;
 	/*< private >*/
@@ -117,7 +116,6 @@ guint    e_book_async_get_supported_auth_methods (EBook              *book,
 						  EBookEListCallback  cb,
 						  gpointer            closure);
 
-
 /* User authentication. */
 gboolean e_book_authenticate_user          (EBook       *book,
 					    const gchar  *user,
diff --git a/addressbook/libebook/e-contact.c b/addressbook/libebook/e-contact.c
index df66ae2..a2d6295 100644
--- a/addressbook/libebook/e-contact.c
+++ b/addressbook/libebook/e-contact.c
@@ -2078,7 +2078,6 @@ e_contact_geo_get_type (void)
 	return type_id;
 }
 
-
 /**
  * e_contact_address_free:
  * @address: an #EContactAddress
diff --git a/addressbook/libebook/e-contact.h b/addressbook/libebook/e-contact.h
index c335042..5f63eb8 100644
--- a/addressbook/libebook/e-contact.h
+++ b/addressbook/libebook/e-contact.h
@@ -179,7 +179,6 @@ typedef enum {
 	E_CONTACT_IS_LIST,             /* boolean field */
 	E_CONTACT_LIST_SHOW_ADDRESSES, /* boolean field */
 
-
 	E_CONTACT_BIRTH_DATE,    /* structured field (EContactDate) */
 	E_CONTACT_ANNIVERSARY,   /* structured field (EContactDate) */
 
@@ -328,7 +327,6 @@ EContactName           *e_contact_name_from_string (const gchar *name_str);
 EContactName           *e_contact_name_copy        (EContactName *n);
 void                    e_contact_name_free        (EContactName *name);
 
-
 GType                   e_contact_photo_get_type   (void);
 void                    e_contact_photo_free       (EContactPhoto *photo);
 
@@ -341,7 +339,6 @@ void                    e_contact_cert_free        (EContactCert *cert);
 GType                   e_contact_address_get_type (void);
 void                    e_contact_address_free     (EContactAddress *address);
 
-
 const gchar *             e_contact_field_name       (EContactField field_id);
 const gchar *             e_contact_pretty_name      (EContactField field_id);
 const gchar *             e_contact_vcard_attribute  (EContactField field_id);
diff --git a/addressbook/libebook/e-destination.h b/addressbook/libebook/e-destination.h
index ea41335..dae7dc5 100644
--- a/addressbook/libebook/e-destination.h
+++ b/addressbook/libebook/e-destination.h
@@ -67,7 +67,6 @@ struct _EDestinationClass {
 
 GType e_destination_get_type (void);
 
-
 EDestination  *e_destination_new                (void);
 EDestination  *e_destination_copy               (const EDestination *dest);
 
diff --git a/addressbook/libebook/e-name-western.c b/addressbook/libebook/e-name-western.c
index 182aa27..01e2dc1 100644
--- a/addressbook/libebook/e-name-western.c
+++ b/addressbook/libebook/e-name-western.c
@@ -727,7 +727,6 @@ e_name_western_reorder_asshole (ENameWestern *name, ENameWesternIdxs *idxs)
 	g_free (name->full);
 	name->full = newfull;
 
-
 	g_free (prefix);
 	g_free (firstmidnick);
 	g_free (last);
diff --git a/addressbook/libebook/e-vcard.c b/addressbook/libebook/e-vcard.c
index a99d9b5..0cb85e1 100644
--- a/addressbook/libebook/e-vcard.c
+++ b/addressbook/libebook/e-vcard.c
@@ -124,8 +124,6 @@ e_vcard_get_type (void)
 	return vcard_type;
 }
 
-
-
 /*  Skip newline characters and return the next character.
  *  This function takes care of folding lines, skipping
  *  newline characters if found, taking care of equal characters
@@ -176,7 +174,6 @@ skip_newline (gchar *str, gboolean quoted_printable)
 	return p;
 }
 
-
 /* skip forward until we hit the CRLF, or \0 */
 static void
 skip_to_next_line (gchar **p)
diff --git a/addressbook/libebook/e-vcard.h b/addressbook/libebook/e-vcard.h
index a23a38c..95f7e77 100644
--- a/addressbook/libebook/e-vcard.h
+++ b/addressbook/libebook/e-vcard.h
@@ -140,7 +140,6 @@ gchar *   e_vcard_to_string                    (EVCard *evc, EVCardFormat format
 /* mostly for debugging */
 void    e_vcard_dump_structure               (EVCard *evc);
 
-
 /* attributes */
 EVCardAttribute *e_vcard_attribute_new               (const gchar *attr_group, const gchar *attr_name);
 void             e_vcard_attribute_free              (EVCardAttribute *attr);
diff --git a/addressbook/libedata-book/e-book-backend-cache.c b/addressbook/libedata-book/e-book-backend-cache.c
index 96eb5f9..de954e4 100644
--- a/addressbook/libedata-book/e-book-backend-cache.c
+++ b/addressbook/libedata-book/e-book-backend-cache.c
@@ -111,7 +111,6 @@ e_book_backend_cache_get_property (GObject *object, guint property_id, GValue *v
 	}
 }
 
-
 static void
 e_book_backend_cache_finalize (GObject *object)
 {
@@ -127,7 +126,6 @@ e_book_backend_cache_finalize (GObject *object)
 			priv->uri = NULL;
 		}
 
-
 		g_free (priv);
 		cache->priv = NULL;
 	}
@@ -191,7 +189,6 @@ e_book_backend_cache_init (EBookBackendCache *cache)
 
 }
 
-
 GType
 e_book_backend_cache_get_type (void)
 {
@@ -259,7 +256,6 @@ e_book_backend_cache_get_contact (EBookBackendCache *cache, const gchar *uid)
 
 	}
 
-
 	return contact;
 }
 
@@ -283,7 +279,6 @@ e_book_backend_cache_add_contact (EBookBackendCache *cache,
 
 	g_return_val_if_fail (E_IS_BOOK_BACKEND_CACHE (cache), FALSE);
 
-
 	priv = cache->priv;
 
 	uid = e_contact_get_const (contact, E_CONTACT_UID);
@@ -321,14 +316,12 @@ e_book_backend_cache_remove_contact (EBookBackendCache *cache,
 
 	priv = cache->priv;
 
-
 	if (!e_file_cache_get_object (E_FILE_CACHE (cache), uid)) {
 		return FALSE;
 	}
 
 	retval = e_file_cache_remove_object (E_FILE_CACHE (cache), uid);
 
-
 	return retval;
 }
 
@@ -387,7 +380,6 @@ e_book_backend_cache_get_contacts (EBookBackendCache *cache, const gchar *query)
 			return NULL;
 	}
 
-
         lcache = l = e_file_cache_get_objects (E_FILE_CACHE (cache));
 
         for (; l != NULL; l = g_slist_next (l)) {
diff --git a/addressbook/libedata-book/e-book-backend-cache.h b/addressbook/libedata-book/e-book-backend-cache.h
index 0e86a90..476beea 100644
--- a/addressbook/libedata-book/e-book-backend-cache.h
+++ b/addressbook/libedata-book/e-book-backend-cache.h
@@ -61,9 +61,6 @@ void e_book_backend_cache_set_time (EBookBackendCache *cache, const gchar *t);
 gchar *e_book_backend_cache_get_time (EBookBackendCache *cache);
 GPtrArray* e_book_backend_cache_search (EBookBackendCache *cache, const gchar *query);
 
-
-
-
 G_END_DECLS
 
 #endif
diff --git a/addressbook/libedata-book/e-book-backend-factory.h b/addressbook/libedata-book/e-book-backend-factory.h
index bcdd38e..4739367 100644
--- a/addressbook/libedata-book/e-book-backend-factory.h
+++ b/addressbook/libedata-book/e-book-backend-factory.h
@@ -53,7 +53,6 @@ GType                e_book_backend_factory_get_type             (void);
 const gchar *          e_book_backend_factory_get_protocol         (EBookBackendFactory *factory);
 EBookBackend*        e_book_backend_factory_new_backend          (EBookBackendFactory *factory);
 
-
 /* use this macro for simple, 1 factory modules */
 #define E_BOOK_BACKEND_FACTORY_SIMPLE(p,t,f) \
 typedef struct { \
diff --git a/addressbook/libedata-book/e-book-backend-sexp.c b/addressbook/libedata-book/e-book-backend-sexp.c
index b4e4e5f..eb13ddf 100644
--- a/addressbook/libedata-book/e-book-backend-sexp.c
+++ b/addressbook/libedata-book/e-book-backend-sexp.c
@@ -103,7 +103,6 @@ compare_im_gadugadu (EContact *contact, const gchar *str,
 	return compare_im (contact, str, compare, E_CONTACT_IM_GADUGADU);
 }
 
-
 static gboolean
 compare_im_jabber (EContact *contact, const gchar *str,
 		   gchar *(*compare)(const gchar *, const gchar *))
diff --git a/addressbook/libedata-book/e-book-backend.c b/addressbook/libedata-book/e-book-backend.c
index 2468180..7ef6da8 100644
--- a/addressbook/libedata-book/e-book-backend.c
+++ b/addressbook/libedata-book/e-book-backend.c
@@ -894,7 +894,6 @@ e_book_backend_foreach_view (EBookBackend *backend,
 	g_object_unref (views);
 }
 
-
 static void
 view_notify_update (EDataBookView *view, gpointer contact)
 {
@@ -919,7 +918,6 @@ e_book_backend_notify_update (EBookBackend *backend, EContact *contact)
 	e_book_backend_foreach_view (backend, view_notify_update, contact);
 }
 
-
 static void
 view_notify_remove (EDataBookView *view, gpointer id)
 {
@@ -944,7 +942,6 @@ e_book_backend_notify_remove (EBookBackend *backend, const gchar *id)
 	e_book_backend_foreach_view (backend, view_notify_remove, (gpointer)id);
 }
 
-
 static void
 view_notify_complete (EDataBookView *view, gpointer unused)
 {
diff --git a/addressbook/libedata-book/e-book-backend.h b/addressbook/libedata-book/e-book-backend.h
index 3f4beee..6ece62e 100644
--- a/addressbook/libedata-book/e-book-backend.h
+++ b/addressbook/libedata-book/e-book-backend.h
@@ -179,7 +179,6 @@ void        e_book_backend_sync                       (EBookBackend *backend);
 
 GType       e_book_backend_get_type                 (void);
 
-
 /* protected functions for subclasses */
 void        e_book_backend_set_is_loaded            (EBookBackend             *backend,
 						     gboolean                  is_loaded);
diff --git a/addressbook/libedata-book/e-data-book-factory.c b/addressbook/libedata-book/e-data-book-factory.c
index 21f2266..5f1410a 100644
--- a/addressbook/libedata-book/e-data-book-factory.c
+++ b/addressbook/libedata-book/e-data-book-factory.c
@@ -476,7 +476,6 @@ e_data_book_factory_set_backend_mode (EDataBookFactory *factory, gint mode)
 {
 	EDataBookFactoryPrivate *priv = factory->priv;
 
-
 	g_mutex_lock (priv->map_mutex);
 	priv->mode = mode;
 	g_hash_table_foreach (priv->active_server_map, set_backend_online_status, GINT_TO_POINTER (priv->mode));
@@ -563,7 +562,6 @@ e_data_book_factory_class_init (EDataBookFactoryClass *klass)
 			      g_cclosure_marshal_VOID__VOID,
 			      G_TYPE_NONE, 0);
 
-
 	epv = &klass->epv;
 
 	epv->getBook = impl_GNOME_Evolution_Addressbook_BookFactory_getBook;
diff --git a/addressbook/libedata-book/e-data-book-view.h b/addressbook/libedata-book/e-data-book-view.h
index b5cc864..1bdfafa 100644
--- a/addressbook/libedata-book/e-data-book-view.h
+++ b/addressbook/libedata-book/e-data-book-view.h
@@ -41,7 +41,6 @@ struct _EDataBookViewClass {
 	POA_GNOME_Evolution_Addressbook_BookView__epv epv;
 };
 
-
 EDataBookView *e_data_book_view_new                  (EBookBackend                 *backend,
 						      GNOME_Evolution_Addressbook_BookViewListener  listener,
 						      const gchar                   *card_query,
diff --git a/addressbook/libedata-book/e-data-book.c b/addressbook/libedata-book/e-data-book.c
index 9c7c8bb..224cd89 100644
--- a/addressbook/libedata-book/e-data-book.c
+++ b/addressbook/libedata-book/e-data-book.c
@@ -172,7 +172,6 @@ impl_GNOME_Evolution_Addressbook_Book_getBookView (PortableServer_Servant servan
 	e_data_book_respond_get_book_view (book, opid, GNOME_Evolution_Addressbook_Success, view);
 }
 
-
 static void
 impl_GNOME_Evolution_Addressbook_Book_getChanges (PortableServer_Servant servant,
 						  const CORBA_long opid,
@@ -198,7 +197,6 @@ impl_GNOME_Evolution_Addressbook_Book_getStaticCapabilities (PortableServer_Serv
 	return ret_val;
 }
 
-
 static void
 impl_GNOME_Evolution_Addressbook_Book_getRequiredFields (PortableServer_Servant servant,
 							  const CORBA_long opid,
@@ -241,7 +239,6 @@ impl_GNOME_Evolution_Addressbook_Book_cancelOperation (PortableServer_Servant se
 	return e_book_backend_cancel_operation (e_data_book_get_backend (book), book);
 }
 
-
 /**
  * e_data_book_get_backend:
  * @book: an #EDataBook
@@ -735,7 +732,6 @@ e_data_book_respond_get_contact_list (EDataBook                              *bo
 	g_list_foreach (card_list, (GFunc)g_free, NULL);
 	g_list_free (card_list);
 
-
 	GNOME_Evolution_Addressbook_BookListener_notifyContactListRequested (book->priv->listener,
 									     opid,
 									     status,
diff --git a/addressbook/libedata-book/e-data-book.h b/addressbook/libedata-book/e-data-book.h
index 6d891d7..5b26b78 100644
--- a/addressbook/libedata-book/e-data-book.h
+++ b/addressbook/libedata-book/e-data-book.h
@@ -47,7 +47,6 @@ struct _EDataBookClass {
 	void (*_pas_reserved4) (void);
 };
 
-
 EDataBook                *e_data_book_new                    (EBookBackend                               *backend,
 							      ESource                                  *source,
 							 GNOME_Evolution_Addressbook_BookListener  listener);
diff --git a/addressbook/tests/ebook/test-changes.c b/addressbook/tests/ebook/test-changes.c
index 742e8e0..e5a339e 100644
--- a/addressbook/tests/ebook/test-changes.c
+++ b/addressbook/tests/ebook/test-changes.c
@@ -86,7 +86,6 @@ main (gint argc, gchar **argv)
 
 	e_book_free_change_list (changes);
 
-
 	if (!e_book_remove (book, &error)) {
 		printf ("failed to remove book; %s\n", error->message);
 		exit(0);
diff --git a/calendar/backends/caldav/e-cal-backend-caldav.c b/calendar/backends/caldav/e-cal-backend-caldav.c
index 53fba2e..404fd62 100644
--- a/calendar/backends/caldav/e-cal-backend-caldav.c
+++ b/calendar/backends/caldav/e-cal-backend-caldav.c
@@ -295,7 +295,6 @@ icomp_x_prop_set (icalcomponent *comp, const gchar *key, const gchar *value)
 	}
 }
 
-
 static gchar *
 icomp_x_prop_get (icalcomponent *comp, const gchar *key)
 {
@@ -404,7 +403,6 @@ ecalcomp_set_synch_state (ECalComponent *comp, ECalCompSyncState state)
 	g_free (state_string);
 }*/
 
-
 static gchar *
 ecalcomp_gen_href (ECalComponent *comp)
 {
@@ -1191,7 +1189,6 @@ caldav_server_list_objects (ECalBackendCalDAV *cbdav, CalDAVObject **objs, gint
 	return result;
 }
 
-
 static ECalBackendSyncStatus
 caldav_server_get_object (ECalBackendCalDAV *cbdav, CalDAVObject *object)
 {
@@ -1758,7 +1755,7 @@ synchronize_cache (ECalBackendCalDAV *cbdav, time_t start_time, time_t end_time)
 		} else if (uid && ccl) {
 			/* all components cover by this uid are up-to-date */
 			GSList *p;
-			
+
 			for (p = ccl->slist; p; p = p->next) {
 				g_object_unref (p->data);
 			}
@@ -2035,7 +2032,6 @@ caldav_is_read_only (ECalBackendSync *backend,
 	return GNOME_Evolution_Calendar_Success;
 }
 
-
 static ECalBackendSyncStatus
 caldav_get_cal_address (ECalBackendSync  *backend,
 			EDataCal         *cal,
@@ -2045,8 +2041,6 @@ caldav_get_cal_address (ECalBackendSync  *backend,
 	return GNOME_Evolution_Calendar_Success;
 }
 
-
-
 static ECalBackendSyncStatus
 caldav_get_ldap_attribute (ECalBackendSync  *backend,
 			   EDataCal         *cal,
@@ -4260,7 +4254,6 @@ e_cal_backend_caldav_init (ECalBackendCalDAV *cbdav)
 	e_cal_backend_sync_set_lock (E_CAL_BACKEND_SYNC (cbdav), FALSE);
 }
 
-
 static void
 e_cal_backend_caldav_class_init (ECalBackendCalDAVClass *class)
 {
diff --git a/calendar/backends/caldav/e-cal-backend-caldav.h b/calendar/backends/caldav/e-cal-backend-caldav.h
index a180d22..1fc24ba 100644
--- a/calendar/backends/caldav/e-cal-backend-caldav.h
+++ b/calendar/backends/caldav/e-cal-backend-caldav.h
@@ -27,7 +27,6 @@
 
 G_BEGIN_DECLS
 
-
 #define E_TYPE_CAL_BACKEND_CALDAV             (e_cal_backend_caldav_get_type ())
 #define E_CAL_BACKEND_CALDAV(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_CAL_BACKEND_CALDAV, ECalBackendCalDAV))
 #define E_CAL_BACKEND_CALDAV_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST ((klass), E_TYPE_CAL_BACKEND_CALDAV, ECalBackendCalDAVClass))
@@ -50,7 +49,6 @@ struct _ECalBackendCalDAVClass {
 
 GType       e_cal_backend_caldav_get_type      (void);
 
-
 G_END_DECLS
 
 #endif /* E_CAL_BACKEND_CALDAV_H */
diff --git a/calendar/backends/contacts/e-cal-backend-contacts.c b/calendar/backends/contacts/e-cal-backend-contacts.c
index 842c735..8606936 100644
--- a/calendar/backends/contacts/e-cal-backend-contacts.c
+++ b/calendar/backends/contacts/e-cal-backend-contacts.c
@@ -1286,7 +1286,6 @@ e_cal_backend_contacts_class_init (ECalBackendContactsClass *class)
 	backend_class->internal_get_timezone = e_cal_backend_contacts_internal_get_timezone;
 }
 
-
 /**
  * e_cal_backend_contacts_get_type:
  * @void:
diff --git a/calendar/backends/file/e-cal-backend-file.c b/calendar/backends/file/e-cal-backend-file.c
index c3a4fb3..4d8422b 100644
--- a/calendar/backends/file/e-cal-backend-file.c
+++ b/calendar/backends/file/e-cal-backend-file.c
@@ -745,7 +745,6 @@ notify_removals_cb (gpointer key, gpointer value, gpointer data)
 		comp = e_cal_component_new_from_string (old_obj_str);
 		id = e_cal_component_get_id (comp);
 
-
 		e_cal_backend_notify_object_removed (context->backend, id, old_obj_str, NULL);
 
 		e_cal_component_free_id (id);
@@ -1727,7 +1726,6 @@ e_cal_backend_file_compute_changes (ECalBackendFile *cbfile, const gchar *change
 
 	priv = cbfile->priv;
 
-
 	/* FIXME Will this always work? */
 	unescaped_uri = g_uri_unescape_string (priv->path, "");
 	filename = g_strdup_printf ("%s-%s.db", unescaped_uri, change_id);
@@ -2461,7 +2459,6 @@ check_tzids (icalparameter *param, gpointer data)
 		tzdata->found = FALSE;
 }
 
-
 /* This function is largely duplicated in
  * ../groupwise/e-cal-backend-groupwise.c
  */
@@ -2877,7 +2874,6 @@ e_cal_backend_file_class_init (ECalBackendFileClass *class)
 	backend_class->internal_get_timezone = e_cal_backend_file_internal_get_timezone;
 }
 
-
 /**
  * e_cal_backend_file_get_type:
  * @void:
diff --git a/calendar/backends/google/e-cal-backend-google-utils.c b/calendar/backends/google/e-cal-backend-google-utils.c
index e0e5ff9..5ed864e 100644
--- a/calendar/backends/google/e-cal-backend-google-utils.c
+++ b/calendar/backends/google/e-cal-backend-google-utils.c
@@ -20,7 +20,6 @@
  * Boston, MA 02110-1301, USA.
  */
 
-
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
@@ -49,7 +48,6 @@
 #include <libecal/e-cal-component.h>
 #include <libecal/e-cal-time-util.h>
 
-
 #include <libical/ical.h>
 #include <libsoup/soup-misc.h>
 
@@ -117,7 +115,6 @@ e_cal_backend_google_utils_populate_cache (ECalBackendGoogle *cbgo)
 	e_cal_backend_notify_view_done (E_CAL_BACKEND(cbgo), GNOME_Evolution_Calendar_Success);
 }
 
-
 /**
  *
  * e_cal_backend_google_utils_create_cache:
@@ -160,7 +157,6 @@ e_cal_backend_google_utils_create_cache (ECalBackendGoogle *cbgo)
 	return GINT_TO_POINTER (GNOME_Evolution_Calendar_Success);
 }
 
-
 /**
  * e_cal_backend_google_utils_update:
  *
@@ -548,7 +544,6 @@ e_go_item_to_cal_component (EGoItem *item, ECalBackendGoogle *cbgo)
 	return comp;
 }
 
-
 /**
  *
  * e_go_item_from_cal_component:
@@ -653,7 +648,6 @@ e_go_item_get_entry (EGoItem *item)
 	return item->entry;
 }
 
-
 /**
  *
  * e_go_item_set_entry:
@@ -693,7 +687,6 @@ gdata_entry_get_entry_by_id (GSList *entries, const gchar *id)
 	return NULL;
 }
 
-
 /***************************************************************** Utility Functions *********************************************/
 
 static gint
@@ -750,7 +743,6 @@ utils_update_insertion (ECalBackendGoogle *cbgo, ECalBackendCache *cache, EGoIte
 		g_slist_free (entries_list);
 }
 
-
 static void
 utils_update_deletion (ECalBackendGoogle *cbgo, ECalBackendCache *cache, GSList *cache_keys)
 {
diff --git a/calendar/backends/google/e-cal-backend-google.c b/calendar/backends/google/e-cal-backend-google.c
index b7ce27f..4082147 100644
--- a/calendar/backends/google/e-cal-backend-google.c
+++ b/calendar/backends/google/e-cal-backend-google.c
@@ -38,7 +38,6 @@
 #include <libedataserver/e-xml-hash-utils.h>
 #include <libedataserver/e-proxy.h>
 
-
 #include <libedata-cal/e-cal-backend-util.h>
 #include <libedata-cal/e-cal-backend-sexp.h>
 
@@ -137,7 +136,6 @@ e_cal_backend_google_get_free_busy (ECalBackendSync *backend,
 	return GNOME_Evolution_Calendar_Success;
 }
 
-
 static ECalBackendSyncStatus
 e_cal_backend_google_remove (ECalBackendSync *backend, EDataCal *cal)
 {
@@ -159,7 +157,6 @@ e_cal_backend_google_remove (ECalBackendSync *backend, EDataCal *cal)
 	return GNOME_Evolution_Calendar_Success;
 }
 
-
 static gboolean
 e_cal_backend_google_is_loaded (ECalBackend *backend)
 {
@@ -172,7 +169,6 @@ e_cal_backend_google_is_loaded (ECalBackend *backend)
 	return priv->cache ? TRUE : FALSE;
 }
 
-
 static ECalBackendSyncStatus
 e_cal_backend_google_add_timezone (ECalBackendSync *backend, EDataCal *cal, const gchar *tzobj)
 {
@@ -416,7 +412,6 @@ e_cal_backend_google_set_default_zone (ECalBackendSync *backend, EDataCal *cal,
 	return GNOME_Evolution_Calendar_Success;
 }
 
-
 static void
 e_cal_backend_google_set_mode (ECalBackend *backend, CalMode mode)
 {
@@ -860,7 +855,6 @@ e_cal_backend_google_is_read_only (ECalBackendSync *backend, EDataCal *cal, gboo
 	return GNOME_Evolution_Calendar_Success;
 }
 
-
 /* Returns the email address of the person who opened the calendar */
 static ECalBackendSyncStatus
 e_cal_backend_google_get_cal_address (ECalBackendSync *backend, EDataCal *cal, gchar **address)
@@ -974,7 +968,6 @@ e_cal_backend_google_modify_object (ECalBackendSync *backend, EDataCal *cal, con
 	return GNOME_Evolution_Calendar_Success;
 }
 
-
 static ECalBackendSyncStatus
 e_cal_backend_google_remove_object (ECalBackendSync *backend, EDataCal *cal,
 				       const gchar *uid, const gchar *rid,
@@ -1133,7 +1126,6 @@ e_cal_backend_google_get_ldap_attribute (ECalBackendSync *backend, EDataCal *cal
 	return GNOME_Evolution_Calendar_Success;
 }
 
-
 static ECalBackendSyncStatus
 e_cal_backend_google_get_static_capabilities (ECalBackendSync *backend, EDataCal *cal, gchar **capabilities)
 {
@@ -1288,7 +1280,6 @@ e_cal_backend_google_finalize (GObject *object)
 		priv->cache = NULL;
 	}
 
-
 	if (priv->default_zone) {
 		icaltimezone_free (priv->default_zone, 1);
 		priv->default_zone = NULL;
@@ -1435,7 +1426,6 @@ e_cal_backend_google_get_type (void)
 	return e_cal_backend_google_type;
 }
 
-
 /***************************************** Helper Functions ****************************************************/
 
 /**
@@ -1612,7 +1602,6 @@ e_cal_backend_google_get_cache (ECalBackendGoogle *cbgo)
 	g_return_val_if_fail (cbgo != NULL, NULL);
 	g_return_val_if_fail (E_IS_CAL_BACKEND_GOOGLE(cbgo), NULL);
 
-
 	priv = cbgo->priv;
 	return priv->cache;
 }
@@ -1741,7 +1730,6 @@ e_cal_backend_google_get_password (ECalBackendGoogle *cbgo)
 	return priv->password;
 }
 
-
 gchar *
 e_cal_backend_google_get_local_attachments_store (ECalBackendGoogle *cbgo)
 {
diff --git a/calendar/backends/groupwise/e-cal-backend-groupwise-utils.c b/calendar/backends/groupwise/e-cal-backend-groupwise-utils.c
index 9756220..c39c9f8 100644
--- a/calendar/backends/groupwise/e-cal-backend-groupwise-utils.c
+++ b/calendar/backends/groupwise/e-cal-backend-groupwise-utils.c
@@ -489,7 +489,6 @@ get_actual_count (ECalComponent *comp, ECalBackendGroupwise *cbgw)
 	gint count = 0;
 	icaltimezone *dzone, *utc;
 
-
 	dzone = e_cal_backend_groupwise_get_default_zone (cbgw);
 	utc = icaltimezone_get_utc_timezone ();
 
@@ -564,7 +563,6 @@ set_rrule_from_comp (ECalComponent *comp, EGwItem *item, ECalBackendGroupwise *c
 			icaltimezone *default_zone, *utc;
 			struct icaltimetype itt_utc;
 
-
 			e_cal_component_get_exdate_list (comp, &exdate_list);
 			default_zone = e_cal_backend_groupwise_get_default_zone (cbgw);
 			utc = icaltimezone_get_utc_timezone ();
@@ -637,8 +635,6 @@ set_properties_from_cal_component (EGwItem *item, ECalComponent *comp, ECalBacke
 			cal_obj_uid_list_free (l);
 		}
 
-
-
 		/* end date */
 		e_cal_component_get_dtend (comp, &dt);
 		if (dt.value) {
@@ -706,7 +702,6 @@ set_properties_from_cal_component (EGwItem *item, ECalComponent *comp, ECalBacke
 	/* GW server ID */
 	e_gw_item_set_id (item, e_cal_component_get_gw_id (comp));
 
-
 	/* UID */
 	e_cal_component_get_uid (comp, &uid);
 	e_gw_item_set_icalid (item, uid);
@@ -733,7 +728,6 @@ set_properties_from_cal_component (EGwItem *item, ECalComponent *comp, ECalBacke
 		e_cal_component_free_text_list (slist);
 	}
 
-
 	/* start date */
 	e_cal_component_get_dtstart (comp, &dt);
 	if (dt.value) {
@@ -794,7 +788,6 @@ set_properties_from_cal_component (EGwItem *item, ECalComponent *comp, ECalBacke
 		e_gw_item_set_classification (item, NULL);
 	}
 
-
 	set_attendees_to_item (item, comp, default_zone, FALSE, NULL);
 
 	/* check if recurrences exist and update the item */
@@ -1001,7 +994,6 @@ set_default_alarms (ECalComponent *comp)
 		g_object_unref (gconf);
 }
 
-
 static gchar *
 get_cn_from_display_name (gchar *display_name)
 {
@@ -1073,7 +1065,6 @@ e_gw_item_to_cal_component (EGwItem *item, ECalBackendGroupwise *cbgw)
 		icalcomponent_add_property (e_cal_component_get_icalcomponent (comp), icalprop);
 	}
 
-
 	if (e_gw_item_get_reply_request (item)) {
 		gchar *reply_within;
 		const gchar *mess = e_gw_item_get_message (item);
@@ -1256,7 +1247,6 @@ e_gw_item_to_cal_component (EGwItem *item, ECalBackendGroupwise *cbgw)
 				else
 					attendee->status = ICAL_PARTSTAT_NEEDSACTION;
 
-
 				attendee_list = g_slist_append (attendee_list, attendee);
 			}
 
@@ -1331,7 +1321,6 @@ e_gw_item_to_cal_component (EGwItem *item, ECalBackendGroupwise *cbgw)
 			e_cal_component_set_dtend (comp, &dt);
 		}
 
-
 		/* alarms*/
 		/* we negate the value as GW supports only "before" the start of event alarms */
 		alarm_duration = 0 - e_gw_item_get_trigger (item);
@@ -1500,7 +1489,6 @@ e_gw_connection_send_appointment (ECalBackendGroupwise *cbgw, const gchar *conta
 			const gchar *email_id;
 			ECalComponentAttendee  *attendee = NULL, *tmp;
 
-
 			e_cal_component_get_attendee_list (comp, &attendee_list);
 			for (l = attendee_list; l; l = g_slist_next (l)) {
 				tmp = (ECalComponentAttendee *) (l->data);
@@ -1661,7 +1649,6 @@ start_freebusy_session (EGwConnection *cnc, GList *users,
 
         soup_soap_message_end_element (msg);
 
-
 	utc = icaltimezone_get_utc_timezone ();
 	icaltime = icaltime_from_timet_with_zone (start, FALSE, utc);
 	start_date = icaltime_as_ical_string_r (icaltime);
@@ -2031,7 +2018,6 @@ e_gw_item_set_changes (EGwItem *item, EGwItem *cache_item)
 	SET_DELTA(message);
 	SET_DELTA(classification);
 
-
 	SET_DELTA(start_date);
 	set_categories_changes (item, cache_item);
 	/*FIXME  recipient_list modifications need go here after server starts
@@ -2063,7 +2049,6 @@ e_gw_item_set_changes (EGwItem *item, EGwItem *cache_item)
 	}
 }
 
-
 static void
 add_return_value (EGwSendOptionsReturnNotify track, ESource *source, const gchar *notify)
 {
diff --git a/calendar/backends/groupwise/e-cal-backend-groupwise-utils.h b/calendar/backends/groupwise/e-cal-backend-groupwise-utils.h
index bfd307f..7dbd605 100644
--- a/calendar/backends/groupwise/e-cal-backend-groupwise-utils.h
+++ b/calendar/backends/groupwise/e-cal-backend-groupwise-utils.h
@@ -33,7 +33,6 @@ G_BEGIN_DECLS
 #define GW_EVENT_TYPE_ID "@4:"
 #define GW_TODO_TYPE_ID "@3:"
 
-
 /* Default reminder */
 #define CALENDAR_CONFIG_PREFIX "/apps/evolution/calendar"
 #define CALENDAR_CONFIG_DEFAULT_REMINDER CALENDAR_CONFIG_PREFIX "/other/use_default_reminder"
@@ -57,7 +56,6 @@ EGwConnectionStatus e_gw_connection_get_freebusy_info (EGwConnection *cnc, GList
 gboolean e_cal_backend_groupwise_store_settings (GwSettings *hold);
 gboolean e_cal_backend_groupwise_utils_check_delegate (ECalComponent *comp, const gchar *email);
 
-
 /*
  * Component related utility functions
  */
diff --git a/calendar/backends/groupwise/e-cal-backend-groupwise.c b/calendar/backends/groupwise/e-cal-backend-groupwise.c
index a447aed..1a0394c 100644
--- a/calendar/backends/groupwise/e-cal-backend-groupwise.c
+++ b/calendar/backends/groupwise/e-cal-backend-groupwise.c
@@ -331,7 +331,6 @@ get_deltas (gpointer handle)
 	const gchar *attempts;
 	const gchar *position;
 
-
 	EGwFilter *filter;
 	gint time_interval;
 	icaltimetype temp;
@@ -598,7 +597,6 @@ get_deltas (gpointer handle)
 		ECalComponent *comp = NULL;
 		icalcomponent *icalcomp = NULL;
 
-
 		comp = e_cal_backend_cache_get_component (cache, (const gchar *) ls->data, NULL);
 
 		if (!comp)
@@ -637,7 +635,6 @@ get_deltas (gpointer handle)
 				sanitize_component (E_CAL_BACKEND_SYNC (cbgw), comp, (gchar *) e_gw_item_get_id (item));
 				e_cal_backend_cache_put_component (priv->cache, comp);
 
-
 				if (kind == icalcomponent_isa (e_cal_component_get_icalcomponent (comp))) {
 					tmp = e_cal_component_get_as_string (comp);
 					e_cal_backend_notify_object_created (E_CAL_BACKEND (cbgw), tmp);
@@ -760,7 +757,6 @@ fetch_deltas (ECalBackendGroupwise *cbgw)
 	return TRUE;
 }
 
-
 static gboolean
 start_fetch_deltas (gpointer data)
 {
@@ -998,7 +994,6 @@ connect_to_server (ECalBackendGroupwise *cbgw)
 			return GNOME_Evolution_Calendar_AuthenticationFailed;
 		}
 
-
 		cbgw->priv->read_only = TRUE;
 
 		if (kind == ICAL_VEVENT_COMPONENT && (permissions & E_GW_PROXY_APPOINTMENT_WRITE) )
@@ -1084,7 +1079,6 @@ connect_to_server (ECalBackendGroupwise *cbgw)
 			return GNOME_Evolution_Calendar_OtherError;
 		}
 
-
 	} else {
 		e_cal_backend_notify_error (E_CAL_BACKEND (cbgw), _("Authentication failed"));
 		return GNOME_Evolution_Calendar_AuthenticationFailed;
@@ -1283,7 +1277,6 @@ e_cal_backend_groupwise_get_static_capabilities (ECalBackendSync *backend, EData
 	return GNOME_Evolution_Calendar_Success;
 }
 
-
 static void
 in_offline (ECalBackendGroupwise *cbgw) {
 	ECalBackendGroupwisePrivate *priv;
@@ -1309,7 +1302,6 @@ in_offline (ECalBackendGroupwise *cbgw) {
 		priv->cnc = NULL;
 	}
 
-
 }
 
 /* Open handler for the file backend */
@@ -2248,7 +2240,6 @@ e_cal_backend_groupwise_modify_object (ECalBackendSync *backend, EDataCal *cal,
 		break;
 	}
 
-
 	*old_object = e_cal_component_get_as_string (cache_comp);
 	g_object_unref (cache_comp);
 	g_object_unref (comp);
@@ -2477,7 +2468,6 @@ change_status (ECalComponent *comp, icalparameter_partstat status, const gchar *
 	gboolean found = FALSE;
 	icalcomponent *icalcomp = e_cal_component_get_icalcomponent (comp);
 
-
 	for (prop = icalcomponent_get_first_property (icalcomp, ICAL_ATTENDEE_PROPERTY);
 			prop;
 			prop = icalcomponent_get_next_property (icalcomp, ICAL_ATTENDEE_PROPERTY)) {
@@ -2713,7 +2703,6 @@ send_object (ECalBackendGroupwise *cbgw, EDataCal *cal, icalcomponent *icalcomp,
 		return GNOME_Evolution_Calendar_ObjectNotFound;
 	}
 
-
 	switch (priv->mode) {
 	case CAL_MODE_ANY :
 	case CAL_MODE_REMOTE :
@@ -2815,7 +2804,6 @@ e_cal_backend_groupwise_send_objects (ECalBackendSync *backend, EDataCal *cal, c
 	return status;
 }
 
-
 /* Object initialization function for the file backend */
 static void
 e_cal_backend_groupwise_init (ECalBackendGroupwise *cbgw, ECalBackendGroupwiseClass *class)
@@ -2883,7 +2871,6 @@ e_cal_backend_groupwise_class_init (ECalBackendGroupwiseClass *class)
 	backend_class->internal_get_timezone = e_cal_backend_groupwise_internal_get_timezone;
 }
 
-
 /**
  * e_cal_backend_groupwise_get_type:
  * @void:
diff --git a/calendar/backends/http/e-cal-backend-http.c b/calendar/backends/http/e-cal-backend-http.c
index 4d64b31..4d6100e 100644
--- a/calendar/backends/http/e-cal-backend-http.c
+++ b/calendar/backends/http/e-cal-backend-http.c
@@ -141,7 +141,6 @@ e_cal_backend_http_finalize (GObject *object)
 		priv->default_zone = NULL;
 	}
 
-
 	if (priv->soup_session) {
 		soup_session_abort (priv->soup_session);
 		g_object_unref (priv->soup_session);
@@ -631,7 +630,6 @@ e_cal_backend_http_open (ECalBackendSync *backend, EDataCal *cal, gboolean only_
 	if (priv->mode == CAL_MODE_LOCAL)
 		return GNOME_Evolution_Calendar_Success;
 
-
 	g_idle_add ((GSourceFunc) begin_retrieval_cb, cbhttp);
 
 	return GNOME_Evolution_Calendar_Success;
@@ -860,7 +858,6 @@ e_cal_backend_http_set_default_zone (ECalBackendSync *backend, EDataCal *cal, co
 	if (!tz_comp)
 		return GNOME_Evolution_Calendar_InvalidObject;
 
-
 	zone = icaltimezone_new ();
 	icaltimezone_set_component (zone, tz_comp);
 
@@ -947,7 +944,6 @@ e_cal_backend_http_start_query (ECalBackend *backend, EDataCalView *query)
 	e_data_cal_view_notify_done (query, GNOME_Evolution_Calendar_Success);
 }
 
-
 static icaltimezone *
 resolve_tzid (const gchar *tzid, gpointer user_data)
 {
@@ -961,7 +957,6 @@ resolve_tzid (const gchar *tzid, gpointer user_data)
         return icalcomponent_get_timezone (vcalendar_comp, tzid);
 }
 
-
 static gboolean
 free_busy_instance (ECalComponent *comp,
                     time_t        instance_start,
@@ -1079,8 +1074,6 @@ create_user_free_busy (ECalBackendHttp *cbhttp, const gchar *address, const gcha
         return vfb;
 }
 
-
-
 /* Get_free_busy handler for the file backend */
 static ECalBackendSyncStatus
 e_cal_backend_http_get_free_busy (ECalBackendSync *backend, EDataCal *cal, GList *users,
@@ -1092,7 +1085,6 @@ e_cal_backend_http_get_free_busy (ECalBackendSync *backend, EDataCal *cal, GList
 	icalcomponent *vfb;
 	gchar *calobj;
 
-
 	cbhttp = E_CAL_BACKEND_HTTP (backend);
 	priv = cbhttp->priv;
 
@@ -1338,7 +1330,6 @@ e_cal_backend_http_class_init (ECalBackendHttpClass *class)
 	backend_class->internal_get_timezone = e_cal_backend_http_internal_get_timezone;
 }
 
-
 /**
  * e_cal_backend_http_get_type:
  * @void:
diff --git a/calendar/backends/weather/e-cal-backend-weather.c b/calendar/backends/weather/e-cal-backend-weather.c
index 5cb4980..58041b3 100644
--- a/calendar/backends/weather/e-cal-backend-weather.c
+++ b/calendar/backends/weather/e-cal-backend-weather.c
@@ -955,7 +955,6 @@ e_cal_backend_weather_class_init (ECalBackendWeatherClass *class)
 	backend_class->internal_get_timezone = e_cal_backend_weather_internal_get_timezone;
 }
 
-
 /**
  * e_cal_backend_weather_get_type:
  * @void:
diff --git a/calendar/libecal/e-cal-check-timezones.c b/calendar/libecal/e-cal-check-timezones.c
index 5fc75e5..0d7012b 100644
--- a/calendar/libecal/e-cal-check-timezones.c
+++ b/calendar/libecal/e-cal-check-timezones.c
@@ -329,7 +329,6 @@ gboolean e_cal_check_timezones(icalcomponent *comp,
                             g_free(fulltzid);
                         }
 
-
                         /*
                          * If the strings are identical, then the
                          * VTIMEZONE definitions are identical.  If
diff --git a/calendar/libecal/e-cal-component.c b/calendar/libecal/e-cal-component.c
index 53ec4d7..ab3e26c 100644
--- a/calendar/libecal/e-cal-component.c
+++ b/calendar/libecal/e-cal-component.c
@@ -37,7 +37,6 @@
 /* Extension property for alarm components so that we can reference them by UID */
 #define EVOLUTION_ALARM_UID_PROPERTY "X-EVOLUTION-ALARM-UID"
 
-
 struct attendee {
 	icalproperty *prop;
 	icalparameter *cutype_param;
@@ -618,7 +617,6 @@ scan_period (ECalComponent *comp, GSList **list, icalproperty *prop)
 	*list = g_slist_append (*list, period);
 }
 
-
 /* Scans an icalrecurtype property */
 static void
 scan_recur_id (ECalComponent *comp, struct recur_id *recur_id, icalproperty *prop)
@@ -1533,7 +1531,6 @@ get_attachment_list (GSList *attachment_list, GSList **al)
 	*al = g_slist_reverse (*al);
 }
 
-
 static void
 set_attachment_list (icalcomponent *icalcomp,
 		   GSList **attachment_list,
@@ -1581,7 +1578,6 @@ set_attachment_list (icalcomponent *icalcomp,
 	*attachment_list = g_slist_reverse (*attachment_list);
 }
 
-
 /**
  * e_cal_component_get_attachment_list:
  * @comp: A calendar component object.
@@ -1738,7 +1734,6 @@ e_cal_component_set_categories (ECalComponent *comp, const gchar *categories)
 	}
 }
 
-
 /**
  * e_cal_component_get_categories_list:
  * @comp: A calendar component object.
@@ -2230,7 +2225,6 @@ e_cal_component_set_completed (ECalComponent *comp, struct icaltimetype *t)
 			  t);
 }
 
-
 /**
  * e_cal_component_get_created:
  * @comp: A calendar component object.
@@ -2410,7 +2404,6 @@ set_datetime (ECalComponent *comp, struct datetime *datetime,
 	}
 }
 
-
 /* This tries to get the DTSTART + DURATION for a VEVENT or VTODO. In a
    VEVENT this is used for the DTEND if no DTEND exists, In a VTOTO it is
    used for the DUE date if DUE doesn't exist. */
@@ -2454,7 +2447,6 @@ e_cal_component_get_start_plus_duration (ECalComponent *comp,
 			 duration.minutes, duration.seconds);
 }
 
-
 /**
  * e_cal_component_get_dtend:
  * @comp: A calendar component object.
@@ -3382,10 +3374,8 @@ e_cal_component_set_organizer (ECalComponent *comp, ECalComponentOrganizer *orga
 		priv->organizer.language_param = NULL;
 	}
 
-
 }
 
-
 /**
  * e_cal_component_has_organizer:
  * @comp: A calendar component object.
@@ -3464,7 +3454,6 @@ e_cal_component_set_percent_as_int (ECalComponent *comp, gint percent)
 		icalcomponent_add_property (priv->icalcomp, priv->percent);
 	}
 
-
 }
 
 gint
@@ -4392,7 +4381,6 @@ e_cal_component_set_transparency (ECalComponent *comp, ECalComponentTransparency
 	priv = comp->priv;
 	g_return_if_fail (priv->icalcomp != NULL);
 
-
 	if (transp == E_CAL_COMPONENT_TRANSP_NONE) {
 		if (priv->transparency) {
 			icalcomponent_remove_property (priv->icalcomp, priv->transparency);
@@ -4542,7 +4530,6 @@ get_attendee_list (GSList *attendee_list, GSList **al)
 	*al = g_slist_reverse (*al);
 }
 
-
 /* Sets a text list value */
 static void
 set_attendee_list (icalcomponent *icalcomp,
@@ -5151,7 +5138,6 @@ e_cal_component_remove_all_alarms (ECalComponent *comp)
 	g_hash_table_foreach_remove (priv->alarm_uid_hash, for_each_remove_all_alarms, comp);
 }
 
-
 /* Scans an icalproperty from a calendar component and adds its mapping to our
  * own alarm structure.
  */
@@ -5955,7 +5941,6 @@ e_cal_component_alarm_has_attendees (ECalComponentAlarm *alarm)
 	return FALSE;
 }
 
-
 /**
  * e_cal_component_alarm_get_icalcomponent
  * @alarm: An alarm.
@@ -5986,7 +5971,6 @@ e_cal_component_strings_match	(const gchar	*string1,
 	return FALSE;
 }
 
-
 /**
  * e_cal_component_event_dates_match:
  * @comp1: A calendar component object.
@@ -6060,4 +6044,3 @@ e_cal_component_event_dates_match	(ECalComponent *comp1,
 	return retval;
 }
 
-
diff --git a/calendar/libecal/e-cal-component.h b/calendar/libecal/e-cal-component.h
index 2d2ad22..cfa88c5 100644
--- a/calendar/libecal/e-cal-component.h
+++ b/calendar/libecal/e-cal-component.h
@@ -337,10 +337,8 @@ void e_cal_component_set_attachment_list (ECalComponent *comp, GSList *attachmen
 gboolean e_cal_component_has_attachments (ECalComponent *comp);
 gint e_cal_component_get_num_attachments (ECalComponent *comp);
 
-
 gboolean e_cal_component_event_dates_match (ECalComponent *comp1, ECalComponent *comp2);
 
-
 /* Functions to free returned values */
 
 void e_cal_component_free_categories_list (GSList *categ_list);
diff --git a/calendar/libecal/e-cal-recur.c b/calendar/libecal/e-cal-recur.c
index 9742de2..637e228 100644
--- a/calendar/libecal/e-cal-recur.c
+++ b/calendar/libecal/e-cal-recur.c
@@ -31,7 +31,6 @@
 #include "e-cal-recur.h"
 #include "e-cal-time-util.h"
 
-
 /*
  * Introduction to The Recurrence Generation Functions:
  *
@@ -131,7 +130,6 @@ typedef struct {
 	/* WKST property - the week start day: 0 = Monday to 6 = Sunday. */
 	gint	       week_start_day;
 
-
 	/* NOTE: I've used GList's here, but it doesn't matter if we use
 	   other data structures like arrays. The code should be easy to
 	   change. So long as it is easy to see if the modifier is set. */
@@ -254,7 +252,6 @@ struct _ECalRecurVTable {
 	CalObjFilterFn bysecond_filter;
 };
 
-
 /* This is used to specify which parts of the CalObjTime to compare in
    cal_obj_time_compare(). */
 typedef enum {
@@ -283,7 +280,6 @@ static ECalRecurrence * e_cal_recur_from_icalproperty (icalproperty *prop,
 static gint e_cal_recur_ical_weekday_to_weekday	(enum icalrecurrencetype_weekday day);
 static void	e_cal_recur_free			(ECalRecurrence	*r);
 
-
 static gboolean cal_object_get_rdate_end	(CalObjTime	*occ,
 						 GArray		*rdate_periods,
 						 icaltimezone	*zone);
@@ -327,7 +323,6 @@ static GArray*	cal_obj_generate_set_default	(RecurData	*recur_data,
 						 ECalRecurVTable *vtable,
 						 CalObjTime	*occ);
 
-
 static ECalRecurVTable* cal_obj_get_vtable	(icalrecurrencetype_frequency recur_type);
 static void	cal_obj_initialize_recur_data	(RecurData	*recur_data,
 						 ECalRecurrence	*recur,
@@ -341,7 +336,6 @@ static void	cal_obj_remove_exceptions	(GArray		*occs,
 static GArray*	cal_obj_bysetpos_filter		(ECalRecurrence	*recur,
 						 GArray		*occs);
 
-
 static gboolean cal_obj_yearly_find_start_position (CalObjTime *event_start,
 						    CalObjTime *event_end,
 						    RecurData  *recur_data,
@@ -484,8 +478,6 @@ static void cal_object_time_from_time		(CalObjTime *cotime,
 static gint cal_obj_date_only_compare_func	(gconstpointer arg1,
 						 gconstpointer arg2);
 
-
-
 static gboolean e_cal_recur_ensure_end_dates	(ECalComponent	*comp,
 						 gboolean	 refresh,
 						 ECalRecurResolveTimezoneFn tz_cb,
@@ -505,12 +497,10 @@ static time_t e_cal_recur_get_rule_end_date	(icalproperty	*prop,
 static void e_cal_recur_set_rule_end_date		(icalproperty	*prop,
 						 time_t		 end_date);
 
-
 #ifdef CAL_OBJ_DEBUG
 static gchar * cal_obj_time_to_string		(CalObjTime	*cotime);
 #endif
 
-
 static ECalRecurVTable cal_obj_yearly_vtable = {
 	cal_obj_yearly_find_start_position,
 	cal_obj_yearly_find_next_position,
@@ -658,7 +648,6 @@ e_cal_recur_generate_instances (ECalComponent		*comp,
 						default_timezone);
 }
 
-
 /*
  * Calls the given callback function for each occurrence of the given
  * recurrence rule between the given start and end times. If the rule is NULL
@@ -1041,7 +1030,6 @@ e_cal_recur_from_icalproperty (icalproperty *prop, gboolean exception,
 	return r;
 }
 
-
 static gint
 e_cal_recur_ical_weekday_to_weekday	(enum icalrecurrencetype_weekday day)
 {
@@ -1079,7 +1067,6 @@ e_cal_recur_ical_weekday_to_weekday	(enum icalrecurrencetype_weekday day)
 	return weekday;
 }
 
-
 /**
  * e_cal_recur_free:
  * @r: A #ECalRecurrence structure.
@@ -1290,7 +1277,6 @@ generate_instances_for_chunk (ECalComponent	*comp,
 		g_array_append_val (ex_occs, cotime);
 	}
 
-
 	/* Sort all the arrays. */
 	cal_obj_sort_occurrences (occs);
 	cal_obj_sort_occurrences (ex_occs);
@@ -1394,7 +1380,6 @@ generate_instances_for_chunk (ECalComponent	*comp,
 	return cb_status && !finished;
 }
 
-
 /* This looks up the occurrence time in the sorted rdate_periods array, and
    tries to compute the end time of the occurrence. If no end time or duration
    is set it returns FALSE and the default duration will be used. */
@@ -1454,7 +1439,6 @@ cal_object_get_rdate_end	(CalObjTime	*occ,
 	return TRUE;
 }
 
-
 static void
 cal_object_compute_duration (CalObjTime *start,
 			     CalObjTime *end,
@@ -1483,7 +1467,6 @@ cal_object_compute_duration (CalObjTime *start,
 	}
 }
 
-
 /* Returns an unsorted GArray of CalObjTime's resulting from expanding the
    given recurrence rule within the given interval. Note that it doesn't
    clip the generated occurrences to the interval, i.e. if the interval
@@ -1597,7 +1580,6 @@ cal_obj_expand_recurrence		(CalObjTime	  *event_start,
 	return all_occs;
 }
 
-
 static GArray*
 cal_obj_generate_set_yearly	(RecurData *recur_data,
 				 ECalRecurVTable *vtable,
@@ -1725,7 +1707,6 @@ cal_obj_generate_set_yearly	(RecurData *recur_data,
 	return occs;
 }
 
-
 static GArray*
 cal_obj_generate_set_monthly	(RecurData *recur_data,
 				 ECalRecurVTable *vtable,
@@ -1764,7 +1745,6 @@ cal_obj_generate_set_monthly	(RecurData *recur_data,
 	return occs;
 }
 
-
 static GArray*
 cal_obj_generate_set_default	(RecurData *recur_data,
 				 ECalRecurVTable *vtable,
@@ -1798,8 +1778,6 @@ cal_obj_generate_set_default	(RecurData *recur_data,
 	return occs;
 }
 
-
-
 /* Returns the function table corresponding to the recurrence frequency. */
 static ECalRecurVTable* cal_obj_get_vtable (icalrecurrencetype_frequency recur_type)
 {
@@ -1835,7 +1813,6 @@ static ECalRecurVTable* cal_obj_get_vtable (icalrecurrencetype_frequency recur_t
 	return vtable;
 }
 
-
 /* This creates a number of fast lookup tables used when filtering with the
    modifier properties BYMONTH, BYYEARDAY etc. */
 static void
@@ -1927,7 +1904,6 @@ cal_obj_initialize_recur_data (RecurData  *recur_data,
 	}
 }
 
-
 static void
 cal_obj_sort_occurrences (GArray *occs)
 {
@@ -1935,7 +1911,6 @@ cal_obj_sort_occurrences (GArray *occs)
 	       cal_obj_time_compare_func);
 }
 
-
 static void
 cal_obj_remove_duplicates_and_invalid_dates (GArray *occs)
 {
@@ -1983,7 +1958,6 @@ cal_obj_remove_duplicates_and_invalid_dates (GArray *occs)
 	g_array_set_size (occs, j);
 }
 
-
 /* Removes the exceptions from the ex_occs array from the occurrences in the
    occs array, and removes any duplicates. Both arrays are sorted. */
 static void
@@ -2085,8 +2059,6 @@ cal_obj_remove_exceptions (GArray *occs,
 	g_array_set_size (occs, j);
 }
 
-
-
 static GArray*
 cal_obj_bysetpos_filter (ECalRecurrence *recur,
 			 GArray	    *occs)
@@ -2130,9 +2102,6 @@ cal_obj_bysetpos_filter (ECalRecurrence *recur,
 	return new_occs;
 }
 
-
-
-
 /* Finds the first year from the event_start, counting in multiples of the
    recurrence interval, that intersects the given interval. It returns TRUE
    if there is no intersection. */
@@ -2163,7 +2132,6 @@ cal_obj_yearly_find_start_position (CalObjTime *event_start,
 	return FALSE;
 }
 
-
 static gboolean
 cal_obj_yearly_find_next_position (CalObjTime *cotime,
 				   CalObjTime *event_end,
@@ -2180,8 +2148,6 @@ cal_obj_yearly_find_next_position (CalObjTime *cotime,
 	return FALSE;
 }
 
-
-
 static gboolean
 cal_obj_monthly_find_start_position (CalObjTime *event_start,
 				     CalObjTime *event_end,
@@ -2213,7 +2179,6 @@ cal_obj_monthly_find_start_position (CalObjTime *event_start,
 	return FALSE;
 }
 
-
 static gboolean
 cal_obj_monthly_find_next_position (CalObjTime *cotime,
 				    CalObjTime *event_end,
@@ -2233,8 +2198,6 @@ cal_obj_monthly_find_next_position (CalObjTime *cotime,
 	return FALSE;
 }
 
-
-
 static gboolean
 cal_obj_weekly_find_start_position (CalObjTime *event_start,
 				    CalObjTime *event_end,
@@ -2297,7 +2260,6 @@ cal_obj_weekly_find_start_position (CalObjTime *event_start,
 	return FALSE;
 }
 
-
 static gboolean
 cal_obj_weekly_find_next_position (CalObjTime *cotime,
 				   CalObjTime *event_end,
@@ -2333,7 +2295,6 @@ cal_obj_weekly_find_next_position (CalObjTime *cotime,
 	return FALSE;
 }
 
-
 static gboolean
 cal_obj_daily_find_start_position  (CalObjTime *event_start,
 				    CalObjTime *event_end,
@@ -2383,7 +2344,6 @@ cal_obj_daily_find_start_position  (CalObjTime *event_start,
 	return FALSE;
 }
 
-
 static gboolean
 cal_obj_daily_find_next_position  (CalObjTime *cotime,
 				   CalObjTime *event_end,
@@ -2402,7 +2362,6 @@ cal_obj_daily_find_next_position  (CalObjTime *cotime,
 	return FALSE;
 }
 
-
 static gboolean
 cal_obj_hourly_find_start_position (CalObjTime *event_start,
 				    CalObjTime *event_end,
@@ -2455,7 +2414,6 @@ cal_obj_hourly_find_start_position (CalObjTime *event_start,
 	return FALSE;
 }
 
-
 static gboolean
 cal_obj_hourly_find_next_position (CalObjTime *cotime,
 				   CalObjTime *event_end,
@@ -2474,7 +2432,6 @@ cal_obj_hourly_find_next_position (CalObjTime *cotime,
 	return FALSE;
 }
 
-
 static gboolean
 cal_obj_minutely_find_start_position (CalObjTime *event_start,
 				      CalObjTime *event_end,
@@ -2529,7 +2486,6 @@ cal_obj_minutely_find_start_position (CalObjTime *event_start,
 	return FALSE;
 }
 
-
 static gboolean
 cal_obj_minutely_find_next_position (CalObjTime *cotime,
 				     CalObjTime *event_end,
@@ -2548,7 +2504,6 @@ cal_obj_minutely_find_next_position (CalObjTime *cotime,
 	return FALSE;
 }
 
-
 static gboolean
 cal_obj_secondly_find_start_position (CalObjTime *event_start,
 				      CalObjTime *event_end,
@@ -2605,7 +2560,6 @@ cal_obj_secondly_find_start_position (CalObjTime *event_start,
 	return FALSE;
 }
 
-
 static gboolean
 cal_obj_secondly_find_next_position (CalObjTime *cotime,
 				     CalObjTime *event_end,
@@ -2624,10 +2578,6 @@ cal_obj_secondly_find_next_position (CalObjTime *cotime,
 	return FALSE;
 }
 
-
-
-
-
 /* If the BYMONTH rule is specified it expands each occurrence in occs, by
    using each of the months in the bymonth list. */
 static GArray*
@@ -2664,7 +2614,6 @@ cal_obj_bymonth_expand		(RecurData  *recur_data,
 	return new_occs;
 }
 
-
 /* If the BYMONTH rule is specified it filters out all occurrences in occs
    which do not match one of the months in the bymonth list. */
 static GArray*
@@ -2694,8 +2643,6 @@ cal_obj_bymonth_filter		(RecurData  *recur_data,
 	return new_occs;
 }
 
-
-
 static GArray*
 cal_obj_byweekno_expand		(RecurData  *recur_data,
 				 GArray     *occs)
@@ -2756,7 +2703,6 @@ cal_obj_byweekno_expand		(RecurData  *recur_data,
 	return new_occs;
 }
 
-
 #if 0
 /* This isn't used at present. */
 static GArray*
@@ -2768,7 +2714,6 @@ cal_obj_byweekno_filter		(RecurData  *recur_data,
 }
 #endif
 
-
 static GArray*
 cal_obj_byyearday_expand	(RecurData  *recur_data,
 				 GArray     *occs)
@@ -2826,7 +2771,6 @@ cal_obj_byyearday_expand	(RecurData  *recur_data,
 	return new_occs;
 }
 
-
 /* Note: occs must not contain invalid dates, e.g. 31st September. */
 static GArray*
 cal_obj_byyearday_filter	(RecurData  *recur_data,
@@ -2863,8 +2807,6 @@ cal_obj_byyearday_filter	(RecurData  *recur_data,
 	return new_occs;
 }
 
-
-
 static GArray*
 cal_obj_bymonthday_expand	(RecurData  *recur_data,
 				 GArray     *occs)
@@ -2925,7 +2867,6 @@ cal_obj_bymonthday_expand	(RecurData  *recur_data,
 	return new_occs;
 }
 
-
 static GArray*
 cal_obj_bymonthday_filter	(RecurData  *recur_data,
 				 GArray     *occs)
@@ -2960,8 +2901,6 @@ cal_obj_bymonthday_filter	(RecurData  *recur_data,
 	return new_occs;
 }
 
-
-
 static GArray*
 cal_obj_byday_expand_yearly	(RecurData  *recur_data,
 				 GArray     *occs)
@@ -3038,7 +2977,6 @@ cal_obj_byday_expand_yearly	(RecurData  *recur_data,
 	return new_occs;
 }
 
-
 static GArray*
 cal_obj_byday_expand_monthly	(RecurData  *recur_data,
 				 GArray     *occs)
@@ -3125,7 +3063,6 @@ cal_obj_byday_expand_monthly	(RecurData  *recur_data,
 	return new_occs;
 }
 
-
 /* Note: occs must not contain invalid dates, e.g. 31st September. */
 static GArray*
 cal_obj_byday_expand_weekly	(RecurData  *recur_data,
@@ -3171,7 +3108,6 @@ cal_obj_byday_expand_weekly	(RecurData  *recur_data,
 	return new_occs;
 }
 
-
 /* Note: occs must not contain invalid dates, e.g. 31st September. */
 static GArray*
 cal_obj_byday_filter		(RecurData  *recur_data,
@@ -3203,8 +3139,6 @@ cal_obj_byday_filter		(RecurData  *recur_data,
 	return new_occs;
 }
 
-
-
 /* If the BYHOUR rule is specified it expands each occurrence in occs, by
    using each of the hours in the byhour list. */
 static GArray*
@@ -3240,7 +3174,6 @@ cal_obj_byhour_expand		(RecurData  *recur_data,
 	return new_occs;
 }
 
-
 /* If the BYHOUR rule is specified it filters out all occurrences in occs
    which do not match one of the hours in the byhour list. */
 static GArray*
@@ -3270,8 +3203,6 @@ cal_obj_byhour_filter		(RecurData  *recur_data,
 	return new_occs;
 }
 
-
-
 /* If the BYMINUTE rule is specified it expands each occurrence in occs, by
    using each of the minutes in the byminute list. */
 static GArray*
@@ -3307,7 +3238,6 @@ cal_obj_byminute_expand		(RecurData  *recur_data,
 	return new_occs;
 }
 
-
 /* If the BYMINUTE rule is specified it filters out all occurrences in occs
    which do not match one of the minutes in the byminute list. */
 static GArray*
@@ -3337,8 +3267,6 @@ cal_obj_byminute_filter		(RecurData  *recur_data,
 	return new_occs;
 }
 
-
-
 /* If the BYSECOND rule is specified it expands each occurrence in occs, by
    using each of the seconds in the bysecond list. */
 static GArray*
@@ -3374,7 +3302,6 @@ cal_obj_bysecond_expand		(RecurData  *recur_data,
 	return new_occs;
 }
 
-
 /* If the BYSECOND rule is specified it filters out all occurrences in occs
    which do not match one of the seconds in the bysecond list. */
 static GArray*
@@ -3404,10 +3331,6 @@ cal_obj_bysecond_filter		(RecurData  *recur_data,
 	return new_occs;
 }
 
-
-
-
-
 /* Adds a positive or negative number of months to the given CalObjTime,
    updating the year appropriately so we end up with a valid month.
    Note that the day may be invalid, e.g. 30th Feb. */
@@ -3432,7 +3355,6 @@ cal_obj_time_add_months		(CalObjTime *cotime,
 	}
 }
 
-
 /* Adds a positive or negative number of days to the given CalObjTime,
    updating the month and year appropriately so we end up with a valid day. */
 static void
@@ -3480,7 +3402,6 @@ cal_obj_time_add_days		(CalObjTime *cotime,
 	}
 }
 
-
 /* Adds a positive or negative number of hours to the given CalObjTime,
    updating the day, month & year appropriately so we end up with a valid
    time. */
@@ -3506,7 +3427,6 @@ cal_obj_time_add_hours		(CalObjTime *cotime,
 	}
 }
 
-
 /* Adds a positive or negative number of minutes to the given CalObjTime,
    updating the rest of the CalObjTime appropriately. */
 static void
@@ -3531,7 +3451,6 @@ cal_obj_time_add_minutes	(CalObjTime *cotime,
 	}
 }
 
-
 /* Adds a positive or negative number of seconds to the given CalObjTime,
    updating the rest of the CalObjTime appropriately. */
 static void
@@ -3556,7 +3475,6 @@ cal_obj_time_add_seconds	(CalObjTime *cotime,
 	}
 }
 
-
 /* Compares 2 CalObjTimes. Returns -1 if the cotime1 is before cotime2, 0 if
    they are the same, or 1 if cotime1 is after cotime2. The comparison type
    specifies which parts of the times we are interested in, e.g. if CALOBJ_DAY
@@ -3614,7 +3532,6 @@ cal_obj_time_compare		(CalObjTime *cotime1,
 	return 0;
 }
 
-
 /* This is the same as the above function, but without the comparison type.
    It is used for qsort(). */
 static gint
@@ -3668,7 +3585,6 @@ cal_obj_time_compare_func (gconstpointer arg1,
 	return retval;
 }
 
-
 static gint
 cal_obj_date_only_compare_func (gconstpointer arg1,
 				gconstpointer arg2)
@@ -3696,7 +3612,6 @@ cal_obj_date_only_compare_func (gconstpointer arg1,
 	return 0;
 }
 
-
 /* Returns the weekday of the given CalObjTime, from 0 (Mon) - 6 (Sun). */
 static gint
 cal_obj_time_weekday		(CalObjTime *cotime)
@@ -3713,7 +3628,6 @@ cal_obj_time_weekday		(CalObjTime *cotime)
 	return weekday;
 }
 
-
 /* Returns the weekday of the given CalObjTime, from 0 - 6. The week start
    day is Monday by default, but can be set in the recurrence rule. */
 static gint
@@ -3738,7 +3652,6 @@ cal_obj_time_weekday_offset	(CalObjTime *cotime,
 	return offset;
 }
 
-
 /* Returns the day of the year of the given CalObjTime, from 1 - 366. */
 static gint
 cal_obj_time_day_of_year		(CalObjTime *cotime)
@@ -3751,7 +3664,6 @@ cal_obj_time_day_of_year		(CalObjTime *cotime)
 	return g_date_get_day_of_year (&date);
 }
 
-
 /* Finds the first week in the given CalObjTime's year, using the same weekday
    as the event start day (i.e. from the RecurData).
    The first week of the year is the first week starting from the specified
@@ -3791,7 +3703,6 @@ cal_obj_time_find_first_week	(CalObjTime *cotime,
 	cal_obj_time_add_days (cotime, offset);
 }
 
-
 static void
 cal_object_time_from_time	(CalObjTime	*cotime,
 				 time_t		 t,
@@ -3813,7 +3724,6 @@ cal_object_time_from_time	(CalObjTime	*cotime,
 	cotime->flags    = FALSE;
 }
 
-
 /* Debugging function to convert a CalObjTime to a string. It uses a static
    buffer so beware. */
 #ifdef CAL_OBJ_DEBUG
@@ -3835,7 +3745,6 @@ cal_obj_time_to_string		(CalObjTime	*cotime)
 }
 #endif
 
-
 /* This recalculates the end dates for recurrence & exception rules which use
    the COUNT property. If refresh is TRUE it will recalculate all enddates
    for rules which use COUNT. If refresh is FALSE, it will only calculate
@@ -3871,7 +3780,6 @@ e_cal_recur_ensure_end_dates (ECalComponent	*comp,
 	return changed;
 }
 
-
 typedef struct _ECalRecurEnsureEndDateData ECalRecurEnsureEndDateData;
 struct _ECalRecurEnsureEndDateData {
 	gint count;
@@ -3879,7 +3787,6 @@ struct _ECalRecurEnsureEndDateData {
 	time_t end_date;
 };
 
-
 static gboolean
 e_cal_recur_ensure_rule_end_date (ECalComponent			*comp,
 				icalproperty			*prop,
@@ -3927,7 +3834,6 @@ e_cal_recur_ensure_rule_end_date (ECalComponent			*comp,
 	return TRUE;
 }
 
-
 static gboolean
 e_cal_recur_ensure_rule_end_date_cb	(ECalComponent	*comp,
 					 time_t		 instance_start,
@@ -3948,7 +3854,6 @@ e_cal_recur_ensure_rule_end_date_cb	(ECalComponent	*comp,
 	return TRUE;
 }
 
-
 /* If default_timezone is set, the saved ENDDATE parameter is assumed to be
    in that timezone. This is used when the DTSTART is a DATE or floating
    value, since the RRULE end date will change depending on the timezone that
@@ -3988,7 +3893,6 @@ e_cal_recur_get_rule_end_date	(icalproperty	*prop,
 	return -1;
 }
 
-
 static void
 e_cal_recur_set_rule_end_date	(icalproperty	*prop,
 				 time_t		 end_date)
diff --git a/calendar/libecal/e-cal-system-timezone.c b/calendar/libecal/e-cal-system-timezone.c
index 3ca2724..c939d81 100644
--- a/calendar/libecal/e-cal-system-timezone.c
+++ b/calendar/libecal/e-cal-system-timezone.c
@@ -266,7 +266,6 @@ recursive_compare (struct stat  *localtime_stat,
 	return NULL;
 }
 
-
 static gboolean
 files_are_identical_inode (struct stat *a_stat,
 			   struct stat *b_stat,
@@ -277,7 +276,6 @@ files_are_identical_inode (struct stat *a_stat,
 	return (a_stat->st_ino == b_stat->st_ino);
 }
 
-
 /* Determine if /etc/localtime is a hard link to some file, by looking at
  * the inodes */
 static gchar *
diff --git a/calendar/libecal/e-cal-time-util.c b/calendar/libecal/e-cal-time-util.c
index 1120620..f01076b 100644
--- a/calendar/libecal/e-cal-time-util.c
+++ b/calendar/libecal/e-cal-time-util.c
@@ -28,15 +28,12 @@
 #define SATURDAY 6		/* Offset value; 1 Jan 1 was a Saturday */
 #define ISODATE_LENGTH 17 /* 4+2+2+1+2+2+2+1 + 1 */
 
-
 /* Number of days in a month, using 0 (Jan) to 11 (Dec). For leap years,
    add 1 to February (month 1). */
 static const gint days_in_month[12] = {
 	31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31
 };
 
-
-
 /**************************************************************************
  * time_t manipulation functions.
  *
@@ -128,7 +125,6 @@ time_day_end (time_t t)
 	return mktime (&tm);
 }
 
-
 /**************************************************************************
  * time_t manipulation functions, using timezones in libical.
  *
@@ -137,7 +133,6 @@ time_day_end (time_t t)
  * time_t values wherever possible.
  **************************************************************************/
 
-
 /**
  * time_add_day_with_zone:
  * @time: A time_t value.
@@ -167,7 +162,6 @@ time_add_day_with_zone (time_t time, gint days, icaltimezone *zone)
 	return icaltime_as_timet_with_zone (tt, zone);
 }
 
-
 /**
  * time_add_week_with_zone:
  * @time: A time_t value.
@@ -188,7 +182,6 @@ time_add_week_with_zone (time_t time, gint weeks, icaltimezone *zone)
 	return time_add_day_with_zone (time, weeks * 7, zone);
 }
 
-
 /**
  * time_add_month_with_zone:
  * @time: A time_t value.
@@ -239,7 +232,6 @@ time_add_month_with_zone (time_t time, gint months, icaltimezone *zone)
 	return icaltime_as_timet_with_zone (tt, zone);
 }
 
-
 /**
  * time_year_begin_with_zone:
  * @time: A time_t value.
@@ -272,7 +264,6 @@ time_year_begin_with_zone (time_t time, icaltimezone *zone)
 	return icaltime_as_timet_with_zone (tt, zone);
 }
 
-
 /**
  * time_month_begin_with_zone:
  * @time: A time_t value.
@@ -304,7 +295,6 @@ time_month_begin_with_zone (time_t time, icaltimezone *zone)
 	return icaltime_as_timet_with_zone (tt, zone);
 }
 
-
 /**
  * time_week_begin_with_zone:
  * @time: A time_t value.
@@ -348,7 +338,6 @@ time_week_begin_with_zone (time_t time, gint week_start_day, icaltimezone *zone)
 	return icaltime_as_timet_with_zone (tt, zone);
 }
 
-
 /**
  * time_day_begin_with_zone:
  * @time: A time_t value.
@@ -379,7 +368,6 @@ time_day_begin_with_zone (time_t time, icaltimezone *zone)
 	return icaltime_as_timet_with_zone (tt, zone);
 }
 
-
 /**
  * time_day_end_with_zone:
  * @time: A time_t value.
@@ -438,12 +426,10 @@ time_to_gdate_with_zone (GDate *date, time_t time, icaltimezone *zone)
 	g_date_set_dmy (date, tt.day, tt.month, tt.year);
 }
 
-
 /**************************************************************************
  * General time functions.
  **************************************************************************/
 
-
 /**
  * time_days_in_month:
  * @year: The year.
@@ -469,7 +455,6 @@ time_days_in_month (gint year, gint month)
 	return days;
 }
 
-
 /**
  * time_day_of_year:
  * @day: The day.
@@ -496,7 +481,6 @@ time_day_of_year (gint day, gint month, gint year)
 	return day;
 }
 
-
 /**
  * time_day_of_week:
  * @day: The day.
@@ -526,7 +510,6 @@ time_day_of_week (gint day, gint month, gint year)
 	return THURSDAY;
 }
 
-
 /**
  * time_is_leap_year:
  * @year: The year.
@@ -545,7 +528,6 @@ time_is_leap_year (gint year)
 		return (!(year % 4) && (year % 100)) || !(year % 400);
 }
 
-
 /**
  * time_leap_years_up_to:
  * @year: The year.
@@ -566,7 +548,6 @@ time_leap_years_up_to (gint year)
 		+ ((year > 1600) ? ((year - 1600) / 400) : 0));
 }
 
-
 /**
  * isodate_from_time_t:
  * @t: A time value.
diff --git a/calendar/libecal/e-cal-time-util.h b/calendar/libecal/e-cal-time-util.h
index 6f36eee..3e1f01d 100644
--- a/calendar/libecal/e-cal-time-util.h
+++ b/calendar/libecal/e-cal-time-util.h
@@ -11,7 +11,6 @@
 #ifndef TIMEUTIL_H
 #define TIMEUTIL_H
 
-
 #include <time.h>
 #include <libical/ical.h>
 #include <glib.h>
@@ -48,7 +47,6 @@ gint	time_leap_years_up_to	(gint year);
 gchar   *isodate_from_time_t     (time_t t);
 time_t	time_from_isodate	(const gchar *str);
 
-
 /**************************************************************************
  * time_t manipulation functions.
  *
@@ -65,7 +63,6 @@ time_t	time_add_week		(time_t time, gint weeks);
 time_t	time_day_begin		(time_t t);
 time_t	time_day_end		(time_t t);
 
-
 /**************************************************************************
  * time_t manipulation functions, using timezones in libical.
  *
diff --git a/calendar/libecal/e-cal-util.c b/calendar/libecal/e-cal-util.c
index 6451176..e4eefb0 100644
--- a/calendar/libecal/e-cal-util.c
+++ b/calendar/libecal/e-cal-util.c
@@ -664,7 +664,6 @@ e_cal_util_generate_alarms_for_list (GList *comps,
 	return n;
 }
 
-
 /**
  * e_cal_util_priority_to_string:
  * @priority: Priority value.
@@ -694,7 +693,6 @@ e_cal_util_priority_to_string (gint priority)
 	return retval;
 }
 
-
 /**
  * e_cal_util_priority_from_string:
  * @string: A string representing the PRIORITY value.
@@ -952,8 +950,6 @@ e_cal_util_event_dates_match (icalcomponent *icalcomp1, icalcomponent *icalcomp2
 			return FALSE;
 	}
 
-
-
 	/* now match the timezones */
 	if (!(!c1_dtstart.zone && !c2_dtstart.zone) ||
 	    (c1_dtstart.zone && c2_dtstart.zone &&
diff --git a/calendar/libecal/e-cal.c b/calendar/libecal/e-cal.c
index c514aa4..15bf036 100644
--- a/calendar/libecal/e-cal.c
+++ b/calendar/libecal/e-cal.c
@@ -42,7 +42,6 @@
 #include "e-cal-view-private.h"
 #include "e-cal.h"
 
-
 static gboolean
 open_calendar (ECal *ecal, gboolean only_if_exists, GError **error, ECalendarStatus *status, gboolean needs_auth);
 
@@ -279,8 +278,6 @@ cal_mode_enum_get_type (void)
 	return cal_mode_enum_type;
 }
 
-
-
 static GNOME_Evolution_Calendar_CalObjType
 convert_type (ECalSourceType type)
 {
@@ -1024,7 +1021,6 @@ get_factories (const gchar *str_uri, GList **factories)
 
 	query = "repo_ids.has ('IDL:GNOME/Evolution/DataServer/CalFactory:" API_VERSION "')";
 
-
 	servers = bonobo_activation_query (query, NULL, NULL);
 
 	e_uri_free (uri);
@@ -1271,7 +1267,6 @@ e_cal_get_type (void)
 	return e_cal_type;
 }
 
-
 static gboolean
 fetch_corba_cal (ECal *ecal, ESource *source, ECalSourceType type)
 {
@@ -1342,7 +1337,6 @@ e_cal_activate (void)
 	g_static_mutex_unlock (&e_cal_lock);
 }
 
-
 /* TODO - For now, the policy of where each backend serializes its
  * attachment data is hardcoded below. Should this end up as a
  * gconf key set during the account creation  and fetched
@@ -1731,7 +1725,6 @@ open_calendar (ECal *ecal, gboolean only_if_exists, GError **error, ECalendarSta
 		g_free (key);
 	}
 
-
 	CORBA_exception_init (&ev);
 
 	priv->load_state = E_CAL_LOAD_LOADING;
@@ -1919,7 +1912,6 @@ e_cal_remove (ECal *ecal, GError **error)
 
 	g_mutex_unlock (ecal->priv->mutex);
 
-
 	CORBA_exception_init (&ev);
 
 	GNOME_Evolution_Calendar_Cal_remove (priv->cal, &ev);
@@ -2178,7 +2170,6 @@ get_read_only (ECal *ecal, gboolean *read_only, GError **error)
 
 	g_mutex_unlock (ecal->priv->mutex);
 
-
 	CORBA_exception_init (&ev);
 
 	GNOME_Evolution_Calendar_Cal_isReadOnly (priv->cal, &ev);
@@ -2226,7 +2217,6 @@ e_cal_get_cal_address (ECal *ecal, gchar **cal_address, GError **error)
 	ECalendarStatus status;
 	ECalendarOp *our_op;
 
-
 	if (!(ecal && E_IS_CAL (ecal)))
 		E_CALENDAR_CHECK_STATUS (E_CALENDAR_STATUS_INVALID_ARG, error);
 	priv = ecal->priv;
@@ -2247,7 +2237,6 @@ e_cal_get_cal_address (ECal *ecal, gchar **cal_address, GError **error)
 
 		g_mutex_unlock (ecal->priv->mutex);
 
-
 		CORBA_exception_init (&ev);
 
 		GNOME_Evolution_Calendar_Cal_getCalAddress (priv->cal, &ev);
@@ -2318,7 +2307,6 @@ e_cal_get_alarm_email_address (ECal *ecal, gchar **alarm_address, GError **error
 
 	g_mutex_unlock (ecal->priv->mutex);
 
-
 	CORBA_exception_init (&ev);
 
 	GNOME_Evolution_Calendar_Cal_getAlarmEmailAddress (priv->cal, &ev);
@@ -2385,7 +2373,6 @@ e_cal_get_ldap_attribute (ECal *ecal, gchar **ldap_attribute, GError **error)
 
 	g_mutex_unlock (ecal->priv->mutex);
 
-
 	CORBA_exception_init (&ev);
 
 	GNOME_Evolution_Calendar_Cal_getLdapAttribute (priv->cal, &ev);
@@ -2442,7 +2429,6 @@ load_static_capabilities (ECal *ecal, GError **error)
 
 	g_mutex_unlock (ecal->priv->mutex);
 
-
 	CORBA_exception_init (&ev);
 
 	GNOME_Evolution_Calendar_Cal_getStaticCapabilities (priv->cal, &ev);
@@ -3149,7 +3135,6 @@ e_cal_get_object_list (ECal *ecal, const gchar *query, GList **objects, GError *
 	ECalendarOp *our_op;
 	ECalendarStatus status;
 
-
 	e_return_error_if_fail (ecal && E_IS_CAL (ecal), E_CALENDAR_STATUS_INVALID_ARG);
 	e_return_error_if_fail (query, E_CALENDAR_STATUS_INVALID_ARG);
 
@@ -4161,7 +4146,6 @@ append_timezone_string (gpointer key, gpointer value, gpointer data)
 	g_free (value);
 }
 
-
 /* This simply frees the hash values. */
 static void
 free_timezone_string (gpointer key, gpointer value, gpointer data)
@@ -4169,7 +4153,6 @@ free_timezone_string (gpointer key, gpointer value, gpointer data)
 	g_free (value);
 }
 
-
 /* This converts the VEVENT/VTODO to a string. If include_all_timezones is
    TRUE, it includes all the VTIMEZONE components needed for the VEVENT/VTODO.
    If not, it only includes builtin timezones that may not be on the server.
@@ -4464,7 +4447,6 @@ e_cal_remove_object_with_mod (ECal *ecal, const gchar *uid,
 
 	g_mutex_unlock (ecal->priv->mutex);
 
-
 	CORBA_exception_init (&ev);
 
 	GNOME_Evolution_Calendar_Cal_removeObject (priv->cal, uid, rid ? rid : "", mod, &ev);
diff --git a/calendar/libedata-cal/e-cal-backend-cache.h b/calendar/libedata-cal/e-cal-backend-cache.h
index 15c694a..4395919 100644
--- a/calendar/libedata-cal/e-cal-backend-cache.h
+++ b/calendar/libedata-cal/e-cal-backend-cache.h
@@ -59,8 +59,6 @@ gboolean            e_cal_backend_cache_remove_component (ECalBackendCache *cach
 GList              *e_cal_backend_cache_get_components (ECalBackendCache *cache);
 GSList             *e_cal_backend_cache_get_components_by_uid (ECalBackendCache *cache, const gchar *uid);
 
-
-
 const icaltimezone *e_cal_backend_cache_get_timezone (ECalBackendCache *cache, const gchar *tzid);
 gboolean            e_cal_backend_cache_put_timezone (ECalBackendCache *cache, const icaltimezone *zone);
 gboolean            e_cal_backend_cache_remove_timezone (ECalBackendCache *cache, const gchar *tzid);
diff --git a/calendar/libedata-cal/e-cal-backend-sexp.h b/calendar/libedata-cal/e-cal-backend-sexp.h
index f49f888..e25e7b6 100644
--- a/calendar/libedata-cal/e-cal-backend-sexp.h
+++ b/calendar/libedata-cal/e-cal-backend-sexp.h
@@ -63,7 +63,6 @@ gboolean         e_cal_backend_sexp_match_comp   (ECalBackendSExp *sexp,
 						  ECalComponent   *comp,
 						  ECalBackend     *backend);
 
-
 /* Default implementations of time functions for use by subclasses */
 
 ESExpResult *e_cal_backend_sexp_func_time_now       (ESExp *esexp, gint argc, ESExpResult **argv, gpointer data);
@@ -72,7 +71,6 @@ ESExpResult *e_cal_backend_sexp_func_time_add_day   (ESExp *esexp, gint argc, ES
 ESExpResult *e_cal_backend_sexp_func_time_day_begin (ESExp *esexp, gint argc, ESExpResult **argv, gpointer data);
 ESExpResult *e_cal_backend_sexp_func_time_day_end   (ESExp *esexp, gint argc, ESExpResult **argv, gpointer data);
 
-
 G_END_DECLS
 
 #endif /* __E_CAL_BACKEND_SEXP_H__ */
diff --git a/calendar/libedata-cal/e-cal-backend-sync.h b/calendar/libedata-cal/e-cal-backend-sync.h
index 56b1117..6b16519 100644
--- a/calendar/libedata-cal/e-cal-backend-sync.h
+++ b/calendar/libedata-cal/e-cal-backend-sync.h
@@ -58,7 +58,6 @@ struct _ECalBackendSyncClass {
 
 	ECalBackendSyncStatus (*get_attachment_list_sync)  (ECalBackendSync *backend, EDataCal *cal, const gchar *uid, const gchar *rid, GSList **attachments);
 
-
 	ECalBackendSyncStatus (*get_timezone_sync) (ECalBackendSync *backend, EDataCal *cal, const gchar *tzid, gchar **object);
 	ECalBackendSyncStatus (*add_timezone_sync) (ECalBackendSync *backend, EDataCal *cal, const gchar *tzobj);
 	ECalBackendSyncStatus (*set_default_timezone_sync) (ECalBackendSync *backend, EDataCal *cal, const gchar *tzid);
diff --git a/calendar/libedata-cal/e-cal-backend.c b/calendar/libedata-cal/e-cal-backend.c
index 1d9345e..b572943 100644
--- a/calendar/libedata-cal/e-cal-backend.c
+++ b/calendar/libedata-cal/e-cal-backend.c
@@ -747,7 +747,6 @@ e_cal_backend_get_mode (ECalBackend *backend)
 	return result;
 }
 
-
 /**
  * e_cal_backend_set_mode:
  * @backend: A calendar backend
@@ -1410,7 +1409,6 @@ e_cal_backend_notify_object_removed (ECalBackend *backend, const ECalComponentId
 	g_object_unref (iter);
 }
 
-
 void
 e_cal_backend_notify_objects_added (ECalBackend *backend, EDataCalView *query, const GList *objects)
 {
diff --git a/calendar/libedata-cal/e-data-cal-factory.c b/calendar/libedata-cal/e-data-cal-factory.c
index 090c323..cbed786 100644
--- a/calendar/libedata-cal/e-data-cal-factory.c
+++ b/calendar/libedata-cal/e-data-cal-factory.c
@@ -166,7 +166,6 @@ get_backend_factory (GHashTable *methods, const gchar *method, icalcomponent_kin
 		return NULL;
 	}
 
-
 	factory = g_hash_table_lookup (kinds, GINT_TO_POINTER (kind));
 
 	return factory;
@@ -346,7 +345,6 @@ impl_CalFactory_getCal (PortableServer_Servant servant,
 	return ret_cal;
 }
 
-
 /**
  * e_data_cal_factory_new:
  * @void:
@@ -466,7 +464,6 @@ e_data_cal_factory_set_backend_mode (EDataCalFactory *factory, gint mode)
 	g_mutex_unlock (priv->backends_mutex);
 }
 
-
 /* Object initialization function for the calendar factory */
 static void
 e_data_cal_factory_init (EDataCalFactory *factory, EDataCalFactoryClass *klass)
diff --git a/calendar/libedata-cal/e-data-cal-view.c b/calendar/libedata-cal/e-data-cal-view.c
index fc16e27..cdae589 100644
--- a/calendar/libedata-cal/e-data-cal-view.c
+++ b/calendar/libedata-cal/e-data-cal-view.c
@@ -57,7 +57,6 @@ struct _EDataCalViewPrivate {
 	ECalBackendSExp *sexp;
 };
 
-
 
 
 static void e_data_cal_view_class_init (EDataCalViewClass *class);
diff --git a/calendar/libedata-cal/e-data-cal.c b/calendar/libedata-cal/e-data-cal.c
index f01422d..cb12f95 100644
--- a/calendar/libedata-cal/e-data-cal.c
+++ b/calendar/libedata-cal/e-data-cal.c
@@ -454,7 +454,6 @@ impl_Cal_getQuery (PortableServer_Servant servant,
 	e_data_cal_notify_query (cal, GNOME_Evolution_Calendar_Success, query);
 }
 
-
 /* Cal::getTimezone method */
 static void
 impl_Cal_getTimezone (PortableServer_Servant servant,
diff --git a/calendar/tests/ecal/test-ecal.c b/calendar/tests/ecal/test-ecal.c
index 796b186..e52eccf 100644
--- a/calendar/tests/ecal/test-ecal.c
+++ b/calendar/tests/ecal/test-ecal.c
@@ -169,7 +169,6 @@ test_object_creation (ECal *client,  gchar **uid)
 	e_cal_component_set_dtend (comp, &dt);
 	e_cal_component_set_transparency (comp, E_CAL_COMPONENT_TRANSP_OPAQUE);
 
-
 	e_cal_component_commit_sequence (comp);
 	icalcomp = e_cal_component_get_icalcomponent (comp);
 	if (!e_cal_create_object (client, icalcomp, uid, &error)) {
@@ -529,7 +528,6 @@ test_get_free_busy (ECal *client)
 	return NULL;
 }
 
-
 static gchar *
 test_get_default_object (ECal *client)
 {
@@ -548,7 +546,6 @@ test_get_default_object (ECal *client)
 	return error->message;
 }
 
-
 /* XXX The string pasted below is *really* ugly. Alternatively, it could be
  * read from a file at run-time. Not sure if it is an elegant solution when
  * multiple clients try to load the same file during stress testing.
@@ -616,7 +613,6 @@ test_timezones (ECal *client)
 	printf ("\n\nTime Zones : \n%s *** %s", icaltimezone_get_display_name (zone), icaltimezone_get_tzid (zone));
 	printf ("\n\nTime Zones : \n%s", icaltimezone_get_location (zone));
 
-
 	return NULL;
 }
 
@@ -638,7 +634,6 @@ all_tests(ECal *client, const gchar *uri)
 	mu_run_test (test_query (client, "(contains? \"summary\" \"Kansas\")", 1));
 	mu_run_test (test_query (client, "(contains? \"any\" \"gibberish\")", 0));
 
-
 	mu_run_test (test_get_default_object (client));
 	mu_run_test (test_get_object (client));
 	mu_run_test (test_get_free_busy (client));
@@ -707,7 +702,6 @@ create_client (ECal **client, const gchar *uri, ECalSourceType type, gboolean on
 	if (results != 0)
 		cl_printf (*client, "***Failures********%s\n", results);
 
-
 	cl_printf (*client, "dump of the test calendar data");
 	list_uids (*client);
 	g_free (cal_uri);
diff --git a/camel/camel-address.c b/camel/camel-address.c
index 30fa365..89b677a 100644
--- a/camel/camel-address.c
+++ b/camel/camel-address.c
@@ -20,7 +20,6 @@
 
 #include "camel-address.h"
 
-
 static void camel_address_class_init (CamelAddressClass *klass);
 static void camel_address_init       (CamelAddress *obj);
 static void camel_address_finalize   (CamelObject *obj);
@@ -78,7 +77,6 @@ camel_address_new (void)
 	return new;
 }
 
-
 /**
  * camel_address_new_clone:
  * @addr: a #CamelAddress object
@@ -96,7 +94,6 @@ camel_address_new_clone (const CamelAddress *addr)
 	return new;
 }
 
-
 /**
  * camel_address_length:
  * @addr: a #CamelAddress object
@@ -111,7 +108,6 @@ camel_address_length (CamelAddress *addr)
 	return addr->addresses->len;
 }
 
-
 /**
  * camel_address_decode:
  * @addr: a #CamelAddress object
@@ -129,7 +125,6 @@ camel_address_decode (CamelAddress *addr, const gchar *raw)
 	return CAMEL_ADDRESS_CLASS (CAMEL_OBJECT_GET_CLASS (addr))->decode(addr, raw);
 }
 
-
 /**
  * camel_address_encode:
  * @addr: a #CamelAddress object
@@ -146,7 +141,6 @@ camel_address_encode (CamelAddress *addr)
 	return CAMEL_ADDRESS_CLASS (CAMEL_OBJECT_GET_CLASS (addr))->encode(addr);
 }
 
-
 /**
  * camel_address_unformat:
  * @addr: a #CamelAddress object
@@ -165,7 +159,6 @@ camel_address_unformat(CamelAddress *addr, const gchar *raw)
 	return CAMEL_ADDRESS_CLASS (CAMEL_OBJECT_GET_CLASS (addr))->unformat(addr, raw);
 }
 
-
 /**
  * camel_address_format:
  * @addr: a #CamelAddress object
@@ -182,7 +175,6 @@ camel_address_format (CamelAddress *addr)
 	return CAMEL_ADDRESS_CLASS (CAMEL_OBJECT_GET_CLASS (addr))->format(addr);
 }
 
-
 /**
  * camel_address_cat:
  * @dest: destination #CamelAddress object
@@ -202,7 +194,6 @@ camel_address_cat (CamelAddress *dest, const CamelAddress *source)
 	return CAMEL_ADDRESS_CLASS(CAMEL_OBJECT_GET_CLASS(dest))->cat(dest, source);
 }
 
-
 /**
  * camel_address_copy:
  * @dest: destination #CamelAddress object
@@ -222,7 +213,6 @@ camel_address_copy (CamelAddress *dest, const CamelAddress *source)
 	return camel_address_cat(dest, source);
 }
 
-
 /**
  * camel_address_remove:
  * @addr: a #CamelAddress object
diff --git a/camel/camel-block-file.c b/camel/camel-block-file.c
index a626d58..673ff80 100644
--- a/camel/camel-block-file.c
+++ b/camel/camel-block-file.c
@@ -58,7 +58,6 @@ struct _CamelBlockFilePrivate {
 	guint deleted:1;
 };
 
-
 #define CAMEL_BLOCK_FILE_LOCK(kf, lock) (pthread_mutex_lock(&(kf)->priv->lock))
 #define CAMEL_BLOCK_FILE_TRYLOCK(kf, lock) (pthread_mutex_trylock(&(kf)->priv->lock))
 #define CAMEL_BLOCK_FILE_UNLOCK(kf, lock) (pthread_mutex_unlock(&(kf)->priv->lock))
diff --git a/camel/camel-certdb.c b/camel/camel-certdb.c
index dca9278..cce0fd6 100644
--- a/camel/camel-certdb.c
+++ b/camel/camel-certdb.c
@@ -20,7 +20,6 @@
  *
  */
 
-
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
@@ -61,10 +60,8 @@ static void certdb_cert_free (CamelCertDB *certdb, CamelCert *cert);
 static const gchar *cert_get_string (CamelCertDB *certdb, CamelCert *cert, gint string);
 static void cert_set_string (CamelCertDB *certdb, CamelCert *cert, gint string, const gchar *value);
 
-
 static CamelObjectClass *parent_class = NULL;
 
-
 CamelType
 camel_certdb_get_type (void)
 {
@@ -84,7 +81,6 @@ camel_certdb_get_type (void)
 	return type;
 }
 
-
 static void
 camel_certdb_class_init (CamelCertDBClass *klass)
 {
@@ -151,18 +147,15 @@ camel_certdb_finalize (CamelObject *obj)
 	g_free (p);
 }
 
-
 CamelCertDB *
 camel_certdb_new (void)
 {
 	return (CamelCertDB *) camel_object_new (camel_certdb_get_type ());
 }
 
-
 static CamelCertDB *default_certdb = NULL;
 static pthread_mutex_t default_certdb_lock = PTHREAD_MUTEX_INITIALIZER;
 
-
 void
 camel_certdb_set_default (CamelCertDB *certdb)
 {
@@ -179,7 +172,6 @@ camel_certdb_set_default (CamelCertDB *certdb)
 	pthread_mutex_unlock (&default_certdb_lock);
 }
 
-
 CamelCertDB *
 camel_certdb_get_default (void)
 {
@@ -197,7 +189,6 @@ camel_certdb_get_default (void)
 	return certdb;
 }
 
-
 void
 camel_certdb_set_filename (CamelCertDB *certdb, const gchar *filename)
 {
@@ -212,7 +203,6 @@ camel_certdb_set_filename (CamelCertDB *certdb, const gchar *filename)
 	CAMEL_CERTDB_UNLOCK (certdb, db_lock);
 }
 
-
 static gint
 certdb_header_load (CamelCertDB *certdb, FILE *istream)
 {
@@ -551,7 +541,6 @@ camel_certdb_cert_unref (CamelCertDB *certdb, CamelCert *cert)
 	CAMEL_CERTDB_UNLOCK (certdb, ref_lock);
 }
 
-
 static gboolean
 cert_remove (gpointer key, gpointer value, gpointer user_data)
 {
@@ -581,7 +570,6 @@ camel_certdb_clear (CamelCertDB *certdb)
 	CAMEL_CERTDB_UNLOCK (certdb, db_lock);
 }
 
-
 static const gchar *
 cert_get_string (CamelCertDB *certdb, CamelCert *cert, gint string)
 {
@@ -599,7 +587,6 @@ cert_get_string (CamelCertDB *certdb, CamelCert *cert, gint string)
 	}
 }
 
-
 const gchar *
 camel_cert_get_string (CamelCertDB *certdb, CamelCert *cert, gint string)
 {
@@ -636,7 +623,6 @@ cert_set_string (CamelCertDB *certdb, CamelCert *cert, gint string, const gchar
 	}
 }
 
-
 void
 camel_cert_set_string (CamelCertDB *certdb, CamelCert *cert, gint string, const gchar *value)
 {
@@ -648,7 +634,6 @@ camel_cert_set_string (CamelCertDB *certdb, CamelCert *cert, gint string, const
 	CAMEL_CERTDB_GET_CLASS (certdb)->cert_set_string (certdb, cert, string, value);
 }
 
-
 CamelCertTrust
 camel_cert_get_trust (CamelCertDB *certdb, CamelCert *cert)
 {
@@ -658,7 +643,6 @@ camel_cert_get_trust (CamelCertDB *certdb, CamelCert *cert)
 	return cert->trust;
 }
 
-
 void
 camel_cert_set_trust (CamelCertDB *certdb, CamelCert *cert, CamelCertTrust trust)
 {
diff --git a/camel/camel-certdb.h b/camel/camel-certdb.h
index 8acd8e4..21b6168 100644
--- a/camel/camel-certdb.h
+++ b/camel/camel-certdb.h
@@ -20,7 +20,6 @@
  *
  */
 
-
 #ifndef __CAMEL_CERTDB_H__
 #define __CAMEL_CERTDB_H__
 
@@ -101,7 +100,6 @@ struct _CamelCertDBClass {
 	void (*cert_set_string) (CamelCertDB *certdb, CamelCert *cert, gint string, const gchar *value);
 };
 
-
 CamelType camel_certdb_get_type (void);
 
 CamelCertDB *camel_certdb_new (void);
@@ -127,7 +125,6 @@ void camel_certdb_cert_unref (CamelCertDB *certdb, CamelCert *cert);
 
 void camel_certdb_clear (CamelCertDB *certdb);
 
-
 const gchar *camel_cert_get_string (CamelCertDB *certdb, CamelCert *cert, gint string);
 void camel_cert_set_string (CamelCertDB *certdb, CamelCert *cert, gint string, const gchar *value);
 
diff --git a/camel/camel-charset-map.c b/camel/camel-charset-map.c
index b8f0664..3c6b61e 100644
--- a/camel/camel-charset-map.c
+++ b/camel/camel-charset-map.c
@@ -22,7 +22,6 @@
  * USA
  */
 
-
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
@@ -388,7 +387,6 @@ camel_charset_best (const gchar *in, gint len)
 	return camel_charset_best_name (&charset);
 }
 
-
 /**
  * camel_charset_iso_to_windows:
  * @isocharset: a canonicalised ISO charset
diff --git a/camel/camel-data-cache.c b/camel/camel-data-cache.c
index 02831d0..5c38240 100644
--- a/camel/camel-data-cache.c
+++ b/camel/camel-data-cache.c
@@ -350,7 +350,6 @@ camel_data_cache_get(CamelDataCache *cdc, const gchar *path, const gchar *key, C
 	return stream;
 }
 
-
 /**
  * camel_data_cache_get_filename:
  * @cdc: A #CamelDataCache
diff --git a/camel/camel-data-cache.h b/camel/camel-data-cache.h
index dec0cc9..e4c0688 100644
--- a/camel/camel-data-cache.h
+++ b/camel/camel-data-cache.h
@@ -20,7 +20,6 @@
  * USA
  */
 
-
 #ifndef CAMEL_DATA_CACHE_H
 #define CAMEL_DATA_CACHE_H 1
 
diff --git a/camel/camel-data-wrapper.c b/camel/camel-data-wrapper.c
index e9145d4..252dc14 100644
--- a/camel/camel-data-wrapper.c
+++ b/camel/camel-data-wrapper.c
@@ -20,7 +20,6 @@
  * USA
  */
 
-
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
@@ -115,7 +114,6 @@ camel_data_wrapper_get_type (void)
 	return type;
 }
 
-
 /**
  * camel_data_wrapper_new:
  *
@@ -151,7 +149,6 @@ write_to_stream (CamelDataWrapper *data_wrapper, CamelStream *stream)
 	return ret;
 }
 
-
 /**
  * camel_data_wrapper_write_to_stream:
  * @data_wrapper: a #CamelDataWrapper object
@@ -174,7 +171,6 @@ camel_data_wrapper_write_to_stream (CamelDataWrapper *data_wrapper,
 	return CDW_CLASS (data_wrapper)->write_to_stream (data_wrapper, stream);
 }
 
-
 static gssize
 decode_to_stream (CamelDataWrapper *data_wrapper, CamelStream *stream)
 {
@@ -218,7 +214,6 @@ decode_to_stream (CamelDataWrapper *data_wrapper, CamelStream *stream)
 	return ret;
 }
 
-
 /**
  * camel_data_wrapper_decode_to_stream:
  * @data_wrapper: a #CamelDataWrapper object
@@ -238,7 +233,6 @@ camel_data_wrapper_decode_to_stream (CamelDataWrapper *data_wrapper,
 	return CDW_CLASS (data_wrapper)->decode_to_stream (data_wrapper, stream);
 }
 
-
 static gint
 construct_from_stream (CamelDataWrapper *data_wrapper, CamelStream *stream)
 {
@@ -250,7 +244,6 @@ construct_from_stream (CamelDataWrapper *data_wrapper, CamelStream *stream)
 	return 0;
 }
 
-
 /**
  * camel_data_wrapper_construct_from_stream:
  * @data_wrapper: a #CamelDataWrapper object
@@ -270,7 +263,6 @@ camel_data_wrapper_construct_from_stream (CamelDataWrapper *data_wrapper,
 	return CDW_CLASS (data_wrapper)->construct_from_stream (data_wrapper, stream);
 }
 
-
 static void
 set_mime_type (CamelDataWrapper *data_wrapper, const gchar *mime_type)
 {
@@ -279,7 +271,6 @@ set_mime_type (CamelDataWrapper *data_wrapper, const gchar *mime_type)
 	data_wrapper->mime_type = camel_content_type_decode (mime_type);
 }
 
-
 /**
  * camel_data_wrapper_set_mime_type:
  * @data_wrapper: a #CamelDataWrapper object
@@ -309,7 +300,6 @@ get_mime_type (CamelDataWrapper *data_wrapper)
 	return camel_content_type_simple (data_wrapper->mime_type);
 }
 
-
 /**
  * camel_data_wrapper_get_mime_type:
  * @data_wrapper: a #CamelDataWrapper object
@@ -324,14 +314,12 @@ camel_data_wrapper_get_mime_type (CamelDataWrapper *data_wrapper)
 	return CDW_CLASS (data_wrapper)->get_mime_type (data_wrapper);
 }
 
-
 static CamelContentType *
 get_mime_type_field (CamelDataWrapper *data_wrapper)
 {
 	return data_wrapper->mime_type;
 }
 
-
 /**
  * camel_data_wrapper_get_mime_type_field:
  * @data_wrapper: a #CamelDataWrapper object
@@ -357,7 +345,6 @@ set_mime_type_field (CamelDataWrapper *data_wrapper,
 	data_wrapper->mime_type = mime_type;
 }
 
-
 /**
  * camel_data_wrapper_set_mime_type_field:
  * @data_wrapper: a #CamelDataWrapper object
@@ -376,14 +363,12 @@ camel_data_wrapper_set_mime_type_field (CamelDataWrapper *data_wrapper,
 	CDW_CLASS (data_wrapper)->set_mime_type_field (data_wrapper, mime_type);
 }
 
-
 static gboolean
 is_offline (CamelDataWrapper *data_wrapper)
 {
 	return data_wrapper->offline;
 }
 
-
 /**
  * camel_data_wrapper_is_offline:
  * @data_wrapper: a #CamelDataWrapper object
diff --git a/camel/camel-data-wrapper.h b/camel/camel-data-wrapper.h
index acef9d6..c1a33a7 100644
--- a/camel/camel-data-wrapper.h
+++ b/camel/camel-data-wrapper.h
@@ -22,7 +22,6 @@
  *
  */
 
-
 #ifndef CAMEL_DATA_WRAPPER_H
 #define CAMEL_DATA_WRAPPER_H 1
 
diff --git a/camel/camel-db.c b/camel/camel-db.c
index 0af9da9..be63c5b 100644
--- a/camel/camel-db.c
+++ b/camel/camel-db.c
@@ -347,7 +347,6 @@ init_sqlite_vfs (void)
 #define STARTTS(stmt)	if (camel_debug("dbtimets")) { g_print ("\n===========\nDB SQL operation [%s] started\n", stmt); if (!cdb->priv->timer) { cdb->priv->timer = g_timer_new (); } else { g_timer_reset(cdb->priv->timer);} }
 #define ENDTS	if (camel_debug("dbtimets")) { g_timer_stop (cdb->priv->timer); g_print ("DB Operation ended. Time Taken : %f\n###########\n", g_timer_elapsed (cdb->priv->timer, NULL)); }
 
-
 struct _CamelDBPrivate {
 	GTimer *timer;
 	gchar *file_name;
@@ -374,7 +373,6 @@ cdb_sql_exec (sqlite3 *db, const gchar * stmt, CamelException *ex)
 		ret = sqlite3_exec(db, stmt, 0, 0, &errmsg);
 	}
 
-
 	if (ret != SQLITE_OK) {
 		d(g_print ("Error in SQL EXEC statement: %s [%s].\n", stmt, errmsg));
 		if (ex)
@@ -420,8 +418,6 @@ camel_db_open (const gchar *path, CamelException *ex)
 		return NULL;
 	}
 
-
-
 	cdb = g_new (CamelDB, 1);
 	cdb->db = db;
 	cdb->lock = g_mutex_new ();
@@ -447,7 +443,6 @@ camel_db_open (const gchar *path, CamelException *ex)
 		camel_db_command (cdb, "PRAGMA temp_store = memory", NULL);
 	}
 
-
 	sqlite3_busy_timeout (cdb->db, CAMEL_DB_SLEEP_INTERVAL);
 
 	return cdb;
@@ -505,7 +500,6 @@ camel_db_command (CamelDB *cdb, const gchar *stmt, CamelException *ex)
 		return ret;
 }
 
-
 gint
 camel_db_begin_transaction (CamelDB *cdb, CamelException *ex)
 {
@@ -576,7 +570,6 @@ camel_db_transaction_command (CamelDB *cdb, GSList *qry_list, CamelException *ex
 	if (ret)
 		goto end;
 
-
 	while (qry_list) {
 		query = qry_list->data;
 		ret = cdb_sql_exec (cdb->db, query, ex);
@@ -749,7 +742,6 @@ camel_db_count_deleted_message_info (CamelDB *cdb, const gchar *table_name, guin
 	return ret;
 }
 
-
 gint
 camel_db_count_total_message_info (CamelDB *cdb, const gchar *table_name, guint32 *count, CamelException *ex)
 {
@@ -825,7 +817,6 @@ camel_db_create_vfolder (CamelDB *db, const gchar *folder_name, CamelException *
 
 	sqlite3_free (table_creation_query);
 
-
 	safe_index = g_strdup_printf("VINDEX-%s", folder_name);
 	table_creation_query = sqlite3_mprintf ("CREATE INDEX IF NOT EXISTS %Q ON %Q (vuid)", safe_index, folder_name);
 	ret = camel_db_command (db, table_creation_query, ex);
@@ -849,7 +840,6 @@ camel_db_recreate_vfolder (CamelDB *db, const gchar *folder_name, CamelException
 
 	sqlite3_free (table_query);
 
-
 	return camel_db_create_vfolder (db, folder_name, ex);
 }
 
@@ -916,7 +906,6 @@ camel_db_get_folder_uids_flags (CamelDB *db, const gchar *folder_name, const gch
 	 data.uids = uids;
 	 data.flags = flags;
 
-
 	 sel_query = sqlite3_mprintf("SELECT uid,flags FROM %Q%s%s%s%s", folder_name, sort_by ? " order by " : "", sort_by ? sort_by: "", (sort_by && collate) ? " collate " : "", (sort_by && collate) ? collate : "");
 
 	 ret = camel_db_select (db, sel_query, read_uids_flags_callback, &data, ex);
@@ -1064,7 +1053,6 @@ read_vuids_callback (gpointer ref, gint ncol, gchar ** cols, gchar ** name)
 	 #if 0
 	 gint i;
 
-
 	 for (i = 0; i < ncol; ++i) {
 		  if (!strcmp (name [i], "vuid"))
 			   g_ptr_array_add (array, (gchar *) (camel_pstring_strdup(cols [i]+8)));
@@ -1135,7 +1123,6 @@ camel_db_add_to_vfolder_transaction (CamelDB *db, gchar *folder_name, gchar *vui
 	 return ret;
 }
 
-
 gint
 camel_db_create_folders_table (CamelDB *cdb, CamelException *ex)
 {
@@ -1144,8 +1131,6 @@ camel_db_create_folders_table (CamelDB *cdb, CamelException *ex)
 	return ((camel_db_command (cdb, query, ex)));
 }
 
-
-
 static gint
 camel_db_create_message_info_table (CamelDB *cdb, const gchar *folder_name, CamelException *ex)
 {
@@ -1406,7 +1391,6 @@ camel_db_write_folder_info_record (CamelDB *cdb, CamelFIRecord *record, CamelExc
 
 	del_query = sqlite3_mprintf ("DELETE FROM folders WHERE folder_name = %Q", record->folder_name);
 
-
 #if 0
 	gchar *upd_query;
 
diff --git a/camel/camel-db.h b/camel/camel-db.h
index 64161a8..2df1616 100644
--- a/camel/camel-db.h
+++ b/camel/camel-db.h
@@ -29,7 +29,6 @@ struct _CamelDB {
 #define CAMEL_DB_RELEASE_SQLITE_MEMORY if(!g_getenv("CAMEL_SQLITE_FREE_CACHE")) sqlite3_release_memory(CAMEL_DB_FREE_CACHE_SIZE);
 #define CAMEL_DB_USE_SHARED_CACHE if(g_getenv("CAMEL_SQLITE_SHARED_CACHE")) sqlite3_enable_shared_cache(TRUE);
 
-
 /* The extensive DB format, supporting basic searching and sorting
   uid, - Message UID
   flags, - Camel Message info flags
@@ -102,13 +101,9 @@ typedef struct _CamelFIRecord {
 	gchar *bdata;
 } CamelFIRecord;
 
-
-
-
 typedef struct _CamelDB CamelDB;
 typedef gint (*CamelDBSelectCB) (gpointer data, gint ncol, gchar **colvalues, gchar **colnames);
 
-
 CamelDB * camel_db_open (const gchar *path, CamelException *ex);
 CamelDB * camel_db_clone (CamelDB *cdb, CamelException *ex);
 void camel_db_close (CamelDB *cdb);
diff --git a/camel/camel-debug.c b/camel/camel-debug.c
index 0c8ad92..91cf5cf 100644
--- a/camel/camel-debug.c
+++ b/camel/camel-debug.c
@@ -210,7 +210,6 @@ Invalid hw breakpoint length %d in i386_length_and_rw_bits.\n", len);
 #define I386_DR_LOCAL_ENABLE(i) \
   dr_control_mirror |= (1 << (DR_LOCAL_ENABLE_SHIFT + DR_ENABLE_SIZE * (i)))
 
-
 #define set_dr(regnum, val) \
 		__asm__("movl %0,%%db" #regnum  \
 			: /* no output */ \
diff --git a/camel/camel-digest-store.c b/camel/camel-digest-store.c
index 3ed3792..925095c 100644
--- a/camel/camel-digest-store.c
+++ b/camel/camel-digest-store.c
@@ -20,7 +20,6 @@
  *
  */
 
-
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
@@ -51,7 +50,6 @@ static gint digest_getv (CamelObject *object, CamelException *ex, CamelArgGetV *
 
 static CamelStoreClass *parent_class = NULL;
 
-
 CamelType
 camel_digest_store_get_type (void)
 {
@@ -122,7 +120,6 @@ digest_getv (CamelObject *object, CamelException *ex, CamelArgGetV *args)
 	return CAMEL_OBJECT_CLASS (parent_class)->getv (object, ex, args);
 }
 
-
 /**
  * camel_digest_store_new:
  * @url:
diff --git a/camel/camel-digest-summary.c b/camel/camel-digest-summary.c
index 1249c64..8d6731b 100644
--- a/camel/camel-digest-summary.c
+++ b/camel/camel-digest-summary.c
@@ -20,7 +20,6 @@
  *
  */
 
-
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
@@ -33,10 +32,8 @@ static void camel_digest_summary_class_init (CamelDigestSummaryClass *klass);
 static void camel_digest_summary_init       (CamelDigestSummary *obj);
 static void camel_digest_summary_finalise   (CamelObject *obj);
 
-
 static CamelFolderSummaryClass *parent_class = NULL;
 
-
 CamelType
 camel_digest_summary_get_type(void)
 {
@@ -82,7 +79,6 @@ camel_digest_summary_finalise (CamelObject *object)
 
 }
 
-
 CamelFolderSummary *
 camel_digest_summary_new (void)
 {
diff --git a/camel/camel-digest-summary.h b/camel/camel-digest-summary.h
index 23a0996..e2105cb 100644
--- a/camel/camel-digest-summary.h
+++ b/camel/camel-digest-summary.h
@@ -48,7 +48,6 @@ struct _CamelDigestSummaryClass {
 
 };
 
-
 CamelType camel_digest_summary_get_type (void);
 
 CamelFolderSummary *camel_digest_summary_new (void);
diff --git a/camel/camel-disco-diary.c b/camel/camel-disco-diary.c
index a76073c..19e1489 100644
--- a/camel/camel-disco-diary.c
+++ b/camel/camel-disco-diary.c
@@ -105,7 +105,6 @@ camel_disco_diary_get_type (void)
 	return camel_disco_diary_type;
 }
 
-
 static gint
 diary_encode_uids (CamelDiscoDiary *diary, GPtrArray *uids)
 {
diff --git a/camel/camel-disco-diary.h b/camel/camel-disco-diary.h
index 622d186..4fff9ea 100644
--- a/camel/camel-disco-diary.h
+++ b/camel/camel-disco-diary.h
@@ -66,7 +66,6 @@ typedef struct {
 
 } CamelDiscoDiaryClass;
 
-
 /* public methods */
 CamelDiscoDiary *camel_disco_diary_new    (CamelDiscoStore *store,
 					   const gchar *filename,
diff --git a/camel/camel-disco-folder.c b/camel/camel-disco-folder.c
index 1d95f35..d3a5887 100644
--- a/camel/camel-disco-folder.c
+++ b/camel/camel-disco-folder.c
@@ -412,7 +412,6 @@ disco_transfer_messages_to (CamelFolder *source, GPtrArray *uids,
 	}
 }
 
-
 /**
  * camel_disco_folder_expunge_uids:
  * @folder: a (disconnectable) folder
@@ -432,7 +431,6 @@ camel_disco_folder_expunge_uids (CamelFolder *folder, GPtrArray *uids,
 	disco_expunge_uids (folder, uids, ex);
 }
 
-
 static void
 disco_cache_message (CamelDiscoFolder *disco_folder, const gchar *uid,
 		     CamelException *ex)
@@ -456,7 +454,6 @@ camel_disco_folder_cache_message (CamelDiscoFolder *disco_folder,
 	CDF_CLASS (disco_folder)->cache_message (disco_folder, uid, ex);
 }
 
-
 static void
 disco_prepare_for_offline (CamelDiscoFolder *disco_folder,
 			   const gchar *expression,
diff --git a/camel/camel-disco-folder.h b/camel/camel-disco-folder.h
index c73e378..5279bf3 100644
--- a/camel/camel-disco-folder.h
+++ b/camel/camel-disco-folder.h
@@ -108,7 +108,6 @@ typedef struct {
 			    const gchar *new_uid);
 } CamelDiscoFolderClass;
 
-
 /* public methods */
 void camel_disco_folder_expunge_uids (CamelFolder *folder, GPtrArray *uids,
 				      CamelException *ex);
diff --git a/camel/camel-disco-store.c b/camel/camel-disco-store.c
index 16a5a7c..3148d9c 100644
--- a/camel/camel-disco-store.c
+++ b/camel/camel-disco-store.c
@@ -22,7 +22,6 @@
  *
  */
 
-
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
@@ -273,7 +272,6 @@ disco_get_folder_info (CamelStore *store, const gchar *top,
 	return NULL;
 }
 
-
 /**
  * camel_disco_store_status:
  * @store: a disconnectable store
@@ -383,7 +381,6 @@ camel_disco_store_can_work_offline (CamelDiscoStore *store)
 	return CDS_CLASS (store)->can_work_offline (store);
 }
 
-
 /**
  * camel_disco_store_check_online:
  * @store: a disconnectable store
diff --git a/camel/camel-disco-store.h b/camel/camel-disco-store.h
index 1a58a48..b1477cf 100644
--- a/camel/camel-disco-store.h
+++ b/camel/camel-disco-store.h
@@ -52,7 +52,6 @@ struct _CamelDiscoStore {
 	CamelDiscoDiary *diary;
 };
 
-
 typedef struct {
 	CamelStoreClass parent_class;
 
@@ -61,7 +60,6 @@ typedef struct {
 						      CamelException *);
 	gboolean          (*can_work_offline)        (CamelDiscoStore *);
 
-
 	gboolean          (*connect_online)          (CamelService *,
 						      CamelException *);
 	gboolean          (*connect_offline)         (CamelService *,
@@ -100,7 +98,6 @@ typedef struct {
 
 } CamelDiscoStoreClass;
 
-
 /* Standard Camel function */
 CamelType camel_disco_store_get_type (void);
 
@@ -111,7 +108,6 @@ void                  camel_disco_store_set_status       (CamelDiscoStore *store
 							  CamelException *ex);
 gboolean              camel_disco_store_can_work_offline (CamelDiscoStore *store);
 
-
 /* Convenience functions */
 gboolean camel_disco_store_check_online (CamelDiscoStore *store, CamelException *ex);
 void camel_disco_store_prepare_for_offline(CamelDiscoStore *store, CamelException *ex);
diff --git a/camel/camel-exception.c b/camel/camel-exception.c
index 1c0c2c8..d8c2980 100644
--- a/camel/camel-exception.c
+++ b/camel/camel-exception.c
@@ -37,7 +37,6 @@
 /* dont turn this off */
 #define w(x) x
 
-
 /**
  * camel_exception_new: allocate a new exception object.
  *
@@ -75,7 +74,6 @@ camel_exception_init (CamelException *ex)
 	ex->id = CAMEL_EXCEPTION_NONE;
 }
 
-
 /**
  * camel_exception_clear:
  * @ex: a #CamelException
diff --git a/camel/camel-exception.h b/camel/camel-exception.h
index e305f7c..5f41d66 100644
--- a/camel/camel-exception.h
+++ b/camel/camel-exception.h
@@ -23,8 +23,6 @@
  * USA
  */
 
-
-
 #ifndef CAMEL_EXCEPTION_H
 #define CAMEL_EXCEPTION_H 1
 
@@ -50,7 +48,6 @@ CamelException *          camel_exception_new           (void);
 void                      camel_exception_free          (CamelException *ex);
 void                      camel_exception_init          (CamelException *ex);
 
-
 /* exception content manipulation */
 void                      camel_exception_clear         (CamelException *ex);
 void                      camel_exception_set           (CamelException *ex,
@@ -65,7 +62,6 @@ void                      camel_exception_setv          (CamelException *ex,
 void                      camel_exception_xfer          (CamelException *ex_dst,
 							 CamelException *ex_src);
 
-
 /* exception content retrieval */
 ExceptionId               camel_exception_get_id        (CamelException *ex);
 const gchar *             camel_exception_get_description (CamelException *ex);
diff --git a/camel/camel-file-utils.c b/camel/camel-file-utils.c
index 7122cb2..d903619 100644
--- a/camel/camel-file-utils.c
+++ b/camel/camel-file-utils.c
@@ -22,7 +22,6 @@
  * USA
  */
 
-
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
@@ -73,7 +72,6 @@ camel_file_util_encode_uint32 (FILE *out, guint32 value)
 	return fputc (value | 0x80, out);
 }
 
-
 /**
  * camel_file_util_decode_uint32:
  * @in: file to read from
@@ -104,7 +102,6 @@ camel_file_util_decode_uint32 (FILE *in, guint32 *dest)
         return 0;
 }
 
-
 /**
  * camel_file_util_encode_fixed_int32:
  * @out: file to output to
@@ -126,7 +123,6 @@ camel_file_util_encode_fixed_int32 (FILE *out, gint32 value)
 	return 0;
 }
 
-
 /**
  * camel_file_util_decode_fixed_int32:
  * @in: file to read from
@@ -180,7 +176,6 @@ camel_file_util_decode_##type(FILE *in, type *dest)	\
 	return 0;					\
 }
 
-
 /**
  * camel_file_util_encode_time_t:
  * @out: file to output to
@@ -214,7 +209,6 @@ CFU_DECODE_T(time_t)
  **/
 CFU_ENCODE_T(off_t)
 
-
 /**
  * camel_file_util_decode_off_t:
  * @in: file to read from
@@ -237,7 +231,6 @@ CFU_DECODE_T(off_t)
  **/
 CFU_ENCODE_T(gsize)
 
-
 /**
  * camel_file_util_decode_gsize:
  * @in: file to read from
@@ -249,7 +242,6 @@ CFU_ENCODE_T(gsize)
  **/
 CFU_DECODE_T(gsize)
 
-
 /**
  * camel_file_util_encode_string:
  * @out: file to output to
@@ -277,7 +269,6 @@ camel_file_util_encode_string (FILE *out, const gchar *str)
 	return -1;
 }
 
-
 /**
  * camel_file_util_decode_string:
  * @in: file to read from
@@ -350,7 +341,6 @@ camel_file_util_encode_fixed_string (FILE *out, const gchar *str, gsize len)
 	return -1;
 }
 
-
 /**
  * camel_file_util_decode_fixed_string:
  * @in: file to read from
@@ -407,7 +397,6 @@ camel_file_util_safe_filename (const gchar *name)
 	return camel_url_encode(name, unsafe_chars);
 }
 
-
 /* FIXME: poll() might be more efficient and more portable? */
 
 /**
@@ -487,7 +476,6 @@ camel_read (gint fd, gchar *buf, gsize n)
 	return nread;
 }
 
-
 /**
  * camel_write:
  * @fd: file descriptor
@@ -732,7 +720,6 @@ camel_write_socket (gint fd, const gchar *buf, gsize n)
 #endif
 }
 
-
 /**
  * camel_file_util_savename:
  * @filename: a pathname
diff --git a/camel/camel-file-utils.h b/camel/camel-file-utils.h
index dfcf3d1..5c8ac4b 100644
--- a/camel/camel-file-utils.h
+++ b/camel/camel-file-utils.h
@@ -23,7 +23,6 @@
  * USA
  */
 
-
 #ifndef CAMEL_FILE_UTILS_H
 #define CAMEL_FILE_UTILS_H 1
 
@@ -54,7 +53,6 @@ gint camel_file_util_decode_string (FILE *in, gchar **str);
 gint camel_file_util_encode_fixed_string (FILE *out, const gchar *str, gsize len);
 gint camel_file_util_decode_fixed_string (FILE *in, gchar **str, gsize len);
 
-
 gchar *camel_file_util_safe_filename (const gchar *name);
 
 /* Code that intends to be portable to Win32 should use camel_read()
diff --git a/camel/camel-filter-driver.c b/camel/camel-filter-driver.c
index e215523..75080fc 100644
--- a/camel/camel-filter-driver.c
+++ b/camel/camel-filter-driver.c
@@ -416,7 +416,6 @@ report_status (CamelFilterDriver *driver, enum camel_filter_status_t status, gin
 	}
 }
 
-
 #if 0
 void
 camel_filter_driver_set_global (CamelFilterDriver *d, const gchar *name, const gchar *value)
@@ -1051,7 +1050,6 @@ free_key (gpointer key, gpointer value, gpointer user_data)
 }
 #endif
 
-
 static void
 camel_filter_driver_log (CamelFilterDriver *driver, enum filter_log_t status, const gchar *desc, ...)
 {
@@ -1102,7 +1100,6 @@ camel_filter_driver_log (CamelFilterDriver *driver, enum filter_log_t status, co
 	}
 }
 
-
 struct _run_only_once {
 	CamelFilterDriver *driver;
 	CamelException *ex;
@@ -1145,7 +1142,6 @@ run_only_once (gpointer key, gchar *action, struct _run_only_once *data)
 	return TRUE;
 }
 
-
 /**
  * camel_filter_driver_flush:
  * @driver:
@@ -1168,7 +1164,6 @@ camel_filter_driver_flush (CamelFilterDriver *driver, CamelException *ex)
 	g_hash_table_foreach_remove (p->only_once, (GHRFunc) run_only_once, &data);
 }
 
-
 static gint
 decode_flags_from_xev(const gchar *xev, CamelMessageInfoBase *mi)
 {
@@ -1297,7 +1292,6 @@ fail:
 	return ret;
 }
 
-
 /**
  * camel_filter_driver_filter_folder:
  * @driver: CamelFilterDriver
@@ -1386,13 +1380,11 @@ camel_filter_driver_filter_folder (CamelFilterDriver *driver, CamelFolder *folde
 	return status;
 }
 
-
 struct _get_message {
 	struct _CamelFilterDriverPrivate *p;
 	const gchar *source_url;
 };
 
-
 static CamelMimeMessage *
 get_message_cb (gpointer data, CamelException *ex)
 {
diff --git a/camel/camel-filter-search.c b/camel/camel-filter-search.c
index 0908188..e67a6c3 100644
--- a/camel/camel-filter-search.c
+++ b/camel/camel-filter-search.c
@@ -125,7 +125,6 @@ static struct {
 	{ "junk-test",          (ESExpFunc *) junk_test,          0 },
 };
 
-
 static CamelMimeMessage *
 camel_filter_search_get_message (FilterMessageSearch *fms, struct _ESExp *sexp)
 {
@@ -206,7 +205,6 @@ header_contains (struct _ESExp *f, gint argc, struct _ESExpResult **argv, Filter
 	return check_header (f, argc, argv, fms, CAMEL_SEARCH_MATCH_CONTAINS);
 }
 
-
 static ESExpResult *
 header_matches (struct _ESExp *f, gint argc, struct _ESExpResult **argv, FilterMessageSearch *fms)
 {
diff --git a/camel/camel-folder-search.c b/camel/camel-folder-search.c
index 100d34d..cb28863 100644
--- a/camel/camel-folder-search.c
+++ b/camel/camel-folder-search.c
@@ -834,7 +834,6 @@ search_match_all(struct _ESExp *f, gint argc, struct _ESExpTerm **argv, CamelFol
 		camel_folder_summary_reload_from_db (search->folder->summary, search->priv->ex);
 	}
 
-
 	for (i=0;i<v->len;i++) {
 		const gchar *uid;
 
diff --git a/camel/camel-folder-summary.c b/camel/camel-folder-summary.c
index 1bc1fff..5672b69 100644
--- a/camel/camel-folder-summary.c
+++ b/camel/camel-folder-summary.c
@@ -77,7 +77,6 @@ static pthread_mutex_t info_lock = PTHREAD_MUTEX_INITIALIZER;
 #define GLOBAL_INFO_LOCK(i) pthread_mutex_lock(&info_lock)
 #define GLOBAL_INFO_UNLOCK(i) pthread_mutex_unlock(&info_lock)
 
-
 /* this should probably be conditional on it existing */
 #define USE_BSEARCH
 
@@ -115,7 +114,6 @@ static gint summary_meta_header_load(CamelFolderSummary *, FILE *);
 static gint summary_meta_header_save(CamelFolderSummary *, FILE *);
 #endif
 
-
 static CamelMessageInfo * message_info_new_from_header(CamelFolderSummary *, struct _camel_header_raw *);
 static CamelMessageInfo * message_info_new_from_parser(CamelFolderSummary *, CamelMimeParser *);
 static CamelMessageInfo * message_info_new_from_message(CamelFolderSummary *s, CamelMimeMessage *msg);
@@ -273,7 +271,6 @@ camel_folder_summary_get_type (void)
 	return type;
 }
 
-
 /**
  * camel_folder_summary_new:
  * @folder: parent #CamelFolder object
@@ -292,7 +289,6 @@ camel_folder_summary_new (struct _CamelFolder *folder)
 	return new;
 }
 
-
 /**
  * camel_folder_summary_set_filename:
  * @summary: a #CamelFolderSummary object
@@ -314,7 +310,6 @@ camel_folder_summary_set_filename(CamelFolderSummary *s, const gchar *name)
 	CAMEL_SUMMARY_UNLOCK(s, summary_lock);
 }
 
-
 /**
  * camel_folder_summary_set_index:
  * @summary: a #CamelFolderSummary object
@@ -338,7 +333,6 @@ camel_folder_summary_set_index(CamelFolderSummary *s, CamelIndex *index)
 		camel_object_ref((CamelObject *)index);
 }
 
-
 /**
  * camel_folder_summary_set_build_content:
  * @summary: a #CamelFolderSummary object
@@ -354,7 +348,6 @@ camel_folder_summary_set_build_content(CamelFolderSummary *s, gboolean state)
 	s->build_content = state;
 }
 
-
 /**
  * camel_folder_summary_count:
  * @summary: a #CamelFolderSummary object
@@ -369,7 +362,6 @@ camel_folder_summary_count(CamelFolderSummary *s)
 	return s->uids->len;
 }
 
-
 /**
  * camel_folder_summary_index:
  * @summary: a #CamelFolderSummary object
@@ -492,7 +484,6 @@ camel_folder_summary_array(CamelFolderSummary *s)
 	for (i=0;i<s->uids->len;i++)
 		res->pdata[i] = (gpointer) camel_pstring_strdup ((gchar *)g_ptr_array_index(s->uids, i));
 
-
 	CAMEL_SUMMARY_UNLOCK(s, summary_lock);
 
 	return res;
@@ -579,7 +570,6 @@ message_info_from_uid (CamelFolderSummary *s, const gchar *uid)
 		data.double_ref = TRUE;
 		data.add = FALSE;
 
-
 		ret = camel_db_read_message_info_record_with_uid (cdb, folder_name, uid, &data, camel_read_mir_callback, &ex);
 		if (ret != 0) {
 			camel_exception_clear (&ex);
@@ -604,14 +594,12 @@ message_info_from_uid (CamelFolderSummary *s, const gchar *uid)
 	} else
 		info->refcount++;
 
-
 	CAMEL_SUMMARY_UNLOCK(s, ref_lock);
 	CAMEL_SUMMARY_UNLOCK(s, summary_lock);
 
 	return info;
 }
 
-
 /**
  * camel_folder_summary_uid:
  * @summary: a #CamelFolderSummary object
@@ -646,7 +634,6 @@ camel_folder_summary_next_uid(CamelFolderSummary *s)
 {
 	guint32 uid;
 
-
 	CAMEL_SUMMARY_LOCK(s, summary_lock);
 
 	uid = s->nextuid++;
@@ -658,7 +645,6 @@ camel_folder_summary_next_uid(CamelFolderSummary *s)
 	return uid;
 }
 
-
 /**
  * camel_folder_summary_set_uid:
  * @summary: a #CamelFolderSummary object
@@ -679,7 +665,6 @@ camel_folder_summary_set_uid(CamelFolderSummary *s, guint32 uid)
 	CAMEL_SUMMARY_UNLOCK(s, summary_lock);
 }
 
-
 /**
  * camel_folder_summary_next_uid_string:
  * @summary: a #CamelFolderSummary object
@@ -727,7 +712,6 @@ perform_content_info_load_from_db (CamelFolderSummary *s, CamelMIRecord *mir)
 	return ci;
 }
 
-
 /* loads the content descriptions, recursively */
 static CamelMessageContentInfo *
 perform_content_info_load(CamelFolderSummary *s, FILE *in)
@@ -819,7 +803,6 @@ remove_item (gchar *key, CamelMessageInfoBase *info, CamelFolderSummary *s)
 	return FALSE;
 }
 
-
 struct _folder_summary_free_msg {
 	CamelSessionThreadMsg msg;
 	CamelFolderSummary *summary;
@@ -849,8 +832,6 @@ remove_cache (CamelSession *session, CamelSessionThreadMsg *msg)
 	return;
 }
 
-
-
 static void remove_cache_end (CamelSession *session, CamelSessionThreadMsg *msg)
 {
 		struct _folder_summary_free_msg *m = (struct _folder_summary_free_msg *)msg;
@@ -1209,7 +1190,6 @@ camel_read_mir_callback (gpointer  ref, gint ncol, gchar ** cols, gchar ** name)
 	}
 	CAMEL_SUMMARY_UNLOCK (s, summary_lock);
 
-
 	info = ((CamelFolderSummaryClass *)(CAMEL_OBJECT_GET_CLASS(s)))->message_info_from_db (s, mir);
 
 	if (info) {
@@ -1322,7 +1302,6 @@ error:
 
 }
 
-
 gint
 camel_folder_summary_migrate_infos(CamelFolderSummary *s)
 {
@@ -1386,7 +1365,6 @@ camel_folder_summary_migrate_infos(CamelFolderSummary *s)
 		g_hash_table_insert (s->loaded_infos, (gpointer) mi->uid, mi);
 	}
 
-
 	if (fclose (in) != 0)
 		return -1;
 
@@ -1424,7 +1402,6 @@ error:
 
 }
 
-
 /* saves the content descriptions, recursively */
 static gint
 perform_content_info_save_to_db (CamelFolderSummary *s, CamelMessageContentInfo *ci, CamelMIRecord *record)
@@ -1655,7 +1632,6 @@ camel_folder_summary_header_save_to_db (CamelFolderSummary *s, CamelException *e
 	return ret;
 }
 
-
 /**
  * camel_folder_summary_save:
  * @summary: a #CamelFolderSummary object
@@ -1845,7 +1821,6 @@ camel_folder_summary_header_load(CamelFolderSummary *s)
 	FILE *in;
 	FILE *in_meta;
 
-
 	if (s->summary_path == NULL ||
 	    s->meta_summary->path == NULL)
 		return 0;
@@ -1907,7 +1882,6 @@ summary_assign_uid(CamelFolderSummary *s, CamelMessageInfo *info)
 	return 1;
 }
 
-
 /**
  * camel_folder_summary_add:
  * @summary: a #CamelFolderSummary object
@@ -1927,7 +1901,6 @@ camel_folder_summary_add (CamelFolderSummary *s, CamelMessageInfo *info)
 	if (info == NULL)
 		return;
 
-
 	if (summary_assign_uid(s, info) == 0)
 		return;
 
@@ -1953,7 +1926,6 @@ camel_folder_summary_add (CamelFolderSummary *s, CamelMessageInfo *info)
 	CAMEL_SUMMARY_UNLOCK(s, summary_lock);
 }
 
-
 void
 camel_folder_summary_insert (CamelFolderSummary *s, CamelMessageInfo *info, gboolean load)
 {
@@ -1987,7 +1959,6 @@ camel_folder_summary_insert (CamelFolderSummary *s, CamelMessageInfo *info, gboo
 	CAMEL_SUMMARY_UNLOCK(s, summary_lock);
 }
 
-
 static void
 update_summary (CamelFolderSummary *summary, CamelMessageInfoBase *info)
 {
@@ -2052,7 +2023,6 @@ camel_folder_summary_add_from_header(CamelFolderSummary *s, struct _camel_header
 	return info;
 }
 
-
 /**
  * camel_folder_summary_add_from_parser:
  * @summary: a #CamelFolderSummary object
@@ -2081,7 +2051,6 @@ camel_folder_summary_add_from_parser(CamelFolderSummary *s, CamelMimeParser *mp)
 	return info;
 }
 
-
 /**
  * camel_folder_summary_add_from_message:
  * @summary: a #CamelFolderSummary object
@@ -2101,7 +2070,6 @@ camel_folder_summary_add_from_message (CamelFolderSummary *s, CamelMimeMessage *
 	return info;
 }
 
-
 /**
  * camel_folder_summary_info_new_from_header:
  * @summary: a #CamelFolderSummary object
@@ -2118,7 +2086,6 @@ camel_folder_summary_info_new_from_header(CamelFolderSummary *s, struct _camel_h
 	return ((CamelFolderSummaryClass *)(CAMEL_OBJECT_GET_CLASS(s)))->message_info_new_from_header(s, h);
 }
 
-
 /**
  * camel_folder_summary_info_new_from_parser:
  * @summary: a #CamelFolderSummary object
@@ -2189,7 +2156,6 @@ camel_folder_summary_info_new_from_parser(CamelFolderSummary *s, CamelMimeParser
 	return info;
 }
 
-
 /**
  * camel_folder_summary_info_new_from_message:
  * @summary: a #CamelFodlerSummary object
@@ -2244,7 +2210,6 @@ camel_folder_summary_info_new_from_message(CamelFolderSummary *s, CamelMimeMessa
 	return info;
 }
 
-
 /**
  * camel_folder_summary_content_info_free:
  * @summary: a #CamelFolderSummary object
@@ -2266,7 +2231,6 @@ camel_folder_summary_content_info_free(CamelFolderSummary *s, CamelMessageConten
 	}
 }
 
-
 /**
  * camel_folder_summary_touch:
  * @summary: a #CamelFolderSummary object
@@ -2346,7 +2310,6 @@ camel_folder_summary_clear_db (CamelFolderSummary *s)
 	camel_db_clear_folder_summary (cdb, folder_name, NULL);
 }
 
-
 /* This function returns 0 on success. So the caller should not bother,
 deleting the uid from db when the return value is non-zero */
 static gint
@@ -2388,7 +2351,6 @@ camel_folder_summary_remove (CamelFolderSummary *s, CamelMessageInfo *info)
 	g_hash_table_remove (s->loaded_infos, camel_message_info_uid(info));
 	ret = summary_remove_uid (s, camel_message_info_uid(info));
 
-
 	s->flags |= CAMEL_SUMMARY_DIRTY;
 	s->meta_summary->msg_expunged = TRUE;
 	CAMEL_SUMMARY_UNLOCK(s, summary_lock);
@@ -2399,7 +2361,6 @@ camel_folder_summary_remove (CamelFolderSummary *s, CamelMessageInfo *info)
 	camel_message_info_free(info);
 }
 
-
 /**
  * camel_folder_summary_remove_uid:
  * @summary: a #CamelFolderSummary object
@@ -2493,7 +2454,6 @@ camel_folder_summary_remove_index_fast (CamelFolderSummary *s, gint index)
 		CAMEL_SUMMARY_UNLOCK(s, ref_lock);
 		CAMEL_SUMMARY_UNLOCK(s, summary_lock);
 
-
 	}
 }
 
@@ -2512,7 +2472,6 @@ camel_folder_summary_remove_index(CamelFolderSummary *s, gint index)
 	camel_folder_summary_remove_uid (s, uid);
 }
 
-
 /**
  * camel_folder_summary_remove_range:
  * @summary: a #CamelFolderSummary object
@@ -2682,7 +2641,6 @@ camel_folder_summary_encode_token(FILE *out, const gchar *str)
 	return 0;
 }
 
-
 /**
  * camel_folder_summary_decode_token:
  * @in: input FILE pointer
@@ -3079,7 +3037,6 @@ summary_format_string (struct _camel_header_raw *h, const gchar *name, const gch
 	return str;
 }
 
-
 /**
  * camel_folder_summary_content_info_new:
  * @summary: a #CamelFolderSummary object
@@ -3394,7 +3351,6 @@ meta_message_info_save(CamelFolderSummary *s, FILE *out_meta, FILE *out, CamelMe
 	return ferror(out);
 }
 
-
 static CamelMIRecord *
 message_info_to_db (CamelFolderSummary *s, CamelMessageInfo *info)
 {
@@ -3468,11 +3424,9 @@ message_info_to_db (CamelFolderSummary *s, CamelMessageInfo *info)
 	record->usertags = tmp->str;
 	g_string_free (tmp, FALSE);
 
-
 	return record;
 }
 
-
 static gint
 message_info_save(CamelFolderSummary *s, FILE *out, CamelMessageInfo *info)
 {
@@ -3549,7 +3503,6 @@ message_info_free(CamelFolderSummary *s, CamelMessageInfo *info)
 	if (mi->headers)
 		camel_header_param_list_free (mi->headers);
 
-
 	if (s)
 #ifndef ALWAYS_ALLOC
 		e_memchunk_free(s->message_info_chunks, mi);
@@ -4099,7 +4052,6 @@ camel_flag_get(CamelFlag **list, const gchar *name)
 	return FALSE;
 }
 
-
 /**
  * camel_flag_set:
  * @list: the address of a #CamelFlag list
@@ -4142,7 +4094,6 @@ camel_flag_set(CamelFlag **list, const gchar *name, gboolean value)
 	return value;
 }
 
-
 /**
  * camel_flag_list_size:
  * @list: the address of a #CamelFlag list
@@ -4165,7 +4116,6 @@ camel_flag_list_size(CamelFlag **list)
 	return count;
 }
 
-
 /**
  * camel_flag_list_free:
  * @list: the address of a #CamelFlag list
@@ -4185,7 +4135,6 @@ camel_flag_list_free(CamelFlag **list)
 	*list = NULL;
 }
 
-
 /**
  * camel_flag_list_copy:
  * @to: the address of the #CamelFlag list to copy to
@@ -4227,7 +4176,6 @@ camel_flag_list_copy(CamelFlag **to, CamelFlag **from)
 	return changed;
 }
 
-
 /**
  * camel_tag_get:
  * @list: the address of a #CamelTag list
@@ -4251,7 +4199,6 @@ camel_tag_get(CamelTag **list, const gchar *name)
 	return NULL;
 }
 
-
 /**
  * camel_tag_set:
  * @list: the address of a #CamelTag list
@@ -4298,7 +4245,6 @@ camel_tag_set(CamelTag **list, const gchar *name, const gchar *value)
 	return FALSE;
 }
 
-
 /**
  * camel_tag_list_size:
  * @list: the address of a #CamelTag list
@@ -4327,7 +4273,6 @@ rem_tag(gchar *key, gchar *value, CamelTag **to)
 	camel_tag_set(to, key, NULL);
 }
 
-
 /**
  * camel_tag_list_copy:
  * @to: the address of the #CamelTag list to copy to
@@ -4370,7 +4315,6 @@ camel_tag_list_copy(CamelTag **to, CamelTag **from)
 	return changed;
 }
 
-
 /**
  * camel_tag_list_free:
  * @list: the address of a #CamelTag list
@@ -4407,7 +4351,6 @@ static struct flag_names_t {
 	{ NULL, 0 }
 };
 
-
 /**
  * camel_system_flag:
  * @name: name of a system flag
@@ -4428,7 +4371,6 @@ camel_system_flag (const gchar *name)
 	return 0;
 }
 
-
 /**
  * camel_system_flag_get:
  * @flags: bitwise system flags
@@ -4446,7 +4388,6 @@ camel_system_flag_get (guint32 flags, const gchar *name)
 	return flags & camel_system_flag (name);
 }
 
-
 /**
  * camel_message_info_new:
  * @summary: a #CamelFolderSummary object or %NULL
@@ -4481,7 +4422,6 @@ camel_message_info_new (CamelFolderSummary *s)
 		info = g_slice_alloc0 (sizeof(CamelMessageInfoBase));
 #endif
 
-
 	}
 
 	info->refcount = 1;
@@ -4493,7 +4433,6 @@ camel_message_info_new (CamelFolderSummary *s)
 	return info;
 }
 
-
 /**
  * camel_message_info_ref:
  * @info: a #CamelMessageInfo
@@ -4518,7 +4457,6 @@ camel_message_info_ref(gpointer o)
 	}
 }
 
-
 /**
  * camel_message_info_new_from_header:
  * @summary: a #CamelFolderSummary object or %NULL
@@ -4538,7 +4476,6 @@ camel_message_info_new_from_header(CamelFolderSummary *s, struct _camel_header_r
 		return message_info_new_from_header(NULL, header);
 }
 
-
 /**
  * camel_message_info_free:
  * @info: a #CamelMessageInfo
@@ -4634,7 +4571,6 @@ message_info_clone(CamelFolderSummary *s, const CamelMessageInfo *mi)
 	return (CamelMessageInfo *)to;
 }
 
-
 /**
  * camel_message_info_clone:
  * @info: a #CamelMessageInfo
@@ -4724,7 +4660,6 @@ info_user_tag(const CamelMessageInfo *mi, const gchar *id)
 	return camel_tag_get(&((CamelMessageInfoBase *)mi)->user_tags, id);
 }
 
-
 /**
  * camel_message_info_ptr:
  * @mi: a #CamelMessageInfo
@@ -4743,7 +4678,6 @@ camel_message_info_ptr(const CamelMessageInfo *mi, gint id)
 		return info_ptr(mi, id);
 }
 
-
 /**
  * camel_message_info_uint32:
  * @mi: a #CamelMessageInfo
@@ -4762,7 +4696,6 @@ camel_message_info_uint32(const CamelMessageInfo *mi, gint id)
 		return info_uint32(mi, id);
 }
 
-
 /**
  * camel_message_info_time:
  * @mi: a #CamelMessageInfo
@@ -4781,7 +4714,6 @@ camel_message_info_time(const CamelMessageInfo *mi, gint id)
 		return info_time(mi, id);
 }
 
-
 /**
  * camel_message_info_user_flag:
  * @mi: a #CamelMessageInfo
@@ -4800,7 +4732,6 @@ camel_message_info_user_flag(const CamelMessageInfo *mi, const gchar *id)
 		return info_user_flag(mi, id);
 }
 
-
 /**
  * camel_message_info_user_tag:
  * @mi: a #CamelMessageInfo
@@ -4878,8 +4809,6 @@ info_set_flags(CamelMessageInfo *info, guint32 flags, guint32 set)
 		camel_folder_change_info_free(changes);
 	}
 
-
-
 	d(printf("%d %d %d %d %d\n", mi->summary->unread_count, mi->summary->deleted_count, mi->summary->junk_count, mi->summary->junk_not_deleted_count, mi->summary->visible_count));
 	return TRUE;
 }
@@ -4931,7 +4860,6 @@ info_set_user_flag(CamelMessageInfo *info, const gchar *name, gboolean value)
 	return res;
 }
 
-
 /**
  * camel_message_info_set_user_flag:
  * @mi: a #CamelMessageInfo
@@ -4973,7 +4901,6 @@ info_set_user_tag(CamelMessageInfo *info, const gchar *name, const gchar *value)
 	return res;
 }
 
-
 /**
  * camel_message_info_set_user_tag:
  * @mi: a #CamelMessageInfo
@@ -5040,7 +4967,6 @@ camel_message_info_dump (CamelMessageInfo *mi)
 	/*camel_content_info_dump(mi->content, 0);*/
 }
 
-
 static void
 camel_folder_summary_class_init (CamelFolderSummaryClass *klass)
 {
@@ -5107,4 +5033,3 @@ camel_folder_summary_get_need_preview (CamelFolderSummary *summary)
 	return _PRIVATE(summary)->need_preview;
 }
 
-
diff --git a/camel/camel-folder-summary.h b/camel/camel-folder-summary.h
index 7fbffc8..6281d18 100644
--- a/camel/camel-folder-summary.h
+++ b/camel/camel-folder-summary.h
@@ -329,7 +329,6 @@ CamelFolderSummary      *camel_folder_summary_new	(struct _CamelFolder *folder);
 /* Deprecated */
 void camel_folder_summary_set_filename(CamelFolderSummary *summary, const gchar *filename);
 
-
 void camel_folder_summary_set_index(CamelFolderSummary *summary, CamelIndex *index);
 void camel_folder_summary_set_build_content(CamelFolderSummary *summary, gboolean state);
 
diff --git a/camel/camel-folder.c b/camel/camel-folder.c
index 2575084..6b3e064 100644
--- a/camel/camel-folder.c
+++ b/camel/camel-folder.c
@@ -80,7 +80,6 @@ static void expunge             (CamelFolder *folder,
 static gint folder_getv(CamelObject *object, CamelException *ex, CamelArgGetV *args);
 static void folder_free(CamelObject *o, guint32 tag, gpointer val);
 
-
 static void append_message (CamelFolder *folder, CamelMimeMessage *message,
 			    const CamelMessageInfo *info, gchar **appended_uid,
 			    CamelException *ex);
@@ -295,7 +294,6 @@ camel_folder_construct (CamelFolder *folder, CamelStore *parent_store,
 	}
 }
 
-
 static void
 folder_sync (CamelFolder *folder, gboolean expunge, CamelException *ex)
 {
@@ -303,7 +301,6 @@ folder_sync (CamelFolder *folder, gboolean expunge, CamelException *ex)
 		     camel_type_to_name (CAMEL_OBJECT_GET_TYPE (folder))));
 }
 
-
 /**
  * camel_folder_sync:
  * @folder: a #CamelFolder object
@@ -326,14 +323,12 @@ camel_folder_sync (CamelFolder *folder, gboolean expunge, CamelException *ex)
 	CAMEL_FOLDER_REC_UNLOCK(folder, lock);
 }
 
-
 static void
 refresh_info (CamelFolder *folder, CamelException *ex)
 {
 	/* No op */
 }
 
-
 /**
  * camel_folder_refresh_info:
  * @folder: a #CamelFolder object
@@ -527,7 +522,6 @@ get_name (CamelFolder *folder)
 	return folder->name;
 }
 
-
 /**
  * camel_folder_get_name:
  * @folder: a #CamelFolder object
@@ -545,14 +539,12 @@ camel_folder_get_name (CamelFolder *folder)
 	return CF_CLASS (folder)->get_name (folder);
 }
 
-
 static const gchar *
 get_full_name (CamelFolder *folder)
 {
 	return folder->full_name;
 }
 
-
 /**
  * camel_folder_get_full_name:
  * @folder: a #CamelFolder object
@@ -569,14 +561,12 @@ camel_folder_get_full_name (CamelFolder *folder)
 	return CF_CLASS (folder)->get_full_name (folder);
 }
 
-
 static CamelStore *
 get_parent_store (CamelFolder * folder)
 {
 	return folder->parent_store;
 }
 
-
 /**
  * camel_folder_get_parent_store:
  * @folder: a #CamelFolder object
@@ -591,7 +581,6 @@ camel_folder_get_parent_store (CamelFolder *folder)
 	return CF_CLASS (folder)->get_parent_store (folder);
 }
 
-
 static void
 expunge (CamelFolder *folder, CamelException *ex)
 {
@@ -599,7 +588,6 @@ expunge (CamelFolder *folder, CamelException *ex)
 		     camel_type_to_name (CAMEL_OBJECT_GET_TYPE (folder))));
 }
 
-
 /**
  * camel_folder_expunge:
  * @folder: a #CamelFolder object
@@ -628,7 +616,6 @@ get_message_count (CamelFolder *folder)
 	return camel_folder_summary_count(folder->summary);
 }
 
-
 /**
  * camel_folder_get_message_count:
  * @folder: a #CamelFolder object
@@ -647,7 +634,6 @@ camel_folder_get_message_count (CamelFolder *folder)
 	return ret;
 }
 
-
 /**
  * camel_folder_get_unread_message_count:
  * @folder: a #CamelFolder object
@@ -669,7 +655,6 @@ camel_folder_get_unread_message_count (CamelFolder *folder)
 	return count;
 }
 
-
 /**
  * camel_folder_get_deleted_message_count:
  * @folder: a #CamelFolder object
@@ -730,14 +715,12 @@ camel_folder_append_message (CamelFolder *folder, CamelMimeMessage *message,
 	CAMEL_FOLDER_REC_UNLOCK(folder, lock);
 }
 
-
 static guint32
 get_permanent_flags (CamelFolder *folder)
 {
 	return folder->permanent_flags;
 }
 
-
 /**
  * camel_folder_get_permanent_flags:
  * @folder: a #CamelFolder object
@@ -772,7 +755,6 @@ get_message_flags(CamelFolder *folder, const gchar *uid)
 	return flags;
 }
 
-
 /**
  * camel_folder_get_message_flags:
  * @folder: a #CamelFolder object
@@ -813,7 +795,6 @@ set_message_flags(CamelFolder *folder, const gchar *uid, guint32 flags, guint32
 	return res;
 }
 
-
 /**
  * camel_folder_set_message_flags:
  * @folder: a #CamelFolder object
@@ -864,7 +845,6 @@ get_message_user_flag(CamelFolder *folder, const gchar *uid, const gchar *name)
 	return ret;
 }
 
-
 /**
  * camel_folder_get_message_user_flag:
  * @folder: a #CamelFolder object
@@ -905,7 +885,6 @@ set_message_user_flag(CamelFolder *folder, const gchar *uid, const gchar *name,
 	camel_message_info_free(info);
 }
 
-
 /**
  * camel_folder_set_message_user_flag:
  * @folder: a #CamelFolder object
@@ -947,7 +926,6 @@ get_message_user_tag(CamelFolder *folder, const gchar *uid, const gchar *name)
 	return ret;
 }
 
-
 /**
  * camel_folder_get_message_user_tag:
  * @folder: a #CamelFolder object
@@ -987,7 +965,6 @@ set_message_user_tag(CamelFolder *folder, const gchar *uid, const gchar *name, c
 	camel_message_info_free(info);
 }
 
-
 /**
  * camel_folder_set_message_user_tag:
  * @folder: a #CamelFolder object
@@ -1018,7 +995,6 @@ get_message_info (CamelFolder *folder, const gchar *uid)
 	return camel_folder_summary_uid(folder->summary, uid);
 }
 
-
 /**
  * camel_folder_get_message_info:
  * @folder: a #CamelFolder object
@@ -1051,7 +1027,6 @@ free_message_info (CamelFolder *folder, CamelMessageInfo *info)
 	camel_message_info_free(info);
 }
 
-
 /**
  * camel_folder_free_message_info:
  * @folder: a #CamelFolder object
@@ -1077,7 +1052,6 @@ ref_message_info (CamelFolder *folder, CamelMessageInfo *info)
 	camel_message_info_ref(info);
 }
 
-
 /**
  * camel_folder_ref_message_info:
  * @folder: a #CamelFolder object
@@ -1097,7 +1071,6 @@ camel_folder_ref_message_info(CamelFolder *folder, CamelMessageInfo *info)
 	CF_CLASS (folder)->ref_message_info(folder, info);
 }
 
-
 /* TODO: is this function required anyway? */
 /**
  * camel_folder_has_summary_capability:
@@ -1115,7 +1088,6 @@ camel_folder_has_summary_capability (CamelFolder *folder)
 	return folder->folder_flags & CAMEL_FOLDER_HAS_SUMMARY_CAPABILITY;
 }
 
-
 /* UIDs stuff */
 
 static CamelMimeMessage *
@@ -1127,7 +1099,6 @@ get_message (CamelFolder *folder, const gchar *uid, CamelException *ex)
 	return NULL;
 }
 
-
 /**
  * camel_folder_get_message:
  * @folder: a #CamelFolder object
@@ -1197,7 +1168,6 @@ get_uids(CamelFolder *folder)
 	return camel_folder_summary_array (folder->summary);
 }
 
-
 /**
  * camel_folder_get_uids:
  * @folder: a #CamelFolder object
@@ -1232,7 +1202,6 @@ free_uids (CamelFolder *folder, GPtrArray *array)
 	g_ptr_array_free(array, TRUE);
 }
 
-
 /**
  * camel_folder_free_uids:
  * @folder: a #CamelFolder object
@@ -1248,7 +1217,6 @@ camel_folder_free_uids (CamelFolder *folder, GPtrArray *array)
 	CF_CLASS (folder)->free_uids (folder, array);
 }
 
-
 /**
  * Default: return the uids we are given.
  */
@@ -1331,7 +1299,6 @@ sort_uids (CamelFolder *folder, GPtrArray *uids)
 	g_qsort_with_data (uids->pdata, uids->len, sizeof (gpointer), cmp_array_uids, folder);
 }
 
-
 /**
  * camel_folder_sort_uids:
  * @folder: a #CamelFolder object
@@ -1347,7 +1314,6 @@ camel_folder_sort_uids (CamelFolder *folder, GPtrArray *uids)
 	CF_CLASS (folder)->sort_uids (folder, uids);
 }
 
-
 static GPtrArray *
 get_summary(CamelFolder *folder)
 {
@@ -1356,7 +1322,6 @@ get_summary(CamelFolder *folder)
 	return camel_folder_summary_array(folder->summary);
 }
 
-
 /**
  * camel_folder_get_summary:
  * @folder: a #CamelFolder object
@@ -1386,7 +1351,6 @@ free_summary(CamelFolder *folder, GPtrArray *summary)
 	g_ptr_array_free (summary, TRUE);
 }
 
-
 /**
  * camel_folder_free_summary:
  * @folder: a #CamelFolder object
@@ -1400,7 +1364,6 @@ camel_folder_free_summary(CamelFolder *folder, GPtrArray *array)
 	CF_CLASS(folder)->free_summary(folder, array);
 }
 
-
 /**
  * camel_folder_has_search_capability:
  * @folder: a #CamelFolder object
@@ -1431,7 +1394,6 @@ search_by_expression (CamelFolder *folder, const gchar *expression,
 	return NULL;
 }
 
-
 /**
  * camel_folder_search_by_expression:
  * @folder: a #CamelFolder object
@@ -1473,7 +1435,6 @@ count_by_expression (CamelFolder *folder, const gchar *expression,
 	return 0;
 }
 
-
 /**
  * camel_folder_count_by_expression:
  * @folder: a #CamelFolder object
@@ -1513,7 +1474,6 @@ search_by_uids(CamelFolder *folder, const gchar *exp, GPtrArray *uids, CamelExce
 	return NULL;
 }
 
-
 /**
  * camel_folder_search_by_uids:
  * @folder: a #CamelFolder object
@@ -1551,7 +1511,6 @@ search_free (CamelFolder *folder, GPtrArray *result)
 	g_ptr_array_free (result, TRUE);
 }
 
-
 /**
  * camel_folder_search_free:
  * @folder: a #CamelFolder object
@@ -1569,7 +1528,6 @@ camel_folder_search_free (CamelFolder *folder, GPtrArray *result)
 	CF_CLASS (folder)->search_free (folder, result);
 }
 
-
 static void
 transfer_message_to (CamelFolder *source, const gchar *uid, CamelFolder *dest,
 		     gchar **transferred_uid, gboolean delete_original,
@@ -1643,7 +1601,6 @@ transfer_messages_to (CamelFolder *source, GPtrArray *uids, CamelFolder *dest, G
 	camel_exception_clear(&local);
 }
 
-
 /**
  * camel_folder_transfer_messages_to:
  * @source: the source #CamelFolder object
@@ -1691,7 +1648,6 @@ delete (CamelFolder *folder)
 		camel_folder_summary_clear (folder->summary);
 }
 
-
 /**
  * camel_folder_delete:
  * @folder: a #CamelFolder object
@@ -1735,7 +1691,6 @@ folder_rename (CamelFolder *folder, const gchar *new)
 	folder->name = g_strdup(tmp?tmp+1:new);
 }
 
-
 /**
  * camel_folder_rename:
  * @folder: a #CamelFolder object
@@ -1772,7 +1727,6 @@ freeze (CamelFolder *folder)
 	CAMEL_FOLDER_UNLOCK(folder, change_lock);
 }
 
-
 /**
  * camel_folder_freeze:
  * @folder: a #CamelFolder
@@ -1839,7 +1793,6 @@ is_frozen (CamelFolder *folder)
 	return folder->priv->frozen != 0;
 }
 
-
 /**
  * camel_folder_is_frozen:
  * @folder: a #CamelFolder object
@@ -2076,7 +2029,6 @@ struct _CamelFolderChangeInfoPrivate {
 	struct _EMemPool *uid_pool;	/* pool used to store copies of uid strings */
 };
 
-
 /* Event hooks that block emission when frozen */
 static gboolean
 folder_changed (CamelObject *obj, gpointer event_data)
@@ -2174,7 +2126,6 @@ folder_changed (CamelObject *obj, gpointer event_data)
 	return TRUE;
 }
 
-
 /**
  * camel_folder_free_nop:
  * @folder: a #CamelFolder object
@@ -2190,7 +2141,6 @@ camel_folder_free_nop (CamelFolder *folder, GPtrArray *array)
 	;
 }
 
-
 /**
  * camel_folder_free_shallow:
  * @folder: a #CamelFolder object
@@ -2207,7 +2157,6 @@ camel_folder_free_shallow (CamelFolder *folder, GPtrArray *array)
 	g_ptr_array_free (array, TRUE);
 }
 
-
 /**
  * camel_folder_free_deep:
  * @folder: a #CamelFolder object
@@ -2227,7 +2176,6 @@ camel_folder_free_deep (CamelFolder *folder, GPtrArray *array)
 	g_ptr_array_free (array, TRUE);
 }
 
-
 /**
  * camel_folder_change_info_new:
  *
@@ -2257,7 +2205,6 @@ camel_folder_change_info_new(void)
 	return info;
 }
 
-
 /**
  * camel_folder_change_info_add_source:
  * @info: a #CamelFolderChangeInfo
@@ -2281,7 +2228,6 @@ camel_folder_change_info_add_source(CamelFolderChangeInfo *info, const gchar *ui
 		g_hash_table_insert(p->uid_source, e_mempool_strdup(p->uid_pool, uid), GINT_TO_POINTER (1));
 }
 
-
 /**
  * camel_folder_change_info_add_source_list:
  * @info: a #CamelFolderChangeInfo
@@ -2311,7 +2257,6 @@ camel_folder_change_info_add_source_list(CamelFolderChangeInfo *info, const GPtr
 	}
 }
 
-
 /**
  * camel_folder_change_info_add_update:
  * @info: a #CamelFolderChangeInfo
@@ -2342,7 +2287,6 @@ camel_folder_change_info_add_update(CamelFolderChangeInfo *info, const gchar *ui
 	}
 }
 
-
 /**
  * camel_folder_change_info_add_update_list:
  * @info: a #CamelFolderChangeInfo
@@ -2384,7 +2328,6 @@ change_info_remove(gchar *key, gpointer value, CamelFolderChangeInfo *info)
 	g_hash_table_insert(p->uid_stored, key, info->uid_removed);
 }
 
-
 /**
  * camel_folder_change_info_build_diff:
  * @info: a #CamelFolderChangeInfo
@@ -2449,7 +2392,6 @@ change_info_cat(CamelFolderChangeInfo *info, GPtrArray *source, void (*add)(Came
 		add(info, source->pdata[i]);
 }
 
-
 /**
  * camel_folder_change_info_cat:
  * @info: a #CamelFolderChangeInfo to append to
@@ -2505,7 +2447,6 @@ camel_folder_change_info_add_uid(CamelFolderChangeInfo *info, const gchar *uid)
 	g_hash_table_insert(p->uid_stored, olduid, info->uid_added);
 }
 
-
 /**
  * camel_folder_change_info_remove_uid:
  * @info: a #CamelFolderChangeInfo
@@ -2539,7 +2480,6 @@ camel_folder_change_info_remove_uid(CamelFolderChangeInfo *info, const gchar *ui
 	g_hash_table_insert(p->uid_stored, olduid, info->uid_removed);
 }
 
-
 /**
  * camel_folder_change_info_change_uid:
  * @info: a #CamelFolderChangeInfo
@@ -2568,7 +2508,6 @@ camel_folder_change_info_change_uid(CamelFolderChangeInfo *info, const gchar *ui
 	g_hash_table_insert(p->uid_stored, olduid, info->uid_changed);
 }
 
-
 /**
  * camel_folder_change_info_recent_uid:
  * @info: a #CamelFolderChangeInfo
@@ -2604,7 +2543,6 @@ camel_folder_change_info_changed(CamelFolderChangeInfo *info)
 	return (info->uid_added->len || info->uid_removed->len || info->uid_changed->len || info->uid_recent->len);
 }
 
-
 /**
  * camel_folder_change_info_clear:
  * @info: a #CamelFolderChangeInfo
@@ -2635,7 +2573,6 @@ camel_folder_change_info_clear(CamelFolderChangeInfo *info)
 	e_mempool_flush(p->uid_pool, TRUE);
 }
 
-
 /**
  * camel_folder_change_info_free:
  * @info: a #CamelFolderChangeInfo
diff --git a/camel/camel-folder.h b/camel/camel-folder.h
index 9c0b699..990c1a4 100644
--- a/camel/camel-folder.h
+++ b/camel/camel-folder.h
@@ -222,7 +222,6 @@ typedef struct {
 /* Standard Camel function */
 CamelType camel_folder_get_type (void);
 
-
 /* public methods */
 void               camel_folder_construct              (CamelFolder *folder,
 							CamelStore *parent_store,
@@ -237,17 +236,14 @@ void               camel_folder_sync                   (CamelFolder *folder,
 
 CamelStore *       camel_folder_get_parent_store       (CamelFolder *folder);
 
-
 /* delete operations */
 void		   camel_folder_expunge                (CamelFolder *folder,
 							CamelException *ex);
 
-
 /* folder name operations */
 const gchar *      camel_folder_get_name                (CamelFolder *folder);
 const gchar *      camel_folder_get_full_name           (CamelFolder *folder);
 
-
 /* various properties accessors */
 guint32		   camel_folder_get_permanent_flags    (CamelFolder *folder);
 
@@ -279,8 +275,6 @@ void		   camel_folder_set_message_user_tag  (CamelFolder *folder,
 						       const gchar *value);
 #endif /* CAMEL_DISABLE_DEPRECATED */
 
-
-
 /* message manipulation */
 void               camel_folder_append_message         (CamelFolder *folder,
 							CamelMimeMessage *message,
@@ -288,11 +282,9 @@ void               camel_folder_append_message         (CamelFolder *folder,
 							gchar **appended_uid,
 							CamelException *ex);
 
-
 /* summary related operations */
 gboolean           camel_folder_has_summary_capability (CamelFolder *folder);
 
-
 gint                camel_folder_get_message_count     (CamelFolder *folder);
 
 #ifndef CAMEL_DISABLE_DEPRECATED
diff --git a/camel/camel-gpg-context.c b/camel/camel-gpg-context.c
index eb71125..2db58e4 100644
--- a/camel/camel-gpg-context.c
+++ b/camel/camel-gpg-context.c
@@ -98,7 +98,6 @@ camel_gpg_context_new (CamelSession *session)
 	return cipher;
 }
 
-
 /**
  * camel_gpg_context_set_always_trust:
  * @ctx: gpg context
@@ -115,7 +114,6 @@ camel_gpg_context_set_always_trust (CamelGpgContext *ctx, gboolean always_trust)
 	ctx->always_trust = always_trust;
 }
 
-
 static const gchar *
 gpg_hash_to_id (CamelCipherContext *context, CamelCipherHash hash)
 {
@@ -159,7 +157,6 @@ gpg_id_to_hash (CamelCipherContext *context, const gchar *id)
 	return CAMEL_CIPHER_HASH_DEFAULT;
 }
 
-
 enum _GpgCtxMode {
 	GPG_CTX_MODE_SIGN,
 	GPG_CTX_MODE_VERIFY,
@@ -1216,7 +1213,6 @@ gpg_ctx_op_complete (struct _GpgCtx *gpg)
 {
 	return gpg->complete && gpg->seen_eof1 && gpg->seen_eof2;}
 
-
 #if 0
 static gboolean
 gpg_ctx_op_exited (struct _GpgCtx *gpg)
@@ -1281,8 +1277,6 @@ gpg_ctx_op_wait (struct _GpgCtx *gpg)
 #endif
 }
 
-
-
 static gint
 gpg_sign (CamelCipherContext *context, const gchar *userid, CamelCipherHash hash, CamelMimePart *ipart, CamelMimePart *opart, CamelException *ex)
 {
@@ -1392,7 +1386,6 @@ fail:
 	return res;
 }
 
-
 static gchar *
 swrite (CamelMimePart *sigpart)
 {
diff --git a/camel/camel-gpg-context.h b/camel/camel-gpg-context.h
index 3044f0b..3c67c28 100644
--- a/camel/camel-gpg-context.h
+++ b/camel/camel-gpg-context.h
@@ -20,7 +20,6 @@
  *
  */
 
-
 #ifndef __CAMEL_GPG_CONTEXT_H__
 #define __CAMEL_GPG_CONTEXT_H__
 
@@ -47,7 +46,6 @@ struct _CamelGpgContextClass {
 
 };
 
-
 CamelType camel_gpg_context_get_type (void);
 
 CamelCipherContext *camel_gpg_context_new (CamelSession *session);
diff --git a/camel/camel-html-parser.c b/camel/camel-html-parser.c
index 2265446..5c9ca8f 100644
--- a/camel/camel-html-parser.c
+++ b/camel/camel-html-parser.c
@@ -126,7 +126,6 @@ camel_html_parser_new (void)
 	return new;
 }
 
-
 void camel_html_parser_set_data(CamelHTMLParser *hp, const gchar *start, gint len, gint last)
 {
 	CamelHTMLParserPrivate *p = hp->priv;
@@ -376,7 +375,6 @@ static struct {
 	{ 8659,	"dArr",	/* downwards double arrow, U+21D3 ISOamsa */ },
 	{ 8660,	"hArr",	/* left right double arrow, U+21D4 ISOamsa */ },
 
-
 	{ 8704,	"forall",/* for all, U+2200 ISOtech */ },
 	{ 8706,	"part",	/* partial differential, U+2202 ISOtech */ },
 	{ 8707,	"exist",/* there exists, U+2203 ISOtech */ },
diff --git a/camel/camel-http-stream.h b/camel/camel-http-stream.h
index 890d7aa..7e3703a 100644
--- a/camel/camel-http-stream.h
+++ b/camel/camel-http-stream.h
@@ -20,7 +20,6 @@
  *
  */
 
-
 #ifndef __CAMEL_HTTP_STREAM_H__
 #define __CAMEL_HTTP_STREAM_H__
 
@@ -47,7 +46,6 @@ typedef enum {
 	/*CAMEL_HTTP_METHOD_CONNECT*/
 } CamelHttpMethod;
 
-
 typedef struct _CamelHttpStreamClass CamelHttpStreamClass;
 
 struct _CamelHttpStream {
diff --git a/camel/camel-iconv.c b/camel/camel-iconv.c
index 1c9d529..2533d1f 100644
--- a/camel/camel-iconv.c
+++ b/camel/camel-iconv.c
@@ -155,8 +155,6 @@ struct {
 	{ NULL,             NULL         }
 };
 
-
-
 /* Another copy of this trivial list implementation
    Why?  This stuff gets called a lot (potentially), should run fast,
    and g_list's are f@@#$ed up to make this a hassle */
@@ -192,7 +190,6 @@ static CamelDListNode *camel_dlist_remove(CamelDListNode *n)
         return n;
 }
 
-
 static const gchar *
 e_strdown (gchar *str)
 {
@@ -221,7 +218,6 @@ e_strup (gchar *str)
 	return str;
 }
 
-
 static void
 locale_parse_lang (const gchar *locale)
 {
@@ -578,7 +574,6 @@ camel_iconv_locale_charset (void)
 	return locale_charset;
 }
 
-
 const gchar *
 camel_iconv_locale_language (void)
 {
diff --git a/camel/camel-iconv.h b/camel/camel-iconv.h
index 39a9147..1199bb5 100644
--- a/camel/camel-iconv.h
+++ b/camel/camel-iconv.h
@@ -20,7 +20,6 @@
  *
  */
 
-
 #ifndef __CAMEL_ICONV_H__
 #define __CAMEL_ICONV_H__
 
diff --git a/camel/camel-internet-address.c b/camel/camel-internet-address.c
index 2fba26f..34ed78a 100644
--- a/camel/camel-internet-address.c
+++ b/camel/camel-internet-address.c
@@ -268,7 +268,6 @@ internet_remove	(CamelAddress *a, gint index)
 	g_ptr_array_remove_index(a->addresses, index);
 }
 
-
 /**
  * camel_internet_address_new:
  *
@@ -283,7 +282,6 @@ camel_internet_address_new (void)
 	return new;
 }
 
-
 /**
  * camel_internet_address_add:
  * @addr: a #CamelInternetAddress object
@@ -311,7 +309,6 @@ camel_internet_address_add (CamelInternetAddress *addr, const gchar *name, const
 	return index;
 }
 
-
 /**
  * camel_internet_address_get:
  * @addr: a #CamelInternetAddress object
@@ -341,7 +338,6 @@ camel_internet_address_get (const CamelInternetAddress *addr, gint index, const
 	return TRUE;
 }
 
-
 /**
  * camel_internet_address_find_name:
  * @addr: a #CamelInternetAddress object
@@ -373,7 +369,6 @@ camel_internet_address_find_name(CamelInternetAddress *addr, const gchar *name,
 	return -1;
 }
 
-
 /**
  * camel_internet_address_find_address:
  * @addr: a #CamelInternetAddress object
@@ -441,7 +436,6 @@ append:
 	g_string_append(out, addr);
 }
 
-
 /**
  * camel_internet_address_encode_address:
  * @len: the length of the line the address is being appended to
@@ -517,7 +511,6 @@ camel_internet_address_encode_address(gint *inlen, const gchar *real, const gcha
 	return ret;
 }
 
-
 /**
  * camel_internet_address_format_address:
  * @name: a name, quotes may be stripped from it
diff --git a/camel/camel-lock-helper.c b/camel/camel-lock-helper.c
index 81153a5..0807bff 100644
--- a/camel/camel-lock-helper.c
+++ b/camel/camel-lock-helper.c
@@ -344,7 +344,6 @@ gint main(gint argc, gchar **argv)
 			continue;
 		}
 
-
 		len = read_n(STDIN_FILENO, &msg, sizeof(msg));
 		if (len == 0)
 			break;
diff --git a/camel/camel-medium.c b/camel/camel-medium.c
index 3ab9925..5959058 100644
--- a/camel/camel-medium.c
+++ b/camel/camel-medium.c
@@ -22,7 +22,6 @@
  * USA
  */
 
-
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
@@ -94,7 +93,6 @@ camel_medium_finalize (CamelObject *object)
 		camel_object_unref (medium->content);
 }
 
-
 CamelType
 camel_medium_get_type (void)
 {
@@ -126,7 +124,6 @@ add_header (CamelMedium *medium, const gchar *name, gconstpointer value)
 	g_warning("No %s::add_header implemented, adding %s", camel_type_to_name(CAMEL_OBJECT_GET_TYPE(medium)), name);
 }
 
-
 /**
  * camel_medium_add_header:
  * @medium: a #CamelMedium object
@@ -151,7 +148,6 @@ set_header (CamelMedium *medium, const gchar *name, gconstpointer value)
 	g_warning("No %s::set_header implemented, setting %s", camel_type_to_name(CAMEL_OBJECT_GET_TYPE(medium)), name);
 }
 
-
 /**
  * camel_medium_set_header:
  * @medium: a #CamelMedium object
@@ -180,7 +176,6 @@ remove_header(CamelMedium *medium, const gchar *name)
 	g_warning("No %s::remove_header implemented, removing %s", camel_type_to_name(CAMEL_OBJECT_GET_TYPE(medium)), name);
 }
 
-
 /**
  * camel_medium_remove_header:
  * @medium: a #CamelMedium
@@ -198,7 +193,6 @@ camel_medium_remove_header(CamelMedium *medium, const gchar *name)
 	CM_CLASS(medium)->remove_header(medium, name);
 }
 
-
 static gconstpointer
 get_header(CamelMedium *medium, const gchar *name)
 {
@@ -206,7 +200,6 @@ get_header(CamelMedium *medium, const gchar *name)
 	return NULL;
 }
 
-
 /**
  * camel_medium_get_header:
  * @medium: a #CamelMedium object
@@ -230,7 +223,6 @@ camel_medium_get_header(CamelMedium *medium, const gchar *name)
 	return CM_CLASS (medium)->get_header (medium, name);
 }
 
-
 static GArray *
 get_headers(CamelMedium *medium)
 {
@@ -280,14 +272,12 @@ camel_medium_free_headers (CamelMedium *medium, GArray *headers)
 	CM_CLASS (medium)->free_headers (medium, headers);
 }
 
-
 static CamelDataWrapper *
 get_content_object(CamelMedium *medium)
 {
 	return medium->content;
 }
 
-
 /**
  * camel_medium_get_content_object:
  * @medium: a #CamelMedium object
@@ -305,7 +295,6 @@ camel_medium_get_content_object (CamelMedium *medium)
 	return CM_CLASS (medium)->get_content_object (medium);
 }
 
-
 static void
 set_content_object (CamelMedium *medium, CamelDataWrapper *content)
 {
@@ -315,7 +304,6 @@ set_content_object (CamelMedium *medium, CamelDataWrapper *content)
 	medium->content = content;
 }
 
-
 /**
  * camel_medium_set_content_object:
  * @medium: a #CamelMedium object
diff --git a/camel/camel-medium.h b/camel/camel-medium.h
index 527f5f8..096d67d 100644
--- a/camel/camel-medium.h
+++ b/camel/camel-medium.h
@@ -23,7 +23,6 @@
  * USA
  */
 
-
 #ifndef CAMEL_MEDIUM_H
 #define CAMEL_MEDIUM_H 1
 
diff --git a/camel/camel-mime-filter-basic.c b/camel/camel-mime-filter-basic.c
index 4815f37..502e2ad 100644
--- a/camel/camel-mime-filter-basic.c
+++ b/camel/camel-mime-filter-basic.c
@@ -56,7 +56,6 @@ camel_mime_filter_basic_init (CamelMimeFilterBasic *obj)
 	obj->save = 0;
 }
 
-
 CamelType
 camel_mime_filter_basic_get_type (void)
 {
@@ -253,7 +252,6 @@ donothing:
 	*outprespace = prespace;
 }
 
-
 /**
  * camel_mime_filter_basic_new:
  *
@@ -268,7 +266,6 @@ camel_mime_filter_basic_new (void)
 	return new;
 }
 
-
 /**
  * camel_mime_filter_basic_new_type:
  * @type: a #CamelMimeFilterBasicType type
diff --git a/camel/camel-mime-filter-bestenc.c b/camel/camel-mime-filter-bestenc.c
index b183a57..8db22ab 100644
--- a/camel/camel-mime-filter-bestenc.c
+++ b/camel/camel-mime-filter-bestenc.c
@@ -18,7 +18,6 @@
  * Boston, MA 02110-1301, USA.
  */
 
-
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
@@ -209,7 +208,6 @@ camel_mime_filter_bestenc_new (guint flags)
 	return new;
 }
 
-
 /**
  * camel_mime_filter_bestenc_get_best_encoding:
  * @filter: a #CamelMimeFilterBestenc object
@@ -272,7 +270,6 @@ camel_mime_filter_bestenc_get_best_encoding(CamelMimeFilterBestenc *filter, Came
 
 }
 
-
 /**
  * camel_mime_filter_bestenc_get_best_charset:
  * @filter: a #CamelMimeFilterBestenc object
@@ -288,7 +285,6 @@ camel_mime_filter_bestenc_get_best_charset (CamelMimeFilterBestenc *filter)
 	return camel_charset_best_name(&filter->charset);
 }
 
-
 /**
  * camel_mime_filter_bestenc_set_flags:
  * @filter: a #CamelMimeFilterBestenc object
diff --git a/camel/camel-mime-filter-bestenc.h b/camel/camel-mime-filter-bestenc.h
index c883e74..2fa499a 100644
--- a/camel/camel-mime-filter-bestenc.h
+++ b/camel/camel-mime-filter-bestenc.h
@@ -84,7 +84,6 @@ struct _CamelMimeFilterBestencClass {
 CamelType		camel_mime_filter_bestenc_get_type	(void);
 CamelMimeFilterBestenc      *camel_mime_filter_bestenc_new	(guint flags);
 
-
 CamelTransferEncoding	camel_mime_filter_bestenc_get_best_encoding(CamelMimeFilterBestenc *filter, CamelBestencEncoding required);
 const gchar *		camel_mime_filter_bestenc_get_best_charset(CamelMimeFilterBestenc *filter);
 void			camel_mime_filter_bestenc_set_flags(CamelMimeFilterBestenc *filter, guint flags);
diff --git a/camel/camel-mime-filter-canon.c b/camel/camel-mime-filter-canon.c
index 2fd5c0f..ebe9ec6 100644
--- a/camel/camel-mime-filter-canon.c
+++ b/camel/camel-mime-filter-canon.c
@@ -38,7 +38,6 @@ static void complete (CamelMimeFilter *f, const gchar *in, gsize len,
 		      gsize *outprespace);
 static void reset (CamelMimeFilter *f);
 
-
 static void
 camel_mime_filter_canon_class_init (CamelMimeFilterCanonClass *klass)
 {
@@ -179,7 +178,6 @@ reset (CamelMimeFilter *f)
 	/* no-op */
 }
 
-
 /**
  * camel_mime_filter_canon_new:
  * @flags: bitwise flags defining the behaviour of the filter
diff --git a/camel/camel-mime-filter-charset.c b/camel/camel-mime-filter-charset.c
index 9ba14b6..b2630c7 100644
--- a/camel/camel-mime-filter-charset.c
+++ b/camel/camel-mime-filter-charset.c
@@ -19,7 +19,6 @@
  * Boston, MA 02110-1301, USA.
  */
 
-
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
@@ -240,7 +239,6 @@ camel_mime_filter_charset_init (CamelMimeFilterCharset *obj)
 	obj->ic = (iconv_t)-1;
 }
 
-
 /**
  * camel_mime_filter_charset_new:
  *
@@ -254,7 +252,6 @@ camel_mime_filter_charset_new (void)
 	return CAMEL_MIME_FILTER_CHARSET (camel_object_new (camel_mime_filter_charset_get_type ()));
 }
 
-
 /**
  * camel_mime_filter_charset_new_convert:
  * @from_charset: charset to convert from
diff --git a/camel/camel-mime-filter-crlf.c b/camel/camel-mime-filter-crlf.c
index c256370..90c5f0b 100644
--- a/camel/camel-mime-filter-crlf.c
+++ b/camel/camel-mime-filter-crlf.c
@@ -29,7 +29,6 @@ static void complete (CamelMimeFilter *f, const gchar *in, gsize len,
 		      gsize *outprespace);
 static void reset (CamelMimeFilter *f);
 
-
 static void
 camel_mime_filter_crlf_class_init (CamelMimeFilterCRLFClass *klass)
 {
@@ -161,7 +160,6 @@ reset (CamelMimeFilter *f)
 	crlf->saw_dot = FALSE;
 }
 
-
 /**
  * camel_mime_filter_crlf_new:
  * @direction: encode vs decode
diff --git a/camel/camel-mime-filter-crlf.h b/camel/camel-mime-filter-crlf.h
index b0374a7..ec1f5a1 100644
--- a/camel/camel-mime-filter-crlf.h
+++ b/camel/camel-mime-filter-crlf.h
@@ -20,7 +20,6 @@
  * Boston, MA 02110-1301, USA.
  */
 
-
 #ifndef _CAMEL_MIME_FILTER_CRLF_H
 #define _CAMEL_MIME_FILTER_CRLF_H
 
diff --git a/camel/camel-mime-filter-enriched.c b/camel/camel-mime-filter-enriched.c
index 94cda93..ed3cac0 100644
--- a/camel/camel-mime-filter-enriched.c
+++ b/camel/camel-mime-filter-enriched.c
@@ -20,7 +20,6 @@
  *
  */
 
-
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
@@ -93,7 +92,6 @@ static struct {
 
 static GHashTable *enriched_hash = NULL;
 
-
 static void camel_mime_filter_enriched_class_init (CamelMimeFilterEnrichedClass *klass);
 static void camel_mime_filter_enriched_init       (CamelMimeFilterEnriched *filter);
 static void camel_mime_filter_enriched_finalize   (CamelObject *obj);
@@ -104,10 +102,8 @@ static void filter_complete (CamelMimeFilter *filter, const gchar *in, gsize len
 			     gchar **out, gsize *outlen, gsize *outprespace);
 static void filter_reset (CamelMimeFilter *filter);
 
-
 static CamelMimeFilterClass *parent_class = NULL;
 
-
 CamelType
 camel_mime_filter_enriched_get_type (void)
 {
@@ -162,7 +158,6 @@ camel_mime_filter_enriched_init (CamelMimeFilterEnriched *filter)
 	filter->nofill = 0;
 }
 
-
 #if 0
 static gboolean
 enriched_tag_needs_param (const gchar *tag)
@@ -564,7 +559,6 @@ filter_reset (CamelMimeFilter *filter)
 	enriched->nofill = 0;
 }
 
-
 /**
  * camel_mime_filter_enriched_new:
  * @flags: bitwise set of flags to specify filter behaviour
@@ -585,7 +579,6 @@ camel_mime_filter_enriched_new (guint32 flags)
 	return CAMEL_MIME_FILTER (new);
 }
 
-
 /**
  * camel_enriched_to_html:
  * @in: input textual string
diff --git a/camel/camel-mime-filter-enriched.h b/camel/camel-mime-filter-enriched.h
index 900f95c..e1d2345 100644
--- a/camel/camel-mime-filter-enriched.h
+++ b/camel/camel-mime-filter-enriched.h
@@ -20,7 +20,6 @@
  *
  */
 
-
 #ifndef __CAMEL_MIME_FILTER_ENRICHED_H__
 #define __CAMEL_MIME_FILTER_ENRICHED_H__
 
diff --git a/camel/camel-mime-filter-from.c b/camel/camel-mime-filter-from.c
index 76422e5..193cd82 100644
--- a/camel/camel-mime-filter-from.c
+++ b/camel/camel-mime-filter-from.c
@@ -19,7 +19,6 @@
  * Boston, MA 02110-1301, USA.
  */
 
-
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
@@ -169,7 +168,6 @@ camel_mime_filter_from_init (CamelMimeFilterFrom *obj)
 	;
 }
 
-
 /**
  * camel_mime_filter_from_new:
  *
@@ -196,7 +194,6 @@ gint main(gint argc, gchar **argv)
 
 	g_tk_init(&argc, &argv);
 
-
 	f = camel_mime_filter_from_new();
 
 	buffer = "This is a test\nFrom Someone\nTo someone. From Someone else, From\n From blah\nFromblah\nBye! \nFrom ";
@@ -212,7 +209,6 @@ gint main(gint argc, gchar **argv)
 	camel_mime_filter_complete(f, buffer, len, prespace, &buffer, &len, &prespace);
 	printf("complete = '%.*s'\n", len, buffer);
 
-
 	return 0;
 }
 
diff --git a/camel/camel-mime-filter-from.h b/camel/camel-mime-filter-from.h
index 6d0d356..3ec0f23 100644
--- a/camel/camel-mime-filter-from.h
+++ b/camel/camel-mime-filter-from.h
@@ -19,7 +19,6 @@
  * Boston, MA 02110-1301, USA.
  */
 
-
 #ifndef _CAMEL_MIME_FILTER_FROM_H
 #define _CAMEL_MIME_FILTER_FROM_H
 
diff --git a/camel/camel-mime-filter-gzip.c b/camel/camel-mime-filter-gzip.c
index 5dadbfb..edce501 100644
--- a/camel/camel-mime-filter-gzip.c
+++ b/camel/camel-mime-filter-gzip.c
@@ -20,7 +20,6 @@
  *
  */
 
-
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
@@ -32,7 +31,6 @@
 
 #include "camel-mime-filter-gzip.h"
 
-
 /* rfc1952 */
 
 enum {
@@ -99,10 +97,8 @@ static void filter_complete (CamelMimeFilter *filter, const gchar *in, gsize len
 			     gchar **out, gsize *outlen, gsize *outprespace);
 static void filter_reset (CamelMimeFilter *filter);
 
-
 static CamelMimeFilterClass *parent_class = NULL;
 
-
 CamelType
 camel_mime_filter_gzip_get_type (void)
 {
@@ -122,7 +118,6 @@ camel_mime_filter_gzip_get_type (void)
 	return type;
 }
 
-
 static void
 camel_mime_filter_gzip_class_init (CamelMimeFilterGZipClass *klass)
 {
@@ -158,7 +153,6 @@ camel_mime_filter_gzip_finalize (CamelObject *object)
 	g_free (priv);
 }
 
-
 static void
 gzip_filter (CamelMimeFilter *filter, const gchar *in, gsize len, gsize prespace,
 	     gchar **out, gsize *outlen, gsize *outprespace, gint flush)
@@ -432,7 +426,6 @@ filter_reset (CamelMimeFilter *filter)
 	priv->isize = 0;
 }
 
-
 /**
  * camel_mime_filter_gzip_new:
  * @mode: zip or unzip
diff --git a/camel/camel-mime-filter-gzip.h b/camel/camel-mime-filter-gzip.h
index 41ef84d..e32269a 100644
--- a/camel/camel-mime-filter-gzip.h
+++ b/camel/camel-mime-filter-gzip.h
@@ -20,7 +20,6 @@
  *
  */
 
-
 #ifndef __CAMEL_MIME_FILTER_GZIP_H__
 #define __CAMEL_MIME_FILTER_GZIP_H__
 
@@ -57,7 +56,6 @@ struct _CamelMimeFilterGZipClass {
 
 };
 
-
 CamelType camel_mime_filter_gzip_get_type (void);
 
 CamelMimeFilter *camel_mime_filter_gzip_new (CamelMimeFilterGZipMode mode, gint level);
diff --git a/camel/camel-mime-filter-html.c b/camel/camel-mime-filter-html.c
index 8e5e5fb..0d65710 100644
--- a/camel/camel-mime-filter-html.c
+++ b/camel/camel-mime-filter-html.c
@@ -60,7 +60,6 @@ static struct {
 	{ "h1", "\n" }, { "h2", "\n" }, { "h3", "\n" }, { "h4", "\n" }, { "h5", "\n" }, { "h6", "\n" },
 };
 
-
 static struct {
 	gchar *element;
 	gchar *remap;
@@ -69,10 +68,8 @@ static struct {
 };
 #endif
 
-
 /* ********************************************************************** */
 
-
 CamelType
 camel_mime_filter_html_get_type (void)
 {
@@ -184,7 +181,6 @@ camel_mime_filter_html_class_init (CamelMimeFilterHTMLClass *klass)
 	filter_class->complete = complete;
 }
 
-
 /**
  * camel_mime_filter_html_new:
  *
diff --git a/camel/camel-mime-filter-html.h b/camel/camel-mime-filter-html.h
index eca16d9..abe71fe 100644
--- a/camel/camel-mime-filter-html.h
+++ b/camel/camel-mime-filter-html.h
@@ -19,7 +19,6 @@
  * Boston, MA 02110-1301, USA.
  */
 
-
 #ifndef _CAMEL_MIME_FILTER_HTML_H
 #define _CAMEL_MIME_FILTER_HTML_H
 
diff --git a/camel/camel-mime-filter-index.c b/camel/camel-mime-filter-index.c
index 4e2e940..2fd5d38 100644
--- a/camel/camel-mime-filter-index.c
+++ b/camel/camel-mime-filter-index.c
@@ -115,7 +115,6 @@ camel_mime_filter_index_new (void)
 	return new;
 }
 
-
 /**
  * camel_mime_filter_index_new_index:
  * @index: a #CamelIndex object
@@ -139,7 +138,6 @@ camel_mime_filter_index_new_index (CamelIndex *index)
 
 /* Set the match name for any indexed words */
 
-
 /**
  * camel_mime_filter_index_set_name:
  * @filter: a #CamelMimeFilterIndex object
@@ -157,7 +155,6 @@ camel_mime_filter_index_set_name (CamelMimeFilterIndex *filter, CamelIndexName *
 		camel_object_ref (name);
 }
 
-
 /**
  * camel_mime_filter_index_set_index:
  * @filter: a #CamelMimeFilterIndex object
diff --git a/camel/camel-mime-filter-index.h b/camel/camel-mime-filter-index.h
index 53c3823..a39369f 100644
--- a/camel/camel-mime-filter-index.h
+++ b/camel/camel-mime-filter-index.h
@@ -19,7 +19,6 @@
  * Boston, MA 02110-1301, USA.
  */
 
-
 #ifndef _CAMEL_MIME_FILTER_INDEX_H
 #define _CAMEL_MIME_FILTER_INDEX_H
 
diff --git a/camel/camel-mime-filter-linewrap.c b/camel/camel-mime-filter-linewrap.c
index 425ec06..222c5e8 100644
--- a/camel/camel-mime-filter-linewrap.c
+++ b/camel/camel-mime-filter-linewrap.c
@@ -19,7 +19,6 @@
  * Boston, MA 02110-1301, USA.
  */
 
-
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
@@ -28,7 +27,6 @@
 
 #include "camel-mime-filter-linewrap.h"
 
-
 static void filter (CamelMimeFilter *f, const gchar *in, gsize len, gsize prespace,
 		    gchar **out, gsize *outlen, gsize *outprespace);
 static void complete (CamelMimeFilter *f, const gchar *in, gsize len,
@@ -36,7 +34,6 @@ static void complete (CamelMimeFilter *f, const gchar *in, gsize len,
 		      gsize *outprespace);
 static void reset (CamelMimeFilter *f);
 
-
 static void
 camel_mime_filter_linewrap_class_init (CamelMimeFilterLinewrapClass *klass)
 {
diff --git a/camel/camel-mime-filter-progress.c b/camel/camel-mime-filter-progress.c
index dacebf5..b4a41f1 100644
--- a/camel/camel-mime-filter-progress.c
+++ b/camel/camel-mime-filter-progress.c
@@ -20,7 +20,6 @@
  *
  */
 
-
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
@@ -120,7 +119,6 @@ camel_mime_filter_progress_class_init (CamelMimeFilterProgressClass *klass)
 	filter_class->complete = filter_complete;
 }
 
-
 /**
  * camel_mime_filter_progress_new:
  * @operation: a #CamelOperation
diff --git a/camel/camel-mime-filter-progress.h b/camel/camel-mime-filter-progress.h
index 355e3e3..7e21b4c 100644
--- a/camel/camel-mime-filter-progress.h
+++ b/camel/camel-mime-filter-progress.h
@@ -20,7 +20,6 @@
  *
  */
 
-
 #ifndef __CAMEL_MIME_FILTER_PROGRESS_H__
 #define __CAMEL_MIME_FILTER_PROGRESS_H__
 
@@ -49,7 +48,6 @@ struct _CamelMimeFilterProgressClass {
 
 };
 
-
 CamelType camel_mime_filter_progress_get_type (void);
 
 CamelMimeFilter *camel_mime_filter_progress_new (CamelOperation *operation, gsize total);
diff --git a/camel/camel-mime-filter-save.c b/camel/camel-mime-filter-save.c
index e8e51cd..707ea07 100644
--- a/camel/camel-mime-filter-save.c
+++ b/camel/camel-mime-filter-save.c
@@ -20,7 +20,6 @@
  *
  */
 
-
 #ifndef HAVE_CONFIG_H
 #include <config.h>
 #endif
@@ -35,7 +34,6 @@ static void complete (CamelMimeFilter *f, const gchar *in, gsize len,
 		      gsize *outprespace);
 static void reset (CamelMimeFilter *f);
 
-
 static void
 camel_mime_filter_save_class_init (CamelMimeFilterSaveClass *klass)
 {
@@ -93,7 +91,6 @@ reset (CamelMimeFilter *f)
 	/* no-op */
 }
 
-
 /**
  * camel_mime_filter_save_new:
  *
@@ -111,7 +108,6 @@ camel_mime_filter_save_new (void)
 	return (CamelMimeFilter *) save;
 }
 
-
 /**
  * camel_mime_filter_save_new_with_stream:
  * @stream: a #CamelStream object
diff --git a/camel/camel-mime-filter-save.h b/camel/camel-mime-filter-save.h
index 0f99d6b..2f63c99 100644
--- a/camel/camel-mime-filter-save.h
+++ b/camel/camel-mime-filter-save.h
@@ -20,7 +20,6 @@
  *
  */
 
-
 #ifndef __CAMEL_MIME_FILTER_SAVE_H__
 #define __CAMEL_MIME_FILTER_SAVE_H__
 
diff --git a/camel/camel-mime-filter-tohtml.c b/camel/camel-mime-filter-tohtml.c
index 4dda1ab..efff477 100644
--- a/camel/camel-mime-filter-tohtml.c
+++ b/camel/camel-mime-filter-tohtml.c
@@ -20,7 +20,6 @@
  *
  */
 
-
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
@@ -77,7 +76,6 @@ static void camel_mime_filter_tohtml_finalize   (CamelObject *obj);
 
 static CamelMimeFilterClass *camel_mime_filter_tohtml_parent;
 
-
 CamelType
 camel_mime_filter_tohtml_get_type (void)
 {
@@ -116,7 +114,6 @@ camel_mime_filter_tohtml_init (CamelMimeFilterToHTML *filter)
 	filter->pre_open = FALSE;
 }
 
-
 static gchar *
 check_size (CamelMimeFilter *filter, gchar *outptr, gchar **outend, gsize len)
 {
@@ -438,7 +435,6 @@ camel_mime_filter_tohtml_class_init (CamelMimeFilterToHTMLClass *klass)
 	filter_class->complete = filter_complete;
 }
 
-
 /**
  * camel_mime_filter_tohtml_new:
  * @flags: bitwise flags defining the behaviour
@@ -468,7 +464,6 @@ camel_mime_filter_tohtml_new (guint32 flags, guint32 colour)
 	return CAMEL_MIME_FILTER (new);
 }
 
-
 /**
  * camel_text_to_html:
  * @in: input text
diff --git a/camel/camel-mime-filter-tohtml.h b/camel/camel-mime-filter-tohtml.h
index 0f1f15f..f485536 100644
--- a/camel/camel-mime-filter-tohtml.h
+++ b/camel/camel-mime-filter-tohtml.h
@@ -20,7 +20,6 @@
  *
  */
 
-
 #ifndef __CAMEL_MIME_FILTER_TOHTML_H__
 #define __CAMEL_MIME_FILTER_TOHTML_H__
 
@@ -62,12 +61,10 @@ struct _CamelMimeFilterToHTMLClass {
 	CamelMimeFilterClass parent_class;
 };
 
-
 CamelType        camel_mime_filter_tohtml_get_type (void);
 
 CamelMimeFilter *camel_mime_filter_tohtml_new (guint32 flags, guint32 colour);
 
-
 /* utility functions to replace e_text_to_html */
 
 gchar *camel_text_to_html (const gchar *in, guint32 flags, guint32 colour);
diff --git a/camel/camel-mime-filter-windows.c b/camel/camel-mime-filter-windows.c
index dbf5cba..1a343b4 100644
--- a/camel/camel-mime-filter-windows.c
+++ b/camel/camel-mime-filter-windows.c
@@ -20,7 +20,6 @@
  *
  */
 
-
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
@@ -133,7 +132,6 @@ camel_mime_filter_windows_class_init (CamelMimeFilterWindowsClass *klass)
 	filter_class->complete = filter_complete;
 }
 
-
 /**
  * camel_mime_filter_windows_new:
  * @claimed_charset: ISO charset name
@@ -157,7 +155,6 @@ camel_mime_filter_windows_new (const gchar *claimed_charset)
 	return CAMEL_MIME_FILTER (new);
 }
 
-
 /**
  * camel_mime_filter_windows_is_windows_charset:
  * @filter: a #CamelMimeFilterWindows object
@@ -177,7 +174,6 @@ camel_mime_filter_windows_is_windows_charset (CamelMimeFilterWindows *filter)
 	return filter->is_windows;
 }
 
-
 /**
  * camel_mime_filter_windows_real_charset:
  * @filter: a #CamelMimeFilterWindows object
diff --git a/camel/camel-mime-filter-windows.h b/camel/camel-mime-filter-windows.h
index 9c74c8f..355946c 100644
--- a/camel/camel-mime-filter-windows.h
+++ b/camel/camel-mime-filter-windows.h
@@ -20,7 +20,6 @@
  *
  */
 
-
 #ifndef __CAMEL_MIME_FILTER_WINDOWS_H__
 #define __CAMEL_MIME_FILTER_WINDOWS_H__
 
@@ -47,7 +46,6 @@ struct _CamelMimeFilterWindowsClass {
 
 };
 
-
 CamelType camel_mime_filter_windows_get_type (void);
 
 CamelMimeFilter *camel_mime_filter_windows_new (const gchar *claimed_charset);
diff --git a/camel/camel-mime-filter-yenc.c b/camel/camel-mime-filter-yenc.c
index d81759c..9434acb 100644
--- a/camel/camel-mime-filter-yenc.c
+++ b/camel/camel-mime-filter-yenc.c
@@ -20,7 +20,6 @@
  *
  */
 
-
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
@@ -38,10 +37,8 @@ static void filter_complete (CamelMimeFilter *filter, const gchar *in, gsize len
 			     gchar **out, gsize *outlen, gsize *outprespace);
 static void filter_reset (CamelMimeFilter *filter);
 
-
 static CamelMimeFilterClass *parent_class = NULL;
 
-
 CamelType
 camel_mime_filter_yenc_get_type (void)
 {
@@ -61,7 +58,6 @@ camel_mime_filter_yenc_get_type (void)
 	return type;
 }
 
-
 static void
 camel_mime_filter_yenc_class_init (CamelMimeFilterYencClass *klass)
 {
@@ -82,7 +78,6 @@ camel_mime_filter_yenc_init (CamelMimeFilterYenc *filter, CamelMimeFilterYencCla
 	filter->crc = CAMEL_MIME_YENCODE_CRC_INIT;
 }
 
-
 /* here we do all of the basic yEnc filtering */
 static void
 filter_filter (CamelMimeFilter *filter, const gchar *in, gsize len, gsize prespace,
@@ -230,7 +225,6 @@ filter_reset (CamelMimeFilter *filter)
 	yenc->crc = CAMEL_MIME_YENCODE_CRC_INIT;
 }
 
-
 /**
  * camel_mime_filter_yenc_new:
  * @direction: encode direction
@@ -261,7 +255,6 @@ camel_mime_filter_yenc_new (CamelMimeFilterYencDirection direction)
 	return (CamelMimeFilter *) new;
 }
 
-
 /**
  * camel_mime_filter_yenc_set_state:
  * @yenc: a #CamelMimeFilterYenc object
@@ -277,7 +270,6 @@ camel_mime_filter_yenc_set_state (CamelMimeFilterYenc *yenc, gint state)
 	yenc->state = state;
 }
 
-
 /**
  * camel_mime_filter_yenc_set_crc:
  * @yenc: a #CamelMimeFilterYenc object
@@ -293,7 +285,6 @@ camel_mime_filter_yenc_set_crc (CamelMimeFilterYenc *yenc, guint32 crc)
 	yenc->crc = crc;
 }
 
-
 #if 0
 /* FIXME: once we parse out the yenc part id, we can re-enable this interface */
 /**
@@ -333,7 +324,6 @@ camel_mime_filter_yenc_get_pcrc (CamelMimeFilterYenc *yenc)
 	return CAMEL_MIME_YENCODE_CRC_FINAL (yenc->pcrc);
 }
 
-
 /**
  * camel_mime_filter_yenc_get_crc:
  * @yenc: a #CamelMimeFiletrYenc object
@@ -350,7 +340,6 @@ camel_mime_filter_yenc_get_crc (CamelMimeFilterYenc *yenc)
 	return CAMEL_MIME_YENCODE_CRC_FINAL (yenc->crc);
 }
 
-
 static const gint yenc_crc_table[256] = {
 	0x00000000, 0x77073096, 0xee0e612c, 0x990951ba, 0x076dc419, 0x706af48f, 0xe963a535, 0x9e6495a3,
 	0x0edb8832, 0x79dcb8a4, 0xe0d5e91e, 0x97d2d988, 0x09b64c2b, 0x7eb17cbd, 0xe7b82d07, 0x90bf1d91,
@@ -390,7 +379,6 @@ static const gint yenc_crc_table[256] = {
 
 #define YENC_NEWLINE_ESCAPE (CAMEL_MIME_YDECODE_STATE_EOLN | CAMEL_MIME_YDECODE_STATE_ESCAPE)
 
-
 /**
  * camel_ydecode_step:
  * @in: input buffer
@@ -470,7 +458,6 @@ camel_ydecode_step (const guchar *in, gsize inlen, guchar *out,
 	return outptr - out;
 }
 
-
 /**
  * camel_yencode_step:
  * @in: input buffer
@@ -536,7 +523,6 @@ camel_yencode_step (const guchar *in, gsize inlen, guchar *out,
 	return outptr - out;
 }
 
-
 /**
  * camel_yencode_close:
  * @in: input buffer
diff --git a/camel/camel-mime-filter-yenc.h b/camel/camel-mime-filter-yenc.h
index c5b5e0b..4a3ade1 100644
--- a/camel/camel-mime-filter-yenc.h
+++ b/camel/camel-mime-filter-yenc.h
@@ -20,7 +20,6 @@
  *
  */
 
-
 #ifndef __CAMEL_MIME_FILTER_YENC_H__
 #define __CAMEL_MIME_FILTER_YENC_H__
 
@@ -79,7 +78,6 @@ struct _CamelMimeFilterYencClass {
 
 };
 
-
 CamelType camel_mime_filter_yenc_get_type (void);
 
 CamelMimeFilter *camel_mime_filter_yenc_new (CamelMimeFilterYencDirection direction);
@@ -91,7 +89,6 @@ void camel_mime_filter_yenc_set_crc (CamelMimeFilterYenc *yenc, guint32 crc);
 guint32 camel_mime_filter_yenc_get_pcrc (CamelMimeFilterYenc *yenc);
 guint32 camel_mime_filter_yenc_get_crc (CamelMimeFilterYenc *yenc);
 
-
 gsize camel_ydecode_step  (const guchar *in, gsize inlen, guchar *out,
 			    gint *state, guint32 *pcrc, guint32 *crc);
 gsize camel_yencode_step  (const guchar *in, gsize inlen, guchar *out,
diff --git a/camel/camel-mime-filter.c b/camel/camel-mime-filter.c
index d06f8ff..af4e090 100644
--- a/camel/camel-mime-filter.c
+++ b/camel/camel-mime-filter.c
@@ -103,7 +103,6 @@ complete(CamelMimeFilter *mf, const gchar *in, gsize len, gsize prespace, gchar
 	/* default - do nothing */
 }
 
-
 /**
  * camel_mime_filter_new:
  *
@@ -195,7 +194,6 @@ static void filter_run(CamelMimeFilter *f,
 
 }
 
-
 /**
  * camel_mime_filter_filter:
  * @filter: a #CamelMimeFilter object
@@ -220,7 +218,6 @@ camel_mime_filter_filter (CamelMimeFilter *filter,
 		g_error("Filter function unplmenented in class");
 }
 
-
 /**
  * camel_mime_filter_complete:
  * @filter: a #CamelMimeFilter object
@@ -246,7 +243,6 @@ camel_mime_filter_complete (CamelMimeFilter *filter,
 		filter_run(filter, in, len, prespace, out, outlen, outprespace, FCLASS(filter)->complete);
 }
 
-
 /**
  * camel_mime_filter_reset:
  * @filter: a #CamelMimeFilter object
@@ -264,7 +260,6 @@ camel_mime_filter_reset(CamelMimeFilter *filter)
 	filter->backlen = 0;
 }
 
-
 /**
  * camel_mime_filter_backup:
  * @filter: a #camelMimeFilter object
@@ -289,7 +284,6 @@ camel_mime_filter_backup(CamelMimeFilter *filter, const gchar *data, gsize lengt
 	memcpy(filter->backbuf, data, length);
 }
 
-
 /**
  * camel_mime_filter_set_size:
  * @filter: a #camelMimeFilter object
diff --git a/camel/camel-mime-message.c b/camel/camel-mime-message.c
index 62cee06..b50a97e 100644
--- a/camel/camel-mime-message.c
+++ b/camel/camel-mime-message.c
@@ -195,7 +195,6 @@ unref_recipient (gpointer key, gpointer value, gpointer user_data)
 	camel_object_unref (value);
 }
 
-
 /**
  * camel_mime_message_new:
  *
@@ -214,7 +213,6 @@ camel_mime_message_new (void)
 
 /* **** Date: */
 
-
 /**
  * camel_mime_message_set_date:
  * @message: a #CamelMimeMessage object
@@ -246,7 +244,6 @@ camel_mime_message_set_date (CamelMimeMessage *message,  time_t date, gint offse
 	g_free (datestr);
 }
 
-
 /**
  * camel_mime_message_get_date:
  * @message: a #CamelMimeMessage object
@@ -265,7 +262,6 @@ camel_mime_message_get_date (CamelMimeMessage *msg, gint *offset)
 	return msg->date;
 }
 
-
 /**
  * camel_mime_message_get_date_received:
  * @message: a #CamelMimeMessage object
@@ -324,7 +320,6 @@ camel_mime_message_set_message_id (CamelMimeMessage *mime_message, const gchar *
 	g_free (id);
 }
 
-
 /**
  * camel_mime_message_get_message_id:
  * @message: a #CamelMimeMessage object
@@ -343,7 +338,6 @@ camel_mime_message_get_message_id (CamelMimeMessage *mime_message)
 
 /* **** Reply-To: */
 
-
 /**
  * camel_mime_message_set_reply_to:
  * @message: a #CamelMimeMessage object
@@ -374,7 +368,6 @@ camel_mime_message_set_reply_to (CamelMimeMessage *msg, const CamelInternetAddre
 	g_free (addr);
 }
 
-
 /**
  * camel_mime_message_get_reply_to:
  * @message: a #CamelMimeMessage object
@@ -423,7 +416,6 @@ camel_mime_message_set_subject (CamelMimeMessage *message, const gchar *subject)
 	g_free (text);
 }
 
-
 /**
  * camel_mime_message_get_subject:
  * @message: a #CamelMimeMessage object
@@ -476,7 +468,6 @@ camel_mime_message_set_from (CamelMimeMessage *msg, const CamelInternetAddress *
 	g_free(addr);
 }
 
-
 /**
  * camel_mime_message_get_from:
  * @message: a #CamelMimeMessage object
@@ -534,7 +525,6 @@ camel_mime_message_set_recipients(CamelMimeMessage *mime_message, const gchar *t
 	g_free(text);
 }
 
-
 /**
  * camel_mime_message_get_recipients:
  * @message: a #CamelMimeMessage object
@@ -552,7 +542,6 @@ camel_mime_message_get_recipients (CamelMimeMessage *mime_message, const gchar *
 	return g_hash_table_lookup (mime_message->recipients, type);
 }
 
-
 void
 camel_mime_message_set_source (CamelMimeMessage *mime_message, const gchar *src)
 {
@@ -821,7 +810,6 @@ check_8bit (CamelMimeMessage *msg, CamelMimePart *part, gpointer data)
 	return !(*has8bit);
 }
 
-
 /**
  * camel_mime_message_has_8bit_parts:
  * @message: a #CamelMimeMessage object
@@ -1007,7 +995,6 @@ best_encoding (CamelMimeMessage *msg, CamelMimePart *part, gpointer datap)
 	return TRUE;
 }
 
-
 /**
  * camel_mime_message_set_best_encoding:
  * @message: a #CamelMimeMessage object
@@ -1036,7 +1023,6 @@ camel_mime_message_set_best_encoding (CamelMimeMessage *msg, CamelBestencRequire
 	camel_mime_message_foreach_part (msg, best_encoding, &data);
 }
 
-
 /**
  * camel_mime_message_encode_8bit_parts:
  * @message: a #CamelMimeMessage object
@@ -1049,7 +1035,6 @@ camel_mime_message_encode_8bit_parts (CamelMimeMessage *mime_message)
 	camel_mime_message_set_best_encoding (mime_message, CAMEL_BESTENC_GET_ENCODING, CAMEL_BESTENC_7BIT);
 }
 
-
 struct _check_content_id {
 	CamelMimePart *part;
 	const gchar *content_id;
@@ -1073,7 +1058,6 @@ check_content_id (CamelMimeMessage *message, CamelMimePart *part, gpointer data)
 	return !found;
 }
 
-
 /**
  * camel_mime_message_get_part_by_content_id:
  * @message: a #CamelMimeMessage object
@@ -1110,7 +1094,6 @@ static const gchar tz_days[][4] = {
 	"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"
 };
 
-
 /**
  * camel_mime_message_build_mbox_from:
  * @message: a #CamelMimeMessage object
diff --git a/camel/camel-mime-message.h b/camel/camel-mime-message.h
index 84bd8eb..6016f89 100644
--- a/camel/camel-mime-message.h
+++ b/camel/camel-mime-message.h
@@ -21,7 +21,6 @@
  * USA
  */
 
-
 #ifndef CAMEL_MIME_MESSAGE_H
 #define CAMEL_MIME_MESSAGE_H 1
 
@@ -77,12 +76,9 @@ typedef struct {
 
 } CamelMimeMessageClass;
 
-
-
 /* Standard Camel function */
 CamelType                   camel_mime_message_get_type           (void);
 
-
 /* public methods */
 CamelMimeMessage           *camel_mime_message_new                (void);
 void                        camel_mime_message_set_date           (CamelMimeMessage           *message,
@@ -116,7 +112,6 @@ void                        camel_mime_message_set_source         (CamelMimeMess
 								   const gchar                 *identity);
 const gchar                 *camel_mime_message_get_source         (CamelMimeMessage           *message);
 
-
 /* utility functions */
 gboolean                    camel_mime_message_has_8bit_parts     (CamelMimeMessage           *message);
 void                        camel_mime_message_set_best_encoding  (CamelMimeMessage           *message,
diff --git a/camel/camel-mime-parser.c b/camel/camel-mime-parser.c
index 15b8645..e851ee7 100644
--- a/camel/camel-mime-parser.c
+++ b/camel/camel-mime-parser.c
@@ -247,7 +247,6 @@ camel_mime_parser_new (void)
 	return new;
 }
 
-
 /**
  * camel_mime_parser_filter_add:
  * @m:
@@ -1404,7 +1403,6 @@ normal_exit:
 	return part;
 }
 
-
 static void
 folder_scan_close(struct _header_scan_state *s)
 {
@@ -1420,7 +1418,6 @@ folder_scan_close(struct _header_scan_state *s)
 	g_free(s);
 }
 
-
 static struct _header_scan_state *
 folder_scan_init(void)
 {
diff --git a/camel/camel-mime-parser.h b/camel/camel-mime-parser.h
index 8738b37..c078712 100644
--- a/camel/camel-mime-parser.h
+++ b/camel/camel-mime-parser.h
@@ -19,7 +19,6 @@
  * Boston, MA 02110-1301, USA.
  */
 
-
 #ifndef _CAMEL_MIME_PARSER_H
 #define _CAMEL_MIME_PARSER_H
 
diff --git a/camel/camel-mime-part-utils.h b/camel/camel-mime-part-utils.h
index 9a75206..45a5a6e 100644
--- a/camel/camel-mime-part-utils.h
+++ b/camel/camel-mime-part-utils.h
@@ -1,7 +1,6 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /* camel-mime-part-utils : Utility for mime parsing and so on */
 
-
 /*
  *
  * Author :
diff --git a/camel/camel-mime-part.c b/camel/camel-mime-part.c
index 88fb732..2c16dbb 100644
--- a/camel/camel-mime-part.c
+++ b/camel/camel-mime-part.c
@@ -23,7 +23,6 @@
  * USA
  */
 
-
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
@@ -62,7 +61,6 @@ typedef enum {
 	HEADER_CONTENT_TYPE
 } CamelHeaderType;
 
-
 static GHashTable *header_name_table;
 static GHashTable *header_formatted_table;
 
@@ -98,7 +96,6 @@ static gssize write_references(CamelStream *stream, struct _camel_header_raw *h)
 /*static gint write_fold(CamelStream *stream, struct _camel_header_raw *h);*/
 static gssize write_raw(CamelStream *stream, struct _camel_header_raw *h);
 
-
 /* loads in a hash table the set of header names we */
 /* recognize and associate them with a unique enum  */
 /* identifier (see CamelHeaderType above)           */
@@ -212,7 +209,6 @@ camel_mime_part_init (gpointer object, gpointer klass)
 	mime_part->encoding = CAMEL_TRANSFER_ENCODING_DEFAULT;
 }
 
-
 static void
 camel_mime_part_finalize (CamelObject *object)
 {
@@ -228,8 +224,6 @@ camel_mime_part_finalize (CamelObject *object)
 	camel_header_raw_clear(&mime_part->headers);
 }
 
-
-
 CamelType
 camel_mime_part_get_type (void)
 {
@@ -249,7 +243,6 @@ camel_mime_part_get_type (void)
 	return type;
 }
 
-
 /* **** */
 
 static gboolean
@@ -391,7 +384,6 @@ camel_mime_part_set_description (CamelMimePart *mime_part, const gchar *descript
 	g_free (text);
 }
 
-
 /**
  * camel_mime_part_get_description:
  * @mime_part: a #CamelMimePart object
@@ -418,7 +410,6 @@ set_disposition (CamelMimePart *mime_part, const gchar *disposition)
 		mime_part->disposition = NULL;
 }
 
-
 /**
  * camel_mime_part_set_disposition:
  * @mime_part: a #CamelMimePart object
@@ -447,7 +438,6 @@ camel_mime_part_set_disposition (CamelMimePart *mime_part, const gchar *disposit
 	g_free(text);
 }
 
-
 /**
  * camel_mime_part_get_disposition:
  * @mime_part: a #CamelMimePart object
@@ -465,7 +455,6 @@ camel_mime_part_get_disposition (CamelMimePart *mime_part)
 		return NULL;
 }
 
-
 /* **** Content-Disposition: filename="xxx" */
 
 /**
@@ -500,7 +489,6 @@ camel_mime_part_set_filename (CamelMimePart *mime_part, const gchar *filename)
 	g_free (str);
 }
 
-
 /**
  * camel_mime_part_get_filename:
  * @mime_part: a #CamelMimePart object
@@ -521,7 +509,6 @@ camel_mime_part_get_filename (CamelMimePart *mime_part)
 	return camel_content_type_param (((CamelDataWrapper *) mime_part)->mime_type, "name");
 }
 
-
 /* **** Content-ID: */
 
 /**
@@ -547,7 +534,6 @@ camel_mime_part_set_content_id (CamelMimePart *mime_part, const gchar *contentid
 	g_free (cid);
 }
 
-
 /**
  * camel_mime_part_get_content_id:
  * @mime_part: a #CamelMimePart object
@@ -577,7 +563,6 @@ camel_mime_part_set_content_MD5 (CamelMimePart *mime_part, const gchar *md5)
 	camel_medium_set_header (CAMEL_MEDIUM (mime_part), "Content-MD5", md5);
 }
 
-
 /**
  * camel_mime_part_get_content_MD5:
  * @mime_part: a #CamelMimePart object
@@ -594,7 +579,6 @@ camel_mime_part_get_content_MD5 (CamelMimePart *mime_part)
 
 /* **** Content-Location: */
 
-
 /**
  * camel_mime_part_set_content_location:
  * @mime_part: a #CamelMimePart object
@@ -609,7 +593,6 @@ camel_mime_part_set_content_location (CamelMimePart *mime_part, const gchar *loc
 	camel_medium_set_header (CAMEL_MEDIUM (mime_part), "Content-Location", location);
 }
 
-
 /**
  * camel_mime_part_get_content_location:
  * @mime_part: a #CamelMimePart object
@@ -626,7 +609,6 @@ camel_mime_part_get_content_location (CamelMimePart *mime_part)
 
 /* **** Content-Transfer-Encoding: */
 
-
 /**
  * camel_mime_part_set_encoding:
  * @mime_part: a #CamelMimePart object
@@ -645,7 +627,6 @@ camel_mime_part_set_encoding (CamelMimePart *mime_part,
 				 "Content-Transfer-Encoding", text);
 }
 
-
 /**
  * camel_mime_part_get_encoding:
  * @mime_part: a #CamelMimePart object
@@ -662,7 +643,6 @@ camel_mime_part_get_encoding (CamelMimePart *mime_part)
 
 /* FIXME: do something with this stuff ... */
 
-
 /**
  * camel_mime_part_set_content_languages:
  * @mime_part: a #CamelMimePart object
@@ -681,7 +661,6 @@ camel_mime_part_set_content_languages (CamelMimePart *mime_part, GList *content_
 	/* FIXME: translate to a header and set it */
 }
 
-
 /**
  * camel_mime_part_get_content_languages:
  * @mime_part: a #CamelMimePart object
@@ -696,7 +675,6 @@ camel_mime_part_get_content_languages (CamelMimePart *mime_part)
 	return mime_part->content_languages;
 }
 
-
 /* **** */
 
 /* **** Content-Type: */
@@ -715,7 +693,6 @@ camel_mime_part_set_content_type (CamelMimePart *mime_part, const gchar *content
 				 "Content-Type", content_type);
 }
 
-
 /**
  * camel_mime_part_get_content_type:
  * @mime_part: a #CamelMimePart object
diff --git a/camel/camel-mime-part.h b/camel/camel-mime-part.h
index 86478e0..0b92db9 100644
--- a/camel/camel-mime-part.h
+++ b/camel/camel-mime-part.h
@@ -23,7 +23,6 @@
  * USA
  */
 
-
 #ifndef CAMEL_MIME_PART_H
 #define CAMEL_MIME_PART_H 1
 
diff --git a/camel/camel-mime-utils.c b/camel/camel-mime-utils.c
index 13b660b..165d5b8 100644
--- a/camel/camel-mime-utils.c
+++ b/camel/camel-mime-utils.c
@@ -114,7 +114,6 @@ camel_base64_encode_close(guchar *in, gsize inlen, gboolean break_lines, guchar
 	return bytes;
 }
 
-
 /**
  * camel_base64_encode_step:
  * @in: input stream
@@ -137,7 +136,6 @@ camel_base64_encode_step(guchar *in, gsize len, gboolean break_lines, guchar *ou
 	return g_base64_encode_step (in, len, break_lines, (gchar *) out, state, save);
 }
 
-
 /**
  * camel_base64_decode_step: decode a chunk of base64 encoded data
  * @in: input stream
@@ -156,7 +154,6 @@ camel_base64_decode_step(guchar *in, gsize len, guchar *out, gint *state, guint
 	return g_base64_decode_step ((gchar *) in, len, out, state, save);
 }
 
-
 /**
  * camel_base64_encode_simple:
  * @data: binary stream of data to encode
@@ -172,7 +169,6 @@ camel_base64_encode_simple (const gchar *data, gsize len)
 	return g_base64_encode ((const guchar *) data, len);
 }
 
-
 /**
  * camel_base64_decode_simple:
  * @data: data to decode
@@ -279,7 +275,6 @@ camel_uuencode_close (guchar *in, gsize len, guchar *out, guchar *uubuf, gint *s
 	return outptr - out;
 }
 
-
 /**
  * camel_uuencode_step:
  * @in: input stream
@@ -357,7 +352,6 @@ camel_uuencode_step (guchar *in, gsize len, guchar *out, guchar *uubuf, gint *st
 	return outptr - out;
 }
 
-
 /**
  * camel_uudecode_step:
  * @in: input stream
@@ -456,7 +450,6 @@ camel_uudecode_step (guchar *in, gsize len, guchar *out, gint *state, guint32 *s
 	return outptr - out;
 }
 
-
 /**
  * camel_quoted_encode_close:
  * @in: input stream
@@ -499,7 +492,6 @@ camel_quoted_encode_close(guchar *in, gsize len, guchar *out, gint *state, gint
 	return outptr-out;
 }
 
-
 /**
  * camel_quoted_encode_step:
  * @in: input stream
@@ -776,7 +768,6 @@ quoted_encode (const guchar *in, gsize len, guchar *out, unsigned short safemask
 	return (outptr - out);
 }
 
-
 static void
 header_decode_lwsp(const gchar **in)
 {
@@ -1319,7 +1310,6 @@ header_decode_text (const gchar *in, gint ctext, const gchar *default_charset)
 	return decoded;
 }
 
-
 /**
  * camel_header_decode_string:
  * @in: input header value string
@@ -1339,7 +1329,6 @@ camel_header_decode_string (const gchar *in, const gchar *default_charset)
 	return header_decode_text (in, FALSE, default_charset);
 }
 
-
 /**
  * camel_header_format_ctext:
  * @in: input header value string
@@ -1472,7 +1461,6 @@ rfc2047_encode_word(GString *outstring, const gchar *in, gsize len, const gchar
 		camel_iconv_close (ic);
 }
 
-
 /* TODO: Should this worry about quotes?? */
 /**
  * camel_header_encode_string:
@@ -1875,7 +1863,6 @@ camel_header_encode_phrase (const guchar *in)
 	return outstr;
 }
 
-
 /* these are all internal parser functions */
 
 static gchar *
@@ -1896,7 +1883,6 @@ decode_token (const gchar **in)
 	}
 }
 
-
 /**
  * camel_header_token_decode:
  * @in: input string
@@ -2122,7 +2108,6 @@ rfc2184_decode (const gchar *in, gsize len)
 	return decoded;
 }
 
-
 /**
  * camel_header_param:
  * @params: parameters
@@ -2142,7 +2127,6 @@ camel_header_param (struct _camel_header_param *p, const gchar *name)
 	return NULL;
 }
 
-
 /**
  * camel_header_set_param:
  * @paramsp: poinetr to a list of params
@@ -2190,7 +2174,6 @@ camel_header_set_param (struct _camel_header_param **l, const gchar *name, const
 	return pn;
 }
 
-
 /**
  * camel_content_type_param:
  * @content_type: a #CamelContentType
@@ -2209,7 +2192,6 @@ camel_content_type_param (CamelContentType *t, const gchar *name)
 	return camel_header_param (t->params, name);
 }
 
-
 /**
  * camel_content_type_set_param:
  * @content_type: a #CamelContentType
@@ -2224,7 +2206,6 @@ camel_content_type_set_param (CamelContentType *t, const gchar *name, const gcha
 	camel_header_set_param (&t->params, name, value);
 }
 
-
 /**
  * camel_content_type_is:
  * @content_type: A content type specifier, or %NULL.
@@ -2254,7 +2235,6 @@ camel_content_type_is(CamelContentType *ct, const gchar *type, const gchar *subt
 			|| !strcmp("*", subtype))));
 }
 
-
 /**
  * camel_header_param_list_free:
  * @params: a list of params
@@ -2275,7 +2255,6 @@ camel_header_param_list_free(struct _camel_header_param *p)
 	}
 }
 
-
 /**
  * camel_content_type_new:
  * @type: the major type of the new content-type
@@ -2299,7 +2278,6 @@ camel_content_type_new(const gchar *type, const gchar *subtype)
 	return t;
 }
 
-
 /**
  * camel_content_type_ref:
  * @content_type: a #CamelContentType
@@ -2313,7 +2291,6 @@ camel_content_type_ref(CamelContentType *ct)
 		ct->refcount++;
 }
 
-
 /**
  * camel_content_type_unref:
  * @content_type: a #CamelContentType
@@ -2760,7 +2737,6 @@ header_msgid_decode_internal(const gchar **in)
 	return msgid;
 }
 
-
 /**
  * camel_header_msgid_decode:
  * @in: input string
@@ -2778,7 +2754,6 @@ camel_header_msgid_decode(const gchar *in)
 	return header_msgid_decode_internal(&in);
 }
 
-
 /**
  * camel_header_contentid_decode:
  * @in: input string
@@ -3647,7 +3622,6 @@ camel_content_disposition_format(CamelContentDisposition *d)
 	return ret;
 }
 
-
 /* date parser macros */
 #define NUMERIC_CHARS          "1234567890"
 #define WEEKDAY_CHARS          "SundayMondayTuesdayWednesdayThursdayFridaySaturday"
@@ -3714,7 +3688,6 @@ static const gchar tm_days [][4] = {
 	"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"
 };
 
-
 /**
  * camel_header_format_date:
  * @date: time_t date representation
@@ -4069,7 +4042,6 @@ parse_rfc822_date (struct _date_token *tokens, gint *tzone)
 	return t;
 }
 
-
 #define date_token_mask(t)  (((struct _date_token *) t)->mask)
 #define is_numeric(t)       ((date_token_mask (t) & DATE_TOKEN_NON_NUMERIC) == 0)
 #define is_weekday(t)       ((date_token_mask (t) & DATE_TOKEN_NON_WEEKDAY) == 0)
@@ -4188,7 +4160,6 @@ parse_broken_date (struct _date_token *tokens, gint *tzone)
 	return t;
 }
 
-
 /**
  * camel_header_decode_date:
  * @str: input date string
@@ -4474,7 +4445,6 @@ camel_header_msgid_generate (void)
 	return msgid;
 }
 
-
 static struct {
 	const gchar *name;
 	const gchar *pattern;
@@ -4711,7 +4681,6 @@ camel_header_address_list_append_list(struct _camel_header_address **l, struct _
 	}
 }
 
-
 void
 camel_header_address_list_append(struct _camel_header_address **l, struct _camel_header_address *h)
 {
diff --git a/camel/camel-mime-utils.h b/camel/camel-mime-utils.h
index 8bd7b2d..722576e 100644
--- a/camel/camel-mime-utils.h
+++ b/camel/camel-mime-utils.h
@@ -20,7 +20,6 @@
  * Boston, MA 02110-1301, USA.
  */
 
-
 #ifndef _CAMEL_MIME_UTILS_H
 #define _CAMEL_MIME_UTILS_H
 
diff --git a/camel/camel-movemail.c b/camel/camel-movemail.c
index 08cc888..86f19c3 100644
--- a/camel/camel-movemail.c
+++ b/camel/camel-movemail.c
@@ -531,7 +531,6 @@ fail:
 			      _("Error copying mail temp file: %s"),
 			      g_strerror (errno));
 
-
 	camel_object_unref((CamelObject *)mp);
 	camel_object_unref((CamelObject *)ffrom);
 
diff --git a/camel/camel-movemail.h b/camel/camel-movemail.h
index 6f1df0c..a0cbb47 100644
--- a/camel/camel-movemail.h
+++ b/camel/camel-movemail.h
@@ -22,7 +22,6 @@
  * USA
  */
 
-
 #ifndef CAMEL_MOVEMAIL_H
 #define CAMEL_MOVEMAIL_H 1
 
diff --git a/camel/camel-multipart-encrypted.c b/camel/camel-multipart-encrypted.c
index 866f4e1..7988bfd 100644
--- a/camel/camel-multipart-encrypted.c
+++ b/camel/camel-multipart-encrypted.c
@@ -20,7 +20,6 @@
  *
  */
 
-
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
@@ -45,10 +44,8 @@ static void camel_multipart_encrypted_finalize (CamelObject *object);
 
 static void set_mime_type_field (CamelDataWrapper *data_wrapper, CamelContentType *mime_type);
 
-
 static CamelMultipartClass *parent_class = NULL;
 
-
 CamelType
 camel_multipart_encrypted_get_type (void)
 {
@@ -68,7 +65,6 @@ camel_multipart_encrypted_get_type (void)
 	return type;
 }
 
-
 static void
 camel_multipart_encrypted_class_init (CamelMultipartEncryptedClass *klass)
 {
@@ -118,7 +114,6 @@ set_mime_type_field (CamelDataWrapper *data_wrapper, CamelContentType *mime_type
 	((CamelDataWrapperClass *) parent_class)->set_mime_type_field (data_wrapper, mime_type);
 }
 
-
 /**
  * camel_multipart_encrypted_new:
  *
diff --git a/camel/camel-multipart-encrypted.h b/camel/camel-multipart-encrypted.h
index ec590f6..7068cd5 100644
--- a/camel/camel-multipart-encrypted.h
+++ b/camel/camel-multipart-encrypted.h
@@ -20,7 +20,6 @@
  *
  */
 
-
 #ifndef __CAMEL_MULTIPART_ENCRYPTED_H__
 #define __CAMEL_MULTIPART_ENCRYPTED_H__
 
diff --git a/camel/camel-multipart-signed.c b/camel/camel-multipart-signed.c
index a87ffb2..4cba88e 100644
--- a/camel/camel-multipart-signed.c
+++ b/camel/camel-multipart-signed.c
@@ -564,7 +564,6 @@ write_to_stream (CamelDataWrapper *data_wrapper, CamelStream *stream)
 	return total;
 }
 
-
 /**
  * camel_multipart_signed_get_content_stream:
  * @mps: a #CamlMultipartSigned object
diff --git a/camel/camel-multipart.c b/camel/camel-multipart.c
index f75ff92..eb2da00 100644
--- a/camel/camel-multipart.c
+++ b/camel/camel-multipart.c
@@ -61,15 +61,12 @@ static gint construct_from_parser(CamelMultipart *multipart, struct _CamelMimePa
 
 static CamelDataWrapperClass *parent_class = NULL;
 
-
-
 /* Returns the class for a CamelMultipart */
 #define CMP_CLASS(so) CAMEL_MULTIPART_CLASS (CAMEL_OBJECT_GET_CLASS(so))
 
 /* Returns the class for a CamelDataWrapper */
 #define CDW_CLASS(so) CAMEL_DATA_WRAPPER_CLASS (CAMEL_OBJECT_GET_CLASS(so))
 
-
 static void
 camel_multipart_class_init (CamelMultipartClass *camel_multipart_class)
 {
@@ -126,7 +123,6 @@ camel_multipart_finalize (CamelObject *object)
 		g_free (multipart->postface);
 }
 
-
 CamelType
 camel_multipart_get_type (void)
 {
@@ -145,7 +141,6 @@ camel_multipart_get_type (void)
 	return camel_multipart_type;
 }
 
-
 /**
  * camel_multipart_new:
  *
@@ -165,7 +160,6 @@ camel_multipart_new (void)
 	return multipart;
 }
 
-
 static void
 add_part (CamelMultipart *multipart, CamelMimePart *part)
 {
@@ -173,7 +167,6 @@ add_part (CamelMultipart *multipart, CamelMimePart *part)
 	camel_object_ref (part);
 }
 
-
 /**
  * camel_multipart_add_part:
  * @multipart: a #CamelMultipart object
@@ -190,7 +183,6 @@ camel_multipart_add_part (CamelMultipart *multipart, CamelMimePart *part)
 	CMP_CLASS (multipart)->add_part (multipart, part);
 }
 
-
 static void
 add_part_at (CamelMultipart *multipart, CamelMimePart *part, guint index)
 {
@@ -218,7 +210,6 @@ camel_multipart_add_part_at (CamelMultipart *multipart,
 	CMP_CLASS (multipart)->add_part_at (multipart, part, index);
 }
 
-
 static void
 remove_part (CamelMultipart *multipart, CamelMimePart *part)
 {
@@ -245,7 +236,6 @@ camel_multipart_remove_part (CamelMultipart *multipart,
 	CMP_CLASS (multipart)->remove_part (multipart, part);
 }
 
-
 static CamelMimePart *
 remove_part_at (CamelMultipart *multipart, guint index)
 {
@@ -291,7 +281,6 @@ camel_multipart_remove_part_at (CamelMultipart *multipart, guint index)
 	return CMP_CLASS (multipart)->remove_part_at (multipart, index);
 }
 
-
 static CamelMimePart *
 get_part (CamelMultipart *multipart, guint index)
 {
@@ -322,7 +311,6 @@ camel_multipart_get_part (CamelMultipart *multipart, guint index)
 	return CMP_CLASS (multipart)->get_part (multipart, index);
 }
 
-
 static guint
 get_number (CamelMultipart *multipart)
 {
@@ -343,7 +331,6 @@ camel_multipart_get_number (CamelMultipart *multipart)
 	return CMP_CLASS (multipart)->get_number (multipart);
 }
 
-
 static void
 set_boundary (CamelMultipart *multipart, const gchar *boundary)
 {
@@ -403,7 +390,6 @@ camel_multipart_set_boundary (CamelMultipart *multipart, const gchar *boundary)
 	CMP_CLASS (multipart)->set_boundary (multipart, boundary);
 }
 
-
 static const gchar *
 get_boundary (CamelMultipart *multipart)
 {
@@ -588,7 +574,6 @@ construct_from_parser(CamelMultipart *multipart, struct _CamelMimeParser *mp)
 		return 0;
 }
 
-
 /**
  * camel_multipart_construct_from_parser:
  * @multipart: a #CamelMultipart object
diff --git a/camel/camel-multipart.h b/camel/camel-multipart.h
index cec7ba9..a711453 100644
--- a/camel/camel-multipart.h
+++ b/camel/camel-multipart.h
@@ -23,7 +23,6 @@
  * USA
  */
 
-
 #ifndef CAMEL_MULTIPART_H
 #define CAMEL_MULTIPART_H 1
 
@@ -68,7 +67,6 @@ typedef struct {
 /* Standard Camel function */
 CamelType camel_multipart_get_type (void);
 
-
 /* public methods */
 CamelMultipart *    camel_multipart_new            (void);
 void                camel_multipart_add_part       (CamelMultipart *multipart,
diff --git a/camel/camel-net-utils.c b/camel/camel-net-utils.c
index 1b1d9f1..e7ba45e 100644
--- a/camel/camel-net-utils.c
+++ b/camel/camel-net-utils.c
@@ -163,7 +163,6 @@ G_LOCK_DEFINE_STATIC (gethost_mutex);
 	}                                                              \
 } G_STMT_END
 
-
 #ifdef ENABLE_IPv6
 /* some helpful utils for IPv6 lookups */
 #define IPv6_BUFLEN_MIN  (sizeof (gchar *) * 3)
diff --git a/camel/camel-news-address.c b/camel/camel-news-address.c
index 46fbf5c..3680f8e 100644
--- a/camel/camel-news-address.c
+++ b/camel/camel-news-address.c
@@ -20,7 +20,6 @@
 
 #include "camel-news-address.h"
 
-
 static void camel_news_address_class_init (CamelNewsAddressClass *klass);
 
 static CamelAddressClass *camel_news_address_parent;
@@ -31,7 +30,6 @@ camel_news_address_class_init (CamelNewsAddressClass *klass)
 	camel_news_address_parent = CAMEL_ADDRESS_CLASS (camel_type_get_global_classfuncs (camel_address_get_type ()));
 }
 
-
 CamelType
 camel_news_address_get_type (void)
 {
diff --git a/camel/camel-object.c b/camel/camel-object.c
index 9c82514..829c634 100644
--- a/camel/camel-object.c
+++ b/camel/camel-object.c
@@ -130,7 +130,6 @@ static void camel_object_bag_remove_unlocked(CamelObjectBag *inbag, CamelObject
 #define camel_object_unget_hooks(o) \
 	(g_static_rec_mutex_unlock(&CAMEL_OBJECT(o)->hooks->lock))
 
-
 /* ********************************************************************** */
 
 /* type-lock must be recursive, for atomically creating classes */
@@ -587,7 +586,6 @@ abort:
 	return res;
 }
 
-
 static void
 cobject_class_init(CamelObjectClass *klass)
 {
@@ -614,7 +612,6 @@ cobject_class_finalise(CamelObjectClass * klass)
 	g_free(klass);
 }
 
-
 /* CamelInterface base methods */
 
 G_GNUC_NORETURN static void
diff --git a/camel/camel-offline-folder.c b/camel/camel-offline-folder.c
index ad27750..a8d941e 100644
--- a/camel/camel-offline-folder.c
+++ b/camel/camel-offline-folder.c
@@ -20,7 +20,6 @@
  *
  */
 
-
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
@@ -52,7 +51,6 @@ static CamelProperty offline_prop_list[] = {
 	{ CAMEL_OFFLINE_FOLDER_SYNC_OFFLINE, "sync_offline", N_("Copy folder content locally for offline operation") },
 };
 
-
 CamelType
 camel_offline_folder_get_type (void)
 {
@@ -72,7 +70,6 @@ camel_offline_folder_get_type (void)
 	return type;
 }
 
-
 static void
 camel_offline_folder_class_init (CamelOfflineFolderClass *klass)
 {
@@ -93,7 +90,6 @@ camel_offline_folder_class_init (CamelOfflineFolderClass *klass)
 	klass->downsync = offline_folder_downsync;
 }
 
-
 struct _offline_downsync_msg {
 	CamelSessionThreadMsg msg;
 
@@ -283,7 +279,6 @@ done:
 	camel_operation_end (NULL);
 }
 
-
 /**
  * camel_offline_folder_downsync:
  * @offline: a #CamelOfflineFolder object
diff --git a/camel/camel-offline-folder.h b/camel/camel-offline-folder.h
index 78fb080..34fa881 100644
--- a/camel/camel-offline-folder.h
+++ b/camel/camel-offline-folder.h
@@ -20,7 +20,6 @@
  *
  */
 
-
 #ifndef __CAMEL_OFFLINE_FOLDER_H__
 #define __CAMEL_OFFLINE_FOLDER_H__
 
@@ -57,7 +56,6 @@ struct _CamelOfflineFolderClass {
 	void (* downsync) (CamelOfflineFolder *folder, const gchar *expression, CamelException *ex);
 };
 
-
 CamelType camel_offline_folder_get_type (void);
 
 void camel_offline_folder_downsync (CamelOfflineFolder *offline, const gchar *expression, CamelException *ex);
diff --git a/camel/camel-offline-journal.c b/camel/camel-offline-journal.c
index be4b117..09b36e0 100644
--- a/camel/camel-offline-journal.c
+++ b/camel/camel-offline-journal.c
@@ -20,7 +20,6 @@
  *
  */
 
-
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
@@ -51,10 +50,8 @@ static void camel_offline_journal_class_init (CamelOfflineJournalClass *klass);
 static void camel_offline_journal_init (CamelOfflineJournal *journal, CamelOfflineJournalClass *klass);
 static void camel_offline_journal_finalize (CamelObject *object);
 
-
 static CamelObjectClass *parent_class = NULL;
 
-
 CamelType
 camel_offline_journal_get_type (void)
 {
@@ -125,7 +122,6 @@ camel_offline_journal_construct (CamelOfflineJournal *journal, CamelFolder *fold
 	}
 }
 
-
 /**
  * camel_offline_journal_set_filename:
  * @journal: a #CamelOfflineJournal object
@@ -142,7 +138,6 @@ camel_offline_journal_set_filename (CamelOfflineJournal *journal, const gchar *f
 	journal->filename = g_strdup (filename);
 }
 
-
 /**
  * camel_offline_journal_write:
  * @journal: a #CamelOfflineJournal object
@@ -192,7 +187,6 @@ camel_offline_journal_write (CamelOfflineJournal *journal, CamelException *ex)
 	return -1;
 }
 
-
 /**
  * camel_offline_journal_replay:
  * @journal: a #CamelOfflineJournal object
diff --git a/camel/camel-offline-journal.h b/camel/camel-offline-journal.h
index 4a42b13..ca05e59 100644
--- a/camel/camel-offline-journal.h
+++ b/camel/camel-offline-journal.h
@@ -20,7 +20,6 @@
  *
  */
 
-
 #ifndef __CAMEL_OFFLINE_JOURNAL_H__
 #define __CAMEL_OFFLINE_JOURNAL_H__
 
@@ -66,7 +65,6 @@ struct _CamelOfflineJournalClass {
 	gint (* entry_play) (CamelOfflineJournal *journal, CamelDListNode *entry, CamelException *ex);
 };
 
-
 CamelType camel_offline_journal_get_type (void);
 
 void camel_offline_journal_construct (CamelOfflineJournal *journal, struct _CamelFolder *folder, const gchar *filename);
diff --git a/camel/camel-offline-store.c b/camel/camel-offline-store.c
index 9bc9bf4..4066bc8 100644
--- a/camel/camel-offline-store.c
+++ b/camel/camel-offline-store.c
@@ -20,7 +20,6 @@
  *
  */
 
-
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
@@ -33,7 +32,6 @@
 #include "camel-offline-store.h"
 #include "camel-session.h"
 
-
 static void camel_offline_store_class_init (CamelOfflineStoreClass *klass);
 static void camel_offline_store_init (CamelOfflineStore *store, CamelOfflineStoreClass *klass);
 static void camel_offline_store_finalize (CamelObject *object);
@@ -42,10 +40,8 @@ static void offline_store_construct (CamelService *service, CamelSession *sessio
 				     CamelProvider *provider, CamelURL *url,
 				     CamelException *ex);
 
-
 static CamelStoreClass *parent_class = NULL;
 
-
 CamelType
 camel_offline_store_get_type (void)
 {
@@ -65,7 +61,6 @@ camel_offline_store_get_type (void)
 	return type;
 }
 
-
 static void
 camel_offline_store_class_init (CamelOfflineStoreClass *klass)
 {
@@ -86,7 +81,6 @@ camel_offline_store_finalize (CamelObject *object)
 	;
 }
 
-
 static void
 offline_store_construct (CamelService *service, CamelSession *session,
 			  CamelProvider *provider, CamelURL *url,
diff --git a/camel/camel-offline-store.h b/camel/camel-offline-store.h
index 458c9c8..3fe60d1 100644
--- a/camel/camel-offline-store.h
+++ b/camel/camel-offline-store.h
@@ -20,7 +20,6 @@
  *
  */
 
-
 #ifndef __CAMEL_OFFLINE_STORE_H__
 #define __CAMEL_OFFLINE_STORE_H__
 
@@ -59,10 +58,8 @@ struct _CamelOfflineStoreClass {
 	void (* set_network_state) (CamelOfflineStore *store, gint state, CamelException *ex);
 };
 
-
 CamelType camel_offline_store_get_type (void);
 
-
 void camel_offline_store_set_network_state (CamelOfflineStore *store, gint state, CamelException *ex);
 gint camel_offline_store_get_network_state (CamelOfflineStore *store, CamelException *ex);
 
diff --git a/camel/camel-operation.c b/camel/camel-operation.c
index c21e4f0..2d87904 100644
--- a/camel/camel-operation.c
+++ b/camel/camel-operation.c
@@ -84,7 +84,6 @@ static pthread_mutex_t operation_lock = PTHREAD_MUTEX_INITIALIZER;
 #define LOCK() pthread_mutex_lock(&operation_lock)
 #define UNLOCK() pthread_mutex_unlock(&operation_lock)
 
-
 static guint stamp (void);
 static CamelDList operation_list = CAMEL_DLIST_INITIALISER(operation_list);
 static pthread_key_t operation_key;
diff --git a/camel/camel-partition-table.c b/camel/camel-partition-table.c
index 5292ae7..bf0bb3e 100644
--- a/camel/camel-partition-table.c
+++ b/camel/camel-partition-table.c
@@ -19,7 +19,6 @@
  * Boston, MA 02110-1301, USA.
  */
 
-
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
@@ -44,7 +43,6 @@
 /* key index debug */
 #define k(x) /*(printf("%s(%d):%s: ",  __FILE__, __LINE__, __PRETTY_FUNCTION__),(x))*/
 
-
 struct _CamelPartitionTablePrivate {
 	pthread_mutex_t lock;	/* for locking partition */
 };
@@ -52,7 +50,6 @@ struct _CamelPartitionTablePrivate {
 #define CAMEL_PARTITION_TABLE_LOCK(kf, lock) (pthread_mutex_lock(&(kf)->priv->lock))
 #define CAMEL_PARTITION_TABLE_UNLOCK(kf, lock) (pthread_mutex_unlock(&(kf)->priv->lock))
 
-
 static void
 camel_partition_table_class_init(CamelPartitionTableClass *klass)
 {
@@ -587,7 +584,6 @@ fail:
 
 /* ********************************************************************** */
 
-
 struct _CamelKeyTablePrivate {
 	pthread_mutex_t lock;	/* for locking key */
 };
@@ -595,7 +591,6 @@ struct _CamelKeyTablePrivate {
 #define CAMEL_KEY_TABLE_LOCK(kf, lock) (pthread_mutex_lock(&(kf)->priv->lock))
 #define CAMEL_KEY_TABLE_UNLOCK(kf, lock) (pthread_mutex_unlock(&(kf)->priv->lock))
 
-
 static void
 camel_key_table_class_init(CamelKeyTableClass *klass)
 {
@@ -650,7 +645,6 @@ camel_key_table_get_type(void)
 	return type;
 }
 
-
 CamelKeyTable *
 camel_key_table_new(CamelBlockFile *bs, camel_block_t root)
 {
@@ -769,7 +763,6 @@ camel_key_table_add(CamelKeyTable *ki, const gchar *key, camel_block_t data, gui
 	}
 #endif
 
-
 	camel_block_file_touch_block(ki->blocks, last);
 	camel_block_file_unref_block(ki->blocks, last);
 
diff --git a/camel/camel-private.h b/camel/camel-private.h
index 1a3caba..e6ddb84 100644
--- a/camel/camel-private.h
+++ b/camel/camel-private.h
@@ -51,7 +51,6 @@ struct _CamelFolderPrivate {
 #define CAMEL_FOLDER_REC_UNLOCK(f, l) \
 	(g_static_rec_mutex_unlock(&((CamelFolder *) (f))->priv->l))
 
-
 struct _CamelStorePrivate {
 	GStaticRecMutex folder_lock;	/* for locking folder operations */
 };
@@ -61,7 +60,6 @@ struct _CamelStorePrivate {
 #define CAMEL_STORE_UNLOCK(f, l) \
 	(g_static_rec_mutex_unlock(&((CamelStore *) (f))->priv->l))
 
-
 struct _CamelTransportPrivate {
 	GMutex *send_lock;   /* for locking send operations */
 };
@@ -71,7 +69,6 @@ struct _CamelTransportPrivate {
 #define CAMEL_TRANSPORT_UNLOCK(f, l) \
 	(g_mutex_unlock(((CamelTransport *) (f))->priv->l))
 
-
 struct _CamelServicePrivate {
 	GStaticRecMutex connect_lock;	/* for locking connection operations */
 	GStaticMutex connect_op_lock;	/* for locking the connection_op */
@@ -88,7 +85,6 @@ struct _CamelServicePrivate {
 #define CAMEL_SERVICE_REC_TRYLOCK(f, l) \
 	(g_static_rec_mutex_trylock(&((CamelService *) (f))->priv->l))
 
-
 struct _CamelSessionPrivate {
 	GMutex *lock;		/* for locking everything basically */
 	GMutex *thread_lock;	/* locking threads */
@@ -107,7 +103,6 @@ struct _CamelSessionPrivate {
 #define CAMEL_SESSION_UNLOCK(f, l) \
 	(g_mutex_unlock(((CamelSession *) (f))->priv->l))
 
-
 /* most of this stuff really is private, but the lock can be used by subordinate classes */
 struct _CamelFolderSummaryPrivate {
 	GHashTable *filter_charset;	/* CamelMimeFilterCharset's indexed by source charset */
@@ -139,7 +134,6 @@ struct _CamelFolderSummaryPrivate {
 #define CAMEL_SUMMARY_UNLOCK(f, l) \
 	(g_mutex_unlock(((CamelFolderSummary *) (f))->priv->l))
 
-
 struct _CamelStoreSummaryPrivate {
 	GMutex *summary_lock;	/* for the summary hashtable/array */
 	GMutex *io_lock;	/* load/save lock, for access to saved_count, etc */
@@ -152,7 +146,6 @@ struct _CamelStoreSummaryPrivate {
 #define CAMEL_STORE_SUMMARY_UNLOCK(f, l) \
 	(g_mutex_unlock(((CamelStoreSummary *) (f))->priv->l))
 
-
 struct _CamelVeeFolderPrivate {
 	gboolean destroyed;
 	GList *folders;			/* lock using subfolder_lock before changing/accessing */
@@ -169,7 +162,6 @@ struct _CamelVeeFolderPrivate {
 #define CAMEL_VEE_FOLDER_UNLOCK(f, l) \
 	(g_mutex_unlock(((CamelVeeFolder *) (f))->priv->l))
 
-
 struct _CamelDataWrapperPrivate {
 	pthread_mutex_t stream_lock;
 };
@@ -179,7 +171,6 @@ struct _CamelDataWrapperPrivate {
 #define CAMEL_DATA_WRAPPER_UNLOCK(dw, l) \
 	(pthread_mutex_unlock(&((CamelDataWrapper *) (dw))->priv->l))
 
-
 /* most of this stuff really is private, but the lock can be used by subordinate classes */
 struct _CamelCertDBPrivate {
 	GMutex *db_lock;	/* for the db hashtable/array */
diff --git a/camel/camel-process.c b/camel/camel-process.c
index 019ccd7..cfc767a 100644
--- a/camel/camel-process.c
+++ b/camel/camel-process.c
@@ -20,7 +20,6 @@
  *
  */
 
-
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
@@ -31,7 +30,6 @@
 
 #include "camel-process.h"
 
-
 pid_t
 camel_process_fork (const gchar *path, gchar **argv, gint *infd, gint *outfd, gint *errfd, CamelException *ex)
 {
@@ -117,7 +115,6 @@ camel_process_fork (const gchar *path, gchar **argv, gint *infd, gint *outfd, gi
 	return pid;
 }
 
-
 gint
 camel_process_wait (pid_t pid)
 {
diff --git a/camel/camel-provider.c b/camel/camel-provider.c
index 4af72ee..c510ff3 100644
--- a/camel/camel-provider.c
+++ b/camel/camel-provider.c
@@ -300,7 +300,6 @@ camel_provider_list(gboolean load)
 {
 	GList *list = NULL;
 
-
 	/* provider_table can be NULL, so initialize it */
 	if (G_UNLIKELY (provider_table == NULL))
 		camel_provider_init ();
@@ -385,7 +384,6 @@ fail:
 	return provider;
 }
 
-
 /**
  * camel_provider_auto_detect:
  * @provider: camel provider
diff --git a/camel/camel-provider.h b/camel/camel-provider.h
index 46c352c..36dc23b 100644
--- a/camel/camel-provider.h
+++ b/camel/camel-provider.h
@@ -24,7 +24,6 @@
  * USA
  */
 
-
 #ifndef CAMEL_PROVIDER_H
 #define CAMEL_PROVIDER_H 1
 
@@ -67,7 +66,6 @@ extern gchar *camel_provider_type_name[CAMEL_NUM_PROVIDER_TYPES];
 #define CAMEL_PROVIDER_HAS_LICENSE      (1 << 6)
 #define CAMEL_PROVIDER_DISABLE_SENT_FOLDER (1 << 7)
 
-
 /* Flags for url_flags. "ALLOW" means the config dialog will let the
  * user configure it. "NEED" implies "ALLOW" but means the user must
  * configure it. Service code can assume that any url part for which
@@ -117,7 +115,6 @@ extern gchar *camel_provider_type_name[CAMEL_NUM_PROVIDER_TYPES];
 #define CAMEL_URL_FRAGMENT_IS_PATH  (1 << 30) /* url uses fragment for folder name path, not path */
 #define CAMEL_URL_PATH_IS_ABSOLUTE (1 << 31)
 
-
 #define CAMEL_PROVIDER_IS_STORE_AND_TRANSPORT(prov) (prov->object_types[CAMEL_PROVIDER_STORE] && prov->object_types[CAMEL_PROVIDER_TRANSPORT])
 
 /* Generic extra config stuff */
@@ -231,7 +228,6 @@ CamelProvider *camel_provider_get(const gchar *url_string, CamelException *ex);
 /* This is defined by each module, not by camel-provider.c. */
 void camel_provider_module_init(void);
 
-
 gint camel_provider_auto_detect (CamelProvider *provider, CamelURL *url,
 				GHashTable **auto_detected, CamelException *ex);
 
diff --git a/camel/camel-sasl-anonymous.c b/camel/camel-sasl-anonymous.c
index 0fa138a..b730420 100644
--- a/camel/camel-sasl-anonymous.c
+++ b/camel/camel-sasl-anonymous.c
@@ -20,7 +20,6 @@
  *
  */
 
-
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
@@ -68,7 +67,6 @@ camel_sasl_anonymous_finalize (CamelObject *object)
 	g_free (sasl->trace_info);
 }
 
-
 CamelType
 camel_sasl_anonymous_get_type (void)
 {
@@ -88,7 +86,6 @@ camel_sasl_anonymous_get_type (void)
 	return type;
 }
 
-
 /**
  * camel_sasl_anonymous_new:
  * @type: trace type
diff --git a/camel/camel-sasl-anonymous.h b/camel/camel-sasl-anonymous.h
index 6ddc423..ce2e82f 100644
--- a/camel/camel-sasl-anonymous.h
+++ b/camel/camel-sasl-anonymous.h
@@ -45,13 +45,11 @@ typedef struct _CamelSaslAnonymous {
 	CamelSaslAnonTraceType type;
 } CamelSaslAnonymous;
 
-
 typedef struct _CamelSaslAnonymousClass {
 	CamelSaslClass parent_class;
 
 } CamelSaslAnonymousClass;
 
-
 /* Standard Camel function */
 CamelType camel_sasl_anonymous_get_type (void);
 
diff --git a/camel/camel-sasl-cram-md5.h b/camel/camel-sasl-cram-md5.h
index 0cbdf0a..6c6e373 100644
--- a/camel/camel-sasl-cram-md5.h
+++ b/camel/camel-sasl-cram-md5.h
@@ -37,13 +37,11 @@ typedef struct _CamelSaslCramMd5 {
 
 } CamelSaslCramMd5;
 
-
 typedef struct _CamelSaslCramMd5Class {
 	CamelSaslClass parent_class;
 
 } CamelSaslCramMd5Class;
 
-
 /* Standard Camel function */
 CamelType camel_sasl_cram_md5_get_type (void);
 
diff --git a/camel/camel-sasl-digest-md5.c b/camel/camel-sasl-digest-md5.c
index b6f3ade..cb2cd7f 100644
--- a/camel/camel-sasl-digest-md5.c
+++ b/camel/camel-sasl-digest-md5.c
@@ -234,7 +234,6 @@ camel_sasl_digest_md5_finalize (CamelObject *object)
 	g_free (sasl->priv);
 }
 
-
 CamelType
 camel_sasl_digest_md5_get_type (void)
 {
diff --git a/camel/camel-sasl-digest-md5.h b/camel/camel-sasl-digest-md5.h
index 120754d..b305bfb 100644
--- a/camel/camel-sasl-digest-md5.h
+++ b/camel/camel-sasl-digest-md5.h
@@ -39,13 +39,11 @@ typedef struct _CamelSaslDigestMd5 {
 
 } CamelSaslDigestMd5;
 
-
 typedef struct _CamelSaslDigestMd5Class {
 	CamelSaslClass parent_class;
 
 } CamelSaslDigestMd5Class;
 
-
 /* Standard Camel function */
 CamelType camel_sasl_digest_md5_get_type (void);
 
diff --git a/camel/camel-sasl-gssapi.c b/camel/camel-sasl-gssapi.c
index 3af757c..7363968 100644
--- a/camel/camel-sasl-gssapi.c
+++ b/camel/camel-sasl-gssapi.c
@@ -20,7 +20,6 @@
  *
  */
 
-
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
@@ -89,13 +88,10 @@ struct _CamelSaslGssapiPrivate {
 	gss_name_t target;
 };
 
-
 static GByteArray *gssapi_challenge (CamelSasl *sasl, GByteArray *token, CamelException *ex);
 
-
 static CamelSaslClass *parent_class = NULL;
 
-
 static void
 camel_sasl_gssapi_class_init (CamelSaslGssapiClass *klass)
 {
@@ -133,7 +129,6 @@ camel_sasl_gssapi_finalize (CamelObject *object)
 	g_free (gssapi->priv);
 }
 
-
 CamelType
 camel_sasl_gssapi_get_type (void)
 {
diff --git a/camel/camel-sasl-gssapi.h b/camel/camel-sasl-gssapi.h
index 94d1891..f575c0e 100644
--- a/camel/camel-sasl-gssapi.h
+++ b/camel/camel-sasl-gssapi.h
@@ -20,7 +20,6 @@
  *
  */
 
-
 #ifndef __CAMEL_SASL_GSSAPI_H__
 #define __CAMEL_SASL_GSSAPI_H__
 
diff --git a/camel/camel-sasl-kerberos4.c b/camel/camel-sasl-kerberos4.c
index 2995248..3c18a23 100644
--- a/camel/camel-sasl-kerberos4.c
+++ b/camel/camel-sasl-kerberos4.c
@@ -104,7 +104,6 @@ camel_sasl_kerberos4_finalize (CamelObject *object)
 	}
 }
 
-
 CamelType
 camel_sasl_kerberos4_get_type (void)
 {
diff --git a/camel/camel-sasl-kerberos4.h b/camel/camel-sasl-kerberos4.h
index 6fa298d..29e4eb7 100644
--- a/camel/camel-sasl-kerberos4.h
+++ b/camel/camel-sasl-kerberos4.h
@@ -39,13 +39,11 @@ typedef struct _CamelSaslKerberos4 {
 
 } CamelSaslKerberos4;
 
-
 typedef struct _CamelSaslKerberos4Class {
 	CamelSaslClass parent_class;
 
 } CamelSaslKerberos4Class;
 
-
 /* Standard Camel function */
 CamelType camel_sasl_kerberos4_get_type (void);
 
diff --git a/camel/camel-sasl-login.c b/camel/camel-sasl-login.c
index a89e052..7f2d3f7 100644
--- a/camel/camel-sasl-login.c
+++ b/camel/camel-sasl-login.c
@@ -85,7 +85,6 @@ camel_sasl_login_finalize (CamelObject *object)
 	g_free (sasl->priv);
 }
 
-
 CamelType
 camel_sasl_login_get_type (void)
 {
diff --git a/camel/camel-sasl-login.h b/camel/camel-sasl-login.h
index 2832e45..9725f8e 100644
--- a/camel/camel-sasl-login.h
+++ b/camel/camel-sasl-login.h
@@ -39,13 +39,11 @@ typedef struct _CamelSaslLogin {
 
 } CamelSaslLogin;
 
-
 typedef struct _CamelSaslLoginClass {
 	CamelSaslClass parent_class;
 
 } CamelSaslLoginClass;
 
-
 /* Standard Camel function */
 CamelType camel_sasl_login_get_type (void);
 
diff --git a/camel/camel-sasl-ntlm.c b/camel/camel-sasl-ntlm.c
index 79c70af..e992b06 100644
--- a/camel/camel-sasl-ntlm.c
+++ b/camel/camel-sasl-ntlm.c
@@ -207,8 +207,6 @@ static void des                   (DES_KS, guchar *);
 
 static void setup_schedule        (const guchar *key_56, DES_KS ks);
 
-
-
 #define LM_PASSWORD_MAGIC "\x4B\x47\x53\x21\x40\x23\x24\x25" \
                           "\x4B\x47\x53\x21\x40\x23\x24\x25" \
 			  "\x00\x00\x00\x00\x00"
@@ -298,7 +296,6 @@ ntlm_calc_response (const guchar key[21], const guchar plaintext[8],
         des (ks, results + 16);
 }
 
-
 /*
  * MD4 encoder. (The one everyone else uses is not GPL-compatible;
  * this is a reimplementation from spec.) This doesn't need to be
@@ -421,7 +418,6 @@ md4sum (const guchar *in, gint nbytes, guchar digest[16])
 	digest[15] = (D >> 24) & 0xFF;
 }
 
-
 /* Public domain DES implementation from Phil Karn */
 static guint32 Spbox[8][64] = {
 	{ 0x01010400, 0x00000000, 0x00010000, 0x01010404,
@@ -694,13 +690,11 @@ static guchar pc2[] = {
 
 /* End of DES-defined tables */
 
-
 /* bit 0 is left-most in byte */
 static gint bytebit[] = {
 	0200,0100,040,020,010,04,02,01
 };
 
-
 /* Generate key schedule for encryption or decryption
  * depending on the value of "decrypt"
  */
diff --git a/camel/camel-sasl-ntlm.h b/camel/camel-sasl-ntlm.h
index 8fc1476..2b894d2 100644
--- a/camel/camel-sasl-ntlm.h
+++ b/camel/camel-sasl-ntlm.h
@@ -35,13 +35,11 @@ typedef struct _CamelSaslNTLM {
 
 } CamelSaslNTLM;
 
-
 typedef struct _CamelSaslNTLMClass {
 	CamelSaslClass parent_class;
 
 } CamelSaslNTLMClass;
 
-
 /* Standard Camel function */
 CamelType camel_sasl_ntlm_get_type (void);
 
diff --git a/camel/camel-sasl-plain.h b/camel/camel-sasl-plain.h
index cb7bf11..0ca11be 100644
--- a/camel/camel-sasl-plain.h
+++ b/camel/camel-sasl-plain.h
@@ -37,13 +37,11 @@ typedef struct _CamelSaslPlain {
 
 } CamelSaslPlain;
 
-
 typedef struct _CamelSaslPlainClass {
 	CamelSaslClass parent_class;
 
 } CamelSaslPlainClass;
 
-
 /* Standard Camel function */
 CamelType camel_sasl_plain_get_type (void);
 
diff --git a/camel/camel-sasl-popb4smtp.h b/camel/camel-sasl-popb4smtp.h
index 54fc8c5..081c52f 100644
--- a/camel/camel-sasl-popb4smtp.h
+++ b/camel/camel-sasl-popb4smtp.h
@@ -37,13 +37,11 @@ typedef struct _CamelSaslPOPB4SMTP {
 
 } CamelSaslPOPB4SMTP;
 
-
 typedef struct _CamelSaslPOPB4SMTPClass {
 	CamelSaslClass parent_class;
 
 } CamelSaslPOPB4SMTPClass;
 
-
 /* Standard Camel function */
 CamelType camel_sasl_popb4smtp_get_type (void);
 
diff --git a/camel/camel-sasl.c b/camel/camel-sasl.c
index aeefbec..5733b97 100644
--- a/camel/camel-sasl.c
+++ b/camel/camel-sasl.c
@@ -20,7 +20,6 @@
  *
  */
 
-
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
@@ -39,7 +38,6 @@
 #include "camel-sasl.h"
 #include "camel-service.h"
 
-
 #define w(x)
 
 static CamelObjectClass *parent_class = NULL;
@@ -85,7 +83,6 @@ camel_sasl_get_type (void)
 	return type;
 }
 
-
 static GByteArray *
 sasl_challenge (CamelSasl *sasl, GByteArray *token, CamelException *ex)
 {
@@ -175,7 +172,6 @@ camel_sasl_authenticated (CamelSasl *sasl)
 	return sasl->authenticated;
 }
 
-
 /**
  * camel_sasl_new:
  * @service_name: the SASL service name
diff --git a/camel/camel-sasl.h b/camel/camel-sasl.h
index 0f4ea31..0f7872b 100644
--- a/camel/camel-sasl.h
+++ b/camel/camel-sasl.h
@@ -44,7 +44,6 @@ typedef struct _CamelSasl {
 	gboolean authenticated;
 } CamelSasl;
 
-
 typedef struct _CamelSaslClass {
 	CamelObjectClass parent_class;
 
@@ -52,7 +51,6 @@ typedef struct _CamelSaslClass {
 
 } CamelSaslClass;
 
-
 /* Standard Camel function */
 CamelType  camel_sasl_get_type (void);
 
diff --git a/camel/camel-search-sql-sexp.c b/camel/camel-search-sql-sexp.c
index 7d3cc7a..2394943 100644
--- a/camel/camel-search-sql-sexp.c
+++ b/camel/camel-search-sql-sexp.c
@@ -308,7 +308,6 @@ match_all(struct _ESExp *f, gint argc, struct _ESExpTerm **argv, gpointer data)
 
 }
 
-
 static ESExpResult *
 match_threads(struct _ESExp *f, gint argc, struct _ESExpTerm **argv, gpointer data)
 {
@@ -417,7 +416,6 @@ header_ends_with (struct _ESExp *f, gint argc, struct _ESExpResult **argv, gpoin
 	return check_header(f, argc, argv, data, CAMEL_SEARCH_MATCH_ENDS);
 }
 
-
 static ESExpResult *
 header_exists (struct _ESExp *f, gint argc, struct _ESExpResult **argv, gpointer data)
 {
@@ -452,7 +450,6 @@ user_tag(struct _ESExp *f, gint argc, struct _ESExpResult **argv, gpointer data)
 	return r;
 }
 
-
 static ESExpResult *
 user_flag(struct _ESExp *f, gint argc, struct _ESExpResult **argv, gpointer data)
 {
@@ -591,7 +588,6 @@ static struct {
 /*	{ "uid", CAMEL_STRUCT_OFFSET(CamelFolderSearchClass, uid), 1 },	*/
 };
 
-
 gchar *
 camel_sexp_to_sql_sexp (const gchar *sql)
 {
@@ -630,7 +626,6 @@ camel_sexp_to_sql_sexp (const gchar *sql)
 #ifdef TEST_MAIN
 /*
 
-
 (and (match-all (and (not (system-flag "deleted")) (not (system-flag "junk"))))
  (and   (or
 
@@ -754,4 +749,3 @@ gint main ()
 }
 #endif
 
-
diff --git a/camel/camel-search-sql.c b/camel/camel-search-sql.c
index 083f870..8d7b766 100644
--- a/camel/camel-search-sql.c
+++ b/camel/camel-search-sql.c
@@ -501,7 +501,6 @@ camel_sexp_to_sql (const gchar *txt)
 				gint len = 2;
 				Node *pnode;
 
-
 				n1=NULL; n2=NULL; n3=NULL;
 				tmp = operands;
 				n1 = operands->data;
@@ -540,7 +539,6 @@ camel_sexp_to_sql (const gchar *txt)
 					else
 						dyn_lvl = n3->level;
 
-
 					if (n3->prefix && g_ascii_strcasecmp (opnode->token, "=") == 0) {
 						/* see if '=' was a last operator. if so take care of it */
 						free_node(opnode);
@@ -573,7 +571,6 @@ camel_sexp_to_sql (const gchar *txt)
 							dyn_lvl = opnode->level;
 						}
 
-
 					}
 					if (n3->prefix && ((g_ascii_strcasecmp (opnode->token, ">") == 0) || (g_ascii_strcasecmp (opnode->token, ">") == 0) )) {
 						/* see if '=' was a last operator. if so take care of it */
@@ -606,7 +603,6 @@ camel_sexp_to_sql (const gchar *txt)
 							n3->ignore_lhs = 0;
 						}
 
-
 					}
 
 					/* Handle if 'not' was a last sysnode, if so take care of it */
@@ -709,7 +705,6 @@ camel_sexp_to_sql (const gchar *txt)
 			}
 		}
 
-
 	}
 
 	tmp = operands;
@@ -733,7 +728,6 @@ camel_sexp_to_sql (const gchar *txt)
 	d(g_node_dump (all));
 	d(printf("\n\n\n"));
 
-
 	res=NULL;
 	tmp = all;
 	op=NULL; n1=NULL;
@@ -882,7 +876,6 @@ camel_sexp_to_sql (const gchar *txt)
 #ifdef TEST_MAIN
 /*
 
-
 (and (match-all (and (not (system-flag "deleted")) (not (system-flag "junk"))))
  (and   (or
 
diff --git a/camel/camel-seekable-stream.c b/camel/camel-seekable-stream.c
index 0156c1d..6d22417 100644
--- a/camel/camel-seekable-stream.c
+++ b/camel/camel-seekable-stream.c
@@ -83,7 +83,6 @@ camel_seekable_stream_get_type (void)
 	return camel_seekable_stream_type;
 }
 
-
 static off_t
 seek (CamelSeekableStream *stream, off_t offset,
       CamelStreamSeekPolicy policy)
@@ -124,7 +123,6 @@ camel_seekable_stream_seek (CamelSeekableStream *stream, off_t offset,
 	return CSS_CLASS (stream)->seek (stream, offset, policy);
 }
 
-
 static off_t
 stream_tell (CamelSeekableStream *stream)
 {
@@ -195,8 +193,3 @@ reset (CamelStream *stream)
 					   CAMEL_STREAM_SET);
 }
 
-
-
-
-
-
diff --git a/camel/camel-seekable-stream.h b/camel/camel-seekable-stream.h
index 2c7c93a..d6d3002 100644
--- a/camel/camel-seekable-stream.h
+++ b/camel/camel-seekable-stream.h
@@ -22,7 +22,6 @@
  * USA
  */
 
-
 #ifndef CAMEL_SEEKABLE_STREAM_H
 #define CAMEL_SEEKABLE_STREAM_H 1
 
diff --git a/camel/camel-seekable-substream.c b/camel/camel-seekable-substream.c
index 9caed31..4f5a3f9 100644
--- a/camel/camel-seekable-substream.c
+++ b/camel/camel-seekable-substream.c
@@ -73,7 +73,6 @@ camel_seekable_substream_finalize (CamelObject *object)
 		camel_object_unref (seekable_substream->parent_stream);
 }
 
-
 CamelType
 camel_seekable_substream_get_type (void)
 {
diff --git a/camel/camel-seekable-substream.h b/camel/camel-seekable-substream.h
index 0e2b997..7ed8b94 100644
--- a/camel/camel-seekable-substream.h
+++ b/camel/camel-seekable-substream.h
@@ -22,7 +22,6 @@
  * USA
  */
 
-
 #ifndef CAMEL_SEEKABLE_SUBSTREAM_H
 #define CAMEL_SEEKABLE_SUBSTREAM_H 1
 
diff --git a/camel/camel-service.c b/camel/camel-service.c
index 129a6be..3dc24f9 100644
--- a/camel/camel-service.c
+++ b/camel/camel-service.c
@@ -23,7 +23,6 @@
  * USA
  */
 
-
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
@@ -65,7 +64,6 @@ static gchar *get_path (CamelService *service);
 static gint service_setv (CamelObject *object, CamelException *ex, CamelArgV *args);
 static gint service_getv (CamelObject *object, CamelException *ex, CamelArgGetV *args);
 
-
 static void
 camel_service_class_init (CamelServiceClass *camel_service_class)
 {
@@ -125,8 +123,6 @@ camel_service_finalize (CamelObject *object)
 	g_free (service->priv);
 }
 
-
-
 CamelType
 camel_service_get_type (void)
 {
@@ -147,7 +143,6 @@ camel_service_get_type (void)
 	return type;
 }
 
-
 static gint
 service_setv (CamelObject *object, CamelException *ex, CamelArgV *args)
 {
@@ -315,7 +310,6 @@ camel_service_construct (CamelService *service, CamelSession *session,
 	CSERV_CLASS (service)->construct (service, session, provider, url, ex);
 }
 
-
 static gboolean
 service_connect (CamelService *service, CamelException *ex)
 {
@@ -325,7 +319,6 @@ service_connect (CamelService *service, CamelException *ex)
 	 return TRUE;
 }
 
-
 /**
  * camel_service_connect:
  * @service: a #CamelService object
@@ -398,7 +391,6 @@ service_disconnect (CamelService *service, gboolean clean, CamelException *ex)
 	return TRUE;
 }
 
-
 /**
  * camel_service_disconnect:
  * @service: a #CamelService object
@@ -488,7 +480,6 @@ camel_service_get_url (CamelService *service)
 	return camel_url_to_string (service->url, CAMEL_URL_HIDE_PASSWORD);
 }
 
-
 static gchar *
 get_name (CamelService *service, gboolean brief)
 {
@@ -497,7 +488,6 @@ get_name (CamelService *service, gboolean brief)
 	return g_strdup ("???");
 }
 
-
 /**
  * camel_service_get_name:
  * @service: a #CamelService object
@@ -519,7 +509,6 @@ camel_service_get_name (CamelService *service, gboolean brief)
 	return CSERV_CLASS (service)->get_name (service, brief);
 }
 
-
 static gchar *
 get_path (CamelService *service)
 {
@@ -584,7 +573,6 @@ camel_service_get_path (CamelService *service)
 	return CSERV_CLASS (service)->get_path (service);
 }
 
-
 /**
  * camel_service_get_session:
  * @service: a #CamelService object
@@ -599,7 +587,6 @@ camel_service_get_session (CamelService *service)
 	return service->session;
 }
 
-
 /**
  * camel_service_get_provider:
  * @service: a #CamelService object
@@ -620,7 +607,6 @@ query_auth_types (CamelService *service, CamelException *ex)
 	return NULL;
 }
 
-
 /**
  * camel_service_query_auth_types:
  * @service: a #CamelService object
diff --git a/camel/camel-session.c b/camel/camel-session.c
index dc3a2fb..f5f8b23 100644
--- a/camel/camel-session.c
+++ b/camel/camel-session.c
@@ -286,7 +286,6 @@ camel_session_get_service_connected (CamelSession *session,
 	return svc;
 }
 
-
 static gchar *
 get_storage_path (CamelSession *session, CamelService *service, CamelException *ex)
 {
@@ -339,7 +338,6 @@ camel_session_get_storage_path (CamelSession *session, CamelService *service,
 	return CS_CLASS (session)->get_storage_path (session, service, ex);
 }
 
-
 /**
  * camel_session_get_password:
  * @session: a #CamelSession object
@@ -385,7 +383,6 @@ camel_session_get_password (CamelSession *session, CamelService *service,
 	return CS_CLASS (session)->get_password (session, service, domain, prompt, item, flags, ex);
 }
 
-
 /**
  * camel_session_forget_password:
  * @session: a #CamelSession object
@@ -412,7 +409,6 @@ camel_session_forget_password (CamelSession *session, CamelService *service,
 	CS_CLASS (session)->forget_password (session, service, domain, item, ex);
 }
 
-
 /**
  * camel_session_alert_user:
  * @session: a #CamelSession object
@@ -501,7 +497,6 @@ camel_session_is_online (CamelSession *session)
 	return session->online;
 }
 
-
 /**
  * camel_session_set_online:
  * @session: a #CamelSession object
diff --git a/camel/camel-session.h b/camel/camel-session.h
index b7b3f70..e6d6455 100644
--- a/camel/camel-session.h
+++ b/camel/camel-session.h
@@ -23,7 +23,6 @@
  * USA
  */
 
-
 #ifndef CAMEL_SESSION_H
 #define CAMEL_SESSION_H 1
 
@@ -125,13 +124,11 @@ typedef struct {
 					      CamelException *ex);
 } CamelSessionClass;
 
-
 /* public methods */
 
 /* Standard Camel function */
 CamelType camel_session_get_type (void);
 
-
 void            camel_session_construct             (CamelSession *session,
 						     const gchar *storage_path);
 
diff --git a/camel/camel-store-summary.c b/camel/camel-store-summary.c
index 1458c7b..4ad4ccd 100644
--- a/camel/camel-store-summary.c
+++ b/camel/camel-store-summary.c
@@ -156,7 +156,6 @@ camel_store_summary_get_type (void)
 	return type;
 }
 
-
 /**
  * camel_store_summary_new:
  *
@@ -170,7 +169,6 @@ camel_store_summary_new (void)
 	CamelStoreSummary *new = CAMEL_STORE_SUMMARY ( camel_object_new (camel_store_summary_get_type ()));	return new;
 }
 
-
 /**
  * camel_store_summary_set_filename:
  * @summary: a #CamelStoreSummary
@@ -189,7 +187,6 @@ camel_store_summary_set_filename(CamelStoreSummary *s, const gchar *name)
 	CAMEL_STORE_SUMMARY_UNLOCK(s, summary_lock);
 }
 
-
 /**
  * camel_store_summary_set_uri_base:
  * @summary: a #CamelStoreSummary object
@@ -209,7 +206,6 @@ camel_store_summary_set_uri_base(CamelStoreSummary *s, CamelURL *base)
 	CAMEL_STORE_SUMMARY_UNLOCK(s, summary_lock);
 }
 
-
 /**
  * camel_store_summary_count:
  * @summary: a #CamelStoreSummary object
@@ -224,7 +220,6 @@ camel_store_summary_count(CamelStoreSummary *s)
 	return s->folders->len;
 }
 
-
 /**
  * camel_store_summary_index:
  * @summary: a #CamelStoreSummary object
@@ -260,7 +255,6 @@ camel_store_summary_index(CamelStoreSummary *s, gint i)
 	return info;
 }
 
-
 /**
  * camel_store_summary_array:
  * @summary: a #CamelStoreSummary object
@@ -294,7 +288,6 @@ camel_store_summary_array(CamelStoreSummary *s)
 	return res;
 }
 
-
 /**
  * camel_store_summary_array_free:
  * @summary: a #CamelStoreSummary object
@@ -313,7 +306,6 @@ camel_store_summary_array_free(CamelStoreSummary *s, GPtrArray *array)
 	g_ptr_array_free(array, TRUE);
 }
 
-
 /**
  * camel_store_summary_path:
  * @summary: a #CamelStoreSummary object
@@ -404,7 +396,6 @@ error:
 	return -1;
 }
 
-
 /**
  * camel_store_summary_save:
  * @summary: a #CamelStoreSummary object
@@ -485,7 +476,6 @@ camel_store_summary_save(CamelStoreSummary *s)
 	return 0;
 }
 
-
 /**
  * camel_store_summary_header_load:
  * @summary: a #CamelStoreSummary object
@@ -517,7 +507,6 @@ camel_store_summary_header_load(CamelStoreSummary *s)
 	return ret;
 }
 
-
 /**
  * camel_store_summary_add:
  * @summary: a #CamelStoreSummary object
@@ -551,7 +540,6 @@ camel_store_summary_add(CamelStoreSummary *s, CamelStoreInfo *info)
 	CAMEL_STORE_SUMMARY_UNLOCK(s, summary_lock);
 }
 
-
 /**
  * camel_store_summary_add_from_path:
  * @summary: a #CamelStoreSummary object
@@ -584,7 +572,6 @@ camel_store_summary_add_from_path(CamelStoreSummary *s, const gchar *path)
 	return info;
 }
 
-
 /**
  * camel_store_summary_info_new_from_path:
  * @summary: a #CamelStoreSummary object
@@ -604,7 +591,6 @@ camel_store_summary_info_new_from_path(CamelStoreSummary *s, const gchar *path)
 	return ((CamelStoreSummaryClass *)(CAMEL_OBJECT_GET_CLASS(s)))->store_info_new(s, path);
 }
 
-
 /**
  * camel_store_summary_info_free:
  * @summary: a #CamelStoreSummary object
@@ -633,7 +619,6 @@ camel_store_summary_info_free(CamelStoreSummary *s, CamelStoreInfo *info)
 	((CamelStoreSummaryClass *)(CAMEL_OBJECT_GET_CLASS(s)))->store_info_free(s, info);
 }
 
-
 /**
  * camel_store_summary_info_ref:
  * @summary: a #CamelStoreSummary object
@@ -653,7 +638,6 @@ camel_store_summary_info_ref(CamelStoreSummary *s, CamelStoreInfo *info)
 	CAMEL_STORE_SUMMARY_UNLOCK(s, ref_lock);
 }
 
-
 /**
  * camel_store_summary_touch:
  * @summary: a #CamelStoreSummary object
@@ -669,7 +653,6 @@ camel_store_summary_touch(CamelStoreSummary *s)
 	CAMEL_STORE_SUMMARY_UNLOCK(s, summary_lock);
 }
 
-
 /**
  * camel_store_summary_clear:
  * @summary: a #CamelStoreSummary object
@@ -697,7 +680,6 @@ camel_store_summary_clear(CamelStoreSummary *s)
 	CAMEL_STORE_SUMMARY_UNLOCK(s, summary_lock);
 }
 
-
 /**
  * camel_store_summary_remove:
  * @summary: a #CamelStoreSummary object
@@ -717,7 +699,6 @@ camel_store_summary_remove(CamelStoreSummary *s, CamelStoreInfo *info)
 	camel_store_summary_info_free(s, info);
 }
 
-
 /**
  * camel_store_summary_remove_path:
  * @summary: a #CamelStoreSummary object
@@ -746,7 +727,6 @@ camel_store_summary_remove_path(CamelStoreSummary *s, const gchar *path)
 	}
 }
 
-
 /**
  * camel_store_summary_remove_index:
  * @summary: a #CamelStoreSummary object
@@ -816,7 +796,6 @@ summary_header_save(CamelStoreSummary *s, FILE *out)
 	return camel_file_util_encode_fixed_int32(out, camel_store_summary_count(s));
 }
 
-
 /**
  * camel_store_summary_info_new:
  * @summary: a #CamelStoreSummary object
@@ -836,7 +815,6 @@ camel_store_summary_info_new(CamelStoreSummary *s)
 	return info;
 }
 
-
 /**
  * camel_store_info_string:
  * @summary: a #CamelStoreSummary object
@@ -853,7 +831,6 @@ camel_store_info_string(CamelStoreSummary *s, const CamelStoreInfo *info, gint t
 	return ((CamelStoreSummaryClass *)(CAMEL_OBJECT_GET_CLASS(s)))->store_info_string(s, info, type);
 }
 
-
 /**
  * camel_store_info_set_string:
  * @summary: a #CamelStoreSummary object
diff --git a/camel/camel-store-summary.h b/camel/camel-store-summary.h
index a8268cf..1a79f00 100644
--- a/camel/camel-store-summary.h
+++ b/camel/camel-store-summary.h
@@ -19,7 +19,6 @@
  * Boston, MA 02110-1301, USA.
  */
 
-
 #ifndef _CAMEL_STORE_SUMMARY_H
 #define _CAMEL_STORE_SUMMARY_H
 
diff --git a/camel/camel-store.c b/camel/camel-store.c
index 6205964..9b8d26f 100644
--- a/camel/camel-store.c
+++ b/camel/camel-store.c
@@ -173,7 +173,6 @@ camel_store_finalize (CamelObject *object)
 	g_free (store->priv);
 }
 
-
 CamelType
 camel_store_get_type (void)
 {
@@ -623,7 +622,6 @@ camel_store_rename_folder (CamelStore *store, const gchar *old_namein, const gch
 	g_free(old_name);
 }
 
-
 static CamelFolder *
 get_inbox (CamelStore *store, CamelException *ex)
 {
@@ -1158,7 +1156,6 @@ folder_info_clone_rec(CamelFolderInfo *fi, CamelFolderInfo *parent)
 	return info;
 }
 
-
 /**
  * camel_folder_info_clone:
  * @fi: a #CamelFolderInfo
@@ -1176,7 +1173,6 @@ camel_folder_info_clone(CamelFolderInfo *fi)
 	return folder_info_clone_rec(fi, NULL);
 }
 
-
 /**
  * camel_store_supports_subscriptions:
  * @store: a #CamelStore object
@@ -1261,7 +1257,6 @@ unsubscribe_folder(CamelStore *store, const gchar *folder_name, CamelException *
 		     camel_type_to_name (CAMEL_OBJECT_GET_TYPE (store))));
 }
 
-
 /**
  * camel_store_unsubscribe_folder:
  * @store: a #CamelStore object
@@ -1312,7 +1307,6 @@ camel_store_noop (CamelStore *store, CamelException *ex)
 	CS_CLASS (store)->noop (store, ex);
 }
 
-
 /**
  * camel_store_folder_uri_equal:
  * @store: a #CamelStore object
diff --git a/camel/camel-stream-buffer.c b/camel/camel-stream-buffer.c
index 73b4c81..8175af7 100644
--- a/camel/camel-stream-buffer.c
+++ b/camel/camel-stream-buffer.c
@@ -99,7 +99,6 @@ camel_stream_buffer_finalize (CamelObject *object)
 	g_free(sbf->linebuf);
 }
 
-
 CamelType
 camel_stream_buffer_get_type (void)
 {
@@ -118,7 +117,6 @@ camel_stream_buffer_get_type (void)
 	return camel_stream_buffer_type;
 }
 
-
 static void
 set_vbuf(CamelStreamBuffer *sbf, gchar *buf, CamelStreamBufferMode mode, gint size)
 {
@@ -155,7 +153,6 @@ init(CamelStreamBuffer *sbuf, CamelStream *s, CamelStreamBufferMode mode)
 	init_vbuf(sbuf, s, mode, NULL, BUF_SIZE);
 }
 
-
 /**
  * camel_stream_buffer_new:
  * @stream: a #CamelStream object to buffer
diff --git a/camel/camel-stream-buffer.h b/camel/camel-stream-buffer.h
index a0200de..9f3e48d 100644
--- a/camel/camel-stream-buffer.h
+++ b/camel/camel-stream-buffer.h
@@ -23,7 +23,6 @@
  * USA
  */
 
-
 #ifndef CAMEL_STREAM_BUFFER_H
 #define CAMEL_STREAM_BUFFER_H 1
 
@@ -62,7 +61,6 @@ struct _CamelStreamBuffer
 	guint flags;	/* internal flags */
 };
 
-
 typedef struct {
 	CamelStreamClass parent_class;
 
@@ -75,11 +73,9 @@ typedef struct {
 
 } CamelStreamBufferClass;
 
-
 /* Standard Camel function */
 CamelType camel_stream_buffer_get_type (void);
 
-
 /* public methods */
 CamelStream *camel_stream_buffer_new (CamelStream *stream,
 				      CamelStreamBufferMode mode);
diff --git a/camel/camel-stream-filter.c b/camel/camel-stream-filter.c
index ca7439d..3879604 100644
--- a/camel/camel-stream-filter.c
+++ b/camel/camel-stream-filter.c
@@ -19,7 +19,6 @@
  * Boston, MA 02110-1301, USA.
  */
 
-
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
diff --git a/camel/camel-stream-filter.h b/camel/camel-stream-filter.h
index cbb8e86..e8b1701 100644
--- a/camel/camel-stream-filter.h
+++ b/camel/camel-stream-filter.h
@@ -19,7 +19,6 @@
  * Boston, MA 02110-1301, USA.
  */
 
-
 #ifndef _CAMEL_STREAM_FILTER_H
 #define _CAMEL_STREAM_FILTER_H
 
diff --git a/camel/camel-stream-fs.c b/camel/camel-stream-fs.c
index 17b6bce..87f1820 100644
--- a/camel/camel-stream-fs.c
+++ b/camel/camel-stream-fs.c
@@ -89,7 +89,6 @@ camel_stream_fs_finalize (CamelObject *object)
 		close (stream_fs->fd);
 }
 
-
 CamelType
 camel_stream_fs_get_type (void)
 {
@@ -211,7 +210,6 @@ camel_stream_fs_new_with_name_and_bounds (const gchar *name, gint flags,
 	return stream;
 }
 
-
 static gssize
 stream_read (CamelStream *stream, gchar *buffer, gsize n)
 {
diff --git a/camel/camel-stream-fs.h b/camel/camel-stream-fs.h
index 883c241..6811936 100644
--- a/camel/camel-stream-fs.h
+++ b/camel/camel-stream-fs.h
@@ -22,7 +22,6 @@
  * USA
  */
 
-
 #ifndef CAMEL_STREAM_FS_H
 #define CAMEL_STREAM_FS_H 1
 
diff --git a/camel/camel-stream-mem.c b/camel/camel-stream-mem.c
index c83eb23..2c55a86 100644
--- a/camel/camel-stream-mem.c
+++ b/camel/camel-stream-mem.c
@@ -110,7 +110,6 @@ camel_stream_mem_get_type (void)
 	return camel_stream_mem_type;
 }
 
-
 /**
  * camel_stream_mem_new:
  *
@@ -124,7 +123,6 @@ camel_stream_mem_new (void)
 	return camel_stream_mem_new_with_byte_array (g_byte_array_new ());
 }
 
-
 /**
  * camel_stream_mem_new_with_buffer:
  * @buffer: a memory buffer to use as the stream data
@@ -148,7 +146,6 @@ camel_stream_mem_new_with_buffer (const gchar *buffer, gsize len)
 	return camel_stream_mem_new_with_byte_array (ba);
 }
 
-
 /**
  * camel_stream_mem_new_with_byte_array:
  * @buffer: a #GByteArray to use as the stream data
@@ -172,7 +169,6 @@ camel_stream_mem_new_with_byte_array (GByteArray *buffer)
 	return CAMEL_STREAM (stream_mem);
 }
 
-
 /**
  * camel_stream_mem_set_secure:
  * @mem: a #CamelStreamMem object
@@ -188,7 +184,6 @@ camel_stream_mem_set_secure(CamelStreamMem *mem)
 	/* setup a mem-locked buffer etc?  blah blah, well not yet anyway */
 }
 
-
 /* note: with these functions the caller is the 'owner' of the buffer */
 
 /**
@@ -213,7 +208,6 @@ camel_stream_mem_set_byte_array (CamelStreamMem *mem, GByteArray *buffer)
 	mem->buffer = buffer;
 }
 
-
 /**
  * camel_stream_mem_set_buffer:
  * @mem: a #CamelStreamMem object
@@ -236,7 +230,6 @@ camel_stream_mem_set_buffer (CamelStreamMem *mem, const gchar *buffer, gsize len
 	mem->owner = TRUE;
 }
 
-
 static void
 camel_stream_mem_finalize (CamelObject *object)
 {
diff --git a/camel/camel-stream-mem.h b/camel/camel-stream-mem.h
index 8bcd851..2a5060b 100644
--- a/camel/camel-stream-mem.h
+++ b/camel/camel-stream-mem.h
@@ -22,7 +22,6 @@
  * USA
  */
 
-
 #ifndef CAMEL_STREAM_MEM_H
 #define CAMEL_STREAM_MEM_H 1
 
diff --git a/camel/camel-stream-null.h b/camel/camel-stream-null.h
index 4fdb077..46e3d3b 100644
--- a/camel/camel-stream-null.h
+++ b/camel/camel-stream-null.h
@@ -19,7 +19,6 @@
  * Boston, MA 02110-1301, USA.
  */
 
-
 #ifndef _CAMEL_STREAM_NULL_H
 #define _CAMEL_STREAM_NULL_H
 
diff --git a/camel/camel-stream-process.c b/camel/camel-stream-process.c
index 04ce7d6..91053f3 100644
--- a/camel/camel-stream-process.c
+++ b/camel/camel-stream-process.c
@@ -86,7 +86,6 @@ camel_stream_process_init (gpointer object, gpointer klass)
 	stream->childpid = 0;
 }
 
-
 CamelType
 camel_stream_process_get_type (void)
 {
@@ -119,7 +118,6 @@ camel_stream_process_new (void)
 	return (CamelStream *) camel_object_new (camel_stream_process_get_type ());
 }
 
-
 static gssize
 stream_read (CamelStream *stream, gchar *buffer, gsize n)
 {
diff --git a/camel/camel-stream-process.h b/camel/camel-stream-process.h
index c996ecf..4c435cd 100644
--- a/camel/camel-stream-process.h
+++ b/camel/camel-stream-process.h
@@ -19,7 +19,6 @@
  * Boston, MA 02110-1301, USA.
  */
 
-
 #ifndef _CAMEL_STREAM_NULL_H
 #define _CAMEL_STREAM_NULL_H
 
diff --git a/camel/camel-stream-vfs.c b/camel/camel-stream-vfs.c
index d3ba109..b735638 100644
--- a/camel/camel-stream-vfs.c
+++ b/camel/camel-stream-vfs.c
@@ -78,7 +78,6 @@ camel_stream_vfs_finalize (CamelObject *object)
 		g_object_unref (stream_vfs->stream);
 }
 
-
 CamelType
 camel_stream_vfs_get_type (void)
 {
diff --git a/camel/camel-stream-vfs.h b/camel/camel-stream-vfs.h
index d5915be..816129a 100644
--- a/camel/camel-stream-vfs.h
+++ b/camel/camel-stream-vfs.h
@@ -22,7 +22,6 @@
  * USA
  */
 
-
 #ifndef CAMEL_STREAM_VFS_H
 #define CAMEL_STREAM_VFS_H 1
 
diff --git a/camel/camel-stream.c b/camel/camel-stream.c
index 368c7da..b8b8da0 100644
--- a/camel/camel-stream.c
+++ b/camel/camel-stream.c
@@ -22,7 +22,6 @@
  * USA
  */
 
-
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
@@ -77,7 +76,6 @@ camel_stream_get_type (void)
 	return camel_stream_type;
 }
 
-
 /**
  * camel_stream_read:
  * @stream: a #CamelStream object.
@@ -98,7 +96,6 @@ camel_stream_read (CamelStream *stream, gchar *buffer, gsize n)
 	return (CS_CLASS (stream)->read) (stream, buffer, n);
 }
 
-
 /**
  * camel_stream_write:
  * @stream: a #CamelStream object
@@ -119,7 +116,6 @@ camel_stream_write (CamelStream *stream, const gchar *buffer, gsize n)
 	return CS_CLASS (stream)->write (stream, buffer, n);
 }
 
-
 /**
  * camel_stream_flush:
  * @stream: a #CamelStream object
@@ -137,7 +133,6 @@ camel_stream_flush (CamelStream *stream)
 	return CS_CLASS (stream)->flush (stream);
 }
 
-
 /**
  * camel_stream_close:
  * @stream: a #CamelStream object
@@ -154,7 +149,6 @@ camel_stream_close (CamelStream *stream)
 	return CS_CLASS (stream)->close (stream);
 }
 
-
 /**
  * camel_stream_eos:
  * @stream: a #CamelStream object
@@ -171,7 +165,6 @@ camel_stream_eos (CamelStream *stream)
 	return CS_CLASS (stream)->eos (stream);
 }
 
-
 /**
  * camel_stream_reset:
  * @stream: a #CamelStream object
@@ -207,7 +200,6 @@ camel_stream_write_string (CamelStream *stream, const gchar *string)
 	return camel_stream_write (stream, string, strlen (string));
 }
 
-
 /**
  * camel_stream_printf:
  * @stream: a #CamelStream object
@@ -238,7 +230,6 @@ camel_stream_printf (CamelStream *stream, const gchar *fmt, ... )
 	return ret;
 }
 
-
 /**
  * camel_stream_write_to_stream:
  * @stream: source #CamelStream object
diff --git a/camel/camel-stream.h b/camel/camel-stream.h
index e7dd918..b44f181 100644
--- a/camel/camel-stream.h
+++ b/camel/camel-stream.h
@@ -22,7 +22,6 @@
  * USA
  */
 
-
 #ifndef CAMEL_STREAM_H
 #define CAMEL_STREAM_H 1
 
diff --git a/camel/camel-string-utils.c b/camel/camel-string-utils.c
index 95041e4..b2c1b27 100644
--- a/camel/camel-string-utils.c
+++ b/camel/camel-string-utils.c
@@ -20,7 +20,6 @@
  *
  */
 
-
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
@@ -53,7 +52,6 @@ camel_strcase_hash (gconstpointer v)
 	return h;
 }
 
-
 static void
 free_string (gpointer string, gpointer user_data)
 {
@@ -94,7 +92,6 @@ camel_strstrcase (const gchar *haystack, const gchar *needle)
 	return NULL;
 }
 
-
 const gchar *
 camel_strdown (gchar *str)
 {
@@ -249,7 +246,6 @@ camel_pstring_strdup (const gchar *s)
 	return camel_pstring_add ((gchar *) s, FALSE);
 }
 
-
 /**
  * camel_pstring_free:
  * @s: String to free.
diff --git a/camel/camel-string-utils.h b/camel/camel-string-utils.h
index 97e268e..10274ea 100644
--- a/camel/camel-string-utils.h
+++ b/camel/camel-string-utils.h
@@ -20,7 +20,6 @@
  *
  */
 
-
 #ifndef __CAMEL_STRING_UTILS_H__
 #define __CAMEL_STRING_UTILS_H__
 
diff --git a/camel/camel-tcp-stream-openssl.c b/camel/camel-tcp-stream-openssl.c
index 3c7666f..7eeefbe 100644
--- a/camel/camel-tcp-stream-openssl.c
+++ b/camel/camel-tcp-stream-openssl.c
@@ -20,7 +20,6 @@
  *
  */
 
-
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
@@ -137,7 +136,6 @@ camel_tcp_stream_ssl_finalize (CamelObject *object)
 	g_free (stream->priv);
 }
 
-
 CamelType
 camel_tcp_stream_ssl_get_type (void)
 {
@@ -157,7 +155,6 @@ camel_tcp_stream_ssl_get_type (void)
 	return type;
 }
 
-
 /**
  * camel_tcp_stream_ssl_new:
  * @service: camel service
@@ -185,7 +182,6 @@ camel_tcp_stream_ssl_new (CamelService *service, const gchar *expected_host, gui
 	return CAMEL_STREAM (stream);
 }
 
-
 /**
  * camel_tcp_stream_ssl_new_raw:
  * @service: camel service
@@ -213,7 +209,6 @@ camel_tcp_stream_ssl_new_raw (CamelService *service, const gchar *expected_host,
 	return CAMEL_STREAM (stream);
 }
 
-
 static gint
 ssl_errno (SSL *ssl, gint ret)
 {
@@ -240,7 +235,6 @@ ssl_errno (SSL *ssl, gint ret)
 	}
 }
 
-
 /**
  * camel_tcp_stream_ssl_enable_ssl:
  * @stream: ssl stream
@@ -271,7 +265,6 @@ camel_tcp_stream_ssl_enable_ssl (CamelTcpStreamSSL *stream)
 	return 0;
 }
 
-
 static gssize
 stream_read (CamelStream *stream, gchar *buffer, gsize n)
 {
@@ -429,7 +422,6 @@ stream_flush (CamelStream *stream)
 	return 0;
 }
 
-
 static void
 close_ssl_connection (SSL *ssl)
 {
@@ -788,7 +780,6 @@ stream_connect (CamelTcpStream *stream, struct hostent *host, gint port)
 	return 0;
 }
 
-
 static gint
 get_sockopt_level (const CamelSockOptData *data)
 {
diff --git a/camel/camel-tcp-stream-raw.c b/camel/camel-tcp-stream-raw.c
index baa1fca..6b0d067 100644
--- a/camel/camel-tcp-stream-raw.c
+++ b/camel/camel-tcp-stream-raw.c
@@ -104,7 +104,6 @@ camel_tcp_stream_raw_finalize (CamelObject *object)
 		SOCKET_CLOSE (stream->sockfd);
 }
 
-
 CamelType
 camel_tcp_stream_raw_get_type (void)
 {
@@ -225,8 +224,6 @@ flaky_tcp_read (gint fd, gchar *buffer, gsize buflen)
 
 #endif /* SIMULATE_FLAKY_NETWORK */
 
-
-
 /**
  * camel_tcp_stream_raw_new:
  *
diff --git a/camel/camel-tcp-stream-raw.h b/camel/camel-tcp-stream-raw.h
index ab24d5e..ebf13fb 100644
--- a/camel/camel-tcp-stream-raw.h
+++ b/camel/camel-tcp-stream-raw.h
@@ -20,7 +20,6 @@
  *
  */
 
-
 #ifndef CAMEL_TCP_STREAM_RAW_H
 #define CAMEL_TCP_STREAM_RAW_H
 
diff --git a/camel/camel-tcp-stream-ssl.c b/camel/camel-tcp-stream-ssl.c
index 0449e83..de3e3cb 100644
--- a/camel/camel-tcp-stream-ssl.c
+++ b/camel/camel-tcp-stream-ssl.c
@@ -143,7 +143,6 @@ camel_tcp_stream_ssl_finalize (CamelObject *object)
 	g_free (stream->priv);
 }
 
-
 CamelType
 camel_tcp_stream_ssl_get_type (void)
 {
@@ -163,7 +162,6 @@ camel_tcp_stream_ssl_get_type (void)
 	return type;
 }
 
-
 /**
  * camel_tcp_stream_ssl_new:
  * @session: an active #CamelSession object
@@ -197,7 +195,6 @@ camel_tcp_stream_ssl_new (CamelSession *session, const gchar *expected_host, gui
 	return CAMEL_STREAM (stream);
 }
 
-
 /**
  * camel_tcp_stream_ssl_new_raw:
  * @session: an active #CamelSession object
@@ -231,7 +228,6 @@ camel_tcp_stream_ssl_new_raw (CamelSession *session, const gchar *expected_host,
 	return CAMEL_STREAM (stream);
 }
 
-
 static void
 set_errno (gint code)
 {
@@ -294,7 +290,6 @@ set_errno (gint code)
 	}
 }
 
-
 /**
  * camel_tcp_stream_ssl_enable_ssl:
  * @ssl: a #CamelTcpStreamSSL object
@@ -334,7 +329,6 @@ camel_tcp_stream_ssl_enable_ssl (CamelTcpStreamSSL *ssl)
 	return 0;
 }
 
-
 static gssize
 stream_read (CamelStream *stream, gchar *buffer, gsize n)
 {
@@ -819,7 +813,6 @@ camel_certdb_nss_cert_set(CamelCertDB *certdb, CamelCert *ccert, CERTCertificate
 	g_free (path);
 }
 
-
 #if 0
 /* used by the mozilla-like code below */
 static gchar *
diff --git a/camel/camel-tcp-stream-ssl.h b/camel/camel-tcp-stream-ssl.h
index 6cd7da1..d8f5861 100644
--- a/camel/camel-tcp-stream-ssl.h
+++ b/camel/camel-tcp-stream-ssl.h
@@ -20,7 +20,6 @@
  *
  */
 
-
 #ifndef CAMEL_TCP_STREAM_SSL_H
 #define CAMEL_TCP_STREAM_SSL_H
 
diff --git a/camel/camel-tcp-stream.c b/camel/camel-tcp-stream.c
index 1798a4b..acc817b 100644
--- a/camel/camel-tcp-stream.c
+++ b/camel/camel-tcp-stream.c
@@ -81,7 +81,6 @@ camel_tcp_stream_get_type (void)
 	return type;
 }
 
-
 static gint
 tcp_connect (CamelTcpStream *stream, struct addrinfo *host)
 {
diff --git a/camel/camel-tcp-stream.h b/camel/camel-tcp-stream.h
index 8e2e7f3..238c0fa 100644
--- a/camel/camel-tcp-stream.h
+++ b/camel/camel-tcp-stream.h
@@ -20,7 +20,6 @@
  *
  */
 
-
 #ifndef CAMEL_TCP_STREAM_H
 #define CAMEL_TCP_STREAM_H
 
diff --git a/camel/camel-text-index.c b/camel/camel-text-index.c
index 65227fb..496780c 100644
--- a/camel/camel-text-index.c
+++ b/camel/camel-text-index.c
@@ -45,7 +45,6 @@
 #include "camel-private.h"
 #include "camel-text-index.h"
 
-
 #define w(x)
 #define io(x)
 #define d(x) /*(printf("%s(%d):%s: ",  __FILE__, __LINE__, __PRETTY_FUNCTION__),(x))*/
@@ -1122,8 +1121,6 @@ dump_raw(GHashTable *map, gchar *path)
 	while ((len = read(fd, buf, 1024)) == 1024) {
 		id = total;
 
-
-
 		type = g_hash_table_lookup(map, id);
 		switch(type) {
 		case 0:
@@ -1167,7 +1164,6 @@ dump_raw(GHashTable *map, gchar *path)
 		} break;
 		}
 
-
 		printf("--raw--\n");
 
 		len = 1024;
@@ -1847,7 +1843,6 @@ gint main(gint argc, gchar **argv)
 
 	idx = (CamelIndex *)camel_text_index_new("textindex", O_CREAT|O_RDWR|O_TRUNC);
 
-
 #if 1
 	camel_index_compress(idx);
 
diff --git a/camel/camel-transport.c b/camel/camel-transport.c
index 139b2c7..eac38e5 100644
--- a/camel/camel-transport.c
+++ b/camel/camel-transport.c
@@ -40,7 +40,6 @@ static CamelServiceClass *parent_class = NULL;
 static gint transport_setv (CamelObject *object, CamelException *ex, CamelArgV *args);
 static gint transport_getv (CamelObject *object, CamelException *ex, CamelArgGetV *args);
 
-
 static void
 camel_transport_class_init (CamelTransportClass *camel_transport_class)
 {
@@ -90,7 +89,6 @@ camel_transport_get_type (void)
 	return type;
 }
 
-
 static gint
 transport_setv (CamelObject *object, CamelException *ex, CamelArgV *args)
 {
@@ -105,7 +103,6 @@ transport_getv (CamelObject *object, CamelException *ex, CamelArgGetV *args)
 	return CAMEL_OBJECT_CLASS (parent_class)->getv (object, ex, args);
 }
 
-
 /**
  * camel_transport_send_to:
  * @transport: a #CamelTransport object
diff --git a/camel/camel-transport.h b/camel/camel-transport.h
index e01a2d6..3c3bbac 100644
--- a/camel/camel-transport.h
+++ b/camel/camel-transport.h
@@ -23,7 +23,6 @@
  * USA
  */
 
-
 #ifndef CAMEL_TRANSPORT_H
 #define CAMEL_TRANSPORT_H 1
 
@@ -48,8 +47,6 @@ struct _CamelTransport
 	struct _CamelTransportPrivate *priv;
 };
 
-
-
 typedef struct {
 	CamelServiceClass parent_class;
 
@@ -59,7 +56,6 @@ typedef struct {
 			     CamelException *ex);
 } CamelTransportClass;
 
-
 /* public methods */
 gboolean camel_transport_send_to (CamelTransport *transport,
 				  CamelMimeMessage *message,
diff --git a/camel/camel-trie.c b/camel/camel-trie.c
index e0fbc90..09180b6 100644
--- a/camel/camel-trie.c
+++ b/camel/camel-trie.c
@@ -59,7 +59,6 @@ struct _CamelTrie {
 	EMemChunk *state_chunks;
 };
 
-
 static inline gunichar
 trie_utf8_getc (const guchar **in, gsize inlen)
 {
@@ -147,8 +146,6 @@ camel_trie_free (CamelTrie *trie)
 	g_free (trie);
 }
 
-
-
 static struct _trie_match *
 g (struct _trie_state *s, gunichar c)
 {
@@ -189,7 +186,6 @@ trie_insert (CamelTrie *trie, gint depth, struct _trie_state *q, gunichar c)
 	return q;
 }
 
-
 #if d(!)0
 static void
 dump_trie (struct _trie_state *s, gint depth)
@@ -213,7 +209,6 @@ dump_trie (struct _trie_state *s, gint depth)
 }
 #endif
 
-
 /*
  * final = empty set
  * FOR p = 1 TO #pat
diff --git a/camel/camel-uid-cache.c b/camel/camel-uid-cache.c
index e91e172..1ebdd47 100644
--- a/camel/camel-uid-cache.c
+++ b/camel/camel-uid-cache.c
@@ -46,7 +46,6 @@ struct _uid_state {
 	gboolean save;
 };
 
-
 /**
  * camel_uid_cache_new:
  * @filename: path to load the cache from
@@ -118,7 +117,6 @@ camel_uid_cache_new (const gchar *filename)
 	return cache;
 }
 
-
 static void
 maybe_write_uid (gpointer key, gpointer value, gpointer data)
 {
@@ -142,7 +140,6 @@ maybe_write_uid (gpointer key, gpointer value, gpointer data)
 	}
 }
 
-
 /**
  * camel_uid_cache_save:
  * @cache: a CamelUIDCache
@@ -233,7 +230,6 @@ camel_uid_cache_save (CamelUIDCache *cache)
 	return FALSE;
 }
 
-
 static void
 free_uid (gpointer key, gpointer value, gpointer data)
 {
@@ -241,7 +237,6 @@ free_uid (gpointer key, gpointer value, gpointer data)
 	g_free (value);
 }
 
-
 /**
  * camel_uid_cache_destroy:
  * @cache: a CamelUIDCache
@@ -257,7 +252,6 @@ camel_uid_cache_destroy (CamelUIDCache *cache)
 	g_free (cache);
 }
 
-
 /**
  * camel_uid_cache_get_new_uids:
  * @cache: a CamelUIDCache
@@ -300,7 +294,6 @@ camel_uid_cache_get_new_uids (CamelUIDCache *cache, GPtrArray *uids)
 	return new_uids;
 }
 
-
 /**
  * camel_uid_cache_save_uid:
  * @cache: a CamelUIDCache
@@ -328,7 +321,6 @@ camel_uid_cache_save_uid (CamelUIDCache *cache, const gchar *uid)
 	}
 }
 
-
 /**
  * camel_uid_cache_free_uids:
  * @uids: an array returned from camel_uid_cache_get_new_uids()
diff --git a/camel/camel-url-scanner.c b/camel/camel-url-scanner.c
index 76ecced..62ba1e8 100644
--- a/camel/camel-url-scanner.c
+++ b/camel/camel-url-scanner.c
@@ -20,7 +20,6 @@
  *
  */
 
-
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
@@ -38,7 +37,6 @@ struct _CamelUrlScanner {
 	CamelTrie *trie;
 };
 
-
 CamelUrlScanner *
 camel_url_scanner_new (void)
 {
@@ -51,7 +49,6 @@ camel_url_scanner_new (void)
 	return scanner;
 }
 
-
 void
 camel_url_scanner_free (CamelUrlScanner *scanner)
 {
@@ -62,7 +59,6 @@ camel_url_scanner_free (CamelUrlScanner *scanner)
 	g_free (scanner);
 }
 
-
 void
 camel_url_scanner_add (CamelUrlScanner *scanner, urlpattern_t *pattern)
 {
@@ -72,7 +68,6 @@ camel_url_scanner_add (CamelUrlScanner *scanner, urlpattern_t *pattern)
 	g_ptr_array_add (scanner->patterns, pattern);
 }
 
-
 gboolean
 camel_url_scanner_scan (CamelUrlScanner *scanner, const gchar *in, gsize inlen, urlmatch_t *match)
 {
@@ -109,7 +104,6 @@ camel_url_scanner_scan (CamelUrlScanner *scanner, const gchar *in, gsize inlen,
 	return FALSE;
 }
 
-
 static guchar url_scanner_table[256] = {
 	  1,  1,  1,  1,  1,  1,  1,  1,  1,  9,  9,  1,  1,  9,  1,  1,
 	  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,
@@ -148,7 +142,6 @@ enum {
 #define is_domain(x) ((url_scanner_table[(guchar)(x)] & IS_DOMAIN) != 0)
 #define is_urlsafe(x) ((url_scanner_table[(guchar)(x)] & (IS_ALPHA|IS_DIGIT|IS_URLSAFE)) != 0)
 
-
 static const struct {
 	const gchar open;
 	const gchar close;
@@ -195,7 +188,6 @@ url_stop_at_brace (const gchar *in, gsize so, gchar *open_brace)
 	return '\0';
 }
 
-
 gboolean
 camel_url_addrspec_start (const gchar *in, const gchar *pos, const gchar *inend, urlmatch_t *match)
 {
@@ -461,14 +453,11 @@ camel_url_web_end (const gchar *in, const gchar *pos, const gchar *inend, urlmat
 	while (inptr > pos && strchr (",.:;?!-|}])\"", inptr[-1]))
 		inptr--;
 
-
 	match->um_eo = (inptr - in);
 
 	return TRUE;
 }
 
-
-
 #ifdef BUILD_TABLE
 
 #include <stdio.h>
@@ -480,7 +469,6 @@ camel_url_web_end (const gchar *in, const gchar *pos, const gchar *inend, urlmat
 /* got these from rfc1738 */
 #define CHARS_URLSAFE "$-_.+!*'(),{}|\\^~[]`#%\";/?:@&="
 
-
 static void
 table_init_bits (guint mask, const guchar *vals)
 {
diff --git a/camel/camel-url-scanner.h b/camel/camel-url-scanner.h
index dcf7cd5..249f414 100644
--- a/camel/camel-url-scanner.h
+++ b/camel/camel-url-scanner.h
@@ -20,7 +20,6 @@
  *
  */
 
-
 #ifndef __CAMEL_URL_SCANNER_H__
 #define __CAMEL_URL_SCANNER_H__
 
diff --git a/camel/camel-url.c b/camel/camel-url.c
index 956d576..e9b637d 100644
--- a/camel/camel-url.c
+++ b/camel/camel-url.c
@@ -431,7 +431,6 @@ camel_url_free (CamelURL *url)
 	}
 }
 
-
 #define DEFINE_CAMEL_URL_SET(part)			\
 void							\
 camel_url_set_##part (CamelURL *url, const gchar *part)	\
@@ -442,7 +441,6 @@ camel_url_set_##part (CamelURL *url, const gchar *part)	\
 	url->part = g_strdup (part);			\
 }
 
-
 /**
  * camel_url_set_protocol:
  * @url: a #CamelURL
@@ -452,7 +450,6 @@ camel_url_set_##part (CamelURL *url, const gchar *part)	\
  **/
 DEFINE_CAMEL_URL_SET (protocol)
 
-
 /**
  * camel_url_set_user:
  * @url: a #CamelURL
@@ -462,7 +459,6 @@ DEFINE_CAMEL_URL_SET (protocol)
  **/
 DEFINE_CAMEL_URL_SET (user)
 
-
 /**
  * camel_url_set_authmech:
  * @url: a #CamelURL
@@ -472,7 +468,6 @@ DEFINE_CAMEL_URL_SET (user)
  **/
 DEFINE_CAMEL_URL_SET (authmech)
 
-
 /**
  * camel_url_set_passwd:
  * @url: a #CamelURL
@@ -482,7 +477,6 @@ DEFINE_CAMEL_URL_SET (authmech)
  **/
 DEFINE_CAMEL_URL_SET (passwd)
 
-
 /**
  * camel_url_set_host:
  * @url: a #CamelURL
@@ -492,7 +486,6 @@ DEFINE_CAMEL_URL_SET (passwd)
  **/
 DEFINE_CAMEL_URL_SET (host)
 
-
 /**
  * camel_url_set_path:
  * @url: a #CamelURL
@@ -502,7 +495,6 @@ DEFINE_CAMEL_URL_SET (host)
  **/
 DEFINE_CAMEL_URL_SET (path)
 
-
 /**
  * camel_url_set_query:
  * @url: a #CamelURL
@@ -512,7 +504,6 @@ DEFINE_CAMEL_URL_SET (path)
  **/
 DEFINE_CAMEL_URL_SET (query)
 
-
 /**
  * camel_url_set_fragment:
  * @url: a #CamelURL
@@ -522,7 +513,6 @@ DEFINE_CAMEL_URL_SET (query)
  **/
 DEFINE_CAMEL_URL_SET (fragment)
 
-
 /**
  * camel_url_set_port:
  * @url: a #CamelURL
@@ -538,7 +528,6 @@ camel_url_set_port (CamelURL *url, gint port)
 	url->port = port;
 }
 
-
 /**
  * camel_url_set_param:
  * @url: a #CamelURL
@@ -558,7 +547,6 @@ camel_url_set_param (CamelURL *url, const gchar *name, const gchar *value)
 		g_datalist_remove_data(&url->params, name);
 }
 
-
 /**
  * camel_url_get_param:
  * @url: a #CamelURL
@@ -664,7 +652,6 @@ camel_url_decode (gchar *part)
 	} while (*s++);
 }
 
-
 guint
 camel_url_hash (gconstpointer v)
 {
@@ -714,7 +701,6 @@ camel_url_equal(gconstpointer v, gconstpointer v2)
 		&& u1->port == u2->port;
 }
 
-
 /**
  * camel_url_copy:
  * @in: a #CamelURL to copy
diff --git a/camel/camel-url.h b/camel/camel-url.h
index 4b4cc9b..afce4e2 100644
--- a/camel/camel-url.h
+++ b/camel/camel-url.h
@@ -23,7 +23,6 @@
  * USA
  */
 
-
 #ifndef CAMEL_URL_H
 #define CAMEL_URL_H 1
 
diff --git a/camel/camel-utf8.c b/camel/camel-utf8.c
index 9443783..ba44512 100644
--- a/camel/camel-utf8.c
+++ b/camel/camel-utf8.c
@@ -20,7 +20,6 @@
  *
  */
 
-
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
diff --git a/camel/camel-vee-folder.c b/camel/camel-vee-folder.c
index 78748c6..2c82064 100644
--- a/camel/camel-vee-folder.c
+++ b/camel/camel-vee-folder.c
@@ -252,12 +252,10 @@ camel_vee_folder_remove_folder(CamelVeeFolder *vf, CamelFolder *sub)
 		return;
 	}
 
-
 	camel_object_unhook_event((CamelObject *)sub, "folder_changed", (CamelObjectEventHookFunc) folder_changed, vf);
 	camel_object_unhook_event((CamelObject *)sub, "deleted", (CamelObjectEventHookFunc) subfolder_deleted, vf);
 	camel_object_unhook_event((CamelObject *)sub, "renamed", (CamelObjectEventHookFunc) folder_renamed, vf);
 
-
 	p->folders = g_list_remove(p->folders, sub);
 
 	/* undo the freeze state that we have imposed on this source folder */
@@ -584,7 +582,6 @@ vee_sync(CamelFolder *folder, gboolean expunge, CamelException *ex)
 		} else
 			camel_exception_clear (ex);
 
-
 		/* auto update vfolders shouldn't need a rebuild */
 /*		if ((vf->flags & CAMEL_STORE_VEE_FOLDER_AUTO) == 0 */
 /*		    && camel_vee_folder_rebuild_folder(vf, f, ex) == -1) */
@@ -692,7 +689,6 @@ vee_count_by_expression(CamelFolder *folder, const gchar *expression, CamelExcep
 		node = g_list_next(node);
 	}
 
-
 	g_free(expr);
 
 	g_hash_table_destroy(searched);
@@ -744,7 +740,6 @@ vee_search_by_expression(CamelFolder *folder, const gchar *expression, CamelExce
 		node = g_list_next(node);
 	}
 
-
 	g_free(expr);
 
 	g_hash_table_destroy(searched);
@@ -1086,7 +1081,6 @@ folder_added_uid(gchar *uidin, gpointer value, struct _update_data *u)
 	}
 }
 
-
 /* build query contents for a single folder */
 static gint
 vee_rebuild_folder(CamelVeeFolder *vf, CamelFolder *source, CamelException *ex)
@@ -1309,7 +1303,6 @@ vee_rebuild_folder(CamelVeeFolder *vf, CamelFolder *source, CamelException *ex)
 	return 0;
 }
 
-
 /* Hold all these with summary lock and unmatched summary lock held */
 static void
 folder_changed_add_uid(CamelFolder *sub, const gchar *uid, const gchar hash[8], CamelVeeFolder *vf, gboolean use_db)
@@ -1485,7 +1478,6 @@ folder_changed_change(CamelSession *session, CamelSessionThreadMsg *msg)
 
 	camel_vee_folder_hash_folder(sub, hash);
 
-
 	/* Lookup anything before we lock anything, to avoid deadlock with build_folder */
 
 	/* Find newly added that match */
@@ -1540,7 +1532,6 @@ folder_changed_change(CamelSession *session, CamelSessionThreadMsg *msg)
 	if (matches_changed || matches_added || changes->uid_removed->len||present)
 		camel_db_begin_transaction (folder->parent_store->cdb_w, NULL);
 
-
 	dd(printf("Vfolder '%s' subfolder changed '%s'\n", folder->full_name, sub->full_name));
 	dd(printf(" changed %u added %u removed %u\n", changes->uid_changed->len, changes->uid_added->len, changes->uid_removed->len));
 
@@ -1957,7 +1948,6 @@ vee_set_expression(CamelVeeFolder *vf, const gchar *query)
 		s->junk_not_deleted_count = 0;
 	}
 
-
 	g_free(vf->expression);
 	if (query)
 		vf->expression = g_strdup(query);
@@ -1990,7 +1980,6 @@ vf_getv(CamelObject *object, CamelException *ex, CamelArgGetV *args)
 	guint32 tag;
 	gint unread = -1, deleted = 0, junked = 0, visible = 0, count = -1, junked_not_deleted = -1;
 
-
 	for (i=0;i<args->argc;i++) {
 		CamelArgGet *arg = &args->argv[i];
 
@@ -2158,7 +2147,6 @@ camel_vee_folder_unmask_event_folder_changed (CamelVeeFolder *vf, CamelFolder *s
 	camel_object_hook_event((CamelObject *)sub, "folder_changed", (CamelObjectEventHookFunc) folder_changed, vf);
 }
 
-
 static void
 vee_folder_stop_folder(CamelVeeFolder *vf, CamelFolder *sub)
 {
@@ -2177,7 +2165,6 @@ vee_folder_stop_folder(CamelVeeFolder *vf, CamelFolder *sub)
 		return;
 	}
 
-
 	camel_object_unhook_event((CamelObject *)sub, "folder_changed", (CamelObjectEventHookFunc) folder_changed, vf);
 	camel_object_unhook_event((CamelObject *)sub, "deleted", (CamelObjectEventHookFunc) subfolder_deleted, vf);
 	camel_object_unhook_event((CamelObject *)sub, "renamed", (CamelObjectEventHookFunc) folder_renamed, vf);
diff --git a/camel/camel-vee-folder.h b/camel/camel-vee-folder.h
index 6564e04..7a38428 100644
--- a/camel/camel-vee-folder.h
+++ b/camel/camel-vee-folder.h
@@ -19,7 +19,6 @@
  * Boston, MA 02110-1301, USA.
  */
 
-
 #ifndef _CAMEL_VEE_FOLDER_H
 #define _CAMEL_VEE_FOLDER_H
 
diff --git a/camel/camel-vee-store.h b/camel/camel-vee-store.h
index 45f2637..ecbd2a0 100644
--- a/camel/camel-vee-store.h
+++ b/camel/camel-vee-store.h
@@ -19,7 +19,6 @@
  * Boston, MA 02110-1301, USA.
  */
 
-
 #ifndef _CAMEL_VEE_STORE_H
 #define _CAMEL_VEE_STORE_H
 
diff --git a/camel/camel-vee-summary.c b/camel/camel-vee-summary.c
index 6cd4947..42962a5 100644
--- a/camel/camel-vee-summary.c
+++ b/camel/camel-vee-summary.c
@@ -169,12 +169,12 @@ vee_info_set_user_flag(CamelMessageInfo *mi, const gchar *name, gboolean value)
 
 		if (hacked_unread_folder)
 			camel_vee_folder_mask_event_folder_changed ((CamelVeeFolder *)mi->summary->folder, rmi->summary->folder);
-		
+
 		res = camel_message_info_set_user_flag(rmi, name, value);
 
 		if (hacked_unread_folder)
 			camel_vee_folder_unmask_event_folder_changed ((CamelVeeFolder *)mi->summary->folder, rmi->summary->folder);
-		
+
 		camel_message_info_free (rmi);
 	}
 
@@ -436,7 +436,6 @@ camel_vee_summary_get_type (void)
 	return type;
 }
 
-
 /**
  * camel_vee_summary_new:
  * @parent: Folder its attached to.
diff --git a/camel/camel-vtrash-folder.h b/camel/camel-vtrash-folder.h
index 7369f4a..815327d 100644
--- a/camel/camel-vtrash-folder.h
+++ b/camel/camel-vtrash-folder.h
@@ -20,7 +20,6 @@
  *
  */
 
-
 #ifndef _CAMEL_VTRASH_FOLDER_H
 #define _CAMEL_VTRASH_FOLDER_H
 
diff --git a/camel/camel.c b/camel/camel.c
index 644c878..7f999ff 100644
--- a/camel/camel.c
+++ b/camel/camel.c
@@ -21,7 +21,6 @@
  *
  */
 
-
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
diff --git a/camel/camel.h b/camel/camel.h
index 9c80a36..1965b7d 100644
--- a/camel/camel.h
+++ b/camel/camel.h
@@ -21,7 +21,6 @@
  * USA
  */
 
-
 #ifndef CAMEL_H
 #define CAMEL_H 1
 
diff --git a/camel/db-scrap-tools/db.c b/camel/db-scrap-tools/db.c
index c156c45..e571168 100644
--- a/camel/db-scrap-tools/db.c
+++ b/camel/db-scrap-tools/db.c
@@ -3,7 +3,6 @@
 #include <stdio.h>
 #include <sqlite3.h>
 
-
 sqlite3 *db;
 
 static gint
diff --git a/camel/providers/groupwise/camel-groupwise-folder.c b/camel/providers/groupwise/camel-groupwise-folder.c
index dc79116..6667956 100644
--- a/camel/providers/groupwise/camel-groupwise-folder.c
+++ b/camel/providers/groupwise/camel-groupwise-folder.c
@@ -25,7 +25,6 @@
  * USA
  */
 
-
 /* This file is broken and suffers from multiple author syndrome.
 This needs to be rewritten with a lot of functions cleaned up.
 
@@ -114,7 +113,6 @@ groupwise_get_filename (CamelFolder *folder, const gchar *uid, CamelException *e
 	return camel_data_cache_get_filename (gw_folder->cache, "cache", uid, ex);
 }
 
-
 /* Get a message from cache if available otherwise get it from server */
 static CamelMimeMessage *
 groupwise_folder_get_message( CamelFolder *folder, const gchar *uid, CamelException *ex )
@@ -887,8 +885,6 @@ groupwise_sync (CamelFolder *folder, gboolean expunge, CamelException *ex)
 		CAMEL_SERVICE_REC_UNLOCK (gw_store, connect_lock);
 	}
 
-
-
 	if (unread_items) {
 		CAMEL_SERVICE_REC_LOCK (gw_store, connect_lock);
 		status = e_gw_connection_mark_unread (cnc, unread_items);
@@ -924,7 +920,6 @@ camel_gw_folder_new(CamelStore *store, const gchar *folder_name, const gchar *fo
 	gchar *summary_file, *state_file, *journal_file;
 	gchar *short_name;
 
-
 	folder = CAMEL_FOLDER (camel_object_new(camel_groupwise_folder_get_type ()) );
 
 	gw_folder = CAMEL_GROUPWISE_FOLDER(folder);
@@ -1308,7 +1303,6 @@ groupwise_refresh_folder(CamelFolder *folder, CamelException *ex)
 		is_proxy = TRUE;
 	}
 
-
 	/*Get the New Items*/
 	if (!is_proxy) {
 		const gchar *source;
@@ -1349,7 +1343,6 @@ groupwise_refresh_folder(CamelFolder *folder, CamelException *ex)
 			goto end3;
 		}
 
-
 		if (gw_store->current_folder != folder)
 			groupwise_store_set_current_folder (gw_store, folder);
 
@@ -1382,7 +1375,6 @@ groupwise_refresh_folder(CamelFolder *folder, CamelException *ex)
 
 		g_object_unref (container);
 
-
 		if (list)
 			gw_update_cache (folder, list, ex, FALSE);
 
@@ -1390,7 +1382,6 @@ groupwise_refresh_folder(CamelFolder *folder, CamelException *ex)
 		update_summary_string (folder, new_sync_time, ex);
 	}
 
-
 	CAMEL_SERVICE_REC_UNLOCK (gw_store, connect_lock);
 	is_locked = FALSE;
 
@@ -1456,7 +1447,6 @@ groupwise_folder_set_threading_data (CamelGroupwiseMessageInfo *mi, EGwItem *ite
 	guint8 *digest;
 	gchar *msgid;
 
-
 	if (!message_id)
 		return;
 
@@ -1843,7 +1833,6 @@ gw_update_summary ( CamelFolder *folder, GList *list,CamelException *ex)
 
 		mi->info.flags |= status_flags;
 
-
 		priority = e_gw_item_get_priority (item);
 		if (priority && !(g_ascii_strcasecmp (priority,"High"))) {
 			mi->info.flags |= CAMEL_MESSAGE_FLAGGED;
@@ -2039,7 +2028,6 @@ groupwise_folder_item_to_msg( CamelFolder *folder,
 
 	} /* if attach_list */
 
-
 	msg = camel_mime_message_new ();
 	if (has_mime_822 && body) {
 		temp_stream = camel_stream_mem_new_with_buffer (body, body_len);
@@ -2236,7 +2224,6 @@ groupwise_folder_item_to_msg( CamelFolder *folder,
 	}/* if attach_list */
 	/********************/
 
-
 	/* this is broken for translations. someone should care to fix these hacks. nobody except groupwise users are affected though */
 	if (e_gw_item_get_priority (item))
 		camel_medium_add_header ( CAMEL_MEDIUM (msg), "Priority", e_gw_item_get_priority(item));
@@ -2486,7 +2473,6 @@ groupwise_transfer_messages_to (CamelFolder *source, GPtrArray *uids,
 		return;
 	}
 
-
 	cnc = cnc_lookup (priv);
 	index = 0;
 	while (index < uids->len) {
@@ -2532,7 +2518,6 @@ groupwise_transfer_messages_to (CamelFolder *source, GPtrArray *uids,
 					wrapper = NULL;
 				}
 
-
 				/* A User may mark a message as Unread and then immediately move it to
 				some other folder. The following piece of code take care of such scenario.
 
@@ -2551,7 +2536,6 @@ groupwise_transfer_messages_to (CamelFolder *source, GPtrArray *uids,
 			}
 		}
 
-
 		if (destination_is_trash) {
 				e_gw_connection_remove_item (cnc, source_container_id, (const gchar *) uids->pdata[index]);
 				camel_folder_summary_remove_uid (source->summary, uids->pdata[index]);
@@ -2625,7 +2609,6 @@ groupwise_expunge (CamelFolder *folder, CamelException *ex)
 	gboolean delete = FALSE;
 	GList *deleted_items, *deleted_head;
 
-
 	deleted_items = deleted_head = NULL;
 	cnc = cnc_lookup (priv);
 	if (!cnc)
@@ -2753,7 +2736,6 @@ camel_groupwise_folder_init (gpointer object, gpointer klass)
 	CamelGroupwiseFolder *gw_folder = CAMEL_GROUPWISE_FOLDER (object);
 	CamelFolder *folder = CAMEL_FOLDER (object);
 
-
 	folder->permanent_flags = CAMEL_MESSAGE_ANSWERED | CAMEL_MESSAGE_DELETED |
 		CAMEL_MESSAGE_DRAFT | CAMEL_MESSAGE_FLAGGED | CAMEL_MESSAGE_SEEN;
 
@@ -2788,7 +2770,6 @@ camel_groupwise_folder_get_type (void)
 {
 	static CamelType camel_groupwise_folder_type = CAMEL_INVALID_TYPE;
 
-
 	if (camel_groupwise_folder_type == CAMEL_INVALID_TYPE) {
 		camel_groupwise_folder_type =
 			camel_type_register (camel_offline_folder_get_type (),
@@ -3025,7 +3006,6 @@ convert_to_task (EGwItem *item, gchar **str, gint *len)
 	gstr = g_string_append (gstr, "END:VTODO\n");
 	gstr = g_string_append (gstr, "END:VCALENDAR\n");
 
-
 	*str = g_strdup (gstr->str);
 	*len = gstr->len;
 
diff --git a/camel/providers/groupwise/camel-groupwise-folder.h b/camel/providers/groupwise/camel-groupwise-folder.h
index a79fda1..7aa37ad 100644
--- a/camel/providers/groupwise/camel-groupwise-folder.h
+++ b/camel/providers/groupwise/camel-groupwise-folder.h
@@ -24,7 +24,6 @@
  * USA
  */
 
-
 #ifndef CAMEL_GROUPWISE_FOLDER_H
 #define CAMEL_GROUPWISE_FOLDER_H 1
 
@@ -63,7 +62,6 @@ struct _CamelGroupwiseFolder {
 	guint need_refresh:1;
 	guint read_only:1;
 
-
 };
 
 struct _CamelGroupwiseFolderClass {
@@ -73,7 +71,6 @@ struct _CamelGroupwiseFolderClass {
 
 } ;
 
-
 /* Standard Camel function */
 CamelType camel_groupwise_folder_get_type (void);
 
diff --git a/camel/providers/groupwise/camel-groupwise-journal.c b/camel/providers/groupwise/camel-groupwise-journal.c
index 91042ff..6e34e36 100644
--- a/camel/providers/groupwise/camel-groupwise-journal.c
+++ b/camel/providers/groupwise/camel-groupwise-journal.c
@@ -20,7 +20,6 @@
  *
  */
 
-
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
@@ -49,7 +48,6 @@
 
 #define d(x)
 
-
 static void camel_groupwise_journal_class_init (CamelGroupwiseJournalClass *klass);
 static void camel_groupwise_journal_init (CamelGroupwiseJournal *journal, CamelGroupwiseJournalClass *klass);
 static void camel_groupwise_journal_finalize (CamelObject *object);
@@ -59,10 +57,8 @@ static CamelDListNode *groupwise_entry_load (CamelOfflineJournal *journal, FILE
 static gint groupwise_entry_write (CamelOfflineJournal *journal, CamelDListNode *entry, FILE *out);
 static gint groupwise_entry_play (CamelOfflineJournal *journal, CamelDListNode *entry, CamelException *ex);
 
-
 static CamelOfflineJournalClass *parent_class = NULL;
 
-
 CamelType
 camel_groupwise_journal_get_type (void)
 {
@@ -317,8 +313,6 @@ groupwise_entry_play (CamelOfflineJournal *journal, CamelDListNode *entry, Camel
 	}
 }
 
-
-
 CamelOfflineJournal *
 camel_groupwise_journal_new (CamelGroupwiseFolder *folder, const gchar *filename)
 {
diff --git a/camel/providers/groupwise/camel-groupwise-journal.h b/camel/providers/groupwise/camel-groupwise-journal.h
index f95382b..a1901b2 100644
--- a/camel/providers/groupwise/camel-groupwise-journal.h
+++ b/camel/providers/groupwise/camel-groupwise-journal.h
@@ -20,7 +20,6 @@
  *
  */
 
-
 #ifndef __CAMEL_GROUPWISE_JOURNAL_H__
 #define __CAMEL_GROUPWISE_JOURNAL_H__
 
@@ -71,7 +70,6 @@ struct _CamelGroupwiseJournalClass {
 
 };
 
-
 CamelType camel_groupwise_journal_get_type (void);
 
 CamelOfflineJournal *camel_groupwise_journal_new (struct _CamelGroupwiseFolder *folder, const gchar *filename);
diff --git a/camel/providers/groupwise/camel-groupwise-provider.c b/camel/providers/groupwise/camel-groupwise-provider.c
index 91f64d3..6b44948 100644
--- a/camel/providers/groupwise/camel-groupwise-provider.c
+++ b/camel/providers/groupwise/camel-groupwise-provider.c
@@ -47,7 +47,6 @@ static guint groupwise_url_hash (gconstpointer key);
 static gint check_equal (gchar *s1, gchar *s2);
 static gint groupwise_url_equal (gconstpointer a, gconstpointer b);
 
-
 CamelProviderConfEntry groupwise_conf_entries[] = {
 	/* override the labels/defaults of the standard settings */
 
@@ -83,7 +82,6 @@ CamelProviderConfEntry groupwise_conf_entries[] = {
 	{ CAMEL_PROVIDER_CONF_END }
 };
 
-
 static CamelProvider groupwise_provider = {
 	"groupwise",
 	N_("Novell GroupWise"),
@@ -150,7 +148,6 @@ camel_provider_module_init(void)
 	camel_provider_register (&groupwise_provider);
 }
 
-
 static void
 add_hash (guint *hash, gchar *s)
 {
diff --git a/camel/providers/groupwise/camel-groupwise-store-summary.c b/camel/providers/groupwise/camel-groupwise-store-summary.c
index 0a8104c..aa37475 100644
--- a/camel/providers/groupwise/camel-groupwise-store-summary.c
+++ b/camel/providers/groupwise/camel-groupwise-store-summary.c
@@ -21,7 +21,6 @@
  * Boston, MA 02110-1301, USA.
  */
 
-
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
@@ -61,7 +60,6 @@ static void camel_groupwise_store_summary_finalise   (CamelObject *obj);
 
 static CamelStoreSummaryClass *camel_groupwise_store_summary_parent;
 
-
 static void
 camel_groupwise_store_summary_class_init (CamelGroupwiseStoreSummaryClass *klass)
 {
@@ -77,7 +75,6 @@ camel_groupwise_store_summary_class_init (CamelGroupwiseStoreSummaryClass *klass
 	ssklass->store_info_string = store_info_string;
 	ssklass->store_info_set_string = store_info_set_string;
 
-
 }
 
 static void
@@ -88,13 +85,11 @@ camel_groupwise_store_summary_init (CamelGroupwiseStoreSummary *s)
 	s->version = CAMEL_GW_STORE_SUMMARY_VERSION;
 }
 
-
 static void
 camel_groupwise_store_summary_finalise (CamelObject *obj)
 {
 }
 
-
 CamelType
 camel_groupwise_store_summary_get_type (void)
 {
@@ -114,7 +109,6 @@ camel_groupwise_store_summary_get_type (void)
 	return type;
 }
 
-
 CamelGroupwiseStoreSummary *
 camel_groupwise_store_summary_new (void)
 {
@@ -123,7 +117,6 @@ camel_groupwise_store_summary_new (void)
 	return new;
 }
 
-
 CamelGroupwiseStoreInfo *
 camel_groupwise_store_summary_full_name(CamelGroupwiseStoreSummary *s, const gchar *full_name)
 {
@@ -457,8 +450,6 @@ camel_groupwise_store_summary_namespace_find_path(CamelGroupwiseStoreSummary *s,
 	return ns;
 }
 
-
-
 static gint
 summary_header_load(CamelStoreSummary *s, FILE *in)
 {
@@ -486,7 +477,6 @@ summary_header_load(CamelStoreSummary *s, FILE *in)
 	return 0;
 }
 
-
 static gint
 summary_header_save(CamelStoreSummary *s, FILE *out)
 {
@@ -503,7 +493,6 @@ summary_header_save(CamelStoreSummary *s, FILE *out)
 	if (summary->namespace && namespace_save(s, out, summary->namespace) == -1)
 		return -1;
 
-
 	return 0;
 }
 
@@ -535,7 +524,6 @@ store_info_save(CamelStoreSummary *s, FILE *out, CamelStoreInfo *mi)
 	return 0;
 }
 
-
 static void
 store_info_free(CamelStoreSummary *s, CamelStoreInfo *mi)
 {
@@ -545,10 +533,6 @@ store_info_free(CamelStoreSummary *s, CamelStoreInfo *mi)
 	camel_groupwise_store_summary_parent->store_info_free(s, mi);
 }
 
-
-
-
-
 static const gchar *
 store_info_string(CamelStoreSummary *s, const CamelStoreInfo *mi, gint type)
 {
diff --git a/camel/providers/groupwise/camel-groupwise-store-summary.h b/camel/providers/groupwise/camel-groupwise-store-summary.h
index 97b9c8e..41ea304 100644
--- a/camel/providers/groupwise/camel-groupwise-store-summary.h
+++ b/camel/providers/groupwise/camel-groupwise-store-summary.h
@@ -19,7 +19,6 @@
  * Boston, MA 02110-1301, USA.
  */
 
-
 #ifndef _CAMEL_GW_STORE_SUMMARY_H
 #define _CAMEL_GW_STORE_SUMMARY_H
 
diff --git a/camel/providers/groupwise/camel-groupwise-store.c b/camel/providers/groupwise/camel-groupwise-store.c
index d3e1001..e5854dd 100644
--- a/camel/providers/groupwise/camel-groupwise-store.c
+++ b/camel/providers/groupwise/camel-groupwise-store.c
@@ -80,8 +80,6 @@ static CamelFolderInfo *convert_to_folder_info (CamelGroupwiseStore *store, EGwC
 static void groupwise_folders_sync (CamelGroupwiseStore *store, CamelException *ex);
 static gint match_path(const gchar *path, const gchar *name);
 
-
-
 static void
 groupwise_store_construct (CamelService *service, CamelSession *session,
 			   CamelProvider *provider, CamelURL *url,
@@ -189,7 +187,6 @@ groupwise_auth_loop (CamelService *service, CamelException *ex)
 		uri = g_strconcat ("http://";, priv->server_name, ":", priv->port, "/soap", NULL);
 	service->url->passwd = NULL;
 
-
 	while (!authenticated) {
 
 		if (!service->url->passwd && !(store->flags & CAMEL_STORE_PROXY)) {
@@ -313,7 +310,6 @@ groupwise_connect (CamelService *service, CamelException *ex)
 		return FALSE;
 	}
 
-
 	service->status = CAMEL_SERVICE_CONNECTED;
 	((CamelOfflineStore *) store)->state = CAMEL_OFFLINE_STORE_NETWORK_AVAIL;
 
@@ -489,7 +485,6 @@ groupwise_build_folder_info(CamelGroupwiseStore *gw_store, const gchar *parent_n
 	if (groupwise_is_system_folder (folder_name))
 		fi->flags |= CAMEL_FOLDER_SYSTEM;
 
-
 	fi->name = g_strdup(name);
 	return fi;
 }
@@ -594,7 +589,6 @@ groupwise_get_folder (CamelStore *store, const gchar *folder_name, guint32 flags
 
 	container_id =	g_strdup (g_hash_table_lookup (priv->name_hash, folder_name));
 
-
 	storage_path = g_strdup_printf("%s/folders", priv->storage_path);
 	folder_dir = e_path_to_physical (storage_path, folder_name);
 	g_free(storage_path);
@@ -1439,7 +1433,6 @@ camel_groupwise_store_folder_lookup (CamelGroupwiseStore *gw_store, const gchar
 	return g_hash_table_lookup (priv->id_hash, container_id);
 }
 
-
 EGwConnection *
 cnc_lookup (CamelGroupwiseStorePrivate *priv)
 {
@@ -1556,7 +1549,6 @@ camel_groupwise_store_class_init (CamelGroupwiseStoreClass *camel_groupwise_stor
 	camel_store_class->can_refresh_folder = groupwise_can_refresh_folder;
 }
 
-
 /*This frees the private structure*/
 static void
 camel_groupwise_store_finalize (CamelObject *object)
diff --git a/camel/providers/groupwise/camel-groupwise-store.h b/camel/providers/groupwise/camel-groupwise-store.h
index 0fc3f29..d4c5b1f 100644
--- a/camel/providers/groupwise/camel-groupwise-store.h
+++ b/camel/providers/groupwise/camel-groupwise-store.h
@@ -21,7 +21,6 @@
  * USA
  */
 
-
 #ifndef CAMEL_GROUPWISE_STORE_H
 #define CAMEL_GROUPWISE_STORE_H 1
 
@@ -60,12 +59,10 @@ struct _CamelGroupwiseStore {
 	guint list_loaded;
 };
 
-
 struct _CamelGroupwiseStoreClass {
 	CamelOfflineStoreClass parent_class;
 };
 
-
 /* Standard Camel function */
 CamelType camel_groupwise_store_get_type (void);
 gchar * groupwise_get_name(CamelService *service, gboolean brief);
diff --git a/camel/providers/groupwise/camel-groupwise-summary.c b/camel/providers/groupwise/camel-groupwise-summary.c
index 8697af0..fe1273e 100644
--- a/camel/providers/groupwise/camel-groupwise-summary.c
+++ b/camel/providers/groupwise/camel-groupwise-summary.c
@@ -70,13 +70,10 @@ static CamelMessageContentInfo * content_info_from_db (CamelFolderSummary *s, Ca
 static void camel_groupwise_summary_class_init (CamelGroupwiseSummaryClass *klass);
 static void camel_groupwise_summary_init       (CamelGroupwiseSummary *obj);
 
-
 /*End of Prototypes*/
 
-
 static CamelFolderSummaryClass *camel_groupwise_summary_parent;
 
-
 CamelType
 camel_groupwise_summary_get_type (void)
 {
@@ -136,7 +133,6 @@ camel_groupwise_summary_class_init (CamelGroupwiseSummaryClass *klass)
 
 }
 
-
 static void
 camel_groupwise_summary_init (CamelGroupwiseSummary *obj)
 {
@@ -150,7 +146,6 @@ camel_groupwise_summary_init (CamelGroupwiseSummary *obj)
 	s->meta_summary->uid_len = 2048;
 }
 
-
 /**
  * camel_groupwise_summary_new:
  * @filename: the file to store the summary in.
@@ -220,10 +215,6 @@ gw_summary_header_load (CamelFolderSummary *s, FILE *in)
 	return 0;
 }
 
-
-
-
-
 static CamelFIRecord *
 summary_header_to_db (CamelFolderSummary *s, CamelException *ex)
 {
@@ -274,7 +265,6 @@ gw_message_info_load (CamelFolderSummary *s, FILE *in)
 	CamelMessageInfo *info;
 	CamelGroupwiseMessageInfo *gw_info;
 
-
 	info = camel_groupwise_summary_parent->message_info_load(s,in);
 	if (info) {
 		gw_info = (CamelGroupwiseMessageInfo*) info;
@@ -332,7 +322,6 @@ content_info_from_db (CamelFolderSummary *s, CamelMIRecord *mir)
 		return camel_folder_summary_content_info_new (s);
 }
 
-
 static CamelMessageContentInfo *
 gw_content_info_load (CamelFolderSummary *s, FILE *in)
 {
@@ -418,7 +407,6 @@ gw_info_set_flags (CamelMessageInfo *info, guint32 flags, guint32 set)
 				mi->flags |= CAMEL_GW_MESSAGE_JUNK | CAMEL_MESSAGE_JUNK | CAMEL_MESSAGE_JUNK_LEARN;
 		}
 
-
 		if (mi->summary && mi->summary->folder && mi->uid) {
 				CamelFolderChangeInfo *changes = camel_folder_change_info_new();
 
@@ -431,7 +419,6 @@ gw_info_set_flags (CamelMessageInfo *info, guint32 flags, guint32 set)
 		return TRUE;
 }
 
-
 void
 camel_gw_summary_add_offline (CamelFolderSummary *summary, const gchar *uid, CamelMimeMessage *message, const CamelMessageInfo *info)
 {
diff --git a/camel/providers/groupwise/camel-groupwise-summary.h b/camel/providers/groupwise/camel-groupwise-summary.h
index 155cbed..b5d61ad 100644
--- a/camel/providers/groupwise/camel-groupwise-summary.h
+++ b/camel/providers/groupwise/camel-groupwise-summary.h
@@ -49,12 +49,10 @@ struct _CamelGroupwiseMessageInfo {
 	guint32 server_flags;
 } ;
 
-
 struct _CamelGroupwiseMessageContentInfo {
 	CamelMessageContentInfo info;
 } ;
 
-
 struct _CamelGroupwiseSummary {
 	CamelFolderSummary parent;
 
@@ -63,12 +61,10 @@ struct _CamelGroupwiseSummary {
 	gint32 validity;
 } ;
 
-
 struct _CamelGroupwiseSummaryClass {
 	CamelFolderSummaryClass parent_class;
 } ;
 
-
 CamelType camel_groupwise_summary_get_type (void);
 
 CamelFolderSummary *camel_groupwise_summary_new (struct _CamelFolder *folder, const gchar *filename);
diff --git a/camel/providers/groupwise/camel-groupwise-transport.c b/camel/providers/groupwise/camel-groupwise-transport.c
index 3c66929..fa31f7a 100644
--- a/camel/providers/groupwise/camel-groupwise-transport.c
+++ b/camel/providers/groupwise/camel-groupwise-transport.c
@@ -57,11 +57,8 @@ static gchar *groupwise_transport_get_name (CamelService *service, gboolean brie
 static void groupwise_transport_construct (CamelService *service, CamelSession *session,
 					   CamelProvider *provider, CamelURL *url, CamelException *ex);
 
-
 static CamelTransportClass *parent_class = NULL;
 
-
-
 static void
 camel_groupwise_transport_class_init (CamelGroupwiseTransportClass *camel_groupwise_transport_class)
 {
@@ -127,7 +124,6 @@ static gchar *groupwise_transport_get_name (CamelService *service, gboolean brie
 	}
 }
 
-
 static gboolean
 groupwise_transport_connect (CamelService *service, CamelException *ex)
 {
@@ -135,7 +131,6 @@ groupwise_transport_connect (CamelService *service, CamelException *ex)
 
 }
 
-
 static gboolean
 groupwise_send_to (CamelTransport *transport,
 		   CamelMimeMessage *message,
@@ -207,7 +202,6 @@ groupwise_send_to (CamelTransport *transport,
 		g_free (id);
 	}
 
-
 	/*Send item*/
 	status = e_gw_connection_send_item (cnc, item, &sent_item_list);
 	if (status != E_GW_CONNECTION_STATUS_OK) {
diff --git a/camel/providers/groupwise/camel-groupwise-transport.h b/camel/providers/groupwise/camel-groupwise-transport.h
index 63bc450..53f69f4 100644
--- a/camel/providers/groupwise/camel-groupwise-transport.h
+++ b/camel/providers/groupwise/camel-groupwise-transport.h
@@ -21,7 +21,6 @@
  * USA
  */
 
-
 #ifndef CAMEL_GROUPWISE_TRANSPORT_H
 #define CAMEL_GROUPWISE_TRANSPORT_H 1
 
@@ -40,13 +39,11 @@ typedef struct {
 
 } CamelGroupwiseTransport;
 
-
 typedef struct {
 	CamelTransportClass parent_class;
 
 } CamelGroupwiseTransportClass;
 
-
 /* Standard Camel function */
 CamelType camel_groupwise_transport_get_type (void);
 
diff --git a/camel/providers/groupwise/camel-groupwise-utils.c b/camel/providers/groupwise/camel-groupwise-utils.c
index ac10ffa..0cda07d 100644
--- a/camel/providers/groupwise/camel-groupwise-utils.c
+++ b/camel/providers/groupwise/camel-groupwise-utils.c
@@ -135,7 +135,6 @@ e_path_to_physical (const gchar *prefix, const gchar *vpath)
 	return ppath;
 }
 
-
 static gboolean
 find_folders_recursive (const gchar *physical_path, const gchar *path,
 			EPathFindFoldersCallback callback, gpointer data)
@@ -216,7 +215,6 @@ e_path_find_folders (const gchar *prefix,
 	return find_folders_recursive (prefix, "", callback, data);
 }
 
-
 /**
  * e_path_rmdir:
  * @prefix: a prefix to prepend to the path, or %NULL
diff --git a/camel/providers/groupwise/camel-groupwise-utils.h b/camel/providers/groupwise/camel-groupwise-utils.h
index 8340784..8093444 100644
--- a/camel/providers/groupwise/camel-groupwise-utils.h
+++ b/camel/providers/groupwise/camel-groupwise-utils.h
@@ -57,7 +57,6 @@ typedef struct {
 	guint32 bits;
 } flags_diff_t;
 
-
 /* FIXME: deprecated
    This is used exclusively for the legacy imap cache code.  DO NOT use this in any new code */
 
@@ -73,7 +72,6 @@ gboolean e_path_find_folders (const gchar *prefix,
 
 gint      e_path_rmdir        (const gchar *prefix, const gchar *vpath);
 
-
 EGwItem *camel_groupwise_util_item_from_message (EGwConnection *cnc, CamelMimeMessage *message, CamelAddress *from);
 
 void do_flags_diff (flags_diff_t *diff, guint32 old, guint32 _new);
diff --git a/camel/providers/hula/camel-hula-provider.c b/camel/providers/hula/camel-hula-provider.c
index 5f6a533..2ec965d 100644
--- a/camel/providers/hula/camel-hula-provider.c
+++ b/camel/providers/hula/camel-hula-provider.c
@@ -42,7 +42,6 @@ static guint hula_url_hash (gconstpointer key);
 static gint check_equal (gchar *s1, gchar *s2);
 static gint hula_url_equal (gconstpointer a, gconstpointer b);
 
-
 static CamelProviderConfEntry hula_conf_entries[] = {
 	/* override the labels/defaults of the standard settings */
 	{ CAMEL_PROVIDER_CONF_SECTION_START, "mailcheck", NULL,
@@ -72,7 +71,6 @@ static CamelProviderConfEntry hula_conf_entries[] = {
 	 * relevancy - harish*/
 };
 
-
 static CamelProvider hula_provider = {
 	"hula",
 	N_("Hula"),
@@ -129,11 +127,9 @@ camel_provider_module_init(void)
 
 	hula_provider.object_types[CAMEL_PROVIDER_STORE] = imap_provider->object_types [CAMEL_PROVIDER_STORE];
 
-
 	camel_provider_register (&hula_provider);
 }
 
-
 static void
 add_hash (guint *hash, gchar *s)
 {
diff --git a/camel/providers/imap/camel-imap-command.c b/camel/providers/imap/camel-imap-command.c
index 30c13cb..d87f1db 100644
--- a/camel/providers/imap/camel-imap-command.c
+++ b/camel/providers/imap/camel-imap-command.c
@@ -586,7 +586,6 @@ imap_read_untagged (CamelImapStore *store, gchar *line, CamelException *ex)
 	return NULL;
 }
 
-
 /**
  * camel_imap_response_free:
  * @store: the CamelImapStore the response is from
diff --git a/camel/providers/imap/camel-imap-command.h b/camel/providers/imap/camel-imap-command.h
index 2d119fa..391684d 100644
--- a/camel/providers/imap/camel-imap-command.h
+++ b/camel/providers/imap/camel-imap-command.h
@@ -23,7 +23,6 @@
  * USA
  */
 
-
 #ifndef CAMEL_IMAP_COMMAND_H
 #define CAMEL_IMAP_COMMAND_H 1
 
diff --git a/camel/providers/imap/camel-imap-folder.c b/camel/providers/imap/camel-imap-folder.c
index f32ee32..6cc8cca 100644
--- a/camel/providers/imap/camel-imap-folder.c
+++ b/camel/providers/imap/camel-imap-folder.c
@@ -1106,7 +1106,6 @@ imap_rescan (CamelFolder *folder, gint exists, CamelException *ex)
 			changed = TRUE;
 		}
 
-
 		/* Do not merge custom flags when server doesn't support it.
 		   Because server always reports NULL, which means none, which
 		   will remove user's flags from local machine, which is bad.
@@ -1133,7 +1132,6 @@ imap_rescan (CamelFolder *folder, gint exists, CamelException *ex)
 
 	seq = i + 1;
 
-
 #if 0
 	/* FIXME: Srini: I don't think this will be called any longer. */
 	/* Free remaining memory. */
@@ -2108,7 +2106,6 @@ imap_append_resyncing (CamelFolder *folder, CamelMimeMessage *message,
 	camel_imap_response_free (store, response);
 }
 
-
 static void
 imap_transfer_offline (CamelFolder *source, GPtrArray *uids,
 		       CamelFolder *dest, GPtrArray **transferred_uids,
@@ -2439,7 +2436,6 @@ imap_transfer_resyncing (CamelFolder *source, GPtrArray *uids,
 	 * if we don't have UIDPLUS, we won't know their real UIDs,
 	 * so we'll have to append them rather than copying. */
 
-
 	realuids = g_ptr_array_new ();
 
 	i = 0;
@@ -3768,7 +3764,6 @@ imap_thaw (CamelFolder *folder)
 	}
 }
 
-
 CamelStream *
 camel_imap_folder_fetch_data (CamelImapFolder *imap_folder, const gchar *uid,
 			      const gchar *section_text, gboolean cache_only,
diff --git a/camel/providers/imap/camel-imap-folder.h b/camel/providers/imap/camel-imap-folder.h
index 246bc34..8071df1 100644
--- a/camel/providers/imap/camel-imap-folder.h
+++ b/camel/providers/imap/camel-imap-folder.h
@@ -23,7 +23,6 @@
  * USA
  */
 
-
 #ifndef CAMEL_IMAP_FOLDER_H
 #define CAMEL_IMAP_FOLDER_H 1
 
@@ -75,7 +74,6 @@ struct _CamelImapFolderClass {
 
 };
 
-
 /* public methods */
 CamelFolder *camel_imap_folder_new (CamelStore *parent,
 				    const gchar *folder_name,
diff --git a/camel/providers/imap/camel-imap-journal.c b/camel/providers/imap/camel-imap-journal.c
index b8008ed..904ae47 100644
--- a/camel/providers/imap/camel-imap-journal.c
+++ b/camel/providers/imap/camel-imap-journal.c
@@ -62,7 +62,6 @@ static void close_folder (gpointer name, gpointer folder, gpointer data);
 
 static CamelOfflineJournalClass *parent_class = NULL;
 
-
 CamelType
 camel_imap_journal_get_type (void)
 {
@@ -204,7 +203,6 @@ imap_entry_load (CamelOfflineJournal *journal, FILE *in)
 {
 	CamelIMAPJournalEntry *entry;
 
-
 	d(g_print ("DEBUG: Loading to  the journal \n"));
 
 	entry = g_malloc0 (sizeof (CamelIMAPJournalEntry));
diff --git a/camel/providers/imap/camel-imap-journal.h b/camel/providers/imap/camel-imap-journal.h
index ea5e7f0..d6d31e4 100644
--- a/camel/providers/imap/camel-imap-journal.h
+++ b/camel/providers/imap/camel-imap-journal.h
@@ -78,7 +78,6 @@ struct _CamelIMAPJournalClass {
 
 };
 
-
 CamelType camel_imap_journal_get_type (void);
 
 CamelOfflineJournal *camel_imap_journal_new (struct _CamelImapFolder *folder, const gchar *filename);
diff --git a/camel/providers/imap/camel-imap-message-cache.c b/camel/providers/imap/camel-imap-message-cache.c
index effe9c0..4509a49 100644
--- a/camel/providers/imap/camel-imap-message-cache.c
+++ b/camel/providers/imap/camel-imap-message-cache.c
@@ -64,7 +64,6 @@ struct _part_find {
 	gint found;
 };
 
-
 CamelType
 camel_imap_message_cache_get_type (void)
 {
@@ -223,7 +222,6 @@ camel_imap_message_cache_new (const gchar *path, CamelFolderSummary *summary,
 	return cache;
 }
 
-
 /**
  * camel_imap_message_cache_delete:
  * @path: directory to use for storage
@@ -304,7 +302,6 @@ stream_finalize (CamelObject *stream, gpointer event_data, gpointer user_data)
 	g_hash_table_insert (cache->parts, key, NULL);
 }
 
-
 static CamelStream *
 insert_setup (CamelImapMessageCache *cache, const gchar *uid, const gchar *part_spec,
 	      gchar **path, gchar **key, CamelException *ex)
@@ -603,7 +600,6 @@ camel_imap_message_cache_clear (CamelImapMessageCache *cache)
 	g_ptr_array_free (uids, TRUE);
 }
 
-
 /**
  * camel_imap_message_cache_copy:
  * @source: the source message cache
@@ -642,7 +638,6 @@ camel_imap_message_cache_copy (CamelImapMessageCache *source,
 	}
 }
 
-
 static void
 _match_part(gpointer part_name, gpointer user_data)
 {
diff --git a/camel/providers/imap/camel-imap-message-cache.h b/camel/providers/imap/camel-imap-message-cache.h
index d4ad488..ac7d35f 100644
--- a/camel/providers/imap/camel-imap-message-cache.h
+++ b/camel/providers/imap/camel-imap-message-cache.h
@@ -22,7 +22,6 @@
  * USA
  */
 
-
 #ifndef CAMEL_IMAP_MESSAGE_CACHE_H
 #define CAMEL_IMAP_MESSAGE_CACHE_H 1
 
@@ -52,7 +51,6 @@ struct _CamelImapMessageCache {
 	guint32 max_uid;
 };
 
-
 typedef struct {
 	CamelFolderClass parent_class;
 
@@ -60,7 +58,6 @@ typedef struct {
 
 } CamelImapMessageCacheClass;
 
-
 /* public methods */
 CamelImapMessageCache *camel_imap_message_cache_new (const gchar *path,
 						     CamelFolderSummary *summary,
diff --git a/camel/providers/imap/camel-imap-search.c b/camel/providers/imap/camel-imap-search.c
index 5b169ea..aca5442 100644
--- a/camel/providers/imap/camel-imap-search.c
+++ b/camel/providers/imap/camel-imap-search.c
@@ -93,7 +93,6 @@ struct _match_record {
 	GArray *matches;
 };
 
-
 static void free_match(CamelImapSearch *is, struct _match_record *mr);
 static ESExpResult *imap_body_contains (struct _ESExp *f, gint argc, struct _ESExpResult **argv, CamelFolderSearch *s);
 
@@ -173,7 +172,6 @@ camel_imap_search_new (const gchar *cachedir)
 	return new;
 }
 
-
 static void
 hash_match(gchar hash[17], gint argc, struct _ESExpResult **argv)
 {
diff --git a/camel/providers/imap/camel-imap-store-summary.h b/camel/providers/imap/camel-imap-store-summary.h
index e5cc6d3..1987200 100644
--- a/camel/providers/imap/camel-imap-store-summary.h
+++ b/camel/providers/imap/camel-imap-store-summary.h
@@ -19,7 +19,6 @@
  * Boston, MA 02110-1301, USA.
  */
 
-
 #ifndef _CAMEL_IMAP_STORE_SUMMARY_H
 #define _CAMEL_IMAP_STORE_SUMMARY_H
 
diff --git a/camel/providers/imap/camel-imap-store.c b/camel/providers/imap/camel-imap-store.c
index 80958a2..f186e91 100644
--- a/camel/providers/imap/camel-imap-store.c
+++ b/camel/providers/imap/camel-imap-store.c
@@ -1546,7 +1546,6 @@ imap_disconnect (CamelService *service, gboolean clean, CamelException *ex)
 {
 	CamelImapStore *store = CAMEL_IMAP_STORE (service);
 
-
 	if (CAMEL_OFFLINE_STORE (store)->state == CAMEL_OFFLINE_STORE_NETWORK_AVAIL && clean) {
 		CamelImapResponse *response;
 
@@ -3017,7 +3016,6 @@ camel_imap_store_connected (CamelImapStore *store, CamelException *ex)
 	return FALSE;
 }
 
-
 gssize
 camel_imap_store_readline (CamelImapStore *store, gchar **dest, CamelException *ex)
 {
diff --git a/camel/providers/imap/camel-imap-store.h b/camel/providers/imap/camel-imap-store.h
index f34f9f8..4206bfe 100644
--- a/camel/providers/imap/camel-imap-store.h
+++ b/camel/providers/imap/camel-imap-store.h
@@ -21,7 +21,6 @@
  * USA
  */
 
-
 #ifndef CAMEL_IMAP_STORE_H
 #define CAMEL_IMAP_STORE_H 1
 
@@ -154,11 +153,9 @@ typedef struct {
 
 } CamelImapStoreClass;
 
-
 /* Standard Camel function */
 CamelType camel_imap_store_get_type (void);
 
-
 gboolean camel_imap_store_connected (CamelImapStore *store, CamelException *ex);
 
 gssize camel_imap_store_readline (CamelImapStore *store, gchar **dest, CamelException *ex);
diff --git a/camel/providers/imap/camel-imap-summary.c b/camel/providers/imap/camel-imap-summary.c
index f95e2ff..fc100b0 100644
--- a/camel/providers/imap/camel-imap-summary.c
+++ b/camel/providers/imap/camel-imap-summary.c
@@ -63,7 +63,6 @@ static CamelMessageInfo * message_info_from_db (CamelFolderSummary *s, CamelMIRe
 static gint content_info_to_db (CamelFolderSummary *s, CamelMessageContentInfo *info, CamelMIRecord *mir);
 static CamelMessageContentInfo * content_info_from_db (CamelFolderSummary *s, CamelMIRecord *mir);
 
-
 static void camel_imap_summary_class_init (CamelImapSummaryClass *klass);
 static void camel_imap_summary_init       (CamelImapSummary *obj);
 
diff --git a/camel/providers/imap/camel-imap-utils.c b/camel/providers/imap/camel-imap-utils.c
index fa30839..5ab4750 100644
--- a/camel/providers/imap/camel-imap-utils.c
+++ b/camel/providers/imap/camel-imap-utils.c
@@ -20,7 +20,6 @@
  *
  */
 
-
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
@@ -67,7 +66,6 @@ imap_next_word (const gchar *buf)
 	return word;
 }
 
-
 static void
 imap_namespace_destroy (struct _namespace *namespace)
 {
@@ -412,7 +410,6 @@ imap_parse_list_response (CamelImapStore *store, const gchar *buf, gint *flags,
 	return TRUE;
 }
 
-
 /**
  * imap_parse_folder_name:
  * @store:
@@ -879,7 +876,6 @@ parse_params (const gchar **parms_p, CamelContentType *type)
 	return 0;
 }
 
-
 static CamelMessageContentInfo *
 imap_body_decode (const gchar **in, CamelMessageContentInfo *ci, CamelFolder *folder, GPtrArray *cis)
 {
@@ -1089,7 +1085,6 @@ imap_body_decode (const gchar **in, CamelMessageContentInfo *ci, CamelFolder *fo
 	return NULL;
 }
 
-
 /**
  * imap_parse_body:
  * @body_p: pointer to the start of an IMAP "body"
@@ -1136,7 +1131,6 @@ imap_parse_body (const gchar **body_p, CamelFolder *folder,
 	g_ptr_array_free (children, TRUE);
 }
 
-
 /**
  * imap_quote_string:
  * @str: the string to quote, which must not contain CR or LF
@@ -1173,7 +1167,6 @@ imap_quote_string (const gchar *str)
 	return quoted;
 }
 
-
 static inline gulong
 get_summary_uid_numeric (CamelFolderSummary *summary, gint index)
 {
diff --git a/camel/providers/imap/camel-imap-wrapper.c b/camel/providers/imap/camel-imap-wrapper.c
index 0a41f7a..a0d9b9b 100644
--- a/camel/providers/imap/camel-imap-wrapper.c
+++ b/camel/providers/imap/camel-imap-wrapper.c
@@ -45,7 +45,6 @@ struct _CamelImapWrapperPrivate {
 #define CAMEL_IMAP_WRAPPER_LOCK(f, l) (g_mutex_lock(((CamelImapWrapper *)f)->priv->l))
 #define CAMEL_IMAP_WRAPPER_UNLOCK(f, l) (g_mutex_unlock(((CamelImapWrapper *)f)->priv->l))
 
-
 static CamelDataWrapperClass *parent_class = NULL;
 
 /* Returns the class for a CamelDataWrapper */
@@ -111,7 +110,6 @@ camel_imap_wrapper_get_type (void)
 	return type;
 }
 
-
 static void
 imap_wrapper_hydrate (CamelImapWrapper *imap_wrapper, CamelStream *stream)
 {
@@ -129,7 +127,6 @@ imap_wrapper_hydrate (CamelImapWrapper *imap_wrapper, CamelStream *stream)
 	imap_wrapper->part = NULL;
 }
 
-
 static gssize
 write_to_stream (CamelDataWrapper *data_wrapper, CamelStream *stream)
 {
@@ -161,7 +158,6 @@ write_to_stream (CamelDataWrapper *data_wrapper, CamelStream *stream)
 	return parent_class->write_to_stream (data_wrapper, stream);
 }
 
-
 CamelDataWrapper *
 camel_imap_wrapper_new (CamelImapFolder *imap_folder,
 			CamelContentType *type, CamelTransferEncoding encoding,
diff --git a/camel/providers/imap/camel-imap-wrapper.h b/camel/providers/imap/camel-imap-wrapper.h
index b0fa350..c746243 100644
--- a/camel/providers/imap/camel-imap-wrapper.h
+++ b/camel/providers/imap/camel-imap-wrapper.h
@@ -19,7 +19,6 @@
  * USA
  */
 
-
 #ifndef CAMEL_IMAP_WRAPPER_H
 #define CAMEL_IMAP_WRAPPER_H 1
 
diff --git a/camel/providers/imap4/camel-imap4-command.c b/camel/providers/imap4/camel-imap4-command.c
index 2e37efe..6cdca40 100644
--- a/camel/providers/imap4/camel-imap4-command.c
+++ b/camel/providers/imap4/camel-imap4-command.c
@@ -19,7 +19,6 @@
  *  Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
-
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
@@ -43,7 +42,6 @@
 
 #define d(x) (camel_debug ("imap4:command") ? (x) : 0)
 
-
 enum {
 	IMAP4_STRING_ATOM,
 	IMAP4_STRING_QSTRING,
@@ -444,7 +442,6 @@ camel_imap4_command_unref (CamelIMAP4Command *ic)
 	}
 }
 
-
 static gint
 imap4_literal_write_to_stream (CamelIMAP4Literal *literal, CamelStream *stream)
 {
@@ -497,7 +494,6 @@ imap4_literal_write_to_stream (CamelIMAP4Literal *literal, CamelStream *stream)
 	return -1;
 }
 
-
 static void
 unexpected_token (camel_imap4_token_t *token)
 {
@@ -710,7 +706,6 @@ camel_imap4_command_step (CamelIMAP4Command *ic)
 	return -1;
 }
 
-
 void
 camel_imap4_command_reset (CamelIMAP4Command *ic)
 {
diff --git a/camel/providers/imap4/camel-imap4-command.h b/camel/providers/imap4/camel-imap4-command.h
index 81b1b08..e072f38 100644
--- a/camel/providers/imap4/camel-imap4-command.h
+++ b/camel/providers/imap4/camel-imap4-command.h
@@ -19,7 +19,6 @@
  *  Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
-
 #ifndef __CAMEL_IMAP4_COMMAND_H__
 #define __CAMEL_IMAP4_COMMAND_H__
 
diff --git a/camel/providers/imap4/camel-imap4-engine.c b/camel/providers/imap4/camel-imap4-engine.c
index 486a8c8..ab04e8e 100644
--- a/camel/providers/imap4/camel-imap4-engine.c
+++ b/camel/providers/imap4/camel-imap4-engine.c
@@ -19,7 +19,6 @@
  *  Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
-
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
@@ -42,7 +41,6 @@
 
 #define d(x)
 
-
 static void camel_imap4_engine_class_init (CamelIMAP4EngineClass *klass);
 static void camel_imap4_engine_init (CamelIMAP4Engine *engine, CamelIMAP4EngineClass *klass);
 static void camel_imap4_engine_finalize (CamelObject *object);
@@ -50,10 +48,8 @@ static void camel_imap4_engine_finalize (CamelObject *object);
 static gint parse_xgwextensions (CamelIMAP4Engine *engine, CamelIMAP4Command *ic, guint32 index,
 				camel_imap4_token_t *token, CamelException *ex);
 
-
 static CamelObjectClass *parent_class = NULL;
 
-
 CamelType
 camel_imap4_engine_get_type (void)
 {
@@ -149,7 +145,6 @@ camel_imap4_engine_finalize (CamelObject *object)
 	}
 }
 
-
 /**
  * camel_imap4_engine_new:
  * @service: service
@@ -173,7 +168,6 @@ camel_imap4_engine_new (CamelService *service, CamelIMAP4ReconnectFunc reconnect
 	return engine;
 }
 
-
 /**
  * camel_imap4_engine_take_stream:
  * @engine: imap4 engine
@@ -232,7 +226,6 @@ camel_imap4_engine_take_stream (CamelIMAP4Engine *engine, CamelStream *stream, C
 	return -1;
 }
 
-
 /**
  * camel_imap4_engine_disconnect:
  * @engine: IMAP4 engine
@@ -256,7 +249,6 @@ camel_imap4_engine_disconnect (CamelIMAP4Engine *engine)
 	}
 }
 
-
 /**
  * camel_imap4_engine_capability:
  * @engine: IMAP4 engine
@@ -303,7 +295,6 @@ camel_imap4_engine_capability (CamelIMAP4Engine *engine, CamelException *ex)
 	return retval;
 }
 
-
 /**
  * camel_imap4_engine_namespace:
  * @engine: IMAP4 engine
@@ -373,7 +364,6 @@ camel_imap4_engine_namespace (CamelIMAP4Engine *engine, CamelException *ex)
 	return 0;
 }
 
-
 /**
  * camel_imap4_engine_select_folder:
  * @engine: IMAP4 engine
@@ -467,7 +457,6 @@ camel_imap4_engine_select_folder (CamelIMAP4Engine *engine, CamelFolder *folder,
 	return retval;
 }
 
-
 static struct {
 	const gchar *name;
 	guint32 flag;
@@ -775,7 +764,6 @@ engine_parse_namespace (CamelIMAP4Engine *engine, CamelException *ex)
 	return -1;
 }
 
-
 /*
  * resp-text-code  = "ALERT" /
  *                   "BADCHARSET" [SP "(" astring *(SP astring) ")" ] /
@@ -809,7 +797,6 @@ static struct {
 	{ NULL,             CAMEL_IMAP4_RESP_CODE_UNKNOWN,     0 }
 };
 
-
 /**
  * camel_imap4_engine_parse_resp_code:
  * @engine: IMAP4 engine
@@ -1075,7 +1062,6 @@ camel_imap4_engine_parse_resp_code (CamelIMAP4Engine *engine, CamelException *ex
 	return -1;
 }
 
-
 /**
  * camel_imap4_engine_handle_untagged_1:
  * @engine: IMAP4 engine
@@ -1238,7 +1224,6 @@ camel_imap4_engine_handle_untagged_1 (CamelIMAP4Engine *engine, camel_imap4_toke
 	return code;
 }
 
-
 /**
  * camel_imap4_engine_handle_untagged:
  * @engine: IMAP4 engine
@@ -1273,7 +1258,6 @@ camel_imap4_engine_handle_untagged (CamelIMAP4Engine *engine, CamelException *ex
 	engine->state = CAMEL_IMAP4_ENGINE_DISCONNECTED;
 }
 
-
 static gint
 imap4_process_command (CamelIMAP4Engine *engine, CamelIMAP4Command *ic)
 {
@@ -1290,7 +1274,6 @@ imap4_process_command (CamelIMAP4Engine *engine, CamelIMAP4Command *ic)
 	return 0;
 }
 
-
 static void
 engine_prequeue_folder_select (CamelIMAP4Engine *engine)
 {
@@ -1313,7 +1296,6 @@ engine_prequeue_folder_select (CamelIMAP4Engine *engine)
 	camel_imap4_command_unref (ic);
 }
 
-
 static gint
 engine_state_change (CamelIMAP4Engine *engine, CamelIMAP4Command *ic)
 {
@@ -1344,7 +1326,6 @@ engine_state_change (CamelIMAP4Engine *engine, CamelIMAP4Command *ic)
 	return retval;
 }
 
-
 /**
  * camel_imap4_engine_iterate:
  * @engine: IMAP4 engine
@@ -1440,7 +1421,6 @@ camel_imap4_engine_iterate (CamelIMAP4Engine *engine)
 	return retval;
 }
 
-
 /**
  * camel_imap4_engine_queue:
  * @engine: IMAP4 engine
@@ -1472,7 +1452,6 @@ camel_imap4_engine_queue (CamelIMAP4Engine *engine, CamelFolder *folder, const g
 	return ic;
 }
 
-
 /**
  * camel_imap4_engine_prequeue:
  * @engine: IMAP4 engine
@@ -1525,7 +1504,6 @@ camel_imap4_engine_prequeue (CamelIMAP4Engine *engine, CamelFolder *folder, cons
 	return ic;
 }
 
-
 /**
  * camel_imap4_engine_dequeue:
  * @engine: IMAP4 engine
@@ -1548,7 +1526,6 @@ camel_imap4_engine_dequeue (CamelIMAP4Engine *engine, CamelIMAP4Command *ic)
 	camel_imap4_command_unref (ic);
 }
 
-
 /**
  * camel_imap4_engine_next_token:
  * @engine: IMAP4 engine
@@ -1577,7 +1554,6 @@ camel_imap4_engine_next_token (CamelIMAP4Engine *engine, camel_imap4_token_t *to
 	return 0;
 }
 
-
 /**
  * camel_imap4_engine_eat_line:
  * @engine: IMAP4 engine
@@ -1618,7 +1594,6 @@ camel_imap4_engine_eat_line (CamelIMAP4Engine *engine, CamelException *ex)
 	return 0;
 }
 
-
 /**
  * camel_imap4_engine_line:
  * @engine: IMAP4 engine
@@ -1673,7 +1648,6 @@ camel_imap4_engine_line (CamelIMAP4Engine *engine, guchar **line, gsize *len, Ca
 	return 0;
 }
 
-
 /**
  * camel_imap4_engine_literal:
  * @engine: IMAP4 engine
@@ -1730,7 +1704,6 @@ camel_imap4_engine_literal (CamelIMAP4Engine *engine, guchar **literal, gsize *l
 	return 0;
 }
 
-
 /**
  * camel_imap4_engine_nstring:
  * @engine: IMAP4 engine
@@ -1773,7 +1746,6 @@ camel_imap4_engine_nstring (CamelIMAP4Engine *engine, guchar **nstring, CamelExc
 	return 0;
 }
 
-
 /**
  * camel_imap4_resp_code_free:
  * @rcode: RESP-CODE
diff --git a/camel/providers/imap4/camel-imap4-engine.h b/camel/providers/imap4/camel-imap4-engine.h
index 25faae9..9390720 100644
--- a/camel/providers/imap4/camel-imap4-engine.h
+++ b/camel/providers/imap4/camel-imap4-engine.h
@@ -19,7 +19,6 @@
  *  Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
-
 #ifndef __CAMEL_IMAP4_ENGINE_H__
 #define __CAMEL_IMAP4_ENGINE_H__
 
@@ -191,7 +190,6 @@ struct _CamelIMAP4EngineClass {
 	guchar tagprefix;
 };
 
-
 CamelType camel_imap4_engine_get_type (void);
 
 CamelIMAP4Engine *camel_imap4_engine_new (CamelService *service, CamelIMAP4ReconnectFunc reconnect);
@@ -215,7 +213,6 @@ void camel_imap4_engine_dequeue (CamelIMAP4Engine *engine, struct _CamelIMAP4Com
 
 gint camel_imap4_engine_iterate (CamelIMAP4Engine *engine);
 
-
 /* untagged response utility functions */
 gint camel_imap4_engine_handle_untagged_1 (CamelIMAP4Engine *engine, struct _camel_imap4_token_t *token, CamelException *ex);
 void camel_imap4_engine_handle_untagged (CamelIMAP4Engine *engine, CamelException *ex);
@@ -227,7 +224,6 @@ gint camel_imap4_engine_literal (CamelIMAP4Engine *engine, guchar **literal, gsi
 gint camel_imap4_engine_nstring (CamelIMAP4Engine *engine, guchar **nstring, CamelException *ex);
 gint camel_imap4_engine_eat_line (CamelIMAP4Engine *engine, CamelException *ex);
 
-
 /* response code stuff */
 gint camel_imap4_engine_parse_resp_code (CamelIMAP4Engine *engine, CamelException *ex);
 void camel_imap4_resp_code_free (CamelIMAP4RespCode *rcode);
diff --git a/camel/providers/imap4/camel-imap4-folder.c b/camel/providers/imap4/camel-imap4-folder.c
index cf41c9e..ecfd31c 100644
--- a/camel/providers/imap4/camel-imap4-folder.c
+++ b/camel/providers/imap4/camel-imap4-folder.c
@@ -19,7 +19,6 @@
  *  Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
-
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
@@ -82,7 +81,6 @@ static gchar * imap4_get_filename (CamelFolder *folder, const gchar *uid, CamelE
 
 static CamelOfflineFolderClass *parent_class = NULL;
 
-
 static GSList *imap4_folder_props = NULL;
 
 static CamelProperty imap4_prop_list[] = {
@@ -91,7 +89,6 @@ static CamelProperty imap4_prop_list[] = {
 	{ CAMEL_IMAP4_FOLDER_EXPIRE_AGE, "expire-age", N_("Expire cached messages older than X seconds") },
 };
 
-
 CamelType
 camel_imap4_folder_get_type (void)
 {
@@ -269,7 +266,6 @@ imap4_setv (CamelObject *object, CamelException *ex, CamelArgV *args)
 	return ((CamelObjectClass *) parent_class)->setv (object, ex, args);
 }
 
-
 static gchar *
 imap4_get_summary_filename (const gchar *path)
 {
@@ -340,7 +336,6 @@ imap4_store_build_filename (gpointer store, const gchar *full_name)
 	return path;
 }
 
-
 CamelFolder *
 camel_imap4_folder_new (CamelStore *store, const gchar *full_name, CamelException *ex)
 {
@@ -446,7 +441,6 @@ camel_imap4_folder_utf7_name (CamelIMAP4Folder *folder)
 	return folder->utf7_name;
 }
 
-
 static struct {
 	const gchar *name;
 	guint32 flag;
@@ -459,7 +453,6 @@ static struct {
 	{ "\\Seen",     CAMEL_MESSAGE_SEEN      },
 };
 
-
 static gint
 imap4_sync_flag (CamelFolder *folder, GPtrArray *infos, gchar onoff, const gchar *flag, CamelException *ex)
 {
@@ -1080,7 +1073,6 @@ imap4_append_message (CamelFolder *folder, CamelMimeMessage *message,
 	CAMEL_SERVICE_REC_UNLOCK (folder->parent_store, connect_lock);
 }
 
-
 static gint
 info_uid_sort (const CamelMessageInfo **info0, const CamelMessageInfo **info1)
 {
diff --git a/camel/providers/imap4/camel-imap4-folder.h b/camel/providers/imap4/camel-imap4-folder.h
index 13ebcd7..8d1a614 100644
--- a/camel/providers/imap4/camel-imap4-folder.h
+++ b/camel/providers/imap4/camel-imap4-folder.h
@@ -19,7 +19,6 @@
  *  Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
-
 #ifndef __CAMEL_IMAP4_FOLDER_H__
 #define __CAMEL_IMAP4_FOLDER_H__
 
@@ -76,7 +75,6 @@ struct _CamelIMAP4FolderClass {
 
 };
 
-
 CamelType camel_imap4_folder_get_type (void);
 
 CamelFolder *camel_imap4_folder_new (CamelStore *store, const gchar *full_name, CamelException *ex);
diff --git a/camel/providers/imap4/camel-imap4-journal.c b/camel/providers/imap4/camel-imap4-journal.c
index 9dfd7a4..6985f8f 100644
--- a/camel/providers/imap4/camel-imap4-journal.c
+++ b/camel/providers/imap4/camel-imap4-journal.c
@@ -19,7 +19,6 @@
  *  Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
-
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
@@ -45,7 +44,6 @@
 
 #define d(x)
 
-
 static void camel_imap4_journal_class_init (CamelIMAP4JournalClass *klass);
 static void camel_imap4_journal_init (CamelIMAP4Journal *journal, CamelIMAP4JournalClass *klass);
 static void camel_imap4_journal_finalize (CamelObject *object);
@@ -55,10 +53,8 @@ static CamelDListNode *imap4_entry_load (CamelOfflineJournal *journal, FILE *in)
 static gint imap4_entry_write (CamelOfflineJournal *journal, CamelDListNode *entry, FILE *out);
 static gint imap4_entry_play (CamelOfflineJournal *journal, CamelDListNode *entry, CamelException *ex);
 
-
 static CamelOfflineJournalClass *parent_class = NULL;
 
-
 CamelType
 camel_imap4_journal_get_type (void)
 {
@@ -272,8 +268,6 @@ imap4_entry_play (CamelOfflineJournal *journal, CamelDListNode *entry, CamelExce
 	}
 }
 
-
-
 CamelOfflineJournal *
 camel_imap4_journal_new (CamelIMAP4Folder *folder, const gchar *filename)
 {
@@ -287,7 +281,6 @@ camel_imap4_journal_new (CamelIMAP4Folder *folder, const gchar *filename)
 	return journal;
 }
 
-
 void
 camel_imap4_journal_readd_failed (CamelIMAP4Journal *journal)
 {
@@ -300,7 +293,6 @@ camel_imap4_journal_readd_failed (CamelIMAP4Journal *journal)
 	g_ptr_array_set_size (journal->failed, 0);
 }
 
-
 void
 camel_imap4_journal_append (CamelIMAP4Journal *imap4_journal, CamelMimeMessage *message,
 			    const CamelMessageInfo *mi, gchar **appended_uid, CamelException *ex)
diff --git a/camel/providers/imap4/camel-imap4-journal.h b/camel/providers/imap4/camel-imap4-journal.h
index f858609..3b204cf 100644
--- a/camel/providers/imap4/camel-imap4-journal.h
+++ b/camel/providers/imap4/camel-imap4-journal.h
@@ -19,7 +19,6 @@
  *  Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
-
 #ifndef __CAMEL_IMAP4_JOURNAL_H__
 #define __CAMEL_IMAP4_JOURNAL_H__
 
@@ -70,7 +69,6 @@ struct _CamelIMAP4JournalClass {
 
 };
 
-
 CamelType camel_imap4_journal_get_type (void);
 
 CamelOfflineJournal *camel_imap4_journal_new (struct _CamelIMAP4Folder *folder, const gchar *filename);
diff --git a/camel/providers/imap4/camel-imap4-provider.c b/camel/providers/imap4/camel-imap4-provider.c
index 0fbe322..7c5f90c 100644
--- a/camel/providers/imap4/camel-imap4-provider.c
+++ b/camel/providers/imap4/camel-imap4-provider.c
@@ -19,7 +19,6 @@
  *  Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
-
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
@@ -90,7 +89,6 @@ CamelServiceAuthType camel_imap4_password_authtype = {
 	TRUE
 };
 
-
 static void
 add_hash (guint *hash, gchar *s)
 {
@@ -138,7 +136,6 @@ imap4_url_equal (gconstpointer a, gconstpointer b)
 		&& u1->port == u2->port;
 }
 
-
 void
 camel_provider_module_init (void)
 {
diff --git a/camel/providers/imap4/camel-imap4-search.c b/camel/providers/imap4/camel-imap4-search.c
index 47e424f..2590cd5 100644
--- a/camel/providers/imap4/camel-imap4-search.c
+++ b/camel/providers/imap4/camel-imap4-search.c
@@ -20,7 +20,6 @@
  *  Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
-
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
@@ -42,10 +41,8 @@ static void camel_imap4_search_finalize (CamelObject *object);
 
 static ESExpResult *imap4_body_contains (struct _ESExp *f, gint argc, struct _ESExpResult **argv, CamelFolderSearch *search);
 
-
 static CamelFolderSearchClass *parent_class = NULL;
 
-
 CamelType
 camel_imap4_search_get_type (void)
 {
@@ -87,7 +84,6 @@ camel_imap4_search_finalize (CamelObject *object)
 	;
 }
 
-
 CamelFolderSearch *
 camel_imap4_search_new (CamelIMAP4Engine *engine, const gchar *cachedir)
 {
@@ -100,7 +96,6 @@ camel_imap4_search_new (CamelIMAP4Engine *engine, const gchar *cachedir)
 	return (CamelFolderSearch *) search;
 }
 
-
 static gint
 untagged_search (CamelIMAP4Engine *engine, CamelIMAP4Command *ic, guint32 index, camel_imap4_token_t *token, CamelException *ex)
 {
@@ -264,7 +259,6 @@ imap4_body_contains (struct _ESExp *f, gint argc, struct _ESExpResult **argv, Ca
 			goto done;
 		}
 
-
 		if (ic->result == CAMEL_IMAP4_RESULT_NO && utf8_search && (engine->capa & CAMEL_IMAP4_CAPABILITY_utf8_search)) {
 			gint j;
 
diff --git a/camel/providers/imap4/camel-imap4-search.h b/camel/providers/imap4/camel-imap4-search.h
index 59580ab..75f7e18 100644
--- a/camel/providers/imap4/camel-imap4-search.h
+++ b/camel/providers/imap4/camel-imap4-search.h
@@ -20,7 +20,6 @@
  *  Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
-
 #ifndef __CAMEL_IMAP4_SEARCH_H__
 #define __CAMEL_IMAP4_SEARCH_H__
 
@@ -61,7 +60,6 @@ struct _CamelIMAP4SearchClass {
 
 };
 
-
 CamelType camel_imap4_search_get_type (void);
 
 CamelFolderSearch *camel_imap4_search_new (struct _CamelIMAP4Engine *engine, const gchar *cachedir);
diff --git a/camel/providers/imap4/camel-imap4-specials.c b/camel/providers/imap4/camel-imap4-specials.c
index db94a38..45c800d 100644
--- a/camel/providers/imap4/camel-imap4-specials.c
+++ b/camel/providers/imap4/camel-imap4-specials.c
@@ -19,7 +19,6 @@
  *  Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
-
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
@@ -52,7 +51,6 @@ guchar camel_imap4_specials[256] = {
           2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,
 };
 
-
 static void
 imap4_init_bits (unsigned short bit, unsigned short bitcopy, gint remove, guchar *vals)
 {
@@ -81,7 +79,6 @@ imap4_init_bits (unsigned short bit, unsigned short bitcopy, gint remove, guchar
 	}
 }
 
-
 void
 camel_imap4_specials_init (void)
 {
diff --git a/camel/providers/imap4/camel-imap4-specials.h b/camel/providers/imap4/camel-imap4-specials.h
index 679001b..02e87ad 100644
--- a/camel/providers/imap4/camel-imap4-specials.h
+++ b/camel/providers/imap4/camel-imap4-specials.h
@@ -19,7 +19,6 @@
  *  Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
-
 #ifndef __CAMEL_IMAP4_SPECIALS_H__
 #define __CAMEL_IMAP4_SPECIALS_H__
 
diff --git a/camel/providers/imap4/camel-imap4-store-summary.c b/camel/providers/imap4/camel-imap4-store-summary.c
index 6d4eb8f..00b12f0 100644
--- a/camel/providers/imap4/camel-imap4-store-summary.c
+++ b/camel/providers/imap4/camel-imap4-store-summary.c
@@ -19,7 +19,6 @@
  *  Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
-
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
@@ -38,7 +37,6 @@
 #include "camel-imap4-store-summary.h"
 #include "camel-imap4-utils.h"
 
-
 #define CAMEL_IMAP4_STORE_SUMMARY_VERSION_0 (0)
 #define CAMEL_IMAP4_STORE_SUMMARY_VERSION (0)
 
@@ -53,10 +51,8 @@ static CamelStoreInfo *store_info_load (CamelStoreSummary *s, FILE *in);
 static gint store_info_save (CamelStoreSummary *s, FILE *out, CamelStoreInfo *info);
 static void store_info_free (CamelStoreSummary *s, CamelStoreInfo *info);
 
-
 static CamelStoreSummaryClass *parent_class = NULL;
 
-
 CamelType
 camel_imap4_store_summary_get_type (void)
 {
@@ -76,7 +72,6 @@ camel_imap4_store_summary_get_type (void)
 	return type;
 }
 
-
 static void
 camel_imap4_store_summary_class_init (CamelIMAP4StoreSummaryClass *klass)
 {
@@ -109,7 +104,6 @@ camel_imap4_store_summary_finalize (CamelObject *obj)
 		camel_imap4_namespace_list_free (s->namespaces);
 }
 
-
 static CamelIMAP4NamespaceList *
 load_namespaces (FILE *in)
 {
@@ -275,7 +269,6 @@ store_info_free (CamelStoreSummary *s, CamelStoreInfo *info)
 	parent_class->store_info_free (s, info);
 }
 
-
 /**
  * camel_imap4_store_summary_new:
  *
@@ -289,14 +282,12 @@ camel_imap4_store_summary_new (void)
 	return (CamelIMAP4StoreSummary *) camel_object_new (camel_imap4_store_summary_get_type ());
 }
 
-
 void
 camel_imap4_store_summary_set_capabilities (CamelIMAP4StoreSummary *s, guint32 capa)
 {
 	s->capa = capa;
 }
 
-
 void
 camel_imap4_store_summary_set_namespaces (CamelIMAP4StoreSummary *s, const CamelIMAP4NamespaceList *ns)
 {
@@ -305,7 +296,6 @@ camel_imap4_store_summary_set_namespaces (CamelIMAP4StoreSummary *s, const Camel
 	s->namespaces = camel_imap4_namespace_list_copy (ns);
 }
 
-
 void
 camel_imap4_store_summary_note_info (CamelIMAP4StoreSummary *s, CamelFolderInfo *fi)
 {
@@ -339,7 +329,6 @@ camel_imap4_store_summary_note_info (CamelIMAP4StoreSummary *s, CamelFolderInfo
 	/* FIXME: should this be recursive? */
 }
 
-
 void
 camel_imap4_store_summary_unnote_info (CamelIMAP4StoreSummary *s, CamelFolderInfo *fi)
 {
@@ -348,7 +337,6 @@ camel_imap4_store_summary_unnote_info (CamelIMAP4StoreSummary *s, CamelFolderInf
 	camel_store_summary_remove_path (ss, fi->full_name);
 }
 
-
 static CamelFolderInfo *
 store_info_to_folder_info (CamelStoreSummary *s, CamelStoreInfo *si)
 {
@@ -373,7 +361,6 @@ store_info_to_folder_info (CamelStoreSummary *s, CamelStoreInfo *si)
 	return fi;
 }
 
-
 CamelFolderInfo *
 camel_imap4_store_summary_get_folder_info (CamelIMAP4StoreSummary *s, const gchar *top, guint32 flags)
 {
diff --git a/camel/providers/imap4/camel-imap4-store-summary.h b/camel/providers/imap4/camel-imap4-store-summary.h
index 6335259..21a32e5 100644
--- a/camel/providers/imap4/camel-imap4-store-summary.h
+++ b/camel/providers/imap4/camel-imap4-store-summary.h
@@ -19,7 +19,6 @@
  *  Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
-
 #ifndef __CAMEL_IMAP_STORE_SUMMARY_H__
 #define __CAMEL_IMAP_STORE_SUMMARY_H__
 
@@ -42,10 +41,8 @@ enum {
 	CAMEL_IMAP4_STORE_INFO_LAST,
 };
 
-
 struct _CamelFolderInfo;
 
-
 struct _CamelIMAP4StoreInfo {
 	CamelStoreInfo info;
 };
@@ -66,7 +63,6 @@ struct _CamelIMAP4StoreSummaryClass {
 	CamelStoreSummaryClass summary_class;
 };
 
-
 CamelType camel_imap4_store_summary_get_type (void);
 
 CamelIMAP4StoreSummary *camel_imap4_store_summary_new (void);
diff --git a/camel/providers/imap4/camel-imap4-store.c b/camel/providers/imap4/camel-imap4-store.c
index 31e5d13..d085eec 100644
--- a/camel/providers/imap4/camel-imap4-store.c
+++ b/camel/providers/imap4/camel-imap4-store.c
@@ -19,7 +19,6 @@
  *  Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
-
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
@@ -78,10 +77,8 @@ static void imap4_unsubscribe_folder (CamelStore *store, const gchar *folder_nam
 static gboolean imap4_folder_subscribed (CamelStore *store, const gchar *folder_name);
 static void imap4_noop (CamelStore *store, CamelException *ex);
 
-
 static CamelOfflineStoreClass *parent_class = NULL;
 
-
 CamelType
 camel_imap4_store_get_type (void)
 {
@@ -175,7 +172,6 @@ camel_imap4_store_finalize (CamelObject *object)
 	g_free (store->storage_path);
 }
 
-
 static void
 imap4_construct (CamelService *service, CamelSession *session, CamelProvider *provider, CamelURL *url, CamelException *ex)
 {
@@ -778,7 +774,6 @@ imap4_get_folder (CamelStore *store, const gchar *folder_name, guint32 flags, Ca
 	return folder;
 }
 
-
 static gboolean
 imap4_folder_can_contain_folders (CamelStore *store, const gchar *folder_name, CamelException *ex)
 {
diff --git a/camel/providers/imap4/camel-imap4-store.h b/camel/providers/imap4/camel-imap4-store.h
index 5ef6449..3773574 100644
--- a/camel/providers/imap4/camel-imap4-store.h
+++ b/camel/providers/imap4/camel-imap4-store.h
@@ -19,7 +19,6 @@
  *  Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
-
 #ifndef __CAMEL_IMAP4_STORE_H__
 #define __CAMEL_IMAP4_STORE_H__
 
@@ -52,7 +51,6 @@ struct _CamelIMAP4StoreClass {
 
 };
 
-
 CamelType camel_imap4_store_get_type (void);
 
 G_END_DECLS
diff --git a/camel/providers/imap4/camel-imap4-stream.c b/camel/providers/imap4/camel-imap4-stream.c
index ec6de21..a460455 100644
--- a/camel/providers/imap4/camel-imap4-stream.c
+++ b/camel/providers/imap4/camel-imap4-stream.c
@@ -19,7 +19,6 @@
  *  Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
-
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
@@ -49,10 +48,8 @@ static gint stream_flush  (CamelStream *stream);
 static gint stream_close  (CamelStream *stream);
 static gboolean stream_eos (CamelStream *stream);
 
-
 static CamelStreamClass *parent_class = NULL;
 
-
 CamelType
 camel_imap4_stream_get_type (void)
 {
@@ -119,7 +116,6 @@ camel_imap4_stream_finalize (CamelObject *object)
 	g_free (imap4->tokenbuf);
 }
 
-
 static gssize
 imap4_fill (CamelIMAP4Stream *imap4)
 {
@@ -268,7 +264,6 @@ stream_eos (CamelStream *stream)
 	return FALSE;
 }
 
-
 /**
  * camel_imap4_stream_new:
  * @stream: tcp stream
@@ -289,8 +284,6 @@ camel_imap4_stream_new (CamelStream *stream)
 	return (CamelStream *) imap4;
 }
 
-
-
 #define token_save(imap4, start, len) G_STMT_START {                         \
 	if (imap4->tokenleft <= len) {                                       \
 		guint tlen, toff;                                    \
@@ -317,7 +310,6 @@ camel_imap4_stream_new (CamelStream *stream)
 	imap4->literal = 0;                                                  \
 } G_STMT_END
 
-
 /**
  * camel_imap4_stream_next_token:
  * @stream: imap4 stream
@@ -587,7 +579,6 @@ camel_imap4_stream_next_token (CamelIMAP4Stream *stream, camel_imap4_token_t *to
 	return 0;
 }
 
-
 /**
  * camel_imap4_stream_unget_token:
  * @stream: imap4 stream
@@ -614,7 +605,6 @@ camel_imap4_stream_unget_token (CamelIMAP4Stream *stream, camel_imap4_token_t *t
 	return 0;
 }
 
-
 /**
  * camel_imap4_stream_line:
  * @stream: imap4 stream
@@ -676,7 +666,6 @@ camel_imap4_stream_line (CamelIMAP4Stream *stream, guchar **line, gsize *len)
 	return 1;
 }
 
-
 /**
  * camel_imap4_stream_literal:
  * @stream: IMAP stream
diff --git a/camel/providers/imap4/camel-imap4-stream.h b/camel/providers/imap4/camel-imap4-stream.h
index 55393bd..350acca 100644
--- a/camel/providers/imap4/camel-imap4-stream.h
+++ b/camel/providers/imap4/camel-imap4-stream.h
@@ -19,7 +19,6 @@
  *  Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
-
 #ifndef __CAMEL_IMAP4_STREAM_H__
 #define __CAMEL_IMAP4_STREAM_H__
 
@@ -105,7 +104,6 @@ struct _CamelIMAP4StreamClass {
 	/* Virtual methods */
 };
 
-
 /* Standard Camel function */
 CamelType camel_imap4_stream_get_type (void);
 
diff --git a/camel/providers/imap4/camel-imap4-summary.c b/camel/providers/imap4/camel-imap4-summary.c
index 45fd732..9ab9202 100644
--- a/camel/providers/imap4/camel-imap4-summary.c
+++ b/camel/providers/imap4/camel-imap4-summary.c
@@ -19,7 +19,6 @@
  *  Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
-
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
@@ -35,7 +34,6 @@
 #include <errno.h>
 #include <ctype.h>
 
-
 #include <glib/gi18n-lib.h>
 
 #include <libedataserver/md5-utils.h>
@@ -74,7 +72,6 @@ static gint imap4_content_info_save (CamelFolderSummary *summary, FILE *out, Cam
 
 static CamelFolderSummaryClass *parent_class = NULL;
 
-
 CamelType
 camel_imap4_summary_get_type (void)
 {
@@ -94,7 +91,6 @@ camel_imap4_summary_get_type (void)
 	return type;
 }
 
-
 static void
 camel_imap4_summary_class_init (CamelIMAP4SummaryClass *klass)
 {
@@ -132,7 +128,6 @@ camel_imap4_summary_finalize (CamelObject *object)
 {
 }
 
-
 CamelFolderSummary *
 camel_imap4_summary_new (CamelFolder *folder)
 {
@@ -1422,7 +1417,6 @@ imap4_content_info_save (CamelFolderSummary *summary, FILE *out, CamelMessageCon
 		return fputc (0, out);
 }
 
-
 void
 camel_imap4_summary_set_exists (CamelFolderSummary *summary, guint32 exists)
 {
diff --git a/camel/providers/imap4/camel-imap4-summary.h b/camel/providers/imap4/camel-imap4-summary.h
index 59862a7..6514557 100644
--- a/camel/providers/imap4/camel-imap4-summary.h
+++ b/camel/providers/imap4/camel-imap4-summary.h
@@ -19,7 +19,6 @@
  *  Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
-
 #ifndef __CAMEL_IMAP4_SUMMARY_H__
 #define __CAMEL_IMAP4_SUMMARY_H__
 
@@ -80,7 +79,6 @@ struct _CamelIMAP4SummaryClass {
 
 };
 
-
 CamelType camel_imap4_summary_get_type (void);
 
 CamelFolderSummary *camel_imap4_summary_new (CamelFolder *folder);
diff --git a/camel/providers/imap4/camel-imap4-utils.c b/camel/providers/imap4/camel-imap4-utils.c
index 5ccf05d..c668115 100644
--- a/camel/providers/imap4/camel-imap4-utils.c
+++ b/camel/providers/imap4/camel-imap4-utils.c
@@ -19,7 +19,6 @@
  *  Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
-
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
@@ -43,7 +42,6 @@
 
 #define d(x)
 
-
 CamelFolderInfo *
 camel_imap4_build_folder_info_tree (GPtrArray *array, const gchar *top)
 {
@@ -118,14 +116,12 @@ camel_imap4_flags_diff (flags_diff_t *diff, guint32 old, guint32 new)
 	diff->bits = new & diff->changed;
 }
 
-
 guint32
 camel_imap4_flags_merge (flags_diff_t *diff, guint32 flags)
 {
 	return (flags & ~diff->changed) | diff->bits;
 }
 
-
 /**
  * camel_imap4_merge_flags:
  * @original: original server flags
@@ -146,7 +142,6 @@ camel_imap4_merge_flags (guint32 original, guint32 local, guint32 server)
 	return camel_imap4_flags_merge (&diff, server);
 }
 
-
 void
 camel_imap4_namespace_clear (CamelIMAP4Namespace **ns)
 {
@@ -206,7 +201,6 @@ camel_imap4_namespace_list_free (CamelIMAP4NamespaceList *nsl)
 	g_free (nsl);
 }
 
-
 gchar
 camel_imap4_get_path_delim (CamelIMAP4StoreSummary *s, const gchar *full_name)
 {
@@ -260,7 +254,6 @@ camel_imap4_get_path_delim (CamelIMAP4StoreSummary *s, const gchar *full_name)
 	return '/';
 }
 
-
 struct _uidset_range {
 	struct _uidset_range *next;
 	guint32 first, last;
@@ -424,7 +417,6 @@ camel_imap4_get_uid_set (CamelIMAP4Engine *engine, CamelFolderSummary *summary,
 	return (i - cur);
 }
 
-
 void
 camel_imap4_utils_set_unexpected_token_error (CamelException *ex, CamelIMAP4Engine *engine, camel_imap4_token_t *token)
 {
@@ -469,7 +461,6 @@ camel_imap4_utils_set_unexpected_token_error (CamelException *ex, CamelIMAP4Engi
 	g_string_free (errmsg, TRUE);
 }
 
-
 static struct {
 	const gchar *name;
 	guint32 flag;
@@ -533,7 +524,6 @@ camel_imap4_parse_flags_list (CamelIMAP4Engine *engine, guint32 *flags, CamelExc
 	return 0;
 }
 
-
 static struct {
 	const gchar *name;
 	guint32 flag;
@@ -646,7 +636,6 @@ camel_imap4_untagged_list (CamelIMAP4Engine *engine, CamelIMAP4Command *ic, guin
 	return -1;
 }
 
-
 static struct {
 	const gchar *name;
 	gint type;
@@ -658,7 +647,6 @@ static struct {
 	{ "UNSEEN",      CAMEL_IMAP4_STATUS_UNSEEN      },
 };
 
-
 void
 camel_imap4_status_free (camel_imap4_status_t *status)
 {
@@ -675,7 +663,6 @@ camel_imap4_status_free (camel_imap4_status_t *status)
 	g_free (status);
 }
 
-
 gint
 camel_imap4_untagged_status (CamelIMAP4Engine *engine, CamelIMAP4Command *ic, guint32 index, camel_imap4_token_t *token, CamelException *ex)
 {
diff --git a/camel/providers/imap4/camel-imap4-utils.h b/camel/providers/imap4/camel-imap4-utils.h
index a0f6536..5f44951 100644
--- a/camel/providers/imap4/camel-imap4-utils.h
+++ b/camel/providers/imap4/camel-imap4-utils.h
@@ -19,7 +19,6 @@
  *  Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
-
 #ifndef __CAMEL_IMAP4_UTILS_H__
 #define __CAMEL_IMAP4_UTILS_H__
 
@@ -39,7 +38,6 @@ void camel_imap4_flags_diff (flags_diff_t *diff, guint32 old, guint32 new);
 guint32 camel_imap4_flags_merge (flags_diff_t *diff, guint32 flags);
 guint32 camel_imap4_merge_flags (guint32 original, guint32 local, guint32 server);
 
-
 struct _CamelFolderInfo;
 struct _CamelIMAP4Engine;
 struct _CamelIMAP4Command;
@@ -76,7 +74,6 @@ typedef struct {
 gint camel_imap4_untagged_list (struct _CamelIMAP4Engine *engine, struct _CamelIMAP4Command *ic,
 			       guint32 index, struct _camel_imap4_token_t *token, CamelException *ex);
 
-
 enum {
 	CAMEL_IMAP4_STATUS_UNKNOWN,
 	CAMEL_IMAP4_STATUS_MESSAGES,
diff --git a/camel/providers/imapp/camel-imapp-driver.c b/camel/providers/imapp/camel-imapp-driver.c
index 1a5f39e..792a4a0 100644
--- a/camel/providers/imapp/camel-imapp-driver.c
+++ b/camel/providers/imapp/camel-imapp-driver.c
@@ -1,5 +1,4 @@
 
-
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
@@ -780,7 +779,6 @@ driver_resp_fetch(CamelIMAPPEngine *ie, guint32 id, CamelIMAPPDriver *sdata)
 	return camel_imapp_engine_skip(ie);
 }
 
-
 /* This code is for the separate thread per server idea */
 
 typedef enum {
diff --git a/camel/providers/imapp/camel-imapp-engine.c b/camel/providers/imapp/camel-imapp-engine.c
index f27fb75..0087245 100644
--- a/camel/providers/imapp/camel-imapp-engine.c
+++ b/camel/providers/imapp/camel-imapp-engine.c
@@ -106,7 +106,6 @@ struct {
 	{ "STARTTLS", IMAP_CAPABILITY_STARTTLS },
 };
 
-
 /*
 capability_data ::= "CAPABILITY" SPACE [1#capability SPACE] "IMAP4rev1"
                     [SPACE 1#capability]
@@ -575,7 +574,6 @@ iterate_completion(CamelIMAPPEngine *imap, guchar *token)
 	return 1;
 }
 
-
 /* Do work if there's any to do */
 gint
 camel_imapp_engine_iterate(CamelIMAPPEngine *imap, CamelIMAPPCommand *icwait)
@@ -871,7 +869,7 @@ imap_engine_command_addv(CamelIMAPPEngine *imap, CamelIMAPPCommand *ic, const gc
 	gint zero;
 	gchar *s;
 	gint d;
-	glong gint l;
+	gglong l;
 	guint32 f;
 	CamelStream *S;
 	CamelDataWrapper *D;
@@ -964,8 +962,8 @@ imap_engine_command_addv(CamelIMAPPEngine *imap, CamelIMAPPCommand *ic, const gc
 				case 'd': /* int/unsigned */
 				case 'u':
 					if (llong) {
-						l = va_arg(ap, glong gint);
-						c(printf("got glong gint '%d'\n", (gint)l));
+						l = va_arg(ap, gglong);
+						c(printf("got gglong '%d'\n", (gint)l));
 						memcpy(buffer, start, p-start);
 						buffer[p-start] = 0;
 						camel_stream_printf((CamelStream *)ic->mem, buffer, l);
@@ -996,7 +994,6 @@ imap_engine_command_addv(CamelIMAPPEngine *imap, CamelIMAPPCommand *ic, const gc
 	camel_stream_write((CamelStream *)ic->mem, ps, p-ps-1);
 }
 
-
 static gpointer
 cie_worker(gpointer data)
 {
@@ -1048,10 +1045,8 @@ cie_worker(gpointer data)
 	}
 }
 
-
 /* here temporarily while its experimental */
 
-
 #ifdef ENABLE_THREADS
 #include <pthread.h>
 
diff --git a/camel/providers/imapp/camel-imapp-folder.c b/camel/providers/imapp/camel-imapp-folder.c
index bd81593..578cbc1 100644
--- a/camel/providers/imapp/camel-imapp-folder.c
+++ b/camel/providers/imapp/camel-imapp-folder.c
@@ -211,7 +211,6 @@ imap_get_message (CamelFolder *folder, const gchar *uid, CamelException *ex)
 	return msg;
 }
 
-
 /* Algorithm for selecting a folder:
 
   - If uidvalidity == old uidvalidity
diff --git a/camel/providers/imapp/camel-imapp-store-summary.h b/camel/providers/imapp/camel-imapp-store-summary.h
index 13e2d69..6efad51 100644
--- a/camel/providers/imapp/camel-imapp-store-summary.h
+++ b/camel/providers/imapp/camel-imapp-store-summary.h
@@ -19,7 +19,6 @@
  * Boston, MA 02110-1301, USA.
  */
 
-
 #ifndef _CAMEL_IMAPP_STORE_SUMMARY_H
 #define _CAMEL_IMAPP_STORE_SUMMARY_H
 
diff --git a/camel/providers/imapp/camel-imapp-store.c b/camel/providers/imapp/camel-imapp-store.c
index 36cf13b..fd51551 100644
--- a/camel/providers/imapp/camel-imapp-store.c
+++ b/camel/providers/imapp/camel-imapp-store.c
@@ -273,7 +273,6 @@ connect_to_server (CamelService *service, gint ssl_mode, gint try_starttls)
 
 /* leave this stuff out for now */
 
-
 static struct {
 	gchar *value;
 	gint mode;
diff --git a/camel/providers/imapp/camel-imapp-store.h b/camel/providers/imapp/camel-imapp-store.h
index 67971a7..99ae301 100644
--- a/camel/providers/imapp/camel-imapp-store.h
+++ b/camel/providers/imapp/camel-imapp-store.h
@@ -21,7 +21,6 @@
  * USA
  */
 
-
 #ifndef CAMEL_IMAPP_STORE_H
 #define CAMEL_IMAPP_STORE_H 1
 
@@ -68,4 +67,3 @@ G_END_DECLS
 
 #endif /* CAMEL_IMAPP_STORE_H */
 
-
diff --git a/camel/providers/imapp/camel-imapp-stream.c b/camel/providers/imapp/camel-imapp-stream.c
index 00b778e..ac89aa4 100644
--- a/camel/providers/imapp/camel-imapp-stream.c
+++ b/camel/providers/imapp/camel-imapp-stream.c
@@ -212,7 +212,6 @@ camel_imapp_stream_new(CamelStream *source)
 	return (CamelStream *)is;
 }
 
-
 /*
  From rfc2060
 
diff --git a/camel/providers/imapp/camel-imapp-summary.c b/camel/providers/imapp/camel-imapp-summary.c
index e719144..dac1fd5 100644
--- a/camel/providers/imapp/camel-imapp-summary.c
+++ b/camel/providers/imapp/camel-imapp-summary.c
@@ -110,7 +110,6 @@ camel_imapp_summary_new(void)
 	return summary;
 }
 
-
 static gint
 summary_header_load(CamelFolderSummary *s, FILE *in)
 {
@@ -151,7 +150,6 @@ summary_header_save(CamelFolderSummary *s, FILE *out)
 	return 0;
 }
 
-
 static CamelMessageInfo *
 message_info_load(CamelFolderSummary *s, FILE *in)
 {
diff --git a/camel/providers/imapp/camel-imapp-utils.c b/camel/providers/imapp/camel-imapp-utils.c
index 6112575..dca49c1 100644
--- a/camel/providers/imapp/camel-imapp-utils.c
+++ b/camel/providers/imapp/camel-imapp-utils.c
@@ -301,13 +301,9 @@ media_subtype   ::= string
 media_text      ::= <"> "TEXT" <"> SPACE media_subtype
                     ;; Defined in [MIME-IMT]
 
-
-
  ( "type" "subtype"  body_fields [envelope body body_fld_lines]
                                  [body_fld_lines]
 
-
-
  (("TEXT" "PLAIN" ("CHARSET"
                      "US-ASCII") NIL NIL "7BIT" 1152 23)("TEXT" "PLAIN"
                      ("CHARSET" "US-ASCII" "NAME" "cc.diff")
@@ -1264,7 +1260,6 @@ imap_free_list(struct _list_info *linfo)
 	}
 }
 
-
 /* ********************************************************************** */
 /* utility functions */
 
diff --git a/camel/providers/local/camel-local-folder.h b/camel/providers/local/camel-local-folder.h
index b4b8b8d..f8cdbb7 100644
--- a/camel/providers/local/camel-local-folder.h
+++ b/camel/providers/local/camel-local-folder.h
@@ -85,7 +85,6 @@ struct _CamelLocalFolderClass {
 	void (*unlock)(CamelLocalFolder *);
 };
 
-
 /* public methods */
 /* flags are taken from CAMEL_STORE_FOLDER_* flags */
 CamelLocalFolder *camel_local_folder_construct(CamelLocalFolder *lf, CamelStore *parent_store,
diff --git a/camel/providers/local/camel-local-private.h b/camel/providers/local/camel-local-private.h
index 134969a..68f2503 100644
--- a/camel/providers/local/camel-local-private.h
+++ b/camel/providers/local/camel-local-private.h
@@ -20,7 +20,6 @@
  *
  */
 
-
 #ifndef CAMEL_LOCAL_PRIVATE_H
 #define CAMEL_LOCAL_PRIVATE_H 1
 
diff --git a/camel/providers/local/camel-local-store.h b/camel/providers/local/camel-local-store.h
index 0983c2a..410c80b 100644
--- a/camel/providers/local/camel-local-store.h
+++ b/camel/providers/local/camel-local-store.h
@@ -57,4 +57,3 @@ G_END_DECLS
 
 #endif /* CAMEL_LOCAL_STORE_H */
 
-
diff --git a/camel/providers/local/camel-local-summary.c b/camel/providers/local/camel-local-summary.c
index b46d28c..c146d8f 100644
--- a/camel/providers/local/camel-local-summary.c
+++ b/camel/providers/local/camel-local-summary.c
@@ -637,7 +637,6 @@ local_summary_decode_x_evolution(CamelLocalSummary *cls, const gchar *xev, Camel
 	return 0;
 }
 
-
 static gint
 summary_header_from_db (CamelFolderSummary *s, CamelFIRecord *fir)
 {
@@ -662,7 +661,6 @@ summary_header_from_db (CamelFolderSummary *s, CamelFIRecord *fir)
 	return 0;
 }
 
-
 static gint
 summary_header_load(CamelFolderSummary *s, FILE *in)
 {
diff --git a/camel/providers/local/camel-maildir-folder.c b/camel/providers/local/camel-maildir-folder.c
index efab037..a809f83 100644
--- a/camel/providers/local/camel-maildir-folder.c
+++ b/camel/providers/local/camel-maildir-folder.c
@@ -262,7 +262,6 @@ maildir_get_filename (CamelFolder *folder, const gchar *uid, CamelException *ex)
 	return g_strdup_printf("%s/cur/%s", lf->folder_path, camel_maildir_info_filename(mdi));
 }
 
-
 static CamelMimeMessage *
 maildir_get_message(CamelFolder * folder, const gchar * uid, CamelException * ex)
 {
diff --git a/camel/providers/local/camel-maildir-summary.c b/camel/providers/local/camel-maildir-summary.c
index 36ac124..ed3d0e5 100644
--- a/camel/providers/local/camel-maildir-summary.c
+++ b/camel/providers/local/camel-maildir-summary.c
@@ -339,7 +339,6 @@ static CamelMessageInfo *message_info_new_from_header(CamelFolderSummary * s, st
 	return mi;
 }
 
-
 static void
 message_info_free(CamelFolderSummary *s, CamelMessageInfo *mi)
 {
@@ -351,7 +350,6 @@ message_info_free(CamelFolderSummary *s, CamelMessageInfo *mi)
 	((CamelFolderSummaryClass *) parent_class)->message_info_free(s, mi);
 }
 
-
 static gchar *maildir_summary_next_uid_string(CamelFolderSummary *s)
 {
 	CamelMaildirSummary *mds = (CamelMaildirSummary *)s;
diff --git a/camel/providers/local/camel-mbox-folder.c b/camel/providers/local/camel-mbox-folder.c
index f47886f..c6f28cb 100644
--- a/camel/providers/local/camel-mbox-folder.c
+++ b/camel/providers/local/camel-mbox-folder.c
@@ -372,7 +372,6 @@ mbox_get_filename (CamelFolder *folder, const gchar *uid, CamelException *ex)
 	frompos = info->frompos;
 	camel_message_info_free((CamelMessageInfo *)info);
 
-
 	filename = g_strdup_printf ("%s%s!%" PRId64, lf->folder_path, G_DIR_SEPARATOR_S, (gint64) frompos);
 
 fail:
diff --git a/camel/providers/local/camel-mbox-store.h b/camel/providers/local/camel-mbox-store.h
index 3910094..d697562 100644
--- a/camel/providers/local/camel-mbox-store.h
+++ b/camel/providers/local/camel-mbox-store.h
@@ -50,4 +50,3 @@ G_END_DECLS
 
 #endif /* CAMEL_MBOX_STORE_H */
 
-
diff --git a/camel/providers/local/camel-mbox-summary.c b/camel/providers/local/camel-mbox-summary.c
index 5203d44..7c2ecb9 100644
--- a/camel/providers/local/camel-mbox-summary.c
+++ b/camel/providers/local/camel-mbox-summary.c
@@ -61,7 +61,6 @@ static gint summary_header_from_db (CamelFolderSummary *, CamelFIRecord *);
 static CamelMessageInfo * message_info_from_db(CamelFolderSummary *s, CamelMIRecord *record);
 static CamelMIRecord * message_info_to_db(CamelFolderSummary *s, CamelMessageInfo *info);
 
-
 static gint summary_header_load (CamelFolderSummary *, FILE *);
 static gint summary_header_save (CamelFolderSummary *, FILE *);
 
@@ -279,7 +278,6 @@ summary_header_from_db (CamelFolderSummary *s, struct _CamelFIRecord *fir)
 	return 0;
 }
 
-
 static gint
 summary_header_load(CamelFolderSummary *s, FILE *in)
 {
@@ -492,7 +490,6 @@ message_info_to_db(CamelFolderSummary *s, CamelMessageInfo *info)
 	return mir;
 }
 
-
 static gint
 message_info_save(CamelFolderSummary *s, FILE *out, CamelMessageInfo *mi)
 {
@@ -987,7 +984,6 @@ mbox_summary_sync(CamelLocalSummary *cls, gboolean expunge, CamelFolderChangeInf
 
 	/* Sync only the changes */
 
-
 	summary = camel_folder_summary_get_changed ((CamelFolderSummary *)mbs);
 	for (i=0; i<summary->len; i++) {
 		CamelMboxMessageInfo *info = (CamelMboxMessageInfo *)camel_folder_summary_uid(s, summary->pdata[i]);
@@ -1006,14 +1002,12 @@ mbox_summary_sync(CamelLocalSummary *cls, gboolean expunge, CamelFolderChangeInf
 	if (quick && expunge) {
 		guint32 dcount =0;
 
-
 		if (camel_db_count_deleted_message_info (s->folder->parent_store->cdb_w, s->folder->full_name, &dcount, ex) == -1)
 			return -1;
 		if (dcount)
 			quick = FALSE;
 	}
 
-
 	/* yuck i hate this logic, but its to simplify the 'all ok, update summary' and failover cases */
 	ret = -1;
 	if (quick) {
diff --git a/camel/providers/local/camel-mh-folder.c b/camel/providers/local/camel-mh-folder.c
index d3aa951..5c9a58d 100644
--- a/camel/providers/local/camel-mh-folder.c
+++ b/camel/providers/local/camel-mh-folder.c
@@ -199,7 +199,6 @@ static gchar * mh_get_filename (CamelFolder *folder, const gchar *uid, CamelExce
 	return g_strdup_printf("%s/%s", lf->folder_path, uid);
 }
 
-
 static CamelMimeMessage *mh_get_message(CamelFolder * folder, const gchar * uid, CamelException * ex)
 {
 	CamelLocalFolder *lf = (CamelLocalFolder *)folder;
diff --git a/camel/providers/local/camel-mh-summary.c b/camel/providers/local/camel-mh-summary.c
index 1595e3e..81add38 100644
--- a/camel/providers/local/camel-mh-summary.c
+++ b/camel/providers/local/camel-mh-summary.c
@@ -216,7 +216,6 @@ remove_summary(gchar *key, CamelMessageInfo *info, CamelLocalSummary *cls)
 	camel_message_info_free(info);
 }
 
-
 static gint
 mh_summary_check(CamelLocalSummary *cls, CamelFolderChangeInfo *changeinfo, CamelException *ex)
 {
diff --git a/camel/providers/local/camel-spool-store.h b/camel/providers/local/camel-spool-store.h
index 93a1ba4..d56c937 100644
--- a/camel/providers/local/camel-spool-store.h
+++ b/camel/providers/local/camel-spool-store.h
@@ -19,7 +19,6 @@
  * USA
  */
 
-
 #ifndef CAMEL_SPOOL_STORE_H
 #define CAMEL_SPOOL_STORE_H 1
 
@@ -43,14 +42,11 @@ typedef struct {
 	camel_spool_store_t type;
 } CamelSpoolStore;
 
-
-
 typedef struct {
 	CamelMboxStoreClass parent_class;
 
 } CamelSpoolStoreClass;
 
-
 /* public methods */
 
 /* Standard Camel function */
@@ -60,4 +56,3 @@ G_END_DECLS
 
 #endif /* CAMEL_SPOOL_STORE_H */
 
-
diff --git a/camel/providers/local/camel-spool-summary.c b/camel/providers/local/camel-spool-summary.c
index 27fb89d..e774ee9 100644
--- a/camel/providers/local/camel-spool-summary.c
+++ b/camel/providers/local/camel-spool-summary.c
@@ -173,7 +173,6 @@ spool_summary_sync_full(CamelMboxSummary *cls, gboolean expunge, CamelFolderChan
 	if (camel_mbox_summary_sync_mbox((CamelMboxSummary *)cls, flags, changeinfo, fd, fdout, ex) == -1)
 		goto error;
 
-
 	/* sync out content */
 	if (fsync(fdout) == -1) {
 		g_warning("Cannot sync temporary folder: %s", g_strerror (errno));
@@ -222,7 +221,6 @@ spool_summary_sync_full(CamelMboxSummary *cls, gboolean expunge, CamelFolderChan
 		goto error;
 	}
 
-
 	/* now copy content back */
 	buffer = g_malloc(8192);
 	size = 1;
diff --git a/camel/providers/nntp/camel-nntp-auth.h b/camel/providers/nntp/camel-nntp-auth.h
index 7aaba83..4958fa3 100644
--- a/camel/providers/nntp/camel-nntp-auth.h
+++ b/camel/providers/nntp/camel-nntp-auth.h
@@ -22,7 +22,6 @@
  * USA
  */
 
-
 #ifndef CAMEL_NNTP_AUTH_H
 #define CAMEL_NNTP_AUTH_H 1
 
diff --git a/camel/providers/nntp/camel-nntp-folder.c b/camel/providers/nntp/camel-nntp-folder.c
index e25f984..ea18215 100644
--- a/camel/providers/nntp/camel-nntp-folder.c
+++ b/camel/providers/nntp/camel-nntp-folder.c
@@ -179,7 +179,6 @@ nntp_folder_download_message (CamelNNTPFolder *nntp_folder, const gchar *id, con
 	return NULL;
 }
 
-
 static void
 nntp_folder_cache_message (CamelDiscoFolder *disco_folder, const gchar *uid, CamelException *ex)
 {
diff --git a/camel/providers/nntp/camel-nntp-folder.h b/camel/providers/nntp/camel-nntp-folder.h
index 67184a9..7d43231 100644
--- a/camel/providers/nntp/camel-nntp-folder.h
+++ b/camel/providers/nntp/camel-nntp-folder.h
@@ -22,7 +22,6 @@
  * USA
  */
 
-
 #ifndef CAMEL_NNTP_FOLDER_H
 #define CAMEL_NNTP_FOLDER_H 1
 
diff --git a/camel/providers/nntp/camel-nntp-grouplist.c b/camel/providers/nntp/camel-nntp-grouplist.c
index b4bf26e..c74bae4 100644
--- a/camel/providers/nntp/camel-nntp-grouplist.c
+++ b/camel/providers/nntp/camel-nntp-grouplist.c
@@ -117,7 +117,6 @@ camel_nntp_get_grouplist_from_file (CamelNNTPStore *store, CamelException *ex)
 		return NULL;
 	}
 
-
 	list = g_new0 (CamelNNTPGroupList, 1);
 	list->store = store;
 	sscanf (buf, "%lu", &time);
diff --git a/camel/providers/nntp/camel-nntp-newsrc.c b/camel/providers/nntp/camel-nntp-newsrc.c
index 72d28a6..a4ffd73 100644
--- a/camel/providers/nntp/camel-nntp-newsrc.c
+++ b/camel/providers/nntp/camel-nntp-newsrc.c
@@ -60,7 +60,6 @@ struct CamelNNTPNewsrc {
 	GMutex *lock;
 };
 
-
 static NewsrcGroup *
 camel_nntp_newsrc_group_add (CamelNNTPNewsrc *newsrc, const gchar *group_name, gboolean subscribed)
 {
@@ -102,7 +101,6 @@ camel_nntp_newsrc_group_get_num_articles_read(CamelNNTPNewsrc *newsrc, NewsrcGro
 	return count;
 }
 
-
 static void
 camel_nntp_newsrc_group_mark_range_read(CamelNNTPNewsrc *newsrc, NewsrcGroup *group, glong low, glong high)
 {
diff --git a/camel/providers/nntp/camel-nntp-private.h b/camel/providers/nntp/camel-nntp-private.h
index 87bad82..e60daf9 100644
--- a/camel/providers/nntp/camel-nntp-private.h
+++ b/camel/providers/nntp/camel-nntp-private.h
@@ -39,7 +39,6 @@ struct _CamelNNTPStorePrivate {
 #define CAMEL_NNTP_STORE_LOCK(f, l) (e_mutex_lock(((CamelNNTPStore *)f)->priv->l))
 #define CAMEL_NNTP_STORE_UNLOCK(f, l) (e_mutex_unlock(((CamelNNTPStore *)f)->priv->l))
 
-
 struct _CamelNNTPFolderPrivate {
 	GMutex *search_lock;	/* for locking the search object */
 	GMutex *cache_lock;     /* for locking the cache object */
diff --git a/camel/providers/nntp/camel-nntp-store-summary.h b/camel/providers/nntp/camel-nntp-store-summary.h
index cc35974..15ae705 100644
--- a/camel/providers/nntp/camel-nntp-store-summary.h
+++ b/camel/providers/nntp/camel-nntp-store-summary.h
@@ -21,7 +21,6 @@
 
 /* currently, this is just a straigt s/imap/nntp from the IMAP file*/
 
-
 #ifndef _CAMEL_NNTP_STORE_SUMMARY_H
 #define _CAMEL_NNTP_STORE_SUMMARY_H
 
diff --git a/camel/providers/nntp/camel-nntp-store.c b/camel/providers/nntp/camel-nntp-store.c
index 505b426..b4fbe3e 100644
--- a/camel/providers/nntp/camel-nntp-store.c
+++ b/camel/providers/nntp/camel-nntp-store.c
@@ -76,7 +76,6 @@ static void nntp_construct (CamelService *service, CamelSession *session,
 			    CamelProvider *provider, CamelURL *url,
 			    CamelException *ex);
 
-
 static gboolean
 nntp_can_work_offline(CamelDiscoStore *store)
 {
diff --git a/camel/providers/nntp/camel-nntp-store.h b/camel/providers/nntp/camel-nntp-store.h
index 8336d4b..73ec19f 100644
--- a/camel/providers/nntp/camel-nntp-store.h
+++ b/camel/providers/nntp/camel-nntp-store.h
@@ -20,7 +20,6 @@
  * USA
  */
 
-
 #ifndef CAMEL_NNTP_STORE_H
 #define CAMEL_NNTP_STORE_H 1
 
@@ -106,4 +105,3 @@ G_END_DECLS
 
 #endif /* CAMEL_NNTP_STORE_H */
 
-
diff --git a/camel/providers/nntp/camel-nntp-stream.h b/camel/providers/nntp/camel-nntp-stream.h
index 37a5a19..6d8ac33 100644
--- a/camel/providers/nntp/camel-nntp-stream.h
+++ b/camel/providers/nntp/camel-nntp-stream.h
@@ -58,7 +58,6 @@ CamelType		 camel_nntp_stream_get_type	(void);
 
 CamelStream     *camel_nntp_stream_new		(CamelStream *source);
 
-
 void		 camel_nntp_stream_set_mode     (CamelNNTPStream *is, camel_nntp_stream_mode_t mode);
 
 gint              camel_nntp_stream_line		(CamelNNTPStream *is, guchar **data, guint *len);
diff --git a/camel/providers/nntp/camel-nntp-summary.c b/camel/providers/nntp/camel-nntp-summary.c
index 71fc958..cea1f2b 100644
--- a/camel/providers/nntp/camel-nntp-summary.c
+++ b/camel/providers/nntp/camel-nntp-summary.c
@@ -172,7 +172,6 @@ summary_header_from_db (CamelFolderSummary *s, CamelFIRecord *mir)
 	CamelNNTPSummary *cns = CAMEL_NNTP_SUMMARY(s);
 	gchar *part;
 
-
 	if (camel_nntp_summary_parent->summary_header_from_db (s, mir) == -1)
 		return -1;
 
@@ -223,7 +222,6 @@ summary_header_load(CamelFolderSummary *s, FILE *in)
 	return 0;
 }
 
-
 static CamelFIRecord *
 summary_header_to_db (CamelFolderSummary *s, CamelException *ex)
 {
diff --git a/camel/providers/nntp/camel-nntp-utils.c b/camel/providers/nntp/camel-nntp-utils.c
index ef7e0ba..b325267 100644
--- a/camel/providers/nntp/camel-nntp-utils.c
+++ b/camel/providers/nntp/camel-nntp-utils.c
@@ -290,7 +290,6 @@ camel_nntp_get_headers (CamelStore *store,
 		return;
 	}
 
-
 	if (nntp_store->extensions & CAMEL_NNTP_EXT_OVER) {
 		get_XOVER_headers (nntp_store, folder, first_message, last_message, ex);
 	}
diff --git a/camel/providers/nntp/camel-nntp-utils.h b/camel/providers/nntp/camel-nntp-utils.h
index 6d27a79..fca72dd 100644
--- a/camel/providers/nntp/camel-nntp-utils.h
+++ b/camel/providers/nntp/camel-nntp-utils.h
@@ -22,7 +22,6 @@
  * USA
  */
 
-
 #ifndef CAMEL_NNTP_UTILS_H
 #define CAMEL_NNTP_UTILS_H 1
 
diff --git a/camel/providers/pop3/camel-pop3-engine.c b/camel/providers/pop3/camel-pop3-engine.c
index f47fdbc..ad4e217 100644
--- a/camel/providers/pop3/camel-pop3-engine.c
+++ b/camel/providers/pop3/camel-pop3-engine.c
@@ -155,7 +155,6 @@ camel_pop3_engine_new(CamelStream *source, guint32 flags)
 	return pe;
 }
 
-
 /**
  * camel_pop3_engine_reget_capabilities:
  * @engine: pop3 engine
@@ -170,7 +169,6 @@ camel_pop3_engine_reget_capabilities (CamelPOP3Engine *engine)
 	get_capabilities (engine);
 }
 
-
 /* TODO: read implementation too?
    etc? */
 static struct {
diff --git a/camel/providers/pop3/camel-pop3-store.c b/camel/providers/pop3/camel-pop3-store.c
index 0b8bfb2..89be794 100644
--- a/camel/providers/pop3/camel-pop3-store.c
+++ b/camel/providers/pop3/camel-pop3-store.c
@@ -95,8 +95,6 @@ camel_pop3_store_class_init (CamelPOP3StoreClass *camel_pop3_store_class)
 	camel_store_class->can_refresh_folder = pop3_can_refresh_folder;
 }
 
-
-
 static void
 camel_pop3_store_init (gpointer object, gpointer klass)
 {
diff --git a/camel/providers/pop3/camel-pop3-store.h b/camel/providers/pop3/camel-pop3-store.h
index d709666..3fa141f 100644
--- a/camel/providers/pop3/camel-pop3-store.h
+++ b/camel/providers/pop3/camel-pop3-store.h
@@ -23,7 +23,6 @@
  * USA
  */
 
-
 #ifndef CAMEL_POP3_STORE_H
 #define CAMEL_POP3_STORE_H 1
 
@@ -48,14 +47,11 @@ typedef struct {
 	guint delete_after;
 } CamelPOP3Store;
 
-
-
 typedef struct {
 	CamelStoreClass parent_class;
 
 } CamelPOP3StoreClass;
 
-
 /* public methods */
 void camel_pop3_store_expunge (CamelPOP3Store *store, CamelException *ex);
 
@@ -71,4 +67,3 @@ G_END_DECLS
 
 #endif /* CAMEL_POP3_STORE_H */
 
-
diff --git a/camel/providers/pop3/camel-pop3-stream.c b/camel/providers/pop3/camel-pop3-stream.c
index 5efe17f..1312ebc 100644
--- a/camel/providers/pop3/camel-pop3-stream.c
+++ b/camel/providers/pop3/camel-pop3-stream.c
@@ -23,7 +23,6 @@
 /* This is *identical* to the camel-nntp-stream, so should probably
    work out a way to merge them */
 
-
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
diff --git a/camel/providers/pop3/camel-pop3-stream.h b/camel/providers/pop3/camel-pop3-stream.h
index 87b1d1f..a019172 100644
--- a/camel/providers/pop3/camel-pop3-stream.h
+++ b/camel/providers/pop3/camel-pop3-stream.h
@@ -61,7 +61,6 @@ CamelType		 camel_pop3_stream_get_type	(void);
 
 CamelStream     *camel_pop3_stream_new		(CamelStream *source);
 
-
 void		 camel_pop3_stream_set_mode     (CamelPOP3Stream *is, camel_pop3_stream_mode_t mode);
 
 gint              camel_pop3_stream_line		(CamelPOP3Stream *is, guchar **data, guint *len);
diff --git a/camel/providers/sendmail/camel-sendmail-provider.c b/camel/providers/sendmail/camel-sendmail-provider.c
index a425531..9858e70 100644
--- a/camel/providers/sendmail/camel-sendmail-provider.c
+++ b/camel/providers/sendmail/camel-sendmail-provider.c
@@ -61,5 +61,3 @@ camel_provider_module_init(void)
 	camel_provider_register(&sendmail_provider);
 }
 
-
-
diff --git a/camel/providers/sendmail/camel-sendmail-transport.c b/camel/providers/sendmail/camel-sendmail-transport.c
index 0e4075c..7038f7c 100644
--- a/camel/providers/sendmail/camel-sendmail-transport.c
+++ b/camel/providers/sendmail/camel-sendmail-transport.c
@@ -50,7 +50,6 @@ static gboolean sendmail_send_to (CamelTransport *transport,
 				  CamelAddress *from, CamelAddress *recipients,
 				  CamelException *ex);
 
-
 static void
 camel_sendmail_transport_class_init (CamelSendmailTransportClass *camel_sendmail_transport_class)
 {
@@ -83,7 +82,6 @@ camel_sendmail_transport_get_type (void)
 	return camel_sendmail_transport_type;
 }
 
-
 static gboolean
 sendmail_send_to (CamelTransport *transport, CamelMimeMessage *message,
 		  CamelAddress *from, CamelAddress *recipients,
diff --git a/camel/providers/sendmail/camel-sendmail-transport.h b/camel/providers/sendmail/camel-sendmail-transport.h
index 8fd72f2..0f963d2 100644
--- a/camel/providers/sendmail/camel-sendmail-transport.h
+++ b/camel/providers/sendmail/camel-sendmail-transport.h
@@ -23,7 +23,6 @@
  * USA
  */
 
-
 #ifndef CAMEL_SENDMAIL_TRANSPORT_H
 #define CAMEL_SENDMAIL_TRANSPORT_H 1
 
@@ -41,13 +40,11 @@ typedef struct {
 
 } CamelSendmailTransport;
 
-
 typedef struct {
 	CamelTransportClass parent_class;
 
 } CamelSendmailTransportClass;
 
-
 /* Standard Camel function */
 CamelType camel_sendmail_transport_get_type (void);
 
diff --git a/camel/providers/smtp/camel-smtp-provider.c b/camel/providers/smtp/camel-smtp-provider.c
index 8140eb5..1daec9c 100644
--- a/camel/providers/smtp/camel-smtp-provider.c
+++ b/camel/providers/smtp/camel-smtp-provider.c
@@ -21,7 +21,6 @@
  *
  */
 
-
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
diff --git a/camel/providers/smtp/camel-smtp-transport.c b/camel/providers/smtp/camel-smtp-transport.c
index d3f35f0..41d398b 100644
--- a/camel/providers/smtp/camel-smtp-transport.c
+++ b/camel/providers/smtp/camel-smtp-transport.c
@@ -21,7 +21,6 @@
  * USA
  */
 
-
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
diff --git a/camel/tests/folder/test9.c b/camel/tests/folder/test9.c
index f945e30..fa9cb06 100644
--- a/camel/tests/folder/test9.c
+++ b/camel/tests/folder/test9.c
@@ -215,7 +215,6 @@ gint main(gint argc, gchar **argv)
 	}
 	pull();
 
-
 	for (i=0;i<ARRAY_LEN(mailboxes);i++) {
 		check_unref(mailboxes[i].folder, 1);
 	}
diff --git a/camel/tests/lib/camel-test.c b/camel/tests/lib/camel-test.c
index e6157a9..9cf38a6 100644
--- a/camel/tests/lib/camel-test.c
+++ b/camel/tests/lib/camel-test.c
@@ -96,7 +96,6 @@ current_state(void)
 	return info;
 }
 
-
 void camel_test_init(gint argc, gchar **argv)
 {
 	struct stat st;
@@ -235,7 +234,6 @@ void camel_test_fail(const gchar *why, ...)
 	va_end(ap);
 }
 
-
 void camel_test_failv(const gchar *why, va_list ap)
 {
 	gchar *text;
@@ -318,9 +316,6 @@ void camel_test_end(void)
 	fflush(stdout);
 }
 
-
-
-
 /* compare strings, ignore whitespace though */
 gint string_equal(const gchar *a, const gchar *b)
 {
diff --git a/camel/tests/lib/folders.c b/camel/tests/lib/folders.c
index 0f619fb..aaae49e 100644
--- a/camel/tests/lib/folders.c
+++ b/camel/tests/lib/folders.c
@@ -318,7 +318,6 @@ test_folder_basic(CamelSession *session, const gchar *storename, gint local, gin
 	camel_exception_free(ex);
 }
 
-
 /* todo: cross-check everything with folder_info checks as well */
 /* this should probably take a folder instead of a session ... */
 void
diff --git a/camel/tests/message/test1.c b/camel/tests/message/test1.c
index e21f7c0..333d177 100644
--- a/camel/tests/message/test1.c
+++ b/camel/tests/message/test1.c
@@ -5,7 +5,6 @@
 
   Retrieve message, compare content.
 
-
   Operations:
 	writing/loading from different types of streams
 	reading/writing different content
diff --git a/camel/tests/message/test2.c b/camel/tests/message/test2.c
index 0ae182a..75635d8 100644
--- a/camel/tests/message/test2.c
+++ b/camel/tests/message/test2.c
@@ -327,4 +327,3 @@ gint main(gint argc, gchar **argv)
 	return 0;
 }
 
-
diff --git a/camel/tests/message/test4.c b/camel/tests/message/test4.c
index 0fc2eea..3b21070 100644
--- a/camel/tests/message/test4.c
+++ b/camel/tests/message/test4.c
@@ -20,7 +20,6 @@
  *
  */
 
-
 #include <stdio.h>
 #include <string.h>
 #include <sys/types.h>
@@ -36,7 +35,6 @@
 #include <camel/camel-stream-fs.h>
 #include <camel/camel-stream-mem.h>
 
-
 #if 0
 static void
 dump_mime_struct (CamelMimePart *mime_part, gint depth)
diff --git a/camel/tests/misc/rfc2047.c b/camel/tests/misc/rfc2047.c
index feabc52..d970e37 100644
--- a/camel/tests/misc/rfc2047.c
+++ b/camel/tests/misc/rfc2047.c
@@ -20,7 +20,6 @@
  *
  */
 
-
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
diff --git a/camel/tests/misc/test1.c b/camel/tests/misc/test1.c
index c23a730..160d1b3 100644
--- a/camel/tests/misc/test1.c
+++ b/camel/tests/misc/test1.c
@@ -1,5 +1,4 @@
 
-
 #include <config.h>
 
 #include <stdio.h>
diff --git a/camel/tests/misc/test2.c b/camel/tests/misc/test2.c
index af22c63..aec3e58 100644
--- a/camel/tests/misc/test2.c
+++ b/camel/tests/misc/test2.c
@@ -1,5 +1,4 @@
 
-
 #include <config.h>
 
 #include <ctype.h>
diff --git a/camel/tests/misc/url-scan.c b/camel/tests/misc/url-scan.c
index bb821a1..3cc3fcd 100644
--- a/camel/tests/misc/url-scan.c
+++ b/camel/tests/misc/url-scan.c
@@ -20,7 +20,6 @@
  *
  */
 
-
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
diff --git a/camel/tests/smime/pgp-mime.c b/camel/tests/smime/pgp-mime.c
index b1cb711..8ba1603 100644
--- a/camel/tests/smime/pgp-mime.c
+++ b/camel/tests/smime/pgp-mime.c
@@ -20,7 +20,6 @@
  *
  */
 
-
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
@@ -42,13 +41,11 @@ static gchar test_msg[] = "Since we need to make sure that\nFrom lines work okay
 "as well as test 8bit chars and other fun stuff? 8bit chars: Dra¾en Kaèar\n\nOkay, I guess that covers"
 "the basics at least...\n";
 
-
 #define CAMEL_PGP_SESSION_TYPE     (camel_pgp_session_get_type ())
 #define CAMEL_PGP_SESSION(obj)     (CAMEL_CHECK_CAST((obj), CAMEL_PGP_SESSION_TYPE, CamelPgpSession))
 #define CAMEL_PGP_SESSION_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_PGP_SESSION_TYPE, CamelPgpSessionClass))
 #define CAMEL_PGP_IS_SESSION(o)    (CAMEL_CHECK_TYPE((o), CAMEL_PGP_SESSION_TYPE))
 
-
 typedef struct _CamelPgpSession {
 	CamelSession parent_object;
 
@@ -59,7 +56,6 @@ typedef struct _CamelPgpSessionClass {
 
 } CamelPgpSessionClass;
 
-
 static gchar *get_password (CamelSession *session, const gchar *prompt,
 			   guint32 flags,
 			   CamelService *service, const gchar *item,
@@ -120,7 +116,6 @@ camel_pgp_session_new (const gchar *path)
 	return session;
 }
 
-
 gint main (gint argc, gchar **argv)
 {
 	CamelSession *session;
diff --git a/camel/tests/smime/pgp.c b/camel/tests/smime/pgp.c
index fcd0436..5585a71 100644
--- a/camel/tests/smime/pgp.c
+++ b/camel/tests/smime/pgp.c
@@ -20,7 +20,6 @@
  *
  */
 
-
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
@@ -41,7 +40,6 @@
 #define CAMEL_PGP_SESSION_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_PGP_SESSION_TYPE, CamelPgpSessionClass))
 #define CAMEL_PGP_IS_SESSION(o)    (CAMEL_CHECK_TYPE((o), CAMEL_PGP_SESSION_TYPE))
 
-
 typedef struct _CamelPgpSession {
 	CamelSession parent_object;
 
@@ -52,7 +50,6 @@ typedef struct _CamelPgpSessionClass {
 
 } CamelPgpSessionClass;
 
-
 static gchar *get_password (CamelSession *session, const gchar *prompt,
 			   guint32 flags,
 			   CamelService *service, const gchar *item,
@@ -113,7 +110,6 @@ camel_pgp_session_new (const gchar *path)
 	return session;
 }
 
-
 gint main (gint argc, gchar **argv)
 {
 	CamelSession *session;
diff --git a/camel/tests/smime/pkcs7.c b/camel/tests/smime/pkcs7.c
index 384c559..ca9f270 100644
--- a/camel/tests/smime/pkcs7.c
+++ b/camel/tests/smime/pkcs7.c
@@ -8,13 +8,11 @@
 
 #include "camel-test.h"
 
-
 #define CAMEL_TEST_SESSION_TYPE     (camel_test_session_get_type ())
 #define CAMEL_TEST_SESSION(obj)     (CAMEL_CHECK_CAST((obj), CAMEL_TEST_SESSION_TYPE, CamelTestSession))
 #define CAMEL_TEST_SESSION_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_TEST_SESSION_TYPE, CamelTestSessionClass))
 #define CAMEL_TEST_IS_SESSION(o)    (CAMEL_CHECK_TYPE((o), CAMEL_TEST_SESSION_TYPE))
 
-
 typedef struct _CamelTestSession {
 	CamelSession parent_object;
 
@@ -25,7 +23,6 @@ typedef struct _CamelTestSessionClass {
 
 } CamelTestSessionClass;
 
-
 static gchar *get_password (CamelSession *session, const gchar *prompt,
 			   guint32 flags, CamelService *service,
 			   const gchar *item, CamelException *ex);
@@ -85,7 +82,6 @@ camel_test_session_new (const gchar *path)
 	return session;
 }
 
-
 gint main (gint argc, gchar **argv)
 {
 	CamelSession *session;
diff --git a/libedataserver/e-account-list.h b/libedataserver/e-account-list.h
index 2d3f7ad..e8393bd 100644
--- a/libedataserver/e-account-list.h
+++ b/libedataserver/e-account-list.h
@@ -58,7 +58,6 @@ typedef struct {
 	void (*account_removed) (EAccountList *, EAccount *);
 } EAccountListClass;
 
-
 GType           e_account_list_get_type (void);
 
 EAccountList   *e_account_list_new       (GConfClient  *gconf);
diff --git a/libedataserver/e-account.c b/libedataserver/e-account.c
index 943201d..98b4c4a 100644
--- a/libedataserver/e-account.c
+++ b/libedataserver/e-account.c
@@ -204,7 +204,6 @@ e_account_new_from_xml (const gchar *xml)
 	return account;
 }
 
-
 static gboolean
 xml_set_bool (xmlNodePtr node, const gchar *name, gboolean *val)
 {
@@ -508,7 +507,6 @@ e_account_set_from_xml (EAccount *account, const gchar *xml)
 	return changed;
 }
 
-
 /**
  * e_account_import:
  * @dest: destination account object
@@ -580,7 +578,6 @@ e_account_import (EAccount *dest, EAccount *src)
 	g_signal_emit(dest, signals[CHANGED], 0, -1);
 }
 
-
 /**
  * e_account_to_xml:
  * @account: an #EAccount
@@ -683,7 +680,6 @@ e_account_to_xml (EAccount *account)
 	return tmp;
 }
 
-
 /**
  * e_account_uid_from_xml:
  * @xml: an XML account description
diff --git a/libedataserver/e-account.h b/libedataserver/e-account.h
index a14255a..afe8d48 100644
--- a/libedataserver/e-account.h
+++ b/libedataserver/e-account.h
@@ -146,7 +146,6 @@ typedef struct {
 	void (*changed)(EAccount *, gint field);
 } EAccountClass;
 
-
 GType     e_account_get_type (void);
 
 EAccount *e_account_new          (void);
@@ -161,7 +160,6 @@ void      e_account_import       (EAccount   *dest,
 
 gchar     *e_account_to_xml       (EAccount   *account);
 
-
 gchar     *e_account_uid_from_xml (const gchar *xml);
 
 const gchar *e_account_get_string (EAccount *,
diff --git a/libedataserver/e-data-server-util.c b/libedataserver/e-data-server-util.c
index c5a3b19..b491d80 100644
--- a/libedataserver/e-data-server-util.c
+++ b/libedataserver/e-data-server-util.c
@@ -162,7 +162,6 @@ e_util_utf8_strstrcase (const gchar *haystack, const gchar *needle)
         return NULL;
 }
 
-
 static gunichar
 stripped_char (gunichar ch)
 {
diff --git a/libedataserver/e-iconv.c b/libedataserver/e-iconv.c
index f933119..411f71c 100644
--- a/libedataserver/e-iconv.c
+++ b/libedataserver/e-iconv.c
@@ -152,8 +152,6 @@ static const struct {
 	{ NULL,              NULL         }
 };
 
-
-
 /* Another copy of this trivial list implementation
    Why?  This stuff gets called a lot (potentially), should run fast,
    and g_list's are f@@#$ed up to make this a hassle */
@@ -189,7 +187,6 @@ static EDListNode *e_dlist_remove(EDListNode *n)
         return n;
 }
 
-
 static const gchar *
 e_strdown (gchar *str)
 {
@@ -218,7 +215,6 @@ e_strup (gchar *str)
 	return str;
 }
 
-
 static void
 locale_parse_lang (const gchar *locale)
 {
@@ -570,7 +566,6 @@ const gchar *e_iconv_locale_charset(void)
 	return locale_charset;
 }
 
-
 const gchar *
 e_iconv_locale_language (void)
 {
diff --git a/libedataserver/e-list-iterator.c b/libedataserver/e-list-iterator.c
index 10f8823..1bcceea 100644
--- a/libedataserver/e-list-iterator.c
+++ b/libedataserver/e-list-iterator.c
@@ -11,7 +11,6 @@
 #include "e-list-iterator.h"
 #include "e-list.h"
 
-
 static void        e_list_iterator_invalidate (EIterator *iterator);
 static gboolean    e_list_iterator_is_valid   (EIterator *iterator);
 static void        e_list_iterator_set        (EIterator  *iterator,
diff --git a/libedataserver/e-memory.c b/libedataserver/e-memory.c
index 1c5da6d..c87c008 100644
--- a/libedataserver/e-memory.c
+++ b/libedataserver/e-memory.c
@@ -544,7 +544,6 @@ void e_mempool_destroy(MemPool *pool)
 	}
 }
 
-
 /*
   string array classes
 */
@@ -846,8 +845,6 @@ e_strv_destroy(struct _EStrv *strv)
 	g_free(strv);
 }
 
-
-
 /* string pool stuff */
 
 /* TODO:
diff --git a/libedataserver/e-proxy.c b/libedataserver/e-proxy.c
index 40b4edf..02cc36f 100644
--- a/libedataserver/e-proxy.c
+++ b/libedataserver/e-proxy.c
@@ -146,7 +146,6 @@ ep_free_proxy_host_addr (ProxyHostAddr* host)
 	}
 }
 
-
 static void
 e_proxy_class_init (EProxyClass *klass)
 {
@@ -173,7 +172,6 @@ e_proxy_class_init (EProxyClass *klass)
                               g_cclosure_marshal_VOID__VOID,
                               G_TYPE_NONE, 0);
 
-
 }
 
 static void
diff --git a/libedataserver/e-sexp.c b/libedataserver/e-sexp.c
index dd6b261..9253d13 100644
--- a/libedataserver/e-sexp.c
+++ b/libedataserver/e-sexp.c
@@ -82,7 +82,6 @@
         Execute a sequence.  The last function return is the return type.
 */
 
-
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
@@ -99,7 +98,6 @@
 #define r(x)			/* run debug */
 #define d(x)			/* general debug */
 
-
 static struct _ESExpTerm * parse_list(ESExp *f, gint gotbrace);
 static struct _ESExpTerm * parse_value(ESExp *f);
 
@@ -670,7 +668,6 @@ term_eval_begin(struct _ESExp *f, gint argc, struct _ESExpTerm **argv, gpointer
 		return e_sexp_result_new(f, ESEXP_RES_UNDEFINED);
 }
 
-
 /* this must only be called from inside term evaluation callbacks! */
 struct _ESExpResult *
 e_sexp_term_eval(struct _ESExp *f, struct _ESExpTerm *t)
@@ -905,7 +902,6 @@ ESExpTerm * e_sexp_parse_value (ESExp *f)
 	return parse_value (f);
 }
 
-
 static struct _ESExpTerm *
 parse_value(ESExp *f)
 {
diff --git a/libedataserver/e-sexp.h b/libedataserver/e-sexp.h
index 25caa24..5f57f58 100644
--- a/libedataserver/e-sexp.h
+++ b/libedataserver/e-sexp.h
@@ -103,8 +103,6 @@ struct _ESExpTerm {
 	} value;
 };
 
-
-
 struct _ESExp {
 #ifdef E_SEXP_IS_G_OBJECT
 	GObject parent_object;
@@ -153,7 +151,6 @@ gint		e_sexp_set_scope	(ESExp *f, gint scope);
 void		e_sexp_input_text	(ESExp *f, const gchar *text, gint len);
 void		e_sexp_input_file	(ESExp *f, gint fd);
 
-
 gint		e_sexp_parse		(ESExp *f);
 ESExpResult    *e_sexp_eval		(ESExp *f);
 
diff --git a/libedataserver/e-source-group.c b/libedataserver/e-source-group.c
index c3563d1..71917c7 100644
--- a/libedataserver/e-source-group.c
+++ b/libedataserver/e-source-group.c
@@ -46,7 +46,6 @@ struct _ESourceGroupPrivate {
 	GHashTable *properties;
 };
 
-
 /* Signals.  */
 
 enum {
@@ -57,7 +56,6 @@ enum {
 };
 static guint signals[LAST_SIGNAL] = { 0 };
 
-
 /* Callbacks.  */
 
 static void
@@ -68,7 +66,6 @@ source_changed_callback (ESource *source,
 		g_signal_emit (group, signals[CHANGED], 0);
 }
 
-
 /* GObject methods.  */
 
 G_DEFINE_TYPE (ESourceGroup, e_source_group, G_TYPE_OBJECT)
@@ -113,7 +110,6 @@ impl_finalize (GObject *object)
 	(* G_OBJECT_CLASS (e_source_group_parent_class)->finalize) (object);
 }
 
-
 /* Initialization.  */
 
 static void
@@ -345,7 +341,6 @@ e_source_group_update_from_xml (ESourceGroup *group,
 	g_return_val_if_fail (E_IS_SOURCE_GROUP (group), FALSE);
 	g_return_val_if_fail (xml != NULL, FALSE);
 
-
 	xmldoc = xmlParseDoc (XC xml);
 
 	success = e_source_group_update_from_xmldoc (group, xmldoc, changed_return);
@@ -752,7 +747,6 @@ e_source_group_remove_source_by_uid (ESourceGroup *group,
 	return FALSE;
 }
 
-
 gchar *
 e_source_group_to_xml (ESourceGroup *group)
 {
diff --git a/libedataserver/e-source-group.h b/libedataserver/e-source-group.h
index 49ecfcd..b74cdfd 100644
--- a/libedataserver/e-source-group.h
+++ b/libedataserver/e-source-group.h
@@ -34,7 +34,6 @@ G_BEGIN_DECLS
 #define E_IS_SOURCE_GROUP(obj)			(G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_SOURCE_GROUP))
 #define E_IS_SOURCE_GROUP_CLASS(klass)		(G_TYPE_CHECK_CLASS_TYPE ((obj), E_TYPE_SOURCE_GROUP))
 
-
 typedef struct _ESourceGroup        ESourceGroup;
 typedef struct _ESourceGroupPrivate ESourceGroupPrivate;
 typedef struct _ESourceGroupClass   ESourceGroupClass;
@@ -58,7 +57,6 @@ struct _ESourceGroupClass {
 	void (* source_added)   (ESourceGroup *source_list, ESource *source);
 };
 
-
 GType    e_source_group_get_type (void);
 
 ESourceGroup *e_source_group_new              (const gchar *name,
diff --git a/libedataserver/e-source-list.c b/libedataserver/e-source-list.c
index 7a83e83..fbd3c0f 100644
--- a/libedataserver/e-source-list.c
+++ b/libedataserver/e-source-list.c
@@ -39,7 +39,6 @@ struct _ESourceListPrivate {
 	gint sync_idle_id;
 };
 
-
 /* Signals.  */
 
 enum {
@@ -50,7 +49,6 @@ enum {
 };
 static guint signals[LAST_SIGNAL] = { 0 };
 
-
 /* Forward declarations.  */
 
 static gboolean  sync_idle_callback      (ESourceList  *list);
@@ -61,7 +59,6 @@ static void      conf_changed_callback   (GConfClient  *client,
 					  GConfEntry   *entry,
 					  ESourceList  *list);
 
-
 /* Utility functions.  */
 
 static void
@@ -187,7 +184,6 @@ remove_group (ESourceList *list,
 	g_signal_emit (list, signals[CHANGED], 0);
 }
 
-
 /* Callbacks.  */
 
 static gboolean
@@ -225,7 +221,6 @@ conf_changed_callback (GConfClient *client,
 	load_from_gconf (list);
 }
 
-
 /* GObject methods.  */
 
 G_DEFINE_TYPE (ESourceList, e_source_list, G_TYPE_OBJECT)
@@ -289,7 +284,6 @@ impl_finalize (GObject *object)
 	(* G_OBJECT_CLASS (e_source_list_parent_class)->finalize) (object);
 }
 
-
 /* Initialization.  */
 
 static void
@@ -739,7 +733,6 @@ e_source_list_remove_source_by_uid (ESourceList *list,
 	return FALSE;
 }
 
-
 gboolean
 e_source_list_sync (ESourceList *list,
 		    GError **error)
@@ -819,7 +812,6 @@ e_source_list_is_gconf_updated (ESourceList *list)
 		}
 	}
 
-
 	/* If there is mismatch, free the conf_list and return FALSE */
 	if (!conf_to_list) {
 		for (p = conf_list; p != NULL; p = p->next) {
diff --git a/libedataserver/e-source-list.h b/libedataserver/e-source-list.h
index b0e7885..0ece32c 100644
--- a/libedataserver/e-source-list.h
+++ b/libedataserver/e-source-list.h
@@ -36,7 +36,6 @@ G_BEGIN_DECLS
 #define E_IS_SOURCE_LIST(obj)			(G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_SOURCE_LIST))
 #define E_IS_SOURCE_LIST_CLASS(klass)		(G_TYPE_CHECK_CLASS_TYPE ((obj), E_TYPE_SOURCE_LIST))
 
-
 typedef struct _ESourceList        ESourceList;
 typedef struct _ESourceListPrivate ESourceListPrivate;
 typedef struct _ESourceListClass   ESourceListClass;
@@ -58,7 +57,6 @@ struct _ESourceListClass {
 	void (* group_added) (ESourceList *source_list, ESourceGroup *group);
 };
 
-
 GType    e_source_list_get_type (void);
 
 ESourceList *e_source_list_new            (void);
diff --git a/libedataserver/e-source.c b/libedataserver/e-source.c
index 21c1113..5ccd506 100644
--- a/libedataserver/e-source.c
+++ b/libedataserver/e-source.c
@@ -30,7 +30,6 @@
 
 #define ES_CLASS(obj)  E_SOURCE_CLASS (G_OBJECT_GET_CLASS (obj))
 
-
 /* Private members.  */
 
 struct _ESourcePrivate {
@@ -48,7 +47,6 @@ struct _ESourcePrivate {
 	GHashTable *properties;
 };
 
-
 /* Signals.  */
 
 enum {
@@ -57,7 +55,6 @@ enum {
 };
 static guint signals[LAST_SIGNAL] = { 0 };
 
-
 /* Callbacks.  */
 
 static void
@@ -69,7 +66,6 @@ group_weak_notify (ESource *source,
 	g_signal_emit (source, signals[CHANGED], 0);
 }
 
-
 /* GObject methods.  */
 
 G_DEFINE_TYPE (ESource, e_source, G_TYPE_OBJECT)
@@ -105,7 +101,6 @@ impl_dispose (GObject *object)
 	(* G_OBJECT_CLASS (e_source_parent_class)->dispose) (object);
 }
 
-
 /* Initialization.  */
 
 static void
@@ -662,7 +657,6 @@ e_source_get_readonly (ESource *source)
 	return source->priv->readonly;
 }
 
-
 #ifndef EDS_DISABLE_DEPRECATED
 /**
  * e_source_get_color:
@@ -717,7 +711,6 @@ e_source_get_uri (ESource *source)
 		return e_source_build_absolute_uri (source);
 }
 
-
 static void
 property_dump_cb (const xmlChar *key, const xmlChar *value, xmlNodePtr root)
 {
@@ -728,7 +721,6 @@ property_dump_cb (const xmlChar *key, const xmlChar *value, xmlNodePtr root)
 	xmlSetProp (node, (xmlChar*)"value", value);
 }
 
-
 static xmlNodePtr
 dump_common_to_xml_node (ESource *source,
 			 xmlNodePtr parent_node)
@@ -766,7 +758,6 @@ dump_common_to_xml_node (ESource *source,
 	return node;
 }
 
-
 void
 e_source_dump_to_xml_node (ESource *source,
 			   xmlNodePtr parent_node)
@@ -776,7 +767,6 @@ e_source_dump_to_xml_node (ESource *source,
 	dump_common_to_xml_node (source, parent_node);
 }
 
-
 gchar *
 e_source_to_standalone_xml (ESource *source)
 {
@@ -913,7 +903,6 @@ e_source_new_from_standalone_xml (const gchar *xml)
 	return source;
 }
 
-
 const gchar *
 e_source_get_property (ESource *source,
 		       const gchar *property)
@@ -955,7 +944,6 @@ e_source_set_property (ESource *source,
 	g_signal_emit (source, signals[CHANGED], 0);
 }
 
-
 void
 e_source_foreach_property (ESource *source, GHFunc func, gpointer data)
 {
@@ -967,14 +955,12 @@ e_source_foreach_property (ESource *source, GHFunc func, gpointer data)
 	g_hash_table_foreach (priv->properties, func, data);
 }
 
-
 static void
 copy_property (const gchar *key, const gchar *value, ESource *new_source)
 {
 	e_source_set_property (new_source, key, value);
 }
 
-
 ESource *
 e_source_copy (ESource *source)
 {
diff --git a/libedataserver/e-source.h b/libedataserver/e-source.h
index 571b10a..a646260 100644
--- a/libedataserver/e-source.h
+++ b/libedataserver/e-source.h
@@ -34,7 +34,6 @@ G_BEGIN_DECLS
 #define E_IS_SOURCE(obj)		(G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_SOURCE))
 #define E_IS_SOURCE_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((obj), E_TYPE_SOURCE))
 
-
 typedef struct _ESource        ESource;
 typedef struct _ESourcePrivate ESourcePrivate;
 typedef struct _ESourceClass   ESourceClass;
@@ -54,7 +53,6 @@ struct _ESourceClass {
 	void (* changed) (ESource *source);
 };
 
-
 GType    e_source_get_type (void);
 
 ESource *e_source_new                (const gchar   *name,
diff --git a/libedataserver/e-time-utils.c b/libedataserver/e-time-utils.c
index ea2a006..75c2f1d 100644
--- a/libedataserver/e-time-utils.c
+++ b/libedataserver/e-time-utils.c
@@ -203,7 +203,6 @@ enum ptime_locale_status { not, loc, raw };
 # include "../locale/localeinfo.h"
 #endif
 
-
 #ifndef __P
 # if defined __GNUC__ || (defined __STDC__ && __STDC__)
 #  define __P(args) args
@@ -212,7 +211,6 @@ enum ptime_locale_status { not, loc, raw };
 # endif  /* GCC.  */
 #endif  /* Not __P.  */
 
-
 #if ! HAVE_LOCALTIME_R && ! defined localtime_r
 # ifdef _LIBC
 #  define localtime_r __localtime_r
@@ -234,7 +232,6 @@ localtime_r (t, tp)
 # endif /* ! _LIBC */
 #endif /* ! HAVE_LOCALTIME_R && ! defined (localtime_r) */
 
-
 #define match_char(ch1, ch2) if (ch1 != ch2) return NULL
 #if defined _LIBC && defined __GNUC__ && __GNUC__ >= 2
 # define match_string(cs1, s2) \
@@ -297,7 +294,6 @@ localtime_r (t, tp)
    && (rp = __strptime_internal (rp, (new_fmt), tm,			      \
 				 decided, era_cnt LOCALE_ARG)) != NULL)
 
-
 #ifdef _LIBC
 /* This is defined in locale/C-time.c in the GNU libc.  */
 extern const struct locale_data _nl_C_LC_TIME attribute_hidden;
@@ -379,9 +375,6 @@ static const unsigned short __mon_yday[2][13] =
 # define ISSPACE(Ch) isspace (Ch)
 #endif
 
-
-
-
 #ifndef __isleap
 /* Nonzero if YEAR is a leap year (every 4 years,
    except every 100th isn't, and every 400th is).  */
@@ -415,7 +408,6 @@ day_of_the_year (struct tm *tm)
 		 + (tm->tm_mday - 1));
 }
 
-
 #ifdef _LIBC
 gchar *
 internal_function
@@ -1474,7 +1466,6 @@ string_is_empty (const gchar *value)
 	return empty;
 }
 
-
 /* Takes a number of format strings for strptime() and attempts to parse a
  * string with them.
  */
@@ -1671,7 +1662,6 @@ e_time_parse_date_and_time_ex		(const gchar	*value,
 	/* strptime format of a weekday and a date. */
 	format[num_formats++] = _("%a %m/%d/%Y");
 
-
 	/*
 	 * Now try all the above formats again, but without the weekday.
 	 */
@@ -1860,7 +1850,6 @@ e_time_parse_time (const gchar *value, struct tm *result)
 	return parse_with_strptime (value, result, format, num_formats);
 }
 
-
 /**
  * e_time_format_date_and_time:
  * @date_tm: The #tm to convert to a string.
@@ -1917,7 +1906,6 @@ e_time_format_date_and_time		(struct tm	*date_tm,
 		buffer[0] = '\0';
 }
 
-
 /**
  * e_time_format_time:
  * @date_tm: The #tm to convert to a string.
@@ -1962,7 +1950,6 @@ e_time_format_time			(struct tm	*date_tm,
 		buffer[0] = '\0';
 }
 
-
 /**
  * e_mktime_utc:
  * @tm: The #tm to convert to a calendar time representation.
@@ -2025,7 +2012,7 @@ e_localtime_with_offset (time_t tt, struct tm *tm, gint *offset)
 }
 
 #ifdef G_OS_WIN32
-static int _e_string_replace(gchar **str, const gchar *old, const gchar *new)
+static gint _e_string_replace(gchar **str, const gchar *old, const gchar *new)
 {
 	GRegex *my_regex = g_regex_new(old, 0, 0, NULL);
 	gchar *buf = *str;
@@ -2045,7 +2032,7 @@ e_time_get_d_fmt_with_4digit_year (void)
 	res = g_strdup (nl_langinfo (D_FMT) );
 #elif defined(G_OS_WIN32)
   #define GET_LOCALE_INFO(str, len) GetLocaleInfoA(LOCALE_USER_DEFAULT, LOCALE_SLONGDATE, str, len)
-	int format_string_length = GET_LOCALE_INFO(NULL, 0);
+	gint format_string_length = GET_LOCALE_INFO(NULL, 0);
 	if (format_string_length > 0)
 	{
 		gsize format_bytes_read, format_bytes_written;
@@ -2066,7 +2053,7 @@ e_time_get_d_fmt_with_4digit_year (void)
 		_e_string_replace(&res, "\\byy\\b", "%y");	/* yy -> %y*/
 		_e_string_replace(&res, "\\byyyy\\b", "%Y");	/* yyyy -> %Y */
 		_e_string_replace(&res, "\\byyyyy\\b", "%Y");	/* yyyyy -> %Y */
-	}			
+	}
   #undef GET_LOCALE_INFO
 	/**TODO** implement this for other systems
 	*/
diff --git a/libedataserver/e-time-utils.h b/libedataserver/e-time-utils.h
index 00bd196..6300e98 100644
--- a/libedataserver/e-time-utils.h
+++ b/libedataserver/e-time-utils.h
@@ -34,7 +34,6 @@ ETimeParseStatus e_time_parse_date_and_time	(const gchar	*value,
 ETimeParseStatus e_time_parse_date		(const gchar	*value,
 						 struct tm	*result);
 
-
 /* have same behavior like those functions above with two_digit_year set to NULL */
 ETimeParseStatus e_time_parse_date_and_time_ex	(const gchar	*value,
 						 struct tm	*result,
@@ -63,7 +62,6 @@ void e_time_format_time				(struct tm	*date_tm,
 						 gchar		*buffer,
 						 gint		 buffer_size);
 
-
 /* Like mktime(3), but assumes UTC instead of local timezone. */
 time_t e_mktime_utc (struct tm *tm);
 
diff --git a/libedataserver/e-trie.c b/libedataserver/e-trie.c
index 910248f..36051e9 100644
--- a/libedataserver/e-trie.c
+++ b/libedataserver/e-trie.c
@@ -20,7 +20,6 @@
  *
  */
 
-
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
@@ -61,7 +60,6 @@ struct _ETrie {
 	EMemChunk *state_chunks;
 };
 
-
 static inline gunichar
 trie_utf8_getc (const guchar **in, gsize inlen)
 {
@@ -149,8 +147,6 @@ e_trie_free (ETrie *trie)
 	g_free (trie);
 }
 
-
-
 static struct _trie_match *
 g (struct _trie_state *s, gunichar c)
 {
@@ -191,7 +187,6 @@ trie_insert (ETrie *trie, gint depth, struct _trie_state *q, gunichar c)
 	return q;
 }
 
-
 #if 0
 static void
 dump_trie (struct _trie_state *s, gint depth)
@@ -215,7 +210,6 @@ dump_trie (struct _trie_state *s, gint depth)
 }
 #endif
 
-
 /*
  * final = empty set
  * FOR p = 1 TO #pat
diff --git a/libedataserver/e-xml-hash-utils.c b/libedataserver/e-xml-hash-utils.c
index 817fa85..b7d280a 100644
--- a/libedataserver/e-xml-hash-utils.c
+++ b/libedataserver/e-xml-hash-utils.c
@@ -86,7 +86,6 @@ e_xml_to_hash (xmlDoc *doc, EXmlHashType type)
 	return hash;
 }
 
-
 struct save_data {
 	EXmlHashType type;
 	xmlDoc *doc;
@@ -162,7 +161,6 @@ e_xml_destroy_hash (GHashTable *hash)
 	g_hash_table_destroy (hash);
 }
 
-
 /**
  * EXmlHash:
  *
diff --git a/libedataserver/e-xml-hash-utils.h b/libedataserver/e-xml-hash-utils.h
index 69aceb1..39ba3d6 100644
--- a/libedataserver/e-xml-hash-utils.h
+++ b/libedataserver/e-xml-hash-utils.h
@@ -43,8 +43,6 @@ xmlDoc     *e_xml_from_hash    (GHashTable   *hash,
 
 void        e_xml_destroy_hash (GHashTable   *hash);
 
-
-
 /**
  * EXmlHashStatus:
  * @E_XMLHASH_STATUS_SAME: The compared values are the same.
diff --git a/libedataserver/e-xml-utils.c b/libedataserver/e-xml-utils.c
index 3c8abe1..e44f8c9 100644
--- a/libedataserver/e-xml-utils.c
+++ b/libedataserver/e-xml-utils.c
@@ -149,4 +149,3 @@ e_xml_get_child_by_name (const xmlNode *parent, const xmlChar *child_name)
 	return NULL;
 }
 
-
diff --git a/libedataserver/md5-utils.c b/libedataserver/md5-utils.c
index ceb6480..54228b5 100644
--- a/libedataserver/md5-utils.c
+++ b/libedataserver/md5-utils.c
@@ -22,7 +22,6 @@
  * Modified October 1995 by Erik Troan for RPM
  */
 
-
 #include <stdio.h>
 #include <string.h>
 
@@ -31,10 +30,8 @@
 
 #include "md5-utils.h"
 
-
 static void md5_transform (guint32 buf[4], const guint32 in[16]);
 
-
 #if G_BYTE_ORDER == G_BIG_ENDIAN
 /*
  * Note: this code is not required on little-endian machines.
@@ -71,8 +68,6 @@ md5_init (MD5Context *ctx)
 	ctx->bits[1] = 0;
 }
 
-
-
 /**
  * md5_update: add a buffer to md5 hash computation
  * @ctx: context object used for md5 computaion
@@ -131,10 +126,6 @@ md5_update (MD5Context *ctx, const guchar *buf, guint32 len)
 	memcpy (ctx->in, buf, len);
 }
 
-
-
-
-
 /*
  * Final wrapup - pad to 64-byte boundary with the bit pattern
  * 1 0* (64-bit count of bits processed, MSB-first)
@@ -193,9 +184,6 @@ md5_final (MD5Context *ctx, guchar digest[16])
 	memcpy (digest, ctx->buf, 16);
 }
 
-
-
-
 /* The four core functions - F1 is optimized somewhat */
 
 /* #define F1(x, y, z) (x & y | ~x & z) */
@@ -297,9 +285,6 @@ md5_transform (guint32 buf[4], const guint32 in[16])
 	buf[3] += d;
 }
 
-
-
-
 /**
  * md5_get_digest: get the md5 hash of a buffer
  * @buffer: byte buffer
@@ -330,7 +315,6 @@ md5_get_digest (const gchar *buffer, gint buffer_size, guchar digest[16])
 	memcpy (digest, local_digest, length);
 }
 
-
 /**
  * md5_get_digest_from_file: get the md5 hash of a file
  * @filename: file name
diff --git a/libedataserver/md5-utils.h b/libedataserver/md5-utils.h
index 8d7bf7e..68fc6d1 100644
--- a/libedataserver/md5-utils.h
+++ b/libedataserver/md5-utils.h
@@ -22,7 +22,6 @@
  * Modified October 1995 by Erik Troan for RPM
  */
 
-
 #ifndef MD5_UTILS_H
 #define MD5_UTILS_H
 
@@ -46,7 +45,6 @@ typedef struct _MD5Context {
 	guchar in[64];
 } MD5Context;
 
-
 void md5_get_digest (const gchar *buffer, gint buffer_size, guchar digest[16]);
 
 /* use this one when speed is needed */
diff --git a/libedataserver/test-source-list.c b/libedataserver/test-source-list.c
index ab676b4..3192cff 100644
--- a/libedataserver/test-source-list.c
+++ b/libedataserver/test-source-list.c
@@ -33,7 +33,6 @@ static GMainLoop *main_loop = NULL;
 static ESourceList *list = NULL;
 static gint idle_dump_id = 0;
 
-
 /* Options.  */
 
 static gboolean listen = FALSE;
@@ -145,7 +144,6 @@ dump_list (void)
 		dump_group (E_SOURCE_GROUP (p->data));
 }
 
-
 static gint
 idle_dump_callback (gpointer unused_data)
 {
@@ -162,7 +160,6 @@ dump_on_idle (void)
 		idle_dump_id = g_idle_add (idle_dump_callback, NULL);
 }
 
-
 static void
 source_changed_callback (ESource *source)
 {
@@ -193,7 +190,6 @@ list_changed_callback (ESourceGroup *group)
 	dump_on_idle ();
 }
 
-
 static void
 connect_source (ESource *source)
 {
@@ -247,7 +243,6 @@ disconnect_source (ESource *source)
 	g_object_unref (source);
 }
 
-
 static void
 source_added_callback (ESourceGroup *group,
 		       ESource *source)
@@ -296,7 +291,6 @@ group_removed_callback (ESourceList *list,
 	dump_on_idle ();
 }
 
-
 static gint
 on_idle_do_stuff (gpointer unused_data)
 {
@@ -536,7 +530,6 @@ on_idle_do_stuff (gpointer unused_data)
 	return FALSE;
 }
 
-
 gint
 main (gint argc, gchar **argv)
 {
diff --git a/libedataserverui/e-cell-renderer-color.h b/libedataserverui/e-cell-renderer-color.h
index acacfc2..b8e0c8a 100644
--- a/libedataserverui/e-cell-renderer-color.h
+++ b/libedataserverui/e-cell-renderer-color.h
@@ -21,7 +21,6 @@
 #ifndef _E_CELL_RENDERER_COLOR_H_
 #define _E_CELL_RENDERER_COLOR_H_
 
-
 #include <glib.h>
 #include <gtk/gtk.h>
 
diff --git a/libedataserverui/e-name-selector-dialog.c b/libedataserverui/e-name-selector-dialog.c
index 27fb5d4..ddeed10 100644
--- a/libedataserverui/e-name-selector-dialog.c
+++ b/libedataserverui/e-name-selector-dialog.c
@@ -87,7 +87,6 @@ G_DEFINE_TYPE (ENameSelectorDialog, e_name_selector_dialog, GTK_TYPE_DIALOG)
 #define E_NAME_SELECTOR_DIALOG_GET_PRIVATE(obj) \
 	(G_TYPE_INSTANCE_GET_PRIVATE ((obj), E_TYPE_NAME_SELECTOR_DIALOG, ENameSelectorDialogPrivate))
 
-
 static void
 e_name_selector_dialog_get_property (GObject *object, guint prop_id,
 				     GValue *value, GParamSpec *pspec)
@@ -262,7 +261,6 @@ e_name_selector_dialog_init (ENameSelectorDialog *name_selector_dialog)
 
 	/* TODO: Remember last used source */
 
-
 	/* Set up dialog defaults */
 
 	gtk_dialog_add_buttons (GTK_DIALOG (name_selector_dialog),
@@ -850,7 +848,6 @@ contact_activated (ENameSelectorDialog *name_selector_dialog, GtkTreePath *path)
 		return;
 	}
 
-
 	priv = E_NAME_SELECTOR_DIALOG_GET_PRIVATE (name_selector_dialog);
 
 	section = &g_array_index (name_selector_dialog->sections, Section, priv->destination_index);
diff --git a/libedataserverui/e-name-selector-dialog.h b/libedataserverui/e-name-selector-dialog.h
index a095676..143914b 100644
--- a/libedataserverui/e-name-selector-dialog.h
+++ b/libedataserverui/e-name-selector-dialog.h
@@ -87,7 +87,6 @@ void                 e_name_selector_dialog_set_model  (ENameSelectorDialog *nam
 void                 e_name_selector_dialog_set_destination_index (ENameSelectorDialog *name_selector_dialog,
 								   guint                index);
 
-
 G_END_DECLS
 
 #endif /* E_NAME_SELECTOR_DIALOG_H */
diff --git a/libedataserverui/e-name-selector-list.c b/libedataserverui/e-name-selector-list.c
index 058ee3e..b85bf1c 100644
--- a/libedataserverui/e-name-selector-list.c
+++ b/libedataserverui/e-name-selector-list.c
@@ -259,7 +259,6 @@ delete_row (GtkTreePath *path, ENameSelectorList *list)
 	list->rows = e_destination_store_get_destination_count (((ENameSelectorEntry *) list)->destination_store);
 	enl_popup_size (list);
 
-
 }
 
 static void
@@ -482,7 +481,6 @@ enl_tree_button_press_event (GtkWidget *widget,
 
 	return TRUE;
 
-
 }
 
 static gboolean
diff --git a/libedataserverui/e-passwords.c b/libedataserverui/e-passwords.c
index 8bbd8c9..18b8ea8 100644
--- a/libedataserverui/e-passwords.c
+++ b/libedataserverui/e-passwords.c
@@ -852,7 +852,6 @@ ep_get_password_keyring (EPassMsg *msg)
 				continue;
 			}
 
-
 			if (ep_keyring_validate (uri->user, uri->host, uri->protocol, found->attributes)) {
 				msg->password = g_strdup (found->secret);
 				break;
@@ -1236,7 +1235,6 @@ ep_ask_password (EPassMsg *msg)
 			1, 2, 3, 4, GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0);
 	}
 
-
 	msg->noreply = noreply;
 
 	g_signal_connect (password_dialog, "response", G_CALLBACK (pass_response), msg);
@@ -1247,7 +1245,6 @@ ep_ask_password (EPassMsg *msg)
 		gtk_widget_show ((GtkWidget *)password_dialog);
 }
 
-
 /**
  * e_passwords_init:
  *
diff --git a/libedataserverui/e-source-option-menu.c b/libedataserverui/e-source-option-menu.c
index c95f275..f9afc26 100644
--- a/libedataserverui/e-source-option-menu.c
+++ b/libedataserverui/e-source-option-menu.c
@@ -29,7 +29,6 @@
 /* We set data on each menu item specifying the corresponding ESource using this key.  */
 #define MENU_ITEM_SOURCE_DATA_ID	"ESourceOptionMenu:Source"
 
-
 struct _ESourceOptionMenuPrivate {
 	ESourceList *source_list;
 
@@ -91,7 +90,6 @@ select_source (ESourceOptionMenu *menu,
 	g_free (foreach_data);
 }
 
-
 /* Menu callback.  */
 
 static void
@@ -104,7 +102,6 @@ menu_item_activate_callback (GtkMenuItem *menu_item,
 		select_source (option_menu, source);
 }
 
-
 /* Functions to keep the menu in sync with the ESourceList.  */
 
 static void
@@ -190,7 +187,6 @@ populate (ESourceOptionMenu *option_menu)
 	}
 }
 
-
 static void
 source_list_changed_callback (ESourceList *list,
 			      ESourceOptionMenu *menu)
@@ -205,7 +201,6 @@ connect_signals (ESourceOptionMenu *menu)
 				 G_CALLBACK (source_list_changed_callback), G_OBJECT (menu), 0);
 }
 
-
 /* GObject methods.  */
 
 static void
@@ -236,7 +231,6 @@ e_source_option_menu_finalize (GObject *object)
 	(* G_OBJECT_CLASS (e_source_option_menu_parent_class)->finalize) (object);
 }
 
-
 /* Initialization.  */
 
 static void
@@ -268,7 +262,6 @@ e_source_option_menu_init (ESourceOptionMenu *source_option_menu)
 	source_option_menu->priv = priv;
 }
 
-
 /* Public methods.  */
 
 /**
diff --git a/libedataserverui/e-source-option-menu.h b/libedataserverui/e-source-option-menu.h
index 4e84d0b..a14dc7b 100644
--- a/libedataserverui/e-source-option-menu.h
+++ b/libedataserverui/e-source-option-menu.h
@@ -35,7 +35,6 @@
 #define E_IS_SOURCE_OPTION_MENU(obj)			(G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_SOURCE_OPTION_MENU))
 #define E_IS_SOURCE_OPTION_MENU_CLASS(klass)		(G_TYPE_CHECK_CLASS_TYPE ((obj), E_TYPE_SOURCE_OPTION_MENU))
 
-
 typedef struct _ESourceOptionMenu        ESourceOptionMenu;
 typedef struct _ESourceOptionMenuPrivate ESourceOptionMenuPrivate;
 typedef struct _ESourceOptionMenuClass   ESourceOptionMenuClass;
@@ -53,7 +52,6 @@ struct _ESourceOptionMenuClass {
 				  ESource *selected_source);
 };
 
-
 GType  e_source_option_menu_get_type  (void);
 
 GtkWidget *e_source_option_menu_new  (ESourceList *list);
diff --git a/libedataserverui/e-source-selector-dialog.h b/libedataserverui/e-source-selector-dialog.h
index 624d6bf..1db9fe4 100644
--- a/libedataserverui/e-source-selector-dialog.h
+++ b/libedataserverui/e-source-selector-dialog.h
@@ -35,7 +35,6 @@ G_BEGIN_DECLS
 #define E_IS_SOURCE_SELECTOR_DIALOG(obj)		(G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_SOURCE_SELECTOR_DIALOG))
 #define E_IS_SOURCE_SELECTOR_DIALOG_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((obj), E_TYPE_SOURCE_SELECTOR_DIALOG))
 
-
 typedef struct _ESourceSelectorDialog        ESourceSelectorDialog;
 typedef struct _ESourceSelectorDialogPrivate ESourceSelectorDialogPrivate;
 typedef struct _ESourceSelectorDialogClass   ESourceSelectorDialogClass;
diff --git a/libedataserverui/e-source-selector.c b/libedataserverui/e-source-selector.c
index 5ff9b7c..9597f9f 100644
--- a/libedataserverui/e-source-selector.c
+++ b/libedataserverui/e-source-selector.c
@@ -156,7 +156,6 @@ create_rebuild_data (ESourceSelector *selector)
 	return rebuild_data;
 }
 
-
 static void
 free_rebuild_data (ESourceSelectorRebuildData *rebuild_data)
 {
@@ -586,7 +585,6 @@ selection_func (GtkTreeSelection *selection,
 	if (! gtk_tree_model_get_iter (model, &iter, path))
 		return FALSE;
 
-
 	gtk_tree_model_get (model, &iter, 0, &data, -1);
 	if (E_IS_SOURCE_GROUP (data)) {
 		g_object_unref (data);
@@ -600,7 +598,6 @@ selection_func (GtkTreeSelection *selection,
 	return TRUE;
 }
 
-
 /* Callbacks.  */
 
 static void
@@ -1134,7 +1131,6 @@ group_search_function   (GtkTreeModel *model,
 	if (name)
 		status = g_ascii_strncasecmp (name, key, strlen(key)) != 0;
 
-
 	g_object_unref (data);
 
 	return status;
@@ -1200,7 +1196,6 @@ e_source_selector_init (ESourceSelector *selector)
 	g_signal_connect (G_OBJECT (selector), "row-expanded", G_CALLBACK (row_expanded_callback), selector);
 }
 
-
 /* Public API.  */
 
 /**
@@ -1309,7 +1304,6 @@ e_source_selector_free_selection (GSList *list)
 	g_slist_free (list);
 }
 
-
 /**
  * e_source_selector_show_selection:
  * @selector: An ESourceSelector widget
diff --git a/libedataserverui/e-source-selector.h b/libedataserverui/e-source-selector.h
index 80bc115..4304013 100644
--- a/libedataserverui/e-source-selector.h
+++ b/libedataserverui/e-source-selector.h
@@ -35,7 +35,6 @@ G_BEGIN_DECLS
 #define E_IS_SOURCE_SELECTOR(obj)		(G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_SOURCE_SELECTOR))
 #define E_IS_SOURCE_SELECTOR_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((obj), E_TYPE_SOURCE_SELECTOR))
 
-
 typedef struct _ESourceSelector        ESourceSelector;
 typedef struct _ESourceSelectorPrivate ESourceSelectorPrivate;
 typedef struct _ESourceSelectorClass   ESourceSelectorClass;
@@ -66,7 +65,6 @@ struct _ESourceSelectorClass {
 	gpointer padding3;
 };
 
-
 GType  e_source_selector_get_type  (void);
 
 GtkWidget *e_source_selector_new  (ESourceList *list);
diff --git a/libedataserverui/test-source-combo-box.c b/libedataserverui/test-source-combo-box.c
index 813782c..6d3044b 100644
--- a/libedataserverui/test-source-combo-box.c
+++ b/libedataserverui/test-source-combo-box.c
@@ -37,7 +37,6 @@ source_changed_cb (ESourceComboBox *combo_box)
 	g_print ("source selected: \"%s\"\n", e_source_peek_name (source));
 }
 
-
 static gint
 on_idle_create_widget (const gchar *gconf_path)
 {
@@ -64,7 +63,6 @@ on_idle_create_widget (const gchar *gconf_path)
 	return FALSE;
 }
 
-
 gint
 main (gint argc, gchar **argv)
 {
diff --git a/libedataserverui/test-source-selector.c b/libedataserverui/test-source-selector.c
index 93cc942..70833e2 100644
--- a/libedataserverui/test-source-selector.c
+++ b/libedataserverui/test-source-selector.c
@@ -107,7 +107,6 @@ on_idle_create_widget (const gchar *gconf_path)
 	return FALSE;
 }
 
-
 gint
 main (gint argc, gchar **argv)
 {
diff --git a/servers/exchange/lib/e2k-action.c b/servers/exchange/lib/e2k-action.c
index 889ae82..6662f34 100644
--- a/servers/exchange/lib/e2k-action.c
+++ b/servers/exchange/lib/e2k-action.c
@@ -267,7 +267,6 @@ e2k_action_delete (void)
 	return act;
 }
 
-
 /**
  * e2k_addr_list_new:
  * @nentries: the number of entries
diff --git a/servers/exchange/lib/e2k-action.h b/servers/exchange/lib/e2k-action.h
index 1679f51..ae7ccc2 100644
--- a/servers/exchange/lib/e2k-action.h
+++ b/servers/exchange/lib/e2k-action.h
@@ -36,7 +36,6 @@ E2kAction   *e2k_action_delete         (void);
 void         e2k_actions_free          (GPtrArray	     *actions);
 void         e2k_action_free           (E2kAction            *act);
 
-
 E2kAddrList *e2k_addr_list_new         (gint		      nentries);
 void         e2k_addr_list_set_local   (E2kAddrList	     *list,
 					gint		      entry_num,
diff --git a/servers/exchange/lib/e2k-autoconfig.c b/servers/exchange/lib/e2k-autoconfig.c
index b9a2cbd..f277e2a 100644
--- a/servers/exchange/lib/e2k-autoconfig.c
+++ b/servers/exchange/lib/e2k-autoconfig.c
@@ -792,7 +792,6 @@ e2k_autoconfig_check_exchange (E2kAutoconfig *ac, E2kOperation *op)
 	return ac->exchange_dn ? E2K_AUTOCONFIG_OK : E2K_AUTOCONFIG_FAILED;
 }
 
-
 /* FIXME: make this cancellable */
 static void
 find_global_catalog (E2kAutoconfig *ac)
@@ -1043,7 +1042,6 @@ set_account_uri_string (E2kAutoconfig *ac)
 	e2k_uri_free (owa_uri);
 }
 
-
 /* Approximate mapping from Exchange timezones to Olson ones. Exchange
  * is less specific, so we factor in the language/country info from
  * the locale in our guess.
@@ -1386,7 +1384,6 @@ find_olson_timezone (const gchar *windows_timezone)
 	return g_strdup (zonemap[i - 1].olson_name);
 }
 
-
 /* Config file handling */
 
 static GHashTable *config_options;
@@ -1685,7 +1682,6 @@ e2k_validate_user (const gchar *owa_url, gchar *pkey, gchar **user,
 try_auth_again:
 	username = g_strdup (*user);
 
-
 	password = e_passwords_get_password ("Exchange", key);
 	if (password) {
 		/* This can be the case, where user presses authenticate button and
diff --git a/servers/exchange/lib/e2k-autoconfig.h b/servers/exchange/lib/e2k-autoconfig.h
index a211ee8..bf9d5b9 100644
--- a/servers/exchange/lib/e2k-autoconfig.h
+++ b/servers/exchange/lib/e2k-autoconfig.h
@@ -74,7 +74,6 @@ E2kGlobalCatalog    *e2k_autoconfig_get_global_catalog   (E2kAutoconfig *ac,
 E2kAutoconfigResult  e2k_autoconfig_check_global_catalog (E2kAutoconfig *ac,
 							  E2kOperation *op);
 
-
 const gchar          *e2k_autoconfig_lookup_option        (const gchar *option);
 
 G_END_DECLS
diff --git a/servers/exchange/lib/e2k-context.c b/servers/exchange/lib/e2k-context.c
index b2a8083..6e5bc68 100644
--- a/servers/exchange/lib/e2k-context.c
+++ b/servers/exchange/lib/e2k-context.c
@@ -131,7 +131,6 @@ static gboolean do_notification (GIOChannel *source, GIOCondition condition, gpo
 static void setup_message (SoupSession *session, SoupMessage *msg, SoupSocket *socket, gpointer user_data);
 static void proxy_settings_changed (EProxy *proxy, gpointer user_data);
 
-
 static void
 proxy_settings_changed (EProxy *proxy, gpointer user_data)
 {
@@ -256,7 +255,6 @@ class_init (GObjectClass *object_class)
 
 E2K_MAKE_TYPE (e2k_context, E2kContext, class_init, init, PARENT_TYPE)
 
-
 static void
 renew_sub_list (gpointer key, gpointer value, gpointer data)
 {
@@ -931,7 +929,6 @@ e2k_context_send_message (E2kContext *ctx, E2kOperation *op, SoupMessage *msg)
 	return status;
 }
 
-
 static void
 update_unique_uri (E2kContext *ctx, SoupMessage *msg,
 		   const gchar *folder_uri, const gchar *encoded_name, gint *count,
@@ -958,7 +955,6 @@ update_unique_uri (E2kContext *ctx, SoupMessage *msg,
 	g_free (uri);
 }
 
-
 /* GET */
 
 static SoupMessage *
@@ -1997,8 +1993,6 @@ e2k_context_search_start (E2kContext *ctx, E2kOperation *op, const gchar *uri,
 				    search_data);
 }
 
-
-
 /* DELETE */
 
 static SoupMessage *
@@ -2357,7 +2351,6 @@ e2k_context_transfer_dir (E2kContext *ctx, E2kOperation *op,
 	return status;
 }
 
-
 /* Subscriptions */
 
 typedef struct {
diff --git a/servers/exchange/lib/e2k-context.h b/servers/exchange/lib/e2k-context.h
index ddc36b5..e722d58 100644
--- a/servers/exchange/lib/e2k-context.h
+++ b/servers/exchange/lib/e2k-context.h
@@ -187,7 +187,6 @@ void          e2k_context_subscribe          (E2kContext *ctx,
 void          e2k_context_unsubscribe        (E2kContext *ctx,
 					      const gchar *uri);
 
-
 /*
  * Utility functions
  */
diff --git a/servers/exchange/lib/e2k-global-catalog.c b/servers/exchange/lib/e2k-global-catalog.c
index 4d51089..b5b04c9 100644
--- a/servers/exchange/lib/e2k-global-catalog.c
+++ b/servers/exchange/lib/e2k-global-catalog.c
@@ -58,7 +58,6 @@ static GObjectClass *parent_class = NULL;
 static void finalize (GObject *);
 static gint get_gc_connection (E2kGlobalCatalog *gc, E2kOperation *op);
 
-
 static void
 class_init (GObjectClass *object_class)
 {
@@ -166,7 +165,6 @@ finalize (GObject *object)
 	G_OBJECT_CLASS (parent_class)->finalize (object);
 }
 
-
 E2K_MAKE_TYPE (e2k_global_catalog, E2kGlobalCatalog, class_init, init, PARENT_TYPE)
 
 static gint
@@ -531,7 +529,6 @@ lookup_mta (E2kGlobalCatalog *gc, E2kOperation *op, const gchar *mta_dn)
 	return hostname;
 }
 
-
 static void
 get_sid_values (E2kGlobalCatalog *gc, E2kOperation *op,
 		LDAPMessage *msg, E2kGlobalCatalogEntry *entry)
@@ -878,7 +875,6 @@ e2k_global_catalog_lookup (E2kGlobalCatalog *gc,
 	return status;
 }
 
-
 struct async_lookup_data {
 	E2kGlobalCatalog *gc;
 	E2kOperation *op;
diff --git a/servers/exchange/lib/e2k-global-catalog.h b/servers/exchange/lib/e2k-global-catalog.h
index abd7d98..096f81f 100644
--- a/servers/exchange/lib/e2k-global-catalog.h
+++ b/servers/exchange/lib/e2k-global-catalog.h
@@ -39,7 +39,6 @@ E2kGlobalCatalog *e2k_global_catalog_new             (const gchar *server,
 						      const gchar *password,
 						      E2kAutoconfigGalAuthPref use_auth);
 
-
 typedef enum {
 	E2K_GLOBAL_CATALOG_OK,
 	E2K_GLOBAL_CATALOG_NO_SUCH_USER,
@@ -102,7 +101,6 @@ void             e2k_global_catalog_async_lookup (E2kGlobalCatalog *gc,
 gdouble		lookup_passwd_max_age (E2kGlobalCatalog *gc,
 				      E2kOperation *op);
 
-
 #define e2k_global_catalog_entry_free(gc, entry)
 
 E2kGlobalCatalogStatus e2k_global_catalog_add_delegate    (E2kGlobalCatalog *gc,
diff --git a/servers/exchange/lib/e2k-operation.c b/servers/exchange/lib/e2k-operation.c
index d164777..4046773 100644
--- a/servers/exchange/lib/e2k-operation.c
+++ b/servers/exchange/lib/e2k-operation.c
@@ -68,7 +68,6 @@ e2k_operation_free (E2kOperation *op)
 	g_static_mutex_unlock (&op_mutex);
 }
 
-
 /**
  * e2k_operation_start:
  * @op: an #E2kOperation, or %NULL
@@ -128,7 +127,6 @@ e2k_operation_finish (E2kOperation *op)
 	g_static_mutex_unlock (&op_mutex);
 }
 
-
 /**
  * e2k_operation_cancel:
  * @op: an #E2kOperation
diff --git a/servers/exchange/lib/e2k-operation.h b/servers/exchange/lib/e2k-operation.h
index 5979289..51552ed 100644
--- a/servers/exchange/lib/e2k-operation.h
+++ b/servers/exchange/lib/e2k-operation.h
@@ -30,7 +30,6 @@ void     e2k_operation_start          (E2kOperation           *op,
 				       gpointer                data);
 void     e2k_operation_finish         (E2kOperation           *op);
 
-
 void     e2k_operation_cancel         (E2kOperation           *op);
 gboolean e2k_operation_is_cancelled   (E2kOperation           *op);
 
diff --git a/servers/exchange/lib/e2k-path.c b/servers/exchange/lib/e2k-path.c
index 9c650e6..188c905 100644
--- a/servers/exchange/lib/e2k-path.c
+++ b/servers/exchange/lib/e2k-path.c
@@ -123,7 +123,6 @@ e_path_to_physical (const gchar *prefix, const gchar *vpath)
 	return ppath;
 }
 
-
 static gboolean
 find_folders_recursive (const gchar *physical_path, const gchar *path,
 			EPathFindFoldersCallback callback, gpointer data)
@@ -205,7 +204,6 @@ e_path_find_folders (const gchar *prefix,
 	return find_folders_recursive (prefix, "", callback, data);
 }
 
-
 /**
  * e_path_rmdir:
  * @prefix: a prefix to prepend to the path, or %NULL
diff --git a/servers/exchange/lib/e2k-properties.c b/servers/exchange/lib/e2k-properties.c
index 9370e5d..44ddfa4 100644
--- a/servers/exchange/lib/e2k-properties.c
+++ b/servers/exchange/lib/e2k-properties.c
@@ -262,7 +262,6 @@ e2k_properties_empty (E2kProperties *props)
 	return g_hash_table_size (props->set) == 0;
 }
 
-
 extern gchar e2k_des_key[8];
 
 static E2kPropInfo *
@@ -423,8 +422,6 @@ E2K_PROPERTIES_SETTER (float, float, FLOAT, g_strdup_printf ("%f", value))
 E2K_PROPERTIES_SETTER (bool, gboolean, BOOL, g_strdup_printf ("%d", value != FALSE))
 E2K_PROPERTIES_SETTER (date, gchar *, DATE, value)
 
-
-
 /**
  * e2k_properties_set_type_as_string:
  * @props: an #E2kProperties
@@ -638,7 +635,6 @@ e2k_properties_foreach_namespace (E2kProperties *props,
 	g_hash_table_destroy (fnd.seen_namespaces);
 }
 
-
 static GHashTable *namespaces;
 static gint next_namespace = 'a';
 static GStaticMutex namespaces_lock = G_STATIC_MUTEX_INIT;
diff --git a/servers/exchange/lib/e2k-properties.h b/servers/exchange/lib/e2k-properties.h
index b3dfd50..7f8df28 100644
--- a/servers/exchange/lib/e2k-properties.h
+++ b/servers/exchange/lib/e2k-properties.h
@@ -79,7 +79,6 @@ void           e2k_properties_set_type_as_string_array (E2kProperties *props,
 void           e2k_properties_remove            (E2kProperties *props,
 						 const gchar    *propname);
 
-
 typedef void (*E2kPropertiesForeachFunc)        (const gchar    *propname,
 						 E2kPropType    type,
 						 gpointer       value,
@@ -91,7 +90,6 @@ void           e2k_properties_foreach_removed   (E2kProperties *props,
 						 E2kPropertiesForeachFunc callback,
 						 gpointer       user_data);
 
-
 typedef void(*E2kPropertiesForeachNamespaceFunc)(const gchar    *namespace,
 						 gchar           abbrev,
 						 gpointer       user_data);
diff --git a/servers/exchange/lib/e2k-restriction.c b/servers/exchange/lib/e2k-restriction.c
index da7ab04..f8a6c67 100644
--- a/servers/exchange/lib/e2k-restriction.c
+++ b/servers/exchange/lib/e2k-restriction.c
@@ -534,7 +534,6 @@ e2k_restriction_ref (E2kRestriction *rn)
 	rn->ref_count++;
 }
 
-
 /* SQL export */
 
 static gboolean rn_to_sql (E2kRestriction *rn, GString *sql, E2kRestrictionType inside);
@@ -731,7 +730,6 @@ e2k_restriction_to_sql (E2kRestriction *rn)
 	return ret;
 }
 
-
 /* Binary import/export */
 
 static gboolean
diff --git a/servers/exchange/lib/e2k-result.c b/servers/exchange/lib/e2k-result.c
index e7b7cf3..12be98a 100644
--- a/servers/exchange/lib/e2k-result.c
+++ b/servers/exchange/lib/e2k-result.c
@@ -370,7 +370,6 @@ e2k_results_array_free (GArray *results_array, gboolean free_results)
 	g_array_free (results_array, FALSE);
 }
 
-
 /**
  * e2k_results_from_multistatus:
  * @msg: a 207 Multi-Status response
@@ -441,7 +440,6 @@ e2k_results_free (E2kResult *results, gint nresults)
 	g_free (results);
 }
 
-
 /* Iterators */
 struct E2kResultIter {
 	E2kContext *ctx;
diff --git a/servers/exchange/lib/e2k-result.h b/servers/exchange/lib/e2k-result.h
index 2140dda..20c418a 100644
--- a/servers/exchange/lib/e2k-result.h
+++ b/servers/exchange/lib/e2k-result.h
@@ -25,7 +25,6 @@ E2kResult *e2k_results_copy                       (E2kResult    *results,
 void       e2k_results_free                       (E2kResult    *results,
 						   gint           nresults);
 
-
 GArray    *e2k_results_array_new                  (void);
 
 void       e2k_results_array_add_from_multistatus (GArray       *results_array,
@@ -34,7 +33,6 @@ void       e2k_results_array_add_from_multistatus (GArray       *results_array,
 void       e2k_results_array_free                 (GArray       *results_array,
 						   gboolean      free_results);
 
-
 typedef struct E2kResultIter E2kResultIter;
 
 typedef E2kHTTPStatus (*E2kResultIterFetchFunc) (E2kResultIter *iter,
diff --git a/servers/exchange/lib/e2k-rule-xml.c b/servers/exchange/lib/e2k-rule-xml.c
index 3cd3735..4ccda13 100644
--- a/servers/exchange/lib/e2k-rule-xml.c
+++ b/servers/exchange/lib/e2k-rule-xml.c
@@ -657,7 +657,6 @@ restriction_to_xml (E2kRestriction *rn, xmlNode *partset,
 	return TRUE;
 }
 
-
 static gchar *
 stringify_entryid (guint8 *data, gint len)
 {
diff --git a/servers/exchange/lib/e2k-rule.c b/servers/exchange/lib/e2k-rule.c
index 62a1681..c025636 100644
--- a/servers/exchange/lib/e2k-rule.c
+++ b/servers/exchange/lib/e2k-rule.c
@@ -402,7 +402,6 @@ e2k_rule_extract_proptag (guint8 **ptr, gint *len, E2kRuleProp *prop)
 	return TRUE;
 }
 
-
 /**
  * e2k_rule_append_propvalue:
  * @ba: a byte array containing a binary rule
@@ -530,7 +529,6 @@ e2k_rule_free_propvalue (E2kPropValue *pv)
 		g_byte_array_free (pv->value, TRUE);
 }
 
-
 /**
  * e2k_rule_free:
  * @rule: an #E2kRule
diff --git a/servers/exchange/lib/e2k-security-descriptor.c b/servers/exchange/lib/e2k-security-descriptor.c
index 0174be7..abf2342 100644
--- a/servers/exchange/lib/e2k-security-descriptor.c
+++ b/servers/exchange/lib/e2k-security-descriptor.c
@@ -176,7 +176,6 @@ dispose (GObject *object)
 
 E2K_MAKE_TYPE (e2k_security_descriptor, E2kSecurityDescriptor, class_init, init, PARENT_TYPE)
 
-
 /* This determines the relative ordering of any two ACEs in a SID.
  * See docs/security for details.
  */
@@ -275,7 +274,6 @@ ace_compar (E2k_ACE *ace1, E2k_ACE *ace2, E2kSecurityDescriptor *sd)
 	}
 }
 
-
 static xmlNode *
 find_child (xmlNode *node, const xmlChar *name)
 {
@@ -837,7 +835,6 @@ e2k_security_descriptor_set_permissions (E2kSecurityDescriptor *sd,
 	}
 }
 
-
 static struct {
 	const gchar *name;
 	guint32 perms;
diff --git a/servers/exchange/lib/e2k-security-descriptor.h b/servers/exchange/lib/e2k-security-descriptor.h
index 15fff71..4283391 100644
--- a/servers/exchange/lib/e2k-security-descriptor.h
+++ b/servers/exchange/lib/e2k-security-descriptor.h
@@ -35,7 +35,6 @@ E2kSid                *e2k_security_descriptor_get_default   (E2kSecurityDescrip
 void                   e2k_security_descriptor_remove_sid    (E2kSecurityDescriptor *sd,
 							      E2kSid                *sid);
 
-
 /* MAPI folder permissions */
 #define E2K_PERMISSION_READ_ANY         0x001
 #define E2K_PERMISSION_CREATE           0x002
diff --git a/servers/exchange/lib/e2k-sid.c b/servers/exchange/lib/e2k-sid.c
index bf96e0c..53c8df6 100644
--- a/servers/exchange/lib/e2k-sid.c
+++ b/servers/exchange/lib/e2k-sid.c
@@ -273,7 +273,6 @@ e2k_sid_get_display_name (E2kSid *sid)
 	return sid->priv->display_name;
 }
 
-
 /**
  * e2k_sid_binary_sid_equal:
  * @a: pointer to a binary SID
diff --git a/servers/exchange/lib/e2k-sid.h b/servers/exchange/lib/e2k-sid.h
index 777dcdb..ac17e3c 100644
--- a/servers/exchange/lib/e2k-sid.h
+++ b/servers/exchange/lib/e2k-sid.h
@@ -64,6 +64,5 @@ gint          e2k_sid_binary_sid_equal    (gconstpointer  a,
 #define E2K_SID_WKS_ANONYMOUS      "S-1-5-7"
 #define E2K_SID_WKS_ANONYMOUS_NAME "Anonymous"
 
-
 #endif
 
diff --git a/servers/exchange/lib/e2k-uri.c b/servers/exchange/lib/e2k-uri.c
index 4b584d3..93c0f2a 100644
--- a/servers/exchange/lib/e2k-uri.c
+++ b/servers/exchange/lib/e2k-uri.c
@@ -214,7 +214,6 @@ e2k_uri_get_param (E2kUri *uri, const gchar *name)
 	return g_datalist_get_data (&uri->params, name);
 }
 
-
 #define HEXVAL(c) (isdigit (c) ? (c) - '0' : g_ascii_tolower (c) - 'a' + 10)
 
 /**
diff --git a/servers/exchange/lib/e2k-uri.h b/servers/exchange/lib/e2k-uri.h
index 27d0293..5df234d 100644
--- a/servers/exchange/lib/e2k-uri.h
+++ b/servers/exchange/lib/e2k-uri.h
@@ -20,7 +20,6 @@ typedef struct {
 	gchar  *fragment;
 } E2kUri;
 
-
 E2kUri *    e2k_uri_new       (const gchar *uri_string);
 void        e2k_uri_free      (E2kUri *uri);
 const gchar *e2k_uri_get_param (E2kUri *uri, const gchar *name);
diff --git a/servers/exchange/lib/e2k-validate.h b/servers/exchange/lib/e2k-validate.h
index cb13921..e0b5c7d 100644
--- a/servers/exchange/lib/e2k-validate.h
+++ b/servers/exchange/lib/e2k-validate.h
@@ -50,7 +50,6 @@ gboolean e2k_validate_user (const gchar *owa_url, gchar *key, gchar **user,
 			    E2kAutoconfigResult *result,
 			    GtkWindow *parent);
 
-
 G_END_DECLS
 
 #endif /* __EXCHANGE_VALIDATE_H_ */
diff --git a/servers/exchange/lib/ebrowse.c b/servers/exchange/lib/ebrowse.c
index caa6e5d..7f14028 100644
--- a/servers/exchange/lib/ebrowse.c
+++ b/servers/exchange/lib/ebrowse.c
@@ -273,7 +273,6 @@ got_all_properties (SoupMessage *msg, gpointer ctx)
 	e2k_results_free (results, nresults);
 }
 
-
 #define ALL_PROPS \
 "<?xml version=\"1.0\" encoding=\"utf-8\" ?>" \
 "<propfind xmlns=\"DAV:\" xmlns:e=\"http://schemas.microsoft.com/exchange/\";>" \
@@ -333,7 +332,6 @@ get_fav_properties(E2kContext *ctx, gchar *uri)
 	gint status;
 	gchar *eml_str, *top = uri, fav_uri[1024];
 
-
 	/* list the contents and search for the favorite properties */
 	e2k_operation_init (&op);
 	prop = E2K_PR_DAV_DISPLAY_NAME;
diff --git a/servers/exchange/lib/gctest.c b/servers/exchange/lib/gctest.c
index bd3d0b0..c3c80df 100644
--- a/servers/exchange/lib/gctest.c
+++ b/servers/exchange/lib/gctest.c
@@ -118,7 +118,6 @@ do_lookup (E2kGlobalCatalog *gc, const gchar *user)
 	if (entry->user_account_control)
 		printf ("    user_account_control : %d\n", entry->user_account_control);
 
-
 	maxAge = lookup_passwd_max_age (gc, &op);
 	printf("Password max age is %f \n", maxAge);
 	pwd_exp_days = (maxAge * 0.000000100)/86400;
diff --git a/servers/exchange/lib/test-utils.h b/servers/exchange/lib/test-utils.h
index df8be68..0a62574 100644
--- a/servers/exchange/lib/test-utils.h
+++ b/servers/exchange/lib/test-utils.h
@@ -18,7 +18,6 @@ E2kGlobalCatalog *test_get_gc              (const gchar     *server);
 
 void              test_abort_if_http_error (E2kHTTPStatus   status);
 
-
 /* lower-level util */
 gchar             *test_ask_password        (const gchar     *prompt);
 
diff --git a/servers/exchange/storage/e-folder-exchange.c b/servers/exchange/storage/e-folder-exchange.c
index a56ddd4..a22f8e3 100644
--- a/servers/exchange/storage/e-folder-exchange.c
+++ b/servers/exchange/storage/e-folder-exchange.c
@@ -339,7 +339,6 @@ e_folder_exchange_set_folder_size (EFolder *folder, gint64 folder_size)
 	efe->priv->folder_size = folder_size;
 }
 
-
 /**
  * e_folder_exchange_get_has_subfolders:
  * @folder: an #EFolderExchange
@@ -459,7 +458,6 @@ e_folder_exchange_get_storage_file (EFolder *folder, const gchar *filename)
 	return path;
 }
 
-
 /**
  * e_folder_exchange_save_to_file:
  * @folder: the folder
@@ -646,8 +644,6 @@ e_folder_exchange_new_from_file (ExchangeHierarchy *hier, const gchar *filename)
 	return folder;
 }
 
-
-
 /* E2kContext wrappers */
 #define E_FOLDER_EXCHANGE_CONTEXT(efe) (exchange_account_get_context (((EFolderExchange *)efe)->priv->hier->account))
 #define E_FOLDER_EXCHANGE_URI(efe) (((EFolderExchange *)efe)->priv->internal_uri)
diff --git a/servers/exchange/storage/e-folder-exchange.h b/servers/exchange/storage/e-folder-exchange.h
index 3c703cb..975270e 100644
--- a/servers/exchange/storage/e-folder-exchange.h
+++ b/servers/exchange/storage/e-folder-exchange.h
@@ -41,7 +41,6 @@ EFolder    *e_folder_exchange_new_from_file (ExchangeHierarchy     *hier,
 gboolean    e_folder_exchange_save_to_file  (EFolder               *folder,
 					     const gchar            *filename);
 
-
 const gchar *e_folder_exchange_get_internal_uri     (EFolder    *folder);
 void        e_folder_exchange_set_internal_uri     (EFolder    *folder,
 						    const gchar *internal_uri);
@@ -70,7 +69,6 @@ gchar       *e_folder_exchange_get_storage_file     (EFolder    *folder,
 
 ExchangeHierarchy *e_folder_exchange_get_hierarchy (EFolder    *folder);
 
-
 /* E2kContext wrappers */
 E2kHTTPStatus  e_folder_exchange_propfind          (EFolder *folder,
 						    E2kOperation *op,
@@ -100,7 +98,6 @@ void           e_folder_exchange_subscribe         (EFolder *folder,
 						    gpointer user_data);
 void           e_folder_exchange_unsubscribe       (EFolder *folder);
 
-
 E2kResultIter *e_folder_exchange_transfer_start    (EFolder *source,
 						    E2kOperation *op,
 						    EFolder *dest,
@@ -151,7 +148,6 @@ E2kHTTPStatus  e_folder_exchange_transfer_dir      (EFolder *source,
 						    gboolean delete_original,
 						    gchar **permanent_url);
 
-
 G_END_DECLS
 
 #endif /* __E_FOLDER_EXCHANGE_H__ */
diff --git a/servers/exchange/storage/e-folder-tree.c b/servers/exchange/storage/e-folder-tree.c
index f4491f3..1fa2491 100644
--- a/servers/exchange/storage/e-folder-tree.c
+++ b/servers/exchange/storage/e-folder-tree.c
@@ -429,7 +429,6 @@ e_folder_tree_foreach (EFolderTree *folder_tree,
 	traverse_subtree (folder_tree, root_node, foreach_func, data);
 }
 
-
 /**
  * e_folder_tree_get_path_for_data:
  * @folder_tree: A pointer to an EFolderTree
diff --git a/servers/exchange/storage/e-folder-type-registry.h b/servers/exchange/storage/e-folder-type-registry.h
index 9f83d04..beede01 100644
--- a/servers/exchange/storage/e-folder-type-registry.h
+++ b/servers/exchange/storage/e-folder-type-registry.h
@@ -84,7 +84,6 @@ const gchar                    *e_folder_type_registry_get_description_for_type
 GList *e_folder_type_registry_get_accepted_dnd_types_for_type (EFolderTypeRegistry *folder_type_registry,
 							       const gchar *type_name);
 
-
 G_END_DECLS
 
 #endif /* _E_FOLDER_TYPE_REGISTRY_H_ */
diff --git a/servers/exchange/storage/e-folder.c b/servers/exchange/storage/e-folder.c
index 1550cf6..7413530 100644
--- a/servers/exchange/storage/e-folder.c
+++ b/servers/exchange/storage/e-folder.c
@@ -79,7 +79,6 @@ accept_drop (EFolder *folder, GdkDragContext *context,
 	return FALSE;
 }
 
-
 /* GObject methods.  */
 
 static void
diff --git a/servers/exchange/storage/exchange-account.c b/servers/exchange/storage/exchange-account.c
index a973c77..ab6f077 100644
--- a/servers/exchange/storage/exchange-account.c
+++ b/servers/exchange/storage/exchange-account.c
@@ -307,10 +307,8 @@ finalize (GObject *object)
 	G_OBJECT_CLASS (parent_class)->finalize (object);
 }
 
-
 E2K_MAKE_TYPE (exchange_account, ExchangeAccount, class_init, init, PARENT_TYPE)
 
-
 void
 exchange_account_rescan_tree (ExchangeAccount *account)
 {
@@ -910,8 +908,6 @@ static const gchar *mailbox_info_props[] = {
 };
 static const gint n_mailbox_info_props = G_N_ELEMENTS (mailbox_info_props);
 
-
-
 static gboolean
 account_moved (ExchangeAccount *account, E2kAutoconfig *ac)
 {
@@ -1172,7 +1168,6 @@ exchange_account_is_save_password (ExchangeAccount *account)
 	return account->priv->account->source->save_passwd;
 }
 
-
 /**
  * exchange_account_set_offline:
  * @account: an #ExchangeAccount
@@ -1937,7 +1932,6 @@ struct _folders_tree {
 	GPtrArray *folders;
 };
 
-
 static void
 add_folder (gpointer key, gpointer value, gpointer folders)
 {
@@ -2207,7 +2201,6 @@ exchange_account_get_authtype (ExchangeAccount *account)
 	return NULL;
 }
 
-
 /**
  * exchange_account_new:
  * @adata: an #EAccount
diff --git a/servers/exchange/storage/exchange-account.h b/servers/exchange/storage/exchange-account.h
index 9a6a209..364d6fa 100644
--- a/servers/exchange/storage/exchange-account.h
+++ b/servers/exchange/storage/exchange-account.h
@@ -131,7 +131,6 @@ void		       exchange_account_is_offline           (ExchangeAccount  *account,
 void		       exchange_account_is_offline_sync_set  (ExchangeAccount *account,
 							      gint             *mode);
 
-
 typedef enum {
 	EXCHANGE_ACCOUNT_FOLDER_OK,
 	EXCHANGE_ACCOUNT_FOLDER_ALREADY_EXISTS,
@@ -198,7 +197,6 @@ GtkListStore	       *exchange_account_folder_size_get_model (ExchangeAccount *ac
 void			exchange_account_scan_foreign_hierarchy (ExchangeAccount *account,
 							      const gchar *user_email);
 
-
 G_END_DECLS
 
 #endif /* __EXCHANGE_ACCOUNT_H__ */
diff --git a/servers/exchange/storage/exchange-constants.h b/servers/exchange/storage/exchange-constants.h
index acb8299..4a928ab 100644
--- a/servers/exchange/storage/exchange-constants.h
+++ b/servers/exchange/storage/exchange-constants.h
@@ -4,7 +4,6 @@
 #ifndef __EXCHANGE_CONSTANTS_H__
 #define __EXCHANGE_CONSTANTS_H__
 
-
 enum {
 	UNSUPPORTED_MODE = 0,
         OFFLINE_MODE,
diff --git a/servers/exchange/storage/exchange-folder-size.c b/servers/exchange/storage/exchange-folder-size.c
index b0c7b75..5b87241 100644
--- a/servers/exchange/storage/exchange-folder-size.c
+++ b/servers/exchange/storage/exchange-folder-size.c
@@ -42,7 +42,6 @@ typedef struct {
         gdouble folder_size;
 } folder_info;
 
-
 struct _ExchangeFolderSizePrivate {
 
 	GHashTable *table;
diff --git a/servers/exchange/storage/exchange-folder-size.h b/servers/exchange/storage/exchange-folder-size.h
index 6b89f37..2d5abd4 100644
--- a/servers/exchange/storage/exchange-folder-size.h
+++ b/servers/exchange/storage/exchange-folder-size.h
@@ -16,7 +16,6 @@ G_BEGIN_DECLS
 #define EXCHANGE_IS_FOLDER_SIZE(obj)			(G_TYPE_CHECK_INSTANCE_TYPE ((obj), EXCHANGE_TYPE_FOLDER_SIZE))
 #define EXCHANGE_IS_FOLDER_SIZE_CLASS(klass)		(G_TYPE_CHECK_CLASS_TYPE ((obj), EXCHANGE_TYPE_FOLDER_SIZE))
 
-
 typedef struct _ExchangeFolderSize        ExchangeFolderSize;
 typedef struct _ExchangeFolderSizePrivate ExchangeFolderSizePrivate;
 typedef struct _ExchangeFolderSizeClass   ExchangeFolderSizeClass;
diff --git a/servers/exchange/storage/exchange-hierarchy-foreign.c b/servers/exchange/storage/exchange-hierarchy-foreign.c
index b0bfb76..69bf785 100644
--- a/servers/exchange/storage/exchange-hierarchy-foreign.c
+++ b/servers/exchange/storage/exchange-hierarchy-foreign.c
@@ -334,7 +334,6 @@ create_internal (ExchangeHierarchy *hier, EFolder *parent,
 	return result;
 }
 
-
 static ExchangeAccountFolderResult
 create_folder (ExchangeHierarchy *hier, EFolder *parent,
 	       const gchar *name, const gchar *type)
diff --git a/servers/exchange/storage/exchange-hierarchy-gal.c b/servers/exchange/storage/exchange-hierarchy-gal.c
index 308fe89..32b8443 100644
--- a/servers/exchange/storage/exchange-hierarchy-gal.c
+++ b/servers/exchange/storage/exchange-hierarchy-gal.c
@@ -37,7 +37,6 @@
 
 E2K_MAKE_TYPE (exchange_hierarchy_gal, ExchangeHierarchyGAL, NULL, NULL, PARENT_TYPE)
 
-
 ExchangeHierarchy *
 exchange_hierarchy_gal_new (ExchangeAccount *account,
 			    const gchar *hierarchy_name,
diff --git a/servers/exchange/storage/exchange-hierarchy-somedav.c b/servers/exchange/storage/exchange-hierarchy-somedav.c
index 4f39bf5..8b93336 100644
--- a/servers/exchange/storage/exchange-hierarchy-somedav.c
+++ b/servers/exchange/storage/exchange-hierarchy-somedav.c
@@ -102,7 +102,6 @@ finalize (GObject *object)
 
 E2K_MAKE_TYPE (exchange_hierarchy_somedav, ExchangeHierarchySomeDAV, class_init, init, PARENT_TYPE)
 
-
 static inline gboolean
 folder_is_unreadable (E2kProperties *props)
 {
@@ -194,7 +193,6 @@ scan_subtree (ExchangeHierarchy *hier, EFolder *folder, gint mode)
 	return folder_result;
 }
 
-
 GPtrArray *
 exchange_hierarchy_somedav_get_hrefs (ExchangeHierarchySomeDAV *hsd)
 {
diff --git a/servers/exchange/storage/exchange-hierarchy-somedav.h b/servers/exchange/storage/exchange-hierarchy-somedav.h
index b8ba4ee..d2b292e 100644
--- a/servers/exchange/storage/exchange-hierarchy-somedav.h
+++ b/servers/exchange/storage/exchange-hierarchy-somedav.h
@@ -33,7 +33,6 @@ struct _ExchangeHierarchySomeDAVClass {
 
 GType exchange_hierarchy_somedav_get_type (void);
 
-
 GPtrArray *exchange_hierarchy_somedav_get_hrefs (ExchangeHierarchySomeDAV *hsd);
 ExchangeAccountFolderResult exchange_hierarchy_somedav_add_folder (ExchangeHierarchySomeDAV *hsd,
 								   const gchar *uri);
diff --git a/servers/exchange/storage/exchange-hierarchy-webdav.c b/servers/exchange/storage/exchange-hierarchy-webdav.c
index 3915d1f..4d4c3eb 100644
--- a/servers/exchange/storage/exchange-hierarchy-webdav.c
+++ b/servers/exchange/storage/exchange-hierarchy-webdav.c
@@ -145,7 +145,6 @@ finalize (GObject *object)
 
 E2K_MAKE_TYPE (exchange_hierarchy_webdav, ExchangeHierarchyWebDAV, class_init, init, PARENT_TYPE)
 
-
 typedef struct {
 	const gchar *contentclass, *component;
 	gboolean offline_supported;
@@ -726,7 +725,6 @@ scan_subtree (ExchangeHierarchy *hier, EFolder *parent, gint mode)
 		return EXCHANGE_ACCOUNT_FOLDER_OK;
 	}
 
-
 	if (!folders_rn) {
 		folders_rn =
 			e2k_restriction_andv (
@@ -818,7 +816,6 @@ scan_offline_cb (const gchar *physical_path, const gchar *path, gpointer data)
 	EFolder *folder;
 	gchar *mf_name;
 
-
 	mf_name = g_build_filename (physical_path, "connector-metadata.xml", NULL);
 	folder = e_folder_exchange_new_from_file (sod->hier, mf_name);
 	if (!folder) {
diff --git a/servers/exchange/storage/exchange-hierarchy-webdav.h b/servers/exchange/storage/exchange-hierarchy-webdav.h
index 987ccd3..ce629f1 100644
--- a/servers/exchange/storage/exchange-hierarchy-webdav.h
+++ b/servers/exchange/storage/exchange-hierarchy-webdav.h
@@ -64,7 +64,6 @@ void    exchange_hierarchy_webdav_offline_scan_subtree (ExchangeHierarchy *hier,
 
 gdouble exchange_hierarchy_webdav_get_total_folder_size (ExchangeHierarchyWebDAV *hwd);
 
-
 G_END_DECLS
 
 #endif /* __EXCHANGE_HIERARCHY_WEBDAV_H__ */
diff --git a/servers/exchange/storage/exchange-hierarchy.c b/servers/exchange/storage/exchange-hierarchy.c
index 6423f9e..77f5d6a 100644
--- a/servers/exchange/storage/exchange-hierarchy.c
+++ b/servers/exchange/storage/exchange-hierarchy.c
@@ -131,7 +131,6 @@ finalize (GObject *object)
 
 E2K_MAKE_TYPE (exchange_hierarchy, ExchangeHierarchy, class_init, NULL, PARENT_TYPE)
 
-
 /**
  * exchange_hierarchy_new_folder:
  * @hier: the hierarchy
@@ -180,7 +179,6 @@ exchange_hierarchy_is_empty (ExchangeHierarchy *hier)
 	return HIER_CLASS (hier)->is_empty (hier);
 }
 
-
 static ExchangeAccountFolderResult
 create_folder (ExchangeHierarchy *hier, EFolder *parent,
 	       const gchar *name, const gchar *type)
@@ -270,7 +268,6 @@ exchange_hierarchy_xfer_folder (ExchangeHierarchy *hier, EFolder *source,
 					       remove_source);
 }
 
-
 static void
 rescan (ExchangeHierarchy *hier)
 {
@@ -291,7 +288,6 @@ exchange_hierarchy_rescan (ExchangeHierarchy *hier)
 	HIER_CLASS (hier)->rescan (hier);
 }
 
-
 static ExchangeAccountFolderResult
 scan_subtree (ExchangeHierarchy *hier, EFolder *folder, gint mode)
 {
@@ -318,7 +314,6 @@ exchange_hierarchy_scan_subtree (ExchangeHierarchy *hier, EFolder *folder, gint
 	return HIER_CLASS (hier)->scan_subtree (hier, folder, mode);
 }
 
-
 static void
 add_to_storage (ExchangeHierarchy *hier)
 {
@@ -341,7 +336,6 @@ exchange_hierarchy_add_to_storage (ExchangeHierarchy *hier)
 	HIER_CLASS (hier)->add_to_storage (hier);
 }
 
-
 /**
  * exchange_hierarchy_construct:
  * @hier: the hierarchy
diff --git a/servers/exchange/xntlm/xntlm-des.c b/servers/exchange/xntlm/xntlm-des.c
index 4f6b49a..aabf0e3 100644
--- a/servers/exchange/xntlm/xntlm-des.c
+++ b/servers/exchange/xntlm/xntlm-des.c
@@ -296,13 +296,11 @@ static guchar pc2[] = {
 
 /* End of DES-defined tables */
 
-
 /* bit 0 is left-most in byte */
 static gint bytebit[] = {
 	0200,0100,040,020,010,04,02,01
 };
 
-
 /* Generate key schedule for encryption or decryption
  * depending on the value of "decrypt"
  */
diff --git a/servers/exchange/xntlm/xntlm.c b/servers/exchange/xntlm/xntlm.c
index 0bf422f..def4b6d 100644
--- a/servers/exchange/xntlm/xntlm.c
+++ b/servers/exchange/xntlm/xntlm.c
@@ -28,7 +28,6 @@
 #include <ctype.h>
 #include <string.h>
 
-
 static guchar NTLM_NEGOTIATE_MESSAGE[] = {
 	 'N',  'T',  'L',  'M',  'S',  'S',  'P', 0x00,
 	0x01, 0x00, 0x00, 0x00, 0x06, 0x82, 0x00, 0x00,
@@ -56,7 +55,6 @@ xntlm_negotiate (void)
 	return message;
 }
 
-
 #define GET_SHORTY(p) ((p)[0] + ((p)[1] << 8))
 
 static gchar *
@@ -150,7 +148,6 @@ xntlm_parse_challenge (gpointer challenge, gint len, gchar **nonce,
 	return TRUE;
 }
 
-
 static void
 ntlm_set_string (GByteArray *ba, gint offset, const gchar *data, gint len)
 {
@@ -231,7 +228,6 @@ xntlm_authenticate (const gchar *nonce, const gchar *domain,
 	return message;
 }
 
-
 static void
 setup_schedule (const guchar *key_56, XNTLM_DES_KS ks)
 {
@@ -325,4 +321,3 @@ ntlm_calc_response (const guchar key[21], const guchar plaintext[8],
         xntlm_des (ks, results + 16);
 }
 
-
diff --git a/servers/google/libgdata-google/gdata-google-service.c b/servers/google/libgdata-google/gdata-google-service.c
index b90f17f..195bf4e 100644
--- a/servers/google/libgdata-google/gdata-google-service.c
+++ b/servers/google/libgdata-google/gdata-google-service.c
@@ -66,7 +66,6 @@ enum {
 	PROP_AGENT
 };
 
-
 static const gchar *GOOGLE_CLIENT_LOGIN = "https://www.google.com/accounts/ClientLogin";;
 
 GQuark
@@ -150,7 +149,6 @@ service_is_authenticated (GDataGoogleService *service)
 		return TRUE;
 }
 
-
 /**
  *
  * gdata_google_service_get_feed:
@@ -211,7 +209,6 @@ gdata_google_service_get_feed (GDataService *service, const gchar *feed_url, GEr
 	return feed;
 }
 
-
 /**
  *
  * gdata_google_service_insert_entry:
@@ -281,7 +278,6 @@ gdata_google_service_insert_entry (GDataService *service, const gchar *feed_url,
 	return updated_entry;
 }
 
-
 /**
  *
  * gdata_google_service_delete_entry:
@@ -357,7 +353,6 @@ gdata_google_service_update_entry (GDataService *service, GDataEntry *entry, GEr
 	return gdata_google_service_update_entry_with_link (service, entry, entry_edit_url, error);
 }
 
-
 /**
  *
  * gdata_google_update_entry_with_link:
@@ -454,7 +449,6 @@ static void gdata_google_service_instance_init(GTypeInstance *instance,
 	priv->name = NULL;
 	priv->agent = NULL;
 
-
 	priv->auth = g_new0(GDataGoogleServiceAuth,1);
 	priv->auth->username = NULL;
 	priv->auth->password = NULL;
@@ -573,7 +567,6 @@ static void gdata_google_service_set_property (GObject *obj,
 	}
 }
 
-
 static void gdata_google_service_class_init(gpointer g_class,
 		gpointer g_class_data)
 {
@@ -587,7 +580,6 @@ static void gdata_google_service_class_init(gpointer g_class,
 	gobject_class->dispose  = gdata_google_service_dispose;
 	gobject_class->finalize = gdata_google_service_finalize;
 
-
 	g_object_class_install_property(gobject_class, PROP_NAME,
 			g_param_spec_string("name", "Name",
 				"The name (e.g. 'cl') of the service",
@@ -598,7 +590,6 @@ static void gdata_google_service_class_init(gpointer g_class,
 				G_PARAM_STATIC_NICK |
 				G_PARAM_STATIC_BLURB));
 
-
 	g_object_class_install_property(gobject_class, PROP_AGENT,
 			g_param_spec_string("agent", "Agent",
 				"The agent (e.g 'evolution', 'tinymail') of the calling program",
@@ -612,7 +603,6 @@ static void gdata_google_service_class_init(gpointer g_class,
 	return;
 }
 
-
 GType  gdata_google_service_get_type (void)
 {
 	static GType type = 0;
@@ -651,7 +641,6 @@ GType  gdata_google_service_get_type (void)
 	return type;
 }
 
-
 /*********API******* */
 
 /**
diff --git a/servers/google/libgdata/gdata-entry.c b/servers/google/libgdata/gdata-entry.c
index f2a3a0e..87bc032 100644
--- a/servers/google/libgdata/gdata-entry.c
+++ b/servers/google/libgdata/gdata-entry.c
@@ -22,7 +22,6 @@
  *
  */
 
-
 #include <config.h>
 
 /* LibXML2 includes */
@@ -173,7 +172,6 @@ static void destroy_postal_address (gpointer data, gpointer user_data)
 	g_free (address);
 }
 
-
 static void gdata_entry_init (GTypeInstance *instance,
 		gpointer      g_class)
 {
@@ -326,7 +324,6 @@ GType gdata_entry_get_type (void)
 	return type;
 }
 
-
 /*** API ***/
 static GDataEntryAuthor *
 xmlnode_to_author (xmlDocPtr doc, xmlNodePtr cur)
@@ -846,7 +843,6 @@ postal_address_to_xmlnode (GDataEntryPostalAddress *address)
 	return address_node;
 }
 
-
 /**
  * gdata_entry_new:
  * Creates a new #GDataEntry.
@@ -1361,7 +1357,6 @@ gdata_entry_get_start_time (GDataEntry *entry)
 	return priv->start_time;
 }
 
-
 /**
  * gdata_entry_get_transparency:
  * @entry: A #GDataEntry object.
diff --git a/servers/google/libgdata/gdata-entry.h b/servers/google/libgdata/gdata-entry.h
index c15c9e2..67759b3 100644
--- a/servers/google/libgdata/gdata-entry.h
+++ b/servers/google/libgdata/gdata-entry.h
@@ -28,17 +28,14 @@
 #include <glib.h>
 #include <glib-object.h>
 
-
 /* LibXML2 includes */
 #include <libxml/parser.h>
 #include <libxml/tree.h>
 #include <libxml/xpath.h>
 #include <libxml/xpathInternals.h>
 
-
 G_BEGIN_DECLS
 
-
 #define GDATA_TYPE_ENTRY           (gdata_entry_get_type())
 #define GDATA_ENTRY(obj)           (G_TYPE_CHECK_INSTANCE_CAST((obj), GDATA_TYPE_ENTRY, GDataEntry))
 #define GDATA_ENTRY_CLASS(klass)   (G_TYPE_CHECK_CLASS_CAST((klass), GDATA_TYPE_ENTRY, GDataEntryClass))
@@ -50,7 +47,6 @@ typedef struct _GDataEntry GDataEntry;
 typedef struct _GDataEntryClass GDataEntryClass;
 typedef struct _GDataEntryPrivate GDataEntryPrivate;
 
-
 struct _GDataEntry {
 
   GObject parent;
@@ -144,10 +140,8 @@ struct _GDataEntryPostalAddress {
 	gboolean primary;
 };
 
-
 GType gdata_entry_get_type(void);
 
-
 /***** API  *****/
 
 GDataEntry * gdata_entry_new(void);
diff --git a/servers/google/libgdata/gdata-feed.c b/servers/google/libgdata/gdata-feed.c
index 7c9c9a4..dad83d8 100644
--- a/servers/google/libgdata/gdata-feed.c
+++ b/servers/google/libgdata/gdata-feed.c
@@ -36,7 +36,6 @@
 
 #define GDATA_FEED_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GDATA_TYPE_FEED, GDataFeedPrivate))
 
-
 struct _GDataFeedAuthor {
 	gchar *email;
 	gchar *name;
@@ -62,8 +61,6 @@ struct _GDataFeedLink {
 };
 typedef struct _GDataFeedLink GDataFeedLink;
 
-
-
 struct _GDataFeedPrivate {
 
 	/* feed information */
@@ -246,7 +243,6 @@ gdata_feed_finalize(GObject *obj)
 	if (priv->feedXML != NULL)
 		g_free(priv->feedXML);
 
-
 	/* Chain up to the parent class */
 	klass = GDATA_FEED_CLASS(g_type_class_peek(GDATA_TYPE_FEED));
 	parent_class = G_OBJECT_CLASS (g_type_class_peek_parent (klass));
@@ -304,13 +300,11 @@ gdata_feed_class_init(gpointer g_class,
 	GObjectClass *gobject_class = G_OBJECT_CLASS(g_class);
 	GDataFeedClass *klass = GDATA_FEED_CLASS(g_class);
 
-
 	g_type_class_add_private(klass, sizeof (GDataFeedPrivate));
 
 	gobject_class->set_property = gdata_feed_set_property;
 	gobject_class->get_property = gdata_feed_get_property;
 
-
 	gobject_class->dispose     = gdata_feed_dispose;
 	gobject_class->finalize    = gdata_feed_finalize;
 	gobject_class->constructor = gdata_feed_constructor;
@@ -337,7 +331,6 @@ GType gdata_feed_get_type(void)
   return type;
 }
 
-
 /*** API ***/
 	static GDataFeedAuthor *
 xmlnode_to_author(xmlDocPtr doc, xmlNodePtr cur)
@@ -387,7 +380,6 @@ xmlnode_to_link(xmlDocPtr doc, xmlNodePtr cur)
 	link->title = NULL;
 	link->type = NULL;
 
-
 	value = xmlGetProp(cur, (xmlChar *)"href");
 	if (value) {
 		link->href = g_strdup((gchar *)value);
@@ -415,7 +407,6 @@ xmlnode_to_link(xmlDocPtr doc, xmlNodePtr cur)
 	return link;
 }
 
-
 static GDataFeedCategory *
 xmlnode_to_category(xmlDocPtr doc, xmlNodePtr cur)
 {
@@ -523,7 +514,6 @@ gdata_feed_new(void)
 	return g_object_new(GDATA_TYPE_FEED, NULL);
 }
 
-
 GDataFeed *
 gdata_feed_new_from_xml(const gchar * feedXML, const gint length)
 {
@@ -603,7 +593,6 @@ gdata_feed_new_from_xml(const gchar * feedXML, const gint length)
 	return feed;
 }
 
-
 gchar *
 gdata_feed_generate_xml(GDataFeed *feed)
 {
diff --git a/servers/google/libgdata/gdata-feed.h b/servers/google/libgdata/gdata-feed.h
index b2406d4..44bccec 100644
--- a/servers/google/libgdata/gdata-feed.h
+++ b/servers/google/libgdata/gdata-feed.h
@@ -29,7 +29,6 @@
 
 G_BEGIN_DECLS
 
-
 #define GDATA_TYPE_FEED           (gdata_feed_get_type())
 #define GDATA_FEED(obj)           (G_TYPE_CHECK_INSTANCE_CAST((obj), GDATA_TYPE_FEED, GDataFeed))
 #define GDATA_FEED_CLASS(klass)   (G_TYPE_CHECK_CLASS_CAST((klass), GDATA_TYPE_FEED, GDataFeedClass))
@@ -41,7 +40,6 @@ typedef struct _GDataFeed GDataFeed;
 typedef struct _GDataFeedClass GDataFeedClass;
 typedef struct _GDataFeedPrivate GDataFeedPrivate;
 
-
 struct _GDataFeed {
 
   GObject parent;
diff --git a/servers/groupwise/e-gw-connection.c b/servers/groupwise/e-gw-connection.c
index bb08519..ca15da1 100644
--- a/servers/groupwise/e-gw-connection.c
+++ b/servers/groupwise/e-gw-connection.c
@@ -521,7 +521,6 @@ e_gw_connection_new_with_error_handler (const gchar *uri, const gchar *username,
 
 	static GStaticMutex connecting = G_STATIC_MUTEX_INIT;
 
-
 	g_static_mutex_lock (&connecting);
 
 	/* search the connection in our hash table */
@@ -540,7 +539,6 @@ e_gw_connection_new_with_error_handler (const gchar *uri, const gchar *username,
 		}
 	}
 
-
 	/* not found, so create a new connection */
 	cnc = g_object_new (E_TYPE_GW_CONNECTION, NULL);
 
@@ -664,7 +662,6 @@ e_gw_connection_new_with_error_handler (const gchar *uri, const gchar *username,
 
 }
 
-
 EGwConnection *
 e_gw_connection_new (const gchar *uri, const gchar *username, const gchar *password)
 {
@@ -1010,7 +1007,6 @@ e_gw_connection_get_items_delta (EGwConnection *cnc, const gchar *container, con
 	     subparam = soup_soap_parameter_get_next_child_by_name (subparam, "item")) {
 		EGwItem *item;
 
-
 		item = e_gw_item_new_from_soap_parameter (cnc->priv->user_email, container, subparam);
 
 		subsubparam =  soup_soap_parameter_get_first_child_by_name(subparam, "sync");
@@ -1035,7 +1031,6 @@ e_gw_connection_get_items_delta (EGwConnection *cnc, const gchar *container, con
 
 }
 
-
 EGwConnectionStatus
 e_gw_connection_get_items (EGwConnection *cnc, const gchar *container, const gchar *view, EGwFilter *filter, GList **list)
 {
@@ -1474,7 +1469,6 @@ e_gw_connection_get_item (EGwConnection *cnc, const gchar *container, const gcha
                 return E_GW_CONNECTION_STATUS_UNKNOWN;
         }
 
-
 	e_gw_message_write_string_parameter (msg, "id", NULL, id);
 
 	if (view)
@@ -1517,10 +1511,6 @@ e_gw_connection_get_item (EGwConnection *cnc, const gchar *container, const gcha
         return E_GW_CONNECTION_STATUS_OK;
 }
 
-
-
-
-
 EGwConnectionStatus
 e_gw_connection_remove_item (EGwConnection *cnc, const gchar *container, const gchar *id)
 {
@@ -2014,7 +2004,6 @@ e_gw_connection_get_address_book_list (EGwConnection *cnc, GList **container_lis
         return status;
 }
 
-
 EGwConnectionStatus
 e_gw_connection_get_address_book_id ( EGwConnection *cnc, gchar *book_name, gchar **id , gboolean *is_writable)
 {
@@ -2107,7 +2096,6 @@ e_gw_connection_get_settings (EGwConnection *cnc, EGwSendOptions **opts)
 	EGwConnectionPrivate *priv;
 	static GStaticMutex connecting = G_STATIC_MUTEX_INIT;
 
-
 	g_return_val_if_fail (E_IS_GW_CONNECTION (cnc), E_GW_CONNECTION_STATUS_INVALID_OBJECT);
 
 	priv = cnc->priv;
@@ -2303,7 +2291,6 @@ e_gw_connection_add_members (EGwConnection *cnc, const gchar *group_id, GList *m
 	g_object_unref (msg);
 	return status;
 
-
 }
 
 EGwConnectionStatus
@@ -2347,11 +2334,8 @@ e_gw_connection_remove_members (EGwConnection *cnc, const gchar *group_id, GList
 	g_object_unref (msg);
 	return status;
 
-
-
 }
 
-
 EGwConnectionStatus
 e_gw_connection_create_cursor (EGwConnection *cnc, const gchar *container, const gchar *view, EGwFilter *filter, gint *cursor)
 {
@@ -2440,8 +2424,6 @@ e_gw_connection_destroy_cursor (EGwConnection *cnc, const gchar *container,  gin
 
 }
 
-
-
 EGwConnectionStatus
 e_gw_connection_position_cursor (EGwConnection *cnc, const gchar *container, gint cursor, const gchar *seek, gint offset)
 {
@@ -2651,10 +2633,8 @@ EGwConnectionStatus e_gw_connection_get_quick_messages (EGwConnection *cnc, cons
 	g_object_unref (msg);
         return E_GW_CONNECTION_STATUS_OK;
 
-
 }
 
-
 EGwConnectionStatus
 e_gw_connection_create_folder(EGwConnection *cnc, const gchar *parent_name,const gchar *folder_name, gchar **container_id)
 {
@@ -2719,7 +2699,6 @@ e_gw_connection_get_attachment (EGwConnection *cnc, const gchar *id, gint offset
                 return E_GW_CONNECTION_STATUS_UNKNOWN;
         }
 
-
 	e_gw_message_write_string_parameter (msg, "id", NULL, id);
 	e_gw_message_write_int_parameter (msg, "offset", NULL, offset);
 	e_gw_message_write_int_parameter (msg, "length", NULL, length);
@@ -2742,7 +2721,6 @@ e_gw_connection_get_attachment (EGwConnection *cnc, const gchar *id, gint offset
 		return status;
 	}
 
-
 	param = soup_soap_response_get_first_parameter_by_name (response, "part");
 	if (param) {
 		buf_length =  soup_soap_parameter_get_property (param, "length");
@@ -2789,7 +2767,6 @@ e_gw_connection_get_attachment_base64 (EGwConnection *cnc, const gchar *id, gint
                 return E_GW_CONNECTION_STATUS_UNKNOWN;
         }
 
-
 	e_gw_message_write_string_parameter (msg, "id", NULL, id);
 	e_gw_message_write_int_parameter (msg, "offset", NULL, offset);
 	e_gw_message_write_int_parameter (msg, "length", NULL, length);
@@ -2812,7 +2789,6 @@ e_gw_connection_get_attachment_base64 (EGwConnection *cnc, const gchar *id, gint
 		return status;
 	}
 
-
 	param = soup_soap_response_get_first_parameter_by_name (response, "part");
 	if (param) {
 		buf_length =  soup_soap_parameter_get_property (param, "length");
@@ -3001,7 +2977,6 @@ e_gw_connection_move_item (EGwConnection *cnc, const gchar *id, const gchar *des
 	g_return_val_if_fail (id != NULL, E_GW_CONNECTION_STATUS_INVALID_OBJECT);
 	g_return_val_if_fail (dest_container_id != NULL, E_GW_CONNECTION_STATUS_INVALID_OBJECT);
 
-
 	/* build the SOAP message */
 	msg = e_gw_message_new_with_header (cnc->priv->uri, cnc->priv->session_id, "moveItemRequest");
 	e_gw_message_write_string_parameter (msg, "id", NULL, id);
@@ -3025,7 +3000,6 @@ e_gw_connection_move_item (EGwConnection *cnc, const gchar *id, const gchar *des
 	g_object_unref (msg);
 	return status;
 
-
 }
 
 EGwConnectionStatus
diff --git a/servers/groupwise/e-gw-connection.h b/servers/groupwise/e-gw-connection.h
index 0ac9c81..ea5394f 100644
--- a/servers/groupwise/e-gw-connection.h
+++ b/servers/groupwise/e-gw-connection.h
@@ -114,7 +114,6 @@ EGwConnectionStatus e_gw_connection_remove_items (EGwConnection *cnc, const gcha
 EGwConnectionStatus e_gw_connection_get_items_delta_info (EGwConnection *cnc, const gchar *container, gdouble *first_sequence, gdouble *last_sequence, gdouble *last_po_rebuild_time);
 EGwConnectionStatus e_gw_connection_get_items_delta (EGwConnection *cnc, const gchar *container, const gchar *view, const gchar *count, const gchar * start_sequence, GList **add_list, GList **delete_list);
 
-
 const gchar         *e_gw_connection_get_uri (EGwConnection *cnc);
 const gchar         *e_gw_connection_get_session_id (EGwConnection *cnc);
 const gchar         *e_gw_connection_get_user_name (EGwConnection *cnc);
@@ -123,11 +122,9 @@ const gchar         *e_gw_connection_get_user_uuid (EGwConnection *cnc);
 const gchar	   *e_gw_connection_get_version (EGwConnection *cnc);
 const gchar	   *e_gw_connection_get_server_time (EGwConnection *cnc);
 
-
 time_t              e_gw_connection_get_date_from_string (const gchar *dtstring);
 gchar               *e_gw_connection_format_date_string (const gchar *dtstring);
 
-
 EGwConnectionStatus e_gw_connection_create_item (EGwConnection *cnc, EGwItem *item, gchar ** id);
 EGwConnectionStatus e_gw_connection_get_item (EGwConnection *cnc, const gchar *container, const gchar *id, const gchar *view, EGwItem **item);
 EGwConnectionStatus e_gw_connection_modify_item (EGwConnection *cnc, const gchar *id, EGwItem *item);
diff --git a/servers/groupwise/e-gw-container.c b/servers/groupwise/e-gw-container.c
index 981976f..6e1f44e 100644
--- a/servers/groupwise/e-gw-container.c
+++ b/servers/groupwise/e-gw-container.c
@@ -270,7 +270,6 @@ e_gw_container_set_from_soap_parameter (EGwContainer *container, SoupSoapParamet
 		g_free (value);
 	}
 
-
 	/* retrive the unread and total count */
 	subparam = soup_soap_parameter_get_first_child_by_name (param, "hasUnread");
 	if (!subparam) {
@@ -635,7 +634,6 @@ e_gw_container_get_unread_count (EGwContainer *container)
 
 }
 
-
 gboolean
 e_gw_container_get_is_writable (EGwContainer *container)
 {
diff --git a/servers/groupwise/e-gw-filter.c b/servers/groupwise/e-gw-filter.c
index 6365875..6cc9e18 100644
--- a/servers/groupwise/e-gw-filter.c
+++ b/servers/groupwise/e-gw-filter.c
@@ -45,8 +45,6 @@ struct _EGwFilterPrivate {
 
 };
 
-
-
 void
 e_gw_filter_add_filter_component (EGwFilter *filter, EGwFilterOpType operation, const gchar *field_name, const gchar *field_value)
 {
@@ -126,7 +124,6 @@ append_child_component (FilterComponent* filter_component, SoupSoapMessage *msg)
 
 	}
 
-
 	if (operation_name != NULL) {
 
 			e_gw_message_write_string_parameter (msg, "op", NULL, operation_name);
@@ -137,8 +134,6 @@ append_child_component (FilterComponent* filter_component, SoupSoapMessage *msg)
 	soup_soap_message_end_element (msg);
 }
 
-
-
 static GSList*
 append_complex_component (GSList *component_list, SoupSoapMessage *msg)
 {
@@ -169,7 +164,6 @@ append_complex_component (GSList *component_list, SoupSoapMessage *msg)
 		else
 			append_child_component (filter_component, msg);
 
-
 	}
 	soup_soap_message_end_element (msg);
 
@@ -248,7 +242,6 @@ e_gw_filter_init (EGwFilter *filter, EGwFilterClass *klass)
 	filter->priv = priv;
 }
 
-
 static void
 e_gw_filter_class_init (EGwFilterClass *klass)
 {
diff --git a/servers/groupwise/e-gw-filter.h b/servers/groupwise/e-gw-filter.h
index 9bc24c7..a931412 100644
--- a/servers/groupwise/e-gw-filter.h
+++ b/servers/groupwise/e-gw-filter.h
@@ -24,7 +24,6 @@
 #ifndef E_GW_FILTER_H
 #define E_GW_FILTER_H
 
-
 #include "soup-soap-message.h"
 #include "soup-soap-response.h"
 
@@ -40,7 +39,6 @@ typedef struct _EGwFilter        EGwFilter;
 typedef struct _EGwFilterClass   EGwFilterClass;
 typedef struct _EGwFilterPrivate EGwFilterPrivate;
 
-
 typedef enum {
 	E_GW_FILTER_OP_AND,
 	E_GW_FILTER_OP_OR,
diff --git a/servers/groupwise/e-gw-item.c b/servers/groupwise/e-gw-item.c
index d14e06b..a22d8e5 100644
--- a/servers/groupwise/e-gw-item.c
+++ b/servers/groupwise/e-gw-item.c
@@ -583,7 +583,6 @@ e_gw_item_init (EGwItem *item, EGwItemClass *klass)
 	priv->parent_threads = NULL;
 	item->priv = priv;
 
-
 }
 
 GType
@@ -680,7 +679,6 @@ set_recipient_list_from_soap_parameter (EGwItem *item, SoupSoapParameter *param)
 		}
 		/*FIXME  gw recipientTypes need to be added after the server is fixed. */
 
-
 		/* update Recipient Status
 		 look for accepted/declined and update the item else set it
 		 to none. */
@@ -881,7 +879,6 @@ e_gw_item_get_email_list (EGwItem *item)
 {
 	return item->priv->email_list;
 
-
 }
 
 void
@@ -1065,7 +1062,6 @@ set_common_addressbook_item_fields_from_soap_parameter (EGwItem *item, SoupSoapP
 		}
 	}
 
-
 }
 
 static void
@@ -1221,7 +1217,6 @@ set_contact_fields_from_soap_parameter (EGwItem *item, SoupSoapParameter *param)
 			}
 	}
 
-
 	subparam =  soup_soap_parameter_get_first_child_by_name(param, "phoneList");
 	if(subparam) {
 		g_hash_table_insert (simple_fields, (gpointer) "default_phone", soup_soap_parameter_get_property(subparam, "default"));
@@ -1374,7 +1369,6 @@ set_group_fields_from_soap_parameter (EGwItem *item, SoupSoapParameter *param)
 		}
 	}
 
-
 }
 
 static void
@@ -1463,7 +1457,6 @@ set_organization_fields_from_soap_parameter (EGwItem *item, SoupSoapParameter *p
 			g_hash_table_insert (simple_fields, (gpointer) "website", value);
 	}
 
-
 }
 
 static void
@@ -2654,7 +2647,6 @@ e_gw_item_set_trigger (EGwItem *item, gint trigger)
 	item->priv->trigger = trigger;
 }
 
-
 void
 e_gw_item_set_to (EGwItem *item, const gchar *to)
 {
@@ -2740,7 +2732,6 @@ e_gw_item_get_track_info (EGwItem *item)
 	return item->priv->track_info;
 }
 
-
 void
 e_gw_item_set_autodelete (EGwItem *item, gboolean set)
 {
@@ -3381,7 +3372,6 @@ e_gw_item_append_to_soap_message (EGwItem *item, SoupSoapMessage *msg)
 		else
 			e_gw_message_write_string_parameter (msg, "allDayEvent", NULL ,"0");
 
-
 		if (priv->trigger != 0) {
 			alarm = g_strdup_printf ("%d", priv->trigger);
 			e_gw_message_write_string_parameter_with_attribute (msg, "alarm", NULL, alarm, "enabled", "1");
@@ -3445,7 +3435,6 @@ e_gw_item_append_to_soap_message (EGwItem *item, SoupSoapMessage *msg)
 	return TRUE;
 }
 
-
 static void
 append_contact_changes_to_soap_message (EGwItem *item, SoupSoapMessage *msg, gint change_type)
 {
diff --git a/servers/groupwise/e-gw-item.h b/servers/groupwise/e-gw-item.h
index f76979c..f145e5e 100644
--- a/servers/groupwise/e-gw-item.h
+++ b/servers/groupwise/e-gw-item.h
@@ -55,7 +55,6 @@ typedef enum {
 
 } EGwItemType;
 
-
 typedef enum {
 	E_GW_ITEM_CHANGE_TYPE_ADD,
 	E_GW_ITEM_CHANGE_TYPE_UPDATE,
@@ -248,7 +247,6 @@ void e_gw_item_set_delay_until (EGwItem *item, gchar *delay_until);
 gchar *e_gw_item_get_delay_until (EGwItem *item);
 void e_gw_item_free_cal_id (EGwItemCalId *calid);
 
-
 #define E_GW_ITEM_CLASSIFICATION_PUBLIC       "Public"
 #define E_GW_ITEM_CLASSIFICATION_PRIVATE      "Private"
 #define E_GW_ITEM_CLASSIFICATION_CONFIDENTIAL "Confidential"
@@ -282,7 +280,6 @@ void e_gw_item_set_organizer (EGwItem  *item, EGwItemOrganizer *organizer);
 GSList * e_gw_item_get_attach_id_list (EGwItem *item);
 void e_gw_item_set_attach_id_list (EGwItem *item, GSList *attach_list);
 
-
 GSList *e_gw_item_get_recurrence_dates (EGwItem *item);
 void e_gw_item_set_recurrence_dates (EGwItem  *item, GSList *new_recurrence_dates);
 
@@ -307,7 +304,6 @@ gboolean e_gw_item_is_from_internet (EGwItem *item);
 const gchar *e_gw_item_get_parent_thread_ids (EGwItem *item);
 const gchar * e_gw_item_get_message_id (EGwItem *item);
 
-
 typedef struct {
 	gchar *email;
 	gchar *display_name;
diff --git a/servers/groupwise/e-gw-message.h b/servers/groupwise/e-gw-message.h
index 25541f4..541e6f6 100644
--- a/servers/groupwise/e-gw-message.h
+++ b/servers/groupwise/e-gw-message.h
@@ -43,7 +43,6 @@ void             e_gw_message_write_base64_parameter (SoupSoapMessage *msg,
 						      const gchar *value);
 void e_gw_message_write_int_parameter (SoupSoapMessage *msg, const gchar *name, const gchar *prefix, glong value);
 
-
 void             e_gw_message_write_footer (SoupSoapMessage *msg);
 
 G_END_DECLS
diff --git a/servers/groupwise/e-gw-proxy.h b/servers/groupwise/e-gw-proxy.h
index 98dd8f7..bebe29b 100644
--- a/servers/groupwise/e-gw-proxy.h
+++ b/servers/groupwise/e-gw-proxy.h
@@ -47,7 +47,6 @@
 #define E_GW_PROXY_MODIFY_FOLDERS           (1 << 10)
 #define E_GW_PROXY_READ_PRIVATE             (1 << 11)
 
-
 struct _proxyHandler {
     gchar *uniqueid;
     gchar *proxy_name;
diff --git a/servers/groupwise/e-gw-recur-utils.c b/servers/groupwise/e-gw-recur-utils.c
index 0014419..16e3701 100644
--- a/servers/groupwise/e-gw-recur-utils.c
+++ b/servers/groupwise/e-gw-recur-utils.c
@@ -36,5 +36,3 @@ e_gw_recur_get_day_of_week (short day)
 	return days_of_week [day-1];
 }
 
-
-
diff --git a/servers/groupwise/e-gw-recur-utils.h b/servers/groupwise/e-gw-recur-utils.h
index c6043cc..72d11f4 100644
--- a/servers/groupwise/e-gw-recur-utils.h
+++ b/servers/groupwise/e-gw-recur-utils.h
@@ -30,7 +30,6 @@
 #define E_GW_ITEM_RECURRENCE_FREQUENCY_MONTHLY "Monthly"
 #define E_GW_ITEM_RECURRENCE_FREQUENCY_YEARLY "Yearly"
 
-
 #define E_GW_ITEM_RECUR_OCCURRENCE_TYPE_FIRST  "First"
 #define E_GW_ITEM_RECUR_OCCURRENCE_TYPE_SECOND "Second"
 #define E_GW_ITEM_RECUR_OCCURRENCE_TYPE_THIRD  "Third"
@@ -65,11 +64,8 @@ typedef struct {
 	short by_setpos [E_GW_ITEM_BY_SETPOS_SIZE];
 } EGwItemRecurrenceRule;
 
-
 #define E_GW_ITEM_RECUR_END_MARKER  0x7f7f
 
-
-
 const gchar *e_gw_recur_get_day_of_week (short day);
 
 #endif
diff --git a/servers/groupwise/e-gw-sendoptions.c b/servers/groupwise/e-gw-sendoptions.c
index 70ff7c9..8dcf915 100644
--- a/servers/groupwise/e-gw-sendoptions.c
+++ b/servers/groupwise/e-gw-sendoptions.c
@@ -229,7 +229,6 @@ parse_status_tracking_options (SoupSoapParameter *group_param, guint i, EGwSendO
 			} else
 				sopts->opened = E_GW_RETURN_NOTIFY_NONE;
 
-
 		} else if (!g_ascii_strcasecmp (field + i, "ReturnDelete")) {
 			if (val_param)
 				val_param = soup_soap_parameter_get_first_child_by_name (val_param, "mail");
@@ -254,7 +253,6 @@ parse_status_tracking_options (SoupSoapParameter *group_param, guint i, EGwSendO
 			} else
 				sopts->accepted = E_GW_RETURN_NOTIFY_NONE;
 
-
 		} else if (!g_ascii_strcasecmp (field + i, "ReturnCompleted")) {
 			if (val_param)
 				val_param = soup_soap_parameter_get_first_child_by_name (val_param, "mail");
@@ -659,4 +657,3 @@ e_gw_sendoptions_new_from_soap_parameter (SoupSoapParameter *param)
 	return opts;
 }
 
-
diff --git a/servers/groupwise/soup-soap-message.c b/servers/groupwise/soup-soap-message.c
index b776db0..4180f72 100644
--- a/servers/groupwise/soup-soap-message.c
+++ b/servers/groupwise/soup-soap-message.c
@@ -60,7 +60,6 @@ soup_soap_message_init (SoupSoapMessage *msg)
 	priv->doc->encoding = xmlCharStrdup ("UTF-8");
 }
 
-
 static xmlNsPtr
 fetch_ns (SoupSoapMessage *msg, const gchar *prefix, const gchar *ns_uri)
 {
diff --git a/servers/groupwise/soup-soap-response.c b/servers/groupwise/soup-soap-response.c
index 37b80fd..6b03d5d 100644
--- a/servers/groupwise/soup-soap-response.c
+++ b/servers/groupwise/soup-soap-response.c
@@ -55,7 +55,6 @@ soup_soap_response_init (SoupSoapResponse *response)
 	priv->xmldoc = xmlNewDoc ((const xmlChar *)"1.0");
 }
 
-
 /**
  * soup_soap_response_new:
  *
@@ -563,7 +562,6 @@ soup_xml_real_node (xmlNode *node)
 	return node;
 }
 
-
 gint
 soup_soap_response_dump_response (SoupSoapResponse *response, FILE *buffer)
 {
diff --git a/servers/groupwise/soup-soap-response.h b/servers/groupwise/soup-soap-response.h
index e26f617..8490571 100644
--- a/servers/groupwise/soup-soap-response.h
+++ b/servers/groupwise/soup-soap-response.h
@@ -63,7 +63,6 @@ SoupSoapParameter *soup_soap_response_get_next_parameter_by_name (SoupSoapRespon
 
 gint soup_soap_response_dump_response (SoupSoapResponse *response, FILE *buffer);
 
-
 G_END_DECLS
 
 #endif
diff --git a/src/offline-listener.c b/src/offline-listener.c
index defd597..32f03de 100644
--- a/src/offline-listener.c
+++ b/src/offline-listener.c
@@ -50,7 +50,6 @@ struct _OfflineListenerPrivate
 	gboolean is_offline_now;
 };
 
-
 static void
 set_online_status (OfflineListener *offline_listener, gboolean is_offline)
 {
@@ -87,7 +86,6 @@ online_status_changed (GConfClient *client, gint cnxn_id, GConfEntry *entry, gpo
 
 }
 
-
 static void
 setup_offline_listener (OfflineListener *offline_listener)
 {
@@ -120,7 +118,6 @@ offline_listener_new (EDataBookFactory *book_factory)
 
 }
 
-
 static void
 offline_listener_dispose (GObject *object)
 {
@@ -157,8 +154,6 @@ offline_listener_init (OfflineListener *listener)
 
 }
 
-
-
 static void
 offline_listener_class_init (OfflineListener *klass)
 {
@@ -170,11 +165,8 @@ offline_listener_class_init (OfflineListener *klass)
 	object_class->dispose = offline_listener_dispose;
 	object_class->finalize = offline_listener_finalize;
 
-
-
 }
 
-
 GType
 offline_listener_get_type (void)
 {
diff --git a/src/offline-listener.h b/src/offline-listener.h
index b7a959a..68ffe45 100644
--- a/src/offline-listener.h
+++ b/src/offline-listener.h
@@ -41,7 +41,6 @@ G_BEGIN_DECLS
 #define OFFLINE_IS_LISTENER(obj)		(G_TYPE_CHECK_INSTANCE_TYPE ((obj), OFFLINE_TYPE_LISTENER))
 #define OFFLINE_IS_LISTENER_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((obj), OFFLINE_TYPE_LISTENER))
 
-
 typedef struct _OfflineListener        OfflineListener;
 typedef struct _OfflineListenerPrivate  OfflineListenerPrivate;
 typedef struct _OfflineListenerClass   OfflineListenerClass;
@@ -57,7 +56,6 @@ struct _OfflineListenerClass {
 
 };
 
-
 GType offline_listener_get_type  (void);
 
 #if ENABLE_CALENDAR
diff --git a/src/server.c b/src/server.c
index ada559b..b76cc57 100644
--- a/src/server.c
+++ b/src/server.c
@@ -239,7 +239,6 @@ setup_interface_check (void)
 	return result == Bonobo_ACTIVATION_REG_SUCCESS;
 }
 
-
 #ifdef DEBUG_BACKENDS
 static void
 dump_backends (gint signal)



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]