[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/KDE/3.5/kdepim/kresources/kolab/kcal
From:       Till Adam <adam () kde ! org>
Date:       2006-01-14 13:32:21
Message-ID: 1137245541.404407.2702.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 497977 by tilladam:

Forward port of:

SVN commit 497744 by dfaure:

Stop (non-single-shot!) timer before emitting the signal, god knows how
much time we'll spend in its slots... if we end up in a subeventloop then the
timer will fire repeatedly.

Also committing patch to avoid progress dialog in non-gui app, as
discussed on kdepim some time ago.



 M  +4 -2      resourcekolab.cpp  


--- branches/KDE/3.5/kdepim/kresources/kolab/kcal/resourcekolab.cpp #497976:497977
@@ -162,7 +162,9 @@
                            : mimetype == "application/x-vnd.kolab.journal" ? i18n( \
"Loading journals..." )  : i18n( "Loading events..." );
   const bool useProgress = qApp && qApp->type() != QApplication::Tty && count > 200;
-  (void)::Observer::self(); // ensure kio_uiserver is running
+  const bool useProgress = qApp && qApp->type() != QApplication::Tty && count > 200;
+  if ( useProgress )
+    (void)::Observer::self(); // ensure kio_uiserver is running
   UIServer_stub uiserver( "kio_uiserver", "UIServer" );
   int progressId = 0;
   if ( useProgress ) {
@@ -941,8 +943,8 @@
 void ResourceKolab::slotEmitResourceChanged()
 {
    kdDebug(5650) << "KCal Kolab resource: emitting resource changed " << endl;
+   mResourceChangedTimer.stop();
    emit resourceChanged( this );
-   mResourceChangedTimer.stop();
 }
 
 KABC::Lock* ResourceKolab::lock()


[prev in list] [next in list] [prev in thread] [next in thread]