[gq-commit] gq/src schema.c,1.23,1.24

[<sta...@us...>]

Update of /cvsroot/gqclient/gq/src
In directory sc8-pr-cvs1:/tmp/cvs-serv13340

Modified Files:
	schema.c 
Log Message:
* Improved statusbar messages


Index: schema.c
===================================================================
RCS file: /cvsroot/gqclient/gq/src/schema.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** schema.c	17 Oct 2003 10:20:38 -0000	1.23
--- schema.c	20 Oct 2003 08:01:11 -0000	1.24
***************
*** 66,70 ****
  	  /* server didn't publish a schema, try the last resort
  	     schemaserver */
- 
  	  int ec = error_new_context(_("Using schema from last-resort schemaserver"));
  	  server = server_by_name(config->schemaserver);
--- 66,69 ----
***************
*** 86,89 ****
--- 85,91 ----
  			  _("Cannot obtain schema from last-resort schema server '%s'"),
  			  server->name);
+ 	  } else {
+ 	       statusbar_msg(_("Using schema from last-resort schema server '%s'"),
+ 			     server->name);
  	  }
       done:
***************
*** 127,131 ****
       ss = NULL;
       server->flags |= SERVER_HAS_NO_SCHEMA;
!      statusbar_msg(_("subschemaSubentry search on root DSE"));
       msg = ldap_search_s(ld, "", LDAP_SCOPE_BASE, "(objectclass=*)",
  			 subschemasubentry, 0, &res);
--- 129,134 ----
       ss = NULL;
       server->flags |= SERVER_HAS_NO_SCHEMA;
!      statusbar_msg(_("subschemaSubentry search on root DSE on server '%s'"),
! 		   server->name);
       msg = ldap_search_s(ld, "", LDAP_SCOPE_BASE, "(objectclass=*)",
  			 subschemasubentry, 0, &res);
***************
*** 141,145 ****
  
       if(res == NULL) {
! 	  statusbar_msg("%s", _("No schema information found"));
  	  close_connection(server, FALSE);
  	  return(NULL);
--- 144,149 ----
  
       if(res == NULL) {
! 	  statusbar_msg(_("No schema information found on server '%s'"),
! 			server->name);
  	  close_connection(server, FALSE);
  	  return(NULL);
***************
*** 162,171 ****
  
       if(subschema == NULL) {
! 	  statusbar_msg("%s", _("No schema information found"));
  	  close_connection(server, FALSE);
  	  return(NULL);
       }
  
!      statusbar_msg(_("Schema search on %s"), subschema);
  
       msg = ldap_search_s(ld, subschema, LDAP_SCOPE_BASE,
--- 166,177 ----
  
       if(subschema == NULL) {
! 	  statusbar_msg(_("No schema information found on server '%s'"),
! 			server->name);
  	  close_connection(server, FALSE);
  	  return(NULL);
       }
  
!      statusbar_msg(_("Schema search on '%1$s' on server '%2$s'"),
! 		   subschema, server->name);
  
       msg = ldap_search_s(ld, subschema, LDAP_SCOPE_BASE,
***************
*** 184,188 ****
  
       if(res == NULL) {
! 	  statusbar_msg("%s", _("No schema information found"));
  	  close_connection(server, FALSE);
  	  return(NULL);
--- 190,195 ----
  
       if(res == NULL) {
! 	  statusbar_msg(_("No schema information found on server '%s'"), 
! 			server->name);
  	  close_connection(server, FALSE);
  	  return(NULL);