tooltip for subject in GC

src/dialogs.py

@@ -524,7 +524,7 @@ def on_join_button_clicked(self, widget):
 		if len(self.recently_groupchat) > 10:
 			self.recently_groupchat = self.recently_groupchat[0:10]
 		gajim.config.set('recently_groupchat', ' '.join(self.recently_groupchat))
-		self.plugin.roster.new_group(jid, nickname, self.account)
+		self.plugin.roster.new_room(jid, nickname, self.account)
 		gajim.connections[self.account].join_gc(nickname, room, server, password)
 			
 		self.window.destroy()

src/groupchat_window.py

@@ -43,8 +43,9 @@ def __init__(self, room_jid, nick, plugin, account):
 		self.list_treeview = {}
 		self.subjects = {}
 		self.subject_entry = self.xml.get_widget('subject_entry')
-		self.new_group(room_jid, nick)
+		self.new_room(room_jid, nick)
 		self.show_title()
+		self.subject_entry_tooltip = gtk.Tooltips()
 		self.xml.signal_connect('on_groupchat_window_destroy', \
 			self.on_groupchat_window_destroy)
 		self.xml.signal_connect('on_groupchat_window_delete_event', \
@@ -89,7 +90,9 @@ def on_chat_notebook_switch_page(self, notebook, page, page_num):
 			if self.childs[jid] == new_child: 
 				new_jid = jid
 				break
-		self.subject_entry.set_text(self.subjects[new_jid])
+		subject = self.subjects[new_jid]
+		self.subject_entry.set_text(subject)
+		self.subject_entry_tooltip.set_tip(self.subject_entry, subject)
 		chat.Chat.on_chat_notebook_switch_page(self, notebook, page, page_num)
 
 	def get_role_iter(self, room_jid, role):
@@ -224,7 +227,7 @@ def chg_user_status(self, room_jid, nick, show, status, role, affiliation, \
 					self.add_user_to_roster(room_jid, nick, show, role, ji)
 				else:
 					roster = self.plugin.roster
-					state_images = roster.get_appropriate_state_images(jid)
+					state_images = roster.get_appropriate_state_images(ji)
 					image = state_images[show]
 					model.set_value(iter, 0, image)
 					model.set_value(iter, 3, show)
@@ -232,6 +235,7 @@ def chg_user_status(self, room_jid, nick, show, status, role, affiliation, \
 	def set_subject(self, room_jid, subject):
 		self.subjects[room_jid] = subject
 		self.subject_entry.set_text(subject)
+		self.subject_entry_tooltip.set_tip(self.subject_entry, subject)
 
 	def on_set_button_clicked(self, widget):
 		room_jid = self.get_active_jid()
@@ -463,15 +467,17 @@ def remove_tab(self, room_jid):
 			del self.list_treeview[room_jid]
 			del self.subjects[room_jid]
 
-	def new_group(self, room_jid, nick):
+	def new_room(self, room_jid, nick):
 		self.names[room_jid] = room_jid.split('@')[0]
 		self.xmls[room_jid] = gtk.glade.XML(GTKGUI_GLADE, 'gc_vbox', APP)
 		self.childs[room_jid] = self.xmls[room_jid].get_widget('gc_vbox')
 		chat.Chat.new_tab(self, room_jid)
 		self.nicks[room_jid] = nick
 		self.subjects[room_jid] = ''
-		self.list_treeview[room_jid] = self.xmls[room_jid].\
-			get_widget('list_treeview')
+		self.list_treeview[room_jid] = self.xmls[room_jid].get_widget(
+																			'list_treeview')
+		conversation_textview = self.xmls[room_jid].get_widget(
+																'conversation_textview')
 
 		#status_image, nickname, real_jid, status
 		store = gtk.TreeStore(gtk.Image, str, str, str)
@@ -497,6 +503,7 @@ def new_group(self, room_jid, nick):
 
 		self.redraw_tab(room_jid)
 		self.show_title()
+		conversation_textview.grab_focus() # remove focus from subject entry
 
 	def on_list_treeview_button_press_event(self, widget, event):
 		"""popup user's group's or agent menu"""

src/roster_window.py

@@ -871,14 +871,14 @@ def new_chat(self, user, account):
 			self.plugin.windows[account]['chats'][user.jid] = \
 				tabbed_chat_window.Tabbed_chat_window(user, self.plugin, account)
 
-	def new_group(self, jid, nick, account):
+	def new_room(self, jid, nick, account):
 		if gajim.config.get('usetabbedchat'):
 			if not self.plugin.windows[account]['gc'].has_key('tabbed'):
 				self.plugin.windows[account]['gc']['tabbed'] = \
 					groupchat_window.Groupchat_window(jid, nick, self.plugin, 
 																	account)
 			else:
-				self.plugin.windows[account]['gc']['tabbed'].new_group(jid, nick)
+				self.plugin.windows[account]['gc']['tabbed'].new_room(jid, nick)
 			self.plugin.windows[account]['gc'][jid] = \
 				self.plugin.windows[account]['gc']['tabbed']
 			self.plugin.windows[account]['gc']['tabbed'].window.present()