Ticket #1297: Write-rejoin.diff

File Write-rejoin.diff, 1.2 KB (added by uwog, 15 years ago)

Write patch to enable rejoining

  • AbiWordActivity.py 

    diff --git a/AbiWordActivity.py b/AbiWordActivity.py
index 69eb967..a300942 100644
    a b class AbiWordActivity (activity.Activity): 
    322322            if state == telepathy.TUBE_STATE_LOCAL_PENDING:
    323323                self.tubes_chan[telepathy.CHANNEL_TYPE_TUBES].AcceptDBusTube(id)
    324324
     325            # All the code below to find the initiator and pass that to
     326            # AbiCollab is unneeded for AbiWord 2.8, but it is left in
     327            # place to keep Write compatible for now with AbiWord 2.6.
     328
    325329            initiator_path = None;
    326330            contacts = self.tubes_chan[telepathy.CHANNEL_TYPE_TUBES].GetDBusNames(id)
    327331            #print 'dbus contact mapping',self.tubes_chan[telepathy.CHANNEL_TYPE_TUBES].GetDBusNames(id)
    … … class AbiWordActivity (activity.Activity): 
    422426
    423427        self.metadata['fulltext'] = self.abiword_canvas.get_content(extension_or_mimetype=".txt")[:3000]
    424428        self.abiword_canvas.save('file://' + file_path, actual_mimetype, '');
     429
     430    def destroy(self):
     431        if self._shared_activity is not None:
     432            self.abiword_canvas.invoke_cmd('com.abisource.abiword.abicollab.olpc.disconnectTube', '', 0, 0)
     433        activity.Activity.destroy(self)