GNOME.org
 

[evolution-groupwise] Coding style and whitespace cleanup.

commit ecbd6327e055266ccc26601f90bae52243a25ac3
Author: Matthew Barnes <mbarnes redhat com>
Date:   Sat Oct 15 12:13:43 2011 -0400

    Coding style and whitespace cleanup.

 src/addressbook/e-book-backend-groupwise.c   |   10 +++++-----
 src/calendar/e-cal-backend-groupwise-utils.c |   10 +++++-----
 src/camel/camel-groupwise-settings.c         |   13 +++++++------
 src/camel/camel-groupwise-settings.h         |    2 +-
 src/camel/camel-groupwise-store.c            |    2 +-
 src/camel/camel-groupwise-summary.c          |    1 -
 src/plugins/camel-gw-listener.c              |   10 +++++-----
 src/plugins/process-meeting.c                |    6 +++---
 8 files changed, 27 insertions(+), 27 deletions(-)
---
diff --git a/src/addressbook/e-book-backend-groupwise.c b/src/addressbook/e-book-backend-groupwise.c
index 43fe662..24cc84c 100644
--- a/src/addressbook/e-book-backend-groupwise.c
+++ b/src/addressbook/e-book-backend-groupwise.c
@@ -1253,9 +1253,9 @@ e_book_backend_groupwise_create_contacts (EBookBackend *backend,
 	 * in our static capability list. This is because there is no clean way to roll back changes in case of an error. */
 	if (vcards->next != NULL) {
 		e_data_book_respond_create_contacts (book, opid,
-		                                     EDB_ERROR_EX (NOT_SUPPORTED,
+						     EDB_ERROR_EX (NOT_SUPPORTED,
 		                                     _("The backend does not support bulk additions")),
-		                                     NULL);
+						     NULL);
 		return;
 	}
 
@@ -1425,9 +1425,9 @@ e_book_backend_groupwise_modify_contacts (EBookBackend *backend,
 	 * in our static capability list. This is because there is no clean way to roll back changes in case of an error. */
 	if (vcards->next != NULL) {
 		e_data_book_respond_modify_contacts (book, opid,
-		                                     EDB_ERROR_EX (NOT_SUPPORTED,
+						     EDB_ERROR_EX (NOT_SUPPORTED,
 		                                     _("The backend does not support bulk modifications")),
-		                                     NULL);
+						     NULL);
 		return;
 	}
 
@@ -3626,7 +3626,7 @@ e_book_backend_groupwise_open (EBookBackend *backend,
 	if (!online)
 		e_book_backend_notify_opened (backend, NULL /* Success */);
 	else
-		e_book_backend_notify_auth_required(backend, TRUE, NULL);
+		e_book_backend_notify_auth_required (backend, TRUE, NULL);
 }
 
 static void
diff --git a/src/calendar/e-cal-backend-groupwise-utils.c b/src/calendar/e-cal-backend-groupwise-utils.c
index 8c3ecb2..e871d46 100644
--- a/src/calendar/e-cal-backend-groupwise-utils.c
+++ b/src/calendar/e-cal-backend-groupwise-utils.c
@@ -590,7 +590,7 @@ set_rrule_from_comp (ECalComponent *comp,
 				ECalComponentDateTime *dt = (ECalComponentDateTime *) l->data;
 				if (dt->value) {
 					if (!icaltime_get_timezone (*(dt->value)))
-						icaltime_set_timezone (dt->value, icaltimezone_get_builtin_timezone_from_tzid(dt->tzid));
+						icaltime_set_timezone (dt->value, icaltimezone_get_builtin_timezone_from_tzid (dt->tzid));
 					itt_utc = icaltime_convert_to_zone (*dt->value, utc);
 					item_exdate_list = g_slist_append (item_exdate_list, icaltime_as_ical_string_r (itt_utc));
 				}
@@ -661,7 +661,7 @@ set_properties_from_cal_component (EGwItem *item,
 		e_cal_component_get_dtend (comp, &dt);
 		if (dt.value) {
 			if (!icaltime_get_timezone (*dt.value))
-				icaltime_set_timezone (dt.value, icaltimezone_get_builtin_timezone_from_tzid(dt.tzid));
+				icaltime_set_timezone (dt.value, icaltimezone_get_builtin_timezone_from_tzid (dt.tzid));
 			itt_utc = icaltime_convert_to_zone (*dt.value, utc);
 			value = icaltime_as_ical_string_r (itt_utc);
 			e_gw_item_set_end_date (item, value);
@@ -678,7 +678,7 @@ set_properties_from_cal_component (EGwItem *item,
 		e_cal_component_get_due (comp, &dt);
 		if (dt.value) {
 			if (!icaltime_get_timezone (*dt.value))
-				icaltime_set_timezone (dt.value, icaltimezone_get_builtin_timezone_from_tzid(dt.tzid));
+				icaltime_set_timezone (dt.value, icaltimezone_get_builtin_timezone_from_tzid (dt.tzid));
 			itt_utc = icaltime_convert_to_zone (*dt.value, utc);
 			value = icaltime_as_ical_string_r (itt_utc);
 			e_gw_item_set_due_date (item,  value);
@@ -754,7 +754,7 @@ set_properties_from_cal_component (EGwItem *item,
 	e_cal_component_get_dtstart (comp, &dt);
 	if (dt.value) {
 		if (!icaltime_get_timezone (*dt.value))
-			icaltime_set_timezone (dt.value, icaltimezone_get_builtin_timezone_from_tzid(dt.tzid));
+			icaltime_set_timezone (dt.value, icaltimezone_get_builtin_timezone_from_tzid (dt.tzid));
 		itt_utc = icaltime_convert_to_zone (*dt.value, utc);
 		value = icaltime_as_ical_string_r (itt_utc);
 		e_gw_item_set_start_date (item, value);
@@ -777,7 +777,7 @@ set_properties_from_cal_component (EGwItem *item,
 	e_cal_component_get_created (comp, &dt.value);
 	if (dt.value) {
 		if (!icaltime_get_timezone (*dt.value))
-			icaltime_set_timezone (dt.value, icaltimezone_get_builtin_timezone_from_tzid(dt.tzid));
+			icaltime_set_timezone (dt.value, icaltimezone_get_builtin_timezone_from_tzid (dt.tzid));
 		itt_utc = icaltime_convert_to_zone (*dt.value, utc);
 		value = icaltime_as_ical_string_r (itt_utc);
 		e_gw_item_set_creation_date (item, value);
diff --git a/src/camel/camel-groupwise-settings.c b/src/camel/camel-groupwise-settings.c
index d04389d..f479864 100644
--- a/src/camel/camel-groupwise-settings.c
+++ b/src/camel/camel-groupwise-settings.c
@@ -191,10 +191,11 @@ groupwise_settings_get_property (GObject *object,
 static void
 groupwise_settings_finalize (GObject *object)
 {
-	CamelGroupwiseSettings *settings = CAMEL_GROUPWISE_SETTINGS (object);
+	CamelGroupwiseSettingsPrivate *priv;
 
-	if (settings && settings->priv)
-		g_free (settings->priv->soap_port);
+	priv = CAMEL_GROUPWISE_SETTINGS_GET_PRIVATE (object);
+
+	g_free (priv->soap_port);
 
 	/* Chain up to parent's finalize() method. */
 	G_OBJECT_CLASS (camel_groupwise_settings_parent_class)->finalize (object);
@@ -367,13 +368,13 @@ camel_groupwise_settings_get_soap_port (CamelGroupwiseSettings *settings)
 
 void
 camel_groupwise_settings_set_soap_port (CamelGroupwiseSettings *settings,
-					const gchar* soap_port)
+                                        const gchar *soap_port)
 {
 	g_return_if_fail (CAMEL_IS_GROUPWISE_SETTINGS (settings));
 
 	g_free (settings->priv->soap_port);
-	if(atoi(soap_port))
-		settings->priv->soap_port = g_strdup(soap_port);
+	if (atoi (soap_port))
+		settings->priv->soap_port = g_strdup (soap_port);
 	else
 		settings->priv->soap_port = NULL;
 
diff --git a/src/camel/camel-groupwise-settings.h b/src/camel/camel-groupwise-settings.h
index c0d6339..04d520f 100644
--- a/src/camel/camel-groupwise-settings.h
+++ b/src/camel/camel-groupwise-settings.h
@@ -72,7 +72,7 @@ gboolean	camel_groupwise_settings_get_filter_junk_inbox
 void		camel_groupwise_settings_set_filter_junk_inbox
 					(CamelGroupwiseSettings *settings,
 					 gboolean filter_junk_inbox);
-const gchar*	camel_groupwise_settings_get_soap_port
+const gchar *	camel_groupwise_settings_get_soap_port
 					(CamelGroupwiseSettings *settings);
 void		camel_groupwise_settings_set_soap_port
 					(CamelGroupwiseSettings *settings,
diff --git a/src/camel/camel-groupwise-store.c b/src/camel/camel-groupwise-store.c
index 4108b6d..c418fcf 100644
--- a/src/camel/camel-groupwise-store.c
+++ b/src/camel/camel-groupwise-store.c
@@ -122,7 +122,7 @@ check_for_connection (CamelService *service,
 		soap_port = camel_groupwise_settings_get_soap_port (
 			CAMEL_GROUPWISE_SETTINGS (settings));
 
-		port_string = g_strdup(soap_port);
+		port_string = g_strdup (soap_port);
 		ai = camel_getaddrinfo (
 			host, port_string, &hints,
 			cancellable, &local_error);
diff --git a/src/camel/camel-groupwise-summary.c b/src/camel/camel-groupwise-summary.c
index c412897..81ca3e8 100644
--- a/src/camel/camel-groupwise-summary.c
+++ b/src/camel/camel-groupwise-summary.c
@@ -228,7 +228,6 @@ gw_info_set_flags (CamelMessageInfo *info,
 	CamelMessageInfoBase *mi = (CamelMessageInfoBase *) info;
 	gboolean junk_flag = 0, junk_learn_flag = 0;
 
-
 	old = mi->flags;
 	mi->flags = (old & ~flags) | (set & flags);
 
diff --git a/src/plugins/camel-gw-listener.c b/src/plugins/camel-gw-listener.c
index fd4d68b..4b2231b 100644
--- a/src/plugins/camel-gw-listener.c
+++ b/src/plugins/camel-gw-listener.c
@@ -237,7 +237,7 @@ add_esource (const gchar *conf_key,
 	if (!can_create)
 		e_source_group_set_property (group, "create_source", "no");
 
-	port_string = g_strdup(soap_port);
+	port_string = g_strdup (soap_port);
 
 	relative_uri = g_strdup_printf ("%s %s/", url->user, poa_address);
 	source = e_source_new (source_name, relative_uri);
@@ -435,7 +435,7 @@ modify_esource (const gchar *conf_key,
 			g_return_if_reached ();
 	}
 
-	port_string = g_strdup(soap_port);
+	port_string = g_strdup (soap_port);
 
 	for (; groups != NULL &&  !found_group; groups = g_slist_next (groups)) {
 		ESourceGroup *group = E_SOURCE_GROUP (groups->data);
@@ -722,7 +722,7 @@ add_addressbook_sources (EAccount *account)
 	if (!temp_list)
 		return FALSE;
 
-	port_string = g_strdup(soap_port);
+	port_string = g_strdup (soap_port);
 
 	for (; temp_list != NULL; temp_list = g_list_next (temp_list)) {
 		const gchar *book_name =  e_gw_container_get_name (E_GW_CONTAINER (temp_list->data));
@@ -850,7 +850,7 @@ modify_addressbook_sources (EAccount *account,
 			g_return_if_reached ();
 	}
 
-	port_string = g_strdup(soap_port);
+	port_string = g_strdup (soap_port);
 
 	new_base_uri = g_strdup_printf ("groupwise://%s %s", url->user, poa_address);
 
@@ -1076,7 +1076,7 @@ account_changed (EAccountList *account_listener,
 		g_object_unref (settings);
 
 		if ((old_poa_address && strcmp (old_poa_address, new_poa_address))
-		   || strcmp(old_soap_port, new_soap_port)
+		   || strcmp (old_soap_port, new_soap_port)
 		   || strcmp (old_url->user, new_url->user)
 		   || old_security_method != new_security_method) {
 
diff --git a/src/plugins/process-meeting.c b/src/plugins/process-meeting.c
index f00f385..24e726d 100644
--- a/src/plugins/process-meeting.c
+++ b/src/plugins/process-meeting.c
@@ -451,7 +451,7 @@ gw_resend_meeting_cb (GtkAction *action,
 			e_cal_component_get_attachment_list (new_comp, &attach_list);
 
 			for (l = attach_list; l; l = l->next) {
-				gchar *sfname = g_filename_from_uri ((gchar *)l->data, NULL, NULL);
+				gchar *sfname = g_filename_from_uri ((gchar *) l->data, NULL, NULL);
 				gchar *filename, *new_filename;
 				gchar *cache_dir, *temp_filename;
 				GMappedFile *mapped_file;
@@ -464,14 +464,14 @@ gw_resend_meeting_cb (GtkAction *action,
 				}
 				filename = g_path_get_basename (sfname);
 				cache_dir = g_path_get_dirname (sfname);
-				temp_filename = g_strdup (filename + strlen(old_uid)+1);
+				temp_filename = g_strdup (filename + strlen (old_uid) + 1);
 				new_filename = g_strconcat (new_uid, "-", temp_filename, NULL);
 				g_free (temp_filename);
 				g_free (filename);
 				dest_file = g_build_filename (cache_dir, new_filename, NULL);
 				g_free (new_filename);
 				g_free (cache_dir);
-				fd = g_open (dest_file, O_RDWR|O_CREAT|O_TRUNC|O_BINARY, 0600);
+				fd = g_open (dest_file, O_RDWR | O_CREAT | O_TRUNC | O_BINARY, 0600);
 				if (fd == -1) {
 					/* TODO handle error conditions */
 				} else if (write (fd, g_mapped_file_get_contents (mapped_file),
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]