Ticket #1297: sugar-toolkit-destroy.diff

File sugar-toolkit-destroy.diff, 773 bytes (added by uwog, 15 years ago)

For completeness: the sugar patch required by the Write patch to work

  • src/sugar/activity/activity.py

    diff --git a/src/sugar/activity/activity.py b/src/sugar/activity/activity.py
    index 0540bb1..35965c8 100644
    a b class Activity(Window, gtk.Container): 
    764764                self._show_keep_failed_dialog()
    765765                return False
    766766
    767         if self.shared_activity:
    768             self.shared_activity.leave()
    769 
    770767        self._closing = True
    771768
    772769        return True
    773770
    774771    def _complete_close(self):
    775         self._cleanup_jobject()
    776772        self.destroy()
    777773
     774        if self.shared_activity:
     775            self.shared_activity.leave()
     776
     777        self._cleanup_jobject()
     778
    778779        # Make the exported object inaccessible
    779780        dbus.service.Object.remove_from_connection(self._bus)
    780781