diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt index ffaa9fd..518b1ed 100644 --- a/source/CMakeLists.txt +++ b/source/CMakeLists.txt @@ -10,19 +10,13 @@ add_definitions(${GTK_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) @@ -74,7 +68,6 @@ set(SOURCE_FILES ubl-settings-usergroups.c ubl-settings-usergroups.h ubl-strings.h - ${CMAKE_CURRENT_BINARY_DIR}/ubl-cmake.h ) set(LIBRARIES diff --git a/source/ubl-settings-usergroups.c b/source/ubl-settings-usergroups.c index c557557..d78bea2 100644 --- a/source/ubl-settings-usergroups.c +++ b/source/ubl-settings-usergroups.c @@ -1133,7 +1133,7 @@ void yon_main_window_complete(main_window *widgets){ } int main(int argc, char *argv[]){ - local=setlocale(LC_ALL, ""); + local=setlocale(LC_ALL, ""); textdomain (LocaleName); config_init(); int option_index=0; @@ -1210,8 +1210,9 @@ int main(int argc, char *argv[]){ } gtk_init(&argc,&argv); yon_ubl_connect_config((_template_config*)&main_config); - yon_ubl_window_init(TITLE_LABEL,TITLE_INFO_LABEL,LocaleName,CssPath,LocaleName,version_application,WIKI_LINK); + yon_ubl_window_init(TITLE_LABEL,TITLE_INFO_LABEL,LocaleName,CssPath,LocaleName,version_application,WIKI_LINK); template_main_window *widgets = yon_ubl_window_setup(); + textdomain (LocaleName); yon_main_window_complete((main_window*)widgets); gtk_main(); } \ No newline at end of file diff --git a/source/ubl-settings-usergroups.h b/source/ubl-settings-usergroups.h index 07e4cea..4118702 100644 --- a/source/ubl-settings-usergroups.h +++ b/source/ubl-settings-usergroups.h @@ -1,16 +1,15 @@ #include #include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include #include #include -#include "../compile/ubl-cmake.h" #ifdef WEBKIT_FOUND #include #endif diff --git a/ubl-settings-usergroups-user.glade b/ubl-settings-usergroups-user.glade index 519ac3b..0215ba6 100644 --- a/ubl-settings-usergroups-user.glade +++ b/ubl-settings-usergroups-user.glade @@ -64,6 +64,7 @@ False True com.ublinux.ubl-settings-usergroups + Users and groups - user configuration True