Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge commit 'origin' into submit | Simon McVittie | 2007-05-21 | 1 | -4/+13 |
|\ | |||||
| * | Correctly send IPv4 address when NM already has a connection | Dan Williams | 2007-05-17 | 1 | -3/+5 |
| | | |||||
| * | Don't try to shove None through dbus | Dan Williams | 2007-05-17 | 1 | -1/+8 |
| | | |||||
* | | Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar | Simon McVittie | 2007-05-16 | 1 | -18/+45 |
|\ \ | |/ | | | | | | | | | Conflicts: services/presence/server_plugin.py | ||||
| * | Retry getting buddy properties a few times | Dan Williams | 2007-05-16 | 1 | -8/+17 |
| | | |||||
| * | Some PS reliability fixes | Dan Williams | 2007-05-15 | 1 | -10/+28 |
| | | |||||
* | | services/presence/server_plugin.py: Handle presence more correctly. | Simon McVittie | 2007-05-16 | 1 | -4/+49 |
| | | | | | | | | | | | | | | | | 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. | ||||
* | | services/presence: Stop using deprecated keyword argument named_service | Simon McVittie | 2007-05-15 | 1 | -2/+2 |
| | | |||||
* | | sugar.presence.presenceservice, services/presence: Use named loggers. | Simon McVittie | 2007-05-15 | 6 | -72/+89 |
|/ | | | | | | | | | | | 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. | ||||
* | Set alias twice so server actually gets it | Dan Williams | 2007-05-15 | 1 | -0/+5 |
| | |||||
* | Don't drop buddies on failure to retrieve their activity list | Dan Williams | 2007-05-14 | 1 | -1/+2 |
| | |||||
* | Fix setting owner OLPC properties | Dan Williams | 2007-05-14 | 1 | -3/+2 |
| | |||||
* | Make reconnection to the jabber server work again | Dan Williams | 2007-05-14 | 1 | -1/+29 |
| | |||||
* | Make deferred connection actually work | Dan Williams | 2007-05-14 | 1 | -2/+3 |
| | |||||
* | Fix uninitialized variable traceback | Dan Williams | 2007-05-14 | 1 | -0/+1 |
| | |||||
* |