Dan Williams
75fb1a33de
Send empty lists rather than NotFoundError exceptions where appropriate; compact some code
2006-10-06 11:05:27 -04:00
Dan Williams
022c183016
Fix wrong conversion of typechecking to isinstance
2006-10-06 10:46:17 -04:00
Dan Williams
86c3e9d1b0
Another merge fix
2006-07-07 11:49:56 -04:00
Dan Williams
70965d0344
Remove merge conflict junk
2006-07-07 11:03:34 -04:00
Dan Williams
fdd2ded8d8
Merge
2006-07-07 11:02:48 -04:00
Dan Williams
8270a84e09
Fix activity double-join bug where opening a shared activity twice opened a blank tab
2006-07-07 11:00:20 -04:00
Dan Williams
cb4b13bce7
Fixes for tracebacks on the receiving end
2006-06-29 14:01:46 -04:00
Dan Williams
29984ace33
Add positive acknowledgements to work around 802.11 + multicast unreliabilities
2006-06-29 13:30:41 -04:00
Dan Williams
a0397b29df
Add some simple network test code for 2 machines
2006-06-27 12:03:06 -04:00
Dan Williams
e5c7dea51c
Don't traceback when an icon isn't found
2006-06-23 14:00:37 -04:00
Dan Williams
a8c9f4301b
Merge branch 'master' of git+ssh://[email protected] /git/sugar
2006-06-23 13:13:32 -04:00
Dan Williams
db90d4a209
Use random port for local models, clean up some model code, and don't double-register models when we hear our own announcement
2006-06-23 13:13:28 -04:00
Dan Williams
7e50e0c8a1
Use correct arguments
2006-06-23 11:17:33 -04:00
Dan Williams
22dd92db71
Remove debug print
2006-06-23 11:13:47 -04:00
Dan Williams
db0aad8333
Fix some missing imports
2006-06-22 22:56:24 -04:00
Dan Williams
6b1c330dbf
Fix spacing a few errors
2006-06-22 22:46:09 -04:00
Dan Williams
4511d13fb5
Merge branch 'master' of git+ssh://[email protected] /git/sugar
2006-06-22 22:42:35 -04:00
Dan Williams
f2ef2a6847
Make activities emit an ActivityShared dbus signal; and have the shell & presence window detect that and disable the 'share' button
2006-06-22 22:42:29 -04:00
Dan Williams
be992586b1
Don't create more than one activity chat, and join a published chat when it appears
2006-06-22 14:37:34 -04:00
Dan Williams
75402820e3
clarify new activity service message
2006-06-22 14:37:05 -04:00
Dan Williams
735d8bc8b4
rename group_chat -> activity_chat for clarification
2006-06-22 14:36:50 -04:00
Dan Williams
2840af85ce
Stop abusing ZeroConf by overloading the service type field; overload the service name field instead like everyone else does
2006-06-22 14:05:38 -04:00
Dan Williams
2351ee0458
[hack] don't traceback when there's no network connection
2006-06-22 12:52:51 -04:00
Dan Williams
89d40971fe
[hack] show a dialog when there's no available network connection, but at least don't traceback
2006-06-22 12:52:30 -04:00
Dan Williams
a6974cd597
fix undefined variable
2006-06-20 15:10:49 -04:00
Dan Williams
e9f20cfe0f
pylint fixes
2006-06-20 09:39:36 -04:00
Dan Williams
0df8d01dce
Increase timeout for nicer animation
2006-06-19 23:23:35 -04:00
Dan Williams
ef0de497a5
clarify variable name
2006-06-19 23:20:18 -04:00
Dan Williams
d57fe375b9
Merge branch 'master' of git+ssh://[email protected] /git/sugar
2006-06-19 23:18:57 -04:00
Dan Williams
2c04bf08b4
Use non-linear algorithm for sliding window animations
2006-06-19 23:18:51 -04:00
Dan Williams
5485a4f958
Fix some typos
2006-06-19 21:24:24 -04:00
Dan Williams
7ba6033921
Use the service's _publisher_ address for buddy service verification, since that's the unicast address from which the buddy's service announcements are coming; not the service's
...
outbound address
2006-06-19 21:19:05 -04:00
Dan Williams
78ee3d2b20
Find chat service that may have already been resolved, and make sure we don't user services that aren't for our activity
2006-06-19 21:17:58 -04:00
Dan Williams
6fd464be7d
Make get_activity_service() actually work
2006-06-19 21:16:55 -04:00
Dan Williams
f15d803cc6
Grab services that may already have been resolved
2006-06-19 21:16:30 -04:00
Dan Williams
2c2ba14311
clarify addresses
2006-06-19 21:14:51 -04:00
Dan Williams
028f033344
Need to change the activity service's name to the owners name before passing it along to the new activity that we're going to join.
2006-06-19 15:12:56 -04:00
Dan Williams
e7f9a0a728
When serializing an activity, allow using the owner's nick name for the service name
2006-06-19 15:12:24 -04:00
Dan Williams
40483bb856
Don't share an activity if it's name doesn't match our owner's nickname
2006-06-19 15:10:37 -04:00
Dan Williams
072fea84a0
Merge branch 'master' of git+ssh://[email protected] /git/sugar
2006-06-19 14:53:36 -04:00
Dan Williams
c218b3fc03
Ensure properties arguments are local encoding (for now), and tell the python dbus bindings explicitly what type to send them through dbus as (ie, ByteArray), because sometimes the bindings can't figure it out
2006-06-19 14:53:32 -04:00
Dan Williams
69c1fd6252
Ensure properties arguments are local encoding (for now)
2006-06-19 14:52:46 -04:00
Dan Williams
c65ef6f9cd
Make the presence service resolve all shared activity services by default; it's up to the activities to ignore services that aren't theirs. Also add 'joined-activity' and 'left-activity' signals on Buddy objects, mainly for the PresenceWindow's 'Who's here' bits
2006-06-19 09:49:57 -04:00
Dan Williams
d08ea50d15
Start presence service later, so that we don't receive signals before we're ready to deal with them. Also ignore shared activities that aren't ours.
2006-06-19 09:48:45 -04:00
Dan Williams
8154529886
Fix some typos
2006-06-19 09:47:28 -04:00
Dan Williams
44752264e0
Ensure that deserialized Service arguments are not in Unicode (for the moment), since dbus passes strings as such
2006-06-19 09:47:04 -04:00
Dan Williams
bc43e25e10
Filter out duplicate shared activities from the Start Page list
2006-06-18 01:50:01 -04:00
Dan Williams
b703d93534
Merge branch 'master' of git+ssh://[email protected] /git/sugar
...
Conflicts:
sugar/browser/BrowserActivity.py
2006-06-18 01:33:05 -04:00
Dan Williams
4e6cbab48e
Pass a serialized Service object through when joining an activity
2006-06-18 01:31:55 -04:00
Dan Williams
9f1c77a55a
Add serialize/deserialize functions for Service objects
2006-06-18 01:31:18 -04:00
Dan Williams
5938a6dc14
Add presence service-scope signals when new services appear on buddies, so that client's don't have to connect signal handlers to every single buddy
2006-06-16 23:55:26 -04:00
Dan Williams
193c2ed4cd
Add get_id() function to match activity.Activity's get_id() function; sort-of interface
2006-06-16 23:33:16 -04:00
Dan Williams
d353bd5ed1
Validate service type and check for uid-based services first
2006-06-16 23:32:50 -04:00
Dan Williams
e060c07873
Make each activity have a default type for sharing
2006-06-16 23:10:30 -04:00
Dan Williams
358c548641
Don't log requests any more
2006-06-16 23:09:56 -04:00
Dan Williams
8746552ff7
Don't block on dbus for open_with_id either
2006-06-16 22:50:00 -04:00
Dan Williams
d60a85e83a
don't try to resolve a service more than once
2006-06-16 22:46:18 -04:00
Dan Williams
b315480c5a
Fix recognition of shared activities
2006-06-16 22:24:12 -04:00
Dan Williams
91b68d4103
Add back the new-service-adv signal for the start page
2006-06-16 22:23:39 -04:00
Dan Williams
a90071fef5
Use better escape function
2006-06-16 22:23:19 -04:00
Dan Williams
3ed0a1c259
Disable some in-progress code
2006-06-16 17:06:09 -04:00
Dan Williams
334dd101e8
Merge branch 'master' of git+ssh://[email protected] /git/sugar
2006-06-16 17:01:37 -04:00
Dan Williams
a6c33403ff
Listen to local activity lifecycle signals
2006-06-16 17:01:25 -04:00
Dan Williams
eb47a36701
Add a gobject helper which proxies signals for the ActivityContainer
2006-06-16 17:01:03 -04:00
Dan Williams
f89ddfaffa
Fix typos in PresenceService
2006-06-16 17:00:42 -04:00
Dan Williams
563810ec56
Add hooks for filtering on specific application UIDs
2006-06-16 16:32:56 -04:00
Dan Williams
e4a8518d02
Fix starting browser activity
2006-06-16 16:31:54 -04:00
Dan Williams
5e549e7a8f
Fix up bits of presence window
2006-06-16 15:58:47 -04:00
Dan Williams
cd3d98cb77
A pass at fixing single-computer with more than one sugar instance work
2006-06-16 15:48:44 -04:00
Dan Williams
333d341c3d
Remove debug prints
2006-06-16 15:31:07 -04:00
Dan Williams
b31a2176ba
- Clarify when a service type is supposed to be full/network, and when it's supposed
...
to be a short one. Activities should _never_ be exposed to the full/network stype
since that's an implementation detail of the PresenceService
- Make everything having to do with service objects non-unicode (?) to stop the madness.
Ideally we want everything to be UTF-8 eventually.
- Fix up PS to deal with service types of short/long variety
- Remove a hack from the Start Page that gets all service advertisements, will fix soon
2006-06-16 15:27:50 -04:00
Dan Williams
38565321d5
Merge branch 'master' of git+ssh://[email protected] /git/sugar
2006-06-16 15:25:25 -04:00
Dan Williams
c46d300c18
merge
2006-06-16 15:25:21 -04:00
Dan Williams
5446b2509f
test merge
2006-06-16 13:30:54 -04:00
Dan Williams
4a564775bd
Another stupid git test
2006-06-16 13:22:04 -04:00
Dan Williams
73aecebb90
Another git test
2006-06-16 13:19:35 -04:00
Dan Williams
7b507d545b
Shorten activity service type
2006-06-15 18:03:12 -04:00
Dan Williams
be575803ae
remove debug print
2006-06-15 18:02:52 -04:00
Dan Williams
f234ebfff0
Merge with Marco
2006-06-15 17:42:35 -04:00
Dan Williams
2aaefdd52b
Hook into PresenceService to find new advertisements and track them
2006-06-15 17:41:49 -04:00
Dan Williams
e4677ee22a
Announce new activities when we resolve them, and add a hook to intercept new service advertisements
2006-06-15 17:41:26 -04:00
Dan Williams
31e9671190
Validate options for compose_service_type
2006-06-15 17:40:33 -04:00
Dan Williams
9034dc8f3b
More fixes for sharing activities
2006-06-15 17:05:44 -04:00
Dan Williams
97881ae7c0
Escape markup so we don't make pango angry
2006-06-15 17:03:59 -04:00
Dan Williams
a03f850ce8
Accept unicode types too
2006-06-15 17:03:43 -04:00
Dan Williams
465c49179c
Make xmlrpc client non-blocking
2006-06-15 17:03:20 -04:00
Dan Williams
ecf81ba35f
Generalize activity publishing code for > 1 activity per process
2006-06-15 11:20:18 -04:00
Dan Williams
ca60226fb0
Do callbacks in an idle handler so we don't dbus deadlock at any point
2006-06-14 15:06:25 -04:00
Dan Williams
4a7aac0e01
Add makefile for presence module
2006-06-14 14:43:56 -04:00
Dan Williams
1cdaf97f20
Switch from Groups to grouping services based on activity UID
2006-06-14 14:42:44 -04:00
Dan Williams
55f538253c
Error checking on activity UID
2006-06-13 16:01:39 -04:00
Dan Williams
b92c730457
Add uid argument to PresenceService.start()
2006-06-13 16:00:11 -04:00
Dan Williams
26ee2d57d8
Clean up tracking of service advertisements and conversion to Service objects.
2006-06-13 15:25:54 -04:00
Dan Williams
21d1294c7a
Fix service disappearance
2006-06-12 21:33:05 -04:00
Dan Williams
ce1d1c879f
Add Owner.py, forgot that one too
2006-06-12 18:51:40 -04:00
Dan Williams
ef35f9327e
Forgot to add the Group.py file
2006-06-12 18:51:06 -04:00
Dan Williams
e934e153f6
Add module init file
2006-06-12 18:50:04 -04:00
Dan Williams
17c371119d
More presence service rework
2006-06-12 18:31:26 -04:00
Dan Williams
d931dca579
Main bits of presence service refactor
2006-06-09 17:23:42 -04:00
Dan Williams
a0ed2fa232
merge
2006-06-07 12:23:14 -04:00