From: Juanma Barranquero <lekktu@gmail.com>
Date: Wed, 9 Jun 2010 11:16:21 +0000 (+0200)
Subject: * net/notifications.el (dbus-register-signal): Declare function.
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~97
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=b978141d8bc598486bfc9917114232773ac35ea7;p=emacs.git

* net/notifications.el (dbus-register-signal): Declare function.
(notifications-notify): Fix typos and reflow docstring.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7a47b2f3586..100e85fea60 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2010-06-09  Juanma Barranquero  <lekktu@gmail.com>
+
+	* net/notifications.el (dbus-register-signal): Declare function.
+	(notifications-notify): Fix typos and reflow docstring.
+
 2010-06-09  Dan Nicolaescu  <dann@ics.uci.edu>
 
 	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 @@
 ;; disabled with configuration option "--without-dbus".  Declare used
 ;; subroutines and variables of `dbus' therefore.
 (declare-function dbus-call-method "dbusbind.c")
+(declare-function dbus-register-signal "dbusbind.c")
 
 (require 'dbus)
 
@@ -127,9 +128,10 @@ Various PARAMS can be set:
  :actions        A list of actions in the form:
                    (KEY TITLE KEY TITLE ...)
                  where KEY and TITLE are both strings.
-                 The default action (usually invoked by clicking the notification)
-                 should have a key named \"default\". The name can be anything,
-                 though implementations are free not to display it.
+                 The default action (usually invoked by clicking the
+                 notification) should have a key named \"default\".
+                 The name can be anything, though implementations are free
+                 not to display it.
  :timeout        The timeout time in milliseconds since the display
                  of the notification at which the notification should
                  automatically close.
@@ -150,14 +152,14 @@ Various PARAMS can be set:
  :suppress-sound Causes the server to suppress playing any sounds, if it has
                  that ability.
  :x              Specifies the X location on the screen that the notification
-                 should point to. The \"y\" hint must also be specified.
+                 should point to.  The \"y\" hint must also be specified.
  :y              Specifies the Y location on the screen that the notification
-                 should point to. The \"x\" hint must also be specified.
- :on-action      Function to call when an action is invoked. The key of the
+                 should point to.  The \"x\" hint must also be specified.
+ :on-action      Function to call when an action is invoked.  The key of the
                  action is passed as argument to the function.
  :on-close       Function to call when the notification has been closed
                  by timeout or by the user.
-                 The function receive the closing reason as argument:
+                 The function receives the closing reason as argument:
                    - `expired' if the notification has expired
                    - `dismissed' if the notification was dismissed by the user
                    - `close-notification' if the notification was closed