Fix coding style.

15 files changed, 34 insertions, 33 deletions

diff --git a/addressbook/conduit/address-conduit.c b/addressbook/conduit/address-conduit.c
index 15cbe75045..4bba2a3ddc 100644
--- a/addressbook/conduit/address-conduit.c
+++ b/addressbook/conduit/address-conduit.c
@@ -470,7 +470,7 @@ addrconduit_load_configuration (guint32 pilot_id)
 	g_assert (c != NULL);
 
 	c->pilot_id = pilot_id;
-	management = gnome_pilot_conduit_management_new ((gchar*)"e_address_conduit", GNOME_PILOT_CONDUIT_MGMT_ID);
+	management = gnome_pilot_conduit_management_new ((gchar *)"e_address_conduit", GNOME_PILOT_CONDUIT_MGMT_ID);
 	g_object_ref_sink (management);
 	config = gnome_pilot_conduit_config_new (management, pilot_id);
 	g_object_ref_sink (config);
@@ -2183,7 +2183,7 @@ conduit_get_gpilot_conduit (guint32 pilot_id)
 
 	LOG (g_message ( "in address's conduit_get_gpilot_conduit\n" ));
 
-	retval = gnome_pilot_conduit_sync_abs_new ((gchar*)"AddressDB", 0x61646472);
+	retval = gnome_pilot_conduit_sync_abs_new ((gchar *)"AddressDB", 0x61646472);
 	g_assert (retval != NULL);
 
 	ctxt = e_addr_context_new (pilot_id);
diff --git a/calendar/conduits/calendar/calendar-conduit.c b/calendar/conduits/calendar/calendar-conduit.c
index 04f7c424dd..93f99ca1c2 100644
--- a/calendar/conduits/calendar/calendar-conduit.c
+++ b/calendar/conduits/calendar/calendar-conduit.c
@@ -123,7 +123,7 @@ calconduit_load_configuration (guint32 pilot_id)
 	c->pilot_id = pilot_id;
 
 	/* Sync Type */
-	management = gnome_pilot_conduit_management_new ((gchar*)"e_calendar_conduit", GNOME_PILOT_CONDUIT_MGMT_ID);
+	management = gnome_pilot_conduit_management_new ((gchar *)"e_calendar_conduit", GNOME_PILOT_CONDUIT_MGMT_ID);
 	g_object_ref_sink (management);
 	config = gnome_pilot_conduit_config_new (management, pilot_id);
 	g_object_ref_sink (config);
@@ -2105,7 +2105,7 @@ conduit_get_gpilot_conduit (guint32 pilot_id)
 
 	LOG (g_message ( "in calendar's conduit_get_gpilot_conduit\n" ));
 
-	retval = gnome_pilot_conduit_sync_abs_new ((gchar*)"DatebookDB", 0x64617465);
+	retval = gnome_pilot_conduit_sync_abs_new ((gchar *)"DatebookDB", 0x64617465);
 	g_assert (retval != NULL);
 
 	ctxt = e_calendar_context_new (pilot_id);
diff --git a/calendar/conduits/memo/memo-conduit.c b/calendar/conduits/memo/memo-conduit.c
index 8fae261828..0027337b5b 100644
--- a/calendar/conduits/memo/memo-conduit.c
+++ b/calendar/conduits/memo/memo-conduit.c
@@ -126,7 +126,7 @@ memoconduit_load_configuration (guint32 pilot_id)
 
 	c->pilot_id = pilot_id;
 
-	management = gnome_pilot_conduit_management_new ((gchar*)"e_memo_conduit", GNOME_PILOT_CONDUIT_MGMT_ID);
+	management = gnome_pilot_conduit_management_new ((gchar *)"e_memo_conduit", GNOME_PILOT_CONDUIT_MGMT_ID);
 	g_object_ref_sink (management);
 	config = gnome_pilot_conduit_config_new (management, pilot_id);
 	g_object_ref_sink (config);
