Coding style and whitespace cleanups.
authorMatthew Barnes <mbarnes@redhat.com>
Mon, 13 Jun 2011 14:24:19 +0000 (10:24 -0400)
committerMatthew Barnes <mbarnes@redhat.com>
Mon, 13 Jun 2011 14:24:19 +0000 (10:24 -0400)
54 files changed:
addressbook/backends/file/e-book-backend-file.c
addressbook/backends/ldap/e-book-backend-ldap.c
addressbook/libebook/e-book-client-view.c
addressbook/libebook/e-book-client-view.h
addressbook/libebook/e-book-client.c
addressbook/libebook/e-book.c
addressbook/libebook/e-vcard.c
addressbook/libedata-book/e-book-backend-sexp.c
addressbook/libedata-book/e-book-backend-sqlitedb-test.c
addressbook/libedata-book/e-book-backend-sqlitedb.c
addressbook/libedata-book/e-book-backend-sqlitedb.h
addressbook/libedata-book/e-book-backend-sync.h
addressbook/libedata-book/e-book-backend.c
addressbook/libedata-book/e-book-backend.h
addressbook/libedata-book/e-data-book.c
addressbook/libegdbus/e-gdbus-book-view.c
addressbook/libegdbus/e-gdbus-book-view.h
addressbook/libegdbus/e-gdbus-book.c
calendar/backends/contacts/e-cal-backend-contacts.c
calendar/backends/file/e-cal-backend-file.c
calendar/libecal/e-cal-client-view.c
calendar/libecal/e-cal-client-view.h
calendar/libecal/e-cal-client.c
calendar/libecal/e-cal-client.h
calendar/libedata-cal/e-cal-backend-sync.h
calendar/libedata-cal/e-data-cal-view.c
calendar/libedata-cal/e-data-cal.c
calendar/libegdbus/e-gdbus-cal-factory.c
calendar/libegdbus/e-gdbus-cal-view.c
calendar/libegdbus/e-gdbus-cal.c
camel/camel-data-cache.c
camel/camel-db.c
camel/camel-filter-driver.c
camel/camel-folder-summary.c
camel/camel-vee-folder.c
camel/providers/imapx/camel-imapx-server.c
libebackend/e-sqlite3-vfs.c
libedataserver/e-client-private.h
libedataserver/e-client.c
libedataserver/e-credentials.c
libedataserver/e-credentials.h
libedataserver/e-gdbus-templates.c
libedataserver/e-gdbus-templates.h
libedataserver/e-operation-pool.c
libedataserver/e-source-list.c
libedataserverui/e-client-utils.c
tests/libebook/client/client-test-utils.c
tests/libebook/client/test-client-examine.c
tests/libebook/client/test-client-stress-factory--single-book.c
tests/libecal/client/client-test-utils.c
tests/libecal/client/test-client-create-object.c
tests/libecal/client/test-client-examine.c
tests/libecal/client/test-client-stress-factory--single-cal.c
tests/libedataserverui/test-client-examine-auth.c

index 604c396..596c829 100644 (file)
@@ -811,7 +811,7 @@ e_book_backend_file_extract_path_from_source (ESource *source)
                if (!g_file_test (filename, G_FILE_TEST_EXISTS | G_FILE_TEST_IS_DIR)) {
                        g_free (filename);
                        filename = NULL;
-               }
+               }
        }
 
        if (!filename) {
index a611019..8717a7c 100644 (file)
@@ -2788,7 +2788,7 @@ contact_list_uids_handler (LDAPOp *op, LDAPMessage *res)
        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,
+                                                          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);
index cad28e0..d7415a5 100644 (file)
@@ -336,7 +336,7 @@ e_book_client_view_class_init (EBookClientViewClass *klass)
        object_class = G_OBJECT_CLASS (klass);
        object_class->dispose = book_client_view_dispose;
 
-       signals [OBJECTS_ADDED] =
+       signals[OBJECTS_ADDED] =
                g_signal_new ("objects-added",
                              G_OBJECT_CLASS_TYPE (object_class),
                              G_SIGNAL_RUN_LAST,
@@ -345,7 +345,7 @@ e_book_client_view_class_init (EBookClientViewClass *klass)
                              g_cclosure_marshal_VOID__POINTER,
                              G_TYPE_NONE, 1, G_TYPE_POINTER);
 
-       signals [OBJECTS_MODIFIED] =
+       signals[OBJECTS_MODIFIED] =
                g_signal_new ("objects-modified",
                              G_OBJECT_CLASS_TYPE (object_class),
                              G_SIGNAL_RUN_LAST,
@@ -354,7 +354,7 @@ e_book_client_view_class_init (EBookClientViewClass *klass)
                              g_cclosure_marshal_VOID__POINTER,
                              G_TYPE_NONE, 1, G_TYPE_POINTER);
 
-       signals [OBJECTS_REMOVED] =
+       signals[OBJECTS_REMOVED] =
                g_signal_new ("objects-removed",
                              G_OBJECT_CLASS_TYPE (object_class),
                              G_SIGNAL_RUN_LAST,
@@ -363,7 +363,7 @@ e_book_client_view_class_init (EBookClientViewClass *klass)
                              g_cclosure_marshal_VOID__POINTER,
                              G_TYPE_NONE, 1, G_TYPE_POINTER);
 
-       signals [PROGRESS] =
+       signals[PROGRESS] =
                g_signal_new ("progress",
                              G_OBJECT_CLASS_TYPE (object_class),
                              G_SIGNAL_RUN_LAST,
@@ -372,7 +372,7 @@ e_book_client_view_class_init (EBookClientViewClass *klass)
                              e_gdbus_marshallers_VOID__UINT_STRING,
                              G_TYPE_NONE, 2, G_TYPE_UINT, G_TYPE_STRING);
 
