75130719b5
Check for locks before using a display. Patch by reinier@heeres.eu
Marco Pesenti Gritti
2007-05-30 18:48:40 +02:00
cd12b59967
Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar
Simon McVittie
2007-05-30 17:43:31 +01:00
22b1338ac5
services/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 +01:00
b362ed625c
services/presence/server_plugin: fix thinko - take the right arguments to _subscribe_members_changed_cb
Simon McVittie
2007-05-30 17:42:19 +01:00
a54aaa54be
services/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 +01:00
f90de752f6
services/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 +01:00
fd4e514e21
services/presence/buddy: Fix thinko - register Owner with correct objid Previously the keyid/ prefix was missing.
Simon McVittie
2007-05-30 17:38:58 +01:00
ee6c1b4283
services/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 +01:00
87446bfb7f
services/presence/buddyiconcache: remove unused import of sugar.util
Simon McVittie
2007-05-30 17:04:16 +01:00
527e22ba5d
Get one line back :)
Tomeu Vizoso
2007-05-29 23:25:47 +02:00
7b4333dc4e
Bug 590# fixed (codestyle issues)
Konrad Kleine
2007-05-29 21:24:01 +02:00
76d3e78302
Bug #590 fixed.
Konrad Kleine
2007-05-29 18:11:57 +02:00
6957446167
services/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 +01:00
9d812430bf
services/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 +01:00
2f8ef7bd3b
services/presence/test_psutils: trivial check for pubkey_to_keyid()
Simon McVittie
2007-05-29 16:10:19 +01:00
c35db7acf8
Some refactoring of the DataStore API.
Tomeu Vizoso
2007-05-29 15:53:58 +02:00
ea892796ae
services/presence/Makefile.am: Include test_psutils.py in "make check"
Simon McVittie
2007-05-29 14:05:12 +01:00
53d64a0536
Use the commit id for the snapshot name
Marco Pesenti Gritti
2007-05-29 14:16:49 +02:00
0c77275ba7
Very first go at the object type registry.
Marco Pesenti Gritti
2007-05-29 12:39:57 +02:00
a4a06206e3
services/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 +01:00
5dacfdd365
Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar
Simon McVittie
2007-05-28 17:10:54 +01:00
706830c489
services/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 +01:00
aad2afdae2
services/presence/server_plugin: Use set operations to update the subscribe set
Simon McVittie
2007-05-28 15:54:40 +01:00
8915657a08
Take out one try..except block.
Tomeu Vizoso
2007-05-28 16:25:36 +02:00
7aee70e047
services/presence/pstest: Add Red Hat/Collabora GPL v2+ notice
Simon McVittie
2007-05-28 14:46:13 +01:00
7583080cd4
services/presence/psutils: Add pubkey_to_keyid() and escape_identifier()
Simon McVittie
2007-05-28 14:44:49 +01:00
f98cebd13a
Cleanups
Marco Pesenti Gritti
2007-05-27 21:16:37 +02:00
11437e3484
Add mime matching to the registry.
Marco Pesenti Gritti
2007-05-27 20:43:31 +02:00
42fef182f4
Refactor 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 +02:00
8c70ff2d86
Fix non-NM IP4 address detection
Dan Williams
2007-05-26 14:01:25 -04:00
c1fc93b2af
Fix syntax error
Dan Williams
2007-05-26 13:58:12 -04:00
3d3e4be65e
services/presence/activity: Validate object path early
Simon McVittie
2007-05-25 16:30:36 +01:00
9721436536
services/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 +01:00
1fa97c3d93
services/presence/buddy: Set attributes more concisely, improve docstrings
Simon McVittie
2007-05-25 12:24:32 +01:00
56b95264cf
services/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 +01:00
fdd8c315cf
services/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 +01:00
7b0d65a211
Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar
Simon McVittie
2007-05-25 11:39:45 +01:00
eafd338d09
services/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 +01:00
a868f6eb9c
services/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 +01:00
5bf10edaee
services/presence/buddy: remove trailing whitespace, wrap long lines
Simon McVittie
2007-05-25 10:56:41 +01:00
a5ba8541a4
services/presence/activity: wrap long lines, remove trailing whitespace
Simon McVittie
2007-05-25 10:56:14 +01:00
c1346a5303
Retry connections when TP connection attempts fail
Dan Williams
2007-05-24 16:40:14 -04:00
cb84d5f8fd
Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar
Simon McVittie
2007-05-24 19:05:58 +01:00
b33dd7cfab
sugar.presence.presenceservice: Add get_buddy_by_telepathy_handle()
Simon McVittie
2007-05-18 15:24:58 +01:00
b96de811d3
services/presence/server_plugin: fix logging of join/share error
Simon McVittie
2007-05-24 18:13:18 +01:00
7b20bacdf5
services/presence/presenceservice: check against None with 'is'
Simon McVittie
2007-05-24 18:11:43 +01:00
0410ed28ba
services/presence/presenceservice: add some missing in_signature arguments
Simon McVittie
2007-05-24 15:39:31 +01:00
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.
Simon McVittie
2007-05-24 15:38:54 +01:00
2abcd89c1f
services/presence/: Move internal_get_activity to TestPresenceService
Simon McVittie
2007-05-24 14:52:20 +01:00
f7ba2aa1e2
services/presence/: separate test code into a separate module
Simon McVittie
2007-05-24 14:27:36 +01:00
f75747015d
services/presence/activity: Document constructor arguments
Simon McVittie
2007-05-24 14:26:30 +01:00
e7f10dd2aa
services/presence/presenceservice: fix broken syntax
Simon McVittie
2007-05-24 14:25:40 +01:00
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.
Simon McVittie
2007-05-24 13:09:44 +01:00
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.
Simon McVittie
2007-05-24 13:04:00 +01:00
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
Simon McVittie
2007-05-24 12:14:55 +01:00
0d5dd24166
services/presence/server_plugin: delete unused InvalidBuddyError
Simon McVittie
2007-05-24 12:01:04 +01:00
e11389d813
services/presence/server_plugin: reformat, document signal definitions
Simon McVittie
2007-05-24 12:00:34 +01:00
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
Simon McVittie
2007-05-24 11:34:48 +01:00
55c0d9cb07
services/presence/server_plugin: remove trailing whitespace
Simon McVittie
2007-05-24 11:29:22 +01:00
2d76475682
services/presence/psutils: Remove bytes_to_string - no longer needed
Simon McVittie
2007-05-24 11:21:58 +01:00
43453124bd
services/presence/presenceservice: Make bytes_to_string() unnecessary by requesting a ByteArray from dbus-python
Simon McVittie
2007-05-24 11:21:21 +01:00
c3e54133a4
services/presence/server_plugin: make bytes_to_string() unnecessary by requesting a dbus.ByteArray
Simon McVittie
2007-05-24 11:19:39 +01:00
cb279a1418
services/presence/server_plugin: reorder imports
Simon McVittie
2007-05-24 11:16:37 +01:00
417fd7cc8a
services/presence/server_plugin: Use more conventional conditional import for md5
Simon McVittie
2007-05-24 11:13:58 +01:00
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.
Simon McVittie
2007-05-24 11:11:03 +01:00
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.
Simon McVittie
2007-05-24 11:05:52 +01:00
e7e6c28394
.gitignore: Don't include vim swapfiles in git status
Simon McVittie
2007-05-24 11:01:35 +01:00
3c2bdfc346
services/presence/server_plugin: implement _new_channel_cb asynchronously
Simon McVittie
2007-05-23 18:39:24 +01:00
3444acae8f
services/presence/server_plugin: Stop using private API of telepathy-python and dbus-python
Simon McVittie
2007-05-23 17:42:31 +01:00
b16bb9d6cc
services/presence/server_plugin: Fix error logging for RequestHandles
Simon McVittie
2007-05-23 17:41:49 +01:00
46e957ee7d
Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar
Marco Pesenti Gritti
2007-05-24 19:50:33 +02:00
8b33ad68be
re-add network.py; it's deletion was unintentional
Dan Williams
2007-05-24 13:57:11 -04:00
5f912f0330
Avoid to reparse the activity registry on each activity start, hrm!
Marco Pesenti Gritti
2007-05-24 19:50:17 +02:00
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.
Simon McVittie
2007-05-22 16:45:20 +01:00
7b1a38af1c
services/presence/: keep track of the owner's Telepathy handles
Simon McVittie
2007-05-22 16:43:45 +01:00
10e1daf8c6
services/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 +01:00
a6e809a9ef
services/presence/: move more of the handle tracking into the Buddy object
Simon McVittie
2007-05-18 15:22:32 +01:00
c40a12a136
New Palette widget
Eduardo Silva
2007-05-24 13:37:48 -04:00
2b9cb92953
Revert "sugar.presence.presenceservice: Add get_buddy_by_telepathy_handle()"
Simon McVittie
2007-05-24 17:48:43 +01:00
161605ccb1
services/presence/server_plugin: Initialize attributes with empty values
Simon McVittie
2007-05-22 16:43:06 +01:00
9786385baa
Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar
Marco Pesenti Gritti
2007-05-24 17:54:15 +02:00
98c5c0734e
Add API to get the mime types
Marco Pesenti Gritti
2007-05-24 17:53:57 +02:00
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.
Simon McVittie
2007-05-24 12:34:36 +01:00
677eb1629c
Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar
Simon McVittie
2007-05-24 12:26:28 +01:00
27a3644dab
Hook up mime.get_for_file
Marco Pesenti Gritti
2007-05-24 12:30:42 +02:00
2145de1039
Hook up get_from_file_name
Marco Pesenti Gritti
2007-05-24 12:08:05 +02:00
c89de594d3
Use proper "org.laptop.Activity" interface when talking to activities
Bert Freudenberg
2007-05-23 18:38:22 +02:00
Eduardo Silva