@@ -1383,7 +1383,7 @@ conduit_get_gpilot_conduit (guint32 pilot_id)
 
 	LOG (g_message ( "in memo's conduit_get_gpilot_conduit\n" ));
 
-	retval = gnome_pilot_conduit_sync_abs_new ((gchar*)"MemoDB", 0x6D656D6F);
+	retval = gnome_pilot_conduit_sync_abs_new ((gchar *)"MemoDB", 0x6D656D6F);
 	g_assert (retval != NULL);
 
 	ctxt = e_memo_context_new (pilot_id);
diff --git a/calendar/conduits/todo/todo-conduit.c b/calendar/conduits/todo/todo-conduit.c
index b5bfc5b996..4b9baa0fcf 100644
--- a/calendar/conduits/todo/todo-conduit.c
+++ b/calendar/conduits/todo/todo-conduit.c
@@ -128,7 +128,7 @@ todoconduit_load_configuration (guint32 pilot_id)
 
 	c->pilot_id = pilot_id;
 
-	management = gnome_pilot_conduit_management_new ((gchar*)"e_todo_conduit", GNOME_PILOT_CONDUIT_MGMT_ID);
+	management = gnome_pilot_conduit_management_new ((gchar *)"e_todo_conduit", GNOME_PILOT_CONDUIT_MGMT_ID);
 	g_object_ref_sink (management);
 	config = gnome_pilot_conduit_config_new (management, pilot_id);
 	g_object_ref_sink (config);
@@ -1573,7 +1573,7 @@ conduit_get_gpilot_conduit (guint32 pilot_id)
 
 	LOG (g_message ( "in todo's conduit_get_gpilot_conduit\n" ));
 
-	retval = gnome_pilot_conduit_sync_abs_new ((gchar*)"ToDoDB", 0x746F646F);
+	retval = gnome_pilot_conduit_sync_abs_new ((gchar *)"ToDoDB", 0x746F646F);
 	g_assert (retval != NULL);
 
 	ctxt = e_todo_context_new (pilot_id);
diff --git a/calendar/gui/dialogs/comp-editor.c b/calendar/gui/dialogs/comp-editor.c
index 469c1c6e28..ba43eaf98d 100644
--- a/calendar/gui/dialogs/comp-editor.c
+++ b/calendar/gui/dialogs/comp-editor.c
@@ -246,8 +246,8 @@ get_attachment_list (CompEditor *editor)
 	EAttachmentView *view;
 	GFile *destination;
 	GSList *list = NULL;
-	const char *comp_uid = NULL;
-	const char *local_store;
+	const gchar *comp_uid = NULL;
+	const gchar *local_store;
 	gchar *uri;
 	gint ii;
 
diff --git a/composer/e-composer-header-table.h b/composer/e-composer-header-table.h
index 3e3c95bff7..146868a864 100644
--- a/composer/e-composer-header-table.h
+++ b/composer/e-composer-header-table.h
@@ -149,9 +149,10 @@ const gchar *	e_composer_header_table_get_subject
 void		e_composer_header_table_set_subject
 						(EComposerHeaderTable *table,
 						 const gchar *subject);
-void		e_composer_header_table_set_header_visible (EComposerHeaderTable *table,
-                	                        EComposerHeaderType type,
-						gboolean visible);
+void		e_composer_header_table_set_header_visible
+						(EComposerHeaderTable *table,
+						 EComposerHeaderType type,
+						 gboolean visible);
 G_END_DECLS
 
 #endif /* E_COMPOSER_HEADER_TABLE_H */
