From b5062f56abadd05d62c6cefd55e1402bbfe5960e Mon Sep 17 00:00:00 2001
From: Ivan Yarcev <yarcev.id@ublinux.ru>
Date: Fri, 23 Jun 2023 16:49:00 +0600
Subject: [PATCH] Fixes:

---
 source/ubl-settings-services.c |  1 -
 source/ubl-utils.c             | 13 +++++++++++--
 source/ubl-utils.h             |  2 ++
 ubl-settings-services.css      |  4 ++++
 ubl-settings-services.desktop  |  6 +++---
 5 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/source/ubl-settings-services.c b/source/ubl-settings-services.c
index 1ac46e5..e9d477f 100644
--- a/source/ubl-settings-services.c
+++ b/source/ubl-settings-services.c
@@ -277,7 +277,6 @@ int main(int argc, char *argv[]){
             exit(0);
             }
     }
-
     if (getuid()!=0){
         main_config.lock_load_global=1;
         main_config.lock_save_global=1;
diff --git a/source/ubl-utils.c b/source/ubl-utils.c
index 6c652a4..486baec 100644
--- a/source/ubl-utils.c
+++ b/source/ubl-utils.c
@@ -733,9 +733,18 @@ int yon_ubl_check_root(){
 }
 
 char *yon_ubl_root_user_get(){
+    char *user=NULL;
     if (yon_ubl_check_root()){
-        char *user=getenv("SUDO_USER");
-        return user;
+        user=getenv("SUDO_USER");
+        if (user&&strcmp(user,"")!=0){
+            return user;
+        }else {
+            FILE *file = popen("getent passwd $PKEXEC_UID | cut -d: -f1","r");
+            user=g_malloc0(4096);
+            fgets(user,4096,file);
+            user=yon_char_divide_search(user,"\n",-1);
+            if (user) return user;
+        }
     }
     return getlogin();
 }
diff --git a/source/ubl-utils.h b/source/ubl-utils.h
index 8bc463d..08b786b 100644
--- a/source/ubl-utils.h
+++ b/source/ubl-utils.h
@@ -12,6 +12,8 @@
 #include <locale.h>
 #include <gtk/gtk.h>
 #include <gtk/gtkx.h>
+#include <fcntl.h>
+#include <sys/types.h>
 
 #include "ubl-cmake.h"
 #ifdef WEBKIT_FOUND
diff --git a/ubl-settings-services.css b/ubl-settings-services.css
index 9ede665..11cb18d 100644
--- a/ubl-settings-services.css
+++ b/ubl-settings-services.css
@@ -127,4 +127,8 @@ background:transparent;
 	border-left:inherit;
 	padding-left: 4px;
 	/* border-top:inherit; */ 
+}
+
+.colortest{
+	-gtk-icon-palette:name @theme_base_color;
 }
\ No newline at end of file
diff --git a/ubl-settings-services.desktop b/ubl-settings-services.desktop
index f7d9fb6..8aa30d5 100644
--- a/ubl-settings-services.desktop
+++ b/ubl-settings-services.desktop
@@ -1,11 +1,11 @@
 [Desktop Entry]
 Encoding=UTF-8
 Name=ubl-settings-services
-Name[ru]=TEMPLATE
+Name[ru]=Службы и процессы systemd
 GenericName=ubl-settings-services
-GenericName[ru]=TEMPLATE
+GenericName[ru]=Службы и процессы systemd
 Comment=ubl-settings-services
-Comment[ru]=Приложение для TEMPLATE
+Comment[ru]=Настройка работы служб и процессов системы
 Type=Application
 Exec=pkexec ubl-settings-services
 Icon=com.ublinux.ubl-settings-services