From: Michael Zucci <zucchi@src.gnome.org>
Date: Tue, 30 May 2000 01:05:18 +0000 (+0000)
Subject: diff -r1.206 ChangeLog
X-Git-Tag: upstream/3.7.4~11741
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=adec3975b400b572e5e5eab0ebc32c73f464cb60;p=platform%2Fupstream%2Fevolution-data-server.git

diff -r1.206 ChangeLog
2a3,9
> 	* camel-store.c (camel_store_init): Move it to here.  If this
> 	level is going to maintain it, it should set it up.  Lets see what
> 	caching folders breaks :(
>
> 	* providers/pop3/camel-pop3-store.c (camel_pop3_store_init): Dont
> 	init folder cache here.
>
7a15,16
> 	(camel_mbox_summary_expunge): Remove some debug, and dont offset
> 	frompos?
---

diff --git a/camel/ChangeLog b/camel/ChangeLog
index 29a64e8..2b1fffd 100644
--- a/camel/ChangeLog
+++ b/camel/ChangeLog
@@ -1,10 +1,19 @@
 2000-05-29  Not Zed  <NotZed@HelixCode.com>
 
+	* camel-store.c (camel_store_init): Move it to here.  If this
+	level is going to maintain it, it should set it up.  Lets see what
+	caching folders breaks :(
+
+	* providers/pop3/camel-pop3-store.c (camel_pop3_store_init): Dont
+	init folder cache here.
+
 	* providers/mbox/camel-mbox-summary.c
 	(camel_mbox_summary_expunge): Make sure we copy messages which are
 	still intact to the new folder.
 	(camel_mbox_summary_expunge): Update the frompos as well when
 	moving the content.
+	(camel_mbox_summary_expunge): Remove some debug, and dont offset
+	frompos?
 
 	* providers/vee/camel-vee-folder.c (vee_folder_build): Check the
 	searched folder is open before trying to search it.
diff --git a/camel/camel-store.c b/camel/camel-store.c
index a303920..87384a6 100644
--- a/camel/camel-store.c
+++ b/camel/camel-store.c
@@ -70,6 +70,13 @@ camel_store_class_init (CamelStoreClass *camel_store_class)
 	gtk_object_class->finalize = finalize;
 }
 
+static void
+camel_store_init (void *o, void *k)
+{
+	CamelStore *store = o;
+
+	store->folders = g_hash_table_new (g_str_hash, g_str_equal);
+}
 
 GtkType
 camel_store_get_type (void)
diff --git a/camel/providers/mbox/camel-mbox-summary.c b/camel/providers/mbox/camel-mbox-summary.c
index 4ee38b2..a5cd61b 100644
--- a/camel/providers/mbox/camel-mbox-summary.c
+++ b/camel/providers/mbox/camel-mbox-summary.c
@@ -683,13 +683,13 @@ camel_mbox_summary_expunge(CamelMboxSummary *mbs)
 					goto error;
 				}
 				/* update from pos here? */
-				info->frompos += offset;
+				/*info->frompos += offset;*/
 			} else {
 				d(printf("Nothing to do for this message\n"));
 			}
 		}
 		if (!quick && info!=NULL && offset!=0) {
-			printf("offsetting content: %d\n", offset);
+			d(printf("offsetting content: %d\n", offset));
 			camel_folder_summary_offset_content(info->info.content, offset);
 			d(printf("pos = %d, endpos = %d, bodypos = %d\n",
 				 info->info.content->pos,
diff --git a/camel/providers/pop3/camel-pop3-store.c b/camel/providers/pop3/camel-pop3-store.c
index 9cbe666..4b4a4ac 100644
--- a/camel/providers/pop3/camel-pop3-store.c
+++ b/camel/providers/pop3/camel-pop3-store.c
@@ -105,7 +105,6 @@ camel_pop3_store_init (gpointer object, gpointer klass)
 
 	service->url_flags = ( CAMEL_SERVICE_URL_NEED_USER |
 			       CAMEL_SERVICE_URL_NEED_HOST );
-	store->folders = g_hash_table_new (g_str_hash, g_str_equal);
 }