diff --git a/source/ubl-settings-usergroups.c b/source/ubl-settings-usergroups.c index 2c71d36..fbc3007 100644 --- a/source/ubl-settings-usergroups.c +++ b/source/ubl-settings-usergroups.c @@ -718,14 +718,14 @@ yon_confirmation_window *yon_delete_confirmation_new(){ void yon_system_delete_confirmation_open(main_window *widgets){ yon_confirmation_window *window = yon_delete_confirmation_new(); gtk_window_set_transient_for(GTK_WINDOW(window->Window),GTK_WINDOW(widgets->Window)); - GtkTreeIter iter,itar; + GtkTreeIter iter; dictionary *dict = NULL; yon_dictionary_add_or_create_if_exists_with_data(dict,"widgets",widgets); yon_dictionary_add_or_create_if_exists_with_data(dict,"window",window); g_signal_connect(G_OBJECT(window->AcceptButton),"clicked",G_CALLBACK(yon_delete_confirmation_save),dict); GtkTreeModel *model = GTK_TREE_MODEL(widgets->liststore1); if (gtk_tree_selection_get_selected(gtk_tree_view_get_selection(GTK_TREE_VIEW(widgets->SystemTree)),&model,&iter)){ - gtk_tree_model_get(model,&iter,1,,2,,) + // gtk_tree_model_get(model,&iter,1,,2,,) } } @@ -2844,16 +2844,16 @@ void on_main_delete(GtkWidget *, main_window *widgets){ if (gtk_tree_selection_get_selected(gtk_tree_view_get_selection(GTK_TREE_VIEW(widgets->SystemTree)),&model,&iter)){ char *target; gtk_tree_model_get(model,&iter,2,&target,-1); - dialog_confirmation_data *data = malloc(sizeof(dialog_confirmation_data)); + dialog_confirmation_data data; int found = !!config(USERADD(target)); if (found){ - data->action_text = SYSTEM_USER_CONFIG_REMOVE_CONFIRMATION_LABEL(target); - data->function=NULL; - data->data=NULL; + data.action_text = SYSTEM_USER_CONFIG_REMOVE_CONFIRMATION_LABEL(target); + data.function=NULL; + data.data=NULL; } else { - data->action_text = SYSTEM_USER_SYSTEM_REMOVE_CONFIRMATION_LABEL(target); - data->function=NULL; - data->data=NULL; + data.action_text = SYSTEM_USER_SYSTEM_REMOVE_CONFIRMATION_LABEL(target); + data.function=NULL; + data.data=NULL; } if (yon_confirmation_dialog_call(widgets->Window,&data)!=GTK_RESPONSE_ACCEPT){ diff --git a/source/ubl-settings-usergroups.h b/source/ubl-settings-usergroups.h index 3090a96..f38b727 100644 --- a/source/ubl-settings-usergroups.h +++ b/source/ubl-settings-usergroups.h @@ -419,6 +419,8 @@ void yon_delete_confirmation_save(GtkWidget *self, dictionary *dict); void yon_group_delete_confirmation_save(GtkWidget *self, dictionary *dict); int yon_check_password_blocked(char *password); yon_confirmation_window *yon_delete_confirmation_new(); + +void yon_system_delete_confirmation_open(main_window *widgets); void yon_delete_confirmation_open(main_window *widgets); void yon_group_delete_confirmation_open(main_window *widgets); yon_savasettings_window *yon_saving_settings_new();