evolution-data-server r9293 - trunk/camel/providers/imap

[pchen svn gnome org]

Author: pchen
Date: Thu Aug  7 08:46:42 2008
New Revision: 9293
URL: http://svn.gnome.org/viewvc/evolution-data-server?rev=9293&view=rev

Log:
2008-08-08  Chenthill Palanisamy  <pchenthill novell com>

        * camel-imap-journal.c: (imap_entry_load), (imap_entry_write),
        (journal_decode_folder), (imap_entry_play):
        * camel-imap-search.c: (imap_body_contains): Fixed a couple of 
        warnings and removed the disabled debug printf's.                                                    



Modified:
   trunk/camel/providers/imap/ChangeLog
   trunk/camel/providers/imap/camel-imap-journal.c
   trunk/camel/providers/imap/camel-imap-search.c

Modified: trunk/camel/providers/imap/camel-imap-journal.c
==============================================================================
--- trunk/camel/providers/imap/camel-imap-journal.c	(original)
+++ trunk/camel/providers/imap/camel-imap-journal.c	Thu Aug  7 08:46:42 2008
@@ -46,7 +46,7 @@
 #include "camel-imap-journal.h"
 #include "camel-imap-folder.h"
 
-#define d(x) x
+#define d(x) 
 
 static void camel_imap_journal_class_init (CamelIMAPJournalClass *klass);
 static void camel_imap_journal_init (CamelIMAPJournal *journal, CamelIMAPJournalClass *klass);
@@ -186,7 +186,7 @@
 	CamelIMAPJournalEntry *entry;
 	
 	
-	d(g_print ("CHEN DEBUG: Loading to  the journal \n"));
+	d(g_print ("DEBUG: Loading to  the journal \n"));
 	
 	entry = g_malloc0 (sizeof (CamelIMAPJournalEntry));
 	
@@ -216,7 +216,6 @@
 		goto exception;
 	}
 
-	d(g_print ("CHEN DEBUG: Atlast got one entry \n"));
 	return (CamelDListNode *) entry;
 	
  exception:
@@ -253,7 +252,7 @@
 	if (camel_file_util_encode_uint32 (out, imap_entry->type) == -1)
 		return -1;
 	
-	d(g_print ("CHEN DEBUG: Writing to  the journal \n"));
+	d(g_print ("DEBUG: Writing to  the journal \n"));
 	switch (imap_entry->type) {
 	case CAMEL_IMAP_JOURNAL_ENTRY_EXPUNGE:
 		uids = imap_entry->uids;
@@ -295,7 +294,7 @@
 		folder = camel_store_get_folder (CAMEL_STORE (CAMEL_OFFLINE_JOURNAL (journal)->folder->parent_store),
 						 name, 0, &ex);
 		if (folder)
-			g_hash_table_insert (journal->folders, name, folder);
+			g_hash_table_insert (journal->folders, (char *) name, folder);
 		else {
 			msg = g_strdup_printf (_("Could not open '%s':\n%s\nChanges made to this folder will not be resynchronized."),
 					       name, camel_exception_get_description (&ex));
@@ -315,7 +314,7 @@
 {
 	CamelIMAPJournalEntry *imap_entry = (CamelIMAPJournalEntry *) entry;
 	
-	d(g_print ("CHEN DEBUG: PLaying to  the journal \n"));
+	d(g_print ("DEBUG: PLaying the journal \n"));
 
 	switch (imap_entry->type) {
 	case CAMEL_IMAP_JOURNAL_ENTRY_EXPUNGE:

Modified: trunk/camel/providers/imap/camel-imap-search.c
==============================================================================
--- trunk/camel/providers/imap/camel-imap-search.c	(original)
+++ trunk/camel/providers/imap/camel-imap-search.c	Thu Aug  7 08:46:42 2008
@@ -439,7 +439,7 @@
 	/* TODO: Cache offline searches too? */
 
 	/* If offline, search using the parent class, which can handle this manually */
-	if (!camel_disco_store_check_online (CAMEL_DISCO_STORE (store), NULL))
+	if (CAMEL_OFFLINE_STORE (store)->state == CAMEL_OFFLINE_STORE_NETWORK_UNAVAIL)
 		return imap_search_parent_class->body_contains(f, argc, argv, s);
 
 	/* optimise the match "" case - match everything */