diff options
| -rw-r--r-- | NEWS | 1 | ||||
| -rwxr-xr-x | services/clipboard/sugar-clipboard | 3 | ||||
| -rw-r--r-- | sugar/graphics/objectchooser.py | 2 |
3 files changed, 3 insertions, 3 deletions
@@ -1,3 +1,4 @@ +* #2511 Fix journal entries background in the object chooser. (tomeu) * Activity launching now timeout after 120 seconds. (marco) * Add timeout arg to sugar.datastore.Datastore. (tomeu) * Presence Service monitor in dev console (smcv) diff --git a/services/clipboard/sugar-clipboard b/services/clipboard/sugar-clipboard index 6ce1e86..4cffa33 100755 --- a/services/clipboard/sugar-clipboard +++ b/services/clipboard/sugar-clipboard @@ -26,9 +26,6 @@ from sugar import logger logger.start('clipboard') import gobject -import pygtk -pygtk.require('2.0') - import dbus.glib from sugar import env diff --git a/sugar/graphics/objectchooser.py b/sugar/graphics/objectchooser.py index aea8315..fa70786 100644 --- a/sugar/graphics/objectchooser.py +++ b/sugar/graphics/objectchooser.py @@ -105,6 +105,8 @@ class CollapsedEntry(Frame): Frame.__init__(self) self.props.box_height = units.grid_to_pixels(1) self.props.spacing = units.points_to_pixels(5) + self.props.border_color = color.FRAME_BORDER.get_int() + self.props.background_color = color.DESKTOP_BACKGROUND.get_int() self.jobject = jobject self._icon_name = None |