Attachment 871129 Details for Bug 1216281

upstream patch

takeabreak-tmpxdg.patch (text/x-diff), 1.89 KB, created by Matthias Gerstner on 2023-12-04 11:56:20 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Matthias Gerstner

Created: 2023-12-04 11:56:20 UTC

Size: 1.89 KB

patch

obsolete

>Applied-Upstream: commit:ffa29d4bfe880217e28d99de99026760ae6fe1d4
>Author: Samuel Lane <samlane00@gmail.com>
>Last-Update: 2023-10-18
>Description: [PATCH 4/8] Resolves 3 / 3.1 - resolves 3.1 (entirety of no. 3)
>
>---
> budgie-takeabreak/budgie_takeabreak.py | 6 +++---
> budgie-takeabreak/takeabreak_run       | 5 +++--
> 2 files changed, 6 insertions(+), 5 deletions(-)
>
>diff --git a/budgie-takeabreak/budgie_takeabreak.py b/budgie-takeabreak/budgie_takeabreak.py
>index 2bc25c7..495707c 100644
>--- a/budgie-takeabreak/budgie_takeabreak.py
>+++ b/budgie-takeabreak/budgie_takeabreak.py
>@@ -23,9 +23,8 @@ program.  If not, see <http://www.gnu.org/licenses/>.
> """
> 
> 
>-user = os.environ["USER"]
>-tmp = GLib.get_tmp_dir()
>-nextbreakfile = tmp + "/nextbreak_" + user
>+tmp = os.getenv("XDG_RUNTIME_DIR") if "XDG_RUNTIME_DIR" in os.environ else os.getenv("HOME")
>+nextbreakfile = os.path.join(tmp, ".nextbreak")
> tab_settings = Gio.Settings.new("org.ubuntubudgie.plugins.takeabreak")
> 
> 
>@@ -261,6 +260,7 @@ class BudgieTakeaBreakApplet(Budgie.Applet):
>         return False
> 
>     def kill_runner(self):
>+        user = os.environ["USER"]
>         try:
>             # I know, old school, but it works well
>             pid = subprocess.check_output([
>diff --git a/budgie-takeabreak/takeabreak_run b/budgie-takeabreak/takeabreak_run
>index 9abbedd..e2078ea 100755
>--- a/budgie-takeabreak/takeabreak_run
>+++ b/budgie-takeabreak/takeabreak_run
>@@ -76,8 +76,9 @@ def subprocess_tasks(task, command_list, fallbackval=None):
> 
> def write_nextbreak():
>     next_break = time.time() + awaketime
>-    tmp = GLib.get_tmp_dir()
>-    open(tmp + "/nextbreak_" + user, "wt").write(str(next_break))
>+    tmp = os.getenv("XDG_RUNTIME_DIR") if "XDG_RUNTIME_DIR" in os.environ else os.getenv("HOME")
>+    nextbreakfile = os.path.join(tmp, ".nextbreak")
>+    open(nextbreakfile, "wt").write(str(next_break))
> 
> 
> def sendmessage(title, message, icon=""):
>-- 
>2.34.1
>

Actions: View

Attachments on bug 1216281: 871129 | 871130 | 871131