From: Fredrik Tolf Date: Sat, 1 Sep 2007 12:15:44 +0000 (+0200) Subject: Merge branch 'master' of git.dolda2000.com:/srv/git/r/doldaconnect X-Git-Tag: 1.0~38 X-Git-Url: http://git.dolda2000.com/gitweb/?p=doldaconnect.git;a=commitdiff_plain;h=8efceeb63faf9c6968da9f4dfe581490dd6cd4b4;hp=a0ca560ebe8e201c8c3c29f3168eae45fcd55beb Merge branch 'master' of git.dolda2000.com:/srv/git/r/doldaconnect --- diff --git a/autopackage/@bzip.org/libbz2/skeleton.1 b/autopackage/@bzip.org/libbz2/skeleton.1 new file mode 100644 index 0000000..63a9496 --- /dev/null +++ b/autopackage/@bzip.org/libbz2/skeleton.1 @@ -0,0 +1,11 @@ +# -*-shell-script-*- + +[Meta] +RootName: @bzip.org/libbz2 +DisplayName: bzip2 library +ShortName: libbz2 +Skeleton-Author: Fredrik Tolf +Skeleton-Version: 1 + +[Test] +INTERFACE_VERSIONS=$(testForLib -i libbz2.so) diff --git a/autopackage/@gnu.org/gdbm/skeleton.1 b/autopackage/@gnu.org/gdbm/skeleton.1 new file mode 100644 index 0000000..470d3c1 --- /dev/null +++ b/autopackage/@gnu.org/gdbm/skeleton.1 @@ -0,0 +1,11 @@ +# -*-shell-script-*- + +[Meta] +RootName: @gnu.org/gdbm +DisplayName: GNU dbm +ShortName: gdbm +Skeleton-Author: Fredrik Tolf +Skeleton-Version: 1 + +[Test] +INTERFACE_VERSIONS=$(testForLib -i libgdbm.so) diff --git a/autopackage/dcuilib.apspec.in b/autopackage/dcuilib.apspec.in index 1f4c860..a80f77f 100644 --- a/autopackage/dcuilib.apspec.in +++ b/autopackage/dcuilib.apspec.in @@ -8,17 +8,18 @@ Maintainer: Fredrik Tolf Packager: Fredrik Tolf Summary: A library used by programs interfacing against the Dolda Connect daemon URL: http://www.dolda2000.com/~fredrik/doldaconnect/ -License: GNU General Public License, Version 2 +License: GNU General Public License, Version 2 or later SoftwareVersion: @VERSION@ -AutopackageTarget: 1.0 -InterfaceVersion: 0.0 +Repository: http://www.dolda2000.com/~fredrik/doldaconnect/ap/doldaconnect-uilib.xml +AutopackageTarget: 1.2 +InterfaceVersion: 1.1 [Description] The Dolda Connect interface library is used by programs for talking with the Dolda Connect daemon. [BuildPrepare] -prepareBuild +prepareBuild --without-krb5 --disable-daemon --disable-gtk2ui [BuildUnprepare] unprepareBuild @@ -27,10 +28,9 @@ unprepareBuild echo lib | import [Prepare] -require @mit.edu/krb5 3.2 [Install] -installLib lib/libdcui.so.0.0.0 +installLib lib/libdcui.so.1.1.0 [Uninstall] uninstallFromLog diff --git a/autopackage/dolcon.apspec.in b/autopackage/dolcon.apspec.in index ae56e30..2263f69 100644 --- a/autopackage/dolcon.apspec.in +++ b/autopackage/dolcon.apspec.in @@ -8,9 +8,10 @@ Maintainer: Fredrik Tolf Packager: Fredrik Tolf Summary: A user interface module for Dolda Connect using GTK 2. URL: http://www.dolda2000.com/~fredrik/doldaconnect/ -License: GNU General Public License, Version 2 +License: GNU General Public License, Version 2 or later SoftwareVersion: @VERSION@ -AutopackageTarget: 1.0 +AutopackageTarget: 1.2 +Repository: http://www.dolda2000.com/~fredrik/doldaconnect/ap/doldaconnect-gtk.xml # Only uncomment InterfaceVersion if your package exposes interfaces to other software, # for instance if it includes DSOs or python/perl modules. See the developer guide for more info, @@ -28,7 +29,7 @@ it is the daemon that does that. This program only controls the daemon. [BuildPrepare] -prepareBuild --enable-gtk2ui --disable-gnomeapplet +prepareBuild --enable-gtk2ui --disable-daemon --disable-dolconf --disable-guishell [BuildUnprepare] unprepareBuild @@ -38,11 +39,10 @@ echo bin/dolcon share | import [Prepare] require @gtk.org/gtk 2.0 -require @mit.edu/krb5 3.2 -require @dolda2000.com/fredrik/doldaconnect/dcuilib 0.0 +require @dolda2000.com/fredrik/doldaconnect/dcuilib 1.1 [Install] -installExe dolcon +installExe bin/dolcon installLocale share/locale [Uninstall] diff --git a/autopackage/doldacond.apspec.in b/autopackage/doldacond.apspec.in index 576740a..6fd47b1 100644 --- a/autopackage/doldacond.apspec.in +++ b/autopackage/doldacond.apspec.in @@ -10,7 +10,8 @@ Summary: The main Dolda Connect file-sharing program. URL: http://www.dolda2000.com/~fredrik/doldaconnect/ License: GNU General Public License, Version 2 or later SoftwareVersion: @VERSION@ -AutopackageTarget: 1.0 +AutopackageTarget: 1.2 +Repository: http://www.dolda2000.com/~fredrik/doldaconnect/ap/doldaconnect-daemon.xml # Only uncomment InterfaceVersion if your package exposes interfaces to other software, # for instance if it includes DSOs or python/perl modules. See the developer guide for more info, @@ -26,7 +27,7 @@ Note that, unless you really want to talk to the daemon using telnet, you will also want a user interface program to control it. [BuildPrepare] -prepareBuild --disable-gtk2ui --without-krb5 +prepareBuild --without-gtk2 --without-krb5 --without-keyutils --without-pam [BuildUnprepare] unprepareBuild @@ -35,6 +36,9 @@ unprepareBuild echo bin/doldacond bin/locktouch bin/tthsum libexec/speedrec share/man etc | import [Prepare] +require @zlib.org/zlib 1 +require @bzip.org/libbz2 1 +require @gnu.org/gdbm 3 [Install] installExe bin/doldacond bin/locktouch bin/tthsum diff --git a/clients/gui-shell/dsh.c b/clients/gui-shell/dsh.c index 62cf0e4..1922aaf 100644 --- a/clients/gui-shell/dsh.c +++ b/clients/gui-shell/dsh.c @@ -48,6 +48,7 @@ struct trinfo { int ostate; int opos, spos, speed; time_t lastprog; + int warned; double sprog; }; @@ -288,11 +289,14 @@ void updatetrinfo(void) if(tri->opos != tr->curpos) { tri->opos = tr->curpos; tri->lastprog = now; + tri->warned = 0; } -#ifdef NOTIFY - if((tr->state = DC_TRNS_MAIN) && (now - tri->lastprog > 600)) { - if(dcpid == 0) +#ifdef HAVE_NOTIFY + if((tr->state = DC_TRNS_MAIN) && (now - tri->lastprog > 600) && !tri->warned) { + if(dcpid == 0) { notify(&trnote, "transfer.error", _("Transfer stalled"), _("The transfer of %ls from %ls has not made progress for 10 minutes"), getfilename(tr->path), tr->peernick); + tri->warned = 1; + } } #endif if((tr->state == DC_TRNS_MAIN) && (dnow - tri->sprog > 10)) {