diff --git a/composer/e-composer-header.c b/composer/e-composer-header.c
index f57d569ead..e2942ca201 100644
--- a/composer/e-composer-header.c
+++ b/composer/e-composer-header.c
@@ -69,12 +69,12 @@ composer_header_addaction_clicked_cb (GtkButton *button,
 				      EComposerHeader *header)
 {
 	gboolean show = !e_composer_header_get_visible(header);
-	if (!show) 
+	if (!show)
 		gtk_label_set_markup ((GtkLabel *)header->priv->action_label, g_object_get_data ((GObject *)header->priv->action_label, "show"));
 	else
 		gtk_label_set_markup ((GtkLabel *)header->priv->action_label, g_object_get_data ((GObject *)header->priv->action_label, "hide"));
 
-	e_composer_header_set_visible (header, show);	
+	e_composer_header_set_visible (header, show);
 }
 
 static GObject *
diff --git a/composer/e-composer-private.c b/composer/e-composer-private.c
index 8610d9c011..e834f41b4e 100644
--- a/composer/e-composer-private.c
+++ b/composer/e-composer-private.c
@@ -176,7 +176,7 @@ e_composer_private_init (EMsgComposer *composer)
 		gtk_widget_hide (combo);
 		container = e_attachment_paned_get_controls_container (
 			E_ATTACHMENT_PANED (widget));
-		
+
 		tmp_box = gtk_hbox_new (FALSE, 0);
 
 		tmp = gtk_hbox_new (FALSE, 0);
diff --git a/e-util/e-util.c b/e-util/e-util.c
index 2451e151a9..1635484c20 100644
--- a/e-util/e-util.c
+++ b/e-util/e-util.c
@@ -1170,7 +1170,7 @@ get_font_options (void)
 
 		fo_option_changed (fo_gconf, 0, NULL, NULL);
 	}
-	
+
 	g_static_mutex_lock (&fo_lock);
 
 	/* Antialiasing */
diff --git a/mail/em-inline-filter.c b/mail/em-inline-filter.c
index 19e3f2671f..bf18aab0f7 100644
--- a/mail/em-inline-filter.c
+++ b/mail/em-inline-filter.c
@@ -339,9 +339,9 @@ emif_scan(CamelMimeFilter *f, gchar *in, gsize len, gint final)
 static void
 emif_filter(CamelMimeFilter *f, const gchar *in, gsize len, gsize prespace, gchar **out, gsize *outlen, gsize *outprespace)
 {
-	emif_scan(f, (gchar*)in, len, FALSE);
+	emif_scan(f, (gchar *)in, len, FALSE);
 
-	*out = (gchar*)in;
+	*out = (gchar *)in;
 	*outlen = len;
 	*outprespace = prespace;
 }
