75130719b5Check for locks before using a display. Patch by reinier@heeres.eu
Marco Pesenti Gritti
2007-05-30 18:48:40 +0200
cd12b59967Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar
Simon McVittie
2007-05-30 17:43:31 +0100
22b1338ac5services/presence/server_plugin: special-case the Owner when IDing buddies. We always know who we are, so don't need to inspect our own handle or anything.
Simon McVittie
2007-05-30 17:43:16 +0100
b362ed625cservices/presence/server_plugin: fix thinko - take the right arguments to _subscribe_members_changed_cb
Simon McVittie
2007-05-30 17:42:19 +0100
a54aaa54beservices/presence/presenceservice: look up buddies by key-ID if we don't know the full key yet.
Simon McVittie
2007-05-30 17:41:08 +0100
f90de752f6services/presence/presenceservice: weakly reference Buddy objects in _buddies This makes sure we re-use an existing Buddy object if it's still referenced somewhere, rather than trying to make another and fighting over the object path.
Simon McVittie
2007-05-30 17:40:31 +0100
fd4e514e21services/presence/buddy: Fix thinko - register Owner with correct objid Previously the keyid/ prefix was missing.
Simon McVittie
2007-05-30 17:38:58 +0100
ee6c1b4283services/presence/: Have joined Activities track membership via group interface. This allows us to ignore the (trivially spoofable) PEP info for activities that we're actually in, in favour of looking at the actual members.
Simon McVittie
2007-05-30 17:36:42 +0100
87446bfb7fservices/presence/buddyiconcache: remove unused import of sugar.util
Simon McVittie
2007-05-30 17:04:16 +0100
527e22ba5dGet one line back :)
Tomeu Vizoso
2007-05-29 23:25:47 +0200
7b4333dc4eBug 590# fixed (codestyle issues)
Konrad Kleine
2007-05-29 21:24:01 +0200
76d3e78302Bug #590 fixed.
Konrad Kleine
2007-05-29 18:11:57 +0200
6957446167services/presence/: Make Activities responsible for tracking their members. Add a signal to notify the PS when all members have gone away.
Simon McVittie
2007-05-29 16:12:05 +0100
9d812430bfservices/presence/psutils.py: don't bother using sugar.util, it's easier to use hexdigest or sha directly
Simon McVittie
2007-05-29 16:11:07 +0100
2f8ef7bd3bservices/presence/test_psutils: trivial check for pubkey_to_keyid()
Simon McVittie
2007-05-29 16:10:19 +0100
c35db7acf8Some refactoring of the DataStore API.
Tomeu Vizoso
2007-05-29 15:53:58 +0200
ea892796aeservices/presence/Makefile.am: Include test_psutils.py in "make check"
Simon McVittie
2007-05-29 14:05:12 +0100
53d64a0536Use the commit id for the snapshot name
Marco Pesenti Gritti
2007-05-29 14:16:49 +0200
0c77275ba7Very first go at the object type registry.
Marco Pesenti Gritti
2007-05-29 12:39:57 +0200
a4a06206e3services/presence/: identify Buddies by "key ID" (pubkey hash), not whole key. This allows us to create Buddy objects as soon as we see a contact on the server. For contacts not on trusted servers, or seen in anonymous MUCs, we create a Buddy identified by JID instead (so we have some way to talk about the anonymous contact within the Sugar API).
Simon McVittie
2007-05-28 17:25:52 +0100
5dacfdd365Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar
Simon McVittie
2007-05-28 17:10:54 +0100
706830c489services/presence/server_plugin: Don't watch MembersChanged in activities. My plan is now to do this in the Activity class, once the PS has a reliable way to map handles to buddies.
Simon McVittie
2007-05-28 15:56:39 +0100
aad2afdae2services/presence/server_plugin: Use set operations to update the subscribe set
Simon McVittie
2007-05-28 15:54:40 +0100
8915657a08Take out one try..except block.
Tomeu Vizoso
2007-05-28 16:25:36 +0200
7aee70e047services/presence/pstest: Add Red Hat/Collabora GPL v2+ notice
Simon McVittie
2007-05-28 14:46:13 +0100
7583080cd4services/presence/psutils: Add pubkey_to_keyid() and escape_identifier()
Simon McVittie
2007-05-28 14:44:49 +0100
f98cebd13aCleanups
Marco Pesenti Gritti
2007-05-27 21:16:37 +0200
11437e3484Add mime matching to the registry.
Marco Pesenti Gritti
2007-05-27 20:43:31 +0200
42fef182f4Refactor the bundle registry. Move it inside the shell and expose the parts that should be public to the shell dbus service.
Marco Pesenti Gritti
2007-05-27 20:24:10 +0200
8c70ff2d86Fix non-NM IP4 address detection
Dan Williams
2007-05-26 14:01:25 -0400
c1fc93b2afFix syntax error
Dan Williams
2007-05-26 13:58:12 -0400
3d3e4be65eservices/presence/activity: Validate object path early
Simon McVittie
2007-05-25 16:30:36 +0100
9721436536services/presence/: Pass the SessionBus around, instead of a BusName object. Delay making the BusName object until after the PS object has been exported, to guarantee race-free activation.
Simon McVittie
2007-05-25 16:21:02 +0100
1fa97c3d93services/presence/buddy: Set attributes more concisely, improve docstrings
Simon McVittie
2007-05-25 12:24:32 +0100
56b95264cfservices/presence/psutils, buddy: Track NameOwnerChanged in IP4AddressMonitor This means Buddy and its subclasses no longer need to care about NameOwnerChanged at all.
Simon McVittie
2007-05-25 12:14:39 +0100
fdd8c315cfservices/presence/buddy: Use add_signal_receiver to connect signals. This means we don't need to care whether the Sugar shell is actually running - if it is, we'll get its signals, and if it's not, obviously it can't send us any signals!
Simon McVittie
2007-05-25 12:06:57 +0100
7b0d65a211Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar
Simon McVittie
2007-05-25 11:39:45 +0100
eafd338d09services/presence/buddy: Stop treating server, key_hash, registered as GObject properties. They're not handled in the inherited do_set_property()/do_get_property(), so won't work as properties, and there seems to be no need for them to be properties at all. This fixes the following assertion when importing buddy:
Simon McVittie
2007-05-25 11:34:54 +0100
a868f6eb9cservices/presence/psutils: Re-order imports conventionally, without dbus.glib. Importing dbus.glib has a side-effect (it sets up the default main loop integration) so it's not something a module should do.
Simon McVittie
2007-05-25 11:30:36 +0100
5bf10edaeeservices/presence/buddy: remove trailing whitespace, wrap long lines
Simon McVittie
2007-05-25 10:56:41 +0100
a5ba8541a4services/presence/activity: wrap long lines, remove trailing whitespace
Simon McVittie
2007-05-25 10:56:14 +0100
c1346a5303Retry connections when TP connection attempts fail
Dan Williams
2007-05-24 16:40:14 -0400
cb84d5f8fdMerge branch 'master' of git+ssh://dev.laptop.org/git/sugar
Simon McVittie
2007-05-24 19:05:58 +0100
b33dd7cfabsugar.presence.presenceservice: Add get_buddy_by_telepathy_handle()
Simon McVittie
2007-05-18 15:24:58 +0100
b96de811d3services/presence/server_plugin: fix logging of join/share error
Simon McVittie
2007-05-24 18:13:18 +0100
7b20bacdf5services/presence/presenceservice: check against None with 'is'
Simon McVittie
2007-05-24 18:11:43 +0100
0410ed28baservices/presence/presenceservice: add some missing in_signature arguments
Simon McVittie
2007-05-24 15:39:31 +0100
570a485d84services/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.
Simon McVittie
2007-05-24 15:38:54 +0100
2abcd89c1fservices/presence/: Move internal_get_activity to TestPresenceService
Simon McVittie
2007-05-24 14:52:20 +0100
f7ba2aa1e2services/presence/: separate test code into a separate module
Simon McVittie
2007-05-24 14:27:36 +0100
f75747015dservices/presence/activity: Document constructor arguments
Simon McVittie
2007-05-24 14:26:30 +0100
e7f10dd2aaservices/presence/presenceservice: fix broken syntax
Simon McVittie
2007-05-24 14:25:40 +0100
4e188059e3services/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.
Simon McVittie
2007-05-24 13:09:44 +0100
a450a82e59services/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.
Simon McVittie
2007-05-24 13:04:00 +0100
e13728f347services/presence/server_plugin: various cosmetic cleanups * wrap most long lines at 80 characters * don't preformat log messages, let the logging framework do it
Simon McVittie
2007-05-24 12:14:55 +0100
0d5dd24166services/presence/server_plugin: delete unused InvalidBuddyError
Simon McVittie
2007-05-24 12:01:04 +0100
e11389d813services/presence/server_plugin: reformat, document signal definitions
Simon McVittie
2007-05-24 12:00:34 +0100
1026fce013services/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
Simon McVittie
2007-05-24 11:34:48 +0100
55c0d9cb07services/presence/server_plugin: remove trailing whitespace
Simon McVittie
2007-05-24 11:29:22 +0100
2d76475682services/presence/psutils: Remove bytes_to_string - no longer needed
Simon McVittie
2007-05-24 11:21:58 +0100
43453124bdservices/presence/presenceservice: Make bytes_to_string() unnecessary by requesting a ByteArray from dbus-python
Simon McVittie
2007-05-24 11:21:21 +0100
c3e54133a4services/presence/server_plugin: make bytes_to_string() unnecessary by requesting a dbus.ByteArray
Simon McVittie
2007-05-24 11:19:39 +0100
cb279a1418services/presence/server_plugin: reorder imports
Simon McVittie
2007-05-24 11:16:37 +0100
417fd7cc8aservices/presence/server_plugin: Use more conventional conditional import for md5
Simon McVittie
2007-05-24 11:13:58 +0100
71951848a6services/presence/server_plugin: error_handler always takes exactly 1 argument. Instead of using lambdas with arbitrary arguments, use a lambda that takes 1 argument.
Simon McVittie
2007-05-24 11:11:03 +0100
f69e06247fservices/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.
Simon McVittie
2007-05-24 11:05:52 +0100
e7e6c28394.gitignore: Don't include vim swapfiles in git status
Simon McVittie
2007-05-24 11:01:35 +0100
3c2bdfc346services/presence/server_plugin: implement _new_channel_cb asynchronously
Simon McVittie
2007-05-23 18:39:24 +0100
3444acae8fservices/presence/server_plugin: Stop using private API of telepathy-python and dbus-python
Simon McVittie
2007-05-23 17:42:31 +0100
b16bb9d6ccservices/presence/server_plugin: Fix error logging for RequestHandles
Simon McVittie
2007-05-23 17:41:49 +0100
46e957ee7dMerge branch 'master' of git+ssh://dev.laptop.org/git/sugar
Marco Pesenti Gritti
2007-05-24 19:50:33 +0200
8b33ad68bere-add network.py; it's deletion was unintentional
Dan Williams
2007-05-24 13:57:11 -0400
5f912f0330Avoid to reparse the activity registry on each activity start, hrm!
Marco Pesenti Gritti
2007-05-24 19:50:17 +0200
f4327759fcservices/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.
Simon McVittie
2007-05-22 16:45:20 +0100
7b1a38af1cservices/presence/: keep track of the owner's Telepathy handles
Simon McVittie
2007-05-22 16:43:45 +0100
10e1daf8c6services/presence/buddy.py: Don't allow the Owner to disappear, even if they have no handles left
Simon McVittie
2007-05-22 16:30:02 +0100
a6e809a9efservices/presence/: move more of the handle tracking into the Buddy object
Simon McVittie
2007-05-18 15:22:32 +0100
2b9cb92953Revert "sugar.presence.presenceservice: Add get_buddy_by_telepathy_handle()"
Simon McVittie
2007-05-24 17:48:43 +0100
161605ccb1services/presence/server_plugin: Initialize attributes with empty values
Simon McVittie
2007-05-22 16:43:06 +0100
9786385baaMerge branch 'master' of git+ssh://dev.laptop.org/git/sugar
Marco Pesenti Gritti
2007-05-24 17:54:15 +0200
98c5c0734eAdd API to get the mime types
Marco Pesenti Gritti
2007-05-24 17:53:57 +0200
494e17b3cdRevert "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.
Simon McVittie
2007-05-24 12:34:36 +0100
677eb1629cMerge branch 'master' of git+ssh://dev.laptop.org/git/sugar
Simon McVittie
2007-05-24 12:26:28 +0100
27a3644dabHook up mime.get_for_file
Marco Pesenti Gritti
2007-05-24 12:30:42 +0200
2145de1039Hook up get_from_file_name
Marco Pesenti Gritti
2007-05-24 12:08:05 +0200
c89de594d3Use proper "org.laptop.Activity" interface when talking to activities
Bert Freudenberg
2007-05-23 18:38:22 +0200