Update NEWS + coding style cleanups.

2 files changed, 9 insertions, 9 deletions

diff --git a/plugins/calendar-file/calendar-file.c b/plugins/calendar-file/calendar-file.c
index fa6aaa7470..66a491edcd 100644
--- a/plugins/calendar-file/calendar-file.c
+++ b/plugins/calendar-file/calendar-file.c
@@ -30,7 +30,7 @@
 static void
 location_changed (GtkFileChooserButton *widget, ESource *source)
 {
-	char *filename;
+	gchar *filename;
 
 	g_return_if_fail (widget != NULL);
 	g_return_if_fail (source != NULL);
@@ -129,7 +129,7 @@ maincheck_toggled (GtkToggleButton *check, ESource *source)
 	gtk_widget_set_sensitive (w, enabled);
 
 	if (enabled) {
-		char *file;
+		gchar *file;
 
 		w = g_object_get_data (G_OBJECT (check), "file-chooser");
 		file = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (w));
@@ -145,7 +145,7 @@ refresh_type_changed (GtkComboBox *refresh_type, ESource *source)
 {
 	GtkWidget *spin, *combobox;
 	gint active = gtk_combo_box_get_active (refresh_type);
-	char buff[2] = {0};
+	gchar buff[2] = {0};
 
 	spin = g_object_get_data (G_OBJECT (refresh_type), "spin");
 	combobox = g_object_get_data (G_OBJECT (refresh_type), "combobox");
@@ -238,7 +238,7 @@ e_calendar_file_customs (EPlugin *epl, EConfigHookItemFactoryData *data)
 		gtk_file_chooser_set_filename (GTK_FILE_CHOOSER (w2), value);
 		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (maincheck), TRUE);
 	} else {
-		char *uri = NULL;
+		gchar *uri = NULL;
 
 		switch (t->source_type) {
 		case E_CAL_SOURCE_TYPE_EVENT:
diff --git a/plugins/pst-import/pst-importer.c b/plugins/pst-import/pst-importer.c
index a8099bd0b1..ddc7e7662f 100644
--- a/plugins/pst-import/pst-importer.c
+++ b/plugins/pst-import/pst-importer.c
@@ -908,13 +908,13 @@ pst_process_email (PstImporter *m, pst_item *item)
 	info = camel_message_info_new (NULL);
 
 	/* Read message flags (see comments in libpst.c */
-	if(item->flags && 0x01)
+	if (item->flags && 0x01)
 		camel_message_info_set_flags (info, CAMEL_MESSAGE_SEEN, ~0);
 
 	if (item->email->importance == 2)
 		camel_message_info_set_flags (info, CAMEL_MESSAGE_FLAGGED, ~0);
 
-	if(item->flags && 0x08)
+	if (item->flags && 0x08)
 		camel_message_info_set_flags (info, CAMEL_MESSAGE_DRAFT, ~0);
 
 	camel_folder_append_message (m->folder, msg, info, NULL, &m->ex);
@@ -1056,15 +1056,15 @@ pst_process_contact (PstImporter *m, pst_item *item)
 	contact_set_string (ec, E_CONTACT_TITLE, c->job_title.str);
 
 	contact_set_address (ec,E_CONTACT_ADDRESS_WORK,
-			    c->business_address.str, c->business_city.str, c->business_country.str, 
+			    c->business_address.str, c->business_city.str, c->business_country.str,
 			    c->business_po_box.str, c->business_postal_code.str, c->business_state.str, c->business_street.str);
 
 	contact_set_address (ec,E_CONTACT_ADDRESS_HOME,
-			    c->home_address.str, c->home_city.str, c->home_country.str, 
+			    c->home_address.str, c->home_city.str, c->home_country.str,
 			    c->home_po_box.str, c->home_postal_code.str, c->home_state.str, c->home_street.str);
 
 	contact_set_address (ec,E_CONTACT_ADDRESS_OTHER,
-			    c->other_address.str, c->other_city.str, c->other_country.str, 
+			    c->other_address.str, c->other_city.str, c->other_country.str,
 			    c->other_po_box.str, c->other_postal_code.str, c->other_state.str, c->other_street.str);
 
 	contact_set_string (ec, E_CONTACT_PHONE_ASSISTANT, c->assistant_phone.str);