Commit Graph

6103 Commits

Author SHA1 Message Date
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
Dan Williams
73aecebb90 Another git test 2006-06-16 13:19:35 -04:00
Marco Pesenti Gritti
541f386ad0 Merge branch 'master' of git+ssh://crank.laptop.org/git/sugar 2006-06-16 13:17:35 -04:00
Marco Pesenti Gritti
af79e35cdb Test commit 2006-06-16 13:17:26 -04:00
Dan Williams
b16dd2a549 Test stuff to see if git is as irritating as mercurial 2006-06-16 13:11:01 -04:00
Marco Pesenti Gritti
06f1e67ce7 Test commit 2006-06-16 13:10:43 -04:00
Dan Williams
48fa6a8934 Merge branch 'master' of git+ssh://dcbw@crank.laptop.org/git/sugar 2006-06-16 13:09:37 -04:00
Dan Williams
d62060ae0d Test stuff to see if git is as irritating as mercurial 2006-06-16 13:09:02 -04:00
Marco Pesenti Gritti
e30f9c337a Merge branch 'master' of git+ssh://crank.laptop.org/git/sugar 2006-06-16 13:07:10 -04:00
Marco Pesenti Gritti
4a0e8ac2d4 Some work on the getting model back 2006-06-16 13:06:11 -04:00
Dan Williams
6db22150b1 Remove unused function 2006-06-16 13:05:45 -04:00
Marco Pesenti Gritti
29fb2321fe Unquote title 2006-06-16 02:37:28 -04:00
Marco Pesenti Gritti
a6b2b4981c More unescaping... 2006-06-16 02:36:18 -04:00
Marco Pesenti Gritti
7eeb43b98a Fix with_id method signature 2006-06-16 02:04:31 -04:00
Marco Pesenti Gritti
bdce0eb48c Get activities sharing sort of working 2006-06-16 01:43:42 -04:00
Marco Pesenti Gritti
20afcfa475 Merge 2006-06-15 18:28:21 -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
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