mirror of https://codeberg.org/cage/tinmop/
- [GUI] included the system-wide configuration file into the user defined configuration file.
This commit is contained in:
parent
c89389fa21
commit
3d872e9b73
|
@ -30,7 +30,7 @@ CONF_PATH_FILE_IN_IN = src/config.lisp.in.in
|
|||
BUILT_SOURCES = $(CONF_PATH_FILE)
|
||||
|
||||
EXTRA_DIST = config.rpath m4/ChangeLog tinmop.asd README.org src \
|
||||
LICENSES.org COPYING etc/shared.conf etc/default-theme.conf etc/gui.conf \
|
||||
LICENSES.org COPYING etc/shared.conf etc/default-theme.conf etc/shared-gui.conf \
|
||||
etc/init.lisp compare_version.awk
|
||||
|
||||
SUBDIRS = po
|
||||
|
@ -40,7 +40,7 @@ doc/tinmop.org doc/send-toot.lisp NEWS.org ChangeLog AUTHORS
|
|||
|
||||
confdir = $(sysconfdir)/$(PACKAGE)
|
||||
|
||||
dist_conf_DATA = etc/init.lisp etc/default-theme.conf etc/shared.conf etc/gui.conf
|
||||
dist_conf_DATA = etc/init.lisp etc/default-theme.conf etc/shared.conf etc/shared-gui.conf
|
||||
|
||||
nobase_dist_pkgdata_DATA = data/error-pages/51 \
|
||||
data/error-pages/header-51.png \
|
||||
|
|
|
@ -398,7 +398,7 @@ CONF_PATH_FILE_IN = src/config.lisp.in
|
|||
CONF_PATH_FILE_IN_IN = src/config.lisp.in.in
|
||||
BUILT_SOURCES = $(CONF_PATH_FILE)
|
||||
EXTRA_DIST = config.rpath m4/ChangeLog tinmop.asd README.org src \
|
||||
LICENSES.org COPYING etc/shared.conf etc/default-theme.conf etc/gui.conf \
|
||||
LICENSES.org COPYING etc/shared.conf etc/default-theme.conf etc/shared-gui.conf \
|
||||
etc/init.lisp compare_version.awk
|
||||
|
||||
SUBDIRS = po
|
||||
|
@ -406,7 +406,7 @@ dist_doc_DATA = README.org LICENSES.org CONTRIBUTING.org \
|
|||
doc/tinmop.org doc/send-toot.lisp NEWS.org ChangeLog AUTHORS
|
||||
|
||||
confdir = $(sysconfdir)/$(PACKAGE)
|
||||
dist_conf_DATA = etc/init.lisp etc/default-theme.conf etc/shared.conf etc/gui.conf
|
||||
dist_conf_DATA = etc/init.lisp etc/default-theme.conf etc/shared.conf etc/shared-gui.conf
|
||||
nobase_dist_pkgdata_DATA = data/error-pages/51 \
|
||||
data/error-pages/header-51.png \
|
||||
data/icons/fmw_arrow-down.png \
|
||||
|
|
|
@ -167,7 +167,7 @@ gemini.preformatted.justification = left
|
|||
|
||||
# width in chars
|
||||
|
||||
toc.show = no
|
||||
toc.show = yes
|
||||
|
||||
toc.maximum.width = 40
|
||||
|
||||
|
@ -187,7 +187,7 @@ toc.autoresize = yes
|
|||
|
||||
# stream frame
|
||||
|
||||
stream-frame.show = no
|
||||
stream-frame.show = yes
|
||||
|
||||
# Keybinding
|
||||
|
|
@ -21,7 +21,9 @@
|
|||
|
||||
(defparameter *client-configuration* ())
|
||||
|
||||
(a:define-constant +client-conf-filename+ "gui.conf" :test #'string=)
|
||||
(a:define-constant +client-conf-filename+ "gui.conf" :test #'string=)
|
||||
|
||||
(a:define-constant +client-sys-conf-filename+ "shared-gui.conf" :test #'string=)
|
||||
|
||||
(swconf::gen-key-constants text
|
||||
font
|
||||
|
|
|
@ -239,6 +239,7 @@ etc.) happened"
|
|||
(load command-line:*script-file* :verbose nil :print nil)))
|
||||
|
||||
(defun rpc-client-load-configuration ()
|
||||
(gui-conf:load-config-file gui-conf:+client-sys-conf-filename+)
|
||||
(handler-bind ((error
|
||||
(lambda (e)
|
||||
(format *error-output*
|
||||
|
|
|
@ -3266,6 +3266,7 @@
|
|||
(:a :alexandria))
|
||||
(:export
|
||||
:+client-conf-filename+
|
||||
:+client-sys-conf-filename+
|
||||
:load-config-file
|
||||
:gemini-default-favicon
|
||||
:gemini-fetch-favicon-p
|
||||
|
|
Loading…
Reference in New Issue