dan/eufon
1
0
Fork 0
Code Issues Pull Requests Releases Activity

handle CloseNotification request with invalid id

Browse Source
This commit is contained in:
Daniel Barlow 2022-02-12 23:39:14 +00:00
parent a9d00b2eb5
commit bb23c31b0b
1 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
crier/crier.fnl
View File

@ -101,11 +101,14 @@
(fn delete-notification [id] (fn delete-notification [id]
(let [widget (. notifications id)] (let [widget (. notifications id)]
(tset notifications id nil) (if widget
(window.box:remove widget.widget) (do
(update-window) (tset notifications id nil)
false (window.box:remove widget.widget)
)) (update-window)
true)
(values nil "no notification with that id"))))
(fn update-notification-widget [widget noti] (fn update-notification-widget [widget noti]
(doto widget (doto widget
@ -126,7 +129,6 @@
(let [summary (Gtk.Label { :name "summary" }) (let [summary (Gtk.Label { :name "summary" })
body (Gtk.Label) body (Gtk.Label)
icon (Gtk.Image) icon (Gtk.Image)
cancel-me (fn [] (delete-notification id))
event-box (Gtk.EventBox { event-box (Gtk.EventBox {
:on_button_press_event #(emit-action id "default") :on_button_press_event #(emit-action id "default")
}) })
@ -185,7 +187,7 @@
timeout (timeout-ms noti)] timeout (timeout-ms noti)]
(when timeout (when timeout
(lgi.GLib.timeout_add (lgi.GLib.timeout_add
lgi.GLib.PRIORITY_DEFAULT timeout #(delete-notification id))) lgi.GLib.PRIORITY_DEFAULT timeout #(do (delete-notification id) nil)))
(update-notification-widget widget noti) (update-notification-widget widget noti)
(tset notifications id widget) (tset notifications id widget)
@ -220,6 +222,9 @@
"GetCapabilities" #["actions" "body" "persistence"] "GetCapabilities" #["actions" "body" "persistence"]
"GetServerInformation" #(values "crier" "telent" "0.1" "1.2") "GetServerInformation" #(values "crier" "telent" "0.1" "1.2")
"Notify" #(add-notification (make-notification $...)) "Notify" #(add-notification (make-notification $...))
"CloseNotification" (fn [id]
(let [(won err) (delete-notification id)]
(if won (values) (error err))))
}) })
(fn args-signature [args] (fn args-signature [args]
@ -229,14 +234,18 @@
sig) sig)
(fn handle-dbus-method-call [conn sender path interface method params invocation] (fn handle-dbus-method-call [conn sender path interface method params invocation]
(print interface)
(when (and (= path dbus-service-attrs.path) (when (and (= path dbus-service-attrs.path)
(= interface dbus-service-attrs.interface)) (= interface dbus-service-attrs.interface))
(let [p (dbus.variant.strip params) (let [p (dbus.variant.strip params)
info (interface-info:lookup_method method) info (interface-info:lookup_method method)
ret (table.pack ((. dbus-methods method) (table.unpack p)))
sig (args-signature info.out_args)] sig (args-signature info.out_args)]
(invocation:return_value (GV (.. "(" sig ")") ret))))) (match (table.pack (pcall (. dbus-methods method) (table.unpack p)))
[true & vals]
(invocation:return_value (GV (.. "(" sig ")") vals))
_
(invocation:return_value nil)))))
(fn handle-dbus-get [conn sender path interface name] (fn handle-dbus-get [conn sender path interface name]
(when (and (= path dbus-service-attrs.path) (when (and (= path dbus-service-attrs.path)