Make procmsg_msginfo_free() zero out pointers to freed memory.

[claws.git] / src / imap.c

diff --git a/src/imap.c b/src/imap.c
index 79b1a897218f0189296331948c73830b33857d81..60c8e315959db56b6a0b24a58762ac074ed33ad7 100644 (file)
--- a/src/imap.c
+++ b/src/imap.c
@@ -618,134 +618,134 @@ static void imap_handle_error(Session *session, const gchar *server, int libetpa
        case MAILIMAP_NO_ERROR:
                return;
        case MAILIMAP_NO_ERROR_AUTHENTICATED:
-               log_warning(LOG_PROTOCOL, _("IMAP error on %s: authenticated\n"), session_server);
+               log_warning(LOG_PROTOCOL, g_strconcat(_("IMAP error on %s:"),_(" authenticated\n"), NULL), session_server);
                break;
        case MAILIMAP_NO_ERROR_NON_AUTHENTICATED:
-               log_warning(LOG_PROTOCOL, _("IMAP error on %s: not authenticated\n"), session_server);
+               log_warning(LOG_PROTOCOL, g_strconcat(_("IMAP error on %s:"),_(" not authenticated\n"), NULL), session_server);
                break;
        case MAILIMAP_ERROR_BAD_STATE:
-               log_warning(LOG_PROTOCOL, _("IMAP error on %s: bad state\n"), session_server);
+               log_warning(LOG_PROTOCOL, g_strconcat(_("IMAP error on %s:"),_(" bad state\n"), NULL), session_server);
                break;
        case MAILIMAP_ERROR_STREAM:
-               log_warning(LOG_PROTOCOL, _("IMAP error on %s: stream error\n"), session_server);
+               log_warning(LOG_PROTOCOL, g_strconcat(_("IMAP error on %s:"),_(" stream error\n"), NULL), session_server);
                break;
        case MAILIMAP_ERROR_PARSE:
-               log_warning(LOG_PROTOCOL, _("IMAP error on %s: parse error "
-                                           "(very probably non-RFC compliance from the server)\n"), session_server);
+               log_warning(LOG_PROTOCOL, g_strconcat(_("IMAP error on %s:"),_(" parse error "
+                                           "(very probably non-RFC compliance from the server)\n"), NULL), session_server);
                break;
        case MAILIMAP_ERROR_CONNECTION_REFUSED:
-               log_warning(LOG_PROTOCOL, _("IMAP error on %s: connection refused\n"), session_server);
+               log_warning(LOG_PROTOCOL, g_strconcat(_("IMAP error on %s:"),_(" connection refused\n"), NULL), session_server);
                break;
        case MAILIMAP_ERROR_MEMORY:
-               log_warning(LOG_PROTOCOL, _("IMAP error on %s: memory error\n"), session_server);
+               log_warning(LOG_PROTOCOL, g_strconcat(_("IMAP error on %s:"),_(" memory error\n"), NULL), session_server);
                break;
        case MAILIMAP_ERROR_FATAL:
-               log_warning(LOG_PROTOCOL, _("IMAP error on %s: fatal error\n"), session_server);
+               log_warning(LOG_PROTOCOL, g_strconcat(_("IMAP error on %s:"),_(" fatal error\n"), NULL), session_server);
                break;
        case MAILIMAP_ERROR_PROTOCOL:
-               log_warning(LOG_PROTOCOL, _("IMAP error on %s: protocol error"
-                                           "(very probably non-RFC compliance from the server)\n"), session_server);
+               log_warning(LOG_PROTOCOL, g_strconcat(_("IMAP error on %s:"),_(" protocol error "
+                                           "(very probably non-RFC compliance from the server)\n"), NULL), session_server);
                break;
        case MAILIMAP_ERROR_DONT_ACCEPT_CONNECTION:
-               log_warning(LOG_PROTOCOL, _("IMAP error on %s: connection not accepted\n"), session_server);
+               log_warning(LOG_PROTOCOL, g_strconcat(_("IMAP error on %s:"),_(" connection not accepted\n"), NULL), session_server);
                break;
        case MAILIMAP_ERROR_APPEND:
-               log_warning(LOG_PROTOCOL, _("IMAP error on %s: APPEND error\n"), session_server);
+               log_warning(LOG_PROTOCOL, g_strconcat(_("IMAP error on %s:"),_(" APPEND error\n"), NULL), session_server);
                break;
        case MAILIMAP_ERROR_NOOP:
-               log_warning(LOG_PROTOCOL, _("IMAP error on %s: NOOP error\n"), session_server);
+               log_warning(LOG_PROTOCOL, g_strconcat(_("IMAP error on %s:"),_(" NOOP error\n"), NULL), session_server);
                break;
        case MAILIMAP_ERROR_LOGOUT:
-               log_warning(LOG_PROTOCOL, _("IMAP error on %s: LOGOUT error\n"), session_server);
+               log_warning(LOG_PROTOCOL, g_strconcat(_("IMAP error on %s:"),_(" LOGOUT error\n"), NULL), session_server);
                break;
        case MAILIMAP_ERROR_CAPABILITY:
-               log_warning(LOG_PROTOCOL, _("IMAP error on %s: CAPABILITY error\n"), session_server);
+               log_warning(LOG_PROTOCOL, g_strconcat(_("IMAP error on %s:"),_(" CAPABILITY error\n"), NULL), session_server);
                break;
        case MAILIMAP_ERROR_CHECK:
-               log_warning(LOG_PROTOCOL, _("IMAP error on %s: CHECK error\n"), session_server);
+               log_warning(LOG_PROTOCOL, g_strconcat(_("IMAP error on %s:"),_(" CHECK error\n"), NULL), session_server);
                break;
        case MAILIMAP_ERROR_CLOSE:
-               log_warning(LOG_PROTOCOL, _("IMAP error on %s: CLOSE error\n"), session_server);
+               log_warning(LOG_PROTOCOL, g_strconcat(_("IMAP error on %s:"),_(" CLOSE error\n"), NULL), session_server);
                break;
        case MAILIMAP_ERROR_EXPUNGE:
-               log_warning(LOG_PROTOCOL, _("IMAP error on %s: EXPUNGE error\n"), session_server);
+               log_warning(LOG_PROTOCOL, g_strconcat(_("IMAP error on %s:"),_(" EXPUNGE error\n"), NULL), session_server);
                break;
        case MAILIMAP_ERROR_COPY:
-               log_warning(LOG_PROTOCOL, _("IMAP error on %s: COPY error\n"), session_server);
+               log_warning(LOG_PROTOCOL, g_strconcat(_("IMAP error on %s:"),_(" COPY error\n"), NULL), session_server);
                break;
        case MAILIMAP_ERROR_UID_COPY:
-               log_warning(LOG_PROTOCOL, _("IMAP error on %s: UID COPY error\n"), session_server);
+               log_warning(LOG_PROTOCOL, g_strconcat(_("IMAP error on %s:"),_(" UID COPY error\n"), NULL), session_server);
                break;
        case MAILIMAP_ERROR_CREATE:
-               log_warning(LOG_PROTOCOL, _("IMAP error on %s: CREATE error\n"), session_server);
+               log_warning(LOG_PROTOCOL, g_strconcat(_("IMAP error on %s:"),_(" CREATE error\n"), NULL), session_server);
                break;
        case MAILIMAP_ERROR_DELETE:
-               log_warning(LOG_PROTOCOL, _("IMAP error on %s: DELETE error\n"), session_server);
+               log_warning(LOG_PROTOCOL, g_strconcat(_("IMAP error on %s:"),_(" DELETE error\n"), NULL), session_server);
                break;
        case MAILIMAP_ERROR_EXAMINE:
-               log_warning(LOG_PROTOCOL, _("IMAP error on %s: EXAMINE error\n"), session_server);
+               log_warning(LOG_PROTOCOL, g_strconcat(_("IMAP error on %s:"),_(" EXAMINE error\n"), NULL), session_server);
                break;
        case MAILIMAP_ERROR_FETCH:
-               log_warning(LOG_PROTOCOL, _("IMAP error on %s: FETCH error\n"), session_server);
+               log_warning(LOG_PROTOCOL, g_strconcat(_("IMAP error on %s:"),_(" FETCH error\n"), NULL), session_server);
                break;
        case MAILIMAP_ERROR_UID_FETCH:
-               log_warning(LOG_PROTOCOL, _("IMAP error on %s: UID FETCH error\n"), session_server);
+               log_warning(LOG_PROTOCOL, g_strconcat(_("IMAP error on %s:"),_(" UID FETCH error\n"), NULL), session_server);
                break;
        case MAILIMAP_ERROR_LIST:
-               log_warning(LOG_PROTOCOL, _("IMAP error on %s: LIST error\n"), session_server);
+               log_warning(LOG_PROTOCOL, g_strconcat(_("IMAP error on %s:"),_(" LIST error\n"), NULL), session_server);
                break;
        case MAILIMAP_ERROR_LOGIN:
-               log_warning(LOG_PROTOCOL, _("IMAP error on %s: LOGIN error\n"), session_server);
+               log_warning(LOG_PROTOCOL, g_strconcat(_("IMAP error on %s:"),_(" LOGIN error\n"), NULL), session_server);
                break;
        case MAILIMAP_ERROR_LSUB:
-               log_warning(LOG_PROTOCOL, _("IMAP error on %s: LSUB error\n"), session_server);
+               log_warning(LOG_PROTOCOL, g_strconcat(_("IMAP error on %s:"),_(" LSUB error\n"), NULL), session_server);
                break;
        case MAILIMAP_ERROR_RENAME:
-               log_warning(LOG_PROTOCOL, _("IMAP error on %s: RENAME error\n"), session_server);
+               log_warning(LOG_PROTOCOL, g_strconcat(_("IMAP error on %s:"),_(" RENAME error\n"), NULL), session_server);
                break;
        case MAILIMAP_ERROR_SEARCH:
-               log_warning(LOG_PROTOCOL, _("IMAP error on %s: SEARCH error\n"), session_server);
+               log_warning(LOG_PROTOCOL, g_strconcat(_("IMAP error on %s:"),_(" SEARCH error\n"), NULL), session_server);
                break;
        case MAILIMAP_ERROR_UID_SEARCH:
-               log_warning(LOG_PROTOCOL, _("IMAP error on %s: UID SEARCH error\n"), session_server);
+               log_warning(LOG_PROTOCOL, g_strconcat(_("IMAP error on %s:"),_(" UID SEARCH error\n"), NULL), session_server);
                break;
        case MAILIMAP_ERROR_SELECT:
-               log_warning(LOG_PROTOCOL, _("IMAP error on %s: SELECT error\n"), session_server);
+               log_warning(LOG_PROTOCOL, g_strconcat(_("IMAP error on %s:"),_(" SELECT error\n"), NULL), session_server);
                break;
        case MAILIMAP_ERROR_STATUS:
-               log_warning(LOG_PROTOCOL, _("IMAP error on %s: STATUS error\n"), session_server);
+               log_warning(LOG_PROTOCOL, g_strconcat(_("IMAP error on %s:"),_(" STATUS error\n"), NULL), session_server);
                break;
        case MAILIMAP_ERROR_STORE:
-               log_warning(LOG_PROTOCOL, _("IMAP error on %s: STORE error\n"), session_server);
+               log_warning(LOG_PROTOCOL, g_strconcat(_("IMAP error on %s:"),_(" STORE error\n"), NULL), session_server);
                break;
        case MAILIMAP_ERROR_UID_STORE:
-               log_warning(LOG_PROTOCOL, _("IMAP error on %s: UID STORE error\n"), session_server);
+               log_warning(LOG_PROTOCOL, g_strconcat(_("IMAP error on %s:"),_(" UID STORE error\n"), NULL), session_server);
                break;
        case MAILIMAP_ERROR_SUBSCRIBE:
-               log_warning(LOG_PROTOCOL, _("IMAP error on %s: SUBSCRIBE error\n"), session_server);
+               log_warning(LOG_PROTOCOL, g_strconcat(_("IMAP error on %s:"),_(" SUBSCRIBE error\n"), NULL), session_server);
                break;
        case MAILIMAP_ERROR_UNSUBSCRIBE:
-               log_warning(LOG_PROTOCOL, _("IMAP error on %s: UNSUBSCRIBE error\n"), session_server);
+               log_warning(LOG_PROTOCOL, g_strconcat(_("IMAP error on %s:"),_(" UNSUBSCRIBE error\n"), NULL), session_server);
                break;
        case MAILIMAP_ERROR_STARTTLS:
-               log_warning(LOG_PROTOCOL, _("IMAP error on %s: STARTTLS error\n"), session_server);
+               log_warning(LOG_PROTOCOL, g_strconcat(_("IMAP error on %s:"),_(" STARTTLS error\n"), NULL), session_server);
                break;
        case MAILIMAP_ERROR_INVAL:
-               log_warning(LOG_PROTOCOL, _("IMAP error on %s: INVAL error\n"), session_server);
+               log_warning(LOG_PROTOCOL, g_strconcat(_("IMAP error on %s:"),_(" INVAL error\n"), NULL), session_server);
                break;
        case MAILIMAP_ERROR_EXTENSION:
-               log_warning(LOG_PROTOCOL, _("IMAP error on %s: EXTENSION error\n"), session_server);
+               log_warning(LOG_PROTOCOL, g_strconcat(_("IMAP error on %s:"),_(" EXTENSION error\n"), NULL), session_server);
                break;
        case MAILIMAP_ERROR_SASL:
-               log_warning(LOG_PROTOCOL, _("IMAP error on %s: SASL error\n"), session_server);
+               log_warning(LOG_PROTOCOL, g_strconcat(_("IMAP error on %s:"),_(" SASL error\n"), NULL), session_server);
                break;
 #ifdef USE_GNUTLS
        case MAILIMAP_ERROR_SSL:
-               log_warning(LOG_PROTOCOL, _("IMAP error on %s: SSL error\n"), session_server);
+               log_warning(LOG_PROTOCOL, g_strconcat(_("IMAP error on %s:"),_(" SSL error\n"), NULL), session_server);
                break;
 #endif
        default:
-               log_warning(LOG_PROTOCOL, _("IMAP error on %s: Unknown error [%d]\n"),
+               log_warning(LOG_PROTOCOL, g_strconcat(_("IMAP error on %s:"),_(" Unknown error [%d]\n"), NULL),
                        session_server, libetpan_errcode);
                break;
        }
@@ -1540,7 +1540,7 @@ static gchar *imap_fetch_msg_full(Folder *folder, FolderItem *item, gint uid,
                                                        have_size, cached->size);
                                        procmsg_msginfo_set_flags(cached, MSG_FULLY_CACHED, 0);
                                }
