Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMorgan Collett <morgan.collett@gmail.com>2008-12-22 14:56:59 (GMT)
committer Morgan Collett <morgan.collett@gmail.com>2008-12-22 14:56:59 (GMT)
commit73aaf17a0b946d29f2d73d49f174e001d6af6eec (patch)
tree27e689d0ab75a32bc39bcd5283d80205e02d0973
parent7b096d363c3590c48bd75226edeadf43e2f58544 (diff)
#145: Prevent object chooser appearing when joining a shared session
-rw-r--r--readactivity.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/readactivity.py b/readactivity.py
index 482245c..5f250a7 100644
--- a/readactivity.py
+++ b/readactivity.py
@@ -206,11 +206,12 @@ class ReadActivity(activity.Activity):
else:
# Wait for a successful join before trying to get the document
self.connect("joined", self._joined_cb)
+ elif self._object_id is None:
+ # Not joining, not resuming
+ self._show_journal_object_picker()
# uncomment this and adjust the path for easier testing
#else:
# self._load_document('file:///home/smcv/tmp/test.pdf')
- if self._object_id is None:
- self._show_journal_object_picker()
def _show_journal_object_picker(self):
"""Show the journal object picker to load a document.