From fc8791deba558b535e54d632ec875320deb5d6dc Mon Sep 17 00:00:00 2001 From: Marcos Pinto Date: Thu, 5 Jul 2007 23:50:05 +0000 Subject: [PATCH] little touchup and uninstall --- Makefile | 17 +++++++++++++++-- src/interface.py | 4 +++- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index f5b03eabb..d5ea3f6cf 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ # Makefile for Deluge # -PREFIX = /usr +PREFIX = /usr/local all: @@ -12,4 +12,17 @@ install: python setup.py install --prefix=$(PREFIX) clean: - python setup.py clean; rm -rf ./build; rm msgfmt.pyc + python setup.py clean + rm -rf ./build + rm msgfmt.pyc + find . -name *.pyc -exec rm {} \; + +uninstall: + #find /usr -name deluge + -rm $(PREFIX)/bin/deluge + -rm -r $(PREFIX)/lib/python2.5/site-packages/deluge + -rm -r $(PREFIX)/lib/python2.5/site-packages/deluge-*.egg-info + -rm -r $(PREFIX)/share/deluge + -find ${PREFIX}/share/locale -name deluge.mo -exec rm {} \; + -rm $(PREFIX)/share/applications/deluge.desktop + -rm $(PREFIX)/share/pixmaps/deluge.xpm diff --git a/src/interface.py b/src/interface.py index 2c69c5ea9..bcfb6390a 100644 --- a/src/interface.py +++ b/src/interface.py @@ -1156,7 +1156,9 @@ class DelugeGTK: dlg.vbox.pack_start(entry) clip = gtk.clipboard_get(selection='PRIMARY') text = clip.wait_for_text() - entry.set_text(text) + #watch out for an empty clipboard, TODO check for non url garbage + if text: + entry.set_text(text) dlg.show_all() result = dlg.run() url = entry.get_text()