[ontv] cb_status callback always recieve strings



commit ced46464d3146162d65414726b80fca36ae004d5
Author: Olof Kindgren <olki src gnome org>
Date:   Tue Aug 31 19:18:27 2010 +0200

    cb_status callback always recieve strings
    
    Removed unnecessary check in callback method by passing "" instead
    of None

 bin/ontv.in       |    5 +----
 ontv/ontv_core.py |    6 +++---
 2 files changed, 4 insertions(+), 7 deletions(-)
---
diff --git a/bin/ontv.in b/bin/ontv.in
index c825788..08caa00 100644
--- a/bin/ontv.in
+++ b/bin/ontv.in
@@ -94,10 +94,7 @@ class OnTVStatusIcon:
     gtk.main_quit()
 
   def cb_status(self, msg):
-    if msg:
-      self.statusIcon.set_tooltip(msg)
-    else:
-      self.statusIcon.set_tooltip("")
+    self.statusIcon.set_tooltip(msg)
 
   def run(self):
     gtk.gdk.threads_init()
diff --git a/ontv/ontv_core.py b/ontv/ontv_core.py
index c8dd07f..f6bcda7 100644
--- a/ontv/ontv_core.py
+++ b/ontv/ontv_core.py
@@ -134,15 +134,15 @@ class OnTVCore:
         self.cb_status(activity)
 
     def __xmltvfile_downloading_done(self, xmltvfile, pid, condition):
-        self.cb_status(None)
+        self.cb_status("")
         self.xmltvfile.sort()
 
     def __xmltvfile_sorting_done(self, xmltvfile, pid, condition):
-        self.cb_status(None)
+        self.cb_status("")
         self.xmltvfile.load()
 
     def __xmltvfile_loading_done(self, xmltvfile, listings):
-        self.cb_status(None)
+        self.cb_status("")
 
     def get_program_window_size(self):
         return self.pw.get_window_size()



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]