author | alwin <alwin> | 2003-12-14 03:41:49 (UTC) |
---|---|---|
committer | alwin <alwin> | 2003-12-14 03:41:49 (UTC) |
commit | 84ac61a9b46d463c9e3112f55cc1e69957d1348a (patch) (unidiff) | |
tree | aa2a03fc364b529a9863d44b9d51f030b22f4820 /noncore/net/mail/libmailwrapper/imapwrapper.cpp | |
parent | 12ba6ab9606538628afc7f7015e115a0251d0389 (diff) | |
download | opie-84ac61a9b46d463c9e3112f55cc1e69957d1348a.zip opie-84ac61a9b46d463c9e3112f55cc1e69957d1348a.tar.gz opie-84ac61a9b46d463c9e3112f55cc1e69957d1348a.tar.bz2 |
-memleak fixed
-check for non-selectable mailboxes
-potential crasher fixed
-selection handling better (app will not send a net-command on each mouse
click)
Diffstat (limited to 'noncore/net/mail/libmailwrapper/imapwrapper.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/net/mail/libmailwrapper/imapwrapper.cpp | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/noncore/net/mail/libmailwrapper/imapwrapper.cpp b/noncore/net/mail/libmailwrapper/imapwrapper.cpp index 9ee0dff..912a412 100644 --- a/noncore/net/mail/libmailwrapper/imapwrapper.cpp +++ b/noncore/net/mail/libmailwrapper/imapwrapper.cpp | |||
@@ -140,25 +140,25 @@ void IMAPwrapper::listMessages(const QString&mailbox,QList<RecMail> &target ) | |||
140 | } | 140 | } |
141 | mailimap_fetch_list_free(result); | 141 | mailimap_fetch_list_free(result); |
142 | } | 142 | } |
143 | 143 | ||
144 | QList<Folder>* IMAPwrapper::listFolders() | 144 | QList<Folder>* IMAPwrapper::listFolders() |
145 | { | 145 | { |
146 | const char *path, *mask; | 146 | const char *path, *mask; |
147 | int err = MAILIMAP_NO_ERROR; | 147 | int err = MAILIMAP_NO_ERROR; |
148 | clist *result; | 148 | clist *result; |
149 | clistcell *current; | 149 | clistcell *current; |
150 | 150 | ||
151 | QList<Folder> * folders = new QList<Folder>(); | 151 | QList<Folder> * folders = new QList<Folder>(); |
152 | folders->setAutoDelete( true ); | 152 | folders->setAutoDelete( false ); |
153 | login(); | 153 | login(); |
154 | if (!m_imap) { | 154 | if (!m_imap) { |
155 | return folders; | 155 | return folders; |
156 | } | 156 | } |
157 | 157 | ||
158 | /* | 158 | /* |
159 | * First we have to check for INBOX 'cause it sometimes it's not inside the path. | 159 | * First we have to check for INBOX 'cause it sometimes it's not inside the path. |
160 | * We must not forget to filter them out in next loop! | 160 | * We must not forget to filter them out in next loop! |
161 | * it seems like ugly code. and yes - it is ugly code. but the best way. | 161 | * it seems like ugly code. and yes - it is ugly code. but the best way. |
162 | */ | 162 | */ |
163 | QString temp; | 163 | QString temp; |
164 | mask = "INBOX" ; | 164 | mask = "INBOX" ; |
@@ -179,37 +179,41 @@ QList<Folder>* IMAPwrapper::listFolders() | |||
179 | qDebug("error fetching folders: %s",m_imap->imap_response); | 179 | qDebug("error fetching folders: %s",m_imap->imap_response); |
180 | } | 180 | } |
181 | mailimap_list_result_free( result ); | 181 | mailimap_list_result_free( result ); |
182 | 182 | ||
183 | /* | 183 | /* |
184 | * second stage - get the other then inbox folders | 184 | * second stage - get the other then inbox folders |
185 | */ | 185 | */ |
186 | mask = "*" ; | 186 | mask = "*" ; |
187 | path = account->getPrefix().latin1(); | 187 | path = account->getPrefix().latin1(); |
188 | if (!path) path = ""; | 188 | if (!path) path = ""; |
189 | result = clist_new(); | 189 | result = clist_new(); |
190 | qDebug(path); | 190 | qDebug(path); |
191 | bool selectable = true; | ||
192 | mailimap_mbx_list_flags*bflags; | ||
191 | err = mailimap_list( m_imap, (char*)path, (char*)mask, &result ); | 193 | err = mailimap_list( m_imap, (char*)path, (char*)mask, &result ); |
192 | if ( err == MAILIMAP_NO_ERROR ) { | 194 | if ( err == MAILIMAP_NO_ERROR ) { |
193 | current = result->first; | 195 | current = result->first; |
194 | for ( int i = result->count; i > 0; i-- ) { | 196 | for ( current=clist_begin(result);current!=NULL;current=clist_next(current)) { |
195 | list = (mailimap_mailbox_list *) current->data; | 197 | list = (mailimap_mailbox_list *) current->data; |
196 | // it is better use the deep copy mechanism of qt itself | 198 | // it is better use the deep copy mechanism of qt itself |
197 | // instead of using strdup! | 199 | // instead of using strdup! |
198 | temp = list->mb_name; | 200 | temp = list->mb_name; |
199 | current = current->next; | ||
200 | if (temp.lower()=="inbox") | 201 | if (temp.lower()=="inbox") |
201 | continue; | 202 | continue; |
202 | folders->append(new IMAPFolder(temp)); | 203 | if ( (bflags = list->mb_flag) ) { |
203 | 204 | selectable = !(bflags->mbf_type==MAILIMAP_MBX_LIST_FLAGS_SFLAG&& | |
205 | bflags->mbf_sflag==MAILIMAP_MBX_LIST_SFLAG_NOSELECT); | ||
206 | } | ||
207 | folders->append(new IMAPFolder(temp,selectable)); | ||
204 | } | 208 | } |
205 | } else { | 209 | } else { |
206 | qDebug("error fetching folders %s",m_imap->imap_response); | 210 | qDebug("error fetching folders %s",m_imap->imap_response); |
207 | } | 211 | } |
208 | mailimap_list_result_free( result ); | 212 | mailimap_list_result_free( result ); |
209 | return folders; | 213 | return folders; |
210 | } | 214 | } |
211 | 215 | ||
212 | RecMail*IMAPwrapper::parse_list_result(mailimap_msg_att* m_att) | 216 | RecMail*IMAPwrapper::parse_list_result(mailimap_msg_att* m_att) |
213 | { | 217 | { |
214 | RecMail * m = 0; | 218 | RecMail * m = 0; |
215 | mailimap_msg_att_item *item=0; | 219 | mailimap_msg_att_item *item=0; |