GNOME.org
 

[evolution-data-server] Whitespace cleanups.

commit 72511b95708d96bb33f8241950b93c9bdfd69a53
Author: Matthew Barnes <mbarnes redhat com>
Date:   Sat Nov 14 12:24:17 2009 -0500

    Whitespace cleanups.

 camel/camel-db.c                                   |    2 +-
 camel/providers/imapx/camel-imapx-server.c         |   14 +++++++-------
 camel/providers/imapx/camel-imapx-store-summary.c  |   11 +++++------
 camel/providers/imapx/camel-imapx-store-summary.h  |    2 +-
 camel/providers/imapx/camel-imapx-tokenise.h       |   16 ++++++++--------
 camel/providers/imapx/camel-imapx-utils.c          |   13 ++++++-------
 .../calendar/libecal/tmpl/e-cal-view.sgml          |    5 +++++
 7 files changed, 33 insertions(+), 30 deletions(-)
---
diff --git a/camel/camel-db.c b/camel/camel-db.c
index 65cb06c..53dba96 100644
--- a/camel/camel-db.c
+++ b/camel/camel-db.c
@@ -434,7 +434,7 @@ camel_db_open (const gchar *path, CamelException *ex)
 		cache = g_strdup_printf ("PRAGMA cache_size=%s", g_getenv("CAMEL_SQLITE_DEFAULT_CACHE_SIZE"));
 		camel_db_command (cdb, cache, NULL);
 		g_free (cache);
-	}		
+	}
 
 	camel_db_command (cdb, "ATTACH DATABASE ':memory:' AS mem", NULL);
 
diff --git a/camel/providers/imapx/camel-imapx-server.c b/camel/providers/imapx/camel-imapx-server.c
index f1f10cf..de5d2d7 100644
--- a/camel/providers/imapx/camel-imapx-server.c
+++ b/camel/providers/imapx/camel-imapx-server.c
@@ -975,18 +975,18 @@ imapx_untagged(CamelIMAPXServer *imap, CamelException *ex)
 		break;
 	}
 	case IMAP_NAMESPACE: {
-		CamelIMAPXNamespaceList *nsl = NULL;				     
-		
+		CamelIMAPXNamespaceList *nsl = NULL;
+
 		nsl = imap_parse_namespace_list (imap->stream, ex);
 		if (nsl != NULL) {
 			CamelIMAPXStore *imapx_store = (CamelIMAPXStore *) imap->store;
 
 			imapx_store->summary->namespaces = nsl;
-			camel_store_summary_touch ((CamelStoreSummary *) imapx_store->summary); 
+			camel_store_summary_touch ((CamelStoreSummary *) imapx_store->summary);
 		}
 
 		return 0;
-	}			     
+	}
 	case IMAP_EXISTS:
 		printf("exists: %d\n", id);
 		imap->exists = id;
@@ -1550,7 +1550,7 @@ retry:
 		g_message ("Connecting \n");
 		imapx_connect(is, 0, 0, ex);
 		if (camel_exception_is_set (ex)) {
-			return;	
+			return;
 		}
 
 		g_message ("Connected \n");
@@ -1607,7 +1607,7 @@ retry:
 				camel_exception_clear (ex);
 				goto retry;
 			}
