From 309be0cc6e84057cdfeb38f63ce92bb15d44126c Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Wed, 20 Dec 2023 17:46:27 +0600 Subject: [PATCH 1/2] Unwanted libraries loading lock --- source/CMakeLists.txt | 6 ++---- source/libublsettings-gtk3.c | 4 ++-- source/libublsettings-gtk3.h | 4 ++-- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt index 1b61aea..af6f806 100644 --- a/source/CMakeLists.txt +++ b/source/CMakeLists.txt @@ -43,14 +43,12 @@ pthread) if (VTE291) list(APPEND LIBRARIES ${VTE291_LIBRARIES}) -else() -add_definitions(-DVTE_DISABLE) +add_definitions(-DVTE_INCLUDE) endif() if (WEBKIT_LIBRARIES_FOUND) list(APPEND LIBRARIES ${WEBKIT_LIBRARIES}) -else() -add_definitions(-DWEBKIT_DISABLE) +add_definitions(-DWEBKIT_INCLUDE) endif() message(${CMAKE_INSTALL_LIBDIR}) diff --git a/source/libublsettings-gtk3.c b/source/libublsettings-gtk3.c index a742576..69e3d0a 100644 --- a/source/libublsettings-gtk3.c +++ b/source/libublsettings-gtk3.c @@ -4,7 +4,7 @@ static render_data render; -#ifndef VTE_DISABLE +#ifdef VTE_INCLUDE static void child_ready(VteTerminal *terminal, GPid pid, GError *error, gpointer user_data) { @@ -824,7 +824,7 @@ void yon_ubl_setup_sockets(GtkWidget *main_window, GtkWidget *left_window, GtkWi } } -#ifndef WEBKIT_DISABLE +#ifdef WEBKIT_INCLUDE void yon_ubl_browser_window_open(char *link, char *browser_window_name){ GtkWidget *browser=gtk_window_new(GTK_WINDOW_TOPLEVEL); diff --git a/source/libublsettings-gtk3.h b/source/libublsettings-gtk3.h index 5356bf6..ae52e22 100644 --- a/source/libublsettings-gtk3.h +++ b/source/libublsettings-gtk3.h @@ -7,7 +7,7 @@ #ifdef __GTK_H__ -#ifndef VTE_DISABLE +#ifdef VTE_INCLUDE #include /** * void yon_terminal_integrated_launch(GtkWidget *place_to_show, void *endwork_function, void* endwork_function_argument) @@ -384,7 +384,7 @@ void _yon_ubl_header_setup_resource(GtkWidget *Overlay, GtkWidget *Head, GtkWidg */ void yon_ubl_setup_sockets(GtkWidget *main_window, GtkWidget *left_window, GtkWidget *right_window, int socket_main_id, int socket_left_id, int socket_right_id); -#ifndef WEBKIT_DISABLE +#ifdef WEBKIT_INCLUDE #include /**yon_ubl_browser_window_open(char *link, char *browser_window_name) -- 2.35.1 From fa126d501c1468c72a00bbae883ceccb45dc5cbc Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Fri, 22 Dec 2023 12:17:40 +0600 Subject: [PATCH 2/2] Fixed bug, causing additional windows saving errors --- source/libublsettings-gtk3.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/libublsettings-gtk3.c b/source/libublsettings-gtk3.c index 69e3d0a..eb592b4 100644 --- a/source/libublsettings-gtk3.c +++ b/source/libublsettings-gtk3.c @@ -358,7 +358,7 @@ void yon_terminal_integrated_start(GtkWidget *terminal, char* command, void *end } } - void yon_on_window_config_custom_window_destroy(GtkWindow *window, char *window_name){ + void yon_on_window_config_custom_window_destroy(GtkWindow *window, GdkEvent* event, char *window_name){ if (!gtk_window_is_maximized(window)){ int height=0; int width=0; -- 2.35.1