evolution r37321 - in branches/gnome-2-24: calendar calendar/gui/alarm-notify mail

[mbarnes svn gnome org]

Author: mbarnes
Date: Wed Feb 25 03:48:11 2009
New Revision: 37321
URL: http://svn.gnome.org/viewvc/evolution?rev=37321&view=rev

Log:
2009-02-24  Matthew Barnes  <mbarnes redhat com>

	* mail/em-migrate.c: Don't mix declarations and code.

	* calendar/gui/alarm-notify/alarm-queue.c (add_component_alarm):
	Hide a debug-only variable.  Compiler thinks it's unused.



Modified:
   branches/gnome-2-24/calendar/ChangeLog
   branches/gnome-2-24/calendar/gui/alarm-notify/alarm-queue.c
   branches/gnome-2-24/mail/ChangeLog
   branches/gnome-2-24/mail/em-migrate.c

Modified: branches/gnome-2-24/calendar/gui/alarm-notify/alarm-queue.c
==============================================================================
--- branches/gnome-2-24/calendar/gui/alarm-notify/alarm-queue.c	(original)
+++ branches/gnome-2-24/calendar/gui/alarm-notify/alarm-queue.c	Wed Feb 25 03:48:11 2009
@@ -479,7 +479,7 @@
 		ECalComponentAlarmInstance *instance;
 		gpointer alarm_id;
 		QueuedAlarm *qa;
-		time_t tnow = time(NULL);
+		d(time_t tnow = time(NULL));
 
 		instance = l->data;
 

Modified: branches/gnome-2-24/mail/em-migrate.c
==============================================================================
--- branches/gnome-2-24/mail/em-migrate.c	(original)
+++ branches/gnome-2-24/mail/em-migrate.c	Wed Feb 25 03:48:11 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);
 		
@@ -2958,6 +2959,7 @@
 
 		if (info) {
 				struct migrate_folders_to_db_structure migrate_dbs;
+				GThread *thread;
 
 				if (g_str_has_suffix (((CamelService *)store)->url->path, ".evolution/mail/local"))
 						migrate_dbs.is_local_store = TRUE;
@@ -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);
@@ -2996,6 +2997,7 @@
 						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) {
 								struct migrate_folders_to_db_structure migrate_dbs;
+								GThread *thread;
 
 								migrate_dbs.ex = ex;
 								migrate_dbs.account_name = account->name;
@@ -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);