[opengaim-changes] opengaim/src account.c,1.1.1.10,1.2

[Todd V. <tvi...@us...>]

Update of /cvsroot/opengaim/opengaim/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4929

Modified Files:
	account.c 
Log Message:
Pull in rev 1.85 [thekingant] from Gaim:

Fix http://sourceforge.net/tracker/index.php?func=detail&aid=932986&group_id=235&atid=100235
"Change Password Crash" (when leaving a field empty)


Index: account.c
===================================================================
RCS file: /cvsroot/opengaim/opengaim/src/account.c,v
retrieving revision 1.1.1.10
retrieving revision 1.2
diff -C2 -d -r1.1.1.10 -r1.2
*** account.c	2 Apr 2004 14:05:58 -0000	1.1.1.10
--- account.c	14 Apr 2004 16:18:20 -0000	1.2
***************
*** 278,282 ****
  	}
  
! 	if (*orig_pass == '\0' || *new_pass_1 == '\0' || *new_pass_2 == '\0')
  	{
  		gaim_notify_error(NULL, NULL,
--- 278,283 ----
  	}
  
! 	if (orig_pass == NULL || new_pass_1 == NULL || new_pass_2 == NULL ||
! 		*orig_pass == '\0' || *new_pass_1 == '\0' || *new_pass_2 == '\0')
  	{
  		gaim_notify_error(NULL, NULL,
***************
*** 309,312 ****
--- 310,314 ----
  										  NULL, FALSE);
  	gaim_request_field_string_set_masked(field, TRUE);
+ 	gaim_request_field_set_required(field, TRUE);
  	gaim_request_field_group_add_field(group, field);
  
***************
*** 315,318 ****
--- 317,321 ----
  										  NULL, FALSE);
  	gaim_request_field_string_set_masked(field, TRUE);
+ 	gaim_request_field_set_required(field, TRUE);
  	gaim_request_field_group_add_field(group, field);
  
***************
*** 321,324 ****
--- 324,328 ----
  										  NULL, FALSE);
  	gaim_request_field_string_set_masked(field, TRUE);
+ 	gaim_request_field_set_required(field, TRUE);
  	gaim_request_field_group_add_field(group, field);