From 3e79929585d080e2580d72c081040cc3c20159c7 Mon Sep 17 00:00:00 2001
From: Tom Tromey <tom@tromey.com>
Date: Fri, 14 Jun 2013 15:01:02 -0600
Subject: [PATCH] add gui.startup.create_builder

this pulls some repeated code out into a separate function
---
 gui/logwindow.py |  4 +---
 gui/source.py    |  5 +----
 gui/startup.py   | 11 +++++++++--
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/gui/logwindow.py b/gui/logwindow.py
index 3fbba37..ce78183 100644
--- a/gui/logwindow.py
+++ b/gui/logwindow.py
@@ -19,7 +19,6 @@ import gdb
 import gui.toplevel
 import gui.startup
 from gi.repository import Gtk
-import os.path
 import functools
 
 default_log_window = None
@@ -32,8 +31,7 @@ class LogWindow(gui.toplevel.Toplevel):
         gui.startup.send_to_gtk(self._initialize)
 
     def _initialize(self):
-        builder = Gtk.Builder()
-        builder.add_from_file(os.path.join(gui.self_dir, 'logwindow.xml'))
+        builder = gui.startup.create_builder('logwindow.xml')
         builder.connect_signals(self)
 
         self.window = builder.get_object('logwindow')
diff --git a/gui/source.py b/gui/source.py
index 3d49f21..d3fc98d 100644
--- a/gui/source.py
+++ b/gui/source.py
@@ -19,7 +19,6 @@ import gdb
 from gui.invoker import Invoker
 from gui.toplevel import Toplevel
 import gui.startup
-import os.path
 import gui.toplevel
 
 from gi.repository import Gtk, GtkSource, GObject, Gdk
@@ -155,9 +154,7 @@ class SourceWindow(Toplevel):
         self.do_finish = Invoker("finish")
         self.do_stop = Invoker("interrupt")
 
-        builder = Gtk.Builder()
-        builder.add_from_file(os.path.join(gui.self_dir, 'sourcewindow.xml'))
-
+        builder = gui.startup.create_builder('sourcewindow.xml')
         builder.connect_signals(self)
         self.window = builder.get_object("sourcewindow")
         self.view = builder.get_object("view")
diff --git a/gui/startup.py b/gui/startup.py
index 45d0425..894b41c 100644
--- a/gui/startup.py
+++ b/gui/startup.py
@@ -16,14 +16,15 @@
 import gdb
 import threading
 import Queue
+import os
+import os.path
+import gui
 
 import fix_signals
 fix_signals.save()
 
 from gi.repository import Gtk, Gdk, GObject, GtkSource
 
-import os
-
 (read_pipe, write_pipe) = os.pipe()
 
 _event_queue = Queue.Queue()
@@ -57,3 +58,9 @@ def start_gtk():
         _t.setDaemon(True)
         _t.start()
         fix_signals.restore()
+
+def create_builder(filename):
+    builder = Gtk.Builder()
+    builder.add_from_file(os.path.join(gui.self_dir, filename))
+    return builder
+