Coding style and whitespace cleanup.

diff --git a/addressbook/backends/google/e-book-backend-google.c b/addressbook/backends/google/e-book-backend-google.c
index a5e5f71..99db0d2 100644 (file)
--- a/addressbook/backends/google/e-book-backend-google.c
+++ b/addressbook/backends/google/e-book-backend-google.c
@@ -998,7 +998,7 @@ get_groups (EBookBackend *backend)
 
 static void
 get_groups_sync (EBookBackend *backend,
-                GCancellable *cancellable)
+                 GCancellable *cancellable)
 {
        EBookBackendGooglePrivate *priv;
        GDataQuery *query;

diff --git a/addressbook/backends/google/tests/phone-numbers.c b/addressbook/backends/google/tests/phone-numbers.c
index ddc6b8b..b67fb66 100644 (file)
--- a/addressbook/backends/google/tests/phone-numbers.c
+++ b/addressbook/backends/google/tests/phone-numbers.c
@@ -39,7 +39,9 @@ build_system_groups_by_id (void)
 }
 
 static gchar *
-create_group_null (const gchar *category_name, gpointer user_data, GError **error)
+create_group_null (const gchar *category_name,
+                   gpointer user_data,
+                   GError **error)
 {
        /* Must never be reached. */
        g_assert_not_reached ();
@@ -110,8 +112,9 @@ test_label_nor_type (void)
        g_object_unref (entry);
 }
 
-int
-main (int argc, char **argv)
+gint
+main (gint argc,
+      gchar **argv)
 {
        g_type_init ();
        g_test_init (&argc, &argv, NULL);

diff --git a/calendar/backends/contacts/e-source-contacts.c b/calendar/backends/contacts/e-source-contacts.c
index 5f6b432..8e8eac3 100644 (file)
--- a/calendar/backends/contacts/e-source-contacts.c
+++ b/calendar/backends/contacts/e-source-contacts.c
@@ -122,7 +122,7 @@ e_source_contacts_class_init (ESourceContactsClass *class)
                        "include-me",
                        "Include Me",
                        "Include this address book in the contacts calendar",
-                       FALSE,  /* see constructed() */
+                       FALSE,  /* see constructed () */
                        G_PARAM_READWRITE |
                        E_SOURCE_PARAM_SETTING));
 }

