From mboxrd@z Thu Jan 1 00:00:00 1970 From: Bernt Hansen Subject: [PATCH 2/2] Do not issue the 'task should be finished by now' message if the clock is stopped Date: Tue, 9 Jun 2009 16:43:54 -0400 Message-ID: <1244580234-25563-2-git-send-email-bernt@norang.ca> Return-path: Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1ME8BP-0002WA-2W for emacs-orgmode@gnu.org; Tue, 09 Jun 2009 16:44:35 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1ME8BL-0002Ul-6j for emacs-orgmode@gnu.org; Tue, 09 Jun 2009 16:44:34 -0400 Received: from [199.232.76.173] (port=42943 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1ME8BL-0002Uh-13 for emacs-orgmode@gnu.org; Tue, 09 Jun 2009 16:44:31 -0400 Received: from mho-01-ewr.mailhop.org ([204.13.248.71]:54705) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1ME8BK-0005W4-MG for emacs-orgmode@gnu.org; Tue, 09 Jun 2009 16:44:30 -0400 Received: from cpe000102d0fe75-cm0012256ecbde.cpe.net.cable.rogers.com ([99.239.148.180] helo=mail.norang.ca) by mho-01-ewr.mailhop.org with esmtpsa (TLSv1:AES256-SHA:256) (Exim 4.68) (envelope-from ) id 1ME8BJ-000NEp-OB for emacs-orgmode@gnu.org; Tue, 09 Jun 2009 20:44:30 +0000 List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org To: emacs-orgmode@gnu.org Cc: Bernt Hansen This patch prevents the org-clock-sound notification and the "Task'BLAH' should be finished by now." message when the termination time is reached and the clock is not running. Before this patch spurious notifications and messages were generated when clocking in a task with estimated effort time remaining. After clocking out the task the remaining minutes would tick by and then the sound and message that the task should be finished were generated - even though you are not working on it anymore. --- This patch series is available at git://git.norang.ca/org-mode for-carsten lisp/org-clock.el | 21 +++++++++++---------- 1 files changed, 11 insertions(+), 10 deletions(-) diff --git a/lisp/org-clock.el b/lisp/org-clock.el index 57f1a6f..ace7792 100644 --- a/lisp/org-clock.el +++ b/lisp/org-clock.el @@ -369,16 +369,17 @@ previous clocking intervals." (defun org-clock-notify-once-if-expired () "Show notification if we spent more time then we estimated before. Notification is shown only once." - (let ((effort-in-minutes (org-hh:mm-string-to-minutes org-clock-effort)) - (clocked-time (org-clock-get-clocked-time))) - (if (>= clocked-time effort-in-minutes) - (unless org-clock-notification-was-shown - (setq org-clock-notification-was-shown t) - (org-clock-play-sound) - (org-show-notification - (format "Task '%s' should be finished by now. (%s)" - org-clock-heading org-clock-effort))) - (setq org-clock-notification-was-shown nil)))) + (when (marker-buffer org-clock-marker) + (let ((effort-in-minutes (org-hh:mm-string-to-minutes org-clock-effort)) + (clocked-time (org-clock-get-clocked-time))) + (if (>= clocked-time effort-in-minutes) + (unless org-clock-notification-was-shown + (setq org-clock-notification-was-shown t) + (org-clock-play-sound) + (org-show-notification + (format "Task '%s' should be finished by now. (%s)" + org-clock-heading org-clock-effort))) + (setq org-clock-notification-was-shown nil))))) (defun org-show-notification (notification) "Show notification. Use libnotify, if available." -- 1.6.3.2.198.g6096d