-                               procmsg_msginfo_free(cached);
+                               procmsg_msginfo_free(&cached);
                                return filename;
                        } else if (!cached && time(NULL) - get_file_mtime(filename) < 60) {
                                debug_print("message not cached and file recent, considering file complete\n");
@@ -1548,18 +1548,18 @@ static gchar *imap_fetch_msg_full(Folder *folder, FolderItem *item, gint uid,
                                if (ok == 0)
                                        return filename;
                        } else {
-                               procmsg_msginfo_free(cached);
+                               procmsg_msginfo_free(&cached);
                        }
                }
                if (cached && MSG_IS_FULLY_CACHED(cached->flags)) {
-                       procmsg_msginfo_free(cached);
+                       procmsg_msginfo_free(&cached);
                        return filename;
                }
        } else {
                MsgInfo *cached = msgcache_get_msg(item->cache,uid);
                if (cached) {
                        procmsg_msginfo_unset_flags(cached, MSG_FULLY_CACHED, 0);
-                       procmsg_msginfo_free(cached);
+                       procmsg_msginfo_free(&cached);
                }
        }
 
@@ -1602,13 +1602,13 @@ static gchar *imap_fetch_msg_full(Folder *folder, FolderItem *item, gint uid,
                MsgInfo *cached = msgcache_get_msg(item->cache,uid);
                if (cached) {
                        procmsg_msginfo_set_flags(cached, MSG_FULLY_CACHED, 0);
-                       procmsg_msginfo_free(cached);
+                       procmsg_msginfo_free(&cached);
                }
        } else if (ok == -1) {
                MsgInfo *cached = msgcache_get_msg(item->cache,uid);
                if (cached) {
                        procmsg_msginfo_unset_flags(cached, MSG_FULLY_CACHED, 0);
-                       procmsg_msginfo_free(cached);
+                       procmsg_msginfo_free(&cached);
                }
        }
        return filename;
