Attachment 871135 Details for Bug 1217597

upstream patch

dropby-tmpxdg.patch (text/x-diff), 4.00 KB, created by Matthias Gerstner on 2023-12-04 11:57:57 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Matthias Gerstner

Created: 2023-12-04 11:57:57 UTC

Size: 4.00 KB

patch

obsolete

>Applied-Upstream: commit:e75c94af249191bdbd33eebf7a62d4234a0d8be5
>Author: Samuel Lane <samlane00@gmail.com>
>Last-Update: 2023-10-19
>Description: [PATCH 6/8] Resolves dropby
>
>---
> budgie-dropby/budgie_dropby.py | 7 +++----
> budgie-dropby/checkonwin       | 4 ++--
> budgie-dropby/copy_flash       | 4 ++--
> budgie-dropby/dropover         | 9 ++++-----
> 4 files changed, 11 insertions(+), 13 deletions(-)
>
>diff --git a/budgie-dropby/budgie_dropby.py b/budgie-dropby/budgie_dropby.py
>index b634ae4..b766f6c 100644
>--- a/budgie-dropby/budgie_dropby.py
>+++ b/budgie-dropby/budgie_dropby.py
>@@ -108,8 +108,8 @@ class BudgieDropByApplet(Budgie.Applet):
>         self.uuid = uuid
>         self.connect("destroy", Gtk.main_quit)
>         app_path = os.path.dirname(os.path.abspath(__file__))
>-        user = os.environ["USER"]
>-        self.copytrigger = "/tmp/" + user + "_dropby_icon_copy"
>+        self.tmp_path = os.getenv("XDG_RUNTIME_DIR") if "XDG_RUNTIME_DIR" in os.environ else os.getenv("HOME")
>+        self.copytrigger = os.path.join(self.tmp_path, ".dropby_icon_copy")
>         self.copying = False
>         self.winpath = os.path.join(app_path, "dropover")
>         self.box = Gtk.EventBox()
>@@ -188,8 +188,7 @@ class BudgieDropByApplet(Budgie.Applet):
> 
>     def create_windowtrigger(self, *args):
>         if not self.check_winexists():
>-            user = os.environ["USER"]
>-            open("/tmp/" + user + "_call_dropby", "wt").write("")
>+            open(os.path.join(self.tmp_path, ".call_dropby"), "wt").write("")
> 
>     def start_dropover(self):
>         try:
>diff --git a/budgie-dropby/checkonwin b/budgie-dropby/checkonwin
>index 5c5f069..cc048d9 100755
>--- a/budgie-dropby/checkonwin
>+++ b/budgie-dropby/checkonwin
>@@ -19,8 +19,8 @@ should have received a copy of the GNU General Public License along with this
> program.  If not, see <https://www.gnu.org/licenses/>.
> """
> 
>-dropby_user = os.environ["USER"]
>-timer = "/tmp/" + dropby_user + "_keepdropbywin"
>+tmp_path = os.getenv("XDG_RUNTIME_DIR") if "XDG_RUNTIME_DIR" in os.environ else os.getenv("HOME")
>+timer = os.path.join(tmp_path, ".keepdropbywin")
> 
> 
> try:
>diff --git a/budgie-dropby/copy_flash b/budgie-dropby/copy_flash
>index 4632f05..920f49b 100755
>--- a/budgie-dropby/copy_flash
>+++ b/budgie-dropby/copy_flash
>@@ -87,8 +87,8 @@ def copy(source, targetdir):
> 
> 
> # get targeted path
>-user = os.environ["USER"]
>-cptrigger = "/tmp/" + user + "_dropby_icon_copy"
>+tmp_path = os.getenv("XDG_RUNTIME_DIR") if "XDG_RUNTIME_DIR" in os.environ else os.getenv("HOME")
>+cptrigger = os.path.join(tmp_path, ".dropby_icon_copy")
> try:
>     target = subprocess.check_output([
>         "/usr/bin/zenity", "--file-selection", "--directory",
>diff --git a/budgie-dropby/dropover b/budgie-dropby/dropover
>index 9263a09..e1b5f9a 100755
>--- a/budgie-dropby/dropover
>+++ b/budgie-dropby/dropover
>@@ -62,10 +62,10 @@ class WatchVolumes:
>         app_path = os.path.dirname(os.path.abspath(__file__))
>         self.copyscript = os.path.join(app_path, "copy_flash")
>         self.start_timer = os.path.join(app_path, "checkonwin")
>-        user = os.environ["USER"]
>-        self.timer = "/tmp/" + user + "_keepdropbywin"
>+        self.tmp_path = os.getenv("XDG_RUNTIME_DIR") if "XDG_RUNTIME_DIR" in os.environ else os.getenv("HOME")
>+        self.timer = os.path.join(self.tmp_path, ".keepdropbywin")
>         # setup watching trigger (uncomment below lines if)
>-        infofile = Gio.File.new_for_path("/tmp")
>+        infofile = Gio.File.new_for_path(self.tmp_path)
>         monitor = infofile.monitor(Gio.FileMonitorFlags.NONE, None)
>         monitor.connect("changed", self.actonfile)
>         # setup watching applet presence
>@@ -100,8 +100,7 @@ class WatchVolumes:
> 
>     def actonfile(self, arg1, arg2, arg3, event):
>         # ok, let's replace once dbus is a fact
>-        user = os.environ["USER"]
>-        trigger = "/tmp/" + user + "_call_dropby"
>+        trigger = os.path.join(self.tmp_path, ".call_dropby")
>         if all([
>             event == Gio.FileMonitorEvent.CREATED,
>             os.path.exists(trigger)
>-- 
>2.34.1
>

Actions: View

Attachments on bug 1217597: 871135 | 871136