[evolution] Coding style and whitespace cleanups.



commit 7005a8dcdc6f2fb87826cfb7e7d575130476d65d
Author: Matthew Barnes <mbarnes redhat com>
Date:   Sat Nov 28 16:16:33 2009 -0500

    Coding style and whitespace cleanups.

 calendar/conduits/calendar/calendar-conduit.c |    4 ++--
 calendar/gui/alarm-notify/alarm-queue.c       |    2 +-
 plugins/contacts-map/contacts-map.c           |   13 +++++--------
 plugins/contacts-map/geo-utils.c              |    4 ++--
 plugins/contacts-map/geo-utils.h              |    2 +-
 plugins/tnef-attachments/tnef-plugin.c        |    2 +-
 6 files changed, 12 insertions(+), 15 deletions(-)
---
diff --git a/calendar/conduits/calendar/calendar-conduit.c b/calendar/conduits/calendar/calendar-conduit.c
index 605845a..677c234 100644
--- a/calendar/conduits/calendar/calendar-conduit.c
+++ b/calendar/conduits/calendar/calendar-conduit.c
@@ -1117,7 +1117,7 @@ local_record_from_comp (ECalLocalRecord *local, ECalComponent *comp, ECalConduit
 						+ trigger.u.rel_duration.hours * 60
 						+ trigger.u.rel_duration.days * 60 * 24
 						+ trigger.u.rel_duration.weeks * 7 * 60 * 24;
-	
+
 					if (local->appt->advance > PILOT_MAX_ADVANCE) {
 						local->appt->advanceUnits = advHours;
 						local->appt->advance =
@@ -1136,7 +1136,7 @@ local_record_from_comp (ECalLocalRecord *local, ECalComponent *comp, ECalConduit
 					}
 					if (local->appt->advance > PILOT_MAX_ADVANCE)
 						local->appt->advance = PILOT_MAX_ADVANCE;
-	
+
 					local->appt->alarm = 1;
 					break;
 				} else if (icaldurationtype_is_null_duration (trigger.u.rel_duration)) {
diff --git a/calendar/gui/alarm-notify/alarm-queue.c b/calendar/gui/alarm-notify/alarm-queue.c
index d5750e2..25010a6 100644
--- a/calendar/gui/alarm-notify/alarm-queue.c
+++ b/calendar/gui/alarm-notify/alarm-queue.c
@@ -179,7 +179,7 @@ message_push (Message *msg)
 {
 	/* This used be pushed through the thread pool. This fix is made to work-around
 	the crashers in dbus due to threading. The threading is not completely removed as
-	its better to have alarm daemon running in a thread rather than blocking main thread. 
+	its better to have alarm daemon running in a thread rather than blocking main thread.
 	 This is the reason the creation of thread pool is commented out */
 	msg->func (msg);
 }
diff --git a/plugins/contacts-map/contacts-map.c b/plugins/contacts-map/contacts-map.c
index 8961233..afde8e2 100644
--- a/plugins/contacts-map/contacts-map.c
+++ b/plugins/contacts-map/contacts-map.c
@@ -30,7 +30,6 @@
 #include <shell/e-shell-view.h>
 #include <shell/e-shell-window.h>
 
-
 /* Plugin entry points */
 
 gboolean addressbook_map_init (GtkUIManager *ui_manager, EShellView *shell_view);
@@ -39,7 +38,7 @@ void show_map_general (ESourceSelector *selector);
 
 /* Implementations */
 
-gboolean 
+gboolean
 addressbook_map_init (GtkUIManager *ui_manager, EShellView *shell_view)
 {
 	EShell *shell;
@@ -77,7 +76,6 @@ addressbook_map_init (GtkUIManager *ui_manager, EShellView *shell_view)
 	return TRUE;
 }
 
-
 void
 action_show_ebook_map (GtkAction *action, EShellView *shell_view)
 {
@@ -93,7 +91,6 @@ action_show_ebook_map (GtkAction *action, EShellView *shell_view)
 	g_object_unref (selector);
 }
 
-
 void
 show_map_general (ESourceSelector *selector)
 {
@@ -110,7 +107,7 @@ show_map_general (ESourceSelector *selector)
 	gdouble lat = 0;
 	gdouble lng = 0;
 
-	GtkWidget *map_widget; 
+	GtkWidget *map_widget;
 	ChamplainView  *view;
 	ChamplainLayer *layer;
 
@@ -123,11 +120,11 @@ show_map_general (ESourceSelector *selector)
 	uri = e_source_get_uri (primary_source);
 	book = e_book_new_from_uri (uri, NULL);
 
-	if (!book || !e_book_open (book, TRUE, NULL)) 
+	if (!book || !e_book_open (book, TRUE, NULL))
 	{
 		g_warning ("Couldn't load addressbook %s", uri);
 		return;
-	} 
+	}
 
 	/* Get all the contacts with an address */
 	query = e_book_query_field_exists (E_CONTACT_ADDRESS);
@@ -154,7 +151,7 @@ show_map_general (ESourceSelector *selector)
 			fields = geoclue_geocode_address_to_position (geocoder, details,
 					&lat, &lng, NULL, &accuracy, &error);
 
-			if (!error && 
+			if (!error &&
 			    (fields & GEOCLUE_POSITION_FIELDS_LATITUDE) != 0 &&
 			    (fields & GEOCLUE_POSITION_FIELDS_LONGITUDE) != 0) {
 				/* Add the marker to the map */
diff --git a/plugins/contacts-map/geo-utils.c b/plugins/contacts-map/geo-utils.c
index 3f7473c..b44b926 100644
--- a/plugins/contacts-map/geo-utils.c
+++ b/plugins/contacts-map/geo-utils.c
@@ -33,13 +33,13 @@ add_marker (ChamplainLayer *layer, gdouble lat, gdouble lng, EContact *contact)
 	champlain_layer_add_marker (layer, CHAMPLAIN_BASE_MARKER(marker));
 }
 
-GeoclueGeocode* 
+GeoclueGeocode*
 get_geocoder (void)
 {
 	GeoclueGeocode *geocoder = NULL;
 
 	/* Create new GeoclueGeocode */
-	geocoder = geoclue_geocode_new ("org.freedesktop.Geoclue.Providers.Yahoo", 
+	geocoder = geoclue_geocode_new ("org.freedesktop.Geoclue.Providers.Yahoo",
 			"/org/freedesktop/Geoclue/Providers/Yahoo");
 
 	return geocoder;
diff --git a/plugins/contacts-map/geo-utils.h b/plugins/contacts-map/geo-utils.h
index 65248f4..4560ed0 100644
--- a/plugins/contacts-map/geo-utils.h
+++ b/plugins/contacts-map/geo-utils.h
@@ -9,7 +9,7 @@
 #include <champlain-gtk/champlain-gtk.h>
 #include <clutter-gtk/clutter-gtk.h>
 
-void 
+void
 get_min_max (gdouble *min_lat, gdouble *max_lat,
         gdouble *min_lng, gdouble *max_lng,
         gdouble lat, gdouble lng);
diff --git a/plugins/tnef-attachments/tnef-plugin.c b/plugins/tnef-attachments/tnef-plugin.c
index 86a1c75..3ef047d 100644
--- a/plugins/tnef-attachments/tnef-plugin.c
+++ b/plugins/tnef-attachments/tnef-plugin.c
@@ -330,7 +330,7 @@ void processTnef(TNEFStruct *tnef, const gchar *tmpdir) {
                 }
             }
             if ((RealAttachment == 1) || (saveintermediate == 1)) {
- 		char tmpname[20];
+		gchar tmpname[20];
                 /* Ok, it's not an embedded stream, so now we */
 		/* process it. */
                 if ((filename = MAPIFindProperty(&(p->MAPI),



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