equal
deleted
inserted
replaced
27 |
27 |
28 #include "hbdevicedialogserverdefs_p.h" |
28 #include "hbdevicedialogserverdefs_p.h" |
29 #include "hbdevicedialogerrors_p.h" |
29 #include "hbdevicedialogerrors_p.h" |
30 #include "hbdevicedialogclientsession_p.h" |
30 #include "hbdevicedialogclientsession_p.h" |
31 #include <e32cmn.h> |
31 #include <e32cmn.h> |
32 |
32 #include "hbdevicedialoglaunchhelper_p.h" |
33 #include "hbdevicedialogsymbian.h" |
33 #include "hbdevicedialogsymbian.h" |
34 #include "hbsymbianvariant.h" |
34 #include "hbsymbianvariant.h" |
35 #include "hbsymbianvariantconverter_p.h" |
35 #include "hbsymbianvariantconverter_p.h" |
36 #include "hbdeleteguardsymbian_p.h" |
36 #include "hbdeleteguardsymbian_p.h" |
37 |
37 |
189 iDataPtr.Set(iBuffer->Des()); |
189 iDataPtr.Set(iBuffer->Des()); |
190 } else { |
190 } else { |
191 return KErrNoMemory; |
191 return KErrNoMemory; |
192 } |
192 } |
193 } |
193 } |
194 return iHbSession.Connect(); |
194 |
|
195 TInt error(KErrNone); |
|
196 if (iFlags & CHbDeviceDialogSymbian::EASyncServerStartup) { |
|
197 HbDeviceDialogLaunchHelper *helper(0); |
|
198 TRAP(error, helper = HbDeviceDialogLaunchHelper::NewL()); |
|
199 |
|
200 if (helper) { |
|
201 helper->Start(); |
|
202 error = helper->Error(); |
|
203 delete helper; |
|
204 helper = 0; |
|
205 } |
|
206 } |
|
207 |
|
208 if (error == KErrNone || error == KErrAlreadyExists) { |
|
209 error = iHbSession.Connect(); |
|
210 } |
|
211 return error; |
195 } |
212 } |
196 |
213 |
197 TInt CHbDeviceDialogSymbianPrivate::Show(const QByteArray& aArray) |
214 TInt CHbDeviceDialogSymbianPrivate::Show(const QByteArray& aArray) |
198 { |
215 { |
199 TInt error = iLastError = KErrNone; |
216 TInt error = iLastError = KErrNone; |