-		
+
 		/* Fetch namespaces */
 		if (is->cinfo->capa & IMAP_CAPABILITY_NAMESPACE) {
 			ic = camel_imapx_command_new ("NAMESPACE", NULL, "NAMESPACE");
@@ -2201,7 +2201,7 @@ imapx_server_loop(gpointer d)
 			imapx_reconnect(is, &ex);
 
 		if (camel_exception_is_set (&ex)) {
-			break;		
+			break;
 		}
 
 		job = (CamelIMAPXJob *)camel_msgport_try_pop (is->port);
diff --git a/camel/providers/imapx/camel-imapx-store-summary.c b/camel/providers/imapx/camel-imapx-store-summary.c
index 81d6998..9cc9147 100644
--- a/camel/providers/imapx/camel-imapx-store-summary.c
+++ b/camel/providers/imapx/camel-imapx-store-summary.c
@@ -391,7 +391,7 @@ CamelIMAPXStoreNamespace *camel_imapx_store_summary_namespace_new(CamelIMAPXStor
 void camel_imapx_store_summary_namespace_set(CamelIMAPXStoreSummary *s, CamelIMAPXStoreNamespace *ns)
 {
 	d(printf("Setting namesapce to '%s' '%c' -> '%s'\n", ns->full_name, ns->sep, ns->path));
-	
+
 	/* CHEN not needed  */
 	camel_store_summary_touch((CamelStoreSummary *)s);
 }
@@ -500,8 +500,8 @@ namespace_load(CamelStoreSummary *s, FILE *in)
 	return nsl;
 exception:
 	camel_imapx_namespace_list_clear (nsl);
-	
-	return NULL;	
+
+	return NULL;
 }
 
 static gint
@@ -533,7 +533,7 @@ namespace_save(CamelStoreSummary *s, FILE *out, CamelIMAPXNamespaceList *nsl)
 		while (ns != NULL) {
 			if (camel_file_util_encode_string (out, ns->path) == -1)
 				return -1;
-			
+
 			if (camel_file_util_encode_string (out, ns->full_name) == -1)
 				return -1;
 
@@ -571,7 +571,7 @@ summary_header_load(CamelStoreSummary *s, FILE *in)
 		return -1;
 
 	is->capabilities = capabilities;
-	
+
 	/* namespaces */
 	if ((is->namespaces = namespace_load(s, in)) == NULL)
 		return -1;
@@ -584,7 +584,6 @@ summary_header_save(CamelStoreSummary *s, FILE *out)
 {
 	CamelIMAPXStoreSummary *is = (CamelIMAPXStoreSummary *)s;
 
-
 	/* always write as latest version */
 	if (camel_imapx_store_summary_parent->summary_header_save((CamelStoreSummary *)s, out) == -1
 	    || camel_file_util_encode_fixed_int32(out, CAMEL_IMAPX_STORE_SUMMARY_VERSION) == -1
diff --git a/camel/providers/imapx/camel-imapx-store-summary.h b/camel/providers/imapx/camel-imapx-store-summary.h
index 5448c54..0eeca45 100644
--- a/camel/providers/imapx/camel-imapx-store-summary.h
+++ b/camel/providers/imapx/camel-imapx-store-summary.h
@@ -58,7 +58,7 @@ struct _CamelIMAPXStoreNamespace {
 typedef struct _CamelIMAPXNamespaceList {
 	CamelIMAPXStoreNamespace *personal;
 	CamelIMAPXStoreNamespace *other;
-	CamelIMAPXStoreNamespace *shared;	
+	CamelIMAPXStoreNamespace *shared;
 } CamelIMAPXNamespaceList;
 
 struct _CamelIMAPXStoreSummary {
diff --git a/camel/providers/imapx/camel-imapx-tokenise.h b/camel/providers/imapx/camel-imapx-tokenise.h
index 03a82a1..4975ef8 100644
--- a/camel/providers/imapx/camel-imapx-tokenise.h
+++ b/camel/providers/imapx/camel-imapx-tokenise.h
@@ -29,7 +29,7 @@
 #endif
 
 #line 3 "camel-imapx-tokens.txt"
-struct _imap_keyword { char *name; camel_imapx_id_t id; };
+struct _imap_keyword { gchar *name; camel_imapx_id_t id; };
 
 #define TOTAL_KEYWORDS 32
 #define MIN_WORD_LENGTH 2
@@ -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 bba5ddf..7273a15 100644
--- a/camel/providers/imapx/camel-imapx-utils.c
+++ b/camel/providers/imapx/camel-imapx-utils.c
@@ -197,7 +197,6 @@ imap_parse_capability(CamelIMAPXStream *stream, CamelException *ex)
 	return cinfo;
 }
 
-
 void imap_free_capability(struct _capability_info *cinfo)
 {
 	g_free(cinfo);
@@ -221,7 +220,7 @@ imap_parse_namespace_list (CamelIMAPXStream *stream, CamelException *ex)
 	do {
 		namespaces[n] = NULL;
 		tail = (CamelIMAPXStoreNamespace *) &namespaces[n];
-	
+
 		if (tok == '(') {
 			tok = camel_imapx_stream_token (stream, &token, &len, ex);
 
@@ -243,7 +242,7 @@ imap_parse_namespace_list (CamelIMAPXStream *stream, CamelException *ex)
 					if (strlen (token) == 1) {
 						node->sep = *token;
 					} else {
-						if (*token) 
+						if (*token)
 							node->sep = node->path [strlen (node->path) - 1];
 						else
 							node->sep = '\0';
@@ -264,7 +263,7 @@ imap_parse_namespace_list (CamelIMAPXStream *stream, CamelException *ex)
 				if (node->path [strlen (node->path) -1] == node->sep)
 					node->path [strlen (node->path) - 1] = '\0';
 
-				if (!g_ascii_strncasecmp (node->path, "INBOX", 5) && 
+				if (!g_ascii_strncasecmp (node->path, "INBOX", 5) &&
 						(node->path [6] == '\0' || node->path [6] == node->sep ))
 					memcpy (node->path, "INBOX", 5);
 				tok = camel_imapx_stream_token (stream, &token, &len, ex);
@@ -299,9 +298,9 @@ imap_parse_namespace_list (CamelIMAPXStream *stream, CamelException *ex)
 	return nsl;
 exception:
 	g_free (nsl);
-	for (i=0; i < 3; i++) 
+	for (i=0; i < 3; i++)
 		imapx_namespace_clear (&namespaces [i]);
-	
+
 	return NULL;
 }
 
@@ -1586,7 +1585,7 @@ camel_imapx_namespace_list_clear (struct _CamelIMAPXNamespaceList *nsl)
 	imapx_namespace_clear (&nsl->personal);
 	imapx_namespace_clear (&nsl->shared);
 	imapx_namespace_clear (&nsl->other);
-	
+
 	g_free (nsl);
 	nsl = NULL;
 }
diff --git a/docs/reference/calendar/libecal/tmpl/e-cal-view.sgml b/docs/reference/calendar/libecal/tmpl/e-cal-view.sgml
index 80d924b..e9e1936 100644
--- a/docs/reference/calendar/libecal/tmpl/e-cal-view.sgml
+++ b/docs/reference/calendar/libecal/tmpl/e-cal-view.sgml
@@ -75,6 +75,11 @@ ECalView is a view of the ECal.
 
 </para>
 
+<!-- ##### ARG ECalView:view-lock ##### -->
+<para>
+
+</para>
+
 <!-- ##### FUNCTION e_cal_view_get_client ##### -->
 <para>
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]