From 6584510d390a37153c20974da6704a907058fea0 Mon Sep 17 00:00:00 2001
From: mike <michael.jmontcalm@gmail.com>
Date: Mon, 19 Oct 2009 04:38:32 +0000
Subject: Merge gitorious@git.sugarlabs.org:tutorius/michaeljm-dev into merge_michaeljm-dev

---
(limited to 'addons/bubblemessage.py')

diff --git a/addons/bubblemessage.py b/addons/bubblemessage.py
index a859ef8..c499bdb 100644
--- a/addons/bubblemessage.py
+++ b/addons/bubblemessage.py
@@ -22,22 +22,22 @@ class BubbleMessage(Action):
     # Do the same for the tail position
     tail_pos = TArrayProperty([0,0], 2, 2)
 
-    def __init__(self, message=None, pos=None, speaker=None, tailpos=None):
+    def __init__(self, message=None, position=None, speaker=None, tail_pos=None):
         """
         Shows a dialog with a given text, at the given position on the screen.
 
         @param message A string to display to the user
-        @param pos A list of the form [x, y]
+        @param position A list of the form [x, y]
         @param speaker treeish representation of the speaking widget
-        @param tailpos The position of the tail of the bubble; useful to point to
+        @param tail_pos The position of the tail of the bubble; useful to point to
         specific elements of the interface
         """
         Action.__init__(self)
 
-        if pos:
-            self.position = pos
-        if tailpos:
-            self.tail_pos = tailpos
+        if position:
+            self.position = position
+        if tail_pos:
+            self.tail_pos = tail_pos
         if message:
             self.message = message
 
--
cgit v0.9.1