From 9f3919c96d1a98538012f5db98ef760d6afa2dbb Mon Sep 17 00:00:00 2001
From: Ivan Yarcev <yarcev.id@ublinux.ru>
Date: Thu, 1 Feb 2024 15:38:37 +0600
Subject: [PATCH] Added username to deletion confirmation window

---
 source/ubl-settings-usergroups.c           |  7 ++++---
 ubl-settings-usergroups-confirmation.glade | 13 +++++++++++++
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/source/ubl-settings-usergroups.c b/source/ubl-settings-usergroups.c
index d949f9c..7847db4 100644
--- a/source/ubl-settings-usergroups.c
+++ b/source/ubl-settings-usergroups.c
@@ -289,8 +289,8 @@ void yon_delete_confirmation_open(main_window *widgets){
 	}
 	int valid = gtk_tree_model_get_iter_first(GTK_TREE_MODEL(widgets->UsersList),&iter);
 	for (;valid;valid=gtk_tree_model_iter_next(GTK_TREE_MODEL(widgets->UsersList),&iter)){
-		char *name,*parameters,*homedir=NULL;
-		gtk_tree_model_get(GTK_TREE_MODEL(widgets->UsersList),&iter,2,&name,6,&parameters,-1);
+		char *name,*username,*parameters,*homedir=NULL;
+		gtk_tree_model_get(GTK_TREE_MODEL(widgets->UsersList),&iter,2,&name,3,&username,6,&parameters,-1);
 		int found = yon_char_parsed_check_exist(main_config.users,main_config.users_size,yon_char_append(name,":"));
 		
 		if (found>-1){
@@ -305,8 +305,9 @@ void yon_delete_confirmation_open(main_window *widgets){
 		int status=0;
 		if (homedir) status=1;
 		gtk_list_store_append(window->list,&itar);
-		gtk_list_store_set(window->list,&itar,0,yon_char_parsed_check_exist(chosen,chosen_size,name)>-1?1:0,1,name,2,homedir,3,0,4,status,-1);
+		gtk_list_store_set(window->list,&itar,0,yon_char_parsed_check_exist(chosen,chosen_size,name)>-1?1:0,1,name,2,homedir,3,0,4,status,5,username,-1);
 		free(name);
+		free(username);
 		free(parameters);
 		free(homedir);
 	}
diff --git a/ubl-settings-usergroups-confirmation.glade b/ubl-settings-usergroups-confirmation.glade
index 65e05e5..8e05972 100644
--- a/ubl-settings-usergroups-confirmation.glade
+++ b/ubl-settings-usergroups-confirmation.glade
@@ -25,6 +25,8 @@
       <column type="gboolean"/>
       <!-- column-name gboolean3 -->
       <column type="gboolean"/>
+      <!-- column-name gchararray3 -->
+      <column type="gchararray"/>
     </columns>
   </object>
   <object class="GtkWindow" id="Window">
@@ -138,6 +140,17 @@
                         </child>
                       </object>
                     </child>
+                    <child>
+                      <object class="GtkTreeViewColumn">
+                        <property name="title" translatable="yes">User name</property>
+                        <child>
+                          <object class="GtkCellRendererText"/>
+                          <attributes>
+                            <attribute name="text">5</attribute>
+                          </attributes>
+                        </child>
+                      </object>
+                    </child>
                     <child>
                       <object class="GtkTreeViewColumn">
                         <property name="title" translatable="yes">Home directory</property>