Commit Graph

64 Commits

Author SHA1 Message Date
Benjamin Berg
1c1f736a81 Merge branch 'master' of git://dev.laptop.org/sugar 2007-10-16 17:50:14 +02:00
Tomeu Vizoso
69aaa7145e One more fix for resuming. 2007-10-16 17:39:27 +02:00
Marco Pesenti Gritti
40fc6e2e47 Simplify the API to get icon/description for objects.
Get rid of the service for now, it's not necessary
until we allow activities to extend the
mime type -> generic type mapping (post 1.0)
2007-10-16 17:18:43 +02:00
Benjamin Berg
977c7d4a99 Subtract the palette border from the primary label height. 2007-10-16 17:12:46 +02:00
Tomeu Vizoso
05236c6670 Fix retrieving the activities suitable for resuming a journal entry 2007-10-16 16:56:02 +02:00
Tomeu Vizoso
aed093dbc2 Fix warning. 2007-10-16 16:18:36 +02:00
Simon Schampijer
664e8a636d Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar 2007-10-16 15:52:05 +02:00
Simon Schampijer
91f55488eb Use double leading underscores for callback names to avoid name collisions
The double underscores invoke Python's name mangling algorithm
2007-10-16 15:51:48 +02:00
Marco Pesenti Gritti
34e2271833 Cast to string, looks like dbus strings confuse pygtk
type checking here.
2007-10-16 14:40:43 +02:00
Marco Pesenti Gritti
cb0cedbc40 Do not use prgname for the bundle id because xulrunner
is messing with it. Some activity launch fixes.
2007-10-16 14:29:38 +02:00
Marco Pesenti Gritti
e425c1d886 Fallback to mime parents if the main one doesn't have matches 2007-10-16 13:32:53 +02:00
Marco Pesenti Gritti
6d2828e54e Use gdk to get/set X11 properties 2007-10-16 11:50:11 +02:00
Marco Pesenti Gritti
c999a3ca80 Fix distcheck 2007-10-16 11:24:10 +02:00
Marco Pesenti Gritti
6240c1cf6f Cleanup the source structure 2007-10-16 11:04:59 +02:00