Coding style and whitespace cleanup.
authorMatthew Barnes <mbarnes@redhat.com>
Sat, 20 Oct 2012 21:04:04 +0000 (17:04 -0400)
committerMatthew Barnes <mbarnes@redhat.com>
Sun, 21 Oct 2012 00:15:59 +0000 (20:15 -0400)
65 files changed:
addressbook/backends/file/e-book-backend-file.c
addressbook/backends/google/e-book-backend-google.c
addressbook/backends/google/e-book-google-utils.c
addressbook/backends/ldap/e-book-backend-ldap.c
addressbook/backends/vcf/e-book-backend-vcf.c
addressbook/backends/webdav/e-book-backend-webdav.c
addressbook/libebook/e-address-western.c
addressbook/libebook/e-book-client-view.c
addressbook/libebook/e-book-client.c
addressbook/libebook/e-book-query.c
addressbook/libebook/e-book-view.c
addressbook/libebook/e-book.c
addressbook/libebook/e-contact.c
addressbook/libebook/e-destination.c
addressbook/libebook/e-name-western.c
addressbook/libebook/e-vcard.c
addressbook/libedata-book/e-book-backend-db-cache.c
addressbook/libedata-book/e-book-backend-sexp.c
addressbook/libedata-book/e-book-backend-sqlitedb.c
addressbook/libedata-book/e-book-backend-summary.c
addressbook/libedata-book/e-book-backend.h
addressbook/libedata-book/e-data-book-view.c
addressbook/libegdbus/e-gdbus-book-factory.c
addressbook/libegdbus/e-gdbus-book-view.c
addressbook/libegdbus/e-gdbus-book.c
calendar/backends/caldav/e-cal-backend-caldav.c
calendar/backends/file/e-cal-backend-file.c
calendar/backends/http/e-cal-backend-http.c
calendar/backends/weather/e-cal-backend-weather.c
calendar/libecal/e-cal-check-timezones.c
calendar/libecal/e-cal-client-view.c
calendar/libecal/e-cal-client.c
calendar/libecal/e-cal-component.c
calendar/libecal/e-cal-recur.c
calendar/libecal/e-cal-system-timezone.c
calendar/libecal/e-cal-time-util.c
calendar/libecal/e-cal-util.c
calendar/libecal/e-cal-view.c
calendar/libecal/e-cal.c
calendar/libedata-cal/e-cal-backend-cache.c
calendar/libedata-cal/e-cal-backend-file-store.c
calendar/libedata-cal/e-cal-backend-intervaltree.c
calendar/libedata-cal/e-cal-backend-sexp.c
calendar/libedata-cal/e-cal-backend.c
calendar/libedata-cal/e-cal-backend.h
calendar/libegdbus/e-gdbus-cal-factory.c
calendar/libegdbus/e-gdbus-cal-view.c
calendar/libegdbus/e-gdbus-cal.c
camel/camel-imapx-folder.c
camel/camel-imapx-server.c
camel/camel-imapx-store.c
camel/camel-imapx-stream.c
camel/camel-imapx-summary.c
camel/camel-imapx-utils.c
camel/camel-mime-part.c
camel/camel.c
camel/providers/imap/camel-imap-folder.c
camel/providers/sendmail/camel-sendmail-settings.c
camel/providers/sendmail/camel-sendmail-transport.c
libedataserver/e-source-mail-submission.c
libedataserver/e-time-utils.c
libedataserverui/e-name-selector-dialog.c
libedataserverui/e-name-selector-entry.c
libedataserverui/e-name-selector.c
services/evolution-source-registry/evolution-source-registry-migrate-sources.c

index 9bace4e..d94398a 100644 (file)
@@ -136,10 +136,11 @@ remove_file (const gchar *filename,
                if (errno == EACCES || errno == EPERM) {
                        g_propagate_error (error, EDB_ERROR (PERMISSION_DENIED));
                } else {
-                       g_propagate_error (error, e_data_book_create_error_fmt
-                                          (E_DATA_BOOK_STATUS_OTHER_ERROR,
-                                           _("Failed to remove file '%s': %s"),
-                                           filename, g_strerror (errno)));
+                       g_propagate_error (
+                               error, e_data_book_create_error_fmt (
+                               E_DATA_BOOK_STATUS_OTHER_ERROR,
+                               _("Failed to remove file '%s': %s"),
+                               filename, g_strerror (errno)));
                }
                return FALSE;
        }
@@ -159,10 +160,11 @@ create_directory (const gchar *dirname,
                if (errno == EACCES || errno == EPERM)
                        g_propagate_error (error, EDB_ERROR (PERMISSION_DENIED));
                else
-                       g_propagate_error (error,
-                                          e_data_book_create_error_fmt (E_DATA_BOOK_STATUS_OTHER_ERROR,
-                                                                        _("Failed to make directory %s: %s"),
-                                                                        dirname, g_strerror (errno)));
+                       g_propagate_error (
+                               error, e_data_book_create_error_fmt (
+                               E_DATA_BOOK_STATUS_OTHER_ERROR,
+                               _("Failed to make directory %s: %s"),
+                               dirname, g_strerror (errno)));
                return FALSE;
        }
        return TRUE;
@@ -369,16 +371,18 @@ safe_name_for_photo (EBookBackendFile *bf,
        /* Get a suitable filename extension */
        if (photo->data.inlined.mime_type != NULL &&
            photo->data.inlined.mime_type[0] != '\0') {
-               suffix = g_uri_escape_string (photo->data.inlined.mime_type,
-                                             NULL, TRUE);
+               suffix = g_uri_escape_string (
+                       photo->data.inlined.mime_type,
+                       NULL, TRUE);
        } else {
                gchar *mime_type = NULL;
                gchar *content_type = NULL;
 
-               content_type = g_content_type_guess (NULL,
-                                                    photo->data.inlined.data,
-                                                    photo->data.inlined.length,
-                                                    NULL);
+               content_type = g_content_type_guess (
+                       NULL,
+                       photo->data.inlined.data,
+                       photo->data.inlined.length,
+                       NULL);
 
                if (content_type)
                        mime_type = g_content_type_get_mime_type (content_type);
@@ -393,8 +397,9 @@ safe_name_for_photo (EBookBackendFile *bf,
        }
 
        /* Create a filename based on the uid/field */
-       name = g_strconcat (e_contact_get_const (contact, E_CONTACT_UID), "_",
-                           e_contact_field_name (field), NULL);
+       name = g_strconcat (
+               e_contact_get_const (contact, E_CONTACT_UID), "_",
+               e_contact_field_name (field), NULL);
        name = g_strdelimit (name, NULL, '_');
 
        do {
@@ -433,8 +438,9 @@ hard_link_photo (EBookBackendFile *bf,
                suffix = "data";
 
        /* Create a filename based on uid/field */
-       name = g_strconcat (e_contact_get_const (contact, E_CONTACT_UID), "_",
-                           e_contact_field_name (field), NULL);
+       name = g_strconcat (
+               e_contact_get_const (contact, E_CONTACT_UID), "_",
+               e_contact_field_name (field), NULL);
        name = g_strdelimit (name, NULL, '_');
 
        do {
@@ -454,10 +460,11 @@ hard_link_photo (EBookBackendFile *bf,
                if (errno == EACCES || errno == EPERM) {
                        g_propagate_error (error, EDB_ERROR (PERMISSION_DENIED));
                } else {
-                       g_propagate_error (error, e_data_book_create_error_fmt
-                                          (E_DATA_BOOK_STATUS_OTHER_ERROR,
-                                           _("Failed to create hardlink for resource '%s': %s"),
-                                           src_filename, g_strerror (errno)));
+                       g_propagate_error (
+                               error, e_data_book_create_error_fmt (
+                               E_DATA_BOOK_STATUS_OTHER_ERROR,
+                               _("Failed to create hardlink for resource '%s': %s"),
+                               src_filename, g_strerror (errno)));
                }
                g_free (fullname);
                fullname = NULL;
@@ -648,13 +655,15 @@ maybe_transform_vcard_for_photo (EBookBackendFile *bf,
        PhotoModifiedStatus status;
        gboolean            modified = FALSE;
 
-       status   = maybe_transform_vcard_field_for_photo (bf, old_contact, contact,
-                                                         E_CONTACT_PHOTO, error);
+       status = maybe_transform_vcard_field_for_photo (
+               bf, old_contact, contact,
+               E_CONTACT_PHOTO, error);
        modified = (status == STATUS_MODIFIED);
 
        if (status != STATUS_ERROR) {
-               status   = maybe_transform_vcard_field_for_photo (bf, old_contact, contact,
-                                                                 E_CONTACT_LOGO, error);
+               status = maybe_transform_vcard_field_for_photo (
+                       bf, old_contact, contact,
+                       E_CONTACT_LOGO, error);
                modified = modified || (status == STATUS_MODIFIED);
        }
 
@@ -793,8 +802,9 @@ e_book_backend_file_bump_revision (EBookBackendFile *bf)
        db_error = db->put (db, NULL, &revision_name_dbt, &revision_dbt, 0);
 
        if (db_error != 0)
-               g_warning (G_STRLOC ": db->put failed while bumping the revision string: %s",
-                          db_strerror (db_error));
+               g_warning (
+                       G_STRLOC ": db->put failed while bumping the revision string: %s",
+                       db_strerror (db_error));
 
        e_book_backend_notify_property_changed (E_BOOK_BACKEND (bf),
                                                BOOK_BACKEND_PROPERTY_REVISION,
@@ -920,9 +930,10 @@ do_create (EBookBackendFile *bf,
                        break;
                } else if (status == STATUS_ERROR) {
                        /* Contact could not be added */
-                       g_warning (G_STRLOC ": db->put failed with %s",
-                                  (perror && *perror) ? (*perror)->message :
-                                  "Unknown error transforming vcard");
+                       g_warning (
+                               G_STRLOC ": db->put failed with %s",
+                               (perror && *perror) ? (*perror)->message :
+                               "Unknown error transforming vcard");
                        g_object_unref (contact);
 
                        /* Abort as soon as an error occurs */
@@ -1143,8 +1154,9 @@ e_book_backend_file_modify_contacts (EBookBackendSync *backend,
                /* Transform incomming photo blobs to uris before storing this to the DB */
                status = maybe_transform_vcard_for_photo (bf, old_contact, contact, NULL, perror);
                if (status == STATUS_ERROR) {
-                       g_warning (G_STRLOC ": Error transforming contact %s: %s",
-                                  id, (perror && *perror) ? (*perror)->message : "Unknown Error");
+                       g_warning (
+                               G_STRLOC ": Error transforming contact %s: %s",
+                               id, (perror && *perror) ? (*perror)->message : "Unknown Error");
 
                        g_free (id);
                        g_object_unref (old_contact);
@@ -1288,11 +1300,12 @@ e_book_backend_file_get_contact_list (EBookBackendSync *backend,
                return;
        }
 
-       summary_list = e_book_backend_sqlitedb_search (bf->priv->sqlitedb,
-                                                      SQLITEDB_FOLDER_ID,
-                                                      search, NULL,
-                                                      &searched_summary,
-                                                      &with_all_required_fields, NULL);
+       summary_list = e_book_backend_sqlitedb_search (
+               bf->priv->sqlitedb,
+               SQLITEDB_FOLDER_ID,
+               search, NULL,
+               &searched_summary,
+               &with_all_required_fields, NULL);
 
        if (summary_list) {
 
@@ -1410,9 +1423,10 @@ e_book_backend_file_get_contact_list_uids (EBookBackendSync *backend,
                return;
        }
 
-       uids = e_book_backend_sqlitedb_search_uids (bf->priv->sqlitedb,
-                                                   SQLITEDB_FOLDER_ID,
-                                                   search, &searched, NULL);
+       uids = e_book_backend_sqlitedb_search_uids (
+               bf->priv->sqlitedb,
+               SQLITEDB_FOLDER_ID,
+               search, &searched, NULL);
 
        if (!searched) {
                search_needed = TRUE;
@@ -1499,8 +1513,10 @@ init_closure (EDataBookView *book_view,
        closure->thread = NULL;
        closure->running = e_flag_new ();
 
-       g_object_set_data_full (G_OBJECT (book_view), "EBookBackendFile.BookView::closure",
-                               closure, (GDestroyNotify) closure_destroy);
+       g_object_set_data_full (
+               G_OBJECT (book_view),
+               "EBookBackendFile.BookView::closure",
+               closure, (GDestroyNotify) closure_destroy);
 
        return closure;
 }
@@ -1508,7 +1524,9 @@ init_closure (EDataBookView *book_view,
 static FileBackendSearchClosure *
 get_closure (EDataBookView *book_view)
 {
-       return g_object_get_data (G_OBJECT (book_view), "EBookBackendFile.BookView::closure");
+       return g_object_get_data (
+               G_OBJECT (book_view),
+               "EBookBackendFile.BookView::closure");
 }
 
 static void
@@ -1579,10 +1597,11 @@ book_view_thread (gpointer data)
        d (printf ("signalling parent thread\n"));
        e_flag_set (closure->running);
 
-       summary_list = e_book_backend_sqlitedb_search (bf->priv->sqlitedb,
-                                                      SQLITEDB_FOLDER_ID,
-                                                      query, fields_of_interest,
-                                                      &searched, &with_all_required_fields, NULL);
+       summary_list = e_book_backend_sqlitedb_search (
+               bf->priv->sqlitedb,
+               SQLITEDB_FOLDER_ID,
+               query, fields_of_interest,
+               &searched, &with_all_required_fields, NULL);
 
        if (searched) {
 
@@ -1601,8 +1620,9 @@ book_view_thread (gpointer data)
                                vcard = load_vcard (bf, NULL, data->uid, &error);
 
                                if (error) {
-                                       g_warning ("Error loading contact %s: %s",
-                                                  data->uid, error->message);
+                                       g_warning (
+                                               "Error loading contact %s: %s",
+                                               data->uid, error->message);
                                        g_error_free (error);
                                }
 
@@ -1647,12 +1667,14 @@ book_view_thread (gpointer data)
 
                        dbc->c_close (dbc);
                        if (db_error && db_error != DB_NOTFOUND)
-                               g_warning ("e_book_backend_file_search: error building list: %s",
-                                          db_strerror (db_error));
+                               g_warning (
+                                       "e_book_backend_file_search: error building list: %s",
+                                       db_strerror (db_error));
                }
                else if (db_error == DB_RUNRECOVERY) {
-                       g_warning ("e_book_backend_file_search: error getting the cursor for %s",
-                                  bf->priv->filename);
+                       g_warning (
+                               "e_book_backend_file_search: error getting the cursor for %s",
+                               bf->priv->filename);
                        abort ();
                }
 
@@ -1728,8 +1750,9 @@ e_book_backend_file_upgrade_db (EBookBackendFile *bf,
 
        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;
        }
 
@@ -2098,12 +2121,13 @@ e_book_backend_file_open (EBookBackendSync *backend,
        bf->priv->dirname = dirname;
        bf->priv->filename = filename;
 
-       bf->priv->sqlitedb = e_book_backend_sqlitedb_new (bf->priv->dirname,
-                                                         SQLITEDB_EMAIL_ID,
-                                                         SQLITEDB_FOLDER_ID,
-                                                         SQLITEDB_FOLDER_NAME,
-                                                         FALSE,
-                                                         perror);
+       bf->priv->sqlitedb = e_book_backend_sqlitedb_new (
+               bf->priv->dirname,
+               SQLITEDB_EMAIL_ID,
+               SQLITEDB_FOLDER_ID,
+               SQLITEDB_FOLDER_NAME,
+               FALSE,
+               perror);
        if (!bf->priv->sqlitedb)
                return;
 
@@ -2114,9 +2138,11 @@ e_book_backend_file_open (EBookBackendSync *backend,
                        g_propagate_error (perror, local_error);
                        return;
                } else if (!build_sqlitedb (bf->priv)) {
-                       g_propagate_error (perror, e_data_book_create_error_fmt (E_DATA_BOOK_STATUS_OTHER_ERROR,
-                                            _("Failed to build summary for an address book %s"),
-                                    bf->priv->filename));
+                       g_propagate_error (
+                               perror, e_data_book_create_error_fmt (
+                               E_DATA_BOOK_STATUS_OTHER_ERROR,
+                               _("Failed to build summary for an address book %s"),
+                               bf->priv->filename));
                }
        }
 
index 03d49fa..4cf9245 100644 (file)
@@ -401,8 +401,9 @@ check_get_new_contacts_finished (GetContactsData *data)
 
        /* Are we finished yet? */
        if (data->update_complete == FALSE || data->num_contacts_pending_photos > 0) {
-               __debug__ ("Bailing from check_get_new_contacts_finished(): update_complete: %u, num_contacts_pending_photos: %u, data: %p",
-                          data->update_complete, data->num_contacts_pending_photos, data);
+               __debug__ (
+                       "Bailing from check_get_new_contacts_finished(): update_complete: %u, num_contacts_pending_photos: %u, data: %p",
+                       data->update_complete, data->num_contacts_pending_photos, data);
                return;
        }
 
@@ -554,13 +555,15 @@ process_contact_cb (GDataEntry *entry,
                        cancellable = g_cancellable_new ();
 
                        photo_data->cancellable = g_object_ref (cancellable);
-                       photo_data->cancelled_handle = g_cancellable_connect (data->cancellable, (GCallback) process_contact_photo_cancelled_cb,
-                                                                             g_object_ref (cancellable), (GDestroyNotify) g_object_unref);
+                       photo_data->cancelled_handle = g_cancellable_connect (
+                               data->cancellable, (GCallback) process_contact_photo_cancelled_cb,
+                               g_object_ref (cancellable), (GDestroyNotify) g_object_unref);
 
                        /* Download the photo. */
-                       gdata_contacts_contact_get_photo_async (GDATA_CONTACTS_CONTACT (entry),
-                                                               GDATA_CONTACTS_SERVICE (priv->service), cancellable,
-                                                               (GAsyncReadyCallback) process_contact_photo_cb, photo_data);
+                       gdata_contacts_contact_get_photo_async (
+                               GDATA_CONTACTS_CONTACT (entry),
+                               GDATA_CONTACTS_SERVICE (priv->service), cancellable,
+                               (GAsyncReadyCallback) process_contact_photo_cb, photo_data);
 
                        g_object_unref (cancellable);
                        g_free (old_photo_etag);
@@ -852,8 +855,11 @@ create_group (EBookBackend *backend,
        __debug__ ("Creating group %s", category_name);
 
        /* Insert the new group */
-       new_group = GDATA_ENTRY (gdata_contacts_service_insert_group (GDATA_CONTACTS_SERVICE (priv->service), GDATA_CONTACTS_GROUP (group),
-                                                                     NULL, error));
+       new_group = GDATA_ENTRY (
+               gdata_contacts_service_insert_group (
+                       GDATA_CONTACTS_SERVICE (priv->service),
+                       GDATA_CONTACTS_GROUP (group),
+                       NULL, error));
        g_object_unref (group);
 
        if (new_group == NULL)
@@ -1114,10 +1120,11 @@ create_contact_photo_cb (GDataContactsContact *contact,
                data->photo = NULL;
 
                /* We now have to re-query for the contact, since setting its photo changes the contact's ETag. */
-               gdata_service_query_single_entry_async (priv->service,
-                                                       gdata_contacts_service_get_primary_authorization_domain (),
-                                                       gdata_entry_get_id (GDATA_ENTRY (contact)), NULL, GDATA_TYPE_CONTACTS_CONTACT,
-                                                       data->cancellable, (GAsyncReadyCallback) create_contact_photo_query_cb, data);
+               gdata_service_query_single_entry_async (
+                       priv->service,
+                       gdata_contacts_service_get_primary_authorization_domain (),
+                       gdata_entry_get_id (GDATA_ENTRY (contact)), NULL, GDATA_TYPE_CONTACTS_CONTACT,
+                       data->cancellable, (GAsyncReadyCallback) create_contact_photo_query_cb, data);
                return;
        } else {
                /* Error. */
@@ -1152,10 +1159,11 @@ create_contact_cb (GDataService *service,
        /* Add a photo for the new contact, if appropriate. This has to be done before we respond to the contact creation operation so that
         * we can update the EContact with the photo data and ETag. */
        if (data->photo != NULL) {
-               gdata_contacts_contact_set_photo_async (GDATA_CONTACTS_CONTACT (new_contact), GDATA_CONTACTS_SERVICE (service),
-                                                       (const guint8 *) data->photo->data.inlined.data, data->photo->data.inlined.length,
-                                                       data->photo->data.inlined.mime_type, data->cancellable,
-                                                       (GAsyncReadyCallback) create_contact_photo_cb, data);
+               gdata_contacts_contact_set_photo_async (
+                       GDATA_CONTACTS_CONTACT (new_contact), GDATA_CONTACTS_SERVICE (service),
+                       (const guint8 *) data->photo->data.inlined.data, data->photo->data.inlined.length,
+                       data->photo->data.inlined.mime_type, data->cancellable,
+                       (GAsyncReadyCallback) create_contact_photo_cb, data);
                return;
        }
 
@@ -1197,10 +1205,11 @@ e_book_backend_google_create_contacts (EBookBackend *backend,
        /* We make the assumption that the vCard list we're passed is always exactly one element long, since we haven't specified "bulk-adds"
         * in our static capability list. This simplifies a lot of the logic, especially around asynchronous results. */
        if (vcards->next != NULL) {
-               e_data_book_respond_create_contacts (book, opid,
-                                                    EDB_ERROR_EX (NOT_SUPPORTED,
-                                                    _("The backend does not support bulk additions")),
-                                                    NULL);
+               e_data_book_respond_create_contacts (
+                       book, opid,
+                       EDB_ERROR_EX (NOT_SUPPORTED,
+                       _("The backend does not support bulk additions")),
+                       NULL);
                return;
        }
 
@@ -1241,8 +1250,9 @@ e_book_backend_google_create_contacts (EBookBackend *backend,
        data->new_contact = NULL;
        data->photo = g_object_steal_data (G_OBJECT (entry), "photo");
 
-       gdata_contacts_service_insert_contact_async (GDATA_CONTACTS_SERVICE (priv->service), GDATA_CONTACTS_CONTACT (entry), cancellable,
-                                                    (GAsyncReadyCallback) create_contact_cb, data);
+       gdata_contacts_service_insert_contact_async (
+               GDATA_CONTACTS_SERVICE (priv->service), GDATA_CONTACTS_CONTACT (entry), cancellable,
+               (GAsyncReadyCallback) create_contact_cb, data);
 
        g_object_unref (cancellable);
        g_object_unref (entry);
@@ -1318,10 +1328,11 @@ e_book_backend_google_remove_contacts (EBookBackend *backend,
        /* We make the assumption that the ID list we're passed is always exactly one element long, since we haven't specified "bulk-removes"
         * in our static capability list. This simplifies a lot of the logic, especially around asynchronous results. */
        if (id_list->next != NULL) {
-               e_data_book_respond_remove_contacts (book, opid,
-                                                    EDB_ERROR_EX (NOT_SUPPORTED,
-                                                    _("The backend does not support bulk removals")),
-                                                    NULL);
+               e_data_book_respond_remove_contacts (
+                       book, opid,
+                       EDB_ERROR_EX (NOT_SUPPORTED,
+                       _("The backend does not support bulk removals")),
+                       NULL);
                return;
        }
        g_return_if_fail (!id_list->next);
@@ -1349,8 +1360,9 @@ e_book_backend_google_remove_contacts (EBookBackend *backend,
        data->uid = g_strdup (uid);
 
        cancellable = start_operation (backend, opid, cancellable, _("Deleting contact…"));
-       gdata_service_delete_entry_async (GDATA_SERVICE (priv->service), gdata_contacts_service_get_primary_authorization_domain (),
-                                         entry, cancellable, (GAsyncReadyCallback) remove_contact_cb, data);
+       gdata_service_delete_entry_async (
+               GDATA_SERVICE (priv->service), gdata_contacts_service_get_primary_authorization_domain (),
+               entry, cancellable, (GAsyncReadyCallback) remove_contact_cb, data);
        g_object_unref (cancellable);
        g_object_unref (entry);
 }
@@ -1478,10 +1490,11 @@ modify_contact_photo_cb (GDataContactsContact *contact,
                }
 
                /* We now have to re-query for the contact, since setting its photo changes the contact's ETag. */
-               gdata_service_query_single_entry_async (priv->service,
-                                                       gdata_contacts_service_get_primary_authorization_domain (),
-                                                       gdata_entry_get_id (GDATA_ENTRY (contact)), NULL, GDATA_TYPE_CONTACTS_CONTACT,
-                                                       data->cancellable, (GAsyncReadyCallback) modify_contact_photo_query_cb, data);
+               gdata_service_query_single_entry_async (
+                       priv->service,
+                       gdata_contacts_service_get_primary_authorization_domain (),
+                       gdata_entry_get_id (GDATA_ENTRY (contact)), NULL, GDATA_TYPE_CONTACTS_CONTACT,
+                       data->cancellable, (GAsyncReadyCallback) modify_contact_photo_query_cb, data);
                return;
        } else {
                /* Error. */
@@ -1533,16 +1546,18 @@ modify_contact_cb (GDataService *service,
                case UPDATE_PHOTO:
                        /* Set the photo. */
                        g_return_if_fail (data->photo != NULL);
-                       gdata_contacts_contact_set_photo_async (GDATA_CONTACTS_CONTACT (new_contact), GDATA_CONTACTS_SERVICE (service),
-                                                               (const guint8 *) data->photo->data.inlined.data, data->photo->data.inlined.length,
-                                                               data->photo->data.inlined.mime_type, data->cancellable,
-                                                               (GAsyncReadyCallback) modify_contact_photo_cb, data);
+                       gdata_contacts_contact_set_photo_async (
+                               GDATA_CONTACTS_CONTACT (new_contact), GDATA_CONTACTS_SERVICE (service),
+                               (const guint8 *) data->photo->data.inlined.data, data->photo->data.inlined.length,
+                               data->photo->data.inlined.mime_type, data->cancellable,
+                               (GAsyncReadyCallback) modify_contact_photo_cb, data);
                        return;
                case REMOVE_PHOTO:
                        /* Unset the photo. */
                        g_return_if_fail (data->photo == NULL);
-                       gdata_contacts_contact_set_photo_async (GDATA_CONTACTS_CONTACT (new_contact), GDATA_CONTACTS_SERVICE (service),
-                                                               NULL, 0, NULL, data->cancellable, (GAsyncReadyCallback) modify_contact_photo_cb, data);
+                       gdata_contacts_contact_set_photo_async (
+                               GDATA_CONTACTS_CONTACT (new_contact), GDATA_CONTACTS_SERVICE (service),
+                               NULL, 0, NULL, data->cancellable, (GAsyncReadyCallback) modify_contact_photo_cb, data);
                        return;
                default:
                        g_assert_not_reached ();
@@ -1678,8 +1693,9 @@ e_book_backend_google_modify_contacts (EBookBackend *backend,
                e_contact_photo_free (old_photo);
        }
 
-       gdata_service_update_entry_async (GDATA_SERVICE (priv->service), gdata_contacts_service_get_primary_authorization_domain (),
-                                         entry, cancellable, (GAsyncReadyCallback) modify_contact_cb, data);
+       gdata_service_update_entry_async (
+               GDATA_SERVICE (priv->service), gdata_contacts_service_get_primary_authorization_domain (),
+               entry, cancellable, (GAsyncReadyCallback) modify_contact_cb, data);
        g_object_unref (cancellable);
 
        g_object_unref (cached_contact);
index a235727..98f4a02 100644 (file)
@@ -1321,11 +1321,12 @@ gdata_gd_email_address_from_attribute (EVCardAttribute *attr,
                email = gdata_gd_email_address_new (values->data, rel, label, primary);
                g_free (rel);
 
-               __debug__ ("New %semail entry %s (%s/%s)",
-                          gdata_gd_email_address_is_primary (email) ? "primary " : "",
-                          gdata_gd_email_address_get_address (email),
-                          gdata_gd_email_address_get_relation_type (email),
-                          gdata_gd_email_address_get_label (email));
+               __debug__ (
+                       "New %semail entry %s (%s/%s)",
+                       gdata_gd_email_address_is_primary (email) ? "primary " : "",
+                       gdata_gd_email_address_get_address (email),
+                       gdata_gd_email_address_get_relation_type (email),
+                       gdata_gd_email_address_get_label (email));
        }
 
        return email;
@@ -1360,12 +1361,13 @@ gdata_gd_im_address_from_attribute (EVCardAttribute *attr,
                g_free (rel);
                g_free (protocol);
 
-               __debug__ ("New %s%s entry %s (%s/%s)",
-                          gdata_gd_im_address_is_primary (im) ? "primary " : "",
-                          gdata_gd_im_address_get_protocol (im),
-                          gdata_gd_im_address_get_address (im),
-                          gdata_gd_im_address_get_relation_type (im),
-                          gdata_gd_im_address_get_label (im));
+               __debug__ (
+                       "New %s%s entry %s (%s/%s)",
+                       gdata_gd_im_address_is_primary (im) ? "primary " : "",
+                       gdata_gd_im_address_get_protocol (im),
+                       gdata_gd_im_address_get_address (im),
+                       gdata_gd_im_address_get_relation_type (im),
+                       gdata_gd_im_address_get_label (im));
        }
 
        return im;
@@ -1396,11 +1398,12 @@ gdata_gd_phone_number_from_attribute (EVCardAttribute *attr,
                number = gdata_gd_phone_number_new (values->data, rel, label, NULL, primary);
                g_free (rel);
 
-               __debug__ ("New %sphone-number entry %s (%s/%s)",
-                          gdata_gd_phone_number_is_primary (number) ? "primary " : "",
-                          gdata_gd_phone_number_get_number (number),
-                          gdata_gd_phone_number_get_relation_type (number),
-                          gdata_gd_phone_number_get_label (number));
+               __debug__ (
+                       "New %sphone-number entry %s (%s/%s)",
+                       gdata_gd_phone_number_is_primary (number) ? "primary " : "",
+                       gdata_gd_phone_number_get_number (number),
+                       gdata_gd_phone_number_get_relation_type (number),
+                       gdata_gd_phone_number_get_label (number));
        }
 
        return number;
@@ -1468,11 +1471,12 @@ gdata_gd_postal_address_from_attribute (EVCardAttribute *attr,
                        return NULL;
                }
 
-               __debug__ ("New %spostal address entry %s (%s/%s)",
-                          gdata_gd_postal_address_is_primary (address) ? "primary " : "",
-                          gdata_gd_postal_address_get_address (address),
-                          gdata_gd_postal_address_get_relation_type (address),
-                          gdata_gd_postal_address_get_label (address));
+               __debug__ (
+                       "New %spostal address entry %s (%s/%s)",
+                       gdata_gd_postal_address_is_primary (address) ? "primary " : "",
+                       gdata_gd_postal_address_get_address (address),
+                       gdata_gd_postal_address_get_relation_type (address),
+                       gdata_gd_postal_address_get_label (address));
        }
 
        return address;
@@ -1507,11 +1511,12 @@ gdata_gd_organization_from_attribute (EVCardAttribute *attr,
 
                /* TITLE and ROLE are dealt with separately in gdata_entry_update_from_e_contact() */
 
-               __debug__ ("New %sorganization entry %s (%s/%s)",
-                          gdata_gd_organization_is_primary (org) ? "primary " : "",
-                          gdata_gd_organization_get_name (org),
-                          gdata_gd_organization_get_relation_type (org),
-                          gdata_gd_organization_get_label (org));
+               __debug__ (
+                       "New %sorganization entry %s (%s/%s)",
+                       gdata_gd_organization_is_primary (org) ? "primary " : "",
+                       gdata_gd_organization_get_name (org),
+                       gdata_gd_organization_get_relation_type (org),
+                       gdata_gd_organization_get_label (org));
        }
 
        return org;
@@ -1541,11 +1546,12 @@ gdata_gc_contact_website_from_attribute (EVCardAttribute *attr,
                website = gdata_gcontact_website_new (values->data, rel, label, primary);
                g_free (rel);
 
-               __debug__ ("New %suri entry %s (%s/%s)",
-                          gdata_gcontact_website_is_primary (website) ? "primary " : "",
-                          gdata_gcontact_website_get_uri (website),
-                          gdata_gcontact_website_get_relation_type (website),
-                          gdata_gcontact_website_get_label (website));
+               __debug__ (
+                       "New %suri entry %s (%s/%s)",
+                       gdata_gcontact_website_is_primary (website) ? "primary " : "",
+                       gdata_gcontact_website_get_uri (website),
+                       gdata_gcontact_website_get_relation_type (website),
+                       gdata_gcontact_website_get_label (website));
        }
 
        return website;
index 1f1242f..f232562 100644 (file)
@@ -666,11 +666,12 @@ get_ldap_library_info (void)
        else {
                gint i;
                if (enable_debug) {
-                       g_message ("libldap vendor/version: %s %2d.%02d.%02d",
-                          info.ldapai_vendor_name,
-                          info.ldapai_vendor_version / 10000,
-                          (info.ldapai_vendor_version % 10000) / 1000,
-                          info.ldapai_vendor_version % 1000);
+                       g_message (
+                               "libldap vendor/version: %s %2d.%02d.%02d",
+                               info.ldapai_vendor_name,
+                               info.ldapai_vendor_version / 10000,
+                               (info.ldapai_vendor_version % 10000) / 1000,
+                               info.ldapai_vendor_version % 1000);
 
                        g_message ("library extensions present:");
                }
@@ -721,10 +722,11 @@ query_ldap_root_dse (EBookBackendLDAP *bl)
        timeout.tv_usec = 0;
 
        g_static_rec_mutex_lock (&eds_ldap_handler_lock);
-       ldap_error = ldap_search_ext_s (bl->priv->ldap,
-                                       LDAP_ROOT_DSE, LDAP_SCOPE_BASE,
-                                       "(objectclass=*)",
-                                       (gchar **) attrs, 0, NULL, NULL, &timeout, LDAP_NO_LIMIT, &resp);
+       ldap_error = ldap_search_ext_s (
+               bl->priv->ldap,
+               LDAP_ROOT_DSE, LDAP_SCOPE_BASE,
+               "(objectclass=*)",
+               (gchar **) attrs, 0, NULL, NULL, &timeout, LDAP_NO_LIMIT, &resp);
        g_static_rec_mutex_unlock (&eds_ldap_handler_lock);
        if (ldap_error != LDAP_SUCCESS) {
                g_warning ("could not perform query on Root DSE (ldap_error 0x%02x/%s)", ldap_error, ldap_err2string (ldap_error) ? ldap_err2string (ldap_error) : "Unknown error");
@@ -999,7 +1001,8 @@ e_book_backend_ldap_connect (EBookBackendLDAP *bl,
                                g_get_current_time (&end);
                                diff = end.tv_sec * 1000 + end.tv_usec / 1000;
                                diff -= start.tv_sec * 1000 + start.tv_usec / 1000;
-                               printf ("e_book_backend_ldap_connect took %ld.%03ld seconds\n",
+                               printf (
+                                       "e_book_backend_ldap_connect took %ld.%03ld seconds\n",
                                        diff / 1000,diff % 1000);
                        }
                        return TRUE;
@@ -1027,11 +1030,12 @@ e_book_backend_ldap_connect (EBookBackendLDAP *bl,
                g_static_rec_mutex_unlock (&eds_ldap_handler_lock);
        }
 
-       g_warning ("e_book_backend_ldap_connect failed for "
-                  "'ldap://%s:%d/%s'\n",
-                  blpriv->ldap_host,
-                  blpriv->ldap_port,
-                  blpriv->ldap_rootdn ? blpriv->ldap_rootdn : "");
+       g_warning (
+               "e_book_backend_ldap_connect failed for "
+               "'ldap://%s:%d/%s'\n",
+               blpriv->ldap_host,
+               blpriv->ldap_port,
+               blpriv->ldap_rootdn ? blpriv->ldap_rootdn : "");
        blpriv->connected = FALSE;
 
        g_propagate_error (error, EDB_ERROR (REPOSITORY_OFFLINE));
@@ -1076,9 +1080,10 @@ e_book_backend_ldap_reconnect (EBookBackendLDAP *bl,
 
                if (bl->priv->auth_dn) {
                        g_static_rec_mutex_lock (&eds_ldap_handler_lock);
-                       ldap_error = ldap_simple_bind_s (bl->priv->ldap,
-                                                       bl->priv->auth_dn,
-                                                       bl->priv->auth_secret);
+                       ldap_error = ldap_simple_bind_s (
+                               bl->priv->ldap,
+                               bl->priv->auth_dn,
+                               bl->priv->auth_secret);
                        g_static_rec_mutex_unlock (&eds_ldap_handler_lock);
                }
                book_view_notify_status (bl, book_view, "");
@@ -1088,7 +1093,8 @@ e_book_backend_ldap_reconnect (EBookBackendLDAP *bl,
                        g_get_current_time (&end);
                        diff = end.tv_sec * 1000 + end.tv_usec / 1000;
                        diff -= start.tv_sec * 1000 + start.tv_usec / 1000;
-                       printf ("e_book_backend_ldap_reconnect took %ld.%03ld seconds\n",
+                       printf (
+                               "e_book_backend_ldap_reconnect took %ld.%03ld seconds\n",
                                diff / 1000,diff % 1000);
                }
 
@@ -1124,8 +1130,7 @@ ldap_op_add (LDAPOp *op,
                g_warning ("conflicting ldap msgid's");
        }
 
-       g_hash_table_insert (bl->priv->id_to_op,
-                            &op->id, op);
+       g_hash_table_insert (bl->priv->id_to_op, &op->id, op);
 
        bl->priv->active_ops++;
 
@@ -1180,8 +1185,7 @@ ldap_op_change_id (LDAPOp *op,
 
        op->id = msg_id;
 
-       g_hash_table_insert (bl->priv->id_to_op,
-                            &op->id, op);
+       g_hash_table_insert (bl->priv->id_to_op, &op->id, op);
        g_static_rec_mutex_unlock (&bl->priv->op_hash_mutex);
 }
 
@@ -1205,9 +1209,12 @@ ldap_error_to_response (gint ldap_error)
        else if (ldap_error == LDAP_TYPE_OR_VALUE_EXISTS )
                return EDB_ERROR (CONTACTID_ALREADY_EXISTS);
        else
-               return e_data_book_create_error_fmt (E_DATA_BOOK_STATUS_OTHER_ERROR,
-                               _("LDAP error 0x%x (%s)"), ldap_error,
-                               ldap_err2string (ldap_error) ? ldap_err2string (ldap_error) : _("Unknown error"));
+               return e_data_book_create_error_fmt (
+                       E_DATA_BOOK_STATUS_OTHER_ERROR,
+                       _("LDAP error 0x%x (%s)"), ldap_error,
+                       ldap_err2string (ldap_error) ?
+                       ldap_err2string (ldap_error) :
+                       _("Unknown error"));
 }
 
 static const gchar *
@@ -1242,11 +1249,12 @@ create_dn_from_contact (EContact *contact,
                }
        }
 
-       dn = g_strdup_printf ("%s=%s%s%lu",
-                             get_dn_attribute_name (rootdn),
-                             (cn_part && *cn_part) ? cn_part : "",
-                             (cn_part && *cn_part) ? "." : "",
-                             time (NULL));
+       dn = g_strdup_printf (
+               "%s=%s%s%lu",
+               get_dn_attribute_name (rootdn),
+               (cn_part && *cn_part) ? cn_part : "",
+               (cn_part && *cn_part) ? "." : "",
+               time (NULL));
 
        g_free (cn_part);
 
@@ -1259,9 +1267,10 @@ static gchar *
 create_full_dn_from_contact (gchar *dn,
                              const gchar *root_dn)
 {
-       gchar *full_dn = g_strdup_printf ("%s%s%s", dn,
-                                        (root_dn && *root_dn) ? "," : "",
-                                        (root_dn && *root_dn) ? root_dn: "");
+       gchar *full_dn = g_strdup_printf (
+               "%s%s%s", dn,
+               (root_dn && *root_dn) ? "," : "",
+               (root_dn && *root_dn) ? root_dn: "");
 
        g_print ("generated full dn: %s\n", full_dn);
 
@@ -1556,32 +1565,36 @@ create_contact_handler (LDAPOp *op,
        g_static_rec_mutex_lock (&eds_ldap_handler_lock);
        if (!bl->priv->ldap) {
                g_static_rec_mutex_unlock (&eds_ldap_handler_lock);
-               e_data_book_respond_create_contacts (op->book,
-                                                    op->opid,
-                                                    EDB_ERROR_NOT_CONNECTED (),
-                                                    NULL);
+               e_data_book_respond_create_contacts (
+                       op->book,
+                       op->opid,
+                       EDB_ERROR_NOT_CONNECTED (),
+                       NULL);
                ldap_op_finished (op);
                return;
        }
        g_static_rec_mutex_unlock (&eds_ldap_handler_lock);
 
        if (LDAP_RES_ADD != ldap_msgtype (res)) {
-               e_data_book_respond_create_contacts (op->book,
-                                                    op->opid,
-                                                    EDB_ERROR_MSG_TYPE (ldap_msgtype (res)),
-                                                    NULL);
+               e_data_book_respond_create_contacts (
+                       op->book,
+                       op->opid,
+                       EDB_ERROR_MSG_TYPE (ldap_msgtype (res)),
+                       NULL);
                ldap_op_finished (op);
                return;
        }
 
        g_static_rec_mutex_lock (&eds_ldap_handler_lock);
-       ldap_parse_result (bl->priv->ldap, res, &ldap_error,
-                          NULL, &ldap_error_msg, NULL, NULL, 0);
+       ldap_parse_result (
+               bl->priv->ldap, res, &ldap_error,
+               NULL, &ldap_error_msg, NULL, NULL, 0);
        g_static_rec_mutex_unlock (&eds_ldap_handler_lock);
        if (ldap_error != LDAP_SUCCESS) {
-               g_warning ("create_contact_handler: %02X (%s), additional info: %s",
-                          ldap_error,
-                          ldap_err2string (ldap_error), ldap_error_msg);
+               g_warning (
+                       "create_contact_handler: %02X (%s), additional info: %s",
+                       ldap_error,
+                       ldap_err2string (ldap_error), ldap_error_msg);
        } else {
                if (bl->priv->cache)
                        e_book_backend_cache_add_contact (bl->priv->cache, create_op->new_contact);
@@ -1590,10 +1603,11 @@ create_contact_handler (LDAPOp *op,
 
        /* and lastly respond */
        added_contacts.data = create_op->new_contact;
-       e_data_book_respond_create_contacts (op->book,
-                                            op->opid,
-                                            ldap_error_to_response (ldap_error),
-                                            &added_contacts);
+       e_data_book_respond_create_contacts (
+               op->book,
+               op->opid,
+               ldap_error_to_response (ldap_error),
+               &added_contacts);
 
        ldap_op_finished (op);
 }
@@ -1628,10 +1642,11 @@ e_book_backend_ldap_create_contacts (EBookBackend *backend,
        /* We make the assumption that the vCard list we're passed is always exactly one element long, since we haven't specified "bulk-adds"
         * in our static capability list. This is because there is no clean way to roll back changes in case of an error. */
        if (vcards->next != NULL) {
-               e_data_book_respond_create_contacts (book, opid,
-                                                    EDB_ERROR_EX (NOT_SUPPORTED,
-                                                    _("The backend does not support bulk additions")),
-                                                    NULL);
+               e_data_book_respond_create_contacts (
+                       book, opid,
+                       EDB_ERROR_EX (NOT_SUPPORTED,
+                       _("The backend does not support bulk additions")),
+                       NULL);
                return;
        }
 
@@ -1716,8 +1731,9 @@ e_book_backend_ldap_create_contacts (EBookBackend *backend,
        do {
                book_view_notify_status (bl, book_view, _("Adding contact to LDAP server..."));
                g_static_rec_mutex_lock (&eds_ldap_handler_lock);
-               err = ldap_add_ext (bl->priv->ldap, create_op->dn, ldap_mods,
-                                   NULL, NULL, &create_contact_msgid);
+               err = ldap_add_ext (
+                       bl->priv->ldap, create_op->dn, ldap_mods,
+                       NULL, NULL, &create_contact_msgid);
                g_static_rec_mutex_unlock (&eds_ldap_handler_lock);
 
        } while (e_book_backend_ldap_reconnect (bl, book_view, err));
@@ -1726,17 +1742,19 @@ e_book_backend_ldap_create_contacts (EBookBackend *backend,
        free_mods (mod_array);
 
        if (LDAP_SUCCESS != err) {
-               e_data_book_respond_create_contacts (create_op->op.book,
-                                                    opid,
-                                                    ldap_error_to_response (err),
-                                                    NULL);
+               e_data_book_respond_create_contacts (
+                       create_op->op.book,
+                       opid,
+                       ldap_error_to_response (err),
+                       NULL);
                create_contact_dtor ((LDAPOp *) create_op);
                return;
        } else {
                g_print ("ldap_add_ext returned %d\n", err);
-               ldap_op_add ((LDAPOp *) create_op, backend, book,
-                            book_view, opid, create_contact_msgid,
-                            create_contact_handler, create_contact_dtor);
+               ldap_op_add (
+                       (LDAPOp *) create_op, backend, book,
+                       book_view, opid, create_contact_msgid,
+                       create_contact_handler, create_contact_dtor);
        }
 }
 
@@ -1765,22 +1783,25 @@ remove_contact_handler (LDAPOp *op,
        g_static_rec_mutex_unlock (&eds_ldap_handler_lock);
 
        if (LDAP_RES_DELETE != ldap_msgtype (res)) {
-               e_data_book_respond_remove_contacts (op->book,
-                                                    op->opid,
-                                                    EDB_ERROR_MSG_TYPE (ldap_msgtype (res)),
-                                                    NULL);
+               e_data_book_respond_remove_contacts (
+                       op->book,
+                       op->opid,
+                       EDB_ERROR_MSG_TYPE (ldap_msgtype (res)),
+                       NULL);
                ldap_op_finished (op);
                return;
        }
 
        g_static_rec_mutex_lock (&eds_ldap_handler_lock);
-       ldap_parse_result (bl->priv->ldap, res, &ldap_error,
-                          NULL, &ldap_error_msg, NULL, NULL, 0);
+       ldap_parse_result (
+               bl->priv->ldap, res, &ldap_error,
+               NULL, &ldap_error_msg, NULL, NULL, 0);
        g_static_rec_mutex_unlock (&eds_ldap_handler_lock);
        if (ldap_error != LDAP_SUCCESS) {
-               g_warning ("remove_contact_handler: %02X (%s), additional info: %s",
-                          ldap_error,
-                          ldap_err2string (ldap_error), ldap_error_msg);
+               g_warning (
+                       "remove_contact_handler: %02X (%s), additional info: %s",
+                       ldap_error,
+                       ldap_err2string (ldap_error), ldap_error_msg);
        } else {
                /* Remove from cache too */
                if (bl->priv->cache)
@@ -1790,10 +1811,11 @@ remove_contact_handler (LDAPOp *op,
        ldap_memfree (ldap_error_msg);
 
        ids = g_slist_append (ids, remove_op->id);
-       e_data_book_respond_remove_contacts (remove_op->op.book,
-                                            op->opid,
-                                            ldap_error_to_response (ldap_error),
-                                            ldap_error == LDAP_SUCCESS ? ids : NULL);
+       e_data_book_respond_remove_contacts (
+               remove_op->op.book,
+               op->opid,
+               ldap_error_to_response (ldap_error),
+               ldap_error == LDAP_SUCCESS ? ids : NULL);
        g_slist_free (ids);
        ldap_op_finished (op);
 }
@@ -1848,25 +1870,28 @@ e_book_backend_ldap_remove_contacts (EBookBackend *backend,
                book_view_notify_status (bl, book_view, _("Removing contact from LDAP server..."));
 
                g_static_rec_mutex_lock (&eds_ldap_handler_lock);
-               ldap_error = ldap_delete_ext (bl->priv->ldap,
-                                             remove_op->id,
-                                             NULL, NULL, &remove_msgid);
+               ldap_error = ldap_delete_ext (
+                       bl->priv->ldap,
+                       remove_op->id,
+                       NULL, NULL, &remove_msgid);
                g_static_rec_mutex_unlock (&eds_ldap_handler_lock);
        } while (e_book_backend_ldap_reconnect (bl, book_view, ldap_error));
 
        if (ldap_error != LDAP_SUCCESS) {
-               e_data_book_respond_remove_contacts (remove_op->op.book,
-                                                    opid,
-                                                    ldap_error_to_response (ldap_error),
-                                                    NULL);
+               e_data_book_respond_remove_contacts (
+                       remove_op->op.book,
+                       opid,
+                       ldap_error_to_response (ldap_error),
+                       NULL);
                ldap_op_finished ((LDAPOp *) remove_op);
                remove_contact_dtor ((LDAPOp *) remove_op);
                return;
        } else {
                g_print ("ldap_delete_ext returned %d\n", ldap_error);
-               ldap_op_add ((LDAPOp *) remove_op, backend, book,
-                            book_view, opid, remove_msgid,
-                            remove_contact_handler, remove_contact_dtor);
+               ldap_op_add (
+                       (LDAPOp *) remove_op, backend, book,
+                       book_view, opid, remove_msgid,
+                       remove_contact_handler, remove_contact_dtor);
        }
 }
 
@@ -1924,13 +1949,15 @@ modify_contact_modify_handler (LDAPOp *op,
        }
 
        g_static_rec_mutex_lock (&eds_ldap_handler_lock);
-       ldap_parse_result (bl->priv->ldap, res, &ldap_error,
-                          NULL, &ldap_error_msg, NULL, NULL, 0);
+       ldap_parse_result (
+               bl->priv->ldap, res, &ldap_error,
+               NULL, &ldap_error_msg, NULL, NULL, 0);
        g_static_rec_mutex_unlock (&eds_ldap_handler_lock);
        if (ldap_error != LDAP_SUCCESS) {
-               g_warning ("modify_contact_modify_handler: %02X (%s), additional info: %s",
-                          ldap_error,
-                          ldap_err2string (ldap_error), ldap_error_msg);
+               g_warning (
+                       "modify_contact_modify_handler: %02X (%s), additional info: %s",
+                       ldap_error,
+                       ldap_err2string (ldap_error), ldap_error_msg);
        } else {
                if (bl->priv->cache)
                        e_book_backend_cache_add_contact (bl->priv->cache, modify_op->contact);
@@ -2001,13 +2028,15 @@ modify_contact_search_handler (LDAPOp *op,
                /* grab the result code, and set up the actual modify (or rename)
                 * if it was successful */
                g_static_rec_mutex_lock (&eds_ldap_handler_lock);
-               ldap_parse_result (bl->priv->ldap, res, &ldap_error,
-                                  NULL, &ldap_error_msg, NULL, NULL, 0);
+               ldap_parse_result (
+                       bl->priv->ldap, res, &ldap_error,
+                       NULL, &ldap_error_msg, NULL, NULL, 0);
                g_static_rec_mutex_unlock (&eds_ldap_handler_lock);
                if (ldap_error != LDAP_SUCCESS) {
-                       g_warning ("modify_contact_search_handler: %02X (%s), additional info: %s",
-                                  ldap_error,
-                                  ldap_err2string (ldap_error), ldap_error_msg);
+                       g_warning (
+                               "modify_contact_search_handler: %02X (%s), additional info: %s",
+                               ldap_error,
+                               ldap_err2string (ldap_error), ldap_error_msg);
                }
                ldap_memfree (ldap_error_msg);
 
@@ -2030,8 +2059,9 @@ modify_contact_search_handler (LDAPOp *op,
                        gchar *new_uid;
 
                        if (modify_op->ldap_uid)
-                               new_uid = g_strdup_printf ("%s=%s", get_dn_attribute_name (bl->priv->ldap_rootdn),
-                                                          modify_op->ldap_uid);
+                               new_uid = g_strdup_printf (
+                                       "%s=%s", get_dn_attribute_name (bl->priv->ldap_rootdn),
+                                       modify_op->ldap_uid);
                        else
                                new_uid = create_dn_from_contact (modify_op->contact, bl->priv->ldap_rootdn);
 
@@ -2049,19 +2079,21 @@ modify_contact_search_handler (LDAPOp *op,
 
                                /* actually perform the ldap rename */
                                g_static_rec_mutex_lock (&eds_ldap_handler_lock);
-                               ldap_error = ldap_rename (bl->priv->ldap, current_dn,
-                                                         new_uid /* newRDN */,
-                                                         NULL    /* NewSuperior */,
-                                                         0       /* deleteOldRDN */,
-                                                         NULL, NULL, &rename_contact_msgid);
+                               ldap_error = ldap_rename (
+                                       bl->priv->ldap, current_dn,
+                                       new_uid /* newRDN */,
+                                       NULL    /* NewSuperior */,
+                                       0       /* deleteOldRDN */,
+                                       NULL, NULL, &rename_contact_msgid);
                                g_static_rec_mutex_unlock (&eds_ldap_handler_lock);
 
                                g_free (new_uid);
 
                                if (ldap_error == LDAP_SUCCESS) {
                                        op->handler = modify_contact_rename_handler;
-                                       ldap_op_change_id ((LDAPOp *) modify_op,
-                                                          rename_contact_msgid);
+                                       ldap_op_change_id (
+                                               (LDAPOp *) modify_op,
+                                               rename_contact_msgid);
 
                                        /* Remove old entry from cache */
                                        if (bl->priv->cache)
@@ -2125,13 +2157,15 @@ modify_contact_rename_handler (LDAPOp *op,
                }
 
                g_static_rec_mutex_lock (&eds_ldap_handler_lock);
-               ldap_parse_result (bl->priv->ldap, res, &ldap_error,
-                                  NULL, &ldap_error_msg, NULL, NULL, 0);
+               ldap_parse_result (
+                       bl->priv->ldap, res, &ldap_error,
+                       NULL, &ldap_error_msg, NULL, NULL, 0);
                g_static_rec_mutex_unlock (&eds_ldap_handler_lock);
                if (ldap_error != LDAP_SUCCESS) {
-                       g_warning ("modify_contact_rename_handler: %02X (%s), additional info: %s",
-                                  ldap_error,
-                                  ldap_err2string (ldap_error), ldap_error_msg);
+                       g_warning (
+                               "modify_contact_rename_handler: %02X (%s), additional info: %s",
+                               ldap_error,
+                               ldap_err2string (ldap_error), ldap_error_msg);
                } else {
                        if (bl->priv->cache)
                                e_book_backend_cache_add_contact (bl->priv->cache, modify_op->contact);
@@ -2204,14 +2238,16 @@ modify_contact_rename_handler (LDAPOp *op,
 #endif
                /* actually perform the ldap modify */
                g_static_rec_mutex_lock (&eds_ldap_handler_lock);
-               ldap_error = ldap_modify_ext (bl->priv->ldap, modify_op->id, ldap_mods,
-                                             NULL, NULL, &modify_contact_msgid);
+               ldap_error = ldap_modify_ext (
+                       bl->priv->ldap, modify_op->id, ldap_mods,
+                       NULL, NULL, &modify_contact_msgid);
                g_static_rec_mutex_unlock (&eds_ldap_handler_lock);
 
                if (ldap_error == LDAP_SUCCESS) {
                        op->handler = modify_contact_modify_handler;
-                       ldap_op_change_id ((LDAPOp *) modify_op,
-                                          modify_contact_msgid);
+                       ldap_op_change_id (
+                               (LDAPOp *) modify_op,
+                               modify_contact_msgid);
                } else {
                        g_warning ("ldap_modify_ext returned %d\n", ldap_error);
                        e_data_book_respond_modify_contacts (op->book,
@@ -2297,20 +2333,22 @@ e_book_backend_ldap_modify_contacts (EBookBackend *backend,
                book_view_notify_status (bl, book_view, _("Modifying contact from LDAP server..."));
 
                g_static_rec_mutex_lock (&eds_ldap_handler_lock);
-               ldap_error = ldap_search_ext (bl->priv->ldap, modify_op->id,
-                                             LDAP_SCOPE_BASE,
-                                             "(objectclass=*)",
-                                             NULL, 0, NULL, NULL,
-                                             NULL, /* XXX timeout */
-                                             1, &modify_contact_msgid);
+               ldap_error = ldap_search_ext (
+                       bl->priv->ldap, modify_op->id,
+                       LDAP_SCOPE_BASE,
+                       "(objectclass=*)",
+                       NULL, 0, NULL, NULL,
+                       NULL, /* XXX timeout */
+                       1, &modify_contact_msgid);
                g_static_rec_mutex_unlock (&eds_ldap_handler_lock);
 
        } while (e_book_backend_ldap_reconnect (bl, book_view, ldap_error));
 
        if (ldap_error == LDAP_SUCCESS) {
-               ldap_op_add ((LDAPOp *) modify_op, backend, book,
-                            book_view, opid, modify_contact_msgid,
-                            modify_contact_search_handler, modify_contact_dtor);
+               ldap_op_add (
+                       (LDAPOp *) modify_op, backend, book,
+                       book_view, opid, modify_contact_msgid,
+                       modify_contact_search_handler, modify_contact_dtor);
        } else {
                e_data_book_respond_modify_contacts (book,
                                                     opid,
@@ -2363,10 +2401,11 @@ get_contact_handler (LDAPOp *op,
                g_static_rec_mutex_unlock (&eds_ldap_handler_lock);
 
                if (!e) {
-                       e_data_book_respond_get_contact (op->book,
-                                                        op->opid,
-                                                        e_data_book_create_error_fmt (E_DATA_BOOK_STATUS_OTHER_ERROR, _("%s: NULL returned from ldap_first_entry"), G_STRFUNC),
-                                                        NULL);
+                       e_data_book_respond_get_contact (
+                               op->book,
+                               op->opid,
+                               e_data_book_create_error_fmt (E_DATA_BOOK_STATUS_OTHER_ERROR, _("%s: NULL returned from ldap_first_entry"), G_STRFUNC),
+                               NULL);
                        ldap_op_finished (op);
                        return;
                }
@@ -2374,10 +2413,11 @@ get_contact_handler (LDAPOp *op,
                contact = build_contact_from_entry (bl, e, NULL, NULL);
 
                vcard = e_vcard_to_string (E_VCARD (contact), EVC_FORMAT_VCARD_30);
-               e_data_book_respond_get_contact (op->book,
-                                                op->opid,
-                                                EDB_ERROR (SUCCESS),
-                                                vcard);
+               e_data_book_respond_get_contact (
+                       op->book,
+                       op->opid,
+                       EDB_ERROR (SUCCESS),
+                       vcard);
                g_free (vcard);
                g_object_unref (contact);
                ldap_op_finished (op);
@@ -2386,8 +2426,9 @@ get_contact_handler (LDAPOp *op,
                        g_get_current_time (&end);
                        diff = end.tv_sec * 1000 + end.tv_usec / 1000;
                        diff -= start.tv_sec * 1000 + start.tv_usec / 1000;
-                       printf ("get_contact_handler took %ld.%03ld seconds \n",
-                                diff / 1000, diff % 1000);
+                       printf (
+                               "get_contact_handler took %ld.%03ld seconds \n",
+                               diff / 1000, diff % 1000);
                }
        } else if (msg_type == LDAP_RES_SEARCH_REFERENCE) {
                /* ignore references */
@@ -2396,28 +2437,32 @@ get_contact_handler (LDAPOp *op,
                gint ldap_error;
 
                g_static_rec_mutex_lock (&eds_ldap_handler_lock);
-               ldap_parse_result (bl->priv->ldap, res, &ldap_error,
-                                  NULL, &ldap_error_msg, NULL, NULL, 0);
+               ldap_parse_result (
+                       bl->priv->ldap, res, &ldap_error,
+                       NULL, &ldap_error_msg, NULL, NULL, 0);
                g_static_rec_mutex_unlock (&eds_ldap_handler_lock);
                if (ldap_error != LDAP_SUCCESS) {
-                       g_warning ("get_contact_handler: %02X (%s), additional info: %s",
-                                  ldap_error,
-                                  ldap_err2string (ldap_error), ldap_error_msg);
+                       g_warning (
+                               "get_contact_handler: %02X (%s), additional info: %s",
+                               ldap_error,
+                               ldap_err2string (ldap_error), ldap_error_msg);
                }
                ldap_memfree (ldap_error_msg);
 
-               e_data_book_respond_get_contact (op->book,
-                                                op->opid,
-                                                ldap_error_to_response (ldap_error),
-                                                NULL);
+               e_data_book_respond_get_contact (
+                       op->book,
+                       op->opid,
+                       ldap_error_to_response (ldap_error),
+                       NULL);
                ldap_op_finished (op);
        }
        else {
-               e_data_book_respond_get_contact (op->book,
-                                                op->opid,
-                                                e_data_book_create_error_fmt (E_DATA_BOOK_STATUS_OTHER_ERROR,
+               e_data_book_respond_get_contact (
+                       op->book,
+                       op->opid,
+                       e_data_book_create_error_fmt (E_DATA_BOOK_STATUS_OTHER_ERROR,
                                                        _("%s: Unhandled result type %d returned"), G_STRFUNC, msg_type),
-                                                NULL);
+                       NULL);
                ldap_op_finished (op);
        }
 
@@ -2458,10 +2503,11 @@ e_book_backend_ldap_get_contact (EBookBackend *backend,
 
                        vcard_str = e_vcard_to_string (E_VCARD (contact), EVC_FORMAT_VCARD_30);
 
-                       e_data_book_respond_get_contact (book,
-                                                        opid,
-                                                        EDB_ERROR (SUCCESS),
-                                                        vcard_str);
+                       e_data_book_respond_get_contact (
+                               book,
+                               opid,
+                               EDB_ERROR (SUCCESS),
+                               vcard_str);
                        g_free (vcard_str);
                        g_object_unref (contact);
                        return;
@@ -2491,33 +2537,37 @@ e_book_backend_ldap_get_contact (EBookBackend *backend,
 
        do {
                g_static_rec_mutex_lock (&eds_ldap_handler_lock);
-               ldap_error = ldap_search_ext (bl->priv->ldap, id,
-                                             LDAP_SCOPE_BASE,
-                                             "(objectclass=*)",
-                                             NULL, 0, NULL, NULL,
-                                             NULL, /* XXX timeout */
-                                             1, &get_contact_msgid);
+               ldap_error = ldap_search_ext (
+                       bl->priv->ldap, id,
+                       LDAP_SCOPE_BASE,
+                       "(objectclass=*)",
+                       NULL, 0, NULL, NULL,
+                       NULL, /* XXX timeout */
+                       1, &get_contact_msgid);
                g_static_rec_mutex_unlock (&eds_ldap_handler_lock);
        } while (e_book_backend_ldap_reconnect (bl, book_view, ldap_error));
 
        if (ldap_error == LDAP_SUCCESS) {
-               ldap_op_add ((LDAPOp *) get_contact_op, backend, book,
-                            book_view, opid, get_contact_msgid,
-                            get_contact_handler, get_contact_dtor);
+               ldap_op_add (
+                       (LDAPOp *) get_contact_op, backend, book,
+                       book_view, opid, get_contact_msgid,
+                       get_contact_handler, get_contact_dtor);
 
                if (enable_debug) {
                        printf ("e_book_backend_ldap_get_contact invoked get_contact_handler\n");
                        g_get_current_time (&end);
                        diff = end.tv_sec * 1000 + end.tv_usec / 1000;
                        diff -= start.tv_sec * 1000 + start.tv_usec / 1000;
-                       printf ("and took %ld.%03ld seconds\n",
-                                               diff / 1000, diff % 1000);
+                       printf (
+                               "and took %ld.%03ld seconds\n",
+                               diff / 1000, diff % 1000);
                }
        } else {
-               e_data_book_respond_get_contact (book,
-                                                opid,
-                                                ldap_error_to_response (ldap_error),
-                                                NULL);
+               e_data_book_respond_get_contact (
+                       book,
+                       opid,
+                       ldap_error_to_response (ldap_error),
+                       NULL);
                get_contact_dtor ((LDAPOp *) get_contact_op);
        }
 }
@@ -2586,38 +2636,44 @@ contact_list_handler (LDAPOp *op,
                gint ldap_error;
 
                g_static_rec_mutex_lock (&eds_ldap_handler_lock);
-               ldap_parse_result (bl->priv->ldap, res, &ldap_error,
-                                  NULL, &ldap_error_msg, NULL, NULL, 0);
+               ldap_parse_result (
+                       bl->priv->ldap, res, &ldap_error,
+                       NULL, &ldap_error_msg, NULL, NULL, 0);
                g_static_rec_mutex_unlock (&eds_ldap_handler_lock);
                if (ldap_error != LDAP_SUCCESS) {
-                       g_warning ("contact_list_handler: %02X (%s), additional info: %s",
-                                  ldap_error,
-                                  ldap_err2string (ldap_error), ldap_error_msg);
+                       g_warning (
+                               "contact_list_handler: %02X (%s), additional info: %s",
+                               ldap_error,
+                               ldap_err2string (ldap_error), ldap_error_msg);
                }
                ldap_memfree (ldap_error_msg);
 
                g_warning ("search returned %d\n", ldap_error);
 
                if (ldap_error == LDAP_TIMELIMIT_EXCEEDED)
-                       e_data_book_respond_get_contact_list (op->book,
-                                                             op->opid,
-                                                             EDB_ERROR (SEARCH_TIME_LIMIT_EXCEEDED),
-                                                             contact_list_op->contacts);
+                       e_data_book_respond_get_contact_list (
+                               op->book,
+                               op->opid,
+                               EDB_ERROR (SEARCH_TIME_LIMIT_EXCEEDED),
+                               contact_list_op->contacts);
                else if (ldap_error == LDAP_SIZELIMIT_EXCEEDED)
-                       e_data_book_respond_get_contact_list (op->book,
-                                                             op->opid,
-                                                             EDB_ERROR (SEARCH_SIZE_LIMIT_EXCEEDED),
-                                                             contact_list_op->contacts);
+                       e_data_book_respond_get_contact_list (
+                               op->book,
+                               op->opid,
+                               EDB_ERROR (SEARCH_SIZE_LIMIT_EXCEEDED),
+                               contact_list_op->contacts);
                else if (ldap_error == LDAP_SUCCESS)
-                       e_data_book_respond_get_contact_list (op->book,
-                                                             op->opid,
-                                                             EDB_ERROR (SUCCESS),
-                                                             contact_list_op->contacts);
+                       e_data_book_respond_get_contact_list (
+                               op->book,
+                               op->opid,
+                               EDB_ERROR (SUCCESS),
+                               contact_list_op->contacts);
                else
-                       e_data_book_respond_get_contact_list (op->book,
-                                                             op->opid,
-                                                             ldap_error_to_response (ldap_error),
-                                                             contact_list_op->contacts);
+                       e_data_book_respond_get_contact_list (
+                               op->book,
+                               op->opid,
+                               ldap_error_to_response (ldap_error),
+                               contact_list_op->contacts);
 
                ldap_op_finished (op);
                if (enable_debug) {
@@ -2630,11 +2686,12 @@ contact_list_handler (LDAPOp *op,
        }
        else {
                g_warning ("unhandled search result type %d returned", msg_type);
-               e_data_book_respond_get_contact_list (op->book,
-                                                     op->opid,
-                                                     e_data_book_create_error_fmt (E_DATA_BOOK_STATUS_OTHER_ERROR,
-                                                           _("%s: Unhandled search result type %d returned"), G_STRFUNC, msg_type),
-                                                     NULL);
+               e_data_book_respond_get_contact_list (
+                       op->book,
+                       op->opid,
+                       e_data_book_create_error_fmt (E_DATA_BOOK_STATUS_OTHER_ERROR,
+                       _("%s: Unhandled search result type %d returned"), G_STRFUNC, msg_type),
+                       NULL);
                ldap_op_finished (op);
        }
 }
@@ -2681,8 +2738,9 @@ e_book_backend_ldap_get_contact_list (EBookBackend *backend,
 
                        for (l = contacts; l; l = g_list_next (l)) {
                                EContact *contact = l->data;
-                               vcard_strings = g_slist_prepend (vcard_strings, e_vcard_to_string (E_VCARD (contact),
-                                                                EVC_FORMAT_VCARD_30));
+                               vcard_strings = g_slist_prepend (
+                                       vcard_strings, e_vcard_to_string (E_VCARD (contact),
+                                       EVC_FORMAT_VCARD_30));
                                g_object_unref (contact);
                        }
 
@@ -2717,22 +2775,24 @@ e_book_backend_ldap_get_contact_list (EBookBackend *backend,
 
        do {
                g_static_rec_mutex_lock (&eds_ldap_handler_lock);
-               ldap_error = ldap_search_ext (bl->priv->ldap,
-                                             bl->priv->ldap_rootdn,
-                                             bl->priv->ldap_scope,
-                                             ldap_query,
-                                             NULL, 0, NULL, NULL,
-                                             NULL, /* XXX timeout */
-                                             LDAP_NO_LIMIT, &contact_list_msgid);
+               ldap_error = ldap_search_ext (
+                       bl->priv->ldap,
+                       bl->priv->ldap_rootdn,
+                       bl->priv->ldap_scope,
+                       ldap_query,
+                       NULL, 0, NULL, NULL,
+                       NULL, /* XXX timeout */
+                       LDAP_NO_LIMIT, &contact_list_msgid);
                g_static_rec_mutex_unlock (&eds_ldap_handler_lock);
        } while (e_book_backend_ldap_reconnect (bl, book_view, ldap_error));
 
        g_free (ldap_query);
 
        if (ldap_error == LDAP_SUCCESS) {
-               ldap_op_add ((LDAPOp *) contact_list_op, backend, book,
-                            book_view, opid, contact_list_msgid,
-                            contact_list_handler, contact_list_dtor);
+               ldap_op_add (
+                       (LDAPOp *) contact_list_op, backend, book,
+                       book_view, opid, contact_list_msgid,
+                       contact_list_handler, contact_list_dtor);
                if (enable_debug) {
                        g_get_current_time (&end);
 
@@ -2743,10 +2803,11 @@ e_book_backend_ldap_get_contact_list (EBookBackend *backend,
                        printf ("and took %ld.%03ld seconds\n", diff / 1000, diff % 1000);
                }
        } else {
-               e_data_book_respond_get_contact_list (book,
-                                                     opid,
-                                                     ldap_error_to_response (ldap_error),
-                                                     NULL);
+               e_data_book_respond_get_contact_list (
+                       book,
+                       opid,
+                       ldap_error_to_response (ldap_error),
+                       NULL);
                contact_list_dtor ((LDAPOp *) contact_list_op);
        }
 }
@@ -2812,13 +2873,15 @@ contact_list_uids_handler (LDAPOp *op,
                gint ldap_error;
 
                g_static_rec_mutex_lock (&eds_ldap_handler_lock);
-               ldap_parse_result (bl->priv->ldap, res, &ldap_error,
-                                  NULL, &ldap_error_msg, NULL, NULL, 0);
+               ldap_parse_result (
+                       bl->priv->ldap, res, &ldap_error,
+                       NULL, &ldap_error_msg, NULL, NULL, 0);
                g_static_rec_mutex_unlock (&eds_ldap_handler_lock);
                if (ldap_error != LDAP_SUCCESS) {
-                       g_warning ("contact_list_uids_handler: %02X (%s), additional info: %s",
-                                  ldap_error,
-                                  ldap_err2string (ldap_error), ldap_error_msg);
+                       g_warning (
+                               "contact_list_uids_handler: %02X (%s), additional info: %s",
+                               ldap_error,
+                               ldap_err2string (ldap_error), ldap_error_msg);
                }
                ldap_memfree (ldap_error_msg);
 
@@ -2844,10 +2907,11 @@ contact_list_uids_handler (LDAPOp *op,
        }
        else {
                g_warning ("unhandled search result type %d returned", msg_type);
-               e_data_book_respond_get_contact_list_uids (op->book, op->opid,
-                                                          e_data_book_create_error_fmt (E_DATA_BOOK_STATUS_OTHER_ERROR,
-                                                             _("%s: Unhandled search result type %d returned"), G_STRFUNC, msg_type),
-                                                          NULL);
+               e_data_book_respond_get_contact_list_uids (
+                       op->book, op->opid,
+                       e_data_book_create_error_fmt (E_DATA_BOOK_STATUS_OTHER_ERROR,
+                       _("%s: Unhandled search result type %d returned"), G_STRFUNC, msg_type),
+                       NULL);
                ldap_op_finished (op);
        }
 }
@@ -2929,22 +2993,24 @@ e_book_backend_ldap_get_contact_list_uids (EBookBackend *backend,
 
        do {
                g_static_rec_mutex_lock (&eds_ldap_handler_lock);
-               ldap_error = ldap_search_ext (bl->priv->ldap,
-                                             bl->priv->ldap_rootdn,
-                                             bl->priv->ldap_scope,
-                                             ldap_query,
-                                             NULL, 0, NULL, NULL,
-                                             NULL, /* XXX timeout */
-                                             LDAP_NO_LIMIT, &contact_list_uids_msgid);
+               ldap_error = ldap_search_ext (
+                       bl->priv->ldap,
+                       bl->priv->ldap_rootdn,
+                       bl->priv->ldap_scope,
+                       ldap_query,
+                       NULL, 0, NULL, NULL,
+                       NULL, /* XXX timeout */
+                       LDAP_NO_LIMIT, &contact_list_uids_msgid);
                g_static_rec_mutex_unlock (&eds_ldap_handler_lock);
        } while (e_book_backend_ldap_reconnect (bl, book_view, ldap_error));
 
        g_free (ldap_query);
 
        if (ldap_error == LDAP_SUCCESS) {
-               ldap_op_add ((LDAPOp *) contact_list_uids_op, backend, book,
-                            book_view, opid, contact_list_uids_msgid,
-                            contact_list_uids_handler, contact_list_uids_dtor);
+               ldap_op_add (
+                       (LDAPOp *) contact_list_uids_op, backend, book,
+                       book_view, opid, contact_list_uids_msgid,
+                       contact_list_uids_handler, contact_list_uids_dtor);
                if (enable_debug) {
                        g_get_current_time (&end);
 
@@ -4090,11 +4156,13 @@ func_contains (struct _ESExp *f,
                        const gchar *ldap_attr = query_prop_to_ldap (propname);
 
                        if (ldap_attr)
-                               ldap_data->list = g_list_prepend (ldap_data->list,
-                                                                g_strdup_printf ("(%s=*%s%s)",
-                                                                                ldap_attr,
-                                                                                str,
-                                                                                one_star ? "" : "*"));
+                               ldap_data->list = g_list_prepend (
+                                       ldap_data->list,
+                                       g_strdup_printf (
+                                               "(%s=*%s%s)",
+                                               ldap_attr,
+                                               str,
+                                               one_star ? "" : "*"));
                }
 
                g_free (str);
@@ -4123,14 +4191,17 @@ func_is (struct _ESExp *f,
                const gchar *ldap_attr = query_prop_to_ldap (propname);
 
                if (ldap_attr)
-                       ldap_data->list = g_list_prepend (ldap_data->list,
-                                                        g_strdup_printf ("(%s=%s)",
-                                                                        ldap_attr, str));
+                       ldap_data->list = g_list_prepend (
+                               ldap_data->list,
+                               g_strdup_printf (
+                                       "(%s=%s)",
+                                       ldap_attr, str));
                else {
                        g_warning ("unknown query property\n");
                        /* we want something that'll always be false */
-                       ldap_data->list = g_list_prepend (ldap_data->list,
-                                                        g_strdup ("objectClass=MyBarnIsBiggerThanYourBarn"));
+                       ldap_data->list = g_list_prepend (
+                               ldap_data->list,
+                               g_strdup ("objectClass=MyBarnIsBiggerThanYourBarn"));
                }
 
                g_free (str);
@@ -4173,25 +4244,33 @@ func_beginswith (struct _ESExp *f,
                 * and for entries that have no fileAs attribute. */
                if (ldap_attr) {
                        if (!strcmp (propname, "full_name")) {
-                               ldap_data->list = g_list_prepend (ldap_data->list,
-                                                              g_strdup_printf (
-                                                                      "(|(cn=%s*)(sn=%s*))",
-                                                                      str, str));
+                               ldap_data->list = g_list_prepend (
+                                       ldap_data->list,
+                                       g_strdup_printf (
+                                               "(|(cn=%s*)(sn=%s*))",
+                                               str, str));
                        }
                        else if (!strcmp (ldap_attr, "fileAs")) {
                                if (ldap_data->bl->priv->evolutionPersonSupported)
-                                       ldap_data->list = g_list_prepend (ldap_data->list,
-                                                                g_strdup_printf ("(|(fileAs=%s*)(&(!(fileAs=*))(sn=%s*)))",
-                                                                                str, str));
+                                       ldap_data->list = g_list_prepend (
+                                               ldap_data->list,
+                                               g_strdup_printf (
+                                                       "(|(fileAs=%s*)"
+                                                       "(&(!(fileAs=*))"
+                                                       "(sn=%s*)))",
+                                                       str, str));
                                else
-                                       ldap_data->list = g_list_prepend (ldap_data->list,
-                                                                        g_strdup_printf ("(sn=%s*)", str));
+                                       ldap_data->list = g_list_prepend (
+                                               ldap_data->list,
+                                               g_strdup_printf (
+                                                       "(sn=%s*)", str));
                        }
                        else {
-                               ldap_data->list = g_list_prepend (ldap_data->list,
-                                                                g_strdup_printf ("(%s=%s*)",
-                                                                                ldap_attr,
-                                                                                str));
+                               ldap_data->list = g_list_prepend (
+                                       ldap_data->list,
+                                       g_strdup_printf (
+                                               "(%s=%s*)",
+                                               ldap_attr, str));
                        }
                }
 
@@ -4221,10 +4300,11 @@ func_endswith (struct _ESExp *f,
                const gchar *ldap_attr = query_prop_to_ldap (propname);
 
                if (ldap_attr)
-                       ldap_data->list = g_list_prepend (ldap_data->list,
-                                                        g_strdup_printf ("(%s=*%s)",
-                                                                        ldap_attr,
-                                                                        str));
+                       ldap_data->list = g_list_prepend (
+                               ldap_data->list,
+                               g_strdup_printf (
+                                       "(%s=*%s)",
+                                       ldap_attr, str));
                g_free (str);
        }
 
@@ -4278,8 +4358,10 @@ func_exists (struct _ESExp *f,
                        const gchar *ldap_attr = query_prop_to_ldap (propname);
 
                        if (ldap_attr)
-                               ldap_data->list = g_list_prepend (ldap_data->list,
-                                                                g_strdup_printf ("(%s=*)", ldap_attr));
+                               ldap_data->list = g_list_prepend (
+                                       ldap_data->list,
+                                       g_strdup_printf (
+                                               "(%s=*)", ldap_attr));
                }
        }
 
@@ -4327,8 +4409,9 @@ e_book_backend_ldap_build_query (EBookBackendLDAP *bl,
                        e_sexp_add_ifunction (sexp, 0, symbols[i].name,
                                             (ESExpIFunc *) symbols[i].func, &data);
                } else {
-                       e_sexp_add_function (sexp, 0, symbols[i].name,
-                                           symbols[i].func, &data);
+                       e_sexp_add_function (
+                               sexp, 0, symbols[i].name,
+                               symbols[i].func, &data);
                }
        }
 
@@ -4544,16 +4627,18 @@ build_contact_from_entry (EBookBackendLDAP *bl,
                                                                                        if (enable_debug)
                                                                                                printf ("email = %s \n", email_values[0]);
                                                                                        *(member_info + j) =
-                                                                                               g_strdup_printf ("%s;%s;",
-                                                                                                                email_values[0], values[j]);
+                                                                                               g_strdup_printf (
+                                                                                                       "%s;%s;",
+                                                                                                       email_values[0], values[j]);
                                                                                        ldap_value_free (email_values);
                                                                                }
                                                                                if (cn_values) {
                                                                                        if (enable_debug)
                                                                                                printf ("cn = %s \n", cn_values[0]);
                                                                                        *(member_info + j) =
-                                                                                               g_strconcat (*(member_info + j),
-                                                                                                            cn_values[0], NULL);
+                                                                                               g_strconcat (
+                                                                                                       *(member_info + j),
+                                                                                                       cn_values[0], NULL);
                                                                                        ldap_value_free (cn_values);
                                                                                }
                                                                        }
@@ -4723,13 +4808,15 @@ ldap_search_handler (LDAPOp *op,
                gint ldap_error;
 
                g_static_rec_mutex_lock (&eds_ldap_handler_lock);
-               ldap_parse_result (bl->priv->ldap, res, &ldap_error,
-                                  NULL, &ldap_error_msg, NULL, NULL, 0);
+               ldap_parse_result (
+                       bl->priv->ldap, res, &ldap_error,
+                       NULL, &ldap_error_msg, NULL, NULL, 0);
                g_static_rec_mutex_unlock (&eds_ldap_handler_lock);
                if (ldap_error != LDAP_SUCCESS) {
-                       g_warning ("ldap_search_handler: %02X (%s), additional info: %s",
-                                  ldap_error,
-                                  ldap_err2string (ldap_error), ldap_error_msg);
+                       g_warning (
+                               "ldap_search_handler: %02X (%s), additional info: %s",
+                               ldap_error,
+                               ldap_err2string (ldap_error), ldap_error_msg);
                }
                ldap_memfree (ldap_error_msg);
 
@@ -4743,7 +4830,8 @@ ldap_search_handler (LDAPOp *op,
                else if (ldap_error == LDAP_SUCCESS)
                        edb_err = EDB_ERROR (SUCCESS);
                else
-                       edb_err = e_data_book_create_error_fmt (E_DATA_BOOK_STATUS_OTHER_ERROR,
+                       edb_err = e_data_book_create_error_fmt (
+                               E_DATA_BOOK_STATUS_OTHER_ERROR,
                                _("LDAP error 0x%x (%s)"), ldap_error,
                                ldap_err2string (ldap_error) ? ldap_err2string (ldap_error) : _("Unknown error"));
 
@@ -4853,14 +4941,15 @@ e_book_backend_ldap_search (EBookBackendLDAP *bl,
                        book_view_notify_status (bl, view, _("Searching..."));
 
                        g_static_rec_mutex_lock (&eds_ldap_handler_lock);
-                       ldap_err = ldap_search_ext (bl->priv->ldap, bl->priv->ldap_rootdn,
-                                                   bl->priv->ldap_scope,
-                                                   ldap_query,
-                                                   NULL, 0,
-                                                   NULL, /* XXX */
-                                                   NULL, /* XXX */
-                                                   NULL, /* XXX timeout */
-                                                   view_limit, &search_msgid);
+                       ldap_err = ldap_search_ext (
+                               bl->priv->ldap, bl->priv->ldap_rootdn,
+                               bl->priv->ldap_scope,
+                               ldap_query,
+                               NULL, 0,
+                               NULL, /* XXX */
+                               NULL, /* XXX */
+                               NULL, /* XXX timeout */
+                               view_limit, &search_msgid);
                        g_static_rec_mutex_unlock (&eds_ldap_handler_lock);
                } while (e_book_backend_ldap_reconnect (bl, view, ldap_err));
 
@@ -4882,9 +4971,10 @@ e_book_backend_ldap_search (EBookBackendLDAP *bl,
                        op->aborted = FALSE;
                        g_object_ref (view);
 
-                       ldap_op_add ((LDAPOp *) op, E_BOOK_BACKEND (bl), book, view,
-                                    0, search_msgid,
-                                    ldap_search_handler, ldap_search_dtor);
+                       ldap_op_add (
+                               (LDAPOp *) op, E_BOOK_BACKEND (bl), book, view,
+                               0, search_msgid,
+                               ldap_search_handler, ldap_search_dtor);
 
                        if (enable_debug) {
                                printf ("e_book_backend_ldap_search invoked ldap_search_handler ");
@@ -4992,8 +5082,9 @@ generate_cache_handler (LDAPOp *op,
 
                        contact_num++;
                        if (book_view) {
-                               status_msg = g_strdup_printf (_("Downloading contacts (%d)... "),
-                                                                contact_num);
+                               status_msg = g_strdup_printf (
+                                       _("Downloading contacts (%d)... "),
+                                       contact_num);
                                book_view_notify_status (bl, book_view, status_msg);
                                g_free (status_msg);
                        }
@@ -5008,8 +5099,9 @@ generate_cache_handler (LDAPOp *op,
                        g_get_current_time (&end);
                        diff = end.tv_sec * 1000 + end.tv_usec / 1000;
                        diff -= start.tv_sec * 1000 + start.tv_usec / 1000;
-                       printf ("generate_cache_handler ... completed in %ld.%03ld seconds\n",
-                                                               diff / 1000,diff % 1000);
+                       printf (
+                               "generate_cache_handler ... completed in %ld.%03ld seconds\n",
+                               diff / 1000,diff % 1000);
                }
        }
 }
@@ -5057,20 +5149,22 @@ generate_cache (EBookBackendLDAP *book_backend_ldap)
 
        do {
                g_static_rec_mutex_lock (&eds_ldap_handler_lock);
-               ldap_error = ldap_search_ext (priv->ldap,
-                                             priv->ldap_rootdn,
-                                             priv->ldap_scope,
-                                             "(cn=*)",
-                                             NULL, 0, NULL, NULL,
-                                             NULL, /* XXX timeout */
-                                             LDAP_NO_LIMIT, &contact_list_msgid);
+               ldap_error = ldap_search_ext (
+                       priv->ldap,
+                       priv->ldap_rootdn,
+                       priv->ldap_scope,
+                       "(cn=*)",
+                       NULL, 0, NULL, NULL,
+                       NULL, /* XXX timeout */
+                       LDAP_NO_LIMIT, &contact_list_msgid);
                g_static_rec_mutex_unlock (&eds_ldap_handler_lock);
        } while (e_book_backend_ldap_reconnect (book_backend_ldap, NULL, ldap_error));
 
        if (ldap_error == LDAP_SUCCESS) {
-               ldap_op_add ((LDAPOp *) contact_list_op, (EBookBackend *) book_backend_ldap, NULL /* book */,
-                            NULL /* book_view */, 0 /* opid */, contact_list_msgid,
-                            generate_cache_handler, generate_cache_dtor);
+               ldap_op_add (
+                       (LDAPOp *) contact_list_op, (EBookBackend *) book_backend_ldap, NULL /* book */,
+                       NULL /* book_view */, 0 /* opid */, contact_list_msgid,
+                       generate_cache_handler, generate_cache_dtor);
                if (enable_debug) {
                        printf ("generating offline cache invoked generate_cache_handler ");
                        g_get_current_time (&end);
@@ -5432,11 +5526,12 @@ book_backend_ldap_try_password_sync (ESourceAuthenticator *authenticator,
                        gchar *entry_dn;
 
                        g_static_rec_mutex_lock (&eds_ldap_handler_lock);
-                       ldap_error = ldap_search_s (bl->priv->ldap,
-                                                   bl->priv->ldap_rootdn,
-                                                   bl->priv->ldap_scope,
-                                                   query,
-                                                   NULL, 0, &res);
+                       ldap_error = ldap_search_s (
+                               bl->priv->ldap,
+                               bl->priv->ldap_rootdn,
+                               bl->priv->ldap_scope,
+                               query,
+                               NULL, 0, &res);
                        g_static_rec_mutex_unlock (&eds_ldap_handler_lock);
                        g_free (query);
 
@@ -5452,7 +5547,7 @@ book_backend_ldap_try_password_sync (ESourceAuthenticator *authenticator,
                                        error, G_IO_ERROR,
                                        G_IO_ERROR_INVALID_DATA,
                                        _("Failed to get the DN "
-                                         "for user '%s'"), user);
+                                       "for user '%s'"), user);
                                return E_SOURCE_AUTHENTICATION_ERROR;
                        }
 
@@ -5504,9 +5599,10 @@ book_backend_ldap_try_password_sync (ESourceAuthenticator *authenticator,
                        }
                }
 
-               ldap_error = ldap_simple_bind_s (bl->priv->ldap,
-                                                bl->priv->auth_dn,
-                                                bl->priv->auth_secret);
+               ldap_error = ldap_simple_bind_s (
+                       bl->priv->ldap,
+                       bl->priv->auth_dn,
+                       bl->priv->auth_secret);
                g_static_rec_mutex_unlock (&eds_ldap_handler_lock);
 
                /* Some ldap servers are returning (ex active directory ones)
@@ -5550,13 +5646,14 @@ book_backend_ldap_try_password_sync (ESourceAuthenticator *authenticator,
                        }
                }
 
-               ldap_error = ldap_sasl_bind_s (bl->priv->ldap,
-                                              NULL,
-                                              method + strlen (SASL_PREFIX),
-                                              bl->priv->auth_secret,
-                                              NULL,
-                                              NULL,
-                                              NULL);
+               ldap_error = ldap_sasl_bind_s (
+                       bl->priv->ldap,
+                       NULL,
+                       method + strlen (SASL_PREFIX),
+                       bl->priv->auth_secret,
+                       NULL,
+                       NULL,
+                       NULL);
                g_static_rec_mutex_unlock (&eds_ldap_handler_lock);
        }
 #endif
index 3da4b63..4eb24a4 100644 (file)
@@ -91,9 +91,10 @@ insert_contact (EBookBackendVCF *vcf,
 
                vcf->priv->contact_list = g_list_prepend (vcf->priv->contact_list, vcard);
 
-               g_hash_table_insert (vcf->priv->contacts,
-                                    id,
-                                    vcf->priv->contact_list);
+               g_hash_table_insert (
+                       vcf->priv->contacts,
+                       id,
+                       vcf->priv->contact_list);
        }
 }
 
@@ -258,8 +259,9 @@ do_create (EBookBackendVCF *bvcf,
                bvcf->priv->dirty = TRUE;
 
                if (!bvcf->priv->flush_timeout_tag)
-                       bvcf->priv->flush_timeout_tag = g_timeout_add (FILE_FLUSH_TIMEOUT,
-                                                                      vcf_flush_file, bvcf);
+                       bvcf->priv->flush_timeout_tag = g_timeout_add (
+                               FILE_FLUSH_TIMEOUT,
+                               vcf_flush_file, bvcf);
        }
 
        g_mutex_unlock (bvcf->priv->mutex);
@@ -282,9 +284,10 @@ e_book_backend_vcf_create_contacts (EBookBackendSync *backend,
        /* We make the assumption that the vCard list we're passed is always exactly one element long, since we haven't specified "bulk-adds"
         * in our static capability list. */
        if (vcards->next != NULL) {
-               g_propagate_error (perror,
-                                  EDB_ERROR_EX (NOT_SUPPORTED,
-                                  _("The backend does not support bulk additions")));
+               g_propagate_error (
+                       perror,
+                       EDB_ERROR_EX (NOT_SUPPORTED,
+                       _("The backend does not support bulk additions")));
                return;
        }
 
@@ -314,9 +317,10 @@ e_book_backend_vcf_remove_contacts (EBookBackendSync *backend,
        /* We make the assumption that the ID list we're passed is always exactly one element long, since we haven't specified "bulk-removes"
         * in our static capability list. */
        if (id_list->next != NULL) {
-               g_propagate_error (perror,
-                                  EDB_ERROR_EX (NOT_SUPPORTED,
-                                  _("The backend does not support bulk removals")));
+               g_propagate_error (
+                       perror,
+                       EDB_ERROR_EX (NOT_SUPPORTED,
+                       _("The backend does not support bulk removals")));
                return;
        }
 
@@ -339,8 +343,9 @@ e_book_backend_vcf_remove_contacts (EBookBackendSync *backend,
 
        bvcf->priv->dirty = TRUE;
        if (!bvcf->priv->flush_timeout_tag)
-               bvcf->priv->flush_timeout_tag = g_timeout_add (FILE_FLUSH_TIMEOUT,
-                                                              vcf_flush_file, bvcf);
+               bvcf->priv->flush_timeout_tag = g_timeout_add (
+                       FILE_FLUSH_TIMEOUT,
+                       vcf_flush_file, bvcf);
        g_mutex_unlock (bvcf->priv->mutex);
 
        *ids = g_slist_append (*ids, g_strdup (id));
@@ -362,9 +367,10 @@ e_book_backend_vcf_modify_contacts (EBookBackendSync *backend,
        /* We make the assumption that the vCard list we're passed is always exactly one element long, since we haven't specified "bulk-modifies"
         * in our static capability list. */
        if (vcards->next != NULL) {
-               g_propagate_error (perror,
-                                  EDB_ERROR_EX (NOT_SUPPORTED,
-                                  _("The backend does not support bulk modifications")));
+               g_propagate_error (
+                       perror,
+                       EDB_ERROR_EX (NOT_SUPPORTED,
+                       _("The backend does not support bulk modifications")));
                return;
        }
 
@@ -384,8 +390,9 @@ e_book_backend_vcf_modify_contacts (EBookBackendSync *backend,
        elem->data = g_strdup (vcards->data);
        bvcf->priv->dirty = TRUE;
        if (!bvcf->priv->flush_timeout_tag)
-               bvcf->priv->flush_timeout_tag = g_timeout_add (FILE_FLUSH_TIMEOUT,
-                                                              vcf_flush_file, bvcf);
+               bvcf->priv->flush_timeout_tag = g_timeout_add (
+                       FILE_FLUSH_TIMEOUT,
+                       vcf_flush_file, bvcf);
        g_mutex_unlock (bvcf->priv->mutex);
 
        *modified_contacts = g_slist_append (*modified_contacts, contact);
@@ -478,8 +485,10 @@ init_closure (EDataBookView *book_view,
        closure->thread = NULL;
        closure->running = e_flag_new ();
 
-       g_object_set_data_full (G_OBJECT (book_view), "EBookBackendVCF.BookView::closure",
-                               closure, (GDestroyNotify) closure_destroy);
+       g_object_set_data_full (
+               G_OBJECT (book_view),
+               "EBookBackendVCF.BookView::closure",
+               closure, (GDestroyNotify) closure_destroy);
 
        return closure;
 }
@@ -487,7 +496,9 @@ init_closure (EDataBookView *book_view,
 static VCFBackendSearchClosure *
 get_closure (EDataBookView *book_view)
 {
-       return g_object_get_data (G_OBJECT (book_view), "EBookBackendVCF.BookView::closure");
+       return g_object_get_data (
+               G_OBJECT (book_view),
+               "EBookBackendVCF.BookView::closure");
 }
 
 static gpointer
index b4b3917..1b28e0e 100644 (file)
@@ -124,8 +124,9 @@ init_closure (EDataBookView *book_view,
        closure->thread  = NULL;
        closure->running = e_flag_new ();
 
-       g_object_set_data_full (G_OBJECT (book_view), WEBDAV_CLOSURE_NAME, closure,
-                       (GDestroyNotify) closure_destroy);
+       g_object_set_data_full (
+               G_OBJECT (book_view), WEBDAV_CLOSURE_NAME,
+               closure, (GDestroyNotify) closure_destroy);
 
        return closure;
 }
@@ -227,13 +228,15 @@ upload_contact (EBookBackendWebdav *webdav,
                /* only override if etag is still the same on the server */
                etag = e_contact_get (contact, E_CONTACT_REV);
                if (etag == NULL) {
-                       soup_message_headers_append (message->request_headers,
-                                                   "If-None-Match", "*");
+                       soup_message_headers_append (
+                               message->request_headers,
+                               "If-None-Match", "*");
                } else if (etag[0] == 'W' && etag[1] == '/') {
                        g_warning ("we only have a weak ETag, don't use If-Match synchronisation");
                } else {
-                       soup_message_headers_append (message->request_headers,
-                                                   "If-Match", etag);
+                       soup_message_headers_append (
+                               message->request_headers,
+                               "If-Match", etag);
                        g_free (etag);
                }
        }
@@ -243,8 +246,9 @@ upload_contact (EBookBackendWebdav *webdav,
        e_contact_set (contact, E_CONTACT_UID, NULL);
        e_contact_set (contact, E_CONTACT_REV, NULL);
        request = e_vcard_to_string (E_VCARD (contact), EVC_FORMAT_VCARD_30);
-       soup_message_set_request (message, "text/vcard", SOUP_MEMORY_TEMPORARY,
-                                request, strlen (request));
+       soup_message_set_request (
+               message, "text/vcard", SOUP_MEMORY_TEMPORARY,
+               request, strlen (request));
 
        status   = soup_session_send_message (webdav->priv->session, message);
        new_etag = soup_message_headers_get (message->response_headers, "ETag");
@@ -321,10 +325,11 @@ e_book_backend_webdav_create_contacts (EBookBackend *backend,
        /* We make the assumption that the vCard list we're passed is always exactly one element long, since we haven't specified "bulk-adds"
         * in our static capability list. This is because there is no clean way to roll back changes in case of an error. */
        if (vcards->next != NULL) {
-               e_data_book_respond_create_contacts (book, opid,
-                                                    EDB_ERROR_EX (NOT_SUPPORTED,
-                                                    _("The backend does not support bulk additions")),
-                                                    NULL);
+               e_data_book_respond_create_contacts (
+                       book, opid,
+                       EDB_ERROR_EX (NOT_SUPPORTED,
+                       _("The backend does not support bulk additions")),
+                       NULL);
                return;
        }
 
@@ -335,8 +340,9 @@ e_book_backend_webdav_create_contacts (EBookBackend *backend,
 
        /* do 3 rand() calls to construct a unique ID... poor way but should be
         * good enough for us */
-       uid = g_strdup_printf ("%s%08X-%08X-%08X.vcf", priv->uri, rand (), rand (),
-                             rand ());
+       uid = g_strdup_printf (
+               "%s%08X-%08X-%08X.vcf",
+               priv->uri, rand (), rand (), rand ());
 
        contact = e_contact_new_from_vcard_with_uid (vcard, uid);
 
@@ -349,9 +355,12 @@ e_book_backend_webdav_create_contacts (EBookBackend *backend,
                if (status == 401 || status == 407) {
                        e_data_book_respond_create_contacts (book, opid, webdav_handle_auth_request (webdav), NULL);
                } else {
-                       e_data_book_respond_create_contacts (book, opid,
-                                       e_data_book_create_error_fmt (E_DATA_BOOK_STATUS_OTHER_ERROR,
-                                       _("Create resource '%s' failed with HTTP status: %d (%s)"), uid, status, status_reason),
+                       e_data_book_respond_create_contacts (
+                               book, opid,
+                               e_data_book_create_error_fmt (
+                               E_DATA_BOOK_STATUS_OTHER_ERROR,
+                               _("Create resource '%s' failed with HTTP status: %d (%s)"),
+                               uid, status, status_reason),
                                        NULL);
                }
                g_free (uid);
@@ -372,8 +381,9 @@ e_book_backend_webdav_create_contacts (EBookBackend *backend,
                g_object_unref (contact);
 
                if (new_contact == NULL) {
-                       e_data_book_respond_create_contacts (book, opid,
-                                       EDB_ERROR (OTHER_ERROR), NULL);
+                       e_data_book_respond_create_contacts (
+                               book, opid,
+                               EDB_ERROR (OTHER_ERROR), NULL);
                        g_free (uid);
                        return;
                }
@@ -420,32 +430,36 @@ e_book_backend_webdav_remove_contacts (EBookBackend *backend,
        guint                      status;
 
        if (!e_backend_get_online (E_BACKEND (backend))) {
-               e_data_book_respond_remove_contacts (book, opid,
-                               EDB_ERROR (REPOSITORY_OFFLINE), NULL);
+               e_data_book_respond_remove_contacts (
+                       book, opid,
+                       EDB_ERROR (REPOSITORY_OFFLINE), NULL);
                return;
        }
 
        /* We make the assumption that the ID list we're passed is always exactly one element long, since we haven't specified "bulk-removes"
         * in our static capability list. */
        if (id_list->next != NULL) {
-               e_data_book_respond_remove_contacts (book, opid,
-                                                    EDB_ERROR_EX (NOT_SUPPORTED,
-                                                    _("The backend does not support bulk removals")),
-                                                    NULL);
+               e_data_book_respond_remove_contacts (
+                       book, opid,
+                       EDB_ERROR_EX (NOT_SUPPORTED,
+                       _("The backend does not support bulk removals")),
+                       NULL);
                return;
        }
 
        status = delete_contact (webdav, uid);
        if (status != 204) {
                if (status == 401 || status == 407) {
-                       e_data_book_respond_remove_contacts (book, opid,
-                                                            webdav_handle_auth_request (webdav), NULL);
+                       e_data_book_respond_remove_contacts (
+                               book, opid,
+                               webdav_handle_auth_request (webdav), NULL);
                } else {
                        g_warning ("DELETE failed with HTTP status %d", status);
-                       e_data_book_respond_remove_contacts (book, opid,
-                                                            e_data_book_create_error_fmt (E_DATA_BOOK_STATUS_OTHER_ERROR,
-                                                                        _("DELETE failed with HTTP status %d"), status),
-                                                            NULL);
+                       e_data_book_respond_remove_contacts (
+                               book, opid,
+                               e_data_book_create_error_fmt (E_DATA_BOOK_STATUS_OTHER_ERROR,
+                               _("DELETE failed with HTTP status %d"), status),
+                               NULL);
                }
                return;
        }
@@ -474,18 +488,21 @@ e_book_backend_webdav_modify_contacts (EBookBackend *backend,
        const gchar *vcard = vcards->data;
 
        if (!e_backend_get_online (E_BACKEND (backend))) {
-               e_data_book_respond_create_contacts (book, opid,
-                               EDB_ERROR (REPOSITORY_OFFLINE), NULL);
+               e_data_book_respond_create_contacts (
+                       book, opid,
+                       EDB_ERROR (REPOSITORY_OFFLINE), NULL);
                return;
        }
 
        /* We make the assumption that the vCard list we're passed is always exactly one element long, since we haven't specified "bulk-modifies"
         * in our static capability list. This is because there is no clean way to roll back changes in case of an error. */
        if (vcards->next != NULL) {
-               e_data_book_respond_modify_contacts (book, opid,
-                                                    EDB_ERROR_EX (NOT_SUPPORTED,
-                                                    _("The backend does not support bulk modifications")),
-                                                    NULL);
+               e_data_book_respond_modify_contacts (
+                       book, opid,
+                       EDB_ERROR_EX (
+                               NOT_SUPPORTED,
+                               _("The backend does not support bulk modifications")),
+                       NULL);
                return;
        }
 
@@ -503,17 +520,20 @@ e_book_backend_webdav_modify_contacts (EBookBackend *backend,
                if (status == 412) {
                        /* too bad no special error code in evolution for this... */
                        e_data_book_respond_modify_contacts (book, opid,
-                                       e_data_book_create_error_fmt (E_DATA_BOOK_STATUS_OTHER_ERROR,
-                                       _("Contact on server changed -> not modifying")),
-                                       NULL);
+                               e_data_book_create_error_fmt (
+                               E_DATA_BOOK_STATUS_OTHER_ERROR,
+                               _("Contact on server changed -> not modifying")),
+                               NULL);
                        g_free (status_reason);
                        return;
                }
 
                e_data_book_respond_modify_contacts (book, opid,
-                               e_data_book_create_error_fmt (E_DATA_BOOK_STATUS_OTHER_ERROR,
-                               _("Modify contact failed with HTTP status: %d (%s)"), status, status_reason),
-                               NULL);
+                       e_data_book_create_error_fmt (
+                       E_DATA_BOOK_STATUS_OTHER_ERROR,
+                       _("Modify contact failed with HTTP status: %d (%s)"),
+                       status, status_reason),
+                       NULL);
                g_free (status_reason);
                return;
        }
@@ -728,8 +748,9 @@ send_propfind (EBookBackendWebdav *webdav)
        soup_message_headers_append (message->request_headers, "User-Agent", USERAGENT);
        soup_message_headers_append (message->request_headers, "Connection", "close");
        soup_message_headers_append (message->request_headers, "Depth", "1");
-       soup_message_set_request (message, "text/xml", SOUP_MEMORY_TEMPORARY,
-                       (gchar *) request, strlen (request));
+       soup_message_set_request (
+               message, "text/xml", SOUP_MEMORY_TEMPORARY,
+               (gchar *) request, strlen (request));
 
        soup_session_send_message (priv->session, message);
 
@@ -925,7 +946,9 @@ download_contacts (EBookBackendWebdav *webdav,
        if (status != 207) {
                GError *error;
 
-               error = e_data_book_create_error_fmt (E_DATA_BOOK_STATUS_OTHER_ERROR, _("PROPFIND on webdav failed with HTTP status %d (%s)"),
+               error = e_data_book_create_error_fmt (
+                       E_DATA_BOOK_STATUS_OTHER_ERROR,
+                       _("PROPFIND on webdav failed with HTTP status %d (%s)"),
                        status,
                        message->reason_phrase && *message->reason_phrase ? message->reason_phrase :
                        (soup_status_get_phrase (message->status_code) ? soup_status_get_phrase (message->status_code) : _("Unknown error")));
@@ -950,9 +973,10 @@ download_contacts (EBookBackendWebdav *webdav,
        }
 
        /* parse response */
-       reader = xmlReaderForMemory (message->response_body->data,
-                                   message->response_body->length, NULL, NULL,
-                                   XML_PARSE_NOWARNING);
+       reader = xmlReaderForMemory (
+               message->response_body->data,
+               message->response_body->length, NULL, NULL,
+               XML_PARSE_NOWARNING);
 
        elements = parse_propfind_response (reader);
 
@@ -1087,7 +1111,7 @@ e_book_backend_webdav_start_view (EBookBackend *backend,
        g_list_free (contacts);
 
        /* this way the UI is notified about cached contacts immediately,
-          and the update thread notifies about possible changes only */
+        * and the update thread notifies about possible changes only */
        e_data_book_view_notify_complete (book_view, NULL /* Success */);
 
        if (e_backend_get_online (E_BACKEND (backend))) {
index 66034c4..83705ba 100644 (file)
@@ -393,8 +393,9 @@ e_address_western_parse (const gchar *in_address)
                        }
                        else {
                                if (eaw->street == NULL) {
-                                       e_address_western_extract_street (lines[cntr], &eaw->street,
-                                                                               &eaw->extended );
+                                       e_address_western_extract_street (
+                                               lines[cntr], &eaw->street,
+                                               &eaw->extended );
                                }
                                else {
                                        gchar *temp;
index 1dc97bd..eb5dea9 100644 (file)
@@ -295,8 +295,9 @@ e_book_client_view_set_flags (EBookClientView *view,
 
                e_client_unwrap_dbus_error (E_CLIENT (priv->client), local_error, error);
        } else {
-               g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_DBUS_ERROR,
-                                    "Cannot set flags on view, D-Bus proxy gone");
+               g_set_error_literal (
+                       error, G_IO_ERROR, G_IO_ERROR_DBUS_ERROR,
+                       "Cannot set flags on view, D-Bus proxy gone");
        }
 }
 
@@ -391,48 +392,48 @@ e_book_client_view_class_init (EBookClientViewClass *class)
        object_class = G_OBJECT_CLASS (class);
        object_class->dispose = book_client_view_dispose;
 
-       signals[OBJECTS_ADDED] =
-               g_signal_new ("objects-added",
-                             G_OBJECT_CLASS_TYPE (object_class),
-                             G_SIGNAL_RUN_LAST,
-                             G_STRUCT_OFFSET (EBookClientViewClass, objects_added),
-                             NULL, NULL,
-                             g_cclosure_marshal_VOID__POINTER,
-                             G_TYPE_NONE, 1, G_TYPE_POINTER);
-
-       signals[OBJECTS_MODIFIED] =
-               g_signal_new ("objects-modified",
-                             G_OBJECT_CLASS_TYPE (object_class),
-                             G_SIGNAL_RUN_LAST,
-                             G_STRUCT_OFFSET (EBookClientViewClass, objects_modified),
-                             NULL, NULL,
-                             g_cclosure_marshal_VOID__POINTER,
-                             G_TYPE_NONE, 1, G_TYPE_POINTER);
-
-       signals[OBJECTS_REMOVED] =
-               g_signal_new ("objects-removed",
-                             G_OBJECT_CLASS_TYPE (object_class),
-                             G_SIGNAL_RUN_LAST,
-                             G_STRUCT_OFFSET (EBookClientViewClass, objects_removed),
-                             NULL, NULL,
-                             g_cclosure_marshal_VOID__POINTER,
-                             G_TYPE_NONE, 1, G_TYPE_POINTER);
-
-       signals[PROGRESS] =
-               g_signal_new ("progress",
-                             G_OBJECT_CLASS_TYPE (object_class),
-                             G_SIGNAL_RUN_LAST,
-                             G_STRUCT_OFFSET (EBookClientViewClass, progress),
-                             NULL, NULL,
-                             e_gdbus_marshallers_VOID__UINT_STRING,
-                             G_TYPE_NONE, 2, G_TYPE_UINT, G_TYPE_STRING);
-
-       signals[COMPLETE] =
-               g_signal_new ("complete",
-                             G_OBJECT_CLASS_TYPE (object_class),
-                             G_SIGNAL_RUN_LAST,
-                             G_STRUCT_OFFSET (EBookClientViewClass, complete),
-                             NULL, NULL,
-                             g_cclosure_marshal_VOID__BOXED,
-                             G_TYPE_NONE, 1, G_TYPE_ERROR);
+       signals[OBJECTS_ADDED] = g_signal_new (
+               "objects-added",
+               G_OBJECT_CLASS_TYPE (object_class),
+               G_SIGNAL_RUN_LAST,
+               G_STRUCT_OFFSET (EBookClientViewClass, objects_added),
+               NULL, NULL,
+               g_cclosure_marshal_VOID__POINTER,
+               G_TYPE_NONE, 1, G_TYPE_POINTER);
+
+       signals[OBJECTS_MODIFIED] = g_signal_new (
+               "objects-modified",
+               G_OBJECT_CLASS_TYPE (object_class),
+               G_SIGNAL_RUN_LAST,
+               G_STRUCT_OFFSET (EBookClientViewClass, objects_modified),
+               NULL, NULL,
+               g_cclosure_marshal_VOID__POINTER,
+               G_TYPE_NONE, 1, G_TYPE_POINTER);
+
+       signals[OBJECTS_REMOVED] = g_signal_new (
+               "objects-removed",
+               G_OBJECT_CLASS_TYPE (object_class),
+               G_SIGNAL_RUN_LAST,
+               G_STRUCT_OFFSET (EBookClientViewClass, objects_removed),
+               NULL, NULL,
+               g_cclosure_marshal_VOID__POINTER,
+               G_TYPE_NONE, 1, G_TYPE_POINTER);
+
+       signals[PROGRESS] = g_signal_new (
+               "progress",
+               G_OBJECT_CLASS_TYPE (object_class),
+               G_SIGNAL_RUN_LAST,
+               G_STRUCT_OFFSET (EBookClientViewClass, progress),
+               NULL, NULL,
+               e_gdbus_marshallers_VOID__UINT_STRING,
+               G_TYPE_NONE, 2, G_TYPE_UINT, G_TYPE_STRING);
+
+       signals[COMPLETE] = g_signal_new (
+               "complete",
+               G_OBJECT_CLASS_TYPE (object_class),
+               G_SIGNAL_RUN_LAST,
+               G_STRUCT_OFFSET (EBookClientViewClass, complete),
+               NULL, NULL,
+               g_cclosure_marshal_VOID__BOXED,
+               G_TYPE_NONE, 1, G_TYPE_ERROR);
 }
index 1b855ae..b10e849 100644 (file)
@@ -992,12 +992,13 @@ make_me_card (void)
                g_string_append_printf (vcard, "FN:%s\n", s);
 
                western = e_name_western_parse (s);
-               g_string_append_printf (vcard, "N:%s;%s;%s;%s;%s\n",
-                                       western->last ? western->last : "",
-                                       western->first ? western->first : "",
-                                       western->middle ? western->middle : "",
-                                       western->prefix ? western->prefix : "",
-                                       western->suffix ? western->suffix : "");
+               g_string_append_printf (
+                       vcard, "N:%s;%s;%s;%s;%s\n",
+                       western->last ? western->last : "",
+                       western->first ? western->first : "",
+                       western->middle ? western->middle : "",
+                       western->prefix ? western->prefix : "",
+                       western->suffix ? western->suffix : "");
                e_name_western_free (western);
        }
        g_string_append (vcard, "END:VCARD");
index 0a0f273..fd507ab 100644 (file)
@@ -658,8 +658,9 @@ e_book_query_from_string (const gchar *query_string)
                        e_sexp_add_ifunction (sexp, 0, symbols[i].name,
                                             (ESExpIFunc *) symbols[i].func, &list);
                } else {
-                       e_sexp_add_function (sexp, 0, symbols[i].name,
-                                           symbols[i].func, &list);
+                       e_sexp_add_function (
+                               sexp, 0, symbols[i].name,
+                               symbols[i].func, &list);
                }
        }
 
@@ -752,10 +753,11 @@ e_book_query_to_string (EBookQuery *q)
 
                e_sexp_encode_string (encoded, q->query.field_test.value);
 
-               g_string_append_printf (str, "%s \"%s\" %s",
-                                       cs,
-                                       q->query.field_test.field_name,
-                                       encoded->str);
+               g_string_append_printf (
+                       str, "%s \"%s\" %s",
+                       cs,
+                       q->query.field_test.field_name,
+                       encoded->str);
                break;
        case E_BOOK_QUERY_TYPE_ANY_FIELD_CONTAINS:
                g_string_append_printf (str, "contains \"x-evolution-any-field\"");
@@ -778,9 +780,10 @@ e_book_query_get_type (void)
        if (g_once_init_enter (&type_id__volatile)) {
                GType type_id;
 
-               type_id = g_boxed_type_register_static ("EBookQuery",
-                                                       (GBoxedCopyFunc) e_book_query_copy,
-                                                       (GBoxedFreeFunc) e_book_query_unref);
+               type_id = g_boxed_type_register_static (
+                       "EBookQuery",
+                       (GBoxedCopyFunc) e_book_query_copy,
+                       (GBoxedFreeFunc) e_book_query_unref);
 
                g_once_init_leave (&type_id__volatile, type_id);
        }
index 7db435f..6b9770b 100644 (file)
@@ -314,49 +314,60 @@ e_book_view_class_init (EBookViewClass *class)
 
        g_type_class_add_private (class, sizeof (EBookViewPrivate));
 
-       signals[CONTACTS_CHANGED] = g_signal_new ("contacts_changed",
-                                                  G_OBJECT_CLASS_TYPE (object_class),
-                                                  G_SIGNAL_RUN_LAST,
-                                                  G_STRUCT_OFFSET (EBookViewClass, contacts_changed),
-                                                  NULL, NULL,
-                                                  e_book_marshal_NONE__POINTER,
-                                                  G_TYPE_NONE, 1, G_TYPE_POINTER);
-       signals[CONTACTS_REMOVED] = g_signal_new ("contacts_removed",
-                                                  G_OBJECT_CLASS_TYPE (object_class),
-                                                  G_SIGNAL_RUN_LAST,
-                                                  G_STRUCT_OFFSET (EBookViewClass, contacts_removed),
-                                                  NULL, NULL,
-                                                  e_book_marshal_NONE__POINTER,
-                                                  G_TYPE_NONE, 1, G_TYPE_POINTER);
-       signals[CONTACTS_ADDED] = g_signal_new ("contacts_added",
-                                                G_OBJECT_CLASS_TYPE (object_class),
-                                                G_SIGNAL_RUN_LAST,
-                                                G_STRUCT_OFFSET (EBookViewClass, contacts_added),
-                                                NULL, NULL,
-                                                e_book_marshal_NONE__POINTER,
-                                                G_TYPE_NONE, 1, G_TYPE_POINTER);
+       signals[CONTACTS_CHANGED] = g_signal_new (
+               "contacts_changed",
+               G_OBJECT_CLASS_TYPE (object_class),
+               G_SIGNAL_RUN_LAST,
+               G_STRUCT_OFFSET (EBookViewClass, contacts_changed),
+               NULL, NULL,
+               e_book_marshal_NONE__POINTER,
+               G_TYPE_NONE, 1, G_TYPE_POINTER);
+
+       signals[CONTACTS_REMOVED] = g_signal_new (
+               "contacts_removed",
+               G_OBJECT_CLASS_TYPE (object_class),
+               G_SIGNAL_RUN_LAST,
+               G_STRUCT_OFFSET (EBookViewClass, contacts_removed),
+               NULL, NULL,
+               e_book_marshal_NONE__POINTER,
+               G_TYPE_NONE, 1, G_TYPE_POINTER);
+
+       signals[CONTACTS_ADDED] = g_signal_new (
+               "contacts_added",
+               G_OBJECT_CLASS_TYPE (object_class),
+               G_SIGNAL_RUN_LAST,
+               G_STRUCT_OFFSET (EBookViewClass, contacts_added),
+               NULL, NULL,
+               e_book_marshal_NONE__POINTER,
+               G_TYPE_NONE, 1, G_TYPE_POINTER);
+
        /* XXX The "sequence-complete" signal is deprecated. */
-       signals[SEQUENCE_COMPLETE] = g_signal_new ("sequence_complete",
-                                                   G_OBJECT_CLASS_TYPE (object_class),
-                                                   G_SIGNAL_RUN_LAST,
-                                                   G_STRUCT_OFFSET (EBookViewClass, sequence_complete),
-                                                   NULL, NULL,
-                                                   e_book_marshal_NONE__INT,
-                                                   G_TYPE_NONE, 1, G_TYPE_UINT);
-       signals[VIEW_COMPLETE] = g_signal_new ("view_complete",
-                                                   G_OBJECT_CLASS_TYPE (object_class),
-                                                   G_SIGNAL_RUN_LAST,
-                                                   G_STRUCT_OFFSET (EBookViewClass, view_complete),
-                                                   NULL, NULL,
-                                                   e_book_marshal_NONE__UINT_STRING,
-                                                   G_TYPE_NONE, 2, G_TYPE_UINT, G_TYPE_STRING);
-       signals[STATUS_MESSAGE] = g_signal_new ("status_message",
-                                                G_OBJECT_CLASS_TYPE (object_class),
-                                                G_SIGNAL_RUN_LAST,
-                                                G_STRUCT_OFFSET (EBookViewClass, status_message),
-                                                NULL, NULL,
-                                                e_book_marshal_NONE__STRING,
-                                                G_TYPE_NONE, 1, G_TYPE_STRING);
+       signals[SEQUENCE_COMPLETE] = g_signal_new (
+               "sequence_complete",
+               G_OBJECT_CLASS_TYPE (object_class),
+               G_SIGNAL_RUN_LAST,
+               G_STRUCT_OFFSET (EBookViewClass, sequence_complete),
+               NULL, NULL,
+               e_book_marshal_NONE__INT,
+               G_TYPE_NONE, 1, G_TYPE_UINT);
+
+       signals[VIEW_COMPLETE] = g_signal_new (
+               "view_complete",
+               G_OBJECT_CLASS_TYPE (object_class),
+               G_SIGNAL_RUN_LAST,
+               G_STRUCT_OFFSET (EBookViewClass, view_complete),
+               NULL, NULL,
+               e_book_marshal_NONE__UINT_STRING,
+               G_TYPE_NONE, 2, G_TYPE_UINT, G_TYPE_STRING);
+
+       signals[STATUS_MESSAGE] = g_signal_new (
+               "status_message",
+               G_OBJECT_CLASS_TYPE (object_class),
+               G_SIGNAL_RUN_LAST,
+               G_STRUCT_OFFSET (EBookViewClass, status_message),
+               NULL, NULL,
+               e_book_marshal_NONE__STRING,
+               G_TYPE_NONE, 1, G_TYPE_STRING);
 
        object_class->dispose = e_book_view_dispose;
 }
index 7d7d401..29b8fc4 100644 (file)
@@ -220,34 +220,34 @@ e_book_class_init (EBookClass *e_book_class)
 {
        GObjectClass *gobject_class = G_OBJECT_CLASS (e_book_class);
 
-       e_book_signals[WRITABLE_STATUS] =
-               g_signal_new ("writable_status",
-                             G_OBJECT_CLASS_TYPE (gobject_class),
-                             G_SIGNAL_RUN_LAST,
-                             G_STRUCT_OFFSET (EBookClass, writable_status),
-                             NULL, NULL,
-                             e_book_marshal_NONE__BOOL,
-                             G_TYPE_NONE, 1,
-                             G_TYPE_BOOLEAN);
-
-       e_book_signals[CONNECTION_STATUS] =
-               g_signal_new ("connection_status",
-                             G_OBJECT_CLASS_TYPE (gobject_class),
-                             G_SIGNAL_RUN_LAST,
-                             G_STRUCT_OFFSET (EBookClass, connection_status),
-                             NULL, NULL,
-                             e_book_marshal_NONE__BOOL,
-                             G_TYPE_NONE, 1,
-                             G_TYPE_BOOLEAN);
-
-       e_book_signals[BACKEND_DIED] =
-               g_signal_new ("backend_died",
-                             G_OBJECT_CLASS_TYPE (gobject_class),
-                             G_SIGNAL_RUN_LAST,
-                             G_STRUCT_OFFSET (EBookClass, backend_died),
-                             NULL, NULL,
-                             e_book_marshal_NONE__NONE,
-                             G_TYPE_NONE, 0);
+       e_book_signals[WRITABLE_STATUS] = g_signal_new (
+               "writable_status",
+               G_OBJECT_CLASS_TYPE (gobject_class),
+               G_SIGNAL_RUN_LAST,
+               G_STRUCT_OFFSET (EBookClass, writable_status),
+               NULL, NULL,
+               e_book_marshal_NONE__BOOL,
+               G_TYPE_NONE, 1,
+               G_TYPE_BOOLEAN);
+
+       e_book_signals[CONNECTION_STATUS] = g_signal_new (
+               "connection_status",
+               G_OBJECT_CLASS_TYPE (gobject_class),
+               G_SIGNAL_RUN_LAST,
+               G_STRUCT_OFFSET (EBookClass, connection_status),
+               NULL, NULL,
+               e_book_marshal_NONE__BOOL,
+               G_TYPE_NONE, 1,
+               G_TYPE_BOOLEAN);
+
+       e_book_signals[BACKEND_DIED] = g_signal_new (
+               "backend_died",
+               G_OBJECT_CLASS_TYPE (gobject_class),
+               G_SIGNAL_RUN_LAST,
+               G_STRUCT_OFFSET (EBookClass, backend_died),
+               NULL, NULL,
+               e_book_marshal_NONE__NONE,
+               G_TYPE_NONE, 0);
 
        gobject_class->dispose = e_book_dispose;
        gobject_class->finalize = e_book_finalize;
@@ -1910,8 +1910,9 @@ e_book_get_book_view (EBook *book,
                *book_view = _e_book_view_new (book, gdbus_bookview);
        } else {
                *book_view = NULL;
-               g_set_error_literal (error, E_BOOK_ERROR, E_BOOK_ERROR_DBUS_EXCEPTION,
-                            "Cannot get connection to view");
+               g_set_error_literal (
+                       error, E_BOOK_ERROR, E_BOOK_ERROR_DBUS_EXCEPTION,
+                       "Cannot get connection to view");
                ret = FALSE;
        }
 
@@ -2871,12 +2872,13 @@ make_me_card (void)
                g_string_append_printf (vcard, "FN:%s\n", s);
 
                western = e_name_western_parse (s);
-               g_string_append_printf (vcard, "N:%s;%s;%s;%s;%s\n",
-                                       western->last ? western->last : "",
-                                       western->first ? western->first : "",
-                                       western->middle ? western->middle : "",
-                                       western->prefix ? western->prefix : "",
-                                       western->suffix ? western->suffix : "");
+               g_string_append_printf (
+                       vcard, "N:%s;%s;%s;%s;%s\n",
+                       western->last ? western->last : "",
+                       western->first ? western->first : "",
+                       western->middle ? western->middle : "",
+                       western->prefix ? western->prefix : "",
+                       western->suffix ? western->suffix : "");
                e_name_western_free (western);
        }
        g_string_append (vcard, "END:VCARD");
index ebcfa9e..0f90212 100644 (file)
@@ -364,35 +364,43 @@ e_contact_class_init (EContactClass *class)
                g_assert (i == field_info[i].field_id);
 
                if (field_info[i].t & E_CONTACT_FIELD_TYPE_STRING)
-                       pspec = g_param_spec_string (field_info[i].field_name,
-                                                    _(field_info[i].pretty_name),
-                                                   field_info[i].pretty_name,
-                                                    NULL,
-                                                    (field_info[i].read_only ? G_PARAM_READABLE : G_PARAM_READWRITE)
-                                                    | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB);
+                       pspec = g_param_spec_string (
+                               field_info[i].field_name,
+                               _(field_info[i].pretty_name),
+                               field_info[i].pretty_name,
+                               NULL,
+                               (field_info[i].read_only ? G_PARAM_READABLE : G_PARAM_READWRITE) |
+                               G_PARAM_STATIC_NICK |
+                               G_PARAM_STATIC_BLURB);
                else if (field_info[i].t & E_CONTACT_FIELD_TYPE_BOOLEAN)
-                       pspec = g_param_spec_boolean (field_info[i].field_name,
-                                                     _(field_info[i].pretty_name),
-                                                   field_info[i].pretty_name,
-                                                     FALSE,
-                                                    (field_info[i].read_only ? G_PARAM_READABLE : G_PARAM_READWRITE)
-                                                    | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB);
+                       pspec = g_param_spec_boolean (
+                               field_info[i].field_name,
+                               _(field_info[i].pretty_name),
+                               field_info[i].pretty_name,
+                               FALSE,
+                               (field_info[i].read_only ? G_PARAM_READABLE : G_PARAM_READWRITE) |
+                               G_PARAM_STATIC_NICK |
+                               G_PARAM_STATIC_BLURB);
                else if (field_info[i].t & E_CONTACT_FIELD_TYPE_STRUCT)
-                       pspec = g_param_spec_boxed (field_info[i].field_name,
-                                                   _(field_info[i].pretty_name),
-                                                   field_info[i].pretty_name,
-                                                   field_info[i].boxed_type_getter (),
-                                                    (field_info[i].read_only ? G_PARAM_READABLE : G_PARAM_READWRITE)
-                                                    | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB);
+                       pspec = g_param_spec_boxed (
+                               field_info[i].field_name,
+                               _(field_info[i].pretty_name),
+                               field_info[i].pretty_name,
+                               field_info[i].boxed_type_getter (),
+                               (field_info[i].read_only ? G_PARAM_READABLE : G_PARAM_READWRITE) |
+                               G_PARAM_STATIC_NICK |
+                               G_PARAM_STATIC_BLURB);
                else
-                       pspec = g_param_spec_pointer (field_info[i].field_name,
-                                                     _(field_info[i].pretty_name),
-                                                   field_info[i].pretty_name,
-                                                    (field_info[i].read_only ? G_PARAM_READABLE : G_PARAM_READWRITE)
-                                                    | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB);
-
-               g_object_class_install_property (object_class, field_info[i].field_id,
-                                                pspec);
+                       pspec = g_param_spec_pointer (
+                               field_info[i].field_name,
+                               _(field_info[i].pretty_name),
+                               field_info[i].pretty_name,
+                               (field_info[i].read_only ? G_PARAM_READABLE : G_PARAM_READWRITE) |
+                               G_PARAM_STATIC_NICK |
+                               G_PARAM_STATIC_BLURB);
+
+               g_object_class_install_property (
+                       object_class, field_info[i].field_id, pspec);
        }
 }
 
@@ -491,24 +499,27 @@ photo_setter (EContact *contact,
        case E_CONTACT_PHOTO_TYPE_INLINED:
                g_return_if_fail (photo->data.inlined.length > 0);
 
-               e_vcard_attribute_add_param_with_value (attr,
-                                                       e_vcard_attribute_param_new (EVC_ENCODING),
-                                                       "b");
+               e_vcard_attribute_add_param_with_value (
+                       attr,
+                       e_vcard_attribute_param_new (EVC_ENCODING),
+                       "b");
                if (photo->data.inlined.mime_type && (p = strchr (photo->data.inlined.mime_type, '/'))) {
                        image_type = p + 1;
                } else {
                        image_type = "X-EVOLUTION-UNKNOWN";
                }
-               e_vcard_attribute_add_param_with_value (attr,
-                                                       e_vcard_attribute_param_new (EVC_TYPE),
-                                                       image_type);
+               e_vcard_attribute_add_param_with_value (
+                       attr,
+                       e_vcard_attribute_param_new (EVC_TYPE),
+                       image_type);
 
                e_vcard_attribute_add_value_decoded (attr, (gchar *) photo->data.inlined.data, photo->data.inlined.length);
                break;
        case E_CONTACT_PHOTO_TYPE_URI:
-               e_vcard_attribute_add_param_with_value (attr,
-                                                       e_vcard_attribute_param_new (EVC_VALUE),
-                                                       "uri");
+               e_vcard_attribute_add_param_with_value (
+                       attr,
+                       e_vcard_attribute_param_new (EVC_VALUE),
+                       "uri");
                e_vcard_attribute_add_value (attr, photo->data.uri);
                break;
        default:
@@ -818,9 +829,10 @@ cert_setter (EContact *contact,
 {
        EContactCert *cert = data;
 
-       e_vcard_attribute_add_param_with_value (attr,
-                                               e_vcard_attribute_param_new (EVC_ENCODING),
-                                               "b");
+       e_vcard_attribute_add_param_with_value (
+               attr,
+               e_vcard_attribute_param_new (EVC_ENCODING),
+               "b");
 
        e_vcard_attribute_add_value_decoded (attr, cert->data, cert->length);
 }
@@ -854,9 +866,10 @@ e_contact_set_property (GObject *object,
                e_vcard_remove_attributes (E_VCARD (contact), NULL, info->vcard_field_name);
 
                for (l = new_values; l; l = l->next)
-                       e_vcard_append_attribute_with_value (E_VCARD (contact),
-                                                         e_vcard_attribute_new (NULL, info->vcard_field_name),
-                                                         (gchar *) l->data);
+                       e_vcard_append_attribute_with_value (
+                               E_VCARD (contact),
+                               e_vcard_attribute_new (NULL, info->vcard_field_name),
+                               (gchar *) l->data);
        }
        else if (info->t & E_CONTACT_FIELD_TYPE_SYNTHETIC) {
                if (info->t & E_CONTACT_FIELD_TYPE_MULTI_ELEM) {
@@ -900,9 +913,10 @@ e_contact_set_property (GObject *object,
                                            !info->attr_type1 &&
                                            !info->attr_type2) {
                                                /* Add default type */
-                                               e_vcard_attribute_add_param_with_value ( attr,
-                                                               e_vcard_attribute_param_new (EVC_TYPE),
-                                                               "OTHER");
+                                               e_vcard_attribute_add_param_with_value (
+                                                       attr,
+                                                       e_vcard_attribute_param_new (EVC_TYPE),
+                                                       "OTHER");
                                        }
                                        e_vcard_append_attribute (E_VCARD (contact), attr);
                                }
@@ -994,11 +1008,13 @@ e_contact_set_property (GObject *object,
                                attr = e_vcard_attribute_new (NULL, info->vcard_field_name);
                                e_vcard_append_attribute (E_VCARD (contact), attr);
                                if (info->attr_type1)
-                                       e_vcard_attribute_add_param_with_value (attr, e_vcard_attribute_param_new (EVC_TYPE),
-                                                                               info->attr_type1);
+                                       e_vcard_attribute_add_param_with_value (
+                                               attr, e_vcard_attribute_param_new (EVC_TYPE),
+                                               info->attr_type1);
                                if (info->attr_type2)
-                                       e_vcard_attribute_add_param_with_value (attr, e_vcard_attribute_param_new (EVC_TYPE),
-                                                                               info->attr_type2);
+                                       e_vcard_attribute_add_param_with_value (
+                                               attr, e_vcard_attribute_param_new (EVC_TYPE),
+                                               info->attr_type2);
                        }
 
                        if (info->t & E_CONTACT_FIELD_TYPE_STRUCT || info->t & E_CONTACT_FIELD_TYPE_GETSET) {
@@ -1134,9 +1150,10 @@ e_contact_set_property (GObject *object,
                }
                else {
                        /* and if we don't find one we create a new attribute */
-                       e_vcard_append_attribute_with_value (E_VCARD (contact),
-                                                         e_vcard_attribute_new (NULL, info->vcard_field_name),
-                                                         g_value_get_boolean (value) ? "TRUE" : "FALSE");
+                       e_vcard_append_attribute_with_value (
+                               E_VCARD (contact),
+                               e_vcard_attribute_new (NULL, info->vcard_field_name),
+                               g_value_get_boolean (value) ? "TRUE" : "FALSE");
                }
        }
        else if (info->t & E_CONTACT_FIELD_TYPE_STRING) {
@@ -1169,9 +1186,10 @@ e_contact_set_property (GObject *object,
                }
                else if (sval) {
                        /* and if we don't find one we create a new attribute */
-                       e_vcard_append_attribute_with_value (E_VCARD (contact),
-                                                         e_vcard_attribute_new (NULL, info->vcard_field_name),
-                                                         sval);
+                       e_vcard_append_attribute_with_value (
+                               E_VCARD (contact),
+                               e_vcard_attribute_new (NULL, info->vcard_field_name),
+                               sval);
                }
        }
        else if (info->t & E_CONTACT_FIELD_TYPE_LIST) {
@@ -1748,9 +1766,10 @@ e_contact_set (EContact *contact,
        g_free (contact->priv->cached_strings[field_id]);
        contact->priv->cached_strings[field_id] = NULL;
 
-       g_object_set (contact,
-                     e_contact_field_name (field_id), value,
-                     NULL);
+       g_object_set (
+               contact,
+               e_contact_field_name (field_id), value,
+               NULL);
 }
 
 /**
@@ -1817,8 +1836,9 @@ e_contact_set_attributes (EContact *contact,
        e_vcard_remove_attributes (E_VCARD (contact), NULL, info->vcard_field_name);
 
        for (l = attributes; l; l = l->next)
-               e_vcard_append_attribute (E_VCARD (contact),
-                                      e_vcard_attribute_copy ((EVCardAttribute *) l->data));
+               e_vcard_append_attribute (
+                       E_VCARD (contact),
+                       e_vcard_attribute_copy ((EVCardAttribute *) l->data));
 }
 
 /**
@@ -2011,10 +2031,11 @@ gchar *
 e_contact_date_to_string (EContactDate *dt)
 {
        if (dt)
-               return g_strdup_printf ("%04d-%02d-%02d",
-                                       CLAMP (dt->year, 1000, 9999),
-                                       CLAMP (dt->month, 1, 12),
-                                       CLAMP (dt->day, 1, 31));
+               return g_strdup_printf (
+                       "%04d-%02d-%02d",
+                       CLAMP (dt->year, 1000, 9999),
+                       CLAMP (dt->month, 1, 12),
+                       CLAMP (dt->day, 1, 31));
        else
                return NULL;
 }
index 96582d1..0a165a5 100644 (file)
@@ -214,8 +214,9 @@ e_destination_copy (const EDestination *dest)
 
        /* deep copy, recursively copy our children */
        for (iter = dest->priv->list_dests; iter != NULL; iter = g_list_next (iter)) {
-               new_dest->priv->list_dests = g_list_append (new_dest->priv->list_dests,
-                                                           e_destination_copy (E_DESTINATION (iter->data)));
+               new_dest->priv->list_dests = g_list_append (
+                       new_dest->priv->list_dests,
+                       e_destination_copy (E_DESTINATION (iter->data)));
        }
 
        /* XXX other settings? */
@@ -387,13 +388,17 @@ e_destination_set_contact (EDestination *dest,
                        gint list_iterations = 0;
                        gint lists_count = 0;
 
-                       hash_table = g_hash_table_new_full (g_str_hash, g_str_equal,
-                                               (GDestroyNotify) g_free, NULL);
+                       hash_table = g_hash_table_new_full (
+                               g_str_hash, g_str_equal,
+                               (GDestroyNotify) g_free, NULL);
 
                        g_hash_table_insert (hash_table, g_strdup ("0"), dest);
 
-                       e_destination_set_name (dest,
-                               e_contact_get_const (dest->priv->contact, E_CONTACT_FILE_AS));
+                       e_destination_set_name (
+                               dest,
+                               e_contact_get_const (
+                                       dest->priv->contact,
+                                       E_CONTACT_FILE_AS));
 
                        attrs = g_list_copy (e_vcard_get_attributes (E_VCARD (dest->priv->contact)));
                        list_length = g_list_length (attrs);
@@ -1358,8 +1363,10 @@ e_destination_xml_encode (const EDestination *dest)
                }
 
                xmlNewProp (dest_node, (xmlChar *)"is_list", (xmlChar *)"yes");
-               xmlNewProp (dest_node, (xmlChar *)"show_addresses",
-                           e_destination_list_show_addresses (dest) ? (xmlChar *)"yes" : (xmlChar *)"no");
+               xmlNewProp (
+                       dest_node, (xmlChar *)"show_addresses",
+                       e_destination_list_show_addresses (dest) ?
+                       (xmlChar *)"yes" : (xmlChar *)"no");
        }
 
        str = e_destination_get_source_uid (dest);
@@ -1378,10 +1385,15 @@ e_destination_xml_encode (const EDestination *dest)
                xmlNewProp (uri_node, (xmlChar *)"email_num", (xmlChar *) buf);
        }
 
-       xmlNewProp (dest_node, (xmlChar *)"html_mail", e_destination_get_html_mail_pref (dest) ? (xmlChar *)"yes" : (xmlChar *)"no");
+       xmlNewProp (
+               dest_node, (xmlChar *)"html_mail",
+               e_destination_get_html_mail_pref (dest) ?
+               (xmlChar *)"yes" : (xmlChar *)"no");
 
-       xmlNewProp (dest_node, (xmlChar *)"auto_recipient",
-                   e_destination_is_auto_recipient (dest) ? (xmlChar *)"yes" : (xmlChar *)"no");
+       xmlNewProp (
+               dest_node, (xmlChar *)"auto_recipient",
+               e_destination_is_auto_recipient (dest) ?
+               (xmlChar *)"yes" : (xmlChar *)"no");
 
        return dest_node;
 }
@@ -1769,23 +1781,27 @@ e_destination_export_to_vcard_attribute (EDestination *dest,
        e_vcard_attribute_remove_params (attr);
 
        if (e_destination_get_contact_uid (dest))
-               e_vcard_attribute_add_param_with_value (attr,
-                                                       e_vcard_attribute_param_new (EVC_X_DEST_CONTACT_UID),
-                                                       e_destination_get_contact_uid (dest));
+               e_vcard_attribute_add_param_with_value (
+                       attr,
+                       e_vcard_attribute_param_new (EVC_X_DEST_CONTACT_UID),
+                       e_destination_get_contact_uid (dest));
        if (e_destination_get_source_uid (dest))
-               e_vcard_attribute_add_param_with_value (attr,
-                                                       e_vcard_attribute_param_new (EVC_X_DEST_SOURCE_UID),
-                                                       e_destination_get_source_uid (dest));
+               e_vcard_attribute_add_param_with_value (
+                       attr,
+                       e_vcard_attribute_param_new (EVC_X_DEST_SOURCE_UID),
+                       e_destination_get_source_uid (dest));
        if (-1 != e_destination_get_email_num (dest)) {
                gchar buf[10];
                g_snprintf (buf, sizeof (buf), "%d", e_destination_get_email_num (dest));
-               e_vcard_attribute_add_param_with_value (attr,
-                                                       e_vcard_attribute_param_new (EVC_X_DEST_EMAIL_NUM),
-                                                       buf);
+               e_vcard_attribute_add_param_with_value (
+                       attr,
+                       e_vcard_attribute_param_new (EVC_X_DEST_EMAIL_NUM),
+                       buf);
        }
-       e_vcard_attribute_add_param_with_value (attr,
-                                               e_vcard_attribute_param_new (EVC_X_DEST_HTML_MAIL),
-                                               e_destination_get_html_mail_pref (dest) ? "TRUE" : "FALSE");
+       e_vcard_attribute_add_param_with_value (
+               attr,
+               e_vcard_attribute_param_new (EVC_X_DEST_HTML_MAIL),
+               e_destination_get_html_mail_pref (dest) ? "TRUE" : "FALSE");
 
        if (e_destination_get_address (dest))
                e_vcard_attribute_add_value (attr, e_destination_get_address (dest));
index f417f90..b95993a 100644 (file)
@@ -735,8 +735,12 @@ e_name_western_reorder_asshole (ENameWestern *name,
         * Create our new reordered version of the name.
         */
 #define NULLSTR(a) ((a) == NULL ? "" : (a))
-       newfull = g_strdup_printf ("%s %s %s %s", NULLSTR (prefix), NULLSTR (firstmidnick),
-                                  NULLSTR (last), NULLSTR (suffix));
+       newfull = g_strdup_printf (
+               "%s %s %s %s",
+               NULLSTR (prefix),
+               NULLSTR (firstmidnick),
+               NULLSTR (last),
+               NULLSTR (suffix));
        g_strstrip (newfull);
        g_free (name->full);
        name->full = newfull;
index 7bd5b81..bae956d 100644 (file)
@@ -546,8 +546,9 @@ read_attribute (gchar **p)
                }
                else if (*lp == '.') {
                        if (attr_group) {
-                               g_warning ("extra `.' in attribute specification.  ignoring extra group `%s'",
-                                          str->str);
+                               g_warning (
+                                       "extra `.' in attribute specification.  ignoring extra group `%s'",
+                                       str->str);
                                g_string_free (str, TRUE);
                                str = g_string_new ("");
                        }
@@ -1394,9 +1395,10 @@ e_vcard_attribute_get_type (void)
        if (g_once_init_enter (&type_id__volatile)) {
                GType type_id;
 
-               type_id = g_boxed_type_register_static ("EVCardAttribute",
-                                                       (GBoxedCopyFunc) e_vcard_attribute_copy,
-                                                       (GBoxedFreeFunc) e_vcard_attribute_free);
+               type_id = g_boxed_type_register_static (
+                       "EVCardAttribute",
+                       (GBoxedCopyFunc) e_vcard_attribute_copy,
+                       (GBoxedFreeFunc) e_vcard_attribute_free);
 
                g_once_init_leave (&type_id__volatile, type_id);
        }
@@ -1814,12 +1816,10 @@ e_vcard_attribute_param_get_type (void)
        if (g_once_init_enter (&type_id__volatile)) {
                GType type_id;
 
-               type_id =
-                       g_boxed_type_register_static ("EVCardAttributeParam",
-                                                     (GBoxedCopyFunc)
-                                                     e_vcard_attribute_param_copy,
-                                                     (GBoxedFreeFunc)
-                                                     e_vcard_attribute_param_free);
+               type_id = g_boxed_type_register_static (
+                       "EVCardAttributeParam",
+                       (GBoxedCopyFunc) e_vcard_attribute_param_copy,
+                       (GBoxedFreeFunc) e_vcard_attribute_param_free);
 
                g_once_init_leave (&type_id__volatile, type_id);
        }
@@ -1971,8 +1971,9 @@ e_vcard_attribute_add_param (EVCardAttribute *attr,
                        else if (!g_ascii_strcasecmp ((gchar *) param->values->data, EVC_QUOTEDPRINTABLE))
                                attr->encoding = EVC_ENCODING_QP;
                        else {
-                               g_warning ("Unknown value `%s' for ENCODING parameter.  values will be treated as raw",
-                                          (gchar *) param->values->data);
+                               g_warning (
+                                       "Unknown value `%s' for ENCODING parameter.  values will be treated as raw",
+                                       (gchar *) param->values->data);
                        }
 
                        attr->encoding_set = TRUE;
index 61ff3d7..e932d79 100644 (file)
@@ -171,7 +171,8 @@ e_book_backend_db_cache_add_contact (DB *db,
        uid = e_contact_get_const (contact, E_CONTACT_UID);
        if (!uid) {
                printf ("no uid\n");
-               printf ("name:%s, email:%s\n",
+               printf (
+                       "name:%s, email:%s\n",
                        (gchar *) e_contact_get (contact, E_CONTACT_GIVEN_NAME),
                        (gchar *) e_contact_get (contact, E_CONTACT_EMAIL_1));
                return FALSE;
index a701c9b..5f2c090 100644 (file)
@@ -1031,8 +1031,9 @@ e_book_backend_sexp_new (const gchar *text)
                                             (ESExpIFunc *) symbols[i].func, sexp->priv->search_context);
                }
                else {
-                       e_sexp_add_function (sexp->priv->search_sexp, 0, symbols[i].name,
-                                           symbols[i].func, sexp->priv->search_context);
+                       e_sexp_add_function (
+                               sexp->priv->search_sexp, 0, symbols[i].name,
+                               symbols[i].func, sexp->priv->search_context);
                }
        }
 
index a1c67ea..f8e7205 100644 (file)
@@ -401,8 +401,9 @@ add_folder_into_db (EBookBackendSqliteDB *ebsdb,
        book_backend_sqlitedb_start_transaction (ebsdb, &err);
 
        if (!err) {
-               stmt = sqlite3_mprintf ("INSERT OR IGNORE INTO folders VALUES ( %Q, %Q, %Q, %d, %d, %d ) ",
-                                       folderid, folder_name, NULL, 0, 0, FOLDER_VERSION);
+               stmt = sqlite3_mprintf (
+                       "INSERT OR IGNORE INTO folders VALUES ( %Q, %Q, %Q, %d, %d, %d ) ",
+                       folderid, folder_name, NULL, 0, 0, FOLDER_VERSION);
 
                book_backend_sql_exec (ebsdb->priv->db, stmt, NULL, NULL, &err);
 
@@ -571,8 +572,9 @@ e_book_backend_sqlitedb_new (const gchar *path,
        ebsdb->priv->store_vcard = store_vcard;
        if (g_mkdir_with_parents (path, 0777) < 0) {
                g_static_mutex_unlock (&dbcon_lock);
-               g_set_error (error, E_BOOK_SDB_ERROR,
-                               0, "Can not make parent directory: errno %d", errno);
+               g_set_error (
+                       error, E_BOOK_SDB_ERROR, 0,
+                       "Can not make parent directory: errno %d", errno);
                return NULL;
        }
        filename = g_build_filename (path, DB_FILENAME, NULL);
@@ -703,8 +705,9 @@ e_book_backend_sqlitedb_add_contact (EBookBackendSqliteDB *ebsdb,
        GSList l;
        l.data = contact;
        l.next = NULL;
-       return e_book_backend_sqlitedb_add_contacts (ebsdb, folderid, &l,
-                                                    partial_content, error);
+       return e_book_backend_sqlitedb_add_contacts (
+               ebsdb, folderid, &l,
+               partial_content, error);
 }
 
 /**
@@ -741,8 +744,9 @@ e_book_backend_sqlitedb_add_contacts (EBookBackendSqliteDB *ebsdb,
                gchar *stmt;
                EContact *contact = (EContact *) l->data;
 
-               stmt = insert_stmt_from_contact (contact, partial_content, folderid,
-                                                priv->store_vcard);
+               stmt = insert_stmt_from_contact (
+                       contact, partial_content, folderid,
+                       priv->store_vcard);
                book_backend_sql_exec (priv->db, stmt, NULL, NULL, &err);
 
                g_free (stmt);
@@ -770,10 +774,12 @@ e_book_backend_sqlitedb_remove_contact (EBookBackendSqliteDB *ebsdb,
                                         GError **error)
 {
        GSList l;
+
        l.data = (gchar *) uid; /* Won't modify it, I promise :) */
        l.next = NULL;
-       return e_book_backend_sqlitedb_remove_contacts (ebsdb, folderid, &l,
-                                                       error);
+
+       return e_book_backend_sqlitedb_remove_contacts (
+               ebsdb, folderid, &l, error);
 }
 
 /**
@@ -916,8 +922,9 @@ e_book_backend_sqlitedb_get_contact (EBookBackendSqliteDB *ebsdb,
 {
        GError *err = NULL;
        EContact *contact = NULL;
-       gchar *vcard = e_book_backend_sqlitedb_get_vcard_string (ebsdb, folderid, uid,
-                                                                fields_of_interest, with_all_required_fields, &err);
+       gchar *vcard = e_book_backend_sqlitedb_get_vcard_string (
+               ebsdb, folderid, uid,
+               fields_of_interest, with_all_required_fields, &err);
        if (!err && vcard) {
                contact = e_contact_new_from_vcard_with_uid (vcard, uid);
                g_free (vcard);
@@ -1088,7 +1095,8 @@ e_book_backend_sqlitedb_get_vcard_string (EBookBackendSqliteDB *ebsdb,
                *with_all_required_fields = local_with_all_required_fields;
 
        if (!vcard_str && error && !*error)
-               g_set_error (error, E_BOOK_SDB_ERROR, 0,
+               g_set_error (
+                       error, E_BOOK_SDB_ERROR, 0,
                        _("Contact '%s' not found"), uid ? uid : "NULL");
 
        return vcard_str;
@@ -1169,8 +1177,9 @@ e_book_backend_sqlitedb_is_summary_query (const gchar *query)
                        e_sexp_add_ifunction (sexp, 0, check_symbols[i].name,
                                              (ESExpIFunc *) check_symbols[i].func, NULL);
                } else {
-                       e_sexp_add_function (sexp, 0, check_symbols[i].name,
-                                            check_symbols[i].func, NULL);
+                       e_sexp_add_function (
+                               sexp, 0, check_symbols[i].name,
+                               check_symbols[i].func, NULL);
                }
        }
 
@@ -1454,8 +1463,9 @@ sexp_to_sql_query (const gchar *query)
                        e_sexp_add_ifunction (sexp, 0, symbols[i].name,
                                             (ESExpIFunc *) symbols[i].func, NULL);
                else
-                       e_sexp_add_function (sexp, 0, symbols[i].name,
-                                           symbols[i].func, NULL);
+                       e_sexp_add_function (
+                               sexp, 0, symbols[i].name,
+                               symbols[i].func, NULL);
        }
 
        e_sexp_input_text (sexp, query, strlen (query));
@@ -1597,8 +1607,9 @@ book_backend_sqlitedb_search_query (EBookBackendSqliteDB *ebsdb,
                        book_backend_sql_exec (ebsdb->priv->db, stmt, store_data_to_vcard, &vcard_data, &err);
                        sqlite3_free (stmt);
                } else
-                       book_backend_sql_exec (ebsdb->priv->db, select_stmt,
-                                              store_data_to_vcard, &vcard_data, &err);
+                       book_backend_sql_exec (
+                               ebsdb->priv->db, select_stmt,
+                               store_data_to_vcard, &vcard_data, &err);
 
                g_free (select_stmt);
 
@@ -1722,9 +1733,10 @@ e_book_backend_sqlitedb_search (EBookBackendSqliteDB *ebsdb,
                gchar *sql_query;
 
                sql_query = sexp ? sexp_to_sql_query (sexp) : NULL;
-               search_contacts = book_backend_sqlitedb_search_query (ebsdb, sql_query, folderid,
-                                                                     fields_of_interest,
-                                                                     &local_with_all_required_fields, error);
+               search_contacts = book_backend_sqlitedb_search_query (
+                       ebsdb, sql_query, folderid,
+                       fields_of_interest,
+                       &local_with_all_required_fields, error);
                g_free (sql_query);
 
                local_searched = TRUE;
@@ -1734,8 +1746,10 @@ e_book_backend_sqlitedb_search (EBookBackendSqliteDB *ebsdb,
                local_searched = TRUE;
                local_with_all_required_fields = TRUE;
        } else {
-               g_set_error (error, E_BOOK_SDB_ERROR,
-                               0, "Full search_contacts are not stored in cache. Hence only summary query is supported.");
+               g_set_error (
+                       error, E_BOOK_SDB_ERROR, 0,
+                       "Full search_contacts are not stored in cache. "
+                       "Hence only summary query is supported.");
        }
 
        if (searched)
@@ -1786,8 +1800,10 @@ e_book_backend_sqlitedb_search_uids (EBookBackendSqliteDB *ebsdb,
 
                local_searched = TRUE;
        } else {
-               g_set_error (error, E_BOOK_SDB_ERROR,
-                               0, "Full vcards are not stored in cache. Hence only summary query is supported.");
+               g_set_error (
+                       error, E_BOOK_SDB_ERROR, 0,
+                       "Full vcards are not stored in cache. "
+                       "Hence only summary query is supported.");
        }
 
        if (searched)
@@ -1898,8 +1914,9 @@ e_book_backend_sqlitedb_set_is_populated (EBookBackendSqliteDB *ebsdb,
        book_backend_sqlitedb_start_transaction (ebsdb, &err);
 
        if (!err) {
-               stmt = sqlite3_mprintf ("UPDATE folders SET is_populated = %d WHERE folder_id = %Q",
-                                       populated, folderid);
+               stmt = sqlite3_mprintf (
+                       "UPDATE folders SET is_populated = %d WHERE folder_id = %Q",
+                       populated, folderid);
                book_backend_sql_exec (ebsdb->priv->db, stmt, NULL, NULL, &err);
                sqlite3_free (stmt);
        }
@@ -1962,7 +1979,8 @@ e_book_backend_sqlitedb_set_has_partial_content (EBookBackendSqliteDB *ebsdb,
        book_backend_sqlitedb_start_transaction (ebsdb, &err);
 
        if (!err) {
-               stmt = sqlite3_mprintf ("UPDATE folders SET partial_content = %d WHERE folder_id = %Q",
+               stmt = sqlite3_mprintf (
+                       "UPDATE folders SET partial_content = %d WHERE folder_id = %Q",
                                        partial_content, folderid);
                book_backend_sql_exec (ebsdb->priv->db, stmt, NULL, NULL, &err);
                sqlite3_free (stmt);
@@ -2035,8 +2053,9 @@ e_book_backend_sqlitedb_set_contact_bdata (EBookBackendSqliteDB *ebsdb,
        book_backend_sqlitedb_start_transaction (ebsdb, &err);
 
        if (!err) {
-               stmt = sqlite3_mprintf ("UPDATE %Q SET bdata = %Q WHERE uid = %Q", folderid,
-                                       value, uid);
+               stmt = sqlite3_mprintf (
+                       "UPDATE %Q SET bdata = %Q WHERE uid = %Q",
+                       folderid, value, uid);
                book_backend_sql_exec (ebsdb->priv->db, stmt, NULL, NULL, &err);
                sqlite3_free (stmt);
        }
@@ -2093,8 +2112,9 @@ e_book_backend_sqlitedb_set_sync_data (EBookBackendSqliteDB *ebsdb,
        book_backend_sqlitedb_start_transaction (ebsdb, &err);
 
        if (!err) {
-               stmt = sqlite3_mprintf ("UPDATE folders SET sync_data = %Q WHERE folder_id = %Q",
-                                       sync_data, folderid);
+               stmt = sqlite3_mprintf (
+                       "UPDATE folders SET sync_data = %Q WHERE folder_id = %Q",
+                       sync_data, folderid);
                book_backend_sql_exec (ebsdb->priv->db, stmt, NULL, NULL, &err);
                sqlite3_free (stmt);
        }
@@ -2124,8 +2144,9 @@ e_book_backend_sqlitedb_get_key_value (EBookBackendSqliteDB *ebsdb,
 
        READER_LOCK (ebsdb);
 
-       stmt = sqlite3_mprintf ("SELECT value FROM keys WHERE folder_id = %Q AND key = %Q",
-                                                       folderid, key);
+       stmt = sqlite3_mprintf (
+               "SELECT value FROM keys WHERE folder_id = %Q AND key = %Q",
+               folderid, key);
        book_backend_sql_exec (ebsdb->priv->db, stmt, get_string_cb , &ret, error);
        sqlite3_free (stmt);
 
@@ -2154,8 +2175,9 @@ e_book_backend_sqlitedb_set_key_value (EBookBackendSqliteDB *ebsdb,
        book_backend_sqlitedb_start_transaction (ebsdb, &err);
 
        if (!err) {
-               stmt = sqlite3_mprintf ("INSERT or REPLACE INTO keys (key, value, folder_id)    \
-                                       values (%Q, %Q, %Q)", key, value, folderid);
+               stmt = sqlite3_mprintf (
+                       "INSERT or REPLACE INTO keys (key, value, folder_id) "
+                       "values (%Q, %Q, %Q)", key, value, folderid);
                book_backend_sql_exec (ebsdb->priv->db, stmt, NULL, NULL, &err);
                sqlite3_free (stmt);
        }
@@ -2185,8 +2207,9 @@ e_book_backend_sqlitedb_get_partially_cached_ids (EBookBackendSqliteDB *ebsdb,
 
        READER_LOCK (ebsdb);
 
-       stmt = sqlite3_mprintf ("SELECT uid FROM %Q WHERE partial_content = 1",
-                                                       folderid);
+       stmt = sqlite3_mprintf (
+               "SELECT uid FROM %Q WHERE partial_content = 1",
+               folderid);
        book_backend_sql_exec (ebsdb->priv->db, stmt, addto_slist_cb, &uids, error);
        sqlite3_free (stmt);
 
@@ -2286,7 +2309,8 @@ e_book_backend_sqlitedb_remove (EBookBackendSqliteDB *ebsdb,
 
        g_free (filename);
        if (ret == -1) {
-               g_set_error (error, E_BOOK_SDB_ERROR,
+               g_set_error (
+                       error, E_BOOK_SDB_ERROR,
                                0, "Unable to remove the db file: errno %d", errno);
                return FALSE;
        }
index aea33b4..f2e6e4b 100644 (file)
@@ -863,8 +863,9 @@ e_book_backend_summary_touch (EBookBackendSummary *summary)
        summary->priv->dirty = TRUE;
        if (!summary->priv->flush_timeout
            && summary->priv->flush_timeout_millis)
-               summary->priv->flush_timeout = g_timeout_add (summary->priv->flush_timeout_millis,
-                                                             summary_flush_func, summary);
+               summary->priv->flush_timeout = g_timeout_add (
+                       summary->priv->flush_timeout_millis,
+                       summary_flush_func, summary);
 }
 
 /**
@@ -962,8 +963,9 @@ e_book_backend_summary_is_summary_query (EBookBackendSummary *summary,
                        e_sexp_add_ifunction (sexp, 0, check_symbols[i].name,
                                             (ESExpIFunc *) check_symbols[i].func, summary);
                } else {
-                       e_sexp_add_function (sexp, 0, check_symbols[i].name,
-                                           check_symbols[i].func, summary);
+                       e_sexp_add_function (
+                               sexp, 0, check_symbols[i].name,
+                               check_symbols[i].func, summary);
                }
        }
 
@@ -1206,8 +1208,9 @@ e_book_backend_summary_search (EBookBackendSummary *summary,
                        e_sexp_add_ifunction (sexp, 0, symbols[i].name,
                                             (ESExpIFunc *) symbols[i].func, summary);
                } else {
-                       e_sexp_add_function (sexp, 0, symbols[i].name,
-                                           symbols[i].func, summary);
+                       e_sexp_add_function (
+                               sexp, 0, symbols[i].name,
+                               symbols[i].func, summary);
                }
        }
 
index 8ce6655..520e0fb 100644 (file)
@@ -340,8 +340,8 @@ void                e_book_backend_respond_opened   (EBookBackend *backend,
 #ifndef EDS_DISABLE_DEPRECATED
 void           e_book_backend_foreach_view     (EBookBackend *backend,
                                                 gboolean (*callback) (EDataBookView *view,
-                                                                      gpointer user_data),
-                                                                      gpointer user_data);
+                                                                      gpointer user_data),
+                                                                      gpointer user_data);
 #endif /* EDS_DISABLE_DEPRECATED */
 
 G_END_DECLS
index 870d705..b8ab312 100644 (file)
@@ -941,8 +941,9 @@ e_data_book_view_notify_update (EDataBookView *view,
                view->priv->sexp, (EContact *) contact);
 
        if (want_in_view) {
-               vcard = e_vcard_to_string (E_VCARD (contact),
-                                          EVC_FORMAT_VCARD_30);
+               vcard = e_vcard_to_string (
+                       E_VCARD (contact),
+                       EVC_FORMAT_VCARD_30);
 
                if (currently_in_view)
                        notify_change (view, id, vcard);
index c84e3ff..9f82daf 100644 (file)
@@ -220,16 +220,16 @@ emit_notifications_in_idle (gpointer user_data)
        }
 
        if (has_changes) {
-               g_dbus_connection_emit_signal (connection,
-                                               NULL,
-                                               path,
-                                               "org.freedesktop.DBus.Properties",
-                                               "PropertiesChanged",
-                                               g_variant_new ("(sa{sv}as)",
-                                                       GDBUS_BOOK_FACTORY_INTERFACE_NAME,
-                                                       builder,
-                                                       invalidated_builder),
-                                               NULL);
+               g_dbus_connection_emit_signal (
+                       connection, NULL, path,
+                       "org.freedesktop.DBus.Properties",
+                       "PropertiesChanged",
+                       g_variant_new (
+                               "(sa{sv}as)",
+                               GDBUS_BOOK_FACTORY_INTERFACE_NAME,
+                               builder,
+                               invalidated_builder),
+                       NULL);
        } else {
                g_variant_builder_unref (builder);
                g_variant_builder_unref (invalidated_builder);
@@ -299,13 +299,14 @@ e_gdbus_book_factory_register_object (EGdbusBookFactory *object,
        g_object_set_data (G_OBJECT (object), "gdbus-codegen-connection", (gpointer) connection);
        g_object_set_data_full (G_OBJECT (object), "gdbus-codegen-pvc", (gpointer) pvc, (GDestroyNotify) g_hash_table_unref);
 
-       return g_dbus_connection_register_object (connection,
-                       object_path,
-                       (GDBusInterfaceInfo *) &_e_gdbus_book_factory_interface_info,
-                       &e_gdbus_book_factory_interface_vtable,
-                       object,
-                       (GDestroyNotify) on_object_unregistered,
-                       error);
+       return g_dbus_connection_register_object (
+               connection,
+               object_path,
+               (GDBusInterfaceInfo *) &_e_gdbus_book_factory_interface_info,
+               &e_gdbus_book_factory_interface_vtable,
+               object,
+               (GDestroyNotify) on_object_unregistered,
+               error);
 }
 
 /**
@@ -390,17 +391,18 @@ e_gdbus_book_factory_proxy_new (GDBusConnection *connection,
                                 GAsyncReadyCallback callback,
                                 gpointer user_data)
 {
-       g_async_initable_new_async (E_TYPE_GDBUS_BOOK_FACTORY_PROXY,
-                               G_PRIORITY_DEFAULT,
-                               cancellable,
-                               callback,
-                               user_data,
-                               "g-flags", flags,
-                               "g-name", name,
-                               "g-connection", connection,
-                               "g-object-path", object_path,
-                               "g-interface-name", GDBUS_BOOK_FACTORY_INTERFACE_NAME,
-                               NULL);
+       g_async_initable_new_async (
+               E_TYPE_GDBUS_BOOK_FACTORY_PROXY,
+               G_PRIORITY_DEFAULT,
+               cancellable,
+               callback,
+               user_data,
+               "g-flags", flags,
+               "g-name", name,
+               "g-connection", connection,
+               "g-object-path", object_path,
+               "g-interface-name", GDBUS_BOOK_FACTORY_INTERFACE_NAME,
+               NULL);
 }
 
 /**
@@ -452,15 +454,16 @@ e_gdbus_book_factory_proxy_new_sync (GDBusConnection *connection,
                                      GError **error)
 {
        GInitable *initable;
-       initable = g_initable_new (E_TYPE_GDBUS_BOOK_FACTORY_PROXY,
-                               cancellable,
-                               error,
-                               "g-flags", flags,
-                               "g-name", name,
-                               "g-connection", connection,
-                               "g-object-path", object_path,
-                               "g-interface-name", GDBUS_BOOK_FACTORY_INTERFACE_NAME,
-                               NULL);
+       initable = g_initable_new (
+               E_TYPE_GDBUS_BOOK_FACTORY_PROXY,
+               cancellable,
+               error,
+               "g-flags", flags,
+               "g-name", name,
+               "g-connection", connection,
+               "g-object-path", object_path,
+               "g-interface-name", GDBUS_BOOK_FACTORY_INTERFACE_NAME,
+               NULL);
        if (initable != NULL)
                return E_GDBUS_BOOK_FACTORY (initable);
        else
@@ -490,17 +493,18 @@ e_gdbus_book_factory_proxy_new_for_bus (GBusType bus_type,
                                         GAsyncReadyCallback callback,
                                         gpointer user_data)
 {
-       g_async_initable_new_async (E_TYPE_GDBUS_BOOK_FACTORY_PROXY,
-                               G_PRIORITY_DEFAULT,
-                               cancellable,
-                               callback,
-                               user_data,
-                               "g-flags", flags,
-                               "g-name", name,
-                               "g-bus-type", bus_type,
-                               "g-object-path", object_path,
-                               "g-interface-name", GDBUS_BOOK_FACTORY_INTERFACE_NAME,
-                               NULL);
+       g_async_initable_new_async (
+               E_TYPE_GDBUS_BOOK_FACTORY_PROXY,
+               G_PRIORITY_DEFAULT,
+               cancellable,
+               callback,
+               user_data,
+               "g-flags", flags,
+               "g-name", name,
+               "g-bus-type", bus_type,
+               "g-object-path", object_path,
+               "g-interface-name", GDBUS_BOOK_FACTORY_INTERFACE_NAME,
+               NULL);
 }
 
 /**
@@ -552,7 +556,8 @@ e_gdbus_book_factory_proxy_new_for_bus_sync (GBusType bus_type,
                                              GError **error)
 {
        GInitable *initable;
-       initable = g_initable_new (E_TYPE_GDBUS_BOOK_FACTORY_PROXY,
+       initable = g_initable_new (
+               E_TYPE_GDBUS_BOOK_FACTORY_PROXY,
                                cancellable,
                                error,
                                "g-flags", flags,
index c3dc758..d3c1eb3 100644 (file)
@@ -480,16 +480,18 @@ emit_notifications_in_idle (gpointer user_data)
        }
 
        if (has_changes) {
-               g_dbus_connection_emit_signal (connection,
-                                       NULL,
-                                       path,
-                                       "org.freedesktop.DBus.Properties",
-                                       "PropertiesChanged",
-                                       g_variant_new ("(sa{sv}as)",
-                                                       GDBUS_BOOK_VIEW_INTERFACE_NAME,
-                                                       builder,
-                                                       invalidated_builder),
-                                       NULL);
+               g_dbus_connection_emit_signal (
+                       connection,
+                       NULL,
+                       path,
+                       "org.freedesktop.DBus.Properties",
+                       "PropertiesChanged",
+                       g_variant_new (
+                               "(sa{sv}as)",
+                               GDBUS_BOOK_VIEW_INTERFACE_NAME,
+                               builder,
+                               invalidated_builder),
+                       NULL);
        } else {
                g_variant_builder_unref (builder);
                g_variant_builder_unref (invalidated_builder);
@@ -558,13 +560,14 @@ e_gdbus_book_view_register_object (EGdbusBookView *object,
        g_object_set_data_full (G_OBJECT (object), "gdbus-codegen-path", (gpointer) g_strdup (object_path), g_free);
        g_object_set_data (G_OBJECT (object), "gdbus-codegen-connection", (gpointer) connection);
        g_object_set_data_full (G_OBJECT (object), "gdbus-codegen-pvc", (gpointer) pvc, (GDestroyNotify) g_hash_table_unref);
-       return g_dbus_connection_register_object (connection,
-                       object_path,
-                       (GDBusInterfaceInfo *) &_e_gdbus_book_view_interface_info,
-                       &e_gdbus_book_view_interface_vtable,
-                       object,
-                       (GDestroyNotify) on_object_unregistered,
-                       error);
+       return g_dbus_connection_register_object (
+               connection,
+               object_path,
+               (GDBusInterfaceInfo *) &_e_gdbus_book_view_interface_info,
+               &e_gdbus_book_view_interface_vtable,
+               object,
+               (GDestroyNotify) on_object_unregistered,
+               error);
 }
 
 /**
@@ -647,17 +650,18 @@ e_gdbus_book_view_proxy_new (GDBusConnection *connection,
                              GAsyncReadyCallback callback,
                              gpointer user_data)
 {
-       g_async_initable_new_async (E_TYPE_GDBUS_BOOK_VIEW_PROXY,
-                               G_PRIORITY_DEFAULT,
-                               cancellable,
-                               callback,
-                               user_data,
-                               "g-flags", flags,
-                               "g-name", name,
-                               "g-connection", connection,
-                               "g-object-path", object_path,
-                               "g-interface-name", GDBUS_BOOK_VIEW_INTERFACE_NAME,
-                               NULL);
+       g_async_initable_new_async (
+               E_TYPE_GDBUS_BOOK_VIEW_PROXY,
+               G_PRIORITY_DEFAULT,
+               cancellable,
+               callback,
+               user_data,
+               "g-flags", flags,
+               "g-name", name,
+               "g-connection", connection,
+               "g-object-path", object_path,
+               "g-interface-name", GDBUS_BOOK_VIEW_INTERFACE_NAME,
+               NULL);
 }
 
 /**
@@ -709,15 +713,16 @@ e_gdbus_book_view_proxy_new_sync (GDBusConnection *connection,
                                   GError **error)
 {
        GInitable *initable;
-       initable = g_initable_new (E_TYPE_GDBUS_BOOK_VIEW_PROXY,
-                               cancellable,
-                               error,
-                               "g-flags", flags,
-                               "g-name", name,
-                               "g-connection", connection,
-                               "g-object-path", object_path,
-                               "g-interface-name", GDBUS_BOOK_VIEW_INTERFACE_NAME,
-                               NULL);
+       initable = g_initable_new (
+               E_TYPE_GDBUS_BOOK_VIEW_PROXY,
+               cancellable,
+               error,
+               "g-flags", flags,
+               "g-name", name,
+               "g-connection", connection,
+               "g-object-path", object_path,
+               "g-interface-name", GDBUS_BOOK_VIEW_INTERFACE_NAME,
+               NULL);
        if (initable != NULL)
                return E_GDBUS_BOOK_VIEW (initable);
        else
@@ -747,17 +752,18 @@ e_gdbus_book_view_proxy_new_for_bus (GBusType bus_type,
                                      GAsyncReadyCallback callback,
                                      gpointer user_data)
 {
-       g_async_initable_new_async (E_TYPE_GDBUS_BOOK_VIEW_PROXY,
-                               G_PRIORITY_DEFAULT,
-                               cancellable,
-                               callback,
-                               user_data,
-                               "g-flags", flags,
-                               "g-name", name,
-                               "g-bus-type", bus_type,
-                               "g-object-path", object_path,
-                               "g-interface-name", GDBUS_BOOK_VIEW_INTERFACE_NAME,
-                               NULL);
+       g_async_initable_new_async (
+               E_TYPE_GDBUS_BOOK_VIEW_PROXY,
+               G_PRIORITY_DEFAULT,
+               cancellable,
+               callback,
+               user_data,
+               "g-flags", flags,
+               "g-name", name,
+               "g-bus-type", bus_type,
+               "g-object-path", object_path,
+               "g-interface-name", GDBUS_BOOK_VIEW_INTERFACE_NAME,
+               NULL);
 }
 
 /**
@@ -809,15 +815,16 @@ e_gdbus_book_view_proxy_new_for_bus_sync (GBusType bus_type,
                                           GError **error)
 {
        GInitable *initable;
-       initable = g_initable_new (E_TYPE_GDBUS_BOOK_VIEW_PROXY,
-                               cancellable,
-                               error,
-                               "g-flags", flags,
-                               "g-name", name,
-                               "g-bus-type", bus_type,
-                               "g-object-path", object_path,
-                               "g-interface-name", GDBUS_BOOK_VIEW_INTERFACE_NAME,
-                               NULL);
+       initable = g_initable_new (
+               E_TYPE_GDBUS_BOOK_VIEW_PROXY,
+               cancellable,
+               error,
+               "g-flags", flags,
+               "g-name", name,
+               "g-bus-type", bus_type,
+               "g-object-path", object_path,
+               "g-interface-name", GDBUS_BOOK_VIEW_INTERFACE_NAME,
+               NULL);
        if (initable != NULL)
                return E_GDBUS_BOOK_VIEW (initable);
        else
index 86779c5..2c66074 100644 (file)
@@ -290,7 +290,8 @@ e_gdbus_book_call_open_sync (GDBusProxy *proxy,
                              GCancellable *cancellable,
                              GError **error)
 {
-       return e_gdbus_proxy_call_sync_boolean__void (proxy, in_only_if_exists, cancellable, error,
+       return e_gdbus_proxy_call_sync_boolean__void (
+               proxy, in_only_if_exists, cancellable, error,
                e_gdbus_book_call_open,
                e_gdbus_book_call_open_finish);
 }
@@ -317,7 +318,8 @@ e_gdbus_book_call_refresh_sync (GDBusProxy *proxy,
                                 GCancellable *cancellable,
                                 GError **error)
 {
-       return e_gdbus_proxy_call_sync_void__void (proxy, cancellable, error,
+       return e_gdbus_proxy_call_sync_void__void (
+               proxy, cancellable, error,
                e_gdbus_book_call_refresh,
                e_gdbus_book_call_refresh_finish);
 }
@@ -348,7 +350,8 @@ e_gdbus_book_call_get_contact_sync (GDBusProxy *proxy,
                                     GCancellable *cancellable,
                                     GError **error)
 {
-       return e_gdbus_proxy_call_sync_string__string (proxy, in_uid, out_vcard, cancellable, error,
+       return e_gdbus_proxy_call_sync_string__string (
+               proxy, in_uid, out_vcard, cancellable, error,
                e_gdbus_book_call_get_contact,
                e_gdbus_book_call_get_contact_finish);
 }
@@ -379,7 +382,8 @@ e_gdbus_book_call_get_contact_list_sync (GDBusProxy *proxy,
                                          GCancellable *cancellable,
                                          GError **error)
 {
-       return e_gdbus_proxy_call_sync_string__strv (proxy, in_query, out_vcards, cancellable, error,
+       return e_gdbus_proxy_call_sync_string__strv (
+               proxy, in_query, out_vcards, cancellable, error,
                e_gdbus_book_call_get_contact_list,
                e_gdbus_book_call_get_contact_list_finish);
 }
@@ -410,7 +414,8 @@ e_gdbus_book_call_get_contact_list_uids_sync (GDBusProxy *proxy,
                                               GCancellable *cancellable,
                                               GError **error)
 {
-       return e_gdbus_proxy_call_sync_string__strv (proxy, in_query, out_uids, cancellable, error,
+       return e_gdbus_proxy_call_sync_string__strv (
+               proxy, in_query, out_uids, cancellable, error,
                e_gdbus_book_call_get_contact_list_uids,
                e_gdbus_book_call_get_contact_list_uids_finish);
 }
@@ -441,7 +446,8 @@ e_gdbus_book_call_add_contacts_sync (GDBusProxy *proxy,
                                     GCancellable *cancellable,
                                     GError **error)
 {
-       return e_gdbus_proxy_call_sync_strv__strv (proxy, in_vcards, out_uids, cancellable, error,
+       return e_gdbus_proxy_call_sync_strv__strv (
+               proxy, in_vcards, out_uids, cancellable, error,
                e_gdbus_book_call_add_contacts,
                e_gdbus_book_call_add_contacts_finish);
 }
@@ -470,7 +476,8 @@ e_gdbus_book_call_remove_contacts_sync (GDBusProxy *proxy,
                                         GCancellable *cancellable,
                                         GError **error)
 {
-       return e_gdbus_proxy_call_sync_strv__void (proxy, in_list, cancellable, error,
+       return e_gdbus_proxy_call_sync_strv__void (
+               proxy, in_list, cancellable, error,
                e_gdbus_book_call_remove_contacts,
                e_gdbus_book_call_remove_contacts_finish);
 }
@@ -499,7 +506,8 @@ e_gdbus_book_call_modify_contacts_sync (GDBusProxy *proxy,
                                         GCancellable *cancellable,
                                         GError **error)
 {
-       return e_gdbus_proxy_call_sync_strv__void (proxy, in_vcards, cancellable, error,
+       return e_gdbus_proxy_call_sync_strv__void (
+               proxy, in_vcards, cancellable, error,
                e_gdbus_book_call_modify_contacts,
                e_gdbus_book_call_modify_contacts_finish);
 }
@@ -530,7 +538,8 @@ e_gdbus_book_call_get_backend_property_sync (GDBusProxy *proxy,
                                              GCancellable *cancellable,
                                              GError **error)
 {
-       return e_gdbus_proxy_call_sync_string__string (proxy, in_prop_name, out_prop_value, cancellable, error,
+       return e_gdbus_proxy_call_sync_string__string (
+               proxy, in_prop_name, out_prop_value, cancellable, error,
                e_gdbus_book_call_get_backend_property,
                e_gdbus_book_call_get_backend_property_finish);
 }
@@ -576,7 +585,8 @@ e_gdbus_book_call_set_backend_property_sync (GDBusProxy *proxy,
                                              GCancellable *cancellable,
                                              GError **error)
 {
-       return e_gdbus_proxy_call_sync_strv__void (proxy, in_prop_name_value, cancellable, error,
+       return e_gdbus_proxy_call_sync_strv__void (
+               proxy, in_prop_name_value, cancellable, error,
                e_gdbus_book_call_set_backend_property,
                e_gdbus_book_call_set_backend_property_finish);
 }
@@ -607,7 +617,8 @@ e_gdbus_book_call_get_view_sync (GDBusProxy *proxy,
                                  GCancellable *cancellable,
                                  GError **error)
 {
-       return e_gdbus_proxy_call_sync_string__string (proxy, in_query, out_view_path, cancellable, error,
+       return e_gdbus_proxy_call_sync_string__string (
+               proxy, in_query, out_view_path, cancellable, error,
                e_gdbus_book_call_get_view,
                e_gdbus_book_call_get_view_finish);
 }
@@ -996,7 +1007,8 @@ emit_notifications_in_idle (gpointer user_data)
        }
 
        if (has_changes) {
-               g_dbus_connection_emit_signal (connection, NULL, path, "org.freedesktop.DBus.Properties", "PropertiesChanged",
+               g_dbus_connection_emit_signal (
+                       connection, NULL, path, "org.freedesktop.DBus.Properties", "PropertiesChanged",
                        g_variant_new ("(sa{sv}as)", GDBUS_BOOK_INTERFACE_NAME, builder, invalidated_builder),
                        NULL);
        } else {
@@ -1069,7 +1081,8 @@ e_gdbus_book_register_object (EGdbusBook *object,
        g_object_set_data (G_OBJECT (object), "gdbus-codegen-connection", (gpointer) connection);
        g_object_set_data_full (G_OBJECT (object), "gdbus-codegen-pvc", (gpointer) pvc, (GDestroyNotify) g_hash_table_unref);
 
-       return g_dbus_connection_register_object (connection, object_path, (GDBusInterfaceInfo *) &_e_gdbus_book_interface_info,
+       return g_dbus_connection_register_object (
+               connection, object_path, (GDBusInterfaceInfo *) &_e_gdbus_book_interface_info,
                        &e_gdbus_book_interface_vtable, object, (GDestroyNotify) on_object_unregistered, error);
 }
 
@@ -1219,17 +1232,18 @@ e_gdbus_book_proxy_new (GDBusConnection *connection,
                         GAsyncReadyCallback callback,
                         gpointer user_data)
 {
-       g_async_initable_new_async (E_TYPE_GDBUS_BOOK_PROXY,
-                               G_PRIORITY_DEFAULT,
-                               cancellable,
-                               callback,
-                               user_data,
-                               "g-flags", flags,
-                               "g-name", name,
-                               "g-connection", connection,
-                               "g-object-path", object_path,
-                               "g-interface-name", GDBUS_BOOK_INTERFACE_NAME,
-                               NULL);
+       g_async_initable_new_async (
+               E_TYPE_GDBUS_BOOK_PROXY,
+               G_PRIORITY_DEFAULT,
+               cancellable,
+               callback,
+               user_data,
+               "g-flags", flags,
+               "g-name", name,
+               "g-connection", connection,
+               "g-object-path", object_path,
+               "g-interface-name", GDBUS_BOOK_INTERFACE_NAME,
+               NULL);
 }
 
 /**
@@ -1282,15 +1296,16 @@ e_gdbus_book_proxy_new_sync (GDBusConnection *connection,
                              GError **error)
 {
        GInitable *initable;
-       initable = g_initable_new (E_TYPE_GDBUS_BOOK_PROXY,
-                               cancellable,
-                               error,
-                               "g-flags", flags,
-                               "g-name", name,
-                               "g-connection", connection,
-                               "g-object-path", object_path,
-                               "g-interface-name", GDBUS_BOOK_INTERFACE_NAME,
-                               NULL);
+       initable = g_initable_new (
+               E_TYPE_GDBUS_BOOK_PROXY,
+               cancellable,
+               error,
+               "g-flags", flags,
+               "g-name", name,
+               "g-connection", connection,
+               "g-object-path", object_path,
+               "g-interface-name", GDBUS_BOOK_INTERFACE_NAME,
+               NULL);
        if (initable != NULL)
                return E_GDBUS_BOOK (initable);
        else
@@ -1320,17 +1335,18 @@ e_gdbus_book_proxy_new_for_bus (GBusType bus_type,
                                 GAsyncReadyCallback callback,
                                 gpointer user_data)
 {
-       g_async_initable_new_async (E_TYPE_GDBUS_BOOK_PROXY,
-                               G_PRIORITY_DEFAULT,
-                               cancellable,
-                               callback,
-                               user_data,
-                               "g-flags", flags,
-                               "g-name", name,
-                               "g-bus-type", bus_type,
-                               "g-object-path", object_path,
-                               "g-interface-name", GDBUS_BOOK_INTERFACE_NAME,
-                               NULL);
+       g_async_initable_new_async (
+               E_TYPE_GDBUS_BOOK_PROXY,
+               G_PRIORITY_DEFAULT,
+               cancellable,
+               callback,
+               user_data,
+               "g-flags", flags,
+               "g-name", name,
+               "g-bus-type", bus_type,
+               "g-object-path", object_path,
+               "g-interface-name", GDBUS_BOOK_INTERFACE_NAME,
+               NULL);
 }
 
 /**
@@ -1384,15 +1400,16 @@ e_gdbus_book_proxy_new_for_bus_sync (GBusType bus_type,
 {
        GInitable *initable;
 
-       initable = g_initable_new (E_TYPE_GDBUS_BOOK_PROXY,
-                               cancellable,
-                               error,
-                               "g-flags", flags,
-                               "g-name", name,
-                               "g-bus-type", bus_type,
-                               "g-object-path", object_path,
-                               "g-interface-name", GDBUS_BOOK_INTERFACE_NAME,
-                               NULL);
+       initable = g_initable_new (
+               E_TYPE_GDBUS_BOOK_PROXY,
+               cancellable,
+               error,
+               "g-flags", flags,
+               "g-name", name,
+               "g-bus-type", bus_type,
+               "g-object-path", object_path,
+               "g-interface-name", GDBUS_BOOK_INTERFACE_NAME,
+               NULL);
        if (initable != NULL)
                return E_GDBUS_BOOK (initable);
        else
index ff89fbe..c4e1131 100644 (file)
@@ -167,9 +167,10 @@ add_debug_key (const gchar *start,
                return;
        }
 
-       g_hash_table_insert (caldav_debug_table,
-                            debug_key,
-                            debug_value);
+       g_hash_table_insert (
+               caldav_debug_table,
+               debug_key,
+               debug_value);
 
        d (g_debug ("Adding %s to enabled debugging keys", debug_key));
 }
@@ -186,8 +187,9 @@ caldav_debug_init_once (gpointer data)
 
                d (g_debug ("Got debug env variable: [%s]", dbg));
 
-               caldav_debug_table = g_hash_table_new (g_str_hash,
-                                                      g_str_equal);
+               caldav_debug_table = g_hash_table_new (
+                       g_str_hash,
+                       g_str_equal);
 
                ptr = dbg;
 
@@ -223,7 +225,8 @@ caldav_debug_init (void)
 {
        static GOnce debug_once = G_ONCE_INIT;
 
-       g_once (&debug_once,
+       g_once (
+               &debug_once,
                caldav_debug_init_once,
                NULL);
 }
@@ -562,7 +565,8 @@ status_code_to_result (SoupMessage *message,
        switch (message->status_code) {
        case SOUP_STATUS_CANT_CONNECT:
        case SOUP_STATUS_CANT_CONNECT_PROXY:
-               g_propagate_error (perror,
+               g_propagate_error (
+                       perror,
                        e_data_cal_create_error_fmt (
                                OtherError,
                                _("Server is unreachable (%s)"),
@@ -593,13 +597,15 @@ status_code_to_result (SoupMessage *message,
 
        case SOUP_STATUS_SSL_FAILED:
                if (ignore_invalid_cert) {
-                       g_propagate_error (perror,
+                       g_propagate_error (
+                               perror,
                                e_data_cal_create_error_fmt ( OtherError,
                                _("Failed to connect to a server using SSL: %s"),
                                message->reason_phrase && *message->reason_phrase ? message->reason_phrase :
                                (soup_status_get_phrase (message->status_code) ? soup_status_get_phrase (message->status_code) : _("Unknown error"))));
                } else {
-                       g_propagate_error (perror, EDC_ERROR_EX (OtherError,
+                       g_propagate_error (
+                               perror, EDC_ERROR_EX (OtherError,
                                _("Failed to connect to a server using SSL. "
                                "One possible reason is an invalid certificate being used by the server. "
                                "If this is expected, like self-signed certificate being used on the server, "
@@ -610,7 +616,8 @@ status_code_to_result (SoupMessage *message,
 
        default:
                d (g_debug ("CalDAV:%s: Unhandled status code %d\n", G_STRFUNC, status_code));
-               g_propagate_error (perror,
+               g_propagate_error (
+                       perror,
                        e_data_cal_create_error_fmt (
                                OtherError,
                                _("Unexpected HTTP status code %d returned (%s)"),
@@ -696,10 +703,11 @@ parse_status_node (xmlNodePtr node,
 
        content = xmlNodeGetContent (node);
 
-       res = soup_headers_parse_status_line ((gchar *) content,
-                                             NULL,
-                                             status_code,
-                                             NULL);
+       res = soup_headers_parse_status_line (
+               (gchar *) content,
+               NULL,
+               status_code,
+               NULL);
        xmlFree (content);
 
        return res;
@@ -752,10 +760,11 @@ xp_object_get_status (xmlXPathObjectPtr result)
                return ret;
 
        if (result->type == XPATH_STRING) {
-               res = soup_headers_parse_status_line ((gchar *) result->stringval,
-                                                       NULL,
-                                                       &ret,
-                                                       NULL);
+               res = soup_headers_parse_status_line (
+                       (gchar *) result->stringval,
+                       NULL,
+                       &ret,
+                       NULL);
 
                if (!res) {
                        ret = 0;
@@ -837,11 +846,12 @@ parse_report_response (SoupMessage *soup_message,
        g_return_val_if_fail (objs != NULL || len != NULL, FALSE);
 
        res = TRUE;
-       doc = xmlReadMemory (soup_message->response_body->data,
-                            soup_message->response_body->length,
-                            "response.xml",
-                            NULL,
-                            0);
+       doc = xmlReadMemory (
+               soup_message->response_body->data,
+               soup_message->response_body->length,
+               "response.xml",
+               NULL,
+               0);
 
        if (doc == NULL) {
                return FALSE;
@@ -849,11 +859,13 @@ parse_report_response (SoupMessage *soup_message,
 
        xpctx = xmlXPathNewContext (doc);
 
-       xmlXPathRegisterNs (xpctx, (xmlChar *) "D",
-                           (xmlChar *) "DAV:");
+       xmlXPathRegisterNs (
+               xpctx, (xmlChar *) "D",
+               (xmlChar *) "DAV:");
 
-       xmlXPathRegisterNs (xpctx, (xmlChar *) "C",
-                           (xmlChar *) "urn:ietf:params:xml:ns:caldav");
+       xmlXPathRegisterNs (
+               xpctx, (xmlChar *) "C",
+               (xmlChar *) "urn:ietf:params:xml:ns:caldav");
 
        result = xpath_eval (xpctx, "/D:multistatus/D:response");
 
@@ -922,11 +934,12 @@ parse_propfind_response (SoupMessage *message,
        g_return_val_if_fail (message != NULL, FALSE);
        g_return_val_if_fail (value != NULL, FALSE);
 
-       doc = xmlReadMemory (message->response_body->data,
-                            message->response_body->length,
-                            "response.xml",
-                            NULL,
-                            0);
+       doc = xmlReadMemory (
+               message->response_body->data,
+               message->response_body->length,
+               "response.xml",
+               NULL,
+               0);
 
        if (doc == NULL) {
                return FALSE;
@@ -1012,9 +1025,10 @@ redirect_handler (SoupMessage *msg,
 
                new_uri = soup_uri_new_with_base (soup_message_get_uri (msg), new_loc);
                if (!new_uri) {
-                       soup_message_set_status_full (msg,
-                                                     SOUP_STATUS_MALFORMED,
-                                                     _("Invalid Redirect URL"));
+                       soup_message_set_status_full (
+                               msg,
+                               SOUP_STATUS_MALFORMED,
+                               _("Invalid Redirect URL"));
                        return;
                }
 
@@ -1098,8 +1112,9 @@ caldav_server_open_calendar (ECalBackendCalDAV *cbdav,
                g_propagate_error (perror, EDC_ERROR (NoSuchCal));
                return FALSE;
        }
-       soup_message_headers_append (message->request_headers,
-                                    "User-Agent", "Evolution/" VERSION);
+       soup_message_headers_append (
+               message->request_headers,
+               "User-Agent", "Evolution/" VERSION);
 
        send_and_handle_redirection (cbdav->priv->session, message, NULL);
 
@@ -1241,16 +1256,19 @@ check_calendar_changed_on_server (ECalBackendCalDAV *cbdav)
        xmlNodeDumpOutput (buf, doc, root, 0, 1, NULL);
        xmlOutputBufferFlush (buf);
 
-       soup_message_headers_append (message->request_headers,
-                                    "User-Agent", "Evolution/" VERSION);
-       soup_message_headers_append (message->request_headers,
-                                    "Depth", "0");
+       soup_message_headers_append (
+               message->request_headers,
+               "User-Agent", "Evolution/" VERSION);
+       soup_message_headers_append (
+               message->request_headers,
+               "Depth", "0");
 
        buf_content = compat_libxml_output_buffer_get_content (buf, &buf_size);
-       soup_message_set_request (message,
-                                 "application/xml",
-                                 SOUP_MEMORY_COPY,
-                                 buf_content, buf_size);
+       soup_message_set_request (
+               message,
+               "application/xml",
+               SOUP_MEMORY_COPY,
+               buf_content, buf_size);
 
        /* Send the request now */
        send_and_handle_redirection (cbdav->priv->session, message, NULL);
@@ -1391,16 +1409,19 @@ caldav_server_list_objects (ECalBackendCalDAV *cbdav,
        xmlOutputBufferFlush (buf);
 
        /* Prepare the soup message */
-       soup_message_headers_append (message->request_headers,
-                                    "User-Agent", "Evolution/" VERSION);
-       soup_message_headers_append (message->request_headers,
-                                    "Depth", "1");
+       soup_message_headers_append (
+               message->request_headers,
+               "User-Agent", "Evolution/" VERSION);
+       soup_message_headers_append (
+               message->request_headers,
+               "Depth", "1");
 
        buf_content = compat_libxml_output_buffer_get_content (buf, &buf_size);
-       soup_message_set_request (message,
-                                 "application/xml",
-                                 SOUP_MEMORY_COPY,
-                                 buf_content, buf_size);
+       soup_message_set_request (
+               message,
+               "application/xml",
+               SOUP_MEMORY_COPY,
+               buf_content, buf_size);
 
        /* Send the request now */
        send_and_handle_redirection (cbdav->priv->session, message, NULL);
@@ -1499,8 +1520,9 @@ caldav_server_get_object (ECalBackendCalDAV *cbdav,
                return FALSE;
        }
 
-       soup_message_headers_append (message->request_headers,
-                                    "User-Agent", "Evolution/" VERSION);
+       soup_message_headers_append (
+               message->request_headers,
+               "User-Agent", "Evolution/" VERSION);
 
        send_and_handle_redirection (cbdav->priv->session, message, NULL);
 
@@ -1564,10 +1586,11 @@ caldav_post_freebusy (ECalBackendCalDAV *cbdav,
        }
 
        soup_message_headers_append (message->request_headers, "User-Agent", "Evolution/" VERSION);
-       soup_message_set_request (message,
-                                 "text/calendar; charset=utf-8",
-                                 SOUP_MEMORY_COPY,
-                                 *post_fb, strlen (*post_fb));
+       soup_message_set_request (
+               message,
+               "text/calendar; charset=utf-8",
+               SOUP_MEMORY_COPY,
+               *post_fb, strlen (*post_fb));
 
        send_and_handle_redirection (cbdav->priv->session, message, NULL);
 
@@ -1646,8 +1669,9 @@ caldav_server_put_object (ECalBackendCalDAV *cbdav,
                return FALSE;
        }
 
-       soup_message_headers_append (message->request_headers,
-                                    "User-Agent", "Evolution/" VERSION);
+       soup_message_headers_append (
+               message->request_headers,
+               "User-Agent", "Evolution/" VERSION);
 
        /* For new items we use the If-None-Match so we don't
         * acidently override resources, for item updates we
@@ -1656,15 +1680,17 @@ caldav_server_put_object (ECalBackendCalDAV *cbdav,
        if (object->etag == NULL) {
                soup_message_headers_append (message->request_headers, "If-None-Match", "*");
        } else {
-               soup_message_headers_append (message->request_headers,
-                                            "If-Match", object->etag);
+               soup_message_headers_append (
+                       message->request_headers,
+                       "If-Match", object->etag);
        }
 
-       soup_message_set_request (message,
-                                 "text/calendar; charset=utf-8",
-                                 SOUP_MEMORY_COPY,
-                                 object->cdata,
-                                 strlen (object->cdata));
+       soup_message_set_request (
+               message,
+               "text/calendar; charset=utf-8",
+               SOUP_MEMORY_COPY,
+               object->cdata,
+               strlen (object->cdata));
 
        uri = NULL;
        send_and_handle_redirection (cbdav->priv->session, message, &uri);
@@ -1787,12 +1813,14 @@ caldav_server_delete_object (ECalBackendCalDAV *cbdav,
                return;
        }
 
-       soup_message_headers_append (message->request_headers,
-                                    "User-Agent", "Evolution/" VERSION);
+       soup_message_headers_append (
+               message->request_headers,
+               "User-Agent", "Evolution/" VERSION);
 
        if (object->etag != NULL) {
-               soup_message_headers_append (message->request_headers,
-                                            "If-Match", object->etag);
+               soup_message_headers_append (
+                       message->request_headers,
+                       "If-Match", object->etag);
        }
 
        send_and_handle_redirection (cbdav->priv->session, message, NULL);
@@ -1841,10 +1869,11 @@ caldav_receive_schedule_outbox_url (ECalBackendCalDAV *cbdav)
        soup_message_headers_append (message->request_headers, "Depth", "0");
 
        buf_content = compat_libxml_output_buffer_get_content (buf, &buf_size);
-       soup_message_set_request (message,
-                                 "application/xml",
-                                 SOUP_MEMORY_COPY,
-                                 buf_content, buf_size);
+       soup_message_set_request (
+               message,
+               "application/xml",
+               SOUP_MEMORY_COPY,
+               buf_content, buf_size);
 
        /* Send the request now */
        send_and_handle_redirection (cbdav->priv->session, message, NULL);
@@ -1891,10 +1920,11 @@ caldav_receive_schedule_outbox_url (ECalBackendCalDAV *cbdav)
                soup_message_headers_append (message->request_headers, "Depth", "0");
 
                buf_content = compat_libxml_output_buffer_get_content (buf, &buf_size);
-               soup_message_set_request (message,
-                                         "application/xml",
-                                         SOUP_MEMORY_COPY,
-                                         buf_content, buf_size);
+               soup_message_set_request (
+                       message,
+                       "application/xml",
+                       SOUP_MEMORY_COPY,
+                       buf_content, buf_size);
 
                /* Send the request now */
                send_and_handle_redirection (cbdav->priv->session, message, NULL);
@@ -2489,9 +2519,10 @@ caldav_get_backend_property (ECalBackendSync *backend,
                gchar *usermail;
                const gchar *extension_name;
 
-               caps = g_string_new (CAL_STATIC_CAPABILITY_NO_THISANDFUTURE ","
-                                    CAL_STATIC_CAPABILITY_NO_THISANDPRIOR ","
-                                    CAL_STATIC_CAPABILITY_REFRESH_SUPPORTED);
+               caps = g_string_new (
+                       CAL_STATIC_CAPABILITY_NO_THISANDFUTURE ","
+                       CAL_STATIC_CAPABILITY_NO_THISANDPRIOR ","
+                       CAL_STATIC_CAPABILITY_REFRESH_SUPPORTED);
 
                usermail = get_usermail (E_CAL_BACKEND (backend));
                if (!usermail || !*usermail)
@@ -2504,8 +2535,10 @@ caldav_get_backend_property (ECalBackendSync *backend,
                extension = e_source_get_extension (source, extension_name);
 
                if (e_source_webdav_get_calendar_auto_schedule (extension)) {
-                       g_string_append (caps, "," CAL_STATIC_CAPABILITY_CREATE_MESSAGES
-                                              "," CAL_STATIC_CAPABILITY_SAVE_SCHEDULES);
+                       g_string_append (
+                               caps,
+                               "," CAL_STATIC_CAPABILITY_CREATE_MESSAGES
+                               "," CAL_STATIC_CAPABILITY_SAVE_SCHEDULES);
                }
 
                *prop_value = g_string_free (caps, FALSE);
@@ -3373,8 +3406,9 @@ add_timezone_cb (icalparameter *param,
        if (!vtz_comp)
                return;
 
-       icalcomponent_add_component (f_data->vcal_comp,
-                                    icalcomponent_new_clone (vtz_comp));
+       icalcomponent_add_component (
+               f_data->vcal_comp,
+               icalcomponent_new_clone (vtz_comp));
 }
 
 static void
@@ -4055,8 +4089,7 @@ extract_objects (icalcomponent *icomp,
        }
 
        *objects = NULL;
-       scomp = icalcomponent_get_first_component (icomp,
-                                                  ekind);
+       scomp = icalcomponent_get_first_component (icomp, ekind);
 
        while (scomp) {
                /* Remove components from toplevel here */
@@ -4541,9 +4574,10 @@ caldav_start_view (ECalBackend *backend,
        } else {
                do_search = TRUE;
        }
-       prunning_by_time = e_cal_backend_sexp_evaluate_occur_times (sexp,
-                                                                           &occur_start,
-                                                                           &occur_end);
+       prunning_by_time = e_cal_backend_sexp_evaluate_occur_times (
+               sexp,
+               &occur_start,
+               &occur_end);
 
        bkend = E_CAL_BACKEND (backend);
 
@@ -5042,8 +5076,9 @@ e_cal_backend_caldav_init (ECalBackendCalDAV *cbdav)
        cbdav->priv->slave_cmd = SLAVE_SHOULD_SLEEP;
        cbdav->priv->slave_busy = FALSE;
 
-       g_signal_connect (cbdav->priv->session, "authenticate",
-                         G_CALLBACK (soup_authenticate), cbdav);
+       g_signal_connect (
+               cbdav->priv->session, "authenticate",
+               G_CALLBACK (soup_authenticate), cbdav);
 
        e_cal_backend_sync_set_lock (E_CAL_BACKEND_SYNC (cbdav), FALSE);
 
index f5fced5..b9ab454 100644 (file)
@@ -576,9 +576,10 @@ check_dup_uid (ECalBackendFile *cbfile,
                        goto done;
        }
 
-       d (g_message (G_STRLOC ": Got object with duplicated UID `%s' and rid `%s', changing it...",
-                    uid,
-                    rid ? rid : ""));
+       d (
+               g_message (G_STRLOC ": Got object with duplicated UID `%s' and rid `%s', changing it...",
+               uid,
+               rid ? rid : ""));
 
        new_uid = e_cal_component_gen_uid ();
        e_cal_component_set_uid (comp, new_uid);
@@ -623,9 +624,10 @@ add_component_to_intervaltree (ECalBackendFile *cbfile,
 
        priv = cbfile->priv;
 
-       e_cal_util_get_component_occur_times (comp, &time_start, &time_end,
-                                  resolve_tzid, priv->icalcomp, icaltimezone_get_utc_timezone (),
-                                  e_cal_backend_get_kind (E_CAL_BACKEND (cbfile)));
+       e_cal_util_get_component_occur_times (
+               comp, &time_start, &time_end,
+               resolve_tzid, priv->icalcomp, icaltimezone_get_utc_timezone (),
+               e_cal_backend_get_kind (E_CAL_BACKEND (cbfile)));
 
        if (time_end != -1 && time_start > time_end)
                g_print ("Bogus component %s\n", e_cal_component_get_as_string (comp));
@@ -1649,9 +1651,10 @@ e_cal_backend_file_get_object_list (ECalBackendSync *backend,
 
        g_static_rec_mutex_lock (&priv->idle_save_rmutex);
 
-       prunning_by_time = e_cal_backend_sexp_evaluate_occur_times (match_data.obj_sexp,
-                                                                           &occur_start,
-                                                                           &occur_end);
+       prunning_by_time = e_cal_backend_sexp_evaluate_occur_times (
+               match_data.obj_sexp,
+               &occur_start,
+               &occur_end);
 
        objs_occuring_in_tw =  NULL;
 
@@ -1659,8 +1662,9 @@ e_cal_backend_file_get_object_list (ECalBackendSync *backend,
                g_hash_table_foreach (priv->comp_uid_hash, (GHFunc) match_object_sexp,
                                      &match_data);
        } else {
-               objs_occuring_in_tw = e_intervaltree_search (priv->interval_tree,
-                                                           occur_start, occur_end);
+               objs_occuring_in_tw = e_intervaltree_search (
+                       priv->interval_tree,
+                       occur_start, occur_end);
 
                g_list_foreach (objs_occuring_in_tw, (GFunc) match_object_sexp_to_component,
                               &match_data);
@@ -1839,9 +1843,10 @@ e_cal_backend_file_start_view (ECalBackend *backend,
                g_error_free (error);
                return;
        }
-       prunning_by_time = e_cal_backend_sexp_evaluate_occur_times (match_data.obj_sexp,
-                                                                           &occur_start,
-                                                                           &occur_end);
+       prunning_by_time = e_cal_backend_sexp_evaluate_occur_times (
+               match_data.obj_sexp,
+               &occur_start,
+               &occur_end);
 
        objs_occuring_in_tw = NULL;
 
@@ -1852,9 +1857,10 @@ e_cal_backend_file_start_view (ECalBackend *backend,
                g_hash_table_foreach (priv->comp_uid_hash, (GHFunc) match_object_sexp,
                                      &match_data);
 
-               e_debug_log (FALSE, E_DEBUG_LOG_DOMAIN_CAL_QUERIES,  "---;%p;QUERY-ITEMS;%s;%s;%d", query,
-                           e_cal_backend_sexp_text (sexp), G_OBJECT_TYPE_NAME (backend),
-                           g_hash_table_size (priv->comp_uid_hash));
+               e_debug_log (
+                       FALSE, E_DEBUG_LOG_DOMAIN_CAL_QUERIES,  "---;%p;QUERY-ITEMS;%s;%s;%d", query,
+                       e_cal_backend_sexp_text (sexp), G_OBJECT_TYPE_NAME (backend),
+                       g_hash_table_size (priv->comp_uid_hash));
        } else {
                /* matches objects in new "interval tree" way */
                /* events occuring in time window */
@@ -1863,9 +1869,10 @@ e_cal_backend_file_start_view (ECalBackend *backend,
                g_list_foreach (objs_occuring_in_tw, (GFunc) match_object_sexp_to_component,
                               &match_data);
 
-               e_debug_log (FALSE, E_DEBUG_LOG_DOMAIN_CAL_QUERIES,  "---;%p;QUERY-ITEMS;%s;%s;%d", query,
-                           e_cal_backend_sexp_text (sexp), G_OBJECT_TYPE_NAME (backend),
-                           g_list_length (objs_occuring_in_tw));
+               e_debug_log (
+                       FALSE, E_DEBUG_LOG_DOMAIN_CAL_QUERIES,  "---;%p;QUERY-ITEMS;%s;%s;%d", query,
+                       e_cal_backend_sexp_text (sexp), G_OBJECT_TYPE_NAME (backend),
+                       g_list_length (objs_occuring_in_tw));
        }
 
        g_static_rec_mutex_unlock (&priv->idle_save_rmutex);
@@ -1955,8 +1962,9 @@ create_user_free_busy (ECalBackendFile *cbfile,
        /* add all objects in the given interval */
        iso_start = isodate_from_time_t (start);
        iso_end = isodate_from_time_t (end);
-       query = g_strdup_printf ("occur-in-time-range? (make-time \"%s\") (make-time \"%s\")",
-                                iso_start, iso_end);
+       query = g_strdup_printf (
+               "occur-in-time-range? (make-time \"%s\") (make-time \"%s\")",
+               iso_start, iso_end);
        obj_sexp = e_cal_backend_sexp_new (query);
        g_free (query);
        g_free (iso_start);
@@ -1975,8 +1983,9 @@ create_user_free_busy (ECalBackendFile *cbfile,
                        continue;
 
                /* If the event is TRANSPARENT, skip it. */
-               prop = icalcomponent_get_first_property (icalcomp,
-                                                        ICAL_TRANSP_PROPERTY);
+               prop = icalcomponent_get_first_property (
+                       icalcomp,
+                       ICAL_TRANSP_PROPERTY);
                if (prop) {
                        icalproperty_transp transp_val = icalproperty_get_transp (prop);
                        if (transp_val == ICAL_TRANSP_TRANSPARENT ||
@@ -1988,12 +1997,13 @@ create_user_free_busy (ECalBackendFile *cbfile,
                        continue;
 
                vcalendar_comp = icalcomponent_get_parent (icalcomp);
-               e_cal_recur_generate_instances (comp, start, end,
-                                               free_busy_instance,
-                                               vfb,
-                                               resolve_tzid,
-                                               vcalendar_comp,
-                                               icaltimezone_get_utc_timezone ());
+               e_cal_recur_generate_instances (
+                       comp, start, end,
+                       free_busy_instance,
+                       vfb,
+                       resolve_tzid,
+                       vcalendar_comp,
+                       icaltimezone_get_utc_timezone ());
        }
        g_object_unref (obj_sexp);
 
@@ -2276,8 +2286,9 @@ remove_object_instance_cb (gpointer key,
                if ((rrdata->mod == CALOBJ_MOD_THISANDPRIOR && instancett <= fromtt) ||
                    (rrdata->mod == CALOBJ_MOD_THISANDFUTURE && instancett >= fromtt)) {
                        /* remove the component from our data */
-                       icalcomponent_remove_component (rrdata->cbfile->priv->icalcomp,
-                                                       e_cal_component_get_icalcomponent (instance));
+                       icalcomponent_remove_component (
+                               rrdata->cbfile->priv->icalcomp,
+                               e_cal_component_get_icalcomponent (instance));
                        rrdata->cbfile->priv->comp = g_list_remove (rrdata->cbfile->priv->comp, instance);
 
                        rrdata->obj_data->recurrences_list = g_list_remove (rrdata->obj_data->recurrences_list, instance);
@@ -2401,8 +2412,9 @@ e_cal_backend_file_modify_objects (ECalBackendSync *backend,
 
                                /* replace only the full object */
                                if (obj_data->full_object) {
-                                       icalcomponent_remove_component (priv->icalcomp,
-                                                               e_cal_component_get_icalcomponent (obj_data->full_object));
+                                       icalcomponent_remove_component (
+                                               priv->icalcomp,
+                                               e_cal_component_get_icalcomponent (obj_data->full_object));
                                        priv->comp = g_list_remove (priv->comp, obj_data->full_object);
 
                                        g_object_unref (obj_data->full_object);
@@ -2411,8 +2423,9 @@ e_cal_backend_file_modify_objects (ECalBackendSync *backend,
                                /* add the new object */
                                obj_data->full_object = comp;
 
-                               icalcomponent_add_component (priv->icalcomp,
-                                                                e_cal_component_get_icalcomponent (obj_data->full_object));
+                               icalcomponent_add_component (
+                                       priv->icalcomp,
+                                       e_cal_component_get_icalcomponent (obj_data->full_object));
                                priv->comp = g_list_prepend (priv->comp, obj_data->full_object);
                                break;
                        }
@@ -2422,8 +2435,9 @@ e_cal_backend_file_modify_objects (ECalBackendSync *backend,
                                        *old_components = g_slist_prepend (*old_components, e_cal_component_clone (recurrence));
 
                                /* remove the component from our data */
-                               icalcomponent_remove_component (priv->icalcomp,
-                                                               e_cal_component_get_icalcomponent (recurrence));
+                               icalcomponent_remove_component (
+                                       priv->icalcomp,
+                                       e_cal_component_get_icalcomponent (recurrence));
                                priv->comp = g_list_remove (priv->comp, recurrence);
                                obj_data->recurrences_list = g_list_remove (obj_data->recurrences_list, recurrence);
                                g_hash_table_remove (obj_data->recurrences, rid);
@@ -2433,11 +2447,13 @@ e_cal_backend_file_modify_objects (ECalBackendSync *backend,
                        }
 
                        /* add the detached instance */
-                       g_hash_table_insert (obj_data->recurrences,
-                                                g_strdup (rid),
-                                                comp);
-                       icalcomponent_add_component (priv->icalcomp,
-                                                        e_cal_component_get_icalcomponent (comp));
+                       g_hash_table_insert (
+                               obj_data->recurrences,
+                               g_strdup (rid),
+                               comp);
+                       icalcomponent_add_component (
+                               priv->icalcomp,
+                               e_cal_component_get_icalcomponent (comp));
                        priv->comp = g_list_append (priv->comp, comp);
                        obj_data->recurrences_list = g_list_append (obj_data->recurrences_list, comp);
                        break;
@@ -2456,8 +2472,9 @@ e_cal_backend_file_modify_objects (ECalBackendSync *backend,
 
                        /* remove the component from our data, temporarily */
                        if (obj_data->full_object) {
-                               icalcomponent_remove_component (priv->icalcomp,
-                                                       e_cal_component_get_icalcomponent (obj_data->full_object));
+                               icalcomponent_remove_component (
+                                       priv->icalcomp,
+                                       e_cal_component_get_icalcomponent (obj_data->full_object));
                                priv->comp = g_list_remove (priv->comp, obj_data->full_object);
                        }
 
@@ -2468,8 +2485,9 @@ e_cal_backend_file_modify_objects (ECalBackendSync *backend,
                                        *old_components = g_slist_prepend (*old_components, e_cal_component_clone (recurrence));
 
                                /* remove the component from our data */
-                               icalcomponent_remove_component (priv->icalcomp,
-                                                               e_cal_component_get_icalcomponent (recurrence));
+                               icalcomponent_remove_component (
+                                       priv->icalcomp,
+                                       e_cal_component_get_icalcomponent (recurrence));
                                priv->comp = g_list_remove (priv->comp, recurrence);
                                obj_data->recurrences_list = g_list_remove (obj_data->recurrences_list, recurrence);
                                g_hash_table_remove (obj_data->recurrences, rid);
@@ -2488,17 +2506,20 @@ e_cal_backend_file_modify_objects (ECalBackendSync *backend,
                         * so that it's always before any detached instance we
                         * might have */
                        if (obj_data->full_object) {
-                               icalcomponent_add_component (priv->icalcomp,
-                                                        e_cal_component_get_icalcomponent (obj_data->full_object));
+                               icalcomponent_add_component (
+                                       priv->icalcomp,
+                                       e_cal_component_get_icalcomponent (obj_data->full_object));
                                priv->comp = g_list_prepend (priv->comp, obj_data->full_object);
                        }
 
                        /* add the new detached recurrence */
-                       g_hash_table_insert (obj_data->recurrences,
-                                                g_strdup (rid),
-                                                comp);
-                       icalcomponent_add_component (priv->icalcomp,
-                                                        e_cal_component_get_icalcomponent (comp));
+                       g_hash_table_insert (
+                               obj_data->recurrences,
+                               g_strdup (rid),
+                               comp);
+                       icalcomponent_add_component (
+                               priv->icalcomp,
+                               e_cal_component_get_icalcomponent (comp));
                        priv->comp = g_list_append (priv->comp, comp);
                        obj_data->recurrences_list = g_list_append (obj_data->recurrences_list, comp);
                        break;
@@ -2624,8 +2645,9 @@ remove_instance (ECalBackendFile *cbfile,
                        }
 
                        /* remove the component from our data */
-                       icalcomponent_remove_component (cbfile->priv->icalcomp,
-                                                       e_cal_component_get_icalcomponent (comp));
+                       icalcomponent_remove_component (
+                               cbfile->priv->icalcomp,
+                               e_cal_component_get_icalcomponent (comp));
                        cbfile->priv->comp = g_list_remove (cbfile->priv->comp, comp);
                        obj_data->recurrences_list = g_list_remove (obj_data->recurrences_list, comp);
                        g_hash_table_remove (obj_data->recurrences, rid);
@@ -2652,8 +2674,9 @@ remove_instance (ECalBackendFile *cbfile,
                        return obj_data;
 
                /* remove the main component from our data before modifying it */
-               icalcomponent_remove_component (cbfile->priv->icalcomp,
-                                               e_cal_component_get_icalcomponent (obj_data->full_object));
+               icalcomponent_remove_component (
+                       cbfile->priv->icalcomp,
+                       e_cal_component_get_icalcomponent (obj_data->full_object));
                cbfile->priv->comp = g_list_remove (cbfile->priv->comp, obj_data->full_object);
 
                /* add EXDATE or EXRULE to parent, report as update */
@@ -2661,8 +2684,9 @@ remove_instance (ECalBackendFile *cbfile,
                        *old_comp = e_cal_component_clone (obj_data->full_object);
                }
 
-               e_cal_util_remove_instances (e_cal_component_get_icalcomponent (obj_data->full_object),
-                                            icaltime_from_string (rid), CALOBJ_MOD_THIS);
+               e_cal_util_remove_instances (
+                       e_cal_component_get_icalcomponent (obj_data->full_object),
+                       icaltime_from_string (rid), CALOBJ_MOD_THIS);
 
                /* Since we are only removing one instance of recurrence
                 * event, update the last modified time on the component */
@@ -2677,8 +2701,9 @@ remove_instance (ECalBackendFile *cbfile,
                /* add the modified object to the beginning of the list,
                 * so that it's always before any detached instance we
                 * might have */
-               icalcomponent_add_component (cbfile->priv->icalcomp,
-                                            e_cal_component_get_icalcomponent (obj_data->full_object));
+               icalcomponent_add_component (
+                       cbfile->priv->icalcomp,
+                       e_cal_component_get_icalcomponent (obj_data->full_object));
                cbfile->priv->comp = g_list_prepend (cbfile->priv->comp, obj_data->full_object);
        } else {
                if (!obj_data->full_object) {
@@ -2696,8 +2721,9 @@ remove_instance (ECalBackendFile *cbfile,
                        g_message (G_STRLOC " Could not remove component from interval tree!");
                        return obj_data;
                }
-               icalcomponent_remove_component (cbfile->priv->icalcomp,
-                                               e_cal_component_get_icalcomponent (obj_data->full_object));
+               icalcomponent_remove_component (
+                       cbfile->priv->icalcomp,
+                       e_cal_component_get_icalcomponent (obj_data->full_object));
                cbfile->priv->comp = g_list_remove (cbfile->priv->comp, obj_data->full_object);
 
                /* remove parent, report as removal */
@@ -2850,8 +2876,9 @@ e_cal_backend_file_remove_objects (ECalBackendSync *backend,
                        ECalComponent *old_component = NULL;
                        ECalComponent *new_component = NULL;
 
-                       obj_data = remove_instance (cbfile, obj_data, id->uid, recur_id, mod,
-                                                       &old_component, &new_component, error);
+                       obj_data = remove_instance (
+                               cbfile, obj_data, id->uid, recur_id, mod,
+                               &old_component, &new_component, error);
 
                        *old_components = g_slist_prepend (*old_components, old_component);
                        *new_components = g_slist_prepend (*new_components, new_component);
@@ -2865,12 +2892,14 @@ e_cal_backend_file_remove_objects (ECalBackendSync *backend,
                                *old_components = g_slist_prepend (*old_components, e_cal_component_clone (comp));
 
                                /* remove the component from our data, temporarily */
-                               icalcomponent_remove_component (priv->icalcomp,
-                                                       e_cal_component_get_icalcomponent (comp));
+                               icalcomponent_remove_component (
+                                       priv->icalcomp,
+                                       e_cal_component_get_icalcomponent (comp));
                                priv->comp = g_list_remove (priv->comp, comp);
 
-                               e_cal_util_remove_instances (e_cal_component_get_icalcomponent (comp),
-                                                        icaltime_from_string (recur_id), mod);
+                               e_cal_util_remove_instances (
+                                       e_cal_component_get_icalcomponent (comp),
+                                       icaltime_from_string (recur_id), mod);
                        } else {
                                *old_components = g_slist_prepend (*old_components, NULL);
                        }
@@ -2931,8 +2960,9 @@ cancel_received_object (ECalBackendFile *cbfile,
        /* And remove it */
        rid = e_cal_component_get_recurid_as_string (comp);
        if (rid && *rid) {
-               obj_data = remove_instance (cbfile, obj_data, uid, rid, CALOBJ_MOD_THIS,
-                                           old_comp, new_comp, NULL);
+               obj_data = remove_instance (
+                       cbfile, obj_data, uid, rid, CALOBJ_MOD_THIS,
+                       old_comp, new_comp, NULL);
                if (obj_data && obj_data->full_object && !*new_comp) {
                        *new_comp = e_cal_component_clone (obj_data->full_object);
                }
@@ -2994,8 +3024,9 @@ fetch_attachments (ECalBackendSync *backend,
 
                mapped_file = g_mapped_file_new (sfname, FALSE, &error);
                if (!mapped_file) {
-                       g_message ("DEBUG: could not map %s: %s\n",
-                                  sfname, error ? error->message : "???");
+                       g_message (
+                               "DEBUG: could not map %s: %s\n",
+                               sfname, error ? error->message : "???");
                        g_error_free (error);
                        g_free (sfname);
                        continue;
@@ -3006,8 +3037,9 @@ fetch_attachments (ECalBackendSync *backend,
                fd = g_open (dest_file, O_RDWR | O_CREAT | O_TRUNC | O_BINARY, 0600);
                if (fd == -1) {
                        /* TODO handle error conditions */
-                       g_message ("DEBUG: could not open %s for writing\n",
-                                  dest_file);
+                       g_message (
+                               "DEBUG: could not open %s for writing\n",
+                               dest_file);
                } else if (write (fd, g_mapped_file_get_contents (mapped_file),
                                  g_mapped_file_get_length (mapped_file)) == -1) {
                        /* TODO handle error condition */
@@ -3183,8 +3215,9 @@ e_cal_backend_file_receive_objects (ECalBackendSync *backend,
                                if (rid) {
                                        ECalComponent *ignore_comp = NULL;
 
-                                       remove_instance (cbfile, obj_data, uid, rid, CALOBJ_MOD_THIS,
-                                                        &old_component, &ignore_comp, NULL);
+                                       remove_instance (
+                                               cbfile, obj_data, uid, rid, CALOBJ_MOD_THIS,
+                                               &old_component, &ignore_comp, NULL);
 
                                        if (ignore_comp)
                                                g_object_unref (ignore_comp);
@@ -3610,10 +3643,11 @@ get_difference_of_lists (ECalBackendFile *cbfile,
                        time_t time_start, time_end;
                        printf ("%s IS MISSING\n", uid);
 
-                       e_cal_util_get_component_occur_times (comp, &time_start, &time_end,
-                                                  resolve_tzid, cbfile->priv->icalcomp,
-                                                  icaltimezone_get_utc_timezone (),
-                                                  e_cal_backend_get_kind (E_CAL_BACKEND (cbfile)));
+                       e_cal_util_get_component_occur_times (
+                               comp, &time_start, &time_end,
+                               resolve_tzid, cbfile->priv->icalcomp,
+                               icaltimezone_get_utc_timezone (),
+                               e_cal_backend_get_kind (E_CAL_BACKEND (cbfile)));
 
                        d (printf ("start %s\n", asctime (gmtime (&time_start))));
                        d (printf ("end %s\n", asctime (gmtime (&time_end))));
index dd54f43..20bcdd3 100644 (file)
@@ -391,9 +391,10 @@ put_component_to_store (ECalBackendHttp *cb,
                        return FALSE;
        }
 
-       e_cal_util_get_component_occur_times (comp, &time_start, &time_end,
-                                  resolve_tzid, cb, icaltimezone_get_utc_timezone (),
-                                  e_cal_backend_get_kind (E_CAL_BACKEND (cb)));
+       e_cal_util_get_component_occur_times (
+               comp, &time_start, &time_end,
+               resolve_tzid, cb, icaltimezone_get_utc_timezone (),
+               e_cal_backend_get_kind (E_CAL_BACKEND (cb)));
 
        e_cal_backend_store_put_component_with_time_range (priv->store, comp, time_start, time_end);
 
@@ -887,7 +888,8 @@ e_cal_backend_http_open (ECalBackendSync *backend,
                                _("Could not create cache file")));
                        e_cal_backend_notify_opened (
                                E_CAL_BACKEND (backend),
-                               EDC_ERROR_EX (OtherError,
+                               EDC_ERROR_EX (
+                               OtherError,
                                _("Could not create cache file")));
                        return;
                }
@@ -1076,9 +1078,10 @@ e_cal_backend_http_get_object_list (ECalBackendSync *backend,
        cbsexp = e_cal_backend_sexp_new (sexp);
 
        *objects = NULL;
-       prunning_by_time = e_cal_backend_sexp_evaluate_occur_times (cbsexp,
-                                                                           &occur_start,
-                                                                           &occur_end);
+       prunning_by_time = e_cal_backend_sexp_evaluate_occur_times (
+               cbsexp,
+               &occur_start,
+               &occur_end);
 
        components = prunning_by_time ?
                e_cal_backend_store_get_components_occuring_in_range (priv->store, occur_start, occur_end)
@@ -1123,9 +1126,10 @@ e_cal_backend_http_start_view (ECalBackend *backend,
 
        /* process all components in the cache */
        objects = NULL;
-       prunning_by_time = e_cal_backend_sexp_evaluate_occur_times (cbsexp,
-                                                                           &occur_start,
-                                                                           &occur_end);
+       prunning_by_time = e_cal_backend_sexp_evaluate_occur_times (
+               cbsexp,
+               &occur_start,
+               &occur_end);
 
        components = prunning_by_time ?
                e_cal_backend_store_get_components_occuring_in_range (priv->store, occur_start, occur_end)
@@ -1230,8 +1234,9 @@ create_user_free_busy (ECalBackendHttp *cbhttp,
         /* add all objects in the given interval */
        iso_start = isodate_from_time_t (start);
        iso_end = isodate_from_time_t (end);
-       query = g_strdup_printf ("occur-in-time-range? (make-time \"%s\") (make-time \"%s\")",
-                                iso_start, iso_end);
+       query = g_strdup_printf (
+               "occur-in-time-range? (make-time \"%s\") (make-time \"%s\")",
+               iso_start, iso_end);
        obj_sexp = e_cal_backend_sexp_new (query);
        g_free (query);
        g_free (iso_start);
@@ -1252,8 +1257,9 @@ create_user_free_busy (ECalBackendHttp *cbhttp,
                        continue;
 
                 /* If the event is TRANSPARENT, skip it. */
-               prop = icalcomponent_get_first_property (icalcomp,
-                                                        ICAL_TRANSP_PROPERTY);
+               prop = icalcomponent_get_first_property (
+                       icalcomp,
+                       ICAL_TRANSP_PROPERTY);
                if (prop) {
                        icalproperty_transp transp_val = icalproperty_get_transp (prop);
                        if (transp_val == ICAL_TRANSP_TRANSPARENT ||
@@ -1267,12 +1273,13 @@ create_user_free_busy (ECalBackendHttp *cbhttp,
                vcalendar_comp = icalcomponent_get_parent (icalcomp);
                if (!vcalendar_comp)
                        vcalendar_comp = icalcomp;
-               e_cal_recur_generate_instances (comp, start, end,
-                                               free_busy_instance,
-                                               vfb,
-                                               resolve_tzid,
-                                               vcalendar_comp,
-                                               icaltimezone_get_utc_timezone ());
+               e_cal_recur_generate_instances (
+                       comp, start, end,
+                       free_busy_instance,
+                       vfb,
+                       resolve_tzid,
+                       vcalendar_comp,
+                       icaltimezone_get_utc_timezone ());
        }
        g_object_unref (obj_sexp);
 
index 2d555b2..495c164 100644 (file)
@@ -150,9 +150,10 @@ put_component_to_store (ECalBackendWeather *cb,
 
        priv = cb->priv;
 
-       e_cal_util_get_component_occur_times (comp, &time_start, &time_end,
-                                  resolve_tzid, cb, icaltimezone_get_utc_timezone (),
-                                  e_cal_backend_get_kind (E_CAL_BACKEND (cb)));
+       e_cal_util_get_component_occur_times (
+               comp, &time_start, &time_end,
+               resolve_tzid, cb, icaltimezone_get_utc_timezone (),
+               e_cal_backend_get_kind (E_CAL_BACKEND (cb)));
 
        e_cal_backend_store_put_component_with_time_range (priv->store, comp, time_start, time_end);
 }
@@ -607,9 +608,10 @@ e_cal_backend_weather_get_object_list (ECalBackendSync *backend,
        }
 
        *objects = NULL;
-       prunning_by_time = e_cal_backend_sexp_evaluate_occur_times (sexp,
-                                                                   &occur_start,
-                                                                   &occur_end);
+       prunning_by_time = e_cal_backend_sexp_evaluate_occur_times (
+               sexp,
+               &occur_start,
+               &occur_end);
 
        components = prunning_by_time ?
                e_cal_backend_store_get_components_occuring_in_range (priv->store, occur_start, occur_end)
index 39f82aa..dfc43f0 100644 (file)
@@ -673,9 +673,10 @@ e_cal_client_check_timezones (icalcomponent *comp,
                                                         */
                                                        tzidprop = strstr (buffer, fulltzid);
                                                        if (tzidprop) {
-                                                               memmove (tzidprop + baselen,
-                                                                        tzidprop + fulllen,
-                                                                        strlen (tzidprop + fulllen) + 1);
+                                                               memmove (
+                                                                       tzidprop + baselen,
+                                                                       tzidprop + fulllen,
+                                                                       strlen (tzidprop + fulllen) + 1);
                                                        }
                                                        g_free (fulltzid);
                                                }
index f4cba2b..463f14d 100644 (file)
@@ -338,70 +338,86 @@ e_cal_client_view_class_init (ECalClientViewClass *class)
 
        g_type_class_add_private (class, sizeof (ECalClientViewPrivate));
 
-       g_object_class_install_property (object_class, PROP_VIEW,
-               g_param_spec_pointer ("view", "The GDBus view proxy", NULL,
-                                     G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
-
-       g_object_class_install_property (object_class, PROP_CLIENT,
-               g_param_spec_object ("client", "The e-cal-client for the view", NULL, E_TYPE_CAL_CLIENT,
-                                     G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
-        /**
-         * ECalClientView::objects-added:
-         * @view:: self
-         * @objects: (type GSList) (transfer none) (element-type long):
-         */
-       signals[OBJECTS_ADDED] =
-               g_signal_new ("objects-added",
-                             G_TYPE_FROM_CLASS (class),
-                             G_SIGNAL_RUN_FIRST,
-                             G_STRUCT_OFFSET (ECalClientViewClass, objects_added),
-                             NULL, NULL,
-                             g_cclosure_marshal_VOID__POINTER,
-                             G_TYPE_NONE, 1, G_TYPE_POINTER);
-        /**
-         * ECalClientView::objects-modified:
-         * @view:: self
-         * @objects: (type GSList) (transfer none) (element-type long):
-         */
-       signals[OBJECTS_MODIFIED] =
-               g_signal_new ("objects-modified",
-                             G_TYPE_FROM_CLASS (class),
-                             G_SIGNAL_RUN_FIRST,
-                             G_STRUCT_OFFSET (ECalClientViewClass, objects_modified),
-                             NULL, NULL,
-                             g_cclosure_marshal_VOID__POINTER,
-                             G_TYPE_NONE, 1, G_TYPE_POINTER);
-        /**
-         * ECalClientView::objects-removed:
-         * @view:: self
-         * @objects: (type GSList) (transfer none) (element-type ECalComponentId):
-         */
-       signals[OBJECTS_REMOVED] =
-               g_signal_new ("objects-removed",
-                             G_TYPE_FROM_CLASS (class),
-                             G_SIGNAL_RUN_FIRST,
-                             G_STRUCT_OFFSET (ECalClientViewClass, objects_removed),
-                             NULL, NULL,
-                             g_cclosure_marshal_VOID__POINTER,
-                             G_TYPE_NONE, 1, G_TYPE_POINTER);
-
-       signals[PROGRESS] =
-               g_signal_new ("progress",
-                             G_TYPE_FROM_CLASS (class),
-                             G_SIGNAL_RUN_FIRST,
-                             G_STRUCT_OFFSET (ECalClientViewClass, progress),
-                             NULL, NULL,
-                             e_gdbus_marshallers_VOID__UINT_STRING,
-                             G_TYPE_NONE, 2, G_TYPE_UINT, G_TYPE_STRING);
-
-       signals[COMPLETE] =
-               g_signal_new ("complete",
-                             G_TYPE_FROM_CLASS (class),
-                             G_SIGNAL_RUN_FIRST,
-                             G_STRUCT_OFFSET (ECalClientViewClass, complete),
-                             NULL, NULL,
-                             g_cclosure_marshal_VOID__BOXED,
-                             G_TYPE_NONE, 1, G_TYPE_ERROR);
+       g_object_class_install_property (
+               object_class,
+               PROP_VIEW,
+               g_param_spec_pointer (
+                       "view",
+                       "The GDBus view proxy",
+                       NULL,
+                       G_PARAM_READWRITE |
+                       G_PARAM_CONSTRUCT_ONLY));
+
+       g_object_class_install_property (
+               object_class,
+               PROP_CLIENT,
+               g_param_spec_object (
+                       "client",
+                       "The e-cal-client for the view",
+                       NULL,
+                       E_TYPE_CAL_CLIENT,
+                       G_PARAM_READWRITE |
+                       G_PARAM_CONSTRUCT_ONLY));
+
+       /**
+        * ECalClientView::objects-added:
+        * @view:: self
+        * @objects: (type GSList) (transfer none) (element-type long):
+        */
+       signals[OBJECTS_ADDED] = g_signal_new (
+               "objects-added",
+               G_TYPE_FROM_CLASS (class),
+               G_SIGNAL_RUN_FIRST,
+               G_STRUCT_OFFSET (ECalClientViewClass, objects_added),
+               NULL, NULL,
+               g_cclosure_marshal_VOID__POINTER,
+               G_TYPE_NONE, 1, G_TYPE_POINTER);
+
+       /**
+        * ECalClientView::objects-modified:
+        * @view:: self
+        * @objects: (type GSList) (transfer none) (element-type long):
+        */
+       signals[OBJECTS_MODIFIED] = g_signal_new (
+               "objects-modified",
+               G_TYPE_FROM_CLASS (class),
+               G_SIGNAL_RUN_FIRST,
+               G_STRUCT_OFFSET (ECalClientViewClass, objects_modified),
+               NULL, NULL,
+               g_cclosure_marshal_VOID__POINTER,
+               G_TYPE_NONE, 1, G_TYPE_POINTER);
+
+       /**
+        * ECalClientView::objects-removed:
+        * @view:: self
+        * @objects: (type GSList) (transfer none) (element-type ECalComponentId):
+        */
+       signals[OBJECTS_REMOVED] = g_signal_new (
+               "objects-removed",
+               G_TYPE_FROM_CLASS (class),
+               G_SIGNAL_RUN_FIRST,
+               G_STRUCT_OFFSET (ECalClientViewClass, objects_removed),
+               NULL, NULL,
+               g_cclosure_marshal_VOID__POINTER,
+               G_TYPE_NONE, 1, G_TYPE_POINTER);
+
+       signals[PROGRESS] = g_signal_new (
+               "progress",
+               G_TYPE_FROM_CLASS (class),
+               G_SIGNAL_RUN_FIRST,
+               G_STRUCT_OFFSET (ECalClientViewClass, progress),
+               NULL, NULL,
+               e_gdbus_marshallers_VOID__UINT_STRING,
+               G_TYPE_NONE, 2, G_TYPE_UINT, G_TYPE_STRING);
+
+       signals[COMPLETE] = g_signal_new (
+               "complete",
+               G_TYPE_FROM_CLASS (class),
+               G_SIGNAL_RUN_FIRST,
+               G_STRUCT_OFFSET (ECalClientViewClass, complete),
+               NULL, NULL,
+               g_cclosure_marshal_VOID__BOXED,
+               G_TYPE_NONE, 1, G_TYPE_ERROR);
 }
 
 /**
@@ -420,7 +436,8 @@ _e_cal_client_view_new (ECalClient *client,
 {
        ECalClientView *view;
 
-       view = g_object_new (E_TYPE_CAL_CLIENT_VIEW,
+       view = g_object_new (
+               E_TYPE_CAL_CLIENT_VIEW,
                "client", client,
                "view", gdbus_calview,
                NULL);
index 5292974..1d58e6c 100644 (file)
@@ -687,7 +687,8 @@ cal_client_get_backend_property (EClient *client,
        if (prop_value) {
                e_client_finish_async_without_dbus (client, cancellable, callback, user_data, cal_client_get_backend_property_from_cache_finish, prop_value, g_free);
        } else {
-               e_client_proxy_call_string_with_res_op_data (client, prop_name, cancellable, callback, user_data, cal_client_get_backend_property, prop_name,
+               e_client_proxy_call_string_with_res_op_data (
+                       client, prop_name, cancellable, callback, user_data, cal_client_get_backend_property, prop_name,
                        e_gdbus_cal_call_get_backend_property,
                        NULL, NULL, e_gdbus_cal_call_get_backend_property_finish, NULL, NULL);
        }
@@ -770,9 +771,10 @@ cal_client_set_backend_property (EClient *client,
 
        prop_name_value = e_gdbus_cal_encode_set_backend_property (prop_name, prop_value);
 
-       e_client_proxy_call_strv (client, (const gchar * const *) prop_name_value, cancellable, callback, user_data, cal_client_set_backend_property,
-                       e_gdbus_cal_call_set_backend_property,
-                       e_gdbus_cal_call_set_backend_property_finish, NULL, NULL, NULL, NULL);
+       e_client_proxy_call_strv (
+               client, (const gchar * const *) prop_name_value, cancellable, callback, user_data, cal_client_set_backend_property,
+               e_gdbus_cal_call_set_backend_property,
+               e_gdbus_cal_call_set_backend_property_finish, NULL, NULL, NULL, NULL);
 
        g_strfreev (prop_name_value);
 }
@@ -819,9 +821,10 @@ cal_client_open (EClient *client,
                  GAsyncReadyCallback callback,
                  gpointer user_data)
 {
-       e_client_proxy_call_boolean (client, only_if_exists, cancellable, callback, user_data, cal_client_open,
-                       e_gdbus_cal_call_open,
-                       e_gdbus_cal_call_open_finish, NULL, NULL, NULL, NULL);
+       e_client_proxy_call_boolean (
+               client, only_if_exists, cancellable, callback, user_data, cal_client_open,
+               e_gdbus_cal_call_open,
+               e_gdbus_cal_call_open_finish, NULL, NULL, NULL, NULL);
 }
 
 static gboolean
@@ -858,9 +861,10 @@ cal_client_refresh (EClient *client,
                     GAsyncReadyCallback callback,
                     gpointer user_data)
 {
-       e_client_proxy_call_void (client, cancellable, callback, user_data, cal_client_refresh,
-                       e_gdbus_cal_call_refresh,
-                       e_gdbus_cal_call_refresh_finish, NULL, NULL, NULL, NULL);
+       e_client_proxy_call_void (
+               client, cancellable, callback, user_data, cal_client_refresh,
+               e_gdbus_cal_call_refresh,
+               e_gdbus_cal_call_refresh_finish, NULL, NULL, NULL, NULL);
 }
 
 static gboolean
@@ -1550,22 +1554,24 @@ process_detached_instances (GSList *instances,
                                                 * recurrency ids. Real problem might be elsewhere,
                                                 * but anything is better than crashing...
                                                 */
-                                               g_log (G_LOG_DOMAIN,
-                                                      G_LOG_LEVEL_CRITICAL,
-                                                      "UID %s: instance RECURRENCE-ID %s + detached instance RECURRENCE-ID %s: cannot compare",
-                                                      uid,
-                                                      i_rid,
-                                                      d_rid);
+                                               g_log (
+                                                       G_LOG_DOMAIN,
+                                                       G_LOG_LEVEL_CRITICAL,
+                                                       "UID %s: instance RECURRENCE-ID %s + detached instance RECURRENCE-ID %s: cannot compare",
+                                                       uid,
+                                                       i_rid,
+                                                       d_rid);
 
                                                e_cal_component_free_datetime (&instance_recur_id.datetime);
                                                g_free (i_rid);
                                                g_free (d_rid);
                                                continue;
                                        }
-                                       cmp = icaltime_compare (*instance_recur_id.datetime.value,
-                                                               *recur_id.datetime.value);
+                                       cmp = icaltime_compare (
+                                               *instance_recur_id.datetime.value,
+                                               *recur_id.datetime.value);
                                        if ((recur_id.type == E_CAL_COMPONENT_RANGE_THISPRIOR && cmp <= 0) ||
-                                           (recur_id.type == E_CAL_COMPONENT_RANGE_THISFUTURE && cmp >= 0)) {
+                                               (recur_id.type == E_CAL_COMPONENT_RANGE_THISFUTURE && cmp >= 0)) {
                                                ECalComponent *comp;
 
                                                comp = e_cal_component_new ();
@@ -1711,9 +1717,10 @@ generate_instances (ECalClient *client,
                        instances_hold->start_zone = start_zone;
                        instances_hold->end_zone = end_zone;
 
-                       e_cal_recur_generate_instances (comp, start, end, add_instance, instances_hold,
-                                                       e_cal_client_resolve_tzid_cb, client,
-                                                       default_zone);
+                       e_cal_recur_generate_instances (
+                               comp, start, end, add_instance, instances_hold,
+                               e_cal_client_resolve_tzid_cb, client,
+                               default_zone);
 
                        g_free (instances_hold);
                }
@@ -1806,8 +1813,9 @@ get_objects_sync (ECalClient *client,
                        return NULL;
                }
 
-               query = g_strdup_printf ("(occur-in-time-range? (make-time \"%s\") (make-time \"%s\"))",
-                                        iso_start, iso_end);
+               query = g_strdup_printf (
+                       "(occur-in-time-range? (make-time \"%s\") (make-time \"%s\"))",
+                       iso_start, iso_end);
                g_free (iso_start);
                g_free (iso_end);
                if (!e_cal_client_get_object_list_as_comps_sync (client, query, &objects, NULL, NULL)) {
@@ -2489,11 +2497,12 @@ e_cal_client_get_component_as_string (ECalClient *client,
        /* Create the start of a VCALENDAR, to add the VTIMEZONES to,
         * and remember its length so we know if any VTIMEZONEs get added. */
        vcal_string = g_string_new (NULL);
-       g_string_append (vcal_string,
-                        "BEGIN:VCALENDAR\n"
-                        "PRODID:-//Ximian//NONSGML Evolution Calendar//EN\n"
-                        "VERSION:2.0\n"
-                        "METHOD:PUBLISH\n");
+       g_string_append (
+               vcal_string,
+               "BEGIN:VCALENDAR\n"
+               "PRODID:-//Ximian//NONSGML Evolution Calendar//EN\n"
+               "VERSION:2.0\n"
+               "METHOD:PUBLISH\n");
 
        /* Now concatenate all the timezone strings. This also frees the
         * timezone strings as it goes. */
@@ -2618,7 +2627,8 @@ e_cal_client_get_default_object (ECalClient *client,
        if (prop_value) {
                e_client_finish_async_without_dbus (base_client, cancellable, callback, user_data, cal_client_get_default_object_from_cache_finish, prop_value, g_free);
        } else {
-               e_client_proxy_call_string (base_client, CAL_BACKEND_PROPERTY_DEFAULT_OBJECT, cancellable, callback, user_data, e_cal_client_get_default_object,
+               e_client_proxy_call_string (
+                       base_client, CAL_BACKEND_PROPERTY_DEFAULT_OBJECT, cancellable, callback, user_data, e_cal_client_get_default_object,
                        e_gdbus_cal_call_get_backend_property,
                        NULL, NULL, e_gdbus_cal_call_get_backend_property_finish, NULL, NULL);
        }
@@ -2836,9 +2846,10 @@ e_cal_client_get_object (ECalClient *client,
 
        strv = e_gdbus_cal_encode_get_object (uid, rid);
 
-       e_client_proxy_call_strv (E_CLIENT (client), (const gchar * const *) strv, cancellable, callback, user_data, e_cal_client_get_object,
-                       e_gdbus_cal_call_get_object,
-                       NULL, NULL, e_gdbus_cal_call_get_object_finish, NULL, NULL);
+       e_client_proxy_call_strv (
+               E_CLIENT (client), (const gchar * const *) strv, cancellable, callback, user_data, e_cal_client_get_object,
+               e_gdbus_cal_call_get_object,
+               NULL, NULL, e_gdbus_cal_call_get_object_finish, NULL, NULL);
 
        g_strfreev (strv);
 }
@@ -2957,9 +2968,10 @@ e_cal_client_get_objects_for_uid (ECalClient *client,
 
        strv = e_gdbus_cal_encode_get_object (uid, "");
 
-       e_client_proxy_call_strv (E_CLIENT (client), (const gchar * const *) strv, cancellable, callback, user_data, e_cal_client_get_objects_for_uid,
-                       e_gdbus_cal_call_get_object,
-                       NULL, NULL, e_gdbus_cal_call_get_object_finish, NULL, NULL);
+       e_client_proxy_call_strv (
+               E_CLIENT (client), (const gchar * const *) strv, cancellable, callback, user_data, e_cal_client_get_objects_for_uid,
+               e_gdbus_cal_call_get_object,
+               NULL, NULL, e_gdbus_cal_call_get_object_finish, NULL, NULL);
 
        g_strfreev (strv);
 }
@@ -3123,9 +3135,10 @@ e_cal_client_get_object_list (ECalClient *client,
 
        g_return_if_fail (sexp != NULL);
 
-       e_client_proxy_call_string (E_CLIENT (client), e_util_ensure_gdbus_string (sexp, &gdbus_sexp), cancellable, callback, user_data, e_cal_client_get_object_list,
-                       e_gdbus_cal_call_get_object_list,
-                       NULL, NULL, NULL, e_gdbus_cal_call_get_object_list_finish, NULL);
+       e_client_proxy_call_string (
+               E_CLIENT (client), e_util_ensure_gdbus_string (sexp, &gdbus_sexp), cancellable, callback, user_data, e_cal_client_get_object_list,
+               e_gdbus_cal_call_get_object_list,
+               NULL, NULL, NULL, e_gdbus_cal_call_get_object_list_finish, NULL);
 
        g_free (gdbus_sexp);
 }
@@ -3264,9 +3277,10 @@ e_cal_client_get_object_list_as_comps (ECalClient *client,
 
        g_return_if_fail (sexp != NULL);
 
-       e_client_proxy_call_string (E_CLIENT (client), e_util_ensure_gdbus_string (sexp, &gdbus_sexp), cancellable, callback, user_data, e_cal_client_get_object_list_as_comps,
-                       e_gdbus_cal_call_get_object_list,
-                       NULL, NULL, NULL, e_gdbus_cal_call_get_object_list_finish, NULL);
+       e_client_proxy_call_string (
+               E_CLIENT (client), e_util_ensure_gdbus_string (sexp, &gdbus_sexp), cancellable, callback, user_data, e_cal_client_get_object_list_as_comps,
+               e_gdbus_cal_call_get_object_list,
+               NULL, NULL, NULL, e_gdbus_cal_call_get_object_list_finish, NULL);
 
        g_free (gdbus_sexp);
 }
@@ -3418,9 +3432,10 @@ e_cal_client_get_free_busy (ECalClient *client,
 
        strv = e_gdbus_cal_encode_get_free_busy (start, end, users);
 
-       e_client_proxy_call_strv (E_CLIENT (client), (const gchar * const *) strv, cancellable, callback, user_data, e_cal_client_get_free_busy,
-                       e_gdbus_cal_call_get_free_busy,
-                       e_gdbus_cal_call_get_free_busy_finish, NULL, NULL, NULL, NULL);
+       e_client_proxy_call_strv (
+               E_CLIENT (client), (const gchar * const *) strv, cancellable, callback, user_data, e_cal_client_get_free_busy,
+               e_gdbus_cal_call_get_free_busy,
+               e_gdbus_cal_call_get_free_busy_finish, NULL, NULL, NULL, NULL);
 
        g_strfreev (strv);
 }
@@ -3521,9 +3536,10 @@ e_cal_client_create_object (ECalClient *client,
 
        g_return_if_fail (strv[0] != NULL);
 
-       e_client_proxy_call_strv (E_CLIENT (client), strv, cancellable, callback, user_data, e_cal_client_create_object,
-                       e_gdbus_cal_call_create_objects,
-                       NULL, NULL, NULL, e_gdbus_cal_call_create_objects_finish, NULL);
+       e_client_proxy_call_strv (
+               E_CLIENT (client), strv, cancellable, callback, user_data, e_cal_client_create_object,
+               e_gdbus_cal_call_create_objects,
+               NULL, NULL, NULL, e_gdbus_cal_call_create_objects_finish, NULL);
 
        g_free (comp_str);
        g_free (gdbus_comp);
@@ -3655,9 +3671,10 @@ e_cal_client_create_objects (ECalClient *client,
 
        array = icalcomponent_slist_to_utf8_icomp_array (icalcomps);
 
-       e_client_proxy_call_strv (E_CLIENT (client), (const gchar * const *) array, cancellable, callback, user_data, e_cal_client_create_objects,
-                       e_gdbus_cal_call_create_objects,
-                       NULL, NULL, NULL, e_gdbus_cal_call_create_objects_finish, NULL);
+       e_client_proxy_call_strv (
+               E_CLIENT (client), (const gchar * const *) array, cancellable, callback, user_data, e_cal_client_create_objects,
+               e_gdbus_cal_call_create_objects,
+               NULL, NULL, NULL, e_gdbus_cal_call_create_objects_finish, NULL);
 
        g_strfreev (array);
 }
@@ -3779,9 +3796,10 @@ e_cal_client_modify_object (ECalClient *client,
        comp_strings.data = comp_str;
        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_object,
-                       e_gdbus_cal_call_modify_objects,
-                       e_gdbus_cal_call_modify_objects_finish, NULL, NULL, NULL, NULL);
+       e_client_proxy_call_strv (
+               E_CLIENT (client), (const gchar * const *) strv, cancellable, callback, user_data, e_cal_client_modify_object,
+               e_gdbus_cal_call_modify_objects,
+               e_gdbus_cal_call_modify_objects_finish, NULL, NULL, NULL, NULL);
 
        g_strfreev (strv);
        g_free (comp_str);
@@ -3897,9 +3915,10 @@ e_cal_client_modify_objects (ECalClient *client,
        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,
-                       e_gdbus_cal_call_modify_objects,
-                       e_gdbus_cal_call_modify_objects_finish, NULL, NULL, NULL, NULL);
+       e_client_proxy_call_strv (
+               E_CLIENT (client), (const gchar * const *) strv, cancellable, callback, user_data, e_cal_client_modify_objects,
+               e_gdbus_cal_call_modify_objects,
+               e_gdbus_cal_call_modify_objects_finish, NULL, NULL, NULL, NULL);
 
        g_strfreev (strv);
        e_client_util_free_string_slist (comp_strings);
@@ -4018,9 +4037,10 @@ e_cal_client_remove_object (ECalClient *client,
        ids.data = &id;
        strv = e_gdbus_cal_encode_remove_objects (&ids, mod);
 
-       e_client_proxy_call_strv (E_CLIENT (client), (const gchar * const *) strv, cancellable, callback, user_data, e_cal_client_remove_object,
-                       e_gdbus_cal_call_remove_objects,
-                       e_gdbus_cal_call_remove_objects_finish, NULL, NULL, NULL, NULL);
+       e_client_proxy_call_strv (
+               E_CLIENT (client), (const gchar * const *) strv, cancellable, callback, user_data, e_cal_client_remove_object,
+               e_gdbus_cal_call_remove_objects,
+               e_gdbus_cal_call_remove_objects_finish, NULL, NULL, NULL, NULL);
 
        g_strfreev (strv);
 }
@@ -4131,9 +4151,10 @@ e_cal_client_remove_objects (ECalClient *client,
 
        strv = e_gdbus_cal_encode_remove_objects (ids, mod);
 
-       e_client_proxy_call_strv (E_CLIENT (client), (const gchar * const *) strv, cancellable, callback, user_data, e_cal_client_remove_objects,
-                       e_gdbus_cal_call_remove_objects,
-                       e_gdbus_cal_call_remove_objects_finish, NULL, NULL, NULL, NULL);
+       e_client_proxy_call_strv (
+               E_CLIENT (client), (const gchar * const *) strv, cancellable, callback, user_data, e_cal_client_remove_objects,
+               e_gdbus_cal_call_remove_objects,
+               e_gdbus_cal_call_remove_objects_finish, NULL, NULL, NULL, NULL);
 
        g_strfreev (strv);
 }
@@ -4233,9 +4254,10 @@ e_cal_client_receive_objects (ECalClient *client,
 
        comp_str = icalcomponent_as_ical_string_r (icalcomp);
 
-       e_client_proxy_call_string (E_CLIENT (client), e_util_ensure_gdbus_string (comp_str, &gdbus_comp), cancellable, callback, user_data, e_cal_client_receive_objects,
-                       e_gdbus_cal_call_receive_objects,
-                       e_gdbus_cal_call_receive_objects_finish, NULL, NULL, NULL, NULL);
+       e_client_proxy_call_string (
+               E_CLIENT (client), e_util_ensure_gdbus_string (comp_str, &gdbus_comp), cancellable, callback, user_data, e_cal_client_receive_objects,
+               e_gdbus_cal_call_receive_objects,
+               e_gdbus_cal_call_receive_objects_finish, NULL, NULL, NULL, NULL);
 
        g_free (comp_str);
        g_free (gdbus_comp);
@@ -4330,9 +4352,10 @@ e_cal_client_send_objects (ECalClient *client,
 
        comp_str = icalcomponent_as_ical_string_r (icalcomp);
 
-       e_client_proxy_call_string (E_CLIENT (client), e_util_ensure_gdbus_string (comp_str, &gdbus_comp), cancellable, callback, user_data, e_cal_client_send_objects,
-                       e_gdbus_cal_call_send_objects,
-                       NULL, NULL, NULL, e_gdbus_cal_call_send_objects_finish, NULL);
+       e_client_proxy_call_string (
+               E_CLIENT (client), e_util_ensure_gdbus_string (comp_str, &gdbus_comp), cancellable, callback, user_data, e_cal_client_send_objects,
+               e_gdbus_cal_call_send_objects,
+               NULL, NULL, NULL, e_gdbus_cal_call_send_objects_finish, NULL);
 
        g_free (comp_str);
        g_free (gdbus_comp);
@@ -4494,9 +4517,10 @@ e_cal_client_get_attachment_uris (ECalClient *client,
 
        strv = e_gdbus_cal_encode_get_attachment_uris (uid, rid);
 
-       e_client_proxy_call_strv (E_CLIENT (client), (const gchar * const *) strv, cancellable, callback, user_data, e_cal_client_get_attachment_uris,
-                       e_gdbus_cal_call_get_attachment_uris,
-                       NULL, NULL, NULL, e_gdbus_cal_call_get_attachment_uris_finish, NULL);
+       e_client_proxy_call_strv (
+               E_CLIENT (client), (const gchar * const *) strv, cancellable, callback, user_data, e_cal_client_get_attachment_uris,
+               e_gdbus_cal_call_get_attachment_uris,
+               NULL, NULL, NULL, e_gdbus_cal_call_get_attachment_uris_finish, NULL);
 
        g_strfreev (strv);
 }
@@ -4627,9 +4651,10 @@ e_cal_client_discard_alarm (ECalClient *client,
 
        strv = e_gdbus_cal_encode_discard_alarm (uid, rid, auid);
 
-       e_client_proxy_call_strv (E_CLIENT (client), (const gchar * const *) strv, cancellable, callback, user_data, e_cal_client_discard_alarm,
-                       e_gdbus_cal_call_discard_alarm,
-                       e_gdbus_cal_call_discard_alarm_finish, NULL, NULL, NULL, NULL);
+       e_client_proxy_call_strv (
+               E_CLIENT (client), (const gchar * const *) strv, cancellable, callback, user_data, e_cal_client_discard_alarm,
+               e_gdbus_cal_call_discard_alarm,
+               e_gdbus_cal_call_discard_alarm_finish, NULL, NULL, NULL, NULL);
 
        g_strfreev (strv);
 }
@@ -4723,9 +4748,10 @@ e_cal_client_get_view (ECalClient *client,
 
        g_return_if_fail (sexp != NULL);
 
-       e_client_proxy_call_string (E_CLIENT (client), e_util_ensure_gdbus_string (sexp, &gdbus_sexp), cancellable, callback, user_data, e_cal_client_get_view,
-                       e_gdbus_cal_call_get_view,
-                       NULL, NULL, e_gdbus_cal_call_get_view_finish, NULL, NULL);
+       e_client_proxy_call_string (
+               E_CLIENT (client), e_util_ensure_gdbus_string (sexp, &gdbus_sexp), cancellable, callback, user_data, e_cal_client_get_view,
+               e_gdbus_cal_call_get_view,
+               NULL, NULL, e_gdbus_cal_call_get_view_finish, NULL, NULL);
 
        g_free (gdbus_sexp);
 }
@@ -4743,12 +4769,13 @@ complete_get_view (ECalClient *client,
                EGdbusCalView *gdbus_calview;
                GError *local_error = NULL;
 
-               gdbus_calview = e_gdbus_cal_view_proxy_new_sync (g_dbus_proxy_get_connection (G_DBUS_PROXY (cal_factory)),
-                                                               G_DBUS_PROXY_FLAGS_NONE,
-                                                               CALENDAR_DBUS_SERVICE_NAME,
-                                                               view_path,
-                                                               NULL,
-                                                               &local_error);
+               gdbus_calview = e_gdbus_cal_view_proxy_new_sync (
+                       g_dbus_proxy_get_connection (G_DBUS_PROXY (cal_factory)),
+                       G_DBUS_PROXY_FLAGS_NONE,
+                       CALENDAR_DBUS_SERVICE_NAME,
+                       view_path,
+                       NULL,
+                       &local_error);
 
                if (gdbus_calview) {
                        *view = _e_cal_client_view_new (client, gdbus_calview);
@@ -4979,9 +5006,10 @@ e_cal_client_get_timezone (ECalClient *client,
        if (zone) {
                e_client_finish_async_without_dbus (E_CLIENT (client), cancellable, callback, user_data, cal_client_get_timezone_from_cache, zone, NULL);
        } else {
-               e_client_proxy_call_string (E_CLIENT (client), e_util_ensure_gdbus_string (tzid, &gdbus_tzid), cancellable, callback, user_data, e_cal_client_get_timezone,
-                               e_gdbus_cal_call_get_timezone,
-                               NULL, NULL, e_gdbus_cal_call_get_timezone_finish, NULL, NULL);
+               e_client_proxy_call_string (
+                       E_CLIENT (client), e_util_ensure_gdbus_string (tzid, &gdbus_tzid), cancellable, callback, user_data, e_cal_client_get_timezone,
+                       e_gdbus_cal_call_get_timezone,
+                       NULL, NULL, e_gdbus_cal_call_get_timezone_finish, NULL, NULL);
 
                g_free (gdbus_tzid);
        }
@@ -5142,9 +5170,10 @@ e_cal_client_add_timezone (ECalClient *client,
 
        zone_str = icalcomponent_as_ical_string_r (icalcomp);
 
-       e_client_proxy_call_string (E_CLIENT (client), e_util_ensure_gdbus_string (zone_str, &gdbus_zone), cancellable, callback, user_data, e_cal_client_add_timezone,
-                       e_gdbus_cal_call_add_timezone,
-                       e_gdbus_cal_call_add_timezone_finish, NULL, NULL, NULL, NULL);
+       e_client_proxy_call_string (
+               E_CLIENT (client), e_util_ensure_gdbus_string (zone_str, &gdbus_zone), cancellable, callback, user_data, e_cal_client_add_timezone,
+               e_gdbus_cal_call_add_timezone,
+               e_gdbus_cal_call_add_timezone_finish, NULL, NULL, NULL, NULL);
 
        g_free (zone_str);
        g_free (gdbus_zone);
index 3c709af..80324e8 100644 (file)
@@ -406,13 +406,14 @@ e_cal_component_gen_uid (void)
        }
 
        iso = isodate_from_time_t (t);
-       ret = g_strdup_printf ("%s-%d-%d-%d-%d@%s",
-                              iso,
-                              getpid (),
-                              getgid (),
-                              getppid (),
-                              serial++,
-                              hostname);
+       ret = g_strdup_printf (
+               "%s-%d-%d-%d-%d@%s",
+               iso,
+               getpid (),
+               getgid (),
+               getppid (),
+               serial++,
+               hostname);
        g_free (iso);
 
        return ret;
@@ -2371,10 +2372,11 @@ e_cal_component_set_completed (ECalComponent *comp,
        priv = comp->priv;
        g_return_if_fail (priv->icalcomp != NULL);
 
-       set_icaltimetype (comp, &priv->completed,
-                         icalproperty_new_completed,
-                         icalproperty_set_completed,
-                         t);
+       set_icaltimetype (
+               comp, &priv->completed,
+               icalproperty_new_completed,
+               icalproperty_set_completed,
+               t);
 }
 
 /**
@@ -2423,10 +2425,11 @@ e_cal_component_set_created (ECalComponent *comp,
        priv = comp->priv;
        g_return_if_fail (priv->icalcomp != NULL);
 
-       set_icaltimetype (comp, &priv->created,
-                         icalproperty_new_created,
-                         icalproperty_set_created,
-                         t);
+       set_icaltimetype (
+               comp, &priv->created,
+               icalproperty_new_created,
+               icalproperty_set_created,
+               t);
 }
 
 /**
@@ -2606,8 +2609,9 @@ e_cal_component_get_start_plus_duration (ECalComponent *comp,
        }
 
        /* Add on the DURATION. */
-       icaltime_adjust (dt->value, duration.days, duration.hours,
-                        duration.minutes, duration.seconds);
+       icaltime_adjust (
+               dt->value, duration.days, duration.hours,
+               duration.minutes, duration.seconds);
 }
 
 /**
@@ -2662,10 +2666,11 @@ e_cal_component_set_dtend (ECalComponent *comp,
        priv = comp->priv;
        g_return_if_fail (priv->icalcomp != NULL);
 
-       set_datetime (comp, &priv->dtend,
-                     icalproperty_new_dtend,
-                     icalproperty_set_dtend,
-                     dt);
+       set_datetime (
+               comp, &priv->dtend,
+               icalproperty_new_dtend,
+               icalproperty_set_dtend,
+               dt);
 
        /* Make sure we remove any existing DURATION property, as it can't be
         * used with a DTEND. If DTEND is set to NULL, i.e. removed, we also
@@ -2781,10 +2786,11 @@ e_cal_component_set_dtstart (ECalComponent *comp,
        priv = comp->priv;
        g_return_if_fail (priv->icalcomp != NULL);
 
-       set_datetime (comp, &priv->dtstart,
-                     icalproperty_new_dtstart,
-                     icalproperty_set_dtstart,
-                     dt);
+       set_datetime (
+               comp, &priv->dtstart,
+               icalproperty_new_dtstart,
+               icalproperty_set_dtstart,
+               dt);
 
        priv->need_sequence_inc = TRUE;
 }
@@ -2841,10 +2847,11 @@ e_cal_component_set_due (ECalComponent *comp,
        priv = comp->priv;
        g_return_if_fail (priv->icalcomp != NULL);
 
-       set_datetime (comp, &priv->due,
-                     icalproperty_new_due,
-                     icalproperty_set_due,
-                     dt);
+       set_datetime (
+               comp, &priv->due,
+               icalproperty_new_due,
+               icalproperty_set_due,
+               dt);
 
        /* Make sure we remove any existing DURATION property, as it can't be
         * used with a DTEND. If DTEND is set to NULL, i.e. removed, we also
@@ -2900,8 +2907,9 @@ get_period_list (GSList *period_list,
                                else
                                        p->type = E_CAL_COMPONENT_PERIOD_DURATION;
                        } else {
-                               g_message ("get_period_list(): Unknown value for period %d; "
-                                          "using DATETIME", value_type);
+                               g_message (
+                                       "get_period_list(): Unknown value for period %d; "
+                                       "using DATETIME", value_type);
                                p->type = E_CAL_COMPONENT_PERIOD_DATETIME;
                        }
                } else
@@ -3421,10 +3429,11 @@ e_cal_component_set_last_modified (ECalComponent *comp,
        priv = comp->priv;
        g_return_if_fail (priv->icalcomp != NULL);
 
-       set_icaltimetype (comp, &priv->last_modified,
-                         icalproperty_new_lastmodified,
-                         icalproperty_set_lastmodified,
-                         t);
+       set_icaltimetype (
+               comp, &priv->last_modified,
+               icalproperty_new_lastmodified,
+               icalproperty_set_lastmodified,
+               t);
 }
 
 /**
@@ -3515,13 +3524,15 @@ e_cal_component_set_organizer (ECalComponent *comp,
                g_return_if_fail (priv->organizer.prop != NULL);
 
                if (priv->organizer.sentby_param)
-                       icalparameter_set_sentby (priv->organizer.sentby_param,
-                                                 (gchar *) organizer->sentby);
+                       icalparameter_set_sentby (
+                               priv->organizer.sentby_param,
+                               (gchar *) organizer->sentby);
                else {
                        priv->organizer.sentby_param = icalparameter_new_sentby (
                                (gchar *) organizer->sentby);
-                       icalproperty_add_parameter (priv->organizer.prop,
-                                                   priv->organizer.sentby_param);
+                       icalproperty_add_parameter (
+                               priv->organizer.prop,
+                               priv->organizer.sentby_param);
                }
        } else if (priv->organizer.sentby_param) {
                icalproperty_remove_parameter (priv->organizer.prop, ICAL_SENTBY_PARAMETER);
@@ -3532,13 +3543,15 @@ e_cal_component_set_organizer (ECalComponent *comp,
                g_return_if_fail (priv->organizer.prop != NULL);
 
                if (priv->organizer.cn_param)
-                       icalparameter_set_cn (priv->organizer.cn_param,
-                                                 (gchar *) organizer->cn);
+                       icalparameter_set_cn (
+                               priv->organizer.cn_param,
+                               (gchar *) organizer->cn);
                else {
                        priv->organizer.cn_param = icalparameter_new_cn (
                                (gchar *) organizer->cn);
-                       icalproperty_add_parameter (priv->organizer.prop,
-                                                   priv->organizer.cn_param);
+                       icalproperty_add_parameter (
+                               priv->organizer.prop,
+                               priv->organizer.cn_param);
                }
        } else if (priv->organizer.cn_param) {
                icalproperty_remove_parameter (priv->organizer.prop, ICAL_CN_PARAMETER);
@@ -3549,13 +3562,15 @@ e_cal_component_set_organizer (ECalComponent *comp,
                g_return_if_fail (priv->organizer.prop != NULL);
 
                if (priv->organizer.language_param)
-                       icalparameter_set_language (priv->organizer.language_param,
-                                                 (gchar *) organizer->language);
+                       icalparameter_set_language (
+                               priv->organizer.language_param,
+                               (gchar *) organizer->language);
                else {
                        priv->organizer.language_param = icalparameter_new_language (
                                (gchar *) organizer->language);
-                       icalproperty_add_parameter (priv->organizer.prop,
-                                                   priv->organizer.language_param);
+                       icalproperty_add_parameter (
+                               priv->organizer.prop,
+                               priv->organizer.language_param);
                }
        } else if (priv->organizer.language_param) {
                icalproperty_remove_parameter (priv->organizer.prop, ICAL_LANGUAGE_PARAMETER);
@@ -3799,9 +3814,10 @@ e_cal_component_get_recurid (ECalComponent *comp,
        priv = comp->priv;
        g_return_if_fail (priv->icalcomp != NULL);
 
-       get_datetime (&priv->recur_id.recur_time,
-                     icalproperty_get_recurrenceid,
-                     &recur_id->datetime);
+       get_datetime (
+               &priv->recur_id.recur_time,
+               icalproperty_get_recurrenceid,
+               &recur_id->datetime);
 }
 
 /**
@@ -3853,10 +3869,11 @@ e_cal_component_set_recurid (ECalComponent *comp,
        priv = comp->priv;
        g_return_if_fail (priv->icalcomp != NULL);
 
-       set_datetime (comp, &priv->recur_id.recur_time,
-                     icalproperty_new_recurrenceid,
-                     icalproperty_set_recurrenceid,
-                     recur_id ? &recur_id->datetime : NULL);
+       set_datetime (
+               comp, &priv->recur_id.recur_time,
+               icalproperty_new_recurrenceid,
+               icalproperty_set_recurrenceid,
+               recur_id ? &recur_id->datetime : NULL);
 }
 
 /**
@@ -4519,13 +4536,15 @@ e_cal_component_set_summary (ECalComponent *comp,
                g_return_if_fail (priv->summary.prop != NULL);
 
                if (priv->summary.altrep_param)
-                       icalparameter_set_altrep (priv->summary.altrep_param,
-                                                 (gchar *) summary->altrep);
+                       icalparameter_set_altrep (
+                               priv->summary.altrep_param,
+                               (gchar *) summary->altrep);
                else {
                        priv->summary.altrep_param = icalparameter_new_altrep (
                                (gchar *) summary->altrep);
-                       icalproperty_add_parameter (priv->summary.prop,
-                                                   priv->summary.altrep_param);
+                       icalproperty_add_parameter (
+                               priv->summary.prop,
+                               priv->summary.altrep_param);
                }
        } else if (priv->summary.altrep_param) {
                icalproperty_remove_parameter (priv->summary.prop, ICAL_ALTREP_PARAMETER);
@@ -5850,8 +5869,9 @@ e_cal_component_alarm_set_description (ECalComponentAlarm *alarm,
        if (description->altrep) {
                alarm->description.altrep_param = icalparameter_new_altrep (
                        (gchar *) description->altrep);
-               icalproperty_add_parameter (alarm->description.prop,
-                                           alarm->description.altrep_param);
+               icalproperty_add_parameter (
+                       alarm->description.prop,
+                       alarm->description.altrep_param);
        }
 }
 
@@ -5964,8 +5984,10 @@ e_cal_component_alarm_get_trigger (ECalComponentAlarm *alarm,
                        break;
 
                default:
-                       g_message ("e_cal_component_alarm_get_trigger(): Unknown value for trigger "
-                                  "value %d; using RELATIVE", value);
+                       g_message (
+                               "e_cal_component_alarm_get_trigger(): "
+                               "Unknown value for trigger "
+                               "value %d; using RELATIVE", value);
 
                        relative = TRUE;
                        break;
index 1b99666..711de27 100644 (file)
@@ -637,9 +637,10 @@ e_cal_recur_generate_instances (ECalComponent *comp,
        g_print ("  start: %li - %s", start, ctime (&start));
        g_print ("  end  : %li - %s", end, ctime (&end));
 #endif
-       e_cal_recur_generate_instances_of_rule (comp, NULL, start, end,
-                                               cb, cb_data, tz_cb, tz_cb_data,
-                                               default_timezone);
+       e_cal_recur_generate_instances_of_rule (
+               comp, NULL, start, end,
+               cb, cb_data, tz_cb, tz_cb_data,
+               default_timezone);
 }
 
 /*
@@ -691,8 +692,9 @@ e_cal_recur_generate_instances_of_rule (ECalComponent *comp,
        e_cal_component_get_dtend (comp, &dtend);
 
        if (!dtstart.value) {
-               g_message ("e_cal_recur_generate_instances_of_rule(): bogus "
-                          "component, does not have DTSTART.  Skipping...");
+               g_message (
+                       "e_cal_recur_generate_instances_of_rule(): bogus "
+                       "component, does not have DTSTART.  Skipping...");
                goto out;
        }
 
@@ -711,8 +713,9 @@ e_cal_recur_generate_instances_of_rule (ECalComponent *comp,
                convert_end_date = TRUE;
        }
 
-       dtstart_time = icaltime_as_timet_with_zone (*dtstart.value,
-                                                   start_zone);
+       dtstart_time = icaltime_as_timet_with_zone (
+               *dtstart.value,
+               start_zone);
        if (start == -1)
                start = dtstart_time;
 
@@ -816,8 +819,9 @@ e_cal_recur_generate_instances_of_rule (ECalComponent *comp,
         * occurrences. We can't just subtract start from end since that may
         * be affected by daylight-saving time. So we want a value of days
         * + seconds. */
-       cal_object_compute_duration (&event_start, &event_end,
-                                    &days, &seconds);
+       cal_object_compute_duration (
+               &event_start, &event_end,
+               &days, &seconds);
 
        /* Take off the duration from interval_start, so we get occurrences
         * that start just before the start time but overlap it. But only do
@@ -1002,7 +1006,8 @@ e_cal_recur_from_icalproperty (icalproperty *prop,
        r->freq = ir.freq;
 
        if (G_UNLIKELY (ir.interval < 1)) {
-               g_warning ("Invalid interval in rule %s - using 1\n",
+               g_warning (
+                       "Invalid interval in rule %s - using 1\n",
                        icalrecurrencetype_as_string (&ir));
                r->interval = 1;
        } else {
@@ -1038,10 +1043,12 @@ e_cal_recur_from_icalproperty (icalproperty *prop,
 
                weekday = e_cal_recur_ical_weekday_to_weekday (day);
 
-               r->byday = g_list_prepend (r->byday,
-                                          GINT_TO_POINTER (weeknum));
-               r->byday = g_list_prepend (r->byday,
-                                          GINT_TO_POINTER (weekday));
+               r->byday = g_list_prepend (
+                       r->byday,
+                       GINT_TO_POINTER (weeknum));
+               r->byday = g_list_prepend (
+                       r->byday,
+                       GINT_TO_POINTER (weekday));
        }
 
        r->byhour = array_to_list (ir.by_hour, G_N_ELEMENTS (ir.by_hour));
@@ -1084,8 +1091,9 @@ e_cal_recur_ical_weekday_to_weekday (enum icalrecurrencetype_weekday day)
                weekday = 6;
                break;
        default:
-               g_warning ("e_cal_recur_ical_weekday_to_weekday(): Unknown week day %d",
-                          day);
+               g_warning (
+                       "e_cal_recur_ical_weekday_to_weekday(): Unknown week day %d",
+                       day);
                weekday = 0;
        }
 
@@ -1157,21 +1165,23 @@ generate_instances_for_chunk (ECalComponent *comp,
        gboolean cb_status = TRUE, rule_finished, finished = TRUE;
 
 #if 0
-       g_print ("In generate_instances_for_chunk rrules: %p\n"
-                "  %i/%i/%i %02i:%02i:%02i - %i/%i/%i %02i:%02i:%02i\n",
-                rrules,
-                chunk_start->day, chunk_start->month + 1,
-                chunk_start->year, chunk_start->hour,
-                chunk_start->minute, chunk_start->second,
-                chunk_end->day, chunk_end->month + 1,
-                chunk_end->year, chunk_end->hour,
-                chunk_end->minute, chunk_end->second);
+       g_print (
+               "In generate_instances_for_chunk rrules: %p\n"
+               "  %i/%i/%i %02i:%02i:%02i - %i/%i/%i %02i:%02i:%02i\n",
+               rrules,
+               chunk_start->day, chunk_start->month + 1,
+               chunk_start->year, chunk_start->hour,
+               chunk_start->minute, chunk_start->second,
+               chunk_end->day, chunk_end->month + 1,
+               chunk_end->year, chunk_end->hour,
+               chunk_end->minute, chunk_end->second);
 #endif
 
        occs = g_array_new (FALSE, FALSE, sizeof (CalObjTime));
        ex_occs = g_array_new (FALSE, FALSE, sizeof (CalObjTime));
-       rdate_periods = g_array_new (FALSE, FALSE,
-                                    sizeof (CalObjRecurrenceDate));
+       rdate_periods = g_array_new (
+               FALSE, FALSE,
+               sizeof (CalObjRecurrenceDate));
 
        /* The original DTSTART property is included in the occurrence set,
         * but not if we are just generating occurrences for a single rule. */
@@ -1191,13 +1201,15 @@ generate_instances_for_chunk (ECalComponent *comp,
                ECalRecurrence *r;
 
                prop = elem->data;
-               r = e_cal_recur_from_icalproperty (prop, FALSE, zone,
-                                                convert_end_date);
-
-               tmp_occs = cal_obj_expand_recurrence (event_start, zone, r,
-                                                     chunk_start,
-                                                     chunk_end,
-                                                     &rule_finished);
+               r = e_cal_recur_from_icalproperty (
+                       prop, FALSE, zone,
+                       convert_end_date);
+
+               tmp_occs = cal_obj_expand_recurrence (
+                       event_start, zone, r,
+                       chunk_start,
+                       chunk_end,
+                       &rule_finished);
                e_cal_recur_free (r);
 
                /* If any of the rules return FALSE for finished, we know we
@@ -1258,13 +1270,15 @@ generate_instances_for_chunk (ECalComponent *comp,
                ECalRecurrence *r;
 
                prop = elem->data;
-               r = e_cal_recur_from_icalproperty (prop, FALSE, zone,
-                                                convert_end_date);
-
-               tmp_occs = cal_obj_expand_recurrence (event_start, zone, r,
-                                                     chunk_start,
-                                                     chunk_end,
-                                                     &rule_finished);
+               r = e_cal_recur_from_icalproperty (
+                       prop, FALSE, zone,
+                       convert_end_date);
+
+               tmp_occs = cal_obj_expand_recurrence (
+                       event_start, zone, r,
+                       chunk_start,
+                       chunk_end,
+                       &rule_finished);
                e_cal_recur_free (r);
 
                g_array_append_vals (ex_occs, tmp_occs->data, tmp_occs->len);
@@ -1305,8 +1319,9 @@ generate_instances_for_chunk (ECalComponent *comp,
        cal_obj_sort_occurrences (occs);
        cal_obj_sort_occurrences (ex_occs);
 
-       qsort (rdate_periods->data, rdate_periods->len,
-              sizeof (CalObjRecurrenceDate), cal_obj_time_compare_func);
+       qsort (
+               rdate_periods->data, rdate_periods->len,
+               sizeof (CalObjRecurrenceDate), cal_obj_time_compare_func);
 
        /* Create the final array, by removing the exceptions from the
         * occurrences, and removing any duplicates. */
@@ -1319,8 +1334,9 @@ generate_instances_for_chunk (ECalComponent *comp,
                 * check it is within the bounds of the event & interval. */
                occ = &g_array_index (occs, CalObjTime, i);
 #if 0
-               g_print ("Checking occurrence: %s\n",
-                        cal_obj_time_to_string (occ));
+               g_print (
+                       "Checking occurrence: %s\n",
+                       cal_obj_time_to_string (occ));
 #endif
                start_tt = icaltime_null_time ();
                start_tt.year   = occ->year;
@@ -1357,8 +1373,9 @@ generate_instances_for_chunk (ECalComponent *comp,
                         * as the original occurrence. */
                        if (!cal_object_get_rdate_end (occ, rdate_periods, zone)) {
                                cal_obj_time_add_days (occ, duration_days);
-                               cal_obj_time_add_seconds (occ,
-                                                         duration_seconds);
+                               cal_obj_time_add_seconds (
+                                       occ,
+                                       duration_seconds);
                        }
                } else {
                        cal_obj_time_add_days (occ, duration_days);
@@ -1455,8 +1472,10 @@ cal_object_get_rdate_end (CalObjTime *occ,
                occ->second   = tt.second;
                occ->flags    = FALSE;
        } else {
-               cal_obj_time_add_days (occ, p->u.duration.weeks * 7
-                                      + p->u.duration.days);
+               cal_obj_time_add_days (
+                       occ,
+                       p->u.duration.weeks * 7 +
+                       p->u.duration.days);
                cal_obj_time_add_hours (occ, p->u.duration.hours);
                cal_obj_time_add_minutes (occ, p->u.duration.minutes);
                cal_obj_time_add_seconds (occ, p->u.duration.seconds);
@@ -1476,10 +1495,10 @@ cal_object_compute_duration (CalObjTime *start,
 
        g_date_clear (&start_date, 1);
        g_date_clear (&end_date, 1);
-       g_date_set_dmy (&start_date, start->day, start->month + 1,
-                       start->year);
-       g_date_set_dmy (&end_date, end->day, end->month + 1,
-                       end->year);
+       g_date_set_dmy (
+               &start_date, start->day, start->month + 1, start->year);
+       g_date_set_dmy (
+               &end_date, end->day, end->month + 1, end->year);
 
        *days = g_date_get_julian (&end_date) - g_date_get_julian (&start_date);
        start_seconds = start->hour * 3600 + start->minute * 60
@@ -1529,8 +1548,9 @@ cal_obj_expand_recurrence (CalObjTime *event_start,
 
        /* Compute the event_end, if the recur's enddate is set. */
        if (recur->enddate > 0) {
-               cal_object_time_from_time (&event_end_cotime,
-                                          recur->enddate, zone);
+               cal_object_time_from_time (
+                       &event_end_cotime,
+                       recur->enddate, zone);
                event_end = &event_end_cotime;
 
                /* If the enddate is before the requested interval return. */
@@ -1558,16 +1578,19 @@ cal_obj_expand_recurrence (CalObjTime *event_start,
                /* Generate the set of occurrences for this period. */
                switch (recur->freq) {
                case ICAL_YEARLY_RECURRENCE:
-                       occs = cal_obj_generate_set_yearly (&recur_data,
-                                                           vtable, &occ);
+                       occs = cal_obj_generate_set_yearly (
+                               &recur_data,
+                               vtable, &occ);
                        break;
                case ICAL_MONTHLY_RECURRENCE:
-                       occs = cal_obj_generate_set_monthly (&recur_data,
-                                                            vtable, &occ);
+                       occs = cal_obj_generate_set_monthly (
+                               &recur_data,
+                               vtable, &occ);
                        break;
                default:
-                       occs = cal_obj_generate_set_default (&recur_data,
-                                                            vtable, &occ);
+                       occs = cal_obj_generate_set_default (
+                               &recur_data,
+                               vtable, &occ);
                        break;
                }
 
@@ -1648,15 +1671,17 @@ cal_obj_generate_set_yearly (RecurData *recur_data,
                        GArray *new_occs = g_array_new (FALSE, FALSE, sizeof (CalObjTime));
 
                        /* Copy the occs array. */
-                       occs2 = g_array_new (FALSE, FALSE,
-                                            sizeof (CalObjTime));
+                       occs2 = g_array_new (
+                               FALSE, FALSE,
+                               sizeof (CalObjTime));
                        g_array_append_vals (occs2, occs->data, occs->len);
 
                        occs = (*vtable->bymonthday_filter) (recur_data, occs);
                        /* Note that we explicitly call the monthly version
                         * of the BYDAY expansion filter. */
-                       occs2 = cal_obj_byday_expand_monthly (recur_data,
-                                                             occs2);
+                       occs2 = cal_obj_byday_expand_monthly (
+                               recur_data,
+                               occs2);
 
                        /* Add only intersection of those two arrays. */
                        g_array_append_vals (occs, occs2->data, occs2->len);
@@ -1797,9 +1822,10 @@ cal_obj_generate_set_default (RecurData *recur_data,
        GArray *occs;
 
 #if 0
-       g_print ("Generating set for %i/%i/%i %02i:%02i:%02i\n",
-                occ->day, occ->month + 1, occ->year, occ->hour, occ->minute,
-                occ->second);
+       g_print (
+               "Generating set for %i/%i/%i %02i:%02i:%02i\n",
+               occ->day, occ->month + 1, occ->year, occ->hour, occ->minute,
+               occ->second);
 #endif
 
        /* We start with just the one time in the set. */
@@ -1874,8 +1900,9 @@ cal_obj_initialize_recur_data (RecurData *recur_data,
 
        /* Set the weekday, used for the WEEKLY frequency and the BYWEEKNO
         * modifier. */
-       recur_data->weekday_offset = cal_obj_time_weekday_offset (event_start,
-                                                                 recur);
+       recur_data->weekday_offset = cal_obj_time_weekday_offset (
+               event_start,
+               recur);
 
        /* Create an array of months from bymonths for fast lookup. */
        elem = recur->bymonth;
@@ -1947,8 +1974,9 @@ cal_obj_initialize_recur_data (RecurData *recur_data,
 static void
 cal_obj_sort_occurrences (GArray *occs)
 {
-       qsort (occs->data, occs->len, sizeof (CalObjTime),
-              cal_obj_time_compare_func);
+       qsort (
+               occs->data, occs->len, sizeof (CalObjTime),
+               cal_obj_time_compare_func);
 }
 
 static void
@@ -2263,11 +2291,13 @@ cal_obj_weekly_find_start_position (CalObjTime *event_start,
        /* Convert the event start and interval start to GDates, so we can
         * easily find the number of days between them. */
        g_date_clear (&event_start_date, 1);
-       g_date_set_dmy (&event_start_date, event_start->day,
-                       event_start->month + 1, event_start->year);
+       g_date_set_dmy (
+               &event_start_date, event_start->day,
+               event_start->month + 1, event_start->year);
        g_date_clear (&interval_start_date, 1);
-       g_date_set_dmy (&interval_start_date, interval_start->day,
-                       interval_start->month + 1, interval_start->year);
+       g_date_set_dmy (
+               &interval_start_date, interval_start->day,
+               interval_start->month + 1, interval_start->year);
 
        /* Calculate the start of the weeks corresponding to the event start
         * and interval start. */
@@ -2326,8 +2356,9 @@ cal_obj_weekly_find_next_position (CalObjTime *cotime,
        if (interval_end && cal_obj_time_compare (&week_start, interval_end,
                                                  CALOBJ_DAY) > 0) {
 #ifdef CAL_OBJ_DEBUG
-               g_print ("Interval end reached: %s\n",
-                        cal_obj_time_to_string (interval_end));
+               g_print (
+                       "Interval end reached: %s\n",
+                       cal_obj_time_to_string (interval_end));
 #endif
                return TRUE;
        }
@@ -2358,11 +2389,13 @@ cal_obj_daily_find_start_position (CalObjTime *event_start,
        /* Convert the event start and interval start to GDates, so we can
         * easily find the number of days between them. */
        g_date_clear (&event_start_date, 1);
-       g_date_set_dmy (&event_start_date, event_start->day,
-                       event_start->month + 1, event_start->year);
+       g_date_set_dmy (
+               &event_start_date, event_start->day,
+               event_start->month + 1, event_start->year);
        g_date_clear (&interval_start_date, 1);
-       g_date_set_dmy (&interval_start_date, interval_start->day,
-                       interval_start->month + 1, interval_start->year);
+       g_date_set_dmy (
+               &interval_start_date, interval_start->day,
+               interval_start->month + 1, interval_start->year);
 
        event_start_julian = g_date_get_julian (&event_start_date);
        interval_start_julian = g_date_get_julian (&interval_start_date);
@@ -2374,11 +2407,9 @@ cal_obj_daily_find_start_position (CalObjTime *event_start,
                cal_obj_time_add_days (cotime, days);
        }
 
-       if (event_end && cal_obj_time_compare (cotime, event_end,
-                                              CALOBJ_DAY) > 0)
+       if (event_end && cal_obj_time_compare (cotime, event_end, CALOBJ_DAY) > 0)
                return TRUE;
-       if (interval_end && cal_obj_time_compare (cotime, interval_end,
-                                                 CALOBJ_DAY) > 0)
+       if (interval_end && cal_obj_time_compare (cotime, interval_end, CALOBJ_DAY) > 0)
                return TRUE;
 
        return FALSE;
@@ -2427,12 +2458,14 @@ cal_obj_hourly_find_start_position (CalObjTime *event_start,
                /* Convert the event start and interval start to GDates, so we
                 * can easily find the number of days between them. */
                g_date_clear (&event_start_date, 1);
-               g_date_set_dmy (&event_start_date, event_start->day,
-                               event_start->month + 1, event_start->year);
+               g_date_set_dmy (
+                       &event_start_date, event_start->day,
+                       event_start->month + 1, event_start->year);
                g_date_clear (&interval_start_date, 1);
-               g_date_set_dmy (&interval_start_date, interval_start->day,
-                               interval_start->month + 1,
-                               interval_start->year);
+               g_date_set_dmy (
+                       &interval_start_date, interval_start->day,
+                       interval_start->month + 1,
+                       interval_start->year);
 
                event_start_julian = g_date_get_julian (&event_start_date);
                interval_start_julian = g_date_get_julian (&interval_start_date);
@@ -2497,12 +2530,14 @@ cal_obj_minutely_find_start_position (CalObjTime *event_start,
                /* Convert the event start and interval start to GDates, so we
                 * can easily find the number of days between them. */
                g_date_clear (&event_start_date, 1);
-               g_date_set_dmy (&event_start_date, event_start->day,
-                               event_start->month + 1, event_start->year);
+               g_date_set_dmy (
+                       &event_start_date, event_start->day,
+                       event_start->month + 1, event_start->year);
                g_date_clear (&interval_start_date, 1);
-               g_date_set_dmy (&interval_start_date, interval_start->day,
-                               interval_start->month + 1,
-                               interval_start->year);
+               g_date_set_dmy (
+                       &interval_start_date, interval_start->day,
+                       interval_start->month + 1,
+                       interval_start->year);
 
                event_start_julian = g_date_get_julian (&event_start_date);
                interval_start_julian = g_date_get_julian (&interval_start_date);
@@ -2569,12 +2604,14 @@ cal_obj_secondly_find_start_position (CalObjTime *event_start,
                /* Convert the event start and interval start to GDates, so we
                 * can easily find the number of days between them. */
                g_date_clear (&event_start_date, 1);
-               g_date_set_dmy (&event_start_date, event_start->day,
-                               event_start->month + 1, event_start->year);
+               g_date_set_dmy (
+                       &event_start_date, event_start->day,
+                       event_start->month + 1, event_start->year);
                g_date_clear (&interval_start_date, 1);
-               g_date_set_dmy (&interval_start_date, interval_start->day,
-                               interval_start->month + 1,
-                               interval_start->year);
+               g_date_set_dmy (
+                       &interval_start_date, interval_start->day,
+                       interval_start->month + 1,
+                       interval_start->year);
 
                event_start_julian = g_date_get_julian (&event_start_date);
                interval_start_julian = g_date_get_julian (&interval_start_date);
@@ -2707,15 +2744,17 @@ cal_obj_byweekno_expand (RecurData *recur_data,
                 * week 1 is the first week starting from the specified week
                 * start day that has 4 days in the new year). */
                year_start_cotime = *occ;
-               cal_obj_time_find_first_week (&year_start_cotime,
-                                             recur_data);
+               cal_obj_time_find_first_week (
+                       &year_start_cotime,
+                       recur_data);
 
                /* Find the day that would correspond to week 1 of the next
                 * year, which we use for -ve week numbers. */
                year_end_cotime = *occ;
                year_end_cotime.year++;
-               cal_obj_time_find_first_week (&year_end_cotime,
-                                             recur_data);
+               cal_obj_time_find_first_week (
+                       &year_end_cotime,
+                       recur_data);
 
                /* Now iterate over the week numbers in byweekno, generating a
                 * new occurrence for each one. */
@@ -2724,8 +2763,9 @@ cal_obj_byweekno_expand (RecurData *recur_data,
                        weekno = GPOINTER_TO_INT (elem->data);
                        if (weekno > 0) {
                                cotime = year_start_cotime;
-                               cal_obj_time_add_days (&cotime,
-                                                      (weekno - 1) * 7);
+                               cal_obj_time_add_days (
+                                       &cotime,
+                                       (weekno - 1) * 7);
                        } else {
                                cotime = year_end_cotime;
                                cal_obj_time_add_days (&cotime, weekno * 7);
@@ -2917,8 +2957,9 @@ cal_obj_bymonthday_filter (RecurData *recur_data,
                if (recur_data->monthdays[occ->day]) {
                        g_array_append_vals (new_occs, occ, 1);
                } else {
-                       days_in_month = time_days_in_month (occ->year,
-                                                           occ->month);
+                       days_in_month = time_days_in_month (
+                               occ->year,
+                               occ->month);
                        if (recur_data->neg_monthdays[days_in_month + 1
                                                     - occ->day])
                                g_array_append_vals (new_occs, occ, 1);
@@ -3063,8 +3104,9 @@ cal_obj_byday_expand_monthly (RecurData *recur_data,
 
                        } else {
                                /* Add the -nth Mon/Tue/etc. in the month. */
-                               occ->day = time_days_in_month (occ->year,
-                                                              occ->month);
+                               occ->day = time_days_in_month (
+                                       occ->year,
+                                       occ->month);
                                last_weekday = cal_obj_time_weekday (occ);
 
                                /* This calculates the number of days to step
@@ -3398,8 +3440,9 @@ cal_obj_time_add_days (CalObjTime *cotime,
 
        if (days >= 0) {
                for (;;) {
-                       days_in_month = time_days_in_month (cotime->year,
-                                                           cotime->month);
+                       days_in_month = time_days_in_month (
+                               cotime->year,
+                               cotime->month);
                        if (day <= days_in_month)
                                break;
 
@@ -3422,8 +3465,9 @@ cal_obj_time_add_days (CalObjTime *cotime,
                                cotime->month--;
                        }
 
-                       days_in_month = time_days_in_month (cotime->year,
-                                                           cotime->month);
+                       days_in_month = time_days_in_month (
+                               cotime->year,
+                               cotime->month);
                        day += days_in_month;
                }
 
@@ -3766,10 +3810,11 @@ cal_obj_time_to_string (CalObjTime *cotime)
 
        weekday = cal_obj_time_weekday (cotime);
 
-       sprintf (buffer, "%s %02i/%02i/%04i %02i:%02i:%02i",
-                weekdays[weekday],
-                cotime->day, cotime->month + 1, cotime->year,
-                cotime->hour, cotime->minute, cotime->second);
+       sprintf (
+               buffer, "%s %02i/%02i/%04i %02i:%02i:%02i",
+               weekdays[weekday],
+               cotime->day, cotime->month + 1, cotime->year,
+               cotime->hour, cotime->minute, cotime->second);
        return buffer;
 }
 #endif
@@ -3864,10 +3909,11 @@ e_cal_recur_ensure_rule_end_date (ECalComponent *comp,
        cb_data.count = rule.count;
        cb_data.instances = 0;
        cb_data.end_date = 0;
-       e_cal_recur_generate_instances_of_rule (comp, prop, -1, -1,
-                                             e_cal_recur_ensure_rule_end_date_cb,
-                                             &cb_data, tz_cb, tz_cb_data,
-                                             icaltimezone_get_utc_timezone ());
+       e_cal_recur_generate_instances_of_rule (
+               comp, prop, -1, -1,
+               e_cal_recur_ensure_rule_end_date_cb,
+               &cb_data, tz_cb, tz_cb_data,
+               icaltimezone_get_utc_timezone ());
 
        /* Store the end date in the "X-EVOLUTION-ENDDATE" parameter of the
         * rule. */
@@ -3915,21 +3961,24 @@ e_cal_recur_get_rule_end_date (icalproperty *prop,
                xname = icalparameter_get_xname (param);
                if (xname && !strcmp (xname, EVOLUTION_END_DATE_PARAMETER)) {
                        xvalue = icalparameter_get_x (param);
-                       value = icalvalue_new_from_string (ICAL_DATETIME_VALUE,
-                                                          xvalue);
+                       value = icalvalue_new_from_string (
+                               ICAL_DATETIME_VALUE,
+                               xvalue);
                        if (value) {
                                icaltime = icalvalue_get_datetime (value);
                                icalvalue_free (value);
 
                                zone = default_timezone ? default_timezone :
                                        icaltimezone_get_utc_timezone ();
-                               return icaltime_as_timet_with_zone (icaltime,
-                                                                   zone);
+                               return icaltime_as_timet_with_zone (
+                                       icaltime,
+                                       zone);
                        }
                }
 
-               param = icalproperty_get_next_parameter (prop,
-                                                        ICAL_X_PARAMETER);
+               param = icalproperty_get_next_parameter (
+                       prop,
+                       ICAL_X_PARAMETER);
        }
 
        return -1;
index e3b7919..0244f22 100644 (file)
@@ -145,8 +145,8 @@ system_timezone_read_key_file (const gchar *filename,
                                        if (retval)
                                                g_free (retval);
 
-                                       retval = g_strndup (value + 1,
-                                                           len - 2);
+                                       retval = g_strndup (
+                                               value + 1, len - 2);
                                }
                        } else {
                                if (retval)
@@ -171,40 +171,40 @@ system_timezone_read_key_file (const gchar *filename,
 static gchar *
 system_timezone_read_etc_sysconfig_clock (GHashTable *ical_zones)
 {
-       return system_timezone_read_key_file (ETC_SYSCONFIG_CLOCK,
-                                             "ZONE");
+       return system_timezone_read_key_file (
+               ETC_SYSCONFIG_CLOCK, "ZONE");
 }
 
 /* This works for openSUSE */
 static gchar *
 system_timezone_read_etc_sysconfig_clock_alt (GHashTable *ical_zones)
 {
-       return system_timezone_read_key_file (ETC_SYSCONFIG_CLOCK,
-                                             "TIMEZONE");
+       return system_timezone_read_key_file (
+               ETC_SYSCONFIG_CLOCK, "TIMEZONE");
 }
 
 /* This works for Solaris/OpenSolaris */
 static gchar *
 system_timezone_read_etc_TIMEZONE (GHashTable *ical_zones)
 {
-       return system_timezone_read_key_file (ETC_TIMEZONE_MAJ,
-                                             "TZ");
+       return system_timezone_read_key_file (
+               ETC_TIMEZONE_MAJ, "TZ");
 }
 
 /* This works for Arch Linux */
 static gchar *
 system_timezone_read_etc_rc_conf (GHashTable *ical_zones)
 {
-       return system_timezone_read_key_file (ETC_RC_CONF,
-                                             "TIMEZONE");
+       return system_timezone_read_key_file (
+               ETC_RC_CONF, "TIMEZONE");
 }
 
 /* This works for old Gentoo */
 static gchar *
 system_timezone_read_etc_conf_d_clock (GHashTable *ical_zones)
 {
-       return system_timezone_read_key_file (ETC_CONF_D_CLOCK,
-                                             "TIMEZONE");
+       return system_timezone_read_key_file (
+               ETC_CONF_D_CLOCK, "TIMEZONE");
 }
 
 static void
@@ -294,14 +294,15 @@ recursive_compare (struct stat *localtime_stat,
                while ((subfile = g_dir_read_name (dir)) != NULL) {
                        subpath = g_build_filename (file, subfile, NULL);
 
-                       ret = recursive_compare (localtime_stat,
-                                                localtime_content,
-                                                localtime_content_len,
-                                                subpath,
-                                                compare_func,
-                                                ical_zones,
-                                                deep_level + 1,
-                                                fallback);
+                       ret = recursive_compare (
+                               localtime_stat,
+                               localtime_content,
+                               localtime_content_len,
+                               subpath,
+                               compare_func,
+                               ical_zones,
+                               deep_level + 1,
+                               fallback);
 
                        g_free (subpath);
 
@@ -357,14 +358,15 @@ system_timezone_read_etc_localtime_hardlink (GHashTable *ical_zones)
        if (!S_ISREG (stat_localtime.st_mode))
                return NULL;
 
-       retval = recursive_compare (&stat_localtime,
-                                 NULL,
-                                 0,
-                                 SYSTEM_ZONEINFODIR,
-                                 files_are_identical_inode,
-                                 ical_zones,
-                                 0,
-                                 &fallback);
+       retval = recursive_compare (
+               &stat_localtime,
+               NULL,
+               0,
+               SYSTEM_ZONEINFODIR,
+               files_are_identical_inode,
+               ical_zones,
+               0,
+               &fallback);
 
        if (retval)
                g_free (fallback);
@@ -448,14 +450,15 @@ system_timezone_read_etc_localtime_content (GHashTable *ical_zones)
                }
        }
 
-       retval = recursive_compare (&stat_localtime,
-                                  localtime_content,
-                                  localtime_content_len,
-                                  SYSTEM_ZONEINFODIR,
-                                  files_are_identical_content,
-                                  ical_zones,
-                                  0,
-                                  &fallback);
+       retval = recursive_compare (
+               &stat_localtime,
+               localtime_content,
+               localtime_content_len,
+               SYSTEM_ZONEINFODIR,
+               files_are_identical_content,
+               ical_zones,
+               0,
+               &fallback);
 
        if (retval)
                g_free (fallback);
@@ -832,7 +835,8 @@ system_timezone_win32_query_registry (void)
        gchar timeZoneStd[MAX_VALUE_NAME] = "";
        gchar subKey[MAX_VALUE_NAME] = "";
 
-       res = RegOpenKeyExA (HKEY_LOCAL_MACHINE,
+       res = RegOpenKeyExA (
+               HKEY_LOCAL_MACHINE,
                "SYSTEM\\CurrentControlSet\\Control\\TimeZoneInformation", 0, KEY_READ, &reg_key);
        if (res != ERROR_SUCCESS) {
                g_debug ("Could not find system timezone! (1)\n");
@@ -863,7 +867,8 @@ system_timezone_win32_query_registry (void)
        RegCloseKey (reg_key);
 
        /* Windows NT and its family */
-       res = RegOpenKeyExA (HKEY_LOCAL_MACHINE,
+       res = RegOpenKeyExA (
+               HKEY_LOCAL_MACHINE,
                "SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Time Zones",
                0, KEY_READ, &reg_key);
        if (res != ERROR_SUCCESS) {
@@ -879,7 +884,8 @@ system_timezone_win32_query_registry (void)
                        if (res != ERROR_SUCCESS)
                                continue;
                        size = MAX_VALUE_NAME;
-                       res = RegQueryValueExA (reg_subkey, "Std", 0, &type,
+                       res = RegQueryValueExA (
+                               reg_subkey, "Std", 0, &type,
                                (LPBYTE) timeZoneStd, &size);
                        RegCloseKey (reg_subkey);
                        if (type != REG_SZ || res != ERROR_SUCCESS) {
index d54c805..1c57ca7 100644 (file)
@@ -435,8 +435,9 @@ time_to_gdate_with_zone (GDate *date,
        g_return_if_fail (date != NULL);
        g_return_if_fail (time != -1);
 
-       tt = icaltime_from_timet_with_zone (time, FALSE,
-                                           zone ? zone : icaltimezone_get_utc_timezone ());
+       tt = icaltime_from_timet_with_zone (
+               time, FALSE,
+               zone ? zone : icaltimezone_get_utc_timezone ());
 
        g_date_set_dmy (date, tt.day, tt.month, tt.year);
 }
index 8a8746b..000f655 100644 (file)
@@ -602,10 +602,11 @@ e_cal_util_generate_alarms_for_comp (ECalComponent *comp,
        aod.triggers = NULL;
        aod.n_triggers = 0;
 
-       e_cal_recur_generate_instances (comp, alarm_start, alarm_end,
-                                       add_alarm_occurrences_cb, &aod,
-                                       resolve_tzid, user_data,
-                                       default_timezone);
+       e_cal_recur_generate_instances (
+               comp, alarm_start, alarm_end,
+               add_alarm_occurrences_cb, &aod,
+               resolve_tzid, user_data,
+               default_timezone);
 
        /* We add the ABSOLUTE triggers separately */
        generate_absolute_triggers (comp, &aod, resolve_tzid, user_data, default_timezone);
@@ -766,8 +767,9 @@ add_timezone_cb (icalparameter *param,
        if (!vtz_comp)
                return;
 
-       icalcomponent_add_component (f_data->vcal_comp,
-                                    icalcomponent_new_clone (vtz_comp));
+       icalcomponent_add_component (
+               f_data->vcal_comp,
+               icalcomponent_new_clone (vtz_comp));
 }
 
 /**
@@ -1267,15 +1269,16 @@ e_cal_util_get_component_occur_times (ECalComponent *comp,
                e_cal_component_get_completed (comp, &tt);
                if (tt) {
                        /* COMPLETED must be in UTC. */
-                       completed_time = icaltime_as_timet_with_zone (*tt,
-                                                                     icaltimezone_get_utc_timezone ());
+                       completed_time = icaltime_as_timet_with_zone (
+                               *tt, icaltimezone_get_utc_timezone ());
                        e_cal_component_free_icaltimetype (tt);
                }
 
                e_cal_component_get_due (comp, &dt_due);
                if (dt_due.value != NULL)
-                       due_time = componenttime_to_utc_timet (&dt_due, tz_cb, tz_cb_data,
-                                                              default_timezone);
+                       due_time = componenttime_to_utc_timet (
+                               &dt_due, tz_cb, tz_cb_data,
+                               default_timezone);
 
                e_cal_component_free_datetime (&dt_due);
 
index fdcd323..c0c3777 100644 (file)
@@ -307,79 +307,96 @@ e_cal_view_class_init (ECalViewClass *class)
 
        g_type_class_add_private (class, sizeof (ECalViewPrivate));
 
-       g_object_class_install_property (object_class, PROP_VIEW,
-               g_param_spec_pointer ("view", "The GDBus view proxy", NULL,
-                                     G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
-
-       g_object_class_install_property (object_class, PROP_CLIENT,
-               g_param_spec_object ("client", "The e-cal for the view", NULL, E_TYPE_CAL,
-                                     G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
-        /**
-         * ECalView::objects-added:
-         * @view:: self
-         * @objects: (type GLib.List) (transfer none) (element-type long):
-         */
-       signals[OBJECTS_ADDED] =
-               g_signal_new ("objects_added",
-                             G_TYPE_FROM_CLASS (class),
-                             G_SIGNAL_RUN_FIRST,
-                             G_STRUCT_OFFSET (ECalViewClass, objects_added),
-                             NULL, NULL,
-                             g_cclosure_marshal_VOID__POINTER,
-                             G_TYPE_NONE, 1, G_TYPE_POINTER);
-        /**
-         * ECalView::objects-modified:
-         * @view:: self
-         * @objects: (type GLib.List) (transfer none) (element-type long):
-         */
-       signals[OBJECTS_MODIFIED] =
-               g_signal_new ("objects_modified",
-                             G_TYPE_FROM_CLASS (class),
-                             G_SIGNAL_RUN_FIRST,
-                             G_STRUCT_OFFSET (ECalViewClass, objects_modified),
-                             NULL, NULL,
-                             g_cclosure_marshal_VOID__POINTER,
-                             G_TYPE_NONE, 1, G_TYPE_POINTER);
-        /**
-         * ECalView::objects-removed:
-         * @view:: self
-         * @objects: (type GLib.List) (transfer none) (element-type ECalComponentId):
-         */
-       signals[OBJECTS_REMOVED] =
-               g_signal_new ("objects_removed",
-                             G_TYPE_FROM_CLASS (class),
-                             G_SIGNAL_RUN_FIRST,
-                             G_STRUCT_OFFSET (ECalViewClass, objects_removed),
-                             NULL, NULL,
-                             g_cclosure_marshal_VOID__POINTER,
-                             G_TYPE_NONE, 1, G_TYPE_POINTER);
-       signals[VIEW_PROGRESS] =
-               g_signal_new ("view_progress",
-                             G_TYPE_FROM_CLASS (class),
-                             G_SIGNAL_RUN_FIRST,
-                             G_STRUCT_OFFSET (ECalViewClass, view_progress),
-                             NULL, NULL,
-                             e_cal_marshal_VOID__STRING_UINT,
-                             G_TYPE_NONE, 2, G_TYPE_STRING, G_TYPE_UINT);
+       g_object_class_install_property (
+               object_class,
+               PROP_VIEW,
+               g_param_spec_pointer (
+                       "view",
+                       "The GDBus view proxy",
+                       NULL,
+                       G_PARAM_READWRITE |
+                       G_PARAM_CONSTRUCT_ONLY));
+
+       g_object_class_install_property (
+               object_class,
+               PROP_CLIENT,
+               g_param_spec_object (
+                       "client",
+                       "The e-cal for the view",
+                       NULL,
+                       E_TYPE_CAL,
+                       G_PARAM_READWRITE |
+                       G_PARAM_CONSTRUCT_ONLY));
+
+       /**
+        * ECalView::objects-added:
+        * @view:: self
+        * @objects: (type GLib.List) (transfer none) (element-type long):
+        */
+       signals[OBJECTS_ADDED] = g_signal_new (
+               "objects_added",
+               G_TYPE_FROM_CLASS (class),
+               G_SIGNAL_RUN_FIRST,
+               G_STRUCT_OFFSET (ECalViewClass, objects_added),
+               NULL, NULL,
+               g_cclosure_marshal_VOID__POINTER,
+               G_TYPE_NONE, 1, G_TYPE_POINTER);
+
+       /**
+        * ECalView::objects-modified:
+        * @view:: self
+        * @objects: (type GLib.List) (transfer none) (element-type long):
+        */
+       signals[OBJECTS_MODIFIED] = g_signal_new (
+               "objects_modified",
+               G_TYPE_FROM_CLASS (class),
+               G_SIGNAL_RUN_FIRST,
+               G_STRUCT_OFFSET (ECalViewClass, objects_modified),
+               NULL, NULL,
+               g_cclosure_marshal_VOID__POINTER,
+               G_TYPE_NONE, 1, G_TYPE_POINTER);
+
+       /**
+        * ECalView::objects-removed:
+        * @view:: self
+        * @objects: (type GLib.List) (transfer none) (element-type ECalComponentId):
+        */
+       signals[OBJECTS_REMOVED] = g_signal_new (
+               "objects_removed",
+               G_TYPE_FROM_CLASS (class),
+               G_SIGNAL_RUN_FIRST,
+               G_STRUCT_OFFSET (ECalViewClass, objects_removed),
+               NULL, NULL,
+               g_cclosure_marshal_VOID__POINTER,
+               G_TYPE_NONE, 1, G_TYPE_POINTER);
+
+       signals[VIEW_PROGRESS] = g_signal_new (
+               "view_progress",
+               G_TYPE_FROM_CLASS (class),
+               G_SIGNAL_RUN_FIRST,
+               G_STRUCT_OFFSET (ECalViewClass, view_progress),
+               NULL, NULL,
+               e_cal_marshal_VOID__STRING_UINT,
+               G_TYPE_NONE, 2, G_TYPE_STRING, G_TYPE_UINT);
 
        /* XXX The "view-done" signal is deprecated. */
-       signals[VIEW_DONE] =
-               g_signal_new ("view_done",
-                             G_TYPE_FROM_CLASS (class),
-                             G_SIGNAL_RUN_FIRST,
-                             G_STRUCT_OFFSET (ECalViewClass, view_done),
-                             NULL, NULL,
-                             g_cclosure_marshal_VOID__INT,
-                             G_TYPE_NONE, 1, G_TYPE_INT);
-
-       signals[VIEW_COMPLETE] =
-               g_signal_new ("view_complete",
-                             G_TYPE_FROM_CLASS (class),
-                             G_SIGNAL_RUN_FIRST,
-                             G_STRUCT_OFFSET (ECalViewClass, view_complete),
-                             NULL, NULL,
-                             e_cal_marshal_VOID__UINT_STRING,
-                             G_TYPE_NONE, 2, G_TYPE_UINT, G_TYPE_STRING);
+       signals[VIEW_DONE] = g_signal_new (
+               "view_done",
+               G_TYPE_FROM_CLASS (class),
+               G_SIGNAL_RUN_FIRST,
+               G_STRUCT_OFFSET (ECalViewClass, view_done),
+               NULL, NULL,
+               g_cclosure_marshal_VOID__INT,
+               G_TYPE_NONE, 1, G_TYPE_INT);
+
+       signals[VIEW_COMPLETE] = g_signal_new (
+               "view_complete",
+               G_TYPE_FROM_CLASS (class),
+               G_SIGNAL_RUN_FIRST,
+               G_STRUCT_OFFSET (ECalViewClass, view_complete),
+               NULL, NULL,
+               e_cal_marshal_VOID__UINT_STRING,
+               G_TYPE_NONE, 2, G_TYPE_UINT, G_TYPE_STRING);
 }
 
 /**
@@ -400,7 +417,8 @@ _e_cal_view_new (ECal *ecal,
 {
        ECalView *view;
 
-       view = g_object_new (E_TYPE_CAL_VIEW,
+       view = g_object_new (
+               E_TYPE_CAL_VIEW,
                "client", ecal,
                "view", gdbus_calview,
                NULL);
index 73be7f4..025b371 100644 (file)
@@ -598,56 +598,58 @@ e_cal_class_init (ECalClass *class)
        object_class = (GObjectClass *) class;
 
        /* XXX The "cal-opened" signal is deprecated. */
-       e_cal_signals[CAL_OPENED] =
-               g_signal_new ("cal_opened",
-                             G_TYPE_FROM_CLASS (class),
-                             G_SIGNAL_RUN_FIRST,
-                             G_STRUCT_OFFSET (ECalClass, cal_opened),
-                             NULL, NULL,
-                             g_cclosure_marshal_VOID__INT,
-                             G_TYPE_NONE, 1, G_TYPE_INT);
-
-        /**
-         * ECal::cal-opened-ex:
-         * @ecal:: self
-         * @error: (type glong):
-         */
-       e_cal_signals[CAL_OPENED_EX] =
-               g_signal_new ("cal_opened_ex",
-                             G_TYPE_FROM_CLASS (class),
-                             G_SIGNAL_RUN_FIRST,
-                             G_STRUCT_OFFSET (ECalClass, cal_opened_ex),
-                             NULL, NULL,
-                             g_cclosure_marshal_VOID__POINTER,
-                             G_TYPE_NONE, 1, G_TYPE_POINTER);
-
-       e_cal_signals[CAL_SET_MODE] =
-               g_signal_new ("cal_set_mode",
-                             G_TYPE_FROM_CLASS (class),
-                             G_SIGNAL_RUN_FIRST,
-                             G_STRUCT_OFFSET (ECalClass, cal_set_mode),
-                             NULL, NULL,
-                             e_cal_marshal_VOID__ENUM_ENUM,
-                             G_TYPE_NONE, 2,
-                             E_CAL_SET_MODE_STATUS_ENUM_TYPE,
-                             CAL_MODE_ENUM_TYPE);
-       e_cal_signals[BACKEND_ERROR] =
-               g_signal_new ("backend_error",
-                             G_TYPE_FROM_CLASS (class),
-                             G_SIGNAL_RUN_FIRST,
-                             G_STRUCT_OFFSET (ECalClass, backend_error),
-                             NULL, NULL,
-                             g_cclosure_marshal_VOID__STRING,
-                             G_TYPE_NONE, 1,
-                             G_TYPE_STRING);
-       e_cal_signals[BACKEND_DIED] =
-               g_signal_new ("backend_died",
-                             G_TYPE_FROM_CLASS (class),
-                             G_SIGNAL_RUN_FIRST,
-                             G_STRUCT_OFFSET (ECalClass, backend_died),
-                             NULL, NULL,
-                             g_cclosure_marshal_VOID__VOID,
-                             G_TYPE_NONE, 0);
+       e_cal_signals[CAL_OPENED] = g_signal_new (
+               "cal_opened",
+               G_TYPE_FROM_CLASS (class),
+               G_SIGNAL_RUN_FIRST,
+               G_STRUCT_OFFSET (ECalClass, cal_opened),
+               NULL, NULL,
+               g_cclosure_marshal_VOID__INT,
+               G_TYPE_NONE, 1, G_TYPE_INT);
+
+       /**
+        * ECal::cal-opened-ex:
+        * @ecal:: self
+        * @error: (type glong):
+        */
+       e_cal_signals[CAL_OPENED_EX] = g_signal_new (
+               "cal_opened_ex",
+               G_TYPE_FROM_CLASS (class),
+               G_SIGNAL_RUN_FIRST,
+               G_STRUCT_OFFSET (ECalClass, cal_opened_ex),
+               NULL, NULL,
+               g_cclosure_marshal_VOID__POINTER,
+               G_TYPE_NONE, 1, G_TYPE_POINTER);
+
+       e_cal_signals[CAL_SET_MODE] = g_signal_new (
+               "cal_set_mode",
+               G_TYPE_FROM_CLASS (class),
+               G_SIGNAL_RUN_FIRST,
+               G_STRUCT_OFFSET (ECalClass, cal_set_mode),
+               NULL, NULL,
+               e_cal_marshal_VOID__ENUM_ENUM,
+               G_TYPE_NONE, 2,
+               E_CAL_SET_MODE_STATUS_ENUM_TYPE,
+               CAL_MODE_ENUM_TYPE);
+
+       e_cal_signals[BACKEND_ERROR] = g_signal_new (
+               "backend_error",
+               G_TYPE_FROM_CLASS (class),
+               G_SIGNAL_RUN_FIRST,
+               G_STRUCT_OFFSET (ECalClass, backend_error),
+               NULL, NULL,
+               g_cclosure_marshal_VOID__STRING,
+               G_TYPE_NONE, 1,
+               G_TYPE_STRING);
+
+       e_cal_signals[BACKEND_DIED] = g_signal_new (
+               "backend_died",
+               G_TYPE_FROM_CLASS (class),
+               G_SIGNAL_RUN_FIRST,
+               G_STRUCT_OFFSET (ECalClass, backend_died),
+               NULL, NULL,
+               g_cclosure_marshal_VOID__VOID,
+               G_TYPE_NONE, 0);
 
        class->cal_opened = NULL;
        class->cal_opened_ex = NULL;
@@ -861,8 +863,9 @@ online_cb (EGdbusCal *gdbus_cal,
 {
        g_return_if_fail (E_IS_CAL (cal));
 
-       g_signal_emit (G_OBJECT (cal), e_cal_signals[CAL_SET_MODE],
-                      0, E_CALENDAR_STATUS_OK, is_online ? Remote : Local);
+       g_signal_emit (
+               G_OBJECT (cal), e_cal_signals[CAL_SET_MODE],
+               0, E_CALENDAR_STATUS_OK, is_online ? Remote : Local);
 }
 
 /*
@@ -2550,22 +2553,24 @@ process_detached_instances (GList *instances,
                                                 * recurrency ids. Real problem might be elsewhere,
                                                 * but anything is better than crashing...
                                                 */
-                                               g_log (G_LOG_DOMAIN,
-                                                      G_LOG_LEVEL_CRITICAL,
-                                                      "UID %s: instance RECURRENCE-ID %s + detached instance RECURRENCE-ID %s: cannot compare",
-                                                      uid,
-                                                      i_rid,
-                                                      d_rid);
+                                               g_log (
+                                                       G_LOG_DOMAIN,
+                                                       G_LOG_LEVEL_CRITICAL,
+                                                       "UID %s: instance RECURRENCE-ID %s + detached instance RECURRENCE-ID %s: cannot compare",
+                                                       uid,
+                                                       i_rid,
+                                                       d_rid);
 
                                                e_cal_component_free_datetime (&instance_recur_id.datetime);
                                                g_free (i_rid);
                                                g_free (d_rid);
                                                continue;
                                        }
-                                       cmp = icaltime_compare (*instance_recur_id.datetime.value,
-                                                               *recur_id.datetime.value);
+                                       cmp = icaltime_compare (
+                                               *instance_recur_id.datetime.value,
+                                               *recur_id.datetime.value);
                                        if ((recur_id.type == E_CAL_COMPONENT_RANGE_THISPRIOR && cmp <= 0) ||
-                                           (recur_id.type == E_CAL_COMPONENT_RANGE_THISFUTURE && cmp >= 0)) {
+                                               (recur_id.type == E_CAL_COMPONENT_RANGE_THISFUTURE && cmp >= 0)) {
                                                ECalComponent *comp;
 
                                                comp = e_cal_component_new ();
@@ -2655,8 +2660,9 @@ try_again:
                        return;
                }
 
-               query = g_strdup_printf ("(occur-in-time-range? (make-time \"%s\") (make-time \"%s\"))",
-                                        iso_start, iso_end);
+               query = g_strdup_printf (
+                       "(occur-in-time-range? (make-time \"%s\") (make-time \"%s\"))",
+                       iso_start, iso_end);
                g_free (iso_start);
                g_free (iso_end);
                if (!e_cal_get_object_list_as_comp (ecal, query, &objects, NULL)) {
@@ -2747,9 +2753,10 @@ try_again:
                        instances_hold->instances = &instances;
                        instances_hold->start_zone = start_zone;
 
-                       e_cal_recur_generate_instances (comp, start, end, add_instance, instances_hold,
-                                                       e_cal_resolve_tzid_cb, ecal,
-                                                       default_zone);
+                       e_cal_recur_generate_instances (
+                               comp, start, end, add_instance, instances_hold,
+                               e_cal_resolve_tzid_cb, ecal,
+                               default_zone);
 
                        g_free (instances_hold);
                        g_object_unref (comp);
@@ -2970,8 +2977,9 @@ build_component_alarms_list (ECal *ecal,
                        continue;
                }
 
-               alarms = e_cal_util_generate_alarms_for_comp (comp, start, end, omit, e_cal_resolve_tzid_cb,
-                                                             ecal, ecal->priv->default_zone);
+               alarms = e_cal_util_generate_alarms_for_comp (
+                       comp, start, end, omit, e_cal_resolve_tzid_cb,
+                       ecal, ecal->priv->default_zone);
                if (alarms)
                        comp_alarms = g_slist_prepend (comp_alarms, alarms);
        }
@@ -3025,8 +3033,11 @@ e_cal_get_alarms_in_range (ECal *ecal,
        }
 
        /* build the query string */
-       sexp = g_strdup_printf ("(has-alarms-in-range? (make-time \"%s\") (make-time \"%s\"))",
-                               iso_start, iso_end);
+       sexp = g_strdup_printf (
+               "(has-alarms-in-range? "
+               "(make-time \"%s\") "
+               "(make-time \"%s\"))",
+               iso_start, iso_end);
        g_free (iso_start);
        g_free (iso_end);
 
@@ -3229,8 +3240,9 @@ foreach_tzid_callback (icalparameter *param,
 
        vtimezone_as_string = icalcomponent_as_ical_string_r (vtimezone_comp);
 
-       g_hash_table_insert (data->timezone_hash, (gchar *) tzid,
-                            vtimezone_as_string);
+       g_hash_table_insert (
+               data->timezone_hash, (gchar *) tzid,
+               vtimezone_as_string);
 }
 
 /* This appends the value string to the GString given in data. */
@@ -3294,11 +3306,12 @@ e_cal_get_component_as_string_internal (ECal *ecal,
        /* Create the start of a VCALENDAR, to add the VTIMEZONES to,
         * and remember its length so we know if any VTIMEZONEs get added. */
        vcal_string = g_string_new (NULL);
-       g_string_append (vcal_string,
-                        "BEGIN:VCALENDAR\n"
-                        "PRODID:-//Ximian//NONSGML Evolution Calendar//EN\n"
-                        "VERSION:2.0\n"
-                        "METHOD:PUBLISH\n");
+       g_string_append (
+               vcal_string,
+               "BEGIN:VCALENDAR\n"
+               "PRODID:-//Ximian//NONSGML Evolution Calendar//EN\n"
+               "VERSION:2.0\n"
+               "METHOD:PUBLISH\n");
        initial_vcal_string_len = vcal_string->len;
 
        /* Now concatenate all the timezone strings. This also frees the
@@ -3812,15 +3825,15 @@ e_cal_get_timezone (ECal *ecal,
                        icalproperty *prop;
 
                        icalcomp = icalcomponent_new_clone (icaltimezone_get_component (syszone));
-                       prop = icalcomponent_get_first_property (icalcomp,
-                                                               ICAL_ANY_PROPERTY);
+                       prop = icalcomponent_get_first_property (
+                               icalcomp, ICAL_ANY_PROPERTY);
                        while (!found && prop) {
                                if (icalproperty_isa (prop) == ICAL_TZID_PROPERTY) {
                                        icalproperty_set_value_from_string (prop, tzid, "NO");
                                        found = TRUE;
                                }
-                               prop = icalcomponent_get_next_property (icalcomp,
-                                                                      ICAL_ANY_PROPERTY);
+                               prop = icalcomponent_get_next_property (
+                                       icalcomp, ICAL_ANY_PROPERTY);
                        }
                } else {
                        status = E_CALENDAR_STATUS_INVALID_OBJECT;
@@ -3950,12 +3963,13 @@ e_cal_get_query (ECal *ecal,
 
        status = E_CALENDAR_STATUS_OK;
 
-       gdbus_calview = e_gdbus_cal_view_proxy_new_sync (g_dbus_proxy_get_connection (G_DBUS_PROXY (cal_factory)),
-                                                       G_DBUS_PROXY_FLAGS_NONE,
-                                                       CALENDAR_DBUS_SERVICE_NAME,
-                                                       query_path,
-                                                       NULL,
-                                                       error);
+       gdbus_calview = e_gdbus_cal_view_proxy_new_sync (
+               g_dbus_proxy_get_connection (G_DBUS_PROXY (cal_factory)),
+               G_DBUS_PROXY_FLAGS_NONE,
+               CALENDAR_DBUS_SERVICE_NAME,
+               query_path,
+               NULL,
+               error);
 
        g_free (query_path);
 
index 2007cec..3082950 100644 (file)
@@ -418,13 +418,15 @@ e_cal_backend_cache_put_timezone (ECalBackendCache *cache,
 
        obj = icalcomponent_as_ical_string_r (icalcomp);
        if (e_file_cache_get_object (E_FILE_CACHE (cache), icaltimezone_get_tzid ((icaltimezone *) zone))) {
-               retval = e_file_cache_replace_object (E_FILE_CACHE (cache),
-                                                     icaltimezone_get_tzid ((icaltimezone *) zone),
-                                                     obj);
+               retval = e_file_cache_replace_object (
+                       E_FILE_CACHE (cache),
+                       icaltimezone_get_tzid ((icaltimezone *) zone),
+                       obj);
        } else {
-               retval = e_file_cache_add_object (E_FILE_CACHE (cache),
-                                                 icaltimezone_get_tzid ((icaltimezone *) zone),
-                                                 obj);
+               retval = e_file_cache_add_object (
+                       E_FILE_CACHE (cache),
+                       icaltimezone_get_tzid ((icaltimezone *) zone),
+                       obj);
        }
        g_free (obj);
 
@@ -465,12 +467,14 @@ e_cal_backend_cache_put_default_timezone (ECalBackendCache *cache,
 
        obj = icalcomponent_as_ical_string_r (icalcomp);
        if (e_file_cache_get_object (E_FILE_CACHE (cache), "default_zone")) {
-               retval = e_file_cache_replace_object (E_FILE_CACHE (cache), "default_zone",
-                                                     obj);
+               retval = e_file_cache_replace_object (
+                       E_FILE_CACHE (cache), "default_zone",
+                       obj);
        } else {
-               retval = e_file_cache_add_object (E_FILE_CACHE (cache),
-                                                "default_zone",
-                                                 obj);
+               retval = e_file_cache_add_object (
+                       E_FILE_CACHE (cache),
+                       "default_zone",
+                       obj);
        }
        g_free (obj);
 
index ad8b5ba..2f3491a 100644 (file)
@@ -665,8 +665,9 @@ scan_vcalendar (ECalBackendStore *store,
                }
 
                dzone = e_cal_backend_store_get_default_timezone (store);
-               e_cal_util_get_component_occur_times (comp, &time_start, &time_end,
-                                               resolve_tzid, store, dzone, kind);
+               e_cal_util_get_component_occur_times (
+                       comp, &time_start, &time_end,
+                       resolve_tzid, store, dzone, kind);
 
                put_component (fstore, comp);
                e_cal_backend_store_interval_tree_add_comp (store, comp, time_start, time_end);
index d23ac18..b574cf5 100644 (file)
@@ -612,11 +612,11 @@ e_intervaltree_node_dump (EIntervalTree *tree,
        g_print ("%*s[%s - %s]\n", indent, "", start_time, end_time);
        */
        EIntervalTreePrivate *priv = tree->priv;
-       if (node != priv->nil)
-               g_print ("%*s[%ld - %ld] [%ld - %ld] red %d\n", indent, "", node->start,
-                               node->end, node->min, node->max, node->red);
-       else
-       {
+       if (node != priv->nil) {
+               g_print (
+                       "%*s[%ld - %ld] [%ld - %ld] red %d\n", indent, "", node->start,
+                       node->end, node->min, node->max, node->red);
+       } else {
                g_print ("%*s[ - ]\n", indent, "");
                return;
        }
@@ -652,8 +652,9 @@ e_intervaltree_search_component (EIntervalTree *tree,
        priv = tree->priv;
        if (!searched_uid)
        {
-               g_warning ("Searching the interval tree, the component "
-                          " does not have a valid UID skipping it\n");
+               g_warning (
+                       "Searching the interval tree, the component "
+                       " does not have a valid UID skipping it\n");
 
                return NULL;
        }
index cc55cdd..db9c9e4 100644 (file)
@@ -74,8 +74,9 @@ e_cal_backend_sexp_func_time_now (ESExp *esexp,
        ESExpResult *result;
 
        if (argc != 0) {
-               e_sexp_fatal_error (esexp, _("\"%s\" expects no arguments"),
-                                   "time-now");
+               e_sexp_fatal_error (
+                       esexp, _("\"%s\" expects no arguments"),
+                       "time-now");
                return NULL;
        }
 
@@ -110,31 +111,35 @@ e_cal_backend_sexp_func_make_time (ESExp *esexp,
        ESExpResult *result;
 
        if (argc != 1) {
-               e_sexp_fatal_error (esexp, _("\"%s\" expects one argument"),
-                                   "make-time");
+               e_sexp_fatal_error (
+                       esexp, _("\"%s\" expects one argument"),
+                       "make-time");
                return NULL;
        }
 
        if (argv[0]->type != ESEXP_RES_STRING) {
-               e_sexp_fatal_error (esexp, _("\"%s\" expects the first "
-                                            "argument to be a string"),
-                                   "make-time");
+               e_sexp_fatal_error (
+                       esexp, _("\"%s\" expects the first "
+                       "argument to be a string"),
+                       "make-time");
                return NULL;
        }
        str = argv[0]->value.string;
        if (!str || !*str) {
-               e_sexp_fatal_error (esexp, _("\"%s\" expects the first "
-                                            "argument to be a string"),
-                                   "make-time");
+               e_sexp_fatal_error (
+                       esexp, _("\"%s\" expects the first "
+                       "argument to be a string"),
+                       "make-time");
                return NULL;
        }
 
        t = time_from_isodate (str);
        if (t == -1) {
-               e_sexp_fatal_error (esexp, _("\"%s\" expects the first "
-                                            "argument to be an ISO 8601 "
-                                            "date/time string"),
-                                   "make-time");
+               e_sexp_fatal_error (
+                       esexp, _("\"%s\" expects the first "
+                       "argument to be an ISO 8601 "
+                       "date/time string"),
+                       "make-time");
                return NULL;
        }
 
@@ -173,23 +178,26 @@ e_cal_backend_sexp_func_time_add_day (ESExp *esexp,
        gint n;
 
        if (argc != 2) {
-               e_sexp_fatal_error (esexp, _("\"%s\" expects two arguments"),
-                                   "time-add-day");
+               e_sexp_fatal_error (
+                       esexp, _("\"%s\" expects two arguments"),
+                       "time-add-day");
                return NULL;
        }
 
        if (argv[0]->type != ESEXP_RES_TIME) {
-               e_sexp_fatal_error (esexp, _("\"%s\" expects the first "
-                                            "argument to be a time_t"),
-                                   "time-add-day");
+               e_sexp_fatal_error (
+                       esexp, _("\"%s\" expects the first "
+                       "argument to be a time_t"),
+                       "time-add-day");
                return NULL;
        }
        t = argv[0]->value.time;
 
        if (argv[1]->type != ESEXP_RES_INT) {
-               e_sexp_fatal_error (esexp, _("\"%s\" expects the second "
-                                            "argument to be an integer"),
-                                   "time-add-day");
+               e_sexp_fatal_error (
+                       esexp, _("\"%s\" expects the second "
+                       "argument to be an integer"),
+                       "time-add-day");
                return NULL;
        }
        n = argv[1]->value.number;
@@ -226,15 +234,17 @@ e_cal_backend_sexp_func_time_day_begin (ESExp *esexp,
        ESExpResult *result;
 
        if (argc != 1) {
-               e_sexp_fatal_error (esexp, _("\"%s\" expects one argument"),
-                                   "time-day-begin");
+               e_sexp_fatal_error (
+                       esexp, _("\"%s\" expects one argument"),
+                       "time-day-begin");
                return NULL;
        }
 
        if (argv[0]->type != ESEXP_RES_TIME) {
-               e_sexp_fatal_error (esexp, _("\"%s\" expects the first "
-                                            "argument to be a time_t"),
-                                   "time-day-begin");
+               e_sexp_fatal_error (
+                       esexp, _("\"%s\" expects the first "
+                       "argument to be a time_t"),
+                       "time-day-begin");
                return NULL;
        }
        t = argv[0]->value.time;
@@ -271,15 +281,17 @@ e_cal_backend_sexp_func_time_day_end (ESExp *esexp,
        ESExpResult *result;
 
        if (argc != 1) {
-               e_sexp_fatal_error (esexp, _("\"%s\" expects one argument"),
-                                   "time-day-end");
+               e_sexp_fatal_error (
+                       esexp, _("\"%s\" expects one argument"),
+                       "time-day-end");
                return NULL;
        }
 
        if (argv[0]->type != ESEXP_RES_TIME) {
-               e_sexp_fatal_error (esexp, _("\"%s\" expects the first "
-                                            "argument to be a time_t"),
-                                   "time-day-end");
+               e_sexp_fatal_error (
+                       esexp, _("\"%s\" expects the first "
+                       "argument to be a time_t"),
+                       "time-day-end");
                return NULL;
        }
        t = argv[0]->value.time;
@@ -310,15 +322,17 @@ func_uid (ESExp *esexp,
        /* Check argument types */
 
        if (argc != 1) {
-               e_sexp_fatal_error (esexp, _("\"%s\" expects one argument"),
-                                   "uid");
+               e_sexp_fatal_error (
+                       esexp, _("\"%s\" expects one argument"),
+                       "uid");
                return NULL;
        }
 
        if (argv[0]->type != ESEXP_RES_STRING) {
-               e_sexp_fatal_error (esexp, _("\"%s\" expects the first "
-                                            "argument to be a string"),
-                                   "uid");
+               e_sexp_fatal_error (
+                       esexp, _("\"%s\" expects the first "
+                       "argument to be a string"),
+                       "uid");
                return NULL;
        }
 
@@ -392,32 +406,36 @@ func_occur_in_time_range (ESExp *esexp,
        /* Check argument types */
 
        if (argc != 2 && argc != 3) {
-               e_sexp_fatal_error (esexp, _("\"%s\" expects two or three arguments"),
-                                   "occur-in-time-range");
+               e_sexp_fatal_error (
+                       esexp, _("\"%s\" expects two or three arguments"),
+                       "occur-in-time-range");
                return NULL;
        }
 
        if (argv[0]->type != ESEXP_RES_TIME) {
-               e_sexp_fatal_error (esexp, _("\"%s\" expects the first "
-                                            "argument to be a time_t"),
-                                   "occur-in-time-range");
+               e_sexp_fatal_error (
+                       esexp, _("\"%s\" expects the first "
+                       "argument to be a time_t"),
+                       "occur-in-time-range");
                return NULL;
        }
        start = argv[0]->value.time;
 
        if (argv[1]->type != ESEXP_RES_TIME) {
-               e_sexp_fatal_error (esexp, _("\"%s\" expects the second "
-                                            "argument to be a time_t"),
-                                   "occur-in-time-range");
+               e_sexp_fatal_error (
+                       esexp, _("\"%s\" expects the second "
+                       "argument to be a time_t"),
+                       "occur-in-time-range");
                return NULL;
        }
        end = argv[1]->value.time;
 
        if (argc == 3) {
                if (argv[2]->type != ESEXP_RES_STRING) {
-                       e_sexp_fatal_error (esexp, _("\"%s\" expects the third "
-                                                    "argument to be a string"),
-                                           "occur-in-time-range");
+                       e_sexp_fatal_error (
+                               esexp, _("\"%s\" expects the third "
+                               "argument to be a string"),
+                               "occur-in-time-range");
                        return NULL;
                }
 
@@ -429,10 +447,11 @@ func_occur_in_time_range (ESExp *esexp,
 
        /* See if the object occurs in the specified time range */
        ctx->occurs = FALSE;
-       e_cal_recur_generate_instances (ctx->comp, start, end,
-                                       (ECalRecurInstanceFn) check_instance_time_range_cb,
-                                       ctx, resolve_tzid, ctx,
-                                       default_zone);
+       e_cal_recur_generate_instances (
+               ctx->comp, start, end,
+               (ECalRecurInstanceFn) check_instance_time_range_cb,
+               ctx, resolve_tzid, ctx,
+               default_zone);
 
        result = e_sexp_result_new (esexp, ESEXP_RES_BOOL);
        result->value.boolean = ctx->occurs;
@@ -475,19 +494,25 @@ func_occurrences_count (ESExp *esexp,
        /* Check argument types */
 
        if (argc != 2 && argc != 0) {
-               e_sexp_fatal_error (esexp, _("\"%s\" expects none or two arguments"), "occurrences-count");
+               e_sexp_fatal_error (
+                       esexp, _("\"%s\" expects none or two arguments"),
+                       "occurrences-count");
                return NULL;
        }
 
        if (argc == 2) {
                if (argv[0]->type != ESEXP_RES_TIME) {
-                       e_sexp_fatal_error (esexp, _("\"%s\" expects the first argument to be a time_t"), "occurrences-count");
+                       e_sexp_fatal_error (
+                               esexp, _("\"%s\" expects the first argument to be a time_t"),
+                               "occurrences-count");
                        return NULL;
                }
                start = argv[0]->value.time;
 
                if (argv[1]->type != ESEXP_RES_TIME) {
-                       e_sexp_fatal_error (esexp, _("\"%s\" expects the second argument to be a time_t"), "occurrences-count");
+                       e_sexp_fatal_error (
+                               esexp, _("\"%s\" expects the second argument to be a time_t"),
+                               "occurrences-count");
                        return NULL;
                }
                end = argv[1]->value.time;
@@ -504,7 +529,8 @@ func_occurrences_count (ESExp *esexp,
        default_zone = icaltimezone_get_utc_timezone ();
 
        ctx->occurrences_count = 0;
-       e_cal_recur_generate_instances (ctx->comp, start, end,
+       e_cal_recur_generate_instances (
+               ctx->comp, start, end,
                                        count_instances_time_range_cb, ctx,
                                        resolve_tzid, ctx,
                                        default_zone);
@@ -532,24 +558,27 @@ func_due_in_time_range (ESExp *esexp,
        /* Check argument types */
 
        if (argc != 2) {
-               e_sexp_fatal_error (esexp, _("\"%s\" expects two arguments"),
+               e_sexp_fatal_error (
+                       esexp, _("\"%s\" expects two arguments"),
                                "due-in-time-range");
                return NULL;
        }
 
        if (argv[0]->type != ESEXP_RES_TIME) {
-               e_sexp_fatal_error (esexp, _("\"%s\" expects the first "
-                                       "argument to be a time_t"),
-                               "due-in-time-range");
+               e_sexp_fatal_error (
+                       esexp, _("\"%s\" expects the first "
+                       "argument to be a time_t"),
+                       "due-in-time-range");
                return NULL;
        }
 
        start = argv[0]->value.time;
 
        if (argv[1]->type != ESEXP_RES_TIME) {
-               e_sexp_fatal_error (esexp, _("\"%s\" expects the second "
-                                       "argument to be a time_t"),
-                               "due-in-time-range");
+               e_sexp_fatal_error (
+                       esexp, _("\"%s\" expects the second "
+                       "argument to be a time_t"),
+                       "due-in-time-range");
                return NULL;
        }
 
@@ -814,7 +843,8 @@ func_has_attachment (ESExp *esexp,
        ESExpResult *result;
 
        if (argc != 0) {
-               e_sexp_fatal_error (esexp, _("\"%s\" expects no arguments"),
+               e_sexp_fatal_error (
+                       esexp, _("\"%s\" expects no arguments"),
                                "has-attachments?");
                return NULL;
        }
@@ -836,7 +866,8 @@ func_percent_complete (ESExp *esexp,
        gint *percent;
 
        if (argc != 0) {
-               e_sexp_fatal_error (esexp, _("\"%s\" expects no arguments"),
+               e_sexp_fatal_error (
+                       esexp, _("\"%s\" expects no arguments"),
                                "percent-completed");
                return NULL;
        }
@@ -875,23 +906,26 @@ func_contains (ESExp *esexp,
        /* Check argument types */
 
        if (argc != 2) {
-               e_sexp_fatal_error (esexp, _("\"%s\" expects two arguments"),
-                                   "contains");
+               e_sexp_fatal_error (
+                       esexp, _("\"%s\" expects two arguments"),
+                       "contains");
                return NULL;
        }
 
        if (argv[0]->type != ESEXP_RES_STRING) {
-               e_sexp_fatal_error (esexp, _("\"%s\" expects the first "
-                                            "argument to be a string"),
-                                   "contains");
+               e_sexp_fatal_error (
+                       esexp, _("\"%s\" expects the first "
+                       "argument to be a string"),
+                       "contains");
                return NULL;
        }
        field = argv[0]->value.string;
 
        if (argv[1]->type != ESEXP_RES_STRING) {
-               e_sexp_fatal_error (esexp, _("\"%s\" expects the second "
-                                            "argument to be a string"),
-                                   "contains");
+               e_sexp_fatal_error (
+                       esexp, _("\"%s\" expects the second "
+                       "argument to be a string"),
+                       "contains");
                return NULL;
        }
        str = argv[1]->value.string;
@@ -919,10 +953,11 @@ func_contains (ESExp *esexp,
        else if (strcmp (field, "priority") == 0)
                matches = matches_priority (ctx->comp, str);
        else {
-               e_sexp_fatal_error (esexp, _("\"%s\" expects the first "
-                                            "argument to be either \"any\", "
-                                       "\"summary\", or \"description\", or \"location\", or \"attendee\", or \"organizer\", or \"classification\""),
-                                   "contains");
+               e_sexp_fatal_error (
+                       esexp, _("\"%s\" expects the first "
+                       "argument to be either \"any\", "
+                       "\"summary\", or \"description\", or \"location\", or \"attendee\", or \"organizer\", or \"classification\""),
+                       "contains");
                return NULL;
        }
 
@@ -951,8 +986,9 @@ func_has_start (ESExp *esexp,
        /* Check argument types */
 
        if (argc != 0) {
-               e_sexp_fatal_error (esexp, _("\"%s\" expects no arguments"),
-                                   "has-start");
+               e_sexp_fatal_error (
+                       esexp, _("\"%s\" expects no arguments"),
+                       "has-start");
                return NULL;
        }
 
@@ -982,8 +1018,9 @@ func_has_alarms (ESExp *esexp,
        /* Check argument types */
 
        if (argc != 0) {
-               e_sexp_fatal_error (esexp, _("\"%s\" expects no arguments"),
-                                   "has-alarms");
+               e_sexp_fatal_error (
+                       esexp, _("\"%s\" expects no arguments"),
+                       "has-alarms");
                return NULL;
        }
 
@@ -1017,23 +1054,26 @@ func_has_alarms_in_range (ESExp *esexp,
        /* Check argument types */
 
        if (argc != 2) {
-               e_sexp_fatal_error (esexp, _("\"%s\" expects two arguments"),
-                                   "has-alarms-in-range");
+               e_sexp_fatal_error (
+                       esexp, _("\"%s\" expects two arguments"),
+                       "has-alarms-in-range");
                return NULL;
        }
 
        if (argv[0]->type != ESEXP_RES_TIME) {
-               e_sexp_fatal_error (esexp, _("\"%s\" expects the first "
-                                            "argument to be a time_t"),
-                                   "has-alarms-in-range");
+               e_sexp_fatal_error (
+                       esexp, _("\"%s\" expects the first "
+                       "argument to be a time_t"),
+                       "has-alarms-in-range");
                return NULL;
        }
        start = argv[0]->value.time;
 
        if (argv[1]->type != ESEXP_RES_TIME) {
-               e_sexp_fatal_error (esexp, _("\"%s\" expects the second "
-                                            "argument to be a time_t"),
-                                   "has-alarms-in-range");
+               e_sexp_fatal_error (
+                       esexp, _("\"%s\" expects the second "
+                       "argument to be a time_t"),
+                       "has-alarms-in-range");
                return NULL;
        }
        end = argv[1]->value.time;
@@ -1041,9 +1081,10 @@ func_has_alarms_in_range (ESExp *esexp,
        /* See if the object has alarms in the given time range */
        default_zone = icaltimezone_get_utc_timezone ();
 
-       alarms = e_cal_util_generate_alarms_for_comp (ctx->comp, start, end,
-                                                     omit, resolve_tzid,
-                                                     ctx, default_zone);
+       alarms = e_cal_util_generate_alarms_for_comp (
+               ctx->comp, start, end,
+               omit, resolve_tzid,
+               ctx, default_zone);
 
        result = e_sexp_result_new (esexp, ESEXP_RES_BOOL);
        if (alarms) {
@@ -1081,9 +1122,10 @@ func_has_categories (ESExp *esexp,
        /* Check argument types */
 
        if (argc < 1) {
-               e_sexp_fatal_error (esexp, _("\"%s\" expects at least one "
-                                            "argument"),
-                                   "has-categories");
+               e_sexp_fatal_error (
+                       esexp, _("\"%s\" expects at least one "
+                       "argument"),
+                       "has-categories");
                return NULL;
        }
 
@@ -1095,14 +1137,15 @@ func_has_categories (ESExp *esexp,
        if (!unfiled)
                for (i = 0; i < argc; i++)
                        if (argv[i]->type != ESEXP_RES_STRING) {
-                               e_sexp_fatal_error (esexp, _("\"%s\" expects "
-                                                            "all arguments to "
-                                                            "be strings or "
-                                                            "one and only one "
-                                                            "argument to be a "
-                                                            "boolean false "
-                                                            "(#f)"),
-                                                   "has-categories");
+                               e_sexp_fatal_error (
+                                       esexp, _("\"%s\" expects "
+                                       "all arguments to "
+                                       "be strings or "
+                                       "one and only one "
+                                       "argument to be a "
+                                       "boolean false "
+                                       "(#f)"),
+                                       "has-categories");
                                return NULL;
                        }
 
@@ -1182,8 +1225,9 @@ func_has_recurrences (ESExp *esexp,
        /* Check argument types */
 
        if (argc != 0) {
-               e_sexp_fatal_error (esexp, _("\"%s\" expects no arguments"),
-                                   "has-recurrences");
+               e_sexp_fatal_error (
+                       esexp, _("\"%s\" expects no arguments"),
+                       "has-recurrences");
                return NULL;
        }
 
@@ -1212,8 +1256,9 @@ func_is_completed (ESExp *esexp,
        /* Check argument types */
 
        if (argc != 0) {
-               e_sexp_fatal_error (esexp, _("\"%s\" expects no arguments"),
-                                   "is-completed");
+               e_sexp_fatal_error (
+                       esexp, _("\"%s\" expects no arguments"),
+                       "is-completed");
                return NULL;
        }
 
@@ -1253,15 +1298,17 @@ func_completed_before (ESExp *esexp,
        /* Check argument types */
 
        if (argc != 1) {
-               e_sexp_fatal_error (esexp, _("\"%s\" expects one argument"),
-                                   "completed-before");
+               e_sexp_fatal_error (
+                       esexp, _("\"%s\" expects one argument"),
+                       "completed-before");
                return NULL;
        }
 
        if (argv[0]->type != ESEXP_RES_TIME) {
-               e_sexp_fatal_error (esexp, _("\"%s\" expects the first "
-                                            "argument to be a time_t"),
-                                   "completed-before");
+               e_sexp_fatal_error (
+                       esexp, _("\"%s\" expects the first "
+                       "argument to be a time_t"),
+                       "completed-before");
                return NULL;
        }
        before_time = argv[0]->value.time;
@@ -1569,8 +1616,9 @@ e_cal_backend_sexp_new (const gchar *text)
                        e_sexp_add_ifunction (sexp->priv->search_sexp, 0, symbols[i].name,
                                             (ESExpIFunc *) symbols[i].func, sexp->priv->search_context);
                } else {
-                       e_sexp_add_function (sexp->priv->search_sexp, 0, symbols[i].name,
-                                           symbols[i].func, sexp->priv->search_context);
+                       e_sexp_add_function (
+                               sexp->priv->search_sexp, 0, symbols[i].name,
+                               symbols[i].func, sexp->priv->search_context);
                }
        }
 
index 8b9771d..d434e40 100644 (file)
@@ -638,8 +638,9 @@ static void
 cal_destroy_cb (gpointer data,
                 GObject *where_cal_was)
 {
-       e_cal_backend_remove_client_private (E_CAL_BACKEND (data),
-                                            (EDataCal *) where_cal_was, FALSE);
+       e_cal_backend_remove_client_private (
+               E_CAL_BACKEND (data),
+               (EDataCal *) where_cal_was, FALSE);
 }
 
 /**
index fcf46d9..baaeb8d 100644 (file)
@@ -437,8 +437,8 @@ void                e_cal_backend_respond_opened    (ECalBackend *backend,
 #ifndef EDS_DISABLE_DEPRECATED
 void           e_cal_backend_foreach_view      (ECalBackend *backend,
                                                 gboolean (*callback) (EDataCalView *view,
-                                                                      gpointer user_data),
-                                                                      gpointer user_data);
+                                                                      gpointer user_data),
+                                                                      gpointer user_data);
 #endif /* EDS_DISABLE_DEPRECATED */
 
 G_END_DECLS
index a2b25ee..4ccdfce 100644 (file)
@@ -279,16 +279,18 @@ emit_notifications_in_idle (gpointer user_data)
        }
 
        if (has_changes) {
-               g_dbus_connection_emit_signal (connection,
-                                       NULL,
-                                       path,
-                                       "org.freedesktop.DBus.Properties",
-                                       "PropertiesChanged",
-                                       g_variant_new ("(sa{sv}as)",
-                                                       GDBUS_CAL_FACTORY_INTERFACE_NAME,
-                                                       builder,
-                                                       invalidated_builder),
-                                       NULL);
+               g_dbus_connection_emit_signal (
+                       connection,
+                       NULL,
+                       path,
+                       "org.freedesktop.DBus.Properties",
+                       "PropertiesChanged",
+                       g_variant_new (
+                               "(sa{sv}as)",
+                               GDBUS_CAL_FACTORY_INTERFACE_NAME,
+                               builder,
+                               invalidated_builder),
+                               NULL);
        } else {
                g_variant_builder_unref (builder);
                g_variant_builder_unref (invalidated_builder);
@@ -357,7 +359,8 @@ e_gdbus_cal_factory_register_object (EGdbusCalFactory *object,
        g_object_set_data_full (G_OBJECT (object), "gdbus-codegen-path", (gpointer) g_strdup (object_path), g_free);
        g_object_set_data (G_OBJECT (object), "gdbus-codegen-connection", (gpointer) connection);
        g_object_set_data_full (G_OBJECT (object), "gdbus-codegen-pvc", (gpointer) pvc, (GDestroyNotify) g_hash_table_unref);
-       return g_dbus_connection_register_object (connection,
+       return g_dbus_connection_register_object (
+               connection,
                object_path,
                (GDBusInterfaceInfo *) &_e_gdbus_cal_factory_interface_info,
                &e_gdbus_cal_factory_interface_vtable,
@@ -448,17 +451,18 @@ e_gdbus_cal_factory_proxy_new (GDBusConnection *connection,
                                GAsyncReadyCallback callback,
                                gpointer user_data)
 {
-       g_async_initable_new_async (E_TYPE_GDBUS_CAL_FACTORY_PROXY,
-                               G_PRIORITY_DEFAULT,
-                               cancellable,
-                               callback,
-                               user_data,
-                               "g-flags", flags,
-                               "g-name", name,
-                               "g-connection", connection,
-                               "g-object-path", object_path,
-                               "g-interface-name", GDBUS_CAL_FACTORY_INTERFACE_NAME,
-                               NULL);
+       g_async_initable_new_async (
+               E_TYPE_GDBUS_CAL_FACTORY_PROXY,
+               G_PRIORITY_DEFAULT,
+               cancellable,
+               callback,
+               user_data,
+               "g-flags", flags,
+               "g-name", name,
+               "g-connection", connection,
+               "g-object-path", object_path,
+               "g-interface-name", GDBUS_CAL_FACTORY_INTERFACE_NAME,
+               NULL);
 }
 
 /**
@@ -510,15 +514,16 @@ e_gdbus_cal_factory_proxy_new_sync (GDBusConnection *connection,
                                     GError **error)
 {
        GInitable *initable;
-       initable = g_initable_new (E_TYPE_GDBUS_CAL_FACTORY_PROXY,
-                               cancellable,
-                               error,
-                               "g-flags", flags,
-                               "g-name", name,
-                               "g-connection", connection,
-                               "g-object-path", object_path,
-                               "g-interface-name", GDBUS_CAL_FACTORY_INTERFACE_NAME,
-                               NULL);
+       initable = g_initable_new (
+               E_TYPE_GDBUS_CAL_FACTORY_PROXY,
+               cancellable,
+               error,
+               "g-flags", flags,
+               "g-name", name,
+               "g-connection", connection,
+               "g-object-path", object_path,
+               "g-interface-name", GDBUS_CAL_FACTORY_INTERFACE_NAME,
+               NULL);
        if (initable != NULL)
                return E_GDBUS_CAL_FACTORY (initable);
        else
@@ -548,17 +553,18 @@ e_gdbus_cal_factory_proxy_new_for_bus (GBusType bus_type,
                                        GAsyncReadyCallback callback,
                                        gpointer user_data)
 {
-       g_async_initable_new_async (E_TYPE_GDBUS_CAL_FACTORY_PROXY,
-                               G_PRIORITY_DEFAULT,
-                               cancellable,
-                               callback,
-                               user_data,
-                               "g-flags", flags,
-                               "g-name", name,
-                               "g-bus-type", bus_type,
-                               "g-object-path", object_path,
-                               "g-interface-name", GDBUS_CAL_FACTORY_INTERFACE_NAME,
-                               NULL);
+       g_async_initable_new_async (
+               E_TYPE_GDBUS_CAL_FACTORY_PROXY,
+               G_PRIORITY_DEFAULT,
+               cancellable,
+               callback,
+               user_data,
+               "g-flags", flags,
+               "g-name", name,
+               "g-bus-type", bus_type,
+               "g-object-path", object_path,
+               "g-interface-name", GDBUS_CAL_FACTORY_INTERFACE_NAME,
+               NULL);
 }
 
 /**
@@ -610,15 +616,16 @@ e_gdbus_cal_factory_proxy_new_for_bus_sync (GBusType bus_type,
                                             GError **error)
 {
        GInitable *initable;
-       initable = g_initable_new (E_TYPE_GDBUS_CAL_FACTORY_PROXY,
-                               cancellable,
-                               error,
-                               "g-flags", flags,
-                               "g-name", name,
-                               "g-bus-type", bus_type,
-                               "g-object-path", object_path,
-                               "g-interface-name", GDBUS_CAL_FACTORY_INTERFACE_NAME,
-                               NULL);
+       initable = g_initable_new (
+               E_TYPE_GDBUS_CAL_FACTORY_PROXY,
+               cancellable,
+               error,
+               "g-flags", flags,
+               "g-name", name,
+               "g-bus-type", bus_type,
+               "g-object-path", object_path,
+               "g-interface-name", GDBUS_CAL_FACTORY_INTERFACE_NAME,
+               NULL);
        if (initable != NULL)
                return E_GDBUS_CAL_FACTORY (initable);
        else
index d8cc323..cafbaec 100644 (file)
@@ -480,16 +480,18 @@ emit_notifications_in_idle (gpointer user_data)
     }
 
        if (has_changes) {
-               g_dbus_connection_emit_signal (connection,
-                                       NULL,
-                                       path,
-                                       "org.freedesktop.DBus.Properties",
-                                       "PropertiesChanged",
-                                       g_variant_new ("(sa{sv}as)",
-                                                       GDBUS_CAL_VIEW_INTERFACE_NAME,
-                                                       builder,
-                                                       invalidated_builder),
-                                       NULL);
+               g_dbus_connection_emit_signal (
+                       connection,
+                       NULL,
+                       path,
+                       "org.freedesktop.DBus.Properties",
+                       "PropertiesChanged",
+                       g_variant_new (
+                               "(sa{sv}as)",
+                               GDBUS_CAL_VIEW_INTERFACE_NAME,
+                               builder,
+                               invalidated_builder),
+                               NULL);
        } else {
                g_variant_builder_unref (builder);
                g_variant_builder_unref (invalidated_builder);
@@ -558,7 +560,8 @@ e_gdbus_cal_view_register_object (EGdbusCalView *object,
        g_object_set_data_full (G_OBJECT (object), "gdbus-codegen-path", (gpointer) g_strdup (object_path), g_free);
        g_object_set_data (G_OBJECT (object), "gdbus-codegen-connection", (gpointer) connection);
        g_object_set_data_full (G_OBJECT (object), "gdbus-codegen-pvc", (gpointer) pvc, (GDestroyNotify) g_hash_table_unref);
-       return g_dbus_connection_register_object (connection,
+       return g_dbus_connection_register_object (
+               connection,
                object_path,
                (GDBusInterfaceInfo *) &_e_gdbus_cal_view_interface_info,
                &e_gdbus_cal_view_interface_vtable,
@@ -647,17 +650,18 @@ e_gdbus_cal_view_proxy_new (GDBusConnection *connection,
                             GAsyncReadyCallback callback,
                             gpointer user_data)
 {
-       g_async_initable_new_async (E_TYPE_GDBUS_CAL_VIEW_PROXY,
-                               G_PRIORITY_DEFAULT,
-                               cancellable,
-                               callback,
-                               user_data,
-                               "g-flags", flags,
-                               "g-name", name,
-                               "g-connection", connection,
-                               "g-object-path", object_path,
-                               "g-interface-name", GDBUS_CAL_VIEW_INTERFACE_NAME,
-                               NULL);
+       g_async_initable_new_async (
+               E_TYPE_GDBUS_CAL_VIEW_PROXY,
+               G_PRIORITY_DEFAULT,
+               cancellable,
+               callback,
+               user_data,
+               "g-flags", flags,
+               "g-name", name,
+               "g-connection", connection,
+               "g-object-path", object_path,
+               "g-interface-name", GDBUS_CAL_VIEW_INTERFACE_NAME,
+               NULL);
 }
 
 /**
@@ -709,15 +713,16 @@ e_gdbus_cal_view_proxy_new_sync (GDBusConnection *connection,
                                  GError **error)
 {
        GInitable *initable;
-       initable = g_initable_new (E_TYPE_GDBUS_CAL_VIEW_PROXY,
-                               cancellable,
-                               error,
-                               "g-flags", flags,
-                               "g-name", name,
-                               "g-connection", connection,
-                               "g-object-path", object_path,
-                               "g-interface-name", GDBUS_CAL_VIEW_INTERFACE_NAME,
-                               NULL);
+       initable = g_initable_new (
+               E_TYPE_GDBUS_CAL_VIEW_PROXY,
+               cancellable,
+               error,
+               "g-flags", flags,
+               "g-name", name,
+               "g-connection", connection,
+               "g-object-path", object_path,
+               "g-interface-name", GDBUS_CAL_VIEW_INTERFACE_NAME,
+               NULL);
        if (initable != NULL)
                return E_GDBUS_CAL_VIEW (initable);
        else
@@ -747,17 +752,18 @@ e_gdbus_cal_view_proxy_new_for_bus (GBusType bus_type,
                                     GAsyncReadyCallback callback,
                                     gpointer user_data)
 {
-       g_async_initable_new_async (E_TYPE_GDBUS_CAL_VIEW_PROXY,
-                               G_PRIORITY_DEFAULT,
-                               cancellable,
-                               callback,
-                               user_data,
-                               "g-flags", flags,
-                               "g-name", name,
-                               "g-bus-type", bus_type,
-                               "g-object-path", object_path,
-                               "g-interface-name", GDBUS_CAL_VIEW_INTERFACE_NAME,
-                               NULL);
+       g_async_initable_new_async (
+               E_TYPE_GDBUS_CAL_VIEW_PROXY,
+               G_PRIORITY_DEFAULT,
+               cancellable,
+               callback,
+               user_data,
+               "g-flags", flags,
+               "g-name", name,
+               "g-bus-type", bus_type,
+               "g-object-path", object_path,
+               "g-interface-name", GDBUS_CAL_VIEW_INTERFACE_NAME,
+               NULL);
 }
 
 /**
@@ -809,15 +815,16 @@ e_gdbus_cal_view_proxy_new_for_bus_sync (GBusType bus_type,
                                          GError **error)
 {
        GInitable *initable;
-       initable = g_initable_new (E_TYPE_GDBUS_CAL_VIEW_PROXY,
-                               cancellable,
-                               error,
-                               "g-flags", flags,
-                               "g-name", name,
-                               "g-bus-type", bus_type,
-                               "g-object-path", object_path,
-                               "g-interface-name", GDBUS_CAL_VIEW_INTERFACE_NAME,
-                               NULL);
+       initable = g_initable_new (
+               E_TYPE_GDBUS_CAL_VIEW_PROXY,
+               cancellable,
+               error,
+               "g-flags", flags,
+               "g-name", name,
+               "g-bus-type", bus_type,
+               "g-object-path", object_path,
+               "g-interface-name", GDBUS_CAL_VIEW_INTERFACE_NAME,
+               NULL);
        if (initable != NULL)
                return E_GDBUS_CAL_VIEW (initable);
        else
index 0f59375..aea358f 100644 (file)
@@ -364,7 +364,8 @@ e_gdbus_cal_call_open_sync (GDBusProxy *proxy,
                             GCancellable *cancellable,
                             GError **error)
 {
-       return e_gdbus_proxy_call_sync_boolean__void (proxy, in_only_if_exists, cancellable, error,
+       return e_gdbus_proxy_call_sync_boolean__void (
+               proxy, in_only_if_exists, cancellable, error,
                e_gdbus_cal_call_open,
                e_gdbus_cal_call_open_finish);
 }
@@ -391,7 +392,8 @@ e_gdbus_cal_call_refresh_sync (GDBusProxy *proxy,
                                GCancellable *cancellable,
                                GError **error)
 {
-       return e_gdbus_proxy_call_sync_void__void (proxy, cancellable, error,
+       return e_gdbus_proxy_call_sync_void__void (
+               proxy, cancellable, error,
                e_gdbus_cal_call_refresh,
                e_gdbus_cal_call_refresh_finish);
 }
@@ -422,7 +424,8 @@ e_gdbus_cal_call_get_backend_property_sync (GDBusProxy *proxy,
                                             GCancellable *cancellable,
                                             GError **error)
 {
-       return e_gdbus_proxy_call_sync_string__string (proxy, in_prop_name, out_prop_value, cancellable, error,
+       return e_gdbus_proxy_call_sync_string__string (
+               proxy, in_prop_name, out_prop_value, cancellable, error,
                e_gdbus_cal_call_get_backend_property,
                e_gdbus_cal_call_get_backend_property_finish);
 }
@@ -468,7 +471,8 @@ e_gdbus_cal_call_set_backend_property_sync (GDBusProxy *proxy,
                                             GCancellable *cancellable,
                                             GError **error)
 {
-       return e_gdbus_proxy_call_sync_strv__void (proxy, in_prop_name_value, cancellable, error,
+       return e_gdbus_proxy_call_sync_strv__void (
+               proxy, in_prop_name_value, cancellable, error,
                e_gdbus_cal_call_set_backend_property,
                e_gdbus_cal_call_set_backend_property_finish);
 }
@@ -516,7 +520,8 @@ e_gdbus_cal_call_get_object_sync (GDBusProxy *proxy,
                                   GCancellable *cancellable,
                                   GError **error)
 {
-       return e_gdbus_proxy_call_sync_strv__string (proxy, in_uid_rid, out_object, cancellable, error,
+       return e_gdbus_proxy_call_sync_strv__string (
+               proxy, in_uid_rid, out_object, cancellable, error,
                e_gdbus_cal_call_get_object,
                e_gdbus_cal_call_get_object_finish);
 }
@@ -547,7 +552,8 @@ e_gdbus_cal_call_get_object_list_sync (GDBusProxy *proxy,
                                        GCancellable *cancellable,
                                        GError **error)
 {
-       return e_gdbus_proxy_call_sync_string__strv (proxy, in_sexp, out_objects, cancellable, error,
+       return e_gdbus_proxy_call_sync_string__strv (
+               proxy, in_sexp, out_objects, cancellable, error,
                e_gdbus_cal_call_get_object_list,
                e_gdbus_cal_call_get_object_list_finish);
 }
@@ -627,7 +633,8 @@ e_gdbus_cal_call_get_free_busy_sync (GDBusProxy *proxy,
                                      GCancellable *cancellable,
                                      GError **error)
 {
-       return e_gdbus_proxy_call_sync_strv__void (proxy, in_start_end_userlist, cancellable, error,
+       return e_gdbus_proxy_call_sync_strv__void (
+               proxy, in_start_end_userlist, cancellable, error,
                e_gdbus_cal_call_get_free_busy,
                e_gdbus_cal_call_get_free_busy_finish);
 }
@@ -658,7 +665,8 @@ e_gdbus_cal_call_create_objects_sync (GDBusProxy *proxy,
                                       GCancellable *cancellable,
                                       GError **error)
 {
-       return e_gdbus_proxy_call_sync_strv__strv (proxy, in_calobjs, out_uids, cancellable, error,
+       return e_gdbus_proxy_call_sync_strv__strv (
+               proxy, in_calobjs, out_uids, cancellable, error,
                e_gdbus_cal_call_create_objects,
                e_gdbus_cal_call_create_objects_finish);
 }
@@ -736,7 +744,8 @@ e_gdbus_cal_call_modify_objects_sync (GDBusProxy *proxy,
                                       GCancellable *cancellable,
                                       GError **error)
 {
-       return e_gdbus_proxy_call_sync_strv__void (proxy, in_mod_calobjs, cancellable, error,
+       return e_gdbus_proxy_call_sync_strv__void (
+               proxy, in_mod_calobjs, cancellable, error,
                e_gdbus_cal_call_modify_objects,
                e_gdbus_cal_call_modify_objects_finish);
 }
@@ -823,7 +832,8 @@ e_gdbus_cal_call_remove_objects_sync (GDBusProxy *proxy,
                                       GCancellable *cancellable,
                                       GError **error)
 {
-       return e_gdbus_proxy_call_sync_strv__void (proxy, in_mod_ids, cancellable, error,
+       return e_gdbus_proxy_call_sync_strv__void (
+               proxy, in_mod_ids, cancellable, error,
                e_gdbus_cal_call_remove_objects,
                e_gdbus_cal_call_remove_objects_finish);
 }
@@ -852,7 +862,8 @@ e_gdbus_cal_call_receive_objects_sync (GDBusProxy *proxy,
                                        GCancellable *cancellable,
                                        GError **error)
 {
-       return e_gdbus_proxy_call_sync_string__void (proxy, in_calobj, cancellable, error,
+       return e_gdbus_proxy_call_sync_string__void (
+               proxy, in_calobj, cancellable, error,
                e_gdbus_cal_call_receive_objects,
                e_gdbus_cal_call_receive_objects_finish);
 }
@@ -928,7 +939,8 @@ e_gdbus_cal_call_send_objects_sync (GDBusProxy *proxy,
                                     GCancellable *cancellable,
                                     GError **error)
 {
-       return e_gdbus_proxy_call_sync_string__strv (proxy, in_calobj, out_calobj_users, cancellable, error,
+       return e_gdbus_proxy_call_sync_string__strv (
+               proxy, in_calobj, out_calobj_users, cancellable, error,
                e_gdbus_cal_call_send_objects,
                e_gdbus_cal_call_send_objects_finish);
 }
@@ -976,7 +988,8 @@ e_gdbus_cal_call_get_attachment_uris_sync (GDBusProxy *proxy,
                                            GCancellable *cancellable,
                                            GError **error)
 {
-       return e_gdbus_proxy_call_sync_strv__strv (proxy, in_uid_rid, out_attachments, cancellable, error,
+       return e_gdbus_proxy_call_sync_strv__strv (
+               proxy, in_uid_rid, out_attachments, cancellable, error,
                e_gdbus_cal_call_get_attachment_uris,
                e_gdbus_cal_call_get_attachment_uris_finish);
 }
@@ -1045,7 +1058,8 @@ e_gdbus_cal_call_discard_alarm_sync (GDBusProxy *proxy,
                                      GCancellable *cancellable,
                                      GError **error)
 {
-       return e_gdbus_proxy_call_sync_strv__void (proxy, in_uid_rid_auid, cancellable, error,
+       return e_gdbus_proxy_call_sync_strv__void (
+               proxy, in_uid_rid_auid, cancellable, error,
                e_gdbus_cal_call_discard_alarm,
                e_gdbus_cal_call_discard_alarm_finish);
 }
@@ -1076,7 +1090,8 @@ e_gdbus_cal_call_get_view_sync (GDBusProxy *proxy,
                                 GCancellable *cancellable,
                                 GError **error)
 {
-       return e_gdbus_proxy_call_sync_string__string (proxy, in_sexp, out_view_path, cancellable, error,
+       return e_gdbus_proxy_call_sync_string__string (
+               proxy, in_sexp, out_view_path, cancellable, error,
                e_gdbus_cal_call_get_view,
                e_gdbus_cal_call_get_view_finish);
 }
@@ -1107,7 +1122,8 @@ e_gdbus_cal_call_get_timezone_sync (GDBusProxy *proxy,
                                     GCancellable *cancellable,
                                     GError **error)
 {
-       return e_gdbus_proxy_call_sync_string__string (proxy, in_tzid, out_tzobject, cancellable, error,
+       return e_gdbus_proxy_call_sync_string__string (
+               proxy, in_tzid, out_tzobject, cancellable, error,
                e_gdbus_cal_call_get_timezone,
                e_gdbus_cal_call_get_timezone_finish);
 }
@@ -1136,7 +1152,8 @@ e_gdbus_cal_call_add_timezone_sync (GDBusProxy *proxy,
                                     GCancellable *cancellable,
                                     GError **error)
 {
-       return e_gdbus_proxy_call_sync_string__void (proxy, in_tzobject, cancellable, error,
+       return e_gdbus_proxy_call_sync_string__void (
+               proxy, in_tzobject, cancellable, error,
                e_gdbus_cal_call_add_timezone,
                e_gdbus_cal_call_add_timezone_finish);
 }
@@ -1591,16 +1608,18 @@ emit_notifications_in_idle (gpointer user_data)
        }
 
        if (has_changes) {
-               g_dbus_connection_emit_signal (connection,
-                                       NULL,
-                                       path,
-                                       "org.freedesktop.DBus.Properties",
-                                       "PropertiesChanged",
-                                       g_variant_new ("(sa{sv}as)",
-                                                       GDBUS_CAL_INTERFACE_NAME,
-                                                       builder,
-                                                       invalidated_builder),
-                                       NULL);
+               g_dbus_connection_emit_signal (
+                       connection,
+                       NULL,
+                       path,
+                       "org.freedesktop.DBus.Properties",
+                       "PropertiesChanged",
+                       g_variant_new (
+                               "(sa{sv}as)",
+                               GDBUS_CAL_INTERFACE_NAME,
+                               builder,
+                               invalidated_builder),
+                               NULL);
        } else {
                g_variant_builder_unref (builder);
                g_variant_builder_unref (invalidated_builder);
@@ -1670,13 +1689,14 @@ e_gdbus_cal_register_object (EGdbusCal *object,
        g_object_set_data (G_OBJECT (object), "gdbus-codegen-connection", (gpointer) connection);
        g_object_set_data_full (G_OBJECT (object), "gdbus-codegen-pvc", (gpointer) pvc, (GDestroyNotify) g_hash_table_unref);
 
-       return g_dbus_connection_register_object (connection,
-                       object_path,
-                       (GDBusInterfaceInfo *) &_e_gdbus_cal_interface_info,
-                       &e_gdbus_cal_interface_vtable,
-                       object,
-                       (GDestroyNotify) on_object_unregistered,
-                       error);
+       return g_dbus_connection_register_object (
+               connection,
+               object_path,
+               (GDBusInterfaceInfo *) &_e_gdbus_cal_interface_info,
+               &e_gdbus_cal_interface_vtable,
+               object,
+               (GDestroyNotify) on_object_unregistered,
+               error);
 }
 
 /**
@@ -1831,17 +1851,18 @@ e_gdbus_cal_proxy_new (GDBusConnection *connection,
                        GAsyncReadyCallback callback,
                        gpointer user_data)
 {
-       g_async_initable_new_async (E_TYPE_GDBUS_CAL_PROXY,
-                               G_PRIORITY_DEFAULT,
-                               cancellable,
-                               callback,
-                               user_data,
-                               "g-flags", flags,
-                               "g-name", name,
-                               "g-connection", connection,
-                               "g-object-path", object_path,
-                               "g-interface-name", GDBUS_CAL_INTERFACE_NAME,
-                               NULL);
+       g_async_initable_new_async (
+               E_TYPE_GDBUS_CAL_PROXY,
+               G_PRIORITY_DEFAULT,
+               cancellable,
+               callback,
+               user_data,
+               "g-flags", flags,
+               "g-name", name,
+               "g-connection", connection,
+               "g-object-path", object_path,
+               "g-interface-name", GDBUS_CAL_INTERFACE_NAME,
+               NULL);
 }
 
 /**
@@ -1893,15 +1914,16 @@ e_gdbus_cal_proxy_new_sync (GDBusConnection *connection,
                             GError **error)
 {
        GInitable *initable;
-       initable = g_initable_new (E_TYPE_GDBUS_CAL_PROXY,
-                               cancellable,
-                               error,
-                               "g-flags", flags,
-                               "g-name", name,
-                               "g-connection", connection,
-                               "g-object-path", object_path,
-                               "g-interface-name", GDBUS_CAL_INTERFACE_NAME,
-                               NULL);
+       initable = g_initable_new (
+               E_TYPE_GDBUS_CAL_PROXY,
+               cancellable,
+               error,
+               "g-flags", flags,
+               "g-name", name,
+               "g-connection", connection,
+               "g-object-path", object_path,
+               "g-interface-name", GDBUS_CAL_INTERFACE_NAME,
+               NULL);
        if (initable != NULL)
                return E_GDBUS_CAL (initable);
        else
@@ -1931,17 +1953,18 @@ e_gdbus_cal_proxy_new_for_bus (GBusType bus_type,
                                GAsyncReadyCallback callback,
                                gpointer user_data)
 {
-       g_async_initable_new_async (E_TYPE_GDBUS_CAL_PROXY,
-                               G_PRIORITY_DEFAULT,
-                               cancellable,
-                               callback,
-                               user_data,
-                               "g-flags", flags,
-                               "g-name", name,
-                               "g-bus-type", bus_type,
-                               "g-object-path", object_path,
-                               "g-interface-name", GDBUS_CAL_INTERFACE_NAME,
-                               NULL);
+       g_async_initable_new_async (
+               E_TYPE_GDBUS_CAL_PROXY,
+               G_PRIORITY_DEFAULT,
+               cancellable,
+               callback,
+               user_data,
+               "g-flags", flags,
+               "g-name", name,
+               "g-bus-type", bus_type,
+               "g-object-path", object_path,
+               "g-interface-name", GDBUS_CAL_INTERFACE_NAME,
+               NULL);
 }
 
 /**
@@ -1993,15 +2016,16 @@ e_gdbus_cal_proxy_new_for_bus_sync (GBusType bus_type,
                                     GError **error)
 {
        GInitable *initable;
-       initable = g_initable_new (E_TYPE_GDBUS_CAL_PROXY,
-                               cancellable,
-                               error,
-                               "g-flags", flags,
-                               "g-name", name,
-                               "g-bus-type", bus_type,
-                               "g-object-path", object_path,
-                               "g-interface-name", GDBUS_CAL_INTERFACE_NAME,
-                               NULL);
+       initable = g_initable_new (
+               E_TYPE_GDBUS_CAL_PROXY,
+               cancellable,
+               error,
+               "g-flags", flags,
+               "g-name", name,
+               "g-bus-type", bus_type,
+               "g-object-path", object_path,
+               "g-interface-name", GDBUS_CAL_INTERFACE_NAME,
+               NULL);
        if (initable != NULL)
                return E_GDBUS_CAL (initable);
        else
index 2d14ff9..c4d45fb 100644 (file)
@@ -569,8 +569,9 @@ imapx_get_message_sync (CamelFolder *folder,
                                has_attachment = camel_mime_message_has_attachment (msg);
                                if (((camel_message_info_flags (mi) & CAMEL_MESSAGE_ATTACHMENTS) && !has_attachment) ||
                                    ((camel_message_info_flags (mi) & CAMEL_MESSAGE_ATTACHMENTS) == 0 && has_attachment)) {
-                                       camel_message_info_set_flags (mi,
-                                               CAMEL_MESSAGE_ATTACHMENTS, has_attachment ? CAMEL_MESSAGE_ATTACHMENTS : 0);
+                                       camel_message_info_set_flags (
+                                               mi, CAMEL_MESSAGE_ATTACHMENTS,
+                                               has_attachment ? CAMEL_MESSAGE_ATTACHMENTS : 0);
                                }
 
                                camel_message_info_free (mi);
index e595243..58e7eb5 100644 (file)
@@ -463,9 +463,10 @@ replace_untagged_descriptor (GHashTable *untagged_handlers,
        /* descr may be NULL (to delete a handler) */
 
        prev = g_hash_table_lookup (untagged_handlers, key);
-       g_hash_table_replace (untagged_handlers,
-                             g_strdup (key),
-                             (gpointer) descr);
+       g_hash_table_replace (
+               untagged_handlers,
+               g_strdup (key),
+               (gpointer) descr);
        return prev;
 }
 
@@ -480,9 +481,10 @@ add_initial_untagged_descriptor (GHashTable *untagged_handlers,
        g_return_if_fail (untagged_id < IMAPX_UNTAGGED_LAST_ID);
 
        cur =  &(_untagged_descr[untagged_id]);
-       prev = replace_untagged_descriptor (untagged_handlers,
-                                           cur->untagged_response,
-                                           cur);
+       prev = replace_untagged_descriptor (
+               untagged_handlers,
+               cur->untagged_response,
+               cur);
        /* there must not be any previous handler here */
        g_return_if_fail (prev == NULL);
 }
@@ -490,10 +492,11 @@ add_initial_untagged_descriptor (GHashTable *untagged_handlers,
 static GHashTable *
 create_initial_untagged_handler_table (void)
 {
-       GHashTable *uh = g_hash_table_new_full (g_str_hash,
-                                               g_str_equal,
-                                               g_free,
-                                               NULL);
+       GHashTable *uh = g_hash_table_new_full (
+               g_str_hash,
+               g_str_equal,
+               g_free,
+               NULL);
        guint32 ii = 0;
 
        /* CamelIMAPXServer predefined handlers*/
@@ -935,8 +938,9 @@ imapx_command_start_next (CamelIMAPXServer *is,
                GList *head, *link;
                gboolean commands_started = FALSE;
 
-               c (is->tagprefix, "- we're selected on '%s', current jobs?\n",
-                 camel_folder_get_full_name (is->select_folder));
+               c (
+                       is->tagprefix, "- we're selected on '%s', current jobs?\n",
+                       camel_folder_get_full_name (is->select_folder));
 
                head = camel_imapx_command_queue_peek_head_link (is->active);
 
@@ -1008,9 +1012,10 @@ imapx_command_start_next (CamelIMAPXServer *is,
        /* If we need to select a folder for the first command, do it now,
         * once it is complete it will re-call us if it succeeded. */
        if (first_ic->select) {
-               c (is->tagprefix, "Selecting folder '%s' for command '%s'(%p)\n",
-                 camel_folder_get_full_name (first_ic->select),
-                 first_ic->name, first_ic);
+               c (
+                       is->tagprefix, "Selecting folder '%s' for command '%s'(%p)\n",
+                       camel_folder_get_full_name (first_ic->select),
+                       first_ic->name, first_ic);
                imapx_select (is, first_ic->select, FALSE, cancellable, error);
        } else {
                GQueue start = G_QUEUE_INIT;
@@ -1405,8 +1410,9 @@ imapx_untagged_vanished (CamelIMAPXServer *is,
                CamelIMAPXFolder *ifolder = (CamelIMAPXFolder *) is->select_folder;
 
                if (ifolder->exists_on_server < uids->len) {
-                       c (is->tagprefix, "Error: exists_on_folder %d is fewer than vanished %d\n",
-                         ifolder->exists_on_server, uids->len);
+                       c (
+                               is->tagprefix, "Error: exists_on_folder %d is fewer than vanished %d\n",
+                               ifolder->exists_on_server, uids->len);
                        ifolder->exists_on_server = 0;
                } else
                        ifolder->exists_on_server -= uids->len;
@@ -1545,8 +1551,9 @@ imapx_untagged_fetch (CamelIMAPXServer *is,
 
                        data->body_len = camel_stream_write_to_stream (finfo->body, data->stream, job->cancellable, &job->error);
                        if (data->body_len == -1)
-                               g_prefix_error (&job->error,
-                                               _("Error writing to cache stream: "));
+                               g_prefix_error (
+                                       &job->error,
+                                       _("Error writing to cache stream: "));
                }
        }
 
@@ -1894,8 +1901,9 @@ imapx_untagged_bye (CamelIMAPXServer *is,
 
        if (camel_imapx_stream_text (stream, &token, cancellable, NULL)) {
                c (is->tagprefix, "BYE: %s\n", token);
-               g_set_error (error, CAMEL_IMAPX_ERROR, 1,
-                            "IMAP server said BYE: %s", token);
+               g_set_error (
+                       error, CAMEL_IMAPX_ERROR, 1,
+                       "IMAP server said BYE: %s", token);
        }
        is->state = IMAPX_SHUTDOWN;
 
@@ -2045,7 +2053,8 @@ imapx_untagged (CamelIMAPXServer *is,
        }
 
        if (is->priv->context->tok == '\n') {
-               g_set_error (error, CAMEL_IMAPX_ERROR, 1,
+               g_set_error (
+                       error, CAMEL_IMAPX_ERROR, 1,
                        "truncated server response");
                goto exit;
        }
@@ -2138,8 +2147,9 @@ imapx_continuation (CamelIMAPXServer *is,
                        }
                        is->idle->state = IMAPX_IDLE_OFF;
                } else {
-                       c (is->tagprefix, "idle starts in wrong state %d\n",
-                                is->idle->state);
+                       c (
+                               is->tagprefix, "idle starts in wrong state %d\n",
+                               is->idle->state);
                }
                IDLE_UNLOCK (is->idle);
 
@@ -2769,8 +2779,9 @@ imapx_stop_idle (CamelIMAPXServer *is,
                        break;
 
                idle->state = IMAPX_IDLE_OFF;
-               c (is->tagprefix, "Stopping idle after %ld seconds\n",
-                 (long)(now - idle->started));
+               c (
+                       is->tagprefix, "Stopping idle after %ld seconds\n",
+                       (long)(now - idle->started));
        case IMAPX_IDLE_PENDING:
                idle->state = IMAPX_IDLE_OFF;
        case IMAPX_IDLE_OFF:
@@ -2906,8 +2917,9 @@ imapx_command_select_done (CamelIMAPXServer *is,
                                CamelIMAPXCommand *cw = link->data;
 
                                if (cw->select && cw->select == is->select_pending) {
-                                       c (is->tagprefix, "Cancelling command '%s'(%p) for folder '%s'\n",
-                                         cw->name, cw, camel_folder_get_full_name (cw->select));
+                                       c (
+                                               is->tagprefix, "Cancelling command '%s'(%p) for folder '%s'\n",
+                                               cw->name, cw, camel_folder_get_full_name (cw->select));
                                        g_queue_push_tail (&trash, link);
                                }
                        }
@@ -2978,8 +2990,9 @@ imapx_command_select_done (CamelIMAPXServer *is,
                        /* We don't want to fetch new messages if the command we selected this
                         * folder for is *already* fetching all messages (i.e. scan_changes).
                         * Bug #667725. */
-                       CamelIMAPXJob *job = imapx_is_job_in_queue (is, is->select_pending,
-                                                                   IMAPX_JOB_REFRESH_INFO, NULL);
+                       CamelIMAPXJob *job = imapx_is_job_in_queue (
+                               is, is->select_pending,
+                               IMAPX_JOB_REFRESH_INFO, NULL);
                        if (job) {
                                RefreshInfoData *data = camel_imapx_job_get_data (job);
 
@@ -3004,9 +3017,10 @@ imapx_command_select_done (CamelIMAPXServer *is,
 #if 0
                /* This should trigger a new messages scan */
                if (is->exists != is->select_folder->summary->root_view->total_count)
-                       g_warning ("exists is %d our summary is %d and summary exists is %d\n", is->exists,
-                                 is->select_folder->summary->root_view->total_count,
-                                 ((CamelIMAPXSummary *) is->select_folder->summary)->exists);
+                       g_warning (
+                               "exists is %d our summary is %d and summary exists is %d\n", is->exists,
+                               is->select_folder->summary->root_view->total_count,
+                               ((CamelIMAPXSummary *) is->select_folder->summary)->exists);
 #endif
        }
 
@@ -3086,9 +3100,10 @@ imapx_select (CamelIMAPXServer *is,
                        firstuid = imapx_get_uid_from_index (folder->summary, 0);
                        lastuid = imapx_get_uid_from_index (folder->summary, total - 1);
 
-                       c (is->tagprefix, "SELECT QRESYNC %" G_GUINT64_FORMAT
-                         " %" G_GUINT64_FORMAT "\n",
-                         ifolder->uidvalidity_on_server, isum->modseq);
+                       c (
+                               is->tagprefix, "SELECT QRESYNC %" G_GUINT64_FORMAT
+                               " %" G_GUINT64_FORMAT "\n",
+                               ifolder->uidvalidity_on_server, isum->modseq);
 
                        camel_imapx_command_add (
                                ic, " (QRESYNC (%"
@@ -3580,7 +3595,7 @@ camel_imapx_server_authenticate (CamelIMAPXServer *is,
                                error, CAMEL_SERVICE_ERROR,
                                CAMEL_SERVICE_ERROR_CANT_AUTHENTICATE,
                                _("IMAP server %s does not support %s "
-                                 "authentication"), host, mechanism);
+                               "authentication"), host, mechanism);
                        result = CAMEL_AUTHENTICATION_ERROR;
                        goto exit;
                }
@@ -4390,16 +4405,18 @@ imapx_command_step_fetch_done (CamelIMAPXServer *is,
        }
 
        if (camel_folder_summary_count (job->folder->summary)) {
-               gchar *uid = imapx_get_uid_from_index (job->folder->summary,
-                                                      camel_folder_summary_count (job->folder->summary) - 1);
+               gchar *uid = imapx_get_uid_from_index (
+                       job->folder->summary,
+                       camel_folder_summary_count (job->folder->summary) - 1);
                guint64 uidl = strtoull (uid, NULL, 10);
                g_free (uid);
 
                uidl++;
 
                if (uidl > ifolder->uidnext_on_server) {
-                       c (is->tagprefix, "Updating uidnext_on_server for '%s' to %" G_GUINT64_FORMAT "\n",
-                         camel_folder_get_full_name (job->folder), uidl);
+                       c (
+                               is->tagprefix, "Updating uidnext_on_server for '%s' to %" G_GUINT64_FORMAT "\n",
+                               camel_folder_get_full_name (job->folder), uidl);
                        ifolder->uidnext_on_server = uidl;
                }
        }
@@ -4643,8 +4660,9 @@ imapx_job_scan_changes_start (CamelIMAPXJob *job,
                _("Scanning for changed messages in '%s'"),
                camel_folder_get_display_name (job->folder));
 
-       e ('E', "Scanning from %s in %s\n", uid ? uid : "start",
-         camel_folder_get_full_name (job->folder));
+       e (
+               'E', "Scanning from %s in %s\n", uid ? uid : "start",
+               camel_folder_get_full_name (job->folder));
 
        ic = camel_imapx_command_new (
                is, "FETCH", job->folder,
@@ -4696,16 +4714,18 @@ imapx_command_fetch_new_messages_done (CamelIMAPXServer *is,
        }
 
        if (camel_folder_summary_count (job->folder->summary)) {
-               gchar *uid = imapx_get_uid_from_index (job->folder->summary,
-                                                      camel_folder_summary_count (job->folder->summary) - 1);
+               gchar *uid = imapx_get_uid_from_index (
+                       job->folder->summary,
+                       camel_folder_summary_count (job->folder->summary) - 1);
                guint64 uidl = strtoull (uid, NULL, 10);
                g_free (uid);
 
                uidl++;
 
                if (uidl > ifolder->uidnext_on_server) {
-                       c (is->tagprefix, "Updating uidnext_on_server for '%s' to %" G_GUINT64_FORMAT "\n",
-                         camel_folder_get_full_name (job->folder), uidl);
+                       c (
+                               is->tagprefix, "Updating uidnext_on_server for '%s' to %" G_GUINT64_FORMAT "\n",
+                               camel_folder_get_full_name (job->folder), uidl);
                        ifolder->uidnext_on_server = uidl;
                }
        }
@@ -4923,8 +4943,9 @@ imapx_job_fetch_messages_start (CamelIMAPXJob *job,
                        data->fetch_msg_limit,
                        camel_folder_get_display_name (folder));
 
-               ic = camel_imapx_command_new (is, "FETCH", job->folder,
-                                       "UID FETCH %s:%s (RFC822.SIZE RFC822.HEADER FLAGS)", start_uid, end_uid);
+               ic = camel_imapx_command_new (
+                       is, "FETCH", job->folder,
+                       "UID FETCH %s:%s (RFC822.SIZE RFC822.HEADER FLAGS)", start_uid, end_uid);
                ic->pri = job->pri;
                ic->complete = imapx_command_fetch_new_messages_done;
 
@@ -5091,12 +5112,13 @@ imapx_job_refresh_info_start (CamelIMAPXJob *job,
        if (is->use_qresync && isum->modseq && ifolder->uidvalidity_on_server)
                can_qresync = TRUE;
 
-       e (is->tagprefix, "folder %s is %sselected, total %u / %u, unread %u / %u, modseq %" G_GUINT64_FORMAT " / %" G_GUINT64_FORMAT ", uidnext %u / %u: will %srescan\n",
-         full_name, is_selected?"": "not ", total, ifolder->exists_on_server,
-         camel_folder_summary_get_unread_count (folder->summary), ifolder->unread_on_server,
-         (guint64) isum->modseq, (guint64) ifolder->modseq_on_server,
-         isum->uidnext, ifolder->uidnext_on_server,
-         need_rescan?"":"not ");
+       e (
+               is->tagprefix, "folder %s is %sselected, total %u / %u, unread %u / %u, modseq %" G_GUINT64_FORMAT " / %" G_GUINT64_FORMAT ", uidnext %u / %u: will %srescan\n",
+               full_name, is_selected?"": "not ", total, ifolder->exists_on_server,
+               camel_folder_summary_get_unread_count (folder->summary), ifolder->unread_on_server,
+               (guint64) isum->modseq, (guint64) ifolder->modseq_on_server,
+               isum->uidnext, ifolder->uidnext_on_server,
+               need_rescan?"":"not ");
 
        /* Fetch new messages first, so that they appear to the user ASAP */
        if (ifolder->exists_on_server > total ||
@@ -5127,15 +5149,17 @@ imapx_job_refresh_info_start (CamelIMAPXJob *job,
                if (total != ifolder->exists_on_server ||
                    camel_folder_summary_get_unread_count (folder->summary) != ifolder->unread_on_server ||
                    (isum->modseq != ifolder->modseq_on_server)) {
-                       c (is->tagprefix, "Eep, after QRESYNC we're out of sync. total %u / %u, unread %u / %u, modseq %" G_GUINT64_FORMAT " / %" G_GUINT64_FORMAT "\n",
-                         total, ifolder->exists_on_server,
-                         camel_folder_summary_get_unread_count (folder->summary), ifolder->unread_on_server,
-                         isum->modseq, ifolder->modseq_on_server);
+                       c (
+                               is->tagprefix, "Eep, after QRESYNC we're out of sync. total %u / %u, unread %u / %u, modseq %" G_GUINT64_FORMAT " / %" G_GUINT64_FORMAT "\n",
+                               total, ifolder->exists_on_server,
+                               camel_folder_summary_get_unread_count (folder->summary), ifolder->unread_on_server,
+                               isum->modseq, ifolder->modseq_on_server);
                } else {
-                       c (is->tagprefix, "OK, after QRESYNC we're still in sync. total %u / %u, unread %u / %u, modseq %" G_GUINT64_FORMAT " / %" G_GUINT64_FORMAT "\n",
-                         total, ifolder->exists_on_server,
-                         camel_folder_summary_get_unread_count (folder->summary), ifolder->unread_on_server,
-                         isum->modseq, ifolder->modseq_on_server);
+                       c (
+                               is->tagprefix, "OK, after QRESYNC we're still in sync. total %u / %u, unread %u / %u, modseq %" G_GUINT64_FORMAT " / %" G_GUINT64_FORMAT "\n",
+                               total, ifolder->exists_on_server,
+                               camel_folder_summary_get_unread_count (folder->summary), ifolder->unread_on_server,
+                               isum->modseq, ifolder->modseq_on_server);
                        goto done;
                }
        }
index 933856c..e33deb8 100644 (file)
@@ -336,7 +336,8 @@ get_folder_offline (CamelStore *store,
                 * But for the on-disk cache we do always capitalize the Inbox no matter what the
                 * server provided.
                 */
-               folder_dir = imapx_path_to_physical (storage_path,
+               folder_dir = imapx_path_to_physical (
+                       storage_path,
                        g_ascii_strcasecmp (folder_name, "INBOX") == 0 ? "INBOX" : folder_name);
                g_free (storage_path);
 
@@ -1568,8 +1569,9 @@ imapx_store_rename_folder_sync (CamelStore *store,
 
        /* So do we care if this didn't work?  Its just a cache? */
        if (g_rename (oldpath, newpath) == -1) {
-               g_warning ("Could not rename message cache '%s' to '%s': %s: cache reset",
-                          oldpath, newpath, g_strerror (errno));
+               g_warning (
+                       "Could not rename message cache '%s' to '%s': %s: cache reset",
+                       oldpath, newpath, g_strerror (errno));
        }
 
        g_free (oldpath);
index 2e80571..50da4ee 100644 (file)
@@ -93,8 +93,9 @@ imapx_stream_fill (CamelIMAPXStream *is,
                         * if we *know* there are data to receive. So set the error
                         * accordingly */
                        if (!left)
-                               g_set_error (error, CAMEL_ERROR, CAMEL_ERROR_GENERIC,
-                                           _("Source stream returned no data"));
+                               g_set_error (
+                                       error, CAMEL_ERROR, CAMEL_ERROR_GENERIC,
+                                       _("Source stream returned no data"));
                        return -1;
                }
        }
index 3cbac21..0656380 100644 (file)
@@ -210,9 +210,10 @@ summary_header_to_db (CamelFolderSummary *s,
        fir = folder_summary_class->summary_header_to_db (s, error);
        if (!fir)
                return NULL;
-       fir->bdata = g_strdup_printf ("%d %" G_GUINT64_FORMAT " %u %" G_GUINT64_FORMAT, CAMEL_IMAPX_SUMMARY_VERSION,
-                                     (guint64) ims->validity, ims->uidnext,
-                                     (guint64) ims->modseq);
+       fir->bdata = g_strdup_printf (
+               "%d %" G_GUINT64_FORMAT " %u %" G_GUINT64_FORMAT, CAMEL_IMAPX_SUMMARY_VERSION,
+               (guint64) ims->validity, ims->uidnext,
+               (guint64) ims->modseq);
        return fir;
 }
 
index 2efadcc..e3ed570 100644 (file)
@@ -388,15 +388,17 @@ create_initial_capabilities_table (void)
        /* TODO add imapx_utils_uninit()
         *      to free hash table
         */
-       capa_htable = g_hash_table_new_full (g_str_hash,
-                                            g_str_equal,
-                                            g_free,
-                                            NULL);
+       capa_htable = g_hash_table_new_full (
+               g_str_hash,
+               g_str_equal,
+               g_free,
+               NULL);
 
        for (i = 0; i < G_N_ELEMENTS (capa_table); i++) {
-               g_hash_table_insert (capa_htable,
-                                    g_strdup (capa_table[i].name),
-                                    GUINT_TO_POINTER (capa_table[i].flag));
+               g_hash_table_insert (
+                       capa_htable,
+                       g_strdup (capa_table[i].name),
+                       GUINT_TO_POINTER (capa_table[i].flag));
        }
 }
 
@@ -432,9 +434,10 @@ imapx_parse_capability (CamelIMAPXStream *stream,
                                while ((c = *p))
                                        *p++ = toupper(c);
                                if (!strncmp ((gchar *) token, "AUTH=", 5)) {
-                                       g_hash_table_insert (cinfo->auth_types,
-                                                       g_strdup ((gchar *) token + 5),
-                                                       GINT_TO_POINTER (1));
+                                       g_hash_table_insert (
+                                               cinfo->auth_types,
+                                               g_strdup ((gchar *) token + 5),
+                                               GINT_TO_POINTER (1));
                                        break;
                                }
                        case IMAPX_TOK_INT:
@@ -483,8 +486,8 @@ imapx_register_capability (const gchar *capability)
         * (1 << 0), so we can use GPOINTER_TO_UINT (NULL) as
         * invalid value
         */
-       capa_id = GPOINTER_TO_UINT (g_hash_table_lookup (capa_htable,
-                                                        capability));
+       capa_id = GPOINTER_TO_UINT (
+               g_hash_table_lookup (capa_htable, capability));
        if (capa_id > 0)
                goto exit;
 
@@ -505,9 +508,10 @@ imapx_register_capability (const gchar *capability)
        capa_id = (guint32) check_id;
 
        /* insert */
-       g_hash_table_insert (capa_htable,
-                            g_strdup (capability),
-                            GUINT_TO_POINTER (capa_id));
+       g_hash_table_insert (
+               capa_htable,
+               g_strdup (capability),
+               GUINT_TO_POINTER (capa_id));
 
  exit:
        g_mutex_unlock (&capa_htable_lock);
@@ -2223,9 +2227,10 @@ imapx_get_temp_uid (void)
        G_LOCK_DEFINE_STATIC (lock);
 
        G_LOCK (lock);
-       res = g_strdup_printf ("tempuid-%lx-%d",
-                              (gulong) time (NULL),
-                              counter++);
+       res = g_strdup_printf (
+               "tempuid-%lx-%d",
+               (gulong) time (NULL),
+               counter++);
        G_UNLOCK (lock);
 
        return res;
index e2b9ade..e000b3d 100644 (file)
@@ -542,11 +542,12 @@ mime_part_write_to_stream_sync (CamelDataWrapper *dw,
        if (mp->headers) {
                struct _camel_header_raw *h = mp->headers;
                gchar *val;
-               gssize (*writefn)       (CamelStream *stream,
-                                        const gchar *name,
-                                        const gchar *value,
-                                        GCancellable *cancellable,
-                                        GError **error);
+               gssize (*writefn) (
+                       CamelStream *stream,
+                       const gchar *name,
+                       const gchar *value,
+                       GCancellable *cancellable,
+                       GError **error);
 
                /* fold/write the headers.   But dont fold headers that are already formatted
                 * (e.g. ones with parameter-lists, that we know about, and have created) */
index 42e47e2..49f2d60 100644 (file)
@@ -131,7 +131,7 @@ camel_init (const gchar *configdir,
                                "sql:", nss_configdir, NULL);
 #else
                        gchar *user_nss_dir = g_build_filename (
-                                g_get_home_dir (), ".pki/nssdb", NULL );
+                               g_get_home_dir (), ".pki/nssdb", NULL );
                        if (g_mkdir_with_parents (user_nss_dir, 0700))
                                g_warning (
                                        "Failed to create SQL "
index 59f5c62..21aa6e0 100644 (file)
@@ -3536,8 +3536,8 @@ imap_folder_summary_uid_or_error (CamelFolderSummary *summary,
 
 CamelMimeMessage *
 imap_get_message_cached (CamelFolder *folder,
-                        const gchar *message_uid,
-                        GCancellable *cancellable)
+                         const gchar *message_uid,
+                         GCancellable *cancellable)
 {
        CamelImapFolder *imap_folder = CAMEL_IMAP_FOLDER (folder);
        CamelMimeMessage *msg = NULL;
index 2863afc..5c3d753 100644 (file)
@@ -43,9 +43,9 @@ G_DEFINE_TYPE (CamelSendmailSettings, camel_sendmail_settings, CAMEL_TYPE_SETTIN
 
 static void
 sendmail_settings_set_property (GObject *object,
-                               guint property_id,
-                               const GValue *value,
-                               GParamSpec *pspec)
+                                guint property_id,
+                                const GValue *value,
+                                GParamSpec *pspec)
 {
        switch (property_id) {
                case PROP_USE_CUSTOM_BINARY:
@@ -78,9 +78,9 @@ sendmail_settings_set_property (GObject *object,
 
 static void
 sendmail_settings_get_property (GObject *object,
-                               guint property_id,
-                               GValue *value,
-                               GParamSpec *pspec)
+                                guint property_id,
+                                GValue *value,
+                                GParamSpec *pspec)
 {
        switch (property_id) {
                case PROP_USE_CUSTOM_BINARY:
@@ -228,7 +228,7 @@ camel_sendmail_settings_get_use_custom_binary (CamelSendmailSettings *settings)
  **/
 void
 camel_sendmail_settings_set_use_custom_binary (CamelSendmailSettings *settings,
-                                              gboolean use_custom_binary)
+                                               gboolean use_custom_binary)
 {
        g_return_if_fail (CAMEL_IS_SENDMAIL_SETTINGS (settings));
 
@@ -269,7 +269,7 @@ camel_sendmail_settings_get_use_custom_args (CamelSendmailSettings *settings)
  **/
 void
 camel_sendmail_settings_set_use_custom_args (CamelSendmailSettings *settings,
-                                            gboolean use_custom_args)
+                                             gboolean use_custom_args)
 {
        g_return_if_fail (CAMEL_IS_SENDMAIL_SETTINGS (settings));
 
@@ -341,7 +341,7 @@ camel_sendmail_settings_dup_custom_binary (CamelSendmailSettings *settings)
  **/
 void
 camel_sendmail_settings_set_custom_binary (CamelSendmailSettings *settings,
-                                          const gchar *custom_binary)
+                                           const gchar *custom_binary)
 {
        g_return_if_fail (CAMEL_IS_SENDMAIL_SETTINGS (settings));
 
@@ -424,7 +424,7 @@ camel_sendmail_settings_dup_custom_args (CamelSendmailSettings *settings)
  **/
 void
 camel_sendmail_settings_set_custom_args (CamelSendmailSettings *settings,
-                                       const gchar *custom_args)
+                                        const gchar *custom_args)
 {
        g_return_if_fail (CAMEL_IS_SENDMAIL_SETTINGS (settings));
 
index f570cbd..4d653a6 100644 (file)
@@ -54,9 +54,9 @@ sendmail_get_name (CamelService *service,
 
 static GPtrArray *
 parse_sendmail_args (const gchar *binary,
-                    const gchar *args,
-                    const gchar *from_addr,
-                    CamelAddress *recipients)
+                     const gchar *args,
+                     const gchar *from_addr,
+                     CamelAddress *recipients)
 {
        GPtrArray *args_arr;
        gint ii, len, argc = 0;
@@ -170,10 +170,11 @@ sendmail_send_to_sync (CamelTransport *transport,
                }
        }
 
-       argv_arr = parse_sendmail_args (binary,
-                                       custom_args ? custom_args : "-i -f %F -- %R",
-                                       from_addr,
-                                       recipients);
+       argv_arr = parse_sendmail_args (
+               binary,
+               custom_args ? custom_args : "-i -f %F -- %R",
+               from_addr,
+               recipients);
 
        if (!argv_arr) {
                g_set_error (
index 84f45a0..cbacde4 100644 (file)
@@ -402,7 +402,7 @@ e_source_mail_submission_get_replies_to_origin_folder (ESourceMailSubmission *ex
  **/
 void
 e_source_mail_submission_set_replies_to_origin_folder (ESourceMailSubmission *extension,
-                                                      gboolean replies_to_origin_folder)
+                                                       gboolean replies_to_origin_folder)
 {
        g_return_if_fail (E_IS_SOURCE_MAIL_SUBMISSION (extension));
 
index 1b26465..ba0e18f 100644 (file)
@@ -1064,13 +1064,11 @@ __strptime_internal (rp,
                        return NULL;
                    }
 
-                 num_eras = _NL_CURRENT_WORD (LC_TIME,
-                                              _NL_TIME_ERA_NUM_ENTRIES);
+                 num_eras = _NL_CURRENT_WORD (LC_TIME, _NL_TIME_ERA_NUM_ENTRIES);
                  for (era_cnt = 0; era_cnt < (gint) num_eras;
                       ++era_cnt, rp = rp_backup)
                    {
-                     era = _nl_select_era_entry (era_cnt
-                                                 HELPER_LOCALE_ARG);
+                       era = _nl_select_era_entry (era_cnt HELPER_LOCALE_ARG);
                      if (era != NULL && match_string (era->era_name, rp))
                        {
                          *decided = loc;
@@ -1119,12 +1117,10 @@ __strptime_internal (rp,
                      break;
                    }
 
-                 num_eras = _NL_CURRENT_WORD (LC_TIME,
-                                              _NL_TIME_ERA_NUM_ENTRIES);
+                 num_eras = _NL_CURRENT_WORD (LC_TIME, _NL_TIME_ERA_NUM_ENTRIES);
                  for (era_cnt = 0; era_cnt < (gint) num_eras; ++era_cnt)
                    {
-                     era = _nl_select_era_entry (era_cnt
-                                                 HELPER_LOCALE_ARG);
+                     era = _nl_select_era_entry (era_cnt HELPER_LOCALE_ARG);
                      if (era != NULL)
                        {
                          gint delta = ((tm->tm_year - era->offset)
@@ -1153,8 +1149,9 @@ __strptime_internal (rp,
            case 'Y':
              if (*decided != raw)
                {
-                 num_eras = _NL_CURRENT_WORD (LC_TIME,
-                                              _NL_TIME_ERA_NUM_ENTRIES);
+                       num_eras = _NL_CURRENT_WORD (
+                       LC_TIME,
+                       _NL_TIME_ERA_NUM_ENTRIES);
                  for (era_cnt = 0; era_cnt < (gint) num_eras;
                       ++era_cnt, rp = rp_backup)
                    {
index a52af24..aa3a939 100644 (file)
@@ -1765,8 +1765,8 @@ e_name_selector_dialog_set_scrolling_policy (ENameSelectorDialog *name_selector_
  **/
 void
 e_name_selector_dialog_set_section_visible (ENameSelectorDialog *name_selector_dialog,
-                                           const gchar *name,
-                                           gboolean visible)
+                                            const gchar *name,
+                                            gboolean visible)
 {
        Section *section;
        gint index;
@@ -1796,7 +1796,7 @@ e_name_selector_dialog_set_section_visible (ENameSelectorDialog *name_selector_d
  **/
 gboolean
 e_name_selector_dialog_get_section_visible (ENameSelectorDialog *name_selector_dialog,
-                                           const gchar *name)
+                                            const gchar *name)
 {
        Section *section;
        gint index;
index 7d56f52..380f6a5 100644 (file)
@@ -2171,7 +2171,7 @@ ensure_type_ahead_complete_on_timeout (ENameSelectorEntry *name_selector_entry)
 
 static gboolean
 is_source_enabled_with_parents (ESourceRegistry *registry,
-                               ESource *source)
+                                ESource *source)
 {
        ESource *parent;
        const gchar *parent_uid;
index 3f25151..ddbb067 100644 (file)
@@ -71,7 +71,7 @@ G_DEFINE_TYPE (ENameSelector, e_name_selector, G_TYPE_OBJECT)
 
 static gboolean
 is_source_enabled_with_parents (ESourceRegistry *registry,
-                               ESource *source)
+                                ESource *source)
 {
        ESource *parent;
        const gchar *parent_uid;
index ba49604..10d1f53 100644 (file)
@@ -1056,7 +1056,8 @@ migrate_parse_url_rename_params (CamelURL *url)
                gchar *value = NULL;
 
                enum_class = g_type_class_ref (CAMEL_TYPE_NETWORK_SECURITY_METHOD);
-               enum_value = g_enum_get_value (enum_class,
+               enum_value = g_enum_get_value (
+                       enum_class,
                        CAMEL_NETWORK_SECURITY_METHOD_STARTTLS_ON_STANDARD_PORT);
                if (enum_value != NULL) {
                        value = g_strdup (enum_value->value_nick);