sugarlabs/sugar-toolkit-gtk3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

merge

Browse Source
This commit is contained in:
Dan Williams 2006-06-07 12:23:14 -04:00
parent f7cd0939c4
commit a0ed2fa232
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sugar/browser/Makefile.am
View File

@ -2,7 +2,12 @@ sugardir = $(pythondir)/sugar/browser
sugar_PYTHON = \ sugar_PYTHON = \
__init__.py \ __init__.py \
browser.py \ browser.py \
NotificationBar.py NotificationBar.py \
BrowserShell.py \
WebActivity.py \
AddressItem.py \
BrowserActivity.py \
NavigationToolbar.py
icondir = $(pkgdatadir) icondir = $(pkgdatadir)
icon_DATA = \ icon_DATA = \

4
sugar/p2p/presence.py
View File

@ -1,6 +1,6 @@
# -*- tab-width: 4; indent-tabs-mode: t -*- # -*- 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_NEW = 'new'
ACTION_SERVICE_REMOVED = 'removed' ACTION_SERVICE_REMOVED = 'removed'
@ -97,7 +97,7 @@ class PresenceAnnounce(object):
"", "", # domain, host (let the system figure it out) "", "", # domain, host (let the system figure it out)
dbus.UInt16(rs_port), info,) dbus.UInt16(rs_port), info,)
g.Commit() g.Commit()
except dbus_bindings.DBusException, exc: except dbus.dbus_bindings.DBusException, exc:
# FIXME: ignore local name collisions, since that means # FIXME: ignore local name collisions, since that means
# the zeroconf service is already registered. Ideally we # the zeroconf service is already registered. Ideally we
# should un-register it an re-register with the correct info # should un-register it an re-register with the correct info

3
sugar/shell/Makefile.am
View File

@ -2,4 +2,5 @@ sugardir = $(pythondir)/sugar/shell
sugar_PYTHON = \ sugar_PYTHON = \
__init__.py \ __init__.py \
activity.py \ activity.py \
shell.py shell.py \
PresenceWindow.py