Fix compiler warnings.

svn path=/trunk/; revision=37206

8 files changed, 21 insertions, 9 deletions

diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index a52a0faeb6..c201726a0c 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,14 @@
+2009-02-01  Matthew Barnes  <mbarnes@redhat.com>
+
+	* gui/calendar-config.c:
+	* gui/calendar-config.h:
+	* gui/e-itip-control.c:
+	* gui/alarm-notify/alarm-queue.c:
+	* gui/dialogs/event-page.c:
+	* gui/dialogs/task-details-page.c:
+	* gui/dialogs/task-page.c:
+	Fix compiler warnings.
+
 2009-01-30  Suman Manjunath  <msuman@novell.com>
 
 	** Fix for bug #450554 (bugzilla.novell.com)
diff --git a/calendar/gui/alarm-notify/alarm-queue.c b/calendar/gui/alarm-notify/alarm-queue.c
index af99eb8c6d..c1258d49e0 100644
--- a/calendar/gui/alarm-notify/alarm-queue.c
+++ b/calendar/gui/alarm-notify/alarm-queue.c
@@ -477,7 +477,7 @@ add_component_alarms (ClientAlarms *ca, ECalComponentAlarms *alarms)
 		ECalComponentAlarmInstance *instance;
 		gpointer alarm_id;
 		QueuedAlarm *qa;
-		time_t tnow = time(NULL);
+		d(time_t tnow = time(NULL));
 
 		instance = l->data;
 
diff --git a/calendar/gui/calendar-config.c b/calendar/gui/calendar-config.c
index d8579edd61..1f18b94458 100644
--- a/calendar/gui/calendar-config.c
+++ b/calendar/gui/calendar-config.c
@@ -244,7 +244,8 @@ calendar_config_get_icaltimezone (void)
 			icalproperty *tz_prop, *offset_to;
 			icaltimezone *st_zone = NULL;
 			int offset;
-			char *n_tzid, *tzid;
+			const char *tzid;
+			char *n_tzid;
 
 			tzid = icaltimezone_get_tzid (zone);
 			n_tzid = g_strconcat (tzid, "-(Standard)", NULL);
@@ -296,7 +297,7 @@ calendar_config_get_icaltimezone (void)
 /* Sets the timezone. If set to NULL it defaults to UTC.
    FIXME: Should check it is being set to a valid timezone. */
 void
-calendar_config_set_timezone (gchar *timezone)
+calendar_config_set_timezone (const gchar *timezone)
 {
 	calendar_config_init ();
 
diff --git a/calendar/gui/calendar-config.h b/calendar/gui/calendar-config.h
index 0d79d2050c..f5fe75bf15 100644
--- a/calendar/gui/calendar-config.h
+++ b/calendar/gui/calendar-config.h
@@ -76,7 +76,7 @@ guint	  calendar_config_add_notification_primary_calendar (GConfClientNotifyFunc
 /* The current timezone, e.g. "Europe/London". */
 gchar*	  calendar_config_get_timezone		(void);
 icaltimezone *calendar_config_get_icaltimezone (void);
-void	  calendar_config_set_timezone		(gchar	     *timezone);
+void	  calendar_config_set_timezone		(const gchar	     *timezone);
 guint calendar_config_add_notification_timezone (GConfClientNotifyFunc func, gpointer data);
 
 /* The working days of the week, a bit-wise combination of flags. */
diff --git a/calendar/gui/dialogs/event-page.c b/calendar/gui/dialogs/event-page.c
index d0e6cad470..4ea1bbde7b 100644
--- a/calendar/gui/dialogs/event-page.c
+++ b/calendar/gui/dialogs/event-page.c
@@ -1490,14 +1490,14 @@ event_page_fill_timezones (CompEditorPage *page, GHashTable *timezones)
 	zone = e_timezone_entry_get_timezone (E_TIMEZONE_ENTRY (priv->start_timezone));
 	if (zone) {
 		if (!g_hash_table_lookup (timezones, icaltimezone_get_tzid (zone)))
-			g_hash_table_insert (timezones, icaltimezone_get_tzid (zone), zone);
+			g_hash_table_insert (timezones, (gpointer) icaltimezone_get_tzid (zone), zone);
 	}
 
 	/* add end date timezone */
 	zone = e_timezone_entry_get_timezone (E_TIMEZONE_ENTRY (priv->end_timezone));
 	if (zone) {
 		if (!g_hash_table_lookup (timezones, icaltimezone_get_tzid (zone)))
-			g_hash_table_insert (timezones, icaltimezone_get_tzid (zone), zone);
+			g_hash_table_insert (timezones, (gpointer) icaltimezone_get_tzid (zone), zone);
 	}
 
 	return TRUE;
diff --git a/calendar/gui/dialogs/task-details-page.c b/calendar/gui/dialogs/task-details-page.c
index af137761d5..a2be1381a6 100644
--- a/calendar/gui/dialogs/task-details-page.c
+++ b/calendar/gui/dialogs/task-details-page.c
@@ -430,7 +430,7 @@ task_details_page_fill_timezones (CompEditorPage *page, GHashTable *timezones)
 	zone = icaltimezone_get_utc_timezone ();
 	if (zone) {
 		if (!g_hash_table_lookup (timezones, icaltimezone_get_tzid (zone)))
-			g_hash_table_insert (timezones, icaltimezone_get_tzid (zone), zone);
+			g_hash_table_insert (timezones, (gpointer) icaltimezone_get_tzid (zone), zone);
 	}
 
 	return TRUE;
diff --git a/calendar/gui/dialogs/task-page.c b/calendar/gui/dialogs/task-page.c
index c00a42f4bc..091a7b50d2 100644
--- a/calendar/gui/dialogs/task-page.c
+++ b/calendar/gui/dialogs/task-page.c
@@ -1353,7 +1353,7 @@ task_page_fill_timezones (CompEditorPage *page, GHashTable *timezones)
 	zone = e_timezone_entry_get_timezone (E_TIMEZONE_ENTRY (priv->timezone));
 	if (zone) {
 		if (!g_hash_table_lookup (timezones, icaltimezone_get_tzid (zone)))
-			g_hash_table_insert (timezones, icaltimezone_get_tzid (zone), zone);
+			g_hash_table_insert (timezones, (gpointer) icaltimezone_get_tzid (zone), zone);
 	}
 
 	return TRUE;
diff --git a/calendar/gui/e-itip-control.c b/calendar/gui/e-itip-control.c
index 03001cc3d9..0583a4fefe 100644
--- a/calendar/gui/e-itip-control.c
+++ b/calendar/gui/e-itip-control.c
@@ -661,7 +661,7 @@ write_label_piece (EItipControl *itip, ECalComponentDateTime *dt,
 	struct tm tmp_tm;
 	char time_buf[64];
 	icaltimezone *zone = NULL;
-	char *display_name;
+	const char *display_name;
 
 	priv = itip->priv;