[evolution-data-server/gnome-3-8] Coding style and whitespace cleanup.

[Matthew Barnes <mbarnes src gnome org>]

commit bffc5770a07944434d092994f3bd22b38bcb0d60
Author: Matthew Barnes <mbarnes redhat com>
Date:   Wed May 8 09:14:53 2013 -0400

    Coding style and whitespace cleanup.

 .../libedata-book/e-book-backend-sqlitedb.c        |   54 ++++++++++---------
 camel/camel-filter-driver.c                        |    3 +-
 camel/camel-imapx-folder.c                         |    2 +-
 camel/camel-imapx-store.c                          |    6 +-
 camel/camel-imapx-stream.c                         |    6 +-
 camel/camel-imapx-summary.c                        |    2 +-
 camel/camel-mime-message.c                         |    8 ++-
 libedataserver/e-gdbus-templates.c                 |    3 +-
 8 files changed, 45 insertions(+), 39 deletions(-)
---
diff --git a/addressbook/libedata-book/e-book-backend-sqlitedb.c 
b/addressbook/libedata-book/e-book-backend-sqlitedb.c
index e26d9bd..e355db6 100644
--- a/addressbook/libedata-book/e-book-backend-sqlitedb.c
+++ b/addressbook/libedata-book/e-book-backend-sqlitedb.c
@@ -700,9 +700,9 @@ collect_columns_cb (gpointer ref,
 
 static gint
 get_count_cb (gpointer ref,
-             gint n_cols,
-             gchar **cols,
-             gchar **name)
+              gint n_cols,
+              gchar **cols,
+              gchar **name)
 {
        gint64 count = 0;
        gint *ret = ref;
@@ -721,9 +721,9 @@ get_count_cb (gpointer ref,
 
 static gboolean
 check_folderid_exists (EBookBackendSqliteDB *ebsdb,
-                      const gchar *folderid,
-                      gboolean *exists,
-                      GError **error)
+                       const gchar *folderid,
+                       gboolean *exists,
+                       GError **error)
 {
        gboolean success;
        gint count = 0;
@@ -991,7 +991,7 @@ create_contacts_table (EBookBackendSqliteDB *ebsdb,
                                folderid);
                        stmt = sqlite3_mprintf (
                                "CREATE INDEX IF NOT EXISTS %Q ON %Q (%s)", tmp, folderid,
-                                               summary_dbname_from_field (ebsdb, 
ebsdb->priv->summary_fields[i].field));
+                               summary_dbname_from_field (ebsdb, ebsdb->priv->summary_fields[i].field));
                        success = book_backend_sql_exec (ebsdb->priv->db, stmt, NULL, NULL, error);
                        sqlite3_free (stmt);
                        g_free (tmp);
@@ -1007,7 +1007,7 @@ create_contacts_table (EBookBackendSqliteDB *ebsdb,
                                folderid);
                        stmt = sqlite3_mprintf (
                                "CREATE INDEX IF NOT EXISTS %Q ON %Q (%s_reverse)", tmp, folderid,
-                                               summary_dbname_from_field (ebsdb, 
ebsdb->priv->summary_fields[i].field));
+                               summary_dbname_from_field (ebsdb, ebsdb->priv->summary_fields[i].field));
                        success = book_backend_sql_exec (ebsdb->priv->db, stmt, NULL, NULL, error);
                        sqlite3_free (stmt);
                        g_free (tmp);
