GNOME.org
 

[evolution-data-server] Coding style and whitespace cleanup.

commit 46e0648d5fa7282c5059a3142089bbf795e5421c
Author: Matthew Barnes <mbarnes redhat com>
Date:   Sat Dec 19 16:59:08 2009 -0500

    Coding style and whitespace cleanup.

 addressbook/libebook/e-book.c                      |    2 +-
 camel/providers/imapx/camel-imapx-folder.c         |   10 ++--
 camel/providers/imapx/camel-imapx-server.c         |   52 +++++++++----------
 camel/providers/imapx/camel-imapx-server.h         |    2 +-
 camel/providers/imapx/camel-imapx-store.c          |    2 +-
 camel/providers/imapx/camel-imapx-tokenise.h       |   14 +++---
 camel/providers/imapx/camel-imapx-utils.c          |   14 ++---
 .../libedata-cal/tmpl/e-data-cal-common.sgml       |    1 +
 8 files changed, 47 insertions(+), 50 deletions(-)
---
diff --git a/addressbook/libebook/e-book.c b/addressbook/libebook/e-book.c
index fdfb75f..e1042ab 100644
--- a/addressbook/libebook/e-book.c
+++ b/addressbook/libebook/e-book.c
@@ -1906,7 +1906,7 @@ static EContact *
 make_me_card (void)
 {
 	GString *vcard;
-	const char *s;
+	const gchar *s;
 	EContact *contact;
 
 	vcard = g_string_new ("BEGIN:VCARD\nVERSION:3.0\n");
diff --git a/camel/providers/imapx/camel-imapx-folder.c b/camel/providers/imapx/camel-imapx-folder.c
index 430f0ad..3f89a30 100644
--- a/camel/providers/imapx/camel-imapx-folder.c
+++ b/camel/providers/imapx/camel-imapx-folder.c
@@ -132,12 +132,12 @@ imapx_sync (CamelFolder *folder, gboolean expunge, CamelException *ex)
 	/* Sync twice - make sure deleted flags are written out,
 	   then sync again incase expunge changed anything */
 	camel_exception_clear(ex);
-	
+
 	changed_uids = camel_folder_summary_get_changed (folder->summary);
 
 	if (is->server) {
 		camel_imapx_server_sync_changes (is->server, folder, changed_uids, ex);
-		
+
 		if (camel_exception_is_set (ex))
 			goto exception;
 	}
@@ -252,9 +252,9 @@ imapx_search_free (CamelFolder *folder, GPtrArray *uids)
 	g_return_if_fail (ifolder->search);
 
 	g_mutex_lock (ifolder->search_lock);
-	
+
 	camel_folder_search_free_result (ifolder->search, uids);
-	
+
 	g_mutex_unlock (ifolder->search_lock);
 }
 
@@ -271,7 +271,7 @@ imapx_search_by_uids (CamelFolder *folder, const gchar *expression, GPtrArray *u
 
 	camel_folder_search_set_folder(ifolder->search, folder);
 	matches = camel_folder_search_search(ifolder->search, expression, uids, ex);
-	
+
 	g_mutex_unlock (ifolder->search_lock);
 
 	return matches;
diff --git a/camel/providers/imapx/camel-imapx-server.c b/camel/providers/imapx/camel-imapx-server.c
index f8eb645..b5aa371 100644
--- a/camel/providers/imapx/camel-imapx-server.c
+++ b/camel/providers/imapx/camel-imapx-server.c
@@ -991,7 +991,7 @@ imapx_untagged(CamelIMAPXServer *imap, CamelException *ex)
 
 	if (tok == '\n') {
 		camel_exception_set (ex, 1, "truncated server response");
-		return -1;	
+		return -1;
 	}
 
 	e(printf("Have token '%s' id %d\n", token, id));
@@ -1022,7 +1022,7 @@ imapx_untagged(CamelIMAPXServer *imap, CamelException *ex)
 
 			imapx_store->summary->namespaces = nsl;
 			camel_store_summary_touch ((CamelStoreSummary *) imapx_store->summary);
-		} 
+		}
 
 		return 0;
 	}
@@ -1121,13 +1121,13 @@ imapx_untagged(CamelIMAPXServer *imap, CamelException *ex)
 
 							binfo->flags = (binfo->flags & ~(xinfo->server_flags ^ r->server_flags)) | r->server_flags;
 							xinfo->server_flags = r->server_flags;
-							
+
 							if (camel_flag_get (&binfo->user_flags, "$has_cal"))
 								set_cal = TRUE;
-							
+
 							camel_flag_list_copy(&binfo->user_flags, &r->server_user_flags);
