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

List:       kde-commits
Subject:    KDE/kdepim/akonadi/tray
From:       Tom Albers <toma () kde ! org>
Date:       2009-05-31 15:30:08
Message-ID: 1243783808.706543.22620.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 975993 by toma:

Only tell the user that akonadi is ready when the user has explicitely started \
akonadi from the tray.


 M  +8 -4      dock.cpp  
 M  +1 -0      dock.h  


--- trunk/KDE/kdepim/akonadi/tray/dock.cpp #975992:975993
@@ -1,5 +1,5 @@
 /* This file is part of the KDE project
-   Copyright (C) 2008 Omat Holding B.V. <info@omat.nl>
+   Copyright (C) 2008-2009 Omat Holding B.V. <info@omat.nl>
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public
@@ -58,7 +58,7 @@
 }
 
 Dock::Dock( QWidget *parent )
-        : KNotificationItem( 0 )
+        : KNotificationItem( 0 ), m_explicitStart( false )
 {
     m_parentWidget = parent;
   
@@ -101,8 +101,11 @@
 void Dock::slotServerStarted()
 {
     updateMenu( true );
-    KPassivePopup::message( i18n( "Akonadi available" ),
-                            i18n( "The Akonadi server has been started and can be \
used now." ), m_parentWidget ); +    if ( m_explicitStart ) {
+      KPassivePopup::message( i18n( "Akonadi available" ),
+                              i18n( "The Akonadi server has been started and can be \
used now." ), m_parentWidget ); +    m_explicitStart = false;
+    }
 }
 
 void Dock::slotServerStopped()
@@ -119,6 +122,7 @@
 
 void Dock::slotStartAkonadi()
 {
+    m_explicitStart = true;
     Akonadi::Control::start( m_parentWidget  );
 }
 
--- trunk/KDE/kdepim/akonadi/tray/dock.h #975992:975993
@@ -83,6 +83,7 @@
     QAction *m_startAction;
     QAction *m_backupAction;
     QAction *m_restoreAction;
+    bool m_explicitStart;
 };
 
 #endif // DOCK_H


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