Merge remote-tracking branch 'origin/main' into HEAD
This commit is contained in:
commit
79a5d639b2
|
|
@ -1 +1 @@
|
|||
Subproject commit 28cd5f7f47a75a63013286f8e2059730f242fcf7
|
||||
Subproject commit 0d8e20d62bdfbf1edcce4927761b25aa234fcd75
|
||||
|
|
@ -22,7 +22,13 @@
|
|||
import os
|
||||
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)
|
||||
|
||||
import signal
|
||||
|
|
@ -31,12 +37,6 @@ import gettext
|
|||
|
||||
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)
|
||||
locale.textdomain('breezydesktop')
|
||||
locale.setlocale(locale.LC_ALL, locale.getlocale())
|
||||
|
|
|
|||
|
|
@ -23,7 +23,12 @@ import logging
|
|||
import os
|
||||
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)
|
||||
|
||||
from logging.handlers import TimedRotatingFileHandler
|
||||
|
|
@ -52,12 +57,6 @@ import time
|
|||
|
||||
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
|
||||
|
||||
gi.require_version('GLib', '2.0')
|
||||
|
|
|
|||
Loading…
Reference in New Issue