Marco Pesenti Gritti
c234b7b4a3
Merge branch 'master' of git+ssh://crank.laptop.org/git/sugar
...
Conflicts:
sugar/presence/Buddy.py
2006-06-22 16:01:14 -04:00
Marco Pesenti Gritti
0a305004b0
Some work getting the one-to-one chat back
2006-06-22 15:59:38 -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
Marco Pesenti Gritti
974ef81c1e
Get back mesh chat (for the everyone tab)
2006-06-21 23:49:37 -04:00
Dan Williams
e9f20cfe0f
pylint fixes
2006-06-20 09:39:36 -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
6fd464be7d
Make get_activity_service() actually work
2006-06-19 21:16:55 -04:00
Dan Williams
2c2ba14311
clarify addresses
2006-06-19 21:14:51 -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://dcbw@crank.laptop.org/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
Marco Pesenti Gritti
918c695b07
Do not assign {} to properties, if you do apparently
...
the table is not recreated on subsequent calls and
that obviously cause funny issues.
2006-06-19 12:38:25 -04:00
Marco Pesenti Gritti
73c94c7bfb
Improve some debug output
2006-06-19 12:28:44 -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
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
Marco Pesenti Gritti
51ea9eedba
Get chat back to work. Well except it get very confused
...
if users have the same ip address.
Dan I commented out the service deserialization in BrowserShell
because it was not really working (also there was a few typos in
that code)
2006-06-18 03:00:23 -04:00
Dan Williams
b703d93534
Merge branch 'master' of git+ssh://dcbw@crank.laptop.org/git/sugar
...
Conflicts:
sugar/browser/BrowserActivity.py
2006-06-18 01:33:05 -04:00
Dan Williams
9f1c77a55a
Add serialize/deserialize functions for Service objects
2006-06-18 01:31:18 -04:00
Marco Pesenti Gritti
b4413fe3c2
Some work to make group chat work again
2006-06-18 01:05:40 -04:00
Marco Pesenti Gritti
6d7940949a
Empty addresses are valid, meaning the buddy own address.
...
For group (multicast) services publisher_address != service_address,
introduce the distinction in the API and in the avahi announcement.
2006-06-17 22:06:20 -04:00
Marco Pesenti Gritti
53f00b05b1
Setup python logging and use it in the PresenceService
2006-06-17 19:54:12 -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
Marco Pesenti Gritti
63bff5cecd
More fixes, not-presence works
2006-06-16 23:40:36 -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
d60a85e83a
don't try to resolve a service more than once
2006-06-16 22:46:18 -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
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
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://dcbw@crank.laptop.org/git/sugar
2006-06-16 15:25:25 -04:00
Dan Williams
c46d300c18
merge
2006-06-16 15:25:21 -04:00
Marco Pesenti Gritti
29a730e0a4
Monitor service addition and update buddy list
...
on these.
2006-06-16 15:21:09 -04:00
Marco Pesenti Gritti
0cae557ab5
Register the model service and start working on
...
looking it up
2006-06-16 14:20:09 -04:00
Dan Williams
6db22150b1
Remove unused function
2006-06-16 13:05:45 -04:00
Marco Pesenti Gritti
6a8e863a16
Fix the problem with service resolution (Dan please have a look...)
2006-06-15 18:27:50 -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
Marco Pesenti Gritti
27b4f25fad
Merge
2006-06-15 11:29:00 -04:00
Marco Pesenti Gritti
f0af49616c
Fixed a bunch of issues reported by pylint
2006-06-15 11:18:33 -04:00
Dan Williams
ecf81ba35f
Generalize activity publishing code for > 1 activity per process
2006-06-15 11:20:18 -04:00
Marco Pesenti Gritti
f2ae132410
Fix a bunch of outdated makefiles.
2006-06-15 08:38:21 -04:00
Marco Pesenti Gritti
3ea146e17c
Initial start page implementation
2006-06-14 15:01:17 -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
