From f526c7a255236644a760d00f52069e1cad0ccde4 Mon Sep 17 00:00:00 2001
From: Ivan Yarcev <yarcev.id@ublinux.ru>
Date: Wed, 3 Apr 2024 14:42:29 +0600
Subject: [PATCH] Fixed command for user services loading in separate window;
 Added tooltip at config file editing

---
 Makefile                             |  2 +-
 source/ubl-settings-services.c       | 10 +++++-----
 source/ubl-settings-services.h       |  2 +-
 ubl-settings-services-terminal.glade |  2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Makefile b/Makefile
index 4c98d16..d8e7205 100644
--- a/Makefile
+++ b/Makefile
@@ -145,7 +145,7 @@ install: check uninstall
 	@if [ -z ${DESTDIR} ]; then \
 	    [ -d "${DESTDIR}/usr/share/icons/hicolor/" ] && gtk-update-icon-cache -fiq "${DESTDIR}/usr/share/icons/hicolor/" &>/dev/null || true; \
 	    update-desktop-database --quiet &>/dev/null || true; \
-	    [ -d "${DESTDIR}$/usr/share/applications" ] && touch "${DESTDIR}/usr/share/applications" &>/dev/null || true; \
+	    [ -d "${DESTDIR}/usr/share/applications" ] && touch "${DESTDIR}/usr/share/applications" &>/dev/null || true; \
 	fi
 	@echo "Install: OK"
 
diff --git a/source/ubl-settings-services.c b/source/ubl-settings-services.c
index a5d1aaa..7785791 100644
--- a/source/ubl-settings-services.c
+++ b/source/ubl-settings-services.c
@@ -1486,35 +1486,35 @@ void yon_main_window_complete(main_window *widgets){
     g_signal_connect(G_OBJECT(widgets->UserInactiveShowCheck),"toggled",G_CALLBACK(yon_gtk_widget_set_sensitive_from_toggle_button),widgets->UserUnloadedShowCheck);
     // g_signal_connect(G_OBJECT(widgets->SystemUnitsTree),"button-press-event",G_CALLBACK(on_context_menu_open),widgets);
     for (unsigned int i=0;i<g_list_length(list);i++){
-    g_signal_connect(G_OBJECT(g_list_nth_data(list,i)),"notify::width",G_CALLBACK(on_column_resize),widgets);
+    g_signal_connect_after(G_OBJECT(g_list_nth_data(list,i)),"notify::width",G_CALLBACK(on_column_resize),widgets);
         yon_window_config_add_listener(g_list_nth_data(list,i),yon_char_append("SystemUnitsColumn",yon_char_from_int(i)),"fixed-width",YON_TYPE_INT);
     }
     g_list_free(list);
     
     list = gtk_tree_view_get_columns(GTK_TREE_VIEW(widgets->UserUnitsTree));
     for (unsigned int i=0;i<g_list_length(list);i++){
-    g_signal_connect(G_OBJECT(g_list_nth_data(list,i)),"notify::width",G_CALLBACK(on_column_resize),widgets);
+    g_signal_connect_after(G_OBJECT(g_list_nth_data(list,i)),"notify::width",G_CALLBACK(on_column_resize),widgets);
         yon_window_config_add_listener(g_list_nth_data(list,i),yon_char_append("UserUnitsColumn",yon_char_from_int(i)),"fixed-width",YON_TYPE_INT);
     }
     g_list_free(list);
     
     list = gtk_tree_view_get_columns(GTK_TREE_VIEW(widgets->ConfigMainTree));
     for (unsigned int i=0;i<g_list_length(list);i++){
-    g_signal_connect(G_OBJECT(g_list_nth_data(list,i)),"notify::width",G_CALLBACK(on_column_resize),widgets);
+    g_signal_connect_after(G_OBJECT(g_list_nth_data(list,i)),"notify::width",G_CALLBACK(on_column_resize),widgets);
         yon_window_config_add_listener(g_list_nth_data(list,i),yon_char_append("ConfigUnitsColumn",yon_char_from_int(i)),"fixed-width",YON_TYPE_INT);
     }
     g_list_free(list);
     
     list = gtk_tree_view_get_columns(GTK_TREE_VIEW(widgets->SessionMainTree));
     for (unsigned int i=0;i<g_list_length(list);i++){
-    g_signal_connect(G_OBJECT(g_list_nth_data(list,i)),"notify::width",G_CALLBACK(on_column_resize),widgets);
+    g_signal_connect_after(G_OBJECT(g_list_nth_data(list,i)),"notify::width",G_CALLBACK(on_column_resize),widgets);
         yon_window_config_add_listener(g_list_nth_data(list,i),yon_char_append("SessionsUnitsColumn",yon_char_from_int(i)),"fixed-width",YON_TYPE_INT);
     }
     g_list_free(list);
     
     list = gtk_tree_view_get_columns(GTK_TREE_VIEW(widgets->TimersMainTree));
     for (unsigned int i=0;i<g_list_length(list);i++){
-    g_signal_connect(G_OBJECT(g_list_nth_data(list,i)),"notify::width",G_CALLBACK(on_column_resize),widgets);
+    g_signal_connect_after(G_OBJECT(g_list_nth_data(list,i)),"notify::width",G_CALLBACK(on_column_resize),widgets);
         yon_window_config_add_listener(g_list_nth_data(list,i),yon_char_append("TimersUnitsColumn",yon_char_from_int(i)),"fixed-width",YON_TYPE_INT);
     }
     g_list_free(list);
diff --git a/source/ubl-settings-services.h b/source/ubl-settings-services.h
index e017e9a..b88f75a 100644
--- a/source/ubl-settings-services.h
+++ b/source/ubl-settings-services.h
@@ -58,7 +58,7 @@
 #define get_config_files_command "find /etc/systemd -iname *.conf -exec du -sh --time {} \\;|sed -e 's/\t/;/g'"
 
 #define system_services_status_command "systemctl status --no-pager"
-#define user_services_status_command yon_char_unite("systemctl --user --machine=",yon_ubl_root_user_get()," status --no-pager",NULL)
+#define user_services_status_command yon_char_unite("systemctl --user --machine=",yon_ubl_root_user_get(),"@ status --no-pager",NULL)
 #define installed_units_states_command "systemctl list-unit-files --no-pager"
 #define list_of_units_states_command "systemctl list-units --all --no-pager"
 #define list_of_sockets_states_command "systemctl list-sockets --all --no-pager"
diff --git a/ubl-settings-services-terminal.glade b/ubl-settings-services-terminal.glade
index 44063f1..6ba40c4 100644
--- a/ubl-settings-services-terminal.glade
+++ b/ubl-settings-services-terminal.glade
@@ -81,7 +81,7 @@
                   <object class="GtkButton" id="SaveButton">
                     <property name="can-focus">True</property>
                     <property name="receives-default">True</property>
-                    <property name="tooltip-text" translatable="yes">Update</property>
+                    <property name="tooltip-text" translatable="yes">Save</property>
                     <property name="image">image2</property>
                     <style>
                       <class name="thin"/>