Merge pull request 'Build fix' (#97) from YanTheKaller/ubl-settings-bootloader:master into master

Reviewed-on: #97
pull/104/head v2.18
Dmitry Razumov 5 months ago
commit 0e97f8f57a

@ -2,7 +2,7 @@
void yon_password_change(GtkWidget *, GtkEntry *entry){ void yon_password_change(GtkWidget *, GtkEntry *entry){
GtkEntry *output_target = entry; GtkEntry *output_target = entry;
yon_password_window *window = yon_ubl_settings_usergroups_password_new(); yon_bootloader_password_window *window = yon_ubl_settings_usergroups_password_new();
dictionary *dict = NULL; dictionary *dict = NULL;
char *password = (char*)gtk_entry_get_text(output_target); char *password = (char*)gtk_entry_get_text(output_target);
if (!yon_char_is_empty(password)){ if (!yon_char_is_empty(password)){
@ -29,7 +29,7 @@ void yon_password_change(GtkWidget *, GtkEntry *entry){
} }
void on_password_accept(GtkWidget *self, dictionary *dict){ void on_password_accept(GtkWidget *self, dictionary *dict){
yon_password_window *window = yon_dictionary_get_data(dict->first,yon_password_window*); yon_bootloader_password_window *window = yon_dictionary_get_data(dict->first,yon_bootloader_password_window*);
GtkEntry *entry = yon_dictionary_get_data(dict->first->next,GtkEntry*); GtkEntry *entry = yon_dictionary_get_data(dict->first->next,GtkEntry*);
char *password = (char*)gtk_entry_get_text(GTK_ENTRY(window->PasswordEntry)); char *password = (char*)gtk_entry_get_text(GTK_ENTRY(window->PasswordEntry));
@ -71,8 +71,8 @@ void on_password_accept(GtkWidget *self, dictionary *dict){
on_subwindow_close(self); on_subwindow_close(self);
} }
yon_password_window *yon_ubl_settings_usergroups_password_new(){ yon_bootloader_password_window *yon_ubl_settings_usergroups_password_new(){
yon_password_window *window = malloc(sizeof(yon_password_window)); yon_bootloader_password_window *window = malloc(sizeof(yon_bootloader_password_window));
GtkBuilder *builder = gtk_builder_new_from_resource(glade_path_password); GtkBuilder *builder = gtk_builder_new_from_resource(glade_path_password);
window->Window=yon_gtk_builder_get_widget(builder,"MainWindow"); window->Window=yon_gtk_builder_get_widget(builder,"MainWindow");
window->StatusBox=yon_gtk_builder_get_widget(builder,"StatusBox"); window->StatusBox=yon_gtk_builder_get_widget(builder,"StatusBox");

@ -151,7 +151,7 @@ typedef struct {
GtkWidget *HashBox; GtkWidget *HashBox;
GtkWidget *PasswordBox; GtkWidget *PasswordBox;
GtkWidget *NoEncriptionCheck; GtkWidget *NoEncriptionCheck;
} yon_password_window; } yon_bootloader_password_window;
typedef struct { typedef struct {
GtkWidget *Window; GtkWidget *Window;
@ -213,7 +213,7 @@ void yon_main_window_complete(main_window *widgets);
//password //password
void yon_password_change(GtkWidget *, GtkEntry *entry); void yon_password_change(GtkWidget *, GtkEntry *entry);
void on_password_accept(GtkWidget *self, dictionary *dict); void on_password_accept(GtkWidget *self, dictionary *dict);
yon_password_window *yon_ubl_settings_usergroups_password_new(); yon_bootloader_password_window *yon_ubl_settings_usergroups_password_new();
int yon_check_password_blocked(char *password); int yon_check_password_blocked(char *password);
//user //user

Loading…
Cancel
Save