diff options
| author | Ummu <jeff@ummu.org> | 2009-07-24 14:41:34 +0400 |
|---|---|---|
| committer | Ummu <jeff@ummu.org> | 2009-07-24 14:41:34 +0400 |
| commit | 60ffbc9dc0bc3494270bc6031ef7430579540d87 (patch) | |
| tree | e3fe21562bb9aad7c5232f79dc59d4100234e811 | |
| parent | 30d6e763e7d9c857e8a05d7986cd4b9b53fefd1c (diff) | |
| parent | 41bd4783504d8c1c1cf2732910421f9e0214d334 (diff) | |
merges
| -rw-r--r-- | src/chat_control.py | 4 | ||||
| -rw-r--r-- | src/dialogs.py | 2 | ||||
| -rw-r--r-- | src/whiteboardwidget.py | 9 |
3 files changed, 5 insertions, 10 deletions
diff --git a/src/chat_control.py b/src/chat_control.py index 896291fc0..10fda0b09 100644 --- a/src/chat_control.py +++ b/src/chat_control.py @@ -2755,13 +2755,13 @@ class ChatControl(ChatControlBase): def draw_whiteboard(self, session): hbox = self.xml.get_widget('chat_child_hbox') if len(hbox.get_children()) == 1: - whiteboard = Whiteboard(self.account, self.contact, session) + self.whiteboard = Whiteboard(self.account, self.contact, session) try: # set minimum size whiteboard.hbox.set_size_request(300, 0) hbox.pack_start(whiteboard.hbox, expand=False, fill=False) whiteboard.hbox.show_all() except: - pass # TODO: Fix problem with groupchat? + pass # TODO: Fix problem with groupchat # vim: se ts=3: diff --git a/src/dialogs.py b/src/dialogs.py index 32667ef25..9d1520b81 100644 --- a/src/dialogs.py +++ b/src/dialogs.py @@ -4083,7 +4083,7 @@ class WhiteboardReceivedDialog(object): dialog.show_all() def on_voip_call_received_messagedialog_close(self, dialog): - return self.on_voip_call_received_messagedialog_response(dialog, gtk.RESPONSE_NO) + return self .on_voip_call_received_messagedialog_response(dialog, gtk.RESPONSE_NO) def on_voip_call_received_messagedialog_response(self, dialog, response): # we've got response from user, either stop connecting or accept the call session = gajim.connections[self.account].getJingleSession(self.jid, self.sid) diff --git a/src/whiteboardwidget.py b/src/whiteboardwidget.py index 9ece3a071..4c97cc55c 100644 --- a/src/whiteboardwidget.py +++ b/src/whiteboardwidget.py @@ -4,11 +4,6 @@ import goocanvas from common.xmpp import Node from common import gajim -#for sxe session -from random import choice -import string -import urllib - ''' A whiteboard widget made for Gajim. Only has basic line tool that draws SVG Paths. @@ -48,10 +43,10 @@ class Whiteboard(object): self.item_data = None def on_brush_button_clicked(self, widget): - print 'on_brush_button_clicked' + self.draw_tool = 'brush' def on_oval_button_clicked(self, widget): - print 'on_oval_button_clicked' + self.draw_tool = 'oval' def on_export_button_clicked(self, widget): self.image.print_xml() |