diff options
| -rw-r--r-- | pulsecaster/source.py | 9 | ||||
| -rw-r--r-- | pulsecaster/ui.py | 6 |
2 files changed, 6 insertions, 9 deletions
diff --git a/pulsecaster/source.py b/pulsecaster/source.py index a65b080..daabff8 100644 --- a/pulsecaster/source.py +++ b/pulsecaster/source.py @@ -18,9 +18,8 @@ # Author: Paul W. Frields <stickster@gmail.com> from config import * -from gi.repository import Gtk +from gi.repository import Gtk, GObject import pygst -import gobject pygst.require('0.10') import gst from pulseaudio.PulseObj import PulseObj @@ -30,9 +29,9 @@ class PulseCasterSource: def __init__(self): '''Construct the source object''' # Should include a PA source, a GtkCombBox, and a GtkProgressBar - self.store = Gtk.ListStore(gobject.TYPE_STRING, - gobject.TYPE_STRING, - gobject.TYPE_PYOBJECT) + self.store = Gtk.ListStore(GObject.TYPE_STRING, + GObject.TYPE_STRING, + GObject.TYPE_PYOBJECT) self.bus = None self.cbox = Gtk.ComboBox.new_with_model(self.store) self.cell = Gtk.CellRendererText() diff --git a/pulsecaster/ui.py b/pulsecaster/ui.py index c0715a7..601029c 100644 --- a/pulsecaster/ui.py +++ b/pulsecaster/ui.py @@ -24,12 +24,10 @@ import gconfig from pulseaudio.PulseObj import PulseObj from listener import * from source import * -import gobject -from gi.repository import Gtk +from gi.repository import Gtk, GObject import os import sys import tempfile -from gobject import timeout_add as gobject_timeout_add import pygst pygst.require('0.10') import gst @@ -270,7 +268,7 @@ class PulseCasterUI: self.starttime = datetime.now() self._update_time() self.timeout = 1000 - gobject_timeout_add(self.timeout, self._update_time) + GObject.timeout_add(self.timeout, self._update_time) self.trayicon.set_visible(True) def on_stop(self, *args): |