[gq-commit] gq/src browse-export.c,1.7,1.8 browse.c,1.103,1.104 dt_binary.c,1.17,1.18 dt_oc.c,1.21,1.22 dt_text.c,1.15,1.16 dt_time.c,1.12,1.13 dtutil.c,1.5,1.6 filter.c,1.28,1.29 formfill.c,1.46,1.47 gq-xml.c,1.14,1.15 input.c,1.88,1.89 ldif.c,1.19,1.20 prefs.c,1.58,1.59 state.c,1.13,1.14 syntax.c,1.21,1.22 template.c,1.16,1.17 tinput.c,1.45,1.46 xmlparse.c,1.8,1.9

[<he...@us...>]

Update of /cvsroot/gqclient/gq/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8756/src

Modified Files:
	browse-export.c browse.c dt_binary.c dt_oc.c dt_text.c 
	dt_time.c dtutil.c filter.c formfill.c gq-xml.c input.c ldif.c 
	prefs.c state.c syntax.c template.c tinput.c xmlparse.c 
Log Message:
2006-04-05  Sven Herzberg  <he...@gn...>

        * src/browse-export.c,
	* src/browse.c,
	* src/dt_binary.c,
	* src/dt_oc.c,
	* src/dt_text.c,
	* src/dt_time.c,
	* src/dtutil.c,
	* src/filter.c,
	* src/formfill.c,
	* src/gq-xml.c,
	* src/input.c,
	* src/ldif.c,
	* src/prefs.c,
	* src/state.c,
	* src/syntax.c,
	* src/template.c,
	* src/tinput.c,
	* src/xmlparse.c: fix warnings


Index: browse-export.c
===================================================================
RCS file: /cvsroot/gqclient/gq/src/browse-export.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** browse-export.c	7 Nov 2003 12:02:10 -0000	1.7
--- browse-export.c	5 Apr 2006 00:53:55 -0000	1.8
***************
*** 232,236 ****
  	  }
  
! 	  statusbar_msg(ngettext("One entry exported to %2$s",
  				 "%1$d entries exported to %2$s", num_entries),
  			num_entries, filename);
--- 232,236 ----
  	  }
  
! 	  statusbar_msg(ngettext("%1$d entry exported to %2$s",
  				 "%1$d entries exported to %2$s", num_entries),
  			num_entries, filename);

Index: browse.c
===================================================================
RCS file: /cvsroot/gqclient/gq/src/browse.c,v
retrieving revision 1.103
retrieving revision 1.104
diff -C2 -d -r1.103 -r1.104
*** browse.c	5 May 2005 04:48:17 -0000	1.103
--- browse.c	5 Apr 2006 00:53:55 -0000	1.104
***************
*** 361,365 ****
--- 361,369 ----
  {
       char **exploded_dn = NULL;
+ #if GTK_MAJOR >= 2
+      gchar const* label;
+ #else
       gchar* label;
+ #endif
       dn_browse_entry *new_entry;
       GQTreeWidgetNode *new_item, *added = NULL;

Index: dt_binary.c
===================================================================
RCS file: /cvsroot/gqclient/gq/src/dt_binary.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** dt_binary.c	3 Nov 2003 21:07:57 -0000	1.17
--- dt_binary.c	5 Apr 2006 00:53:55 -0000	1.18
***************
*** 263,267 ****
  
  	 if (*flags & DT_BINARY_HEX) {
! 	      encoded = dt_hex_encode(data->data, data->len);
  	 } else if (*flags & DT_BINARY_PLAIN) {
  	      /* check if data does NOT contain a NUL byte .... */
--- 263,267 ----
  
  	 if (*flags & DT_BINARY_HEX) {
! 	      encoded = dt_hex_encode((gchar*)data->data, data->len);
  	 } else if (*flags & DT_BINARY_PLAIN) {
  	      /* check if data does NOT contain a NUL byte .... */
***************
*** 276,280 ****
  	      }
  	      if (fail) {
! 		   encoded = dt_b64_encode(data->data, data->len);
  		   /* wrong encoding */
  		   *flags = (*flags & ~DT_BINARY_ENCODING_MASK) | DT_BINARY_BASE64;
--- 276,280 ----
  	      }
  	      if (fail) {
! 		   encoded = dt_b64_encode((gchar*)data->data, data->len);
  		   /* wrong encoding */
  		   *flags = (*flags & ~DT_BINARY_ENCODING_MASK) | DT_BINARY_BASE64;
***************
*** 288,292 ****
  	      }
  	 } else {
! 	      encoded = dt_b64_encode(data->data, data->len);
  	 }
  	 if (*flags & DT_BINARY_TEXT) {
--- 288,292 ----
  	      }
  	 } else {
! 	      encoded = dt_b64_encode((gchar*)data->data, data->len);
  	 }
  	 if (*flags & DT_BINARY_TEXT) {
***************
*** 297,304 ****
  	      gtk_text_forward_delete(text, gtk_text_get_length(text));
  	      gtk_text_insert(text, big_fixed, NULL, NULL,
! 			      encoded->data, encoded->len);
  	      gtk_text_thaw(text);
  	 } else if (*flags & DT_BINARY_ENTRY) {
! 	      gtk_entry_set_text(GTK_ENTRY(widget), encoded->data);
  	 }
  
