summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2005-03-29 14:23:43 (UTC)
committer zautrix <zautrix>2005-03-29 14:23:43 (UTC)
commit3116f249fc6ccd0e067213e826d3d924f6986972 (patch) (unidiff)
treefe37b19450279d07b6767d56ef0deeff51f7485e
parentc873163eca527625ce22ed461ee5d4fec61b3b18 (diff)
downloadkdepimpi-3116f249fc6ccd0e067213e826d3d924f6986972.zip
kdepimpi-3116f249fc6ccd0e067213e826d3d924f6986972.tar.gz
kdepimpi-3116f249fc6ccd0e067213e826d3d924f6986972.tar.bz2
fix
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:
10Now you can print out the view of the "Event Viewer". 10Now you can print out the view of the "Event Viewer".
11That means you can print all data of one particular event/todo. 11That means you can print all data of one particular event/todo.
12Added scaling options to printout of Event Viewer and What'sNext View. 12Added scaling options to printout of Event Viewer and What'sNext View.
13Fixed some problems in the month view in "week start sunday" mode. 13Fixed some problems in the month view in "week start sunday" mode.
14KA/Pi:
15Added two more config options.
16Fixed resizing problem of address request dialog when orientation was switched.
14 17
15********** VERSION 2.0.21 ************ 18********** VERSION 2.0.21 ************
16 19
17Fixed another SMTP problem in OM/Pi. 20Fixed 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
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
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
1151 1151
1152bool ExternalAppHandler::requestNameEmailUidListFromKAPI(const QString& sourceChannel, const QString& sessionuid) 1152bool 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
1158bool ExternalAppHandler::returnNameEmailUidListFromKAPI(const QString& sourceChannel, const QString& sessionuid, const QStringList& list1, const QStringList& list2, const QStringList& list3) 1161bool ExternalAppHandler::returnNameEmailUidListFromKAPI(const QString& sourceChannel, const QString& sessionuid, const QStringList& list1, const QStringList& list2, const QStringList& list3)
1159{ 1162{