From 6935d812608df633ea83b341c8e7de96404dcfdf Mon Sep 17 00:00:00 2001 From: Paul Mangan Date: Thu, 9 Oct 2003 05:06:19 +0000 Subject: [PATCH 1/1] more sync with 0.9.6cvs2 --- ChangeLog.claws | 5 ++ configure.ac | 2 +- src/imap.c | 167 +++++++++++++++++++++++++++--------------------- 3 files changed, 101 insertions(+), 73 deletions(-) diff --git a/ChangeLog.claws b/ChangeLog.claws index cb721c3d7..cb003d406 100644 --- a/ChangeLog.claws +++ b/ChangeLog.claws @@ -1,3 +1,8 @@ +2003-10-09 [paul] 0.9.6claws9 + + * src/imap.c + a little more sync with 0.9.6cvs2 and a tidy up + 2003-10-08 [paul] 0.9.6claws8 * sync with 0.9.6cvs2 diff --git a/configure.ac b/configure.ac index 2347539f9..f275922a8 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ MINOR_VERSION=9 MICRO_VERSION=6 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=8 +EXTRA_VERSION=9 if test $EXTRA_VERSION -eq 0; then VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}claws else diff --git a/src/imap.c b/src/imap.c index cd22ddd02..fcda94df7 100644 --- a/src/imap.c +++ b/src/imap.c @@ -159,51 +159,65 @@ struct _IMAPFolderItem GSList *uid_list; }; -static Folder *imap_folder_new(const gchar * name, const gchar * path); -static void imap_folder_destroy(Folder * folder); - -static IMAPSession *imap_session_new(const PrefsAccount * account); -static void imap_session_authenticate(IMAPSession * session, - const PrefsAccount * account); -static void imap_session_destroy(Session * session); - -static gchar *imap_fetch_msg(Folder * folder, FolderItem * item, gint uid); -static gint imap_add_msg(Folder * folder, - FolderItem * dest, - const gchar * file, MsgFlags * flags); -static gint imap_add_msgs(Folder * folder, FolderItem * dest, - GSList * file_list, - GRelation *relation); - -static gint imap_copy_msg(Folder * folder, - FolderItem * dest, MsgInfo * msginfo); -static gint imap_copy_msgs(Folder *folder, FolderItem *dest, - MsgInfoList *msglist, GRelation *relation); - -static gint imap_remove_msg(Folder * folder, FolderItem * item, gint uid); -static gint imap_remove_all_msg(Folder * folder, FolderItem * item); - -static gboolean imap_is_msg_changed(Folder * folder, - FolderItem * item, MsgInfo * msginfo); - -static gint imap_close(Folder * folder, FolderItem * item); - -static gint imap_scan_tree(Folder * folder); - -static gint imap_create_tree(Folder * folder); - -static FolderItem *imap_create_folder(Folder * folder, - FolderItem * parent, - const gchar * name); -static gint imap_rename_folder(Folder * folder, - FolderItem * item, const gchar * name); -static gint imap_remove_folder(Folder * folder, FolderItem * item); - - static void imap_folder_init (Folder *folder, const gchar *name, const gchar *path); +static Folder *imap_folder_new (const gchar *name, + const gchar *path); +static void imap_folder_destroy (Folder *folder); + +static IMAPSession *imap_session_new (const PrefsAccount *account); +static void imap_session_authenticate(IMAPSession *session, + const PrefsAccount *account); +static void imap_session_destroy (Session *session); + +static gchar *imap_fetch_msg (Folder *folder, + FolderItem *item, + gint uid); +static gint imap_add_msg (Folder *folder, + FolderItem *dest, + const gchar *file, + MsgFlags *flags); +static gint imap_add_msgs (Folder *folder, + FolderItem *dest, + GSList *file_list, + GRelation *relation); + +static gint imap_copy_msg (Folder *folder, + FolderItem *dest, + MsgInfo *msginfo); +static gint imap_copy_msgs (Folder *folder, + FolderItem *dest, + MsgInfoList *msglist, + GRelation *relation); + +static gint imap_remove_msg (Folder *folder, + FolderItem *item, + gint uid); +static gint imap_remove_all_msg (Folder *folder, + FolderItem *item); + +static gboolean imap_is_msg_changed (Folder *folder, + FolderItem *item, + MsgInfo *msginfo); + +static gint imap_close (Folder *folder, + FolderItem *item); + +static gint imap_scan_tree (Folder *folder); + +static gint imap_create_tree (Folder *folder); + +static FolderItem *imap_create_folder (Folder *folder, + FolderItem *parent, + const gchar *name); +static gint imap_rename_folder (Folder *folder, + FolderItem *item, + const gchar *name); +static gint imap_remove_folder (Folder *folder, + FolderItem *item); + static FolderItem *imap_folder_item_new (Folder *folder); static void imap_folder_item_destroy (Folder *folder, FolderItem *item); @@ -223,7 +237,7 @@ static GSList *imap_parse_list (IMAPFolder *folder, const gchar *real_path, gchar *separator); -static void imap_create_missing_folders (Folder *folder); +static void imap_create_missing_folders (Folder *folder); static FolderItem *imap_create_special_folder (Folder *folder, SpecialFolderItemType stype, @@ -423,7 +437,7 @@ static gchar *imap_folder_get_path (Folder *folder); static gchar *imap_item_get_path (Folder *folder, FolderItem *item); -FolderClass imap_class = +static FolderClass imap_class = { F_IMAP, "imap", @@ -468,7 +482,7 @@ FolderClass *imap_get_class(void) return &imap_class; } -Folder *imap_folder_new(const gchar *name, const gchar *path) +static Folder *imap_folder_new(const gchar *name, const gchar *path) { Folder *folder; @@ -479,7 +493,7 @@ Folder *imap_folder_new(const gchar *name, const gchar *path) return folder; } -void imap_folder_destroy(Folder *folder) +static void imap_folder_destroy(Folder *folder) { gchar *dir; @@ -668,7 +682,7 @@ static IMAPSession *imap_session_get(Folder *folder) return IMAP_SESSION(session); } -IMAPSession *imap_session_new(const PrefsAccount *account) +static IMAPSession *imap_session_new(const PrefsAccount *account) { IMAPSession *session; SockInfo *imap_sock; @@ -743,7 +757,8 @@ IMAPSession *imap_session_new(const PrefsAccount *account) session_destroy(SESSION(session)); return NULL; } - if (!ssl_init_socket_with_method(SESSION(session)->sock, SSL_METHOD_TLSv1)) { + if (!ssl_init_socket_with_method(SESSION(session)->sock, + SSL_METHOD_TLSv1)) { session_destroy(SESSION(session)); return NULL; } @@ -765,7 +780,8 @@ IMAPSession *imap_session_new(const PrefsAccount *account) return session; } -void imap_session_authenticate(IMAPSession *session, const PrefsAccount *account) +static void imap_session_authenticate(IMAPSession *session, + const PrefsAccount *account) { gchar *pass; @@ -789,7 +805,7 @@ void imap_session_authenticate(IMAPSession *session, const PrefsAccount *account session->authenticated = TRUE; } -void imap_session_destroy(Session *session) +static void imap_session_destroy(Session *session) { imap_free_capabilities(IMAP_SESSION(session)); g_free(IMAP_SESSION(session)->mbox); @@ -797,7 +813,7 @@ void imap_session_destroy(Session *session) session->sock = NULL; } -gchar *imap_fetch_msg(Folder *folder, FolderItem *item, gint uid) +static gchar *imap_fetch_msg(Folder *folder, FolderItem *item, gint uid) { gchar *path, *filename; IMAPSession *session; @@ -811,7 +827,7 @@ gchar *imap_fetch_msg(Folder *folder, FolderItem *item, gint uid) make_dir_hier(path); filename = g_strconcat(path, G_DIR_SEPARATOR_S, itos(uid), NULL); g_free(path); - + if (is_file_exist(filename)) { debug_print("message %d has been already cached.\n", uid); return filename; @@ -843,7 +859,8 @@ gchar *imap_fetch_msg(Folder *folder, FolderItem *item, gint uid) return filename; } -gint imap_add_msg(Folder *folder, FolderItem *dest, const gchar *file, MsgFlags *flags) +static gint imap_add_msg(Folder *folder, FolderItem *dest, + const gchar *file, MsgFlags *flags) { gint ret; GSList file_list; @@ -861,7 +878,7 @@ gint imap_add_msg(Folder *folder, FolderItem *dest, const gchar *file, MsgFlags return ret; } -gint imap_add_msgs(Folder *folder, FolderItem *dest, GSList *file_list, +static gint imap_add_msgs(Folder *folder, FolderItem *dest, GSList *file_list, GRelation *relation) { gchar *destdir; @@ -993,7 +1010,7 @@ static gint imap_do_copy_msgs(Folder *folder, FolderItem *dest, GPOINTER_TO_INT(0)); g_tuples_destroy(tuples); } - + imap_seq_set_free(seq_list); g_free(destdir); @@ -1004,7 +1021,7 @@ static gint imap_do_copy_msgs(Folder *folder, FolderItem *dest, return -1; } -gint imap_copy_msg(Folder *folder, FolderItem *dest, MsgInfo *msginfo) +static gint imap_copy_msg(Folder *folder, FolderItem *dest, MsgInfo *msginfo) { GSList msglist; @@ -1016,7 +1033,7 @@ gint imap_copy_msg(Folder *folder, FolderItem *dest, MsgInfo *msginfo) return imap_copy_msgs(folder, dest, &msglist, NULL); } -gint imap_copy_msgs(Folder *folder, FolderItem *dest, +static gint imap_copy_msgs(Folder *folder, FolderItem *dest, MsgInfoList *msglist, GRelation *relation) { MsgInfo *msginfo; @@ -1043,7 +1060,7 @@ gint imap_copy_msgs(Folder *folder, FolderItem *dest, return ret; } -gint imap_remove_msg(Folder *folder, FolderItem *item, gint uid) +static gint imap_remove_msg(Folder *folder, FolderItem *item, gint uid) { gint ok; IMAPSession *session; @@ -1097,7 +1114,7 @@ gint imap_remove_msg(Folder *folder, FolderItem *item, gint uid) return IMAP_SUCCESS; } -gint imap_remove_all_msg(Folder *folder, FolderItem *item) +static gint imap_remove_all_msg(Folder *folder, FolderItem *item) { gint ok; IMAPSession *session; @@ -1135,13 +1152,14 @@ gint imap_remove_all_msg(Folder *folder, FolderItem *item) return IMAP_SUCCESS; } -gboolean imap_is_msg_changed(Folder *folder, FolderItem *item, MsgInfo *msginfo) +static gboolean imap_is_msg_changed(Folder *folder, FolderItem *item, + MsgInfo *msginfo) { /* TODO: properly implement this method */ return FALSE; } -gint imap_close(Folder *folder, FolderItem *item) +static gint imap_close(Folder *folder, FolderItem *item) { gint ok; IMAPSession *session; @@ -1169,7 +1187,7 @@ gint imap_close(Folder *folder, FolderItem *item) return 0; } -gint imap_scan_tree(Folder *folder) +static gint imap_scan_tree(Folder *folder) { FolderItem *item = NULL; IMAPSession *session; @@ -1446,7 +1464,7 @@ static GSList *imap_parse_list(IMAPFolder *folder, IMAPSession *session, return item_list; } -gint imap_create_tree(Folder *folder) +static gint imap_create_tree(Folder *folder) { g_return_val_if_fail(folder != NULL, -1); g_return_val_if_fail(folder->node != NULL, -1); @@ -1559,7 +1577,7 @@ static gchar *imap_item_get_path(Folder *folder, FolderItem *item) return path; } -FolderItem *imap_create_folder(Folder *folder, FolderItem *parent, +static FolderItem *imap_create_folder(Folder *folder, FolderItem *parent, const gchar *name) { gchar *dirpath, *imap_path; @@ -1655,7 +1673,8 @@ FolderItem *imap_create_folder(Folder *folder, FolderItem *parent, return new_item; } -gint imap_rename_folder(Folder *folder, FolderItem *item, const gchar *name) +static gint imap_rename_folder(Folder *folder, FolderItem *item, + const gchar *name) { gchar *dirpath; gchar *newpath; @@ -1737,7 +1756,7 @@ gint imap_rename_folder(Folder *folder, FolderItem *item, const gchar *name) return 0; } -gint imap_remove_folder(Folder *folder, FolderItem *item) +static gint imap_remove_folder(Folder *folder, FolderItem *item) { gint ok; IMAPSession *session; @@ -2472,8 +2491,8 @@ static gint imap_status(IMAPSession *session, IMAPFolder *folder, real_path = imap_get_real_path(folder, path); QUOTE_IF_REQUIRED(real_path_, real_path); imap_gen_send(session, "STATUS %s " - "(MESSAGES RECENT UIDNEXT UIDVALIDITY UNSEEN)", - real_path_); + "(MESSAGES RECENT UIDNEXT UIDVALIDITY UNSEEN)", + real_path_); ok = imap_cmd_ok(session, argbuf); if (ok != IMAP_SUCCESS || !argbuf) THROW(ok); @@ -2532,7 +2551,7 @@ static gboolean imap_has_capability(IMAPSession *session, const gchar *cap) return FALSE; } -void imap_free_capabilities(IMAPSession *session) +static void imap_free_capabilities(IMAPSession *session) { g_strfreev(session->capability); session->capability = NULL; @@ -2778,7 +2797,8 @@ static gint imap_cmd_delete(IMAPSession *session, const gchar *folder) return imap_cmd_ok(session, NULL); } -static gint imap_cmd_search(IMAPSession *session, const gchar *criteria, GSList **list) +static gint imap_cmd_search(IMAPSession *session, const gchar *criteria, + GSList **list) { gint ok; gchar *uidlist; @@ -2817,7 +2837,8 @@ static gint imap_cmd_search(IMAPSession *session, const gchar *criteria, GSList return IMAP_SUCCESS; } -static gint imap_cmd_fetch(IMAPSession *session, guint32 uid, const gchar *filename) +static gint imap_cmd_fetch(IMAPSession *session, guint32 uid, + const gchar *filename) { gint ok; gchar *buf = NULL; @@ -2861,7 +2882,8 @@ static gint imap_cmd_fetch(IMAPSession *session, guint32 uid, const gchar *filen g_free(buf); - if (recv_bytes_write_to_file(SESSION(session)->sock, size_num, filename) != 0) + if (recv_bytes_write_to_file(SESSION(session)->sock, + size_num, filename) != 0) return IMAP_ERROR; if (imap_gen_recv(session, &buf) != IMAP_SUCCESS) { @@ -2881,7 +2903,8 @@ static gint imap_cmd_fetch(IMAPSession *session, guint32 uid, const gchar *filen } static gint imap_cmd_append(IMAPSession *session, const gchar *destfolder, - const gchar *file, IMAPFlags flags, guint32 *new_uid) + const gchar *file, IMAPFlags flags, + guint32 *new_uid) { gint ok; gint size; -- 2.25.1