From 061302159d3d77048480da447b4aae9bf5b705dd Mon Sep 17 00:00:00 2001
From: YanTheKaller <yarcev.id@ublinux.ru>
Date: Mon, 8 Apr 2024 07:42:58 +0000
Subject: [PATCH] Changed systemd relaunch and re-exec status message
 background, changed sensitivity logics for relaunch and re-execute buttons on
 both tabs

---
 source/ubl-settings-services.c | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/source/ubl-settings-services.c b/source/ubl-settings-services.c
index 2b397b4..a38bc4d 100644
--- a/source/ubl-settings-services.c
+++ b/source/ubl-settings-services.c
@@ -580,14 +580,14 @@ void yon_system_systemd_restart(GtkWidget *self, main_window *widgets){
             if (system(reload_systemd_root_command)){
                 yon_ubl_status_box_render(SYSTEMD_RELAUNCH_ERROR_LABEL,BACKGROUND_IMAGE_FAIL_TYPE);
             } else {
-                yon_ubl_status_box_render(SYSTEMD_RELAUNCH_SUCCESS_LABEL,BACKGROUND_IMAGE_FAIL_TYPE);
+                yon_ubl_status_box_render(SYSTEMD_RELAUNCH_SUCCESS_LABEL,BACKGROUND_IMAGE_SUCCESS_TYPE);
 
             }
         } else {
             if (system(reload_systemd_user_command)){
                 yon_ubl_status_box_render(SYSTEMD_RELAUNCH_ERROR_LABEL,BACKGROUND_IMAGE_FAIL_TYPE);
             } else {
-                yon_ubl_status_box_render(SYSTEMD_RELAUNCH_SUCCESS_LABEL,BACKGROUND_IMAGE_FAIL_TYPE);
+                yon_ubl_status_box_render(SYSTEMD_RELAUNCH_SUCCESS_LABEL,BACKGROUND_IMAGE_SUCCESS_TYPE);
 
             }
         }
@@ -1285,6 +1285,8 @@ void config_init(){
     main_config.lock_save_local=0; 
     main_config.load_mode=1;
     main_config.update_thread_active=0;
+    main_config.launch_arguments=NULL;
+    main_config.launch_size=0;
 }
 
 void on_tree_selection_changed(GtkWidget *self, main_window *widgets){
@@ -1358,8 +1360,8 @@ void on_root_access(GtkWidget *self, main_window *widgets){
     if (getuid()){
         char *argline = LocaleName;
         for (int i=1;i<main_config.launch_size;i++){
-            char *temp = yon_char_unite(argline," -a ",main_config.launch_arguments[i],NULL);
-            if(strcmp(argline,""))
+            char *temp = yon_char_unite(argline,main_config.launch_arguments[i],NULL);
+            if(strcmp(argline,"")&&strcmp(argline,LocaleName))
                 free(argline);
             argline=temp;
         }
@@ -1530,6 +1532,8 @@ void yon_main_window_complete(main_window *widgets){
     g_signal_connect(G_OBJECT(widgets->UserConfigAutostopCell),"toggled",G_CALLBACK(on_config_autostop_clicked),widgets);
     g_signal_connect(G_OBJECT(widgets->UserConfigBlockCell),"toggled",G_CALLBACK(on_config_block_clicked),widgets);
     if (getuid()==0){
+        gtk_widget_set_sensitive(widgets->UserUpdateButton,0);
+        gtk_widget_set_sensitive(widgets->UserPrevButton,0);
         g_signal_connect(G_OBJECT(widgets->SystemAutostartCell),"toggled",G_CALLBACK(on_system_autostart_clicked),widgets);
         g_signal_connect(G_OBJECT(widgets->SystemLaunchedCell),"toggled",G_CALLBACK(on_system_launch_clicked),widgets);
 
@@ -1537,9 +1541,7 @@ void yon_main_window_complete(main_window *widgets){
         g_signal_connect(G_OBJECT(widgets->UserSystemLaunchedCell),"toggled",G_CALLBACK(on_system_launch_clicked),widgets);
     } else {
         gtk_widget_set_sensitive(widgets->SystemUpdateButton,0);
-        gtk_widget_set_sensitive(widgets->UserUpdateButton,0);
         gtk_widget_set_sensitive(widgets->SystemPrevButton,0);
-        gtk_widget_set_sensitive(widgets->UserPrevButton,0);
     }
     yon_gtk_tree_view_minimal_fixed_size_set_full(GTK_TREE_VIEW(widgets->UserUnitsTree));
     yon_gtk_tree_view_minimal_fixed_size_set_full(GTK_TREE_VIEW(widgets->SystemUnitsTree));
@@ -1643,8 +1645,9 @@ int main(int argc, char *argv[]){
         yon_ubl_status_box_render(ROOT_WARNING_LABEL,BACKGROUND_IMAGE_FAIL_TYPE);
         textdomain(LocaleName);
     }
-    main_config.launch_arguments=argv;
+    main_config.launch_arguments=yon_char_parsed_copy(argv,argc);
     main_config.launch_size=argc;
+    yon_char_parsed_add_or_create_if_exists(main_config.launch_arguments,&main_config.launch_size,"--socket-id=gfasdfg");
     gtk_main();
     return 0;
 }
\ No newline at end of file