summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--pwmanager/pwmanager/pwminit.cpp2
1 files changed, 0 insertions, 2 deletions
diff --git a/pwmanager/pwmanager/pwminit.cpp b/pwmanager/pwmanager/pwminit.cpp
index b0a78c2..2f1aa4e 100644
--- a/pwmanager/pwmanager/pwminit.cpp
+++ b/pwmanager/pwmanager/pwminit.cpp
@@ -136,98 +136,96 @@ void PwMInit::initializeApp()
136 handleCmdLineArgs(); 136 handleCmdLineArgs();
137 137
138 bool openDeeplocked = false; 138 bool openDeeplocked = false;
139 if (conf()->confGlobAutostartDeepLocked() || 139 if (conf()->confGlobAutostartDeepLocked() ||
140 savedCmd.open_deeplocked) 140 savedCmd.open_deeplocked)
141 openDeeplocked = true; 141 openDeeplocked = true;
142 if (conf()->confWndAutoMinimizeOnStart() || 142 if (conf()->confWndAutoMinimizeOnStart() ||
143 savedCmd.minToTray) { 143 savedCmd.minToTray) {
144 PwMDoc *newDoc = createDoc(); 144 PwMDoc *newDoc = createDoc();
145 if (!newDoc->openDocUi(newDoc, 145 if (!newDoc->openDocUi(newDoc,
146 conf()->confGlobAutoStart(), 146 conf()->confGlobAutoStart(),
147 openDeeplocked)) { 147 openDeeplocked)) {
148 delete newDoc; 148 delete newDoc;
149 } 149 }
150 } else { 150 } else {
151 createMainWnd(conf()->confGlobAutoStart(), 151 createMainWnd(conf()->confGlobAutoStart(),
152 openDeeplocked, 152 openDeeplocked,
153 true, 153 true,
154 0, 154 0,
155 savedCmd.minimized); 155 savedCmd.minimized);
156 } 156 }
157 157
158 runStatus = running; 158 runStatus = running;
159} 159}
160 160
161void PwMInit::shutdownApp(int exitStatus) 161void PwMInit::shutdownApp(int exitStatus)
162{ 162{
163 printDebug(string("PwMInit::shutdownApp(") 163 printDebug(string("PwMInit::shutdownApp(")
164 + tostr(exitStatus) + ") called."); 164 + tostr(exitStatus) + ") called.");
165 PWM_ASSERT((runStatus == running) || (runStatus == init)); 165 PWM_ASSERT((runStatus == running) || (runStatus == init));
166 runStatus = shutdown; 166 runStatus = shutdown;
167 QApplication::exit(exitStatus); 167 QApplication::exit(exitStatus);
168 /* The destructor of PwMInit is called when control 168 /* The destructor of PwMInit is called when control
169 * leaves main() 169 * leaves main()
170 */ 170 */
171} 171}
172 172
173void PwMInit::initPosixSignalHandler() 173void PwMInit::initPosixSignalHandler()
174{ 174{
175 signal(SIGINT, sig_handler); 175 signal(SIGINT, sig_handler);
176 signal(SIGTERM, sig_handler); 176 signal(SIGTERM, sig_handler);
177} 177}
178 178
179void PwMInit::initDCOP() 179void PwMInit::initDCOP()
180{ 180{
181#ifndef PWM_EMBEDDED 181#ifndef PWM_EMBEDDED
182 _dcopClient = app->dcopClient(); 182 _dcopClient = app->dcopClient();
183 _dcopClient->setNotifications(true); 183 _dcopClient->setNotifications(true);
184#else
185 qDebug("PwMInit::initDCOP() has to be implemented");
186#endif 184#endif
187 185
188} 186}
189 187
190void PwMInit::initKWalletEmu(bool forceDisable, bool forceReload) 188void PwMInit::initKWalletEmu(bool forceDisable, bool forceReload)
191{ 189{
192#ifdef CONFIG_KWALLETIF 190#ifdef CONFIG_KWALLETIF
193 if (!conf()->confGlobKwalletEmu() || 191 if (!conf()->confGlobKwalletEmu() ||
194 forceDisable) { 192 forceDisable) {
195 delete_ifnot_null(_kwalletEmu); 193 delete_ifnot_null(_kwalletEmu);
196 return; 194 return;
197 } 195 }
198 try { 196 try {
199 if (_kwalletEmu && forceReload) 197 if (_kwalletEmu && forceReload)
200 delete_and_null(_kwalletEmu); 198 delete_and_null(_kwalletEmu);
201 if (!_kwalletEmu) 199 if (!_kwalletEmu)
202 _kwalletEmu = new KWalletEmu(this); 200 _kwalletEmu = new KWalletEmu(this);
203 } catch (PwMException e) { 201 } catch (PwMException e) {
204 string errMsg("initializing KWallet emulation failed. ID: "); 202 string errMsg("initializing KWallet emulation failed. ID: ");
205 errMsg += tostr(static_cast<int>(e.getId())); 203 errMsg += tostr(static_cast<int>(e.getId()));
206 errMsg += " err-message: "; 204 errMsg += " err-message: ";
207 errMsg += e.getMessage(); 205 errMsg += e.getMessage();
208 printWarn(errMsg); 206 printWarn(errMsg);
209 return; 207 return;
210 } 208 }
211#else // CONFIG_KWALLETIF 209#else // CONFIG_KWALLETIF
212 PARAM_UNUSED(forceDisable); 210 PARAM_UNUSED(forceDisable);
213 PARAM_UNUSED(forceReload); 211 PARAM_UNUSED(forceReload);
214#endif // CONFIG_KWALLETIF 212#endif // CONFIG_KWALLETIF
215} 213}
216 214
217void PwMInit::initKeycard() 215void PwMInit::initKeycard()
218{ 216{
219#ifdef CONFIG_KEYCARD 217#ifdef CONFIG_KEYCARD
220 PWM_ASSERT(!_keycard); 218 PWM_ASSERT(!_keycard);
221 _keycard = new PwMKeyCard(this); 219 _keycard = new PwMKeyCard(this);
222#endif // CONFIG_KEYCARD 220#endif // CONFIG_KEYCARD
223} 221}
224 222
225void PwMInit::initTray() 223void PwMInit::initTray()
226{ 224{
227#ifdef PWM_EMBEDDED 225#ifdef PWM_EMBEDDED
228 //US ENH : embedded version does not support a tray 226 //US ENH : embedded version does not support a tray
229 return; 227 return;
230#endif 228#endif
231 229
232 if (!conf()->confGlobTray()) { 230 if (!conf()->confGlobTray()) {
233 if (!_tray) 231 if (!_tray)