[evolution-data-server] Whitespace cleanups.
- From: Matthew Barnes <mbarnes src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution-data-server] Whitespace cleanups.
- Date: Sat, 2 Jun 2012 14:38:35 +0000 (UTC)
commit 986d0d7c976bb1e9c439a7b90f062dd41c77c6de
Author: Matthew Barnes <mbarnes redhat com>
Date: Sat Jun 2 07:58:05 2012 -0400
Whitespace cleanups.
calendar/backends/caldav/e-cal-backend-caldav.c | 2 +-
.../backends/contacts/e-cal-backend-contacts.c | 2 +-
calendar/backends/http/e-cal-backend-http.c | 2 +-
camel/camel-folder-search.c | 2 +-
camel/camel-folder-summary.c | 17 ++--
camel/camel-folder-summary.h | 2 +-
camel/camel-imapx-conn-manager.c | 5 +-
camel/camel-imapx-server.c | 12 +-
camel/camel-string-utils.c | 4 +-
camel/camel-tcp-stream-ssl.c | 2 +-
camel/camel-vee-data-cache.c | 50 ++++----
camel/camel-vee-folder.c | 125 ++++++++++----------
camel/camel-vee-store.c | 56 +++++-----
camel/camel-vee-summary.c | 20 ++--
camel/providers/imap/camel-imap-folder.c | 3 +-
15 files changed, 152 insertions(+), 152 deletions(-)
---
diff --git a/calendar/backends/caldav/e-cal-backend-caldav.c b/calendar/backends/caldav/e-cal-backend-caldav.c
index e5955fc..862b028 100644
--- a/calendar/backends/caldav/e-cal-backend-caldav.c
+++ b/calendar/backends/caldav/e-cal-backend-caldav.c
@@ -542,7 +542,7 @@ quote_etag (const gchar *etag)
static gboolean
status_code_to_result (SoupMessage *message,
ECalBackendCalDAV *cbdav,
- gboolean is_opening,
+ gboolean is_opening,
GError **perror)
{
ECalBackendCalDAVPrivate *priv;
diff --git a/calendar/backends/contacts/e-cal-backend-contacts.c b/calendar/backends/contacts/e-cal-backend-contacts.c
index 46a862d..bc90dd8 100644
--- a/calendar/backends/contacts/e-cal-backend-contacts.c
+++ b/calendar/backends/contacts/e-cal-backend-contacts.c
@@ -436,7 +436,7 @@ e_cal_backend_contacts_authenticate_user (ECalBackendSync *backend,
/* BookRecord methods */
static void
create_book_record (ECalBackendContacts *cbc,
- ESource *source)
+ ESource *source)
{
EBookClient *book_client;
BookRecord *br;
diff --git a/calendar/backends/http/e-cal-backend-http.c b/calendar/backends/http/e-cal-backend-http.c
index db8ff9f..d427931 100644
--- a/calendar/backends/http/e-cal-backend-http.c
+++ b/calendar/backends/http/e-cal-backend-http.c
@@ -432,7 +432,7 @@ retrieval_done (SoupSession *session,
"then disable certificate validity tests by selecting 'Ignore invalid SSL certificate' option "
"in Properties"));
}
-
+
e_cal_backend_notify_error (E_CAL_BACKEND (cbhttp), err_msg);
g_free (err_msg);
} else
diff --git a/camel/camel-folder-search.c b/camel/camel-folder-search.c
index ab96996..876ba9b 100644
--- a/camel/camel-folder-search.c
+++ b/camel/camel-folder-search.c
@@ -324,7 +324,7 @@ camel_folder_search_set_body_index (CamelFolderSearch *search,
static gboolean
do_search_in_memory (CamelFolder *search_in_folder,
- const gchar *expr)
+ const gchar *expr)
{
/* if the expression contains any of these tokens, then perform a memory search, instead of the SQL one */
const gchar *in_memory_tokens[] = {
diff --git a/camel/camel-folder-summary.c b/camel/camel-folder-summary.c
index a80ca37..67a2e0b 100644
--- a/camel/camel-folder-summary.c
+++ b/camel/camel-folder-summary.c
@@ -835,7 +835,7 @@ content_info_to_db (CamelFolderSummary *summary,
**/
gboolean
camel_folder_summary_replace_flags (CamelFolderSummary *summary,
- CamelMessageInfo *info)
+ CamelMessageInfo *info)
{
guint32 old_flags, new_flags, added_flags, removed_flags;
GObject *summary_object;
@@ -867,9 +867,9 @@ camel_folder_summary_replace_flags (CamelFolderSummary *summary,
if ((old_flags & CAMEL_MESSAGE_SEEN) == (new_flags & CAMEL_MESSAGE_SEEN)) {
/* unread count is different from others, it asks for nonexistence
- of the flag, thus if it wasn't changed, then simply set it
- in added/removed, thus there are no false notifications
- on unread counts */
+ * of the flag, thus if it wasn't changed, then simply set it
+ * in added/removed, thus there are no false notifications
+ * on unread counts */
added_flags |= CAMEL_MESSAGE_SEEN;
removed_flags |= CAMEL_MESSAGE_SEEN;
}
@@ -1758,8 +1758,8 @@ camel_folder_summary_free_array (GPtrArray *array)
static void
cfs_copy_uids_cb (gpointer key,
- gpointer value,
- gpointer user_data)
+ gpointer value,
+ gpointer user_data)
{
const gchar *uid = key;
GHashTable *copy_hash = user_data;
@@ -3362,7 +3362,7 @@ camel_folder_summary_remove_uid (CamelFolderSummary *summary,
**/
gboolean
camel_folder_summary_remove_uids (CamelFolderSummary *summary,
- GList *uids)
+ GList *uids)
{
CamelStore *parent_store;
const gchar *full_name;
@@ -3375,7 +3375,7 @@ camel_folder_summary_remove_uids (CamelFolderSummary *summary,
g_object_freeze_notify (G_OBJECT (summary));
camel_folder_summary_lock (summary, CAMEL_FOLDER_SUMMARY_SUMMARY_LOCK);
- for (l = g_list_first(uids); l; l = g_list_next(l)) {
+ for (l = g_list_first (uids); l; l = g_list_next (l)) {
gpointer ptr_uid = NULL, ptr_flags = NULL;
if (g_hash_table_lookup_extended (summary->priv->uids, l->data, &ptr_uid, &ptr_flags)) {
const gchar *uid_copy = camel_pstring_strdup (l->data);
@@ -3400,7 +3400,6 @@ camel_folder_summary_remove_uids (CamelFolderSummary *summary,
return res;
}
-
static struct _node *
my_list_append (struct _node **list,
struct _node *n)
diff --git a/camel/camel-folder-summary.h b/camel/camel-folder-summary.h
index 50f335e..ba2ab77 100644
--- a/camel/camel-folder-summary.h
+++ b/camel/camel-folder-summary.h
@@ -411,7 +411,7 @@ gboolean camel_folder_summary_remove (CamelFolderSummary *summary,
gboolean camel_folder_summary_remove_uid (CamelFolderSummary *summary,
const gchar *uid);
-gboolean camel_folder_summary_remove_uids(CamelFolderSummary *summary,
+gboolean camel_folder_summary_remove_uids (CamelFolderSummary *summary,
GList *uids);
/* remove all items */
diff --git a/camel/camel-imapx-conn-manager.c b/camel/camel-imapx-conn-manager.c
index ccc93ac..f406300 100644
--- a/camel/camel-imapx-conn-manager.c
+++ b/camel/camel-imapx-conn-manager.c
@@ -71,7 +71,8 @@ static void
imapx_conn_shutdown (CamelIMAPXServer *is, CamelIMAPXConnManager *con_man);
static void
-imapx_conn_update_select (CamelIMAPXServer *is, const gchar *selected_folder,
+imapx_conn_update_select (CamelIMAPXServer *is,
+ const gchar *selected_folder,
CamelIMAPXConnManager *con_man);
static ConnectionInfo *
@@ -128,7 +129,7 @@ connection_info_cancel_and_unref (ConnectionInfo *cinfo)
{
g_return_if_fail (cinfo != NULL);
g_return_if_fail (cinfo->ref_count > 0);
-
+
g_signal_handlers_disconnect_matched (cinfo->is, G_SIGNAL_MATCH_FUNC, 0, 0, NULL, imapx_conn_shutdown, NULL);
g_signal_handlers_disconnect_matched (cinfo->is, G_SIGNAL_MATCH_FUNC, 0, 0, NULL, imapx_conn_update_select, NULL);
g_cancellable_cancel (cinfo->is->cancellable);
diff --git a/camel/camel-imapx-server.c b/camel/camel-imapx-server.c
index a52f521..65a15b6 100644
--- a/camel/camel-imapx-server.c
+++ b/camel/camel-imapx-server.c
@@ -1167,7 +1167,7 @@ imapx_untagged (CamelIMAPXServer *is,
return FALSE;
if (unsolicited) {
- CamelIMAPXFolder *ifolder = (CamelIMAPXFolder *)is->select_folder;
+ CamelIMAPXFolder *ifolder = (CamelIMAPXFolder *) is->select_folder;
if (ifolder->exists_on_server < uids->len) {
c(is->tagprefix, "Error: exists_on_folder %d is fewer than vanished %d\n",
@@ -1184,11 +1184,11 @@ imapx_untagged (CamelIMAPXServer *is,
c(is->tagprefix, "vanished: %s\n", uid);
- uid_list = g_list_append(uid_list, uid);
+ uid_list = g_list_append (uid_list, uid);
camel_folder_change_info_remove_uid (is->changes, uid);
}
- camel_folder_summary_remove_uids(is->select_folder->summary, uid_list);
- is->expunged = g_list_concat(is->expunged, uid_list);
+ camel_folder_summary_remove_uids (is->select_folder->summary, uid_list);
+ is->expunged = g_list_concat (is->expunged, uid_list);
g_ptr_array_free (uids, FALSE);
break;
}
@@ -2462,8 +2462,8 @@ imapx_command_select_done (CamelIMAPXServer *is,
ifolder->modseq_on_server = is->highestmodseq;
if (ifolder->uidnext_on_server < is->uidnext) {
/* We don't want to fetch new messages if the command we selected this
- folder for is *already* fetching all messages (i.e. scan_changes).
- Bug #667725. */
+ * folder for is *already* fetching all messages (i.e. scan_changes).
+ * Bug #667725. */
CamelIMAPXJob *job = imapx_is_job_in_queue (is, is->select_pending,
IMAPX_JOB_REFRESH_INFO, NULL);
if (job) {
diff --git a/camel/camel-string-utils.c b/camel/camel-string-utils.c
index 76971d9..417a9d6 100644
--- a/camel/camel-string-utils.c
+++ b/camel/camel-string-utils.c
@@ -297,8 +297,8 @@ camel_pstring_free (const gchar *s)
static void
count_pstring_memory_cb (gpointer key,
- gpointer value,
- gpointer user_data)
+ gpointer value,
+ gpointer user_data)
{
const gchar *str = key;
guint64 *pbytes = user_data;
diff --git a/camel/camel-tcp-stream-ssl.c b/camel/camel-tcp-stream-ssl.c
index 8c57ae7..4347fbe 100644
--- a/camel/camel-tcp-stream-ssl.c
+++ b/camel/camel-tcp-stream-ssl.c
@@ -333,7 +333,7 @@ camel_certdb_nss_cert_get (CamelCertDB *certdb,
g_clear_error (&error);
/* failed to load the certificate, thus remove it from
- the CertDB, thus it can be re-added and properly saved */
+ * the CertDB, thus it can be re-added and properly saved */
camel_certdb_remove_host (certdb, hostname);
camel_certdb_touch (certdb);
g_free (fingerprint);
diff --git a/camel/camel-vee-data-cache.c b/camel/camel-vee-data-cache.c
index b0a1284..8fe92f2 100644
--- a/camel/camel-vee-data-cache.c
+++ b/camel/camel-vee-data-cache.c
@@ -74,7 +74,7 @@ camel_vee_subfolder_data_init (CamelVeeSubfolderData *data)
static void
vee_subfolder_data_hash_folder (CamelFolder *folder,
- gchar buffer[8])
+ gchar buffer[8])
{
CamelStore *parent_store;
GChecksum *checksum;
@@ -200,7 +200,7 @@ camel_vee_message_info_data_init (CamelVeeMessageInfoData *data)
CamelVeeMessageInfoData *
camel_vee_message_info_data_new (CamelVeeSubfolderData *subfolder_data,
- const gchar *orig_message_uid)
+ const gchar *orig_message_uid)
{
CamelVeeMessageInfoData *data;
gchar *vee_message_uid;
@@ -277,7 +277,7 @@ vee_data_hash (gconstpointer ptr)
static gboolean
vee_data_equal (gconstpointer v1,
- gconstpointer v2)
+ gconstpointer v2)
{
const VeeData *vee_data1 = v1, *vee_data2 = v2;
@@ -354,7 +354,7 @@ camel_vee_data_cache_new (void)
void
camel_vee_data_cache_add_subfolder (CamelVeeDataCache *data_cache,
- CamelFolder *subfolder)
+ CamelFolder *subfolder)
{
CamelVeeSubfolderData *sf_data;
@@ -373,9 +373,9 @@ camel_vee_data_cache_add_subfolder (CamelVeeDataCache *data_cache,
g_hash_table_insert (data_cache->priv->subfolder_hash, subfolder, sf_data);
/* camel_vee_data_cache_get_message_info_data() caches uids on demand,
- while here are cached all known uids in once - it is better when
- the folder is used in Unmatched folder, where the uid/vuid will
- be used in the vfolder or Unmatched folder anyway */
+ * while here are cached all known uids in once - it is better when
+ * the folder is used in Unmatched folder, where the uid/vuid will
+ * be used in the vfolder or Unmatched folder anyway */
uids = camel_folder_get_uids (subfolder);
if (uids) {
for (ii = 0; ii < uids->len; ii++) {
@@ -415,8 +415,8 @@ camel_vee_data_cache_add_subfolder (CamelVeeDataCache *data_cache,
static gboolean
remove_vee_by_folder_cb (gpointer key,
- gpointer value,
- gpointer user_data)
+ gpointer value,
+ gpointer user_data)
{
CamelVeeMessageInfoData *mi_data = value;
CamelVeeSubfolderData *sf_data;
@@ -431,8 +431,8 @@ remove_vee_by_folder_cb (gpointer key,
static gboolean
remove_orig_by_folder_cb (gpointer key,
- gpointer value,
- gpointer user_data)
+ gpointer value,
+ gpointer user_data)
{
VeeData *vee_data = key;
CamelFolder *folder = user_data;
@@ -442,7 +442,7 @@ remove_orig_by_folder_cb (gpointer key,
void
camel_vee_data_cache_remove_subfolder (CamelVeeDataCache *data_cache,
- CamelFolder *subfolder)
+ CamelFolder *subfolder)
{
g_return_if_fail (CAMEL_IS_VEE_DATA_CACHE (data_cache));
g_return_if_fail (CAMEL_IS_FOLDER (subfolder));
@@ -460,7 +460,7 @@ camel_vee_data_cache_remove_subfolder (CamelVeeDataCache *data_cache,
CamelVeeSubfolderData *
camel_vee_data_cache_get_subfolder_data (CamelVeeDataCache *data_cache,
- CamelFolder *folder)
+ CamelFolder *folder)
{
CamelVeeSubfolderData *res;
@@ -484,8 +484,8 @@ camel_vee_data_cache_get_subfolder_data (CamelVeeDataCache *data_cache,
CamelVeeMessageInfoData *
camel_vee_data_cache_get_message_info_data (CamelVeeDataCache *data_cache,
- CamelFolder *folder,
- const gchar *orig_message_uid)
+ CamelFolder *folder,
+ const gchar *orig_message_uid)
{
CamelVeeMessageInfoData *res;
VeeData vdata;
@@ -538,7 +538,7 @@ camel_vee_data_cache_get_message_info_data (CamelVeeDataCache *data_cache,
CamelVeeMessageInfoData *
camel_vee_data_cache_get_message_info_data_by_vuid (CamelVeeDataCache *data_cache,
- const gchar *vee_message_uid)
+ const gchar *vee_message_uid)
{
CamelVeeMessageInfoData *res;
const gchar *vuid;
@@ -573,8 +573,8 @@ struct ForeachMiData
static void
cvdc_foreach_mi_data_cb (gpointer key,
- gpointer value,
- gpointer user_data)
+ gpointer value,
+ gpointer user_data)
{
VeeData *vdata = key;
CamelVeeMessageInfoData *mi_data = value;
@@ -590,11 +590,11 @@ cvdc_foreach_mi_data_cb (gpointer key,
void
camel_vee_data_cache_foreach_message_info_data (CamelVeeDataCache *data_cache,
- CamelFolder *fromfolder,
- void (* func) (CamelVeeMessageInfoData *mi_data,
- CamelFolder *subfolder,
- gpointer user_data),
- gpointer user_data)
+ CamelFolder *fromfolder,
+ void (* func) (CamelVeeMessageInfoData *mi_data,
+ CamelFolder *subfolder,
+ gpointer user_data),
+ gpointer user_data)
{
struct ForeachMiData fmd;
@@ -614,7 +614,7 @@ camel_vee_data_cache_foreach_message_info_data (CamelVeeDataCache *data_cache,
void
camel_vee_data_cache_remove_message_info_data (CamelVeeDataCache *data_cache,
- CamelVeeMessageInfoData *mi_data)
+ CamelVeeMessageInfoData *mi_data)
{
VeeData vdata;
CamelVeeSubfolderData *sf_data;
@@ -622,7 +622,7 @@ camel_vee_data_cache_remove_message_info_data (CamelVeeDataCache *data_cache,
g_return_if_fail (CAMEL_IS_VEE_DATA_CACHE (data_cache));
g_return_if_fail (CAMEL_IS_VEE_MESSAGE_INFO_DATA (mi_data));
-
+
g_mutex_lock (data_cache->priv->mi_mutex);
sf_data = camel_vee_message_info_data_get_subfolder_data (mi_data);
diff --git a/camel/camel-vee-folder.c b/camel/camel-vee-folder.c
index 82aa589..68079a4 100644
--- a/camel/camel-vee-folder.c
+++ b/camel/camel-vee-folder.c
@@ -54,8 +54,8 @@ struct _CamelVeeFolderPrivate {
GList *subfolders; /* lock using subfolder_lock before changing/accessing */
GHashTable *ignore_changed; /* hash of subfolder pointers to ignore the next folder's 'changed' signal */
GHashTable *skipped_changes; /* CamelFolder -> CamelFolderChangeInfo accumulating ignored changes */
- GHashTable *unmatched_add_changed; /* CamelVeeMessageInfoData -> 1, for unmatched folder, postponed additions from camel_vee_folder_add_vuid() */
- GHashTable *unmatched_remove_changed; /* CamelVeeMessageInfoData -> 1, for unmatched folder, postponed removal from camel_vee_folder_remove_vuid() */
+ GHashTable *unmatched_add_changed; /* CamelVeeMessageInfoData -> 1, for unmatched folder, postponed additions from camel_vee_folder_add_vuid () */
+ GHashTable *unmatched_remove_changed; /* CamelVeeMessageInfoData -> 1, for unmatched folder, postponed removal from camel_vee_folder_remove_vuid () */
gboolean auto_update;
/* Processing queue for folder changes. */
@@ -91,7 +91,7 @@ struct _FolderChangedData {
static FolderChangedData *
vee_folder_changed_data_new (CamelFolder *subfolder,
- CamelFolderChangeInfo *changes)
+ CamelFolderChangeInfo *changes)
{
FolderChangedData *data;
@@ -134,10 +134,10 @@ vee_folder_is_unmatched (CamelVeeFolder *vfolder)
static void
vee_folder_note_added_uid (CamelVeeFolder *vfolder,
- CamelVeeSummary *vsummary,
- CamelVeeMessageInfoData *added_mi_data,
- CamelFolderChangeInfo *changes,
- gboolean included_as_changed)
+ CamelVeeSummary *vsummary,
+ CamelVeeMessageInfoData *added_mi_data,
+ CamelFolderChangeInfo *changes,
+ gboolean included_as_changed)
{
const gchar *vuid;
@@ -164,10 +164,10 @@ vee_folder_note_added_uid (CamelVeeFolder *vfolder,
static void
vee_folder_note_unmatch_uid (CamelVeeFolder *vfolder,
- CamelVeeSummary *vsummary,
- CamelFolder *subfolder,
- CamelVeeMessageInfoData *unmatched_mi_data,
- CamelFolderChangeInfo *changes)
+ CamelVeeSummary *vsummary,
+ CamelFolder *subfolder,
+ CamelVeeMessageInfoData *unmatched_mi_data,
+ CamelFolderChangeInfo *changes)
{
const gchar *vuid;
@@ -189,12 +189,13 @@ vee_folder_note_unmatch_uid (CamelVeeFolder *vfolder,
static void
vee_folder_remove_unmatched (CamelVeeFolder *vfolder,
- CamelVeeSummary *vsummary,
- CamelVeeDataCache *data_cache,
- CamelFolderChangeInfo *changes,
- CamelFolder *subfolder,
- const gchar *orig_message_uid,
- gboolean is_orig_message_uid) /* if not, then it's 'vee_message_uid' */
+ CamelVeeSummary *vsummary,
+ CamelVeeDataCache *data_cache,
+ CamelFolderChangeInfo *changes,
+ CamelFolder *subfolder,
+ const gchar *orig_message_uid,
+ gboolean is_orig_message_uid) /* if not,
+ then it's 'vee_message_uid' */
{
CamelVeeMessageInfoData *mi_data;
@@ -223,8 +224,8 @@ struct RemoveUnmatchedData
static void
vee_folder_remove_unmatched_cb (gpointer key,
- gpointer value,
- gpointer user_data)
+ gpointer value,
+ gpointer user_data)
{
struct RemoveUnmatchedData *rud = user_data;
const gchar *uid = key;
@@ -236,11 +237,11 @@ vee_folder_remove_unmatched_cb (gpointer key,
static void
vee_folder_merge_matching (CamelVeeFolder *vfolder,
- CamelFolder *subfolder,
- GHashTable *all_uids,
- GPtrArray *match,
- CamelFolderChangeInfo *changes,
- gboolean included_as_changed)
+ CamelFolder *subfolder,
+ GHashTable *all_uids,
+ GPtrArray *match,
+ CamelFolderChangeInfo *changes,
+ gboolean included_as_changed)
{
CamelVeeDataCache *data_cache;
CamelVeeMessageInfoData *mi_data;
@@ -288,9 +289,9 @@ vee_folder_merge_matching (CamelVeeFolder *vfolder,
static void
vee_folder_rebuild_folder_with_changes (CamelVeeFolder *vfolder,
- CamelFolder *subfolder,
- CamelFolderChangeInfo *changes,
- GCancellable *cancellable)
+ CamelFolder *subfolder,
+ CamelFolderChangeInfo *changes,
+ GCancellable *cancellable)
{
GPtrArray *match = NULL;
@@ -323,7 +324,7 @@ vee_folder_rebuild_folder_with_changes (CamelVeeFolder *vfolder,
static void
vee_folder_rebuild_all (CamelVeeFolder *vfolder,
- GCancellable *cancellable)
+ GCancellable *cancellable)
{
CamelFolderChangeInfo *changes;
GList *iter;
@@ -355,10 +356,10 @@ vee_folder_rebuild_all (CamelVeeFolder *vfolder,
static void
vee_folder_subfolder_changed (CamelVeeFolder *vfolder,
- CamelFolder *subfolder,
- CamelFolderChangeInfo *subfolder_changes,
- GCancellable *cancellable,
- GError **error)
+ CamelFolder *subfolder,
+ CamelFolderChangeInfo *subfolder_changes,
+ GCancellable *cancellable,
+ GError **error)
{
CamelVeeDataCache *data_cache;
CamelFolderChangeInfo *changes;
@@ -371,7 +372,7 @@ vee_folder_subfolder_changed (CamelVeeFolder *vfolder,
g_return_if_fail (subfolder_changes != NULL);
camel_vee_folder_lock (vfolder, CAMEL_VEE_FOLDER_SUBFOLDER_LOCK);
- if (!g_list_find (vfolder->priv->subfolders, subfolder)){
+ if (!g_list_find (vfolder->priv->subfolders, subfolder)) {
camel_vee_folder_unlock (vfolder, CAMEL_VEE_FOLDER_SUBFOLDER_LOCK);
return;
}
@@ -413,7 +414,7 @@ vee_folder_subfolder_changed (CamelVeeFolder *vfolder,
const gchar *vuid;
/* all common from test_uids and stored uids
- in the unmatched folder should be updated */
+ * in the unmatched folder should be updated */
for (ii = 0; ii < test_uids->len; ii++) {
mi_data = camel_vee_data_cache_get_message_info_data (data_cache, subfolder, test_uids->pdata[ii]);
if (!mi_data)
@@ -427,7 +428,7 @@ vee_folder_subfolder_changed (CamelVeeFolder *vfolder,
}
} else {
/* sadly, if there are threads involved, then searching by uids doesn't work,
- because just changed uids can be brought in by the thread condition */
+ * because just changed uids can be brought in by the thread condition */
if (strstr (vfolder->priv->expression, "match-threads") != NULL)
match = camel_folder_search_by_expression (subfolder, vfolder->priv->expression, cancellable, NULL);
else
@@ -498,7 +499,7 @@ vee_folder_process_changes (CamelSession *session,
static void
subfolder_changed (CamelFolder *subfolder,
- CamelFolderChangeInfo *changes,
+ CamelFolderChangeInfo *changes,
CamelVeeFolder *vfolder)
{
g_return_if_fail (vfolder != NULL);
@@ -601,9 +602,9 @@ vee_folder_finalize (GObject *object)
static void
vee_folder_get_property (GObject *object,
- guint property_id,
- GValue *value,
- GParamSpec *pspec)
+ guint property_id,
+ GValue *value,
+ GParamSpec *pspec)
{
switch (property_id) {
case PROP_AUTO_UPDATE:
@@ -618,9 +619,9 @@ vee_folder_get_property (GObject *object,
static void
vee_folder_set_property (GObject *object,
- guint property_id,
- const GValue *value,
- GParamSpec *pspec)
+ guint property_id,
+ const GValue *value,
+ GParamSpec *pspec)
{
switch (property_id) {
case PROP_AUTO_UPDATE:
@@ -761,7 +762,7 @@ vee_folder_count_by_expression (CamelFolder *folder,
static void
vee_folder_search_free (CamelFolder *folder,
- GPtrArray *result)
+ GPtrArray *result)
{
camel_folder_search_free_result (NULL, result);
}
@@ -906,7 +907,7 @@ vee_folder_synchronize_sync (CamelFolder *folder,
vee_folder_propagate_skipped_changes (vfolder);
/* basically no-op here, especially do not call synchronize on subfolders
- if not expunging, they are responsible for themselfs */
+ * if not expunging, they are responsible for themselfs */
if (!expunge ||
vee_folder_is_unmatched (vfolder))
return TRUE;
@@ -978,7 +979,7 @@ vee_folder_set_expression (CamelVeeFolder *vee_folder,
static void
vee_folder_rebuild_folder (CamelVeeFolder *vfolder,
CamelFolder *subfolder,
- GCancellable *cancellable)
+ GCancellable *cancellable)
{
CamelFolderChangeInfo *changes;
CamelFolder *v_folder;
@@ -998,7 +999,7 @@ vee_folder_rebuild_folder (CamelVeeFolder *vfolder,
static void
vee_folder_add_folder (CamelVeeFolder *vfolder,
CamelFolder *subfolder,
- GCancellable *cancellable)
+ GCancellable *cancellable)
{
if (vfolder->priv->parent_vee_store)
camel_vee_store_note_subfolder_used (vfolder->priv->parent_vee_store, subfolder, vfolder);
@@ -1007,8 +1008,8 @@ vee_folder_add_folder (CamelVeeFolder *vfolder,
static gboolean
vee_folder_remove_from_unmatched_changed_cb (gpointer key,
- gpointer value,
- gpointer user_data)
+ gpointer value,
+ gpointer user_data)
{
CamelVeeMessageInfoData *mi_data = key;
CamelFolder *subfolder = user_data;
@@ -1024,7 +1025,7 @@ vee_folder_remove_from_unmatched_changed_cb (gpointer key,
static void
vee_folder_remove_folder (CamelVeeFolder *vfolder,
CamelFolder *subfolder,
- GCancellable *cancellable)
+ GCancellable *cancellable)
{
CamelFolderChangeInfo *changes;
CamelFolder *v_folder;
@@ -1277,7 +1278,7 @@ camel_vee_folder_set_expression (CamelVeeFolder *vfolder,
}
const gchar *
-camel_vee_folder_get_expression (CamelVeeFolder *vfolder)
+camel_vee_folder_get_expression (CamelVeeFolder *vfolder)
{
g_return_val_if_fail (CAMEL_IS_VEE_FOLDER (vfolder), NULL);
@@ -1294,7 +1295,7 @@ camel_vee_folder_get_expression (CamelVeeFolder *vfolder)
void
camel_vee_folder_add_folder (CamelVeeFolder *vfolder,
CamelFolder *subfolder,
- GCancellable *cancellable)
+ GCancellable *cancellable)
{
g_return_if_fail (CAMEL_IS_VEE_FOLDER (vfolder));
@@ -1336,7 +1337,7 @@ camel_vee_folder_add_folder (CamelVeeFolder *vfolder,
void
camel_vee_folder_remove_folder (CamelVeeFolder *vfolder,
CamelFolder *subfolder,
- GCancellable *cancellable)
+ GCancellable *cancellable)
{
g_return_if_fail (CAMEL_IS_VEE_FOLDER (vfolder));
@@ -1370,7 +1371,7 @@ camel_vee_folder_remove_folder (CamelVeeFolder *vfolder,
void
camel_vee_folder_rebuild_folder (CamelVeeFolder *vfolder,
CamelFolder *subfolder,
- GCancellable *cancellable)
+ GCancellable *cancellable)
{
vee_folder_propagate_skipped_changes (vfolder);
@@ -1396,7 +1397,7 @@ remove_folders (CamelFolder *folder,
void
camel_vee_folder_set_folders (CamelVeeFolder *vf,
GList *folders,
- GCancellable *cancellable)
+ GCancellable *cancellable)
{
CamelVeeFolderPrivate *p = CAMEL_VEE_FOLDER_GET_PRIVATE (vf);
GHashTable *remove = g_hash_table_new (NULL, NULL);
@@ -1442,8 +1443,8 @@ camel_vee_folder_set_folders (CamelVeeFolder *vf,
void
camel_vee_folder_add_vuid (CamelVeeFolder *vfolder,
- CamelVeeMessageInfoData *mi_data,
- CamelFolderChangeInfo *changes)
+ CamelVeeMessageInfoData *mi_data,
+ CamelFolderChangeInfo *changes)
{
CamelVeeSummary *vsummary;
CamelVeeSubfolderData *sf_data;
@@ -1466,7 +1467,7 @@ camel_vee_folder_add_vuid (CamelVeeFolder *vfolder,
if (g_list_find (vfolder->priv->subfolders, subfolder)) {
/* postpone addition to the Unmatched folder, if the change was done
- in the Unmatched folder itself or auto-update is disabled */
+ * in the Unmatched folder itself or auto-update is disabled */
g_hash_table_insert (vfolder->priv->unmatched_add_changed,
g_object_ref (mi_data), GINT_TO_POINTER (1));
}
@@ -1485,8 +1486,8 @@ camel_vee_folder_add_vuid (CamelVeeFolder *vfolder,
void
camel_vee_folder_remove_vuid (CamelVeeFolder *vfolder,
- CamelVeeMessageInfoData *mi_data,
- CamelFolderChangeInfo *changes)
+ CamelVeeMessageInfoData *mi_data,
+ CamelFolderChangeInfo *changes)
{
CamelVeeSummary *vsummary;
CamelVeeSubfolderData *sf_data;
@@ -1509,7 +1510,7 @@ camel_vee_folder_remove_vuid (CamelVeeFolder *vfolder,
if (g_list_find (vfolder->priv->subfolders, subfolder)) {
/* postpone removal from the Unmatched folder, if the change was done
- in the Unmatched folder itself or auto-update is disabled */
+ * in the Unmatched folder itself or auto-update is disabled */
g_hash_table_insert (vfolder->priv->unmatched_remove_changed,
g_object_ref (mi_data), GINT_TO_POINTER (1));
}
@@ -1569,7 +1570,7 @@ camel_vee_folder_get_location (CamelVeeFolder *vf,
CamelFolder *
camel_vee_folder_get_vee_uid_folder (CamelVeeFolder *vf,
- const gchar *vee_message_uid)
+ const gchar *vee_message_uid)
{
CamelFolder *res;
CamelVeeDataCache *data_cache;
@@ -1596,7 +1597,7 @@ camel_vee_folder_get_vee_uid_folder (CamelVeeFolder *vf,
void
camel_vee_folder_set_auto_update (CamelVeeFolder *vfolder,
- gboolean auto_update)
+ gboolean auto_update)
{
g_return_if_fail (CAMEL_IS_VEE_FOLDER (vfolder));
diff --git a/camel/camel-vee-store.c b/camel/camel-vee-store.c
index bd8f481..9b674cb 100644
--- a/camel/camel-vee-store.c
+++ b/camel/camel-vee-store.c
@@ -154,9 +154,9 @@ vee_store_constructed (GObject *object)
static void
vee_store_get_property (GObject *object,
- guint property_id,
- GValue *value,
- GParamSpec *pspec)
+ guint property_id,
+ GValue *value,
+ GParamSpec *pspec)
{
switch (property_id) {
case PROP_UNMATCHED_ENABLED:
@@ -171,9 +171,9 @@ vee_store_get_property (GObject *object,
static void
vee_store_set_property (GObject *object,
- guint property_id,
- const GValue *value,
- GParamSpec *pspec)
+ guint property_id,
+ const GValue *value,
+ GParamSpec *pspec)
{
switch (property_id) {
case PROP_UNMATCHED_ENABLED:
@@ -589,7 +589,7 @@ camel_vee_store_get_unmatched_enabled (CamelVeeStore *vstore)
void
camel_vee_store_set_unmatched_enabled (CamelVeeStore *vstore,
- gboolean is_enabled)
+ gboolean is_enabled)
{
CamelFolderInfo *fi_unmatched;
@@ -621,10 +621,10 @@ struct AddToUnmatchedData
GHashTable *vuid_usage_counts;
};
-static void
+static void
add_to_unmatched_folder_cb (CamelVeeMessageInfoData *mi_data,
- CamelFolder *subfolder,
- gpointer user_data)
+ CamelFolder *subfolder,
+ gpointer user_data)
{
struct AddToUnmatchedData *atud = user_data;
const gchar *vuid;
@@ -641,8 +641,8 @@ add_to_unmatched_folder_cb (CamelVeeMessageInfoData *mi_data,
void
camel_vee_store_note_subfolder_used (CamelVeeStore *vstore,
- CamelFolder *subfolder,
- CamelVeeFolder *used_by)
+ CamelFolder *subfolder,
+ CamelVeeFolder *used_by)
{
gint counts;
@@ -698,8 +698,8 @@ camel_vee_store_note_subfolder_used (CamelVeeStore *vstore,
static void
remove_vuid_count_record_cb (CamelVeeMessageInfoData *mi_data,
- CamelFolder *subfolder,
- gpointer user_data)
+ CamelFolder *subfolder,
+ gpointer user_data)
{
GHashTable *vuid_usage_counts = user_data;
@@ -711,8 +711,8 @@ remove_vuid_count_record_cb (CamelVeeMessageInfoData *mi_data,
void
camel_vee_store_note_subfolder_unused (CamelVeeStore *vstore,
- CamelFolder *subfolder,
- CamelVeeFolder *unused_by)
+ CamelFolder *subfolder,
+ CamelVeeFolder *unused_by)
{
gint counts;
@@ -751,8 +751,8 @@ camel_vee_store_note_subfolder_unused (CamelVeeStore *vstore,
void
camel_vee_store_note_vuid_used (CamelVeeStore *vstore,
- CamelVeeMessageInfoData *mi_data,
- CamelVeeFolder *used_by)
+ CamelVeeMessageInfoData *mi_data,
+ CamelVeeFolder *used_by)
{
gint counts;
const gchar *vuid;
@@ -799,8 +799,8 @@ camel_vee_store_note_vuid_used (CamelVeeStore *vstore,
void
camel_vee_store_note_vuid_unused (CamelVeeStore *vstore,
- CamelVeeMessageInfoData *mi_data,
- CamelVeeFolder *unused_by)
+ CamelVeeMessageInfoData *mi_data,
+ CamelVeeFolder *unused_by)
{
gint counts;
const gchar *vuid;
@@ -861,8 +861,8 @@ struct RebuildUnmatchedData
static void
rebuild_unmatched_folder_cb (gpointer key,
- gpointer value,
- gpointer user_data)
+ gpointer value,
+ gpointer user_data)
{
const gchar *vuid = key;
gint counts = GPOINTER_TO_INT (value);
@@ -890,9 +890,9 @@ rebuild_unmatched_folder_cb (gpointer key,
static void
vee_store_rebuild_unmatched_folder (CamelSession *session,
- GCancellable *cancellable,
- CamelVeeStore *vstore,
- GError **error)
+ GCancellable *cancellable,
+ CamelVeeStore *vstore,
+ GError **error)
{
struct RebuildUnmatchedData rud;
CamelVeeFolder *vunmatched;
@@ -934,13 +934,13 @@ vee_store_rebuild_unmatched_folder (CamelSession *session,
void
camel_vee_store_rebuild_unmatched_folder (CamelVeeStore *vstore,
- GCancellable *cancellable,
- GError **error)
+ GCancellable *cancellable,
+ GError **error)
{
g_return_if_fail (CAMEL_IS_VEE_STORE (vstore));
/* this operation requires cancellable, thus if called
- without it then run in a dedicated thread */
+ * without it then run in a dedicated thread */
if (!cancellable) {
CamelSession *session;
diff --git a/camel/camel-vee-summary.c b/camel/camel-vee-summary.c
index b9a7a11..e4d026f 100644
--- a/camel/camel-vee-summary.c
+++ b/camel/camel-vee-summary.c
@@ -152,7 +152,7 @@ vee_info_user_tag (const CamelMessageInfo *mi,
static void
vee_summary_notify_mi_changed (CamelVeeFolder *vfolder,
- CamelMessageInfo *mi)
+ CamelMessageInfo *mi)
{
CamelFolderChangeInfo *changes;
@@ -262,9 +262,9 @@ vee_info_set_flags (CamelMessageInfo *mi,
}
/* Do not call parent class' info_set_flags, to not do flood
- of change notifications, rather wait for a notification
- from original folder, and propagate the change in counts
- through camel_vee_summary_replace_flags().
+ * of change notifications, rather wait for a notification
+ * from original folder, and propagate the change in counts
+ * through camel_vee_summary_replace_flags().
*/
/*if (res)
CAMEL_FOLDER_SUMMARY_CLASS (camel_vee_summary_parent_class)->info_set_flags (mi, flags, set);*/
@@ -392,15 +392,15 @@ camel_vee_summary_new (CamelFolder *parent)
static void
get_uids_for_subfolder (gpointer key,
- gpointer value,
- gpointer user_data)
+ gpointer value,
+ gpointer user_data)
{
g_hash_table_insert (user_data, (gpointer) camel_pstring_strdup (key), GINT_TO_POINTER (1));
}
GHashTable *
camel_vee_summary_get_uids_for_subfolder (CamelVeeSummary *summary,
- CamelFolder *subfolder)
+ CamelFolder *subfolder)
{
GHashTable *vuids, *known_uids;
@@ -486,8 +486,8 @@ camel_vee_summary_add (CamelVeeSummary *s,
void
camel_vee_summary_remove (CamelVeeSummary *summary,
- const gchar *vuid,
- CamelFolder *subfolder)
+ const gchar *vuid,
+ CamelFolder *subfolder)
{
GHashTable *vuids;
@@ -519,7 +519,7 @@ camel_vee_summary_remove (CamelVeeSummary *summary,
**/
void
camel_vee_summary_replace_flags (CamelVeeSummary *summary,
- const gchar *uid)
+ const gchar *uid)
{
CamelMessageInfo *mi;
CamelVeeMessageInfo *vmi;
diff --git a/camel/providers/imap/camel-imap-folder.c b/camel/providers/imap/camel-imap-folder.c
index ee9a69f..1319ace 100644
--- a/camel/providers/imap/camel-imap-folder.c
+++ b/camel/providers/imap/camel-imap-folder.c
@@ -2094,7 +2094,7 @@ camel_imap_expunge_uids_resyncing (CamelFolder *folder,
return FALSE;
response = camel_imap_command (store, folder, cancellable, error, "UID SEARCH DELETED");
- if (!response)
+ if (!response)
return FALSE;
result = camel_imap_response_extract (store, response, "SEARCH", error);
@@ -2666,7 +2666,6 @@ handle_copyuid (CamelImapResponse *response,
g_warning ("Bad COPYUID response from server");
}
-
/* Call with lock held on destination folder cache */
static void
handle_copyuid_copy_user_tags (CamelImapResponse *response,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
