From 98d7ab4e1b5f83ba803ec4d5122fbcb0b8a6bef0 Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Fri, 4 Oct 2024 10:11:26 +0600 Subject: [PATCH] Fixed wrong behaivior if repomanager was launched from ubl-settings-manager --- source/CMakeLists.txt | 7 ------- source/ubl-cmake.in | 1 - source/ubl-settings-repomanager.c | 2 +- 3 files changed, 1 insertion(+), 9 deletions(-) delete mode 100644 source/ubl-cmake.in diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt index 65f3e99..cc5b44d 100644 --- a/source/CMakeLists.txt +++ b/source/CMakeLists.txt @@ -15,19 +15,13 @@ add_definitions(${VTE291_CFLAGS_OTHER}) find_library(WEBKIT_LIBRARIES_FOUND webkit2gtk-4.0 webkit2gtk-web-extension-4.0) -option(WEBKIT_FOUND "No" OFF) if(WEBKIT_LIBRARIES_FOUND) - option(WEBKIT_FOUND "Yes" ON) PKG_CHECK_MODULES(WEBKIT REQUIRED webkit2gtk-4.0 webkit2gtk-web-extension-4.0) include_directories(${WEBKIT_INCLUDE_DIRS}) link_directories(${WEBKIT_LIBRARY_DIRS}) add_definitions(${WEBKIT_CFLAGS_OTHER}) endif() -configure_file(ubl-cmake.in ubl-cmake.h) - -file(COPY ${CMAKE_CURRENT_BINARY_DIR}/ubl-cmake.h DESTINATION ./) - set(GRESOURCE_C resources.c) set(GRESOURCE_XML gresource.xml) @@ -79,7 +73,6 @@ set(SOURCE_FILES ubl-settings-repomanager.c ubl-settings-repomanager.h ubl-strings.h - ${CMAKE_CURRENT_BINARY_DIR}/ubl-cmake.h ) set(LIBRARIES diff --git a/source/ubl-cmake.in b/source/ubl-cmake.in deleted file mode 100644 index d4623a7..0000000 --- a/source/ubl-cmake.in +++ /dev/null @@ -1 +0,0 @@ -#cmakedefine WEBKIT_FOUND diff --git a/source/ubl-settings-repomanager.c b/source/ubl-settings-repomanager.c index e5ea13b..ec79ba4 100644 --- a/source/ubl-settings-repomanager.c +++ b/source/ubl-settings-repomanager.c @@ -1850,7 +1850,7 @@ main_window *yon_main_window_complete(main_window *widgets){ /* Widget registration for config monitoring | Регистрация виджетов для мониторинга конфига */ /* Localisation | Локализация */ - gtk_widget_show(widgets->Window); + // gtk_widget_show(widgets->Window); return widgets; } } -- 2.35.1