Commit Graph

2655 Commits

Author SHA1 Message Date
Simon McVittie
cb84d5f8fd Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar 2007-05-24 19:05:58 +01:00
Simon McVittie
b33dd7cfab sugar.presence.presenceservice: Add get_buddy_by_telepathy_handle() 2007-05-24 19:04:35 +01:00
Simon McVittie
b96de811d3 services/presence/server_plugin: fix logging of join/share error 2007-05-24 18:59:32 +01:00
Simon McVittie
7b20bacdf5 services/presence/presenceservice: check against None with 'is' 2007-05-24 18:59:25 +01:00
Simon McVittie
0410ed28ba services/presence/presenceservice: add some missing in_signature arguments 2007-05-24 18:59:19 +01:00
Simon McVittie
570a485d84 services/presence/presenceservice: don't use deprecated dbus.glib
Importing dbus.glib has strange magical side-effects. Instead, make it more
explicit that the default dbus-python main loop is being set to the GLib main
loop.
2007-05-24 18:59:13 +01:00
Simon McVittie
2abcd89c1f services/presence/: Move internal_get_activity to TestPresenceService 2007-05-24 18:59:06 +01:00
Simon McVittie
f7ba2aa1e2 services/presence/: separate test code into a separate module 2007-05-24 18:58:58 +01:00
Simon McVittie
f75747015d services/presence/activity: Document constructor arguments 2007-05-24 18:58:50 +01:00
Simon McVittie
e7f10dd2aa services/presence/presenceservice: fix broken syntax 2007-05-24 18:58:43 +01:00
Simon McVittie
4e188059e3 services/presence/server_plugin: Use telepathy-python helper function request_channel()
Also request the subscribe and publish handles at the same time, to reduce
D-Bus roundtrips.
2007-05-24 18:58:35 +01:00
Simon McVittie
a450a82e59 services/presence/server_plugin: Call _handle_connection_status_change with appropriate arguments
Also reduce number of methods by using nested functions for trivial Connect()
reply handlers.
2007-05-24 18:58:28 +01:00
Simon McVittie
e13728f347 services/presence/server_plugin: various cosmetic cleanups
* wrap most long lines at 80 characters
* don't preformat log messages, let the logging framework do it
2007-05-24 18:58:17 +01:00
Simon McVittie
0d5dd24166 services/presence/server_plugin: delete unused InvalidBuddyError 2007-05-24 18:58:10 +01:00
Simon McVittie
e11389d813 services/presence/server_plugin: reformat, document signal definitions 2007-05-24 18:58:02 +01:00
Simon McVittie
1026fce013 services/presence/presenceservice: various cosmetic cleanups
* wrap long lines at 80 characters
* don't preformat log messages, let the logging framework do it
* eradicate trailing whitespace
2007-05-24 18:57:53 +01:00
Simon McVittie
55c0d9cb07 services/presence/server_plugin: remove trailing whitespace 2007-05-24 18:56:42 +01:00
Simon McVittie
2d76475682 services/presence/psutils: Remove bytes_to_string - no longer needed 2007-05-24 18:56:35 +01:00
Simon McVittie
43453124bd services/presence/presenceservice: Make bytes_to_string() unnecessary by requesting a ByteArray from dbus-python 2007-05-24 18:56:29 +01:00
Simon McVittie
c3e54133a4 services/presence/server_plugin: make bytes_to_string() unnecessary by requesting a dbus.ByteArray 2007-05-24 18:56:20 +01:00
Simon McVittie
cb279a1418 services/presence/server_plugin: reorder imports 2007-05-24 18:56:12 +01:00
Simon McVittie
417fd7cc8a services/presence/server_plugin: Use more conventional conditional import for md5 2007-05-24 18:56:06 +01:00
Simon McVittie
71951848a6 services/presence/server_plugin: error_handler always takes exactly 1 argument.
Instead of using lambdas with arbitrary arguments, use a lambda that takes
1 argument.
2007-05-24 18:55:57 +01:00
Simon McVittie
f69e06247f services/presence/server_plugin: Use non-deprecated handle type constants.
(CONNECTION_HANDLE_TYPE_foo is deprecated in favour of HANDLE_TYPE_foo.)
Also rewrap imports to be 80 characters wide.
2007-05-24 18:55:50 +01:00
Simon McVittie
e7e6c28394 .gitignore: Don't include vim swapfiles in git status 2007-05-24 18:55:38 +01:00
Simon McVittie
3c2bdfc346 services/presence/server_plugin: implement _new_channel_cb asynchronously 2007-05-24 18:55:31 +01:00
Simon McVittie
3444acae8f services/presence/server_plugin: Stop using private API of telepathy-python and dbus-python 2007-05-24 18:52:26 +01:00
Simon McVittie
b16bb9d6cc services/presence/server_plugin: Fix error logging for RequestHandles 2007-05-24 18:52:15 +01:00
Marco Pesenti Gritti
46e957ee7d Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar 2007-05-24 19:50:33 +02:00
Dan Williams
8b33ad68be re-add network.py; it's deletion was unintentional 2007-05-24 13:57:11 -04:00
Marco Pesenti Gritti
5f912f0330 Avoid to reparse the activity registry on each activity start, hrm! 2007-05-24 19:50:17 +02:00
Simon McVittie
f4327759fc services/presence/server_plugin: When creating a room, make it non-anonymous.
Otherwise clients joining the room won't be able to convert other clients'
channel-specific handles into global handles in order to make Buddy objects,
because they're not the moderator of the room.
2007-05-24 18:48:13 +01:00
Simon McVittie
7b1a38af1c services/presence/: keep track of the owner's Telepathy handles 2007-05-24 18:47:55 +01:00
Simon McVittie
10e1daf8c6 services/presence/buddy.py: Don't allow the Owner to disappear, even if they have no handles left 2007-05-24 18:46:16 +01:00
Simon McVittie
a6e809a9ef services/presence/: move more of the handle tracking into the Buddy object 2007-05-24 18:46:09 +01:00
Eduardo Silva
c40a12a136 New Palette widget 2007-05-24 13:37:48 -04:00
Simon McVittie
2b9cb92953 Revert "sugar.presence.presenceservice: Add get_buddy_by_telepathy_handle()"
This reverts commit c6ac2873c8 because
the necessary API isn't committed in PS yet.
2007-05-24 17:48:43 +01:00
Simon McVittie
161605ccb1 services/presence/server_plugin: Initialize attributes with empty values 2007-05-24 17:45:05 +01:00
Marco Pesenti Gritti
9786385baa Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar 2007-05-24 17:54:15 +02:00
Marco Pesenti Gritti
98c5c0734e Add API to get the mime types 2007-05-24 17:53:57 +02:00
Simon McVittie
494e17b3cd Revert "services/presence/: move more of the handle tracking into the Buddy object".
It shouldn't have been applied before "services/presence: buddy: add mapping
to/from Telepathy handles" which has not yet been reviewed.

