RomanNum3ral
/
breezy-desktop
mirror of https://github.com/wheaney/breezy-desktop.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main' into HEAD

This commit is contained in:
wheaney 2025-04-29 11:54:20 -07:00
parent 91bcd82fc4 bc2edc8d1c
commit 3aebbbbf2c
3 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/XRLinuxDriver

@ -1 +1 @@
Subproject commit 28cd5f7f47a75a63013286f8e2059730f242fcf7 Subproject commit 0d8e20d62bdfbf1edcce4927761b25aa234fcd75

14
ui/src/breezydesktop.in
View File

@ -22,7 +22,13 @@
import os import os
import sys import sys
lib_dir = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'lib') xdg_data_home = os.getenv('XDG_DATA_HOME', os.path.join(os.path.expanduser('~'), '.local', 'share'))
appdir = os.getenv('APPDIR', xdg_data_home)
locale_dir = os.path.join(appdir, 'locale')
pkgdatadir = os.path.join(appdir, 'breezydesktop')
sys.path.insert(1, pkgdatadir)
lib_dir = os.path.join(pkgdatadir, 'breezydesktop', 'lib')
sys.path.insert(0, lib_dir) sys.path.insert(0, lib_dir)
import signal import signal
@ -31,12 +37,6 @@ import gettext
VERSION = '@VERSION@' VERSION = '@VERSION@'
xdg_data_home = os.getenv('XDG_DATA_HOME', os.path.join(os.path.expanduser('~'), '.local', 'share'))
appdir = os.getenv('APPDIR', xdg_data_home)
locale_dir = os.path.join(appdir, 'locale')
pkgdatadir = os.path.join(appdir, 'breezydesktop')
sys.path.insert(1, pkgdatadir)
signal.signal(signal.SIGINT, signal.SIG_DFL) signal.signal(signal.SIGINT, signal.SIG_DFL)
locale.textdomain('breezydesktop') locale.textdomain('breezydesktop')
locale.setlocale(locale.LC_ALL, locale.getlocale()) locale.setlocale(locale.LC_ALL, locale.getlocale())

13
ui/src/virtualdisplay.in
View File

@ -23,7 +23,12 @@ import logging
import os import os
import sys import sys
lib_dir = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'lib') xdg_data_home = os.getenv('XDG_DATA_HOME', os.path.join(os.path.expanduser('~'), '.local', 'share'))
appdir = os.getenv('APPDIR', xdg_data_home)
pkgdatadir = os.path.join(appdir, 'breezydesktop')
sys.path.insert(1, pkgdatadir)
lib_dir = os.path.join(pkgdatadir, 'breezydesktop', 'lib')
sys.path.insert(0, lib_dir) sys.path.insert(0, lib_dir)
from logging.handlers import TimedRotatingFileHandler from logging.handlers import TimedRotatingFileHandler
@ -52,12 +57,6 @@ import time
VERSION = '@VERSION@' VERSION = '@VERSION@'
xdg_data_home = os.getenv('XDG_DATA_HOME', os.path.join(os.path.expanduser('~'), '.local', 'share'))
appdir = os.getenv('APPDIR', xdg_data_home)
locale_dir = os.path.join(appdir, 'locale')
pkgdatadir = os.path.join(appdir, 'breezydesktop')
sys.path.insert(1, pkgdatadir)
import gi import gi
gi.require_version('GLib', '2.0') gi.require_version('GLib', '2.0')