The patch does make sure that the color of the entry has the owner's color when
you copy
it from an external device to the Journal. It handles the case where when you
copy a Journal
entry from another user on an external device and then into your Journal
cleanly.
The color stays the same.
---
src/jarabe/journal/model.py | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/src/jarabe/journal/model.py b/src/jarabe/journal/model.py
index fd25681..b246abb 100644
--- a/src/jarabe/journal/model.py
+++ b/src/jarabe/journal/model.py
@@ -30,10 +30,12 @@ from gettext import gettext as _
import gobject
import dbus
import gio
+import gconf
from sugar import dispatch
from sugar import mime
from sugar import util
+from sugar.graphics.xocolor import XoColor
DS_DBUS_SERVICE = 'org.laptop.sugar.DataStore'
@@ -615,6 +617,9 @@ def copy(metadata, mount_point):
"""Copies an object to another mount point
"""
metadata = get(metadata['uid'])
+ if mount_point == '/' and metadata['icon-color'] == '#000000,#ffffff':
+ client = gconf.client_get_default()
+ metadata['icon-color'] = client.get_string('/desktop/sugar/user/color')
file_path = get_file(metadata['uid'])
metadata['mountpoint'] = mount_point
--
1.7.4
_______________________________________________
Sugar-devel mailing list
Sugar-devel@lists.sugarlabs.org
http://lists.sugarlabs.org/listinfo/sugar-devel
