[gq-commit] gq/src util.c,1.60,1.61

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

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

Modified Files:
	util.c 
Log Message:
* Got rid of global struct gq_config object - use pointer now
* Added more positional arguments to i18n'd strings


Index: util.c
===================================================================
RCS file: /cvsroot/gqclient/gq/src/util.c,v
retrieving revision 1.60
retrieving revision 1.61
diff -C2 -d -r1.60 -r1.61
*** util.c	2 Oct 2003 16:16:26 -0000	1.60
--- util.c	4 Oct 2003 10:12:27 -0000	1.61
***************
*** 357,361 ****
       } else {
  	  snprintf(message, sizeof(message),
! 		   _("connecting to %s port %d"), 
  		   server->ldaphost, server->ldapport);
       }
--- 357,361 ----
       } else {
  	  snprintf(message, sizeof(message),
! 		   _("connecting to %1$s port %2$d"), 
  		   server->ldaphost, server->ldapport);
       }
***************
*** 780,784 ****
  	  return(NULL);
  
!      server = config.ldapservers;
       while(server) {
  	  if(!strcmp(server->name, name))
--- 780,784 ----
  	  return(NULL);
  
!      server = config->ldapservers;
       while(server) {
  	  if(!strcmp(server->name, name))
***************
*** 1192,1196 ****
  
       template = NULL;
!      templatelist = config.templates;
       while(templatelist) {
  	  template = (struct gq_template *) templatelist->data;
--- 1192,1196 ----
  
       template = NULL;
!      templatelist = config->templates;
       while(templatelist) {
  	  template = (struct gq_template *) templatelist->data;
***************
*** 1582,1586 ****
       
       snprintf(message, sizeof(message),
! 	      ngettext("One suffix found", "%d suffixes found", num_suffixes),
  	      num_suffixes);
       statusbar_msg(message);
--- 1582,1587 ----
       
       snprintf(message, sizeof(message),
! 	      ngettext("One suffix found", "%d suffixes found",
! 		       num_suffixes),
  	      num_suffixes);
       statusbar_msg(message);