Merged message_window branch.

src/gtkgui_helpers.py

@@ -218,15 +218,6 @@ def resize_window(window, w, h):
 		h = screen_h
 	window.resize(abs(w), abs(h))
 
-# FIXME: Remove or update??
-def one_window_opened(typ):
-	for account in gajim.connections:
-		if not gajim.interface.instances[account].has_key(typ):
-			continue
-		if len(gajim.interface.instances[account][typ]):
-			return True
-	return False
-
 class TagInfoHandler(xml.sax.ContentHandler):
 	def __init__(self, tagname1, tagname2):
 		xml.sax.ContentHandler.__init__(self)

src/roster_window.py

@@ -203,7 +203,7 @@ class RosterWindow:
 			if g == _('Transports'):
 				typestr = 'agent'
 
-			name = contcat.get_shown_name()
+			name = contact.get_shown_name()
 			# we add some values here. see draw_contact for more
 			model.append(iterG, (None, name, typestr, contact.jid, account,
 				False, None))