Merge branch 'master' of git+ssh://danw@dev.laptop.org/git/sugar

NEWS

@@ -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)

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

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