Commit Graph

26 Commits

Author SHA1 Message Date
Dan Williams
e9f20cfe0f pylint fixes 2006-06-20 09:39:36 -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
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
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
361eeff0c5 Implement page location sharing. Not yet working for
some reason.
2006-06-17 00:33:08 -04:00
Dan Williams
e060c07873 Make each activity have a default type for sharing 2006-06-16 23:10:30 -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
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
e633c2ef8d Missing import 2006-06-16 13:21:28 -04:00
Marco Pesenti Gritti
4a0e8ac2d4 Some work on the getting model back 2006-06-16 13:06:11 -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
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
9ebcd65659 Implement the share button on the presence window 2006-06-13 14:49:01 -04:00
Dan Williams
046a954de1 Change Activity so that subclasses don't have to call Activity superclass methods from the shell callbacks. Makes subclasses simpler since they don't (necessarily) have to care about OO concepts like superclasses right away. 2006-06-05 12:35:00 -04:00
Dan Williams
4c7f15f694 Refactor dbus out of Activity objects so that we're sure when 2006-06-02 14:52:20 -04:00
Marco Pesenti Gritti
f96fbfc10b Split up the browser, some cleanups and 2006-05-31 18:01:24 -04:00