From f513a9c1677344e26498c7f0b75d286261eecadd Mon Sep 17 00:00:00 2001
From: Nikos Kouremenos <kourem@gmail.com>
Date: Sat, 18 Jun 2005 15:18:15 +0000
Subject: [PATCH] fix #315

---
 src/config.py        | 8 ++++++--
 src/gtkgui.glade     | 4 ++--
 src/roster_window.py | 6 +++---
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/config.py b/src/config.py
index 148509f82..9877684a2 100644
--- a/src/config.py
+++ b/src/config.py
@@ -1638,6 +1638,7 @@ class ManageEmoticonsWindow:
 		#emoticons
 		self.emot_tree = self.xml.get_widget('emoticons_treeview')
 		model = gtk.ListStore(str, str, gtk.Image)
+		model.set_sort_column_id(0, gtk.SORT_ASCENDING)
 		self.emot_tree.set_model(model)
 		col = gtk.TreeViewColumn(_('Text'))
 		self.emot_tree.append_column(col)
@@ -1821,6 +1822,10 @@ _('Without a connection, you can not browse available services')).get_response()
 			raise RuntimeError, 'You must be connected to browse services'
 		xml = gtk.glade.XML(GTKGUI_GLADE, 'service_discovery_window', APP)
 		self.window = xml.get_widget('service_discovery_window')
+		if len(gajim.connections):
+			self.window.set_title(_('Service Discovery using %s account') %account)
+		else:
+			self.window.set_title(_('Service Discovery'))
 		self.services_treeview = xml.get_widget('services_treeview')
 		self.join_button = xml.get_widget('join_button')
 		self.register_button = xml.get_widget('register_button')
@@ -1828,8 +1833,7 @@ _('Without a connection, you can not browse available services')).get_response()
 		self.address_comboboxentry_entry = self.address_comboboxentry.child
 		self.address_comboboxentry_entry.set_activates_default(True)
 		
-		model = gtk.TreeStore(str, str,
-			str)
+		model = gtk.TreeStore(str, str, str)
 		model.set_sort_column_id(0, gtk.SORT_ASCENDING)
 		self.services_treeview.set_model(model)
 		#columns
diff --git a/src/gtkgui.glade b/src/gtkgui.glade
index 9f6f6101f..da2f52a9a 100644
--- a/src/gtkgui.glade
+++ b/src/gtkgui.glade
@@ -1535,7 +1535,7 @@
 		<widget class="GtkButton" id="edit_details_button">
 		  <property name="visible">True</property>
 		  <property name="can_focus">True</property>
-		  <property name="label" translatable="yes">Edit Personal Details...</property>
+		  <property name="label" translatable="yes">Edit Personal Information...</property>
 		  <property name="use_underline">True</property>
 		  <property name="relief">GTK_RELIEF_NORMAL</property>
 		  <property name="focus_on_click">True</property>
@@ -2384,7 +2384,7 @@
 
 <widget class="GtkWindow" id="service_discovery_window">
   <property name="border_width">6</property>
-  <property name="title" translatable="yes">Service Discovery</property>
+  <property name="title" translatable="yes"></property>
   <property name="type">GTK_WINDOW_TOPLEVEL</property>
   <property name="window_position">GTK_WIN_POS_NONE</property>
   <property name="modal">False</property>
diff --git a/src/roster_window.py b/src/roster_window.py
index cfbc10316..c62bf475b 100644
--- a/src/roster_window.py
+++ b/src/roster_window.py
@@ -1278,7 +1278,7 @@ _('If "%s" accepts this request you will know his status.') %jid).get_response()
 
 	def on_editing_canceled (self, cell):
 		'''editing has been canceled'''
-		#TODO: get iter
+		#FIXME: get iter
 		#model.set_value(iter, 5, False)
 		pass
 
@@ -1484,8 +1484,8 @@ _('If "%s" accepts this request you will know his status.') %jid).get_response()
 				jid2 = model.get_value(iter2, 3)
 				luser1 = self.contacts[account][jid1]
 				luser2 = self.contacts[account][jid2]
-				cshow = {'online':0, 'chat': 1, 'away':2, 'xa':3, 'dnd':4,
-					'invisible':5, 'offline':6, 'not in the roster':7, 'error':8}
+				cshow = {'online':0, 'chat': 1, 'away': 2, 'xa': 3, 'dnd': 4,
+					'invisible': 5, 'offline': 6, 'not in the roster': 7, 'error': 8}
 				s = self.get_show(luser1)
 				if s in cshow:
 					show1 = cshow[s]