author | zautrix <zautrix> | 2004-09-08 02:02:15 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2004-09-08 02:02:15 (UTC) |
commit | e5f6ea343bc2b129f81fde3734b100cfa2ed6c83 (patch) (unidiff) | |
tree | 8d33b16e52b1d886cf524052418e8dd445689a66 /kmicromail/composemail.cpp | |
parent | 199025628054eef739a261437a51a98f5218ab0f (diff) | |
download | kdepimpi-e5f6ea343bc2b129f81fde3734b100cfa2ed6c83.zip kdepimpi-e5f6ea343bc2b129f81fde3734b100cfa2ed6c83.tar.gz kdepimpi-e5f6ea343bc2b129f81fde3734b100cfa2ed6c83.tar.bz2 |
Some fixes
-rw-r--r-- | kmicromail/composemail.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kmicromail/composemail.cpp b/kmicromail/composemail.cpp index f7604ad..14feeee 100644 --- a/kmicromail/composemail.cpp +++ b/kmicromail/composemail.cpp | |||
@@ -172,65 +172,65 @@ void ComposeMail::pickAddress( ) | |||
172 | //qDebug(" ComposeMail::pickAddress "); | 172 | //qDebug(" ComposeMail::pickAddress "); |
173 | QString names ;//= AddressPicker::getNames(); | 173 | QString names ;//= AddressPicker::getNames(); |
174 | 174 | ||
175 | KABC::Addressee::List list = KABC::AddresseeDialog::getAddressees(this); | 175 | KABC::Addressee::List list = KABC::AddresseeDialog::getAddressees(this); |
176 | uint i=0; | 176 | uint i=0; |
177 | for (i=0; i < list.count(); i++) { | 177 | for (i=0; i < list.count(); i++) { |
178 | if ( !list[i].preferredEmail().isEmpty()) { | 178 | if ( !list[i].preferredEmail().isEmpty()) { |
179 | if ( ! names.isEmpty() ) | 179 | if ( ! names.isEmpty() ) |
180 | names+= ","; | 180 | names+= ","; |
181 | names+= "\""+list[i].realName() +"\"<" +list[i].preferredEmail() +">"; | 181 | names+= "\""+list[i].realName() +"\"<" +list[i].preferredEmail() +">"; |
182 | 182 | ||
183 | } | 183 | } |
184 | } | 184 | } |
185 | 185 | ||
186 | 186 | ||
187 | if ( line->text().isEmpty() ) { | 187 | if ( line->text().isEmpty() ) { |
188 | line->setText( names ); | 188 | line->setText( names ); |
189 | } else if ( !names.isEmpty() ) { | 189 | } else if ( !names.isEmpty() ) { |
190 | line->setText( line->text() + ", " + names ); | 190 | line->setText( line->text() + ", " + names ); |
191 | } | 191 | } |
192 | #else | 192 | #else |
193 | bool res = ExternalAppHandler::instance()->requestNameEmailUidListFromKAPI("QPE/Application/ompi", this->name() /* name is here the unique uid*/); | 193 | bool res = ExternalAppHandler::instance()->requestNameEmailUidListFromKAPI("QPE/Application/ompi", this->name() /* name is here the unique uid*/); |
194 | // the result should now arrive through method insertAttendees | 194 | // the result should now arrive through method insertAttendees |
195 | #endif | 195 | #endif |
196 | } | 196 | } |
197 | //the map includes name/email pairs, that comes from Ka/Pi | 197 | //the map includes name/email pairs, that comes from Ka/Pi |
198 | void ComposeMail::insertAttendees(const QString& uid,const QStringList& nameList,const QStringList& emailList,const QStringList& uidList) | 198 | void ComposeMail::insertAttendees(const QString& uid,const QStringList& nameList,const QStringList& emailList,const QStringList& uidList) |
199 | { | 199 | { |
200 | qDebug("ComposeMail::insertAttendees "); | 200 | qDebug("ComposeMail::insertAttendees "); |
201 | raise(); | 201 | raise(); |
202 | 202 | ||
203 | if ( mPickLineEdit == 0 ) { //whoami received | 203 | if ( mPickLineEdit == 0 ) { //whoami received |
204 | 204 | qDebug("returnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnn "); | |
205 | QString defmail = uidList[0]; | 205 | QString defmail = uidList[0]; |
206 | if ( emailList.count() == 0 ) | 206 | if ( emailList.count() == 0 ) |
207 | QMessageBox::information( 0, tr( "Hint" ), | 207 | QMessageBox::information( 0, tr( "Hint" ), |
208 | tr( "Please apply\n\"Set Who Am I\"\nin KA/Pi to get the from\nfield automatically filled out!\n" ), | 208 | tr( "Please apply\n\"Set Who Am I\"\nin KA/Pi to get the from\nfield automatically filled out!\n" ), |
209 | tr( "Ok" ) ); | 209 | tr( "Ok" ) ); |
210 | if (defmail.length()!=0) { | 210 | if (defmail.length()!=0) { |
211 | fromBox->insertItem(defmail); | 211 | fromBox->insertItem(defmail); |
212 | } | 212 | } |
213 | QStringList::ConstIterator sit = emailList.begin(); | 213 | QStringList::ConstIterator sit = emailList.begin(); |
214 | int pref = 0; | 214 | int pref = 0; |
215 | for (;sit!=emailList.end();++sit) { | 215 | for (;sit!=emailList.end();++sit) { |
216 | if ( (*sit)==defmail) | 216 | if ( (*sit)==defmail) |
217 | continue; | 217 | continue; |
218 | fromBox->insertItem((*sit)); | 218 | fromBox->insertItem((*sit)); |
219 | } | 219 | } |
220 | senderNameEdit->setText(nameList[0]); | 220 | senderNameEdit->setText(nameList[0]); |
221 | return; | 221 | return; |
222 | } | 222 | } |
223 | QString names ; | 223 | QString names ; |
224 | QLineEdit *line = mPickLineEdit; | 224 | QLineEdit *line = mPickLineEdit; |
225 | if (uid == this->name()) | 225 | if (uid == this->name()) |
226 | { | 226 | { |
227 | for ( int i = 0; i < nameList.count(); i++) | 227 | for ( int i = 0; i < nameList.count(); i++) |
228 | { | 228 | { |
229 | QString _name = nameList[i]; | 229 | QString _name = nameList[i]; |
230 | QString _email = emailList[i]; | 230 | QString _email = emailList[i]; |
231 | QString _uid = uidList[i]; | 231 | QString _uid = uidList[i]; |
232 | if ( ! _email.isEmpty() ) { | 232 | if ( ! _email.isEmpty() ) { |
233 | if ( ! names.isEmpty() ) | 233 | if ( ! names.isEmpty() ) |
234 | names+= ","; | 234 | names+= ","; |
235 | names+= "\""+_name +"\"<" +_email +">"; | 235 | names+= "\""+_name +"\"<" +_email +">"; |
236 | } | 236 | } |