From 0155df2d582cab3ab300f050ba35b8787ac86703 Mon Sep 17 00:00:00 2001 From: Marcos Pinto Date: Tue, 5 Jun 2007 03:16:26 +0000 Subject: [PATCH] freebsd fix oops --- setup.py | 12 ++++++------ src/interface.py | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/setup.py b/setup.py index 2a351ccbb..90d443d9e 100644 --- a/setup.py +++ b/setup.py @@ -36,12 +36,12 @@ if platform.system() == "Linux": elif platform.system() == "Darwin" : print "Darwin / OS X system detected" OS = "osx" +elif platform.system() == "FreeBSD" : + print "FreeBSD operating system detected" + OS = "freebsd" elif platform.system() == "Windows": print "Windows system detected" OS = "win" -elif platform.system() == "FreeBSD": - print "FreeBSD system detected" - OS = "freebsd" elif os.name == "posix": print "Unix system detected" OS = "nix" @@ -90,16 +90,15 @@ if ARCH == "x64": # it has been removed to prevent confusion. if not OS == "win": - if OS == "linux": if os.WEXITSTATUS(os.system('grep -q "Debian GNU/Linux 4.0\|Ubuntu 7.04\|Ubuntu 6.06\|Fedora Core release 6" /etc/issue')) == 0: boosttype = 'nomt' + else: + boosttype = 'mt' elif OS == "freebsd": boosttype = 'nomt' else: boosttype = 'mt' - - removals = ['-g', '-DNDEBUG', '-O2', '-Wstrict-prototypes'] additions = ['-DNDEBUG', '-O2'] @@ -317,3 +316,4 @@ setup(name=NAME, fullname=FULLNAME, version=VERSION, ext_modules=[deluge_core], cmdclass=cmdclass ) + diff --git a/src/interface.py b/src/interface.py index 8c04f92ee..39b6054a7 100644 --- a/src/interface.py +++ b/src/interface.py @@ -378,7 +378,7 @@ class DelugeGTK: self.name_column = dgtk.add_text_column(self.torrent_view, _("Name"), 2) self.size_column = dgtk.add_func_column(self.torrent_view, _("Size"), size, 3) self.status_column = dgtk.add_progress_column(self.torrent_view, _("Status"), 4, 5) - self.seed_column = dgtk.add_func_column(self.torrent_view, _("Seeders"), peer, (6, 7)) + self.seed_column = dgtk.add_func_column(self.torrent_view, _("Seeders"), seed, (6, 7)) self.peer_column = dgtk.add_func_column(self.torrent_view, _("Peers"), peer, (8, 9)) self.dl_column = dgtk.add_func_column(self.torrent_view, _("Download"), rate, 10) self.ul_column = dgtk.add_func_column(self.torrent_view, _("Upload"), rate, 11)