More work on packages refactoring, mostly working

activities/browser/BrowserActivity.py

@@ -6,7 +6,7 @@ pygtk.require('2.0')
 import gtk
 import geckoembed
 
-from sugar.activity import activity
+from sugar.activity.Activity import Activity
 from sugar.presence.PresenceService import PresenceService
 from sugar.p2p.model.LocalModel import LocalModel
 from sugar.p2p.model.RemoteModel import RemoteModel
@@ -18,13 +18,13 @@ _BROWSER_ACTIVITY_TYPE = "_web_olpc._udp"
 _SERVICE_URI_TAG = "URI"
 _SERVICE_TITLE_TAG = "Title"
 
-class BrowserActivity(activity.Activity):
+class BrowserActivity(Activity):
 	SOLO = 1
 	FOLLOWING = 2
 	LEADING = 3
 
 	def __init__(self, uri, mode = SOLO):
-		activity.Activity.__init__(self, _BROWSER_ACTIVITY_TYPE)
+		Activity.__init__(self, _BROWSER_ACTIVITY_TYPE)
 		self.uri = uri
 		self._mode = mode
 		

activities/browser/Makefile.am

@@ -1,4 +1,4 @@
-sugardir = $(pythondir)/sugar/browser
+sugardir = $(pkgdatadir)/activities/browser
 sugar_PYTHON =			\
 	__init__.py		\
 	browser.py		\
@@ -8,18 +8,7 @@ sugar_PYTHON =			\
 	BrowserActivity.py      \
 	NavigationToolbar.py
 
-icondir = $(pkgdatadir)
-icon_DATA =		\
-	fold.png	\
-	unfold.png
-
-rcdir = $(pkgdatadir)
-rc_DATA = browser.rc
-
-activitydir = $(pkgdatadir)/activities
+activitydir = $(pkgdatadir)/activities/browser
 activity_DATA = browser.activity
 
-EXTRA_DIST =			\
-	$(rc_DATA)		\
-	$(activity_DATA)	\
-	$(icon_DATA)
+EXTRA_DIST = $(activity_DATA)

activities/browser/browser.py

@@ -6,15 +6,13 @@ import gtk
 import dbus
 
 import sugar.env
-from sugar.session.LogWriter import LogWriter
+from sugar.LogWriter import LogWriter
 
 from BrowserShell import BrowserShell
 
 log_writer = LogWriter("Web")
 log_writer.start()
 
-gtk.rc_parse(sugar.env.get_data_file('browser.rc'))
-
 session_bus = dbus.SessionBus()
 bus_name = dbus.service.BusName('com.redhat.Sugar.Browser', bus=session_bus)
 shell = BrowserShell(bus_name)

activities/browser/browser.rc

@@ -1,7 +0,0 @@
-style "NotificationBarButton" = "button"
-{
-    xthickness = 0
-    ythickness = 0
-}
-
-widget "*.notif bar.*GtkButton*" style "NotificationBarButton"