Fix compiler warnings.

svn path=/trunk/; revision=37206

12 files changed, 34 insertions, 13 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;
 
diff --git a/mail/ChangeLog b/mail/ChangeLog
index c2f0e4689f..969d4a4550 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,10 @@
+2009-02-01  Matthew Barnes  <mbarnes@redhat.com>
+
+	* em-event.c:
+	* em-event.h:
+	* em-migrate.c:
+	Fix compiler warnings.
+
 2009-02-01  Johnny Jacob  <jjohnny@novell.com>
 
 	* em-event.h (struct _EMEventTargetFolderBrowser): Added.
diff --git a/mail/em-event.c b/mail/em-event.c
index fe7f5bd1fd..8a027cce98 100644
--- a/mail/em-event.c
+++ b/mail/em-event.c
@@ -32,7 +32,6 @@
 #include "em-event.h"
 #include "composer/e-msg-composer.h"
 #include "libedataserver/e-msgport.h"
-#include "em-folder-browser.h"
 
 #include <camel/camel-store.h>
 #include <camel/camel-folder.h>
diff --git a/mail/em-event.h b/mail/em-event.h
index 10da5a669d..eb45050a27 100644
--- a/mail/em-event.h
+++ b/mail/em-event.h
@@ -27,6 +27,7 @@
 #include <glib-object.h>
 
 #include "e-util/e-event.h"
+#include "mail/em-folder-browser.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -154,6 +155,7 @@ GType em_event_get_type(void);
 EMEvent *em_event_peek(void);
 
 EMEventTargetFolder *em_event_target_new_folder(EMEvent *emp, const char *uri, guint32 flags);
+EMEventTargetFolderBrowser *em_event_target_new_folder_browser (EMEvent *eme, EMFolderBrowser *emfb);
 EMEventTargetComposer *em_event_target_new_composer(EMEvent *emp, const struct _EMsgComposer *composer, guint32 flags);
 EMEventTargetMessage *em_event_target_new_message(EMEvent *emp, struct _CamelFolder *folder, struct _CamelMimeMessage *message, const char *uid, guint32 flags);
 EMEventTargetSendReceive * em_event_target_new_send_receive(EMEvent *eme, struct _GtkWidget *table, gpointer data, int row, guint32 flags);
diff --git a/mail/em-migrate.c b/mail/em-migrate.c
index c2c63582ea..7f7e6a1c44 100644
--- a/mail/em-migrate.c
+++ b/mail/em-migrate.c
@@ -2856,10 +2856,11 @@ migrate_folders(CamelStore *store, gboolean is_local, CamelFolderInfo *fi, const
 
 	while (fi) {
 		double progress;
+		char *tmp;
 
 		*nth_folder = *nth_folder + 1;
 
-		char *tmp = g_strdup_printf ("%s/%s", acc, fi->full_name);
+		tmp = g_strdup_printf ("%s/%s", acc, fi->full_name);
 		em_migrate_set_folder_name (tmp);
 		g_free (tmp);
 		
@@ -2957,6 +2958,7 @@ migrate_to_db()
 		info = camel_store_get_folder_info (store, NULL, CAMEL_STORE_FOLDER_INFO_RECURSIVE|CAMEL_STORE_FOLDER_INFO_FAST|CAMEL_STORE_FOLDER_INFO_SUBSCRIBED, NULL);	
 
 		if (info) {
+				GThread *thread;
 				struct migrate_folders_to_db_structure migrate_dbs;
 
 				if (g_str_has_suffix (((CamelService *)store)->url->path, ".evolution/mail/local"))
@@ -2969,7 +2971,6 @@ migrate_to_db()
 				migrate_dbs.store = store;
 				migrate_dbs.done = FALSE;
 
-				GThread *thread;
 				thread = g_thread_create ((GThreadFunc) migrate_folders_to_db_thread, &migrate_dbs, TRUE, NULL);
 				while (!migrate_dbs.done)
 						g_main_context_iteration (NULL, TRUE);
@@ -2995,6 +2996,7 @@ migrate_to_db()
 						store = (CamelStore *) camel_session_get_service (session, service->url, CAMEL_PROVIDER_STORE, &ex);
 						info = camel_store_get_folder_info (store, NULL, CAMEL_STORE_FOLDER_INFO_RECURSIVE|CAMEL_STORE_FOLDER_INFO_FAST|CAMEL_STORE_FOLDER_INFO_SUBSCRIBED, &ex);
 						if (info) {
+								GThread *thread;
 								struct migrate_folders_to_db_structure migrate_dbs;
 
 								migrate_dbs.ex = ex;
@@ -3003,7 +3005,6 @@ migrate_to_db()
 								migrate_dbs.store = store;
 								migrate_dbs.done = FALSE;
 
-								GThread *thread;
 								thread = g_thread_create ((GThreadFunc) migrate_folders_to_db_thread, &migrate_dbs, TRUE, NULL);
 								while (!migrate_dbs.done)
 										g_main_context_iteration (NULL, TRUE);