aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--camel/ChangeLog24
-rw-r--r--camel/camel-folder-summary.c4
-rw-r--r--camel/camel-folder-summary.h2
-rw-r--r--camel/camel-mime-message.h52
-rw-r--r--camel/camel-mime-parser.c2
-rw-r--r--camel/camel-seekable-substream.c2
-rw-r--r--camel/providers/imap/camel-imap-auth.c2
-rw-r--r--camel/providers/imap/camel-imap-folder.c3
-rw-r--r--camel/providers/imap/camel-imap-store.c3
9 files changed, 68 insertions, 26 deletions
diff --git a/camel/ChangeLog b/camel/ChangeLog
index c25006880b..8b00382783 100644
--- a/camel/ChangeLog
+++ b/camel/ChangeLog
@@ -1,3 +1,27 @@
+2000-12-12 Christopher James Lahey <clahey@helixcode.com>
+
+ * camel-folder-summary.c, camel-folder-summary.h: Added #ifndef
+ NO_WARNINGS around a #warning. Added (void) to the prototype and
+ declaration of camel_message_info_new.
+
+ * camel-mime-message.h: Added an include for
+ camel-mime-filter-bestenc.h. Added a prototype for
+ camel_mime_message_set_best_encoding. Reformatted prototypes to
+ line up.
+
+ * camel-mime-parser.c: Added #if d(!)0 around the states string
+ lookup table since it's only used in debugging output.
+
+ * camel-seekable-substream.c (stream_flush): Added a cast.
+
+ * providers/imap/camel-imap-auth.c: Added #include <netinet/in.h>.
+
+ * providers/imap/camel-imap-folder.c (imap_refresh_info): Made uid
+ and flags const to fix warnings here.
+
+ * providers/imap/camel-imap-store.c (get_folder_info): Made p
+ const to fix warnings here.
+
2000-12-12 Dan Winship <danw@helixcode.com>
* tests/lib/Makefile.am: Add missing .h file. (From campd.)
diff --git a/camel/camel-folder-summary.c b/camel/camel-folder-summary.c
index 9a6a96c273..6ee83348a4 100644
--- a/camel/camel-folder-summary.c
+++ b/camel/camel-folder-summary.c
@@ -1379,7 +1379,9 @@ static CamelMessageContentInfo * content_info_new_from_message(CamelFolderSummar
return ci;
}
+#ifndef NO_WARNINGS
#warning "These should be made private again, easy to fix (used in filter-driver)"
+#endif
char *
camel_folder_summary_format_address(struct _header_raw *h, const char *name)
{
@@ -2206,7 +2208,7 @@ camel_system_flag_get (guint32 flags, const char *name)
* Returns a new CamelMessageInfo structure.
**/
CamelMessageInfo *
-camel_message_info_new ()
+camel_message_info_new (void)
{
CamelMessageInfo *info;
diff --git a/camel/camel-folder-summary.h b/camel/camel-folder-summary.h
index 9e3d132c50..4aeb98f687 100644
--- a/camel/camel-folder-summary.h
+++ b/camel/camel-folder-summary.h
@@ -280,7 +280,7 @@ void camel_tag_list_free(CamelTag **list);
/* message info utils for working with pseudo-messageinfo structures
NOTE: These cannot be added to a real summary object, but suffice for all
other external interfaces that use message info's */
-CamelMessageInfo *camel_message_info_new ();
+CamelMessageInfo *camel_message_info_new (void);
CamelMessageInfo *camel_message_info_new_from_header (struct _header_raw *header);
void camel_message_info_dup_to(const CamelMessageInfo *from, CamelMessageInfo *to);
void camel_message_info_free(CamelMessageInfo *mi);
diff --git a/camel/camel-mime-message.h b/camel/camel-mime-message.h
index 4cf7e060d0..b386632a86 100644
--- a/camel/camel-mime-message.h
+++ b/camel/camel-mime-message.h
@@ -35,6 +35,7 @@ extern "C" {
#include <camel/camel-mime-part.h>
#include <camel/camel-mime-utils.h>
#include <camel/camel-internet-address.h>
+#include <camel/camel-mime-filter-bestenc.h>
#define CAMEL_RECIPIENT_TYPE_TO "To"
#define CAMEL_RECIPIENT_TYPE_CC "Cc"
@@ -80,32 +81,41 @@ typedef struct {
/* Standard Camel function */
-CamelType camel_mime_message_get_type (void);
+CamelType camel_mime_message_get_type (void);
/* public methods */
-CamelMimeMessage * camel_mime_message_new (void);
-
-
-void camel_mime_message_set_date (CamelMimeMessage *mime_message, time_t date, int offset);
-
-time_t camel_mime_message_get_date (CamelMimeMessage *mime_message, int *offset);
-time_t camel_mime_message_get_date_received (CamelMimeMessage *mime_message, int *offset);
-
-void camel_mime_message_set_reply_to (CamelMimeMessage *mime_message, const CamelInternetAddress *reply_to);
-const CamelInternetAddress *camel_mime_message_get_reply_to (CamelMimeMessage *mime_message);
-void camel_mime_message_set_subject (CamelMimeMessage *mime_message,
- const char *subject);
-const char * camel_mime_message_get_subject (CamelMimeMessage *mime_message);
-void camel_mime_message_set_from (CamelMimeMessage *mime_message, const CamelInternetAddress *from);
-const CamelInternetAddress *camel_mime_message_get_from (CamelMimeMessage *mime_message);
-
-const CamelInternetAddress *camel_mime_message_get_recipients (CamelMimeMessage *mime_message, const char *type);
-void camel_mime_message_set_recipients (CamelMimeMessage *mime_message, const char *type, const CamelInternetAddress *r);
+CamelMimeMessage *camel_mime_message_new (void);
+void camel_mime_message_set_date (CamelMimeMessage *mime_message,
+ time_t date,
+ int offset);
+time_t camel_mime_message_get_date (CamelMimeMessage *mime_message,
+ int *offset);
+time_t camel_mime_message_get_date_received (CamelMimeMessage *mime_message,
+ int *offset);
+void camel_mime_message_set_reply_to (CamelMimeMessage *mime_message,
+ const CamelInternetAddress *reply_to);
+const CamelInternetAddress *camel_mime_message_get_reply_to (CamelMimeMessage *mime_message);
+
+void camel_mime_message_set_subject (CamelMimeMessage *mime_message,
+ const char *subject);
+const char *camel_mime_message_get_subject (CamelMimeMessage *mime_message);
+void camel_mime_message_set_from (CamelMimeMessage *mime_message,
+ const CamelInternetAddress *from);
+const CamelInternetAddress *camel_mime_message_get_from (CamelMimeMessage *mime_message);
+
+const CamelInternetAddress *camel_mime_message_get_recipients (CamelMimeMessage *mime_message,
+ const char *type);
+void camel_mime_message_set_recipients (CamelMimeMessage *mime_message,
+ const char *type,
+ const CamelInternetAddress *r);
/* utility functions */
-gboolean camel_mime_message_has_8bit_parts (CamelMimeMessage *mime_message);
-void camel_mime_message_encode_8bit_parts (CamelMimeMessage *mime_message);
+gboolean camel_mime_message_has_8bit_parts (CamelMimeMessage *mime_message);
+void camel_mime_message_set_best_encoding (CamelMimeMessage *msg,
+ CamelBestencRequired required,
+ CamelBestencEncoding enctype);
+void camel_mime_message_encode_8bit_parts (CamelMimeMessage *mime_message);
#ifdef __cplusplus
}
diff --git a/camel/camel-mime-parser.c b/camel/camel-mime-parser.c
index 0d151b7e9b..b9fc3d2ebb 100644
--- a/camel/camel-mime-parser.c
+++ b/camel/camel-mime-parser.c
@@ -293,6 +293,7 @@ static void header_append_mempool(struct _header_scan_state *s, struct _header_s
static void camel_mime_parser_class_init (CamelMimeParserClass *klass);
static void camel_mime_parser_init (CamelMimeParser *obj);
+#if d(!)0
static char *states[] = {
"HSCAN_INITIAL",
"HSCAN_PRE_FROM", /* pre-from data */
@@ -312,6 +313,7 @@ static char *states[] = {
"HSCAN_MULTIPART_END",
"HSCAN_MESSAGE_END",
};
+#endif
static CamelObjectClass *camel_mime_parser_parent;
diff --git a/camel/camel-seekable-substream.c b/camel/camel-seekable-substream.c
index ad1a01eef6..294526ada3 100644
--- a/camel/camel-seekable-substream.c
+++ b/camel/camel-seekable-substream.c
@@ -220,7 +220,7 @@ stream_flush (CamelStream *stream)
{
CamelSeekableSubstream *sus = (CamelSeekableSubstream *)stream;
- return camel_stream_flush(sus->parent_stream);
+ return camel_stream_flush(CAMEL_STREAM(sus->parent_stream));
}
static int
diff --git a/camel/providers/imap/camel-imap-auth.c b/camel/providers/imap/camel-imap-auth.c
index cc77843d9c..2fac879580 100644
--- a/camel/providers/imap/camel-imap-auth.c
+++ b/camel/providers/imap/camel-imap-auth.c
@@ -24,6 +24,8 @@
#include <config.h>
+#include <netinet/in.h>
+
#include <string.h>
#ifdef HAVE_KRB4
diff --git a/camel/providers/imap/camel-imap-folder.c b/camel/providers/imap/camel-imap-folder.c
index b6f6cc1132..c127df73de 100644
--- a/camel/providers/imap/camel-imap-folder.c
+++ b/camel/providers/imap/camel-imap-folder.c
@@ -245,7 +245,8 @@ imap_refresh_info (CamelFolder *folder, CamelException *ex)
char *uid;
guint32 flags;
} *new;
- char *resp, *uid, *p, *flags;
+ char *resp, *p;
+ const char *uid, *flags;
int i, seq, summary_len;
CamelMessageInfo *info;
gboolean folder_changed = FALSE;
diff --git a/camel/providers/imap/camel-imap-store.c b/camel/providers/imap/camel-imap-store.c
index aa5d003674..729452f002 100644
--- a/camel/providers/imap/camel-imap-store.c
+++ b/camel/providers/imap/camel-imap-store.c
@@ -609,7 +609,8 @@ get_folder_info (CamelStore *store, const char *top, gboolean fast,
GPtrArray *folders;
const char *name;
char *pattern, *list;
- char *status, *p;
+ char *status;
+ const char *p;
CamelFolderInfo *topfi, *fi;
name = top;
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-07 07:11:42 +0800