| author | llornkcor <llornkcor> | 2003-05-24 02:07:21 (UTC) |
|---|---|---|
| committer | llornkcor <llornkcor> | 2003-05-24 02:07:21 (UTC) |
| commit | 694ff39fe4f0f4164edd7a2a80abe6be3a4fa2f9 (patch) (side-by-side diff) | |
| tree | 6c3f2a5837e32adf2755de4f90d3590d585f1a96 | |
| parent | 62d2ddfb5cd77e2637cdf7fe16d76aac04975984 (diff) | |
| download | opie-694ff39fe4f0f4164edd7a2a80abe6be3a4fa2f9.zip opie-694ff39fe4f0f4164edd7a2a80abe6be3a4fa2f9.tar.gz opie-694ff39fe4f0f4164edd7a2a80abe6be3a4fa2f9.tar.bz2 | |
fix for a few crashes. one being stack overwrite. please test before I commit to 0_99
| -rw-r--r-- | noncore/net/mailit/emailclient.cpp | 8 | ||||
| -rw-r--r-- | noncore/net/mailit/emailhandler.cpp | 6 | ||||
| -rw-r--r-- | noncore/net/mailit/mailitwindow.cpp | 2 | ||||
| -rw-r--r-- | noncore/unsupported/mailit/emailclient.cpp | 8 | ||||
| -rw-r--r-- | noncore/unsupported/mailit/emailhandler.cpp | 6 | ||||
| -rw-r--r-- | noncore/unsupported/mailit/mailitwindow.cpp | 2 |
6 files changed, 20 insertions, 12 deletions
diff --git a/noncore/net/mailit/emailclient.cpp b/noncore/net/mailit/emailclient.cpp index 2102ba7..da1226c 100644 --- a/noncore/net/mailit/emailclient.cpp +++ b/noncore/net/mailit/emailclient.cpp @@ -471,6 +471,6 @@ void EmailClient::mailArrived(const Email &mail, bool fromDisk) } - if (item->getMail()->files.count()>0) - { - item->setPixmap(0, Resource::loadPixmap("mailit/attach")); - } +// if (item->getMail()->files.count()>0) +// { +// item->setPixmap(0, Resource::loadPixmap("mailit/attach")); +// } /*if (!newMail.downloaded) diff --git a/noncore/net/mailit/emailhandler.cpp b/noncore/net/mailit/emailhandler.cpp index 59ccd90..39f693d 100644 --- a/noncore/net/mailit/emailhandler.cpp +++ b/noncore/net/mailit/emailhandler.cpp @@ -177,3 +177,5 @@ bool EmailHandler::parse(const QString &in, const QString &lineShift, Email *mai - TextParser p(header, lineShift); + // TextParser p(header, lineShift); + TextParser * lp = new TextParser(header, lineShift); +#define p (*lp) @@ -272,2 +274,3 @@ bool EmailHandler::parse(const QString &in, const QString &lineShift, Email *mai mail->bodyPlain = body; + delete lp; return mail; @@ -340,2 +343,3 @@ bool EmailHandler::parse(const QString &in, const QString &lineShift, Email *mai } + delete lp; return TRUE; diff --git a/noncore/net/mailit/mailitwindow.cpp b/noncore/net/mailit/mailitwindow.cpp index a111241..f945a0f 100644 --- a/noncore/net/mailit/mailitwindow.cpp +++ b/noncore/net/mailit/mailitwindow.cpp @@ -142,3 +142,3 @@ void MailItWindow::viewMail(QListView *view, Email *mail) views->raiseWidget(readMail); - setCaption( tr( "Examine mail" ) ); + setCaption( tr( "Read Mail" ) ); } diff --git a/noncore/unsupported/mailit/emailclient.cpp b/noncore/unsupported/mailit/emailclient.cpp index 2102ba7..da1226c 100644 --- a/noncore/unsupported/mailit/emailclient.cpp +++ b/noncore/unsupported/mailit/emailclient.cpp @@ -471,6 +471,6 @@ void EmailClient::mailArrived(const Email &mail, bool fromDisk) } - if (item->getMail()->files.count()>0) - { - item->setPixmap(0, Resource::loadPixmap("mailit/attach")); - } +// if (item->getMail()->files.count()>0) +// { +// item->setPixmap(0, Resource::loadPixmap("mailit/attach")); +// } /*if (!newMail.downloaded) diff --git a/noncore/unsupported/mailit/emailhandler.cpp b/noncore/unsupported/mailit/emailhandler.cpp index 59ccd90..39f693d 100644 --- a/noncore/unsupported/mailit/emailhandler.cpp +++ b/noncore/unsupported/mailit/emailhandler.cpp @@ -177,3 +177,5 @@ bool EmailHandler::parse(const QString &in, const QString &lineShift, Email *mai - TextParser p(header, lineShift); + // TextParser p(header, lineShift); + TextParser * lp = new TextParser(header, lineShift); +#define p (*lp) @@ -272,2 +274,3 @@ bool EmailHandler::parse(const QString &in, const QString &lineShift, Email *mai mail->bodyPlain = body; + delete lp; return mail; @@ -340,2 +343,3 @@ bool EmailHandler::parse(const QString &in, const QString &lineShift, Email *mai } + delete lp; return TRUE; diff --git a/noncore/unsupported/mailit/mailitwindow.cpp b/noncore/unsupported/mailit/mailitwindow.cpp index a111241..f945a0f 100644 --- a/noncore/unsupported/mailit/mailitwindow.cpp +++ b/noncore/unsupported/mailit/mailitwindow.cpp @@ -142,3 +142,3 @@ void MailItWindow::viewMail(QListView *view, Email *mail) views->raiseWidget(readMail); - setCaption( tr( "Examine mail" ) ); + setCaption( tr( "Read Mail" ) ); } |