Commit Graph

49 Commits

Author SHA1 Message Date
Tomeu Vizoso
d780248e87 Use Account.ConnectionStatus instead of Account.Connection.Status 2010-08-26 15:26:33 +02:00
Tomeu Vizoso
d156ff56a8 Address comments from Simon's review 2010-08-20 16:25:13 +02:00
Tomeu Vizoso
1af1bc9713 Address several nitpicks from Marco 2010-08-20 15:33:54 +02:00
Tomeu Vizoso
6a12411477 Add copyright statement due to the collaboration refactoring 2010-08-20 15:33:54 +02:00
Tomeu Vizoso
fdfacaf26f Misc. pylint fixes 2010-08-20 15:33:54 +02:00
Tomeu Vizoso
fab271ac9c Wrap lines with more than 80 chars 2010-08-20 15:33:54 +02:00
Tomeu Vizoso
ead42a6945 Remove some unused imports 2010-08-20 15:33:54 +02:00
Tomeu Vizoso
1d16629d1b For several reasons, a shared activity won't survive to its connection
disconnecting and coming back.
2010-08-20 15:33:54 +02:00
Tomeu Vizoso
cd6c0101af No need to dispose the buddies currently in the activity, as it is information that is needed through the whole life of the activity instance 2010-08-20 15:33:53 +02:00
Tomeu Vizoso
694c456ed3 Remove misleading comment, we are already listening Closed 2010-08-20 15:33:53 +02:00
Tomeu Vizoso
d5dbe3616f Correctly use the connections from ConnectionManager 2010-08-20 15:33:53 +02:00
Tomeu Vizoso
c0ed611aee Make sure that the connection we choose is connected 2010-08-20 15:33:53 +02:00
Tomeu Vizoso
ba80f2a2c1 Set the properties of the channel after we have joined it 2010-08-20 15:33:53 +02:00
Tomeu Vizoso
1e7f499029 Translate handles if the channel has channel-specific handles (gabble) 2010-08-20 15:33:53 +02:00
Tomeu Vizoso
11d0574b3f Log when we fail to find a share activity for a given id 2010-08-20 15:33:53 +02:00
Tomeu Vizoso
8da18fe2aa Track the buddies inside the activity 2010-08-20 15:33:53 +02:00
Tomeu Vizoso
363f828205 Handle invitations using Mission Control 5.
src/sugar/activity/activity.py: If the activity is being invoked to
handle an invite, create a Client.Handler instance and share the
activity when HandleChannels is invoked.

src/sugar/activity/activityfactory.py,
src/sugar/activity/activityhandle.py,
src/sugar/activity/main.py: Add a -i switch that indicates to the
activity that it should handle the channel from an invitation.

src/sugar/presence/activity.py: Expose Activity.room_handle.

src/sugar/presence/presenceservice.py: Add get_activity_by_handle().

src/sugar/presence/util.py: Add get_account_for_connection().
2010-08-20 15:33:53 +02:00
Tomeu Vizoso
af6e3aa5ef Restore use of ActivityProperties.GetActivity 2010-08-20 15:33:53 +02:00
Tomeu Vizoso
46159e987b Pass the account path to the Activity on creation 2010-08-20 15:33:53 +02:00
Tomeu Vizoso
1a4c721f3d Identify buddies and activities by their account and ids instead
of connection and handle.
2010-08-20 15:33:53 +02:00
Tomeu Vizoso
cc8ecd81e7 Add src/sugar/presence/util.py 2010-08-20 15:33:53 +02:00
Tomeu Vizoso
ce87bb3ff6 Only add ourselves to a channel if we are in local_pending 2010-08-20 15:33:53 +02:00
Tomeu Vizoso
fbee730549 Implement inviting buddies to a private activity 2010-08-20 15:33:53 +02:00
Tomeu Vizoso
37d7fc1075 Add src/sugar/util.py to the Makefile 2010-08-20 15:33:52 +02:00
Tomeu Vizoso
6f6b86d1e2 Implement Buddy.object_path() 2010-08-20 15:33:52 +02:00
Tomeu Vizoso
9c1275e4c8 Implement Activity.get_channels() 2010-08-20 15:33:52 +02:00
Tomeu Vizoso
043d3b0ee7 Emit the buddy-left signal 2010-08-20 15:33:52 +02:00
Tomeu Vizoso
12cd353620 Implement leaving an activity 2010-08-20 15:33:52 +02:00
Tomeu Vizoso
2db82c1722 Emit the buddy-joined signal 2010-08-20 15:33:52 +02:00
Tomeu Vizoso
f9b0d68a48 Refactor the logic for sharing into _ShareCommand and implement
joining a shared instance with _JoinCommand.
2010-08-20 15:33:52 +02:00
Tomeu Vizoso
a0b9394846 Replace enough of the old PS so we can share an activity instance publically
on the network.
2010-08-20 15:33:52 +02:00
Tomeu Vizoso
98cc77f1fb Replace enough of the old PS so we can join an activity instance on the network.
* src/sugar/activity/activity.py: Get the shared activity wrapper from
  sugar.presence.
