GNOME.org
 

[evolution-data-server] Coding style cleanup.

commit f7b4b08f9c71fca4463710affc5feec2c4513ead
Author: Matthew Barnes <mbarnes redhat com>
Date:   Sat Mar 5 12:35:48 2011 -0500

    Coding style cleanup.

 .../backends/google/e-book-backend-google.c        |    4 +++-
 .../backends/webdav/e-book-backend-webdav.c        |    5 +++--
 addressbook/libebook/e-book-view.c                 |    3 ++-
 addressbook/libebook/e-book.c                      |    3 ++-
 addressbook/libedata-book/e-book-backend-cache.c   |    3 ++-
 addressbook/libedata-book/e-book-backend.c         |    3 ++-
 addressbook/libedata-book/e-data-book-factory.c    |    3 ++-
 addressbook/libedata-book/e-data-book-view.c       |    3 ++-
 addressbook/libedata-book/e-data-book.c            |    3 ++-
 calendar/backends/caldav/e-cal-backend-caldav.c    |    3 ++-
 calendar/libecal/e-cal-view.c                      |    3 ++-
 calendar/libecal/e-cal.c                           |    3 ++-
 calendar/libedata-cal/e-cal-backend-cache.c        |    3 ++-
 calendar/libedata-cal/e-cal-backend-file-store.c   |    4 +++-
 calendar/libedata-cal/e-cal-backend-intervaltree.c |    3 ++-
 calendar/libedata-cal/e-cal-backend-store.c        |    3 ++-
 calendar/libedata-cal/e-cal-backend.c              |    3 ++-
 calendar/libedata-cal/e-data-cal-factory.c         |    3 ++-
 calendar/libedata-cal/e-data-cal-view.c            |    3 ++-
 calendar/libedata-cal/e-data-cal.c                 |    3 ++-
 camel/camel-certdb.c                               |    3 ++-
 camel/camel-cipher-context.c                       |    3 ++-
 camel/camel-data-cache.c                           |    3 ++-
 camel/camel-data-wrapper.c                         |    4 +++-
 camel/camel-disco-folder.c                         |    4 +++-
 camel/camel-filter-driver.c                        |    4 +++-
 camel/camel-folder-search.c                        |    3 ++-
 camel/camel-folder-summary.c                       |    3 ++-
 camel/camel-folder.c                               |    3 ++-
 camel/camel-gpg-context.c                          |    3 ++-
 camel/camel-index.c                                |    3 ++-
 camel/camel-medium.c                               |    3 ++-
 camel/camel-mime-filter-basic.c                    |    4 +++-
 camel/camel-mime-filter-bestenc.c                  |    4 +++-
 camel/camel-mime-filter-canon.c                    |    4 +++-
 camel/camel-mime-filter-charset.c                  |    4 +++-
 camel/camel-mime-filter-crlf.c                     |    4 +++-
 camel/camel-mime-filter-enriched.c                 |    4 +++-
 camel/camel-mime-filter-from.c                     |    4 +++-
 camel/camel-mime-filter-gzip.c                     |    4 +++-
 camel/camel-mime-filter-html.c                     |    4 +++-
 camel/camel-mime-filter-index.c                    |    4 +++-
 camel/camel-mime-filter-linewrap.c                 |    4 +++-
 camel/camel-mime-filter-pgp.c                      |    4 +++-
 camel/camel-mime-filter-progress.c                 |    4 +++-
 camel/camel-mime-filter-save.c                     |    4 +++-
 camel/camel-mime-filter-tohtml.c                   |    4 +++-
 camel/camel-mime-filter-windows.c                  |    4 +++-
 camel/camel-mime-filter-yenc.c                     |    4 +++-
 camel/camel-mime-filter.c                          |    3 ++-
 camel/camel-mime-part.c                            |    3 ++-
 camel/camel-object.c                               |    3 ++-
 camel/camel-offline-folder.c                       |    3 ++-
 camel/camel-offline-store.c                        |    3 ++-
 camel/camel-operation.c                            |    3 ++-
 camel/camel-partition-table.c                      |    6 ++++--
 camel/camel-sasl-cram-md5.c                        |    3 ++-
 camel/camel-sasl-digest-md5.c                      |    3 ++-
 camel/camel-sasl-gssapi.c                          |    3 ++-
 camel/camel-sasl-login.c                           |    3 ++-
 camel/camel-sasl-ntlm.c                            |    3 ++-
 camel/camel-sasl-plain.c                           |    3 ++-
 camel/camel-sasl-popb4smtp.c                       |    3 ++-
 camel/camel-sasl.c                                 |    3 ++-
 camel/camel-service.c                              |    3 ++-
 camel/camel-session.c                              |    3 ++-
 camel/camel-smime-context.c                        |    4 +++-
 camel/camel-store-summary.c                        |    3 ++-
 camel/camel-store.c                                |    3 ++-
 camel/camel-stream-buffer.c                        |    3 ++-
 camel/camel-stream-filter.c                        |    3 ++-
 camel/camel-stream-fs.c                            |    3 ++-
 camel/camel-stream-mem.c                           |    3 ++-
 camel/camel-tcp-stream-raw.c                       |    3 ++-
 camel/camel-tcp-stream-ssl.c                       |    3 ++-
 camel/camel-tcp-stream.c                           |    3 ++-
 camel/camel-text-index.c                           |    3 ++-
 camel/camel-transport.c                            |    3 ++-
 camel/camel-vee-folder.c                           |    3 ++-
 camel/providers/groupwise/camel-groupwise-folder.c |    4 +++-
 camel/providers/groupwise/camel-groupwise-store.c  |    4 +++-
 camel/providers/imap/camel-imap-folder.c           |    3 ++-
 camel/providers/imap/camel-imap-wrapper.c          |    4 +++-
 camel/providers/imapx/camel-imapx-conn-manager.c   |    3 ++-
 camel/providers/local/camel-local-folder.c         |    4 +++-
 camel/providers/local/camel-maildir-summary.c      |    4 +++-
 camel/providers/local/camel-mh-summary.c           |    3 ++-
 camel/providers/nntp/camel-nntp-folder.c           |    3 ++-
 camel/providers/nntp/camel-nntp-store.c            |    3 ++-
 camel/providers/nntp/camel-nntp-summary.c          |    4 +++-
 libedataserver/e-proxy.c                           |    3 ++-
 libedataserver/e-soap-message.c                    |    3 ++-
 libedataserver/e-soap-response.c                   |    3 ++-
 libedataserverui/e-categories-dialog.c             |    3 ++-
 libedataserverui/e-category-completion.c           |    4 +++-
 libedataserverui/e-cell-renderer-color.c           |    4 +++-
 libedataserverui/e-contact-store.c                 |    3 ++-
 libedataserverui/e-destination-store.c             |    4 +++-
 libedataserverui/e-name-selector-dialog.c          |    4 +++-
 libedataserverui/e-name-selector-entry.c           |    4 +++-
 libedataserverui/e-name-selector-list.c            |    3 ++-
 libedataserverui/e-name-selector-model.c           |    4 +++-
 libedataserverui/e-name-selector.c                 |    3 ++-
 libedataserverui/e-source-combo-box.c              |    4 +++-
 libedataserverui/e-source-selector.c               |    3 ++-
 libedataserverui/e-tree-model-generator.c          |    4 +++-
 servers/groupwise/soup-soap-message.c              |    3 ++-
 servers/groupwise/soup-soap-response.c             |    3 ++-
 108 files changed, 256 insertions(+), 110 deletions(-)
---
diff --git a/addressbook/backends/google/e-book-backend-google.c b/addressbook/backends/google/e-book-backend-google.c
index 76c1684..f3cd23b 100644
--- a/addressbook/backends/google/e-book-backend-google.c
+++ b/addressbook/backends/google/e-book-backend-google.c
@@ -1708,7 +1708,9 @@ static void
 e_book_backend_google_init (EBookBackendGoogle *backend)
 {
 	__debug__ (G_STRFUNC);
-	backend->priv = G_TYPE_INSTANCE_GET_PRIVATE (backend, E_TYPE_BOOK_BACKEND_GOOGLE, EBookBackendGooglePrivate);
+	backend->priv = G_TYPE_INSTANCE_GET_PRIVATE (
+		backend, E_TYPE_BOOK_BACKEND_GOOGLE,
+		EBookBackendGooglePrivate);
 }
 
 EBookBackend *
diff --git a/addressbook/backends/webdav/e-book-backend-webdav.c b/addressbook/backends/webdav/e-book-backend-webdav.c
index 4c18e8d..29d3147 100644
--- a/addressbook/backends/webdav/e-book-backend-webdav.c
+++ b/addressbook/backends/webdav/e-book-backend-webdav.c
@@ -1426,7 +1426,8 @@ e_book_backend_webdav_class_init (EBookBackendWebdavClass *klass)
 static void
 e_book_backend_webdav_init (EBookBackendWebdav *backend)
 {
-	backend->priv = G_TYPE_INSTANCE_GET_PRIVATE (backend,
-			E_TYPE_BOOK_BACKEND_WEBDAV, EBookBackendWebdavPrivate);
+	backend->priv = G_TYPE_INSTANCE_GET_PRIVATE (
+		backend, E_TYPE_BOOK_BACKEND_WEBDAV,
+		EBookBackendWebdavPrivate);
 }
 
