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

Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar

Browse Source
This commit is contained in:
Marco Pesenti Gritti 2006-10-20 18:24:33 +02:00
commit ae34c6d5fe
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
services/presence/PresenceService.py
View File

@ -340,10 +340,10 @@ class PresenceService(object):
avahi.DBUS_PATH_SERVER), avahi.DBUS_INTERFACE_SERVER) avahi.DBUS_PATH_SERVER), avahi.DBUS_INTERFACE_SERVER)
# Always browse .local # Always browse .local
self._new_domain_cb(avahi.IF_UNSPEC, avahi.PROTO_UNSPEC, "local") self._new_domain_cb(avahi.IF_UNSPEC, avahi.PROTO_INET, "local")
# Connect to Avahi and start looking for stuff # Connect to Avahi and start looking for stuff
domain_browser = self._mdns_service.DomainBrowserNew(avahi.IF_UNSPEC, avahi.PROTO_UNSPEC, domain_browser = self._mdns_service.DomainBrowserNew(avahi.IF_UNSPEC, avahi.PROTO_INET,
"", avahi.DOMAIN_BROWSER_BROWSE, dbus.UInt32(0)) "", avahi.DOMAIN_BROWSER_BROWSE, dbus.UInt32(0))
db = dbus.Interface(self._system_bus.get_object(avahi.DBUS_NAME, domain_browser), avahi.DBUS_INTERFACE_DOMAIN_BROWSER) db = dbus.Interface(self._system_bus.get_object(avahi.DBUS_NAME, domain_browser), avahi.DBUS_INTERFACE_DOMAIN_BROWSER)
db.connect_to_signal('ItemNew', self._new_domain_cb_glue) db.connect_to_signal('ItemNew', self._new_domain_cb_glue)
@ -573,7 +573,7 @@ class PresenceService(object):
# Ask avahi to resolve this particular service # Ask avahi to resolve this particular service
path = self._mdns_service.ServiceResolverNew(dbus.Int32(adv.interface()), path = self._mdns_service.ServiceResolverNew(dbus.Int32(adv.interface()),
dbus.Int32(adv.protocol()), adv.name(), adv.stype(), adv.domain(), dbus.Int32(adv.protocol()), adv.name(), adv.stype(), adv.domain(),
avahi.PROTO_UNSPEC, dbus.UInt32(0)) avahi.PROTO_INET, dbus.UInt32(0))
resolver = dbus.Interface(self._system_bus.get_object(avahi.DBUS_NAME, path), resolver = dbus.Interface(self._system_bus.get_object(avahi.DBUS_NAME, path),
avahi.DBUS_INTERFACE_SERVICE_RESOLVER) avahi.DBUS_INTERFACE_SERVICE_RESOLVER)
resolver.connect_to_signal('Found', lambda *args: self._service_resolved_cb_glue(adv, *args)) resolver.connect_to_signal('Found', lambda *args: self._service_resolved_cb_glue(adv, *args))

3
sugar/activity/Activity.py
View File

@ -113,6 +113,9 @@ class Activity(gtk.Window):
"""Gets the activity type.""" """Gets the activity type."""
return self._activity_type return self._activity_type
def get_default_type(self):
return self._default_type
def get_shared(self): def get_shared(self):
"""Returns TRUE if the activity is shared on the mesh.""" """Returns TRUE if the activity is shared on the mesh."""
return self._shared return self._shared