diff --git a/src/gajim.py b/src/gajim.py index 281319702abd385827e58b1e5add909605000cab..84cc6840f00df1b2aec2fa4aa4855010e8886adc 100755 --- a/src/gajim.py +++ b/src/gajim.py @@ -204,7 +204,7 @@ class Interface: def handle_event_http_auth(self, account, data): #('HTTP_AUTH', account, (method, url, iq_obj)) dialog = dialogs.ConfirmationDialog(_('HTTP (%s) Authorization for %s') \ - % (data[0], data[1]), _('Do you accept this request?')) + % (array[0], array[1]), _('Do you accept this request?')) if dialog.get_response() == gtk.RESPONSE_OK: answer = 'yes' else: @@ -367,7 +367,7 @@ class Interface: (account, array)) # when contact signs out we reset his chatstate - contact = gajim.get_first_contact_instance_from_jid(acccount, jid) + contact = gajim.get_first_contact_instance_from_jid(account, jid) contact.chatstate = None elif old_show > 1 and new_show < 2: @@ -1001,7 +1001,6 @@ class Interface: self.handle_event_file_send_error) con.register_handler('STANZA_ARRIVED', self.handle_event_stanza_arrived) con.register_handler('STANZA_SENT', self.handle_event_stanza_sent) - con.register_handler('HTTP_AUTH', self.handle_event_http_auth) def process_connections(self): try: diff --git a/src/tabbed_chat_window.py b/src/tabbed_chat_window.py index f742054836146db013f8afdb9510c76ca8afd1d1..029c12cb46b31c6232653e8c5cd2dbdf8c5c5971 100644 --- a/src/tabbed_chat_window.py +++ b/src/tabbed_chat_window.py @@ -396,6 +396,7 @@ class TabbedChatWindow(chat.Chat): if self.mouse_over_in_last_5_secs: self.send_chatstate('active', jid) elif self.kbd_activity_in_last_5_secs: + print 'PAUSED sends COMPOSING' self.send_chatstate('composing', jid) else: if self.chatstates[jid] == 'composing': @@ -430,6 +431,7 @@ class TabbedChatWindow(chat.Chat): def on_message_tv_buffer_insert_text(self, textbuffer, textiter, text, length, jid): + print 'insert-text' self.kbd_activity_in_last_5_secs = True self.kbd_activity_in_last_30_secs = True self.send_chatstate('composing', jid)