From: Colin Leroy Date: Sat, 16 Jul 2005 02:47:28 +0000 (+0000) Subject: 2005-07-16 [colin] 1.9.12cvs66 X-Git-Tag: rel_1_9_13~27 X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=a784bb61ae8159d09de918f9f12faf330118f62d;hp=11533ef14b03be58550a437c1c35f80ea2268ef9 2005-07-16 [colin] 1.9.12cvs66 * src/imap.c Remove pseudo-log * src/etpan/imap-thread.c Add real log --- diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws index 7fc2cbd0a..5e6298feb 100644 --- a/ChangeLog-gtk2.claws +++ b/ChangeLog-gtk2.claws @@ -1,3 +1,10 @@ +2005-07-16 [colin] 1.9.12cvs66 + + * src/imap.c + Remove pseudo-log + * src/etpan/imap-thread.c + Add real log + 2005-07-16 [colin] 1.9.12cvs65 * src/main.c diff --git a/PATCHSETS b/PATCHSETS index 21b8c5293..ae8e53aae 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -660,3 +660,4 @@ ( cvs diff -u -r 1.115.2.42 -r 1.115.2.43 src/main.c; ) > 1.9.12cvs63.patchset ( cvs diff -u -r 1.1.2.3 -r 1.1.2.4 src/prefs_other.c; ) > 1.9.12cvs64.patchset ( cvs diff -u -r 1.115.2.43 -r 1.115.2.44 src/main.c; cvs diff -u -r 1.1.2.4 -r 1.1.2.5 src/prefs_other.c; ) > 1.9.12cvs65.patchset +( cvs diff -u -r 1.179.2.53 -r 1.179.2.54 src/imap.c; cvs diff -u -r 1.1.4.10 -r 1.1.4.11 src/etpan/imap-thread.c; ) > 1.9.12cvs66.patchset diff --git a/configure.ac b/configure.ac index 69d24d479..927220546 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ MINOR_VERSION=9 MICRO_VERSION=12 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=65 +EXTRA_VERSION=66 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/src/etpan/imap-thread.c b/src/etpan/imap-thread.c index ca8dd1939..09f606b26 100644 --- a/src/etpan/imap-thread.c +++ b/src/etpan/imap-thread.c @@ -13,6 +13,7 @@ #include #include +#include #include "etpan-thread-manager.h" #include "utils.h" @@ -35,6 +36,25 @@ static gboolean thread_manager_event(GIOChannel * source, return TRUE; } +void imap_logger(int direction, const char * str, size_t size) +{ + gchar buf[512]; + strncpy(buf, str, 511); + buf[511] = '\0'; + if (size < 511) + buf[size] = '\0'; + if (!strncmp(buf, "<<<<<<<", 7) + || !strncmp(buf, ">>>>>>>", 7) + || buf[0] == '\r' || buf[0] == '\n') + return; + + while (strstr(buf, "\r")) + *strstr(buf, "\r") = ' '; + while (strstr(buf, "\n")) + *strstr(buf, "\n") = ' '; + + log_print("IMAP4%c %s\n", direction?'>':'<', buf); +} #define ETPAN_DEFAULT_NETWORK_TIMEOUT 60 @@ -45,9 +65,9 @@ void imap_main_init(void) mailstream_network_delay.tv_sec = ETPAN_DEFAULT_NETWORK_TIMEOUT; mailstream_network_delay.tv_usec = 0; - if (debug_get_mode()) - mailstream_debug = 1; - + mailstream_debug = 1; + mailstream_logger = imap_logger; + imap_hash = chash_new(CHASH_COPYKEY, CHASH_DEFAULTSIZE); session_hash = chash_new(CHASH_COPYKEY, CHASH_DEFAULTSIZE); courier_workaround_hash = chash_new(CHASH_COPYKEY, CHASH_DEFAULTSIZE); diff --git a/src/imap.c b/src/imap.c index 9f2f0897a..5e6962d2b 100644 --- a/src/imap.c +++ b/src/imap.c @@ -1803,7 +1803,7 @@ static GSList *imap_get_uncached_messages(IMAPSession *session, cur = numlist; data->total = g_slist_length(numlist); debug_print("messages list : %i\n", data->total); - log_print(_("IMAP> Getting uncached messages for %s\n"), item->path); + while (cur != NULL) { GSList * partial_result; int count; @@ -1839,7 +1839,6 @@ static GSList *imap_get_uncached_messages(IMAPSession *session, if (prefs_common.work_offline && !imap_gtk_should_override()) { g_free(data); - log_error(_("IMAP< Error\n")); return NULL; } @@ -1857,7 +1856,6 @@ static GSList *imap_get_uncached_messages(IMAPSession *session, statusbar_progress_all(0,0,0); statusbar_pop_all(); - log_print(_("IMAP< Done\n")); return result; } @@ -2148,18 +2146,15 @@ static gint imap_cmd_authenticate(IMAPSession *session, const gchar *user, challenge_len = base64_decode(challenge, buf + 2, -1); challenge[challenge_len] = '\0'; g_free(buf); - log_print(_("IMAP< [Decoded: %s]\n"), challenge); md5_hex_hmac(hexdigest, challenge, challenge_len, pass, strlen(pass)); g_free(challenge); response = g_strdup_printf("%s %s", user, hexdigest); - log_print(_("IMAP> [Encoded: %s]\n"), response); response64 = g_malloc((strlen(response) + 3) * 2 + 1); base64_encode(response64, response, strlen(response)); g_free(response); - log_print(_("IMAP> %s\n"), response64); sock_puts(SESSION(session)->sock, response64); ok = imap_cmd_ok(session, NULL); if (ok != IMAP_SUCCESS) @@ -2176,7 +2171,7 @@ static gint imap_cmd_login(IMAPSession *session, gint ok; static time_t last_login_err = 0; - log_print(_("IMAP> Logging in to %s\n"), SESSION(session)->server); + log_print("IMAP4> Logging in to %s\n", SESSION(session)->server); r = imap_threaded_login(session->folder, user, pass); if (r != MAILIMAP_NO_ERROR) { if (time(NULL) - last_login_err > 10) { @@ -2184,10 +2179,10 @@ static gint imap_cmd_login(IMAPSession *session, SESSION(session)->server); } last_login_err = time(NULL); - log_error(_("IMAP< Error\n")); + log_error("IMAP4< Error logging in to %s\n", + SESSION(session)->server); ok = IMAP_ERROR; } else { - log_print(_("IMAP< Done\n")); ok = IMAP_SUCCESS; } return ok; @@ -2195,7 +2190,6 @@ static gint imap_cmd_login(IMAPSession *session, static gint imap_cmd_logout(IMAPSession *session) { - log_print(_("IMAP> Logging out of %s\n"), SESSION(session)->server); imap_threaded_disconnect(session->folder); return IMAP_SUCCESS; @@ -2222,14 +2216,11 @@ static gint imap_cmd_starttls(IMAPSession *session) { int r; - log_print(_("IMAP> Starting TLS\n")); r = imap_threaded_starttls(session->folder); if (r != MAILIMAP_NO_ERROR) { debug_print("starttls err %d\n", r); - log_error(_("IMAP< Error\n")); return IMAP_ERROR; } - log_print(_("IMAP< Done\n")); return IMAP_SUCCESS; } #endif @@ -2240,15 +2231,12 @@ static gint imap_cmd_select(IMAPSession *session, const gchar *folder, { int r; - log_print(_("IMAP> Selecting %s\n"), folder); r = imap_threaded_select(session->folder, folder, exists, recent, unseen, uid_validity); if (r != MAILIMAP_NO_ERROR) { debug_print("select err %d\n", r); - log_error(_("IMAP< Error\n")); return IMAP_ERROR; } - log_print(_("IMAP< Done\n")); return IMAP_SUCCESS; } @@ -2258,28 +2246,26 @@ static gint imap_cmd_examine(IMAPSession *session, const gchar *folder, { int r; - log_print(_("IMAP> Examining %s\n"), folder); r = imap_threaded_examine(session->folder, folder, exists, recent, unseen, uid_validity); if (r != MAILIMAP_NO_ERROR) { debug_print("examine err %d\n", r); - log_error(_("IMAP< Error\n")); + return IMAP_ERROR; } - log_print(_("IMAP< Done\n")); return IMAP_SUCCESS; } static gint imap_cmd_create(IMAPSession *session, const gchar *folder) { int r; - log_print(_("IMAP> Creating %s\n"), folder); + r = imap_threaded_create(session->folder, folder); if (r != MAILIMAP_NO_ERROR) { - log_error(_("IMAP< Error\n")); + return IMAP_ERROR; } - log_print(_("IMAP< Done\n")); + return IMAP_SUCCESS; } @@ -2287,14 +2273,14 @@ static gint imap_cmd_rename(IMAPSession *session, const gchar *old_folder, const gchar *new_folder) { int r; - log_print(_("IMAP> Renaming %s to %s\n"), old_folder, new_folder); + r = imap_threaded_rename(session->folder, old_folder, new_folder); if (r != MAILIMAP_NO_ERROR) { - log_error(_("IMAP< Error\n")); + return IMAP_ERROR; } - log_print(_("IMAP< Done\n")); + return IMAP_SUCCESS; } @@ -2302,13 +2288,13 @@ static gint imap_cmd_delete(IMAPSession *session, const gchar *folder) { int r; - log_print(_("IMAP> Deleting %s\n"), folder); + r = imap_threaded_delete(session->folder, folder); if (r != MAILIMAP_NO_ERROR) { - log_error(_("IMAP< Error\n")); + return IMAP_ERROR; } - log_print(_("IMAP< Done\n")); + return IMAP_SUCCESS; } @@ -2400,13 +2386,12 @@ static gint imap_cmd_copy(IMAPSession *session, struct mailimap_set * set, g_return_val_if_fail(set != NULL, IMAP_ERROR); g_return_val_if_fail(destfolder != NULL, IMAP_ERROR); - log_print(_("IMAP> Copying to %s\n"), destfolder); r = imap_threaded_copy(session->folder, set, destfolder); if (r != MAILIMAP_NO_ERROR) { - log_error(_("IMAP< Error\n")); + return IMAP_ERROR; } - log_print(_("IMAP< Done\n")); + return IMAP_SUCCESS; } @@ -2426,13 +2411,12 @@ static gint imap_cmd_store(IMAPSession *session, struct mailimap_set * set, store_att_flags = mailimap_store_att_flags_new_remove_flags_silent(flag_list); - log_print(_("IMAP> Storing\n")); r = imap_threaded_store(session->folder, set, store_att_flags); if (r != MAILIMAP_NO_ERROR) { - log_error(_("IMAP< Error\n")); + return IMAP_ERROR; } - log_print(_("IMAP< Done\n")); + return IMAP_SUCCESS; } @@ -2443,13 +2427,13 @@ static gint imap_cmd_expunge(IMAPSession *session) if (prefs_common.work_offline && !imap_gtk_should_override()) { return -1; } - log_print(_("IMAP> Expunging\n")); + r = imap_threaded_expunge(session->folder); if (r != MAILIMAP_NO_ERROR) { - log_error(_("IMAP< Error\n")); + return IMAP_ERROR; } - log_print(_("IMAP< Done\n")); + return IMAP_SUCCESS; } @@ -2800,14 +2784,12 @@ gint imap_get_num_list(Folder *folder, FolderItem *_item, GSList **msgnum_list, session = imap_session_get(folder); g_return_val_if_fail(session != NULL, -1); - log_print(_("IMAP> Getting numbers list for %s\n"), item->item.path); - selected_folder = (session->mbox != NULL) && (!strcmp(session->mbox, item->item.path)); if (selected_folder) { ok = imap_cmd_noop(session); if (ok != IMAP_SUCCESS) { - log_error(_("IMAP< Error\n")); + return -1; } exists = session->exists; @@ -2817,7 +2799,7 @@ gint imap_get_num_list(Folder *folder, FolderItem *_item, GSList **msgnum_list, ok = imap_status(session, IMAP_FOLDER(folder), item->item.path, &exists, &recent, &uid_next, &uid_val, &unseen, FALSE); if (ok != IMAP_SUCCESS) { - log_error(_("IMAP< Error\n")); + return -1; } if(item->item.mtime == uid_val) @@ -2852,7 +2834,6 @@ gint imap_get_num_list(Folder *folder, FolderItem *_item, GSList **msgnum_list, out which numbers have been removed */ if (exists == nummsgs) { *msgnum_list = g_slist_copy(item->uid_list); - log_print(_("IMAP< Done\n")); return nummsgs; } else if (exists < nummsgs) { debug_print("Freeing imap uid cache"); @@ -2864,14 +2845,13 @@ gint imap_get_num_list(Folder *folder, FolderItem *_item, GSList **msgnum_list, if (exists == 0) { *msgnum_list = NULL; - log_print(_("IMAP< Done\n")); return 0; } nummsgs = get_list_of_uids(folder, item, &uidlist); if (nummsgs < 0) { - log_error(_("IMAP< Error\n")); + return -1; } @@ -2899,7 +2879,6 @@ gint imap_get_num_list(Folder *folder, FolderItem *_item, GSList **msgnum_list, debug_print("get_num_list - ok - %i\n", nummsgs); - log_print(_("IMAP< Done\n")); return nummsgs; }