diff options
| author | Santiago Collazo <scollazo@activitycentral.com> | 2013-02-24 19:23:36 (GMT) |
|---|---|---|
| committer | Santiago Collazo <scollazo@activitycentral.com> | 2013-02-24 19:23:36 (GMT) |
| commit | dd7c80afc8bc42d54a9bf762adf3b1d1452fe236 (patch) | |
| tree | a6cf0dc3ff462f09a7fe1e9ec13901ff1336bbb2 | |
| parent | d9a3e01da5078ccc09aa8c8f3026258fbb0527f3 (diff) | |
| parent | 0608994f4db68877dd8fc87fdc6b8999170f1740 (diff) | |
Merge branch 'master' of git://git.sugarlabs.org/~ajaygarg/sugar-toolkit/dx4-sugar-toolkit into devel
| -rw-r--r-- | src/sugar/activity/activity.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/sugar/activity/activity.py b/src/sugar/activity/activity.py index 460917e..87f53c7 100644 --- a/src/sugar/activity/activity.py +++ b/src/sugar/activity/activity.py @@ -103,8 +103,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): |