@@ -1016,11 +1016,13 @@ create_contacts_table (EBookBackendSqliteDB *ebsdb,
                if ((ebsdb->priv->summary_fields[i].index & INDEX_PHONE) != 0 &&
                    ebsdb->priv->summary_fields[i].type != E_TYPE_CONTACT_ATTR_LIST) {
                        /* Derive index name from field & folder */
-                       tmp = g_strdup_printf ("PINDEX_%s_%s",
-                                              summary_dbname_from_field (ebsdb, 
ebsdb->priv->summary_fields[i].field),
-                                              folderid);
-                       stmt = sqlite3_mprintf ("CREATE INDEX IF NOT EXISTS %Q ON %Q (%s_phone)", tmp, 
folderid,
-                                               summary_dbname_from_field (ebsdb, 
ebsdb->priv->summary_fields[i].field));
+                       tmp = g_strdup_printf (
+                               "PINDEX_%s_%s",
+                               summary_dbname_from_field (ebsdb, ebsdb->priv->summary_fields[i].field),
+                               folderid);
+                       stmt = sqlite3_mprintf (
+                               "CREATE INDEX IF NOT EXISTS %Q ON %Q (%s_phone)", tmp, folderid,
+                               summary_dbname_from_field (ebsdb, ebsdb->priv->summary_fields[i].field));
                        success = book_backend_sql_exec (ebsdb->priv->db, stmt, NULL, NULL, error);
                        sqlite3_free (stmt);
                        g_free (tmp);
@@ -1859,7 +1861,7 @@ insert_stmt_from_contact (EBookBackendSqliteDB *ebsdb,
 
 static void
 update_e164_attribute_params (EVCard *vcard,
-                             const gchar *default_region)
+                              const gchar *default_region)
 {
        GList *attr_list;
 
@@ -3054,10 +3056,10 @@ extract_digits (const gchar *normal)
 
 static gchar *
 convert_string_value (EBookBackendSqliteDB *ebsdb,
-                     const gchar          *value,
-                     const gchar          *region,
-                     ConvertFlags          flags,
-                     MatchType             match)
+                      const gchar *value,
+                      const gchar *region,
+                      ConvertFlags flags,
+                      MatchType match)
 {
        GString *str;
        size_t len;
@@ -3145,14 +3147,14 @@ convert_string_value (EBookBackendSqliteDB *ebsdb,
 
 static gchar *
 field_name_and_query_term (EBookBackendSqliteDB *ebsdb,
-                          const gchar          *folderid,
-                          const gchar          *field_name_input,
-                          const gchar          *query_term_input,
-                          const gchar          *region,
-                          MatchType             match,
-                          gboolean             *is_list_attr,
-                          gchar               **query_term,
-                          gchar               **extra_term)
+                           const gchar *folderid,
+                           const gchar *field_name_input,
+                           const gchar *query_term_input,
+                           const gchar *region,
+                           MatchType match,
+                           gboolean *is_list_attr,
+                           gchar **query_term,
+                           gchar **extra_term)
 {
        gint summary_index;
        gchar *field_name = NULL;
diff --git a/camel/camel-filter-driver.c b/camel/camel-filter-driver.c
index a61ed20..e5d54a3 100644
--- a/camel/camel-filter-driver.c
+++ b/camel/camel-filter-driver.c
@@ -1158,7 +1158,8 @@ close_folder (gpointer key,
                /* FIXME Pass a GCancellable */
                if (camel_folder_synchronize_sync (folder, FALSE, NULL,
                        (driver->priv->error != NULL) ? NULL : &driver->priv->error))
-                       camel_folder_refresh_info_sync (folder, NULL,
+                       camel_folder_refresh_info_sync (
+                               folder, NULL,
                                (driver->priv->error != NULL) ? NULL : &driver->priv->error);
                camel_folder_thaw (folder);
                g_object_unref (folder);
diff --git a/camel/camel-imapx-folder.c b/camel/camel-imapx-folder.c
index 7785b6a..a00caa0 100644
--- a/camel/camel-imapx-folder.c
+++ b/camel/camel-imapx-folder.c
@@ -1044,7 +1044,7 @@ imapx_transfer_messages_to_sync (CamelFolder *source,
        }
 
        /* update destination folder only if not frozen, to not update
-          for each single message transfer during filtering
+        * for each single message transfer during filtering
         */
        if (!camel_folder_is_frozen (dest))
                imapx_refresh_info_sync (dest, cancellable, NULL);
diff --git a/camel/camel-imapx-store.c b/camel/camel-imapx-store.c
index 0161536..885c275 100644
--- a/camel/camel-imapx-store.c
+++ b/camel/camel-imapx-store.c
@@ -1143,9 +1143,9 @@ sync_folders (CamelIMAPXStore *istore,
        }
 
        /* In certain situations can happen that the function returns data,
-          even either the operation was cancelled or an error was set,
-          thus check for this and do not update local list of folders
-          with incomplete data
+        * even either the operation was cancelled or an error was set,
+        * thus check for this and do not update local list of folders
+        * with incomplete data
        */
        if (g_cancellable_is_cancelled (cancellable) || local_error) {
                g_hash_table_foreach (folders_from_server, imapx_get_folders_free, NULL);
diff --git a/camel/camel-imapx-stream.c b/camel/camel-imapx-stream.c
index 7d0a7cd..f547287 100644
--- a/camel/camel-imapx-stream.c
+++ b/camel/camel-imapx-stream.c
@@ -950,9 +950,9 @@ camel_imapx_stream_skip (CamelIMAPXStream *is,
 
 gboolean
 camel_imapx_stream_skip_until (CamelIMAPXStream *is,
-                               const gchar *delimiters,
-                               GCancellable *cancellable,
-                               GError **error)
+                                const gchar *delimiters,
+                                GCancellable *cancellable,
+                                GError **error)
 {
        register guchar c;
        guchar *p, *e;
diff --git a/camel/camel-imapx-summary.c b/camel/camel-imapx-summary.c
index c0042c7..b9bb7c7 100644
--- a/camel/camel-imapx-summary.c
+++ b/camel/camel-imapx-summary.c
@@ -78,7 +78,7 @@ imapx_message_info_clone (CamelFolderSummary *s,
 
 static void
 imapx_message_info_free (CamelFolderSummary *summary,
-                        CamelMessageInfo *mi)
+                         CamelMessageInfo *mi)
 {
        CamelIMAPXMessageInfo *xinfo = (CamelIMAPXMessageInfo *) mi;
 
diff --git a/camel/camel-mime-message.c b/camel/camel-mime-message.c
index 05d3bfe..167557e 100644
--- a/camel/camel-mime-message.c
+++ b/camel/camel-mime-message.c
@@ -1289,10 +1289,12 @@ camel_mime_message_has_attachment (CamelMimeMessage *message)
 }
 
 static void
-dumpline (const char *indent, guint8 *data, gsize data_len)
+dumpline (const gchar *indent,
+          guint8 *data,
+          gsize data_len)
 {
-       int j;
-       char *gutter;
+       gint j;
+       gchar *gutter;
        guint gutter_size;
 
        g_return_if_fail (data_len <= 16);
diff --git a/libedataserver/e-gdbus-templates.c b/libedataserver/e-gdbus-templates.c
index 6ac05f8..19800ad 100644
--- a/libedataserver/e-gdbus-templates.c
+++ b/libedataserver/e-gdbus-templates.c
@@ -1531,7 +1531,8 @@ e_gdbus_proxy_call_sync (GDBusProxy *proxy,
        sync_data_hash = g_object_get_data (G_OBJECT (proxy), SYNC_DATA_HASH_KEY);
        if (!sync_data_hash) {
                sync_data_hash = g_hash_table_new (g_direct_hash, g_direct_equal);
-               g_object_set_data_full (G_OBJECT (proxy), SYNC_DATA_HASH_KEY, sync_data_hash,
+               g_object_set_data_full (
+                       G_OBJECT (proxy), SYNC_DATA_HASH_KEY, sync_data_hash,
                        (GDestroyNotify) g_hash_table_destroy);
        }
        sync_opid_ident = GINT_TO_POINTER (sync_opid);