-rw-r--r-- | kmicromail/opiemail.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/kmicromail/opiemail.cpp b/kmicromail/opiemail.cpp index 251f15a..3e560c5 100644 --- a/kmicromail/opiemail.cpp +++ b/kmicromail/opiemail.cpp | |||
@@ -83,48 +83,49 @@ void OpieMail::message(const QCString &msg, const QByteArray &data) | |||
83 | } | 83 | } |
84 | void OpieMail::slotwriteMail2(const QString& namemail ) | 84 | void OpieMail::slotwriteMail2(const QString& namemail ) |
85 | { | 85 | { |
86 | // qDebug("OpieMail::slotwriteMail2 "); | 86 | // qDebug("OpieMail::slotwriteMail2 "); |
87 | qApp->processEvents(); | 87 | qApp->processEvents(); |
88 | ComposeMail compose( settings, this, 0, true ); | 88 | ComposeMail compose( settings, this, 0, true ); |
89 | if ( !namemail.isEmpty() ) { | 89 | if ( !namemail.isEmpty() ) { |
90 | QString to = namemail; | 90 | QString to = namemail; |
91 | if ( namemail.find( " <") > 1 ) { | 91 | if ( namemail.find( " <") > 1 ) { |
92 | to = "\"" +to.replace( QRegExp( " <"), "\" <") ; | 92 | to = "\"" +to.replace( QRegExp( " <"), "\" <") ; |
93 | } else | 93 | } else |
94 | if ( namemail.find( "<") > 1 ) { | 94 | if ( namemail.find( "<") > 1 ) { |
95 | to = "\"" +to.replace( QRegExp( "<"), "\" <") ; | 95 | to = "\"" +to.replace( QRegExp( "<"), "\" <") ; |
96 | } | 96 | } |
97 | int sub = to.find( ">:"); | 97 | int sub = to.find( ">:"); |
98 | if ( sub > 0 ) { | 98 | if ( sub > 0 ) { |
99 | compose.setTo( to.left(sub+1) ); | 99 | compose.setTo( to.left(sub+1) ); |
100 | compose.setSubject( to.mid(sub+2) ); | 100 | compose.setSubject( to.mid(sub+2) ); |
101 | } else | 101 | } else |
102 | compose.setTo( to ); | 102 | compose.setTo( to ); |
103 | } | 103 | } |
104 | compose.slotAdjustColumns(); | 104 | compose.slotAdjustColumns(); |
105 | compose.showMaximized(); | 105 | compose.showMaximized(); |
106 | compose.exec(); | 106 | compose.exec(); |
107 | raise(); | ||
107 | //qDebug("retttich "); | 108 | //qDebug("retttich "); |
108 | } | 109 | } |
109 | void OpieMail::slotwriteMail(const QString&name,const QString&email) | 110 | void OpieMail::slotwriteMail(const QString&name,const QString&email) |
110 | { | 111 | { |
111 | // qDebug("OpieMail::slotwriteMail "); | 112 | // qDebug("OpieMail::slotwriteMail "); |
112 | ComposeMail compose( settings, this, 0, true , WStyle_ContextHelp ); | 113 | ComposeMail compose( settings, this, 0, true , WStyle_ContextHelp ); |
113 | if (!email.isEmpty()) | 114 | if (!email.isEmpty()) |
114 | { | 115 | { |
115 | if (!name.isEmpty()) | 116 | if (!name.isEmpty()) |
116 | { | 117 | { |
117 | compose.setTo("\"" + name + "\"" + " " + "<"+ email + ">"); | 118 | compose.setTo("\"" + name + "\"" + " " + "<"+ email + ">"); |
118 | } | 119 | } |
119 | else | 120 | else |
120 | { | 121 | { |
121 | compose.setTo(email); | 122 | compose.setTo(email); |
122 | } | 123 | } |
123 | } | 124 | } |
124 | compose.slotAdjustColumns(); | 125 | compose.slotAdjustColumns(); |
125 | compose.showMaximized(); | 126 | compose.showMaximized(); |
126 | compose.exec(); | 127 | compose.exec(); |
127 | } | 128 | } |
128 | 129 | ||
129 | void OpieMail::slotComposeMail() | 130 | void OpieMail::slotComposeMail() |
130 | { | 131 | { |