@@ -1624,7 +1624,7 @@ static gboolean imap_is_msg_fully_cached(Folder *folder, FolderItem *item, gint
                return FALSE;
 
        if (MSG_IS_FULLY_CACHED(cached->flags)) {
-               procmsg_msginfo_free(cached);
+               procmsg_msginfo_free(&cached);
                return TRUE;
        }
 
@@ -1644,11 +1644,11 @@ static gboolean imap_is_msg_fully_cached(Folder *folder, FolderItem *item, gint
        if (cached && size >= cached->size) {
                cached->total_size = cached->size;
                procmsg_msginfo_set_flags(cached, MSG_FULLY_CACHED, 0);
-               procmsg_msginfo_free(cached);
+               procmsg_msginfo_free(&cached);
                return TRUE;
        }
        if (cached)
-               procmsg_msginfo_free(cached);
+               procmsg_msginfo_free(&cached);
        return FALSE;   
 }
 
@@ -2071,6 +2071,7 @@ static gboolean imap_matcher_type_is_local(gint matchertype)
        case MATCHCRITERIA_TO_OR_CC:
        case MATCHCRITERIA_SUBJECT:
        case MATCHCRITERIA_REFERENCES:
+       case MATCHCRITERIA_MESSAGEID:
        case MATCHCRITERIA_INREPLYTO:
        case MATCHCRITERIA_AGE_GREATER:
        case MATCHCRITERIA_AGE_LOWER:
@@ -2117,6 +2118,7 @@ static IMAPSearchKey* search_make_key(MatcherProp* match, gboolean* is_all)
                case MATCHCRITERIA_NOT_MESSAGE: invert = TRUE; matchertype = MATCHCRITERIA_MESSAGE; break;
                case MATCHCRITERIA_NOT_BODY_PART: invert = TRUE; matchertype = MATCHCRITERIA_BODY_PART; break;
                case MATCHCRITERIA_NOT_TO_AND_NOT_CC: invert = TRUE; matchertype = MATCHCRITERIA_TO_OR_CC; break;
+               case MATCHCRITERIA_NOT_MESSAGEID: invert = TRUE; matchertype = MATCHCRITERIA_MESSAGEID; break;
                case MATCHCRITERIA_NOT_INREPLYTO: invert = TRUE; matchertype = MATCHCRITERIA_INREPLYTO; break;
                }
 
