sugarlabs/sugar-toolkit-gtk3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
1,109 Commits 1 Branch 0 Tags 15 MiB
4f2b8b3e31
Commit Graph

595 Commits

Author SHA1 Message Date
Marco Pesenti Gritti
7dddefe229 Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar into demo4 2006-08-16 19:55:34 +02:00
Marco Pesenti Gritti
115eefb4c2 Implement a canvas element that can draw svg icons 
with different colors.
 2006-08-16 19:55:13 +02:00
Marco Pesenti Gritti
6b181ced13 Some cleanups 2006-08-16 00:41:51 +02:00
Marco Pesenti Gritti
1cfd208f7b Do not pass the timeout argument if we are using the in-process console 2006-08-16 00:30:50 +02:00
Marco Pesenti Gritti
b1c7385204 Print traces also on stderr 2006-08-15 13:15:46 +02:00
Marco Pesenti Gritti
621e43563f Get rid of the initial implementation of Diana design since that's no more the plan. 2006-08-14 20:54:33 +02:00
Marco Pesenti Gritti
3d4330580c Factor out a queue from the handler and use it for exceptions too. 
Send all messages in the same dbus call.
 2006-08-14 12:18:58 +02:00
Marco Pesenti Gritti
6eb7117c25 Getting presence service logging to work. 
Don't lose debug state when switching tab.
 2006-08-13 02:57:12 +02:00
Marco Pesenti Gritti
dd7fff79f8 Fix add_python_path, ensure service exist before trying to log 2006-08-13 01:31:24 +02:00
Marco Pesenti Gritti
c7c71d25a8 Use dbus activation to start the presence service 2006-08-13 00:28:38 +02:00
Marco Pesenti Gritti
e2e5bc0000 Install service files for the presence service 2006-08-13 00:06:52 +02:00
Marco Pesenti Gritti
e57f4da027 Factor out a function to write services from the activities setup code 2006-08-12 23:47:14 +02:00
Marco Pesenti Gritti
c07612c858 Fix running from installed 2006-08-12 23:38:52 +02:00
Marco Pesenti Gritti
bb60b8ad3e Cleanup environemnt setup 2006-08-12 23:35:52 +02:00
Marco Pesenti Gritti
d41c761e02 Simplify profile/nick name code. Use SUGAR_NICK_NAME env. 2006-08-12 21:34:06 +02:00
Marco Pesenti Gritti
2636bc63d0 Split the console service out of the shell, to remove dep 2006-08-12 16:19:47 +02:00
Marco Pesenti Gritti
fc1aefc72c Use dbus-launch with the --exit-with-session. dbus not exiting still not fully solved. 2006-08-12 01:29:55 +02:00
Marco Pesenti Gritti
72bf637091 Actually enable exception logging 2006-08-11 23:30:03 +02:00
Marco Pesenti Gritti
9585330e43 Add a way to enable/disable displaying debug messages 2006-08-11 17:05:06 +02:00
Marco Pesenti Gritti
884eef4bd5 Show all activities output in the console, just 
activate the tab for the current activity.
 2006-08-11 15:21:11 +02:00
Marco Pesenti Gritti
628271959c Refactor the console stuff 2006-08-11 13:05:33 +02:00
Marco Pesenti Gritti
27456ff723 Remove the theme hacks. sugar-jhbuild set this up fine now. 2006-08-10 23:54:34 +02:00
Marco Pesenti Gritti
9b12b11534 Get one-to-one chat back to work 2006-08-10 00:54:54 +02:00
Marco Pesenti Gritti
0dcaf314f7 Several fixes and cleanups 2006-08-09 18:29:33 +02:00
Marco Pesenti Gritti
95d9b7fe8e More work on the chat. Fix terminal api 2006-08-09 15:53:10 +02:00
Marco Pesenti Gritti
a0c69066d4 Remove default_type from the dbus service too 2006-08-09 13:05:57 +02:00
Marco Pesenti Gritti
7db5479c5c It's not necessary to pass the default_type around anymore. 2006-08-09 13:01:47 +02:00
Marco Pesenti Gritti
7e85c5160e Setup the activity from the shell process, through dbus, 
this simplifies things a lot...
 2006-08-09 12:57:42 +02:00
