-rw-r--r-- | kmicromail/accountitem.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/kmicromail/accountitem.cpp b/kmicromail/accountitem.cpp index 7795055..49d86fc 100644 --- a/kmicromail/accountitem.cpp +++ b/kmicromail/accountitem.cpp | |||
@@ -289,33 +289,33 @@ void NNTPviewItem::refresh() | |||
289 | 289 | ||
290 | RECBODYP NNTPviewItem::fetchBody( const RecMailP &mail ) | 290 | RECBODYP NNTPviewItem::fetchBody( const RecMailP &mail ) |
291 | { | 291 | { |
292 | 292 | ||
293 | return wrapper->fetchBody( mail ); | 293 | return wrapper->fetchBody( mail ); |
294 | } | 294 | } |
295 | 295 | ||
296 | QPopupMenu * NNTPviewItem::getContextMenu() | 296 | QPopupMenu * NNTPviewItem::getContextMenu() |
297 | { | 297 | { |
298 | QPopupMenu *m = new QPopupMenu(0); | 298 | QPopupMenu *m = new QPopupMenu(0); |
299 | if (m) | 299 | if (m) |
300 | { | 300 | { |
301 | if (!account->getOffline()) | 301 | if (!account->getOffline()) |
302 | { | 302 | { |
303 | m->insertItem(QObject::tr("Disconnect",contextName),0); | 303 | m->insertItem(QObject::tr("Disconnect",contextName),0); |
304 | m->insertItem(QObject::tr("Set offline",contextName),1); | 304 | m->insertItem(QObject::tr("Set offline",contextName),1); |
305 | m->insertItem(QObject::tr("(Un-)Subscribe groups",contextName),2); | 305 | //m->insertItem(QObject::tr("(Un-)Subscribe groups",contextName),2); |
306 | } | 306 | } |
307 | else | 307 | else |
308 | { | 308 | { |
309 | m->insertItem(QObject::tr("Set online",contextName),1); | 309 | m->insertItem(QObject::tr("Set online",contextName),1); |
310 | } | 310 | } |
311 | } | 311 | } |
312 | return m; | 312 | return m; |
313 | } | 313 | } |
314 | 314 | ||
315 | void NNTPviewItem::subscribeGroups() | 315 | void NNTPviewItem::subscribeGroups() |
316 | { | 316 | { |
317 | NNTPGroupsDlg dlg(account); | 317 | NNTPGroupsDlg dlg(account); |
318 | dlg.showMaximized(); | 318 | dlg.showMaximized(); |
319 | if ( dlg.exec()== QDialog::Accepted ){ | 319 | if ( dlg.exec()== QDialog::Accepted ){ |
320 | refresh(); | 320 | refresh(); |
321 | } | 321 | } |
@@ -746,35 +746,34 @@ void IMAPfolderItem::contextMenuSelected(int id) | |||
746 | view->refreshCurrent(); | 746 | view->refreshCurrent(); |
747 | break; | 747 | break; |
748 | case 1: | 748 | case 1: |
749 | deleteAllMail(imap->getWrapper(),folder); | 749 | deleteAllMail(imap->getWrapper(),folder); |
750 | break; | 750 | break; |
751 | case 2: | 751 | case 2: |
752 | createNewFolder(); | 752 | createNewFolder(); |
753 | break; | 753 | break; |
754 | case 3: | 754 | case 3: |
755 | deleteFolder(); | 755 | deleteFolder(); |
756 | break; | 756 | break; |
757 | case 4: | 757 | case 4: |
758 | downloadMails(); | 758 | downloadMails(); |
759 | break; | 759 | break; |
760 | case GET_NEW_MAILS: // daunlood | 760 | case GET_NEW_MAILS: // daunlood |
761 | { | 761 | { |
762 | AccountView*bl = accountView(); | 762 | if (!view) return; |
763 | if (!bl) return; | 763 | view->downloadMailsInbox(getFolder(),imap->getWrapper()); |
764 | bl->downloadMailsInbox(getFolder(),imap->getWrapper()); | ||
765 | } | 764 | } |
766 | break; | 765 | break; |
767 | default: | 766 | default: |
768 | break; | 767 | break; |
769 | } | 768 | } |
770 | } | 769 | } |
771 | 770 | ||
772 | /** | 771 | /** |
773 | * MH Account stuff | 772 | * MH Account stuff |
774 | */ | 773 | */ |
775 | /* MH is a little bit different - the top folder can contains messages other than in IMAP and | 774 | /* MH is a little bit different - the top folder can contains messages other than in IMAP and |
776 | POP3 and MBOX */ | 775 | POP3 and MBOX */ |
777 | MHviewItem::MHviewItem( const QString&aPath, AccountView *parent ) | 776 | MHviewItem::MHviewItem( const QString&aPath, AccountView *parent ) |
778 | : AccountViewItem( parent ) | 777 | : AccountViewItem( parent ) |
779 | { | 778 | { |
780 | m_Path = aPath; | 779 | m_Path = aPath; |