-						
-							/* reset the calendar flag if it was set in messageinfo before */	
+
+							/* reset the calendar flag if it was set in messageinfo before */
 							if (set_cal)
 								camel_flag_set (&binfo->user_flags, "$has_cal", TRUE);
 
@@ -1135,12 +1135,12 @@ imapx_untagged(CamelIMAPXServer *imap, CamelException *ex)
 							break;
 						}
 					}
-					
+
 					if (!camel_folder_summary_check_uid (job->folder->summary, mi->uid)) {
 						camel_folder_summary_add(job->folder->summary, mi);
 						update_summary (job->folder->summary, (CamelMessageInfoBase *) mi);
 						camel_folder_change_info_add_uid (job->u.refresh_info.changes, mi->uid);
-					} 
+					}
 				}
 			}
 		}
@@ -1612,20 +1612,20 @@ imapx_connect(CamelIMAPXServer *is, gint ssl_mode, gint try_starttls, CamelExcep
 		g_message ("Unable to connect %d %s \n", ex->id, ex->desc);
 		return;
 	}
-	
+
 	/* Fetch namespaces */
 	if (is->cinfo->capa & IMAP_CAPABILITY_NAMESPACE) {
 		ic = camel_imapx_command_new ("NAMESPACE", NULL, "NAMESPACE");
 		imapx_command_run (is, ic, ex);
 		camel_imapx_command_free (ic);
-	} 
-	
+	}
+
 	if (((CamelIMAPXStore *) is->store)->summary->namespaces == NULL) {
 		CamelIMAPXNamespaceList *nsl = NULL;
 		CamelIMAPXStoreNamespace *ns = NULL;
 		CamelIMAPXStore *imapx_store = (CamelIMAPXStore *) is->store;
 
-		/* set a default namespace */	
+		/* set a default namespace */
 		nsl = g_malloc0(sizeof(CamelIMAPXNamespaceList));
 		ns = g_new0 (CamelIMAPXStoreNamespace, 1);
 		ns->next = NULL;
@@ -1680,7 +1680,7 @@ retry:
 	imapx_command_run(is, ic, ex);
 	if (ic->status->result != IMAP_OK) {
 		camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_CANT_AUTHENTICATE, "Login failed: %s", ic->status->text);
-		return;	
+		return;
 	}
 
 	camel_imapx_command_free(ic);
@@ -1780,9 +1780,9 @@ imapx_job_get_message_start(CamelIMAPXServer *is, CamelIMAPXJob *job)
 	   select the folder to make sure it runs immmediately ...
 
 	   This doesn't work yet, so we always force a select every time
-	
+
 	//imapx_select(is, job->folder);
