Whitespace cleanups.

diff --git a/addressbook/backends/file/e-book-backend-file.c b/addressbook/backends/file/e-book-backend-file.c
index 9a5c6ea..337e637 100644 (file)
--- a/addressbook/backends/file/e-book-backend-file.c
+++ b/addressbook/backends/file/e-book-backend-file.c
@@ -1025,7 +1025,7 @@ e_book_backend_file_remove_contacts (EBookBackendSync *backend,
 
                id = l->data;
 
-               contact = load_contact(bf, txn, id, NULL);
+               contact = load_contact (bf, txn, id, NULL);
                if (contact)
                        removed_contacts = g_slist_prepend (removed_contacts, contact);
 
@@ -1064,8 +1064,8 @@ e_book_backend_file_remove_contacts (EBookBackendSync *backend,
                GError *error = NULL;
 
                /* Delete URI associated to those contacts */
-               for (l = removed_contacts; l; l=l->next) {
-                       maybe_delete_unused_uris (bf, E_CONTACT(l->data), NULL);
+               for (l = removed_contacts; l; l = l->next) {
+                       maybe_delete_unused_uris (bf, E_CONTACT (l->data), NULL);
                }
 
                /* Remove from summary as well */
@@ -1215,7 +1215,7 @@ e_book_backend_file_modify_contacts (EBookBackendSync *backend,
                lold = old_contacts;
                l = modified_contacts;
                while (lold && l) {
-                       maybe_delete_unused_uris (bf, E_CONTACT(lold->data), E_CONTACT(l->data));
+                       maybe_delete_unused_uris (bf, E_CONTACT (lold->data), E_CONTACT (l->data));
                        lold = lold->next;
                        l = l->next;
                }

diff --git a/addressbook/backends/google/e-book-backend-google.c b/addressbook/backends/google/e-book-backend-google.c
index de597fd..3e6ace0 100644 (file)
--- a/addressbook/backends/google/e-book-backend-google.c
+++ b/addressbook/backends/google/e-book-backend-google.c
@@ -919,7 +919,7 @@ sanitise_group_id (const gchar *group_id)
 
 static const gchar *
 map_google_with_evo_group (const gchar *group_name,
-                          gboolean google_to_evo)
+                           gboolean google_to_evo)
 {
        struct _GroupsMap {
                const gchar *google_id;
@@ -2803,7 +2803,7 @@ static gboolean
 _gdata_entry_update_from_e_contact (EBookBackend *backend,
                                     GDataEntry *entry,
                                     EContact *contact,
-                                   gboolean ensure_personal_group)
+                                    gboolean ensure_personal_group)
 {
        EBookBackendGooglePrivate *priv;
        GList *attributes, *iter, *category_names;
@@ -3097,8 +3097,8 @@ _gdata_entry_update_from_e_contact (EBookBackend *backend,
        }
 
        /* to have contacts shown in My Contacts by default,
-          see https://bugzilla.gnome.org/show_bug.cgi?id=663324
-          for more details */
+        * see https://bugzilla.gnome.org/show_bug.cgi?id=663324
+        * for more details */
        if (ensure_personal_group) {
                const gchar *group_entry_id = g_hash_table_lookup (priv->system_groups_by_id, GDATA_CONTACTS_GROUP_CONTACTS);
 

diff --git a/addressbook/libebook/e-contact.c b/addressbook/libebook/e-contact.c
index 90ce263..9f86d5d 100644 (file)
--- a/addressbook/libebook/e-contact.c
+++ b/addressbook/libebook/e-contact.c
@@ -122,7 +122,7 @@ static const EContactFieldInfo field_info[] = {
        /* FILE_AS is not really a structured field - we use a getter/setter
         * so we can generate its value if necessary in the getter */
        /* Translators: This is an EContact field description, in this case it's a
-          preferred user's description (or display name) of the contact. Note 'File' is a verb here. */
+        * preferred user's description (or display name) of the contact. Note 'File' is a verb here. */
        GETSET_FIELD (E_CONTACT_FILE_AS,    EVC_X_FILE_AS, "file_as", N_("File Under"),    FALSE, fileas_getter, fileas_setter),
        /* URI of the book to which the contact belongs to */
        STRING_FIELD (E_CONTACT_BOOK_URI, EVC_X_BOOK_URI, "book_uri", N_("Book URI"), FALSE),
@@ -238,8 +238,8 @@ static const EContactFieldInfo field_info[] = {
        /* Last modified time */
        STRING_FIELD (E_CONTACT_REV, EVC_REV, "Rev", N_("Last Revision"), FALSE),
        /* Translators: This is an EContact field description, in this case it's a
-          virtual field, which returns either name of the contact or the organization
-          name, recognized by multiple other fields, where the first filled is used. */
+        * virtual field, which returns either name of the contact or the organization
+        * name, recognized by multiple other fields, where the first filled is used. */
        SYNTH_STR_FIELD     (E_CONTACT_NAME_OR_ORG,               "name_or_org", N_("Name or Org"), TRUE),
 
        /* Address fields */
@@ -256,7 +256,7 @@ static const EContactFieldInfo field_info[] = {
        STRUCT_FIELD    (E_CONTACT_LOGO,  EVC_LOGO,  "logo",  N_("Logo"),  FALSE, photo_getter, photo_setter, e_contact_photo_get_type),
 
        /* Translators: This is an EContact field description, in this case it's a name
-          of the contact, as specified in http://tools.ietf.org/html/rfc6350#section-6.2.2 */
+        * of the contact, as specified in http://tools.ietf.org/html/rfc6350#section-6.2.2 */
        STRUCT_FIELD        (E_CONTACT_NAME,        EVC_N,        "name", N_("Name"),        FALSE, n_getter, n_setter, e_contact_name_get_type),
        MULTI_LIST_FIELD     (E_CONTACT_EMAIL,      EVC_EMAIL,        "email",      N_("Email List"),      FALSE),
 
@@ -271,13 +271,13 @@ static const EContactFieldInfo field_info[] = {
        BOOLEAN_FIELD        (E_CONTACT_WANTS_HTML, EVC_X_WANTS_HTML, "wants_html", N_("Wants HTML Mail"), FALSE),
 
        /* Translators: This is an EContact field description, in this case it's a
-          field describing whether it's a Contact list (list of email addresses) or a
-          regular contact for one person/organization/... */
+        * field describing whether it's a Contact list (list of email addresses) or a
+        * regular contact for one person/organization/... */
        BOOLEAN_FIELD (E_CONTACT_IS_LIST,             EVC_X_LIST, "list", N_("List"), FALSE),
        /* Translators: This is an EContact field description, in this case it's a flag
-          used to determine whether when sending to Contact lists the addresses should be
-          shown or not to other recipients - basically whether to use BCC field or CC
-          message header when sending messages to this Contact list. */
+        * used to determine whether when sending to Contact lists the addresses should be
+        * shown or not to other recipients - basically whether to use BCC field or CC
+        * message header when sending messages to this Contact list. */
        BOOLEAN_FIELD (E_CONTACT_LIST_SHOW_ADDRESSES, EVC_X_LIST_SHOW_ADDRESSES, "list_show_addresses", N_("List Shows Addresses"), FALSE),
 
        STRUCT_FIELD (E_CONTACT_BIRTH_DATE,  EVC_BDAY,          "birth_date",  N_("Birth Date"), FALSE, date_getter, date_setter, e_contact_date_get_type),
@@ -1745,7 +1745,7 @@ e_contact_set (EContact *contact,
 
        /* set the cached slot to NULL so we'll re-get the new string
         * if e_contact_get_const is called again */
-        g_free (contact->priv->cached_strings[field_id]);
+       g_free (contact->priv->cached_strings[field_id]);
        contact->priv->cached_strings[field_id] = NULL;
 
        g_object_set (contact,

diff --git a/calendar/backends/caldav/e-cal-backend-caldav.c b/calendar/backends/caldav/e-cal-backend-caldav.c
index 4939fd6..e5955fc 100644 (file)
--- a/calendar/backends/caldav/e-cal-backend-caldav.c
+++ b/calendar/backends/caldav/e-cal-backend-caldav.c
@@ -313,7 +313,7 @@ static gboolean put_comp_to_cache (ECalBackendCalDAV *cbdav, icalcomponent *ical
 
 static void
 update_slave_cmd (ECalBackendCalDAVPrivate *priv,
-                 SlaveCommand slave_cmd)
+                  SlaveCommand slave_cmd)
 {
        g_return_if_fail (priv != NULL);
 
@@ -1556,7 +1556,7 @@ caldav_post_freebusy (ECalBackendCalDAV *cbdav,
 
 static gchar *
 caldav_gen_file_from_uid_cal (ECalBackendCalDAV *cbdav,
-                             icalcomponent *icalcomp)
+                              icalcomponent *icalcomp)
 {
        icalcomponent_kind my_kind;
        const gchar *uid = NULL;
@@ -1684,7 +1684,7 @@ caldav_server_put_object (ECalBackendCalDAV *cbdav,
                                gchar *file;
 
                                /* OK, the event was properly created, but cannot be found on the place
-                                  where it was PUT - why didn't server tell us where it saved it? */
+                                * where it was PUT - why didn't server tell us where it saved it? */
                                g_clear_error (&local_error);
 
                                /* try whether it's saved as its UID.ics file */
@@ -1698,7 +1698,7 @@ caldav_server_put_object (ECalBackendCalDAV *cbdav,
                                                        g_clear_error (&local_error);
 
                                                        /* not sure what can happen, but do not need to guess for ever,
-                                                          thus report success and update the calendar to get fresh info */
+                                                        * thus report success and update the calendar to get fresh info */
                                                        update_slave_cmd (cbdav->priv, SLAVE_SHOULD_WORK);
                                                        g_cond_signal (cbdav->priv->cond);
                                                }
@@ -3959,8 +3959,8 @@ do_remove_objects (ECalBackendCalDAV *cbdav,
        icalcomponent            *cache_comp;
        gboolean                  online;
        gchar *href = NULL, *etag = NULL;
-       const gchar *uid = ((ECalComponentId *)ids->data)->uid;
-       const gchar *rid = ((ECalComponentId *)ids->data)->rid;
+       const gchar *uid = ((ECalComponentId *) ids->data)->uid;
+       const gchar *rid = ((ECalComponentId *) ids->data)->rid;
 
        if (new_components)
                *new_components = NULL;

diff --git a/calendar/backends/file/e-cal-backend-file.c b/calendar/backends/file/e-cal-backend-file.c
index 55f8b29..37813cf 100644 (file)
--- a/calendar/backends/file/e-cal-backend-file.c
+++ b/calendar/backends/file/e-cal-backend-file.c
@@ -2916,7 +2916,7 @@ e_cal_backend_file_remove_objects (ECalBackendSync *backend,
                                /* Check that it has a recurrence id if mod is CALOBJ_MOD_THISANDPRIOR
                                         or CALOBJ_MOD_THISANDFUTURE */
                if ((mod == CALOBJ_MOD_THISANDPRIOR || mod == CALOBJ_MOD_THISANDFUTURE) &&
-                       (!id->rid || !*(id->rid))) {
+                       (!id->rid || !*(id->rid))) {
                        g_static_rec_mutex_unlock (&priv->idle_save_rmutex);
                        g_propagate_error (error, EDC_ERROR (ObjectNotFound));
                        return;

diff --git a/calendar/libecal/e-cal-client-view.c b/calendar/libecal/e-cal-client-view.c
index 645762d..ef09718 100644 (file)
--- a/calendar/libecal/e-cal-client-view.c
+++ b/calendar/libecal/e-cal-client-view.c
@@ -581,9 +581,9 @@ e_cal_client_view_set_fields_of_interest (ECalClientView *view,
  * Since: 3.6
  */
 void
-e_cal_client_view_set_flags (ECalClientView      *view,
-                             ECalClientViewFlags  flags,
-                             GError              **error)
+e_cal_client_view_set_flags (ECalClientView *view,
+                             ECalClientViewFlags flags,
+                             GError **error)
 {
        ECalClientViewPrivate *priv;
 

diff --git a/calendar/libecal/e-cal-client.c b/calendar/libecal/e-cal-client.c
index 38bd24f..421db26 100644 (file)
--- a/calendar/libecal/e-cal-client.c
+++ b/calendar/libecal/e-cal-client.c
@@ -1299,10 +1299,9 @@ add_instance (ECalComponent *comp,
                        }
                }
 
-
                g_free (dtstart.value);
                dtstart.value = &itt;
-               e_cal_component_set_dtstart(ci->comp, &dtstart);
+               e_cal_component_set_dtstart (ci->comp, &dtstart);
 
                /* set the RECUR-ID for the instance */
                range = g_new0 (ECalComponentRange, 1);
@@ -1329,7 +1328,7 @@ add_instance (ECalComponent *comp,
 
                g_free (dtend.value);
                dtend.value = &itt;
-               e_cal_component_set_dtend(ci->comp, &dtend);
+               e_cal_component_set_dtend (ci->comp, &dtend);
 
                g_free ((gchar *) dtend.tzid);
        }
@@ -4023,7 +4022,7 @@ e_cal_client_modify_objects (ECalClient *client,
        g_return_if_fail (E_IS_CAL_CLIENT (client));
        g_return_if_fail (comps != NULL);
 
-       comp_strings = icalcomponent_slist_to_string_slist(comps);
+       comp_strings = icalcomponent_slist_to_string_slist (comps);
        strv = e_gdbus_cal_encode_modify_objects (comp_strings, mod);
 
        e_client_proxy_call_strv (E_CLIENT (client), (const gchar * const *) strv, cancellable, callback, user_data, e_cal_client_modify_objects,
@@ -4095,7 +4094,7 @@ e_cal_client_modify_objects_sync (ECalClient *client,
                return FALSE;
        }
 
-       comp_strings = icalcomponent_slist_to_string_slist(comps);
+       comp_strings = icalcomponent_slist_to_string_slist (comps);
        strv = e_gdbus_cal_encode_modify_objects (comp_strings, mod);
 
        res = e_client_proxy_call_sync_strv__void (E_CLIENT (client), (const gchar * const *) strv, cancellable, error, e_gdbus_cal_call_modify_objects_sync);
@@ -4142,8 +4141,8 @@ e_cal_client_remove_object (ECalClient *client,
 
        g_return_if_fail (uid != NULL);
 
-       id.uid = (gchar *)uid;
-       id.rid = (gchar *)rid;
+       id.uid = (gchar *) uid;
+       id.rid = (gchar *) rid;
        ids.data = &id;
        strv = e_gdbus_cal_encode_remove_objects (&ids, mod);
 
@@ -4214,8 +4213,8 @@ e_cal_client_remove_object_sync (ECalClient *client,
                return FALSE;
        }
 
-       id.uid = (gchar *)uid;
-       id.rid = (gchar *)rid;
+       id.uid = (gchar *) uid;
+       id.rid = (gchar *) rid;
        ids.data = &id;
        strv = e_gdbus_cal_encode_remove_objects (&ids, mod);
 

diff --git a/calendar/libecal/e-cal.c b/calendar/libecal/e-cal.c
index 7533fb9..cfddc67 100644 (file)
--- a/calendar/libecal/e-cal.c
+++ b/calendar/libecal/e-cal.c
@@ -4097,8 +4097,8 @@ e_cal_remove_object_with_mod (ECal *ecal,
                E_CALENDAR_CHECK_STATUS (E_CALENDAR_STATUS_URI_NOT_LOADED, error);
        }
 
-       id.uid = (gchar *)uid;
-       id.rid = (gchar *)rid;
+       id.uid = (gchar *) uid;
+       id.rid = (gchar *) rid;
        ids.data = &id;
        strv = e_gdbus_cal_encode_remove_objects (&ids, mod);
        if (!e_gdbus_cal_call_remove_objects_sync (priv->gdbus_cal, (const gchar * const *) strv, NULL, error)) {

diff --git a/calendar/libedata-cal/e-cal-backend-sync.c b/calendar/libedata-cal/e-cal-backend-sync.c
index f6226e5..6343aab 100644 (file)
--- a/calendar/libedata-cal/e-cal-backend-sync.c
+++ b/calendar/libedata-cal/e-cal-backend-sync.c
@@ -351,13 +351,13 @@ e_cal_backend_sync_create_objects (ECalBackendSync *backend,
  */
 void
 e_cal_backend_sync_modify_objects (ECalBackendSync *backend,
-                                                                  EDataCal *cal,
-                                                                  GCancellable *cancellable,
-                                                                  const GSList *calobjs,
-                                                                  CalObjModType mod,
-                                                                  GSList **old_components,
-                                                                  GSList **new_components,
-                                                                  GError **error)
+                                                                   EDataCal *cal,
+                                                                   GCancellable *cancellable,
+                                                                   const GSList *calobjs,
+                                                                   CalObjModType mod,
+                                                                   GSList **old_components,
+                                                                   GSList **new_components,
+                                                                   GError **error)
 {
        e_return_data_cal_error_if_fail (backend && E_IS_CAL_BACKEND_SYNC (backend), InvalidArg);
        e_return_data_cal_error_if_fail (E_CAL_BACKEND_SYNC_GET_CLASS (backend)->modify_objects_sync != NULL, UnsupportedMethod);

diff --git a/calendar/libedata-cal/e-data-cal-view.c b/calendar/libedata-cal/e-data-cal-view.c
index c046fac..d2c9ef5 100644 (file)
--- a/calendar/libedata-cal/e-data-cal-view.c
+++ b/calendar/libedata-cal/e-data-cal-view.c
@@ -471,10 +471,10 @@ impl_DataCalView_stop (EGdbusCalView *object,
 }
 
 static gboolean
-impl_DataCalView_setFlags (EGdbusCalView         *object,
+impl_DataCalView_setFlags (EGdbusCalView *object,
                            GDBusMethodInvocation *invocation,
-                           ECalClientViewFlags    flags,
-                           EDataCalView          *view)
+                           ECalClientViewFlags flags,
+                           EDataCalView *view)
 {
        view->priv->flags = flags;
 

diff --git a/calendar/libedata-cal/e-data-cal.c b/calendar/libedata-cal/e-data-cal.c
index 40e294d..e01de5a 100644 (file)
--- a/calendar/libedata-cal/e-data-cal.c
+++ b/calendar/libedata-cal/e-data-cal.c
@@ -226,7 +226,7 @@ operation_thread (gpointer data,
                break;
        case OP_REMOVE_OBJECTS:
                e_cal_backend_remove_objects (backend, op->cal, op->id, op->cancellable, op->d.ro.ids, op->d.ro.mod);
-               g_slist_free_full (op->d.ro.ids, (GDestroyNotify)e_cal_component_free_id);
+               g_slist_free_full (op->d.ro.ids, (GDestroyNotify) e_cal_component_free_id);
                break;
        case OP_RECEIVE_OBJECTS:
                e_cal_backend_receive_objects (backend, op->cal, op->id, op->cancellable, op->d.co.calobj);
@@ -1192,7 +1192,7 @@ e_data_cal_respond_create_objects (EDataCal *cal,
        /* Translators: This is prefix to a detailed error message */
        g_prefix_error (&error, "%s", _("Cannot create calendar object: "));
 
-       e_gdbus_cal_emit_create_objects_done (cal->priv->gdbus_object, opid, error, (const gchar * const *)array);
+       e_gdbus_cal_emit_create_objects_done (cal->priv->gdbus_object, opid, error, (const gchar * const *) array);
 
        g_strfreev (array);
        if (error)

diff --git a/calendar/libegdbus/e-gdbus-cal.c b/calendar/libegdbus/e-gdbus-cal.c
index ca9e602..f10cec5 100644 (file)
--- a/calendar/libegdbus/e-gdbus-cal.c
+++ b/calendar/libegdbus/e-gdbus-cal.c
@@ -166,9 +166,9 @@ E_DECLARE_GDBUS_METHOD_DONE_EMISSION_HOOK_ASYNC_STRV (GDBUS_CAL_INTERFACE_NAME,
 E_DECLARE_GDBUS_METHOD_DONE_EMISSION_HOOK_ASYNC_VOID (GDBUS_CAL_INTERFACE_NAME,
                                                       get_free_busy)
 E_DECLARE_GDBUS_METHOD_DONE_EMISSION_HOOK_ASYNC_STRV (GDBUS_CAL_INTERFACE_NAME,
-                                                                                                         create_objects)
+                                                                                                          create_objects)
 E_DECLARE_GDBUS_METHOD_DONE_EMISSION_HOOK_ASYNC_VOID (GDBUS_CAL_INTERFACE_NAME,
-                                                                                                         modify_objects)
+                                                                                                          modify_objects)
 E_DECLARE_GDBUS_METHOD_DONE_EMISSION_HOOK_ASYNC_VOID (GDBUS_CAL_INTERFACE_NAME,
                                                       remove_objects)
 E_DECLARE_GDBUS_METHOD_DONE_EMISSION_HOOK_ASYNC_VOID (GDBUS_CAL_INTERFACE_NAME,
@@ -590,7 +590,7 @@ e_gdbus_cal_encode_modify_objects (const GSList *in_calobjs,
 
        g_return_val_if_fail (in_calobjs != NULL, NULL);
 
-       strv = g_new0 (gchar *, g_slist_length ((GSList *)in_calobjs) + 2);
+       strv = g_new0 (gchar *, g_slist_length ((GSList *) in_calobjs) + 2);
        strv[i++] = g_strdup_printf ("%u", (guint32) in_mod);
 
        for (l = in_calobjs; l; l = l->next) {
@@ -668,7 +668,7 @@ e_gdbus_cal_encode_remove_objects (const GSList *in_ids,
 
        g_return_val_if_fail (in_ids != NULL, NULL);
 
-       strv = g_new0 (gchar *, 2 + 2 * g_slist_length ((GSList *)in_ids));
+       strv = g_new0 (gchar *, 2 + 2 * g_slist_length ((GSList *) in_ids));
        strv[i++] = g_strdup_printf ("%u", (guint32) in_mod);
 
        for (l = in_ids; l; l = l->next) {
@@ -686,7 +686,7 @@ e_gdbus_cal_encode_remove_objects (const GSList *in_ids,
 /* free ids g_slist_free_full(ids, g_free) */
 gboolean
 e_gdbus_cal_decode_remove_objects (const gchar * const *in_strv,
-                                                                                                                                        GSList **out_ids,
+                                                                                                                                         GSList **out_ids,
                                    guint *out_mod)
 {
        gint ii;

diff --git a/camel/camel-certdb.c b/camel/camel-certdb.c
index f95e57a..128089c 100644 (file)
--- a/camel/camel-certdb.c
+++ b/camel/camel-certdb.c
@@ -65,7 +65,7 @@ G_DEFINE_TYPE (CamelCertDB, camel_certdb, CAMEL_TYPE_OBJECT)
 
 static gboolean
 certdb_str_equal_casecmp (gconstpointer str1,
-                         gconstpointer str2)
+                          gconstpointer str2)
 {
        if (!str1 || !str2)
                return str1 == str2;

diff --git a/camel/camel-folder-search.c b/camel/camel-folder-search.c
index 6526995..c72acc8 100644 (file)
--- a/camel/camel-folder-search.c
+++ b/camel/camel-folder-search.c
@@ -340,7 +340,7 @@ camel_folder_search_set_body_index (CamelFolderSearch *search,
 guint32
 camel_folder_search_count (CamelFolderSearch *search,
                            const gchar *expr,
-                          GCancellable *cancellable,
+                           GCancellable *cancellable,
                            GError **error)
 {
        CamelSExpResult *r;
@@ -519,7 +519,7 @@ GPtrArray *
 camel_folder_search_search (CamelFolderSearch *search,
                             const gchar *expr,
                             GPtrArray *uids,
-                           GCancellable *cancellable,
+                            GCancellable *cancellable,
                             GError **error)
 {
        CamelSExpResult *r;
@@ -1403,7 +1403,7 @@ static gboolean
 match_words_1message (CamelDataWrapper *object,
                       struct _camel_search_words *words,
                       guint32 *mask,
-                     GCancellable *cancellable)
+                      GCancellable *cancellable)
 {
        CamelDataWrapper *containee;
        gint truth = FALSE;

diff --git a/camel/camel-folder.c b/camel/camel-folder.c
index d73bf11..f3599e2 100644 (file)
--- a/camel/camel-folder.c
+++ b/camel/camel-folder.c
@@ -2638,7 +2638,7 @@ camel_folder_has_search_capability (CamelFolder *folder)
 GPtrArray *
 camel_folder_search_by_expression (CamelFolder *folder,
                                    const gchar *expression,
-                                  GCancellable *cancellable,
+                                   GCancellable *cancellable,
                                    GError **error)
 {
        CamelFolderClass *class;
@@ -2674,7 +2674,7 @@ camel_folder_search_by_expression (CamelFolder *folder,
 guint32
 camel_folder_count_by_expression (CamelFolder *folder,
                                   const gchar *expression,
-                                 GCancellable *cancellable,
+                                  GCancellable *cancellable,
                                   GError **error)
 {
        CamelFolderClass *class;
@@ -2707,7 +2707,7 @@ GPtrArray *
 camel_folder_search_by_uids (CamelFolder *folder,
                              const gchar *expr,
                              GPtrArray *uids,
-                            GCancellable *cancellable,
+                             GCancellable *cancellable,
                              GError **error)
 {
        CamelFolderClass *class;

diff --git a/camel/camel-imapx-conn-manager.h b/camel/camel-imapx-conn-manager.h
index 1fe1600..af31fa8 100644 (file)
--- a/camel/camel-imapx-conn-manager.h
+++ b/camel/camel-imapx-conn-manager.h
@@ -23,7 +23,6 @@
 #error "Only <camel/camel.h> can be included directly."
 #endif
 
-
 #ifndef _CAMEL_IMAPX_CONN_MANAGER_H
 #define _CAMEL_IMAPX_CONN_MANAGER_H
 

diff --git a/camel/camel-imapx-folder.c b/camel/camel-imapx-folder.c
index 318ac6a..2453da3 100644 (file)
--- a/camel/camel-imapx-folder.c
+++ b/camel/camel-imapx-folder.c
@@ -330,7 +330,7 @@ static GPtrArray *
 imapx_search_by_uids (CamelFolder *folder,
                       const gchar *expression,
                       GPtrArray *uids,
-                     GCancellable *cancellable,
+                      GCancellable *cancellable,
                       GError **error)
 {
        CamelIMAPXFolder *ifolder = CAMEL_IMAPX_FOLDER (folder);
@@ -352,7 +352,7 @@ imapx_search_by_uids (CamelFolder *folder,
 static guint32
 imapx_count_by_expression (CamelFolder *folder,
                            const gchar *expression,
-                          GCancellable *cancellable,
+                           GCancellable *cancellable,
                            GError **error)
 {
        CamelIMAPXFolder *ifolder = CAMEL_IMAPX_FOLDER (folder);
@@ -371,7 +371,7 @@ imapx_count_by_expression (CamelFolder *folder,
 static GPtrArray *
 imapx_search_by_expression (CamelFolder *folder,
                             const gchar *expression,
-                           GCancellable *cancellable,
+                            GCancellable *cancellable,
                             GError **error)
 {
        CamelIMAPXFolder *ifolder = CAMEL_IMAPX_FOLDER (folder);
@@ -732,7 +732,7 @@ imapx_transfer_messages_to_sync (CamelFolder *source,
 
 static void
 imapx_rename (CamelFolder *folder,
-             const gchar *new_name)
+              const gchar *new_name)
 {
        CamelStore *parent_store;
 

diff --git a/camel/camel-imapx-job.h b/camel/camel-imapx-job.h
index c07ca5d..aababec 100644 (file)
--- a/camel/camel-imapx-job.h
+++ b/camel/camel-imapx-job.h
@@ -20,7 +20,6 @@
 #error "Only <camel/camel.h> can be included directly."
 #endif
 
-
 #ifndef CAMEL_IMAPX_JOB_H
 #define CAMEL_IMAPX_JOB_H
 

diff --git a/camel/camel-imapx-server.c b/camel/camel-imapx-server.c
index 10d5184..b25aa2b 100644 (file)
--- a/camel/camel-imapx-server.c
+++ b/camel/camel-imapx-server.c
@@ -5763,7 +5763,7 @@ camel_imapx_server_append_message (CamelIMAPXServer *is,
                                    CamelFolder *folder,
                                    CamelMimeMessage *message,
                                    const CamelMessageInfo *mi,
-                                  gchar **appended_uid,
+                                   gchar **appended_uid,
                                    GCancellable *cancellable,
                                    GError **error)
 {
@@ -6483,9 +6483,9 @@ camel_imapx_server_get_job_queue_info (CamelIMAPXServer *is)
        return jinfo;
 }
 
-void           
-camel_imapx_server_set_extended_token_handler  (CamelIMAPXServer *is,
-                                                IMAPXExtUntaggedResponseHander handler_func)
+void
+camel_imapx_server_set_extended_token_handler (CamelIMAPXServer *is,
+                                                 IMAPXExtUntaggedResponseHander handler_func)
 {
        g_return_if_fail (is != NULL);
 

diff --git a/camel/camel-imapx-server.h b/camel/camel-imapx-server.h
index 680dfea..f8bd937 100644 (file)
--- a/camel/camel-imapx-server.h
+++ b/camel/camel-imapx-server.h
@@ -21,7 +21,6 @@
 #error "Only <camel/camel.h> can be included directly."
 #endif
 
-
 #ifndef CAMEL_IMAPX_SERVER_H
 #define CAMEL_IMAPX_SERVER_H
 
@@ -63,8 +62,8 @@ typedef struct _CamelIMAPXIdle CamelIMAPXIdle;
 struct _IMAPXJobQueueInfo;
 
 typedef gboolean (*IMAPXExtUntaggedResponseHander)
-                                       (CamelIMAPXServer *server, 
-                                        GCancellable *cancellable, 
+                                       (CamelIMAPXServer *server,
+                                        GCancellable *cancellable,
                                         GError **error);
 
 struct _CamelIMAPXServer {
@@ -241,11 +240,10 @@ struct _IMAPXJobQueueInfo *
                camel_imapx_server_get_job_queue_info
                                                (CamelIMAPXServer *is);
 
-void           camel_imapx_server_set_extended_token_handler 
+void           camel_imapx_server_set_extended_token_handler
                                                (CamelIMAPXServer *is,
                                                 IMAPXExtUntaggedResponseHander handler_func);
 
-
 G_END_DECLS
 
 #endif /* CAMEL_IMAPX_SERVER_H */

diff --git a/camel/camel-imapx-store-summary.h b/camel/camel-imapx-store-summary.h
index e4ea6b5..c88b9c9 100644 (file)
--- a/camel/camel-imapx-store-summary.h
+++ b/camel/camel-imapx-store-summary.h
@@ -23,7 +23,6 @@
 #error "Only <camel/camel.h> can be included directly."
 #endif
 
-
 #ifndef CAMEL_IMAPX_STORE_SUMMARY_H
 #define CAMEL_IMAPX_STORE_SUMMARY_H
 

diff --git a/camel/camel-imapx-store.h b/camel/camel-imapx-store.h
index cb2f350..f1db789 100644 (file)
--- a/camel/camel-imapx-store.h
+++ b/camel/camel-imapx-store.h
@@ -25,7 +25,6 @@
 #error "Only <camel/camel.h> can be included directly."
 #endif
 
-
 #ifndef CAMEL_IMAPX_STORE_H
 #define CAMEL_IMAPX_STORE_H
 

diff --git a/camel/camel-imapx-stream.h b/camel/camel-imapx-stream.h
index 9385fdf..24a2450 100644 (file)
--- a/camel/camel-imapx-stream.h
+++ b/camel/camel-imapx-stream.h
@@ -24,7 +24,6 @@
 #error "Only <camel/camel.h> can be included directly."
 #endif
 
-
 #ifndef CAMEL_IMAPX_STREAM_H
 #define CAMEL_IMAPX_STREAM_H
 

diff --git a/camel/camel-imapx-summary.c b/camel/camel-imapx-summary.c
index dd2766f..53282c0 100644 (file)
--- a/camel/camel-imapx-summary.c
+++ b/camel/camel-imapx-summary.c
@@ -31,7 +31,6 @@
 #include <unistd.h>
 #include <sys/stat.h>
 
-
 #include <camel/camel-db.h>
 #include <camel/camel-store.h>
 #include <camel/camel-string-utils.h>

diff --git a/camel/camel-imapx-summary.h b/camel/camel-imapx-summary.h
index 6fe947a..3a8d422 100644 (file)
--- a/camel/camel-imapx-summary.h
+++ b/camel/camel-imapx-summary.h
@@ -24,7 +24,6 @@
 #error "Only <camel/camel.h> can be included directly."
 #endif
 
-
 #ifndef CAMEL_IMAPX_SUMMARY_H
 #define CAMEL_IMAPX_SUMMARY_H
 

diff --git a/camel/camel-imapx-utils.h b/camel/camel-imapx-utils.h
index fd3d9fb..8ee329f 100644 (file)
--- a/camel/camel-imapx-utils.h
+++ b/camel/camel-imapx-utils.h
@@ -21,7 +21,6 @@
 #error "Only <camel/camel.h> can be included directly."
 #endif
 
-
 #ifndef CAMEL_IMAPX_UTILS_H
 #define CAMEL_IMAPX_UTILS_H
 

diff --git a/camel/camel-mime-utils.c b/camel/camel-mime-utils.c
index ceb6f0e..16e08a5 100644 (file)
--- a/camel/camel-mime-utils.c
+++ b/camel/camel-mime-utils.c
@@ -1536,7 +1536,7 @@ rfc2047_encode_word (GString *outstring,
 
 static gchar *
 header_encode_string_rfc2047 (const guchar *in,
-                             gboolean include_lwsp)
+                              gboolean include_lwsp)
 {
        const guchar *inptr = in, *start, *word;
        gboolean last_was_encoded = FALSE;

diff --git a/camel/camel-vee-folder.c b/camel/camel-vee-folder.c
index e1df20a..e716e60 100644 (file)
--- a/camel/camel-vee-folder.c
+++ b/camel/camel-vee-folder.c
@@ -1082,7 +1082,7 @@ vee_folder_propagate_skipped_changes (CamelVeeFolder *vf)
 static GPtrArray *
 vee_folder_search_by_expression (CamelFolder *folder,
                                  const gchar *expression,
-                                GCancellable *cancellable,
+                                 GCancellable *cancellable,
                                  GError **error)
 {
        GList *node;
@@ -1144,7 +1144,7 @@ static GPtrArray *
 vee_folder_search_by_uids (CamelFolder *folder,
                            const gchar *expression,
                            GPtrArray *uids,
-                          GCancellable *cancellable,
+                           GCancellable *cancellable,
                            GError **error)
 {
        GList *node;
@@ -1210,7 +1210,7 @@ vee_folder_search_by_uids (CamelFolder *folder,
 static guint32
 vee_folder_count_by_expression (CamelFolder *folder,
                                 const gchar *expression,
-                               GCancellable *cancellable,
+                                GCancellable *cancellable,
                                 GError **error)
 {
        GList *node;

diff --git a/camel/providers/imap/camel-imap-folder.c b/camel/providers/imap/camel-imap-folder.c
index c012b33..6add270 100644 (file)
--- a/camel/providers/imap/camel-imap-folder.c
+++ b/camel/providers/imap/camel-imap-folder.c
@@ -3075,7 +3075,7 @@ camel_imap_transfer_resyncing (CamelFolder *source,
 static GPtrArray *
 imap_search_by_expression (CamelFolder *folder,
                            const gchar *expression,
-                          GCancellable *cancellable,
+                           GCancellable *cancellable,
                            GError **error)
 {
        CamelImapFolder *imap_folder = CAMEL_IMAP_FOLDER (folder);
@@ -3097,7 +3097,7 @@ imap_search_by_expression (CamelFolder *folder,
 static guint32
 imap_count_by_expression (CamelFolder *folder,
                           const gchar *expression,
-                         GCancellable *cancellable,
+                          GCancellable *cancellable,
                           GError **error)
 {
        CamelImapFolder *imap_folder = CAMEL_IMAP_FOLDER (folder);
@@ -3120,7 +3120,7 @@ static GPtrArray *
 imap_search_by_uids (CamelFolder *folder,
                      const gchar *expression,
                      GPtrArray *uids,
-                    GCancellable *cancellable,
+                     GCancellable *cancellable,
                      GError **error)
 {
        CamelImapFolder *imap_folder = CAMEL_IMAP_FOLDER (folder);

diff --git a/camel/providers/imapx/camel-imapx-provider.c b/camel/providers/imapx/camel-imapx-provider.c
index c789976..9c87264 100644 (file)
--- a/camel/providers/imapx/camel-imapx-provider.c
+++ b/camel/providers/imapx/camel-imapx-provider.c
@@ -112,7 +112,6 @@ static CamelProvider imapx_provider = {
        /* ... */
 };
 
-
 extern CamelServiceAuthType camel_imapx_password_authtype;
 
 void camel_imapx_module_init (void);

diff --git a/camel/providers/local/camel-local-folder.c b/camel/providers/local/camel-local-folder.c
index 47c275f..d50a56e 100644 (file)
--- a/camel/providers/local/camel-local-folder.c
+++ b/camel/providers/local/camel-local-folder.c
@@ -228,7 +228,7 @@ local_folder_constructed (GObject *object)
 static GPtrArray *
 local_folder_search_by_expression (CamelFolder *folder,
                                    const gchar *expression,
-                                  GCancellable *cancellable,
+                                   GCancellable *cancellable,
                                    GError **error)
 {
        CamelLocalFolder *local_folder = CAMEL_LOCAL_FOLDER (folder);
@@ -255,7 +255,7 @@ static GPtrArray *
 local_folder_search_by_uids (CamelFolder *folder,
                              const gchar *expression,
                              GPtrArray *uids,
-                            GCancellable *cancellable,
+                             GCancellable *cancellable,
                              GError **error)
 {
        CamelLocalFolder *local_folder = CAMEL_LOCAL_FOLDER (folder);
@@ -342,7 +342,7 @@ local_folder_rename (CamelFolder *folder,
 static guint32
 local_folder_count_by_expression (CamelFolder *folder,
                                   const gchar *expression,
-                                 GCancellable *cancellable,
+                                  GCancellable *cancellable,
                                   GError **error)
 {
        CamelLocalFolder *local_folder = CAMEL_LOCAL_FOLDER (folder);

diff --git a/camel/providers/local/camel-maildir-store.c b/camel/providers/local/camel-maildir-store.c
index f0bd395..ed3f72a 100644 (file)
--- a/camel/providers/local/camel-maildir-store.c
+++ b/camel/providers/local/camel-maildir-store.c
@@ -608,13 +608,13 @@ scan_dirs (CamelStore *store,
 
                if ((g_ascii_strcasecmp ((*topfi)->full_name, "Inbox") != 0 
                    && (!g_str_has_prefix (full_name, (*topfi)->full_name) ||
-                       (full_name[strlen((*topfi)->full_name)] != '\0' &&
-                        full_name[strlen((*topfi)->full_name)] != '/')))
+                       (full_name[strlen ((*topfi)->full_name)] != '\0' &&
+                        full_name[strlen ((*topfi)->full_name)] != '/')))
                    || (!can_inbox_sibling
                    && g_ascii_strcasecmp ((*topfi)->full_name, "Inbox") == 0 
                    && (!g_str_has_prefix (full_name, (*topfi)->full_name) ||
-                       (full_name[strlen((*topfi)->full_name)] != '\0' &&
-                        full_name[strlen((*topfi)->full_name)] != '/')))) {
+                       (full_name[strlen ((*topfi)->full_name)] != '\0' &&
+                        full_name[strlen ((*topfi)->full_name)] != '/')))) {
                        g_free (full_name);
                        continue;
                }

diff --git a/camel/providers/local/camel-maildir-summary.c b/camel/providers/local/camel-maildir-summary.c
index 220f240..85d6fbf 100644 (file)
--- a/camel/providers/local/camel-maildir-summary.c
+++ b/camel/providers/local/camel-maildir-summary.c
@@ -337,7 +337,7 @@ message_info_new_from_header (CamelFolderSummary *s,
 
 static CamelMessageInfo *
 maildir_message_info_from_db (CamelFolderSummary *summary,
-                             CamelMIRecord *record)
+                              CamelMIRecord *record)
 {
        CamelMessageInfo *mi;
 

diff --git a/camel/providers/nntp/camel-nntp-folder.c b/camel/providers/nntp/camel-nntp-folder.c
index 98098bc..65aa2ca 100644 (file)
--- a/camel/providers/nntp/camel-nntp-folder.c
+++ b/camel/providers/nntp/camel-nntp-folder.c
@@ -398,7 +398,7 @@ nntp_folder_cache_message (CamelDiscoFolder *disco_folder,
 static GPtrArray *
 nntp_folder_search_by_expression (CamelFolder *folder,
                                   const gchar *expression,
-                                 GCancellable *cancellable,
+                                  GCancellable *cancellable,
                                   GError **error)
 {
        CamelNNTPFolder *nntp_folder = CAMEL_NNTP_FOLDER (folder);
@@ -420,7 +420,7 @@ nntp_folder_search_by_expression (CamelFolder *folder,
 static guint32
 nntp_folder_count_by_expression (CamelFolder *folder,
                                  const gchar *expression,
-                                GCancellable *cancellable,
+                                 GCancellable *cancellable,
                                  GError **error)
 {
        CamelNNTPFolder *nntp_folder = CAMEL_NNTP_FOLDER (folder);
@@ -443,7 +443,7 @@ static GPtrArray *
 nntp_folder_search_by_uids (CamelFolder *folder,
                             const gchar *expression,
                             GPtrArray *uids,
-                           GCancellable *cancellable,
+                            GCancellable *cancellable,
                             GError **error)
 {
        CamelNNTPFolder *nntp_folder = (CamelNNTPFolder *) folder;

diff --git a/libedataserver/e-client.c b/libedataserver/e-client.c
index f2d7bc5..e04a49b 100644 (file)
--- a/libedataserver/e-client.c
+++ b/libedataserver/e-client.c
@@ -133,7 +133,7 @@ e_client_error_to_string (EClientError code)
                return _("Repository offline");
        case E_CLIENT_ERROR_OFFLINE_UNAVAILABLE:
                /* Translators: This means that the EClient does not support offline mode, or
-                  it's not set to by a user, thus it is unavailable while user is not connected. */
+                * it's not set to by a user, thus it is unavailable while user is not connected. */
                return _("Offline unavailable");
        case E_CLIENT_ERROR_PERMISSION_DENIED:
                return _("Permission denied");

diff --git a/libedataserver/e-gdbus-templates.c b/libedataserver/e-gdbus-templates.c
index 61b594d..4e937ae 100644 (file)
--- a/libedataserver/e-gdbus-templates.c
+++ b/libedataserver/e-gdbus-templates.c
@@ -952,7 +952,7 @@ e_gdbus_op_cancelled_cb (GCancellable *cancellable,
        g_return_if_fail (op_data->cancellable == cancellable);
 
        /* do this on idle, because this callback should be left
-          as soon as possible, with no sync calls being done */
+        * as soon as possible, with no sync calls being done */
        op_data->cancel_idle_id = g_idle_add (e_gdbus_op_cancelled_idle_cb, op_data);
 }
 

diff --git a/tests/libecal/client/test-client-bulk-methods.c b/tests/libecal/client/test-client-bulk-methods.c
index c4d9069..62d3a64 100644 (file)
--- a/tests/libecal/client/test-client-bulk-methods.c
+++ b/tests/libecal/client/test-client-bulk-methods.c
@@ -10,7 +10,7 @@
 
 static gboolean
 test_icalcomps (icalcomponent *icalcomp1,
-                               icalcomponent *icalcomp2)
+                                icalcomponent *icalcomp2)
 {
        struct icaltimetype t1, t2;
 
@@ -50,7 +50,7 @@ test_icalcomps (icalcomponent *icalcomp1,
 
 static gboolean
 check_removed (ECalClient *cal_client,
-                          const GSList *uids)
+                           const GSList *uids)
 {
        g_return_val_if_fail (cal_client != NULL, FALSE);
        g_return_val_if_fail (uids != NULL, FALSE);
@@ -59,7 +59,7 @@ check_removed (ECalClient *cal_client,
                GError *error = NULL;
                icalcomponent *icalcomp = NULL;
 
-               if (!e_cal_client_get_object_sync(cal_client, uids->data, NULL, &icalcomp, NULL, &error) &&
+               if (!e_cal_client_get_object_sync (cal_client, uids->data, NULL, &icalcomp, NULL, &error) &&
                                g_error_matches (error, E_CAL_CLIENT_ERROR, E_CAL_CLIENT_ERROR_OBJECT_NOT_FOUND)) {
                        g_clear_error (&error);
                } else {
@@ -75,7 +75,7 @@ check_removed (ECalClient *cal_client,
 }
 
 static GSList *
-uid_slist_to_ecalcomponentid_slist(GSList *uids)
+uid_slist_to_ecalcomponentid_slist (GSList *uids)
 {
        GSList *ids = NULL;
        const GSList *l;
@@ -91,7 +91,7 @@ uid_slist_to_ecalcomponentid_slist(GSList *uids)
 
 static gboolean
 check_icalcomps_exist (ECalClient *cal_client,
-                                          GSList *icalcomps)
+                                           GSList *icalcomps)
 {
        const GSList *l;
 
@@ -99,9 +99,9 @@ check_icalcomps_exist (ECalClient *cal_client,
                GError *error = NULL;
                icalcomponent *icalcomp = l->data;
                icalcomponent *icalcomp2 = NULL;
-               const char *uid = icalcomponent_get_uid(icalcomp);
+               const gchar *uid = icalcomponent_get_uid (icalcomp);
 
-               if (!e_cal_client_get_object_sync(cal_client, uid, NULL, &icalcomp2, NULL, &error)) {
+               if (!e_cal_client_get_object_sync (cal_client, uid, NULL, &icalcomp2, NULL, &error)) {
                        report_error ("get object sync", &error);
                        return FALSE;
                }
@@ -120,7 +120,7 @@ check_icalcomps_exist (ECalClient *cal_client,
 }
 
 static gboolean
-test_bulk_methods(GSList *icalcomps)
+test_bulk_methods (GSList *icalcomps)
 {
        ECalClient *cal_client;
        GError *error = NULL;
@@ -171,14 +171,14 @@ test_bulk_methods(GSList *icalcomps)
                icalcomponent *icalcomp = lcomp->data;
 
                summary = g_strdup_printf ("Edited test summary %d", i);
-               icalcomponent_set_summary(icalcomp, summary);
+               icalcomponent_set_summary (icalcomp, summary);
 
                g_free (summary);
                ++i;
        }
 
        /* Save the modified objects in bulk */
-       if (!e_cal_client_modify_objects_sync(cal_client, icalcomps, CALOBJ_MOD_ALL, NULL, &error)) {
+       if (!e_cal_client_modify_objects_sync (cal_client, icalcomps, CALOBJ_MOD_ALL, NULL, &error)) {
                report_error ("modify objects sync", &error);
                g_object_unref (cal_client);
                g_slist_free_full (uids, g_free);
@@ -195,7 +195,7 @@ test_bulk_methods(GSList *icalcomps)
        /* Remove all the objects in bulk */
        ids = uid_slist_to_ecalcomponentid_slist (uids);
 
-       if (!e_cal_client_remove_objects_sync(cal_client, ids, CALOBJ_MOD_ALL, NULL, &error)) {
+       if (!e_cal_client_remove_objects_sync (cal_client, ids, CALOBJ_MOD_ALL, NULL, &error)) {
                report_error ("remove objects sync", &error);
                g_object_unref (cal_client);
                g_slist_free_full (ids, (GDestroyNotify) e_cal_component_free_id);
@@ -205,7 +205,7 @@ test_bulk_methods(GSList *icalcomps)
        g_slist_free_full (ids, (GDestroyNotify) e_cal_component_free_id);
 
        /* Check that the objects don't exist anymore */
-       if (!check_removed(cal_client, uids)) {
+       if (!check_removed (cal_client, uids)) {
                g_object_unref (cal_client);
                g_slist_free_full (uids, g_free);
                return FALSE;
@@ -218,7 +218,7 @@ test_bulk_methods(GSList *icalcomps)
 
 gint
 main (gint argc,
-         gchar **argv)
+          gchar **argv)
 {
        GSList *icalcomps = NULL;
        struct icaltimetype now;
@@ -247,7 +247,7 @@ main (gint argc,
        /* Test synchronous bulk methods */
        res = test_bulk_methods (icalcomps);
 
-       g_slist_free_full (icalcomps, (GDestroyNotify)icalcomponent_free);
+       g_slist_free_full (icalcomps, (GDestroyNotify) icalcomponent_free);
 
        return (res != TRUE);
 }