From ff6d4b18a4fb8a882237e0cefafb672a5c6093ac Mon Sep 17 00:00:00 2001 From: wiz Date: Sun, 3 Nov 2002 21:32:24 +0000 Subject: Update to 0.63. Changes: - Dutch translation of the GUI updated by Myckel Habets. - Download date of share list added to cached share list. - Cached share lists can now be sorted by size and by date. - Add capability to generate automatically autoscan pattern for selected GDL. - fix compilation problem with Berkeley DB 4 (open function has a different prototype). - French translation of the GUI updated by Nicolas Le Gaillart. - GDL renaming part now works properly. - GDL end program support added. - fix the missing translation files problem in the RPM file. - find result list modified. The local filename column is gone and is replaced by a column with the connection speed of the user having the file. Currently, only speed of users on the same hub is displayed. - user list partially rewritten and is now displayed faster when reconnecting to a client. - button added to close all private chats in one click. - dc_gui does not hang anymore when it retrieves the hublist. The "connect" label will blink when the hublist is received. --- net/dc_gui/Makefile | 6 +++--- net/dc_gui/PLIST | 5 ++++- net/dc_gui/distinfo | 14 +++++++------- net/dc_gui/patches/patch-ac | 20 ++++++++++---------- net/dc_gui/patches/patch-ad | 37 +++++++++++++++++++++++-------------- net/dc_gui/patches/patch-af | 10 +++++----- net/dc_gui/patches/patch-ag | 6 +++--- 7 files changed, 55 insertions(+), 43 deletions(-) (limited to 'net') diff --git a/net/dc_gui/Makefile b/net/dc_gui/Makefile index ede5533058b..02599390700 100644 --- a/net/dc_gui/Makefile +++ b/net/dc_gui/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.5 2002/10/21 01:36:59 wiz Exp $ +# $NetBSD: Makefile,v 1.6 2002/11/03 21:32:24 wiz Exp $ # -DISTNAME= dc_gui-0.63 +DISTNAME= dc_gui-0.64 CATEGORIES= net MASTER_SITES= http://www.ac2i.tzo.com/dctc/ @@ -9,7 +9,7 @@ MAINTAINER= packages@netbsd.org HOMEPAGE= http://www.ac2i.tzo.com/dctc/ COMMENT= graphical user interface for DCTC -DEPENDS+= dctc>=0.83.6:../../net/dctc +DEPENDS+= dctc>=0.83.7:../../net/dctc GNU_CONFIGURE= YES USE_BUILDLINK2= YES diff --git a/net/dc_gui/PLIST b/net/dc_gui/PLIST index 7dbc1f4cd95..e7ec7a95636 100644 --- a/net/dc_gui/PLIST +++ b/net/dc_gui/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 2002/09/30 16:35:18 wiz Exp $ +@comment $NetBSD: PLIST,v 1.3 2002/11/03 21:32:24 wiz Exp $ bin/dc_gui share/gnome/help/dc_gui/C/index.html share/gnome/help/dc_gui/C/topic.dat @@ -10,8 +10,11 @@ ${PKGLOCALEDIR}/locale/de/LC_MESSAGES/dc_gui.mo ${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/dc_gui.mo ${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/dc_gui.mo ${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/dc_gui.mo +share/pixmaps/dc_gui/icon_folder_add.xpm +share/pixmaps/dc_gui/icon_folder_del.xpm share/pixmaps/dc_gui/icon_kill.xpm share/pixmaps/dc_gui/icon_refresh.xpm +share/pixmaps/dc_gui/icon_remove_all.xpm share/pixmaps/dc_gui/icon_remove_selected.xpm @dirrm share/pixmaps/dc_gui @unexec ${RMDIR} %D/share/pixmaps 2> /dev/null || ${TRUE} diff --git a/net/dc_gui/distinfo b/net/dc_gui/distinfo index 5efa724a130..e2b85280b63 100644 --- a/net/dc_gui/distinfo +++ b/net/dc_gui/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.7 2002/10/21 01:36:59 wiz Exp $ +$NetBSD: distinfo,v 1.8 2002/11/03 21:32:25 wiz Exp $ -SHA1 (dc_gui-0.63.tar.gz) = f2443cb41d7c85d8490afa17d5814f1b85832d76 -Size (dc_gui-0.63.tar.gz) = 444585 bytes -SHA1 (patch-ac) = 31c81e48aecb6e06a2c4fc39073f8d9d5c2c3e30 -SHA1 (patch-ad) = 2ecdb4b6203b4d10b25dddc13fd04b0e0ed8ed41 +SHA1 (dc_gui-0.64.tar.gz) = 2c608ba0e8e7e10c7ddba212f006142e2abfbd20 +Size (dc_gui-0.64.tar.gz) = 454778 bytes +SHA1 (patch-ac) = a3b0f1d28c2b4d9dfb60442c11a8ad7e0a39401d +SHA1 (patch-ad) = 1fdb94cf8897fb333a5aac11f843b1cc05129a74 SHA1 (patch-ae) = f2e9fe445efea23fe52f27ff14d5dcc5c0775af0 -SHA1 (patch-af) = ca57f8527913aee28594cb6b801a984bd80babe2 -SHA1 (patch-ag) = f2c697099c31ff87e040973c756049d9b07f9e25 +SHA1 (patch-af) = cd6f3c4f8af7c540064e17c0e9714ddc13050641 +SHA1 (patch-ag) = d2c699a09b220c7f53e5fefe35aee3b4d71d74e4 diff --git a/net/dc_gui/patches/patch-ac b/net/dc_gui/patches/patch-ac index 18e6c1f5f63..21d160633a3 100644 --- a/net/dc_gui/patches/patch-ac +++ b/net/dc_gui/patches/patch-ac @@ -1,6 +1,6 @@ -$NetBSD: patch-ac,v 1.3 2002/10/03 11:44:40 wiz Exp $ +$NetBSD: patch-ac,v 1.4 2002/11/03 21:32:25 wiz Exp $ ---- src/callbacks.c.orig Tue Sep 24 18:25:08 2002 +--- src/callbacks.c.orig Sun Nov 3 08:12:20 2002 +++ src/callbacks.c @@ -2,6 +2,13 @@ # include @@ -24,7 +24,7 @@ $NetBSD: patch-ac,v 1.3 2002/10/03 11:44:40 wiz Exp $ #include #include #include -@@ -1631,7 +1637,7 @@ on_find_entry_activate ( +@@ -1632,7 +1638,7 @@ on_find_entry_activate ( val=atof(gtk_entry_get_text(GTK_ENTRY(w))); @@ -33,7 +33,7 @@ $NetBSD: patch-ac,v 1.3 2002/10/03 11:44:40 wiz Exp $ } w=get_widget_by_widget_name("find_result"); -@@ -2857,7 +2863,7 @@ on_apply_pref_clicked ( +@@ -2875,7 +2881,7 @@ on_apply_pref_clicked ( } if(i==4) i=0; @@ -42,12 +42,12 @@ $NetBSD: patch-ac,v 1.3 2002/10/03 11:44:40 wiz Exp $ send_data_to_dctc(out->str); } } -@@ -3429,7 +3435,7 @@ static void reload_ls_cache_clist(int ev - nw[1]=buf; +@@ -3447,7 +3453,7 @@ static void reload_ls_cache_clist(int ev + LS_CACHE_CL_ENTRY *lcce; - printf("%llX",lsch.share_size); + strftime(dl_time,sizeof(dl_time)-1,"%c",localtime(&(lsch.retrieve_time))); - sprintf(buf,"%'llu", lsch.share_size); + sprintf(buf,"%llu", lsch.share_size); - gtk_clist_append(clst,nw); - } - } + + nw[0]=obj->d_name; + nw[1]=buf; diff --git a/net/dc_gui/patches/patch-ad b/net/dc_gui/patches/patch-ad index 4c8419703ff..d9d946f198f 100644 --- a/net/dc_gui/patches/patch-ad +++ b/net/dc_gui/patches/patch-ad @@ -1,8 +1,17 @@ -$NetBSD: patch-ad,v 1.3 2002/09/30 16:35:19 wiz Exp $ +$NetBSD: patch-ad,v 1.4 2002/11/03 21:32:25 wiz Exp $ ---- src/dctc_process.c.orig Sat Sep 21 17:27:49 2002 +--- src/dctc_process.c.orig Sat Nov 2 18:01:44 2002 +++ src/dctc_process.c -@@ -539,9 +539,9 @@ static void update_users_info(void) +@@ -463,7 +463,7 @@ static void user__fnc(const GString *s) + vsize=lu.share_size; + + if(vsize>(1024.0*1024.0*1024.0)) +- g_string_sprintf(fsize,"%'.2fGB",vsize/(1024.0*1024.0*1024.0)); ++ g_string_sprintf(fsize,"%.2fGB",vsize/(1024.0*1024.0*1024.0)); + else if(vsize>(1024.0*1024.0)) + g_string_sprintf(fsize,"%.2fMB",vsize/(1024.0*1024.0)); + else if(vsize>(1024.0)) +@@ -565,9 +565,9 @@ static void update_users_info(void) } if( (amount/(1024.0*1024.0*1024.0)) > 1024.0) @@ -14,7 +23,7 @@ $NetBSD: patch-ad,v 1.3 2002/09/30 16:35:19 wiz Exp $ w=get_widget_by_widget_name("users_info_label"); if(w==NULL) return; -@@ -701,7 +701,7 @@ static void uinfo_fnc(const GString *s) +@@ -722,7 +722,7 @@ static void uinfo_fnc(const GString *s) fsize=g_string_new(""); if(vsize>(1024.0*1024.0*1024.0)) @@ -23,16 +32,16 @@ $NetBSD: patch-ad,v 1.3 2002/09/30 16:35:19 wiz Exp $ else if(vsize>(1024.0*1024.0)) g_string_sprintf(fsize,"%.2fMB",vsize/(1024.0*1024.0)); else if(vsize>(1024.0)) -@@ -1143,7 +1143,7 @@ static void srest_fnc(const GString *s) - gchar *nw[6]; - +@@ -1169,7 +1169,7 @@ static void srest_fnc(const GString *s) + nickuinfo.cnx_type[0]='\0'; /* no information available */ + } sscanf(size,"%lu",&fsize); - sprintf(buf_size,"%'lu",fsize); + sprintf(buf_size,"%lu",fsize); sscanf(dl_ratio,"%u/%u",&free_slot,&ttl_slot); -@@ -3105,7 +3105,7 @@ static void recursive_insert_new_user_cl +@@ -2938,7 +2938,7 @@ static void recursive_insert_new_user_cl nw[UFLC_TREE_COL]=new_leaf->c.file.filename+cur_string_pos; nw[UFLC_SIZE_COL]=bf; @@ -41,7 +50,7 @@ $NetBSD: patch-ad,v 1.3 2002/09/30 16:35:19 wiz Exp $ leaf_node=gtk_ctree_insert_node(ctree,*last_inserted_node,NULL,nw,5,NULL,NULL,NULL,NULL,TRUE,TRUE); /* it is a leaf */ gtk_ctree_node_set_row_data_full(ctree,leaf_node, new_leaf, (void*)free_user_file_cl_entry); -@@ -3915,7 +3915,7 @@ void second_level_glst_end_fnc(GtkCTree +@@ -3783,7 +3783,7 @@ void second_level_glst_end_fnc(GtkCTree gtk_ctree_node_set_text(ctree,cnode,2,strv[i]+temp_str_len); #else char buf_size[64]; @@ -50,7 +59,7 @@ $NetBSD: patch-ad,v 1.3 2002/09/30 16:35:19 wiz Exp $ gtk_ctree_node_set_text(ctree,cnode,2,buf_size); #endif gce->c.active_segment.remote_file_size=cur_size; -@@ -4008,7 +4008,7 @@ static void second_level_add_newly_creat +@@ -3890,7 +3890,7 @@ static void second_level_add_newly_creat unsigned long cur_size; cur_size=strtoul(f4[2],NULL,10); @@ -59,7 +68,7 @@ $NetBSD: patch-ad,v 1.3 2002/09/30 16:35:19 wiz Exp $ ent_array[0]=f4[0]; ent_array[1]=f4[1]; -@@ -4054,7 +4054,7 @@ static void second_level_add_newly_creat +@@ -3936,7 +3936,7 @@ static void second_level_add_newly_creat char out_range[512]; unsigned long lower, upper; sscanf(f2[1],"[%lu;%lu]",&lower,&upper); @@ -68,7 +77,7 @@ $NetBSD: patch-ad,v 1.3 2002/09/30 16:35:19 wiz Exp $ ent_array[0]=""; ent_array[1]=f2[0]; -@@ -4168,7 +4168,7 @@ static void first_level_glst_end_fnc(Gtk +@@ -4050,7 +4050,7 @@ static void first_level_glst_end_fnc(Gtk missing_bytes=gce_root->c.root.gdl_size-gce_root->c.root.received_bytes; spd_str=g_string_new(""); @@ -77,7 +86,7 @@ $NetBSD: patch-ad,v 1.3 2002/09/30 16:35:19 wiz Exp $ 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 +@@ -4058,11 +4058,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) { @@ -91,7 +100,7 @@ $NetBSD: patch-ad,v 1.3 2002/09/30 16:35:19 wiz Exp $ } /* Estimated Time to Arrival computation: now (in second) + missing_bytes/spd */ -@@ -4263,7 +4263,7 @@ void glst_end_fnc(const GString *in) +@@ -4145,7 +4145,7 @@ void glst_end_fnc(const GString *in) unsigned long size_gdl=strtoul(k[2],NULL,10); /* remove an entry with the same gdl_id */ diff --git a/net/dc_gui/patches/patch-af b/net/dc_gui/patches/patch-af index aef65b0af54..29feff5c193 100644 --- a/net/dc_gui/patches/patch-af +++ b/net/dc_gui/patches/patch-af @@ -1,11 +1,11 @@ -$NetBSD: patch-af,v 1.2 2002/10/03 11:44:40 wiz Exp $ +$NetBSD: patch-af,v 1.3 2002/11/03 21:32:25 wiz Exp $ ---- src/init_fnc.c.orig Wed Sep 25 17:12:36 2002 +--- src/init_fnc.c.orig Sun Nov 3 08:09:10 2002 +++ src/init_fnc.c -@@ -11,7 +11,13 @@ - #include +@@ -12,7 +12,13 @@ #include #include + #include +#ifdef __linux__ #include /* for the value of SEMVMX */ +#else @@ -15,4 +15,4 @@ $NetBSD: patch-af,v 1.2 2002/10/03 11:44:40 wiz Exp $ +#endif #include #include - #include + #include diff --git a/net/dc_gui/patches/patch-ag b/net/dc_gui/patches/patch-ag index ce43c6623e1..bdfd8b17f9c 100644 --- a/net/dc_gui/patches/patch-ag +++ b/net/dc_gui/patches/patch-ag @@ -1,8 +1,8 @@ -$NetBSD: patch-ag,v 1.2 2002/10/03 11:48:43 wiz Exp $ +$NetBSD: patch-ag,v 1.3 2002/11/03 21:32:26 wiz Exp $ ---- src/main.c.orig Fri Aug 23 18:41:11 2002 +--- src/main.c.orig Fri Oct 11 17:45:44 2002 +++ src/main.c -@@ -329,6 +329,23 @@ main (int argc, char *argv[]) +@@ -372,6 +372,23 @@ main (int argc, char *argv[]) dctc_dir=g_string_new(NULL); g_string_sprintf(dctc_dir,"%s/running",dctc_main_dir->str); -- cgit v1.2.3