Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAjay Garg <ajay@activitycentral.com>2013-02-24 12:16:10 (GMT)
committer Ajay Garg <ajay@activitycentral.com>2013-02-24 12:16:10 (GMT)
commit9eb5c3d1aa5dbed7f0c3a890440cb0c86bd0570c (patch)
treeacab53cdbf60cf33af54072a451b5195140f2b54
parent43141357fb131aa24acb818f479af3ec5be2c9fc (diff)
sdxo#3149: If the gconf-key is not present, handle the situation gracefully
-rw-r--r--src/sugar3/activity/activity.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/sugar3/activity/activity.py b/src/sugar3/activity/activity.py
index 2cb8a85..b97f9b3 100644
--- a/src/sugar3/activity/activity.py
+++ b/src/sugar3/activity/activity.py
@@ -99,9 +99,11 @@ CONN_INTERFACE_ACTIVITY_PROPERTIES = 'org.laptop.Telepathy.ActivityProperties'
gconf_client = GConf.Client.get_default()
GCONF_FOR_ACTIVITIES_NOT_REQUIRING_OSK_ACCUMULATION = \
gconf_client.get('/desktop/sugar/activities_not_requiring_osk_accumulation')
-ACTIVITIES_NOT_REQUIRING_OSK_ACCUMULATION = \
- GCONF_FOR_ACTIVITIES_NOT_REQUIRING_OSK_ACCUMULATION.get_list()
+ACTIVITIES_NOT_REQUIRING_OSK_ACCUMULATION = []
+if GCONF_FOR_ACTIVITIES_NOT_REQUIRING_OSK_ACCUMULATION is not None:
+ ACTIVITIES_NOT_REQUIRING_OSK_ACCUMULATION = \
+ GCONF_FOR_ACTIVITIES_NOT_REQUIRING_OSK_ACCUMULATION.get_list()
class _ActivitySession(GObject.GObject):