[evolution-ews] Coding style and whitespace cleanup.



commit 249aeb6c0e191130df90466d21fe833d48f581d3
Author: Matthew Barnes <mbarnes redhat com>
Date:   Sat Jun 2 07:49:23 2012 -0400

    Coding style and whitespace cleanup.

 .../exchange-ews-account-out-of-office.c           |    5 +-
 .../exchange-ews-change-password.c                 |   14 ++---
 src/addressbook/e-book-backend-ews.c               |    2 +-
 src/addressbook/lzx/ews-oal-decompress.c           |    6 +-
 src/calendar/e-cal-backend-ews-utils.c             |    6 +-
 src/camel/camel-ews-folder.c                       |    6 +-
 src/camel/camel-ews-store-summary.c                |    2 +-
 src/server/e-ews-connection.c                      |   56 ++++++++++----------
 src/server/e-ews-item.c                            |    2 +-
 src/utils/e-ews-query-to-restriction.c             |    4 +-
 10 files changed, 50 insertions(+), 53 deletions(-)
---
diff --git a/src/account-setup-eplugin/exchange-ews-account-out-of-office.c b/src/account-setup-eplugin/exchange-ews-account-out-of-office.c
index b61d67d..7a34737 100644
--- a/src/account-setup-eplugin/exchange-ews-account-out-of-office.c
+++ b/src/account-setup-eplugin/exchange-ews-account-out-of-office.c
@@ -167,7 +167,7 @@ toggled_state_cb (GtkToggleButton *button,
 
 static void
 toggled_set_date_cb (GtkToggleButton *button,
-		     gpointer data)
+                     gpointer data)
 {
 	gboolean current_state;
 
@@ -373,10 +373,9 @@ set_oof_settings_to_frame (GtkWidget *oof_frame)
 	/*Check box for setting date*/
 	set_range = gtk_check_button_new_with_mnemonic (_("_Send only during this time period"));
 	oof_data->range_wt = set_range;
-	gtk_toggle_button_set_active ((GtkToggleButton*) set_range, oof_data->set_range);
+	gtk_toggle_button_set_active ((GtkToggleButton *) set_range, oof_data->set_range);
 	g_signal_connect ((GtkToggleButton*) set_range, "toggled", G_CALLBACK (toggled_set_date_cb), NULL);
 
-
 	/*Selectable Dates*/
 	from_date = e_date_edit_new ();
 	to_date = e_date_edit_new ();
diff --git a/src/account-setup-eplugin/exchange-ews-change-password.c b/src/account-setup-eplugin/exchange-ews-change-password.c
index f08536b..3fa99c7 100644
--- a/src/account-setup-eplugin/exchange-ews-change-password.c
+++ b/src/account-setup-eplugin/exchange-ews-change-password.c
@@ -36,7 +36,6 @@
 #include "exchange-ews-change-password.h"
 #include <gtk/gtk.h>
 
-
 #ifdef HAVE_KRB5
 static void
 entry_changed (GtkEntry *entry,
@@ -109,8 +108,8 @@ get_password (EMConfigTargetSettings *target_account)
 
 static gboolean
 e_ews_set_password (EMConfigTargetSettings *account,
-		    const gchar *old_pwd,
-		    const gchar *new_pwd)
+                    const gchar *old_pwd,
+                    const gchar *new_pwd)
 {
 	CamelSettings *settings;
 	CamelNetworkSettings *network_settings;
@@ -142,7 +141,7 @@ e_ews_set_password (EMConfigTargetSettings *account,
 
 	result = ews_kerberos_change_password (user, domain, old_pwd, new_pwd);
 
-	if(result != EWS_KERBEROS_OK)
+	if (result != EWS_KERBEROS_OK)
 		return FALSE;
 
 	/*On Success add new password to the keyring*/
@@ -304,7 +303,6 @@ run_dialog_again:
 	return new_pass;
 }
 
-
 static void
 btn_chpass_clicked (GtkButton *button,
                     gpointer data)
@@ -312,11 +310,11 @@ btn_chpass_clicked (GtkButton *button,
 #ifdef HAVE_KRB5
 	EMConfigTargetSettings *target_account = (EMConfigTargetSettings *) data;
 	gchar *password, *new_password;
-	password = get_password(target_account);
+	password = get_password (target_account);
 	new_password = e_ews_get_new_password ( password, TRUE);
 	g_print("Password is %s \n New password is %s", password, new_password);
 
-	if(e_ews_set_password(target_account, password, new_password))
+	if (e_ews_set_password (target_account, password, new_password))
 		e_notice(button, GTK_MESSAGE_INFO, "Password changed successfully. Please remember the same.");
 	else
 #endif
@@ -340,7 +338,7 @@ ews_get_change_pwd_widget (EMConfigTargetSettings *target_account)
 	gtk_label_set_markup ((GtkLabel *) label, txt);
 	g_free (txt);
 	frame = (GtkFrame*) g_object_new (GTK_TYPE_FRAME, "label-widget", label, NULL);
-	
+
 	/*Create a VBox*/
 	vbox_auth = (GtkVBox*) g_object_new (GTK_TYPE_VBOX, "homogeneous", FALSE, "spacing", 6, NULL);
 	gtk_container_set_border_width (GTK_CONTAINER (vbox_auth), 6);
diff --git a/src/addressbook/e-book-backend-ews.c b/src/addressbook/e-book-backend-ews.c
index 7773f1d..3e01e8c 100644
--- a/src/addressbook/e-book-backend-ews.c
+++ b/src/addressbook/e-book-backend-ews.c
@@ -2101,7 +2101,7 @@ ebews_fetch_items (EBookBackendEws *ebews,
                    GSList *items,
                    gboolean store_to_cache,
                    GSList **vcards,
-		   GCancellable *cancellable,
+                   GCancellable *cancellable,
                    GError **error)
 {
 	EBookBackendEwsPrivate *priv;
diff --git a/src/addressbook/lzx/ews-oal-decompress.c b/src/addressbook/lzx/ews-oal-decompress.c
index 562fa0e..9a402eb 100644
--- a/src/addressbook/lzx/ews-oal-decompress.c
+++ b/src/addressbook/lzx/ews-oal-decompress.c
@@ -268,13 +268,13 @@ main (gint argc,
 		g_print ("Pass an lzx file and an output filename as argument \n");
 		return;
 	}
- *
+
 	g_type_init ();
- *
+
 	if (oal_decompress_v4_full_detail_file (argv[1], argv[2], NULL))
 		g_print ("Successfully decompressed \n");
 	else
 		g_print ("decompression failed \n");
- *
+
 	return 0;
 } */
diff --git a/src/calendar/e-cal-backend-ews-utils.c b/src/calendar/e-cal-backend-ews-utils.c
index edfd485..59c44f7 100644
--- a/src/calendar/e-cal-backend-ews-utils.c
+++ b/src/calendar/e-cal-backend-ews-utils.c
@@ -450,8 +450,8 @@ ewscal_set_availability_timezone (ESoapMessage *msg,
 	/* Fetch the timezone offsets for the standard (or only) zone.
 	 * Negate it, because Exchange does it backwards */
 	if (xstd) {
-		prop = icalcomponent_get_first_property(xstd, ICAL_TZOFFSETTO_PROPERTY);
-		std_utcoffs = -icalproperty_get_tzoffsetto(prop)/60;
+		prop = icalcomponent_get_first_property (xstd, ICAL_TZOFFSETTO_PROPERTY);
+		std_utcoffs = -icalproperty_get_tzoffsetto (prop) / 60;
 	} else
 		std_utcoffs = 0;
 
@@ -473,7 +473,7 @@ ewscal_set_availability_timezone (ESoapMessage *msg,
 		e_soap_message_start_element(msg, "DaylightTime", NULL, NULL);
 		ewscal_add_availability_timechange (msg, xdaylight, std_utcoffs);
 		e_soap_message_end_element(msg); /* "DaylightTime" */
-	} else 
+	} else
 		/* Set default values*/
 		ewscal_add_availability_default_timechange (msg);
 
diff --git a/src/camel/camel-ews-folder.c b/src/camel/camel-ews-folder.c
index 36ae586..c76b5c3 100644
--- a/src/camel/camel-ews-folder.c
+++ b/src/camel/camel-ews-folder.c
@@ -569,7 +569,7 @@ ews_folder_get_message_sync (CamelFolder *folder,
 static GPtrArray *
 ews_folder_search_by_expression (CamelFolder *folder,
                                  const gchar *expression,
-				 GCancellable *cancellable,
+                                 GCancellable *cancellable,
                                  GError **error)
 {
 	CamelEwsFolder *ews_folder;
@@ -592,7 +592,7 @@ ews_folder_search_by_expression (CamelFolder *folder,
 static guint32
 ews_folder_count_by_expression (CamelFolder *folder,
                                 const gchar *expression,
-				GCancellable *cancellable,
+                                GCancellable *cancellable,
                                 GError **error)
 {
 	CamelEwsFolder *ews_folder;
@@ -616,7 +616,7 @@ static GPtrArray *
 ews_folder_search_by_uids (CamelFolder *folder,
                            const gchar *expression,
                            GPtrArray *uids,
-			   GCancellable *cancellable,
+                           GCancellable *cancellable,
                            GError **error)
 {
 	CamelEwsFolder *ews_folder;
diff --git a/src/camel/camel-ews-store-summary.c b/src/camel/camel-ews-store-summary.c
index 999162a..ba2203e 100644
--- a/src/camel/camel-ews-store-summary.c
+++ b/src/camel/camel-ews-store-summary.c
@@ -740,7 +740,7 @@ camel_ews_store_summary_get_folder_id_from_name (CamelEwsStoreSummary *ews_summa
 
 gchar *
 camel_ews_store_summary_get_folder_id_from_folder_type (CamelEwsStoreSummary *ews_summary,
-							guint64 folder_type)
+                                                        guint64 folder_type)
 {
 	gchar *folder_id = NULL;
 	GSList *folders, *l;
diff --git a/src/server/e-ews-connection.c b/src/server/e-ews-connection.c
index a2116e8..508c67c 100644
--- a/src/server/e-ews-connection.c
+++ b/src/server/e-ews-connection.c
@@ -362,8 +362,8 @@ ews_active_job_done (EEwsConnection *cnc,
 
 	ews_trigger_next_request (cnc);
 	/* the 'simple' holds reference on 'cnc' and this function
-	   is called in a dedicated thread, which 'cnc' joins on dispose,
-	   thus to avoid race condition, unref the object in its own thread */
+	 * is called in a dedicated thread, which 'cnc' joins on dispose,
+	 * thus to avoid race condition, unref the object in its own thread */
 	ews_unref_in_thread (G_OBJECT (ews_node->simple));
 	g_free (ews_node);
 }
@@ -612,7 +612,7 @@ sync_xxx_response_cb (ESoapParameter *subparam,
 static void
 sync_hierarchy_response_cb (ESoapParameter *subparam,
                             EwsNode *enode,
-			    GError **error)
+                            GError **error)
 {
 	/* stop on errors */
 	if (error && *error)
@@ -625,7 +625,7 @@ sync_hierarchy_response_cb (ESoapParameter *subparam,
 static void
 sync_folder_items_response_cb (ESoapParameter *subparam,
                                EwsNode *enode,
-			       GError **error)
+                               GError **error)
 {
 	/* stop on errors */
 	if (error && *error)
@@ -638,7 +638,7 @@ sync_folder_items_response_cb (ESoapParameter *subparam,
 static void
 get_folder_response_cb (ESoapParameter *subparam,
                         EwsNode *enode,
-			GError **error)
+                        GError **error)
 {
 	ESoapParameter *node;
 	EwsAsyncData *async_data;
@@ -661,7 +661,7 @@ get_folder_response_cb (ESoapParameter *subparam,
 static void
 find_folder_items_response_cb (ESoapParameter *subparam,
                                EwsNode *enode,
-			       GError **error)
+                               GError **error)
 {
 	ESoapParameter *node, *subparam1;
 	EwsAsyncData *async_data;
@@ -700,7 +700,7 @@ find_folder_items_response_cb (ESoapParameter *subparam,
 static void
 get_items_response_cb (ESoapParameter *subparam,
                        EwsNode *enode,
-		       GError **error)
+                       GError **error)
 {
 	ESoapParameter *node;
 	EwsAsyncData *async_data;
@@ -732,7 +732,7 @@ get_text_from_html (gchar *html_text)
 	gchar *start = g_strstr_len (html_text, haystack_len, "<body"),
 		*end = g_strstr_len (html_text, haystack_len, "</body>"),
 		*i, *j;
-	
+
 	/*parse the status set by owa*/
 	if  (g_strrstr (html_text, "BodyFragment") && !start) {
 		start = html_text;
@@ -763,7 +763,7 @@ get_text_from_html (gchar *html_text)
 static void
 get_oof_settings_response_cb (ESoapParameter *subparam,
                               EwsNode *enode,
-			      GError **error)
+                              GError **error)
 {
 	ESoapParameter *node, *node_1;
 	EwsAsyncData *async_data;
@@ -827,7 +827,7 @@ get_oof_settings_response_cb (ESoapParameter *subparam,
 static void
 resolve_names_response_cb (ESoapParameter *subparam,
                            EwsNode *enode,
-			   GError **error)
+                           GError **error)
 {
 	ESoapParameter *node;
 	gboolean includes_last_item;
@@ -877,7 +877,7 @@ resolve_names_response_cb (ESoapParameter *subparam,
 static void
 expand_dl_response_cb (ESoapParameter *subparam,
                        EwsNode *enode,
-		       GError **error)
+                       GError **error)
 {
 	gboolean includes_last_item;
 	GSList *mailboxes = NULL;
@@ -915,8 +915,8 @@ expand_dl_response_cb (ESoapParameter *subparam,
 /* TODO scan all folders if we support creating multiple folders in the request */
 static void
 ews_create_folder_response_cb (ESoapParameter *soapparam,
-			       EwsNode *enode,
-			       GError **error)
+                               EwsNode *enode,
+                               GError **error)
 {
 	ESoapParameter *param, *node;
 	EwsAsyncData *async_data;
@@ -1364,9 +1364,9 @@ autodiscover_response_cb (SoupSession *session,
 	ad->msgs[idx] = NULL;
 
 	/* Take 'simple' from 'ad' before actual call
-	   to g_simple_async_result_complete_in_idle(),
-	   for cases where the 'ad' is freed in autodiscover_done_cb()
-	   before this function finishes. Suggested by Dan Winship.
+	 * to g_simple_async_result_complete_in_idle(),
+	 * for cases where the 'ad' is freed in autodiscover_done_cb()
+	 * before this function finishes. Suggested by Dan Winship.
 	*/
 	simple = ad->simple;
 
@@ -1454,8 +1454,8 @@ autodiscover_response_cb (SoupSession *session,
 	g_simple_async_result_set_op_res_gpointer (ad->simple, urls, NULL);
 	g_simple_async_result_complete_in_idle (ad->simple);
 	/* the 'simple' holds reference on 'cnc' and this function
-	   is called in a dedicated thread, which 'cnc' joins on dispose,
-	   thus to avoid race condition, unref the object in its own thread */
+	 * is called in a dedicated thread, which 'cnc' joins on dispose,
+	 * thus to avoid race condition, unref the object in its own thread */
 	ews_unref_in_thread (G_OBJECT (simple));
 	return;
 
@@ -1476,8 +1476,8 @@ failed:
 	g_simple_async_result_set_from_error (ad->simple, error);
 	g_simple_async_result_complete_in_idle (ad->simple);
 	/* the 'simple' holds reference on 'cnc' and this function
-	   is called in a dedicated thread, which 'cnc' joins on dispose,
-	   thus to avoid race condition, unref the object in its own thread */
+	 * is called in a dedicated thread, which 'cnc' joins on dispose,
+	 * thus to avoid race condition, unref the object in its own thread */
 	ews_unref_in_thread (G_OBJECT (simple));
 }
 
@@ -4297,7 +4297,7 @@ e_ews_connection_delete_folder_sync (EEwsConnection *cnc,
 static void
 create_attachments_response_cb (ESoapParameter *param,
                                 EwsNode *enode,
-				GError **error)
+                                GError **error)
 {
 	/* http://msdn.microsoft.com/en-us/library/aa565877%28v=EXCHG.80%29.aspx */
 	ESoapParameter *subparam, *attspara, *last_relevant = NULL, *attparam;
@@ -4492,7 +4492,7 @@ e_ews_connection_create_attachments_sync (EEwsConnection *cnc,
 static void
 delete_attachments_response_cb (ESoapParameter *subparam,
                                 EwsNode *enode,
-				GError **error)
+                                GError **error)
 {
 	/* http://msdn.microsoft.com/en-us/library/aa580782%28v=EXCHG.80%29.aspx */
 	ESoapParameter *attspara;
@@ -4744,7 +4744,7 @@ e_ews_connection_get_attachments_sync (EEwsConnection *cnc,
 static void
 get_attachments_response_cb (ESoapParameter *param,
                              EwsNode *enode,
-			     GError **error)
+                             GError **error)
 {
 	ESoapParameter *subparam, *attspara;
 	EwsAsyncData *async_data;
@@ -4784,7 +4784,7 @@ get_attachments_response_cb (ESoapParameter *param,
 static void
 get_free_busy_response_cb (ESoapParameter *param,
                            EwsNode *enode,
-			   GError **error)
+                           GError **error)
 {
        /*parse the response to create a free_busy data
 	http://msdn.microsoft.com / en - us / library / aa564001 % 28v = EXCHG.140 % 29.aspx */
@@ -4812,7 +4812,7 @@ get_free_busy_response_cb (ESoapParameter *param,
 			if (!g_ascii_strcasecmp (name, "StartTime")) {
 				value = e_soap_parameter_get_string_value (subparam);
 				/*We are sending UTC timezone and expect server to return in same*/
-				
+
 				/*Remove leading and trailing whitespace*/
 				g_strstrip (value);
 
@@ -4822,7 +4822,7 @@ get_free_busy_response_cb (ESoapParameter *param,
 					g_free (value);
 				} else
 					new_val = value;
-				
+
 				g_time_val_from_iso8601 (new_val, &t_val);
 				g_free (new_val);
 
@@ -4831,7 +4831,7 @@ get_free_busy_response_cb (ESoapParameter *param,
 			} else if (!g_ascii_strcasecmp (name, "EndTime")) {
 				value = e_soap_parameter_get_string_value (subparam);
 				/*We are sending UTC timezone and expect server to return in same*/
-				
+
 				/*Remove leading and trailing whitespace*/
 				g_strstrip (value);
 
@@ -4983,7 +4983,7 @@ get_permission_from_string (gchar *permission)
 static void
 get_delegate_response_cb (ESoapParameter *param,
                           EwsNode *enode,
-			  GError **error)
+                          GError **error)
 {
 	ESoapParameter *subparam, *node, *child;
 	EwsAsyncData *async_data;
diff --git a/src/server/e-ews-item.c b/src/server/e-ews-item.c
index 698c5ba..7e5d352 100644
--- a/src/server/e-ews-item.c
+++ b/src/server/e-ews-item.c
@@ -1143,7 +1143,7 @@ e_ews_item_get_error (EEwsItem *item)
 
 void
 e_ews_item_set_error (EEwsItem *item,
-		      const GError *error)
+                      const GError *error)
 {
 	GError *new_error;
 
diff --git a/src/utils/e-ews-query-to-restriction.c b/src/utils/e-ews-query-to-restriction.c
index 2521cc8..ec6cae1 100644
--- a/src/utils/e-ews-query-to-restriction.c
+++ b/src/utils/e-ews-query-to-restriction.c
@@ -297,7 +297,7 @@ e_ews_implement_contact_contains (ESExp *f,
 
 				WRITE_CONTAINS_MESSAGE (msg, mode, "IgnoreCase", "item:Categories", value);
 			}
-			
+
 			g_free (mode);
 		}
 	}
@@ -792,7 +792,7 @@ func_eq (ESExp *f,
 
 	if (argv[0]->type == ESEXP_RES_STRING) {
 		const gchar *name;
-	       	gchar *field_uri = NULL;
+		gchar *field_uri = NULL;
 
 		name = argv[0]->value.string;
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]