2 files changed, 22 insertions, 28 deletions
diff --git a/noncore/net/mail/imapwrapper.cpp b/noncore/net/mail/imapwrapper.cpp
index 0178e33..89ec7ab 100644
--- a/noncore/net/mail/imapwrapper.cpp
+++ b/noncore/net/mail/imapwrapper.cpp
@@ -150,42 +150,41 @@ void IMAPwrapper::listMessages(const QString&mailbox,QList<RecMail> &target )
            }
        }
    } else {
        qDebug("Error fetching headers: %s",m_imap->imap_response);
    }
    if (result) mailimap_fetch_list_free(result);
 }
 QList<Folder>* IMAPwrapper::listFolders()
 {
    const char *path, *mask;
    int err = MAILIMAP_NO_ERROR;
-    clist *result;
+    clist *result = 0;
-    clistcell *current;
+    clistcell *current = 0;
    QList<Folder> * folders = new QList<Folder>();
    folders->setAutoDelete( false );
    login();
    if (!m_imap) {
        return folders;
    }
 /*
 * First we have to check for INBOX 'cause it sometimes it's not inside the path.
 * We must not forget to filter them out in next loop!
 * it seems like ugly code. and yes - it is ugly code. but the best way.
 */
    QString temp;
    mask = "INBOX" ;
-    result = clist_new();
    mailimap_mailbox_list *list;
    err = mailimap_list( m_imap, (char*)"", (char*)mask, &result );
    QString del;
    if ( err == MAILIMAP_NO_ERROR ) {
        current = result->first;
        for ( int i = result->count; i > 0; i-- ) {
            list = (mailimap_mailbox_list *) current->data;
            // it is better use the deep copy mechanism of qt itself
            // instead of using strdup!
            temp = list->mb_name;
            del = list->mb_delimiter;
            folders->append( new IMAPFolder(temp,del,true,account->getPrefix()));
@@ -193,25 +192,24 @@ QList<Folder>* IMAPwrapper::listFolders()
        }
    } else {
        qDebug("error fetching folders: %s",m_imap->imap_response);
    }
    mailimap_list_result_free( result );
 /*
 * second stage - get the other then inbox folders
 */
    mask = "*" ;
    path = account->getPrefix().latin1();
    if (!path) path = "";
-    result = clist_new();
    qDebug(path);
    bool selectable = true;
    mailimap_mbx_list_flags*bflags;
    err = mailimap_list( m_imap, (char*)path, (char*)mask, &result );
    if ( err == MAILIMAP_NO_ERROR ) {
        current = result->first;
        for ( current=clist_begin(result);current!=NULL;current=clist_next(current)) {
            list = (mailimap_mailbox_list *) current->data;
            // it is better use the deep copy mechanism of qt itself
            // instead of using strdup!
            temp = list->mb_name;
            if (temp.lower()=="inbox")
@@ -219,25 +217,25 @@ QList<Folder>* IMAPwrapper::listFolders()
            if (temp.lower()==account->getPrefix().lower())
                continue;
            if ( (bflags = list->mb_flag) ) {
                selectable = !(bflags->mbf_type==MAILIMAP_MBX_LIST_FLAGS_SFLAG&&
                            bflags->mbf_sflag==MAILIMAP_MBX_LIST_SFLAG_NOSELECT);
            }
            del = list->mb_delimiter;
            folders->append(new IMAPFolder(temp,del,selectable,account->getPrefix()));
        }
    } else {
        qDebug("error fetching folders %s",m_imap->imap_response);
    }
-    mailimap_list_result_free( result );
+    if (result) mailimap_list_result_free( result );
    return folders;
 }
 RecMail*IMAPwrapper::parse_list_result(mailimap_msg_att* m_att)
 {
    RecMail * m = 0;
    mailimap_msg_att_item *item=0;
    clistcell *current,*c,*cf;
    mailimap_msg_att_dynamic*flist;
    mailimap_flag_fetch*cflag;
    int size;
    QBitArray mFlags(7);
@@ -338,68 +336,67 @@ RecMail*IMAPwrapper::parse_list_result(mailimap_msg_att* m_att)
    if (m) {
        m->setFlags(mFlags);
        m->setMsgsize(size);
    }
    return m;
 }
 RecBody IMAPwrapper::fetchBody(const RecMail&mail)
 {
    RecBody body;
    const char *mb;
    int err = MAILIMAP_NO_ERROR;
-    clist *result;
+    clist *result = 0;
    clistcell *current;
-    mailimap_fetch_att *fetchAtt;
+    mailimap_fetch_att *fetchAtt = 0;
-    mailimap_fetch_type *fetchType;
+    mailimap_fetch_type *fetchType = 0;
-    mailimap_set *set;
+    mailimap_set *set = 0;
-    mailimap_body*body_desc;
+    mailimap_body*body_desc = 0;
    mb = mail.getMbox().latin1();
    login();
    if (!m_imap) {
        return body;
    }
    
    err = mailimap_select( m_imap, (char*)mb);
    if ( err != MAILIMAP_NO_ERROR ) {
        qDebug("error selecting mailbox: %s",m_imap->imap_response);
        return body;
    }
 
-    result = clist_new();
    /* the range has to start at 1!!! not with 0!!!! */
    set = mailimap_set_new_interval( mail.getNumber(),mail.getNumber() );
    fetchAtt = mailimap_fetch_att_new_bodystructure();
    fetchType = mailimap_fetch_type_new_fetch_att(fetchAtt);
    err = mailimap_fetch( m_imap, set, fetchType, &result );
    mailimap_set_free( set );
    mailimap_fetch_type_free( fetchType );
    if (err == MAILIMAP_NO_ERROR && (current=clist_begin(result)) ) {
        mailimap_msg_att * msg_att;
        msg_att = (mailimap_msg_att*)current->data;
        mailimap_msg_att_item*item = (mailimap_msg_att_item*)msg_att->att_list->first->data;
        body_desc = item->att_data.att_static->att_data.att_body;
        if (body_desc->bd_type==MAILIMAP_BODY_1PART) {
            searchBodyText(mail,body_desc->bd_data.bd_body_1part,body);
        } else if (body_desc->bd_type==MAILIMAP_BODY_MPART) {
            qDebug("Mulitpart mail");
            searchBodyText(mail,body_desc->bd_data.bd_body_mpart,body);
        }
    } else {
        qDebug("error fetching body: %s",m_imap->imap_response);
    }
-    mailimap_fetch_list_free(result);
+    if (result) mailimap_fetch_list_free(result);
    return body;
 }
 /* this routine is just called when the mail has only ONE part.
   for filling the parts of a multi-part-message there are other
   routines 'cause we can not simply fetch the whole body. */
 void IMAPwrapper::searchBodyText(const RecMail&mail,mailimap_body_type_1part*mailDescription,RecBody&target_body)
 {
    if (!mailDescription) {
        return;
    }
    QString sub,body_text;
@@ -500,49 +497,49 @@ encodedString*IMAPwrapper::fetchRawPart(const RecMail&mail,const QValueList<int>
    for (unsigned j=0; j < path.count();++j) {
        uint32_t * p_id = (uint32_t *)malloc(sizeof(*p_id));
        *p_id = path[j];
        clist_append(id_list,p_id);
    }
    mailimap_section_part * section_part =  mailimap_section_part_new(id_list);
    mailimap_section_spec * section_spec =  mailimap_section_spec_new(MAILIMAP_SECTION_SPEC_SECTION_PART, NULL, section_part, NULL);
    mailimap_section * section = mailimap_section_new(section_spec);
    mailimap_fetch_att * fetch_att = mailimap_fetch_att_new_body_section(section);
    
    fetchType = mailimap_fetch_type_new_fetch_att(fetch_att);
    
-    clist*result = clist_new();
+    clist*result = 0;
    
    err = mailimap_fetch( m_imap, set, fetchType, &result );
    mailimap_set_free( set );
    mailimap_fetch_type_free( fetchType );
    
    if (err == MAILIMAP_NO_ERROR && (current=clist_begin(result)) ) {
        mailimap_msg_att * msg_att;
        msg_att = (mailimap_msg_att*)current->data;
        mailimap_msg_att_item*msg_att_item;
        for(cur = clist_begin(msg_att->att_list) ; cur != NULL ; cur = clist_next(cur)) {
            msg_att_item = (mailimap_msg_att_item*)clist_content(cur);
            if (msg_att_item->att_type == MAILIMAP_MSG_ATT_ITEM_STATIC) {
                if (msg_att_item->att_data.att_static->att_type == MAILIMAP_MSG_ATT_BODY_SECTION) {
                    char*text = msg_att_item->att_data.att_static->att_data.att_body_section->sec_body_part;
                    /* detach - we take over the content */
                    msg_att_item->att_data.att_static->att_data.att_body_section->sec_body_part = 0L;
                    res->setContent(text,msg_att_item->att_data.att_static->att_data.att_body_section->sec_length);
                }
            }
        }         
    } else {
        qDebug("error fetching text: %s",m_imap->imap_response);
    }
-    mailimap_fetch_list_free(result);
+    if (result) mailimap_fetch_list_free(result);
    return res;
 }
 void IMAPwrapper::searchBodyText(const RecMail&mail,mailimap_body_type_mpart*mailDescription,RecBody&target_body,int current_recursion,QValueList<int>recList)
 {
    /* current_recursion is for avoiding ugly mails which has a to deep body-structure */
    if (!mailDescription||current_recursion==10) {
        return;
    }
    clistcell*current;
    mailimap_body*current_body;
    unsigned int count = 0;
diff --git a/noncore/net/mail/libmailwrapper/imapwrapper.cpp b/noncore/net/mail/libmailwrapper/imapwrapper.cpp
index 0178e33..89ec7ab 100644
--- a/noncore/net/mail/libmailwrapper/imapwrapper.cpp
+++ b/noncore/net/mail/libmailwrapper/imapwrapper.cpp
@@ -150,42 +150,41 @@ void IMAPwrapper::listMessages(const QString&mailbox,QList<RecMail> &target )
            }
        }
    } else {
        qDebug("Error fetching headers: %s",m_imap->imap_response);
    }
    if (result) mailimap_fetch_list_free(result);
 }
 QList<Folder>* IMAPwrapper::listFolders()
 {
    const char *path, *mask;
    int err = MAILIMAP_NO_ERROR;
-    clist *result;
+    clist *result = 0;
-    clistcell *current;
+    clistcell *current = 0;
    QList<Folder> * folders = new QList<Folder>();
    folders->setAutoDelete( false );
    login();
    if (!m_imap) {
        return folders;
    }
 /*
 * First we have to check for INBOX 'cause it sometimes it's not inside the path.
 * We must not forget to filter them out in next loop!
 * it seems like ugly code. and yes - it is ugly code. but the best way.
 */
    QString temp;
    mask = "INBOX" ;
-    result = clist_new();
    mailimap_mailbox_list *list;
    err = mailimap_list( m_imap, (char*)"", (char*)mask, &result );
    QString del;
    if ( err == MAILIMAP_NO_ERROR ) {
        current = result->first;
        for ( int i = result->count; i > 0; i-- ) {
            list = (mailimap_mailbox_list *) current->data;
            // it is better use the deep copy mechanism of qt itself
            // instead of using strdup!
            temp = list->mb_name;
            del = list->mb_delimiter;
            folders->append( new IMAPFolder(temp,del,true,account->getPrefix()));
@@ -193,25 +192,24 @@ QList<Folder>* IMAPwrapper::listFolders()
        }
    } else {
        qDebug("error fetching folders: %s",m_imap->imap_response);
    }
    mailimap_list_result_free( result );
 /*
 * second stage - get the other then inbox folders
 */
    mask = "*" ;
    path = account->getPrefix().latin1();
    if (!path) path = "";
-    result = clist_new();
    qDebug(path);
    bool selectable = true;
    mailimap_mbx_list_flags*bflags;
    err = mailimap_list( m_imap, (char*)path, (char*)mask, &result );
    if ( err == MAILIMAP_NO_ERROR ) {
        current = result->first;
        for ( current=clist_begin(result);current!=NULL;current=clist_next(current)) {
            list = (mailimap_mailbox_list *) current->data;
            // it is better use the deep copy mechanism of qt itself
            // instead of using strdup!
            temp = list->mb_name;
            if (temp.lower()=="inbox")
@@ -219,25 +217,25 @@ QList<Folder>* IMAPwrapper::listFolders()
            if (temp.lower()==account->getPrefix().lower())
                continue;
            if ( (bflags = list->mb_flag) ) {
                selectable = !(bflags->mbf_type==MAILIMAP_MBX_LIST_FLAGS_SFLAG&&
                            bflags->mbf_sflag==MAILIMAP_MBX_LIST_SFLAG_NOSELECT);
            }
            del = list->mb_delimiter;
            folders->append(new IMAPFolder(temp,del,selectable,account->getPrefix()));
        }
    } else {
        qDebug("error fetching folders %s",m_imap->imap_response);
    }
-    mailimap_list_result_free( result );
+    if (result) mailimap_list_result_free( result );
    return folders;
 }
 RecMail*IMAPwrapper::parse_list_result(mailimap_msg_att* m_att)
 {
    RecMail * m = 0;
    mailimap_msg_att_item *item=0;
    clistcell *current,*c,*cf;
    mailimap_msg_att_dynamic*flist;
    mailimap_flag_fetch*cflag;
    int size;
    QBitArray mFlags(7);
@@ -338,68 +336,67 @@ RecMail*IMAPwrapper::parse_list_result(mailimap_msg_att* m_att)
    if (m) {
        m->setFlags(mFlags);
        m->setMsgsize(size);
    }
    return m;
 }
 RecBody IMAPwrapper::fetchBody(const RecMail&mail)
 {
    RecBody body;
    const char *mb;
    int err = MAILIMAP_NO_ERROR;
-    clist *result;
+    clist *result = 0;
    clistcell *current;
-    mailimap_fetch_att *fetchAtt;
+    mailimap_fetch_att *fetchAtt = 0;
-    mailimap_fetch_type *fetchType;
+    mailimap_fetch_type *fetchType = 0;
-    mailimap_set *set;
+    mailimap_set *set = 0;
-    mailimap_body*body_desc;
+    mailimap_body*body_desc = 0;
    mb = mail.getMbox().latin1();
    login();
    if (!m_imap) {
        return body;
    }
    
    err = mailimap_select( m_imap, (char*)mb);
    if ( err != MAILIMAP_NO_ERROR ) {
        qDebug("error selecting mailbox: %s",m_imap->imap_response);
        return body;
    }
 
-    result = clist_new();
    /* the range has to start at 1!!! not with 0!!!! */
    set = mailimap_set_new_interval( mail.getNumber(),mail.getNumber() );
    fetchAtt = mailimap_fetch_att_new_bodystructure();
    fetchType = mailimap_fetch_type_new_fetch_att(fetchAtt);
    err = mailimap_fetch( m_imap, set, fetchType, &result );
    mailimap_set_free( set );
    mailimap_fetch_type_free( fetchType );
    if (err == MAILIMAP_NO_ERROR && (current=clist_begin(result)) ) {
        mailimap_msg_att * msg_att;
        msg_att = (mailimap_msg_att*)current->data;
        mailimap_msg_att_item*item = (mailimap_msg_att_item*)msg_att->att_list->first->data;
        body_desc = item->att_data.att_static->att_data.att_body;
        if (body_desc->bd_type==MAILIMAP_BODY_1PART) {
            searchBodyText(mail,body_desc->bd_data.bd_body_1part,body);
        } else if (body_desc->bd_type==MAILIMAP_BODY_MPART) {
            qDebug("Mulitpart mail");
            searchBodyText(mail,body_desc->bd_data.bd_body_mpart,body);
        }
    } else {
        qDebug("error fetching body: %s",m_imap->imap_response);
    }
-    mailimap_fetch_list_free(result);
+    if (result) mailimap_fetch_list_free(result);
    return body;
 }
 /* this routine is just called when the mail has only ONE part.
   for filling the parts of a multi-part-message there are other
   routines 'cause we can not simply fetch the whole body. */
 void IMAPwrapper::searchBodyText(const RecMail&mail,mailimap_body_type_1part*mailDescription,RecBody&target_body)
 {
    if (!mailDescription) {
        return;
    }
    QString sub,body_text;
@@ -500,49 +497,49 @@ encodedString*IMAPwrapper::fetchRawPart(const RecMail&mail,const QValueList<int>
    for (unsigned j=0; j < path.count();++j) {
        uint32_t * p_id = (uint32_t *)malloc(sizeof(*p_id));
        *p_id = path[j];
        clist_append(id_list,p_id);
    }
    mailimap_section_part * section_part =  mailimap_section_part_new(id_list);
    mailimap_section_spec * section_spec =  mailimap_section_spec_new(MAILIMAP_SECTION_SPEC_SECTION_PART, NULL, section_part, NULL);
    mailimap_section * section = mailimap_section_new(section_spec);
    mailimap_fetch_att * fetch_att = mailimap_fetch_att_new_body_section(section);
    
    fetchType = mailimap_fetch_type_new_fetch_att(fetch_att);
    
-    clist*result = clist_new();
+    clist*result = 0;
    
    err = mailimap_fetch( m_imap, set, fetchType, &result );
    mailimap_set_free( set );
    mailimap_fetch_type_free( fetchType );
    
    if (err == MAILIMAP_NO_ERROR && (current=clist_begin(result)) ) {
        mailimap_msg_att * msg_att;
        msg_att = (mailimap_msg_att*)current->data;
        mailimap_msg_att_item*msg_att_item;
        for(cur = clist_begin(msg_att->att_list) ; cur != NULL ; cur = clist_next(cur)) {
            msg_att_item = (mailimap_msg_att_item*)clist_content(cur);
            if (msg_att_item->att_type == MAILIMAP_MSG_ATT_ITEM_STATIC) {
                if (msg_att_item->att_data.att_static->att_type == MAILIMAP_MSG_ATT_BODY_SECTION) {
                    char*text = msg_att_item->att_data.att_static->att_data.att_body_section->sec_body_part;
                    /* detach - we take over the content */
                    msg_att_item->att_data.att_static->att_data.att_body_section->sec_body_part = 0L;
                    res->setContent(text,msg_att_item->att_data.att_static->att_data.att_body_section->sec_length);
                }
            }
        }         
    } else {
        qDebug("error fetching text: %s",m_imap->imap_response);
    }
-    mailimap_fetch_list_free(result);
+    if (result) mailimap_fetch_list_free(result);
    return res;
 }
 void IMAPwrapper::searchBodyText(const RecMail&mail,mailimap_body_type_mpart*mailDescription,RecBody&target_body,int current_recursion,QValueList<int>recList)
 {
    /* current_recursion is for avoiding ugly mails which has a to deep body-structure */
    if (!mailDescription||current_recursion==10) {
        return;
    }
    clistcell*current;
    mailimap_body*current_body;
    unsigned int count = 0;