author | zautrix <zautrix> | 2005-03-29 14:23:43 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-03-29 14:23:43 (UTC) |
commit | 3116f249fc6ccd0e067213e826d3d924f6986972 (patch) (unidiff) | |
tree | fe37b19450279d07b6767d56ef0deeff51f7485e | |
parent | c873163eca527625ce22ed461ee5d4fec61b3b18 (diff) | |
download | kdepimpi-3116f249fc6ccd0e067213e826d3d924f6986972.zip kdepimpi-3116f249fc6ccd0e067213e826d3d924f6986972.tar.gz kdepimpi-3116f249fc6ccd0e067213e826d3d924f6986972.tar.bz2 |
fix
-rw-r--r-- | bin/kdepim/WhatsNew.txt | 3 | ||||
-rw-r--r-- | kaddressbook/kabcore.cpp | 1 | ||||
-rw-r--r-- | libkdepim/externalapphandler.cpp | 5 |
3 files changed, 8 insertions, 1 deletions
diff --git a/bin/kdepim/WhatsNew.txt b/bin/kdepim/WhatsNew.txt index b5285bf..03aec7b 100644 --- a/bin/kdepim/WhatsNew.txt +++ b/bin/kdepim/WhatsNew.txt | |||
@@ -8,12 +8,15 @@ Added option to split toolbar to 3 toolbars. | |||
8 | Added option to show one small filter-view-toolbar. | 8 | Added option to show one small filter-view-toolbar. |
9 | Added a print option to the desktop version: | 9 | Added a print option to the desktop version: |
10 | Now you can print out the view of the "Event Viewer". | 10 | Now you can print out the view of the "Event Viewer". |
11 | That means you can print all data of one particular event/todo. | 11 | That means you can print all data of one particular event/todo. |
12 | Added scaling options to printout of Event Viewer and What'sNext View. | 12 | Added scaling options to printout of Event Viewer and What'sNext View. |
13 | Fixed some problems in the month view in "week start sunday" mode. | 13 | Fixed some problems in the month view in "week start sunday" mode. |
14 | KA/Pi: | ||
15 | Added two more config options. | ||
16 | Fixed resizing problem of address request dialog when orientation was switched. | ||
14 | 17 | ||
15 | ********** VERSION 2.0.21 ************ | 18 | ********** VERSION 2.0.21 ************ |
16 | 19 | ||
17 | Fixed another SMTP problem in OM/Pi. | 20 | Fixed another SMTP problem in OM/Pi. |
18 | Some small changed in the new datenavigator in KO/Pi. | 21 | Some small changed in the new datenavigator in KO/Pi. |
19 | Changed default setting for new filter in KA/Pi to "exclude categories". | 22 | Changed default setting for new filter in KA/Pi to "exclude categories". |
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp index db19dd5..27aca2d 100644 --- a/kaddressbook/kabcore.cpp +++ b/kaddressbook/kabcore.cpp | |||
@@ -2510,12 +2510,13 @@ void KABCore::requestForNameEmailUidList(const QString& sourceChannel, const QSt | |||
2510 | QStringList uidList; | 2510 | QStringList uidList; |
2511 | bool ok = false; | 2511 | bool ok = false; |
2512 | int wid = uid.toInt( &ok ); | 2512 | int wid = uid.toInt( &ok ); |
2513 | if ( ok ) { | 2513 | if ( ok ) { |
2514 | if ( wid != QApplication::desktop()->width() ) { | 2514 | if ( wid != QApplication::desktop()->width() ) { |
2515 | qDebug("KA/Pi: Request from different desktop geometry. Resizing ..."); | 2515 | qDebug("KA/Pi: Request from different desktop geometry. Resizing ..."); |
2516 | message( i18n("Resizing, please wait...") ); | ||
2516 | raise(); | 2517 | raise(); |
2517 | qApp->processEvents(); | 2518 | qApp->processEvents(); |
2518 | } | 2519 | } |
2519 | 2520 | ||
2520 | } else { | 2521 | } else { |
2521 | qDebug("KABCore::requestForNameEmailUidList:: Got invalid uid "); | 2522 | qDebug("KABCore::requestForNameEmailUidList:: Got invalid uid "); |
diff --git a/libkdepim/externalapphandler.cpp b/libkdepim/externalapphandler.cpp index 7200da9..f8f4c8a 100644 --- a/libkdepim/externalapphandler.cpp +++ b/libkdepim/externalapphandler.cpp | |||
@@ -1149,13 +1149,16 @@ void ExternalAppHandler::appMessage( const QCString& cmsg, const QByteArray& dat | |||
1149 | 1149 | ||
1150 | 1150 | ||
1151 | 1151 | ||
1152 | bool ExternalAppHandler::requestNameEmailUidListFromKAPI(const QString& sourceChannel, const QString& sessionuid) | 1152 | bool ExternalAppHandler::requestNameEmailUidListFromKAPI(const QString& sourceChannel, const QString& sessionuid) |
1153 | { | 1153 | { |
1154 | mNameEmailUidListFromKAPITransfer->setSourceChannel(sourceChannel); | 1154 | mNameEmailUidListFromKAPITransfer->setSourceChannel(sourceChannel); |
1155 | return mNameEmailUidListFromKAPITransfer->sendMessageToTarget(sessionuid); | 1155 | // maybe we are sending to KA/Pi fom a different worldd... |
1156 | // it may be that the QAplication::desktop()->width() values in KA/Pi are not the same as in our application | ||
1157 | // for that reason we send the current QApplication::desktop()->width() to KA/Pi | ||
1158 | return mNameEmailUidListFromKAPITransfer->sendMessageToTarget(QString::number ( QApplication::desktop()->width() )); | ||
1156 | } | 1159 | } |
1157 | 1160 | ||
1158 | bool ExternalAppHandler::returnNameEmailUidListFromKAPI(const QString& sourceChannel, const QString& sessionuid, const QStringList& list1, const QStringList& list2, const QStringList& list3) | 1161 | bool ExternalAppHandler::returnNameEmailUidListFromKAPI(const QString& sourceChannel, const QString& sessionuid, const QStringList& list1, const QStringList& list2, const QStringList& list3) |
1159 | { | 1162 | { |
1160 | QStringList list4, list5, list6; | 1163 | QStringList list4, list5, list6; |
1161 | 1164 | ||