From 695a6f932b208c6e840bda9ddb5f01e81e830c45 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Fri, 13 Nov 2015 15:33:29 +0200 Subject: [PATCH] Remove support for ':timeout' from w32 tray notifications * src/w32fns.c (Fw32_notification_notify): Delete the code that supports ':timeout'. (syms_of_w32fns): Don't DEFSYM ':timeout'. This avoids clashes with dbusbind.c when D-Bus is compiled in. * doc/lispref/os.texi (Desktop Notifications): Don't mention ':timeout'. --- doc/lispref/os.texi | 6 ------ src/w32fns.c | 15 --------------- 2 files changed, 21 deletions(-) diff --git a/doc/lispref/os.texi b/doc/lispref/os.texi index 53aa0e195a7..f3c4e29cca2 100644 --- a/doc/lispref/os.texi +++ b/doc/lispref/os.texi @@ -2603,12 +2603,6 @@ Notification severity level, one of @code{info}, @code{warning}, or left of the notification title, but only if the @code{:title} parameter (see below) is also specified and is a string. -@item :timeout @var{timeout} -@var{timeout} is the time in seconds after which the notification -disappears. The value can be integer or floating-point. This is -ignored on Vista and later systems, where the duration is fixed at 9 -sec and can only be customized via system-wide Accessibility settings. - @item :title @var{title} The title of the notification. If @var{title} is a string, it is displayed in a larger font immediately above the body text. The title diff --git a/src/w32fns.c b/src/w32fns.c index f2d286d6364..f3391cb98f0 100644 --- a/src/w32fns.c +++ b/src/w32fns.c @@ -9111,13 +9111,6 @@ The following parameters are supported: parameter (see below) is also specified and is a string. -:timeout TIMEOUT -- TIMEOUT is the time in seconds after which the - notification disappears. The value can be integer - or floating-point. This is ignored on Vista and - later systems, where the duration is fixed at 9 sec - and can only be customized via system-wide - Accessibility settings. - :title TITLE -- The title of the notification. If TITLE is a string, it is displayed in a larger font immediately above the body text. The title text can be up to 63 @@ -9179,13 +9172,6 @@ usage: (w32-notification-notify &rest PARAMS) */) else severity = Ni_Info; - /* Timeout. */ - lres = Fplist_get (arg_plist, QCtimeout); - if (NUMBERP (lres)) - timeout = 1000 * (INTEGERP (lres) ? XINT (lres) : XFLOAT_DATA (lres)); - else - timeout = 0; - /* Title. */ lres = Fplist_get (arg_plist, QCtitle); if (STRINGP (lres)) @@ -9300,7 +9286,6 @@ syms_of_w32fns (void) DEFSYM (QClevel, ":level"); DEFSYM (Qinfo, "info"); DEFSYM (Qwarning, "warning"); - DEFSYM (QCtimeout, ":timeout"); DEFSYM (QCtitle, ":title"); DEFSYM (QCbody, ":body"); #endif -- 2.39.2