Final touches on chatstate notifications

src/chat.py

@@ -160,14 +160,9 @@ def show_title(self):
 		self.window.set_title(title)
 		gtkgui_helpers.set_unset_urgency_hint(self.window, unread)
 
-	def redraw_tab(self, contact, chatstate = None):
+	def redraw_tab(self, jid, chatstate = None):
 		'''redraw the label of the tab
 		if chatstate is given that means we have HE SENT US a chatstate'''
-		if isinstance(contact, unicode):
-			jid = contact
-		else:
-			jid = contact.jid
-
 		unread = ''
 		if self.nb_unread[jid] > 1:
 			unread = '[' + unicode(self.nb_unread[jid]) + '] '

src/tabbed_chat_window.py

@@ -368,8 +368,6 @@ def new_tab(self, contact):
 		
 		message_textview = self.xmls[contact.jid].get_widget('message_textview')
 		message_tv_buffer = message_textview.get_buffer()
-		message_tv_buffer.connect('insert-text',
-			self.on_message_tv_buffer_insert_text, contact.jid)
 		message_tv_buffer.connect('changed',
 			self.on_message_tv_buffer_changed, contact)
 
@@ -381,7 +379,7 @@ def new_tab(self, contact):
 		self.tabbed_chat_popup_menu = xm.get_widget('tabbed_chat_popup_menu')
 		
 		chat.Chat.new_tab(self, contact.jid)
-		self.redraw_tab(contact)
+		self.redraw_tab(contact.jid)
 		self.draw_widgets(contact)
 
 		# restore previous conversation
@@ -408,7 +406,7 @@ def handle_incoming_chatstate(self, account, jid, chatstate):
 		contact = gajim.get_first_contact_instance_from_jid(account, jid)
 		self.draw_name_banner(contact, chatstate)
 		# update chatstate in tab for this chat
-		self.redraw_tab(contact, chatstate)
+		self.redraw_tab(contact.jid, chatstate)
 
 	def check_for_possible_paused_chatstate(self, jid):
 		''' did we move mouse of that window or write something in message
@@ -470,17 +468,12 @@ def check_for_possible_inactive_chatstate(self, jid):
 		
 		return True # loop forever
 
-	def on_message_tv_buffer_insert_text(self, textbuffer, textiter, text, length, jid):
-		self.kbd_activity_in_last_5_secs = True
-		self.kbd_activity_in_last_30_secs = True
-		# XXX: only send the event every N'th character after the first N... optimization
-		self.send_chatstate('composing', jid)
-
 	def on_message_tv_buffer_changed(self, textbuffer, contact):
 		self.kbd_activity_in_last_5_secs = True
 		self.kbd_activity_in_last_30_secs = True
-		# All characters have been erased, undo composing
-		if textbuffer.get_char_count() == 0:
+		if textbuffer.get_char_count():
+			self.send_chatstate('composing', contact.jid)
+		else:
 			self.send_chatstate('active', contact.jid)
 
 	def reset_kbd_mouse_timeout_vars(self):