-	
+
 #ifdef MULTI_FETCH
 	for (i=0;i<3;i++) {
 		ic = camel_imapx_command_new("FETCH", job->folder->full_name,
@@ -1937,7 +1937,7 @@ update_store_summary (CamelFolder *folder, CamelException *ex)
 		if (si->unread != unread || si->total != total) {
 			si->unread = unread;
 			si->total = total;
-			
+
 			g_message ("Unread count is %d \n", unread);
 			camel_store_summary_touch ((CamelStoreSummary *)((CamelIMAPXStore *) folder->parent_store)->summary);
 			camel_store_summary_save ((CamelStoreSummary *)((CamelIMAPXStore *) folder->parent_store)->summary);
@@ -2021,7 +2021,6 @@ imapx_uid_cmp(gconstpointer ap, gconstpointer bp, gpointer data)
 	return strcmp(ae, be);
 }
 
-
 static void
 imapx_job_refresh_info_done(CamelIMAPXServer *is, CamelIMAPXCommand *ic)
 {
@@ -2070,12 +2069,12 @@ imapx_job_refresh_info_done(CamelIMAPXServer *is, CamelIMAPXCommand *ic)
 			if (s_minfo && uid_cmp(s_minfo->uid, r->uid, s) == 0) {
 				info = (CamelIMAPXMessageInfo *)s_minfo;
 				if (info->server_flags !=  r->server_flags
-				    && camel_message_info_set_flags((CamelMessageInfo *)info, info->server_flags ^ r->server_flags, r->server_flags)) 
+				    && camel_message_info_set_flags((CamelMessageInfo *)info, info->server_flags ^ r->server_flags, r->server_flags))
 					camel_folder_change_info_change_uid (job->u.refresh_info.changes, camel_message_info_uid (s_minfo));
-				
+
 				g_free(r->uid);
 				r->uid = NULL;
-			} else 
+			} else
 				fetch_new = TRUE;
 
 			j = imapx_index_next (s, j);
@@ -2108,7 +2107,6 @@ imapx_job_refresh_info_done(CamelIMAPXServer *is, CamelIMAPXCommand *ic)
 			camel_object_trigger_event(job->folder, "folder_changed", job->u.refresh_info.changes);
 		camel_folder_change_info_clear(job->u.refresh_info.changes);
 
-
 		/* If we have any new messages, download their headers, but only a few (100?) at a time */
 		if (fetch_new) {
 			imapx_uidset_init(&job->u.refresh_info.uidset, 500, 0);
@@ -2223,13 +2221,13 @@ imapx_job_sync_changes_done(CamelIMAPXServer *is, CamelIMAPXCommand *ic)
 			gint i;
 
 			for (i=0;i<job->u.sync_changes.changed_uids->len;i++) {
-				CamelIMAPXMessageInfo *info = (CamelIMAPXMessageInfo *) camel_folder_summary_peek_info (job->folder->summary, 
+				CamelIMAPXMessageInfo *info = (CamelIMAPXMessageInfo *) camel_folder_summary_peek_info (job->folder->summary,
 										job->u.sync_changes.changed_uids->pdata[i]);
 
 				info->server_flags = ((CamelMessageInfoBase *)info)->flags & CAMEL_IMAPX_SERVER_FLAGS;
 				info->info.flags &= ~CAMEL_MESSAGE_FOLDER_FLAGGED;
 				info->info.dirty = TRUE;
-			
+
 				camel_folder_summary_touch (job->folder->summary);
 
 				/* FIXME: move over user flags too */
@@ -2282,7 +2280,7 @@ imapx_job_sync_changes_start(CamelIMAPXServer *is, CamelIMAPXJob *job)
 			printf("checking/storing %s flags '%s'\n", on?"on":"off", flags_table[j].name);
 			imapx_uidset_init(&ss, 0, 100);
 			for (i = 0; i < uids->len; i++) {
-				CamelIMAPXMessageInfo *info = (CamelIMAPXMessageInfo *)camel_folder_summary_peek_info 
+				CamelIMAPXMessageInfo *info = (CamelIMAPXMessageInfo *)camel_folder_summary_peek_info
 										(job->folder->summary, uids->pdata[i]);
 
 				guint32 flags = ((CamelMessageInfoBase *)info)->flags & CAMEL_IMAPX_SERVER_FLAGS;
@@ -2311,11 +2309,11 @@ imapx_job_sync_changes_start(CamelIMAPXServer *is, CamelIMAPXJob *job)
 		if (user_set) {
 			CamelIMAPXCommand *ic = NULL;
 
-			for (j=0 ; j<user_set->len; j++) {
+			for (j=0; j<user_set->len; j++) {
 				struct _imapx_flag_change *c = &g_array_index(user_set, struct _imapx_flag_change, j);
 
 				imapx_uidset_init(&ss, 0, 100);
-				for (i=0 ; i < c->infos->len; i++) {
+				for (i=0; i < c->infos->len; i++) {
 					CamelIMAPXMessageInfo *info = c->infos->pdata[i];
 
 					if (ic == NULL) {
@@ -2933,7 +2931,7 @@ camel_imapx_server_sync_changes(CamelIMAPXServer *is, CamelFolder *folder, GPtrA
 				}
 
 				/* Could sort this and binary search */
-				for (j = 0; j < user_set->len ; j++) {
+				for (j = 0; j < user_set->len; j++) {
 					change = &g_array_index(user_set, struct _imapx_flag_change, j);
 					if (strcmp(change->name, user_flag->name) == 0)
 						goto found;
diff --git a/camel/providers/imapx/camel-imapx-server.h b/camel/providers/imapx/camel-imapx-server.h
index e2c34ee..f892f36 100644
--- a/camel/providers/imapx/camel-imapx-server.h
+++ b/camel/providers/imapx/camel-imapx-server.h
@@ -83,7 +83,7 @@ struct _CamelIMAPXServer {
 	/* any expunges that happened from the last command, they are
 	   processed after the command completes. */
 	GArray *expunged;
-	
+
 	GMutex *connect_lock;
 };
 
diff --git a/camel/providers/imapx/camel-imapx-store.c b/camel/providers/imapx/camel-imapx-store.c
index 9797eef..7162cc9 100644
--- a/camel/providers/imapx/camel-imapx-store.c
+++ b/camel/providers/imapx/camel-imapx-store.c
@@ -810,7 +810,7 @@ imapx_get_folder_info(CamelStore *store, const gchar *top, guint32 flags, CamelE
 {
 	CamelIMAPXStore *istore = (CamelIMAPXStore *)store;
 	CamelFolderInfo * fi= NULL;
-	
+
 	if (top == NULL)
 		top = "";
 
diff --git a/camel/providers/imapx/camel-imapx-tokenise.h b/camel/providers/imapx/camel-imapx-tokenise.h
index 21475d8..5572ea6 100644
--- a/camel/providers/imapx/camel-imapx-tokenise.h
+++ b/camel/providers/imapx/camel-imapx-tokenise.h
@@ -45,10 +45,10 @@ __inline
 inline
 #endif
 #endif
-static unsigned int
-imap_hash (register const char *str, register unsigned int len)
+static guint
+imap_hash (register const gchar *str, register guint len)
 {
-  static unsigned char asso_values[] =
+  static guchar asso_values[] =
     {
       50, 50, 50, 50, 50, 50, 50, 50, 50, 50,
       50, 50, 50, 50, 50, 50, 50, 50, 50, 50,
@@ -77,14 +77,14 @@ imap_hash (register const char *str, register unsigned int len)
       50, 50, 50, 50, 50, 50, 50, 50, 50, 50,
       50, 50, 50, 50, 50, 50
     };
-  return len + asso_values[(unsigned char)str[len - 1]] + asso_values[(unsigned char)str[0]];
+  return len + asso_values[(guchar)str[len - 1]] + asso_values[(guchar)str[0]];
 }
 
 #ifdef __GNUC__
 __inline
 #endif
 struct _imap_keyword *
-imap_tokenise_struct (register const char *str, register unsigned int len)
+imap_tokenise_struct (register const gchar *str, register guint len)
 {
   static struct _imap_keyword wordlist[] =
     {
@@ -165,11 +165,11 @@ imap_tokenise_struct (register const char *str, register unsigned int len)
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
     {
-      register int key = imap_hash (str, len);
+      register gint key = imap_hash (str, len);
 
       if (key <= MAX_HASH_VALUE && key >= 0)
         {
-          register const char *s = wordlist[key].name;
+          register const gchar *s = wordlist[key].name;
 
           if (*str == *s && !strcmp (str + 1, s + 1))
             return &wordlist[key];
diff --git a/camel/providers/imapx/camel-imapx-utils.c b/camel/providers/imapx/camel-imapx-utils.c
index 8dbf64b..4c424f7 100644
--- a/camel/providers/imapx/camel-imapx-utils.c
+++ b/camel/providers/imapx/camel-imapx-utils.c
@@ -82,10 +82,10 @@ imap_parse_flags(CamelIMAPXStream *stream, guint32 *flagsp, CamelFlag **user_fla
 						goto found;
 					}
 				if (user_flagsp) {
-					const char *flag_name = rename_label_flag ((gchar *) token, strlen ((gchar *) token), TRUE);
-					
+					const gchar *flag_name = rename_label_flag ((gchar *) token, strlen ((gchar *) token), TRUE);
+
 					camel_flag_set(user_flagsp, flag_name, TRUE);
-					
+
 				}
 			found:
 				tok = tok; /* fixes stupid warning */
@@ -102,7 +102,6 @@ imap_parse_flags(CamelIMAPXStream *stream, guint32 *flagsp, CamelFlag **user_fla
 	*flagsp = flags;
 }
 
-
 /*
  * rename_flag
  * Converts label flag name on server to name used in Evolution or back.
@@ -166,9 +165,8 @@ imap_write_flags(CamelStream *stream, guint32 flags, CamelFlag *user_flags, Came
 	}
 
 	while (user_flags) {
-		const char *flag_name = rename_label_flag (user_flags->name, strlen (user_flags->name), FALSE);
-		
-		
+		const gchar *flag_name = rename_label_flag (user_flags->name, strlen (user_flags->name), FALSE);
+
 		if (camel_stream_write(stream, flag_name, strlen (flag_name)) == -1) {
 			camel_exception_setv (ex, 1, "io error: %s", strerror(errno));
 			return;
@@ -176,7 +174,7 @@ imap_write_flags(CamelStream *stream, guint32 flags, CamelFlag *user_flags, Came
 
 		if (user_flags->next && camel_stream_write(stream, " ", 1) == -1) {
 			camel_exception_setv (ex, 1, "io error: %s", strerror(errno));
-			return;	
+			return;
 		}
 
 		user_flags = user_flags->next;
diff --git a/docs/reference/calendar/libedata-cal/tmpl/e-data-cal-common.sgml b/docs/reference/calendar/libedata-cal/tmpl/e-data-cal-common.sgml
index 5da7a51..5a9808a 100644
--- a/docs/reference/calendar/libedata-cal/tmpl/e-data-cal-common.sgml
+++ b/docs/reference/calendar/libedata-cal/tmpl/e-data-cal-common.sgml
@@ -79,6 +79,7 @@ e-data-cal-common
 @get_ldap_attribute: 
 @get_static_capabilities: 
 @open: 
+ refresh: 
 @remove: 
 @create_object: 
 @modify_object:
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]