Coding style and whitespace cleanup.

diff --git a/addressbook/backends/file/e-book-backend-file-migrate-bdb.c b/addressbook/backends/file/e-book-backend-file-migrate-bdb.c
index 1e971cd..4d80a97 100644 (file)
--- a/addressbook/backends/file/e-book-backend-file-migrate-bdb.c
+++ b/addressbook/backends/file/e-book-backend-file-migrate-bdb.c
@@ -43,7 +43,6 @@
 
 #include "e-book-backend-file-migrate-bdb.h"
 
-
 #define E_BOOK_BACKEND_FILE_REVISION_NAME         "PAS-DB-REVISION"
 #define E_BOOK_BACKEND_FILE_VERSION_NAME          "PAS-DB-VERSION"
 #define E_BOOK_BACKEND_FILE_LAST_BDB_VERSION      "0.2"
@@ -51,7 +50,6 @@
 #define EDB_ERROR(_code)          e_data_book_create_error (E_DATA_BOOK_STATUS_ ## _code, NULL)
 #define EDB_ERROR_EX(_code, _msg) e_data_book_create_error (E_DATA_BOOK_STATUS_ ## _code, _msg)
 
-
 G_LOCK_DEFINE_STATIC (db_env);
 static DB_ENV *db_env = NULL;
 
