-rw-r--r-- | kaddressbook/kabcore.cpp | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp index 4299ebd..2f9f1df 100644 --- a/kaddressbook/kabcore.cpp +++ b/kaddressbook/kabcore.cpp | |||
@@ -2034,83 +2034,86 @@ void KABCore::requestForNameEmailUidList(const QString& sourceChannel, const QSt | |||
2034 | } | 2034 | } |
2035 | 2035 | ||
2036 | bool res = ExternalAppHandler::instance()->returnNameEmailUidListFromKAPI(sourceChannel, uid, nameList, emailList, uidList); | 2036 | bool res = ExternalAppHandler::instance()->returnNameEmailUidListFromKAPI(sourceChannel, uid, nameList, emailList, uidList); |
2037 | 2037 | ||
2038 | } | 2038 | } |
2039 | 2039 | ||
2040 | /* this method will be called through the QCop interface from other apps to show details of a contact. | 2040 | /* this method will be called through the QCop interface from other apps to show details of a contact. |
2041 | */ | 2041 | */ |
2042 | void KABCore::requestForDetails(const QString& sourceChannel, const QString& sessionuid, const QString& name, const QString& email, const QString& uid) | 2042 | void KABCore::requestForDetails(const QString& sourceChannel, const QString& sessionuid, const QString& name, const QString& email, const QString& uid) |
2043 | { | 2043 | { |
2044 | // qDebug("KABCore::requestForDetails %s %s %s %s %s", sourceChannel.latin1(), sessionuid.latin1(), name.latin1(), email.latin1(), uid.latin1()); | 2044 | // qDebug("KABCore::requestForDetails %s %s %s %s %s", sourceChannel.latin1(), sessionuid.latin1(), name.latin1(), email.latin1(), uid.latin1()); |
2045 | 2045 | ||
2046 | QString foundUid = QString::null; | 2046 | QString foundUid = QString::null; |
2047 | if (uid.isEmpty()) | 2047 | if (uid.isEmpty()) |
2048 | { | 2048 | { |
2049 | //find the uid of the person first | 2049 | //find the uid of the person first |
2050 | Addressee::List namelist; | 2050 | Addressee::List namelist; |
2051 | Addressee::List emaillist; | 2051 | Addressee::List emaillist; |
2052 | 2052 | ||
2053 | if (!name.isEmpty()) | 2053 | if (!name.isEmpty()) |
2054 | namelist = mAddressBook->findByName( name ); | 2054 | namelist = mAddressBook->findByName( name ); |
2055 | 2055 | ||
2056 | if (!email.isEmpty()) | 2056 | if (!email.isEmpty()) |
2057 | emaillist = mAddressBook->findByEmail( email ); | 2057 | emaillist = mAddressBook->findByEmail( email ); |
2058 | 2058 | qDebug("count %d %d ", namelist.count(),emaillist.count() ); | |
2059 | //check if we have a match in Namelist and Emaillist | 2059 | //check if we have a match in Namelist and Emaillist |
2060 | if ((namelist.count() == 0) && (emaillist.count() > 0)) | 2060 | if ((namelist.count() == 0) && (emaillist.count() > 0)) { |
2061 | foundUid == emaillist[0].uid(); | 2061 | foundUid = emaillist[0].uid(); |
2062 | } | ||
2062 | else if ((namelist.count() > 0) && (emaillist.count() == 0)) | 2063 | else if ((namelist.count() > 0) && (emaillist.count() == 0)) |
2063 | foundUid == namelist[0].uid(); | 2064 | foundUid = namelist[0].uid(); |
2064 | else | 2065 | else |
2065 | { | 2066 | { |
2066 | for (int i = 0; i < namelist.count(); i++) | 2067 | for (int i = 0; i < namelist.count(); i++) |
2067 | { | 2068 | { |
2068 | for (int j = 0; j < emaillist.count(); j++) | 2069 | for (int j = 0; j < emaillist.count(); j++) |
2069 | { | 2070 | { |
2070 | if (namelist[i] == emaillist[j]) | 2071 | if (namelist[i] == emaillist[j]) |
2071 | { | 2072 | { |
2072 | foundUid == namelist[i].uid(); | 2073 | foundUid = namelist[i].uid(); |
2073 | } | 2074 | } |
2074 | } | 2075 | } |
2075 | } | 2076 | } |
2076 | } | 2077 | } |
2077 | } | 2078 | } |
2078 | else | 2079 | else |
2079 | { | 2080 | { |
2080 | foundUid = uid; | 2081 | foundUid = uid; |
2081 | } | 2082 | } |
2082 | 2083 | ||
2083 | if (!foundUid.isEmpty()) | 2084 | if (!foundUid.isEmpty()) |
2084 | { | 2085 | { |
2086 | |||
2085 | // raise Ka/Pi if it is in the background | 2087 | // raise Ka/Pi if it is in the background |
2086 | #ifndef DESKTOP_VERSION | 2088 | #ifndef DESKTOP_VERSION |
2087 | #ifndef KORG_NODCOP | 2089 | #ifndef KORG_NODCOP |
2088 | QCopEnvelope e("QPE/Application/kapi", "raise()"); | 2090 | //QCopEnvelope e("QPE/Application/kapi", "raise()"); |
2089 | #endif | 2091 | #endif |
2090 | #endif | 2092 | #endif |
2091 | 2093 | ||
2092 | mMainWindow->showMaximized(); | 2094 | mMainWindow->showMaximized(); |
2095 | mMainWindow-> raise(); | ||
2093 | 2096 | ||
2094 | mViewManager->setSelected( "", false); | 2097 | mViewManager->setSelected( "", false); |
2095 | mViewManager->refreshView( "" ); | 2098 | mViewManager->refreshView( "" ); |
2096 | mViewManager->setSelected( foundUid, true ); | 2099 | mViewManager->setSelected( foundUid, true ); |
2097 | mViewManager->refreshView( foundUid ); | 2100 | mViewManager->refreshView( foundUid ); |
2098 | 2101 | ||
2099 | if ( !mMultipleViewsAtOnce ) | 2102 | if ( !mMultipleViewsAtOnce ) |
2100 | { | 2103 | { |
2101 | setDetailsVisible( true ); | 2104 | setDetailsVisible( true ); |
2102 | mActionDetails->setChecked(true); | 2105 | mActionDetails->setChecked(true); |
2103 | } | 2106 | } |
2104 | } | 2107 | } |
2105 | } | 2108 | } |
2106 | 2109 | ||
2107 | 2110 | ||
2108 | void KABCore::faq() | 2111 | void KABCore::faq() |
2109 | { | 2112 | { |
2110 | KApplication::showFile( "KA/Pi FAQ", "kdepim/kaddressbook/kapiFAQ.txt" ); | 2113 | KApplication::showFile( "KA/Pi FAQ", "kdepim/kaddressbook/kapiFAQ.txt" ); |
2111 | } | 2114 | } |
2112 | 2115 | ||
2113 | 2116 | ||
2114 | 2117 | ||
2115 | 2118 | ||
2116 | #ifndef KAB_EMBEDDED | 2119 | #ifndef KAB_EMBEDDED |