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
Marco Pesenti Gritti
9c0669dde4
Merge branch 'master' of git+ssh://crank.laptop.org/git/sugar
2006-06-19 15:31:32 -04:00
Marco Pesenti Gritti
4cef4cb3bd
Implement sliding, dead slow with gradients.
...
Get keyboard focus in the dock with some evil hack.
2006-06-19 15:31:18 -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://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
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
Marco Pesenti Gritti
ea27f1ad8f
Hint slide in windows as docs, this should allow us to
...
actually slide in.
2006-06-19 02:36:11 -04:00
Marco Pesenti Gritti
5c7da12cd5
Change the start page interface to make some sense.
...
Need some theme love...
(Code is an hack, but it's not worth implementing it
right until we have more definite plans about this)
2006-06-19 00:39:24 -04:00
Marco Pesenti Gritti
b129956aba
Add back colors in the toolbar. Layout/appeareance sucks atm
2006-06-18 15:35:44 -04:00
Marco Pesenti Gritti
3fe0d7a580
Get sketches back to work, add a send button
2006-06-18 15:13:50 -04:00
Marco Pesenti Gritti
be051b2726
Mention ctrl+s
2006-06-18 14:45:04 -04:00
Marco Pesenti Gritti
3553882352
Factor out window logic to ChatWindow.
...
Hook the sketchpad to ctrl+s combination
2006-06-18 14:44:08 -04:00
Marco Pesenti Gritti
9d7a7f8050
Fix the confusion when running multiple instances on the
...
same box by passing the nick name in the message.
2006-06-18 14:14:59 -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
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
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
Dan Williams
b16dd2a549
Test stuff to see if git is as irritating as mercurial
2006-06-16 13:11:01 -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
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
Marco Pesenti Gritti
9c4da3c172
F11 now put the activities window in fullscreen,
2006-06-15 17:31:41 -04:00
Marco Pesenti Gritti
122c0dad16
Simplify focus a lot by using transient windows
2006-06-15 17:22:36 -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
Marco Pesenti Gritti
1b611fc842
More chat refactoring
2006-06-15 16:51:30 -04:00
Marco Pesenti Gritti
c05bc5a669
Fix
2006-06-15 11:46:42 -04:00