Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/AbiWordActivity.py
diff options
context:
space:
mode:
authorGonzalo Odiard <godiard@gmail.com>2013-02-27 13:57:28 (GMT)
committer Gonzalo Odiard <godiard@gmail.com>2013-02-27 13:57:28 (GMT)
commitc5cce57b3ac379d7d082120031f0744c71e88b84 (patch)
tree7fdb644a929e2eead897a09f0f5527cc814c61f9 /AbiWordActivity.py
parent4e2f2e946fdfc19ef9798d35c702803d69f8bad1 (diff)
Don't set the font if is joining a shared activity - SL #4436
We should not take the case when the activity is joining a shared document like if is a new document. The document already have content, and also can break the collaboration startup due to delays. Signed-off-by: Gonzalo Odiard <gonzalo@laptop.org>
Diffstat (limited to 'AbiWordActivity.py')
-rw-r--r--AbiWordActivity.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/AbiWordActivity.py b/AbiWordActivity.py
index e95718e..4b458a5 100644
--- a/AbiWordActivity.py
+++ b/AbiWordActivity.py
@@ -184,6 +184,7 @@ class AbiWordActivity(activity.Activity):
if self.shared_activity:
# we are joining the activity
logger.error('We are joining an activity')
+ self._new_instance = False
self.connect('joined', self._joined_cb)
self.shared_activity.connect('buddy-joined',
self._buddy_joined_cb)