1
0
Fork 0
forked from Miroirs/x49gp

Merge branch 'main' of ssh://src.le-moine.org:38172/gwh/x50ng

This commit is contained in:
Gwenhael Le Moine 2024-12-15 15:52:50 +01:00
commit 2e9954e57c
No known key found for this signature in database
GPG key ID: FDFE3669426707A7
2 changed files with 2 additions and 3 deletions

View file

@ -1,9 +1,8 @@
TARGET = x50ng TARGET = x50ng
TARGET_ALLCAPS = X50NG
VERSION_MAJOR = 1 VERSION_MAJOR = 1
VERSION_MINOR = 6 VERSION_MINOR = 6
PATCHLEVEL = 1 PATCHLEVEL = 2
INSTALL_PREFIX = /usr/local INSTALL_PREFIX = /usr/local
INSTALL_BINARY_DIR = "$(INSTALL_PREFIX)"/bin INSTALL_BINARY_DIR = "$(INSTALL_PREFIX)"/bin

View file

@ -1698,7 +1698,7 @@ static int ui_load( x49gp_module_t* module, GKeyFile* keyfile )
GLOBAL_DATADIR, opt.style_filename ); GLOBAL_DATADIR, opt.style_filename );
else { else {
GtkCssProvider* style_provider = gtk_css_provider_new(); GtkCssProvider* style_provider = gtk_css_provider_new();
gtk_css_provider_load_from_path( style_provider, g_build_filename( GLOBAL_DATADIR, opt.style_filename, NULL ), NULL ); gtk_css_provider_load_from_path( style_provider, style_full_path, NULL );
gtk_style_context_add_provider_for_screen( gdk_screen_get_default(), GTK_STYLE_PROVIDER( style_provider ), gtk_style_context_add_provider_for_screen( gdk_screen_get_default(), GTK_STYLE_PROVIDER( style_provider ),
GTK_STYLE_PROVIDER_PRIORITY_USER + 1 ); GTK_STYLE_PROVIDER_PRIORITY_USER + 1 );