Coding style and whitespace cleanups.

6 files changed, 12 insertions, 14 deletions

diff --git a/calendar/gui/dialogs/comp-editor.c b/calendar/gui/dialogs/comp-editor.c
index 10a5232d73..5097c9f336 100644
--- a/calendar/gui/dialogs/comp-editor.c
+++ b/calendar/gui/dialogs/comp-editor.c
@@ -1562,7 +1562,7 @@ comp_editor_init (CompEditor *editor)
 	priv->is_group_item = FALSE;
 
 	priv->ui_manager = gtk_ui_manager_new ();
-	
+
 	if (comp_lite)
 		gtk_window_set_default_size ((GtkWindow *) editor, 800, 450);
 	gtk_window_add_accel_group (
@@ -1653,7 +1653,7 @@ comp_editor_init (CompEditor *editor)
 	if (comp_lite) {
 		GtkWidget *tmp, *tmp1, *tmp_box, *cont;
 		GtkWidget *combo;
-	
+
 		e_attachment_paned_set_expanded (E_ATTACHMENT_PANED (widget), TRUE);
 		e_attachment_paned_set_expanded (E_ATTACHMENT_PANED (widget), FALSE);
 
@@ -1670,7 +1670,7 @@ comp_editor_init (CompEditor *editor)
 		tmp1 = gtk_label_new_with_mnemonic (_("Save"));
 		gtk_box_pack_start ((GtkBox *)tmp, tmp1, FALSE, FALSE, 3);
 		gtk_widget_show_all(tmp);
-		
+
 		combo = gtk_ui_manager_get_widget (priv->ui_manager, "/main-toolbar/save");
 		gtk_widget_reparent (combo, tmp_box);
 		gtk_box_set_child_packing ((GtkBox *)tmp_box, combo, FALSE, FALSE, 6, GTK_PACK_END);
@@ -1678,11 +1678,11 @@ comp_editor_init (CompEditor *editor)
 		combo = gtk_bin_get_child ((GtkBin *)combo);
 		gtk_container_remove((GtkContainer *)combo, gtk_bin_get_child ((GtkBin *)combo));
 		gtk_container_add((GtkContainer *)combo, tmp);
-		gtk_button_set_relief ((GtkButton *)combo, GTK_RELIEF_NORMAL);		
+		gtk_button_set_relief ((GtkButton *)combo, GTK_RELIEF_NORMAL);
 
 		gtk_widget_show(tmp_box);
 		gtk_box_pack_end (GTK_BOX (cont), tmp_box, FALSE, FALSE, 4);
-		
+
 	}
 	container = e_attachment_paned_get_content_area (
 		E_ATTACHMENT_PANED (priv->attachment_view));
diff --git a/calendar/gui/dialogs/event-page.c b/calendar/gui/dialogs/event-page.c
index 0975bb02ee..eb95245128 100644
--- a/calendar/gui/dialogs/event-page.c
+++ b/calendar/gui/dialogs/event-page.c
@@ -2257,7 +2257,7 @@ get_widgets (EventPage *epage)
 		gtk_widget_hide (priv->invite);
 	else
 		gtk_widget_hide (priv->invite_label);
-			
+
 	priv->add = GW ("add-attendee");
 	priv->remove = GW ("remove-attendee");
 	priv->edit = GW ("edit-attendee");
diff --git a/calendar/gui/e-cal-list-view.c b/calendar/gui/e-cal-list-view.c
index 1da7f16037..d0771398c1 100644
--- a/calendar/gui/e-cal-list-view.c
+++ b/calendar/gui/e-cal-list-view.c
@@ -257,7 +257,6 @@ setup_e_table (ECalListView *cal_list_view)
 	e_table_extras_add_compare (extras, "date-compare",
 				    date_compare_cb);
 
-
 	/* set proper format component for a default 'date' cell renderer */
 	cell = e_table_extras_get_cell (extras, "date");
 	e_cell_date_set_format_component (E_CELL_DATE (cell), "calendar");
diff --git a/e-util/e-datetime-format.c b/e-util/e-datetime-format.c
index c6900ff8ca..6dff77f2ee 100644
--- a/e-util/e-datetime-format.c
+++ b/e-util/e-datetime-format.c
@@ -153,7 +153,7 @@ static void
 set_format_internal (const gchar *key, const gchar *fmt, GKeyFile *keyfile)
 {
 	ensure_loaded ();
-	
+
 	g_return_if_fail (key != NULL);
 	g_return_if_fail (key2fmt != NULL);
 	g_return_if_fail (keyfile != NULL);
@@ -256,7 +256,7 @@ format_internal (const gchar *key, DTFormatKind kind, time_t tvalue, struct tm *
 					g_string_append (use_fmt, ad);
 				else if (g_ascii_isspace (fmt [i + 3]))
 					i++;
-					
+
 				g_free (ad);
 			}
 		}
@@ -322,7 +322,7 @@ fill_combo_formats (GtkWidget *combo, const gchar *key, DTFormatKind kind)
 	};
 
 	const gchar **items = NULL;
-	int i, idx = 0;
+	gint i, idx = 0;
 	const gchar *fmt;
 
 	g_return_if_fail (GTK_IS_COMBO_BOX_ENTRY (combo));
@@ -431,7 +431,6 @@ gen_key (const gchar *component, const gchar *part, DTFormatKind kind)
 	g_return_val_if_fail (component != NULL, NULL);
 	g_return_val_if_fail (*component != 0, NULL);
 
-
 	switch (kind) {
 	case DTFormatKindDate:
 		kind_str = "Date";
diff --git a/plugins/mail-notification/mail-notification.c b/plugins/mail-notification/mail-notification.c
index 9bc8458eb4..c42473acc7 100644
--- a/plugins/mail-notification/mail-notification.c
+++ b/plugins/mail-notification/mail-notification.c
@@ -466,7 +466,7 @@ can_support_actions (void)
 		caps = notify_get_server_caps ();
 		if (caps != NULL) {
 			for (c = caps; c != NULL; c = c->next) {
-				if (strcmp ((char*)c->data, "actions") == 0) {
+				if (strcmp ((gchar *)c->data, "actions") == 0) {
 					supports_actions = TRUE;
 					break;
 				}
@@ -531,7 +531,7 @@ new_notify_status (EMEventTargetFolder *t)
 				notify_notification_set_timeout (notify, NOTIFY_EXPIRES_DEFAULT);
 				notify_notification_add_action(notify, "default", "Default", notifyActionCallback, NULL, NULL);
 				g_timeout_add (500, notification_callback, notify);
-			} 
+			}
 		}
 	}
 	#endif
diff --git a/widgets/misc/e-attachment.c b/widgets/misc/e-attachment.c
index 7d8984dba0..25fc4bb7db 100644
--- a/widgets/misc/e-attachment.c
+++ b/widgets/misc/e-attachment.c
@@ -108,7 +108,7 @@ create_system_thumbnail (EAttachment *attachment, GIcon **icon)
 {
 	GFile *file;
 	gchar *thumbnail = NULL;
-	
+
 	g_return_val_if_fail (attachment != NULL, FALSE);
 	g_return_val_if_fail (icon != NULL, FALSE);