remove some non-error case debugging messages.

	* remove some non-error case debugging messages.

svn path=/trunk/; revision=3904

5 files changed, 10 insertions, 35 deletions

diff --git a/camel/ChangeLog b/camel/ChangeLog
index 7ffdc5e58e..37e7454f1c 100644
--- a/camel/ChangeLog
+++ b/camel/ChangeLog
@@ -1,3 +1,11 @@
+2000-07-05  Dan Winship  <danw@helixcode.com>
+
+	* camel-folder-summary.c:
+	* camel-session.c:
+	* providers/mbox/camel-mbox-folder.c:
+	* providers/mbox/camel-mbox-summary.c: Remove some non-error case
+	debugging-type messages.
+
 2000-07-05  Ettore Perazzoli  <ettore@helixcode.com>
 
 	* providers/mbox/camel-mbox-summary.c (d): Define to empty so that
diff --git a/camel/camel-folder-summary.c b/camel/camel-folder-summary.c
index 027984e7ef..18605fb551 100644
--- a/camel/camel-folder-summary.c
+++ b/camel/camel-folder-summary.c
@@ -306,22 +306,16 @@ camel_folder_summary_load(CamelFolderSummary *s)
 
 	g_assert(s->summary_path);
 
-	printf("loading summary\n");
-
 	in = fopen(s->summary_path, "r");
 	if ( in == NULL ) {
 		return -1;
 	}
 
-	printf("loading header\n");
-
 	if ( ((CamelFolderSummaryClass *)((GtkObject *)s)->klass)->summary_header_load(s, in) == -1) {
 		fclose(in);
 		return -1;
 	}
 
-	printf("loading content\n");
-
 	/* now read in each message ... */
 	/* FIXME: check returns */
 	for (i=0;i<s->saved_count;i++) {
@@ -369,14 +363,8 @@ camel_folder_summary_save(CamelFolderSummary *s)
 
 	g_assert(s->summary_path);
 
-	printf("saving summary? '%s'\n", s->summary_path);
-
-	if ((s->flags & CAMEL_SUMMARY_DIRTY) == 0) {
-		printf("nup\n");
+	if ((s->flags & CAMEL_SUMMARY_DIRTY) == 0)
 		return 0;
-	}
-
-	printf("yep\n");
 
 	fd = open(s->summary_path, O_RDWR|O_CREAT, 0600);
 	if (fd == -1)
diff --git a/camel/camel-session.c b/camel/camel-session.c
index 3ee5766143..ec99e17964 100644
--- a/camel/camel-session.c
+++ b/camel/camel-session.c
@@ -244,15 +244,12 @@ camel_session_get_service (CamelSession *session, const char *url_string,
 	}
 	
 	/* Now look up the service in the provider's cache */
-	printf ("looking up service in cache: \"%s\"\n", camel_url_to_string (url, FALSE));
 	service = g_hash_table_lookup (provider->service_cache, url);
 	if (service != NULL) {
-		printf ("found!!\n");
 		camel_url_free (url);
 		gtk_object_ref (GTK_OBJECT (service));
 		return service;
 	}
-	printf ("not found, creating service\n");
 
 	service = camel_service_new (provider->object_types[type], session, url, ex);
 	if (service) {
diff --git a/camel/providers/mbox/camel-mbox-folder.c b/camel/providers/mbox/camel-mbox-folder.c
index 63d0d2cfb9..d7ee9c2376 100644
--- a/camel/providers/mbox/camel-mbox-folder.c
+++ b/camel/providers/mbox/camel-mbox-folder.c
@@ -211,9 +211,7 @@ mbox_init (CamelFolder *folder, CamelStore *parent_store,
 	/* if we have no index file, force it */
 	forceindex = stat(mbox_folder->index_file_path, &st) == -1;
 
-	printf("loading ibex\n");
 	mbox_folder->index = ibex_open(mbox_folder->index_file_path, O_CREAT|O_RDWR, 0600);
-	printf("loaded ibex\n");
 	if (mbox_folder->index == NULL) {
 		/* yes, this isn't fatal at all */
 		g_warning("Could not open/create index file: %s: indexing not performed",
@@ -221,7 +219,6 @@ mbox_init (CamelFolder *folder, CamelStore *parent_store,
 	}
 
 	/* no summary (disk or memory), and we're proverbially screwed */
-	printf("loading summary\n");
 	mbox_folder->summary = camel_mbox_summary_new (mbox_folder->summary_file_path,
 						       mbox_folder->folder_file_path, mbox_folder->index);
 	if (mbox_folder->summary == NULL
@@ -231,7 +228,6 @@ mbox_init (CamelFolder *folder, CamelStore *parent_store,
 				     "Could not create summary");
 		return;
 	}
-	printf("summary loaded\n");
 }
 
 static void
diff --git a/camel/providers/mbox/camel-mbox-summary.c b/camel/providers/mbox/camel-mbox-summary.c
index 7860d15296..5af28a63e1 100644
--- a/camel/providers/mbox/camel-mbox-summary.c
+++ b/camel/providers/mbox/camel-mbox-summary.c
@@ -31,12 +31,7 @@
 #include <stdlib.h>
 
 #define io(x)
-
-#if 0
-#  define d(x) (x)
-#else
-#  define d(x)
-#endif
+#define d(x)
 
 #define CAMEL_MBOX_SUMMARY_VERSION (0x1000)
 
@@ -293,8 +288,6 @@ summary_rebuild (CamelMboxSummary *mbs, off_t offset)
 	int fd;
 	int ok = 0;
 
-	printf ("(re)Building summary from %d (%s)\n", (int)offset, mbs->folder_path);
-
 	fd = open (mbs->folder_path, O_RDONLY);
 	if (fd == -1) {
 		printf ("%s failed to open: %s", mbs->folder_path, strerror (errno));
@@ -320,7 +313,6 @@ summary_rebuild (CamelMboxSummary *mbs, off_t offset)
 		} else {
 			gtk_object_unref (GTK_OBJECT (mp));
 			/* end of file - no content? */
-			printf("We ran out of file?\n");
 			return -1;
 		}
 	}
@@ -366,10 +358,8 @@ camel_mbox_summary_update (CamelMboxSummary *mbs, off_t offset)
 	if (ret != -1) {
 		if (camel_folder_summary_save((CamelFolderSummary *)mbs) == -1)
 			g_warning("Could not save summary: %s", strerror(errno));
-		printf("summary saved\n");
 		if (mbs->index)
 			ibex_save(mbs->index);
-		printf("ibex saved\n");
 	}
 #endif
 	return ret;
@@ -415,7 +405,6 @@ camel_mbox_summary_load (CamelMboxSummary *mbs, int forceindex)
 #endif
 		/* is the summary uptodate? */
 		if (st.st_size == mbs->folder_size && st.st_mtime == s->time) {
-			printf ("Summary time and date match mbox\n");
 			if (minstart < st.st_size) {
 				/* FIXME: Only clear the messages and reindex from this point forward */
 				printf ("REBUILDING SUMMARY: Index file is incomplete.\n");
@@ -446,13 +435,10 @@ camel_mbox_summary_load (CamelMboxSummary *mbs, int forceindex)
 	if (ret != -1) {
 		mbs->folder_size = st.st_size;
 		s->time = st.st_mtime;
-		printf ("saving summary\n");
 		if (camel_folder_summary_save (s) == -1)
 			g_warning("Could not save summary: %s", strerror (errno));
-		printf ("summary saved\n");
 		if (mbs->index)
 			ibex_save (mbs->index);
-		printf ("ibex saved\n");
 	}
 
 	return ret;