Marco Pesenti Gritti
4d67407f6a Cleanups 2006-08-09 02:13:56 +02:00
Marco Pesenti Gritti
70485218c0 Split the factory to his own module 2006-08-09 02:02:34 +02:00
Marco Pesenti Gritti
7ab6da7278 Actually join the activity, check for duplicates in the model. 2006-08-09 01:50:35 +02:00
Marco Pesenti Gritti
c6d59fd7b4 Improve the activity api 2006-08-09 01:08:19 +02:00
Marco Pesenti Gritti
f1821704e7 Cleanups and document a bit 2006-08-08 12:34:04 +02:00
Marco Pesenti Gritti
892c61e63a Publish and use title for the activities model 2006-08-08 12:08:16 +02:00
Marco Pesenti Gritti
2535a88645 Use the default service to get activity informations, instead 
of Activity ps object.
 2006-08-08 12:01:45 +02:00
Marco Pesenti Gritti
544e47cbe0 Move activity service registration in Activity 2006-08-07 16:42:36 +02:00
Marco Pesenti Gritti
9274f9707f Remove args from the factory interface 2006-08-07 16:26:54 +02:00
Marco Pesenti Gritti
d919848324 Rework to not use protected API 2006-08-07 11:08:10 +02:00
Marco Pesenti Gritti
167dbec0f5 Add a script to install external activities 2006-08-04 15:54:28 +02:00
Dan Williams
3117d454b9 add service unregistration 2006-08-02 10:27:09 -04:00
Marco Pesenti Gritti
86bd6f50f0 Use dbus activation to launch factories. This breaks 
p-to-p chat and ./sugar/activities. Will fix tomorrow.
 2006-07-28 01:25:08 +02:00
Marco Pesenti Gritti
d778d45b13 Load the current page when joining an active. 
Get back page sharing to work.
 2006-07-26 18:00:28 +02:00
