pull/1/head
parent 66071c44cf
commit b5062f56ab

@ -277,7 +277,6 @@ int main(int argc, char *argv[]){
exit(0); exit(0);
} }
} }
if (getuid()!=0){ if (getuid()!=0){
main_config.lock_load_global=1; main_config.lock_load_global=1;
main_config.lock_save_global=1; main_config.lock_save_global=1;

@ -733,9 +733,18 @@ int yon_ubl_check_root(){
} }
char *yon_ubl_root_user_get(){ char *yon_ubl_root_user_get(){
char *user=NULL;
if (yon_ubl_check_root()){ if (yon_ubl_check_root()){
char *user=getenv("SUDO_USER"); user=getenv("SUDO_USER");
return 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(); return getlogin();
} }

@ -12,6 +12,8 @@
#include <locale.h> #include <locale.h>
#include <gtk/gtk.h> #include <gtk/gtk.h>
#include <gtk/gtkx.h> #include <gtk/gtkx.h>
#include <fcntl.h>
#include <sys/types.h>
#include "ubl-cmake.h" #include "ubl-cmake.h"
#ifdef WEBKIT_FOUND #ifdef WEBKIT_FOUND

@ -127,4 +127,8 @@ background:transparent;
border-left:inherit; border-left:inherit;
padding-left: 4px; padding-left: 4px;
/* border-top:inherit; */ /* border-top:inherit; */
}
.colortest{
-gtk-icon-palette:name @theme_base_color;
} }

@ -1,11 +1,11 @@
[Desktop Entry] [Desktop Entry]
Encoding=UTF-8 Encoding=UTF-8
Name=ubl-settings-services Name=ubl-settings-services
Name[ru]=TEMPLATE Name[ru]=Службы и процессы systemd
GenericName=ubl-settings-services GenericName=ubl-settings-services
GenericName[ru]=TEMPLATE GenericName[ru]=Службы и процессы systemd
Comment=ubl-settings-services Comment=ubl-settings-services
Comment[ru]=Приложение для TEMPLATE Comment[ru]=Настройка работы служб и процессов системы
Type=Application Type=Application
Exec=pkexec ubl-settings-services Exec=pkexec ubl-settings-services
Icon=com.ublinux.ubl-settings-services Icon=com.ublinux.ubl-settings-services

Loading…
Cancel
Save