sugarlabs/sugar-toolkit-gtk3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
Dan Winship 2007-07-27 09:44:33 -04:00
commit b9d7d00985
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
NEWS
View File

@ -1,3 +1,4 @@
* #2511 Fix journal entries background in the object chooser. (tomeu)
* Activity launching now timeout after 120 seconds. (marco) * Activity launching now timeout after 120 seconds. (marco)
* Add timeout arg to sugar.datastore.Datastore. (tomeu) * Add timeout arg to sugar.datastore.Datastore. (tomeu)
* Presence Service monitor in dev console (smcv) * Presence Service monitor in dev console (smcv)

3
services/clipboard/sugar-clipboard
View File

@ -26,9 +26,6 @@ from sugar import logger
logger.start('clipboard') logger.start('clipboard')
import gobject import gobject
import pygtk
pygtk.require('2.0')
import dbus.glib import dbus.glib
from sugar import env from sugar import env

2
sugar/graphics/objectchooser.py
View File

@ -105,6 +105,8 @@ class CollapsedEntry(Frame):
Frame.__init__(self) Frame.__init__(self)
self.props.box_height = units.grid_to_pixels(1) self.props.box_height = units.grid_to_pixels(1)
self.props.spacing = units.points_to_pixels(5) 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.jobject = jobject
self._icon_name = None self._icon_name = None