do some ellipsize via glade2.10 and remove some fixmes

src/chat.py

@@ -180,10 +180,7 @@ def redraw_tab(self, jid):
 		else:
 			close_button.hide()
 
-		#FIXME: when gtk2.4 is OOOOLD do it via glade2.10+
-		if gtk.pygtk_version >= (2, 6, 0) and gtk.gtk_version >= (2, 6, 0):
-			nickname.set_max_width_chars(10)
-
+		nickname.set_max_width_chars(10)
 		nickname.set_text(start + self.names[jid])
 
 

src/groupchat_window.py

@@ -1020,9 +1020,6 @@ def new_room(self, room_jid, nick):
 		self.name_labels[room_jid] = self.xmls[room_jid].get_widget(
 			'banner_name_label')
 		self.paint_banner(room_jid)
-		#FIXME: when gtk2.4 is OOOOLD do it via glade2.10+  
-		if gtk.pygtk_version >= (2, 6, 0) and gtk.gtk_version >= (2, 6, 0):
-			self.name_labels[room_jid].set_ellipsize(pango.ELLIPSIZE_END)
 		
 		# connect the menuitems to their respective functions
 		xm = gtk.glade.XML(GTKGUI_GLADE, 'gc_popup_menu', APP)

src/gtkgui.glade

@@ -9268,7 +9268,7 @@ topic</property>
 		      <property name="yalign">0.5</property>
 		      <property name="xpad">0</property>
 		      <property name="ypad">6</property>
-		      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+		      <property name="ellipsize">PANGO_ELLIPSIZE_END</property>
 		      <property name="width_chars">-1</property>
 		      <property name="single_line_mode">False</property>
 		      <property name="angle">0</property>
@@ -9761,7 +9761,7 @@ topic</property>
 	      <property name="spacing">4</property>
 	      <child>
-		<widget class="GtkLabel" id="label250">
+		<widget class="GtkLabel" id="tab_name_label">
 		  <property name="visible">True</property>
 		  <property name="label" translatable="yes"></property>
 		  <property name="use_underline">False</property>
@@ -10768,7 +10768,7 @@ Status message</property>
 			  <property name="yalign">0.5</property>
 			  <property name="xpad">0</property>
 			  <property name="ypad">5</property>
-			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			  <property name="ellipsize">PANGO_ELLIPSIZE_END</property>
 			  <property name="width_chars">-1</property>
 			  <property name="single_line_mode">False</property>
 			  <property name="angle">0</property>

src/tabbed_chat_window.py

@@ -145,14 +145,10 @@ def draw_name_banner(self, contact, chatstate = None):
 		name = gtkgui_helpers.escape_for_pango_markup(contact.name)
 		
 		status = contact.status
-		#FIXME: when gtk2.4 is OOOOLD do it via glade2.10+  
-		if gtk.pygtk_version >= (2, 6, 0) and gtk.gtk_version >= (2, 6, 0) and \
-		status is not None:
+
+		if status is not None:
 			banner_name_label.set_ellipsize(pango.ELLIPSIZE_END)
 			status = gtkgui_helpers.reduce_chars_newlines(status, 0, 2)
-		#FIXME: remove me when gtk24 is OLD
-		elif status is not None:
-			status = gtkgui_helpers.reduce_chars_newlines(status, 50, 2)
 
 		status = gtkgui_helpers.escape_for_pango_markup(status)
 

src/vcard.py

@@ -307,14 +307,11 @@ def fill_jabber_page(self):
 			'resource_prio_label_eventbox')
 		tip.set_tip(resource_prio_label_eventbox, uf_resources)
 		
+		tip = gtk.Tooltips()
+		status_label_eventbox = self.xml.get_widget('status_label_eventbox')
+		tip.set_tip(status_label_eventbox, stats)
 		status_label = self.xml.get_widget('status_label')
-		#FIXME: when gtk2.4 is OOOOLD do it via glade2.10+
-		if gtk.pygtk_version >= (2, 6, 0) and gtk.gtk_version >= (2, 6, 0):
-			tip = gtk.Tooltips()
-			status_label_eventbox = self.xml.get_widget('status_label_eventbox')
-			tip.set_tip(status_label_eventbox, stats)
-			status_label.set_max_width_chars(15)
-		
+		status_label.set_max_width_chars(15)
 		status_label.set_text(stats)
 		
 		gajim.connections[self.account].request_vcard(self.contact.jid)