Simon McVittie
1d79d93627
Fix syntax
2007-05-21 11:50:29 +01:00
Simon McVittie
66c5e882f3
Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar
2007-05-21 11:30:38 +01:00
Simon McVittie
8c8dffe662
Merge commit 'origin' into submit
2007-05-21 11:27:47 +01:00
Simon McVittie
78356b1956
services/presence/: move more of the handle tracking into the Buddy object
2007-05-18 15:22:32 +01:00
Simon McVittie
bf84eca102
services/presence/server_plugin.py: Ensure _conn always exists (even if None)
...
This means cleanup() will not fail on an uninitialized server plugin,
and get_connection() will return None rather than raising AttributeError.
2007-05-18 15:21:36 +01:00
Dan Williams
7b9c59fb9c
Correctly send IPv4 address when NM already has a connection
2007-05-17 13:54:26 -04:00
Simon McVittie
f3a2d532f5
services/presence: buddy: add mapping to/from Telepathy handles
2007-05-17 17:41:42 +01:00
Dan Williams
d72ff8c6fb
Don't try to shove None through dbus
2007-05-17 09:32:34 -04:00
Simon McVittie
531321740c
Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar
...
Conflicts:
services/presence/server_plugin.py
2007-05-16 12:30:49 +01:00
Simon McVittie
35d190b55e
services/presence/server_plugin.py: Handle presence more correctly.
...
This avoids unnecessary attempts to look up the buddy properties of
channel-specific handles (which doesn't work) by only looking up the buddy
properties of people we're subscribed to.
Also, this approves subscription requests that come in while we're online,
rather than handling them when we next go from offline to online.
2007-05-16 11:39:16 +01:00
Dan Williams
5d9e19a892
Retry getting buddy properties a few times
2007-05-16 01:03:55 -04:00
Dan Williams
82095ea26a
Some PS reliability fixes
2007-05-15 15:25:30 -04:00
Simon McVittie
5d77ff680a
services/presence: Stop using deprecated keyword argument named_service
2007-05-15 15:20:02 +01:00
Simon McVittie
4b26840333
sugar.presence.presenceservice, services/presence: Use named loggers.
...
This causes events in the log to be annotated with the module that emitted the
message.
Before: DEBUG - root: Starting up...
After: DEBUG - s-p-s.server_plugin: Starting up...
I've used a log domain of "sugar.presence..." for the client library and
e.g. "s-p-s.activity" for the service internals.
2007-05-15 14:58:15 +01:00
Dan Williams
871828f307
Set alias twice so server actually gets it
2007-05-14 22:48:53 -04:00
Dan Williams
79aad47327
Don't drop buddies on failure to retrieve their activity list
2007-05-14 16:20:23 -04:00
Dan Williams
9b978f014f
Fix setting owner OLPC properties
2007-05-14 16:17:33 -04:00
Dan Williams
a05d804949
Make reconnection to the jabber server work again
2007-05-14 13:58:26 -04:00
Dan Williams
9e1e851884
Make deferred connection actually work
2007-05-14 02:46:51 -04:00
Dan Williams
e1b3cde65e
Fix uninitialized variable traceback
2007-05-13 21:40:24 -04:00
Dan Williams
5e2ea16e3a
Redo PS connection handling; ensure valid network connection before talking to server
2007-05-13 21:34:15 -04:00
Dan Williams
66dfd363ba
Log the PS getting kicked off the bus
2007-05-13 21:33:14 -04:00
Dan Williams
fddf101885
Quiet error message when unecessary
2007-05-13 21:31:16 -04:00
Dan Williams
de1796605f
Fix member name collision with dbus object superclass
2007-05-13 21:11:19 -04:00
Dan Williams
077b3e3391
Fix debug log statement
2007-05-13 21:08:54 -04:00
Simon McVittie
2216f5095d
Use ExportedGObject from dbus-python rather than reimplementing it
2007-05-11 17:27:36 -04:00
Dan Williams
a86293dcb4
Only set our own properties when we're connected
2007-05-11 17:25:44 -04:00
Dan Williams
a67d87c2a6
Fix server-based registration
2007-05-08 16:28:55 -04:00
Dan Williams
d598097994
Fix retrieval of owner's object path
2007-05-07 14:18:20 -04:00
Dan Williams
66b7210481
Ignore network properties for the owner when their jabber contact comes online
2007-05-03 00:43:53 -04:00
Dan Williams
46d97015e6
Fix arguments
2007-05-02 23:20:38 -04:00
Dan Williams
570c7e6052
Add buddy ip4-address property (temporary)
2007-04-30 23:44:39 -04:00
Dafydd Harries
9a8d5ac32a
Merge branch 'master' of git://dev.laptop.org/sugar
2007-04-30 18:43:59 +01:00
Dafydd Harries
f6c5b63a58
don't return unused value from D-Bus signal callback
2007-04-30 18:43:43 +01:00
Dan Williams
e432cc91ca
Fix split_properties usage
2007-04-30 09:51:35 -04:00
Dan Williams
58a8cfc795
Fix up activity property handling
2007-04-29 21:44:57 -04:00
Dan Williams
e63accc8be
Make test buddy attribute randomization optional
2007-04-29 18:01:23 -04:00
Tomeu Vizoso
395d3f5c96
Fix.
2007-04-27 13:01:41 +02:00
Dan Williams
274cc65c4e
Use hashlib on python 2.5
2007-04-26 12:34:05 -04:00
Tomeu Vizoso
1c249a216b
Fix for using with python 2.4.
2007-04-26 18:25:40 +02:00
Dan Williams
60c9e0ecb8
Let PresenceService._buddy_activities_changed see all joined activities, even invalid ones
2007-04-21 19:20:06 -04:00
Dan Williams
51f56ed7a3
Join/leave activity when its validity changes
2007-04-21 19:09:59 -04:00
Mike's Primary Account
a0348a565c
Initial documentation for psutils and server_plugin
2007-04-20 21:09:51 -04:00
Mike's Primary Account
83a6a2e73e
Initial documentation pass for activity by Amanda Yilmaz
2007-04-20 19:07:41 -04:00
Mike's Primary Account
81d9bed0d8
Merge branch 'master' of git+ssh://mcfletch@dev.laptop.org/git/sugar
...
Conflicts:
services/presence/buddy.py
2007-04-20 16:42:47 -04:00
Mike's Primary Account
c0c64809a0
Initial documentation pass for buddy objects
2007-04-20 16:25:37 -04:00
Mike's Primary Account
79d17c14f4
Initial documentation of presence service overview.
...
Fix weird indent in server_plugin module
2007-04-20 13:10:40 -04:00
Dan Williams
2866d3c4c9
Convert more string-named properties to var-named
2007-04-20 12:40:53 -04:00
Dan Williams
37953c47f7
Use well-defined names for properties rather than strings
2007-04-20 12:34:16 -04:00
Dan Williams
26ed1d1504
Don't leak invalid properties
2007-04-17 13:27:34 -04:00
Dan Williams
99bf82b44f
Make TestOwner create more realistic activities and switch between them
2007-04-16 22:44:54 -04:00
Dan Williams
845734eb72
Ignore unknown handles
2007-04-16 22:43:26 -04:00
Dan Williams
d45e6dd1a6
Show which buddy properties were updated
2007-04-16 22:42:35 -04:00
Dan Williams
4449b4e237
Work around server not figuring out conference server address
2007-04-16 22:40:20 -04:00
Dan Williams
5f30901e62
Always set key; new buddy properties replace old ones
2007-04-16 22:39:07 -04:00
Dan Williams
8b47d93ad2
Fix debug output; print handle
2007-04-16 22:37:56 -04:00
Marco Pesenti Gritti
d49b0ed6fb
Use sys.path.append, not insert
2007-04-15 12:26:50 +02:00
Dan Williams
879ef9b0e0
Add activity to owner's list after sharing it
2007-04-13 16:59:16 -04:00
Dan Williams
17adb7b58b
Add some debug output when sharing activities
2007-04-13 16:00:22 -04:00
Dan Williams
cc2d69e364
Forgot to import logging
2007-04-13 15:59:36 -04:00
Dan Williams
f169628cbd
Query non-local activity properties on discovery
2007-04-13 15:42:54 -04:00
Dan Williams
182de3af1c
Remove test code
2007-04-13 15:41:19 -04:00
Dan Williams
5015beaaa6
Clean up activity join/leave debug messages
2007-04-13 15:37:12 -04:00
Dan Williams
94431a66eb
Ensure local activities emit ActivityAppeared signal when shared
2007-04-13 15:15:09 -04:00
Dan Williams
15febc6620
Correctly handle blank activity list
2007-04-13 15:05:21 -04:00
Dan Williams
02900bbfbb
Fix traceback when sharing activity
2007-04-13 14:06:49 -04:00
Dan Williams
773ae4965e
Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar
2007-04-13 13:12:04 -04:00
Dan Williams
31000f6c3e
Asynchronize activity join/share in the PS
2007-04-13 13:11:59 -04:00
Guillaume Desmottes
6b6b72f9c9
implement org.laptop.Sugar.Presence.GetPreferredConnection
2007-04-13 18:29:50 +02:00
Dan Williams
7b40f9bf60
Asynchronize set_activity_properties
2007-04-12 17:03:30 -04:00
Dan Williams
118e039a8b
Remove test activity sharing code
2007-04-12 17:03:14 -04:00
Dan Williams
6e070996c9
Asynchronize setting owner properties
2007-04-12 16:48:40 -04:00
Dan Williams
5970bb6e62
Convert print statements to logging.debug
2007-04-12 14:44:23 -04:00
Dan Williams
3d3dd23390
Randomness tweak
2007-04-12 00:14:29 -04:00
Dan Williams
3f2f609c4a
Use different log file for test PS instances
2007-04-11 23:45:45 -04:00
Dan Williams
3d6bff9278
Ignore invalid handles on avatar updates
2007-04-11 23:45:20 -04:00
Dan Williams
162a87f882
Create test owner for presence service
...
This owner changes properties periodically so we can test out the PS's handling
of property changes. To execute, run Sugar and then make sure that the D-Bus
address is the one sugar is using (get it from ~/.sugar/default/session.info).
Then run:
build/bin/sugar-presence-service X
where X is a number 1 -> 9 inclusive. It will generate fake buddy info for that
test buddy and then start up a presence service for that buddy, changing a random
property of the buddy every 10 seconds.
2007-04-11 22:49:14 -04:00
Dan Williams
133a718f28
Really fix cache code this time; revert to previous code plus ensure directory exists
2007-04-10 15:22:28 -04:00
Dan Williams
a4792552f4
Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar
2007-04-10 15:15:30 -04:00
Dan Williams
e49b36c0f5
Cleanup new cache code
2007-04-10 15:15:21 -04:00
Dan Williams
3e862d517c
Ensure icon cache directory exists
2007-04-10 15:14:19 -04:00
Marco Pesenti Gritti
f134efbb6f
Swap class order here too, to fix FC7
2007-04-10 21:12:33 +02:00
Dan Williams
8d4d87a081
Make contact-online handler async; print -> logging.debug
2007-04-10 15:00:49 -04:00
Marco Pesenti Gritti
3350d5772a
Swap the classes order, which for some reason make it work on FC7
2007-04-10 20:29:34 +02:00
Dan Williams
dba902bd15
Fix unknown variable bug
2007-04-10 14:12:12 -04:00
Dan Williams
48cab08b33
PS fixes; use correct type on public keys and hide invalid buddies
2007-04-10 10:59:35 -04:00
Dan Williams
c9310c2220
PS fixes; use correct type on public keys and hide invalid buddies
2007-04-10 10:59:31 -04:00
Dan Williams
76a0f45aa8
More new PS fixes
2007-04-09 16:05:32 -04:00
Dan Williams
bc083dae5a
Cut over to new PresenceService
2007-04-09 14:40:56 -04:00
Dan Williams
2509d990e4
Cut over to new PresenceService
2007-04-09 14:40:50 -04:00
Dan Williams
fc12f73fba
Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar
2007-04-06 15:29:14 -04:00
Dan Williams
e37bba0094
PresenceService fixes; don't traceback on avahi errors
2007-04-06 15:29:11 -04:00
Marco Pesenti Gritti
c9c1117872
Remove the threadframe stuff which went unused.
2007-04-06 20:13:37 +02:00
Dan Williams
de46d81828
Disable buddy icon request for trial 1
2007-03-29 11:48:21 -04:00
Marco Pesenti Gritti
57c928916c
Refactor sugar.env and paths
2007-03-09 14:57:54 +01:00
Marco Pesenti Gritti
2d9a06ec9a
Add the root path of the services to python path, not services/.
...
Get rid of the now useless env.get_services_dir
2007-03-09 12:32:32 +01:00
Tomeu Vizoso
cb0d75eb59
Rename IconColor to XoColor.
2007-02-23 13:09:33 +01:00
Marco Pesenti Gritti
4cdf88f31d
Do not hardcode /usr/bin/python
2007-01-20 13:38:58 +01:00
Dan Williams
5aedeae62f
Validate colors; ensure that Owner's color is a string
2006-12-19 17:50:13 -05:00
Marco Pesenti Gritti
37853ad836
Fix up service installation path
2006-12-04 14:32:48 -05:00
