sugar.profile->gconf

4 files changed, 46 insertions, 8 deletions

diff --git a/drawwaveform.py b/drawwaveform.py
index 1828ee4..402bc7b 100755
--- a/drawwaveform.py
+++ b/drawwaveform.py
@@ -22,6 +22,7 @@ import pygst
 pygst.require("0.10")
 import pygtk
 import gtk
+import gconf
 import cairo
 import gobject
 import time
@@ -409,7 +410,11 @@ class DrawWaveform(gtk.DrawingArea):
 
     def get_stroke_color_from_sugar(self):
         """Returns in (r,g,b) format the stroke color from the Sugar profile"""
-        color = profile.get_color()
+        try:
+            client = gconf.client_get_default()
+            color = client.get_string("/desktop/sugar/user/color")
+        except:
+            color = profile.get_color()
         stroke = color.get_stroke_color()
         colorstring = stroke.strip()
         if colorstring[0] == '#': 
@@ -423,7 +428,11 @@ class DrawWaveform(gtk.DrawingArea):
 
     def get_fill_color_from_sugar(self):
         """Returns in (r,g,b) format the fill color from the Sugar profile"""
-        color = profile.get_color()
+        try:
+            client = gconf.client_get_default()
+            color = client.get_string("/desktop/sugar/user/color")
+        except:
+            color = profile.get_color()
         fill = color.get_fill_color()
         colorstring = fill.strip()
         if colorstring[0] == '#': 
diff --git a/journal.py b/journal.py
index 20a76b7..cd42807 100755
--- a/journal.py
+++ b/journal.py
@@ -1,7 +1,8 @@
 #! /usr/bin/python
 #
 #    Author:  Arjun Sarwal   arjun@laptop.org
-#    Copyright (C) 2007, OLPC
+#    Copyright (C) 2007, Arjun Sarwal
+#    Copyright (C) 2009, Walter Bender
 #    
 #    	
 #    This program is free software; you can redistribute it and/or modify
@@ -34,6 +35,7 @@ import csv
 import os
 import gtk
 import dbus
+import gconf
 import tempfile
 import time
 from os import environ
@@ -183,8 +185,13 @@ class JournalInteraction():
                     self.jobject.metadata['keep'] = '0'
                     self.jobject.metadata['buddies'] = ''
                     self.jobject.metadata['preview'] = ''
-                    self.jobject.metadata['icon-color'] = \
-                        profile.get_color().to_string()
+                    try:
+                        client = gconf.client_get_default()
+                        self.jobject.metadata['icon-color'] = \
+                            client.get_string("/desktop/sugar/user/color")
+                    except:
+                        self.jobject.metadata['icon-color'] = \
+                            profile.get_color().to_string()
                     self.jobject.metadata['mime_type'] = 'text/csv'
                     self.jobject.file_path = self.filepath
                     datastore.write(self.jobject)
@@ -341,7 +348,13 @@ class JournalInteraction():
                 jobject.metadata['keep'] = '0'
                 jobject.metadata['buddies'] = ''
                 jobject.metadata['preview'] = ''
-                jobject.metadata['icon-color'] = profile.get_color().to_string()
+                try:
+                    client = gconf.client_get_default()
+                    jobject.metadata['icon-color'] = \
+                        client.get_string("/desktop/sugar/user/color")
+                except:
+                    jobject.metadata['icon-color'] = \
+                        profile.get_color().to_string()
                 jobject.metadata['mime_type'] = 'image/png'
                 jobject.file_path = file_path
                 datastore.write(jobject)
diff --git a/sensor_toolbar.py b/sensor_toolbar.py
index 3718e4d..0c8ce7b 100644
--- a/sensor_toolbar.py
+++ b/sensor_toolbar.py
@@ -20,6 +20,7 @@
 
 import pygtk
 import gtk
+import gconf
 import time
 from gettext import gettext as _
 
@@ -136,7 +137,14 @@ class SensorToolbar(gtk.Toolbar):
             Xscale = (1.00/self.ag.get_sampling_rate())
             Yscale = 0.0
             interval = self.interval_convert()
-            username = profile.get_nick_name()
+            try:
+                client = gconf.client_get_default()
+                username = client.get_string("/desktop/suagr/user/nick")
+            except:
+                try:
+                    username = profile.get_nick_name()
+                except:
+                    username = "Sugar user"
             self.ji.start_new_session(username, Xscale, Yscale,\
                                       self.logginginterval_status)
             self.ag.set_logging_params(True, interval, False)
diff --git a/sound_toolbar.py b/sound_toolbar.py
index 6f82bc9..127829b 100644
--- a/sound_toolbar.py
+++ b/sound_toolbar.py
@@ -20,6 +20,7 @@
 
 import pygtk
 import gtk
+import gconf
 from time import *
 from gettext import gettext as _
 
@@ -172,7 +173,14 @@ class SoundToolbar(gtk.Toolbar):
             Xscale = (1.00/self.ag.get_sampling_rate())
             Yscale = 0.0
             interval = self.interval_convert()
-            username = profile.get_nick_name()
+            try:
+                client = gconf.client_get_default()
+                username = client.get_string("/desktop/suagr/user/nick")
+            except:
+                try:
+                    username = profile.get_nick_name()
+                except:
+                    username = "Sugar user"
             self.ji.start_new_session(username, Xscale, Yscale,\
                                       self.logginginterval_status)
             self.ag.set_logging_params(True, interval, True)