Commit Graph

522 Commits

Author SHA1 Message Date
Sascha Silbe
5f8ec81023 PEP8 cleanup: fix deprecated raise syntax
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
9c7769cc21 PEP8 cleanup: fix whitespace before ':'
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:33 +01:00
Sascha Silbe
73de340d27 PEP8 cleanup: fix spaces around keyword parameters
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:33 +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
60707443ea PEP8 cleanup: fix whitespace around operator
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:33 +01:00
Sascha Silbe
814ab2ddf9 PEP8 cleanup: don't use has_key()
has_key() has been deprecated for quite some time now.

Acked-by: Simon Schampijer <simon@laptop.org>
CC: Aleksey Lim <alsroot@member.fsf.org>
2010-11-23 17:14:32 +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
Sascha Silbe
131c28bb72 fix EOL spaces
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:31 +01:00
Simon Schampijer
c7a80a1e56 Add new numbering scheme #2425
- add class NormalizedVersion to parse and compare the new activity versions
- change the bundlebuilder and activitybundle to use the new scheme, instead
of an int version we expect a string that matches the format defined in
NormalizedVersion
2010-11-09 10:53:05 +01:00
Tomeu Vizoso
29582de67f Add 'cache-palette' property to Invoker #1742
Meaning that the palette will be cached after it's created.
2010-10-14 19:06:31 +02:00
Tomeu Vizoso
4fb2943ec4 Fix running multiple instances of Browse by adapting to API changes #2404
* sugar/presence/presenceservice.py: Specify the D-Bus interface when
  calling ActivityProperties.GetActivity
* sugar/activity/main.py: Set a default for the --invite option and
  make the create() D-Bus method accept a{sv} so we can pass the
  boolean value.
2010-10-05 16:36:13 +02:00
Tomeu Vizoso
7dedaeb7bb Cast floats to ints before calling cairo.ImageSurface() #2291
Otherwise Python 2.7 will raise an exception.
2010-10-04 16:56:26 +02:00
Simon Schampijer
106b9fba68 Do not break if the string contains no conversion specifier #2354 2010-09-29 16:15:59 +02:00
Tomeu Vizoso
a2b8518489 Don't try to share the activity if we couldn't find a suitable connection #2217 2010-09-10 09:45:06 +02: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
e21ab06e34 Read the public and private keys lazily 2010-08-26 17:07:15 +02:00
Tomeu Vizoso
d780248e87 Use Account.ConnectionStatus instead of Account.Connection.Status 2010-08-26 15:26:33 +02:00
Martin Abente
4260a53d3f Merge branch 'master' of gitorious@git.sugarlabs.org:sugar-toolkit/mainline 2010-08-23 14:22:49 -04:00
Martin Abente
f0a570b5ae Delete activities profile data when uninstall #2074
When activities are uninstalled, profile data persists. Profile
data can consume a lot of storage space. Therefore it is necessary
to delete it when required.

Signed-off-by: Martin Abente <mabente@paraguayeduca.org>
2010-08-23 14:09:33 -04:00
Tomeu Vizoso
c56154d938 Remove sugar/__init__.py, it should come from sugar-base #1868 2010-08-23 19:27:57 +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
56679a3de6 Rename ActivityHandle.handle_invite to ActivityHandle.invited 2010-08-20 15:33:54 +02:00
Tomeu Vizoso
d66eb39c9b Remove unused constant 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
24df594203 Add the MAC address to the data that gets hashed to get an activity_id 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
633214e2b6 Call the new invite method in ActivityService InviteCommand and keep a stub for Invite 2010-08-20 15:33:53 +02:00
Tomeu Vizoso
7136145667 Add WOCKY_DEBUG to ~/.sugar/debug 2010-08-20 15:33:53 +02:00
Tomeu Vizoso
6b965fa98d Add mission control env vars for debugging 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
bd3a4ca747 Take into account the "private" property when updating the scope toolbutton 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