Simon McVittie
531321740c
Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar
...
Conflicts:
services/presence/server_plugin.py
2007-05-16 12:30:49 +01:00
Simon McVittie
35d190b55e
services/presence/server_plugin.py: Handle presence more correctly.
...
This avoids unnecessary attempts to look up the buddy properties of
channel-specific handles (which doesn't work) by only looking up the buddy
properties of people we're subscribed to.
Also, this approves subscription requests that come in while we're online,
rather than handling them when we next go from offline to online.
2007-05-16 11:39:16 +01:00
Dan Williams
5d9e19a892
Retry getting buddy properties a few times
2007-05-16 01:03:55 -04:00
Dan Williams
e659d15384
Make datastore find & update operations async
2007-05-16 00:41:45 -04:00
Dan Williams
28e8b9025e
Show activity title in mesh view
2007-05-15 16:21:40 -04:00
Dan Williams
82095ea26a
Some PS reliability fixes
2007-05-15 15:25:30 -04:00
Simon McVittie
5d77ff680a
services/presence: Stop using deprecated keyword argument named_service
2007-05-15 15:20:02 +01:00
Simon McVittie
4b26840333
sugar.presence.presenceservice, services/presence: Use named loggers.
...
This causes events in the log to be annotated with the module that emitted the
message.
Before: DEBUG - root: Starting up...
After: DEBUG - s-p-s.server_plugin: Starting up...
I've used a log domain of "sugar.presence..." for the client library and
e.g. "s-p-s.activity" for the service internals.
2007-05-15 14:58:15 +01:00
Marco Pesenti Gritti
ef00d72ca8
Put compreg.dat in the profile.
2007-05-15 12:22:26 +02:00
Marco Pesenti Gritti
4a8493f95e
Fix mozilla components loading when sugar is running from source.
...
We don't attempt to load components from source, since that would
be insanely complicated.
2007-05-15 11:50:21 +02:00
Marco Pesenti Gritti
9fa0790c2b
Do not assume we are packing an ActivityToolbox inside the activity
2007-05-15 11:23:46 +02:00
Dan Williams
871828f307
Set alias twice so server actually gets it
2007-05-14 22:48:53 -04:00
Dan Williams
79aad47327
Don't drop buddies on failure to retrieve their activity list
2007-05-14 16:20:23 -04:00
Dan Williams
9b978f014f
Fix setting owner OLPC properties
2007-05-14 16:17:33 -04:00
Marco Pesenti Gritti
9a83c2b0fd
Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar
2007-05-14 19:57:01 +02:00
Dan Williams
a05d804949
Make reconnection to the jabber server work again
2007-05-14 13:58:26 -04:00
Marco Pesenti Gritti
141072c9e9
Set a default title for the activity
2007-05-14 19:56:06 +02:00
Marco Pesenti Gritti
8ccb393b55
Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar
2007-05-14 19:27:51 +02:00
Marco Pesenti Gritti
820e739a0f
Improve the layout of the activity toolbar
2007-05-14 19:27:35 +02:00
Dan Williams
b99e149d23
Fix Friends view buddy removal
2007-05-14 13:04:59 -04:00
Marco Pesenti Gritti
c84e21aa9e
Hide the tabs bar when there is only one toolbar.
...
Fix sugar.Browser
2007-05-14 15:48:36 +02:00
Dan Williams
9e1e851884
Make deferred connection actually work
2007-05-14 02:46:51 -04:00
Dan Williams
02c99e2a0c
Handle buddy nick changes
2007-05-14 01:21:22 -04:00
Dan Williams
e1b3cde65e
Fix uninitialized variable traceback
2007-05-13 21:40:24 -04:00
Dan Williams
5e2ea16e3a
Redo PS connection handling; ensure valid network connection before talking to server
2007-05-13 21:34:15 -04:00
Dan Williams
66dfd363ba
Log the PS getting kicked off the bus
2007-05-13 21:33:14 -04:00
Dan Williams
fddf101885
Quiet error message when unecessary
2007-05-13 21:31:16 -04:00
Dan Williams
de1796605f
Fix member name collision with dbus object superclass
2007-05-13 21:11:19 -04:00
Dan Williams
077b3e3391
Fix debug log statement
2007-05-13 21:08:54 -04:00
Marco Pesenti Gritti
9e10d15c21
More work on pyxpcom integration
2007-05-13 22:49:27 +02:00
Marco Pesenti Gritti
7e0fd77b13
Some fixes
2007-05-13 20:32:28 +02:00
Tomeu
f3289d2e59
Implement setting the journal entry title from the toolbar.
2007-05-13 18:21:35 +02:00
Tomeu
309ddec8b7
Activate session saving as gtk_moz_embed_set_directory_service_provider got added to the glue.
2007-05-13 18:18:50 +02:00
Marco Pesenti Gritti
04b81ee901
Add a browsehelper component which I'll use for pyxpcom integration.
2007-05-13 16:26:55 +02:00
Dan Williams
f13a49b08e
Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar
2007-05-11 18:41:39 -04:00
Simon McVittie
2216f5095d
Use ExportedGObject from dbus-python rather than reimplementing it
2007-05-11 17:27:36 -04:00
Dan Williams
a86293dcb4
Only set our own properties when we're connected
2007-05-11 17:25:44 -04:00
Marco Pesenti Gritti
d8446e25ae
Cleanup
2007-05-11 23:11:02 +02:00
Marco Pesenti Gritti
b0c2f0313f
Check the grid exists before trying to remove weight when removing items.
2007-05-11 23:10:07 +02:00
Marco Pesenti Gritti
d319ac192d
Use sugar theme for matchbox
2007-05-11 20:31:44 +02:00
Marco Pesenti Gritti
5b55fbc99e
Use the sugar-xo theme on the xo
2007-05-11 16:55:43 +02:00
Marco Pesenti Gritti
f0e5523cd0
gtk thinks the xo dpi is 200.0
2007-05-11 12:36:07 +02:00
Marco Pesenti Gritti
669c4259dc
Fix distcheck
2007-05-11 12:33:14 +02:00
Marco Pesenti Gritti
35a9102b71
Build the gtkrcs from a common gtkrc.em
2007-05-11 12:17:43 +02:00
Marco Pesenti Gritti
d5e0605195
Scripted generation of sugar and sugar-xo
2007-05-11 11:49:12 +02:00
Marco Pesenti Gritti
0087f41fb4
Remove obsolete files
2007-05-11 11:19:03 +02:00
Marco Pesenti Gritti
e5a586fe69
More distcheck fixes
2007-05-11 11:18:17 +02:00
Marco Pesenti Gritti
85a4c4adb3
More distcheck fixes
2007-05-10 19:16:27 +02:00
Marco Pesenti Gritti
cb1119a647
Fix several distcheck issues
2007-05-10 18:55:29 +02:00
Tomeu Vizoso
133b96b4f0
Typo.
2007-05-10 17:04:40 +02:00
