Applications
/
libublsettingsui-gtk3
10
0
Fork 1
Code Issues 2 Pull Requests Packages Projects Releases Wiki Activity

Fixes

Browse Source
pull/38/head
Ivan Dmitrievich Yartsev 9 months ago
parent 82b83d13f1
commit 74ef1b8272
2 changed files with 28 additions and 25 deletions
Show Stats Download Patch File Download Diff File

16
source/libublsettingsui-gtk3-save.c
Unescape View File

@ -413,13 +413,15 @@ void yon_save_window_loaded_config_init(template_saving_window *window, struct l
GtkTreeIter iter; GtkTreeIter iter;
if (status==0||status==-2) status = 0; if (status==0||status==-2) status = 0;
else status=1; else status=1;
if (strstr(current->data,"&")) {current->data = yon_char_replace(current->data,"&","\003");current->data = yon_char_replace(current->data,"\003","&");} char *old_val = yon_char_new(current->data);
if (strstr(current->data,">")) current->data = yon_char_replace(current->data,">","<"); char *new_val = yon_char_new(dict->data);
if (strstr(current->data,"<")) current->data = yon_char_replace(current->data,"<","&gt;"); if (strstr(old_val,"&")) {old_val = yon_char_replace(old_val,"&","\003");old_val = yon_char_replace(old_val,"\003","&amp;");}
if (strstr(dict->data,"&")) {dict->data = yon_char_replace(dict->data,"&","\003");dict->data = yon_char_replace(dict->data,"\003","&amp;");} if (strstr(old_val,">")) old_val = yon_char_replace(old_val,">","&lt;");
if (strstr(dict->data,">")) dict->data = yon_char_replace(dict->data,">","&lt;"); if (strstr(old_val,"<")) old_val = yon_char_replace(old_val,"<","&gt;");
if (strstr(dict->data,"<")) dict->data = yon_char_replace(dict->data,"<","&gt;"); if (strstr(new_val,"&")) {new_val = yon_char_replace(new_val,"&","\003");new_val = yon_char_replace(new_val,"\003","&amp;");}
char *compare_string = yon_char_unite("<s>",(char*)dict->data,"</s>\n",(char*)current->data,NULL); if (strstr(new_val,">")) new_val = yon_char_replace(new_val,">","&lt;");
if (strstr(new_val,"<")) new_val = yon_char_replace(new_val,"<","&gt;");
char *compare_string = yon_char_unite("<s>",(char*)new_val,"</s>\n",(char*)old_val,NULL);
gtk_list_store_append(window->list,&iter); gtk_list_store_append(window->list,&iter);
gtk_list_store_set(window->list,&iter,0,status,1,current->key,2,(char*)dict->data,3,(char*)current->data,4,compare_string,6,1,7,yon_config_get_section_for_key(current->key),-1); gtk_list_store_set(window->list,&iter,0,status,1,current->key,2,(char*)dict->data,3,(char*)current->data,4,compare_string,6,1,7,yon_config_get_section_for_key(current->key),-1);
free(compare_string); free(compare_string);

37
source/libublsettingsui-gtk3.c
Unescape View File

@ -566,27 +566,30 @@ char *yon_gtk_entry_check_restricted(GtkEntry *target){
GtkInputPurpose purpose = gtk_entry_get_input_purpose(target); GtkInputPurpose purpose = gtk_entry_get_input_purpose(target);
const char *text = gtk_entry_get_text(target); const char *text = gtk_entry_get_text(target);
char *error=NULL; char *error=NULL;
switch(purpose){ if (!yon_char_is_empty(text)){
case GTK_INPUT_PURPOSE_EMAIL:{ switch(purpose){
char *temp = NULL; case GTK_INPUT_PURPOSE_EMAIL:{
if (!((temp = strstr(text,"@"))&& char *temp = NULL;
strstr(temp,".")&& if (!((temp = strstr(text,"@"))&&
strlen(temp)!=strlen(text)&& strstr(temp,".")&&
temp[1]!='.'&& strlen(temp)!=strlen(text)&&
strstr(temp,".")[1]!='\0')){ temp[1]!='.'&&
error = yon_char_get_localised_from_lib(EMAIL_INVALID_LABEL); strstr(temp,".")[1]!='\0')){
error = yon_char_get_localised_from_lib(EMAIL_INVALID_LABEL);
}
} }
} break;
break; case GTK_INPUT_PURPOSE_URL:{
case GTK_INPUT_PURPOSE_URL:{ if (!strstr(text,"/")){
if (!strstr(text,"/")){ error = yon_char_get_localised_from_lib(PATH_INVALID_LABEL);
error = yon_char_get_localised_from_lib(PATH_INVALID_LABEL); }
} }
break;
default: break;
} }
break;
default: break;
} }
return error; return error;
} }
void yon_entry_set_entry_type(GtkEntry *target,GtkBox *status){ void yon_entry_set_entry_type(GtkEntry *target,GtkBox *status){
@ -604,7 +607,5 @@ void yon_entry_set_entry_type(GtkEntry *target,GtkBox *status){
break; break;
default: break; default: break;
} }
} }
Write Preview
Loading…
Cancel
Save