diff options
| author | Santiago Collazo <scollazo@activitycentral.com> | 2013-02-24 17:40:11 (GMT) |
|---|---|---|
| committer | Santiago Collazo <scollazo@activitycentral.com> | 2013-02-24 17:40:11 (GMT) |
| commit | 9366728a9093d15bef641f991a57cb932d3080f8 (patch) | |
| tree | f5884a7e0bb7ccc111e08141198200064d3142f1 | |
| parent | 0fea5691f0349763f46814f34bafac197c21a05a (diff) | |
| parent | 9eb5c3d1aa5dbed7f0c3a890440cb0c86bd0570c (diff) | |
Merge remote-tracking branch 'ajay/0.97.7-as-base' into devel
| -rw-r--r-- | src/sugar3/activity/activity.py | 6 |
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): |