Merge branch 'main' into main

Make the xdg dependency optional
We now default to using `~/.cache/waybar-current-task.json` if the `xdg` package is not present.
2024-01-15 09:04:00 +00:00 · 2023-01-31 08:47:36 +01:00 · 2021-10-16 10:24:06 +00:00 · 2021-10-16 06:25:34 +02:00
1 changed files with 4 additions and 2 deletions
--- a/org-clock-waybar.el
+++ b/org-clock-waybar.el
@@ -38,7 +38,7 @@

 ;;; Code:

-(require 'xdg)
+(require 'xdg nil t)
 (require 'json)
 (require 'org-clock)

@@ -47,7 +47,9 @@
  :group 'emacs)

 (defcustom org-clock-waybar-filename
-  (expand-file-name "waybar-current-task.json" (xdg-cache-home))
+  (if (fboundp 'xdg-cache-home)
+      (expand-file-name "waybar-current-task.json" (xdg-cache-home))
+    (expand-file-name "~/.cache/waybar-current-task.json"))
  "Name of the file to save task data to."
  :type 'string
  :group 'org-clock-waybar)
Author	SHA1	Message	Date
Cadair	857d193205	Merge branch 'main' into main	2024-01-15 09:04:00 +00:00
Gergely Polonkai	c327eb18c6	Make the xdg dependency optional We now default to using `~/.cache/waybar-current-task.json` if the `xdg` package is not present.	2023-01-31 08:47:36 +01:00
Gergely Polonkai	754fd9d2fa	Merge pull request '[Bugfix] Make sure we remove all text properties before outputting JSON data' (#8 ) from remove-text-properties into main Reviewed-on: gergely/org-clock-waybar#8	2021-10-16 10:24:06 +00:00
Gergely Polonkai	a144ee13c0	[Bugfix] Make sure we remove all text properties before outputting JSON data	2021-10-16 06:25:34 +02:00