evolution r37206 - in trunk: calendar calendar/gui calendar/gui/alarm-notify calendar/gui/dialogs mail

[mbarnes svn gnome org]

Author: mbarnes
Date: Mon Feb  2 03:39:24 2009
New Revision: 37206
URL: http://svn.gnome.org/viewvc/evolution?rev=37206&view=rev

Log:
Fix compiler warnings.


Modified:
   trunk/calendar/ChangeLog
   trunk/calendar/gui/alarm-notify/alarm-queue.c
   trunk/calendar/gui/calendar-config.c
   trunk/calendar/gui/calendar-config.h
   trunk/calendar/gui/dialogs/event-page.c
   trunk/calendar/gui/dialogs/task-details-page.c
   trunk/calendar/gui/dialogs/task-page.c
   trunk/calendar/gui/e-itip-control.c
   trunk/mail/ChangeLog
   trunk/mail/em-event.c
   trunk/mail/em-event.h
   trunk/mail/em-migrate.c

Modified: trunk/calendar/gui/alarm-notify/alarm-queue.c
==============================================================================
--- trunk/calendar/gui/alarm-notify/alarm-queue.c	(original)
+++ trunk/calendar/gui/alarm-notify/alarm-queue.c	Mon Feb  2 03:39:24 2009
@@ -477,7 +477,7 @@
 		ECalComponentAlarmInstance *instance;
 		gpointer alarm_id;
 		QueuedAlarm *qa;
-		time_t tnow = time(NULL);
+		d(time_t tnow = time(NULL));
 
 		instance = l->data;
 

Modified: trunk/calendar/gui/calendar-config.c
==============================================================================
--- trunk/calendar/gui/calendar-config.c	(original)
+++ trunk/calendar/gui/calendar-config.c	Mon Feb  2 03:39:24 2009
@@ -244,7 +244,8 @@
 			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 @@
 /* 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 ();
 

Modified: trunk/calendar/gui/calendar-config.h
==============================================================================
--- trunk/calendar/gui/calendar-config.h	(original)
+++ trunk/calendar/gui/calendar-config.h	Mon Feb  2 03:39:24 2009
@@ -76,7 +76,7 @@
 /* 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. */

Modified: trunk/calendar/gui/dialogs/event-page.c
==============================================================================
--- trunk/calendar/gui/dialogs/event-page.c	(original)
+++ trunk/calendar/gui/dialogs/event-page.c	Mon Feb  2 03:39:24 2009
@@ -1490,14 +1490,14 @@
 	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;

Modified: trunk/calendar/gui/dialogs/task-details-page.c
==============================================================================
--- trunk/calendar/gui/dialogs/task-details-page.c	(original)
+++ trunk/calendar/gui/dialogs/task-details-page.c	Mon Feb  2 03:39:24 2009
@@ -430,7 +430,7 @@
 	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;

Modified: trunk/calendar/gui/dialogs/task-page.c
==============================================================================
--- trunk/calendar/gui/dialogs/task-page.c	(original)
+++ trunk/calendar/gui/dialogs/task-page.c	Mon Feb  2 03:39:24 2009
@@ -1353,7 +1353,7 @@
 	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;

Modified: trunk/calendar/gui/e-itip-control.c
==============================================================================
--- trunk/calendar/gui/e-itip-control.c	(original)
+++ trunk/calendar/gui/e-itip-control.c	Mon Feb  2 03:39:24 2009
@@ -661,7 +661,7 @@
 	struct tm tmp_tm;
 	char time_buf[64];
 	icaltimezone *zone = NULL;
-	char *display_name;
+	const char *display_name;
 
 	priv = itip->priv;
 

Modified: trunk/mail/em-event.c
==============================================================================
--- trunk/mail/em-event.c	(original)
+++ trunk/mail/em-event.c	Mon Feb  2 03:39:24 2009
@@ -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>

Modified: trunk/mail/em-event.h
==============================================================================
--- trunk/mail/em-event.h	(original)
+++ trunk/mail/em-event.h	Mon Feb  2 03:39:24 2009
@@ -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 @@
 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);

Modified: trunk/mail/em-migrate.c
==============================================================================
--- trunk/mail/em-migrate.c	(original)
+++ trunk/mail/em-migrate.c	Mon Feb  2 03:39:24 2009
@@ -2856,10 +2856,11 @@
 
 	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 @@
 		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_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 @@
 						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_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);