Simon McVittie
66c5e882f3
Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar
2007-05-21 11:30:38 +01:00
Simon McVittie
8c8dffe662
Merge commit 'origin' into submit
2007-05-21 11:27:47 +01:00
Tomeu Vizoso
11c89d86c9
Put dates to work correctly on the journal, create a new journal entry when resuming a past entry.
2007-05-20 12:38:08 +02:00
Tomeu Vizoso
04fc7047c2
Don't autolaunch downloaded docs, this will be done from the Web activity.
2007-05-20 12:36:55 +02:00
Tomeu Vizoso
5d4b9b1dfa
Set the activity icon on new journal entries.
2007-05-19 20:06:36 +02:00
Tomeu Vizoso
abec4df66e
Don't try to display an icon without file name.
2007-05-19 11:19:56 +02:00
Tomeu Vizoso
3ac4cb5432
Stop depending on NSPR.
2007-05-19 10:01:07 +02:00
Simon McVittie
ccc224e76f
sugar.presence.presenceservice: Use absolute imports
2007-05-18 15:33:21 +01:00
Simon McVittie
29cc39968d
Don't rely on dbus importing the exceptions module - import it explicitly.
...
Also divide up imports in a PEP8-compliant way.
2007-05-18 15:31:32 +01:00
Simon McVittie
c6ac2873c8
sugar.presence.presenceservice: Add get_buddy_by_telepathy_handle()
2007-05-18 15:24:58 +01:00
Simon McVittie
78356b1956
services/presence/: move more of the handle tracking into the Buddy object
2007-05-18 15:22:32 +01:00
Simon McVittie
bf84eca102
services/presence/server_plugin.py: Ensure _conn always exists (even if None)
...
This means cleanup() will not fail on an uninitialized server plugin,
and get_connection() will return None rather than raising AttributeError.
2007-05-18 15:21:36 +01:00
Marco Pesenti Gritti
6c671fb7fe
Size the toolbox to 1 grid cell
2007-05-18 14:00:29 +02:00
Marco Pesenti Gritti
b958a515d5
Draw the background of the toolbox hbox
2007-05-18 13:32:50 +02:00
Dan Williams
7b9c59fb9c
Correctly send IPv4 address when NM already has a connection
2007-05-17 13:54:26 -04:00
Simon McVittie
f3a2d532f5
services/presence: buddy: add mapping to/from Telepathy handles
2007-05-17 17:41:42 +01:00
Marco Pesenti Gritti
4af212d214
Disable clicks handling for now, can't figure out what's broken.
2007-05-17 16:06:04 +02:00
Dan Williams
d72ff8c6fb
Don't try to shove None through dbus
2007-05-17 09:32:34 -04:00
Bert Freudenberg
6dd2f7109c
Find executable in bundle (approved by marcopg, fix for #1362 )
2007-05-17 13:18:56 +02:00
Simon McVittie
cd0a2b3ecd
Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar
2007-05-17 11:31:57 +01:00
Tomeu Vizoso
3a1d514e9f
Save to the journal when switching to another activity.
2007-05-16 21:30:49 +02:00
Tomeu Vizoso
1d31c51ecc
Don't save to the journal on focus-out.
2007-05-16 17:55:56 +02:00
Tomeu Vizoso
7314d5a8c8
Improve logging.
2007-05-16 17:01:59 +02:00
Tomeu
79fdfc5fb7
Don't set_active(0) on realize, as it would trigger 'changed'.
2007-05-16 15:02:41 +02:00
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
