Welcome to mirror list, hosted at ThFree Co, Russian Federation.

dev.gajim.org/gajim/gajim.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUmmu <jeff@ummu.org>2009-08-01 06:47:00 +0400
committerUmmu <jeff@ummu.org>2009-08-01 06:47:00 +0400
commit05676936533e6221126b7526fd773b7de6166ce0 (patch)
tree5e40e70f90e0dae5fad097d2afec571aefc361fa
parent9df6381878dc63d62f035991b28b9e7b3dbf1b14 (diff)
fixed merge error with line tool
-rw-r--r--src/whiteboardwidget.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/whiteboardwidget.py b/src/whiteboardwidget.py
index 6b6db7562..eb97e475b 100644
--- a/src/whiteboardwidget.py
+++ b/src/whiteboardwidget.py
@@ -106,8 +106,9 @@ class Whiteboard(object):
elif self.draw_tool == 'line':
self.item_data = 'M %s,%s L' % self.item_temp_coords
self.item_data = self.item_data + ' %s,%s' % (x,y)
- self.item_temp = self.item_temp = goocanvas.Path(parent=self.root,
- data=self.item_data, line_width=self.line_width)
+ self.item_temp = goocanvas.Path(parent=self.root,
+ data=self.item_data, line_width=self.line_width,
+ stroke_color=self.color)
def button_release_event(self, widget, event):
x = event.x
@@ -146,7 +147,7 @@ class Whiteboard(object):
stroke_color='black',
fill_color='black',
line_width=self.line_width)
- self.image.add_path(self.item_data, self.line_width)
+ self.image.add_path(self.item_data, self.line_width, self.color)
self.item_data = None
if self.item_temp is not None: