summaryrefslogtreecommitdiffabout
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--bin/kdepim/WhatsNew.txt3
-rw-r--r--kaddressbook/kabcore.cpp1
-rw-r--r--libkdepim/externalapphandler.cpp5
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
@@ -10,8 +10,11 @@ Added a print option to the desktop version:
Now you can print out the view of the "Event Viewer".
That means you can print all data of one particular event/todo.
Added scaling options to printout of Event Viewer and What'sNext View.
Fixed some problems in the month view in "week start sunday" mode.
+KA/Pi:
+Added two more config options.
+Fixed resizing problem of address request dialog when orientation was switched.
********** VERSION 2.0.21 ************
Fixed another SMTP problem in OM/Pi.
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index db19dd5..27aca2d 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -2512,8 +2512,9 @@ void KABCore::requestForNameEmailUidList(const QString& sourceChannel, const QSt
int wid = uid.toInt( &ok );
if ( ok ) {
if ( wid != QApplication::desktop()->width() ) {
qDebug("KA/Pi: Request from different desktop geometry. Resizing ...");
+ message( i18n("Resizing, please wait...") );
raise();
qApp->processEvents();
}
diff --git a/libkdepim/externalapphandler.cpp b/libkdepim/externalapphandler.cpp
index 7200da9..f8f4c8a 100644
--- a/libkdepim/externalapphandler.cpp
+++ b/libkdepim/externalapphandler.cpp
@@ -1151,9 +1151,12 @@ void ExternalAppHandler::appMessage( const QCString& cmsg, const QByteArray& dat
bool ExternalAppHandler::requestNameEmailUidListFromKAPI(const QString& sourceChannel, const QString& sessionuid)
{
mNameEmailUidListFromKAPITransfer->setSourceChannel(sourceChannel);
- return mNameEmailUidListFromKAPITransfer->sendMessageToTarget(sessionuid);
+ // maybe we are sending to KA/Pi fom a different worldd...
+ // it may be that the QAplication::desktop()->width() values in KA/Pi are not the same as in our application
+ // for that reason we send the current QApplication::desktop()->width() to KA/Pi
+ return mNameEmailUidListFromKAPITransfer->sendMessageToTarget(QString::number ( QApplication::desktop()->width() ));
}
bool ExternalAppHandler::returnNameEmailUidListFromKAPI(const QString& sourceChannel, const QString& sessionuid, const QStringList& list1, const QStringList& list2, const QStringList& list3)
{