From 1a4b73e1ba08efe91bb2922bf02798e9f3b1fff2 Mon Sep 17 00:00:00 2001
From: Pootle daemon <pootle@pootle.sugarlabs.org>
Date: Fri, 10 Jan 2014 05:31:38 +0000
Subject: Merge branch 'master' of git.sugarlabs.org:physics/mainline

---
(limited to 'activity.py')

diff --git a/activity.py b/activity.py
index 823143a..4dd609c 100644
--- a/activity.py
+++ b/activity.py
@@ -318,7 +318,10 @@ class PhysicsActivity(activity.Activity):
     def _palette_icon_clicked(self, button, toolname, value_name, value):
         for tool in tools.allTools:
             if tool.name == toolname:
-                tool.palette_data[value_name] = value
+                if hasattr(tool, 'palette_data_type'):
+                    tool.palette_data_type = value
+                else:
+                    tool.palette_data[value_name] = value
 
     def _slider_label_palette(self, slider, toolname, dataname):
         value = slider.get_value()
--
cgit v0.9.1