--- 297,304 ----
  	      gtk_text_forward_delete(text, gtk_text_get_length(text));
  	      gtk_text_insert(text, big_fixed, NULL, NULL,
! 			      (gchar*)encoded->data, encoded->len);
  	      gtk_text_thaw(text);
  	 } else if (*flags & DT_BINARY_ENTRY) {
! 	      gtk_entry_set_text(GTK_ENTRY(widget), (gchar*)encoded->data);
  	 }
  
***************
*** 417,421 ****
       } else if (*flags & DT_BINARY_PLAIN) {
  	  copy = g_byte_array_new();
! 	  g_byte_array_append(copy, content, strlen(content));
       } else {
  	  copy = dt_b64_decode(content, strlen(content));
--- 417,421 ----
       } else if (*flags & DT_BINARY_PLAIN) {
  	  copy = g_byte_array_new();
! 	  g_byte_array_append(copy, (guchar*)content, strlen(content));
       } else {
  	  copy = dt_b64_decode(content, strlen(content));
***************
*** 481,485 ****
       gb = g_byte_array_new();
       if (!gb) return NULL;
!      g_byte_array_append(gb, b64->str, b64->len);
       g_string_free(b64, TRUE);
  
--- 481,485 ----
       gb = g_byte_array_new();
       if (!gb) return NULL;
!      g_byte_array_append(gb, (guchar*)b64->str, b64->len);
       g_string_free(b64, TRUE);
  
***************
*** 513,517 ****
  	       if (i > 0) {
  		    strcat(linebuf, "\n");
! 		    g_byte_array_append(gb, linebuf, strlen(linebuf));
  	       }
  	       sprintf(linebuf, "%06x:", i);  /* Flawfinder: ignore */
--- 513,517 ----
  	       if (i > 0) {
  		    strcat(linebuf, "\n");
! 		    g_byte_array_append(gb, (guchar*)linebuf, strlen(linebuf));
  	       }
  	       sprintf(linebuf, "%06x:", i);  /* Flawfinder: ignore */
***************
*** 521,525 ****
       }
  
!      g_byte_array_append(gb, linebuf, strlen(linebuf));
  
       return gb;
--- 521,525 ----
       }
  
!      g_byte_array_append(gb, (guchar*)linebuf, strlen(linebuf));
  
       return gb;

Index: dt_oc.c
===================================================================
RCS file: /cvsroot/gqclient/gq/src/dt_oc.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** dt_oc.c	3 Nov 2003 21:07:57 -0000	1.21
--- dt_oc.c	5 Apr 2006 00:53:55 -0000	1.22
***************
*** 240,244 ****
  			 GByteArray *gb = t->data;
  			 if (!gb) continue;
