From b8fce2f1fe70588a07e88a2a6b527ff96f65b613 Mon Sep 17 00:00:00 2001 From: Nikos Kouremenos Date: Thu, 3 Nov 2005 15:21:18 +0000 Subject: [PATCH] do not ask xml anymore --- src/groupchat_window.py | 16 ++++------------ src/tabbed_chat_window.py | 12 +++--------- 2 files changed, 7 insertions(+), 21 deletions(-) diff --git a/src/groupchat_window.py b/src/groupchat_window.py index 2c615aa86..31136c165 100644 --- a/src/groupchat_window.py +++ b/src/groupchat_window.py @@ -698,9 +698,7 @@ class GroupchatWindow(chat.Chat): def on_send_button_clicked(self, widget): '''When send button is pressed: send the current message''' room_jid = self.get_active_jid() - message_scrolledwindow = self.xmls[room_jid].get_widget( - 'message_scrolledwindow') - message_textview = message_scrolledwindow.get_children()[0] + message_textview = self.message_textviews[jid] message_buffer = message_textview.get_buffer() start_iter = message_buffer.get_start_iter() end_iter = message_buffer.get_end_iter() @@ -716,9 +714,7 @@ class GroupchatWindow(chat.Chat): if not message: return room_jid = self.get_active_jid() - message_scrolledwindow = self.xmls[room_jid].get_widget( - 'message_scrolledwindow') - message_textview = message_scrolledwindow.get_children()[0] + message_textview = self.message_textviews[jid] conv_textview = self.conversation_textviews[room_jid] message_buffer = message_textview.get_buffer() if message != '' or message != '\n': @@ -1281,9 +1277,7 @@ current room topic.') % command, room_jid) def got_connected(self, room_jid): gajim.gc_connected[self.account][room_jid] = True - message_scrolledwindow = self.xmls[room_jid].get_widget( - 'message_scrolledwindow') - message_textview = message_scrolledwindow.get_children()[0] + message_textview = self.message_textviews[jid] message_textview.set_sensitive(True) self.xmls[room_jid].get_widget('send_button').set_sensitive(True) @@ -1292,9 +1286,7 @@ current room topic.') % command, room_jid) model.clear() gajim.gc_contacts[self.account][room_jid] = {} gajim.gc_connected[self.account][room_jid] = False - message_scrolledwindow = self.xmls[room_jid].get_widget( - 'message_scrolledwindow') - message_textview = message_scrolledwindow.get_children()[0] + message_textview = self.message_textviews[jid] message_textview.set_sensitive(False) self.xmls[room_jid].get_widget('send_button').set_sensitive(False) diff --git a/src/tabbed_chat_window.py b/src/tabbed_chat_window.py index 52de9b9b8..49f24dc53 100644 --- a/src/tabbed_chat_window.py +++ b/src/tabbed_chat_window.py @@ -419,9 +419,7 @@ class TabbedChatWindow(chat.Chat): def on_send_button_clicked(self, widget): '''When send button is pressed: send the current message''' jid = self.get_active_jid() - message_scrolledwindow = self.xmls[jid].get_widget( - 'message_scrolledwindow') - message_textview = message_scrolledwindow.get_children()[0] + message_textview = self.message_textviews[jid] message_buffer = message_textview.get_buffer() start_iter = message_buffer.get_start_iter() end_iter = message_buffer.get_end_iter() @@ -518,9 +516,7 @@ class TabbedChatWindow(chat.Chat): if current_state is False: # jid doesn't support chatstates return False # stop looping - message_scrolledwindow = self.xmls[jid].get_widget( - 'message_scrolledwindow') - message_textview = message_scrolledwindow.get_children()[0] + message_textview = self.message_textviews[jid] message_buffer = message_textview.get_buffer() if self.kbd_activity_in_last_5_secs and message_buffer.get_char_count(): # Only composing if the keyboard activity was in text entry @@ -724,9 +720,7 @@ class TabbedChatWindow(chat.Chat): return conv_textview = self.conversation_textviews[jid] - message_scrolledwindow = self.xmls[jid].get_widget( - 'message_scrolledwindow') - message_textview = message_scrolledwindow.get_children()[0] + message_textview = self.message_textviews[jid] message_buffer = message_textview.get_buffer() if message != '' or message != '\n':