Merge branch 'master' of git+ssh://crank.laptop.org/git/sugar
This commit is contained in:
commit
0b170ea30d
@ -143,7 +143,6 @@ class ActivityDbusService(dbus.service.Object):
|
|||||||
|
|
||||||
@dbus.service.signal(ACTIVITY_SERVICE_NAME)
|
@dbus.service.signal(ACTIVITY_SERVICE_NAME)
|
||||||
def ActivityShared(self):
|
def ActivityShared(self):
|
||||||
print "sent signal"
|
|
||||||
pass
|
pass
|
||||||
|
|
||||||
class Activity(object):
|
class Activity(object):
|
||||||
@ -213,7 +212,7 @@ class Activity(object):
|
|||||||
self._plug = gtk.Plug(self._window_id)
|
self._plug = gtk.Plug(self._window_id)
|
||||||
self._initial_service = service
|
self._initial_service = service
|
||||||
if service:
|
if service:
|
||||||
self.set_shared(True)
|
self.set_shared()
|
||||||
self.on_connected_to_shell()
|
self.on_connected_to_shell()
|
||||||
|
|
||||||
def _internal_on_disconnected_from_shell_cb(self):
|
def _internal_on_disconnected_from_shell_cb(self):
|
||||||
|
Loading…
Reference in New Issue
Block a user