diff options
| -rw-r--r-- | camel/ChangeLog | 4 | ||||
| -rw-r--r-- | camel/Makefile.am | 2 | ||||
| -rw-r--r-- | camel/camel-folder-utils.c | 99 | ||||
| -rw-r--r-- | camel/camel-folder-utils.h | 44 | ||||
| -rw-r--r-- | camel/camel.h | 22 |
5 files changed, 23 insertions, 148 deletions
diff --git a/camel/ChangeLog b/camel/ChangeLog index 062c600b32..1d0c06596d 100644 --- a/camel/ChangeLog +++ b/camel/ChangeLog @@ -1,5 +1,9 @@ 2000-04-26 Dan Winship <danw@helixcode.com> + * camel.h: sync to current reality + + * camel-folder-utils.[ch]: removed + * camel-mime-utils.c (header_format_date): fix format specifier for time zone. Fix typo in month names array. diff --git a/camel/Makefile.am b/camel/Makefile.am index a395c13037..a3b2fbdfd3 100644 --- a/camel/Makefile.am +++ b/camel/Makefile.am @@ -36,7 +36,6 @@ libcamel_la_SOURCES = \ camel-data-wrapper.c \ camel-exception.c \ camel-folder.c \ - camel-folder-utils.c \ camel-medium.c \ camel-marshal-utils.c \ camel-mime-body-part.c \ @@ -80,7 +79,6 @@ libcamelinclude_HEADERS = \ camel-data-wrapper.h \ camel-exception.h \ camel-folder.h \ - camel-folder-utils.h \ camel-mime-body-part.h \ camel-marshal-utils.h \ camel-medium.h \ diff --git a/camel/camel-folder-utils.c b/camel/camel-folder-utils.c deleted file mode 100644 index 427a93c509..0000000000 --- a/camel/camel-folder-utils.c +++ /dev/null @@ -1,99 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* camel-folder-utils : Utility for camel folders */ - - -/* - * - * Author : - * Bertrand Guiheneuf <bertrand@helixcode.com> - * - * Copyright 1999, 2000 Helix Code, Inc. (http://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 - * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. - * - * 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - */ - -#include <config.h> -#include "camel-folder-utils.h" -#include "camel-mime-message.h" - - - -/* Active Message List utilities */ - -/* */ -static gint -camel_mime_message_number_cmp (gconstpointer a, gconstpointer b) -{ - CamelMimeMessage *m_a = CAMEL_MIME_MESSAGE (a); - CamelMimeMessage *m_b = CAMEL_MIME_MESSAGE (b); - - return (m_a->message_number - (m_b->message_number)); -} - - -/** - * camel_aml_expunge_messages: Expunge the message marked as deleted in an Active Message List - * @aml: active message list - * @folder: folder object - * - * Expunge the message flagged as "DELETED" in an active message list. - * The messages are not freed nor really expunged on the disk, they - * are just removed from the active message list and marked as - * "EXPUNGED". The list of the message which have been expunged is - * return in a GList which must be freed by the caller. - * To be really expunged the providers must provide or call - * folder specific methods. - * - * Return value: the list of expunged messages. - **/ -static GList * -camel_aml_expunge_messages (GList *aml, - CamelFolder *folder) -{ - CamelMimeMessage *message = NULL; - GList *message_node = NULL; - GList *next_message_node = NULL; - GList *expunged_messages = NULL; - - - message_node = aml; - /* look in folder message list which messages - * need to be expunged */ - while ( message_node) { - message = CAMEL_MIME_MESSAGE (message_node->data); - - /* we may free message_node so get the next node now */ - next_message_node = message_node->next; - - if (message) { - if (camel_mime_message_get_flag (message, "DELETED")) { - - /* remove the message from active message list */ - g_list_remove_link (aml, message_node); - g_list_free_1 (message_node); - camel_mime_message_set_flag (message, "EXPUNGED", TRUE); - expunged_messages = g_list_prepend (expunged_messages, message); - - } - } else { - g_warning ("CamelFolder::expunge warning message_node " - "contains no message\n"); - } - message_node = next_message_node; - } - - return expunged_messages; -} diff --git a/camel/camel-folder-utils.h b/camel/camel-folder-utils.h deleted file mode 100644 index f806e923cb..0000000000 --- a/camel/camel-folder-utils.h +++ /dev/null @@ -1,44 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* camel-folder-utils : Utility for camel folders */ - - -/* - * - * Author : - * Bertrand Guiheneuf <bertrand@helixcode.com> - * - * Copyright 1999, 2000 Helix Code, Inc. (http://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 - * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. - * - * 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - */ - -#ifndef CAMEL_MIME_PART_UTILS_H -#define CAMEL_MIME_PART_UTILS_H 1 - -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus }*/ - -#include "camel-folder.h" - - -#ifdef __cplusplus -} -#endif /* __cplusplus */ - -#endif /* CAMEL_MIME_PART_UTILS_H */ - diff --git a/camel/camel.h b/camel/camel.h index 69fd7eb527..2721c39e3b 100644 --- a/camel/camel.h +++ b/camel/camel.h @@ -34,30 +34,46 @@ extern "C" { #endif /* __cplusplus }*/ #include <gtk/gtk.h> -#include <camel/camel-exception.h> #include <camel/camel-data-wrapper.h> -#include <camel/camel-folder.h> +#include <camel/camel-exception.h> #include <camel/camel-folder-pt-proxy.h> +#include <camel/camel-folder.h> #include <camel/camel-marshal-utils.h> +#include <camel/camel-medium.h> #include <camel/camel-mime-body-part.h> +#include <camel/camel-mime-filter-basic.h> +#include <camel/camel-mime-filter-charset.h> +#include <camel/camel-mime-filter-index.h> +#include <camel/camel-mime-filter-save.h> +#include <camel/camel-mime-filter.h> #include <camel/camel-mime-message.h> +#include <camel/camel-mime-parser.h> +#include <camel/camel-mime-part-utils.h> #include <camel/camel-mime-part.h> +#include <camel/camel-mime-utils.h> #include <camel/camel-movemail.h> #include <camel/camel-multipart.h> #include <camel/camel-op-queue.h> #include <camel/camel-provider.h> +#include <camel/camel-recipient.h> +#include <camel/camel-seekable-stream.h> +#include <camel/camel-seekable-substream.h> #include <camel/camel-service.h> #include <camel/camel-session.h> #include <camel/camel-store.h> -#include <camel/camel-stream.h> #include <camel/camel-stream-buffer.h> +#include <camel/camel-stream-filter.h> #include <camel/camel-stream-fs.h> #include <camel/camel-stream-mem.h> +#include <camel/camel-stream.h> #include <camel/camel-thread-proxy.h> +#include <camel/camel-transport.h> #include <camel/camel-url.h> #include <camel/gmime-content-field.h> #include <camel/gmime-utils.h> #include <camel/gstring-util.h> +#include <camel/hash-table-utils.h> +#include <camel/md5-utils.h> #include <camel/string-utils.h> gint camel_init (void); |