From 5af3287336db27d5916ffc4e06452580ceefb322 Mon Sep 17 00:00:00 2001 From: Gwenhael Le Moine Date: Wed, 27 Nov 2024 13:32:05 +0100 Subject: [PATCH 1/3] bugfix: user local style was never loaded --- src/x50ng/ui.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/x50ng/ui.c b/src/x50ng/ui.c index 8d70593..13e1702 100644 --- a/src/x50ng/ui.c +++ b/src/x50ng/ui.c @@ -1698,7 +1698,7 @@ static int ui_load( x49gp_module_t* module, GKeyFile* keyfile ) GLOBAL_DATADIR, opt.style_filename ); else { 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_PROVIDER_PRIORITY_USER + 1 ); From 196b37f48255e491b0e3c644a5a1b8245d6c1bd9 Mon Sep 17 00:00:00 2001 From: Gwenhael Le Moine Date: Wed, 27 Nov 2024 13:32:51 +0100 Subject: [PATCH 2/3] 1.6.2 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 9b58be6..8dc3a11 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,7 @@ TARGET_ALLCAPS = X50NG VERSION_MAJOR = 1 VERSION_MINOR = 6 -PATCHLEVEL = 1 +PATCHLEVEL = 2 INSTALL_PREFIX = /usr/local INSTALL_BINARY_DIR = "$(INSTALL_PREFIX)"/bin From 205bd7213cd8ff33487e6e1bae454336b05ff0f4 Mon Sep 17 00:00:00 2001 From: Gwenhael Le Moine Date: Wed, 27 Nov 2024 13:36:54 +0100 Subject: [PATCH 3/3] kludge --- Makefile | 1 - 1 file changed, 1 deletion(-) diff --git a/Makefile b/Makefile index 8dc3a11..e54f81d 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,4 @@ TARGET = x50ng -TARGET_ALLCAPS = X50NG VERSION_MAJOR = 1 VERSION_MINOR = 6