From 4d081a0ed759bd526ab01849d650bd9e8d80ddd1 Mon Sep 17 00:00:00 2001 From: Chris Larson Date: Thu, 9 Dec 2010 14:05:22 -0500 Subject: Rename the ui 'init' method to 'main' As these may run the UI in a blocking fashion and then return the exit code, 'init' was an inappropriate name, and 'main' is more appropriate. Signed-off-by: Chris Larson --- lib/bb/ui/depexp.py | 2 +- lib/bb/ui/goggle.py | 2 +- lib/bb/ui/knotty.py | 2 +- lib/bb/ui/ncurses.py | 2 +- lib/bb/ui/puccho.py | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) (limited to 'lib') diff --git a/lib/bb/ui/depexp.py b/lib/bb/ui/depexp.py index 6fd18d168..f0297a3bc 100644 --- a/lib/bb/ui/depexp.py +++ b/lib/bb/ui/depexp.py @@ -185,7 +185,7 @@ class gtkthread(threading.Thread): gtk.main() gtkthread.quit.set() -def init(server, eventHandler): +def main(server, eventHandler): try: cmdline = server.runCommand(["getCmdLineAction"]) diff --git a/lib/bb/ui/goggle.py b/lib/bb/ui/goggle.py index 858ca14c4..40923ba88 100644 --- a/lib/bb/ui/goggle.py +++ b/lib/bb/ui/goggle.py @@ -49,7 +49,7 @@ class MainWindow (gtk.Window): self.set_default_size(640, 480) scrolled_window.add (self.cur_build_tv) -def init (server, eventHandler): +def main (server, eventHandler): gobject.threads_init() gtk.gdk.threads_init() diff --git a/lib/bb/ui/knotty.py b/lib/bb/ui/knotty.py index dea1fd99a..a60c1853a 100644 --- a/lib/bb/ui/knotty.py +++ b/lib/bb/ui/knotty.py @@ -66,7 +66,7 @@ class BBLogFormatter(logging.Formatter): else: return logging.Formatter.format(self, record) -def init(server, eventHandler): +def main(server, eventHandler): # Get values of variables which control our output includelogs = server.runCommand(["getVariable", "BBINCLUDELOGS"]) diff --git a/lib/bb/ui/ncurses.py b/lib/bb/ui/ncurses.py index 3fed4c58a..3bc837396 100644 --- a/lib/bb/ui/ncurses.py +++ b/lib/bb/ui/ncurses.py @@ -324,7 +324,7 @@ class NCursesUI: shutdown = shutdown + 1 pass -def init(server, eventHandler): +def main(server, eventHandler): if not os.isatty(sys.stdout.fileno()): print("FATAL: Unable to run 'ncurses' UI without a TTY.") return diff --git a/lib/bb/ui/puccho.py b/lib/bb/ui/puccho.py index a627fc803..3ce4590c1 100644 --- a/lib/bb/ui/puccho.py +++ b/lib/bb/ui/puccho.py @@ -390,7 +390,7 @@ def running_build_failed_cb (running_build, manager): print("build failed") manager.notify_build_failed () -def init (server, eventHandler): +def main (server, eventHandler): # Initialise threading... gobject.threads_init() gtk.gdk.threads_init() -- cgit 1.2.3-korg