2 files changed, 8 insertions, 18 deletions
diff --git a/camel/providers/imap/camel-imap-folder.h b/camel/providers/imap/camel-imap-folder.h
index 13471f2e23..5a54d693d2 100644
--- a/camel/providers/imap/camel-imap-folder.h
+++ b/camel/providers/imap/camel-imap-folder.h
@@ -2,10 +2,10 @@
 /* camel-imap-folder.h : Abstract class for an imap folder */
 
 /* 
+ * Author: 
+ *   Jeffrey Stedfast <fejj@helixcode.com> 
  *
- * Authors: Jeffrey Stedfast <fejj@helixcode.com> 
- *
- * Copyright (C) 2000 Helix Code .
+ * Copyright (C) 2000 Helix Code, Inc. (www.helixcode.com)
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of the GNU General Public License as 
@@ -34,12 +34,7 @@ extern "C" {
 #endif /* __cplusplus }*/
 
 #include <gtk/gtk.h>
-#include <camel/camel-folder.h>
-#include <camel/camel-folder-search.h>
-#include <libibex/ibex.h>
-#include "camel-imap-summary.h"
-
-/*  #include "camel-store.h" */
+#include "camel-folder.h"
 
 #define CAMEL_IMAP_FOLDER_TYPE     (camel_imap_folder_get_type ())
 #define CAMEL_IMAP_FOLDER(obj)     (GTK_CHECK_CAST((obj), CAMEL_IMAP_FOLDER_TYPE, CamelImapFolder))
@@ -50,17 +45,12 @@ typedef struct {
 	CamelFolder parent_object;
 
 	gchar *folder_file_path;   /* contains the messages */
-	gchar *summary_file_path;  /* contains the messages summary */
 	gchar *folder_dir_path;    /* contains the subfolders */
 	gchar *index_file_path;	   /* index of body contents */
 
-	ibex *index;		   /* index for this folder */
-	CamelImapSummary *summary;
-	CamelFolderSearch *search; /* used to run searches, we just use the real thing (tm) */
 } CamelImapFolder;
 
 
-
 typedef struct {
 	CamelFolderClass parent_class;
 
@@ -70,6 +60,7 @@ typedef struct {
 
 
 /* public methods */
+CamelFolder *camel_imap_folder_new (CamelStore *parent, CamelException *ex);
 
 /* Standard Gtk function */
 GtkType camel_imap_folder_get_type (void);
diff --git a/camel/providers/imap/camel-imap-store.c b/camel/providers/imap/camel-imap-store.c
index 22f81c189d..b5d5f71ccc 100644
--- a/camel/providers/imap/camel-imap-store.c
+++ b/camel/providers/imap/camel-imap-store.c
@@ -163,10 +163,9 @@ try_connect (CamelService *service, CamelException *ex)
 
 	fd = socket (h->h_addrtype, SOCK_STREAM, 0);
 	if (fd == -1 || connect (fd, (struct sockaddr *)&sin, sizeof(sin)) == -1) {
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_UNAVAILABLE,
-				      "Could not connect to %s (port %s): %s",
-				      service->url->host, service->url->port,
-				      strerror(errno));
+
+		/* We don't want to set a CamelException here */
+
 		if (fd > -1)
 			close (fd);