diff options
| author | Dan Williams <dcbw@redhat.com> | 2006-06-07 16:22:28 (GMT) |
|---|---|---|
| committer | Dan Williams <dcbw@redhat.com> | 2006-06-07 16:22:28 (GMT) |
| commit | f7cd0939c4fdf8cb8f44185fb2796f9adaed12df (patch) | |
| tree | 51830e7781858d0ee9a4b3b9ac4ef8a8fed88533 /sugar | |
| parent | 55d863fc7110fbdc790f777d03ffd21c024cef6d (diff) | |
Fix traceback on focus changes
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 | ||||
| -rw-r--r-- | sugar/shell/activity.py | 2 |
4 files changed, 5 insertions, 11 deletions
diff --git a/sugar/browser/Makefile.am b/sugar/browser/Makefile.am index 5a709c0..7aacdd8 100644 --- a/sugar/browser/Makefile.am +++ b/sugar/browser/Makefile.am @@ -2,12 +2,7 @@ sugardir = $(pythondir)/sugar/browser sugar_PYTHON = \ __init__.py \ browser.py \ - NotificationBar.py \ - BrowserShell.py \ - WebActivity.py \ - AddressItem.py \ - BrowserActivity.py \ - NavigationToolbar.py + NotificationBar.py icondir = $(pkgdatadir) icon_DATA = \ diff --git a/sugar/p2p/presence.py b/sugar/p2p/presence.py index 9cb297e..9d11d7e 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.dbus_bindings +import avahi, dbus, dbus.glib, 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.dbus_bindings.DBusException, exc: + except 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 387838d..a768aad 100644 --- a/sugar/shell/Makefile.am +++ b/sugar/shell/Makefile.am @@ -2,5 +2,4 @@ sugardir = $(pythondir)/sugar/shell sugar_PYTHON = \ __init__.py \ activity.py \ - shell.py \ - PresenceWindow.py + shell.py diff --git a/sugar/shell/activity.py b/sugar/shell/activity.py index 47506d0..2518444 100644 --- a/sugar/shell/activity.py +++ b/sugar/shell/activity.py @@ -246,7 +246,7 @@ class Activity(object): """Marks this Activity as having changes. This usually means that this Activity's tab turns a red color or something else to notify the user that this Activity needs attention.""" - if not self.get_has_focus() and has_changes: + if not self.has_focus() and has_changes: self._activity_object.set_has_changes(True) else: self._activity_object.set_has_changes(False) |