-       signals [COMPLETE] =
+       signals[COMPLETE] =
                g_signal_new ("complete",
                              G_OBJECT_CLASS_TYPE (object_class),
                              G_SIGNAL_RUN_LAST,
index 38d5064..247a2ae 100644 (file)
@@ -61,7 +61,7 @@ struct _EBookClientViewClass {
 GType                  e_book_client_view_get_type             (void);
 struct _EBookClient *  e_book_client_view_get_client           (EBookClientView *view);
 gboolean               e_book_client_view_is_running           (EBookClientView *view);
-void                   e_book_client_view_set_fields_of_interest(EBookClientView *view, const GSList *fields_of_interest, GError **error);
+void                   e_book_client_view_set_fields_of_interest (EBookClientView *view, const GSList *fields_of_interest, GError **error);
 void                   e_book_client_view_start                (EBookClientView *view, GError **error);
 void                   e_book_client_view_stop                 (EBookClientView *view, GError **error);
 
index 14e50ff..3078803 100644 (file)
@@ -1569,7 +1569,7 @@ e_book_client_get_contact (EBookClient *client, const gchar *uid, GCancellable *
 
        safe_uid = e_util_utf8_make_valid (uid);
        g_return_if_fail (safe_uid != NULL);
-       
+
        e_client_proxy_call_string (E_CLIENT (client), safe_uid, cancellable, callback, user_data, e_book_client_get_contact,
                        e_gdbus_book_call_get_contact,
                        NULL, NULL, e_gdbus_book_call_get_contact_finish, NULL, NULL);
index 67c3518..3484861 100644 (file)
@@ -3564,8 +3564,8 @@ get_local_source (GError **error)
 
                                relative_uri = e_source_peek_relative_uri (source);
                                if (g_strcmp0 (relative_uri, "system") == 0) {
-                                       personal = source;
-                                       break;
+                                       personal = source;
+                                       break;
                                }
                        }
 
@@ -3580,7 +3580,7 @@ get_local_source (GError **error)
                                e_source_set_property (source, "completion", "true");
 
                                source_uri = e_source_get_uri (source);
-                               g_object_unref(source);
+                               g_object_unref (source);
                        } else {
                                /* Force the source name to the current locale. */
                                e_source_set_name (personal, name);
index 5c08766..28fcb88 100644 (file)
@@ -1095,7 +1095,6 @@ e_vcard_attribute_get_type (void)
        return type_id__volatile;
 }
 
-
 /**
  * e_vcard_remove_attributes:
  * @evc: vcard object
@@ -1467,7 +1466,6 @@ e_vcard_attribute_remove_params (EVCardAttribute *attr)
        attr->encoding = EVC_ENCODING_RAW;
 }
 
-
 GType
 e_vcard_attribute_param_get_type (void)
 {
index f0c6273..7e3fc0d 100644 (file)
@@ -191,9 +191,9 @@ compare_photo_uri (EContact *contact, const gchar *str,
 
        if (photo) {
                /* Compare the photo uri with the string */
-               if ((photo->type == E_CONTACT_PHOTO_TYPE_URI) 
-                    && compare(photo->data.uri, str)) {
-                       ret_val = TRUE; 
+               if ((photo->type == E_CONTACT_PHOTO_TYPE_URI)
+                    && compare (photo->data.uri, str)) {
+                       ret_val = TRUE;
                }
                e_contact_photo_free (photo);
        }
@@ -263,7 +263,7 @@ compare_date (EContactDate *date, const gchar *str,
        gboolean ret_val = FALSE;
 
        if (date_str) {
-               if (compare(date_str, str)) {
+               if (compare (date_str, str)) {
                        ret_val = TRUE;
                }
                g_free (date_str);
@@ -383,12 +383,12 @@ entry_compare (SearchContext *ctx, struct _ESExp *f,
                                else if (info->prop_type == PROP_TYPE_DATE) {
                                        /* the special searches that match dates */
                                        EContactDate *date;
-                                       
+
                                        date = e_contact_get (ctx->contact, info->field_id);
 
                                        if (date) {
                                                truth = compare_date (date, argv[1]->value.string, compare);
-                                               e_contact_date_free (date);     
+                                               e_contact_date_free (date);
                                        }
                                }
 
@@ -423,7 +423,7 @@ entry_compare (SearchContext *ctx, struct _ESExp *f,
                                GList *a, *attrs = e_vcard_get_attributes (E_VCARD (ctx->contact));
                                for (a = attrs; a && !truth; a = a->next) {
                                        EVCardAttribute *attr = (EVCardAttribute *) a->data;
-                                       if (g_ascii_strcasecmp (e_vcard_attribute_get_name (attr), propname) == 0) {
+                                       if (g_ascii_strcasecmp (e_vcard_attribute_get_name (attr), propname) == 0) {
                                                GList *l, *values = e_vcard_attribute_get_values (attr);
 
                                                for (l = values; l && !truth; l = l->next) {
index bc67590..33c4466 100644 (file)
@@ -63,12 +63,12 @@ const gchar *vcard_str =
 static void
 quit_tests (void)
 {
-       
+
        if (error != NULL) {
                g_print ("Tests failed: %s - %s \n", op, error->message);
                g_clear_error (&error);
        }
-       
+
        g_main_loop_quit (main_loop);
 }
 
@@ -80,11 +80,11 @@ add_contacts (EBookBackendSqliteDB *ebsdb)
 
        g_print ("Adding contact \n");
        op = "add contact";
-       
+
        con = e_contact_new_from_vcard (vcard_str);
        contacts = g_slist_append (contacts, con);
        e_book_backend_sqlitedb_add_contacts (ebsdb, folderid, contacts, FALSE, &error);
-       
+
        g_object_unref (con);
 }
 
@@ -93,7 +93,7 @@ search_db (EBookBackendSqliteDB *ebsdb, const gchar *type, const gchar *sexp)
 {
        GSList *vcards;
        EbSdbSearchData *s_data;
-       
+
        g_print ("%s - query: %s \n", type, sexp);
        op = type;
        vcards = e_book_backend_sqlitedb_search (ebsdb, folderid, sexp, NULL, &error);
@@ -117,7 +117,7 @@ start_tests (gpointer data)
 
        g_print ("Creating the sqlitedb \n");
        op = "create sqlitedb";
-       ebsdb = e_book_backend_sqlitedb_new 
+       ebsdb = e_book_backend_sqlitedb_new
                                        (cache_path, email, folderid, folder_name,
                                         store_vcard, &error);
        if (error)
@@ -132,20 +132,20 @@ start_tests (gpointer data)
        e_book_backend_sqlitedb_set_is_populated (ebsdb, folderid, TRUE, &error);
        if (error)
                goto exit;
-       
+
        g_print ("Setting is_populated \n");
        op = "set is_populated";
        populated = e_book_backend_sqlitedb_get_is_populated (ebsdb, folderid, &error);
        if (error)
                goto exit;
        g_print ("Populated: %d \n", populated);
-       
+
        g_print ("Setting key value \n");
        op = "set key/value";
        e_book_backend_sqlitedb_set_key_value (ebsdb, folderid, "customkey", "stored", &error);
        if (error)
                goto exit;
-       
+
        g_print ("Get Vcard string \n");
        op = "get vcard string";
        vcard_str = e_book_backend_sqlitedb_get_vcard_string (ebsdb, folderid, uid, &error);
@@ -171,7 +171,7 @@ start_tests (gpointer data)
                if (error)
                        goto exit;
        }
-       
+
        g_print ("Delete contact \n");
        op = "delete contact";
        uids = g_slist_append (uids, (gchar *) uid);
@@ -183,11 +183,11 @@ start_tests (gpointer data)
        g_print ("Delete addressbook \n");
        op = "delete addressbook";
        e_book_backend_sqlitedb_delete_addressbook (ebsdb, folderid, &error);
-       
+
 exit:
        g_object_unref (ebsdb);
        quit_tests ();
-       return FALSE;   
+       return FALSE;
 }
 
 gint
index d2da462..8790341 100644 (file)
@@ -61,7 +61,7 @@ G_DEFINE_TYPE (EBookBackendSqliteDB, e_book_backend_sqlitedb, G_TYPE_OBJECT)
 static GHashTable *db_connections = NULL;
 static GStaticMutex dbcon_lock = G_STATIC_MUTEX_INIT;
 
-static int
+static gint
 store_data_to_vcard (gpointer ref, gint ncol, gchar **cols, gchar **name);
 
 static GQuark
@@ -127,13 +127,12 @@ e_book_backend_sqlitedb_class_init (EBookBackendSqliteDBClass *class)
 static void
 e_book_backend_sqlitedb_init (EBookBackendSqliteDB *ebsdb)
 {
-       ebsdb->priv = g_new0 (EBookBackendSqliteDBPrivate, 1) ;
+       ebsdb->priv = g_new0 (EBookBackendSqliteDBPrivate, 1);
 
        ebsdb->priv->store_vcard = TRUE;
        g_static_rw_lock_init (&ebsdb->priv->rwlock);
 }
 
-
 static void
 e_book_sqlitedb_match_func (sqlite3_context *ctx, gint nArgs, sqlite3_value **values)
 {
@@ -186,7 +185,7 @@ e_book_sqlitedb_match_func (sqlite3_context *ctx, gint nArgs, sqlite3_value **va
 static gint
 book_backend_sql_exec  (sqlite3 *db,
                         const gchar *stmt,
-                        gint (*callback)(void*,gint,gchar**,gchar**),
+                        gint (*callback)(gpointer ,gint,gchar **,gchar **),
                         gpointer data,
                         GError **error)
 {
@@ -263,7 +262,6 @@ create_folders_table        (EBookBackendSqliteDB *ebsdb,
        if (!err)
                book_backend_sql_exec (ebsdb->priv->db, stmt, NULL, NULL , &err);
 
-
        /* Create a child table to store key/value pairs for a folder */
        if (!err) {
                stmt =  "CREATE TABLE IF NOT EXISTS keys"
@@ -286,7 +284,6 @@ create_folders_table        (EBookBackendSqliteDB *ebsdb,
        return;
 }
 
-
 static gint
 folder_found_cb (gpointer ref, gint col, gchar **cols, gchar **name)
 {
@@ -333,7 +330,7 @@ add_folder_into_db  (EBookBackendSqliteDB *ebsdb,
 
        if (!err) {
                stmt = sqlite3_mprintf ("INSERT OR REPLACE INTO folders VALUES ( %Q, %Q, %Q, %d, %d, %d ) ",
-                                       folderid, folder_name, NULL, 0, 0, FOLDER_VERSION);
+                                       folderid, folder_name, NULL, 0, 0, FOLDER_VERSION);
 
                book_backend_sql_exec (ebsdb->priv->db, stmt, NULL, NULL, &err);
 
@@ -349,7 +346,6 @@ add_folder_into_db  (EBookBackendSqliteDB *ebsdb,
        return;
 }
 
-
 /* The column names match the fields used in book-backend-sexp */
 static gint
 create_contacts_table  (EBookBackendSqliteDB *ebsdb,
@@ -376,7 +372,6 @@ create_contacts_table       (EBookBackendSqliteDB *ebsdb,
        ret = book_backend_sql_exec (ebsdb->priv->db, stmt, NULL, NULL , &err);
        sqlite3_free (stmt);
 
-
        /* Create indexes on full_name and email_1 as autocompletion queries would mainly
           rely on this. Assuming that the frequency of matching on these would be higher than
           on the other fields like email_2, surname etc. email_1 should be the primary email */
@@ -633,7 +628,7 @@ e_book_backend_sqlitedb_add_contacts        (EBookBackendSqliteDB *ebsdb,
                EContact *contact = (EContact *) l->data;
 
                stmt = insert_stmt_from_contact (contact, partial_content, folderid,
-                                                priv->store_vcard);
+                                                priv->store_vcard);
                book_backend_sql_exec (priv->db, stmt, NULL, NULL, &err);
 
                sqlite3_free (stmt);
@@ -656,7 +651,7 @@ e_book_backend_sqlitedb_remove_contact      (EBookBackendSqliteDB *ebsdb,
                                         GError **error)
 {
        GSList l;
-       l.data = (char*)uid; /* Won't modify it, I promise :) */
+       l.data = (gchar *) uid; /* Won't modify it, I promise :) */
        l.next = NULL;
        return e_book_backend_sqlitedb_remove_contacts (ebsdb, folderid, &l,
                                                        error);
@@ -723,7 +718,7 @@ contact_found_cb (gpointer ref, gint col, gchar **cols, gchar **name)
        struct _contact_info *cinfo = ref;
 
        cinfo->exists = TRUE;
-       cinfo->partial_content = cols [0] ? strtoul (cols [0], NULL, 10) : 0;
+       cinfo->partial_content = cols[0] ? strtoul (cols[0], NULL, 10) : 0;
 
        return 0;
 }
@@ -763,7 +758,7 @@ get_vcard_cb (gpointer ref, gint col, gchar **cols, gchar **name)
 {
        gchar **vcard_str = ref;
 
-       if (cols [0])
+       if (cols[0])
                *vcard_str = g_strdup (cols [0]);
 
        return 0;
@@ -773,13 +768,13 @@ EContact *
 e_book_backend_sqlitedb_get_contact    (EBookBackendSqliteDB *ebsdb,
                                         const gchar *folderid,
                                         const gchar *uid,
-                                        GError **error) 
+                                        GError **error)
 {
        GError *err = NULL;
        EContact *contact = NULL;
        gchar *vcard = e_book_backend_sqlitedb_get_vcard_string (ebsdb, folderid, uid, &err);
        if (!err) {
-               contact = e_contact_new_from_vcard(vcard);
+               contact = e_contact_new_from_vcard (vcard);
                g_free (vcard);
        } else
                g_propagate_error (error, err);
@@ -800,7 +795,7 @@ e_book_backend_sqlitedb_get_vcard_string    (EBookBackendSqliteDB *ebsdb,
 
        if (!ebsdb->priv->store_vcard) {
                GSList *vcards = NULL;
-               
+
                stmt = sqlite3_mprintf ("SELECT uid, nickname, full_name, given_name, family_name, file_as, email_1, email_2, " 
                                        "email_3, is_list, list_show_addresses, wants_html FROM %Q WHERE uid = %Q", folderid, uid);
                book_backend_sql_exec (ebsdb->priv->db, stmt, store_data_to_vcard, &vcards, error);
@@ -810,7 +805,7 @@ e_book_backend_sqlitedb_get_vcard_string    (EBookBackendSqliteDB *ebsdb,
                        EbSdbSearchData *s_data = (EbSdbSearchData *) vcards->data;
 
                        vcard_str = s_data->vcard;
-                       
+
                        g_free (s_data->uid);
                        g_free (s_data->bdata);
                        g_free (s_data);
@@ -881,7 +876,7 @@ book_backend_sqlitedb_is_summary_query (const gchar *query)
        for (i = 0; i < G_N_ELEMENTS (check_symbols); i++) {
                if (check_symbols[i].type == 1) {
                        e_sexp_add_ifunction (sexp, 0, check_symbols[i].name,
-                                            (ESExpIFunc *)check_symbols[i].func, NULL);
+                                            (ESExpIFunc *) check_symbols[i].func, NULL);
                } else {
                        e_sexp_add_function (sexp, 0, check_symbols[i].name,
                                            check_symbols[i].func, NULL);
@@ -932,7 +927,6 @@ func_or (ESExp *f, gint argc, struct _ESExpTerm **argv, gpointer data)
        return r;
 }
 
-
 typedef enum {
        MATCH_CONTAINS,
        MATCH_IS,
@@ -953,7 +947,7 @@ convert_match_exp (struct _ESExp *f, gint argc, struct _ESExpResult **argv, gpoi
                /* only a subset of headers are supported .. */
                field = argv[0]->value.string;
 
-               if (argv[1]->type == ESEXP_RES_STRING && argv[1]->value.string [0] != 0) {
+               if (argv[1]->type == ESEXP_RES_STRING && argv[1]->value.string[0] != 0) {
                        gchar *value=NULL;
 
                        if (match == MATCH_CONTAINS) {
@@ -1042,7 +1036,7 @@ static struct {
        { "endswith", func_endswith, 0 },
 };
 
-static char *
+static gchar *
 sexp_to_sql_query (const gchar *query)
 {
        ESExp *sexp;
@@ -1083,14 +1077,14 @@ addto_vcard_list_cb (gpointer ref, gint col, gchar **cols, gchar **name)
        GSList **vcard_data = ref;
        EbSdbSearchData *s_data = g_new0 (EbSdbSearchData, 1);
 
-       if (cols [0])
-               s_data->uid = g_strdup (cols [0]);
+       if (cols[0])
+               s_data->uid = g_strdup (cols[0]);
 
-       if (cols [1])
-               s_data->vcard = g_strdup (cols [1]);
-       
-       if (cols [2])
-               s_data->bdata = g_strdup (cols [1]);
+       if (cols[1])
+               s_data->vcard = g_strdup (cols[1]);
+
+       if (cols[2])
+               s_data->bdata = g_strdup (cols[1]);
 
        *vcard_data = g_slist_prepend (*vcard_data, s_data);
 
@@ -1102,13 +1096,13 @@ addto_slist_cb (gpointer ref, gint col, gchar **cols, gchar **name)
 {
        GSList **uids = ref;
 
-       if (cols [0])
+       if (cols[0])
                *uids = g_slist_prepend (*uids, g_strdup (cols [0]));
 
        return 0;
 }
 
-static int
+static gint
 store_data_to_vcard (gpointer ref, gint ncol, gchar **cols, gchar **name)
 {
        GSList **vcard_data = ref;
@@ -1124,25 +1118,25 @@ store_data_to_vcard (gpointer ref, gint ncol, gchar **cols, gchar **name)
                        continue;
 
                if (!strcmp (name [i], "uid")) {
-                       e_contact_set (contact, E_CONTACT_UID, cols [i]);
-                       
-                       search_data->uid = g_strdup (cols [i]);
+                       e_contact_set (contact, E_CONTACT_UID, cols[i]);
+
+                       search_data->uid = g_strdup (cols[i]);
                } else if (!strcmp (name [i], "nickname"))
-                       e_contact_set (contact, E_CONTACT_NICKNAME, cols [i]);
+                       e_contact_set (contact, E_CONTACT_NICKNAME, cols[i]);
                else if (!strcmp (name [i], "full_name"))
-                       e_contact_set (contact, E_CONTACT_FULL_NAME, cols [i]);
+                       e_contact_set (contact, E_CONTACT_FULL_NAME, cols[i]);
                else if (!strcmp (name [i], "given_name"))
-                       e_contact_set (contact, E_CONTACT_GIVEN_NAME, cols [i]);
+                       e_contact_set (contact, E_CONTACT_GIVEN_NAME, cols[i]);
                else if (!strcmp (name [i], "family_name"))
-                       e_contact_set (contact, E_CONTACT_FAMILY_NAME, cols [i]);
+                       e_contact_set (contact, E_CONTACT_FAMILY_NAME, cols[i]);
                else if (!strcmp (name [i], "file_as"))
-                       e_contact_set (contact, E_CONTACT_FILE_AS, cols [i]);
+                       e_contact_set (contact, E_CONTACT_FILE_AS, cols[i]);
                else if (!strcmp (name [i], "email_1"))
-                       e_contact_set (contact, E_CONTACT_EMAIL_1, cols [i]);
+                       e_contact_set (contact, E_CONTACT_EMAIL_1, cols[i]);
                else if (!strcmp (name [i], "email_2"))
-                       e_contact_set (contact, E_CONTACT_EMAIL_2, cols [i]);
+                       e_contact_set (contact, E_CONTACT_EMAIL_2, cols[i]);
                else if (!strcmp (name [i], "email_3"))
-                       e_contact_set (contact, E_CONTACT_EMAIL_3, cols [i]);
+                       e_contact_set (contact, E_CONTACT_EMAIL_3, cols[i]);
                else if (!strcmp (name [i], "is_list")) {
                        gint val = cols[i] ? strtoul (cols[i], NULL, 10) : 0;
                        e_contact_set (contact, E_CONTACT_IS_LIST, GINT_TO_POINTER (val));
@@ -1153,9 +1147,9 @@ store_data_to_vcard (gpointer ref, gint ncol, gchar **cols, gchar **name)
                        gint val = cols[i] ? strtoul (cols[i], NULL, 10) : 0;
                        e_contact_set (contact, E_CONTACT_WANTS_HTML, GINT_TO_POINTER (val));
                } else if (!strcmp (name [i], "bdata")) {
-                       search_data->bdata = g_strdup (cols [i]);
+                       search_data->bdata = g_strdup (cols[i]);
                }
-               
+
        }
 
        vcard = e_vcard_to_string (E_VCARD (contact), EVC_FORMAT_VCARD_30);
@@ -1167,10 +1161,10 @@ store_data_to_vcard (gpointer ref, gint ncol, gchar **cols, gchar **name)
 }
 
 static GSList *
-book_backend_sqlitedb_search_query     (EBookBackendSqliteDB *ebsdb, 
-                                        const gchar *sql, 
-                                        const gchar *folderid, 
-                                        GSList *fields_of_interest, 
+book_backend_sqlitedb_search_query     (EBookBackendSqliteDB *ebsdb,
+                                        const gchar *sql,
+                                        const gchar *folderid,
+                                        GSList *fields_of_interest,
                                         GError **error)
 {
        GError *err = NULL;
@@ -1223,7 +1217,7 @@ book_backend_sqlitedb_search_full (EBookBackendSqliteDB *ebsdb, const gchar *sex
 
                for (l = all; l != NULL; l = g_slist_next (l)) {
                        EbSdbSearchData *s_data = (EbSdbSearchData *) l->data;
-                       
+
                        if (e_book_backend_sexp_match_vcard (bsexp, s_data->vcard)) {
                                if (!return_uids)
                                        r_list = g_slist_prepend (r_list, s_data);
@@ -1285,20 +1279,20 @@ e_book_backend_sqlitedb_search  (EBookBackendSqliteDB *ebsdb,
        return search_contacts;
 }
 
-GSList *               
+GSList *
 e_book_backend_sqlitedb_search_uids    (EBookBackendSqliteDB *ebsdb,
                                         const gchar *folderid,
                                         const gchar *sexp,
                                         GError **error)
 {
        GSList *uids = NULL;
-       
+
        if (book_backend_sqlitedb_is_summary_query (sexp)) {
                gchar *stmt;
                gchar *sql_query = sexp_to_sql_query (sexp);
 
                READER_LOCK (ebsdb);
-               
+
                stmt = sqlite3_mprintf ("SELECT uid FROM %Q WHERE %s", folderid, sql_query);
                book_backend_sql_exec (ebsdb->priv->db, stmt, addto_slist_cb, &uids, error);
                sqlite3_free (stmt);
@@ -1346,7 +1340,6 @@ e_book_backend_sqlitedb_get_is_populated  (EBookBackendSqliteDB *ebsdb,
 
 }
 
-
 gboolean
 e_book_backend_sqlitedb_set_is_populated       (EBookBackendSqliteDB *ebsdb,
                                                 const gchar *folderid,
@@ -1432,7 +1425,7 @@ e_book_backend_sqlitedb_set_has_partial_content   (EBookBackendSqliteDB *ebsdb,
        return !err;
 }
 
-static int
+static gint
 get_string_cb (gpointer ref, gint col, gchar **cols, gchar **name)
 {
        gchar **ret = ref;
@@ -1442,8 +1435,7 @@ get_string_cb (gpointer ref, gint col, gchar **cols, gchar **name)
        return 0;
 }
 
-
-gchar *                
+gchar *
 e_book_backend_sqlitedb_get_contact_bdata      (EBookBackendSqliteDB *ebsdb,
                                                 const gchar *folderid,
                                                 const gchar *uid,
@@ -1462,7 +1454,7 @@ e_book_backend_sqlitedb_get_contact_bdata (EBookBackendSqliteDB *ebsdb,
        return ret;
 }
 
-gboolean       
+gboolean
 e_book_backend_sqlitedb_set_contact_bdata      (EBookBackendSqliteDB *ebsdb,
                                                 const gchar *folderid,
                                                 const gchar *uid,
@@ -1647,7 +1639,7 @@ e_book_backend_sqlitedb_delete_addressbook        (EBookBackendSqliteDB *ebsdb,
        return !err;
 }
 
-void   
+void
 e_book_backend_sqlitedb_search_data_free       (EbSdbSearchData *s_data)
 {
        if (s_data) {
@@ -1658,7 +1650,7 @@ e_book_backend_sqlitedb_search_data_free  (EbSdbSearchData *s_data)
        }
 }
 
-gboolean       
+gboolean
 e_book_backend_sqlitedb_remove          (EBookBackendSqliteDB *ebsdb,
                                          GError **error)
 {
@@ -1669,7 +1661,7 @@ e_book_backend_sqlitedb_remove          (EBookBackendSqliteDB *ebsdb,
        priv = ebsdb->priv;
 
        WRITER_LOCK (ebsdb);
-       
+
        sqlite3_close (priv->db);
        filename = g_build_filename (priv->path, DB_FILENAME, NULL);
        ret = g_unlink (filename);
index 49099b7..78c66e4 100644 (file)
@@ -115,7 +115,7 @@ GSList *            e_book_backend_sqlitedb_search  (EBookBackendSqliteDB *ebsdb,
                                                         const gchar *sexp,
                                                         GSList *fields_of_interest,
                                                         GError **error);
-GSList *               e_book_backend_sqlitedb_search_uids     
+GSList *               e_book_backend_sqlitedb_search_uids
                                                        (EBookBackendSqliteDB *ebsdb,
                                                         const gchar *folderid,
                                                         const gchar *sexp,
@@ -182,7 +182,7 @@ gboolean    e_book_backend_sqlitedb_delete_addressbook
                                                         GError **error);
 gboolean       e_book_backend_sqlitedb_remove          (EBookBackendSqliteDB *ebsdb,
                                                         GError **error);
-void           e_book_backend_sqlitedb_search_data_free        
+void           e_book_backend_sqlitedb_search_data_free
                                                        (EbSdbSearchData *s_data);
 
 G_END_DECLS
index 7ef2f51..ec45ac2 100644 (file)
@@ -50,14 +50,14 @@ gboolean    e_book_backend_sync_construct           (EBookBackendSync *backend);
 void           e_book_backend_sync_open                (EBookBackendSync *backend, EDataBook *book, GCancellable *cancellable, gboolean only_if_exists, GError **error);
 void           e_book_backend_sync_remove              (EBookBackendSync *backend, EDataBook *book, GCancellable *cancellable, GError **error);
 void           e_book_backend_sync_refresh             (EBookBackendSync *backend, EDataBook *book, GCancellable *cancellable, GError **error);
-gboolean       e_book_backend_sync_get_backend_property(EBookBackendSync *backend, EDataBook *book, GCancellable *cancellable, const gchar *prop_name, gchar **prop_value, GError **error);
-gboolean       e_book_backend_sync_set_backend_property(EBookBackendSync *backend, EDataBook *book, GCancellable *cancellable, const gchar *prop_name, const gchar *prop_value, GError **error);
+gboolean       e_book_backend_sync_get_backend_property (EBookBackendSync *backend, EDataBook *book, GCancellable *cancellable, const gchar *prop_name, gchar **prop_value, GError **error);
+gboolean       e_book_backend_sync_set_backend_property (EBookBackendSync *backend, EDataBook *book, GCancellable *cancellable, const gchar *prop_name, const gchar *prop_value, GError **error);
 void           e_book_backend_sync_create_contact      (EBookBackendSync *backend, EDataBook *book, GCancellable *cancellable, const gchar *vcard, EContact **contact, GError **error);
 void           e_book_backend_sync_remove_contacts     (EBookBackendSync *backend, EDataBook *book, GCancellable *cancellable, const GSList *id_list, GSList **removed_ids, GError **error);
 void           e_book_backend_sync_modify_contact      (EBookBackendSync *backend, EDataBook *book, GCancellable *cancellable, const gchar *vcard, EContact **contact, GError **error);
 void           e_book_backend_sync_get_contact         (EBookBackendSync *backend, EDataBook *book, GCancellable *cancellable, const gchar *id, gchar **vcard, GError **error);
 void           e_book_backend_sync_get_contact_list    (EBookBackendSync *backend, EDataBook *book, GCancellable *cancellable, const gchar *query, GSList **contacts, GError **error);
-void           e_book_backend_sync_get_contact_list_uids(EBookBackendSync *backend, EDataBook *book, GCancellable *cancellable, const gchar *query, GSList **contacts_uids, GError **error);
+void           e_book_backend_sync_get_contact_list_uids (EBookBackendSync *backend, EDataBook *book, GCancellable *cancellable, const gchar *query, GSList **contacts_uids, GError **error);
 
 void           e_book_backend_sync_authenticate_user   (EBookBackendSync *backend, GCancellable *cancellable, ECredentials *credentials, GError **error);
 
index 64673d5..d5dfeb0 100644 (file)
@@ -486,7 +486,7 @@ void
 e_book_backend_remove_contacts (EBookBackend *backend,
                                EDataBook    *book,
                                guint32       opid,
-                               GCancellable *cancellable,
+                               GCancellable *cancellable,
                                const GSList *id_list)
 {
        g_return_if_fail (E_IS_BOOK_BACKEND (backend));
index 0ee449d..a9f81d3 100644 (file)
@@ -100,7 +100,7 @@ gboolean    e_book_backend_is_opening       (EBookBackend *backend);
 gboolean       e_book_backend_is_readonly      (EBookBackend *backend);
 gboolean       e_book_backend_is_removed       (EBookBackend *backend);
 void           e_book_backend_set_online       (EBookBackend *backend, gboolean is_online);
-void           e_book_backend_authenticate_user(EBookBackend *backend, GCancellable *cancellable, ECredentials *credentials);
+void           e_book_backend_authenticate_user (EBookBackend *backend, GCancellable *cancellable, ECredentials *credentials);
 
 void           e_book_backend_get_backend_property (EBookBackend *backend, EDataBook *book, guint32 opid, GCancellable *cancellable, const gchar *prop_name);
 void           e_book_backend_set_backend_property (EBookBackend *backend, EDataBook *book, guint32 opid, GCancellable *cancellable, const gchar *prop_name, const gchar *prop_value);
@@ -113,7 +113,7 @@ void                e_book_backend_remove_contacts  (EBookBackend *backend, EDataBook *book, gu
 void           e_book_backend_modify_contact   (EBookBackend *backend, EDataBook *book, guint32 opid, GCancellable *cancellable, const gchar *vcard);
 void           e_book_backend_get_contact      (EBookBackend *backend, EDataBook *book, guint32 opid, GCancellable *cancellable, const gchar *id);
 void           e_book_backend_get_contact_list (EBookBackend *backend, EDataBook *book, guint32 opid, GCancellable *cancellable, const gchar *query);
-void           e_book_backend_get_contact_list_uids(EBookBackend *backend, EDataBook *book, guint32 opid, GCancellable *cancellable, const gchar *query);
+void           e_book_backend_get_contact_list_uids (EBookBackend *backend, EDataBook *book, guint32 opid, GCancellable *cancellable, const gchar *query);
 
 void           e_book_backend_start_book_view  (EBookBackend *backend, EDataBookView *view);
 void           e_book_backend_stop_book_view   (EBookBackend *backend, EDataBookView *view);
index eae7a08..2f96114 100644 (file)
@@ -200,7 +200,7 @@ operation_thread (gpointer data, gpointer user_data)
                        }
 
                        path = construct_bookview_path ();
-                       
+
                        book_view = e_data_book_view_new (op->book, op->d.query, card_sexp);
                        e_data_book_view_register_gdbus_object (book_view, e_gdbus_book_stub_get_connection (op->book->priv->gdbus_object), path, &error);
 
@@ -449,7 +449,7 @@ data_book_return_error (GDBusMethodInvocation *invocation, const GError *perror,
 }
 
 /* takes a list of strings and converts it to a comma-separated string of values;
-   free returned pointer with g_free() */
+   free returned pointer with g_free () */
 gchar *
 e_data_book_string_slist_to_comma_string (const GSList *strings)
 {
index b423089..c2b3609 100644 (file)
@@ -99,7 +99,6 @@ e_gdbus_book_view_default_init (EGdbusBookViewIface *iface)
        _signal_name_to_id = g_hash_table_new (g_str_hash, g_str_equal);
        _signal_name_to_type = g_hash_table_new (g_str_hash, g_str_equal);
 
-       
        /* GObject signals definitions for D-Bus signals: */
        E_INIT_GDBUS_SIGNAL_STRV        (EGdbusBookViewIface, "objects_added",          objects_added, __OBJECTS_ADDED_SIGNAL)
        E_INIT_GDBUS_SIGNAL_STRV        (EGdbusBookViewIface, "objects_modified",       objects_modified, __OBJECTS_MODIFIED_SIGNAL)
index 3f750da..a271eea 100644 (file)
@@ -107,7 +107,7 @@ struct _EGdbusBookViewIface
        void (*objects_added)           (EGdbusBookView *object, const gchar * const *arg_objects);
        void (*objects_modified)        (EGdbusBookView *object, const gchar * const *arg_objects);
        void (*objects_removed)         (EGdbusBookView *object, const gchar * const *arg_uids);
-  
+
        void (*progress)                (EGdbusBookView *object, guint arg_percent, const gchar *arg_message);
        void (*complete)                (EGdbusBookView *object, const gchar * const *arg_error);
 
@@ -141,7 +141,6 @@ gboolean    e_gdbus_book_view_call_set_fields_of_interest_sync      (GDBusProxy *proxy,
 #define e_gdbus_book_view_complete_dispose                     e_gdbus_complete_sync_method_void
 #define e_gdbus_book_view_complete_set_fields_of_interest      e_gdbus_complete_sync_method_void
 
-
 /* D-Bus Signal Emission Helpers */
 void   e_gdbus_book_view_emit_objects_added    (EGdbusBookView *object, const gchar * const *arg_objects);
 void   e_gdbus_book_view_emit_objects_modified (EGdbusBookView *object, const gchar * const *arg_objects);
index f4b29bc..b115be2 100644 (file)
@@ -794,7 +794,7 @@ e_gdbus_book_register_object (EGdbusBook *object, GDBusConnection *connection, c
        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_interface_info,
                        &e_gdbus_book_interface_vtable, object, (GDestroyNotify) on_object_unregistered, error);
 }
index 1aff087..cd60bca 100644 (file)
@@ -41,7 +41,6 @@
 #include <libedata-cal/e-cal-backend-sexp.h>
 #include <libebook/e-book.h>
 
-
 #define EDC_ERROR(_code) e_data_cal_create_error (_code, NULL)
 
 G_DEFINE_TYPE (ECalBackendContacts, e_cal_backend_contacts, E_TYPE_CAL_BACKEND_SYNC)
@@ -872,7 +871,7 @@ e_cal_backend_contacts_get_object (ECalBackendSync *backend, EDataCal *cal, GCan
 }
 
 static void
-e_cal_backend_contacts_get_free_busy (ECalBackendSync *backend, EDataCal *cal, GCancellable *cancellable, 
+e_cal_backend_contacts_get_free_busy (ECalBackendSync *backend, EDataCal *cal, GCancellable *cancellable,
                                      const GSList *users, time_t start, time_t end,
                                      GSList **freebusy, GError **perror)
 {
index 64b2fb0..bbf391c 100644 (file)
@@ -2451,7 +2451,7 @@ remove_instance (ECalBackendFile *cbfile, ECalBackendFileObject *obj_data,
        if (rid) {
                /* remove recurrence */
                if (g_hash_table_lookup_extended (obj_data->recurrences, rid,
-                                                 (gpointer *)&hash_rid, (gpointer *)&comp)) {
+                                                 (gpointer *)&hash_rid, (gpointer *)&comp)) {
                        /* Removing without parent or not modifying parent?
                           Report removal to caller. */
                        if (old_object &&
@@ -2466,8 +2466,8 @@ remove_instance (ECalBackendFile *cbfile, ECalBackendFileObject *obj_data,
                                   instead rely on the view detecting
                                   whether it contains the id */
                                ECalComponentId id;
-                               id.uid = (gchar *)uid;
-                               id.rid = (gchar *)rid;
+                               id.uid = (gchar *) uid;
+                               id.rid = (gchar *) rid;
                                e_cal_backend_notify_object_removed (E_CAL_BACKEND (cbfile), &id, NULL, NULL);
                        }
 
index 079e72a..33cc8b1 100644 (file)
@@ -74,7 +74,7 @@ build_object_list (const gchar * const *seq)
        for (i = 0; seq[i]; i++) {
                icalcomponent *comp;
 
-               comp = icalcomponent_new_from_string ((gchar *)seq[i]);
+               comp = icalcomponent_new_from_string ((gchar *) seq[i]);
                if (!comp)
                        continue;
 
index fe3cf27..5a4cecf 100644 (file)
@@ -59,7 +59,7 @@ struct _ECalClientViewClass {
 GType                  e_cal_client_view_get_type              (void);
 struct _ECalClient *   e_cal_client_view_get_client            (ECalClientView *view);
 gboolean               e_cal_client_view_is_running            (ECalClientView *view);
-void                   e_cal_client_view_set_fields_of_interest(ECalClientView *view, const GSList *fields_of_interest, GError **error);
+void                   e_cal_client_view_set_fields_of_interest (ECalClientView *view, const GSList *fields_of_interest, GError **error);
 void                   e_cal_client_view_start                 (ECalClientView *view, GError **error);
 void                   e_cal_client_view_stop                  (ECalClientView *view, GError **error);
 
index cfcf1f7..7fcca6c 100644 (file)
@@ -428,7 +428,6 @@ free_busy_data_cb (EGdbusCal *object, const gchar * const *free_busy_strv, ECalC
        g_return_if_fail (E_IS_CAL_CLIENT (client));
        g_return_if_fail (free_busy_strv != NULL);
 
-
        for (ii = 0; free_busy_strv[ii]; ii++) {
                ECalComponent *comp;
                icalcomponent *icalcomp;
index 1cf3484..7a1c19a 100644 (file)
@@ -105,9 +105,9 @@ void                        e_cal_client_set_default_timezone       (ECalClient *client, /* const */ icalti
 /* Check predefined capabilities */
 gboolean               e_cal_client_check_one_alarm_only       (ECalClient *client);
 gboolean               e_cal_client_check_save_schedules       (ECalClient *client);
-gboolean               e_cal_client_check_organizer_must_attend(ECalClient *client);
-gboolean               e_cal_client_check_organizer_must_accept(ECalClient *client);
-gboolean               e_cal_client_check_recurrences_no_master(ECalClient *client);
+gboolean               e_cal_client_check_organizer_must_attend (ECalClient *client);
+gboolean               e_cal_client_check_organizer_must_accept (ECalClient *client);
+gboolean               e_cal_client_check_recurrences_no_master (ECalClient *client);
 
 /* Utility functions */
 void           e_cal_client_free_icalcomp_slist                (GSList *icalcomps);
index 8217af9..1b64a50 100644 (file)
@@ -59,8 +59,8 @@ void  e_cal_backend_sync_set_lock             (ECalBackendSync *backend, gboolean lock);
 void   e_cal_backend_sync_open                 (ECalBackendSync *backend, EDataCal *cal, GCancellable *cancellable, gboolean only_if_exists, GError **error);
 void   e_cal_backend_sync_remove               (ECalBackendSync *backend, EDataCal *cal, GCancellable *cancellable, GError **error);
 void   e_cal_backend_sync_refresh              (ECalBackendSync *backend, EDataCal *cal, GCancellable *cancellable, GError **error);
-gboolean e_cal_backend_sync_get_backend_property(ECalBackendSync *backend, EDataCal *cal, GCancellable *cancellable, const gchar *prop_name, gchar **prop_value, GError **error);
-gboolean e_cal_backend_sync_set_backend_property(ECalBackendSync *backend, EDataCal *cal, GCancellable *cancellable, const gchar *prop_name, const gchar *prop_value, GError **error);
+gboolean e_cal_backend_sync_get_backend_property (ECalBackendSync *backend, EDataCal *cal, GCancellable *cancellable, const gchar *prop_name, gchar **prop_value, GError **error);
+gboolean e_cal_backend_sync_set_backend_property (ECalBackendSync *backend, EDataCal *cal, GCancellable *cancellable, const gchar *prop_name, const gchar *prop_value, GError **error);
 void   e_cal_backend_sync_get_object           (ECalBackendSync *backend, EDataCal *cal, GCancellable *cancellable, const gchar *uid, const gchar *rid, gchar **calobj, GError **error);
 void   e_cal_backend_sync_get_object_list      (ECalBackendSync *backend, EDataCal *cal, GCancellable *cancellable, const gchar *sexp, GSList **calobjs, GError **error);
 void   e_cal_backend_sync_get_free_busy        (ECalBackendSync *backend, EDataCal *cal, GCancellable *cancellable, const GSList *users, time_t start, time_t end, GSList **freebusyobjs, GError **error);
index e272ba3..479692e 100644 (file)
@@ -308,7 +308,7 @@ notify_remove (EDataCalView *view, ECalComponentId *id)
        EDataCalViewPrivate *priv = view->priv;
        gchar *ids;
        gchar *uid, *rid;
-       size_t uid_len, rid_len;
+       gsize uid_len, rid_len;
 
        send_pending_adds (view);
        send_pending_changes (view);
index bbcb3b0..5e6ac15 100644 (file)
@@ -501,7 +501,6 @@ data_cal_return_error (GDBusMethodInvocation *invocation, const GError *perror,
        g_error_free (error);
 }
 
-
 EDataCal *
 e_data_cal_new (ECalBackend *backend, ESource *source)
 {
index d9b0b11..1e29b72 100644 (file)
@@ -74,7 +74,7 @@ e_gdbus_cal_factory_default_init (EGdbusCalFactoryIface *iface)
 }
 
 /* encodes source and source type into a strv usable for a wire transfer;
-   Free returned pointer with g_strfreev() */
+   Free returned pointer with g_strfreev () */
 gchar **
 e_gdbus_cal_factory_encode_get_cal (const gchar *in_source, guint in_type)
 {
@@ -91,7 +91,7 @@ e_gdbus_cal_factory_encode_get_cal (const gchar *in_source, guint in_type)
 }
 
 /* decodes source and source type from a strv recevied from a wire transfer;
-   free out_source with g_free(); returns TRUE is successful. */
+   free out_source with g_free (); returns TRUE is successful. */
 gboolean
 e_gdbus_cal_factory_decode_get_cal (const gchar * const * in_strv, gchar **out_source, guint *out_type)
 {
index 090daf5..28700e2 100644 (file)
@@ -99,7 +99,6 @@ e_gdbus_cal_view_default_init (EGdbusCalViewIface *iface)
        _signal_name_to_id = g_hash_table_new (g_str_hash, g_str_equal);
        _signal_name_to_type = g_hash_table_new (g_str_hash, g_str_equal);
 
-       
        /* GObject signals definitions for D-Bus signals: */
        E_INIT_GDBUS_SIGNAL_STRV        (EGdbusCalViewIface, "objects_added",   objects_added, __OBJECTS_ADDED_SIGNAL)
        E_INIT_GDBUS_SIGNAL_STRV        (EGdbusCalViewIface, "objects_modified",objects_modified, __OBJECTS_MODIFIED_SIGNAL)
index eadf1ae..b213cd2 100644 (file)
@@ -880,7 +880,7 @@ e_gdbus_cal_call_close (GDBusProxy *proxy, GCancellable *cancellable, GAsyncRead
 {
        e_gdbus_proxy_method_call_void ("close", proxy, cancellable, callback, user_data);
 }
-       
+
 gboolean
 e_gdbus_cal_call_close_finish (GDBusProxy *proxy, GAsyncResult *result, GError **error)
 {
index 57029e6..34e2498 100644 (file)
@@ -287,7 +287,7 @@ data_cache_expire (CamelDataCache *cdc, const gchar *path, const gchar *keep, ti
                if (g_stat (dpath, &st) == 0
                    && S_ISREG (st.st_mode)
                    && (expire_all
-                       || (cdc->priv->expire_age != -1 && st.st_mtime + cdc->priv->expire_age < now)
+                       || (cdc->priv->expire_age != -1 && st.st_mtime + cdc->priv->expire_age < now)
                        || (cdc->priv->expire_access != -1 && st.st_atime + cdc->priv->expire_access < now))) {
                        g_unlink (dpath);
                        stream = camel_object_bag_get (cdc->priv->busy_bag, dpath);
index 0486efe..d90c6d3 100644 (file)
@@ -47,7 +47,6 @@
 #define WRITER_LOCK(cdb) g_static_rw_lock_writer_lock (&cdb->priv->rwlock)
 #define WRITER_UNLOCK(cdb) g_static_rw_lock_writer_unlock (&cdb->priv->rwlock)
 
-
 static sqlite3_vfs *old_vfs = NULL;
 static GThreadPool *sync_pool = NULL;
 
@@ -366,7 +365,7 @@ struct _CamelDBPrivate {
 static gint
 cdb_sql_exec (sqlite3 *db,
               const gchar *stmt,
-             gint (*callback)(void*,gint,gchar**,gchar**),
+             gint (*callback)(gpointer ,gint,gchar **,gchar **),
              gpointer data,
               GError **error)
 {
@@ -579,15 +578,14 @@ camel_db_command (CamelDB *cdb,
 
        if (!cdb)
                return TRUE;
-       
+
        WRITER_LOCK (cdb);
 
        START (stmt);
        ret = cdb_sql_exec (cdb->db, stmt, NULL, NULL, error);
        END;
-       
-       WRITER_UNLOCK (cdb);
 
+       WRITER_UNLOCK (cdb);
 
        return ret;
 }
@@ -627,7 +625,7 @@ camel_db_end_transaction (CamelDB *cdb,
 
        ret = cdb_sql_exec (cdb->db, "COMMIT", NULL, NULL, error);
        cdb->priv->transaction_is_on = FALSE;
-       
+
        ENDTS;
        WRITER_UNLOCK (cdb);
        CAMEL_DB_RELEASE_SQLITE_MEMORY;
@@ -738,9 +736,8 @@ camel_db_count_message_info (CamelDB *cdb,
 {
        gint ret = -1;
 
-
        READER_LOCK (cdb);
-       
+
        START (query);
        ret = cdb_sql_exec (cdb->db, query, count_cb, count, error);
        END;
@@ -1541,7 +1538,7 @@ read_version_callback (gpointer ref, gint ncol, gchar ** cols, gchar ** name)
 {
        gint *version = (gint *) ref;
 
-       if (cols [0])
+       if (cols[0])
                *version = strtoul (cols [0], NULL, 10);
 
        return 0;
@@ -1587,7 +1584,7 @@ camel_db_prepare_message_info_table (CamelDB *cdb,
        current_version = camel_db_get_folder_version (cdb, folder_name, &err);
 
        camel_db_begin_transaction (cdb, &err);
-       
+
        /* Migration stage one: storing the old data if necessary */
        ret = camel_db_migrate_folder_prepare (cdb, folder_name, current_version, &err);
        if (err)
@@ -1602,13 +1599,13 @@ camel_db_prepare_message_info_table (CamelDB *cdb,
        ret = camel_db_write_folder_version (cdb, folder_name, current_version, &err);
        if (err)
                goto exit;
-       
+
        camel_db_end_transaction (cdb, &err);
 
 exit:
        if (err && cdb->priv->transaction_is_on)
                camel_db_abort_transaction (cdb, NULL);
-       
+
        if (err)
                g_propagate_error (error, err);
 
index b2746e9..017b417 100644 (file)
@@ -1281,7 +1281,7 @@ camel_filter_driver_filter_mbox (CamelFilterDriver *driver,
                GError *local_error = NULL;
 
                if (st.st_size > 0)
-                       pc = (gint)(100.0 * ((double)camel_mime_parser_tell (mp) / (double)st.st_size));
+                       pc = (gint)(100.0 * ((double) camel_mime_parser_tell (mp) / (double) st.st_size));
 
                report_status (driver, CAMEL_FILTER_STATUS_START, pc, _("Getting message %d (%d%%)"), i, pc);
 
@@ -1299,9 +1299,9 @@ camel_filter_driver_filter_mbox (CamelFilterDriver *driver,
                /* Try and see if it has X-Evolution headers */
                xev = camel_header_raw_find(&mime_part->headers, "X-Evolution", NULL);
                if (xev)
-                       decode_flags_from_xev (xev, (CamelMessageInfoBase *)info);
+                       decode_flags_from_xev (xev, (CamelMessageInfoBase *) info);
 
-               ((CamelMessageInfoBase *)info)->size = camel_mime_parser_tell (mp) - last;
+               ((CamelMessageInfoBase *) info)->size = camel_mime_parser_tell (mp) - last;
 
                last = camel_mime_parser_tell (mp);
                status = camel_filter_driver_filter_message (
index b97887f..229b913 100644 (file)
@@ -2145,12 +2145,12 @@ save_message_infos_to_db (CamelFolderSummary *s,
                return -1;
 
        camel_folder_summary_lock (s, CAMEL_FOLDER_SUMMARY_SUMMARY_LOCK);
-       
+
        /* Push MessageInfo-es */
        camel_db_begin_transaction (cdb, NULL);
        g_hash_table_foreach (s->loaded_infos, save_to_db_cb, &args);
        camel_db_end_transaction (cdb, NULL);
-       
+
        camel_folder_summary_unlock (s, CAMEL_FOLDER_SUMMARY_SUMMARY_LOCK);
        /* FIXME[disk-summary] make sure we free the message infos that are loaded
         * are freed if not used anymore or should we leave that to the timer? */
@@ -2194,12 +2194,12 @@ camel_folder_summary_save_to_db (CamelFolderSummary *s,
        d(printf ("\ncamel_folder_summary_save_to_db called \n"));
        if (s->priv->need_preview && g_hash_table_size (s->priv->preview_updates)) {
                camel_folder_summary_lock (s, CAMEL_FOLDER_SUMMARY_SUMMARY_LOCK);
-               
+
                camel_db_begin_transaction (parent_store->cdb_w, NULL);
                g_hash_table_foreach (s->priv->preview_updates, (GHFunc) msg_save_preview, s->folder);
                g_hash_table_remove_all (s->priv->preview_updates);
                camel_db_end_transaction (parent_store->cdb_w, NULL);
-               
+
                camel_folder_summary_unlock (s, CAMEL_FOLDER_SUMMARY_SUMMARY_LOCK);
        }
 
@@ -2224,7 +2224,7 @@ camel_folder_summary_save_to_db (CamelFolderSummary *s,
 
                full_name = camel_folder_get_full_name (s->folder);
                g_warning ("Fixing up a broken summary migration on %s\n", full_name);
-               
+
                /* Begin everything again. */
                camel_db_begin_transaction (cdb, NULL);
                camel_db_reset_folder_version (cdb, full_name, 0, NULL);
index 621add8..c77dcac 100644 (file)
@@ -63,7 +63,7 @@ struct _update_data {
        CamelVeeFolder *folder_unmatched;
        GHashTable *unmatched_uids;
        gboolean rebuilt, correlating;
-       
+
        /* used for uids that needs to be updated in db later by unmatched_check_uid and
           folder_added_uid */
        GQueue *message_uids;
@@ -135,10 +135,10 @@ expression_is_correlating (const gchar *expr)
 
 /* Hold all these with summary lock and unmatched summary lock held */
 static void
-folder_changed_add_uid (CamelFolder *sub, 
-                       const gchar *uid, 
-                       const gchar hash[8], 
-                       CamelVeeFolder *vf, 
+folder_changed_add_uid (CamelFolder *sub,
+                       const gchar *uid,
+                       const gchar hash[8],
+                       CamelVeeFolder *vf,
                        gboolean use_db,
                        GSList **m_added_l,
                        GSList **unm_added_l)
@@ -157,7 +157,7 @@ folder_changed_add_uid (CamelFolder *sub,
 
        vuid = camel_pstring_strdup (camel_message_info_uid (vinfo));
        camel_message_info_free ((CamelMessageInfo *) vinfo);
-       
+
        if (use_db)
                *m_added_l = g_slist_prepend (*m_added_l, (gpointer) camel_pstring_strdup (vuid));
 
@@ -174,9 +174,9 @@ folder_changed_add_uid (CamelFolder *sub,
                        camel_folder_summary_update_counts_by_flags (CAMEL_FOLDER (folder_unmatched)->summary, vinfo->old_flags, TRUE);
                        camel_folder_change_info_remove_uid (
                                folder_unmatched->changes, vuid);
-               
+
                        *unm_added_l = g_slist_prepend (*unm_added_l, (gpointer) camel_pstring_strdup (vuid));
-                       
+
                        camel_folder_summary_remove_uid_fast (
                                CAMEL_FOLDER (folder_unmatched)->summary, vuid);
                        camel_folder_free_message_info (
@@ -189,16 +189,16 @@ folder_changed_add_uid (CamelFolder *sub,
 }
 
 static void
-folder_changed_remove_uid      (CamelFolder *sub, 
-                                const gchar *uid, 
-                                const gchar hash[8], 
-                                gint keep, 
-                                CamelVeeFolder *vf, 
+folder_changed_remove_uid      (CamelFolder *sub,
+                                const gchar *uid,
+                                const gchar hash[8],
+                                gint keep,
+                                CamelVeeFolder *vf,
                                 gboolean use_db,
                                 GSList **m_removed_l,
                                 GSList **unm_removed_l)
 {
-       CamelFolder *folder = (CamelFolder *)vf;
+       CamelFolder *folder = (CamelFolder *) vf;
        gchar *vuid, *oldkey;
        gpointer oldval;
        gint n;
@@ -249,9 +249,9 @@ folder_changed_remove_uid   (CamelFolder *sub,
                                camel_folder_summary_update_counts_by_flags (CAMEL_FOLDER (folder_unmatched)->summary, vinfo->old_flags, TRUE);
                                camel_folder_change_info_remove_uid (
                                        folder_unmatched->changes, vuid);
-               
+
                                *unm_removed_l = g_slist_prepend (*unm_removed_l, (gpointer) camel_pstring_strdup (vuid));
-                               
+
                                camel_folder_summary_remove_uid_fast (
                                        CAMEL_FOLDER (folder_unmatched)->summary, vuid);
                                camel_folder_free_message_info (
@@ -274,11 +274,11 @@ update_old_flags (CamelFolderSummary *summary, CamelVeeMessageInfo *vinfo)
 }
 
 static void
-folder_changed_change_uid      (CamelFolder *sub, 
-                                const gchar *uid, 
-                                const gchar hash[8], 
-                                CamelVeeFolder *vf, 
-                                gboolean use_db, 
+folder_changed_change_uid      (CamelFolder *sub,
+                                const gchar *uid,
+                                const gchar hash[8],
+                                CamelVeeFolder *vf,
+                                gboolean use_db,
                                 GSList **m_removed_l,
                                 GSList **unm_removed_l)
 {
@@ -314,7 +314,7 @@ folder_changed_change_uid   (CamelFolder *sub,
                } else {
                        if (vinfo) {
                                folder_changed_remove_uid (sub, uid, hash, FALSE, vf, use_db, m_removed_l, unm_removed_l);
-                               camel_message_info_free ((CamelMessageInfo *)vinfo);
+                               camel_message_info_free ((CamelMessageInfo *) vinfo);
                        }
                        if (uinfo)
                                camel_message_info_free ((CamelMessageInfo *) uinfo);
@@ -322,22 +322,21 @@ folder_changed_change_uid (CamelFolder *sub,
        }
 }
 
-
 static void
 vfolder_add_remove_transaction (CamelStore *parent_store, const gchar *full_name, GSList **uids, gboolean add, GError **error)
 {
        GSList *l;
 
        for (l = *uids; l != NULL; l = g_slist_next (l)) {
-               if (add)        
+               if (add)
                         camel_db_add_to_vfolder_transaction    (parent_store->cdb_w, full_name,
-                                                               (const gchar *) l->data, error);
+                                                               (const gchar *) l->data, error);
                else
-                       camel_db_delete_uid_from_vfolder_transaction    
-                                                               (parent_store->cdb_w, full_name, 
+                       camel_db_delete_uid_from_vfolder_transaction
+                                                               (parent_store->cdb_w, full_name,
                                                                 (const gchar *) l->data, error);
        }
-       
+
        g_slist_foreach (*uids, (GFunc) camel_pstring_free, NULL);
        g_slist_free (*uids);
        *uids = NULL;
@@ -572,21 +571,21 @@ folder_changed_change (CamelSession *session,
 
                parent_store = camel_folder_get_parent_store (folder);
                full_name = camel_folder_get_full_name (folder);
-               
+
                if (folder_unmatched)
                        unm_full_name = camel_folder_get_full_name (CAMEL_FOLDER (folder_unmatched));
-               
+
                camel_db_begin_transaction (parent_store->cdb_w, NULL);
-       
-               if (m_added_l)  
+
+               if (m_added_l)
                        vfolder_add_remove_transaction (parent_store, full_name, &m_added_l, TRUE, NULL);
                if (m_removed_l)
                        vfolder_add_remove_transaction (parent_store, full_name, &m_removed_l, FALSE, NULL);
-               if (unm_added_l)        
+               if (unm_added_l)
                        vfolder_add_remove_transaction (parent_store, unm_full_name, &unm_added_l, TRUE, NULL);
                if (unm_removed_l)
                        vfolder_add_remove_transaction (parent_store, unm_full_name, &unm_removed_l, FALSE, NULL);
-               
+
                camel_db_end_transaction (parent_store->cdb_w, NULL);
        }
 
@@ -727,7 +726,7 @@ unmatched_check_uid (gchar *uidin, gpointer value, struct _update_data *u)
                CamelVeeMessageInfo *mi = (CamelVeeMessageInfo *) camel_folder_summary_uid (((CamelFolder *) u->folder_unmatched)->summary, uid);
                if (mi) {
                        camel_folder_summary_update_counts_by_flags (CAMEL_FOLDER (u->folder_unmatched)->summary, mi->old_flags, TRUE);
-                       
+
                        if (u->message_uids != NULL)
                                g_queue_push_tail (u->message_uids, g_strdup (uid));
 
@@ -985,7 +984,7 @@ vee_folder_dispose (GObject *object)
                        folder = CAMEL_FOLDER (vf);
                        parent_store = camel_folder_get_parent_store (folder);
                        record = summary_header_to_db (folder->summary, NULL);
-                       
+
                        camel_db_begin_transaction (parent_store->cdb_w, NULL);
                        camel_db_write_folder_info_record (parent_store->cdb_w, record, NULL);
                        camel_db_end_transaction (parent_store->cdb_w, NULL);
@@ -1885,10 +1884,10 @@ vee_folder_rebuild_folder (CamelVeeFolder *vee_folder,
                                CamelStore *parent_store;
                                const gchar *full_name;
                                gchar *uid;
-                               
+
                                full_name = camel_folder_get_full_name (CAMEL_FOLDER (u.folder_unmatched));
                                parent_store = camel_folder_get_parent_store (CAMEL_FOLDER (u.folder_unmatched));
-                               
+
                                camel_db_begin_transaction (parent_store->cdb_w, NULL);
 
                                while ((uid = g_queue_pop_head (u.message_uids)) != NULL) {
index f6abcfb..3c36f03 100644 (file)
@@ -361,13 +361,12 @@ static gboolean imapx_select (CamelIMAPXServer *is, CamelFolder *folder, gboolea
 
 G_DEFINE_TYPE (CamelIMAPXServer, camel_imapx_server, CAMEL_TYPE_OBJECT)
 
-
 static guint
 get_batch_fetch_count (CamelIMAPXServer *is)
 {
        static guint count = 0;
        const gchar *fetch_count;
-       
+
        if (count)
                return count;
 
@@ -375,7 +374,7 @@ get_batch_fetch_count (CamelIMAPXServer *is)
        fetch_count = camel_url_get_param (is->url, "batch-fetch-count");
        if (fetch_count)
                count = strtoul (fetch_count, NULL, 10);
-       
+
        if (count <= 0)
                count = BATCH_FETCH_COUNT;
 
@@ -4076,7 +4075,7 @@ exception:
 
 static void
 imapx_command_fetch_new_uids_done      (CamelIMAPXServer *is,
-                                        CamelIMAPXCommand *ic)
+                                        CamelIMAPXCommand *ic)
 {
        CamelIMAPXJob *job = ic->job;
        GArray *infos = job->u.refresh_info.infos;
@@ -4119,10 +4118,10 @@ imapx_job_fetch_new_messages_start (CamelIMAPXServer *is,
                imapx_uidset_init (&job->u.refresh_info.uidset, get_batch_fetch_count (is), 0);
                job->u.refresh_info.infos = g_array_new (0, 0, sizeof (struct _refresh_info));
                ic->pri = job->pri;
-               
+
                if (is->descending)
                        ic->complete = imapx_command_fetch_new_uids_done;
-               else 
+               else
                        ic->complete = imapx_command_step_fetch_done;
        } else {
                ic = camel_imapx_command_new (
index 6d2868d..ce2bab1 100644 (file)
@@ -257,7 +257,7 @@ e_sqlite3_vfs_xOpen (sqlite3_vfs *pVfs, const gchar *zPath, sqlite3_file *pFile,
        g_return_val_if_fail (old_vfs != NULL, -1);
        g_return_val_if_fail (pFile != NULL, -1);
 
-       cFile = (ESqlite3File *)pFile;
+       cFile = (ESqlite3File *) pFile;
        cFile->old_vfs_file = g_malloc0 (old_vfs->szOsFile);
 
        res = old_vfs->xOpen (old_vfs, zPath, cFile->old_vfs_file, flags, pOutFlags);
index 8f23c95..b2cf4b3 100644 (file)
@@ -45,7 +45,7 @@ void          e_client_emit_backend_died      (EClient *client);
 
 ESource *      e_client_util_get_system_source (ESourceList *source_list);
 gboolean       e_client_util_set_default       (ESourceList *source_list, ESource *source);
-ESource *      e_client_util_get_source_for_uri(ESourceList *source_list, const gchar *uri);
+ESource *      e_client_util_get_source_for_uri (ESourceList *source_list, const gchar *uri);
 
 /* protected functions simplifying sync/async calls */
 GDBusProxy *   e_client_get_dbus_proxy         (EClient *client);
index e80bd7b..59e56fc 100644 (file)
@@ -337,7 +337,6 @@ e_client_class_init (EClientClass *klass)
                G_TYPE_NONE, 1,
                G_TYPE_ERROR);
 
-
        signals[BACKEND_ERROR] = g_signal_new (
                "backend-error",
                G_OBJECT_CLASS_TYPE (klass),
@@ -838,7 +837,7 @@ client_handle_authentication (EClient *client, const ECredentials *credentials)
 /* Processes authentication request in a new thread. Usual steps are:
    a) backend sends an auth-required signal
    b) EClient implementation calls this function
-   c) a new thread is run which emits authenticate signal by e_client_emit_authenticate()
+   c) a new thread is run which emits authenticate signal by e_client_emit_authenticate ()
    d) if anyone responds (returns true), the EClient::handle_authentication
       is called from the same extra thread with new credentials
    e) EClient implementation passes results to backend in the EClient::handle_authentication
index 40ebd59..716796e 100644 (file)
@@ -62,7 +62,7 @@ e_credentials_new (void)
 }
 
 /* Expects @keys as NULL terminate list of strings "key:encoded_value".
-   The same can be returned from e_credentials_to_strv().
+   The same can be returned from e_credentials_to_strv ().
 */
 ECredentials *
 e_credentials_new_strv (const gchar * const *keys)
@@ -163,8 +163,8 @@ add_to_array_cb (gpointer key, gpointer value, gpointer ptr_array)
 }
 
 /* Returns NULL-terminated array of strings with keys and encoded values;
-   To read them back pass this pointer to e_credentials_new(). As it returns
-   newly allocated string then this should be freed with g_strfreev()
+   To read them back pass this pointer to e_credentials_new (). As it returns
+   newly allocated string then this should be freed with g_strfreev ()
    when no longer needed.
 */
 gchar **
@@ -286,7 +286,7 @@ e_credentials_get (const ECredentials *credentials, const gchar *key)
 
 /* peeks value for a key, in a clear form. The value is valid until free
    of the @credentials structure or until the key value is rewritten
-   by e_credentials_set()
+   by e_credentials_set ()
 */
 const gchar *
 e_credentials_peek (ECredentials *credentials, const gchar *key)
@@ -386,7 +386,7 @@ e_credentials_equal_keys (const ECredentials *credentials1, const ECredentials *
        va_end (va);
 
        return equal;
-}      
+}
 
 /**
  * Returns whether @credentials contains @key.
@@ -427,7 +427,7 @@ gather_key_names (gpointer key, gpointer value, gpointer pslist)
 
 /* Returns newly allocated list of key names stored in the credentials strucutre;
    strings are internal credentials values, only the list is newly allocated.
-   Free the list with g_slist_free() when no longer needed.
+   Free the list with g_slist_free () when no longer needed.
 */
 GSList *
 e_credentials_list_keys        (const ECredentials *credentials)
@@ -495,7 +495,7 @@ static struct _PromptFlags {
 };
 
 /* Returned pointer can be passed to e_credentials_util_string_to prompt_flags()
-   to decode it back to flags. Free returned pointer with g_free().
+   to decode it back to flags. Free returned pointer with g_free ().
 */
 gchar *
 e_credentials_util_prompt_flags_to_string (guint prompt_flags)
index 06b0f26..ebd32c7 100644 (file)
@@ -71,12 +71,12 @@ void                e_credentials_set       (      ECredentials *credentials, const gchar *key, cons
 gchar *                e_credentials_get       (const ECredentials *credentials, const gchar *key);
 const gchar *  e_credentials_peek      (      ECredentials *credentials, const gchar *key);
 gboolean       e_credentials_equal     (const ECredentials *credentials1, const ECredentials *credentials2);
-gboolean       e_credentials_equal_keys(const ECredentials *credentials1, const ECredentials *credentials2, const gchar *key1, ...) G_GNUC_NULL_TERMINATED;
+gboolean       e_credentials_equal_keys (const ECredentials *credentials1, const ECredentials *credentials2, const gchar *key1, ...) G_GNUC_NULL_TERMINATED;
 gboolean       e_credentials_has_key   (const ECredentials *credentials, const gchar *key);
 guint          e_credentials_keys_size (const ECredentials *credentials);
 GSList *       e_credentials_list_keys (const ECredentials *credentials);
 void           e_credentials_clear     (      ECredentials *credentials);
-void           e_credentials_clear_peek(      ECredentials *credentials);
+void           e_credentials_clear_peek (      ECredentials *credentials);
 
 void           e_credentials_util_safe_free_string (gchar *str);
 gchar *                e_credentials_util_prompt_flags_to_string (guint prompt_flags); /* bit-or of ECredentialsPromptFlags */
index 9f4e7a7..04f726d 100644 (file)
@@ -628,8 +628,8 @@ e_gdbus_async_op_keeper_default_init (EGdbusAsyncOpKeeperInterface *iface)
 }
 
 /* Created hash table of pending async operations. This can be freed
-   with g_hash_table_destroy() in dispose. Interface asks for this
-   ponter by call of e_gdbus_async_op_keeper_create_pending_ops().
+   with g_hash_table_destroy () in dispose. Interface asks for this
+   ponter by call of e_gdbus_async_op_keeper_create_pending_ops ().
 */
 GHashTable *
 e_gdbus_async_op_keeper_create_pending_ops (EGdbusAsyncOpKeeper *object)
@@ -641,7 +641,7 @@ e_gdbus_async_op_keeper_create_pending_ops (EGdbusAsyncOpKeeper *object)
 }
 
 /* Returns hash table of pending async operations previously created
-   by e_gdbus_async_op_keeper_create_pending_ops().
+   by e_gdbus_async_op_keeper_create_pending_ops ().
 */
 GHashTable *
 e_gdbus_async_op_keeper_get_pending_ops (EGdbusAsyncOpKeeper *object)
@@ -746,7 +746,6 @@ typedef struct _AsyncOpData
        } result;
 } AsyncOpData;
 
-
 static void
 async_op_data_free (AsyncOpData *op_data)
 {
@@ -907,7 +906,7 @@ gdbus_proxy_async_method_done (guint e_gdbus_type, gconstpointer out_value, EGdb
                case E_GDBUS_TYPE_VOID:
                        break;
                case E_GDBUS_TYPE_BOOLEAN:
-                       op_data->result.out_boolean = * ((const gboolean *)out_value);
+                       op_data->result.out_boolean = * ((const gboolean *) out_value);
                        break;
                case E_GDBUS_TYPE_STRING:
                        op_data->result.out_string = g_strdup ((const gchar *) out_value);
@@ -1459,7 +1458,7 @@ proxy_method_call (const gchar *method_name, guint param_type, gconstpointer par
                g_variant_builder_unref (builder);
        }
 
-       g_dbus_proxy_call (G_DBUS_PROXY (proxy), method_name, params, G_DBUS_CALL_FLAGS_NONE, e_data_server_util_get_dbus_call_timeout (), cancellable, callback, user_data);   
+       g_dbus_proxy_call (G_DBUS_PROXY (proxy), method_name, params, G_DBUS_CALL_FLAGS_NONE, e_data_server_util_get_dbus_call_timeout (), cancellable, callback, user_data);
 }
 
 void
index ce32798..b6e68ef 100644 (file)
@@ -464,7 +464,7 @@ enum {
        g_hash_table_insert (_method_name_to_type, (gpointer) _dbus_sig_name_str, GUINT_TO_POINTER (E_GDBUS_TYPE_ ## _gtype | E_GDBUS_TYPE_IS_ASYNC));
 
 #define E_INIT_GDBUS_METHOD_VOID(_iface_struct, _dbus_sig_name_str, _sig_name_var, _method_sig_id)                             \
-       E_INIT_GDBUS_METHOD_CALL_TMPL_VOID(_iface_struct, _dbus_sig_name_str, _sig_name_var, _method_sig_id)                    \
+       E_INIT_GDBUS_METHOD_CALL_TMPL_VOID (_iface_struct, _dbus_sig_name_str, _sig_name_var, _method_sig_id)                   \
        g_hash_table_insert (_method_name_to_type, (gpointer) _dbus_sig_name_str, GUINT_TO_POINTER (E_GDBUS_TYPE_VOID));
 
 #define E_INIT_GDBUS_METHOD_BOOLEAN(_iface_struct, _dbus_sig_name_str, _sig_name_var, _method_sig_id)                          \
@@ -484,7 +484,7 @@ enum {
        g_hash_table_insert (_method_name_to_type, (gpointer) _dbus_sig_name_str, GUINT_TO_POINTER (E_GDBUS_TYPE_UINT));
 
 #define E_INIT_GDBUS_METHOD_CALL_VOID(_iface_struct, _dbus_sig_name_str, _sig_name_var, _method_sig_id)                                \
-       E_INIT_GDBUS_METHOD_CALL_TMPL_VOID(_iface_struct, _dbus_sig_name_str, _sig_name_var, _method_sig_id)                    \
+       E_INIT_GDBUS_METHOD_CALL_TMPL_VOID (_iface_struct, _dbus_sig_name_str, _sig_name_var, _method_sig_id)                   \
        g_hash_table_insert (_method_name_to_type, (gpointer) _dbus_sig_name_str, GUINT_TO_POINTER (E_GDBUS_TYPE_VOID | E_GDBUS_TYPE_IS_ASYNC));
 
 #define E_INIT_GDBUS_METHOD_CALL_BOOLEAN(_iface_struct, _dbus_sig_name_str, _sig_name_var, _method_sig_id)                     \
index b100755..4b336e2 100644 (file)
@@ -69,7 +69,7 @@ e_operation_pool_free (EOperationPool *pool)
 }
 
 /* Reserves new operation ID, which is returned. This operation ID may
-   be released by e_operation_pool_release_opid() when the operation
+   be released by e_operation_pool_release_opid () when the operation
    is finished.
 */
 guint32
@@ -115,7 +115,7 @@ e_operation_pool_release_opid (EOperationPool *pool, guint32 opid)
 }
 
 /* Pushes operation to be processed. 'opdata' is passed to the function
-   provided in e_operation_pool_new().
+   provided in e_operation_pool_new ().
 */
 void
 e_operation_pool_push (EOperationPool *pool, gpointer opdata)
index 4d0c636..1f102ba 100644 (file)
@@ -405,7 +405,6 @@ e_source_list_peek_groups (ESourceList *list)
        return list->priv->groups;
 }
 
-
 /**
  * e_source_list_peek_group_by_uid:
  *
index b085500..b8dbd5a 100644 (file)
@@ -421,7 +421,7 @@ client_utils_opened_cb (EClient *client, const GError *error, EClientUtilsAsyncO
 
        if (!async_data->open_finished) {
                /* there can happen that the "opened" signal is received
-                  before the e_client_open() is finished, thus keep detailed
+                  before the e_client_open () is finished, thus keep detailed
                   error for later use, if any */
                if (error)
                        async_data->opened_cb_error = g_error_copy (error);
@@ -573,7 +573,6 @@ e_client_utils_open_new (ESource *source, EClientSourceType source_type, gboolea
        if (auth_handler)
                g_signal_connect (client, "authenticate", G_CALLBACK (client_utils_open_new_auth_cb), async_data);
 
-
        /* wait till backend notifies about its opened state */
        g_signal_connect (client, "opened", G_CALLBACK (client_utils_opened_cb), async_data);
 
@@ -655,7 +654,6 @@ e_client_utils_authenticate_handler (EClient *client, ECredentials *credentials,
                username_markup = g_markup_printf_escaped ("<b>%s</b>", e_credentials_peek (credentials, E_CREDENTIALS_KEY_USERNAME));
                source_name_markup = g_markup_printf_escaped ("<b>%s</b>", e_source_peek_name (source));
 
-
                if (reason && *reason)
                        prompt = g_strdup_printf (_("Enter password for %s (user %s)\nReason: %s"), source_name_markup, username_markup, reason);
                else
index 13acd6a..3f4e53d 100644 (file)
@@ -28,7 +28,7 @@ print_email (EContact *contact)
        for (e = emails; e; e = e->next) {
                g_print ("\t%s\n",  (gchar *)e->data);
        }
-       g_list_foreach (emails, (GFunc)g_free, NULL);
+       g_list_foreach (emails, (GFunc) g_free, NULL);
        g_list_free (emails);
 
        g_print ("\n");
@@ -125,8 +125,8 @@ do_start (GThreadFunc func, gpointer data)
 }
 
 /* Starts new main-loop, but just before that calls 'func'.
-   Main-loop is kept running, and this function blocks, 
-   until call of stop_main_loop().
+   Main-loop is kept running, and this function blocks,
+   until call of stop_main_loop ().
 */
 void
 start_main_loop (GThreadFunc func, gpointer data)
@@ -137,8 +137,8 @@ start_main_loop (GThreadFunc func, gpointer data)
 }
 
 /* Starts new main-loop and then invokes func in a new thread.
-   Main-loop is kept running, and this function blocks, 
-   until call of stop_main_loop().
+   Main-loop is kept running, and this function blocks,
+   until call of stop_main_loop ().
 */
 void
 start_in_thread_with_main_loop (GThreadFunc func, gpointer data)
@@ -161,8 +161,8 @@ start_in_thread_with_main_loop (GThreadFunc func, gpointer data)
 }
 
 /* Starts new main-loop and then invokes func in an idle callback.
-   Main-loop is kept running, and this function blocks, 
-   until call of stop_main_loop().
+   Main-loop is kept running, and this function blocks,
+   until call of stop_main_loop ().
 */
 void
 start_in_idle_with_main_loop (GThreadFunc func, gpointer data)
index 687c74a..8b58eab 100644 (file)
@@ -63,7 +63,6 @@ print_each_property (gpointer prop_name, gpointer prop_value, gpointer user_data
            g_str_equal (prop_name, BOOK_BACKEND_PROPERTY_SUPPORTED_AUTH_METHODS)) {
                GSList *values = e_client_util_parse_comma_strings (prop_value), *v;
 
-               
                for (v = values; v; v = v->next) {
                        if (v != values)
                                g_print (", ");
index 919d67a..ea134b7 100644 (file)
@@ -48,7 +48,7 @@ main (gint argc, gchar **argv)
                g_object_unref (book_client);
                g_free (uri);
                return 1;
-       } else  if (!e_client_remove_sync (E_CLIENT (book_client), NULL, &error)) {
+       } else  if (!e_client_remove_sync (E_CLIENT (book_client), NULL, &error)) {
                report_error ("client remove sync", &error);
                g_object_unref (book_client);
                g_free (uri);
index 4ff6915..6a774dc 100644 (file)
@@ -121,8 +121,8 @@ do_start (GThreadFunc func, gpointer data)
 }
 
 /* Starts new main-loop, but just before that calls 'func'.
-   Main-loop is kept running, and this function blocks, 
-   until call of stop_main_loop().
+   Main-loop is kept running, and this function blocks,
+   until call of stop_main_loop ().
 */
 void
 start_main_loop (GThreadFunc func, gpointer data)
@@ -133,8 +133,8 @@ start_main_loop (GThreadFunc func, gpointer data)
 }
 
 /* Starts new main-loop and then invokes func in a new thread.
-   Main-loop is kept running, and this function blocks, 
-   until call of stop_main_loop().
+   Main-loop is kept running, and this function blocks,
+   until call of stop_main_loop ().
 */
 void
 start_in_thread_with_main_loop (GThreadFunc func, gpointer data)
@@ -157,8 +157,8 @@ start_in_thread_with_main_loop (GThreadFunc func, gpointer data)
 }
 
 /* Starts new main-loop and then invokes func in an idle callback.
-   Main-loop is kept running, and this function blocks, 
-   until call of stop_main_loop().
+   Main-loop is kept running, and this function blocks,
+   until call of stop_main_loop ().
 */
 void
 start_in_idle_with_main_loop (GThreadFunc func, gpointer data)
index 25af903..3cb8fa5 100644 (file)
@@ -87,7 +87,7 @@ test_sync (icalcomponent *icalcomp)
 
        if (res) {
                GSList *ecalcomps = NULL;
-       
+
                if (!e_cal_client_get_objects_for_uid_sync (cal_client, uid, &ecalcomps, NULL, &error)) {
                        report_error ("get objects for uid sync", &error);
                        res = FALSE;
index 3a1298e..dc990f3 100644 (file)
@@ -81,7 +81,6 @@ print_each_property (gpointer prop_name, gpointer prop_value, gpointer user_data
        if (g_str_equal (prop_name, CLIENT_BACKEND_PROPERTY_CAPABILITIES)) {
                GSList *values = e_client_util_parse_comma_strings (prop_value), *v;
 
-               
                for (v = values; v; v = v->next) {
                        if (v != values)
                                g_print (", ");
@@ -335,7 +334,7 @@ client_opened_async (GObject *source_object, GAsyncResult *result, gpointer asyn
        evals->async_data = async_data;
        evals->todo_prop_names = get_known_prop_names ();
        evals->retrieved_props = g_hash_table_new_full (g_str_hash, g_str_equal, NULL, g_free);
-       
+
        e_cal_client_get_default_object (cal_client, NULL, client_got_default_object_async, evals);
 }
 
index 579dffc..c82847b 100644 (file)
@@ -49,7 +49,7 @@ main (gint argc, gchar **argv)
                g_object_unref (cal_client);
                g_free (uri);
                return 1;
-       } else  if (!e_client_remove_sync (E_CLIENT (cal_client), NULL, &error)) {
+       } else  if (!e_client_remove_sync (E_CLIENT (cal_client), NULL, &error)) {
                report_error ("client remove sync", &error);
                g_object_unref (cal_client);
                g_free (uri);
index 0e093ec..d76bf70 100644 (file)
@@ -61,7 +61,6 @@ print_each_property (gpointer prop_name, gpointer prop_value, gpointer user_data
        if (g_str_equal (prop_name, CLIENT_BACKEND_PROPERTY_CAPABILITIES)) {
                GSList *values = e_client_util_parse_comma_strings (prop_value), *v;
 
-               
                for (v = values; v; v = v->next) {
                        if (v != values)
                                g_print (", ");