aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--camel/ChangeLog4
-rw-r--r--camel/camel-folder.c1
-rw-r--r--camel/providers/imap/camel-imap-store.c54
-rw-r--r--camel/providers/imap/camel-imap-store.h4
4 files changed, 4 insertions, 59 deletions
diff --git a/camel/ChangeLog b/camel/ChangeLog
index af600c0557..b75612447c 100644
--- a/camel/ChangeLog
+++ b/camel/ChangeLog
@@ -1,3 +1,7 @@
+2004-03-19 Not Zed <NotZed@Ximian.com>
+
+ * providers/imap/camel-imap-store.h: remove async_thread thing.
+
2004-03-17 Jeffrey Stedfast <fejj@ximian.com>
* providers/imap/camel-imap-folder.c (imap_get_message): Checking
diff --git a/camel/camel-folder.c b/camel/camel-folder.c
index 620881b1fc..e5ecbb9b8a 100644
--- a/camel/camel-folder.c
+++ b/camel/camel-folder.c
@@ -1690,7 +1690,6 @@ static CamelSessionThreadOps filter_ops = {
filter_free,
};
-
/* Event hooks that block emission when frozen */
static gboolean
folder_changed (CamelObject *obj, gpointer event_data)
diff --git a/camel/providers/imap/camel-imap-store.c b/camel/providers/imap/camel-imap-store.c
index f5f13d8883..adca07651f 100644
--- a/camel/providers/imap/camel-imap-store.c
+++ b/camel/providers/imap/camel-imap-store.c
@@ -192,55 +192,8 @@ camel_imap_store_finalize (CamelObject *object)
g_free (imap_store->base_url);
if (imap_store->storage_path)
g_free (imap_store->storage_path);
-
-#ifdef ENABLE_THREADS
- e_thread_destroy (imap_store->async_thread);
-#endif
-}
-
-#ifdef ENABLE_THREADS
-static void async_destroy(EThread *et, EMsg *em, void *data)
-{
- CamelImapStore *imap_store = data;
- CamelImapMsg *msg = (CamelImapMsg *)em;
-
- if (msg->free)
- msg->free (imap_store, msg);
-
- g_free (msg);
-}
-
-static void async_received(EThread *et, EMsg *em, void *data)
-{
- CamelImapStore *imap_store = data;
- CamelImapMsg *msg = (CamelImapMsg *)em;
-
- if (msg->receive)
- msg->receive(imap_store, msg);
-}
-
-CamelImapMsg *camel_imap_msg_new(void (*receive)(CamelImapStore *store, struct _CamelImapMsg *m),
- void (*free)(CamelImapStore *store, struct _CamelImapMsg *m),
- size_t size)
-{
- CamelImapMsg *msg;
-
- g_assert(size >= sizeof(*msg));
-
- msg = g_malloc0(size);
- msg->receive = receive;
- msg->free = free;
-
- return msg;
-}
-
-void camel_imap_msg_queue(CamelImapStore *store, CamelImapMsg *msg)
-{
- e_thread_put(store->async_thread, (EMsg *)msg);
}
-#endif
-
static void
camel_imap_store_init (gpointer object, gpointer klass)
{
@@ -257,12 +210,6 @@ camel_imap_store_init (gpointer object, gpointer klass)
imap_store->tag_prefix = imap_tag_prefix++;
if (imap_tag_prefix > 'Z')
imap_tag_prefix = 'A';
-
-#ifdef ENABLE_THREADS
- imap_store->async_thread = e_thread_new(E_THREAD_QUEUE);
- e_thread_set_msg_destroy(imap_store->async_thread, async_destroy, imap_store);
- e_thread_set_msg_received(imap_store->async_thread, async_received, imap_store);
-#endif /* ENABLE_THREADS */
}
CamelType
@@ -507,7 +454,6 @@ static struct {
{ NULL, 0 }
};
-
static gboolean
imap_get_capability (CamelService *service, CamelException *ex)
{
diff --git a/camel/providers/imap/camel-imap-store.h b/camel/providers/imap/camel-imap-store.h
index 739a74bc74..fe57553658 100644
--- a/camel/providers/imap/camel-imap-store.h
+++ b/camel/providers/imap/camel-imap-store.h
@@ -124,10 +124,6 @@ struct _CamelImapStore {
GHashTable *authtypes;
gboolean renaming;
-
-#ifdef ENABLE_THREADS
- EThread *async_thread;
-#endif
};