6 files changed, 8 insertions, 8 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index 87ce98ac..b877ffcf 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -227,9 +227,9 @@ libaria2c_a_SOURCES = $(SRCS)
 aria2c_LDADD = libaria2c.a @LIBINTL@ @ALLOCA@ @LIBGNUTLS_LIBS@\
 	@LIBGCRYPT_LIBS@ @OPENSSL_LIBS@ @XML_LIBS@ @LIBARES_LIBS@\
 	@LIBCARES_LIBS@
-aria2c_LDFLAGS = -pg
+#aria2c_LDFLAGS = -pg
 AM_CPPFLAGS =  -Wall\
 	-I../lib -I../intl -I$(top_srcdir)/intl\
 	@LIBGNUTLS_CFLAGS@ @LIBGCRYPT_CFLAGS@ @OPENSSL_CFLAGS@ @XML_CPPFLAGS@\
 	@LIBARES_CPPFLAGS@ @LIBCARES_CPPFLAGS@\
-	-D_FILE_OFFSET_BITS=64 -DLOCALEDIR=\"$(localedir)\" @DEFS@  -pg
\ No newline at end of file
+	-D_FILE_OFFSET_BITS=64 -DLOCALEDIR=\"$(localedir)\" @DEFS@ # -pg
\ No newline at end of file
diff --git a/src/Makefile.in b/src/Makefile.in
index be215f12..bbc28cbc 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -668,12 +668,12 @@ aria2c_LDADD = libaria2c.a @LIBINTL@ @ALLOCA@ @LIBGNUTLS_LIBS@\
 	@LIBGCRYPT_LIBS@ @OPENSSL_LIBS@ @XML_LIBS@ @LIBARES_LIBS@\
 	@LIBCARES_LIBS@
 
-aria2c_LDFLAGS = -pg
+#aria2c_LDFLAGS = -pg
 AM_CPPFLAGS = -Wall\
 	-I../lib -I../intl -I$(top_srcdir)/intl\
 	@LIBGNUTLS_CFLAGS@ @LIBGCRYPT_CFLAGS@ @OPENSSL_CFLAGS@ @XML_CPPFLAGS@\
 	@LIBARES_CPPFLAGS@ @LIBCARES_CPPFLAGS@\
-	-D_FILE_OFFSET_BITS=64 -DLOCALEDIR=\"$(localedir)\" @DEFS@  -pg
+	-D_FILE_OFFSET_BITS=64 -DLOCALEDIR=\"$(localedir)\" @DEFS@ # -pg
 
 all: all-am
 
diff --git a/src/PeerListenCommand.cc b/src/PeerListenCommand.cc
index 74581569..92dd04bc 100644
--- a/src/PeerListenCommand.cc
+++ b/src/PeerListenCommand.cc
@@ -98,7 +98,7 @@ bool PeerListenCommand::execute() {
 	}
       }
     } catch(RecoverableException* ex) {
-      logger->error("CUID#%d - error in accepting connection", ex, cuid);
+      logger->debug("CUID#%d - error in accepting connection", ex, cuid);
       delete ex;
     }		    
   }
diff --git a/src/TorrentConsoleDownloadEngine.cc b/src/TorrentConsoleDownloadEngine.cc
index 1b411a29..c8fd7034 100644
--- a/src/TorrentConsoleDownloadEngine.cc
+++ b/src/TorrentConsoleDownloadEngine.cc
@@ -49,8 +49,8 @@ void TorrentConsoleDownloadEngine::sendStatistics() {
     printf("Download Completed.");
   } else {
     printf("%s/%sB %d%% %s D:%.2f",
-	   Util::llitos(downloadLength, true).c_str(),
-	   Util::llitos(totalLength, true).c_str(),
+	   Util::abbrevSize(downloadLength).c_str(),
+	   Util::abbrevSizellitos(totalLength).c_str(),
 	   (totalLength == 0 ?
 	    0 : (int)((downloadLength*100)/totalLength)),
 	   avgSpeed == 0 ? "-" : Util::secfmt(eta).c_str(),
diff --git a/src/TrackerSegmentManFactory.cc b/src/TrackerSegmentManFactory.cc
index 63dafa31..e203c2bd 100644
--- a/src/TrackerSegmentManFactory.cc
+++ b/src/TrackerSegmentManFactory.cc
@@ -40,6 +40,5 @@ SegmentManHandle TrackerSegmentManFactory::createNewInstance()
   SegmentManHandle segmentMan = new SegmentMan();
   segmentMan->diskWriter = new ByteArrayDiskWriter();
   segmentMan->option = _option;
-  segmentMan->ufilename = "[tracker.announce]";
   return segmentMan;
 }
diff --git a/src/TrackerWatcherCommand.cc b/src/TrackerWatcherCommand.cc
index 5b4b2b64..7c463251 100644
--- a/src/TrackerWatcherCommand.cc
+++ b/src/TrackerWatcherCommand.cc
@@ -88,6 +88,7 @@ Command* TrackerWatcherCommand::createCommand() {
 Command* TrackerWatcherCommand::createRequestCommand(const string& url)
 {
   RequestGroupHandle rg = new RequestGroup(url, e->option);
+  rg->setUserDefinedFilename("[tracker.announce]");
   rg->isTorrent = true;
   rg->setSegmentManFactory(new TrackerSegmentManFactory(e->option));
   e->_requestGroupMan->addRequestGroup(rg);