diff --git a/camel/camel-vee-folder.c b/camel/camel-vee-folder.c
index 1886a58..a8a5d91 100644 (file)
--- a/camel/camel-vee-folder.c
+++ b/camel/camel-vee-folder.c
@@ -1069,7 +1069,7 @@ vee_folder_remove_folder (CamelVeeFolder *vfolder,
        camel_folder_thaw (v_folder);
 
        /* do not notify about changes in vfolder which
-          is removing its subfolders in dispose */
+        * is removing its subfolders in dispose */
        if (!vfolder->priv->destroyed &&
            camel_folder_change_info_changed (changes))
                camel_folder_changed (CAMEL_FOLDER (vfolder), changes);

diff --git a/camel/providers/imap/camel-imap-command.c b/camel/providers/imap/camel-imap-command.c
index 29bfc23..5f11957 100644 (file)
--- a/camel/providers/imap/camel-imap-command.c
+++ b/camel/providers/imap/camel-imap-command.c
@@ -255,7 +255,7 @@ imap_command_start (CamelImapStore *store,
 
        if (nwritten == -1) {
                /* do not pass cancellable, the connection is gone or
-                  the cancellable cancelled, thus there will be no I/O */
+                * the cancellable cancelled, thus there will be no I/O */
                camel_service_disconnect_sync (
                        CAMEL_SERVICE (store), FALSE, NULL, NULL);
                return FALSE;
@@ -311,7 +311,7 @@ camel_imap_command_continuation (CamelImapStore *store,
        if (camel_stream_write (store->ostream, cmd, cmdlen, cancellable, error) == -1 ||
            camel_stream_write (store->ostream, "\r\n", 2, cancellable, error) == -1) {
                /* do not pass cancellable, the connection is gone or
-                  the cancellable cancelled, thus there will be no I/O */
+                * the cancellable cancelled, thus there will be no I/O */
                camel_service_disconnect_sync (
                        CAMEL_SERVICE (store), FALSE, NULL, NULL);
                g_static_rec_mutex_unlock (&store->command_and_response_lock);
@@ -380,7 +380,7 @@ camel_imap_command_response (CamelImapStore *store,
                                err = g_strerror (104);
 
                        /* do not pass cancellable, the connection is gone or
-                          the cancellable cancelled, thus there will be no I/O */
+                        * the cancellable cancelled, thus there will be no I/O */
                        camel_service_disconnect_sync (
                                service, FALSE, NULL, NULL);
                        g_set_error (
@@ -585,7 +585,7 @@ imap_read_untagged (CamelImapStore *store,
                                cancellable, error);
                        if (n == -1) {
                                /* do not pass cancellable, the connection is gone or
-                                  the cancellable cancelled, thus there will be no I/O */
+                                * the cancellable cancelled, thus there will be no I/O */
                                camel_service_disconnect_sync (
                                        CAMEL_SERVICE (store),
                                        FALSE, NULL, NULL);
@@ -602,7 +602,7 @@ imap_read_untagged (CamelImapStore *store,
                                CAMEL_SERVICE_ERROR_UNAVAILABLE,
                                _("Server response ended too soon."));
                        /* do not pass cancellable, the connection is gone or
-                          the cancellable cancelled, thus there will be no I/O */
+                        * the cancellable cancelled, thus there will be no I/O */
                        camel_service_disconnect_sync (
                                CAMEL_SERVICE (store),
                                FALSE, NULL, NULL);

diff --git a/camel/providers/imap/camel-imap-settings.c b/camel/providers/imap/camel-imap-settings.c
index 0f78dc2..fabc08b 100644 (file)
--- a/camel/providers/imap/camel-imap-settings.c
+++ b/camel/providers/imap/camel-imap-settings.c
@@ -820,7 +820,7 @@ camel_imap_settings_dup_fetch_headers_extra (CamelImapSettings *settings)
 
 static gboolean
 fetch_headers_equal (const gchar * const *h1,
-                    const gchar * const *h2)
+                     const gchar * const *h2)
 {
        gint ii;
 

diff --git a/camel/providers/imap/camel-imap-store.c b/camel/providers/imap/camel-imap-store.c
index fba76e7..794939f 100644 (file)
--- a/camel/providers/imap/camel-imap-store.c
+++ b/camel/providers/imap/camel-imap-store.c
@@ -841,7 +841,7 @@ imap_store_connect_sync (CamelService *service,
        if (!connect_to_server_wrapper (service, cancellable, error) ||
            !imap_auth_loop (service, cancellable, error)) {
                /* reset cancellable, in case it is cancelled,
-                  thus the disconnect is run */
+                * thus the disconnect is run */
                if (cancellable)
                        g_cancellable_reset (cancellable);
                camel_service_disconnect_sync (
@@ -1019,7 +1019,7 @@ done:
 
        if (local_error != NULL) {
                /* reset cancellable, in case it is cancelled,
-                  thus the disconnect is run */
+                * thus the disconnect is run */
                if (cancellable)
                        g_cancellable_reset (cancellable);
                camel_service_disconnect_sync (
@@ -3266,7 +3266,7 @@ camel_imap_store_readline (CamelImapStore *store,
                                error, _("Server unexpectedly disconnected: "));
 
                /* do not pass cancellable, the connection is gone or
-                  the cancellable cancelled, thus there will be no I/O */
+                * the cancellable cancelled, thus there will be no I/O */
                camel_service_disconnect_sync (
                        CAMEL_SERVICE (store), FALSE, NULL, NULL);
                g_byte_array_free (ba, TRUE);

diff --git a/libedataserver/e-source-mail-composition.c b/libedataserver/e-source-mail-composition.c
index 0d764a0..ec37741 100644 (file)
--- a/libedataserver/e-source-mail-composition.c
+++ b/libedataserver/e-source-mail-composition.c
@@ -319,7 +319,7 @@ e_source_mail_composition_dup_bcc (ESourceMailComposition *extension)
 
 static gboolean
 strv_equal (const gchar * const *strv1,
-           const gchar * const *strv2)
+            const gchar * const *strv2)
 {
        gint ii;
 

diff --git a/libedataserverui/e-name-selector-entry.c b/libedataserverui/e-name-selector-entry.c
index ea1081b..c69556c 100644 (file)
--- a/libedataserverui/e-name-selector-entry.c
+++ b/libedataserverui/e-name-selector-entry.c
@@ -869,7 +869,7 @@ build_textrep_for_contact (EContact *contact,
 
 static gboolean
 contact_match_cue (ENameSelectorEntry *name_selector_entry,
-                  EContact *contact,
+                   EContact *contact,
                    const gchar *cue_str,
                    EContactField *matched_field,
                    gint *matched_field_rank)
@@ -1248,7 +1248,7 @@ modify_destination_at_position (ENameSelectorEntry *name_selector_entry,
 
 static gchar *
 get_destination_textrep (ENameSelectorEntry *name_selector_entry,
-                        EDestination *destination)
+                         EDestination *destination)
 {
        gboolean show_email = e_name_selector_entry_get_show_address (name_selector_entry);
        EContact *contact;
@@ -3315,7 +3315,7 @@ e_name_selector_entry_get_minimum_query_length (ENameSelectorEntry *name_selecto
  **/
 void
 e_name_selector_entry_set_minimum_query_length (ENameSelectorEntry *name_selector_entry,
-                                               gint length)
+                                                gint length)
 {
        g_return_if_fail (E_IS_NAME_SELECTOR_ENTRY (name_selector_entry));
        g_return_if_fail (length > 0);
@@ -3355,7 +3355,7 @@ e_name_selector_entry_get_show_address (ENameSelectorEntry *name_selector_entry)
  **/
 void
 e_name_selector_entry_set_show_address (ENameSelectorEntry *name_selector_entry,
-                                       gboolean show)
+                                        gboolean show)
 {
        g_return_if_fail (E_IS_NAME_SELECTOR_ENTRY (name_selector_entry));
 

diff --git a/modules/online-accounts/goaewsclient.c b/modules/online-accounts/goaewsclient.c
index 412eed5..1b09e50 100644 (file)
--- a/modules/online-accounts/goaewsclient.c
+++ b/modules/online-accounts/goaewsclient.c
@@ -248,7 +248,7 @@ ews_autodiscover_response_cb (SoupSession *session,
        if (!success) {
                g_set_error (
                        &error, GOA_ERROR,
-                       GOA_ERROR_FAILED, /* TODO: more specific*/
+                       GOA_ERROR_FAILED, /* TODO: more specific */
                        _("Failed to find ASUrl and OABUrl in autodiscover response"));
                        goto out;
        }
@@ -310,7 +310,8 @@ ews_create_autodiscover_xml (const gchar *email)
 }
 
 static void
-ews_post_restarted_cb (SoupMessage *msg, gpointer data)
+ews_post_restarted_cb (SoupMessage *msg,
+                       gpointer data)
 {
        xmlOutputBuffer *buf = data;
 

diff --git a/services/evolution-source-registry/evolution-source-registry-migrate-sources.c b/services/evolution-source-registry/evolution-source-registry-migrate-sources.c
index 67ba54c..8c2b8b1 100644 (file)
--- a/services/evolution-source-registry/evolution-source-registry-migrate-sources.c
+++ b/services/evolution-source-registry/evolution-source-registry-migrate-sources.c
@@ -2463,7 +2463,6 @@ migrate_parse_weather_source (ParseData *parse_data)
                g_free (location);
        }
 
-
        parse_data->property_func = migrate_parse_weather_property;
 }
 

diff --git a/tests/libebook/ebook-test-utils.c b/tests/libebook/ebook-test-utils.c
index 699074a..82750be 100644 (file)
--- a/tests/libebook/ebook-test-utils.c
+++ b/tests/libebook/ebook-test-utils.c
@@ -115,16 +115,16 @@ ebook_test_utils_book_add_contact (EBook *book,
 {
        GError *error = NULL;
 
-        if (!e_book_add_contact (book, contact, &error)) {
-                ESource *source;
-                const gchar *name;
+       if (!e_book_add_contact (book, contact, &error)) {
+               ESource *source;
+               const gchar *name;
 
-                source = e_book_get_source (book);
-                name = e_source_get_display_name (source);
+               source = e_book_get_source (book);
+               name = e_source_get_display_name (source);
                 g_warning ("failed to add contact to addressbook: `%s': %s",
-                                name, error->message);
-                exit (1);
-        }
+                               name, error->message);
+               exit (1);
+       }
 
        return e_contact_get_const (contact, E_CONTACT_UID);
 }
@@ -173,19 +173,19 @@ ebook_test_utils_book_commit_contact (EBook *book,
 {
        GError *error = NULL;
 
-        if (!e_book_commit_contact (book, contact, &error)) {
-                ESource *source;
-                const gchar *name;
-                const gchar *uid;
+       if (!e_book_commit_contact (book, contact, &error)) {
+               ESource *source;
+               const gchar *name;
+               const gchar *uid;
 
-                uid = (const gchar *) e_contact_get_const (contact, E_CONTACT_UID);
+               uid = (const gchar *) e_contact_get_const (contact, E_CONTACT_UID);
 
-                source = e_book_get_source (book);
-                name = e_source_get_display_name (source);
+               source = e_book_get_source (book);
+               name = e_source_get_display_name (source);
                 g_warning ("failed to commit changes to contact '%s' to addressbook: `%s': %s",
-                                uid, name, error->message);
-                exit (1);
-        }
+                               uid, name, error->message);
+               exit (1);
+       }
 }
 
 static void
@@ -232,16 +232,16 @@ ebook_test_utils_book_get_contact (EBook *book,
        EContact *contact = NULL;
        GError *error = NULL;
 
-        if (!e_book_get_contact (book, uid, &contact, &error)) {
-                ESource *source;
-                const gchar *name;
+       if (!e_book_get_contact (book, uid, &contact, &error)) {
+               ESource *source;
+               const gchar *name;
 
-                source = e_book_get_source (book);
-                name = e_source_get_display_name (source);
+               source = e_book_get_source (book);
+               name = e_source_get_display_name (source);
                 g_warning ("failed to get contact '%s' in addressbook: `%s': "
                                 "%s", uid, name, error->message);
-                exit (1);
-        }
+               exit (1);
+       }
 
        return contact;
 }
@@ -295,16 +295,16 @@ ebook_test_utils_book_get_required_fields (EBook *book)
        GList *fields = NULL;
        GError *error = NULL;
 
-        if (!e_book_get_required_fields (book, &fields, &error)) {
-                ESource *source;
-                const gchar *name;
+       if (!e_book_get_required_fields (book, &fields, &error)) {
+               ESource *source;
+               const gchar *name;
 
-                source = e_book_get_source (book);
-                name = e_source_get_display_name (source);
+               source = e_book_get_source (book);
+               name = e_source_get_display_name (source);
                 g_warning ("failed to get required fields for addressbook "
                                 "`%s': %s", name, error->message);
-                exit (1);
-        }
+               exit (1);
+       }
 
        return fields;
 }
@@ -355,16 +355,16 @@ ebook_test_utils_book_get_static_capabilities (EBook *book)
        GError *error = NULL;
        const gchar *caps;
 
-        if (!(caps = e_book_get_static_capabilities (book, &error))) {
-                ESource *source;
-                const gchar *name;
+       if (!(caps = e_book_get_static_capabilities (book, &error))) {
+               ESource *source;
+               const gchar *name;
 
-                source = e_book_get_source (book);
-                name = e_source_get_display_name (source);
+               source = e_book_get_source (book);
+               name = e_source_get_display_name (source);
                 g_warning ("failed to get capabilities for addressbook: `%s': "
                                 "%s", name, error->message);
-                exit (1);
-        }
+               exit (1);
+       }
 
        return caps;
 }
@@ -375,16 +375,16 @@ ebook_test_utils_book_get_supported_auth_methods (EBook *book)
        GList *fields = NULL;
        GError *error = NULL;
 
-        if (!e_book_get_supported_auth_methods (book, &fields, &error)) {
-                ESource *source;
-                const gchar *name;
+       if (!e_book_get_supported_auth_methods (book, &fields, &error)) {
+               ESource *source;
+               const gchar *name;
 
-                source = e_book_get_source (book);
-                name = e_source_get_display_name (source);
+               source = e_book_get_source (book);
+               name = e_source_get_display_name (source);
                 g_warning ("failed to get supported auth methods for "
                                 "addressbook `%s': %s", name, error->message);
-                exit (1);
-        }
+               exit (1);
+       }
 
        return fields;
 }
@@ -435,16 +435,16 @@ ebook_test_utils_book_get_supported_fields (EBook *book)
        GList *fields = NULL;
        GError *error = NULL;
 
-        if (!e_book_get_supported_fields (book, &fields, &error)) {
-                ESource *source;
-                const gchar *name;
+       if (!e_book_get_supported_fields (book, &fields, &error)) {
+               ESource *source;
+               const gchar *name;
 
-                source = e_book_get_source (book);
-                name = e_source_get_display_name (source);
+               source = e_book_get_source (book);
+               name = e_source_get_display_name (source);
                 g_warning ("failed to get supported fields for addressbook "
                                 "`%s': %s", name, error->message);
-                exit (1);
-        }
+               exit (1);
+       }
 
        return fields;
 }
@@ -494,16 +494,16 @@ ebook_test_utils_book_remove_contact (EBook *book,
 {
        GError *error = NULL;
 
-        if (!e_book_remove_contact (book, uid, &error)) {
-                ESource *source;
-                const gchar *name;
+       if (!e_book_remove_contact (book, uid, &error)) {
+               ESource *source;
+               const gchar *name;
 
-                source = e_book_get_source (book);
-                name = e_source_get_display_name (source);
+               source = e_book_get_source (book);
+               name = e_source_get_display_name (source);
                 g_warning ("failed to remove contact '%s' from addressbook: `%s': %s",
-                                uid, name, error->message);
-                exit (1);
-        }
+                               uid, name, error->message);
+               exit (1);
+       }
 }
 
 static void
@@ -588,16 +588,16 @@ ebook_test_utils_book_remove_contacts (EBook *book,
 {
        GError *error = NULL;
 
-        if (!e_book_remove_contacts (book, ids, &error)) {
-                ESource *source;
-                const gchar *name;
+       if (!e_book_remove_contacts (book, ids, &error)) {
+               ESource *source;
+               const gchar *name;
 
-                source = e_book_get_source (book);
-                name = e_source_get_display_name (source);
+               source = e_book_get_source (book);
+               name = e_source_get_display_name (source);
                 g_warning ("failed to remove contacts from addressbook: `%s': %s",
-                                name, error->message);
-                exit (1);
-        }
+                               name, error->message);
+               exit (1);
+       }
 }
 
 static void
@@ -694,17 +694,17 @@ ebook_test_utils_book_get_book_view (EBook *book,
 {
        GError *error = NULL;
 
-        if (!e_book_get_book_view (book, query, NULL, -1, view, &error)) {
-                ESource *source;
-                const gchar *name;
+       if (!e_book_get_book_view (book, query, NULL, -1, view, &error)) {
+               ESource *source;
+               const gchar *name;
 
-                source = e_book_get_source (book);
-                name = e_source_get_display_name (source);
+               source = e_book_get_source (book);
+               name = e_source_get_display_name (source);
 
                 g_warning ("failed to get view for addressbook: `%s': %s",
-                                name, error->message);
-                exit (1);
-        }
+                               name, error->message);
+               exit (1);
+       }
 }
 
 static void

diff --git a/tests/libebook/test-ebook-get-book-view.c b/tests/libebook/test-ebook-get-book-view.c
index c4355ac..97923f3 100644 (file)
--- a/tests/libebook/test-ebook-get-book-view.c
+++ b/tests/libebook/test-ebook-get-book-view.c
@@ -114,7 +114,7 @@ main (gint argc,
        loop = g_main_loop_new (NULL, TRUE);
        g_main_loop_run (loop);
 
-        e_book_query_unref (query);
+       e_book_query_unref (query);
 
        /*
         * Async version
@@ -128,7 +128,7 @@ main (gint argc,
 
        g_main_loop_run (loop);
 
-        e_book_query_unref (query);
+       e_book_query_unref (query);
 
        return 0;
 }

diff --git a/tests/libebook/test-ebook-remove-contact.c b/tests/libebook/test-ebook-remove-contact.c
index fe71c3c..5b5728f 100644 (file)
--- a/tests/libebook/test-ebook-remove-contact.c
+++ b/tests/libebook/test-ebook-remove-contact.c
@@ -32,7 +32,7 @@ main (gint argc,
        g_assert (contact_final == NULL);
         test_print ("successfully added and removed contact '%s'\n", uid);
 
-        g_free (uid);
+       g_free (uid);
 
         /*
          * Async version

diff --git a/tests/libebook/test-ebook-remove-contacts.c b/tests/libebook/test-ebook-remove-contacts.c
index eabe89e..dff2e31 100644 (file)
--- a/tests/libebook/test-ebook-remove-contacts.c
+++ b/tests/libebook/test-ebook-remove-contacts.c
@@ -40,8 +40,8 @@ main (gint argc,
 
         test_print ("successfully added and removed contacts\n");
 
-        g_free (uid_1);
-        g_free (uid_2);
+       g_free (uid_1);
+       g_free (uid_2);
        g_list_free (uids);
 
         /*
@@ -62,8 +62,8 @@ main (gint argc,
 
        g_main_loop_run (loop);
 
-        g_free (uid_1);
-        g_free (uid_2);
+       g_free (uid_1);
+       g_free (uid_2);
        g_list_free (uids);
 
        return 0;

diff --git a/tests/libebook/test-nonexistent-id.c b/tests/libebook/test-nonexistent-id.c
index 0411134..2924018 100644 (file)
--- a/tests/libebook/test-nonexistent-id.c
+++ b/tests/libebook/test-nonexistent-id.c
@@ -2,7 +2,8 @@
 #include <libebook/libebook.h>
 
 gint
-main (gint argc, gchar **argv)
+main (gint argc,
+      gchar **argv)
 {
 #if 0  /* ACCOUNT_MGMT */
        GError *err = NULL;

diff --git a/tests/libedataserver/e-source-test.c b/tests/libedataserver/e-source-test.c
index e24ab14..bb14f5d 100644 (file)
--- a/tests/libedataserver/e-source-test.c
+++ b/tests/libedataserver/e-source-test.c
@@ -225,7 +225,8 @@ test_single_source (TestFixture *fixture,
 }
 
 gint
-main (gint argc, gchar **argv)
+main (gint argc,
+      gchar **argv)
 {
        g_type_init ();