Commit Graph

32 Commits

Author SHA1 Message Date
Sascha Silbe
7acfbd070f style cleanup: prefer ' for strings
Tomeu prefers ' for strings, so let's use it wherever we don't have a good
reason to use ".

Reviewed-by: James Cameron <quozl@laptop.org>
Acked-by: Simon Schampijer <simon@laptop.org>
CC: Aleksey Lim <alsroot@member.fsf.org>
2010-11-23 17:14:34 +01:00
Sascha Silbe
72ed58cbca PEP8 cleanup: fix inline comment spacing
pep8 wants inline comments to be prefixed by at least two spaces. Let's just
move them to a separate line as that's easier to read anyway.

Acked-by: Simon Schampijer <simon@laptop.org>
CC: Aleksey Lim <alsroot@member.fsf.org>
2010-11-23 17:14:33 +01:00
Sascha Silbe
4d978fda14 PEP8 cleanup: ensure lines are shorter than 80 characters
Caught by PEP8. This is important for Sugar because the XO has a small screen
where long lines would make the code hard to understand (because you need to
constantly scroll horizontally).

Reviewed-by: James Cameron <quozl@laptop.org>
Acked-by: Simon Schampijer<simon@schampijer.de>
CC: Aleksey Lim <alsroot@member.fsf.org>
2010-11-23 17:14:32 +01:00
Sascha Silbe
e2231d5620 PEP8 cleanup: fix number of blank lines
Caught by pep8.

Reviewed-by: James Cameron <quozl@laptop.org>
Acked-by: Simon Schampijer <simon@laptop.org>
CC: Aleksey Lim <alsroot@member.fsf.org>
2010-11-23 17:14:32 +01:00
Tomeu Vizoso
0002c93e96 sugar.presence: Remove dead code and make clear which methonds are deprecated 2010-08-30 19:21:35 +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
694c456ed3 Remove misleading comment, we are already listening Closed 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
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
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
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
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
Tomeu Vizoso
042a09cccd Expose telepathy_room_handle (cassidy) #757 2009-06-15 15:46:08 +02:00
Marco Pesenti Gritti
b58182a970 Mark modules as STABLE/UNSTABLE/DEPRECATED. 2008-10-28 14:19:01 +01: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
Marco Pesenti Gritti
72c2a1d770 Use a src directory consistently with base and shell. 2008-04-29 14:58:34 +02:00