diff options
Diffstat (limited to 'kde2/kpsion')
| -rw-r--r-- | kde2/kpsion/Makefile.am | 2 | ||||
| -rw-r--r-- | kde2/kpsion/kpsion.cpp | 12 |
2 files changed, 11 insertions, 3 deletions
diff --git a/kde2/kpsion/Makefile.am b/kde2/kpsion/Makefile.am index 6f401da..1ec1da4 100644 --- a/kde2/kpsion/Makefile.am +++ b/kde2/kpsion/Makefile.am @@ -23,7 +23,7 @@ libkpsion_la_SOURCES = kpsion.cpp setupdialog.cpp wizards.cpp \ statusbarprogress.cpp kpsionconfig.cpp kpsionbackuplistview.cpp \ kpsionrestoredialog.cpp -libkpsion_la_LIBADD = -L$(top_srcdir)/lib/.libs -lplp $(LIB_KFILE) +libkpsion_la_LIBADD = -L$(top_srcdir)/lib -lplp $(LIB_KFILE) kpsion_SOURCES = main.cpp kpsion_LDFLAGS = $(KDE_RPATH) diff --git a/kde2/kpsion/kpsion.cpp b/kde2/kpsion/kpsion.cpp index f0c6ab8..e6a8d4d 100644 --- a/kde2/kpsion/kpsion.cpp +++ b/kde2/kpsion/kpsion.cpp @@ -540,20 +540,28 @@ startupNcpd() { return; KProcess proc; ppsocket *testSocket; + time_t start_time = time(0L) + 2; + bool connectOk = false; testSocket = new ppsocket(); if (!testSocket->connect(NULL, 7501)) { - time_t start_time = time(0L) + 2; statusBar()->changeItem(i18n("Starting ncpd daemon ..."), STID_CONNECTION); proc << ncpdPath; proc << "-s" << ncpdDevice << "-b" << ncpdSpeed; proc.start(KProcess::DontCare); - while ((time(0L) < start_time) && (!testSocket->connect(NULL, 7501))) + while ((time(0L) < start_time) && + (!(connectOk = testSocket->connect(NULL, 7501)))) kapp->processEvents(); } delete testSocket; + if (connectOk) { + // 2 more seconds for ncpd to negotiate with the Psion. + start_time = time(0L) + 2; + while (time(0L) < start_time) + kapp->processEvents(); + } } void KPsionMainWindow:: |