Commit Graph

4354 Commits

Author SHA1 Message Date
Eduardo Silva
9ea6b18027 Merge branch 'master' of git://dev.laptop.org/sugar 2007-05-30 14:37:51 -04:00
Simon McVittie
ef369e97de Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar 2007-05-30 19:33:14 +01:00
Eduardo Silva
7985a05274 Console: fix reading log files 2007-05-30 14:32:29 -04:00
Eduardo Silva
dd00dda41f Palette fixes 2007-05-30 13:29:29 -04:00
Marco Pesenti Gritti
75130719b5 Check for locks before using a display.
Patch by reinier@heeres.eu
2007-05-30 18:48:40 +02:00
Simon McVittie
cd12b59967 Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar 2007-05-30 17:43:31 +01:00
Simon McVittie
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.
2007-05-30 17:43:16 +01:00
Simon McVittie
b362ed625c services/presence/server_plugin: fix thinko - take the right arguments to _subscribe_members_changed_cb 2007-05-30 17:42:19 +01:00
Simon McVittie
a54aaa54be services/presence/presenceservice: look up buddies by key-ID if we don't know the full key yet. 2007-05-30 17:41:08 +01:00
Simon McVittie
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.
2007-05-30 17:40:31 +01:00
Simon McVittie
fd4e514e21 services/presence/buddy: Fix thinko - register Owner with correct objid
Previously the keyid/ prefix was missing.
2007-05-30 17:38:58 +01:00
Simon McVittie
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.
2007-05-30 17:36:42 +01:00
Simon McVittie
87446bfb7f services/presence/buddyiconcache: remove unused import of sugar.util 2007-05-30 17:04:16 +01:00
Tomeu Vizoso
527e22ba5d Get one line back :) 2007-05-29 23:25:47 +02:00
Konrad Kleine
7b4333dc4e Bug 590# fixed (codestyle issues) 2007-05-29 21:29:14 +02:00
Konrad Kleine
76d3e78302 Bug #590 fixed.
All logfiles will be backed up to ~./sugar/default/logs/old .
You can adjust the backup directory and the number of backup
versions.

You can also adjust the file suffix for the backup files.

Konrad Kleine
2007-05-29 21:28:59 +02:00
Eduardo Silva
b1ed24498c Palette: event improves 2007-05-29 12:27:54 -04:00
Simon McVittie
6957446167 services/presence/: Make Activities responsible for tracking their members.
Add a signal to notify the PS when all members have gone away.
2007-05-29 16:12:05 +01:00
Simon McVittie
9d812430bf services/presence/psutils.py: don't bother using sugar.util, it's easier to use hexdigest or sha directly 2007-05-29 16:11:07 +01:00
Simon McVittie
2f8ef7bd3b services/presence/test_psutils: trivial check for pubkey_to_keyid() 2007-05-29 16:10:19 +01:00
Tomeu Vizoso
c35db7acf8 Some refactoring of the DataStore API. 2007-05-29 15:53:58 +02:00
Simon McVittie
ea892796ae services/presence/Makefile.am: Include test_psutils.py in "make check" 2007-05-29 14:05:12 +01:00
Marco Pesenti Gritti
53d64a0536 Use the commit id for the snapshot name 2007-05-29 14:16:49 +02:00
Marco Pesenti Gritti
0c77275ba7 Very first go at the object type registry. 2007-05-29 12:39:57 +02:00
Simon McVittie
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).

The concept of "trusted server" means a server which we trust to validate that
users with a keyID as the username part of their JID do in fact have that key.
Currently we just pretend that olpc.collabora.co.uk does this - in future, the
school servers will do this validation by using key rather than password
authentication.

Also create Buddy object paths based on the keyID or JID (for easier debugging).
2007-05-28 17:25:52 +01:00
Simon McVittie
5dacfdd365 Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar 2007-05-28 17:10:54 +01:00
Simon McVittie
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.
2007-05-28 15:56:39 +01:00
Simon McVittie
aad2afdae2 services/presence/server_plugin: Use set operations to update the subscribe set 2007-05-28 15:54:40 +01:00
Tomeu Vizoso
8915657a08 Take out one try..except block. 2007-05-28 16:25:36 +02:00
Simon McVittie
7aee70e047 services/presence/pstest: Add Red Hat/Collabora GPL v2+ notice 2007-05-28 14:46:13 +01:00
Simon McVittie
7583080cd4 services/presence/psutils: Add pubkey_to_keyid() and escape_identifier() 2007-05-28 14:44:49 +01:00
Eduardo Silva
d2aaebac38 Palette updates 2007-05-28 01:05:31 -04:00
Marco Pesenti Gritti
f98cebd13a Cleanups 2007-05-27 21:16:37 +02:00
Marco Pesenti Gritti
11437e3484 Add mime matching to the registry. 2007-05-27 20:43:31 +02:00
Marco Pesenti Gritti
42fef182f4 Refactor the bundle registry. Move it inside
the shell and expose the parts that should be
public to the shell dbus service.
2007-05-27 20:24:10 +02:00
Dan Williams
8c70ff2d86 Fix non-NM IP4 address detection 2007-05-26 14:01:25 -04:00
Dan Williams
c1fc93b2af Fix syntax error 2007-05-26 13:58:12 -04:00
Simon McVittie
3d3e4be65e services/presence/activity: Validate object path early 2007-05-25 16:30:36 +01:00
Simon McVittie
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.
2007-05-25 16:21:02 +01:00
Simon McVittie
ad33f7dfdd services/presence/buddy: Improve docstring; remove unused property _object_id 2007-05-25 12:26:53 +01:00
Simon McVittie
1fa97c3d93 services/presence/buddy: Set attributes more concisely, improve docstrings 2007-05-25 12:24:32 +01:00
Simon McVittie
56b95264cf services/presence/psutils, buddy: Track NameOwnerChanged in IP4AddressMonitor
This means Buddy and its subclasses no longer need to care about
NameOwnerChanged at all.

The old code might not have worked anyway, since it was watching for
NameOwnerChanged on the session bus, but invoking NM methods on the system bus.
2007-05-25 12:14:39 +01:00
Simon McVittie
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!
2007-05-25 12:06:57 +01:00
Simon McVittie
7b0d65a211 Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar 2007-05-25 11:39:45 +01:00
Simon McVittie
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:

Warning: g_object_class_install_property: assertion `pspec->flags & G_PARAM_WRITABLE' failed
  type_register(cls, namespace.get('__gtype_name__'))
2007-05-25 11:34:54 +01:00
Simon McVittie
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.
2007-05-25 11:30:36 +01:00
Simon McVittie
5bf10edaee services/presence/buddy: remove trailing whitespace, wrap long lines 2007-05-25 10:56:41 +01:00
Simon McVittie
a5ba8541a4 services/presence/activity: wrap long lines, remove trailing whitespace 2007-05-25 10:56:14 +01:00
Dan Williams
c1346a5303 Retry connections when TP connection attempts fail 2007-05-24 16:40:14 -04:00
Simon McVittie
cb84d5f8fd Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar 2007-05-24 19:05:58 +01:00