@@ -2143,6 +2145,10 @@ static IMAPSearchKey* search_make_key(MatcherProp* match, gboolean* is_all)
                        result = imap_search_new(IMAP_SEARCH_CRITERIA_TAG, NULL, RTAG_JUNK, 0);
                        break;
 
+               case MATCHCRITERIA_MESSAGEID:
+                       result = imap_search_new(IMAP_SEARCH_CRITERIA_HEADER, "Message-ID", match->expr, 0);
+                       break;
+
                case MATCHCRITERIA_INREPLYTO:
                        result = imap_search_new(IMAP_SEARCH_CRITERIA_HEADER, "In-Reply-To", match->expr, 0);
                        break;
@@ -3042,7 +3048,7 @@ static gchar *imap_encode_unsafe_chars(const gchar *str)
                return NULL;
        ret = g_malloc(3*strlen(str)+1);
        o_ret = ret;
-       for (i = str; *i; i++) {
+       for (i = (gchar *)str; *i; i++) {
                switch(*i) {
                        case ':':
                        case '|':
@@ -3317,9 +3323,9 @@ static gint imap_rename_folder(Folder *folder, FolderItem *item,
                g_free(real_oldpath);
                return -1;
        }
-       if (strchr(item->path, G_DIR_SEPARATOR)) {
+       if (strchr(item->path, '/')) {
                dirpath = g_path_get_dirname(item->path);
-               newpath = g_strconcat(dirpath, G_DIR_SEPARATOR_S, name, NULL);
+               newpath = g_strconcat(dirpath, "/", name, NULL);
                g_free(dirpath);
        } else
                newpath = g_strdup(name);
@@ -4458,11 +4464,11 @@ static gboolean imap_rename_folder_func(GNode *node, gpointer data)
        }
 
        base = item->path + oldpathlen;
-       while (*base == G_DIR_SEPARATOR) base++;
+       while (*base == '/') base++;
        if (*base == '\0')
                new_itempath = g_strdup(newpath);
        else
-               new_itempath = g_strconcat(newpath, G_DIR_SEPARATOR_S, base,
+               new_itempath = g_strconcat(newpath, "/", base,
                                           NULL);
 
        real_oldpath = imap_get_real_path(session, IMAP_FOLDER(item->folder), item->path, &ok);
@@ -4540,8 +4546,6 @@ static gint get_list_of_uids(IMAPSession *session, Folder *folder, IMAPFolderIte
        }
        g_slist_free(uidlist);
 
-       unlock_session(session); /* locked from imap_get_num_list */
-
        return nummsgs;
 
 }
@@ -4596,11 +4600,11 @@ 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);
 
-       lock_session(session); /* unlocked by get_list_of_uids */
+       lock_session(session);
        if (FOLDER_ITEM(item)->path) 
                statusbar_print_all(_("Scanning folder %s%c%s..."),
                                      FOLDER_ITEM(item)->folder->name, 
-                                     G_DIR_SEPARATOR,
+                                     '/',
                                      FOLDER_ITEM(item)->path);
        else
                statusbar_print_all(_("Scanning folder %s..."),
@@ -4621,6 +4625,9 @@ gint imap_get_num_list(Folder *folder, FolderItem *_item, GSList **msgnum_list,
        }
 
        nummsgs = get_list_of_uids(session, folder, item, &uidlist);
+
+       unlock_session(session);
+
        /* session could be broken now, in case of fatal error */
 
        debug_print("get_num_list: got %d msgs\n", nummsgs);
@@ -5400,7 +5407,7 @@ static gint imap_get_flags(Folder *folder, FolderItem *item,
                data->full_search = TRUE;
        
        for (cur = tmp; cur; cur = cur->next)
-               procmsg_msginfo_free((MsgInfo *)cur->data);
+               procmsg_msginfo_free((MsgInfo **)&(cur->data));
        
        g_slist_free(tmp);