aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuanma Barranquero2010-06-09 13:16:21 +0200
committerJuanma Barranquero2010-06-09 13:16:21 +0200
commitb978141d8bc598486bfc9917114232773ac35ea7 (patch)
tree50cf8f42cbd15a3e70680fb7c6312142f7daae3b
parent5f4f2ae4f967a5a135b95e135c8b29de43ec71b2 (diff)
downloademacs-b978141d8bc598486bfc9917114232773ac35ea7.tar.gz
emacs-b978141d8bc598486bfc9917114232773ac35ea7.zip
* net/notifications.el (dbus-register-signal): Declare function.
(notifications-notify): Fix typos and reflow docstring.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/net/notifications.el16
2 files changed, 14 insertions, 7 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7a47b2f3586..100e85fea60 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12010-06-09 Juanma Barranquero <lekktu@gmail.com>
2
3 * net/notifications.el (dbus-register-signal): Declare function.
4 (notifications-notify): Fix typos and reflow docstring.
5
12010-06-09 Dan Nicolaescu <dann@ics.uci.edu> 62010-06-09 Dan Nicolaescu <dann@ics.uci.edu>
2 7
3 Improve VC create/retrieve tag/branch. 8 Improve VC create/retrieve tag/branch.
diff --git a/lisp/net/notifications.el b/lisp/net/notifications.el
index a2147ed132a..a5728f0dd71 100644
--- a/lisp/net/notifications.el
+++ b/lisp/net/notifications.el
@@ -38,6 +38,7 @@
38;; disabled with configuration option "--without-dbus". Declare used 38;; disabled with configuration option "--without-dbus". Declare used
39;; subroutines and variables of `dbus' therefore. 39;; subroutines and variables of `dbus' therefore.
40(declare-function dbus-call-method "dbusbind.c") 40(declare-function dbus-call-method "dbusbind.c")
41(declare-function dbus-register-signal "dbusbind.c")
41 42
42(require 'dbus) 43(require 'dbus)
43 44
@@ -127,9 +128,10 @@ Various PARAMS can be set:
127 :actions A list of actions in the form: 128 :actions A list of actions in the form:
128 (KEY TITLE KEY TITLE ...) 129 (KEY TITLE KEY TITLE ...)
129 where KEY and TITLE are both strings. 130 where KEY and TITLE are both strings.
130 The default action (usually invoked by clicking the notification) 131 The default action (usually invoked by clicking the
131 should have a key named \"default\". The name can be anything, 132 notification) should have a key named \"default\".
132 though implementations are free not to display it. 133 The name can be anything, though implementations are free
134 not to display it.
133 :timeout The timeout time in milliseconds since the display 135 :timeout The timeout time in milliseconds since the display
134 of the notification at which the notification should 136 of the notification at which the notification should
135 automatically close. 137 automatically close.
@@ -150,14 +152,14 @@ Various PARAMS can be set:
150 :suppress-sound Causes the server to suppress playing any sounds, if it has 152 :suppress-sound Causes the server to suppress playing any sounds, if it has
151 that ability. 153 that ability.
152 :x Specifies the X location on the screen that the notification 154 :x Specifies the X location on the screen that the notification
153 should point to. The \"y\" hint must also be specified. 155 should point to. The \"y\" hint must also be specified.
154 :y Specifies the Y location on the screen that the notification 156 :y Specifies the Y location on the screen that the notification
155 should point to. The \"x\" hint must also be specified. 157 should point to. The \"x\" hint must also be specified.
156 :on-action Function to call when an action is invoked. The key of the 158 :on-action Function to call when an action is invoked. The key of the
157 action is passed as argument to the function. 159 action is passed as argument to the function.
158 :on-close Function to call when the notification has been closed 160 :on-close Function to call when the notification has been closed
159 by timeout or by the user. 161 by timeout or by the user.
160 The function receive the closing reason as argument: 162 The function receives the closing reason as argument:
161 - `expired' if the notification has expired 163 - `expired' if the notification has expired
162 - `dismissed' if the notification was dismissed by the user 164 - `dismissed' if the notification was dismissed by the user
163 - `close-notification' if the notification was closed 165 - `close-notification' if the notification was closed