diff options
| author | Dan Williams <dcbw@redhat.com> | 2006-06-07 16:23:14 (GMT) |
|---|---|---|
| committer | Dan Williams <dcbw@redhat.com> | 2006-06-07 16:23:14 (GMT) |
| commit | a0ed2fa232f54a93199c94f8efff169d52556667 (patch) | |
| tree | 6d898d1426fa6243fb3561759167c6ee4da4620b /sugar | |
| parent | f7cd0939c4fdf8cb8f44185fb2796f9adaed12df (diff) | |
merge
Diffstat (limited to 'sugar')
| -rw-r--r-- | sugar/browser/Makefile.am | 7 | ||||
| -rw-r--r-- | sugar/p2p/presence.py | 4 | ||||
| -rw-r--r-- | sugar/shell/Makefile.am | 3 |
3 files changed, 10 insertions, 4 deletions
diff --git a/sugar/browser/Makefile.am b/sugar/browser/Makefile.am index 7aacdd8..5a709c0 100644 --- a/sugar/browser/Makefile.am +++ b/sugar/browser/Makefile.am @@ -2,7 +2,12 @@ sugardir = $(pythondir)/sugar/browser sugar_PYTHON = \ __init__.py \ browser.py \ - NotificationBar.py + NotificationBar.py \ + BrowserShell.py \ + WebActivity.py \ + AddressItem.py \ + BrowserActivity.py \ + NavigationToolbar.py icondir = $(pkgdatadir) icon_DATA = \ diff --git a/sugar/p2p/presence.py b/sugar/p2p/presence.py index 9d11d7e..9cb297e 100644 --- a/sugar/p2p/presence.py +++ b/sugar/p2p/presence.py @@ -1,6 +1,6 @@ # -*- tab-width: 4; indent-tabs-mode: t -*- -import avahi, dbus, dbus.glib, dbus_bindings +import avahi, dbus, dbus.glib, dbus.dbus_bindings ACTION_SERVICE_NEW = 'new' ACTION_SERVICE_REMOVED = 'removed' @@ -97,7 +97,7 @@ class PresenceAnnounce(object): "", "", # domain, host (let the system figure it out) dbus.UInt16(rs_port), info,) g.Commit() - except dbus_bindings.DBusException, exc: + except dbus.dbus_bindings.DBusException, exc: # FIXME: ignore local name collisions, since that means # the zeroconf service is already registered. Ideally we # should un-register it an re-register with the correct info diff --git a/sugar/shell/Makefile.am b/sugar/shell/Makefile.am index a768aad..387838d 100644 --- a/sugar/shell/Makefile.am +++ b/sugar/shell/Makefile.am @@ -2,4 +2,5 @@ sugardir = $(pythondir)/sugar/shell sugar_PYTHON = \ __init__.py \ activity.py \ - shell.py + shell.py \ + PresenceWindow.py |