GNOME.org
 

[evolution/kill-bonobo: 11/25] Fix coding style.

commit dc0ab70f11e998c5d038fe1f078768b8dc071dc7
Author: Matthew Barnes <mbarnes redhat com>
Date:   Sat Jun 13 22:06:45 2009 -0400

    Fix coding style.

 addressbook/conduit/address-conduit.c         |    4 ++--
 calendar/conduits/calendar/calendar-conduit.c |    4 ++--
 calendar/conduits/memo/memo-conduit.c         |    4 ++--
 calendar/conduits/todo/todo-conduit.c         |    4 ++--
 calendar/gui/dialogs/comp-editor.c            |    4 ++--
 em-format/em-stripsig-filter.c                |    2 +-
 mail/em-inline-filter.c                       |    8 ++++----
 plugins/calendar-http/calendar-http.c         |   12 ++++++------
 plugins/ipod-sync/ipod.c                      |    4 ++--
 9 files changed, 23 insertions(+), 23 deletions(-)
---
diff --git a/addressbook/conduit/address-conduit.c b/addressbook/conduit/address-conduit.c
index 15cbe75..4bba2a3 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 04f7c42..93f99ca 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 8fae261..0027337 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 b5bfc5b..4b9baa0 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 794184d..268f61a 100644
--- a/calendar/gui/dialogs/comp-editor.c
+++ b/calendar/gui/dialogs/comp-editor.c
@@ -261,8 +261,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/em-format/em-stripsig-filter.c b/em-format/em-stripsig-filter.c
index f4097a1..39e6d02 100644
--- a/em-format/em-stripsig-filter.c
+++ b/em-format/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/mail/em-inline-filter.c b/mail/em-inline-filter.c
index 9067205..ab46628 100644
--- a/mail/em-inline-filter.c
+++ b/mail/em-inline-filter.c
@@ -340,9 +340,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;
 }
@@ -350,9 +350,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/plugins/calendar-http/calendar-http.c b/plugins/calendar-http/calendar-http.c
index ad89379..d2e8f90 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 7556866..ee7bfcb 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;
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]