* src/sugar/activity/activityfactory.py: Disable checking in the PS for
  activity_id duplicates.
* src/sugar/presence/activity.py: Remove the PS dependency and query Telepathy
  directly. Implemented enough to join an activity.
* src/sugar/presence/buddy.py: Remove the PS dependency and query Telepathy
  directly. Implemented enough to join an activity. Added an Owner subclass of
  Buddy()
* src/sugar/presence/presenceservice.py: Remove the PS dependency and query Telepathy
  directly. Implemented enough to join an activity.
* src/sugar/presence/util.py: Add ConnectionManager for discovering and tracking
  connections.
2010-08-20 15:33:52 +02:00
Sascha Silbe
c9e63eb8ea PEP8 white space and long line fixes 2009-08-25 21:12:40 +02:00
Sascha Silbe
ecdaf6b795 trim EOL (end-of-line) spaces on source files 2009-08-25 19:55:48 +02:00
Simon Schampijer
e1e8647de9 pylint fixes 2009-08-24 14:51:00 +02:00
Sascha Silbe
496090fe62 let the logger do the formatting 2009-08-24 12:54:02 +02:00
Tomeu Vizoso
f0b78ef406 Add the tags property to the buddy model 2009-07-29 18:26:14 +02:00
Tomeu Vizoso
042a09cccd Expose telepathy_room_handle (cassidy) #757 2009-06-15 15:46:08 +02:00
Tomeu Vizoso
43d923b4d5 Log an error message when GetPreferredConnection fails 2008-12-09 13:07:25 +01:00
Marco Pesenti Gritti
b58182a970 Mark modules as STABLE/UNSTABLE/DEPRECATED. 2008-10-28 14:19:01 +01:00
Guillaume Desmottes
1ab0c67830 fix weird change in _share_activity_cb causing all activity sharing fails 2008-09-18 11:46:40 +01:00
Marco Pesenti Gritti
3d9f3eca67 Disable the few remaining pylint messages 2008-09-07 23:57:27 +02:00
Marco Pesenti Gritti
80190bf944 Several pylint fixes. 2008-08-11 00:50:29 +02:00
Guillaume Desmottes
6a78863c22 Merge branch 'master' of git+ssh://guillaume@dev.laptop.org/git/sugar-toolkit into 5079-rebased 2008-07-14 18:42:58 +02:00
Morgan Collett
1659332c81 #7444 Fix crash in get_joined_buddies when a buddy disappears uncleanly 2008-07-10 15:20:50 +02:00
Guillaume Desmottes
5c40a70e5e Simplify sharing code using new PS API (import the patch attached to #5079) 2008-07-02 14:31:47 +02:00
Guillaume Desmottes
d71635781f PrivateInvitation now have a channel type arg 2008-06-13 16:43:26 +02:00
Morgan Collett
4db051f402 6473: Better method for resolving handles to buddies 2008-05-15 13:20:48 +02:00
Marco Pesenti Gritti
72c2a1d770 Use a src directory consistently with base and shell. 2008-04-29 14:58:34 +02:00