Attachment 871132 Details for Bug 1216282

upstream patch

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

(hide)

Description:

Filename:

MIME Type:

Creator: Matthias Gerstner

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

Size: 2.28 KB

patch

obsolete

>Applied-Upstream: commit:0092025ef25b48c287a75946c0ee797d3c142760
>Author: Samuel Lane <samlane00@gmail.com>
>Last-Update: 2023-10-18
>Description: [PATCH 3/8] Resolves 4 / 4.1 - resolves 4.1 (entirety of No. 4)
>
>---
> budgie-weathershow/src/desktop_weather/desktop_weather.vala | 5 ++---
> budgie-weathershow/src/weathershow/WeatherShow.vala         | 5 ++---
> 2 files changed, 4 insertions(+), 6 deletions(-)
>
>diff --git a/budgie-weathershow/src/desktop_weather/desktop_weather.vala b/budgie-weathershow/src/desktop_weather/desktop_weather.vala
>index 7b85dc6..7a20798 100644
>--- a/budgie-weathershow/src/desktop_weather/desktop_weather.vala
>+++ b/budgie-weathershow/src/desktop_weather/desktop_weather.vala
>@@ -134,9 +134,8 @@ public class DesktopWeather : Gtk.Window {
>         this.set_visual(visual);
>         this.draw.connect(on_draw);
>         // monitored datafile
>-        string username = Environment.get_user_name();
>-        var tmp = Environment.get_tmp_dir() + "/";
>-        string src = tmp.concat(username, "_weatherdata");
>+        string tmpdir = Environment.get_variable("XDG_RUNTIME_DIR") ?? Environment.get_variable("HOME");
>+        string src = GLib.Path.build_path(GLib.Path.DIR_SEPARATOR_S, tmpdir, ".weatherdata");
>         datasrc = File.new_for_path(src);
>         // report
>         maingrid = new Gtk.Grid();
>diff --git a/budgie-weathershow/src/weathershow/WeatherShow.vala b/budgie-weathershow/src/weathershow/WeatherShow.vala
>index cfa71e2..ce1f30c 100644
>--- a/budgie-weathershow/src/weathershow/WeatherShow.vala
>+++ b/budgie-weathershow/src/weathershow/WeatherShow.vala
>@@ -348,9 +348,8 @@ namespace WeatherShowApplet {
>             string result_current = weather_obj.get_current();
>             // write to file only for desktop show
>             if (show_ondesktop == true) {
>-                string username = Environment.get_user_name();
>-                var tmp = Environment.get_tmp_dir() + "/";
>-                string src = tmp.concat(username, "_weatherdata");
>+                string tmpdir = Environment.get_variable("XDG_RUNTIME_DIR") ?? Environment.get_variable("HOME");
>+                string src = GLib.Path.build_path(GLib.Path.DIR_SEPARATOR_S, tmpdir, ".weatherdata");
>                 WeatherShowFunctions.write_tofile(src, result_current);
>             }
>         }
>-- 
>2.34.1
>

Actions: View

Attachments on bug 1216282: 871132