diff --git a/source/ubl-settings-services.c b/source/ubl-settings-services.c index cee948e..f9beddf 100644 --- a/source/ubl-settings-services.c +++ b/source/ubl-settings-services.c @@ -5,12 +5,11 @@ config main_config; //saving & loading void on_save_done(main_window *widgets, config_str output, int size){ - + if (widgets) {}; char *final_output = yon_char_parsed_to_string(output,size,""); printf("%s\n",final_output); free(final_output); yon_char_parsed_free(output,size); - on_config_update(NULL,widgets); switch (main_config.save_config){ case 0: 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&>k_notebook_get_current_page(GTK_NOTEBOOK(widgets->MainNotebook))==0){ 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); + } } 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); + } } } @@ -594,10 +599,16 @@ void yon_system_systemd_reexec(GtkWidget *self, main_window *widgets){ if (getuid()!=0&>k_notebook_get_current_page(GTK_NOTEBOOK(widgets->MainNotebook))==0){ if (system(reexec_systemd_root_command)){ 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 { if (system(reexec_systemd_user_command)){ 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_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[]){ diff --git a/source/ubl-settings-services.h b/source/ubl-settings-services.h index ed035bb..62429f2 100644 --- a/source/ubl-settings-services.h +++ b/source/ubl-settings-services.h @@ -402,4 +402,6 @@ gboolean on_source_user_filter(GtkTreeModel *model, GtkTreeIter *iter,void *data gboolean on_source_system_filter(GtkTreeModel *model, GtkTreeIter *iter,void *data); void on_root_get_root(char *argline); -void on_root_access(GtkWidget *self, main_window *widgets); \ No newline at end of file +void on_root_access(GtkWidget *self, main_window *widgets); + +void on_save_done(main_window *widgets, config_str output, int size); \ No newline at end of file diff --git a/source/ubl-strings.h b/source/ubl-strings.h index 6c0c1e8..971fb69 100644 --- a/source/ubl-strings.h +++ b/source/ubl-strings.h @@ -137,4 +137,7 @@ #define SYSTEMD_REEXEC_ERROR_LABEL _("Failed to re-execute 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") \ No newline at end of file diff --git a/ubl-settings-services.pot b/ubl-settings-services.pot index 1d49b50..04c881f 100644 --- a/ubl-settings-services.pot +++ b/ubl-settings-services.pot @@ -454,5 +454,13 @@ msgid "failed to relaunch systemd" msgstr "" #: 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" msgstr "" diff --git a/ubl-settings-services_ru.po b/ubl-settings-services_ru.po index 255aaf5..972937f 100644 --- a/ubl-settings-services_ru.po +++ b/ubl-settings-services_ru.po @@ -455,5 +455,13 @@ msgid "failed to relaunch systemd" msgstr "Ошибка перезапуска systemd" #: 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" msgstr "Сохранить"