Merge pull request 'master' (#90) from YanTheKaller/libublsettingsui-gtk3:master into master

Reviewed-on: #90
master v1.80
Dmitry Razumov 2 weeks ago
commit 45ba2dfa82

@ -40,7 +40,7 @@ void on_file_chooser_selected(GtkWidget *self, filechooser_window *window){
for (int i=0;i<g_slist_length(list);i++){
char *data = (char*)g_slist_nth_data(list,i);
if (action == GTK_FILE_CHOOSER_ACTION_SAVE){
if (yon_file_is_directory(data)){
if (!access(data,F_OK)&&yon_file_is_directory(data)){
char *temp = yon_char_unite(data,"/",gtk_file_chooser_get_current_name(GTK_FILE_CHOOSER(window->MainFileChooser)),NULL);
data = temp;
}
@ -49,7 +49,7 @@ void on_file_chooser_selected(GtkWidget *self, filechooser_window *window){
if ((action == GTK_FILE_CHOOSER_ACTION_CREATE_FOLDER&&success_size==0) ||
(action == GTK_FILE_CHOOSER_ACTION_OPEN&&gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(window->ChooseFolderCheck))&&yon_file_is_directory(data)) ||
(action == GTK_FILE_CHOOSER_ACTION_OPEN&&!gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(window->ChooseFolderCheck))&&!yon_file_is_directory(data)) ||
(action == GTK_FILE_CHOOSER_ACTION_SAVE&&!yon_file_is_directory(data)) ||
(action == GTK_FILE_CHOOSER_ACTION_SAVE&&(!yon_file_is_directory(data)||access(data,F_OK))) ||
(action == GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER&&yon_file_is_directory(data))
){
// gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(window->MainFileChooser),g_path_get_basename(data));

@ -523,7 +523,7 @@ config_str arg_target;
void on_root_access(GtkWidget *, GtkWidget *window){
if (getuid()){
char *argline = template_app_information.app_tech_name;
char *argline = arg_target[0];
for (int i=1;i<arg_size;i++){
if (yon_char_check_begins_with(arg_target[i],"--socket-id")||yon_char_check_begins_with(arg_target[i],"--socket-ext-id")||yon_char_check_begins_with(arg_target[i],"--socket-trd-id")){ i++;
continue;
@ -539,6 +539,7 @@ void on_root_access(GtkWidget *, GtkWidget *window){
pthread_t thread_id;
pthread_create(&thread_id, NULL, (void *)on_root_get_root,argline);
gtk_widget_destroy(window);
exit(0);
}
}
}

Loading…
Cancel
Save