@@ -349,9 +349,9 @@ emif_filter(CamelMimeFilter *f, const gchar *in, gsize len, gsize prespace, gcha
 static void
 emif_complete(CamelMimeFilter *f, const gchar *in, gsize len, gsize prespace, gchar **out, gsize *outlen, gsize *outprespace)
 {
-	emif_scan(f, (gchar*)in, len, TRUE);
+	emif_scan(f, (gchar *)in, len, TRUE);
 
-	*out = (gchar*)in;
+	*out = (gchar *)in;
 	*outlen = len;
 	*outprespace = prespace;
 }
diff --git a/mail/em-stripsig-filter.c b/mail/em-stripsig-filter.c
index f4097a1b3d..39e6d02dad 100644
--- a/mail/em-stripsig-filter.c
+++ b/mail/em-stripsig-filter.c
@@ -126,7 +126,7 @@ strip_signature (CamelMimeFilter *filter, const gchar *in, gsize len, gsize pres
 	else if (!start)
 		inptr = inend;
 
-	*out = (gchar*)in;
+	*out = (gchar *)in;
 	*outlen = inptr - in;
 	*outprespace = prespace;
 }
diff --git a/plugins/calendar-http/calendar-http.c b/plugins/calendar-http/calendar-http.c
index ad89379922..d2e8f903c6 100644
--- a/plugins/calendar-http/calendar-http.c
+++ b/plugins/calendar-http/calendar-http.c
@@ -34,17 +34,17 @@ GtkWidget * e_calendar_http_secure (EPlugin *epl, EConfigHookItemFactoryData *da
 GtkWidget *e_calendar_http_auth (EPlugin *epl, EConfigHookItemFactoryData *data);
 
 /* replaces all '@' with '%40' in str; returns newly allocated string */
-static char *
-replace_at_sign (const char *str)
+static gchar *
+replace_at_sign (const gchar *str)
 {
-	char *res, *at;
+	gchar *res, *at;
 
 	if (!str)
 		return NULL;
 
 	res = g_strdup (str);
 	while (at = strchr (res, '@'), at) {
-		char *tmp = g_malloc0 (sizeof (char) * (1 + strlen (res) + 2));
+		gchar *tmp = g_malloc0 (sizeof (gchar) * (1 + strlen (res) + 2));
 
 		strncpy (tmp, res, at - res);
 		strcat (tmp, "%40");
@@ -386,7 +386,7 @@ static void
 username_changed (GtkEntry *entry, ESource *source)
 {
 	const gchar *username;
-	char *uri;
+	gchar *uri;
 
 	username = gtk_entry_get_text (GTK_ENTRY (entry));
 
@@ -401,7 +401,7 @@ username_changed (GtkEntry *entry, ESource *source)
 	uri = e_source_get_uri (source);
 	if (uri != NULL) {
 		EUri *euri;
-		char *ruri;
+		gchar *ruri;
 
 		if (username && !*username)
 			username = NULL;
diff --git a/plugins/ipod-sync/ipod.c b/plugins/ipod-sync/ipod.c
index 75568660f1..ee7bfcb501 100644
--- a/plugins/ipod-sync/ipod.c
+++ b/plugins/ipod-sync/ipod.c
@@ -70,7 +70,7 @@ try_mount (gchar *device)
 	GError *err = NULL;
 	gint exit_status;
 
-	argv[0] = (gchar*)MOUNT;
+	argv[0] = (gchar *)MOUNT;
 	argv[1] = device;
 	argv[2] = NULL;
 
@@ -94,7 +94,7 @@ try_umount (gchar *device)
 	GError *err = NULL;
 	gint exit_status;
 
-	argv[0] = (gchar*)UMOUNT;
+	argv[0] = (gchar *)UMOUNT;
 	argv[1] = device;
 	argv[2] = NULL;
 
diff --git a/widgets/misc/e-attachment-paned.h b/widgets/misc/e-attachment-paned.h
index c0fd7b5c54..825de3a16b 100644
--- a/widgets/misc/e-attachment-paned.h
+++ b/widgets/misc/e-attachment-paned.h
@@ -78,9 +78,9 @@ void		e_attachment_paned_drag_data_received
 						 GtkSelectionData *selection,
 						 guint info,
 						 guint time);
-GtkWidget *	e_attachment_paned_get_controls_container 
+GtkWidget *	e_attachment_paned_get_controls_container
 						(EAttachmentPaned *paned);
-GtkWidget *	e_attachment_paned_get_view_combo 
+GtkWidget *	e_attachment_paned_get_view_combo
 						(EAttachmentPaned *paned);
 
 G_END_DECLS
diff --git a/widgets/misc/e-search-bar.c b/widgets/misc/e-search-bar.c
index acd52ece6f..b2f1a314e2 100644
--- a/widgets/misc/e-search-bar.c
+++ b/widgets/misc/e-search-bar.c
@@ -1451,7 +1451,7 @@ e_search_bar_set_search_scope (ESearchBar *search_bar, gint id)
 	gint row;
 
 	g_return_if_fail (E_IS_SEARCH_BAR (search_bar));
-	
+
 	if (!search_bar->scopeoption_menu)
 		return;
 	row = find_id (search_bar->scopeoption_menu, id, "EsbItemId", NULL);