diff --git a/run_svn.sh b/run_svn.sh index 9aaf1ff04..681ad70ef 100644 --- a/run_svn.sh +++ b/run_svn.sh @@ -8,6 +8,10 @@ # a working copy of Deluge-SVN # +echo "For now, you'll have to install Deluge to run it" +exit + + if [ -d ./working/ ] then echo " Removing old files: " diff --git a/scripts/deluge b/scripts/deluge index 8a053d3de..c007ba6a9 100755 --- a/scripts/deluge +++ b/scripts/deluge @@ -50,8 +50,8 @@ interface = None if not "org.deluge_torrent.Deluge" in dbus_objects: print "no existing Deluge session" - import delugegtk - interface = delugegtk.DelugeGTK() + import deluge, deluge.delugegtk + interface = deluge.delugegtk.DelugeGTK() for arg in args: apath = os.path.abspath(arg) if apath.endswith(".torrent"): diff --git a/setup.py b/setup.py index cf164e371..94650b822 100644 --- a/setup.py +++ b/setup.py @@ -89,7 +89,7 @@ setup(name="deluge", fullname="Deluge BitTorrent Client", version="0.5.0", packages=['deluge'], package_dir = {'deluge': 'src'}, data_files=[("share/deluge/glade", ["glade/delugegtk.glade", "glade/dgtkpopups.glade", "glade/dgtkpref.glade"]), - ("share/deluge/pixmaps", ["pixmaps/deluge32.png","pixmaps/deluge128.png"])], - ext_package='deluge', + ("share/deluge/pixmaps", ["pixmaps/deluge32.png","pixmaps/deluge128.png", "pixmaps/deluge256.png"])], + ext_package='deluge', ext_modules=[deluge_core] ) diff --git a/src/deluge.py b/src/deluge.py index 1c57bc1df..5acc70d68 100644 --- a/src/deluge.py +++ b/src/deluge.py @@ -36,7 +36,6 @@ # time to calculate, so we do if efficiently # 3. supp_torrent_state - supplementary torrent data, from Deluge - import deluge_core import os, shutil import pickle