From f7d5e5e39d0221c159b46b7dbf46a11710290756 Mon Sep 17 00:00:00 2001
From: Ivan Yarcev <yarcev.id@ublinux.ru>
Date: Mon, 22 Jul 2024 15:28:33 +0600
Subject: [PATCH] Removed pkexec from gparted command

---
 source/ubinstall-gtk.c | 28 +++++++++++++++++++++++++---
 source/ubinstall-gtk.h |  6 ++++--
 2 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/source/ubinstall-gtk.c b/source/ubinstall-gtk.c
index 8a89a13..1fd2ae6 100644
--- a/source/ubinstall-gtk.c
+++ b/source/ubinstall-gtk.c
@@ -79,7 +79,7 @@ void yon_load_proceed(YON_CONFIG_TYPE type){
 
 void yon_interface_update(main_window *widgets){
     if (widgets){};
-    // enum YON_PAGES page;
+    // enum YON_PAGES page=YON_PAGE_COMPLETED;
     // char *type = config(AUTOINSTALL_TYPE_INSTALL);
     // if (strcmp(type,"fast")){
     //    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widgets->InstallationRadio),1);
@@ -188,21 +188,41 @@ void yon_interface_update(main_window *widgets){
     //     default:{}break;
     // }
 
+    // GtkTreeIter iter;
+
     // char *zone = config(zone_parameter);
+    // char *region = NULL;
+    // if (!yon_char_is_empty(zone)) region = yon_char_divide_search(zone,"",-1); 
     // char *system_locale = config(locale_parameter);
     // char *language = config(lang_parameter);
+    // for_iter(widgets->LanguagesList,&iter){
+    //     char *cur=NULL;
+    //     gtk_tree_model_get(GTK_TREE_MODEL(widgets->LanguagesList),&iter,1,&cur,-1);
+    //     if (strstr(system_locale,cur)){
+    //         gtk_list_store_set(GTK_TREE_MODEL(widgets->LanguagesList),&iter,0,1,-1);
+    //     } else {
+    //         gtk_list_store_set(GTK_TREE_MODEL(widgets->LanguagesList),&iter,0,0,-1);
+    //     }
+    // }
+    // gtk_tree_model_filter_refilter(GTK_TREE_MODEL_FILTER(widgets->LanguagesFilter));
+    // gtk_combo_box_set_active_id(GTK_COMBO_BOX(widgets->RegionCombo),region);
+    // gtk_combo_box_set_active_id(GTK_COMBO_BOX(widgets->ZoneCombo),zone);
+    // gtk_combo_box_set_active_id(GTK_COMBO_BOX(widgets->LanguageCombo),language);
+
 
     // char *kbmodel = config (xkbmodel_parameter);
     // char *optinos = config(xkboptions_parameter);
     // char *layout = config(xkblayout_parameter);
 
+
+
     // char *user_name = config(user_name_parameter);
     // char *user_gecos = config(user_name_parameter);
     // char *user_password = config(user_name_parameter);
     // char *root_password = config(user_name_parameter);
     // char *autologin = config(user_name_parameter);
     // char *hostname = config(user_name_parameter);
-
+    
 }
 
 void on_config_local_load(GtkWidget *,main_window *);
@@ -716,7 +736,10 @@ void on_page_changed(GtkWidget *,GtkWidget *,int page, main_window *widgets){
             gtk_widget_set_sensitive(widgets->NextButton,1);
             gtk_widget_hide(widgets->SaveButton);
             break;
+
         case YON_PAGE_INSTALL_ERROR:
+            on_summary_log_view((GtkWidget*)NULL);
+        [[fallthrough]];
         case YON_PAGE_COMPLETION:{
             yon_switch_page_render(widgets,7);
             gtk_widget_set_sensitive(widgets->BackButton,0);
@@ -851,7 +874,6 @@ void on_process_log_view(GtkWidget *){
     gdk_threads_add_timeout(500,(GSourceFunc)yon_read_log,window);
 }
 
-void on_summary_log_view(GtkWidget *);
 void on_summary_log_view(GtkWidget *){
     log_window *window = yon_log_window_new();
     yon_gtk_window_setup(GTK_WINDOW(window->Window),NULL,LOG_VIEW_LABEL,icon_path,"log_viewer");
diff --git a/source/ubinstall-gtk.h b/source/ubinstall-gtk.h
index 6727f1b..7e3739e 100755
--- a/source/ubinstall-gtk.h
+++ b/source/ubinstall-gtk.h
@@ -117,7 +117,7 @@ NULL
 
 #define set_user_config_command(parameters) yon_char_unite("pkexec bash -c 'ubconfig --target system set [autoinstall] ",parameters,";nice ubinstall2 autoconfig'",NULL)
 
-#define open_gparted_command "pkexec gparted"
+#define open_gparted_command "gparted"
 
 #define AUTOINSTALL_TYPE_INSTALL_command "ubconfig --source global get autoinstall AUTOINSTALL[install_type]"
 #define AUTOINSTALL_DEVICE_command "ubconfig --source global get autoinstall AUTOINSTALL[device]"
@@ -421,4 +421,6 @@ void on_password_accept(GtkWidget *self, dictionary *dict);
 char* yon_debug_output(char *pattern,char*text);
 
 char *yon_save_command_prepare(char *command, char *target);
-void yon_interface_update(main_window *widgets);
\ No newline at end of file
+void yon_interface_update(main_window *widgets);
+
+void on_summary_log_view(GtkWidget *);
\ No newline at end of file