Merge pull request 'Fixed wrong behaivior if repomanager was launched from ubl-settings-manager' (#88) from YanTheKaller/ubl-settings-repomanager:master into master

Reviewed-on: #88
pull/108/head v2.9
Dmitry Razumov 1 year ago
commit 2d483cf689

@ -15,19 +15,13 @@ add_definitions(${VTE291_CFLAGS_OTHER})
find_library(WEBKIT_LIBRARIES_FOUND webkit2gtk-4.0 webkit2gtk-web-extension-4.0) find_library(WEBKIT_LIBRARIES_FOUND webkit2gtk-4.0 webkit2gtk-web-extension-4.0)
option(WEBKIT_FOUND "No" OFF)
if(WEBKIT_LIBRARIES_FOUND) if(WEBKIT_LIBRARIES_FOUND)
option(WEBKIT_FOUND "Yes" ON)
PKG_CHECK_MODULES(WEBKIT REQUIRED webkit2gtk-4.0 webkit2gtk-web-extension-4.0) PKG_CHECK_MODULES(WEBKIT REQUIRED webkit2gtk-4.0 webkit2gtk-web-extension-4.0)
include_directories(${WEBKIT_INCLUDE_DIRS}) include_directories(${WEBKIT_INCLUDE_DIRS})
link_directories(${WEBKIT_LIBRARY_DIRS}) link_directories(${WEBKIT_LIBRARY_DIRS})
add_definitions(${WEBKIT_CFLAGS_OTHER}) add_definitions(${WEBKIT_CFLAGS_OTHER})
endif() 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_C resources.c)
set(GRESOURCE_XML gresource.xml) set(GRESOURCE_XML gresource.xml)
@ -79,7 +73,6 @@ set(SOURCE_FILES
ubl-settings-repomanager.c ubl-settings-repomanager.c
ubl-settings-repomanager.h ubl-settings-repomanager.h
ubl-strings.h ubl-strings.h
${CMAKE_CURRENT_BINARY_DIR}/ubl-cmake.h
) )
set(LIBRARIES set(LIBRARIES

@ -1 +0,0 @@
#cmakedefine WEBKIT_FOUND

@ -1850,7 +1850,7 @@ main_window *yon_main_window_complete(main_window *widgets){
/* Widget registration for config monitoring | Регистрация виджетов для мониторинга конфига */ /* Widget registration for config monitoring | Регистрация виджетов для мониторинга конфига */
/* Localisation | Локализация */ /* Localisation | Локализация */
gtk_widget_show(widgets->Window); // gtk_widget_show(widgets->Window);
return widgets; return widgets;
} }
} }

Loading…
Cancel
Save