From: Nathan W. <fac...@us...> - 2003-03-22 18:13:52
|
Update of /cvsroot/gaim/gaim/src In directory sc8-pr-cvs1:/tmp/cvs-serv448/src Modified Files: buddy.c multi.c Log Message: oops, escaped characters do actually count ;-) Index: buddy.c =================================================================== RCS file: /cvsroot/gaim/gaim/src/buddy.c,v retrieving revision 1.459 retrieving revision 1.460 diff -u -d -r1.459 -r1.460 --- buddy.c 22 Mar 2003 16:43:41 -0000 1.459 +++ buddy.c 22 Mar 2003 18:13:48 -0000 1.460 @@ -903,10 +903,10 @@ while(*c && vis < 20) { if(*c == '&') inside = TRUE; + else if(*c == ';') + inside = FALSE; if(!inside) vis++; - if(*c == ';') - inside = FALSE; length++; c++; /* this is fun */ } Index: multi.c =================================================================== RCS file: /cvsroot/gaim/gaim/src/multi.c,v retrieving revision 1.180 retrieving revision 1.181 diff -u -d -r1.180 -r1.181 --- multi.c 19 Mar 2003 23:07:48 -0000 1.180 +++ multi.c 22 Mar 2003 18:13:49 -0000 1.181 @@ -864,7 +864,11 @@ static void proxy_dropdown_set(GObject *w, struct mod_account *ma) { int opt = GPOINTER_TO_INT(g_object_get_data(w, "proxytype")); - gtk_widget_set_sensitive(ma->proxy_host_box, (opt != PROXY_NONE && opt != PROXY_USE_GLOBAL)); + if(opt == PROXY_NONE || opt == PROXY_USE_GLOBAL) + gtk_widget_hide_all(ma->proxy_host_box); + else { + gtk_widget_show_all(ma->proxy_host_box); + } } static void generate_proxy_options(struct mod_account *ma, GtkWidget *box) { @@ -1031,7 +1035,8 @@ gtk_widget_show(entry); ma->proxypass_entry = entry; - gtk_widget_set_sensitive(vbox2, !(gpi == NULL || gpi->proxytype == PROXY_NONE)); + if(gpi == NULL || gpi->proxytype == PROXY_NONE) + gtk_widget_hide_all(vbox2); } static void show_acct_mod(struct gaim_account *a) |