From 3952c4af5df3ca2cd0a2738812dbadaffd7727f2 Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Fri, 7 Mar 2025 10:34:39 +0600 Subject: [PATCH 1/3] Fixed building --- source/CMakeLists.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt index b4d98a2..3bea421 100644 --- a/source/CMakeLists.txt +++ b/source/CMakeLists.txt @@ -66,8 +66,10 @@ add_definitions(-DVTE_INCLUDE) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Werror -Wmissing-declarations -fdiagnostics-color=always \ -O2 -pipe -fno-plt -fexceptions \ - -Wp,-D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security \ + -Wformat -Werror=format-security \ -fstack-clash-protection -fcf-protection") + +string(FIND "${CMAKE_CXX_FLAGS}" "-D_FORTIFY_SOURCE" FORTIFY_FOUND) set(SOURCE_FILES -- 2.35.1 From e951c7313c3079bb2b736a645f892dae47d19d5c Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Fri, 7 Mar 2025 12:08:17 +0600 Subject: [PATCH 2/3] Fixed units tab startup service type --- ubl-settings-services.glade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ubl-settings-services.glade b/ubl-settings-services.glade index d80920c..93a428e 100644 --- a/ubl-settings-services.glade +++ b/ubl-settings-services.glade @@ -1185,10 +1185,10 @@ Autolaunch in configuration Stopped in configuration Blocked in configuration - Service Automount Device Path + Service Scope Slice Socket -- 2.35.1 From e139a3e0fb623bc564745abd82ede5a30b9031de Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Fri, 7 Mar 2025 12:11:28 +0600 Subject: [PATCH 3/3] Fixed custom config loading --- source/ubl-settings-services.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/source/ubl-settings-services.c b/source/ubl-settings-services.c index 5ec877e..4e167e9 100644 --- a/source/ubl-settings-services.c +++ b/source/ubl-settings-services.c @@ -57,13 +57,13 @@ void yon_load_proceed(YON_CONFIG_TYPE type){ if (!yon_char_is_empty(file)){ path=file; } + yon_config_clean(); + char *command = yon_config_get_custom_command(path); + yon_config_load_config(type,command,NULL); gtk_widget_destroy(dialog); } else { gtk_widget_destroy(dialog); } - yon_config_clean(); - char *command = yon_config_get_custom_command(path); - yon_config_load_config(type,command,NULL); } } -- 2.35.1