@@ -172,7 +170,7 @@ string_to_dbt (const gchar *str,
 **     came about.
 */
 static gboolean
-e_book_backend_file_upgrade_db (DB    *db,
+e_book_backend_file_upgrade_db (DB *db,
                                 gchar *old_version)
 {
        gint db_error;
@@ -185,8 +183,9 @@ e_book_backend_file_upgrade_db (DB    *db,
 
        if (strcmp (old_version, "0.0")
            && strcmp (old_version, "0.1")) {
-               g_warning ("unsupported version '%s' found in PAS backend file\n",
-                          old_version);
+               g_warning (
+                       "unsupported version '%s' found in PAS backend file\n",
+                       old_version);
                return FALSE;
        }
 
@@ -299,12 +298,11 @@ e_book_backend_file_maybe_upgrade_db (DB *db)
        return ret_val;
 }
 
-
 static gboolean
-migrate_bdb_to_sqlitedb (EBookBackendSqliteDB   *sqlitedb,
-                        const gchar            *sqlite_folder_id,
-                        DB                     *db,
-                        GError                **error)
+migrate_bdb_to_sqlitedb (EBookBackendSqliteDB *sqlitedb,
+                         const gchar *sqlite_folder_id,
+                         DB *db,
+                         GError **error)
 {
        DBC            *dbc;
        DBT             id_dbt, vcard_dbt;
@@ -386,17 +384,16 @@ migrate_bdb_to_sqlitedb (EBookBackendSqliteDB   *sqlitedb,
 }
 
 gboolean
-e_book_backend_file_migrate_bdb (EBookBackendSqliteDB  *sqlitedb,
-                                const gchar           *sqlite_folder_id,
-                                const gchar           *dirname,
-                                const gchar           *filename,
-                                GError               **error)
+e_book_backend_file_migrate_bdb (EBookBackendSqliteDB *sqlitedb,
+                                 const gchar *sqlite_folder_id,
+                                 const gchar *dirname,
+                                 const gchar *filename,
+                                 GError **error)
 {
        DB        *db = NULL;
        gint       db_error;
        gboolean   status = FALSE;
 
-
        G_LOCK (db_env);
 
 #ifdef G_OS_WIN32

diff --git a/addressbook/backends/file/e-book-backend-file-migrate-bdb.h b/addressbook/backends/file/e-book-backend-file-migrate-bdb.h
index e108d13..c0b8ddc 100644 (file)
--- a/addressbook/backends/file/e-book-backend-file-migrate-bdb.h
+++ b/addressbook/backends/file/e-book-backend-file-migrate-bdb.h
@@ -34,10 +34,6 @@ gboolean e_book_backend_file_migrate_bdb (EBookBackendSqliteDB  *sqlitedb,
                                          const gchar           *filename,
                                          GError               **error);
 
-
-
 G_END_DECLS
 
-
-
 #endif /* E_BOOK_BACKEND_MIGRATE_BDB_H */

diff --git a/addressbook/backends/file/e-book-backend-file.c b/addressbook/backends/file/e-book-backend-file.c
index 62aae48..b3fa627 100644 (file)
--- a/addressbook/backends/file/e-book-backend-file.c
+++ b/addressbook/backends/file/e-book-backend-file.c
@@ -63,7 +63,6 @@
 #define EDB_ERROR_EX(_code, _msg) e_data_book_create_error (E_DATA_BOOK_STATUS_ ## _code, _msg)
 #define EDB_NOT_OPENED_ERROR      EDB_ERROR(NOT_OPENED)
 
-
 G_DEFINE_TYPE (EBookBackendFile, e_book_backend_file, E_TYPE_BOOK_BACKEND_SYNC)
 
 struct _EBookBackendFilePrivate {
@@ -74,7 +73,6 @@ struct _EBookBackendFilePrivate {
        EBookBackendSqliteDB *sqlitedb;
 };
 
-
 /****************************************************************
  *                   File Management helper APIs                *
  ****************************************************************/
@@ -580,7 +578,6 @@ maybe_transform_vcard_for_photo (EBookBackendFile *bf,
        return status;
 }
 
-
 /****************************************************************
  *                     Global Revisioning Tools                 *
  ****************************************************************/
@@ -626,8 +623,9 @@ e_book_backend_file_bump_revision (EBookBackendFile *bf)
                                                   SQLITEDB_FOLDER_ID,
                                                   bf->priv->revision,
                                                   &error)) {
-               g_warning (G_STRLOC ": Error setting database revision: %s",
-                          error->message);
+               g_warning (
+                       G_STRLOC ": Error setting database revision: %s",
+                       error->message);
                g_error_free (error);
        }
 
@@ -645,8 +643,9 @@ e_book_backend_file_load_revision (EBookBackendFile *bf)
                                                   SQLITEDB_FOLDER_ID,
                                                   &bf->priv->revision,
                                                   &error)) {
-               g_warning (G_STRLOC ": Error loading database revision: %s",
-                          error->message);
+               g_warning (
+                       G_STRLOC ": Error loading database revision: %s",
+                       error->message);
                g_error_free (error);
        } else if (bf->priv->revision == NULL) {
                e_book_backend_file_bump_revision (bf);
@@ -668,7 +667,6 @@ set_revision (EContact *contact)
 
 }
 
-
 /****************************************************************
  *                   Main Backend Implementation                *
  ****************************************************************/
@@ -681,9 +679,9 @@ set_revision (EContact *contact)
  */
 static gboolean
 do_create (EBookBackendFile *bf,
-          const GSList *vcards_req,
-          GSList **contacts,
-          GError **perror)
+           const GSList *vcards_req,
+           GSList **contacts,
+           GError **perror)
 {
        GSList *slist = NULL;
        const GSList *l;
@@ -723,7 +721,8 @@ do_create (EBookBackendFile *bf,
                        slist = g_slist_prepend (slist, contact);
                } else {
                        /* Contact could not be transformed */
-                       g_warning (G_STRLOC ": Error transforming vcard with image data %s",
+                       g_warning (
+                               G_STRLOC ": Error transforming vcard with image data %s",
                                (perror && *perror) ? (*perror)->message :
                                "Unknown error transforming vcard");
                        g_object_unref (contact);
@@ -739,7 +738,7 @@ do_create (EBookBackendFile *bf,
                                                           SQLITEDB_FOLDER_ID,
                                                           slist, FALSE,
                                                           &local_error)) {
-                       
+
                        g_warning ("Failed to add contacts: %s", local_error->message);
                        g_propagate_error (perror, local_error);
 
@@ -802,9 +801,10 @@ e_book_backend_file_remove_contacts (EBookBackendSync *backend,
                 * single query to fetch a list of contacts for a list of ids, the
                 * current method makes a query for each UID.
                 */
-               contact = e_book_backend_sqlitedb_get_contact (bf->priv->sqlitedb,
-                                                              SQLITEDB_FOLDER_ID, id,
-                                                              NULL, NULL, &local_error);
+               contact = e_book_backend_sqlitedb_get_contact (
+                       bf->priv->sqlitedb,
+                       SQLITEDB_FOLDER_ID, id,
+                       NULL, NULL, &local_error);
 
                if (contact) {
                        removed_ids      = g_slist_prepend (removed_ids, g_strdup (id));
@@ -879,9 +879,10 @@ e_book_backend_file_modify_contacts (EBookBackendSync *backend,
                        break;
                }
 
-               old_contact = e_book_backend_sqlitedb_get_contact (bf->priv->sqlitedb,
-                                                                  SQLITEDB_FOLDER_ID, id,
-                                                                  NULL, NULL, &local_error);
+               old_contact = e_book_backend_sqlitedb_get_contact (
+                       bf->priv->sqlitedb,
+                       SQLITEDB_FOLDER_ID, id,
+                       NULL, NULL, &local_error);
                if (!old_contact) {
                        g_warning (G_STRLOC ": Failed to load contact %s: %s", id, local_error->message);
                        g_propagate_error (perror, local_error);
@@ -1169,11 +1170,11 @@ book_view_thread (gpointer data)
 
                vcard = data->vcard;
                data->vcard = NULL;
- 
+
                notify_update_vcard (book_view, TRUE, data->uid, vcard);
                g_free (vcard);
-       }
- 
+       }
+
        g_slist_foreach (summary_list, (GFunc) e_book_backend_sqlitedb_search_data_free, NULL);
        g_slist_free (summary_list);
 
@@ -1222,7 +1223,6 @@ e_book_backend_file_stop_view (EBookBackend *backend,
        }
 }
 
-
 #ifdef CREATE_DEFAULT_VCARD
 # include <libedata-book/ximian-vcard.h>
 #endif
@@ -1251,12 +1251,13 @@ e_book_backend_file_open (EBookBackendSync *backend,
        /* The old BDB exists, lets migrate that to sqlite right away
         */
        if (g_file_test (filename, G_FILE_TEST_EXISTS)) {
-               bf->priv->sqlitedb = e_book_backend_sqlitedb_new (dirname,
-                                                                 SQLITEDB_EMAIL_ID,
-                                                                 SQLITEDB_FOLDER_ID,
-                                                                 SQLITEDB_FOLDER_NAME,
-                                                                 TRUE,
-                                                                 &local_error);
+               bf->priv->sqlitedb = e_book_backend_sqlitedb_new (
+                       dirname,
+                       SQLITEDB_EMAIL_ID,
+                       SQLITEDB_FOLDER_ID,
+                       SQLITEDB_FOLDER_NAME,
+                       TRUE,
+                       &local_error);
 
                if (!bf->priv->sqlitedb) {
                        g_warning (G_STRLOC ": Failed to open sqlitedb: %s", local_error->message);
@@ -1272,12 +1273,14 @@ e_book_backend_file_open (EBookBackendSync *backend,
                                                      dirname, filename, &local_error)) {
 
                        /* Perhaps this error should not be fatal */
-                       g_warning (G_STRLOC ": Failed to migrate old BDB to sqlitedb: %s", local_error->message);
+                       g_warning (
+                               G_STRLOC ": Failed to migrate old BDB to sqlitedb: %s",
+                               local_error->message);
                        g_propagate_error (perror, local_error);
                        g_free (dirname);
                        g_free (filename);
                        g_free (backup);
- 
+
                        g_object_unref (bf->priv->sqlitedb);
                        bf->priv->sqlitedb = NULL;
                        return;
@@ -1286,20 +1289,22 @@ e_book_backend_file_open (EBookBackendSync *backend,
                /* Now we've migrated the database, lets rename it instead of unlinking it */
                if (g_rename (filename, backup) < 0) {
 
-                       g_warning (G_STRLOC ": Failed to rename old database from '%s' to '%s': %s",
-                                  filename, backup, g_strerror (errno));
+                       g_warning (
+                               G_STRLOC ": Failed to rename old database from '%s' to '%s': %s",
+                               filename, backup, g_strerror (errno));
 
-                       g_propagate_error (perror, e_data_book_create_error_fmt
-                                          (E_DATA_BOOK_STATUS_OTHER_ERROR,
-                                           _("Failed to rename old database from '%s' to '%s': %s"),
-                                           filename, backup, g_strerror (errno)));
+                       g_propagate_error (
+                               perror, e_data_book_create_error_fmt (
+                               E_DATA_BOOK_STATUS_OTHER_ERROR,
+                               _("Failed to rename old database from '%s' to '%s': %s"),
+                               filename, backup, g_strerror (errno)));
 
                        g_free (dirname);
                        g_free (filename);
                        g_free (backup);
                        bf->priv->sqlitedb = NULL;
                        return;
-               }
+               }
        }
 
        /* If we already have a handle on this, it means there was an old BDB migrated
@@ -1313,57 +1318,59 @@ e_book_backend_file_open (EBookBackendSync *backend,
                        g_warning (G_STRLOC ": Failed to create directory for sqlite db: %s", local_error->message);
                        g_propagate_error (perror, local_error);
 
-                       g_free (dirname);
-                       g_free (filename);
+                       g_free (dirname);
+                       g_free (filename);
                        g_free (backup);
-                       return;
-               }
+                       return;
+               }
 
                /* Create the sqlitedb */
-               bf->priv->sqlitedb = e_book_backend_sqlitedb_new (dirname,
-                                                                 SQLITEDB_EMAIL_ID,
-                                                                 SQLITEDB_FOLDER_ID,
-                                                                 SQLITEDB_FOLDER_NAME,
-                                                                 TRUE, &local_error);
+               bf->priv->sqlitedb = e_book_backend_sqlitedb_new (
+                       dirname,
+                       SQLITEDB_EMAIL_ID,
+                       SQLITEDB_FOLDER_ID,
+                       SQLITEDB_FOLDER_NAME,
+                       TRUE, &local_error);
 
                if (!bf->priv->sqlitedb) {
                        g_warning (G_STRLOC ": Failed to open sqlitedb: %s", local_error->message);
                        g_propagate_error (perror, local_error);
-                       g_free (dirname);
-                       g_free (filename);
+                       g_free (dirname);
+                       g_free (filename);
                        g_free (backup);
-                       return;
-               }
+                       return;
+               }
 
                /* An sqlite DB only 'exists' if the populated flag is set */
-               populated = e_book_backend_sqlitedb_get_is_populated (bf->priv->sqlitedb,
-                                                                     SQLITEDB_FOLDER_ID,
-                                                                     &local_error);
+               populated = e_book_backend_sqlitedb_get_is_populated (
+                       bf->priv->sqlitedb,
+                       SQLITEDB_FOLDER_ID,
+                       &local_error);
 
                if (local_error != NULL) {
                        /* Perhaps this error should not be fatal */
                        g_warning (G_STRLOC ": Failed to check populated flag in sqlite db: %s", local_error->message);
                        g_propagate_error (perror, local_error);
-                       g_free (dirname);
-                       g_free (filename);
+                       g_free (dirname);
+                       g_free (filename);
                        g_free (backup);
 
                        g_object_unref (bf->priv->sqlitedb);
                        bf->priv->sqlitedb = NULL;
                        return;
-               }
+               }
 
                if (!populated) {
                        /* Shutdown, no such book ! */
                        if (only_if_exists) {
-                               g_free (dirname);
-                               g_free (filename);
+                               g_free (dirname);
+                               g_free (filename);
                                g_free (backup);
                                g_object_unref (bf->priv->sqlitedb);
                                bf->priv->sqlitedb = NULL;
                                g_propagate_error (perror, EDB_ERROR (NO_SUCH_BOOK));
                                return;
-                       }
+                       }
 
 #ifdef CREATE_DEFAULT_VCARD
                        {
@@ -1381,8 +1388,9 @@ e_book_backend_file_open (EBookBackendSync *backend,
                                                                       SQLITEDB_FOLDER_ID,
                                                                       TRUE,
                                                                       &local_error)) {
-                               g_warning (G_STRLOC ": Failed to set populated flag in sqlite db: %s",
-                                          local_error->message);
+                               g_warning (
+                                       G_STRLOC ": Failed to set populated flag in sqlite db: %s",
+                                       local_error->message);
                                g_propagate_error (perror, local_error);
                                g_free (dirname);
                                g_free (filename);
@@ -1391,8 +1399,8 @@ e_book_backend_file_open (EBookBackendSync *backend,
                                bf->priv->sqlitedb = NULL;
                                return;
                        }
-               }
-       }
+               }
+       }
 
        g_free (dirname);
        g_free (filename);

diff --git a/addressbook/backends/google/e-book-google-utils.c b/addressbook/backends/google/e-book-google-utils.c
index ab4af4a..db4d292 100644 (file)
--- a/addressbook/backends/google/e-book-google-utils.c
+++ b/addressbook/backends/google/e-book-google-utils.c
@@ -233,9 +233,9 @@ gdata_entry_update_from_e_contact (GDataEntry *entry,
                    0 == g_ascii_strcasecmp (name, EVC_NOTE) ||
                    0 == g_ascii_strcasecmp (name, EVC_CATEGORIES) ||
                    0 == g_ascii_strcasecmp (name, EVC_PHOTO) ||
-                    0 == g_ascii_strcasecmp (name, GOOGLE_SYSTEM_GROUP_ATTR)) {
+                   0 == g_ascii_strcasecmp (name, GOOGLE_SYSTEM_GROUP_ATTR)) {
                        /* Ignore UID, VERSION, X-EVOLUTION-FILE-AS, N, FN, LABEL, TITLE, ROLE, NOTE, CATEGORIES, PHOTO,
-                                  X-GOOGLE-SYSTEM-GROUP-IDS */
+ *                                X-GOOGLE-SYSTEM-GROUP-IDS */
                } else if (0 == g_ascii_strcasecmp (name, EVC_EMAIL)) {
                        /* EMAIL */
                        GDataGDEmailAddress *email;
@@ -390,36 +390,36 @@ gdata_entry_update_from_e_contact (GDataEntry *entry,
                e_contact_date_free (bdate);
        }
 
-        /* Map X-GOOGLE-SYSTEM-GROUP-IDS from outside to CATEGORIES.
-           They will be mapped again to system group ids below; this is done
-           so e-d-s/evolution (which use CATEGORIES), folks/gnome-contacts (which
-           use X-GOOGLE-SYSTEM-GROUP-IDS) and google contacts (which uses the
-           GData group IDs) all stay in sync */
-        {
-                EVCardAttribute *system_group_attr;
-                EVCardAttribute *categories_attr;
+       /* Map X-GOOGLE-SYSTEM-GROUP-IDS from outside to CATEGORIES.
+        * They will be mapped again to system group ids below; this is done
+        * so e-d-s / evolution (which use CATEGORIES), folks / gnome-contacts
+        * (which use X-GOOGLE-SYSTEM-GROUP-IDS) and google contacts (which
+        * uses the GData group IDs) all stay in sync */
+       {
+               EVCardAttribute *system_group_attr;
+               EVCardAttribute *categories_attr;
 
-                system_group_attr = e_vcard_get_attribute (E_VCARD (contact), GOOGLE_SYSTEM_GROUP_ATTR);
-                categories_attr = e_vcard_get_attribute (E_VCARD (contact), EVC_CATEGORIES);
+               system_group_attr = e_vcard_get_attribute (E_VCARD (contact), GOOGLE_SYSTEM_GROUP_ATTR);
+               categories_attr = e_vcard_get_attribute (E_VCARD (contact), EVC_CATEGORIES);
 
-                if (system_group_attr) {
-                        GList *system_groups = e_vcard_attribute_get_values (system_group_attr);
-                        GList *sys_group;
+               if (system_group_attr) {
+                       GList *system_groups = e_vcard_attribute_get_values (system_group_attr);
+                       GList *sys_group;
 
-                        for (sys_group = system_groups; sys_group; sys_group = sys_group->next) {
-                                const char *category_name;
+                       for (sys_group = system_groups; sys_group; sys_group = sys_group->next) {
+                               const gchar *category_name;
 
-                                category_name = e_contact_map_google_with_evo_group (sys_group->data, TRUE);
+                               category_name = e_contact_map_google_with_evo_group (sys_group->data, TRUE);
 
-                                if (!categories_attr) {
-                                        categories_attr = e_vcard_attribute_new (NULL, EVC_CATEGORIES);
-                                        e_vcard_append_attribute (E_VCARD (contact), categories_attr);
-                                }
+                               if (!categories_attr) {
+                                       categories_attr = e_vcard_attribute_new (NULL, EVC_CATEGORIES);
+                                       e_vcard_append_attribute (E_VCARD (contact), categories_attr);
+                               }
 
-                                e_vcard_attribute_add_value (categories_attr, category_name);
-                        }
-                }
-        }
+                               e_vcard_attribute_add_value (categories_attr, category_name);
+                       }
+               }
+       }
 
        /* CATEGORIES */
        for (category_names = e_contact_get (contact, E_CONTACT_CATEGORY_LIST); category_names != NULL; category_names = category_names->next) {

diff --git a/calendar/backends/contacts/e-cal-backend-contacts.c b/calendar/backends/contacts/e-cal-backend-contacts.c
index ad84f84..00f71fd 100644 (file)
--- a/calendar/backends/contacts/e-cal-backend-contacts.c
+++ b/calendar/backends/contacts/e-cal-backend-contacts.c
@@ -278,7 +278,8 @@ cbc_reopen_book_client (BookRecord *br)
                br->book_client, "opened",
                G_CALLBACK (book_client_opened_cb), br);
 
-       thread = g_thread_new (NULL,
+       thread = g_thread_new (
+               NULL,
                cbc_reopen_book_client_thread,
                br->book_client);
        g_thread_unref (thread);

diff --git a/camel/camel-certdb.c b/camel/camel-certdb.c
index fc38ebd..f9c6343 100644 (file)
--- a/camel/camel-certdb.c
+++ b/camel/camel-certdb.c
@@ -70,7 +70,7 @@ typedef struct {
 
 static CamelCertDBKey *
 certdb_key_new (const gchar *hostname,
-               const gchar *fingerprint)
+                const gchar *fingerprint)
 {
        CamelCertDBKey *key;
 
@@ -108,7 +108,7 @@ certdb_key_hash (gconstpointer ptr)
 
 static gboolean
 certdb_key_equal (gconstpointer ptr1,
-                 gconstpointer ptr2)
+                  gconstpointer ptr2)
 {
        const CamelCertDBKey *key1 = ptr1, *key2 = ptr2;
        gboolean same_hostname;
@@ -128,7 +128,6 @@ certdb_key_equal (gconstpointer ptr1,
                return g_ascii_strcasecmp (key1->fingerprint, key2->fingerprint) == 0;
        }
 
-       
        return same_hostname;
 }
 
@@ -511,7 +510,7 @@ camel_certdb_touch (CamelCertDB *certdb)
 CamelCert *
 camel_certdb_get_host (CamelCertDB *certdb,
                        const gchar *hostname,
-                      const gchar *fingerprint)
+                       const gchar *fingerprint)
 {
        CamelCert *cert;
        CamelCertDBKey *key;
@@ -581,7 +580,7 @@ camel_certdb_put (CamelCertDB *certdb,
 void
 camel_certdb_remove_host (CamelCertDB *certdb,
                           const gchar *hostname,
-                         const gchar *fingerprint)
+                          const gchar *fingerprint)
 {
        CamelCert *cert;
        CamelCertDBKey *key;

diff --git a/camel/camel-imapx-server.c b/camel/camel-imapx-server.c
index fa993ca..26cf884 100644 (file)
--- a/camel/camel-imapx-server.c
+++ b/camel/camel-imapx-server.c
@@ -979,7 +979,7 @@ imapx_command_start_next (CamelIMAPXServer *is,
                                                is->tagprefix,
                                                "waiting for idle to stop \n");
                                        /* if there are more pending commands,
-                                          then they should be processed too */
+                                        * then they should be processed too */
                                        break;
 
                                case IMAPX_IDLE_STOP_ERROR:
@@ -3017,8 +3017,8 @@ imapx_start_idle (CamelIMAPXServer *is)
        if (!idle->idle_thread) {
                idle->start_watch_is_set = FALSE;
 
-               idle->idle_thread = g_thread_new (NULL,
-                       (GThreadFunc) imapx_idle_thread, is);
+               idle->idle_thread = g_thread_new (
+                       NULL, (GThreadFunc) imapx_idle_thread, is);
        } else {
                g_mutex_lock (&idle->start_watch_mutex);
                idle->start_watch_is_set = TRUE;

diff --git a/camel/camel-mime-utils.c b/camel/camel-mime-utils.c
index 3cc92bc..3fb1ec4 100644 (file)
--- a/camel/camel-mime-utils.c
+++ b/camel/camel-mime-utils.c
@@ -2052,7 +2052,7 @@ header_decode_atom (const gchar **in)
 
 static gboolean
 extract_rfc2047_encoded_word (const gchar **in,
-                             gchar **word)
+                              gchar **word)
 {
        const gchar *inptr = *in, *start;
 

diff --git a/camel/providers/pop3/camel-pop3-engine.c b/camel/providers/pop3/camel-pop3-engine.c
index 7ee2843..44aa4c3 100644 (file)
--- a/camel/providers/pop3/camel-pop3-engine.c
+++ b/camel/providers/pop3/camel-pop3-engine.c
@@ -135,7 +135,7 @@ CamelPOP3Engine *
 camel_pop3_engine_new (CamelStream *source,
                        guint32 flags,
                        GCancellable *cancellable,
-                      GError **error)
+                       GError **error)
 {
        CamelPOP3Engine *pe;
 
@@ -165,7 +165,7 @@ camel_pop3_engine_new (CamelStream *source,
 gboolean
 camel_pop3_engine_reget_capabilities (CamelPOP3Engine *engine,
                                       GCancellable *cancellable,
-                                     GError **error)
+                                      GError **error)
 {
        g_return_val_if_fail (CAMEL_IS_POP3_ENGINE (engine), FALSE);
 
@@ -189,7 +189,7 @@ static void
 cmd_capa (CamelPOP3Engine *pe,
           CamelPOP3Stream *stream,
           GCancellable *cancellable,
-         GError **error,
+          GError **error,
           gpointer data)
 {
        guchar *line, *tok, *next;
@@ -234,7 +234,7 @@ cmd_capa (CamelPOP3Engine *pe,
 static gboolean
 get_capabilities (CamelPOP3Engine *pe,
                   GCancellable *cancellable,
-                 GError **error)
+                  GError **error)
 {
        CamelPOP3Command *pc;
        GError *local_error = NULL;

diff --git a/camel/providers/pop3/camel-pop3-folder.c b/camel/providers/pop3/camel-pop3-folder.c
index 4c0a407..5e6f438 100644 (file)
--- a/camel/providers/pop3/camel-pop3-folder.c
+++ b/camel/providers/pop3/camel-pop3-folder.c
@@ -63,7 +63,7 @@ static void
 cmd_uidl (CamelPOP3Engine *pe,
           CamelPOP3Stream *stream,
           GCancellable *cancellable,
-         GError **error,
+          GError **error,
           gpointer data)
 {
        gint ret;
@@ -98,7 +98,7 @@ static void
 cmd_builduid (CamelPOP3Engine *pe,
               CamelPOP3Stream *stream,
               GCancellable *cancellable,
-             GError **error,
+              GError **error,
               gpointer data)
 {
        GChecksum *checksum;
@@ -147,7 +147,7 @@ static void
 cmd_list (CamelPOP3Engine *pe,
           CamelPOP3Stream *stream,
           GCancellable *cancellable,
-         GError **error,
+          GError **error,
           gpointer data)
 {
        gint ret;
@@ -322,7 +322,7 @@ static void
 cmd_tocache (CamelPOP3Engine *pe,
              CamelPOP3Stream *stream,
              GCancellable *cancellable,
-            GError **error,
+             GError **error,
              gpointer data)
 {
        CamelPOP3FolderInfo *fi = data;

diff --git a/libebackend/e-authentication-mediator.c b/libebackend/e-authentication-mediator.c
index 3ffb8c1..2719fb7 100644 (file)
--- a/libebackend/e-authentication-mediator.c
+++ b/libebackend/e-authentication-mediator.c
@@ -743,7 +743,8 @@ authentication_mediator_initable_init (GInitable *initable,
         * main loop will signal the thread itself to terminate. */
        mediator->priv->thread_closure = thread_closure_ref (closure);
 
-       thread = g_thread_new (NULL,
+       thread = g_thread_new (
+               NULL,
                authentication_mediator_authenticator_thread,
                closure);
 

diff --git a/libebackend/e-collection-backend.c b/libebackend/e-collection-backend.c
index 1b783e7..0fc0af3 100644 (file)
--- a/libebackend/e-collection-backend.c
+++ b/libebackend/e-collection-backend.c
@@ -351,11 +351,12 @@ collection_backend_child_is_mail (ESource *child_source)
 
 static gboolean
 include_master_source_enabled_transform (GBinding *binding,
-                                        const GValue *source_value,
-                                        GValue *target_value,
-                                        gpointer backend)
+                                         const GValue *source_value,
+                                         GValue *target_value,
+                                         gpointer backend)
 {
-       g_value_set_boolean (target_value,
+       g_value_set_boolean (
+               target_value,
                g_value_get_boolean (source_value) &&
                e_source_get_enabled (e_backend_get_source (backend)));
 

diff --git a/libedataserver/e-source-registry.c b/libedataserver/e-source-registry.c
index 4c9c572..d1af615 100644 (file)
--- a/libedataserver/e-source-registry.c
+++ b/libedataserver/e-source-registry.c
@@ -1032,7 +1032,8 @@ source_registry_initable_init (GInitable *initable,
 
        registry->priv->thread_closure = closure;
 
-       registry->priv->manager_thread = g_thread_new (NULL,
+       registry->priv->manager_thread = g_thread_new (
+               NULL,
                source_registry_object_manager_thread,
                closure);
 

diff --git a/modules/gnome-online-accounts/goaewsclient.c b/modules/gnome-online-accounts/goaewsclient.c
index e59e149..4fc1ab4 100644 (file)
--- a/modules/gnome-online-accounts/goaewsclient.c
+++ b/modules/gnome-online-accounts/goaewsclient.c
@@ -116,7 +116,7 @@ ews_autodiscover_cancelled_cb (GCancellable *cancellable,
 
 static gboolean
 has_suffix_icmp (const gchar *text,
-                const gchar *suffix)
+                 const gchar *suffix)
 {
        gint ii, tlen, slen;
 
@@ -130,7 +130,7 @@ has_suffix_icmp (const gchar *text,
                return FALSE;
 
        for (ii = 0; ii < slen; ii++) {
-               if (g_ascii_tolower (text[tlen - ii - 1]) != 
+               if (g_ascii_tolower (text[tlen - ii - 1]) !=
                    g_ascii_tolower (suffix[slen - ii - 1]))
                        break;
        }
@@ -158,7 +158,7 @@ ews_autodiscover_parse_protocol (xmlNode *node,
                        const gchar *oab_url;
 
                        content = xmlNodeGetContent (node);
-                       oab_url = (const char *) content;
+                       oab_url = (const gchar *) content;
 
                        if (!has_suffix_icmp (oab_url, "oab.xml")) {
                                gchar *tmp;

diff --git a/modules/gnome-online-accounts/module-gnome-online-accounts.c b/modules/gnome-online-accounts/module-gnome-online-accounts.c
index 45e91a3..e6dbfa5 100644 (file)
--- a/modules/gnome-online-accounts/module-gnome-online-accounts.c
+++ b/modules/gnome-online-accounts/module-gnome-online-accounts.c
@@ -176,7 +176,7 @@ gnome_online_accounts_new_source (EGnomeOnlineAccounts *extension)
 #ifdef HAVE_GOA_PASSWORD_BASED
 static void
 replace_host (gchar **url,
-             const gchar *host)
+              const gchar *host)
 {
        SoupURI *uri;
 
@@ -258,6 +258,7 @@ gnome_online_accounts_config_exchange (EGnomeOnlineAccounts *extension,
        /* This will be NULL if Evolution-EWS is not installed. */
        if (source_extension != NULL) {
                GoaAccount *goa_account;
+               CamelSettings *settings;
                gchar *host, *user, *email;
 
                goa_account = goa_object_peek_account (goa_object);
@@ -277,7 +278,11 @@ gnome_online_accounts_config_exchange (EGnomeOnlineAccounts *extension,
                        "email", email,
                        NULL);
 
-               g_object_set (e_source_camel_get_settings (E_SOURCE_CAMEL (source_extension)),
+               settings = e_source_camel_get_settings (
+                       E_SOURCE_CAMEL (source_extension));
+
+               g_object_set (
+                       settings,
                        "host", host,
                        "user", user,
                        "email", email,