Commit Graph

4422 Commits

Author SHA1 Message Date
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
bc43e25e10 Filter out duplicate shared activities from the Start Page list 2006-06-18 01:50:01 -04:00
Marco Pesenti Gritti
bf55ae8644 Fix a bunch of issues with the chat window 2006-06-18 01:47:53 -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
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
Marco Pesenti Gritti
b4413fe3c2 Some work to make group chat work again 2006-06-18 01:05:40 -04:00
Marco Pesenti Gritti
afc587212e Get page sharing back to work 2006-06-17 22:06: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
Marco Pesenti Gritti
361eeff0c5 Implement page location sharing. Not yet working for
some reason.
2006-06-17 00:33:08 -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
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
Marco Pesenti Gritti
0871ca9f3d Some fixes 2006-06-16 23:24:07 -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://dcbw@crank.laptop.org/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
Marco Pesenti Gritti
b2fc0d7314 Get chat to show again 2006-06-16 16:44:03 -04:00
Marco Pesenti Gritti
6fc051bc8e Merge branch 'master' of git+ssh://crank.laptop.org/git/sugar 2006-06-16 16:34:01 -04:00
Marco Pesenti Gritti
65bd2b284f No time to think about log 2006-06-16 16:33:55 -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
Marco Pesenti Gritti
0363ed5457 More work on chats 2006-06-16 16:29:51 -04:00
Marco Pesenti Gritti
99d26223e5 Fixup model iterations to take the new filter in
account.
2006-06-16 16:07:14 -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
Marco Pesenti Gritti
c7075255f8 Merge branch 'master' of git+ssh://crank.laptop.org/git/sugar 2006-06-16 15:43:03 -04:00
Marco Pesenti Gritti
a4f9a15b5d Show buddies always if there is no activity 2006-06-16 15:42:55 -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
9db404afb9 Filter presence by activity 2006-06-16 15:13:39 -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
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
Marco Pesenti Gritti
792481c669 Merge branch 'master' of git+ssh://crank.laptop.org/git/sugar 2006-06-16 13:21:34 -04:00
Marco Pesenti Gritti
e633c2ef8d Missing import 2006-06-16 13:21:28 -04:00