Automakeify

1 files changed, 17 insertions, 15 deletions

diff --git a/browser/browser.py b/browser/browser.py
index c2ad8e1..fbb16f8 100755
--- a/browser/browser.py
+++ b/browser/browser.py
@@ -11,9 +11,10 @@ import gtk
 import geckoembed
 
 import sys
-sys.path.append('../shell/example-activity/')
 import activity
 
+from sugar_globals import *
+
 class AddressToolbar(gtk.Toolbar):
 	def __init__(self):
 		gtk.Toolbar.__init__(self)
@@ -60,14 +61,14 @@ class AddressEntry(gtk.HBox):
 	def _update_folded_state(self):
 		if self.folded:
 			image = gtk.Image()
-			image.set_from_file("unfold.png")
+			image.set_from_file(data_dir + "/unfold.png")
 			self.button.set_image(image)
 			image.show()
 
 			self.entry.hide()
 		else:
 			image = gtk.Image()
-			image.set_from_file("fold.png")
+			image.set_from_file(data_dir + "/fold.png")
 			self.button.set_image(image)
 			image.show()
 
@@ -233,15 +234,16 @@ class BrowserShell(dbus.service.Object):
 		browser = BrowserActivity(uri)
 		self.__browsers.append(browser)
 		browser.activity_connect_to_shell()
-      
-web_activity = WebActivity()
-web_activity.activity_connect_to_shell()
-
-session_bus = dbus.SessionBus()
-bus_name = dbus.service.BusName('com.redhat.Sugar.Browser', bus=session_bus)
-browser_shell = BrowserShell(bus_name)
-
-try:
-	gtk.main()
-except KeyboardInterrupt:
-	pass
+
+def main():      
+	web_activity = WebActivity()
+	web_activity.activity_connect_to_shell()
+
+	session_bus = dbus.SessionBus()
+	bus_name = dbus.service.BusName('com.redhat.Sugar.Browser', bus=session_bus)
+	browser_shell = BrowserShell(bus_name)
+
+	try:
+		gtk.main()
+	except KeyboardInterrupt:
+		pass