emacs-orgmode@gnu.org archives
 help / color / mirror / code / Atom feed
* [PATCH 2/2] Do not issue the 'task should be finished by now' message if the clock is stopped
@ 2009-06-09 20:43 Bernt Hansen
  2009-06-09 21:45 ` Carsten Dominik
  0 siblings, 1 reply; 2+ messages in thread
From: Bernt Hansen @ 2009-06-09 20:43 UTC (permalink / raw)
  To: emacs-orgmode; +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

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH 2/2] Do not issue the 'task should be finished by now' message if the clock is stopped
  2009-06-09 20:43 [PATCH 2/2] Do not issue the 'task should be finished by now' message if the clock is stopped Bernt Hansen
@ 2009-06-09 21:45 ` Carsten Dominik
  0 siblings, 0 replies; 2+ messages in thread
From: Carsten Dominik @ 2009-06-09 21:45 UTC (permalink / raw)
  To: Bernt Hansen; +Cc: emacs-orgmode

All patches applied, thanks.

- Carsten

On Jun 9, 2009, at 10:43 PM, Bernt Hansen wrote:

> 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
>
>
>
> _______________________________________________
> Emacs-orgmode mailing list
> Remember: use `Reply All' to send replies to the list.
> Emacs-orgmode@gnu.org
> http://lists.gnu.org/mailman/listinfo/emacs-orgmode

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2009-06-09 21:45 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-06-09 20:43 [PATCH 2/2] Do not issue the 'task should be finished by now' message if the clock is stopped Bernt Hansen
2009-06-09 21:45 ` Carsten Dominik

Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/emacs/org-mode.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).