Commit Graph

3865 Commits

Author SHA1 Message Date
Simon McVittie
494e17b3cd Revert "services/presence/: move more of the handle tracking into the Buddy object".
It shouldn't have been applied before "services/presence: buddy: add mapping
to/from Telepathy handles" which has not yet been reviewed.

This reverts commit 78356b1956.

Conflicts:

	services/presence/presenceservice.py
2007-05-24 12:34:36 +01:00
Simon McVittie
677eb1629c Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar 2007-05-24 12:26:28 +01:00
Marco Pesenti Gritti
27a3644dab Hook up mime.get_for_file 2007-05-24 12:30:42 +02:00
Marco Pesenti Gritti
2145de1039 Hook up get_from_file_name 2007-05-24 12:08:05 +02:00
Bert Freudenberg
c89de594d3 Use proper "org.laptop.Activity" interface when talking to activities 2007-05-23 18:38:22 +02:00
Bert Freudenberg
677c4bc199 Reliably detect activity launch (fix for #1560) 2007-05-23 18:33:30 +02:00
Marco Pesenti Gritti
f3d9d5e334 Remove the obsolete p2p code 2007-05-23 12:37:15 +02:00
Marco Pesenti Gritti
08c366d044 Remove a couple of macros which was unused and causing problems. 2007-05-23 12:32:33 +02:00
Marco Pesenti Gritti
c202b6be43 Import xdgmime and start hooking it up 2007-05-23 11:55:21 +02:00
Tomeu Vizoso
ffebebcd7d Set icon size on the combobox. 2007-05-22 18:25:29 +02:00
Tomeu Vizoso
87d59ae13b Avoid crashing in atexit. 2007-05-22 18:24:56 +02:00
Marco Pesenti Gritti
1cb7700136 Rename interface name to org.laptop 2007-05-22 14:49:28 +02:00
Tomeu Vizoso
1dc104126d Adapt to new DataStore API. 2007-05-22 14:03:31 +02:00
Marco Pesenti Gritti
490b939eb9 Import the AddressEntry 2007-05-21 17:53:47 +02:00
Marco Pesenti Gritti
0ddbf7e9ab Add the AddressEntry object to sugar 2007-05-21 17:36:08 +02:00
Marco Pesenti Gritti
d560489d0f Browser leftover 2007-05-21 12:58:05 +02:00
Simon McVittie
1d79d93627 Fix syntax 2007-05-21 11:50:29 +01:00
Marco Pesenti Gritti
17b3142776 Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar
Conflicts:

	configure.ac
2007-05-21 12:47:28 +02:00
Marco Pesenti Gritti
f1d67f661e Use autoreconf 2007-05-21 12:46:32 +02:00
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
Marco Pesenti Gritti
42f7eeedc8 Drop the browser stuff, it will be replaced by hulahop. 2007-05-21 11:06:52 +02: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