[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-mac
Subject: [KDE/Mac] Fwd: KDE/kdelibs/kdeui
From: Frank Osterfeld <frank.osterfeld () kdab ! com>
Date: 2010-12-28 16:44:34
Message-ID: C30232C4-375E-4CD6-87EE-B2FB60FD5146 () kdab ! com
[Download RAW message or body]
[Attachment #2 (multipart/signed)]
Begin forwarded message:
> From: Frank Osterfeld <frank.osterfeld@kdemail.net>
> Date: December 28, 2010 4:32:05 PM GMT+01:00
> To: kde-commits@kde.org
> Cc: bjoern.ricks@intevation.de, kde-mac@kde.org, adam@kde.org
> Subject: KDE/kdelibs/kdeui
> Reply-To: kde-commits@kde.org
>
> SVN commit 1209931 by osterfeld:
>
> Add an OS X keychain backend for kwallet. Not all concepts from KWallet (folders, \
> in particular, which are not available as such in keychain) are supported yet. \
> However, I used it successfully in KDE 4.3/4.4 times with Kontact.
> To enable it, pass -DMAC_USE_OSXKEYCHAIN=true to cmake.
>
> CCMAIL=kde-mac@kde.org, bjoern.ricks@intevation.de, adam@kde.org
>
>
> M +14 -1 CMakeLists.txt
> M +4 -0 util/kwallet.cpp
> M +6 -0 util/kwallet.h
> A util/kwallet_mac.cpp [License: LGPL (v2+)]
>
>
> --- trunk/KDE/kdelibs/kdeui/CMakeLists.txt #1209930:1209931
> @@ -207,7 +207,6 @@
> util/kpixmapcache.cpp
> util/kpixmapprovider.cpp
> util/kstandardguiitem.cpp
> - util/kwallet.cpp
> util/kwordwrap.cpp
> util/kxerrorhandler.cpp
> util/kxmessages.cpp
> @@ -289,6 +288,17 @@
> )
> endif(NOT KDE_NO_DEPRECATED)
>
> +option(MAC_USE_OSXKEYCHAIN "On OS X, use the keychain as backend for kwallet, \
> instead of kwalletd.") +
> +if (Q_WS_MAC AND MAC_USE_OSXKEYCHAIN)
> + FIND_LIBRARY(SECURITY_LIBRARY Security)
> + set(kdeui_LIB_SRCS ${kdeui_LIB_SRCS} util/kwallet_mac.cpp)
> +else(Q_WS_MAC AND MAC_USE_OSXKEYCHAIN)
> + set(kdeui_LIB_SRCS ${kdeui_LIB_SRCS} util/kwallet.cpp)
> +else(Q_WS_MAC AND MAC_USE_OSXKEYCHAIN)
> + set(kdeui_LIB_SRCS ${kdeui_LIB_SRCS} util/kwallet.cpp)
> +endif(Q_WS_MAC AND MAC_USE_OSXKEYCHAIN)
> +
> if(NOT WINCE)
> set(kdeui_LIB_SRCS
> ${kdeui_LIB_SRCS}
> @@ -409,6 +419,9 @@
>
> if(Q_WS_MAC)
> target_link_libraries(kdeui ${CARBON_LIBRARY})
> + if (MAC_USE_OSXKEYCHAIN)
> + target_link_libraries(kdeui ${SECURITY_LIBRARY})
> + endif (MAC_USE_OSXKEYCHAIN)
> endif(Q_WS_MAC)
>
> if(X11_XTest_FOUND)
> --- trunk/KDE/kdelibs/kdeui/util/kwallet.cpp #1209930:1209931
> @@ -838,6 +838,10 @@
> emit walletOpened(false);
> }
>
> +void Wallet::emitWalletOpened() {
> + emit walletOpened(true);
> +}
> +
> bool Wallet::folderDoesNotExist(const QString& wallet, const QString& folder)
> {
> QDBusReply<bool> r = walletLauncher->getInterface().folderDoesNotExist(wallet, \
> folder);
> --- trunk/KDE/kdelibs/kdeui/util/kwallet.h #1209930:1209931
> @@ -497,6 +497,12 @@
> */
> void emitWalletAsyncOpenError();
>
> + /**
> + * @internal
> + * Emits wallet opening success.
> + */
> + void emitWalletOpened();
> +
> private:
> class WalletPrivate;
> WalletPrivate* const d;
--
Frank Osterfeld | frank.osterfeld@kdab.com | Software Engineer KDAB (Deutschland)
GmbH&Co KG, a KDAB Group company Tel. Germany +49-30-521325470, Sweden (HQ)
+46-563-540090 KDAB - Qt Experts - Platform-independent software solutions
["smime.p7s" (smime.p7s)]
0 *H
01 0 + 0 *H
00 q_Mtq40
*H
0{1 0 UGB10U Greater Manchester10U Salford10U
Comodo CA Limited1!0 U AAA Certificate Services0
040101000000Z
281231235959Z01 0 UUS1 0 UUT10USalt Lake City1 0 U
The USERTRUST Network1!0 U http://www.usertrust.com1604U-UTN-USERFirst-Client \
Authentication and Email0"0 *H
0
9}A;bF7`u9eJGHjM5BI/ |1Nd.)բdąQ5yNh{ zɤ2 O0 \
nFxoY^/m/묡j.g5y iF v:z'[=s "HaLi.1 \
,CZ qYں gT:
we tbh ~GeMW(t40b0, '0#0 U #0
#>)00 U g}ĝ&p KPH|=n}0U 0U 00 U %0++0U \
00U 0{U t0r08 6 42http://crl.comodoca.com/AAACertificateServices.crl06 4 \
20http://crl.comodo.net/AAACertificateServices.crl0 `HB0 *H
<~ v9<O ૄ]Te;m |7,%T_!7OT klE`-QLf< \
J?VvÂOl atG@We"'gOWdZٍ /i)J /LQFĊ7N \
1hǞċ~2hD*Q`Mt:C29V:RAC3'9N&9≸])&A곛wuʵeJc>D^s 00 \
/9:u$zl0 *H
01 0 UUS1 0 UUT10USalt Lake City1 0 U
The USERTRUST Network1!0 U http://www.usertrust.com1604U-UTN-USERFirst-Client \
Authentication and Email0 100618000000Z
130617235959Z0_1 0 USE10
U683 3110U Vaermland10UHagfors10U Norrings vaeg 210
UBox 301&0$U
Klarälvdalens Datakonsult AB1 0U A KDAB Group Company1C0AU :Issued \
through Klarälvdalens Datakonsult AB E-PKI Manager1 0 U Corporate Secure \
Email10UFrank Osterfeld1'0% *H frank.osterfeld@kdab.com0"0
*H
0
d"v 3 cV;/{%yöo1H <oNl)Q! c3Ak eTʸPv
J_X7S~;' 86bOLfd ^\ 1ه.7mPRBhCoߎ4DÏǯ5N \
YR eqaƂ ډ KM \
x)UUMEF>AT퀁ԅmX;H 0 0 U #0g}ĝ&p KPH|=n}0 U Lb8 KC&0U \
0 U 0 0 U %0++0FU \
?0=0; +10+0)+ https://secure.comodo.net/CPS0U 00L J \
HFhttp://crl.comodoca.com/UTN-USERFirst-ClientAuthenticationandEmail.crl0J H \
FDhttp://crl.comodo.net/UTN-USERFirst-ClientAuthenticationandEmail.crl0l+`0 \
^06+0*http://crt.comodoca.com/UTNAAAClientCA.crt0$+0http://ocsp.comodoca.com0#U 0frank.osterfeld@kdab.com0
*H
c+5F#ka2:eL,i \
wsŦr3-Q!X<5FGurbǐľf9$t >}sIKx+N&˙L1Kߑ-ڢ+ZY7a \
wr>If.$*E M'ا5 c& A^FBlCW쩃)4?r8
aX[DG k3X"J,xB \
10001 0 UUS1 0 UUT10USalt Lake City1 0 U The \
USERTRUST Network1!0 U http://www.usertrust.com1604U-UTN-USERFirst-Client \
Authentication and Email /9:u$zl0 + 0 *H 1 *H
0 *H
1
101228164434Z0# *H
1a<s_eyC P0 +71001 0 UUS1 0 UUT10USalt \
Lake City1 0 U The USERTRUST \
Network1!0 U http://www.usertrust.com1604U-UTN-USERFirst-Client \
Authentication and Email /9:u$zl0 *H 1 \
01 0 UUS1 0 UUT10USalt Lake City1 0 U The USERTRUST \
Network1!0 U http://www.usertrust.com1604U-UTN-USERFirst-Client \
Authentication and Email /9:u$zl0 *H
& o 6Z \
9u'!MPCjrh;R5嚶5*1wՆ̀JP8:4Obm jjRqEB! AE X n,i1:@jA kΗ
tA`vZ,}II mi<;gۈ܀@jA3gv{Sf)cB$] ѿP<wRUfq9 \
ʯ^ZoU
_______________________________________________
kde-mac@kde.org
List Information: https://mail.kde.org/mailman/listinfo/kde-mac
KDE/Mac Information: http://techbase.kde.org/index.php?title=Projects/KDE_on_Mac_OS_X
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic