Update to 0.61:

- GDL handling has been totally rewritten and is now more clean.
- It is now possible to destroy GDL "rename at end" entry like any other one.
- In the GDL list, sizes are now displayed using locale format.
- search result handling has been partially rewritten and is now more clean.
- The search result size is now displayed using locale format.
- old style user list is no more supported, only new one is (the one using
  list cache).
- user share lists handling has been partially rewritten and is now more clean.
- The user share lists are now displayed using locale format.

4 files changed, 38 insertions, 29 deletions

diff --git a/net/dc_gui/Makefile b/net/dc_gui/Makefile
index 50604cf50e9..5c720d92e98 100644
--- a/net/dc_gui/Makefile
+++ b/net/dc_gui/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/09/11 20:47:14 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2002/09/23 11:48:29 wiz Exp $
 #
 
-DISTNAME=	dc_gui-0.60
+DISTNAME=	dc_gui-0.61
 CATEGORIES=	net
 MASTER_SITES=	http://www.ac2i.tzo.com/dctc/
 
diff --git a/net/dc_gui/distinfo b/net/dc_gui/distinfo
index 41e19fad187..dc35516b59e 100644
--- a/net/dc_gui/distinfo
+++ b/net/dc_gui/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.1.1.1 2002/09/11 20:47:14 wiz Exp $
+$NetBSD: distinfo,v 1.2 2002/09/23 11:48:29 wiz Exp $
 
-SHA1 (dc_gui-0.60.tar.gz) = b22a783b9a93d1f07b9d65266469b405597ca7e9
-Size (dc_gui-0.60.tar.gz) = 430608 bytes
+SHA1 (dc_gui-0.61.tar.gz) = fb8ad7e19d1139bc45804934f71328a465cdc14b
+Size (dc_gui-0.61.tar.gz) = 437997 bytes
 SHA1 (patch-aa) = 99881d4f57e646aba7a5f03aa45939e776921f71
 SHA1 (patch-ab) = acda6d89cc60414ebe69b239d357958e94e31de8
-SHA1 (patch-ac) = a1bc03b93bef1217eb9ca1077de4927049cddd74
-SHA1 (patch-ad) = 0854068b6c5940a566df4d6f689a58a7a427e617
+SHA1 (patch-ac) = bd200cd1a02b23bd08a139c068659f2723e6c874
+SHA1 (patch-ad) = c1bdd133e93e878537ceb3ceee61911700a0c8ee
 SHA1 (patch-ae) = f2e9fe445efea23fe52f27ff14d5dcc5c0775af0
 SHA1 (patch-af) = 9d6c0f96b5772e2eda691d7dedae539eafdbb24b
 SHA1 (patch-ag) = f674203f9c05c9f3c99f9dc0e933c26df5e82e1b
diff --git a/net/dc_gui/patches/patch-ac b/net/dc_gui/patches/patch-ac
index 6f8205980e9..e1117d1d873 100644
--- a/net/dc_gui/patches/patch-ac
+++ b/net/dc_gui/patches/patch-ac
@@ -1,6 +1,6 @@
-$NetBSD: patch-ac,v 1.1.1.1 2002/09/11 20:47:14 wiz Exp $
+$NetBSD: patch-ac,v 1.2 2002/09/23 11:48:29 wiz Exp $
 
---- src/callbacks.c.orig	Sun Aug 25 10:28:02 2002
+--- src/callbacks.c.orig	Sat Sep 21 17:00:26 2002
 +++ src/callbacks.c
 @@ -2,6 +2,13 @@
  #  include <config.h>
@@ -29,7 +29,7 @@ $NetBSD: patch-ac,v 1.1.1.1 2002/09/11 20:47:14 wiz Exp $
  #include <string.h>
  
  #include "callbacks.h"
-@@ -1383,7 +1389,7 @@ on_find_entry_activate                 (
+@@ -1631,7 +1637,7 @@ on_find_entry_activate                 (
  
  		val=atof(gtk_entry_get_text(GTK_ENTRY(w)));
  
@@ -38,7 +38,7 @@ $NetBSD: patch-ac,v 1.1.1.1 2002/09/11 20:47:14 wiz Exp $
  	}
  
  	w=get_widget_by_widget_name("find_result");
-@@ -2610,7 +2616,7 @@ on_apply_pref_clicked                  (
+@@ -2857,7 +2863,7 @@ on_apply_pref_clicked                  (
  			}
  			if(i==4)
  				i=0;
@@ -47,7 +47,7 @@ $NetBSD: patch-ac,v 1.1.1.1 2002/09/11 20:47:14 wiz Exp $
  			send_data_to_dctc(out->str);
  		}
  	}
-@@ -3226,7 +3232,7 @@ static void reload_ls_cache_clist(int ev
+@@ -3429,7 +3435,7 @@ static void reload_ls_cache_clist(int ev
  				nw[1]=buf;
  
  				printf("%llX",lsch.share_size);
diff --git a/net/dc_gui/patches/patch-ad b/net/dc_gui/patches/patch-ad
index 695fec0d5e2..380b5749525 100644
--- a/net/dc_gui/patches/patch-ad
+++ b/net/dc_gui/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.1.1.1 2002/09/11 20:47:14 wiz Exp $
+$NetBSD: patch-ad,v 1.2 2002/09/23 11:48:29 wiz Exp $
 
---- src/dctc_process.c.orig	Tue Jul 30 17:54:39 2002
+--- src/dctc_process.c.orig	Sat Sep 21 17:27:49 2002
 +++ src/dctc_process.c
-@@ -535,9 +535,9 @@ static void update_users_info(void)
+@@ -539,9 +539,9 @@ static void update_users_info(void)
  	}
  
  	if( (amount/(1024.0*1024.0*1024.0)) > 1024.0)
@@ -14,7 +14,7 @@ $NetBSD: patch-ad,v 1.1.1.1 2002/09/11 20:47:14 wiz Exp $
  	w=get_widget_by_widget_name("users_info_label");
  	if(w==NULL)
  		return;
-@@ -697,7 +697,7 @@ static void uinfo_fnc(const GString *s)
+@@ -701,7 +701,7 @@ static void uinfo_fnc(const GString *s)
  	fsize=g_string_new("");
  	
  	if(vsize>(1024.0*1024.0*1024.0))
@@ -23,17 +23,26 @@ $NetBSD: patch-ad,v 1.1.1.1 2002/09/11 20:47:14 wiz Exp $
  	else if(vsize>(1024.0*1024.0))
  		g_string_sprintf(fsize,"%.2fMB",vsize/(1024.0*1024.0));
  	else if(vsize>(1024.0))
-@@ -4140,11 +4140,11 @@ static void first_level_glst_end_fnc(Gtk
- #endif
- 					if(spd<1024.0)
- 					{
--						g_string_sprintfa(spd_str,"[%.2lfB/s]",spd);
-+						g_string_sprintfa(spd_str,"[%.2fB/s]",spd);
- 					}
- 					else if(spd<(1024.0*1024.0))
- 					{
--						g_string_sprintfa(spd_str,"[%.2lfKB/s]",spd/1024.0);
-+						g_string_sprintfa(spd_str,"[%.2fKB/s]",spd/1024.0);
- 					}
+@@ -4168,7 +4168,7 @@ static void first_level_glst_end_fnc(Gtk
+ 				missing_bytes=gce_root->c.root.gdl_size-gce_root->c.root.received_bytes;
  
- 					/* Estimated Time to Arrival computation: now (in second) + missing_bytes/spd */
+ 				spd_str=g_string_new("");
+-				g_string_sprintf(spd_str,"%'15lu (%.2f%%) ",gce_root->c.root.received_bytes,100.0*(double)gce_root->c.root.received_bytes/(double)gce_root->c.root.gdl_size);
++				g_string_sprintf(spd_str,"%15lu (%.2f%%) ",gce_root->c.root.received_bytes,100.0*(double)gce_root->c.root.received_bytes/(double)gce_root->c.root.gdl_size);
+ 
+ 				cur_size=gce_root->c.root.received_bytes-gce_root->c.root.byte_offset;		/* number of bytes downloaded */
+ 				duration=time(NULL)-gce_root->c.root.start_time;
+@@ -4176,11 +4176,11 @@ static void first_level_glst_end_fnc(Gtk
+ 				spd=(double)(gce_root->c.root.last_10sec_speed)/10.0;		/* compute the speed of the last 10 seconds */
+ 				if(spd<1024.0)
+ 				{
+-					g_string_sprintfa(spd_str,"[%.2lfB/s]",spd);
++					g_string_sprintfa(spd_str,"[%.2fB/s]",spd);
+ 				}
+ 				else if(spd<(1024.0*1024.0))
+ 				{
+-					g_string_sprintfa(spd_str,"[%.2lfKB/s]",spd/1024.0);
++					g_string_sprintfa(spd_str,"[%.2fKB/s]",spd/1024.0);
+ 				}
+ 
+ 				/* Estimated Time to Arrival computation: now (in second) + missing_bytes/spd */