! 			 if (strncasecmp(gb->data, *cp, 
  					 MAX(gb->len, strlen(*cp))) == 0) {
  			      /* OK, found */
--- 240,244 ----
  			 GByteArray *gb = t->data;
  			 if (!gb) continue;
! 			 if (strncasecmp((gchar*)gb->data, *cp,
  					 MAX(gb->len, strlen(*cp))) == 0) {
  			      /* OK, found */
***************
*** 452,456 ****
  	  if (data) {
  	       octmp = g_malloc0( data->len + 1);
! 	       strncpy(octmp, data->data, data->len); /* UTF-8 OK */
  	  }
  	  oclist = ss->oc;
--- 452,456 ----
  	  if (data) {
  	       octmp = g_malloc0( data->len + 1);
! 	       strncpy(octmp, (gchar*)data->data, data->len); /* UTF-8 OK */
  	  }
  	  oclist = ss->oc;
***************
*** 546,553 ****
       if (ci->oldtext) g_free(ci->oldtext);
       if(data) {
! 	  gchar g = 0;
  
  	  GByteArray *encoded =
! 	       DT_ENTRY(form->dt_handler)->encode(data->data, data->len);
  	  /*  	printf("setting text '%s' orglen=%d len1=%d len2=%d\n", */
  	  /*  	       encoded->data, */
--- 546,553 ----
       if (ci->oldtext) g_free(ci->oldtext);
       if(data) {
! 	  guchar g = '\0';
  
  	  GByteArray *encoded =
! 	       DT_ENTRY(form->dt_handler)->encode((gchar*)data->data, data->len);
  	  /*  	printf("setting text '%s' orglen=%d len1=%d len2=%d\n", */
  	  /*  	       encoded->data, */
***************
*** 555,562 ****
  	  /*  	       encoded->len, strlen(encoded->data)); */
  	  gtk_entry_set_text(GTK_ENTRY(GTK_COMBO(widget)->entry),
! 			     encoded->data);
  	  g_byte_array_append(encoded, &g, 1);
  
! 	  ci->oldtext = encoded->data;
  
  	  g_byte_array_free(encoded, FALSE);
--- 555,562 ----
  	  /*  	       encoded->len, strlen(encoded->data)); */
  	  gtk_entry_set_text(GTK_ENTRY(GTK_COMBO(widget)->entry),
! 			     (gchar*)encoded->data);
  	  g_byte_array_append(encoded, &g, 1);
  
! 	  ci->oldtext = (gchar*)encoded->data;
  
  	  g_byte_array_free(encoded, FALSE);

Index: dt_text.c
===================================================================
RCS file: /cvsroot/gqclient/gq/src/dt_text.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** dt_text.c	2 Nov 2003 07:20:43 -0000	1.15
--- dt_text.c	5 Apr 2006 00:53:55 -0000	1.16
***************
*** 139,143 ****
       if (strlen(c) != 0) {
  	  a = g_byte_array_new();
! 	  g_byte_array_append(a, c, strlen(c));
       }
       g_free(c);     
--- 139,143 ----
       if (strlen(c) != 0) {
  	  a = g_byte_array_new();
! 	  g_byte_array_append(a, (guchar*)c, strlen(c));
       }
       g_free(c);     

Index: dt_time.c
===================================================================
RCS file: /cvsroot/gqclient/gq/src/dt_time.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** dt_time.c	3 Nov 2003 21:07:57 -0000	1.12
--- dt_time.c	5 Apr 2006 00:53:55 -0000	1.13
***************
*** 175,179 ****
       GtkWidget *editwindow = cbd->editwindow; 
       GtkWidget *w;
!      int y, m, d, H = 0, M = 0, S = 0, zone = 0;
       int sign;
       char buffer[60];
--- 175,179 ----
       GtkWidget *editwindow = cbd->editwindow; 
       GtkWidget *w;
!      guint y, m, d, H = 0, M = 0, S = 0, zone = 0;
       int sign;
       char buffer[60];

Index: dtutil.c
===================================================================
RCS file: /cvsroot/gqclient/gq/src/dtutil.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** dtutil.c	3 Nov 2003 21:07:57 -0000	1.5
--- dtutil.c	5 Apr 2006 00:53:55 -0000	1.6
***************
*** 44,48 ****
  {
       int len;
!      char nul[] = { 0 };
       int pos = 0;
       GByteArray *copy = NULL, *encoded;
--- 44,48 ----
  {
       int len;
!      guchar nul[] = { '\0' };
       int pos = 0;
       GByteArray *copy = NULL, *encoded;
***************
*** 56,60 ****
  	  /* encode data */
  	  if (encode) {
! 	       encoded = encode(data->data, data->len);
  	       del = TRUE;
  	  } else {
--- 56,60 ----
  	  /* encode data */
  	  if (encode) {
! 	       encoded = encode((gchar*)data->data, data->len);
  	       del = TRUE;
  	  } else {
***************
*** 69,74 ****
  	  g_byte_array_append(encoded, nul, 1);
  	  
! 	  gtk_editable_insert_text(entry, encoded->data, 
! 				   strlen(encoded->data), &pos);
  	  
  	  gtk_editable_set_position(entry, 0);
--- 69,74 ----
  	  g_byte_array_append(encoded, nul, 1);
  	  
! 	  gtk_editable_insert_text(entry, (gchar*)encoded->data,
! 				   strlen((gchar*)encoded->data), &pos);
  	  
  	  gtk_editable_set_position(entry, 0);
***************
*** 126,130 ****
  	  } else {
  	       data = g_byte_array_new();
! 	       g_byte_array_append(data, c, strlen(c));
  	  }
  	  g_free(c);
--- 126,130 ----
  	  } else {
  	       data = g_byte_array_new();
! 	       g_byte_array_append(data, (guchar*)c, strlen(c));
  	  }
  	  g_free(c);

Index: filter.c
===================================================================
RCS file: /cvsroot/gqclient/gq/src/filter.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** filter.c	3 Nov 2003 21:34:52 -0000	1.28
--- filter.c	5 Apr 2006 00:53:55 -0000	1.29
***************
*** 1069,1073 ****
  {
       unsigned int s, f, allow_sp, allow_sp_next;
!      unsigned char c, *unindented;
  
       unindented = g_malloc(strlen(indented) + 1);
--- 1069,1074 ----
  {
       unsigned int s, f, allow_sp, allow_sp_next;
!      unsigned char c;
!      gchar* unindented;
  
       unindented = g_malloc(strlen(indented) + 1);
***************
*** 1108,1112 ****
       unindented[f] = '\0';
  
!      return(unindented);
  }
  
--- 1109,1113 ----
       unindented[f] = '\0';
  
!      return unindented;
  }
  

Index: formfill.c
===================================================================
RCS file: /cvsroot/gqclient/gq/src/formfill.c,v
retrieving revision 1.46
retrieving revision 1.47
diff -C2 -d -r1.46 -r1.47
*** formfill.c	7 Nov 2003 12:02:11 -0000	1.46
--- formfill.c	5 Apr 2006 00:53:55 -0000	1.47
***************
*** 254,258 ****
  				   GByteArray *gb = g_byte_array_new();
  				   g_byte_array_append(gb, 
! 						       bervals[i]->bv_val,
  						       bervals[i]->bv_len);
  				   form->values = g_list_append(form->values,
--- 254,258 ----
  				   GByteArray *gb = g_byte_array_new();
  				   g_byte_array_append(gb, 
! 						       (guchar*)bervals[i]->bv_val,
  						       bervals[i]->bv_len);
  				   form->values = g_list_append(form->values,

Index: gq-xml.c
===================================================================
RCS file: /cvsroot/gqclient/gq/src/gq-xml.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** gq-xml.c	3 Nov 2003 22:28:24 -0000	1.14
--- gq-xml.c	5 Apr 2006 00:53:55 -0000	1.15
***************
*** 85,89 ****
      long l;
  
!     l = strtol(e->cdata, &ep, 10);
      if ((ep && *ep) || l < 0) {
  	XMLhandleError(ctx,
--- 85,89 ----
      long l;
  
!     l = strtol((gchar*)e->cdata, &ep, 10);
      if ((ep && *ep) || l < 0) {
  	XMLhandleError(ctx,
***************
*** 100,106 ****
      int b;
  
!     if (strcasecmp("true", e->cdata) == 0) {
  	b = 1;
!     } else if (strcasecmp("false", e->cdata) == 0) {
  	b = 0;
      } else {
--- 100,106 ----
      int b;
  
!     if (strcasecmp("true", (gchar*)e->cdata) == 0) {
  	b = 1;
!     } else if (strcasecmp("false", (gchar*)e->cdata) == 0) {
  	b = 0;
      } else {
***************
*** 263,267 ****
      struct gq_config *c = peek_tag(ctx->stack, 1)->data;
  
!     int t = tokenize(token_ldifformat, e->cdata);
      c->ldifformat = t;
  }
--- 263,267 ----
      struct gq_config *c = peek_tag(ctx->stack, 1)->data;
  
!     int t = tokenize(token_ldifformat, (gchar*)e->cdata);
      c->ldifformat = t;
  }
***************
*** 275,279 ****
         token number as well */
  
!     gunichar ch = g_utf8_get_char(e->cdata);
      if (g_unichar_isdigit(ch)) {
  	long l = longCDATA(ctx, e);
--- 275,279 ----
         token number as well */
  
!     gunichar ch = g_utf8_get_char((gchar*)e->cdata);
      if (g_unichar_isdigit(ch)) {
  	long l = longCDATA(ctx, e);
***************
*** 284,288 ****
  	}
      } else {
! 	int t = tokenize(token_searchargument, e->cdata);
  	c->search_argument = t;
      }
--- 284,288 ----
  	}
      } else {
! 	int t = tokenize(token_searchargument, (gchar*)e->cdata);
  	c->search_argument = t;
      }
***************
*** 294,298 ****
  {
      struct gq_config *c = peek_tag(ctx->stack, 1)->data;
!     g_free_and_dup(c->schemaserver, e->cdata);
  }
  
--- 294,298 ----
  {
      struct gq_config *c = peek_tag(ctx->stack, 1)->data;
!     g_free_and_dup(c->schemaserver, (gchar*)e->cdata);
  }
  
***************
*** 316,320 ****
  	
  	server->bindpw = g_malloc(o->len + 1);
! 	strncpy(server->bindpw, o->data, o->len); /* UTF-8 OK */
  	server->bindpw[o->len] = 0;
      } else if (server->bindpw[0] && server->pwencoding[0]) {
--- 316,320 ----
  	
  	server->bindpw = g_malloc(o->len + 1);
! 	strncpy(server->bindpw, (gchar*)o->data, o->len); /* UTF-8 OK */
  	server->bindpw[o->len] = 0;
      } else if (server->bindpw[0] && server->pwencoding[0]) {
***************
*** 333,337 ****
  {
      struct ldapserver *server = peek_tag(ctx->stack, 1)->data;
!     g_free_and_dup(server->name, e->cdata);
  }
  
--- 333,337 ----
  {
      struct ldapserver *server = peek_tag(ctx->stack, 1)->data;
!     g_free_and_dup(server->name, (gchar*)e->cdata);
  }
  
***************
*** 340,344 ****
  {
      struct ldapserver *server = peek_tag(ctx->stack, 1)->data;
!     g_free_and_dup(server->ldaphost, e->cdata);
  }
  
--- 340,344 ----
  {
      struct ldapserver *server = peek_tag(ctx->stack, 1)->data;
!     g_free_and_dup(server->ldaphost, (gchar*)e->cdata);
  }
  
***************
*** 357,361 ****
  {
      struct ldapserver *server = peek_tag(ctx->stack, 1)->data;
!     g_free_and_dup(server->basedn, e->cdata);
  }
  
--- 357,361 ----
  {
      struct ldapserver *server = peek_tag(ctx->stack, 1)->data;
!     g_free_and_dup(server->basedn, (gchar*)e->cdata);
  }
  
***************
*** 365,369 ****
  {
      struct ldapserver *server = peek_tag(ctx->stack, 1)->data;
!     g_free_and_dup(server->binddn, e->cdata);
  }
  
--- 365,369 ----
  {
      struct ldapserver *server = peek_tag(ctx->stack, 1)->data;
!     g_free_and_dup(server->binddn, (gchar*)e->cdata);
  }
  
***************
*** 372,376 ****
  {
      struct ldapserver *server = peek_tag(ctx->stack, 1)->data;
!     g_free_and_dup(server->bindpw, e->cdata);
  }
  
--- 372,376 ----
  {
      struct ldapserver *server = peek_tag(ctx->stack, 1)->data;
!     g_free_and_dup(server->bindpw, (gchar*)e->cdata);
  }
  
***************
*** 380,384 ****
  {
      struct ldapserver *server = peek_tag(ctx->stack, 1)->data;
!     g_free_and_dup(server->pwencoding, e->cdata);
  }
  
--- 380,384 ----
  {
      struct ldapserver *server = peek_tag(ctx->stack, 1)->data;
!     g_free_and_dup(server->pwencoding, (gchar*)e->cdata);
  }
  
***************
*** 389,393 ****
      struct ldapserver *server = peek_tag(ctx->stack, 1)->data;
  
!     int t = tokenize(token_bindtype, e->cdata);
      server->bindtype = t;
  }
--- 389,393 ----
      struct ldapserver *server = peek_tag(ctx->stack, 1)->data;
  
!     int t = tokenize(token_bindtype, (gchar*)e->cdata);
      server->bindtype = t;
  }
***************
*** 397,401 ****
  {
      struct ldapserver *server = peek_tag(ctx->stack, 1)->data;
!     g_free_and_dup(server->searchattr, e->cdata);
  }
  
--- 397,401 ----
  {
      struct ldapserver *server = peek_tag(ctx->stack, 1)->data;
!     g_free_and_dup(server->searchattr, (gchar*)e->cdata);
  }
  
***************
*** 491,495 ****
  {
      struct gq_filter *filter = peek_tag(ctx->stack, 1)->data;
!     g_free_and_dup(filter->name, e->cdata);
  }
  
--- 491,495 ----
  {
      struct gq_filter *filter = peek_tag(ctx->stack, 1)->data;
!     g_free_and_dup(filter->name, (gchar*)e->cdata);
  }
  
***************
*** 498,502 ****
  {
      struct gq_filter *filter = peek_tag(ctx->stack, 1)->data;
!     g_free_and_dup(filter->ldapfilter, e->cdata);
  }
  
--- 498,502 ----
  {
      struct gq_filter *filter = peek_tag(ctx->stack, 1)->data;
!     g_free_and_dup(filter->ldapfilter, (gchar*)e->cdata);
  }
  
***************
*** 505,509 ****
  {
      struct gq_filter *filter = peek_tag(ctx->stack, 1)->data;
!     g_free_and_dup(filter->servername, e->cdata);
  }
  
--- 505,509 ----
  {
      struct gq_filter *filter = peek_tag(ctx->stack, 1)->data;
!     g_free_and_dup(filter->servername, (gchar*)e->cdata);
  }
  
***************
*** 512,516 ****
  {
      struct gq_filter *filter = peek_tag(ctx->stack, 1)->data;
!     g_free_and_dup(filter->basedn, e->cdata);
  }
  
--- 512,516 ----
  {
      struct gq_filter *filter = peek_tag(ctx->stack, 1)->data;
!     g_free_and_dup(filter->basedn, (gchar*)e->cdata);
  }
  
***************
*** 536,540 ****
  {
      struct gq_template *t = peek_tag(ctx->stack, 1)->data;
!     g_free_and_dup(t->name, e->cdata);
  }
  
--- 536,540 ----
  {
      struct gq_template *t = peek_tag(ctx->stack, 1)->data;
!     g_free_and_dup(t->name, (gchar*)e->cdata);
  }
  
***************
*** 545,549 ****
      struct gq_template *t = peek_tag(ctx->stack, 1)->data;
  
!     t->objectclasses = g_list_append(t->objectclasses, strdup(e->cdata));
  }
  
--- 545,549 ----
      struct gq_template *t = peek_tag(ctx->stack, 1)->data;
  
!     t->objectclasses = g_list_append(t->objectclasses, strdup((gchar*)e->cdata));
  }
  
***************
*** 600,604 ****
  
      if (d->attr) free(d->attr);
!     d->attr = strdup(e->cdata);
  }
  
--- 600,604 ----
  
      if (d->attr) free(d->attr);
!     d->attr = strdup((gchar*)e->cdata);
  }
  
***************
*** 619,623 ****
  
      for (i = 0 ; e->attrs[i] ; i += 2) {
! 	if (strcasecmp(e->attrs[i], "name") == 0) {
  	    char *tmp, *t;
  	    struct attr_settings *as;
--- 619,623 ----
  
      for (i = 0 ; e->attrs[i] ; i += 2) {
! 	if (strcasecmp((gchar*)e->attrs[i], "name") == 0) {
  	    char *tmp, *t;
  	    struct attr_settings *as;
***************
*** 625,629 ****
  	    assert(e->attrs[i + 1]);
  
! 	    tmp = g_strdup(e->attrs[i + 1]);
  	    for (t = tmp ; *t ; t++) *t = tolower(*t);
  
--- 625,629 ----
  	    assert(e->attrs[i + 1]);
  
! 	    tmp = g_strdup((gchar*)e->attrs[i + 1]);
  	    for (t = tmp ; *t ; t++) *t = tolower(*t);
  
***************
*** 698,703 ****
      assert(as);
      
!     if (e->cdata && strlen(e->cdata) > 0) {
! 	as->user_friendly = g_strdup(e->cdata);
      }
  }
--- 698,703 ----
      assert(as);
      
!     if (e->cdata && strlen((gchar*)e->cdata) > 0) {
! 	as->user_friendly = g_strdup((gchar*)e->cdata);
      }
  }

Index: input.c
===================================================================
RCS file: /cvsroot/gqclient/gq/src/input.c,v
retrieving revision 1.88
retrieving revision 1.89
diff -C2 -d -r1.88 -r1.89
*** input.c	5 Apr 2006 00:27:43 -0000	1.88
--- input.c	5 Apr 2006 00:53:55 -0000	1.89
***************
*** 2136,2140 ****
  	       od_bvalues[valcnt] = (struct berval*) g_malloc(sizeof(struct berval));
  	       od_bvalues[valcnt]->bv_len = gb->len;
! 	       od_bvalues[valcnt]->bv_val = gb->data;
  	       
  	       g_byte_array_free(gb, FALSE);
--- 2136,2140 ----
  	       od_bvalues[valcnt] = (struct berval*) g_malloc(sizeof(struct berval));
  	       od_bvalues[valcnt]->bv_len = gb->len;
! 	       od_bvalues[valcnt]->bv_val = (gchar*)gb->data;
  	       
  	       g_byte_array_free(gb, FALSE);
***************
*** 2636,2640 ****
  
  			 if (ndata) {
! 			      if (strncasecmp(ndata->data,
  					      "extensibleObject",
  					      ndata->len) == 0) {
--- 2636,2640 ----
  
  			 if (ndata) {
! 			      if (strncasecmp((gchar*)ndata->data,
  					      "extensibleObject",
  					      ndata->len) == 0) {

Index: ldif.c
===================================================================
RCS file: /cvsroot/gqclient/gq/src/ldif.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** ldif.c	3 Nov 2003 22:28:24 -0000	1.19
--- ldif.c	5 Apr 2006 00:53:55 -0000	1.20
***************
*** 320,324 ****
  	  case 3: {
  	       tmp[2] |= d & 0x3f;
! 	       g_byte_array_append(out, tmp, 3);
  	       tmp[0] = tmp[1] = tmp[2] = 0;
  	       j = 0;
--- 320,324 ----
  	  case 3: {
  	       tmp[2] |= d & 0x3f;
! 	       g_byte_array_append(out, (guchar*)tmp, 3);
  	       tmp[0] = tmp[1] = tmp[2] = 0;
  	       j = 0;
***************
*** 329,335 ****
       
       if (j != 0) {
! 	  g_byte_array_append(out, tmp, 1);
! 	  if (eq < 2) g_byte_array_append(out, tmp + 1, 1);
! 	  if (eq < 1) g_byte_array_append(out, tmp + 2, 1);
       }
  }
--- 329,335 ----
       
       if (j != 0) {
! 	  g_byte_array_append(out, (guchar*)tmp, 1);
! 	  if (eq < 2) g_byte_array_append(out, (guchar*)tmp + 1, 1);
! 	  if (eq < 1) g_byte_array_append(out, (guchar*)tmp + 2, 1);
       }
  }

Index: prefs.c
===================================================================
RCS file: /cvsroot/gqclient/gq/src/prefs.c,v
retrieving revision 1.58
retrieving revision 1.59
diff -C2 -d -r1.58 -r1.59
*** prefs.c	3 Nov 2003 21:44:06 -0000	1.58
--- prefs.c	5 Apr 2006 00:53:55 -0000	1.59
***************
*** 2214,2218 ****
  	  } else {
  	       /* save failed - undo changes */
! 	       g_list_insert(config->templates, tmpl, index);
  	  }
       }
--- 2214,2218 ----
  	  } else {
  	       /* save failed - undo changes */
! 	       config->templates = g_list_insert(config->templates, tmpl, index);
  	  }
       }

Index: state.c
===================================================================
RCS file: /cvsroot/gqclient/gq/src/state.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** state.c	3 Nov 2003 21:19:54 -0000	1.13
--- state.c	5 Apr 2006 00:53:55 -0000	1.14
***************
*** 685,690 ****
  
      for (i = 0 ; e->attrs[i] ; i += 2) {
! 	if (strcmp("name", e->attrs[i]) == 0) {
! 	    g_hash_table_insert(ents, g_strdup(e->attrs[i+1]), 
  				ent);
  
--- 685,690 ----
  
      for (i = 0 ; e->attrs[i] ; i += 2) {
! 	if (strcmp("name", (gchar*)e->attrs[i]) == 0) {
! 	    g_hash_table_insert(ents, g_strdup((gchar*)e->attrs[i+1]), 
  				ent);
  
***************
*** 705,710 ****
  
      for (i = 0 ; e->attrs[i] ; i += 2) {
! 	if (strcmp("name", e->attrs[i]) == 0) {
! 	    g_hash_table_insert(parent->entities, g_strdup(e->attrs[i+1]), 
  				ent);
  
--- 705,710 ----
  
      for (i = 0 ; e->attrs[i] ; i += 2) {
! 	if (strcmp("name", (gchar*)e->attrs[i]) == 0) {
! 	    g_hash_table_insert(parent->entities, g_strdup((gchar*)e->attrs[i+1]), 
  				ent);
  
***************
*** 725,730 ****
  
      for (i = 0 ; e->attrs[i] ; i += 2) {
! 	if (strcmp("type", e->attrs[i]) == 0) {
! 	    t = tokenize(token_value_type_names, e->attrs[i+1]);
  	}
      }
--- 725,730 ----
  
      for (i = 0 ; e->attrs[i] ; i += 2) {
! 	if (strcmp("type", (gchar*)e->attrs[i]) == 0) {
! 	    t = tokenize(token_value_type_names, (gchar*)e->attrs[i+1]);
  	}
      }
***************
*** 745,754 ****
  {
      struct state_entity *ent = peek_tag(ctx->stack, 1)->data;
!     const char *n = NULL;
      int i;
      struct state_value *v = (struct state_value *) e->data;
  
      for (i = 0 ; e->attrs[i] ; i += 2) {
! 	if (strcmp("name", e->attrs[i]) == 0) {
  	    n = e->attrs[i+1];
  	}
--- 745,754 ----
  {
      struct state_entity *ent = peek_tag(ctx->stack, 1)->data;
!     guchar const* n = NULL;
      int i;
      struct state_value *v = (struct state_value *) e->data;
  
      for (i = 0 ; e->attrs[i] ; i += 2) {
! 	if (strcmp("name", (gchar*)e->attrs[i]) == 0) {
  	    n = e->attrs[i+1];
  	}
***************
*** 763,770 ****
  	case SV_int: 
  	    *(v->val.int_val) = 
! 		strtol(e->cdata, &ep, 10); /* FIXME handle error */
  	    break;
  	case SV_char: 
! 	    v->val.char_val = g_strdup(e->cdata);
  	    break;
  	case SV_list: 
--- 763,770 ----
  	case SV_int: 
  	    *(v->val.int_val) = 
! 		strtol((gchar*)e->cdata, &ep, 10); /* FIXME handle error */
  	    break;
  	case SV_char: 
! 	    v->val.char_val = g_strdup((gchar*)e->cdata);
  	    break;
  	case SV_list: 
***************
*** 775,779 ****
  	}
  
! 	g_hash_table_insert(ent->values, g_strdup(n), 
  			    v);
  
--- 775,779 ----
  	}
  
! 	g_hash_table_insert(ent->values, g_strdup((gchar*)n), 
  			    v);
  
***************
*** 790,794 ****
      if (v->type == SV_list) {
  	v->val.list_val = g_list_append(v->val.list_val, 
! 					g_strdup(e->cdata));
      } else {
  	/* FIXME: report error */
--- 790,794 ----
      if (v->type == SV_list) {
  	v->val.list_val = g_list_append(v->val.list_val, 
! 					g_strdup((gchar*)e->cdata));
      } else {
  	/* FIXME: report error */

Index: syntax.c
===================================================================
RCS file: /cvsroot/gqclient/gq/src/syntax.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** syntax.c	3 Nov 2003 21:07:58 -0000	1.21
--- syntax.c	5 Apr 2006 00:53:55 -0000	1.22
***************
*** 666,670 ****
  	  }
  	  mod->mod_bvalues[cval]->bv_len = copy->len;
! 	  mod->mod_bvalues[cval]->bv_val = copy->data;
  	
  /*  	  printf("bervalLDAPMod data=%s (%d)\n", copy->data, copy->len); */
--- 666,670 ----
  	  }
  	  mod->mod_bvalues[cval]->bv_len = copy->len;
! 	  mod->mod_bvalues[cval]->bv_val = (gchar*)copy->data;
  	
  /*  	  printf("bervalLDAPMod data=%s (%d)\n", copy->data, copy->len); */

Index: template.c
===================================================================
RCS file: /cvsroot/gqclient/gq/src/template.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** template.c	3 Nov 2003 21:41:27 -0000	1.16
--- template.c	5 Apr 2006 00:53:55 -0000	1.17
***************
*** 619,623 ****
  	  if (!save_ok) {
  	       /* save failed - undo changes */
! 	       g_list_remove(config->templates, tmpl);
  	       free_template(tmpl);
  	  }
--- 619,623 ----
  	  if (!save_ok) {
  	       /* save failed - undo changes */
! 	       config->templates = g_list_remove(config->templates, tmpl);
  	       free_template(tmpl);
  	  }
***************
*** 652,656 ****
  	       save_ok = save_config_ext(error_context);
  	       if (!save_ok) {
! 		    g_list_remove(config->templates, tmpl);
  		    free_template(tmpl);
  	       }
--- 652,656 ----
  	       save_ok = save_config_ext(error_context);
  	       if (!save_ok) {
! 		    config->templates = g_list_remove(config->templates, tmpl);
  		    free_template(tmpl);
  	       }

Index: tinput.c
===================================================================
RCS file: /cvsroot/gqclient/gq/src/tinput.c,v
retrieving revision 1.45
retrieving revision 1.46
diff -C2 -d -r1.45 -r1.46
*** tinput.c	7 Nov 2003 12:02:12 -0000	1.45
--- tinput.c	5 Apr 2006 00:53:55 -0000	1.46
***************
*** 358,362 ****
  	  GByteArray *gb = (GByteArray*) tmplist->data;
  	  /* we know this is plain text... */
! 	  oclist = g_list_append(oclist, g_strndup(gb->data, gb->len));
  	  tmplist = tmplist->next;
       }
--- 358,362 ----
  	  GByteArray *gb = (GByteArray*) tmplist->data;
  	  /* we know this is plain text... */
! 	  oclist = g_list_append(oclist, g_strndup((gchar*)gb->data, gb->len));
  	  tmplist = tmplist->next;
       }

Index: xmlparse.c
===================================================================
RCS file: /cvsroot/gqclient/gq/src/xmlparse.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** xmlparse.c	3 Nov 2003 21:07:58 -0000	1.8
--- xmlparse.c	5 Apr 2006 00:53:55 -0000	1.9
***************
*** 99,104 ****
      }
      stack->entries[stack->sp++] = e;
!     e->tag = strdup(tag);
!     e->cdata = strdup("");
      e->len = 1;
  
--- 99,104 ----
      }
      stack->entries[stack->sp++] = e;
!     e->tag = (guchar*)strdup((gchar*)tag);
!     e->cdata = (guchar*)strdup("");
      e->len = 1;
  
***************
*** 165,169 ****
  	e->attrs = calloc(i, sizeof(xmlChar *));
  	for (i = 0 ; attrs[i] ; i++) {
! 	    e->attrs[i] = strdup(attrs[i]);
  	}
      }
--- 165,169 ----
  	e->attrs = calloc(i, sizeof(xmlChar *));
  	for (i = 0 ; attrs[i] ; i++) {
! 	    e->attrs[i] = (guchar*)strdup((gchar*)attrs[i]);
  	}
      }
***************
*** 172,176 ****
      
      for (t = ctx->tags ; t->tag ; t++) {
! 	if (strcmp(name, t->tag) == 0) {
  	    /* maybe, maybe, maybe..... (J Joplin) */
  
--- 172,176 ----
      
      for (t = ctx->tags ; t->tag ; t++) {
! 	if (strcmp((gchar*)name, t->tag) == 0) {
  	    /* maybe, maybe, maybe..... (J Joplin) */
  
***************
*** 184,188 ****
  		    break;
  		}
! 		if (strcmp(f->tag, t->context[i]) != 0) {
  		    ok = 0;
  		    break;
--- 184,188 ----
  		    break;
  		}
! 		if (strcmp((gchar*)f->tag, t->context[i]) != 0) {
  		    ok = 0;
  		    break;
***************
*** 221,226 ****
  
  	/* trim leading whitespace */
! 	for(c = g_utf8_get_char(p) ; c ; 
! 	    p = g_utf8_next_char(p), c = g_utf8_get_char(p)) {
  	    if (!g_unichar_isspace(c)) {
  		memmove(e->cdata, p, e->len - (p - e->cdata) + 1);
--- 221,226 ----
  
  	/* trim leading whitespace */
! 	for(c = g_utf8_get_char((gchar*)p) ; c ;
! 	    p = (guchar*)g_utf8_next_char((gchar*)p), c = g_utf8_get_char((gchar*)p)) {
  	    if (!g_unichar_isspace(c)) {
  		memmove(e->cdata, p, e->len - (p - e->cdata) + 1);
***************
*** 231,236 ****
  	/* trim trailing whitespace */
  	p = e->cdata;
! 	for(c = g_utf8_get_char(p) ; c ; 
! 	    p = g_utf8_next_char(p), c = g_utf8_get_char(p)) {
  	    if (g_unichar_isspace(c)) {
  		if (n == NULL) n = p;
--- 231,236 ----
  	/* trim trailing whitespace */
  	p = e->cdata;
! 	for(c = g_utf8_get_char((gchar*)p) ; c ;
! 	    p = (guchar*)g_utf8_next_char((gchar*)p), c = g_utf8_get_char((gchar*)p)) {
  	    if (g_unichar_isspace(c)) {
  		if (n == NULL) n = p;
***************
*** 272,276 ****
      }
  
!     strncat(e->cdata, ch, len);
      e->cdata[e->len] = 0;
  }
--- 272,276 ----
      }
  
!     strncat((gchar*)e->cdata, (gchar*)ch, len);
      e->cdata[e->len] = 0;
  }