This reverts commit 78356b1956.

Conflicts:

	services/presence/presenceservice.py
2007-05-24 12:34:36 +01:00
Simon McVittie
677eb1629c Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar 2007-05-24 12:26:28 +01:00
Marco Pesenti Gritti
27a3644dab Hook up mime.get_for_file 2007-05-24 12:30:42 +02:00
Marco Pesenti Gritti
2145de1039 Hook up get_from_file_name 2007-05-24 12:08:05 +02:00
Bert Freudenberg
c89de594d3 Use proper "org.laptop.Activity" interface when talking to activities 2007-05-23 18:38:22 +02:00
Bert Freudenberg
677c4bc199 Reliably detect activity launch (fix for #1560) 2007-05-23 18:33:30 +02:00
Marco Pesenti Gritti
f3d9d5e334 Remove the obsolete p2p code 2007-05-23 12:37:15 +02:00
Marco Pesenti Gritti
08c366d044 Remove a couple of macros which was unused and causing problems. 2007-05-23 12:32:33 +02:00
Marco Pesenti Gritti
c202b6be43 Import xdgmime and start hooking it up 2007-05-23 11:55:21 +02:00
Tomeu Vizoso
ffebebcd7d Set icon size on the combobox. 2007-05-22 18:25:29 +02:00