summaryrefslogtreecommitdiff
authorharlekin <harlekin>2003-12-13 22:17:45 (UTC)
committer harlekin <harlekin>2003-12-13 22:17:45 (UTC)
commitf1fa9ca873169e803fcc28cecd756a3edaa30ec4 (patch) (unidiff)
tree6e1f14694056c341427475d9fdddac1b9dcf99a7
parent8290f1a524b6f0051e49f8045d24e508d46868e2 (diff)
downloadopie-f1fa9ca873169e803fcc28cecd756a3edaa30ec4.zip
opie-f1fa9ca873169e803fcc28cecd756a3edaa30ec4.tar.gz
opie-f1fa9ca873169e803fcc28cecd756a3edaa30ec4.tar.bz2
make sure the wrapper pointer is not Ol
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/mail/mainwindow.cpp4
-rw-r--r--noncore/net/mail/viewmail.cpp7
2 files changed, 6 insertions, 5 deletions
diff --git a/noncore/net/mail/mainwindow.cpp b/noncore/net/mail/mainwindow.cpp
index 560715c..8ef7ddd 100644
--- a/noncore/net/mail/mainwindow.cpp
+++ b/noncore/net/mail/mainwindow.cpp
@@ -82,7 +82,7 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags )
82 layout->addWidget( folderView ); 82 layout->addWidget( folderView );
83 83
84 mailView = new QListView( view ); 84 mailView = new QListView( view );
85 mailView->addColumn( tr( "Status" ) ); 85 mailView->addColumn( tr( "" ) );
86 mailView->addColumn( tr( "Subject" ),QListView::Manual ); 86 mailView->addColumn( tr( "Subject" ),QListView::Manual );
87 mailView->addColumn( tr( "Sender" ),QListView::Manual ); 87 mailView->addColumn( tr( "Sender" ),QListView::Manual );
88 mailView->addColumn( tr( "Date" )); 88 mailView->addColumn( tr( "Date" ));
@@ -100,7 +100,7 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags )
100 100
101 connect(folderView,SIGNAL(refreshMailview(QList<RecMail>*)),this,SLOT(refreshMailView(QList<RecMail>*))); 101 connect(folderView,SIGNAL(refreshMailview(QList<RecMail>*)),this,SLOT(refreshMailView(QList<RecMail>*)));
102 102
103 QTimer::singleShot( 1000, this, SLOT( slotAdjustColumns() ) ); 103 QTimer::singleShot( 1000, this, SLOT( slotAdjustColumns() ) );
104} 104}
105 105
106 106
diff --git a/noncore/net/mail/viewmail.cpp b/noncore/net/mail/viewmail.cpp
index a73dac5..42707e3 100644
--- a/noncore/net/mail/viewmail.cpp
+++ b/noncore/net/mail/viewmail.cpp
@@ -112,7 +112,7 @@ void ViewMail::slotItemClicked( QListViewItem * item , const QPoint & point, int
112 if ( item->text( 0 ).left( 4 ) == "text" ) { 112 if ( item->text( 0 ).left( 4 ) == "text" ) {
113 menu->insertItem( tr( "Show Text" ), 1 ); 113 menu->insertItem( tr( "Show Text" ), 1 );
114 } 114 }
115 menu->insertItem( tr( "Save Attachemt" ), 0 ); 115 menu->insertItem( tr( "Save Attachment" ), 0 );
116 menu->insertSeparator(1); 116 menu->insertSeparator(1);
117 117
118 ret = menu->exec( point, 0 ); 118 ret = menu->exec( point, 0 );
@@ -125,17 +125,18 @@ void ViewMail::slotItemClicked( QListViewItem * item , const QPoint & point, int
125 "/", item->text( 1 ) , types, 0 ); 125 "/", item->text( 1 ) , types, 0 );
126 126
127 if( !str.isEmpty() ) { 127 if( !str.isEmpty() ) {
128 qDebug( " first we will need a MIME wrapper" ); 128 qDebug( "first we will need a MIME wrapper" );
129 } 129 }
130 } 130 }
131 break ; 131 break ;
132 132
133 case 1: 133 case 1:
134 qDebug( QString( "Test selected" ).arg( ( ( AttachItem* )item )->Partnumber() ) );
135 if ( ( ( AttachItem* )item )->Partnumber() == -1 ) { 134 if ( ( ( AttachItem* )item )->Partnumber() == -1 ) {
136 setText(); 135 setText();
137 } else { 136 } else {
137 if ( m_recMail.Wrapper() != 0l ) { // make sure that there is a wrapper , even after delete or simular actions
138 browser->setText( m_recMail.Wrapper()->fetchPart( m_recMail, m_body.Parts()[ ( ( AttachItem* )item )->Partnumber() ] ) ); 138 browser->setText( m_recMail.Wrapper()->fetchPart( m_recMail, m_body.Parts()[ ( ( AttachItem* )item )->Partnumber() ] ) );
139 }
139 } 140 }
140 break; 141 break;
141 } 142 }