Marco Pesenti Gritti
fd6367007a Get chat to work again 2006-07-26 14:05:43 +02:00
Marco Pesenti Gritti
5f628f1a4f Get presence to work on the chat window 2006-07-26 13:41:49 +02:00
Marco Pesenti Gritti
0947581a11 A bunch of fixes... 2006-07-26 12:57:54 +02:00
Marco Pesenti Gritti
57cc6a303c Some fixes, adapt the presence view to the new api 2006-07-26 11:44:54 +02:00
Dan Williams
ae1b278d7a Fix getting published service values 2006-07-25 19:15:36 -05:00
Dan Williams
80b92fe2aa Merge branch 'master' of git+ssh://dcbw@dev.laptop.org/git/sugar 2006-07-25 19:04:20 -05:00
Dan Williams
164add907d Make shareActivity work 2006-07-25 19:04:15 -05:00
Marco Pesenti Gritti
2e58cc8786 Work around for dbus locking issue 2006-07-26 01:14:31 +02:00
Dan Williams
e5065263a9 s/publish/share 2006-07-25 17:17:05 -05:00
Dan Williams
8d232ae292 Fix spacing 2006-07-25 16:46:09 -05:00
Dan Williams
e3065ba02d Merge branch 'master' of git+ssh://dcbw@dev.laptop.org/git/sugar 2006-07-25 16:38:52 -05:00
Dan Williams
ea133a9c6d merge 2006-07-25 16:38:48 -05:00
Dan Williams
c1e0bd39b2 presence.py is no longer used 2006-07-25 16:36:51 -05:00
Marco Pesenti Gritti
1ef5c576c2 Do not use dbus_bindings for exceptions. Use dbus.exceptions. Thanks J5 to point it out. 2006-07-25 22:52:45 +02:00
Marco Pesenti Gritti
ef71679ed6 Rewrite this since I forgot to add it and lost it grrr 2006-07-25 18:39:03 +02:00
Dan Williams
3798f29a6b Make dbus service properties public 2006-07-24 11:27:21 -05:00
Dan Williams
318c49bacf Don't traceback when our activity can't be found (because it's not shared) 2006-07-24 11:13:07 -05:00
Dan Williams
a827175a28 Fix dbus_bindings import namespace 2006-07-24 11:08:59 -05:00
Dan Williams
ba6c75725d Fix occurances of get_nick_name() -> get_name() 2006-07-24 10:57:21 -05:00
Dan Williams
a216a19f3f Re-enable ActivityChat service existing chat service detection code 2006-07-24 10:57:02 -05:00
Dan Williams
5887cb39bb Fix get_icon_pixbuf() 2006-07-24 10:56:06 -05:00
Marco Pesenti Gritti
d2f76cc41d More work on the new home page. 
Remove obsolete import.
 2006-07-24 15:11:14 +02:00
Marco Pesenti Gritti
1acd82599a Start working on Diana's home window visual design 2006-07-24 12:48:12 +02:00
Marco Pesenti Gritti
e4a87bea06 Implement a stage view 2006-07-24 12:15:52 +02:00
Marco Pesenti Gritti
5cec8f9734 Better applying of transformations 2006-07-24 11:53:02 +02:00
Marco Pesenti Gritti
78660bfcf6 Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar 2006-07-24 11:02:10 +02:00
Marco Pesenti Gritti
1e3633baf7 Implement translation 2006-07-24 11:01:25 +02:00
Dan Williams
5afb98d0ae Add missing import 2006-07-23 22:29:27 -05:00
Dan Williams
7c996b0011 More fixes, and convert python PS bindings to more glib style method names 2006-07-23 09:21:00 -05:00
Dan Williams
b63e78a174 Make the PresenceService stuff start to work 2006-07-22 23:56:40 -05:00
Marco Pesenti Gritti
1c35f8d92c Small improvements 2006-07-22 14:32:04 +02:00
Marco Pesenti Gritti
1e3af85c40 Implement basic animation 2006-07-22 13:48:47 +02:00
Marco Pesenti Gritti
a292b642e1 Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar 2006-07-22 12:42:02 +02:00
Marco Pesenti Gritti
fe69904b6c Add layout manager and a circle layout 2006-07-22 12:28:59 +02:00
Marco Pesenti Gritti
a02313d85a Beginnings of a simple scene API. Inspired opened-hand's Clutter 2006-07-22 11:54:27 +02:00
Dan Williams
ea264a1a83 More PS bits 2006-07-22 01:26:39 -04:00
Marco Pesenti Gritti
48a21ef143 Add each activity to a separate window group to get 
a correct behavior with transient windows in matchbox.
Thanks to Matthew Allum for suggesting this.
 2006-07-20 17:52:31 +02:00
Marco Pesenti Gritti
32bb288389 Some build fixes. pygtk.require at least one time for process. 2006-07-20 16:49:11 +02:00
Marco Pesenti Gritti
d6ec6db880 Make the console contextual to the activity and use the 
window manager to activate it.
 2006-07-20 12:13:47 +02:00
Marco Pesenti Gritti
87cb115aa0 Abstract activity on the shell side into an ActivityHost object. 
Comment out/fix more ps borkage.
 2006-07-20 11:34:06 +02:00
Dan Williams
766b82d467 Switch sugar/presence module over to a thin API wrapper around the PresenceService dbus API 2006-07-19 15:27:37 -04:00
Marco Pesenti Gritti
1590e15c25 Fix path building 2006-07-19 20:59:46 +02:00
Marco Pesenti Gritti
c3de9649b9 Use the new -kbdconfig option in matchbox 2006-07-19 20:58:29 +02:00
Marco Pesenti Gritti
5daa5aa69b Missing return, yay for python 2006-07-19 19:35:32 +02:00
Marco Pesenti Gritti
ae00121fbf Use matchbox to activate home and people page 2006-07-19 13:38:24 +02:00
Marco Pesenti Gritti
46d2f1c532 Get rid of pygtk.require. It doesn't make a lot of sense 
and recent apps are not using it anyway.
 2006-07-16 17:25:32 +02:00
Marco Pesenti Gritti
21b46a0022 Bunch of fixes, sharing should be back to work 2006-07-15 12:31:06 +02:00
Marco Pesenti Gritti
db08c3795f Read service type from the .activity file 2006-07-14 16:40:45 +02:00
Marco Pesenti Gritti
2bbedf988b Fix a bunch of bugs, more cleanups 2006-07-12 22:17:57 +02:00
Marco Pesenti Gritti
d12b780074 More work on session refactoring 2006-07-12 17:21:22 +02:00
Marco Pesenti Gritti
be806eb191 More cleanups and some fixes 2006-07-12 14:02:29 +02:00
Marco Pesenti Gritti
ca2b08f8b6 Cleanup and document session creation and activity registry 2006-07-12 13:20:41 +02:00
Marco Pesenti Gritti
01da885516 Lots of build fixes 2006-07-10 16:16:30 +02:00
Marco Pesenti Gritti
9f9f420863 Add tasks to the home window. A bunch of fixes. 2006-07-10 13:42:34 +02:00
Marco Pesenti Gritti
1cc14e406a More work on the window management refactor 2006-07-09 17:37:54 +02:00
Marco Pesenti Gritti
d4cb9a2714 More work on the new design 2006-07-08 15:47:51 +02:00
Marco Pesenti Gritti
2999244b54 Stat refactoring the shell to use windows rather than tabs. 
Initial implementation of the new activity menu
 2006-07-08 11:55:33 +02:00
Marco Pesenti Gritti
63c93e4f2d Rewrite the wm, implement smarter sliding, "merge" 
presence window and chat, activate by F1
 2006-07-07 16:37:52 +02:00
Marco Pesenti Gritti
ba09278c67 Split classes out of shell.py 2006-07-06 23:34:23 +02:00
Marco Pesenti Gritti
270bb8aaf6 This should fix one-to-one chat, can't test now though 2006-07-06 23:08:35 +02:00
Marco Pesenti Gritti
fbb2621fff Make missing strings translatable 2006-07-06 20:25:56 +02:00
Marco Pesenti Gritti
6f9ae0c769 Initialize the console 2006-07-06 16:06:07 +02:00
Marco Pesenti Gritti
85ff44db1c Forgot to commit changes... This breaks one-to-one chat, 
I'm going to fix it.
 2006-07-06 15:59:48 +02:00
Marco Pesenti Gritti
0cd9d86310 No need to use presence service if it's all well known 2006-06-30 12:32:15 -04:00
Marco Pesenti Gritti
23b6c1e98a Use well known address for mesh chat 2006-06-30 12:26:12 -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
Marco Pesenti Gritti
9ef8013a6b Initialize the stream also when publishing 2006-06-27 12:27:30 -04:00
Marco Pesenti Gritti
d61c478168 Add some debug messages 2006-06-27 12:15:14 -04:00
Dan Williams
a0397b29df Add some simple network test code for 2 machines 2006-06-27 12:03:06 -04:00
Marco Pesenti Gritti
0ac820812a Another missing file 2006-06-23 23:22:17 -04:00
Marco Pesenti Gritti
8fa1efd703 Add some missing files 2006-06-23 23:20:41 -04:00
Marco Pesenti Gritti
7026006efd Make the send button larger and remove border 2006-06-23 16:08:58 -04:00
Marco Pesenti Gritti
7504297e72 Merge branch 'master' of git+ssh://crank.laptop.org/git/sugar 2006-06-23 15:08:28 -04:00
Marco Pesenti Gritti
3fcfebf112 Fix chat focus 2006-06-23 15:08:00 -04:00
Marco Pesenti Gritti
92a4708244 Make sketches work in one-to-one chat 2006-06-23 14:11:26 -04:00
Dan Williams
e5c7dea51c Don't traceback when an icon isn't found 2006-06-23 14:00:37 -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
4511d13fb5 Merge branch 'master' of git+ssh://dcbw@crank.laptop.org/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
Marco Pesenti Gritti
e2719f7fb4 Don't need this anymore 2006-06-22 18:29:46 -04:00
Marco Pesenti Gritti
59f25b0741 Get one-to-one chat to actually work... 2006-06-22 18:07:54 -04:00
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
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
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
Marco Pesenti Gritti
8797223ccd Fixup the chat toolbar layout a bit 2006-06-22 09:22:23 -04:00
Marco Pesenti Gritti
974ef81c1e Get back mesh chat (for the everyone tab) 2006-06-21 23:49:37 -04:00
Marco Pesenti Gritti
26684a091c Release 0.11 2006-06-21 16:18:25 -04:00
Marco Pesenti Gritti
37ad383be3 Forgot to add these 2006-06-21 16:06:56 -04:00
Marco Pesenti Gritti
9ea6805174 More work on packages refactoring, mostly working 2006-06-21 16:05:52 -04:00
Marco Pesenti Gritti
f4e2791c89 Big refactor of the directory structure and packages to 
reflect private/public
 2006-06-21 14:23:18 -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
Marco Pesenti Gritti
7e20f07b6c Add some defines for the sliding parameters 2006-06-20 03:34:14 -04:00
Marco Pesenti Gritti
028b15d3df Initial bots code... probably a crack idea but let's see if I can 
get something useful out of it.
 2006-06-20 03:19:33 -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://dcbw@crank.laptop.org/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
Marco Pesenti Gritti
8212ce7595 Ensure to not do unnecessary move when sliding 2006-06-19 23:05:25 -04:00
Marco Pesenti Gritti
758d9fba43 Always enable console 2006-06-19 23:04:53 -04:00
Marco Pesenti Gritti
8bcdb8f3dd Implement session shutdown. For now we are forcefully 
killing activities. We will need to implement some sort
of shutdown notification system but... for now this
works.
 2006-06-19 22:39:57 -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
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