From ed88c7f5da9ff00b611bbcd1be93df80e4dc7cc4 Mon Sep 17 00:00:00 2001
From: Jekyll Wu <adaptee@gmail.com>
Date: Fri, 21 Oct 2011 13:23:22 +0800
Subject: [PATCH] Refactor Session::activityStateSet() to make it more readable

---
 src/Session.cpp | 29 ++++++++++++++---------------
 1 file changed, 14 insertions(+), 15 deletions(-)

diff --git a/src/Session.cpp b/src/Session.cpp
index 8041186bb..2f9f516c9 100644
--- a/src/Session.cpp
+++ b/src/Session.cpp
@@ -652,23 +652,22 @@ void Session::activityStateSet(int state)
     }
     else if (state == NOTIFYACTIVITY)
     {
-        if (_monitorSilence) {
-            _silenceTimer->start(_silenceSeconds*1000);
+        if ( _monitorActivity  && !_notifiedActivity )
+        {
+            KNotification::event("Activity", i18n("Activity in session '%1'", _nameTitle), QPixmap(),
+                    QApplication::activeWindow(),
+                    KNotification::CloseWhenWidgetActivated);
+
+            // mask activity notification for a while to avoid flooding
+            // TODO: should this hardcoded interval be user configurable?
+            _notifiedActivity = true;
+            const int activitMaskSeconds = 15;
+            _activityTimer->start(activitMaskSeconds*1000);
         }
 
-        if ( _monitorActivity ) {
-            //FIXME:  See comments in Session::silenceTimerDone()
-            if (!_notifiedActivity) {
-                KNotification::event("Activity", i18n("Activity in session '%1'", _nameTitle), QPixmap(),
-                        QApplication::activeWindow(),
-                        KNotification::CloseWhenWidgetActivated);
-
-                // mask activity notification for a while to avoid flooding
-                // TODO: should this hardcoded interval be user configurable?
-                _notifiedActivity = true;
-                const int activitMaskSeconds = 15;
-                _activityTimer->start(activitMaskSeconds*1000);
-            }
+        if (_monitorSilence)
+        {
+            _silenceTimer->start(_silenceSeconds*1000);
         }
     }