From 038dcea2985425f3a0c7cb41e96e70f3f579e50b Mon Sep 17 00:00:00 2001 From: Ivan Dmitrievich Yartsev Date: Tue, 16 Dec 2025 09:25:17 +0000 Subject: [PATCH 1/2] Fixed packages update after DB update --- source/ubl-settings-video.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/source/ubl-settings-video.c b/source/ubl-settings-video.c index c7930d9..a4a1e23 100644 --- a/source/ubl-settings-video.c +++ b/source/ubl-settings-video.c @@ -582,18 +582,17 @@ void yon_set_sensitive_from_combo_box(GtkComboBox *toggle, GtkWidget *target){ } gboolean on_db_update_done(GtkWidget *,gint ,main_window *widgets){ + yon_packages_update(); yon_proprietary_get_thread(NULL,(main_window*)widgets); g_signal_handlers_disconnect_by_func(G_OBJECT(widgets->InstallTerminal),G_CALLBACK(on_db_update_done),widgets); return 0; } void on_database_update(void *,main_window *widgets){ - // terminal_window_struct *window = yon_terminal_window_launch(GTK_WINDOW(((main_window*)widgets)->Window),pacman_update_command,yon_char_get_localised_from_lib(SUCCESS_LABEL),OPERATION_FAIL_LABEL); yon_terminal_integrated_start_shell(widgets->InstallTerminal,yon_debug_output("%s\n",pacman_update_command),NULL,NULL); g_signal_connect(G_OBJECT(widgets->InstallTerminal),"child-exited",G_CALLBACK(on_db_update_done),widgets); gtk_button_clicked(GTK_BUTTON(widgets->MoreButton)); gtk_notebook_set_current_page(GTK_NOTEBOOK(widgets->MenusTab),1); - // g_signal_connect(G_OBJECT(window->window),"destroy",G_CALLBACK(yon_proprietary_get_thread),widgets); } void on_gapfix_changed(GtkWidget*, main_window *widgets){ -- 2.35.1 From aa0cfbe5ef1e5b2da1a16d01bdd58b8fe9cddd57 Mon Sep 17 00:00:00 2001 From: Ivan Dmitrievich Yartsev Date: Tue, 16 Dec 2025 10:32:00 +0000 Subject: [PATCH 2/2] Fixed thread widgets interacting --- source/ubl-settings-video.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/source/ubl-settings-video.c b/source/ubl-settings-video.c index a4a1e23..6b1048b 100644 --- a/source/ubl-settings-video.c +++ b/source/ubl-settings-video.c @@ -272,7 +272,7 @@ void yon_load_proceed(YON_CONFIG_TYPE type){ } void on_config_local_load(GtkWidget *self,main_window *){ - if (self){} + if (self){}; yon_load_proceed(YON_CONFIG_LOCAL); main_config.load_mode=1; yon_interface_update(); @@ -383,12 +383,12 @@ void yon_proprietary_local_get(main_window *widgets){ } } if (dr_desc==size-1) { - yon_proprietary_connect(widgets); + g_idle_add((GSourceFunc)yon_proprietary_connect,widgets); } } if (!size){ - yon_proprietary_connect(widgets); + g_idle_add((GSourceFunc)yon_proprietary_connect,widgets); } char *status_text = yon_char_unite(yon_char_get_localised_from_lib(SUCCESS_LABEL),". ", !getuid()? main_config.load_mode==1?yon_char_get_localised_from_lib(LOCAL_LOAD_SUCCESS_LABEL):yon_char_get_localised_from_lib(GLOBAL_LOAD_SUCCESS_LABEL):yon_char_get_localised_from_lib(ROOT_WARNING_LABEL),NULL); yon_ubl_status_box_render_thread(status_text,!getuid()?BACKGROUND_IMAGE_SUCCESS_TYPE:BACKGROUND_IMAGE_FAIL_TYPE); @@ -398,6 +398,7 @@ void yon_proprietary_local_get(main_window *widgets){ } void yon_proprietary_get_thread(GtkWidget *,main_window *widgets){ + printf("thread started\n"); yon_ubl_status_box_render(PROPRIETARY_LOADING_LABEL,BACKGROUND_IMAGE_INFO_TYPE); yon_proprietary_local_get(widgets); } @@ -892,9 +893,6 @@ template_main_window *yon_main_window_complete(main_window *widgets){ g_signal_connect(G_OBJECT(widgets->TerminalPaned),"notify::position",G_CALLBACK(on_paned_position_changed),widgets); g_signal_connect(G_OBJECT(widgets->TerminalPaned),"notify::max-position",G_CALLBACK(on_paned_position_changed),widgets); // g_signal_connect(G_OBJECT(widgets->InstallTerminal),"child-ready",G_CALLBACK(on_driver_child_ready),NULL); - char *path = yon_char_unite(yon_ubl_user_get_home_directory(),"/.config/",LocaleName,"/",LocaleName,".conf",NULL); - yon_window_config_load(path); - gtk_overlay_add_overlay(GTK_OVERLAY(widgets->MainOverlay),widgets->MainSpinner); g_object_set_data(G_OBJECT(widgets->InstallTerminal),"widgets",widgets); { -- 2.35.1