Index: channels/__init__.py ================================================================== --- channels/__init__.py +++ channels/__init__.py @@ -11,11 +11,11 @@ # pack: # bookmarks.py configwin.py streamedit.py history.py search.py links.py # icast.py internet_radio.py itunes.py jamendo.py live365.py global_key.py # modarchive.py myoggradio.py punkcast.py radiobrowser.py radiotray.py # shoutcast.py surfmusik.py timer.py tunein.py xiph.py youtube.py -# exportcat.py useragentswitcher.py somafm.py dnd.py +# exportcat.py useragentswitcher.py somafm.py dnd.py ubuntuusers.py # config: - # priority: core # # GenericChannel implements the basic GUI functions and defines # the default channel data structure. It implements fallback logic @@ -26,11 +26,11 @@ # GtkBuilder description. They derive from ChannelPlugins therefore, # which constructs and registers the required gtk widgets manually. import gtk -from uikit import uikit +from uikit import uikit, ver as gtk_ver from config import * import ahttp as http import action import favicon import os.path @@ -300,11 +300,14 @@ conf.save("cache/" + self.module, self.streams, gz=1) # called occasionally while retrieving and parsing def update_streams_partially_done(self, entries): - uikit.do(uikit.columns, self.gtk_list, self.datamap, entries) + if gtk_ver == 3 and not conf.nothreads: + pass + else: # kills Gtk3 too easily + uikit.do(uikit.columns, self.gtk_list, self.datamap, entries) # finds differences in new/old streamlist, marks deleted with flag def deleted_streams(self, new, old): diff = []