1 files changed, 29 insertions, 29 deletions

diff --git a/calendar/gui/calendar-config.c b/calendar/gui/calendar-config.c
index 14ebc801a3..e98210fa57 100644
--- a/calendar/gui/calendar-config.c
+++ b/calendar/gui/calendar-config.c
@@ -74,7 +74,7 @@ calendar_config_remove_notification (guint id)
 gboolean
 calendar_config_locale_supports_12_hour_format (void)
 {
-	char s[16];
+	gchar s[16];
 	time_t t = 0;
 
 	calendar_config_init ();
@@ -84,7 +84,7 @@ calendar_config_locale_supports_12_hour_format (void)
 }
 
 /* Returns the string representation of a units value */
-static const char *
+static const gchar *
 units_to_string (CalUnits units)
 {
 	switch (units) {
@@ -104,7 +104,7 @@ units_to_string (CalUnits units)
 
 /* opposite function to 'units_to_string' */
 static CalUnits
-string_to_units (const char *units)
+string_to_units (const gchar *units)
 {
 	CalUnits res;
 
@@ -184,7 +184,7 @@ calendar_config_get_timezone_stored (void)
 icaltimezone *
 calendar_config_get_icaltimezone (void)
 {
-	char *location;
+	gchar *location;
 	icaltimezone *zone = NULL;
 
 	calendar_config_init ();
@@ -468,9 +468,9 @@ calendar_config_add_notification_month_scroll_by_week (GConfClientNotifyFunc fun
 
 /* Whether we show the Marcus Bains Line (current time), and in what colors. */
 void
-calendar_config_get_marcus_bains (gboolean *show_line, const char **dayview_color, const char **timebar_color)
+calendar_config_get_marcus_bains (gboolean *show_line, const gchar **dayview_color, const gchar **timebar_color)
 {
-	static char *dcolor = NULL, *tcolor = NULL;
+	static gchar *dcolor = NULL, *tcolor = NULL;
 
 	calendar_config_init ();
 
@@ -705,7 +705,7 @@ calendar_config_add_notification_tasks_selected (GConfClientNotifyFunc func, gpo
 }
 
 /* The primary task list */
-char *
+gchar *
 calendar_config_get_primary_tasks (void)
 {
 	calendar_config_init ();
@@ -714,7 +714,7 @@ calendar_config_get_primary_tasks (void)
 }
 
 void
-calendar_config_set_primary_tasks (const char *primary_uid)
+calendar_config_set_primary_tasks (const gchar *primary_uid)
 {
 	calendar_config_init ();
 
@@ -783,7 +783,7 @@ calendar_config_add_notification_memos_selected (GConfClientNotifyFunc func, gpo
 }
 
 /* The primary memo list */
-char *
+gchar *
 calendar_config_get_primary_memos (void)
 {
 	calendar_config_init ();
@@ -792,7 +792,7 @@ calendar_config_get_primary_memos (void)
 }
 
 void
-calendar_config_set_primary_memos (const char *primary_uid)
+calendar_config_set_primary_memos (const gchar *primary_uid)
 {
 	calendar_config_init ();
 
@@ -936,7 +936,7 @@ calendar_config_add_notification_hide_completed_tasks (GConfClientNotifyFunc fun
 CalUnits
 calendar_config_get_hide_completed_tasks_units	(void)
 {
-	char *units;
+	gchar *units;
 	CalUnits cu;
 
 	calendar_config_init ();
@@ -959,7 +959,7 @@ calendar_config_get_hide_completed_tasks_units	(void)
 void
 calendar_config_set_hide_completed_tasks_units	(CalUnits	cu)
 {
-	char *units;
+	gchar *units;
 
 	calendar_config_init ();
 
@@ -1234,7 +1234,7 @@ calendar_config_set_use_default_reminder (gboolean value)
  *
  * Return value: Interval for default reminders.
  **/
-int
+gint
 calendar_config_get_default_reminder_interval (void)
 {
 	calendar_config_init ();
@@ -1250,7 +1250,7 @@ calendar_config_get_default_reminder_interval (void)
  * appointments.
  **/
 void
-calendar_config_set_default_reminder_interval (int interval)
+calendar_config_set_default_reminder_interval (gint interval)
 {
 	calendar_config_init ();
 
@@ -1268,7 +1268,7 @@ calendar_config_set_default_reminder_interval (int interval)
 CalUnits
 calendar_config_get_default_reminder_units (void)
 {
-	char *units;
+	gchar *units;
 	CalUnits cu;
 
 	calendar_config_init ();
@@ -1305,7 +1305,7 @@ calendar_config_set_default_reminder_units (CalUnits units)
  * are retrieved even when returns FALSE.
  **/
 gboolean
-calendar_config_get_ba_reminder (int *interval, CalUnits *units)
+calendar_config_get_ba_reminder (gint *interval, CalUnits *units)
 {
 	calendar_config_init ();
 
@@ -1314,7 +1314,7 @@ calendar_config_get_ba_reminder (int *interval, CalUnits *units)
 	}
 
 	if (units) {
-		char *str;
+		gchar *str;
 
 		str = gconf_client_get_string (config, CALENDAR_CONFIG_BA_REMINDER_UNITS, NULL);
 		*units = string_to_units (str);
@@ -1333,7 +1333,7 @@ calendar_config_get_ba_reminder (int *interval, CalUnits *units)
  * @units: The units of the reminder; can be NULL.
  **/
 void
-calendar_config_set_ba_reminder (gboolean *enabled, int *interval, CalUnits *units)
+calendar_config_set_ba_reminder (gboolean *enabled, gint *interval, CalUnits *units)
 {
 	calendar_config_init ();
 
@@ -1355,10 +1355,10 @@ calendar_config_set_ba_reminder (gboolean *enabled, int *interval, CalUnits *uni
  * Returns the subexpression to use to filter out completed tasks according
  * to the config settings. The returned sexp should be freed.
  **/
-char*
+gchar *
 calendar_config_get_hide_completed_tasks_sexp (gboolean get_completed)
 {
-	char *sexp = NULL;
+	gchar *sexp = NULL;
 
 	if (calendar_config_get_hide_completed_tasks ()) {
 		CalUnits units;
@@ -1375,7 +1375,7 @@ calendar_config_get_hide_completed_tasks_sexp (gboolean get_completed)
 			else
 				sexp = g_strdup ("(is-completed?)");
 		} else {
-			char *isodate;
+			gchar *isodate;
 			icaltimezone *zone;
 			struct icaltimetype tt;
 			time_t t;
@@ -1453,10 +1453,10 @@ calendar_config_set_dir_path (const gchar *path)
 	gconf_client_set_string (config, CALENDAR_CONFIG_SAVE_DIR, path, NULL);
 }
 
-char *
+gchar *
 calendar_config_get_dir_path (void)
 {
-	char *path;
+	gchar *path;
 
 	calendar_config_init ();
 
@@ -1491,14 +1491,14 @@ calendar_config_free_day_second_zones (GSList *zones)
 
 /* keeps max 'day_second_zones_max' zones, if 'location' is already in a list, then it'll became first there */
 void
-calendar_config_set_day_second_zone (const char *location)
+calendar_config_set_day_second_zone (const gchar *location)
 {
 	calendar_config_init ();
 
 	if (location && *location) {
 		GSList *lst, *l;
 		GError *error = NULL;
-		int max_zones;
+		gint max_zones;
 
 		/* configurable max number of timezones to remember */
 		max_zones = gconf_client_get_int (config, CALENDAR_CONFIG_DAY_SECOND_ZONES_MAX, &error);
@@ -1516,7 +1516,7 @@ calendar_config_set_day_second_zone (const char *location)
 			if (l->data && g_str_equal (l->data, location)) {
 				if (l != lst) {
 					/* isn't first in the list */
-					char *val = l->data;
+					gchar *val = l->data;
 
 					lst = g_slist_remove (lst, val);
 					lst = g_slist_prepend (lst, val);
@@ -1545,7 +1545,7 @@ calendar_config_set_day_second_zone (const char *location)
 }
 
 /* location of the second time zone user has selected. Free with g_free. */
-char *
+gchar *
 calendar_config_get_day_second_zone (void)
 {
 	calendar_config_init ();
@@ -1559,7 +1559,7 @@ calendar_config_select_day_second_zone (void)
 	icaltimezone *zone = NULL;
 	ETimezoneDialog *tzdlg;
 	GtkWidget *dialog;
-	char *second_location;
+	gchar *second_location;
 
 	second_location = calendar_config_get_day_second_zone ();
 	if (second_location && *second_location)
@@ -1575,7 +1575,7 @@ calendar_config_select_day_second_zone (void)
 	dialog = e_timezone_dialog_get_toplevel (tzdlg);
 
 	if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT) {
-		const char *location = NULL;
+		const gchar *location = NULL;
 
 		zone = e_timezone_dialog_get_timezone (tzdlg);
 		if (zone == icaltimezone_get_utc_timezone ()) {