From 76c3cb95c73cc67709bf77d81697b69d4d0c0a04 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Fri, 6 Apr 2012 00:16:58 -0400 Subject: Remove EMSyncStream. Not needed now that Evolution uses WebKit. Been wanting to get rid of this for years... --- mail/Makefile.am | 2 - mail/em-sync-stream.c | 243 -------------------------------------------------- mail/em-sync-stream.h | 85 ------------------ 3 files changed, 330 deletions(-) delete mode 100644 mail/em-sync-stream.c delete mode 100644 mail/em-sync-stream.h diff --git a/mail/Makefile.am b/mail/Makefile.am index e6eccc83fe..72ca86708b 100644 --- a/mail/Makefile.am +++ b/mail/Makefile.am @@ -87,7 +87,6 @@ mailinclude_HEADERS = \ em-format-html.h \ em-search-context.h \ em-subscription-editor.h \ - em-sync-stream.h \ em-utils.h \ em-vfolder-editor-context.h \ em-vfolder-editor-rule.h \ @@ -153,7 +152,6 @@ libevolution_mail_la_SOURCES = \ em-format-html.c \ em-search-context.c \ em-subscription-editor.c \ - em-sync-stream.c \ em-utils.c \ em-vfolder-editor-context.c \ em-vfolder-editor-rule.c \ diff --git a/mail/em-sync-stream.c b/mail/em-sync-stream.c deleted file mode 100644 index 841d890e41..0000000000 --- a/mail/em-sync-stream.c +++ /dev/null @@ -1,243 +0,0 @@ -/* - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) version 3. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see - * - * - * Authors: - * Jeffrey Stedfast - * Michael Zucchi - * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) - * - */ - -#ifdef HAVE_CONFIG_H -#include -#endif - -#include "em-sync-stream.h" - -#include -#include -#include -#include - -#include - -enum _write_msg_t { - EMSS_WRITE, - EMSS_FLUSH, - EMSS_CLOSE -}; - -struct _write_msg { - EMSyncStream *emss; - GError *error; - EFlag *done; - - enum _write_msg_t op; - - const gchar *string; - gsize len; -}; - -G_DEFINE_TYPE (EMSyncStream, em_sync_stream, CAMEL_TYPE_STREAM) - -static gboolean -sync_stream_process_message (struct _write_msg *msg) -{ - struct _EMSyncStream *emss = msg->emss; - - if (emss->cancel) { - /* Do not pass data to the child if we are canceled. */ - e_flag_set (msg->done); - - return FALSE; - } - - /* Force out any pending data before doing anything else. */ - if (emss->buffer != NULL && emss->buffer->len > 0) { - EM_SYNC_STREAM_GET_CLASS (emss)->sync_write ( - CAMEL_STREAM (emss), emss->buffer->str, - emss->buffer->len, &msg->error); - g_string_set_size (emss->buffer, 0); - } - - switch (msg->op) { - case EMSS_WRITE: - EM_SYNC_STREAM_GET_CLASS (emss)->sync_write ( - CAMEL_STREAM (emss), msg->string, - msg->len, &msg->error); - break; - case EMSS_FLUSH: - EM_SYNC_STREAM_GET_CLASS (emss)->sync_flush ( - CAMEL_STREAM (emss), &msg->error); - break; - case EMSS_CLOSE: - EM_SYNC_STREAM_GET_CLASS (emss)->sync_close ( - CAMEL_STREAM (emss), &msg->error); - break; - } - - emss->idle_id = 0; - e_flag_set (msg->done); - - return FALSE; -} - -static void -sync_stream_sync_op (EMSyncStream *emss, - enum _write_msg_t op, - const gchar *string, - gsize len, - GError **error) -{ - struct _write_msg msg; - - msg.done = e_flag_new (); - msg.error = NULL; - msg.emss = emss; - msg.op = op; - msg.string = string; - msg.len = len; - - g_object_ref (emss); - - if (emss->idle_id) - g_source_remove (emss->idle_id); - emss->idle_id = g_idle_add ((GSourceFunc) sync_stream_process_message, &msg); - - e_flag_wait (msg.done); - e_flag_free (msg.done); - - if (msg.error != NULL) - g_propagate_error (error, msg.error); - - g_object_unref (emss); -} - -static void -sync_stream_finalize (GObject *object) -{ - EMSyncStream *emss = EM_SYNC_STREAM (object); - - if (emss->buffer != NULL) - g_string_free (emss->buffer, TRUE); - if (emss->idle_id) - g_source_remove (emss->idle_id); -} - -static gssize -sync_stream_write (CamelStream *stream, - const gchar *string, - gsize len, - GCancellable *cancellable, - GError **error) -{ - EMSyncStream *emss = EM_SYNC_STREAM (stream); - - if (emss->cancel) { - g_set_error ( - error, G_IO_ERROR, G_IO_ERROR_CANCELLED, - _("Canceled")); - return -1; - } - - if (mail_in_main_thread ()) { - EM_SYNC_STREAM_GET_CLASS (emss)->sync_write (stream, string, len, error); - } else if (emss->buffer != NULL) { - if (len < (emss->buffer->allocated_len - emss->buffer->len)) - g_string_append_len (emss->buffer, string, len); - else - sync_stream_sync_op (emss, EMSS_WRITE, string, len, error); - } else { - sync_stream_sync_op (emss, EMSS_WRITE, string, len, error); - } - - return (gssize) len; -} - -static gint -sync_stream_flush (CamelStream *stream, - GCancellable *cancellable, - GError **error) -{ - EMSyncStream *emss = EM_SYNC_STREAM (stream); - - if (emss->cancel) { - g_set_error ( - error, G_IO_ERROR, G_IO_ERROR_CANCELLED, - _("Canceled")); - return -1; - } - - if (mail_in_main_thread ()) - return EM_SYNC_STREAM_GET_CLASS (emss)->sync_flush (stream, error); - else - sync_stream_sync_op (emss, EMSS_FLUSH, NULL, 0, error); - - return 0; -} - -static gint -sync_stream_close (CamelStream *stream, - GCancellable *cancellable, - GError **error) -{ - EMSyncStream *emss = EM_SYNC_STREAM (stream); - - if (emss->cancel) { - g_set_error ( - error, G_IO_ERROR, G_IO_ERROR_CANCELLED, - _("Canceled")); - return -1; - } - - emss->idle_id = 0; - - if (mail_in_main_thread ()) - return EM_SYNC_STREAM_GET_CLASS (emss)->sync_close (stream, error); - else - sync_stream_sync_op (emss, EMSS_CLOSE, NULL, 0, error); - - return 0; -} - -static void -em_sync_stream_class_init (EMSyncStreamClass *class) -{ - GObjectClass *object_class; - CamelStreamClass *stream_class; - - object_class = G_OBJECT_CLASS (class); - object_class->finalize = sync_stream_finalize; - - stream_class = CAMEL_STREAM_CLASS (class); - stream_class->write = sync_stream_write; - stream_class->flush = sync_stream_flush; - stream_class->close = sync_stream_close; -} - -static void -em_sync_stream_init (EMSyncStream *emss) -{ -} - -void -em_sync_stream_set_buffer_size (EMSyncStream *emss, - gsize size) -{ - if (emss->buffer != NULL) - g_string_free (emss->buffer, TRUE); - emss->buffer = g_string_sized_new (size); -} diff --git a/mail/em-sync-stream.h b/mail/em-sync-stream.h deleted file mode 100644 index 122a461664..0000000000 --- a/mail/em-sync-stream.h +++ /dev/null @@ -1,85 +0,0 @@ -/* - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) version 3. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see - * - * - * Authors: - * Michael Zucchi - * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) - * - */ - -/* -EMSyncStream - Abstract class. -A synchronous stream, that can be written from any thread, but whose -requests are always handled in the main gui thread in the correct order. -*/ - -#ifndef EM_SYNC_STREAM_H -#define EM_SYNC_STREAM_H - -#include - -/* Standard GObject macros */ -#define EM_TYPE_SYNC_STREAM \ - (em_sync_stream_get_type ()) -#define EM_SYNC_STREAM(obj) \ - (G_TYPE_CHECK_INSTANCE_CAST \ - ((obj), EM_TYPE_SYNC_STREAM, EMSyncStream)) -#define EM_SYNC_STREAM_CLASS(cls) \ - (G_TYPE_CHECK_CLASS_CAST \ - ((cls), EM_TYPE_SYNC_STREAM, EMSyncStreamClass)) -#define EM_IS_SYNC_STREAM(obj) \ - (G_TYPE_CHECK_INSTANCE_TYPE \ - ((obj), EM_TYPE_SYNC_STREAM)) -#define EM_IS_SYNC_STREAM_CLASS(cls) \ - (G_TYPE_CHECK_CLASS_TYPE \ - ((cls), EM_TYPE_SYNC_STREAM)) -#define EM_SYNC_STREAM_GET_CLASS(obj) \ - (G_TYPE_INSTANCE_GET_CLASS \ - ((obj), EM_TYPE_SYNC_STREAM, EMSyncStreamClass)) - -G_BEGIN_DECLS - -typedef struct _EMSyncStream EMSyncStream; -typedef struct _EMSyncStreamClass EMSyncStreamClass; - -struct _EMSyncStream { - CamelStream parent; - GString *buffer; - gboolean cancel; - guint idle_id; -}; - -struct _EMSyncStreamClass { - CamelStreamClass parent_class; - - gssize (*sync_write) (CamelStream *stream, - const gchar *string, - gsize len, - GError **error); - gint (*sync_close) (CamelStream *stream, - GError **error); - gint (*sync_flush) (CamelStream *stream, - GError **error); -}; - -GType em_sync_stream_get_type (void); -void em_sync_stream_set_buffer_size (EMSyncStream *stream, - gsize size); - -G_END_DECLS - -#endif /* EM_SYNC_STREAM_H */ -- cgit v1.2.3