Fixed building

pull/28/head
parent 0b02e4019e
commit 753d7c676c

@ -5,12 +5,11 @@ config main_config;
//saving & loading //saving & loading
void on_save_done(main_window *widgets, config_str output, int size){ void on_save_done(main_window *widgets, config_str output, int size){
if (widgets) {};
char *final_output = yon_char_parsed_to_string(output,size,""); char *final_output = yon_char_parsed_to_string(output,size,"");
printf("%s\n",final_output); printf("%s\n",final_output);
free(final_output); free(final_output);
yon_char_parsed_free(output,size); yon_char_parsed_free(output,size);
on_config_update(NULL,widgets);
switch (main_config.save_config){ switch (main_config.save_config){
case 0: case 0:
yon_ubl_status_box_render(GLOBAL_SAVE_SUCCESS_LABEL,BACKGROUND_IMAGE_SUCCESS_TYPE); yon_ubl_status_box_render(GLOBAL_SAVE_SUCCESS_LABEL,BACKGROUND_IMAGE_SUCCESS_TYPE);
@ -579,10 +578,16 @@ void yon_system_systemd_restart(GtkWidget *self, main_window *widgets){
if (getuid()!=0&&gtk_notebook_get_current_page(GTK_NOTEBOOK(widgets->MainNotebook))==0){ if (getuid()!=0&&gtk_notebook_get_current_page(GTK_NOTEBOOK(widgets->MainNotebook))==0){
if (system(reload_systemd_root_command)){ if (system(reload_systemd_root_command)){
yon_ubl_status_box_render(SYSTEMD_RELAUNCH_ERROR_LABEL,BACKGROUND_IMAGE_FAIL_TYPE); 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);
} }
} else { } else {
if (system(reload_systemd_user_command)){ if (system(reload_systemd_user_command)){
yon_ubl_status_box_render(SYSTEMD_RELAUNCH_ERROR_LABEL,BACKGROUND_IMAGE_FAIL_TYPE); 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);
} }
} }
} }
@ -594,10 +599,16 @@ void yon_system_systemd_reexec(GtkWidget *self, main_window *widgets){
if (getuid()!=0&&gtk_notebook_get_current_page(GTK_NOTEBOOK(widgets->MainNotebook))==0){ if (getuid()!=0&&gtk_notebook_get_current_page(GTK_NOTEBOOK(widgets->MainNotebook))==0){
if (system(reexec_systemd_root_command)){ if (system(reexec_systemd_root_command)){
yon_ubl_status_box_render(SYSTEMD_REEXEC_ERROR_LABEL,BACKGROUND_IMAGE_FAIL_TYPE); yon_ubl_status_box_render(SYSTEMD_REEXEC_ERROR_LABEL,BACKGROUND_IMAGE_FAIL_TYPE);
} else {
yon_ubl_status_box_render(SYSTEMD_REEXEC_SUCCESS_LABEL,BACKGROUND_IMAGE_FAIL_TYPE);
} }
} else { } else {
if (system(reexec_systemd_user_command)){ if (system(reexec_systemd_user_command)){
yon_ubl_status_box_render(SYSTEMD_REEXEC_ERROR_LABEL,BACKGROUND_IMAGE_FAIL_TYPE); yon_ubl_status_box_render(SYSTEMD_REEXEC_ERROR_LABEL,BACKGROUND_IMAGE_FAIL_TYPE);
} else {
yon_ubl_status_box_render(SYSTEMD_REEXEC_SUCCESS_LABEL,BACKGROUND_IMAGE_FAIL_TYPE);
} }
} }
} }
@ -1607,7 +1618,7 @@ void yon_main_window_complete(main_window *widgets){
pthread_t tid; pthread_t tid;
pthread_create(&tid,NULL,(void*)(void*)((yon_interface_update)),widgets); pthread_create(&tid,NULL,(void*)(void*)((yon_interface_update)),widgets);
} }
yon_save_window_set_postsave_function(on_save_done) yon_save_window_set_postsave_function(on_save_done,widgets);
} }
int main(int argc, char *argv[]){ int main(int argc, char *argv[]){

@ -403,3 +403,5 @@ gboolean on_source_system_filter(GtkTreeModel *model, GtkTreeIter *iter,void *da
void on_root_get_root(char *argline); void on_root_get_root(char *argline);
void on_root_access(GtkWidget *self, main_window *widgets); void on_root_access(GtkWidget *self, main_window *widgets);
void on_save_done(main_window *widgets, config_str output, int size);

@ -137,4 +137,7 @@
#define SYSTEMD_REEXEC_ERROR_LABEL _("Failed to re-execute systemd") #define SYSTEMD_REEXEC_ERROR_LABEL _("Failed to re-execute systemd")
#define SYSTEMD_RELAUNCH_ERROR_LABEL _("failed to relaunch systemd") #define SYSTEMD_RELAUNCH_ERROR_LABEL _("failed to relaunch systemd")
#define SYSTEMD_REEXEC_SUCCESS_LABEL _("Systemd has been re-executed")
#define SYSTEMD_RELAUNCH_SUCCESS_LABEL _("Systemd has been relaunched")
#define SAVE_LABEL _("Save") #define SAVE_LABEL _("Save")

@ -454,5 +454,13 @@ msgid "failed to relaunch systemd"
msgstr "" msgstr ""
#: source/ubl-strings.h:140 #: source/ubl-strings.h:140
msgid "Systemd has been re-executed"
msgstr ""
#: source/ubl-strings.h:141
msgid "Systemd has been relaunched"
msgstr ""
#: source/ubl-strings.h:143
msgid "Save" msgid "Save"
msgstr "" msgstr ""

@ -455,5 +455,13 @@ msgid "failed to relaunch systemd"
msgstr "Ошибка перезапуска systemd" msgstr "Ошибка перезапуска systemd"
#: source/ubl-strings.h:140 #: source/ubl-strings.h:140
msgid "Systemd has been re-executed"
msgstr "Systemd был успешно перезапущен"
#: source/ubl-strings.h:141
msgid "Systemd has been relaunched"
msgstr "Systemd был успешно перезагружен"
#: source/ubl-strings.h:143
msgid "Save" msgid "Save"
msgstr "Сохранить" msgstr "Сохранить"

Loading…
Cancel
Save