evolution-exchange r1731 - in trunk: . camel

[mbarnes svn gnome org]

Author: mbarnes
Date: Wed Aug  6 17:11:27 2008
New Revision: 1731
URL: http://svn.gnome.org/viewvc/evolution-exchange?rev=1731&view=rev

Log:
2008-08-06  Matthew Barnes  <mbarnes redhat com>

	** Fixes part of bug #545877

	* configure.in:
	Bump eds_minimum_version to 2.23.90 for CamelDList.

	* camel/camel-exchange-journal.c:
	* camel/camel-exchange-journal.h:
	Use CamelDList instead of EDList.



Modified:
   trunk/ChangeLog
   trunk/camel/camel-exchange-journal.c
   trunk/camel/camel-exchange-journal.h
   trunk/configure.in

Modified: trunk/camel/camel-exchange-journal.c
==============================================================================
--- trunk/camel/camel-exchange-journal.c	(original)
+++ trunk/camel/camel-exchange-journal.c	Wed Aug  6 17:11:27 2008
@@ -52,10 +52,10 @@
 static void camel_exchange_journal_init (CamelExchangeJournal *journal, CamelExchangeJournalClass *klass);
 static void camel_exchange_journal_finalize (CamelObject *object);
 
-static void exchange_entry_free (CamelOfflineJournal *journal, EDListNode *entry);
-static EDListNode *exchange_entry_load (CamelOfflineJournal *journal, FILE *in);
-static int exchange_entry_write (CamelOfflineJournal *journal, EDListNode *entry, FILE *out);
-static int exchange_entry_play (CamelOfflineJournal *journal, EDListNode *entry, CamelException *ex);
+static void exchange_entry_free (CamelOfflineJournal *journal, CamelDListNode *entry);
+static CamelDListNode *exchange_entry_load (CamelOfflineJournal *journal, FILE *in);
+static int exchange_entry_write (CamelOfflineJournal *journal, CamelDListNode *entry, FILE *out);
+static int exchange_entry_play (CamelOfflineJournal *journal, CamelDListNode *entry, CamelException *ex);
 
 
 static CamelOfflineJournalClass *parent_class = NULL;
@@ -106,7 +106,7 @@
 }
 
 static void
-exchange_entry_free (CamelOfflineJournal *journal, EDListNode *entry)
+exchange_entry_free (CamelOfflineJournal *journal, CamelDListNode *entry)
 {
 	CamelExchangeJournalEntry *exchange_entry = (CamelExchangeJournalEntry *) entry;
 
@@ -116,7 +116,7 @@
 	g_free (exchange_entry);
 }
 
-static EDListNode *
+static CamelDListNode *
 exchange_entry_load (CamelOfflineJournal *journal, FILE *in)
 {
 	CamelExchangeJournalEntry *entry;
@@ -164,7 +164,7 @@
 		goto exception;
 	}
 
-	return (EDListNode *) entry;
+	return (CamelDListNode *) entry;
 
  exception:
 
@@ -177,7 +177,7 @@
 }
 
 static int
-exchange_entry_write (CamelOfflineJournal *journal, EDListNode *entry, FILE *out)
+exchange_entry_write (CamelOfflineJournal *journal, CamelDListNode *entry, FILE *out)
 {
 	CamelExchangeJournalEntry *exchange_entry = (CamelExchangeJournalEntry *) entry;
 	char *tmp;
@@ -390,7 +390,7 @@
 }
 
 static int
-exchange_entry_play (CamelOfflineJournal *journal, EDListNode *entry, CamelException *ex)
+exchange_entry_play (CamelOfflineJournal *journal, CamelDListNode *entry, CamelException *ex)
 {
 	CamelExchangeJournalEntry *exchange_entry = (CamelExchangeJournalEntry *) entry;
 
@@ -493,7 +493,7 @@
 	entry->type = CAMEL_EXCHANGE_JOURNAL_ENTRY_APPEND;
 	entry->uid = uid;
 
-	e_dlist_addtail (&journal->queue, (EDListNode *) entry);
+	camel_dlist_addtail (&journal->queue, (CamelDListNode *) entry);
 
 	if (appended_uid)
 		*appended_uid = g_strdup (uid);
@@ -507,7 +507,7 @@
 			      gboolean delete_original)
 {
 	CamelOfflineJournal *journal = folder->journal;
-	EDListNode *entry, *next;
+	CamelDListNode *entry, *next;
 	CamelExchangeJournalEntry *ex_entry;
 	const char *offline_uid = *uid;
 	int type = -1;
@@ -531,7 +531,7 @@
 			}
 
 			if (delete_original) {
-				e_dlist_remove (entry);
+				camel_dlist_remove (entry);
 			}
 		}
 
@@ -576,7 +576,7 @@
 		entry->delete_original = delete_original;
 	}
 
-	e_dlist_addtail (&journal->queue, (EDListNode *) entry);
+	camel_dlist_addtail (&journal->queue, (CamelDListNode *) entry);
 
 	if (transferred_uid)
 		*transferred_uid = g_strdup (uid);
@@ -600,6 +600,6 @@
 	entry->flags = flags;
 	entry->set = set;
 
-	e_dlist_addtail (&journal->queue, (EDListNode *) entry);
+	camel_dlist_addtail (&journal->queue, (CamelDListNode *) entry);
 }
 

Modified: trunk/camel/camel-exchange-journal.h
==============================================================================
--- trunk/camel/camel-exchange-journal.h	(original)
+++ trunk/camel/camel-exchange-journal.h	Wed Aug  6 17:11:27 2008
@@ -26,6 +26,7 @@
 
 #include <glib.h>
 
+#include <camel/camel-list-utils.h>
 #include <camel/camel-offline-journal.h>
 #include <camel/camel-mime-message.h>
 #include "camel-exchange-folder.h"
@@ -55,7 +56,7 @@
 };
 
 struct _CamelExchangeJournalEntry {
-	EDListNode node;
+	CamelDListNode node;
 
 	int type;
 

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Wed Aug  6 17:11:27 2008
@@ -8,7 +8,7 @@
 # Required Package Versions
 m4_define([glib_minimum_version], [2.16.0])
 m4_define([gtk_minimum_version], [2.10.0])
-m4_define([eds_minimum_version], [2.23.5])
+m4_define([eds_minimum_version], [2.23.90])
 m4_define([gconf_minimum_version], [2.0.0])             # XXX Just a Guess
 m4_define([libbonobo_minimum_version], [2.20.3])
 m4_define([libglade_minimum_version], [2.0.0])          # XXX Just a Guess