added exception for gconf for old builds

4 files changed, 17 insertions, 8 deletions

diff --git a/drawwaveform.py b/drawwaveform.py
index 5810a4b..7da7807 100755
--- a/drawwaveform.py
+++ b/drawwaveform.py
@@ -22,7 +22,6 @@ import pygst
 pygst.require("0.10")
 import pygtk
 import gtk
-import gconf
 import cairo
 import gobject
 import time
@@ -32,7 +31,10 @@ import os
 import audioop
 import math
 from gtk import gdk
-from sugar import profile
+try:
+    import gconf
+except:
+    from sugar import profile
 from numpy.oldnumeric import *
 from numpy.fft import *
 
diff --git a/journal.py b/journal.py
index cd42807..8505707 100755
--- a/journal.py
+++ b/journal.py
@@ -35,7 +35,7 @@ import csv
 import os
 import gtk
 import dbus
-import gconf
+
 import tempfile
 import time
 from os import environ
@@ -44,7 +44,10 @@ from numpy import array
 from gettext import gettext as _
 
 from sugar.datastore import datastore
-from sugar import profile
+try:
+    import gconf
+except:
+    from sugar import profile
 
 class JournalInteraction():
     def __init__(self, file_path, existing):
diff --git a/sensor_toolbar.py b/sensor_toolbar.py
index 8eff7af..db9ae97 100644
--- a/sensor_toolbar.py
+++ b/sensor_toolbar.py
@@ -20,7 +20,6 @@
 
 import pygtk
 import gtk
-import gconf
 import time
 from gettext import gettext as _
 
@@ -29,7 +28,10 @@ import config  	#This has all the globals
 from sugar.graphics.toolbutton import ToolButton
 from sugar.graphics.combobox import ComboBox
 from sugar.graphics.toolcombobox import ToolComboBox
-from sugar import profile
+try:
+    import gconf
+except:
+    from sugar import profile
 
 # 'Sensor' toolbar class
 class SensorToolbar(gtk.Toolbar):
diff --git a/sound_toolbar.py b/sound_toolbar.py
index a292940..30b2821 100644
--- a/sound_toolbar.py
+++ b/sound_toolbar.py
@@ -20,7 +20,6 @@
 
 import pygtk
 import gtk
-import gconf
 from time import *
 from gettext import gettext as _
 
@@ -29,7 +28,10 @@ import config  	#This has all the globals
 from sugar.graphics.toolbutton import ToolButton
 from sugar.graphics.combobox import ComboBox
 from sugar.graphics.toolcombobox import ToolComboBox
-from sugar import profile
+try:
+    import gconf
+except:
+    from sugar import profile
 
 class SoundToolbar(gtk.Toolbar):