diff --git a/src/dgtk.py b/src/dgtk.py index c22e993a4..308835baf 100644 --- a/src/dgtk.py +++ b/src/dgtk.py @@ -40,15 +40,6 @@ import pygtk pygtk.require('2.0') import gtk -# This is a dummy tray object to allow Deluge to run on PyGTK < 2.9 -class StupidTray: - def __init__(self): - pass - def set_visible(self, value): - pass - def set_tooltip(self, value): - pass - ## Cell data functions to pass to add_func_column() def cell_data_speed(column, cell, model, iter, data): diff --git a/src/interface.py b/src/interface.py index 45b235f20..6f70618d1 100644 --- a/src/interface.py +++ b/src/interface.py @@ -80,15 +80,8 @@ class DelugeGTK: self.statusbar = self.wtree.get_widget("statusbar") - ## Construct the Interface - try: - self.build_tray_icon() - except AttributeError: - #python-pygtk is < 2.9 - self.tray_icon = dgtk.StupidTray() - self.has_tray = False - else: - self.has_tray = True + self.build_tray_icon() + self.has_tray = True self.build_torrent_table() self.load_status_icons()