[gq-commit] gq/src browse.c,1.65,1.66

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

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

Modified Files:
	browse.c 
Log Message:
* Reverted change wrt ngettext
* Added client caching info to the server info
* Fixed a double unicode decoding bug
* Fixed minor bug wrt memory freeing


Index: browse.c
===================================================================
RCS file: /cvsroot/gqclient/gq/src/browse.c,v
retrieving revision 1.65
retrieving revision 1.66
diff -C2 -d -r1.65 -r1.66
*** browse.c	28 Sep 2003 03:26:25 -0000	1.65
--- browse.c	28 Sep 2003 22:59:39 -0000	1.66
***************
*** 224,228 ****
  				  ngettext("One entry found (running)",
  					   "%d entries found (running)",
! 					   num_children));
  
  /*  			 make_message(message, sizeof(message), */
--- 224,228 ----
  				  ngettext("One entry found (running)",
  					   "%d entries found (running)",
! 					   num_children), num_children);
  
  /*  			 make_message(message, sizeof(message), */
***************
*** 241,245 ****
  	  snprintf(message, sizeof(message),
  		   ngettext("One entry found (finished)",
! 			    "%d entries found (finished)", num_children));
  
  /*  	  make_message(message, sizeof(message), */
--- 241,246 ----
  	  snprintf(message, sizeof(message),
  		   ngettext("One entry found (finished)",
! 			    "%d entries found (finished)", num_children), 
! 		   num_children);
  
  /*  	  make_message(message, sizeof(message), */
***************
*** 691,694 ****
--- 692,721 ----
       row++;
  
+ #if HAVE_LDAP_CLIENT_CACHE
+      label = gtk_label_new(_("Client-side caching"));
+      gtk_widget_show(label);
+      gtk_table_attach(GTK_TABLE(table),
+ 		      label,
+ 		      0, 1, row, row+1,
+ 		      GTK_SHRINK,
+ 		      GTK_EXPAND | GTK_SHRINK | GTK_FILL,
+ 		      0, 0);
+ 
+      snprintf(buf, sizeof(buf), "%s", 
+ 	      (entry->server->local_cache_timeout >= 0) ? _("on") : _("off"));
+      e = gtk_entry_new();
+      gtk_entry_set_text(GTK_ENTRY(e), buf);
+      gtk_widget_set_sensitive(e, FALSE);
+      gtk_widget_show(e);
+      gtk_table_attach(GTK_TABLE(table),
+ 		      e,
+ 		      1, 2, row, row+1,
+ 		      GTK_EXPAND | GTK_SHRINK | GTK_FILL,
+ 		      GTK_EXPAND | GTK_SHRINK | GTK_FILL,
+ 		      0, 0);
+ 
+      row++;
+ #endif
+ 
       /* Connections so far */
       label = gtk_label_new(_("Connections so far"));
***************
*** 962,966 ****
       snprintf(message, sizeof(message), 
  	      ngettext("One server found",
! 		       "%d servers found", server_cnt));
  
       statusbar_msg(message);
--- 989,994 ----
       snprintf(message, sizeof(message), 
  	      ngettext("One server found",
! 		       "%d servers found", server_cnt),
! 	      server_cnt);
  
       statusbar_msg(message);
***************
*** 1104,1108 ****
  void inputform_free(struct inputform *iform) 
  {
- 
       if(iform->olddn)
  	  g_free(iform->olddn);
--- 1132,1135 ----
***************
*** 1755,1759 ****
  	  snprintf(message, sizeof(message),
  		   ngettext("One entry exported to ",
! 			    "%1$d entries exported to ", num_entries));
  	  strcat(message, filename);
  
--- 1782,1787 ----
  	  snprintf(message, sizeof(message),
  		   ngettext("One entry exported to ",
! 			    "%1$d entries exported to ", num_entries),
! 		   num_entries);
  	  strcat(message, filename);
  
***************
*** 1946,1950 ****
  	       return(TRUE);
  
! 	  name = decoded_string(entry->base_methods.get_name((browse_entry *) entry, FALSE));
  
  	  BROWSETAB(tab)->tree_row_popped_up = ctree_node;
--- 1974,1979 ----
  	       return(TRUE);
  
! 	  /* The get_name method already does UTF-8 decoding */
! 	  name = entry->base_methods.get_name((browse_entry *) entry, FALSE);
  
  	  BROWSETAB(tab)->tree_row_popped_up = ctree_node;
***************
*** 1970,1974 ****
  	  gtk_widget_show(menu_item);
  
! 	  if (name) free(name);
  
  	  /* New submenu */
--- 1999,2003 ----
  	  gtk_widget_show(menu_item);
  
! 	  if (name) g_free(name);
  
  	  /* New submenu */
***************
*** 2121,2126 ****
  	  gtk_signal_emit_stop_by_name(GTK_OBJECT(ctreeroot), 
  				       "button_press_event");
- 
- 	  g_free(name);
       }
  
--- 2150,2153 ----