In account and systray menu, put groupchat before single so menuitems with submenus are grouped and it's easier to choose

where to click.
Add back disco to account menu.
Use the good label for account->group chat (doesn't break string freeze)

src/gtkgui.glade

@@ -10859,15 +10859,15 @@ Custom</property>
   </child>
 
   <child>
-    <widget class="GtkImageMenuItem" id="single_message_menuitem">
+    <widget class="GtkImageMenuItem" id="join_gc_menuitem">
       <property name="visible">True</property>
-      <property name="label" translatable="yes">Send Single _Message</property>
+      <property name="label" translatable="yes">_Group Chat</property>
       <property name="use_underline">True</property>
 
       <child internal-child="image">
-	<widget class="GtkImage" id="image1373">
+	<widget class="GtkImage" id="image1445">
 	  <property name="visible">True</property>
-	  <property name="stock">gtk-new</property>
+	  <property name="stock">gtk-connect</property>
 	  <property name="icon_size">1</property>
 	  <property name="xalign">0.5</property>
 	  <property name="yalign">0.5</property>
@@ -10879,15 +10879,15 @@ Custom</property>
   </child>
 
   <child>
-    <widget class="GtkImageMenuItem" id="join_gc_menuitem">
+    <widget class="GtkImageMenuItem" id="single_message_menuitem">
       <property name="visible">True</property>
-      <property name="label" translatable="yes">_Group Chat</property>
+      <property name="label" translatable="yes">Send Single _Message</property>
       <property name="use_underline">True</property>
 
       <child internal-child="image">
-	<widget class="GtkImage" id="image1445">
+	<widget class="GtkImage" id="image1373">
 	  <property name="visible">True</property>
-	  <property name="stock">gtk-connect</property>
+	  <property name="stock">gtk-new</property>
 	  <property name="icon_size">1</property>
 	  <property name="xalign">0.5</property>
 	  <property name="yalign">0.5</property>
@@ -16751,6 +16751,26 @@ Maybe I'll refactor later</property>
     </widget>
   </child>
 
+  <child>
+    <widget class="GtkImageMenuItem" id="join_group_chat_menuitem">
+      <property name="visible">True</property>
+      <property name="label" translatable="yes">_Group Chat</property>
+      <property name="use_underline">True</property>
+
+      <child internal-child="image">
+	<widget class="GtkImage" id="image1234">
+	  <property name="visible">True</property>
+	  <property name="stock">gtk-connect</property>
+	  <property name="icon_size">1</property>
+	  <property name="xalign">0.5</property>
+	  <property name="yalign">0.5</property>
+	  <property name="xpad">0</property>
+	  <property name="ypad">0</property>
+	</widget>
+      </child>
+    </widget>
+  </child>
+  
   <child>
     <widget class="GtkImageMenuItem" id="new_message_menuitem">
       <property name="visible">True</property>
@@ -16772,15 +16792,15 @@ Maybe I'll refactor later</property>
   </child>
 
   <child>
-    <widget class="GtkImageMenuItem" id="join_group_chat_menuitem">
+    <widget class="GtkImageMenuItem" id="add_contact_menuitem">
       <property name="visible">True</property>
-      <property name="label" translatable="yes">_Join New Room...</property>
+      <property name="label" translatable="yes">_Add Contact...</property>
       <property name="use_underline">True</property>
 
       <child internal-child="image">
-	<widget class="GtkImage" id="image1234">
+	<widget class="GtkImage" id="image1233">
 	  <property name="visible">True</property>
-	  <property name="stock">gtk-connect</property>
+	  <property name="stock">gtk-add</property>
 	  <property name="icon_size">1</property>
 	  <property name="xalign">0.5</property>
 	  <property name="yalign">0.5</property>
@@ -16792,15 +16812,15 @@ Maybe I'll refactor later</property>
   </child>
 
    <child>
-    <widget class="GtkImageMenuItem" id="add_contact_menuitem">
+    <widget class="GtkImageMenuItem" id="service_discovery_menuitem">
        <property name="visible">True</property>
-      <property name="label" translatable="yes">_Add Contact...</property>
+      <property name="label" translatable="yes">_Discover Services...</property>
        <property name="use_underline">True</property>
  
        <child internal-child="image">
-	<widget class="GtkImage" id="image1233">
+	<widget class="GtkImage" id="image1232">
  	  <property name="visible">True</property>
-	  <property name="stock">gtk-add</property>
+	  <property name="stock">gtk-find</property>
  	  <property name="icon_size">1</property>
  	  <property name="xalign">0.5</property>
  	  <property name="yalign">0.5</property>

src/roster_window.py

@@ -1497,11 +1497,11 @@ class RosterWindow:
 		childs = account_context_menu.get_children()
 
 		status_menuitem = childs[0]
-		new_message_menuitem = childs[1]
-		join_group_chat_menuitem = childs[2]
+		join_group_chat_menuitem = childs[1]
+		new_message_menuitem = childs[2]
 		add_contact_menuitem = childs[3]
-		edit_account_menuitem = childs[4]
-
+		service_discovery_menuitem = childs[4]
+		edit_account_menuitem = childs[5]
 		sub_menu = gtk.Menu()
 		status_menuitem.set_submenu(sub_menu)
 
@@ -1535,6 +1535,8 @@ class RosterWindow:
 
 		edit_account_menuitem.connect('activate', self.on_edit_account, account)
 		add_contact_menuitem.connect('activate', self.on_add_new_contact, account)
+		service_discovery_menuitem.connect('activate',
+			self.on_service_disco_menuitem_activate, account)
 		
 		gc_sub_menu = gtk.Menu() # gc is always a submenu
 		join_group_chat_menuitem.set_submenu(gc_sub_menu)
@@ -1544,7 +1546,7 @@ class RosterWindow:
 
 		# make some items insensitive if account is offline
 		if gajim.connections[account].connected < 2:
-			for widget in [add_contact_menuitem,
+			for widget in [add_contact_menuitem, service_discovery_menuitem,
 			join_group_chat_menuitem, new_message_menuitem]:
 				widget.set_sensitive(False)