GNOME.org
 

[evolution-exchange] Coding style and whitespace cleanup.

commit 0477f4bd2df8231c1d1e2b5bc1bf6b0806ab0c50
Author: Matthew Barnes <mbarnes redhat com>
Date:   Sun Jul 11 13:21:39 2010 -0400

    Coding style and whitespace cleanup.

 addressbook/e-book-backend-exchange.c  |   18 +++++++++---------
 addressbook/e-book-backend-gal.c       |   30 +++++++++++++++---------------
 calendar/e2k-cal-query.c               |    2 +-
 camel/camel-exchange-utils.c           |    2 +-
 eplugin/exchange-folder-subscription.c |    2 +-
 server/lib/e2k-autoconfig.c            |    2 +-
 6 files changed, 28 insertions(+), 28 deletions(-)
---
diff --git a/addressbook/e-book-backend-exchange.c b/addressbook/e-book-backend-exchange.c
index fe22fb3..ba8d5f5 100644
--- a/addressbook/e-book-backend-exchange.c
+++ b/addressbook/e-book-backend-exchange.c
@@ -238,7 +238,7 @@ e_book_backend_exchange_prop_to_exchange (const gchar *propname)
 {
 	gint i;
 
-	for (i = 0; i < G_N_ELEMENTS (prop_mappings); i ++)
+	for (i = 0; i < G_N_ELEMENTS (prop_mappings); i++)
 		if (prop_mappings[i].e_book_field && !strcmp (prop_mappings[i].e_book_field, propname))
 			return prop_mappings[i].prop_name;
 
@@ -432,7 +432,7 @@ e_contact_from_props (EBookBackendExchange *be, E2kResult *result)
 
 	e_contact_set (contact, E_CONTACT_UID, result->href);
 
-	for (i = 0; i < G_N_ELEMENTS (prop_mappings); i ++) {
+	for (i = 0; i < G_N_ELEMENTS (prop_mappings); i++) {
 		data = e2k_properties_get_prop (result->props,
 						prop_mappings[i].prop_name);
 		if (!data)
@@ -1112,7 +1112,7 @@ proppatch_address (PropMapping *prop_mapping,
 
 	if (!new_address) {
 		if (cur_address) {
-			for (i = 0; i < ADDRPROP_LAST; i ++)
+			for (i = 0; i < ADDRPROP_LAST; i++)
 				e2k_properties_remove (props, propnames[i]);
 			e_contact_address_free (cur_address);
 		}
@@ -1134,7 +1134,7 @@ proppatch_address (PropMapping *prop_mapping,
 		cur_addrprops [ADDRPROP_COUNTRY]	= cur_address->country;
 	}
 
-	for (i = 0; i < ADDRPROP_LAST; i ++) {
+	for (i = 0; i < ADDRPROP_LAST; i++) {
 		if (!new_addrprops[i]) {
 			if (cur_addrprops[i])
 				e2k_properties_remove (props, propnames[i]);
@@ -1312,7 +1312,7 @@ props_from_contact (EBookBackendExchange *be,
 			}
 		}
 	} else {
-		for (i = 0; i < G_N_ELEMENTS (prop_mappings); i ++) {
+		for (i = 0; i < G_N_ELEMENTS (prop_mappings); i++) {
 			/* handle composite attributes here (like addresses) */
 			if (prop_mappings[i].flags & FLAG_COMPOSITE) {
 				prop_mappings[i].composite_proppatch_func (&prop_mappings[i], contact, old_contact, props);
@@ -1960,7 +1960,7 @@ func_and_or (ESExp *f, gint argc, ESExpResult **argv, gpointer and)
 
 	rns = g_ptr_array_new ();
 
-	for (i = 0; i < argc; i ++) {
+	for (i = 0; i < argc; i++) {
 		if (argv[i]->type != ESEXP_RES_UNDEFINED) {
 			g_ptr_array_free (rns, TRUE);
 			for (i = 0; i < argc; i++) {
@@ -2010,7 +2010,7 @@ func_match (struct _ESExp *f, gint argc, struct _ESExpResult **argv, gpointer da
 		gint i;
 
 		rns = g_ptr_array_new ();
-		for (i = 0; i < G_N_ELEMENTS (prop_mappings); i ++) {
+		for (i = 0; i < G_N_ELEMENTS (prop_mappings); i++) {
 			if (prop_mappings[i].flags & FLAG_UNLIKEABLE)
 				continue;
 
@@ -2753,7 +2753,7 @@ e_book_backend_exchange_get_supported_fields (EBookBackendSync  *backend,
 	d(printf("ebbe_get_supported_fields(%p, %p)\n", backend, book));
 
 	*methods = NULL;
-	for (i = 0; i < G_N_ELEMENTS (prop_mappings); i ++) {
+	for (i = 0; i < G_N_ELEMENTS (prop_mappings); i++) {
 		if (prop_mappings[i].e_book_field) {
 			*methods = g_list_prepend (*methods,
 					g_strdup (e_contact_field_name(prop_mappings[i].field)));
@@ -3010,7 +3010,7 @@ e_book_backend_exchange_class_init (EBookBackendExchangeClass *klass)
 	g_ptr_array_add (field_names_array, (gpointer) E2K_PR_MAPI_EMAIL_2_ADDRTYPE);
 	g_ptr_array_add (field_names_array, (gpointer) E2K_PR_MAPI_EMAIL_3_ADDRTYPE);
 	g_ptr_array_add (field_names_array, (gpointer) E2K_PR_HTTPMAIL_HAS_ATTACHMENT);
-	for (i = 0; i < G_N_ELEMENTS (prop_mappings); i ++)
+	for (i = 0; i < G_N_ELEMENTS (prop_mappings); i++)
 		g_ptr_array_add (field_names_array, (gpointer) prop_mappings[i].prop_name);
 	field_names = (const gchar **)field_names_array->pdata;
 	n_field_names = field_names_array->len;
diff --git a/addressbook/e-book-backend-gal.c b/addressbook/e-book-backend-gal.c
index b93209c..9ef092d 100644
--- a/addressbook/e-book-backend-gal.c
+++ b/addressbook/e-book-backend-gal.c
@@ -396,7 +396,7 @@ ldap_op_add (LDAPOp *op, EBookBackend *backend,
 	g_hash_table_insert (bl->priv->id_to_op,
 			     &op->id, op);
 
-	bl->priv->active_ops ++;
+	bl->priv->active_ops++;
 
 	if (bl->priv->poll_timeout == -1)
 		bl->priv->poll_timeout = g_timeout_add (LDAP_POLL_INTERVAL,
@@ -905,11 +905,11 @@ rfc2254_escape(gchar *str)
 	gint len = strlen(str);
 	gint newlen = 0;
 
-	for (i = 0; i < len; i ++) {
+	for (i = 0; i < len; i++) {
 		if (IS_RFC2254_CHAR(str[i]))
 			newlen += 3;
 		else
-			newlen ++;
+			newlen++;
 	}
 
 	if (len == newlen) {
@@ -918,7 +918,7 @@ rfc2254_escape(gchar *str)
 	else {
 		gchar *newstr = g_malloc0 (newlen + 1);
 		gint j = 0;
-		for (i = 0; i < len; i ++) {
+		for (i = 0; i < len; i++) {
 			if (IS_RFC2254_CHAR(str[i])) {
 				sprintf (newstr + j, "\\%02x", str[i]);
 				j+= 3;
@@ -950,7 +950,7 @@ func_and(ESExp *f, gint argc, ESExpResult **argv, gpointer data)
 	}
 
 	string = g_string_new("(&");
-	for (i = 0; i < argc; i ++) {
+	for (i = 0; i < argc; i++) {
 		if (argv[i]->type != ESEXP_RES_STRING)
 			continue;
 		g_string_append(string, argv[i]->value.string);
@@ -983,7 +983,7 @@ func_or(ESExp *f, gint argc, ESExpResult **argv, gpointer data)
 	}
 
 	string = g_string_new("(|");
-	for (i = 0; i < argc; i ++) {
+	for (i = 0; i < argc; i++) {
 		if (argv[i]->type != ESEXP_RES_STRING)
 			continue;
 		g_string_append(string, argv[i]->value.string);
@@ -1027,7 +1027,7 @@ query_prop_to_ldap (const gchar *query_prop)
 	if (!strcmp (query_prop, "email"))
 		query_prop = "email_1";
 
-	for (i = 0; i < G_N_ELEMENTS (prop_info); i ++)
+	for (i = 0; i < G_N_ELEMENTS (prop_info); i++)
 		if (!strcmp (query_prop, e_contact_field_name (prop_info[i].field_id)))
 			return prop_info[i].ldap_attr;
 
@@ -1335,7 +1335,7 @@ get_time_stamp (gchar *serv_time_str, time_t *mtime)
 	hour = G_STRNDUP(input_str, 2)
 	minute = G_STRNDUP(input_str, 2)
 	second = G_STRNDUP(input_str, 2)
-	input_str ++; // parse over the dot
+	input_str++; // parse over the dot
 	zone = G_STRNDUP(input_str, 1)
 
 	mytime.tm_year = atoi(year)-1900;
@@ -1443,7 +1443,7 @@ build_contact_from_entry (EBookBackendGAL *bl, LDAPMessage *e, GList **existing_
 			g_mutex_lock (bl->priv->ldap_lock);
 			values = ldap_get_values (bl->priv->ldap, e, attr);
 			g_mutex_unlock (bl->priv->ldap_lock);
-			for (i = 0; values[i]; i ++) {
+			for (i = 0; values[i]; i++) {
 				if (!g_ascii_strcasecmp (values [i], "groupOfNames")) {
 					d(printf ("groupOfNames\n"));
 					e_contact_set (contact, E_CONTACT_IS_LIST, GINT_TO_POINTER (TRUE));
@@ -1455,7 +1455,7 @@ build_contact_from_entry (EBookBackendGAL *bl, LDAPMessage *e, GList **existing_
 			ldap_value_free (values);
 		}
 		else {
-			for (i = 0; i < G_N_ELEMENTS (prop_info); i ++)
+			for (i = 0; i < G_N_ELEMENTS (prop_info); i++)
 				if (!g_ascii_strcasecmp (attr, prop_info[i].ldap_attr)) {
 					info = &prop_info[i];
 					break;
@@ -1758,7 +1758,7 @@ get_contacts_from_cache (EBookBackendGAL *ebg,
 {
 	gint i;
 
-	for (i = 0; i < ids->len; i ++) {
+	for (i = 0; i < ids->len; i++) {
 		gchar *uid = g_ptr_array_index (ids, i);
 
 		EContact *contact =
@@ -2042,7 +2042,7 @@ tool_server_controls( LDAP *ld, LDAPControl *extra_c, gint count )
 	err = ldap_set_option( ld, LDAP_OPT_SERVER_CONTROLS, ctrls );
 
 	if (err != LDAP_SUCCESS) {
-		for ( j = 0; j < i; j++ ) {
+		for (j = 0; j < i; j++) {
 			if (ctrls[j]->ldctl_iscritical) crit = 1;
 		}
 		fprintf( stderr, "Could not set %scontrols\n",
@@ -2186,7 +2186,7 @@ static gint dosearch(
 		0,
 		NULL, &res )) > 0 )
 	{
-		for ( msg = ldap_first_message (bl->priv->ldap, res );
+		for (msg = ldap_first_message (bl->priv->ldap, res);
 			msg != NULL;
 			msg = ldap_next_message (bl->priv->ldap, msg ) )
 		{
@@ -2195,7 +2195,7 @@ static gint dosearch(
 
 			switch (ldap_msgtype( msg )) {
 			case LDAP_RES_SEARCH_ENTRY:
-				count ++;
+				count++;
 				g_mutex_unlock (bl->priv->ldap_lock);
 				contact = build_contact_from_entry (bl, msg, NULL);
 				uid = e_contact_get_const (contact, E_CONTACT_UID);
@@ -2694,7 +2694,7 @@ load_source (EBookBackend *backend,
 		g_static_mutex_lock (&global_env_lock);
 		if (global_env.ref_count > 0) {
 			env = global_env.env;
-			global_env.ref_count ++;
+			global_env.ref_count++;
 		}
 		else {
 			db_error = db_env_create (&env, 0);
diff --git a/calendar/e2k-cal-query.c b/calendar/e2k-cal-query.c
index 8c8a862..2f7cd71 100644
--- a/calendar/e2k-cal-query.c
+++ b/calendar/e2k-cal-query.c
@@ -39,7 +39,7 @@ rns_array (ESExp *esexp, gint argc, ESExpResult **argv)
 	gint i;
 
 	rns = g_new (E2kRestriction *, argc);
-	for (i = 0; i < argc; i ++) {
+	for (i = 0; i < argc; i++) {
 		if (argv[i]->type != ESEXP_RES_UNDEFINED) {
 			while (i--)
 				e2k_restriction_unref (rns[i]);
diff --git a/camel/camel-exchange-utils.c b/camel/camel-exchange-utils.c
index 2ad5e1a..5fb93f4 100644
--- a/camel/camel-exchange-utils.c
+++ b/camel/camel-exchange-utils.c
@@ -759,7 +759,7 @@ sync_deletions (ExchangeFolder *mfld)
 		g_warning ("synced_deleted: %d", status);
 
 	/* Clear out removed messages from mfld */
-	for (my_i = mfld->messages->len - 1; my_i >= 0; my_i --) {
+	for (my_i = mfld->messages->len - 1; my_i >= 0; my_i--) {
 		mmsg = mfld->messages->pdata[my_i];
 		if (!g_hash_table_lookup (known_messages, mmsg)) {
 			mfld->deleted_count++;
diff --git a/eplugin/exchange-folder-subscription.c b/eplugin/exchange-folder-subscription.c
index 01f7332..2067f5c 100644
--- a/eplugin/exchange-folder-subscription.c
+++ b/eplugin/exchange-folder-subscription.c
@@ -105,7 +105,7 @@ setup_folder_name_combo (GtkWidget *widget, const gchar *fname)
 
 	gtk_list_store_clear (GTK_LIST_STORE (gtk_combo_box_get_model (combo)));
 
-	for (i = 0; strings[i] != NULL; i ++)
+	for (i = 0; strings[i] != NULL; i++)
 		gtk_combo_box_append_text (combo, strings[i]);
 
 	gtk_entry_set_text (GTK_ENTRY (gtk_bin_get_child (GTK_BIN (combo))), fname);
diff --git a/server/lib/e2k-autoconfig.c b/server/lib/e2k-autoconfig.c
index a113748..14396f3 100644
--- a/server/lib/e2k-autoconfig.c
+++ b/server/lib/e2k-autoconfig.c
@@ -1729,7 +1729,7 @@ try_auth_again:
 			if (usernames && usernames[0] && usernames[1]) {
 				username = g_strdup (usernames[0]);
 				g_strfreev (usernames);
-				try ++;
+				try++;
 				memset(*user, 0, strlen(*user));
 				g_free (*user);
 				*user = g_strdup (username);
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]