diff --git a/addressbook/libebook/e-book-view.c b/addressbook/libebook/e-book-view.c
index c8e280a..369c628 100644
--- a/addressbook/libebook/e-book-view.c
+++ b/addressbook/libebook/e-book-view.c
@@ -266,7 +266,8 @@ e_book_view_stop (EBookView *book_view)
 static void
 e_book_view_init (EBookView *book_view)
 {
-	book_view->priv = G_TYPE_INSTANCE_GET_PRIVATE (book_view, E_TYPE_BOOK_VIEW, EBookViewPrivate);
+	book_view->priv = G_TYPE_INSTANCE_GET_PRIVATE (
+		book_view, E_TYPE_BOOK_VIEW, EBookViewPrivate);
 	book_view->priv->gdbus_bookview = NULL;
 	book_view->priv->book = NULL;
 	book_view->priv->running = FALSE;
diff --git a/addressbook/libebook/e-book.c b/addressbook/libebook/e-book.c
index a4ffb72..c104787 100644
--- a/addressbook/libebook/e-book.c
+++ b/addressbook/libebook/e-book.c
@@ -248,7 +248,8 @@ e_book_class_init (EBookClass *e_book_class)
 static void
 e_book_init (EBook *book)
 {
-	book->priv = G_TYPE_INSTANCE_GET_PRIVATE (book, E_TYPE_BOOK, EBookPrivate);
+	book->priv = G_TYPE_INSTANCE_GET_PRIVATE (
+		book, E_TYPE_BOOK, EBookPrivate);
 
 	LOCK_FACTORY ();
 	active_books++;
diff --git a/addressbook/libedata-book/e-book-backend-cache.c b/addressbook/libedata-book/e-book-backend-cache.c
index 4d297a3..a35814c 100644
--- a/addressbook/libedata-book/e-book-backend-cache.c
+++ b/addressbook/libedata-book/e-book-backend-cache.c
@@ -43,7 +43,8 @@ e_book_backend_cache_class_init (EBookBackendCacheClass *class)
 static void
 e_book_backend_cache_init (EBookBackendCache *cache)
 {
-	cache->priv = G_TYPE_INSTANCE_GET_PRIVATE (cache, E_TYPE_BOOK_BACKEND_CACHE, EBookBackendCachePrivate);
+	cache->priv = G_TYPE_INSTANCE_GET_PRIVATE (
+		cache, E_TYPE_BOOK_BACKEND_CACHE, EBookBackendCachePrivate);
 }
 
 /**
diff --git a/addressbook/libedata-book/e-book-backend.c b/addressbook/libedata-book/e-book-backend.c
index 17a1927..f86d2fc 100644
--- a/addressbook/libedata-book/e-book-backend.c
+++ b/addressbook/libedata-book/e-book-backend.c
@@ -179,7 +179,8 @@ e_book_backend_class_init (EBookBackendClass *class)
 static void
 e_book_backend_init (EBookBackend *backend)
 {
-	backend->priv = G_TYPE_INSTANCE_GET_PRIVATE (backend, E_TYPE_BOOK_BACKEND, EBookBackendPrivate);
+	backend->priv = G_TYPE_INSTANCE_GET_PRIVATE (
+		backend, E_TYPE_BOOK_BACKEND, EBookBackendPrivate);
 
 	backend->priv->views = e_list_new (
 		(EListCopyFunc) NULL, (EListFreeFunc) NULL, NULL);
diff --git a/addressbook/libedata-book/e-data-book-factory.c b/addressbook/libedata-book/e-data-book-factory.c
index d74a9f7..94bbbdd 100644
--- a/addressbook/libedata-book/e-data-book-factory.c
+++ b/addressbook/libedata-book/e-data-book-factory.c
@@ -417,7 +417,8 @@ e_data_book_factory_init (EDataBookFactory *factory)
 {
 	GError *error = NULL;
 
-	factory->priv = G_TYPE_INSTANCE_GET_PRIVATE (factory, E_TYPE_DATA_BOOK_FACTORY, EDataBookFactoryPrivate);
+	factory->priv = G_TYPE_INSTANCE_GET_PRIVATE (
+		factory, E_TYPE_DATA_BOOK_FACTORY, EDataBookFactoryPrivate);
 
 	factory->priv->gdbus_object = e_gdbus_book_factory_stub_new ();
 	g_signal_connect (factory->priv->gdbus_object, "handle-get-book", G_CALLBACK (impl_BookFactory_getBook), factory);
diff --git a/addressbook/libedata-book/e-data-book-view.c b/addressbook/libedata-book/e-data-book-view.c
index 061bbbf..2ecfbc5 100644
--- a/addressbook/libedata-book/e-data-book-view.c
+++ b/addressbook/libedata-book/e-data-book-view.c
@@ -595,7 +595,8 @@ impl_DataBookView_dispose (EGdbusBookView *object, GDBusMethodInvocation *invoca
 static void
 e_data_book_view_init (EDataBookView *book_view)
 {
-	EDataBookViewPrivate *priv = G_TYPE_INSTANCE_GET_PRIVATE (book_view, E_TYPE_DATA_BOOK_VIEW, EDataBookViewPrivate);
+	EDataBookViewPrivate *priv = G_TYPE_INSTANCE_GET_PRIVATE (
+		book_view, E_TYPE_DATA_BOOK_VIEW, EDataBookViewPrivate);
 
 	book_view->priv = priv;
 
diff --git a/addressbook/libedata-book/e-data-book.c b/addressbook/libedata-book/e-data-book.c
index a7ce338..5495f1e 100644
--- a/addressbook/libedata-book/e-data-book.c
+++ b/addressbook/libedata-book/e-data-book.c
@@ -850,7 +850,8 @@ e_data_book_init (EDataBook *ebook)
 {
 	EGdbusBook *gdbus_object;
 
-	ebook->priv = G_TYPE_INSTANCE_GET_PRIVATE (ebook, E_TYPE_DATA_BOOK, EDataBookPrivate);
+	ebook->priv = G_TYPE_INSTANCE_GET_PRIVATE (
+		ebook, E_TYPE_DATA_BOOK, EDataBookPrivate);
 
 	ebook->priv->gdbus_object = e_gdbus_book_stub_new ();
 
diff --git a/calendar/backends/caldav/e-cal-backend-caldav.c b/calendar/backends/caldav/e-cal-backend-caldav.c
index bfda9c1..63f5259 100644
--- a/calendar/backends/caldav/e-cal-backend-caldav.c
+++ b/calendar/backends/caldav/e-cal-backend-caldav.c
@@ -4639,7 +4639,8 @@ e_cal_backend_caldav_finalize (GObject *object)
 static void
 e_cal_backend_caldav_init (ECalBackendCalDAV *cbdav)
 {
-	cbdav->priv = G_TYPE_INSTANCE_GET_PRIVATE (cbdav, E_TYPE_CAL_BACKEND_CALDAV, ECalBackendCalDAVPrivate);
+	cbdav->priv = G_TYPE_INSTANCE_GET_PRIVATE (
+		cbdav, E_TYPE_CAL_BACKEND_CALDAV, ECalBackendCalDAVPrivate);
 
 	cbdav->priv->session = soup_session_sync_new ();
 	g_object_set (cbdav->priv->session, SOUP_SESSION_TIMEOUT, 90, NULL);
diff --git a/calendar/libecal/e-cal-view.c b/calendar/libecal/e-cal-view.c
index 960c70f..379df5f 100644
--- a/calendar/libecal/e-cal-view.c
+++ b/calendar/libecal/e-cal-view.c
@@ -178,7 +178,8 @@ done_cb (EGdbusCalView *gdbus_calview, /* ECalendarStatus */ guint status, const
 static void
 e_cal_view_init (ECalView *view)
 {
-	view->priv = G_TYPE_INSTANCE_GET_PRIVATE (view, E_TYPE_CAL_VIEW, ECalViewPrivate);
+	view->priv = G_TYPE_INSTANCE_GET_PRIVATE (
+		view, E_TYPE_CAL_VIEW, ECalViewPrivate);
 }
 
 static void
diff --git a/calendar/libecal/e-cal.c b/calendar/libecal/e-cal.c
index 234e607..6835d45 100644
--- a/calendar/libecal/e-cal.c
+++ b/calendar/libecal/e-cal.c
@@ -410,7 +410,8 @@ e_cal_init (ECal *ecal)
 	active_cals++;
 	UNLOCK_FACTORY ();
 
-	ecal->priv = priv = G_TYPE_INSTANCE_GET_PRIVATE (ecal, E_TYPE_CAL, ECalPrivate);
+	ecal->priv = priv = G_TYPE_INSTANCE_GET_PRIVATE (
+		ecal, E_TYPE_CAL, ECalPrivate);
 
 	priv->load_state = E_CAL_LOAD_NOT_LOADED;
 	priv->uri = NULL;
diff --git a/calendar/libedata-cal/e-cal-backend-cache.c b/calendar/libedata-cal/e-cal-backend-cache.c
index 67b82d1..f90e19d 100644
--- a/calendar/libedata-cal/e-cal-backend-cache.c
+++ b/calendar/libedata-cal/e-cal-backend-cache.c
@@ -69,7 +69,8 @@ timezones_value_destroy (icaltimezone *zone)
 static void
 e_cal_backend_cache_init (ECalBackendCache *cache)
 {
-	cache->priv = G_TYPE_INSTANCE_GET_PRIVATE (cache, E_TYPE_CAL_BACKEND_CACHE, ECalBackendCachePrivate);
+	cache->priv = G_TYPE_INSTANCE_GET_PRIVATE (
+		cache, E_TYPE_CAL_BACKEND_CACHE, ECalBackendCachePrivate);
 
 	cache->priv->timezones = g_hash_table_new_full (
 		g_str_hash, g_str_equal,
diff --git a/calendar/libedata-cal/e-cal-backend-file-store.c b/calendar/libedata-cal/e-cal-backend-file-store.c
index 6d8fe2a..4dcd8d3 100644
--- a/calendar/libedata-cal/e-cal-backend-file-store.c
+++ b/calendar/libedata-cal/e-cal-backend-file-store.c
@@ -948,7 +948,9 @@ e_cal_backend_file_store_init (ECalBackendFileStore *store)
 {
 	ECalBackendFileStorePrivate *priv;
 
-	priv = G_TYPE_INSTANCE_GET_PRIVATE (store, E_TYPE_CAL_BACKEND_FILE_STORE, ECalBackendFileStorePrivate);
+	priv = G_TYPE_INSTANCE_GET_PRIVATE (
+		store, E_TYPE_CAL_BACKEND_FILE_STORE,
+		ECalBackendFileStorePrivate);
 
 	store->priv = priv;
 
diff --git a/calendar/libedata-cal/e-cal-backend-intervaltree.c b/calendar/libedata-cal/e-cal-backend-intervaltree.c
index 7cfe417..4c9e42e 100644
--- a/calendar/libedata-cal/e-cal-backend-intervaltree.c
+++ b/calendar/libedata-cal/e-cal-backend-intervaltree.c
@@ -776,7 +776,8 @@ e_intervaltree_init (EIntervalTree *tree)
 	EIntervalTreePrivate *priv;
 	EIntervalNode *root, *nil;
 
-	tree->priv = G_TYPE_INSTANCE_GET_PRIVATE (tree, E_TYPE_INTERVALTREE, EIntervalTreePrivate);
+	tree->priv = G_TYPE_INSTANCE_GET_PRIVATE (
+		tree, E_TYPE_INTERVALTREE, EIntervalTreePrivate);
 	priv = tree->priv;
 
 	priv->nil = nil = g_new (EIntervalNode, 1);
diff --git a/calendar/libedata-cal/e-cal-backend-store.c b/calendar/libedata-cal/e-cal-backend-store.c
index 129a3c7..158fd8b 100644
--- a/calendar/libedata-cal/e-cal-backend-store.c
+++ b/calendar/libedata-cal/e-cal-backend-store.c
@@ -124,7 +124,8 @@ e_cal_backend_store_class_init (ECalBackendStoreClass *class)
 static void
 e_cal_backend_store_init (ECalBackendStore *store)
 {
-	store->priv = G_TYPE_INSTANCE_GET_PRIVATE (store, E_TYPE_CAL_BACKEND_STORE, ECalBackendStorePrivate);
+	store->priv = G_TYPE_INSTANCE_GET_PRIVATE (
+		store, E_TYPE_CAL_BACKEND_STORE, ECalBackendStorePrivate);
 	store->priv->intervaltree = e_intervaltree_new ();
 }
 
diff --git a/calendar/libedata-cal/e-cal-backend.c b/calendar/libedata-cal/e-cal-backend.c
index acd3f8c..ff031c5 100644
--- a/calendar/libedata-cal/e-cal-backend.c
+++ b/calendar/libedata-cal/e-cal-backend.c
@@ -358,7 +358,8 @@ e_cal_backend_class_init (ECalBackendClass *class)
 static void
 e_cal_backend_init (ECalBackend *backend)
 {
-	backend->priv = G_TYPE_INSTANCE_GET_PRIVATE (backend, E_TYPE_CAL_BACKEND, ECalBackendPrivate);
+	backend->priv = G_TYPE_INSTANCE_GET_PRIVATE (
+		backend, E_TYPE_CAL_BACKEND, ECalBackendPrivate);
 
 	backend->priv->clients = NULL;
 	backend->priv->clients_mutex = g_mutex_new ();
diff --git a/calendar/libedata-cal/e-data-cal-factory.c b/calendar/libedata-cal/e-data-cal-factory.c
index 326ef01..26c6d6a 100644
--- a/calendar/libedata-cal/e-data-cal-factory.c
+++ b/calendar/libedata-cal/e-data-cal-factory.c
@@ -528,7 +528,8 @@ e_data_cal_factory_init (EDataCalFactory *factory)
 {
 	GError *error = NULL;
 
-	factory->priv = G_TYPE_INSTANCE_GET_PRIVATE (factory, E_TYPE_DATA_CAL_FACTORY, EDataCalFactoryPrivate);
+	factory->priv = G_TYPE_INSTANCE_GET_PRIVATE (
+		factory, E_TYPE_DATA_CAL_FACTORY, EDataCalFactoryPrivate);
 
 	factory->priv->gdbus_object = e_gdbus_cal_factory_stub_new ();
 	g_signal_connect (factory->priv->gdbus_object, "handle-get-cal", G_CALLBACK (impl_CalFactory_getCal), factory);
diff --git a/calendar/libedata-cal/e-data-cal-view.c b/calendar/libedata-cal/e-data-cal-view.c
index 18d7a24..5aec6d1 100644
--- a/calendar/libedata-cal/e-data-cal-view.c
+++ b/calendar/libedata-cal/e-data-cal-view.c
@@ -390,7 +390,8 @@ e_data_cal_view_get_property (GObject *object, guint property_id, GValue *value,
 static void
 e_data_cal_view_init (EDataCalView *query)
 {
-	EDataCalViewPrivate *priv = G_TYPE_INSTANCE_GET_PRIVATE (query, E_DATA_CAL_VIEW_TYPE, EDataCalViewPrivate);
+	EDataCalViewPrivate *priv = G_TYPE_INSTANCE_GET_PRIVATE (
+		query, E_DATA_CAL_VIEW_TYPE, EDataCalViewPrivate);
 
 	query->priv = priv;
 
diff --git a/calendar/libedata-cal/e-data-cal.c b/calendar/libedata-cal/e-data-cal.c
index 0b48753..87e9dd6 100644
--- a/calendar/libedata-cal/e-data-cal.c
+++ b/calendar/libedata-cal/e-data-cal.c
@@ -1207,7 +1207,8 @@ e_data_cal_init (EDataCal *ecal)
 {
 	EGdbusCal *gdbus_object;
 
-	ecal->priv = G_TYPE_INSTANCE_GET_PRIVATE (ecal, E_TYPE_DATA_CAL, EDataCalPrivate);
+	ecal->priv = G_TYPE_INSTANCE_GET_PRIVATE (
+		ecal, E_TYPE_DATA_CAL, EDataCalPrivate);
 
 	ecal->priv->gdbus_object = e_gdbus_cal_stub_new ();
 
diff --git a/camel/camel-certdb.c b/camel/camel-certdb.c
index f2845d2..33a4ae9 100644
--- a/camel/camel-certdb.c
+++ b/camel/camel-certdb.c
@@ -114,7 +114,8 @@ camel_certdb_class_init (CamelCertDBClass *class)
 static void
 camel_certdb_init (CamelCertDB *certdb)
 {
-	certdb->priv = G_TYPE_INSTANCE_GET_PRIVATE (certdb, CAMEL_TYPE_CERTDB, CamelCertDBPrivate);
+	certdb->priv = G_TYPE_INSTANCE_GET_PRIVATE (
+		certdb, CAMEL_TYPE_CERTDB, CamelCertDBPrivate);
 	certdb->filename = NULL;
 	certdb->version = CAMEL_CERTDB_VERSION;
 	certdb->saved_certs = 0;
diff --git a/camel/camel-cipher-context.c b/camel/camel-cipher-context.c
index 2fc0a33..fdcd17c 100644
--- a/camel/camel-cipher-context.c
+++ b/camel/camel-cipher-context.c
@@ -761,7 +761,8 @@ camel_cipher_context_class_init (CamelCipherContextClass *class)
 static void
 camel_cipher_context_init (CamelCipherContext *context)
 {
-	context->priv = G_TYPE_INSTANCE_GET_PRIVATE (context, CAMEL_TYPE_CIPHER_CONTEXT, CamelCipherContextPrivate);
+	context->priv = G_TYPE_INSTANCE_GET_PRIVATE (
+		context, CAMEL_TYPE_CIPHER_CONTEXT, CamelCipherContextPrivate);
 	context->priv->lock = g_mutex_new ();
 }
 
diff --git a/camel/camel-data-cache.c b/camel/camel-data-cache.c
index 9e8b051..e3ecd5f 100644
--- a/camel/camel-data-cache.c
+++ b/camel/camel-data-cache.c
@@ -149,7 +149,8 @@ camel_data_cache_init (CamelDataCache *data_cache)
 		(CamelCopyFunc) g_strdup,
 		(GFreeFunc) g_free);
 
-	data_cache->priv = G_TYPE_INSTANCE_GET_PRIVATE (data_cache, CAMEL_TYPE_DATA_CACHE, CamelDataCachePrivate);
+	data_cache->priv = G_TYPE_INSTANCE_GET_PRIVATE (
+		data_cache, CAMEL_TYPE_DATA_CACHE, CamelDataCachePrivate);
 	data_cache->priv->busy_bag = busy_bag;
 	data_cache->priv->expire_age = -1;
 	data_cache->priv->expire_access = -1;
diff --git a/camel/camel-data-wrapper.c b/camel/camel-data-wrapper.c
index b775ea6..070962a 100644
--- a/camel/camel-data-wrapper.c
+++ b/camel/camel-data-wrapper.c
@@ -471,7 +471,9 @@ camel_data_wrapper_class_init (CamelDataWrapperClass *class)
 static void
 camel_data_wrapper_init (CamelDataWrapper *data_wrapper)
 {
-	data_wrapper->priv = G_TYPE_INSTANCE_GET_PRIVATE (data_wrapper, CAMEL_TYPE_DATA_WRAPPER, CamelDataWrapperPrivate);
+	data_wrapper->priv = G_TYPE_INSTANCE_GET_PRIVATE (
+		data_wrapper, CAMEL_TYPE_DATA_WRAPPER,
+		CamelDataWrapperPrivate);
 
 	g_static_mutex_init (&data_wrapper->priv->stream_lock);
 
diff --git a/camel/camel-disco-folder.c b/camel/camel-disco-folder.c
index 54bbaf6..1d96fb9 100644
--- a/camel/camel-disco-folder.c
+++ b/camel/camel-disco-folder.c
@@ -470,7 +470,9 @@ camel_disco_folder_class_init (CamelDiscoFolderClass *class)
 static void
 camel_disco_folder_init (CamelDiscoFolder *disco_folder)
 {
-	disco_folder->priv = G_TYPE_INSTANCE_GET_PRIVATE (disco_folder, CAMEL_TYPE_DISCO_FOLDER, CamelDiscoFolderPrivate);
+	disco_folder->priv = G_TYPE_INSTANCE_GET_PRIVATE (
+		disco_folder, CAMEL_TYPE_DISCO_FOLDER,
+		CamelDiscoFolderPrivate);
 
 	g_signal_connect (
 		disco_folder, "changed",
diff --git a/camel/camel-filter-driver.c b/camel/camel-filter-driver.c
index 0d5d9d6..4fa8a78 100644
--- a/camel/camel-filter-driver.c
+++ b/camel/camel-filter-driver.c
@@ -249,7 +249,9 @@ camel_filter_driver_init (CamelFilterDriver *filter_driver)
 {
 	gint ii;
 
-	filter_driver->priv = G_TYPE_INSTANCE_GET_PRIVATE (filter_driver, CAMEL_TYPE_FILTER_DRIVER, CamelFilterDriverPrivate);
+	filter_driver->priv = G_TYPE_INSTANCE_GET_PRIVATE (
+		filter_driver, CAMEL_TYPE_FILTER_DRIVER,
+		CamelFilterDriverPrivate);
 
 	camel_dlist_init (&filter_driver->priv->rules);
 
diff --git a/camel/camel-folder-search.c b/camel/camel-folder-search.c
index 4c62050..7cfe9eb 100644
--- a/camel/camel-folder-search.c
+++ b/camel/camel-folder-search.c
@@ -157,7 +157,8 @@ camel_folder_search_class_init (CamelFolderSearchClass *class)
 static void
 camel_folder_search_init (CamelFolderSearch *search)
 {
-	search->priv = G_TYPE_INSTANCE_GET_PRIVATE (search, CAMEL_TYPE_FOLDER_SEARCH, CamelFolderSearchPrivate);
+	search->priv = G_TYPE_INSTANCE_GET_PRIVATE (
+		search, CAMEL_TYPE_FOLDER_SEARCH, CamelFolderSearchPrivate);
 	search->sexp = e_sexp_new ();
 }
 
diff --git a/camel/camel-folder-summary.c b/camel/camel-folder-summary.c
index 5aaccc3..e2da790 100644
--- a/camel/camel-folder-summary.c
+++ b/camel/camel-folder-summary.c
@@ -911,7 +911,8 @@ camel_folder_summary_class_init (CamelFolderSummaryClass *class)
 static void
 camel_folder_summary_init (CamelFolderSummary *summary)
 {
-	summary->priv = G_TYPE_INSTANCE_GET_PRIVATE (summary, CAMEL_TYPE_FOLDER_SUMMARY, CamelFolderSummaryPrivate);
+	summary->priv = G_TYPE_INSTANCE_GET_PRIVATE (
+		summary, CAMEL_TYPE_FOLDER_SUMMARY, CamelFolderSummaryPrivate);
 
 	summary->priv->filter_charset = g_hash_table_new (
 		camel_strcase_hash, camel_strcase_equal);
diff --git a/camel/camel-folder.c b/camel/camel-folder.c
index 1f57796..a83d90b 100644
--- a/camel/camel-folder.c
+++ b/camel/camel-folder.c
@@ -1641,7 +1641,8 @@ camel_folder_class_init (CamelFolderClass *class)
 static void
 camel_folder_init (CamelFolder *folder)
 {
-	folder->priv = G_TYPE_INSTANCE_GET_PRIVATE (folder, CAMEL_TYPE_FOLDER, CamelFolderPrivate);
+	folder->priv = G_TYPE_INSTANCE_GET_PRIVATE (
+		folder, CAMEL_TYPE_FOLDER, CamelFolderPrivate);
 	folder->priv->frozen = 0;
 	folder->priv->changed_frozen = camel_folder_change_info_new ();
 
diff --git a/camel/camel-gpg-context.c b/camel/camel-gpg-context.c
index 8495377..605b629 100644
--- a/camel/camel-gpg-context.c
+++ b/camel/camel-gpg-context.c
@@ -2233,7 +2233,8 @@ camel_gpg_context_class_init (CamelGpgContextClass *class)
 static void
 camel_gpg_context_init (CamelGpgContext *context)
 {
-	context->priv = G_TYPE_INSTANCE_GET_PRIVATE (context, CAMEL_TYPE_GPG_CONTEXT, CamelGpgContextPrivate);
+	context->priv = G_TYPE_INSTANCE_GET_PRIVATE (
+		context, CAMEL_TYPE_GPG_CONTEXT, CamelGpgContextPrivate);
 }
 
 /**
diff --git a/camel/camel-index.c b/camel/camel-index.c
index ab8643c..17baffe 100644
--- a/camel/camel-index.c
+++ b/camel/camel-index.c
@@ -74,7 +74,8 @@ camel_index_class_init (CamelIndexClass *class)
 static void
 camel_index_init (CamelIndex *index)
 {
-	index->priv = G_TYPE_INSTANCE_GET_PRIVATE (index, CAMEL_TYPE_INDEX, CamelIndexPrivate);
+	index->priv = G_TYPE_INSTANCE_GET_PRIVATE (
+		index, CAMEL_TYPE_INDEX, CamelIndexPrivate);
 	index->version = CAMEL_INDEX_VERSION;
 }
 
diff --git a/camel/camel-medium.c b/camel/camel-medium.c
index d12b61d..7799607 100644
--- a/camel/camel-medium.c
+++ b/camel/camel-medium.c
@@ -162,7 +162,8 @@ camel_medium_class_init (CamelMediumClass *class)
 static void
 camel_medium_init (CamelMedium *medium)
 {
-	medium->priv = G_TYPE_INSTANCE_GET_PRIVATE (medium, CAMEL_TYPE_MEDIUM, CamelMediumPrivate);
+	medium->priv = G_TYPE_INSTANCE_GET_PRIVATE (
+		medium, CAMEL_TYPE_MEDIUM, CamelMediumPrivate);
 }
 
 /**
diff --git a/camel/camel-mime-filter-basic.c b/camel/camel-mime-filter-basic.c
index 68c82ff..3986632 100644
--- a/camel/camel-mime-filter-basic.c
+++ b/camel/camel-mime-filter-basic.c
@@ -245,7 +245,9 @@ camel_mime_filter_basic_class_init (CamelMimeFilterBasicClass *class)
 static void
 camel_mime_filter_basic_init (CamelMimeFilterBasic *filter)
 {
-	filter->priv = G_TYPE_INSTANCE_GET_PRIVATE (filter, CAMEL_TYPE_MIME_FILTER_BASIC, CamelMimeFilterBasicPrivate);
+	filter->priv = G_TYPE_INSTANCE_GET_PRIVATE (
+		filter, CAMEL_TYPE_MIME_FILTER_BASIC,
+		CamelMimeFilterBasicPrivate);
 }
 
 /**
diff --git a/camel/camel-mime-filter-bestenc.c b/camel/camel-mime-filter-bestenc.c
index 8fb6183..570660c 100644
--- a/camel/camel-mime-filter-bestenc.c
+++ b/camel/camel-mime-filter-bestenc.c
@@ -211,7 +211,9 @@ camel_mime_filter_bestenc_class_init (CamelMimeFilterBestencClass *class)
 static void
 camel_mime_filter_bestenc_init (CamelMimeFilterBestenc *filter)
 {
-	filter->priv = G_TYPE_INSTANCE_GET_PRIVATE (filter, CAMEL_TYPE_MIME_FILTER_BESTENC, CamelMimeFilterBestencPrivate);
+	filter->priv = G_TYPE_INSTANCE_GET_PRIVATE (
+		filter, CAMEL_TYPE_MIME_FILTER_BESTENC,
+		CamelMimeFilterBestencPrivate);
 
 	mime_filter_bestenc_reset (CAMEL_MIME_FILTER (filter));
 }
diff --git a/camel/camel-mime-filter-canon.c b/camel/camel-mime-filter-canon.c
index 9c644c3..fb837cb 100644
--- a/camel/camel-mime-filter-canon.c
+++ b/camel/camel-mime-filter-canon.c
@@ -189,7 +189,9 @@ camel_mime_filter_canon_class_init (CamelMimeFilterCanonClass *class)
 static void
 camel_mime_filter_canon_init (CamelMimeFilterCanon *filter)
 {
-	filter->priv = G_TYPE_INSTANCE_GET_PRIVATE (filter, CAMEL_TYPE_MIME_FILTER_CANON, CamelMimeFilterCanonPrivate);
+	filter->priv = G_TYPE_INSTANCE_GET_PRIVATE (
+		filter, CAMEL_TYPE_MIME_FILTER_CANON,
+		CamelMimeFilterCanonPrivate);
 }
 
 /**
diff --git a/camel/camel-mime-filter-charset.c b/camel/camel-mime-filter-charset.c
index d6a6041..de5cd30 100644
--- a/camel/camel-mime-filter-charset.c
+++ b/camel/camel-mime-filter-charset.c
@@ -249,7 +249,9 @@ camel_mime_filter_charset_class_init (CamelMimeFilterCharsetClass *class)
 static void
 camel_mime_filter_charset_init (CamelMimeFilterCharset *filter)
 {
-	filter->priv = G_TYPE_INSTANCE_GET_PRIVATE (filter, CAMEL_TYPE_MIME_FILTER_CHARSET, CamelMimeFilterCharsetPrivate);
+	filter->priv = G_TYPE_INSTANCE_GET_PRIVATE (
+		filter, CAMEL_TYPE_MIME_FILTER_CHARSET,
+		CamelMimeFilterCharsetPrivate);
 	filter->priv->ic = (iconv_t) -1;
 }
 
diff --git a/camel/camel-mime-filter-crlf.c b/camel/camel-mime-filter-crlf.c
index c19dfb4..9cf0d00 100644
--- a/camel/camel-mime-filter-crlf.c
+++ b/camel/camel-mime-filter-crlf.c
@@ -166,7 +166,9 @@ camel_mime_filter_crlf_class_init (CamelMimeFilterCRLFClass *class)
 static void
 camel_mime_filter_crlf_init (CamelMimeFilterCRLF *filter)
 {
-	filter->priv = G_TYPE_INSTANCE_GET_PRIVATE (filter, CAMEL_TYPE_MIME_FILTER_CRLF, CamelMimeFilterCRLFPrivate);
+	filter->priv = G_TYPE_INSTANCE_GET_PRIVATE (
+		filter, CAMEL_TYPE_MIME_FILTER_CRLF,
+		CamelMimeFilterCRLFPrivate);
 
 	filter->priv->saw_cr = FALSE;
 	filter->priv->saw_lf = TRUE;
diff --git a/camel/camel-mime-filter-enriched.c b/camel/camel-mime-filter-enriched.c
index e4c5408..c33b92c 100644
--- a/camel/camel-mime-filter-enriched.c
+++ b/camel/camel-mime-filter-enriched.c
@@ -545,7 +545,9 @@ camel_mime_filter_enriched_class_init (CamelMimeFilterEnrichedClass *class)
 static void
 camel_mime_filter_enriched_init (CamelMimeFilterEnriched *filter)
 {
-	filter->priv = G_TYPE_INSTANCE_GET_PRIVATE (filter, CAMEL_TYPE_MIME_FILTER_ENRICHED, CamelMimeFilterEnrichedPrivate);
+	filter->priv = G_TYPE_INSTANCE_GET_PRIVATE (
+		filter, CAMEL_TYPE_MIME_FILTER_ENRICHED,
+		CamelMimeFilterEnrichedPrivate);
 }
 
 /**
diff --git a/camel/camel-mime-filter-from.c b/camel/camel-mime-filter-from.c
index f297967..6784a4e 100644
--- a/camel/camel-mime-filter-from.c
+++ b/camel/camel-mime-filter-from.c
@@ -160,7 +160,9 @@ camel_mime_filter_from_class_init (CamelMimeFilterFromClass *class)
 static void
 camel_mime_filter_from_init (CamelMimeFilterFrom *filter)
 {
-	filter->priv = G_TYPE_INSTANCE_GET_PRIVATE (filter, CAMEL_TYPE_MIME_FILTER_FROM, CamelMimeFilterFromPrivate);
+	filter->priv = G_TYPE_INSTANCE_GET_PRIVATE (
+		filter, CAMEL_TYPE_MIME_FILTER_FROM,
+		CamelMimeFilterFromPrivate);
 }
 
 /**
diff --git a/camel/camel-mime-filter-gzip.c b/camel/camel-mime-filter-gzip.c
index e98116b..7926b8f 100644
--- a/camel/camel-mime-filter-gzip.c
+++ b/camel/camel-mime-filter-gzip.c
@@ -441,7 +441,9 @@ camel_mime_filter_gzip_class_init (CamelMimeFilterGZipClass *class)
 static void
 camel_mime_filter_gzip_init (CamelMimeFilterGZip *mime_filter)
 {
-	mime_filter->priv = G_TYPE_INSTANCE_GET_PRIVATE (mime_filter, CAMEL_TYPE_MIME_FILTER_GZIP, CamelMimeFilterGZipPrivate);
+	mime_filter->priv = G_TYPE_INSTANCE_GET_PRIVATE (
+		mime_filter, CAMEL_TYPE_MIME_FILTER_GZIP,
+		CamelMimeFilterGZipPrivate);
 	mime_filter->priv->stream = g_new0 (z_stream, 1);
 	mime_filter->priv->crc32 = crc32 (0, Z_NULL, 0);
 }
diff --git a/camel/camel-mime-filter-html.c b/camel/camel-mime-filter-html.c
index 0ac795c..40032a2 100644
--- a/camel/camel-mime-filter-html.c
+++ b/camel/camel-mime-filter-html.c
@@ -190,7 +190,9 @@ camel_mime_filter_html_class_init (CamelMimeFilterHTMLClass *class)
 static void
 camel_mime_filter_html_init (CamelMimeFilterHTML *mime_filter)
 {
-	mime_filter->priv = G_TYPE_INSTANCE_GET_PRIVATE (mime_filter, CAMEL_TYPE_MIME_FILTER_HTML, CamelMimeFilterHTMLPrivate);
+	mime_filter->priv = G_TYPE_INSTANCE_GET_PRIVATE (
+		mime_filter, CAMEL_TYPE_MIME_FILTER_HTML,
+		CamelMimeFilterHTMLPrivate);
 	mime_filter->priv->ctxt = camel_html_parser_new ();
 }
 
diff --git a/camel/camel-mime-filter-index.c b/camel/camel-mime-filter-index.c
index 059fa80..5385188 100644
--- a/camel/camel-mime-filter-index.c
+++ b/camel/camel-mime-filter-index.c
@@ -119,7 +119,9 @@ camel_mime_filter_index_class_init (CamelMimeFilterIndexClass *class)
 static void
 camel_mime_filter_index_init (CamelMimeFilterIndex *filter)
 {
-	filter->priv = G_TYPE_INSTANCE_GET_PRIVATE (filter, CAMEL_TYPE_MIME_FILTER_INDEX, CamelMimeFilterIndexPrivate);
+	filter->priv = G_TYPE_INSTANCE_GET_PRIVATE (
+		filter, CAMEL_TYPE_MIME_FILTER_INDEX,
+		CamelMimeFilterIndexPrivate);
 }
 
 /**
diff --git a/camel/camel-mime-filter-linewrap.c b/camel/camel-mime-filter-linewrap.c
index 6d6c2ff..253f4a7 100644
--- a/camel/camel-mime-filter-linewrap.c
+++ b/camel/camel-mime-filter-linewrap.c
@@ -175,7 +175,9 @@ camel_mime_filter_linewrap_class_init (CamelMimeFilterLinewrapClass *class)
 static void
 camel_mime_filter_linewrap_init (CamelMimeFilterLinewrap *filter)
 {
-	filter->priv = G_TYPE_INSTANCE_GET_PRIVATE (filter, CAMEL_TYPE_MIME_FILTER_LINEWRAP, CamelMimeFilterLinewrapPrivate);
+	filter->priv = G_TYPE_INSTANCE_GET_PRIVATE (
+		filter, CAMEL_TYPE_MIME_FILTER_LINEWRAP,
+		CamelMimeFilterLinewrapPrivate);
 }
 
 CamelMimeFilter *
diff --git a/camel/camel-mime-filter-pgp.c b/camel/camel-mime-filter-pgp.c
index fe868dc..521ab49 100644
--- a/camel/camel-mime-filter-pgp.c
+++ b/camel/camel-mime-filter-pgp.c
@@ -200,7 +200,9 @@ camel_mime_filter_pgp_class_init (CamelMimeFilterPgpClass *class)
 static void
 camel_mime_filter_pgp_init (CamelMimeFilterPgp *filter)
 {
-	filter->priv = G_TYPE_INSTANCE_GET_PRIVATE (filter, CAMEL_TYPE_MIME_FILTER_PGP, CamelMimeFilterPgpPrivate);
+	filter->priv = G_TYPE_INSTANCE_GET_PRIVATE (
+		filter, CAMEL_TYPE_MIME_FILTER_PGP,
+		CamelMimeFilterPgpPrivate);
 }
 
 CamelMimeFilter *
diff --git a/camel/camel-mime-filter-progress.c b/camel/camel-mime-filter-progress.c
index 436cc8a..e44271b 100644
--- a/camel/camel-mime-filter-progress.c
+++ b/camel/camel-mime-filter-progress.c
@@ -128,7 +128,9 @@ camel_mime_filter_progress_class_init (CamelMimeFilterProgressClass *class)
 static void
 camel_mime_filter_progress_init (CamelMimeFilterProgress *filter)
 {
-	filter->priv = G_TYPE_INSTANCE_GET_PRIVATE (filter, CAMEL_TYPE_MIME_FILTER_PROGRESS, CamelMimeFilterProgressPrivate);
+	filter->priv = G_TYPE_INSTANCE_GET_PRIVATE (
+		filter, CAMEL_TYPE_MIME_FILTER_PROGRESS,
+		CamelMimeFilterProgressPrivate);
 }
 
 /**
diff --git a/camel/camel-mime-filter-save.c b/camel/camel-mime-filter-save.c
index 4966e73..2604f39 100644
--- a/camel/camel-mime-filter-save.c
+++ b/camel/camel-mime-filter-save.c
@@ -91,7 +91,9 @@ camel_mime_filter_save_class_init (CamelMimeFilterSaveClass *class)
 static void
 camel_mime_filter_save_init (CamelMimeFilterSave *filter)
 {
-	filter->priv = G_TYPE_INSTANCE_GET_PRIVATE (filter, CAMEL_TYPE_MIME_FILTER_SAVE, CamelMimeFilterSavePrivate);
+	filter->priv = G_TYPE_INSTANCE_GET_PRIVATE (
+		filter, CAMEL_TYPE_MIME_FILTER_SAVE,
+		CamelMimeFilterSavePrivate);
 }
 
 /**
diff --git a/camel/camel-mime-filter-tohtml.c b/camel/camel-mime-filter-tohtml.c
index 962a843..54ebdb1 100644
--- a/camel/camel-mime-filter-tohtml.c
+++ b/camel/camel-mime-filter-tohtml.c
@@ -460,7 +460,9 @@ camel_mime_filter_tohtml_class_init (CamelMimeFilterToHTMLClass *class)
 static void
 camel_mime_filter_tohtml_init (CamelMimeFilterToHTML *filter)
 {
-	filter->priv = G_TYPE_INSTANCE_GET_PRIVATE (filter, CAMEL_TYPE_MIME_FILTER_TOHTML, CamelMimeFilterToHTMLPrivate);
+	filter->priv = G_TYPE_INSTANCE_GET_PRIVATE (
+		filter, CAMEL_TYPE_MIME_FILTER_TOHTML,
+		CamelMimeFilterToHTMLPrivate);
 	filter->priv->scanner = camel_url_scanner_new ();
 }
 
diff --git a/camel/camel-mime-filter-windows.c b/camel/camel-mime-filter-windows.c
index 72d5bfe..cfaf797 100644
--- a/camel/camel-mime-filter-windows.c
+++ b/camel/camel-mime-filter-windows.c
@@ -134,7 +134,9 @@ camel_mime_filter_windows_class_init (CamelMimeFilterWindowsClass *class)
 static void
 camel_mime_filter_windows_init (CamelMimeFilterWindows *filter)
 {
-	filter->priv = G_TYPE_INSTANCE_GET_PRIVATE (filter, CAMEL_TYPE_MIME_FILTER_WINDOWS, CamelMimeFilterWindowsPrivate);
+	filter->priv = G_TYPE_INSTANCE_GET_PRIVATE (
+		filter, CAMEL_TYPE_MIME_FILTER_WINDOWS,
+		CamelMimeFilterWindowsPrivate);
 }
 
 /**
diff --git a/camel/camel-mime-filter-yenc.c b/camel/camel-mime-filter-yenc.c
index cf81579..16c738a 100644
--- a/camel/camel-mime-filter-yenc.c
+++ b/camel/camel-mime-filter-yenc.c
@@ -236,7 +236,9 @@ camel_mime_filter_yenc_class_init (CamelMimeFilterYencClass *class)
 static void
 camel_mime_filter_yenc_init (CamelMimeFilterYenc *filter)
 {
-	filter->priv = G_TYPE_INSTANCE_GET_PRIVATE (filter, CAMEL_TYPE_MIME_FILTER_YENC, CamelMimeFilterYencPrivate);
+	filter->priv = G_TYPE_INSTANCE_GET_PRIVATE (
+		filter, CAMEL_TYPE_MIME_FILTER_YENC,
+		CamelMimeFilterYencPrivate);
 
 	filter->priv->part = 0;
 	filter->priv->pcrc = CAMEL_MIME_YENCODE_CRC_INIT;
diff --git a/camel/camel-mime-filter.c b/camel/camel-mime-filter.c
index 0f98de1..c54c689 100644
--- a/camel/camel-mime-filter.c
+++ b/camel/camel-mime-filter.c
@@ -82,7 +82,8 @@ camel_mime_filter_class_init (CamelMimeFilterClass *class)
 static void
 camel_mime_filter_init (CamelMimeFilter *mime_filter)
 {
-	mime_filter->priv = G_TYPE_INSTANCE_GET_PRIVATE (mime_filter, CAMEL_TYPE_MIME_FILTER, CamelMimeFilterPrivate);
+	mime_filter->priv = G_TYPE_INSTANCE_GET_PRIVATE (
+		mime_filter, CAMEL_TYPE_MIME_FILTER, CamelMimeFilterPrivate);
 
 	mime_filter->outreal = NULL;
 	mime_filter->outbuf = NULL;
diff --git a/camel/camel-mime-part.c b/camel/camel-mime-part.c
index f428283..9a6369a 100644
--- a/camel/camel-mime-part.c
+++ b/camel/camel-mime-part.c
@@ -915,7 +915,8 @@ camel_mime_part_init (CamelMimePart *mime_part)
 {
 	CamelDataWrapper *data_wrapper;
 
-	mime_part->priv = G_TYPE_INSTANCE_GET_PRIVATE (mime_part, CAMEL_TYPE_MIME_PART, CamelMimePartPrivate);
+	mime_part->priv = G_TYPE_INSTANCE_GET_PRIVATE (
+		mime_part, CAMEL_TYPE_MIME_PART, CamelMimePartPrivate);
 	mime_part->priv->encoding = CAMEL_TRANSFER_ENCODING_DEFAULT;
 
 	data_wrapper = CAMEL_DATA_WRAPPER (mime_part);
diff --git a/camel/camel-object.c b/camel/camel-object.c
index 42c3c61..b6267c2 100644
--- a/camel/camel-object.c
+++ b/camel/camel-object.c
@@ -360,7 +360,8 @@ camel_object_class_init (CamelObjectClass *class)
 static void
 camel_object_init (CamelObject *object)
 {
-	object->priv = G_TYPE_INSTANCE_GET_PRIVATE (object, CAMEL_TYPE_OBJECT, CamelObjectPrivate);
+	object->priv = G_TYPE_INSTANCE_GET_PRIVATE (
+		object, CAMEL_TYPE_OBJECT, CamelObjectPrivate);
 }
 
 GQuark
diff --git a/camel/camel-offline-folder.c b/camel/camel-offline-folder.c
index 52b23bd..8ab0405 100644
--- a/camel/camel-offline-folder.c
+++ b/camel/camel-offline-folder.c
@@ -318,7 +318,8 @@ camel_offline_folder_class_init (CamelOfflineFolderClass *class)
 static void
 camel_offline_folder_init (CamelOfflineFolder *folder)
 {
-	folder->priv = G_TYPE_INSTANCE_GET_PRIVATE (folder, CAMEL_TYPE_OFFLINE_FOLDER, CamelOfflineFolderPrivate);
+	folder->priv = G_TYPE_INSTANCE_GET_PRIVATE (
+		folder, CAMEL_TYPE_OFFLINE_FOLDER, CamelOfflineFolderPrivate);
 
 	g_signal_connect (
 		folder, "changed",
diff --git a/camel/camel-offline-store.c b/camel/camel-offline-store.c
index 6ce9c49..b5b9a35 100644
--- a/camel/camel-offline-store.c
+++ b/camel/camel-offline-store.c
@@ -71,7 +71,8 @@ camel_offline_store_class_init (CamelOfflineStoreClass *class)
 static void
 camel_offline_store_init (CamelOfflineStore *store)
 {
-	store->priv = G_TYPE_INSTANCE_GET_PRIVATE (store, CAMEL_TYPE_OFFLINE_STORE, CamelOfflineStorePrivate);
+	store->priv = G_TYPE_INSTANCE_GET_PRIVATE (
+		store, CAMEL_TYPE_OFFLINE_STORE, CamelOfflineStorePrivate);
 	store->priv->online = TRUE;
 }
 
diff --git a/camel/camel-operation.c b/camel/camel-operation.c
index cbcf34c..b89bc5a 100644
--- a/camel/camel-operation.c
+++ b/camel/camel-operation.c
@@ -203,7 +203,8 @@ camel_operation_class_init (CamelOperationClass *class)
 static void
 camel_operation_init (CamelOperation *operation)
 {
-	operation->priv = G_TYPE_INSTANCE_GET_PRIVATE (operation, CAMEL_TYPE_OPERATION, CamelOperationPrivate);
+	operation->priv = G_TYPE_INSTANCE_GET_PRIVATE (
+		operation, CAMEL_TYPE_OPERATION, CamelOperationPrivate);
 
 	g_queue_init (&operation->priv->status_stack);
 	operation->priv->cancel_port = camel_msgport_new ();
diff --git a/camel/camel-partition-table.c b/camel/camel-partition-table.c
index af2e2da..ce94165 100644
--- a/camel/camel-partition-table.c
+++ b/camel/camel-partition-table.c
@@ -88,7 +88,8 @@ camel_partition_table_class_init (CamelPartitionTableClass *class)
 static void
 camel_partition_table_init (CamelPartitionTable *cpi)
 {
-	cpi->priv = G_TYPE_INSTANCE_GET_PRIVATE (cpi, CAMEL_TYPE_PARTITION_TABLE, CamelPartitionTablePrivate);
+	cpi->priv = G_TYPE_INSTANCE_GET_PRIVATE (
+		cpi, CAMEL_TYPE_PARTITION_TABLE, CamelPartitionTablePrivate);
 
 	camel_dlist_init (&cpi->partition);
 	g_static_mutex_init (&cpi->priv->lock);
@@ -638,7 +639,8 @@ camel_key_table_class_init (CamelKeyTableClass *class)
 static void
 camel_key_table_init (CamelKeyTable *table)
 {
-	table->priv = G_TYPE_INSTANCE_GET_PRIVATE (table, CAMEL_TYPE_KEY_TABLE, CamelKeyTablePrivate);
+	table->priv = G_TYPE_INSTANCE_GET_PRIVATE (
+		table, CAMEL_TYPE_KEY_TABLE, CamelKeyTablePrivate);
 	g_static_mutex_init (&table->priv->lock);
 }
 
diff --git a/camel/camel-sasl-cram-md5.c b/camel/camel-sasl-cram-md5.c
index acaf2ef..1bf4800 100644
--- a/camel/camel-sasl-cram-md5.c
+++ b/camel/camel-sasl-cram-md5.c
@@ -142,5 +142,6 @@ camel_sasl_cram_md5_class_init (CamelSaslCramMd5Class *class)
 static void
 camel_sasl_cram_md5_init (CamelSaslCramMd5 *sasl)
 {
-	sasl->priv = G_TYPE_INSTANCE_GET_PRIVATE (sasl, CAMEL_TYPE_SASL_CRAM_MD5, CamelSaslCramMd5Private);
+	sasl->priv = G_TYPE_INSTANCE_GET_PRIVATE (
+		sasl, CAMEL_TYPE_SASL_CRAM_MD5, CamelSaslCramMd5Private);
 }
diff --git a/camel/camel-sasl-digest-md5.c b/camel/camel-sasl-digest-md5.c
index 7d0e19e..5324f81 100644
--- a/camel/camel-sasl-digest-md5.c
+++ b/camel/camel-sasl-digest-md5.c
@@ -942,5 +942,6 @@ camel_sasl_digest_md5_class_init (CamelSaslDigestMd5Class *class)
 static void
 camel_sasl_digest_md5_init (CamelSaslDigestMd5 *sasl)
 {
-	sasl->priv = G_TYPE_INSTANCE_GET_PRIVATE (sasl, CAMEL_TYPE_SASL_DIGEST_MD5, CamelSaslDigestMd5Private);
+	sasl->priv = G_TYPE_INSTANCE_GET_PRIVATE (
+		sasl, CAMEL_TYPE_SASL_DIGEST_MD5, CamelSaslDigestMd5Private);
 }
diff --git a/camel/camel-sasl-gssapi.c b/camel/camel-sasl-gssapi.c
index 23f6102..cb59919 100644
--- a/camel/camel-sasl-gssapi.c
+++ b/camel/camel-sasl-gssapi.c
@@ -441,7 +441,8 @@ static void
 camel_sasl_gssapi_init (CamelSaslGssapi *sasl)
 {
 #ifdef HAVE_KRB5
-	sasl->priv = G_TYPE_INSTANCE_GET_PRIVATE (sasl, CAMEL_TYPE_SASL_GSSAPI, CamelSaslGssapiPrivate);
+	sasl->priv = G_TYPE_INSTANCE_GET_PRIVATE (
+		sasl, CAMEL_TYPE_SASL_GSSAPI, CamelSaslGssapiPrivate);
 	sasl->priv->state = GSSAPI_STATE_INIT;
 	sasl->priv->ctx = GSS_C_NO_CONTEXT;
 	sasl->priv->target = GSS_C_NO_NAME;
diff --git a/camel/camel-sasl-login.c b/camel/camel-sasl-login.c
index f3ca3d2..ef16d1b 100644
--- a/camel/camel-sasl-login.c
+++ b/camel/camel-sasl-login.c
@@ -110,5 +110,6 @@ camel_sasl_login_class_init (CamelSaslLoginClass *class)
 static void
 camel_sasl_login_init (CamelSaslLogin *sasl)
 {
-	sasl->priv = G_TYPE_INSTANCE_GET_PRIVATE (sasl, CAMEL_TYPE_SASL_LOGIN, CamelSaslLoginPrivate);
+	sasl->priv = G_TYPE_INSTANCE_GET_PRIVATE (
+		sasl, CAMEL_TYPE_SASL_LOGIN, CamelSaslLoginPrivate);
 }
diff --git a/camel/camel-sasl-ntlm.c b/camel/camel-sasl-ntlm.c
index 94d50d5..e180725 100644
--- a/camel/camel-sasl-ntlm.c
+++ b/camel/camel-sasl-ntlm.c
@@ -732,5 +732,6 @@ camel_sasl_ntlm_class_init (CamelSaslNTLMClass *class)
 static void
 camel_sasl_ntlm_init (CamelSaslNTLM *sasl)
 {
-	sasl->priv = G_TYPE_INSTANCE_GET_PRIVATE (sasl, CAMEL_TYPE_SASL_NTLM, CamelSaslNTLMPrivate);
+	sasl->priv = G_TYPE_INSTANCE_GET_PRIVATE (
+		sasl, CAMEL_TYPE_SASL_NTLM, CamelSaslNTLMPrivate);
 }
diff --git a/camel/camel-sasl-plain.c b/camel/camel-sasl-plain.c
index a4b0049..9609581 100644
--- a/camel/camel-sasl-plain.c
+++ b/camel/camel-sasl-plain.c
@@ -87,5 +87,6 @@ camel_sasl_plain_class_init (CamelSaslPlainClass *class)
 static void
 camel_sasl_plain_init (CamelSaslPlain *sasl)
 {
-	sasl->priv = G_TYPE_INSTANCE_GET_PRIVATE (sasl, CAMEL_TYPE_SASL_PLAIN, CamelSaslPlainPrivate);
+	sasl->priv = G_TYPE_INSTANCE_GET_PRIVATE (
+		sasl, CAMEL_TYPE_SASL_PLAIN, CamelSaslPlainPrivate);
 }
diff --git a/camel/camel-sasl-popb4smtp.c b/camel/camel-sasl-popb4smtp.c
index eb90afa..c279c01 100644
--- a/camel/camel-sasl-popb4smtp.c
+++ b/camel/camel-sasl-popb4smtp.c
@@ -148,5 +148,6 @@ camel_sasl_popb4smtp_class_init (CamelSaslPOPB4SMTPClass *class)
 static void
 camel_sasl_popb4smtp_init (CamelSaslPOPB4SMTP *sasl)
 {
-	sasl->priv = G_TYPE_INSTANCE_GET_PRIVATE (sasl, CAMEL_TYPE_SASL_POPB4SMTP, CamelSaslPOPB4SMTPPrivate);
+	sasl->priv = G_TYPE_INSTANCE_GET_PRIVATE (
+		sasl, CAMEL_TYPE_SASL_POPB4SMTP, CamelSaslPOPB4SMTPPrivate);
 }
diff --git a/camel/camel-sasl.c b/camel/camel-sasl.c
index d4290fe..0b4b67c 100644
--- a/camel/camel-sasl.c
+++ b/camel/camel-sasl.c
@@ -350,7 +350,8 @@ camel_sasl_class_init (CamelSaslClass *class)
 static void
 camel_sasl_init (CamelSasl *sasl)
 {
-	sasl->priv = G_TYPE_INSTANCE_GET_PRIVATE (sasl, CAMEL_TYPE_SASL, CamelSaslPrivate);
+	sasl->priv = G_TYPE_INSTANCE_GET_PRIVATE (
+		sasl, CAMEL_TYPE_SASL, CamelSaslPrivate);
 }
 
 /**
diff --git a/camel/camel-service.c b/camel/camel-service.c
index 5bb7e7d..888ec49 100644
--- a/camel/camel-service.c
+++ b/camel/camel-service.c
@@ -224,7 +224,8 @@ camel_service_class_init (CamelServiceClass *class)
 static void
 camel_service_init (CamelService *service)
 {
-	service->priv = G_TYPE_INSTANCE_GET_PRIVATE (service, CAMEL_TYPE_SERVICE, CamelServicePrivate);
+	service->priv = G_TYPE_INSTANCE_GET_PRIVATE (
+		service, CAMEL_TYPE_SERVICE, CamelServicePrivate);
 
 	g_static_rec_mutex_init (&service->priv->connect_lock);
 	g_static_mutex_init (&service->priv->connect_op_lock);
diff --git a/camel/camel-session.c b/camel/camel-session.c
index 306ca18..4f0c296 100644
--- a/camel/camel-session.c
+++ b/camel/camel-session.c
@@ -425,7 +425,8 @@ camel_session_class_init (CamelSessionClass *class)
 static void
 camel_session_init (CamelSession *session)
 {
-	session->priv = G_TYPE_INSTANCE_GET_PRIVATE (session, CAMEL_TYPE_SESSION, CamelSessionPrivate);
+	session->priv = G_TYPE_INSTANCE_GET_PRIVATE (
+		session, CAMEL_TYPE_SESSION, CamelSessionPrivate);
 	session->priv->lock = g_mutex_new ();
 	session->priv->thread_lock = g_mutex_new ();
 	session->priv->thread_id = 1;
diff --git a/camel/camel-smime-context.c b/camel/camel-smime-context.c
index 47e22fa..ada0edd 100644
--- a/camel/camel-smime-context.c
+++ b/camel/camel-smime-context.c
@@ -1285,7 +1285,9 @@ camel_smime_context_class_init (CamelSMIMEContextClass *class)
 static void
 camel_smime_context_init (CamelSMIMEContext *smime_context)
 {
-	smime_context->priv = G_TYPE_INSTANCE_GET_PRIVATE (smime_context, CAMEL_TYPE_SMIME_CONTEXT, CamelSMIMEContextPrivate);
+	smime_context->priv = G_TYPE_INSTANCE_GET_PRIVATE (
+		smime_context, CAMEL_TYPE_SMIME_CONTEXT,
+		CamelSMIMEContextPrivate);
 	smime_context->priv->certdb = CERT_GetDefaultCertDB ();
 	smime_context->priv->sign_mode = CAMEL_SMIME_SIGN_CLEARSIGN;
 	smime_context->priv->password_tries = 0;
diff --git a/camel/camel-store-summary.c b/camel/camel-store-summary.c
index 2105b89..d15bf1a 100644
--- a/camel/camel-store-summary.c
+++ b/camel/camel-store-summary.c
@@ -316,7 +316,8 @@ camel_store_summary_class_init (CamelStoreSummaryClass *class)
 static void
 camel_store_summary_init (CamelStoreSummary *summary)
 {
-	summary->priv = G_TYPE_INSTANCE_GET_PRIVATE (summary, CAMEL_TYPE_STORE_SUMMARY, CamelStoreSummaryPrivate);
+	summary->priv = G_TYPE_INSTANCE_GET_PRIVATE (
+		summary, CAMEL_TYPE_STORE_SUMMARY, CamelStoreSummaryPrivate);
 	summary->store_info_size = sizeof (CamelStoreInfo);
 
 	summary->store_info_chunks = NULL;
diff --git a/camel/camel-store.c b/camel/camel-store.c
index 07f7b47..470e0f6 100644
--- a/camel/camel-store.c
+++ b/camel/camel-store.c
@@ -1361,7 +1361,8 @@ camel_store_class_init (CamelStoreClass *class)
 static void
 camel_store_init (CamelStore *store)
 {
-	store->priv = G_TYPE_INSTANCE_GET_PRIVATE (store, CAMEL_TYPE_STORE, CamelStorePrivate);
+	store->priv = G_TYPE_INSTANCE_GET_PRIVATE (
+		store, CAMEL_TYPE_STORE, CamelStorePrivate);
 
 	/* set vtrash and vjunk on by default */
 	store->flags = CAMEL_STORE_VTRASH | CAMEL_STORE_VJUNK;
diff --git a/camel/camel-stream-buffer.c b/camel/camel-stream-buffer.c
index a8cb54c..8e2617f 100644
--- a/camel/camel-stream-buffer.c
+++ b/camel/camel-stream-buffer.c
@@ -365,7 +365,8 @@ camel_stream_buffer_class_init (CamelStreamBufferClass *class)
 static void
 camel_stream_buffer_init (CamelStreamBuffer *stream)
 {
-	stream->priv = G_TYPE_INSTANCE_GET_PRIVATE (stream, CAMEL_TYPE_STREAM_BUFFER, CamelStreamBufferPrivate);
+	stream->priv = G_TYPE_INSTANCE_GET_PRIVATE (
+		stream, CAMEL_TYPE_STREAM_BUFFER, CamelStreamBufferPrivate);
 	stream->priv->flags = 0;
 	stream->priv->size = BUF_SIZE;
 	stream->priv->buf = g_malloc (BUF_SIZE);
diff --git a/camel/camel-stream-filter.c b/camel/camel-stream-filter.c
index e29694f..fc6646f 100644
--- a/camel/camel-stream-filter.c
+++ b/camel/camel-stream-filter.c
@@ -333,7 +333,8 @@ camel_stream_filter_class_init (CamelStreamFilterClass *class)
 static void
 camel_stream_filter_init (CamelStreamFilter *stream)
 {
-	stream->priv = G_TYPE_INSTANCE_GET_PRIVATE (stream, CAMEL_TYPE_STREAM_FILTER, CamelStreamFilterPrivate);
+	stream->priv = G_TYPE_INSTANCE_GET_PRIVATE (
+		stream, CAMEL_TYPE_STREAM_FILTER, CamelStreamFilterPrivate);
 	stream->priv->realbuffer = g_malloc (READ_SIZE + READ_PAD);
 	stream->priv->buffer = stream->priv->realbuffer + READ_PAD;
 	stream->priv->last_was_read = TRUE;
diff --git a/camel/camel-stream-fs.c b/camel/camel-stream-fs.c
index 54af8f6..976bb3a 100644
--- a/camel/camel-stream-fs.c
+++ b/camel/camel-stream-fs.c
@@ -258,7 +258,8 @@ camel_stream_fs_seekable_init (GSeekableIface *interface)
 static void
 camel_stream_fs_init (CamelStreamFs *stream)
 {
-	stream->priv = G_TYPE_INSTANCE_GET_PRIVATE (stream, CAMEL_TYPE_STREAM_FS, CamelStreamFsPrivate);
+	stream->priv = G_TYPE_INSTANCE_GET_PRIVATE (
+		stream, CAMEL_TYPE_STREAM_FS, CamelStreamFsPrivate);
 	stream->priv->fd = -1;
 }
 
diff --git a/camel/camel-stream-mem.c b/camel/camel-stream-mem.c
index e3ed3ed..7d7203a 100644
--- a/camel/camel-stream-mem.c
+++ b/camel/camel-stream-mem.c
@@ -250,7 +250,8 @@ camel_stream_mem_seekable_init (GSeekableIface *interface)
 static void
 camel_stream_mem_init (CamelStreamMem *stream)
 {
-	stream->priv = G_TYPE_INSTANCE_GET_PRIVATE (stream, CAMEL_TYPE_STREAM_MEM, CamelStreamMemPrivate);
+	stream->priv = G_TYPE_INSTANCE_GET_PRIVATE (
+		stream, CAMEL_TYPE_STREAM_MEM, CamelStreamMemPrivate);
 }
 
 /**
diff --git a/camel/camel-tcp-stream-raw.c b/camel/camel-tcp-stream-raw.c
index 4074519..5241faa 100644
--- a/camel/camel-tcp-stream-raw.c
+++ b/camel/camel-tcp-stream-raw.c
@@ -1313,7 +1313,8 @@ camel_tcp_stream_raw_init (CamelTcpStreamRaw *stream)
 {
 	CamelTcpStreamRawPrivate *priv;
 
-	stream->priv = G_TYPE_INSTANCE_GET_PRIVATE (stream, CAMEL_TYPE_TCP_STREAM_RAW, CamelTcpStreamRawPrivate);
+	stream->priv = G_TYPE_INSTANCE_GET_PRIVATE (
+		stream, CAMEL_TYPE_TCP_STREAM_RAW, CamelTcpStreamRawPrivate);
 	priv = stream->priv;
 
 	priv->sockfd = NULL;
diff --git a/camel/camel-tcp-stream-ssl.c b/camel/camel-tcp-stream-ssl.c
index 0411d19..b486bfa 100644
--- a/camel/camel-tcp-stream-ssl.c
+++ b/camel/camel-tcp-stream-ssl.c
@@ -762,7 +762,8 @@ camel_tcp_stream_ssl_class_init (CamelTcpStreamSSLClass *class)
 static void
 camel_tcp_stream_ssl_init (CamelTcpStreamSSL *stream)
 {
-	stream->priv = G_TYPE_INSTANCE_GET_PRIVATE (stream, CAMEL_TYPE_TCP_STREAM_SSL, CamelTcpStreamSSLPrivate);
+	stream->priv = G_TYPE_INSTANCE_GET_PRIVATE (
+		stream, CAMEL_TYPE_TCP_STREAM_SSL, CamelTcpStreamSSLPrivate);
 }
 
 /**
diff --git a/camel/camel-tcp-stream.c b/camel/camel-tcp-stream.c
index ee40a8e..4367cb1 100644
--- a/camel/camel-tcp-stream.c
+++ b/camel/camel-tcp-stream.c
@@ -67,7 +67,8 @@ camel_tcp_stream_class_init (CamelTcpStreamClass *class)
 static void
 camel_tcp_stream_init (CamelTcpStream *tcp_stream)
 {
-	tcp_stream->priv = G_TYPE_INSTANCE_GET_PRIVATE (tcp_stream, CAMEL_TYPE_TCP_STREAM, CamelTcpStreamPrivate);
+	tcp_stream->priv = G_TYPE_INSTANCE_GET_PRIVATE (
+		tcp_stream, CAMEL_TYPE_TCP_STREAM, CamelTcpStreamPrivate);
 }
 
 /**
diff --git a/camel/camel-text-index.c b/camel/camel-text-index.c
index 7d5f96e..da225b6 100644
--- a/camel/camel-text-index.c
+++ b/camel/camel-text-index.c
@@ -813,7 +813,8 @@ camel_text_index_class_init (CamelTextIndexClass *class)
 static void
 camel_text_index_init (CamelTextIndex *text_index)
 {
-	text_index->priv = G_TYPE_INSTANCE_GET_PRIVATE (text_index, CAMEL_TYPE_TEXT_INDEX, CamelTextIndexPrivate);
+	text_index->priv = G_TYPE_INSTANCE_GET_PRIVATE (
+		text_index, CAMEL_TYPE_TEXT_INDEX, CamelTextIndexPrivate);
 
 	camel_dlist_init (&text_index->priv->word_cache);
 	text_index->priv->words = g_hash_table_new (g_str_hash, g_str_equal);
diff --git a/camel/camel-transport.c b/camel/camel-transport.c
index 97e0970..c900489 100644
--- a/camel/camel-transport.c
+++ b/camel/camel-transport.c
@@ -160,7 +160,8 @@ camel_transport_class_init (CamelTransportClass *class)
 static void
 camel_transport_init (CamelTransport *transport)
 {
-	transport->priv = G_TYPE_INSTANCE_GET_PRIVATE (transport, CAMEL_TYPE_TRANSPORT, CamelTransportPrivate);
+	transport->priv = G_TYPE_INSTANCE_GET_PRIVATE (
+		transport, CAMEL_TYPE_TRANSPORT, CamelTransportPrivate);
 
 	transport->priv->send_lock = g_mutex_new ();
 }
diff --git a/camel/camel-vee-folder.c b/camel/camel-vee-folder.c
index 7257988..15055ec 100644
--- a/camel/camel-vee-folder.c
+++ b/camel/camel-vee-folder.c
@@ -1966,7 +1966,8 @@ camel_vee_folder_init (CamelVeeFolder *vee_folder)
 {
 	CamelFolder *folder = CAMEL_FOLDER (vee_folder);
 
-	vee_folder->priv = G_TYPE_INSTANCE_GET_PRIVATE (vee_folder, CAMEL_TYPE_VEE_FOLDER, CamelVeeFolderPrivate);
+	vee_folder->priv = G_TYPE_INSTANCE_GET_PRIVATE (
+		vee_folder, CAMEL_TYPE_VEE_FOLDER, CamelVeeFolderPrivate);
 
 	folder->folder_flags |= (CAMEL_FOLDER_HAS_SUMMARY_CAPABILITY |
 				 CAMEL_FOLDER_HAS_SEARCH_CAPABILITY);
diff --git a/camel/providers/groupwise/camel-groupwise-folder.c b/camel/providers/groupwise/camel-groupwise-folder.c
index fdbcd35..51f45be 100644
--- a/camel/providers/groupwise/camel-groupwise-folder.c
+++ b/camel/providers/groupwise/camel-groupwise-folder.c
@@ -3050,7 +3050,9 @@ camel_groupwise_folder_init (CamelGroupwiseFolder *gw_folder)
 {
 	CamelFolder *folder = CAMEL_FOLDER (gw_folder);
 
-	gw_folder->priv = G_TYPE_INSTANCE_GET_PRIVATE (gw_folder, CAMEL_TYPE_GROUPWISE_FOLDER, CamelGroupwiseFolderPrivate);
+	gw_folder->priv = G_TYPE_INSTANCE_GET_PRIVATE (
+		gw_folder, CAMEL_TYPE_GROUPWISE_FOLDER,
+		CamelGroupwiseFolderPrivate);
 
 	folder->permanent_flags = CAMEL_MESSAGE_ANSWERED | CAMEL_MESSAGE_DELETED |
 		CAMEL_MESSAGE_DRAFT | CAMEL_MESSAGE_FLAGGED | CAMEL_MESSAGE_SEEN;
diff --git a/camel/providers/groupwise/camel-groupwise-store.c b/camel/providers/groupwise/camel-groupwise-store.c
index 11fcfe7..25946f1 100644
--- a/camel/providers/groupwise/camel-groupwise-store.c
+++ b/camel/providers/groupwise/camel-groupwise-store.c
@@ -1586,7 +1586,9 @@ camel_groupwise_store_class_init (CamelGroupwiseStoreClass *class)
 static void
 camel_groupwise_store_init (CamelGroupwiseStore *groupwise_store)
 {
-	groupwise_store->priv = G_TYPE_INSTANCE_GET_PRIVATE (groupwise_store, CAMEL_TYPE_GROUPWISE_STORE, CamelGroupwiseStorePrivate);
+	groupwise_store->priv = G_TYPE_INSTANCE_GET_PRIVATE (
+		groupwise_store, CAMEL_TYPE_GROUPWISE_STORE,
+		CamelGroupwiseStorePrivate);
 
 	d("in groupwise store init\n");
 	groupwise_store->priv->server_name = NULL;
diff --git a/camel/providers/imap/camel-imap-folder.c b/camel/providers/imap/camel-imap-folder.c
index b02b5e0..83751c1 100644
--- a/camel/providers/imap/camel-imap-folder.c
+++ b/camel/providers/imap/camel-imap-folder.c
@@ -300,7 +300,8 @@ camel_imap_folder_init (CamelImapFolder *imap_folder)
 {
 	CamelFolder *folder = CAMEL_FOLDER (imap_folder);
 
-	imap_folder->priv = G_TYPE_INSTANCE_GET_PRIVATE (imap_folder, CAMEL_TYPE_IMAP_FOLDER, CamelImapFolderPrivate);
+	imap_folder->priv = G_TYPE_INSTANCE_GET_PRIVATE (
+		imap_folder, CAMEL_TYPE_IMAP_FOLDER, CamelImapFolderPrivate);
 
 	folder->permanent_flags = CAMEL_MESSAGE_ANSWERED | CAMEL_MESSAGE_DELETED |
 		CAMEL_MESSAGE_DRAFT | CAMEL_MESSAGE_FLAGGED | CAMEL_MESSAGE_SEEN;
diff --git a/camel/providers/imap/camel-imap-wrapper.c b/camel/providers/imap/camel-imap-wrapper.c
index 91b03d1..8f5130b 100644
--- a/camel/providers/imap/camel-imap-wrapper.c
+++ b/camel/providers/imap/camel-imap-wrapper.c
@@ -144,7 +144,9 @@ camel_imap_wrapper_class_init (CamelImapWrapperClass *class)
 static void
 camel_imap_wrapper_init (CamelImapWrapper *imap_wrapper)
 {
-	imap_wrapper->priv = G_TYPE_INSTANCE_GET_PRIVATE (imap_wrapper, CAMEL_TYPE_IMAP_WRAPPER, CamelImapWrapperPrivate);
+	imap_wrapper->priv = G_TYPE_INSTANCE_GET_PRIVATE (
+		imap_wrapper, CAMEL_TYPE_IMAP_WRAPPER,
+		CamelImapWrapperPrivate);
 	imap_wrapper->priv->lock = g_mutex_new ();
 }
 
diff --git a/camel/providers/imapx/camel-imapx-conn-manager.c b/camel/providers/imapx/camel-imapx-conn-manager.c
index f979f82..4134907 100644
--- a/camel/providers/imapx/camel-imapx-conn-manager.c
+++ b/camel/providers/imapx/camel-imapx-conn-manager.c
@@ -96,7 +96,8 @@ camel_imapx_conn_manager_class_init (CamelIMAPXConnManagerClass *class)
 static void
 camel_imapx_conn_manager_init (CamelIMAPXConnManager *con_man)
 {
-	con_man->priv = G_TYPE_INSTANCE_GET_PRIVATE (con_man, CAMEL_TYPE_OBJECT, CamelIMAPXConnManagerPrivate);
+	con_man->priv = G_TYPE_INSTANCE_GET_PRIVATE (
+		con_man, CAMEL_TYPE_OBJECT, CamelIMAPXConnManagerPrivate);
 
 	/* default is 1 connection */
 	con_man->priv->n_connections = 1;
diff --git a/camel/providers/local/camel-local-folder.c b/camel/providers/local/camel-local-folder.c
index 90d0bf8..e76a124 100644
--- a/camel/providers/local/camel-local-folder.c
+++ b/camel/providers/local/camel-local-folder.c
@@ -474,7 +474,9 @@ camel_local_folder_init (CamelLocalFolder *local_folder)
 {
 	CamelFolder *folder = CAMEL_FOLDER (local_folder);
 
-	local_folder->priv = G_TYPE_INSTANCE_GET_PRIVATE (local_folder, CAMEL_TYPE_LOCAL_FOLDER, CamelLocalFolderPrivate);
+	local_folder->priv = G_TYPE_INSTANCE_GET_PRIVATE (
+		local_folder, CAMEL_TYPE_LOCAL_FOLDER,
+		CamelLocalFolderPrivate);
 	local_folder->priv->search_lock = g_mutex_new ();
 
 	folder->folder_flags |= (CAMEL_FOLDER_HAS_SUMMARY_CAPABILITY |
diff --git a/camel/providers/local/camel-maildir-summary.c b/camel/providers/local/camel-maildir-summary.c
index cb97661..b116cd5 100644
--- a/camel/providers/local/camel-maildir-summary.c
+++ b/camel/providers/local/camel-maildir-summary.c
@@ -116,7 +116,9 @@ camel_maildir_summary_init (CamelMaildirSummary *maildir_summary)
 
 	folder_summary = CAMEL_FOLDER_SUMMARY (maildir_summary);
 
-	maildir_summary->priv = G_TYPE_INSTANCE_GET_PRIVATE (maildir_summary, CAMEL_TYPE_MAILDIR_SUMMARY, CamelMaildirSummaryPrivate);
+	maildir_summary->priv = G_TYPE_INSTANCE_GET_PRIVATE (
+		maildir_summary, CAMEL_TYPE_MAILDIR_SUMMARY,
+		CamelMaildirSummaryPrivate);
 
 	/* set unique file version */
 	folder_summary->version += CAMEL_MAILDIR_SUMMARY_VERSION;
diff --git a/camel/providers/local/camel-mh-summary.c b/camel/providers/local/camel-mh-summary.c
index 34a09c1..55c1fc6 100644
--- a/camel/providers/local/camel-mh-summary.c
+++ b/camel/providers/local/camel-mh-summary.c
@@ -74,7 +74,8 @@ camel_mh_summary_init (CamelMhSummary *mh_summary)
 {
 	CamelFolderSummary *folder_summary;
 
-	mh_summary->priv = G_TYPE_INSTANCE_GET_PRIVATE (mh_summary, CAMEL_TYPE_MH_SUMMARY, CamelMhSummaryPrivate);
+	mh_summary->priv = G_TYPE_INSTANCE_GET_PRIVATE (
+		mh_summary, CAMEL_TYPE_MH_SUMMARY, CamelMhSummaryPrivate);
 
 	folder_summary = CAMEL_FOLDER_SUMMARY (mh_summary);
 
diff --git a/camel/providers/nntp/camel-nntp-folder.c b/camel/providers/nntp/camel-nntp-folder.c
index b464e53..9934b66 100644
--- a/camel/providers/nntp/camel-nntp-folder.c
+++ b/camel/providers/nntp/camel-nntp-folder.c
@@ -639,7 +639,8 @@ camel_nntp_folder_class_init (CamelNNTPFolderClass *class)
 static void
 camel_nntp_folder_init (CamelNNTPFolder *nntp_folder)
 {
-	nntp_folder->priv = G_TYPE_INSTANCE_GET_PRIVATE (nntp_folder, CAMEL_TYPE_NNTP_FOLDER, CamelNNTPFolderPrivate);
+	nntp_folder->priv = G_TYPE_INSTANCE_GET_PRIVATE (
+		nntp_folder, CAMEL_TYPE_NNTP_FOLDER, CamelNNTPFolderPrivate);
 
 	nntp_folder->changes = camel_folder_change_info_new ();
 	nntp_folder->priv->search_lock = g_mutex_new ();
diff --git a/camel/providers/nntp/camel-nntp-store.c b/camel/providers/nntp/camel-nntp-store.c
index 4ebc59e..8b5c10e 100644
--- a/camel/providers/nntp/camel-nntp-store.c
+++ b/camel/providers/nntp/camel-nntp-store.c
@@ -1384,7 +1384,8 @@ camel_nntp_store_init (CamelNNTPStore *nntp_store)
 
 	nntp_store->mem = (CamelStreamMem *)camel_stream_mem_new ();
 
-	nntp_store->priv = G_TYPE_INSTANCE_GET_PRIVATE (nntp_store, CAMEL_TYPE_NNTP_STORE, CamelNNTPStorePrivate);
+	nntp_store->priv = G_TYPE_INSTANCE_GET_PRIVATE (
+		nntp_store, CAMEL_TYPE_NNTP_STORE, CamelNNTPStorePrivate);
 }
 
 /* Enter owning lock */
diff --git a/camel/providers/nntp/camel-nntp-summary.c b/camel/providers/nntp/camel-nntp-summary.c
index b6491d3..0497743 100644
--- a/camel/providers/nntp/camel-nntp-summary.c
+++ b/camel/providers/nntp/camel-nntp-summary.c
@@ -83,7 +83,9 @@ camel_nntp_summary_init (CamelNNTPSummary *nntp_summary)
 {
 	CamelFolderSummary *summary = CAMEL_FOLDER_SUMMARY (nntp_summary);
 
-	nntp_summary->priv = G_TYPE_INSTANCE_GET_PRIVATE (nntp_summary, CAMEL_TYPE_NNTP_SUMMARY, CamelNNTPSummaryPrivate);
+	nntp_summary->priv = G_TYPE_INSTANCE_GET_PRIVATE (
+		nntp_summary, CAMEL_TYPE_NNTP_SUMMARY,
+		CamelNNTPSummaryPrivate);
 
 	/* and a unique file version */
 	summary->version += CAMEL_NNTP_SUMMARY_VERSION;
diff --git a/libedataserver/e-proxy.c b/libedataserver/e-proxy.c
index 85af8bf..3df673b 100644
--- a/libedataserver/e-proxy.c
+++ b/libedataserver/e-proxy.c
@@ -224,7 +224,8 @@ e_proxy_class_init (EProxyClass *class)
 static void
 e_proxy_init (EProxy *proxy)
 {
-	proxy->priv = G_TYPE_INSTANCE_GET_PRIVATE (proxy, E_TYPE_PROXY, EProxyPrivate);
+	proxy->priv = G_TYPE_INSTANCE_GET_PRIVATE (
+		proxy, E_TYPE_PROXY, EProxyPrivate);
 
 	proxy->priv->type = PROXY_TYPE_SYSTEM;
 }
diff --git a/libedataserver/e-soap-message.c b/libedataserver/e-soap-message.c
index 1fd1a26..2974764 100644
--- a/libedataserver/e-soap-message.c
+++ b/libedataserver/e-soap-message.c
@@ -51,7 +51,8 @@ e_soap_message_class_init (ESoapMessageClass *e_soap_message_class)
 static void
 e_soap_message_init (ESoapMessage *msg)
 {
-	msg->priv = G_TYPE_INSTANCE_GET_PRIVATE (msg, E_TYPE_SOAP_MESSAGE, ESoapMessagePrivate);
+	msg->priv = G_TYPE_INSTANCE_GET_PRIVATE (
+		msg, E_TYPE_SOAP_MESSAGE, ESoapMessagePrivate);
 
 	/* initialize XML structures */
 	msg->priv->doc = xmlNewDoc ((const xmlChar *)"1.0");
diff --git a/libedataserver/e-soap-response.c b/libedataserver/e-soap-response.c
index 3941571..e6d7b91 100644
--- a/libedataserver/e-soap-response.c
+++ b/libedataserver/e-soap-response.c
@@ -49,7 +49,8 @@ e_soap_response_class_init (ESoapResponseClass *e_soap_response_class)
 static void
 e_soap_response_init (ESoapResponse *response)
 {
-	response->priv = G_TYPE_INSTANCE_GET_PRIVATE (response, E_TYPE_SOAP_RESPONSE, ESoapResponsePrivate);
+	response->priv = G_TYPE_INSTANCE_GET_PRIVATE (
+		response, E_TYPE_SOAP_RESPONSE, ESoapResponsePrivate);
 	response->priv->xmldoc = xmlNewDoc ((const xmlChar *)"1.0");
 }
 
diff --git a/libedataserverui/e-categories-dialog.c b/libedataserverui/e-categories-dialog.c
index d0131a7..6e3b360 100644
--- a/libedataserverui/e-categories-dialog.c
+++ b/libedataserverui/e-categories-dialog.c
@@ -718,7 +718,8 @@ e_categories_dialog_init (ECategoriesDialog *dialog)
 	gtk_label_set_mnemonic_widget (GTK_LABEL (label_header), entry_categories);
 	gtk_label_set_mnemonic_widget (GTK_LABEL (label2), categories_list);
 
-	dialog->priv = G_TYPE_INSTANCE_GET_PRIVATE (dialog, E_TYPE_CATEGORIES_DIALOG, ECategoriesDialogPrivate);
+	dialog->priv = G_TYPE_INSTANCE_GET_PRIVATE (
+		dialog, E_TYPE_CATEGORIES_DIALOG, ECategoriesDialogPrivate);
 	dialog->priv->selected_categories = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_free);
 
 	dialog->priv->categories_entry = entry_categories;
diff --git a/libedataserverui/e-category-completion.c b/libedataserverui/e-category-completion.c
index 226e8b0..238d2b9 100644
--- a/libedataserverui/e-category-completion.c
+++ b/libedataserverui/e-category-completion.c
@@ -482,7 +482,9 @@ e_category_completion_class_init (ECategoryCompletionClass *class)
 static void
 e_category_completion_init (ECategoryCompletion *category_completion)
 {
-	category_completion->priv = G_TYPE_INSTANCE_GET_PRIVATE (category_completion, E_TYPE_CATEGORY_COMPLETION, ECategoryCompletionPrivate);
+	category_completion->priv = G_TYPE_INSTANCE_GET_PRIVATE (
+		category_completion, E_TYPE_CATEGORY_COMPLETION,
+		ECategoryCompletionPrivate);
 }
 
 /**
diff --git a/libedataserverui/e-cell-renderer-color.c b/libedataserverui/e-cell-renderer-color.c
index f178b25..3ccb55f 100644
--- a/libedataserverui/e-cell-renderer-color.c
+++ b/libedataserverui/e-cell-renderer-color.c
@@ -216,7 +216,9 @@ e_cell_renderer_color_class_init (ECellRendererColorClass *class)
 static void
 e_cell_renderer_color_init (ECellRendererColor *cellcolor)
 {
-	cellcolor->priv = G_TYPE_INSTANCE_GET_PRIVATE (cellcolor, E_TYPE_CELL_RENDERER_COLOR, ECellRendererColorPrivate);
+	cellcolor->priv = G_TYPE_INSTANCE_GET_PRIVATE (
+		cellcolor, E_TYPE_CELL_RENDERER_COLOR,
+		ECellRendererColorPrivate);
 
 	g_object_set (cellcolor, "xpad", 4, NULL);
 }
diff --git a/libedataserverui/e-contact-store.c b/libedataserverui/e-contact-store.c
index bdcdfeb..3fba409 100644
--- a/libedataserverui/e-contact-store.c
+++ b/libedataserverui/e-contact-store.c
@@ -176,7 +176,8 @@ e_contact_store_init (EContactStore *contact_store)
 
 	contact_sources = g_array_new (FALSE, FALSE, sizeof (ContactSource));
 
-	contact_store->priv = G_TYPE_INSTANCE_GET_PRIVATE (contact_store, E_TYPE_CONTACT_STORE, EContactStorePrivate);
+	contact_store->priv = G_TYPE_INSTANCE_GET_PRIVATE (
+		contact_store, E_TYPE_CONTACT_STORE, EContactStorePrivate);
 	contact_store->priv->stamp = g_random_int ();
 	contact_store->priv->contact_sources = contact_sources;
 }
diff --git a/libedataserverui/e-destination-store.c b/libedataserverui/e-destination-store.c
index 4e2b8ff..8335d83 100644
--- a/libedataserverui/e-destination-store.c
+++ b/libedataserverui/e-destination-store.c
@@ -152,7 +152,9 @@ e_destination_store_tree_model_init (GtkTreeModelIface *iface)
 static void
 e_destination_store_init (EDestinationStore *destination_store)
 {
-	destination_store->priv = G_TYPE_INSTANCE_GET_PRIVATE (destination_store, E_TYPE_DESTINATION_STORE, EDestinationStorePrivate);
+	destination_store->priv = G_TYPE_INSTANCE_GET_PRIVATE (
+		destination_store, E_TYPE_DESTINATION_STORE,
+		EDestinationStorePrivate);
 	destination_store->priv->destinations = g_ptr_array_new ();
 	destination_store->priv->stamp = g_random_int ();
 }
diff --git a/libedataserverui/e-name-selector-dialog.c b/libedataserverui/e-name-selector-dialog.c
index 3ab310f..9e27124 100644
--- a/libedataserverui/e-name-selector-dialog.c
+++ b/libedataserverui/e-name-selector-dialog.c
@@ -161,7 +161,9 @@ e_name_selector_dialog_init (ENameSelectorDialog *name_selector_dialog)
 	GtkWidget *status_message;
 	GtkWidget *source_combo;
 
-	name_selector_dialog->priv = G_TYPE_INSTANCE_GET_PRIVATE (name_selector_dialog, E_TYPE_NAME_SELECTOR_DIALOG, ENameSelectorDialogPrivate);
+	name_selector_dialog->priv = G_TYPE_INSTANCE_GET_PRIVATE (
+		name_selector_dialog, E_TYPE_NAME_SELECTOR_DIALOG,
+		ENameSelectorDialogPrivate);
 
 	name_selector_box = gtk_vbox_new (FALSE, 6);
 	gtk_widget_show (name_selector_box);
diff --git a/libedataserverui/e-name-selector-entry.c b/libedataserverui/e-name-selector-entry.c
index 65a1581..ef40e00 100644
--- a/libedataserverui/e-name-selector-entry.c
+++ b/libedataserverui/e-name-selector-entry.c
@@ -2822,7 +2822,9 @@ e_name_selector_entry_init (ENameSelectorEntry *name_selector_entry)
 	GtkCellRenderer *renderer;
 	GConfClient *gconf;
 
-	name_selector_entry->priv = G_TYPE_INSTANCE_GET_PRIVATE (name_selector_entry, E_TYPE_NAME_SELECTOR_ENTRY, ENameSelectorEntryPrivate);
+	name_selector_entry->priv = G_TYPE_INSTANCE_GET_PRIVATE (
+		name_selector_entry, E_TYPE_NAME_SELECTOR_ENTRY,
+		ENameSelectorEntryPrivate);
 
 	g_queue_init (&name_selector_entry->priv->cancellables);
 
diff --git a/libedataserverui/e-name-selector-list.c b/libedataserverui/e-name-selector-list.c
index c9d819b..348a54a 100644
--- a/libedataserverui/e-name-selector-list.c
+++ b/libedataserverui/e-name-selector-list.c
@@ -620,7 +620,8 @@ e_name_selector_list_init (ENameSelectorList *list)
 	EDestinationStore *store;
 	GtkEntryCompletion *completion;
 
-	list->priv = G_TYPE_INSTANCE_GET_PRIVATE (list, E_TYPE_NAME_SELECTOR_LIST, ENameSelectorListPrivate);
+	list->priv = G_TYPE_INSTANCE_GET_PRIVATE (
+		list, E_TYPE_NAME_SELECTOR_LIST, ENameSelectorListPrivate);
 	list->priv->menu = NULL;
 
 	entry = E_NAME_SELECTOR_ENTRY (list);
diff --git a/libedataserverui/e-name-selector-model.c b/libedataserverui/e-name-selector-model.c
index 04681eb..7063e95 100644
--- a/libedataserverui/e-name-selector-model.c
+++ b/libedataserverui/e-name-selector-model.c
@@ -70,7 +70,9 @@ G_DEFINE_TYPE (ENameSelectorModel, e_name_selector_model, G_TYPE_OBJECT)
 static void
 e_name_selector_model_init (ENameSelectorModel *name_selector_model)
 {
-	name_selector_model->priv = G_TYPE_INSTANCE_GET_PRIVATE (name_selector_model, E_TYPE_NAME_SELECTOR_MODEL, ENameSelectorModelPrivate);
+	name_selector_model->priv = G_TYPE_INSTANCE_GET_PRIVATE (
+		name_selector_model, E_TYPE_NAME_SELECTOR_MODEL,
+		ENameSelectorModelPrivate);
 	name_selector_model->priv->sections       = g_array_new (FALSE, FALSE, sizeof (Section));
 	name_selector_model->priv->contact_store  = e_contact_store_new ();
 
diff --git a/libedataserverui/e-name-selector.c b/libedataserverui/e-name-selector.c
index a0d265a..b80cc35 100644
--- a/libedataserverui/e-name-selector.c
+++ b/libedataserverui/e-name-selector.c
@@ -253,7 +253,8 @@ e_name_selector_init (ENameSelector *name_selector)
 	sections = g_array_new (FALSE, FALSE, sizeof (Section));
 	source_books = g_array_new (FALSE, FALSE, sizeof (SourceBook));
 
-	name_selector->priv = G_TYPE_INSTANCE_GET_PRIVATE (name_selector, E_TYPE_NAME_SELECTOR, ENameSelectorPrivate);
+	name_selector->priv = G_TYPE_INSTANCE_GET_PRIVATE (
+		name_selector, E_TYPE_NAME_SELECTOR, ENameSelectorPrivate);
 	name_selector->priv->sections = sections;
 	name_selector->priv->model = e_name_selector_model_new ();
 	name_selector->priv->source_books = source_books;
diff --git a/libedataserverui/e-source-combo-box.c b/libedataserverui/e-source-combo-box.c
index ce812e0..6086b44 100644
--- a/libedataserverui/e-source-combo-box.c
+++ b/libedataserverui/e-source-combo-box.c
@@ -317,7 +317,9 @@ e_source_combo_box_class_init (ESourceComboBoxClass *class)
 static void
 e_source_combo_box_init (ESourceComboBox *source_combo_box)
 {
-	source_combo_box->priv = G_TYPE_INSTANCE_GET_PRIVATE (source_combo_box, E_TYPE_SOURCE_COMBO_BOX, ESourceComboBoxPrivate);
+	source_combo_box->priv = G_TYPE_INSTANCE_GET_PRIVATE (
+		source_combo_box, E_TYPE_SOURCE_COMBO_BOX,
+		ESourceComboBoxPrivate);
 	source_combo_box->priv->uid_index =
 		g_hash_table_new_full (
 			g_str_hash, g_str_equal,
diff --git a/libedataserverui/e-source-selector.c b/libedataserverui/e-source-selector.c
index 8a02f6e..2fe8e66 100644
--- a/libedataserverui/e-source-selector.c
+++ b/libedataserverui/e-source-selector.c
@@ -1299,7 +1299,8 @@ e_source_selector_init (ESourceSelector *selector)
 	GtkTreeStore *tree_store;
 	GtkTreeView *tree_view;
 
-	selector->priv = G_TYPE_INSTANCE_GET_PRIVATE (selector, E_TYPE_SOURCE_SELECTOR, ESourceSelectorPrivate);
+	selector->priv = G_TYPE_INSTANCE_GET_PRIVATE (
+		selector, E_TYPE_SOURCE_SELECTOR, ESourceSelectorPrivate);
 	priv = selector->priv;
 
 	tree_view = GTK_TREE_VIEW (selector);
diff --git a/libedataserverui/e-tree-model-generator.c b/libedataserverui/e-tree-model-generator.c
index 2c4d09a..bf84fee 100644
--- a/libedataserverui/e-tree-model-generator.c
+++ b/libedataserverui/e-tree-model-generator.c
@@ -235,7 +235,9 @@ e_tree_model_generator_tree_model_init (GtkTreeModelIface *iface)
 static void
 e_tree_model_generator_init (ETreeModelGenerator *tree_model_generator)
 {
-	tree_model_generator->priv = G_TYPE_INSTANCE_GET_PRIVATE (tree_model_generator, E_TYPE_TREE_MODEL_GENERATOR, ETreeModelGeneratorPrivate);
+	tree_model_generator->priv = G_TYPE_INSTANCE_GET_PRIVATE (
+		tree_model_generator, E_TYPE_TREE_MODEL_GENERATOR,
+		ETreeModelGeneratorPrivate);
 
 	tree_model_generator->priv->stamp      = g_random_int ();
 	tree_model_generator->priv->root_nodes = g_array_new (FALSE, FALSE, sizeof (Node));
diff --git a/servers/groupwise/soup-soap-message.c b/servers/groupwise/soup-soap-message.c
index 549e250..afb03dc 100644
--- a/servers/groupwise/soup-soap-message.c
+++ b/servers/groupwise/soup-soap-message.c
@@ -51,7 +51,8 @@ soup_soap_message_class_init (SoupSoapMessageClass *soup_soap_message_class)
 static void
 soup_soap_message_init (SoupSoapMessage *msg)
 {
-	msg->priv = G_TYPE_INSTANCE_GET_PRIVATE (msg, SOUP_TYPE_SOAP_MESSAGE, SoupSoapMessagePrivate);
+	msg->priv = G_TYPE_INSTANCE_GET_PRIVATE (
+		msg, SOUP_TYPE_SOAP_MESSAGE, SoupSoapMessagePrivate);
 
 	/* initialize XML structures */
 	msg->priv->doc = xmlNewDoc ((const xmlChar *)"1.0");
diff --git a/servers/groupwise/soup-soap-response.c b/servers/groupwise/soup-soap-response.c
index 185d0f6..9c3cdcc 100644
--- a/servers/groupwise/soup-soap-response.c
+++ b/servers/groupwise/soup-soap-response.c
@@ -49,7 +49,8 @@ soup_soap_response_class_init (SoupSoapResponseClass *soup_soap_response_class)
 static void
 soup_soap_response_init (SoupSoapResponse *response)
 {
-	response->priv = G_TYPE_INSTANCE_GET_PRIVATE (response, SOUP_TYPE_SOAP_RESPONSE, SoupSoapResponsePrivate);
+	response->priv = G_TYPE_INSTANCE_GET_PRIVATE (
+		response, SOUP_TYPE_SOAP_RESPONSE, SoupSoapResponsePrivate);
 	response->priv->xmldoc = xmlNewDoc ((const xmlChar *)"1.0");
 }
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]