From 6cec4ba12802103095b357a3aa64d19fa9342e4f Mon Sep 17 00:00:00 2001
From: Yann Leboulanger <asterix@lagaule.org>
Date: Sat, 25 Mar 2006 00:47:34 +0000
Subject: [PATCH] remove online users menuitem as is in disco

---
 src/gtkgui.glade     | 13 +++----------
 src/roster_window.py | 10 ----------
 2 files changed, 3 insertions(+), 20 deletions(-)

diff --git a/src/gtkgui.glade b/src/gtkgui.glade
index 50df46280..853d2cb0c 100644
--- a/src/gtkgui.glade
+++ b/src/gtkgui.glade
@@ -17263,7 +17263,7 @@ Maybe I'll refactor later</property>
       <property name="use_underline">True</property>
 
       <child internal-child="image">
-	<widget class="GtkImage" id="image1173">
+	<widget class="GtkImage" id="image1453">
 	  <property name="visible">True</property>
 	  <property name="stock">gtk-new</property>
 	  <property name="icon_size">1</property>
@@ -17296,13 +17296,6 @@ Maybe I'll refactor later</property>
       <child>
 	<widget class="GtkMenu" id="administrator_menuitem_menu">
 
-	  <child>
-	    <widget class="GtkMenuItem" id="online_users_menuitem">
-	      <property name="label" translatable="yes">_Online Users</property>
-	      <property name="use_underline">True</property>
-	    </widget>
-	  </child>
-
 	  <child>
 	    <widget class="GtkImageMenuItem" id="send_server_message_menuitem">
 	      <property name="tooltip" translatable="yes">Sends a message to currently connected users to this server</property>
@@ -17310,7 +17303,7 @@ Maybe I'll refactor later</property>
 	      <property name="use_underline">True</property>
 
 	      <child internal-child="image">
-		<widget class="GtkImage" id="image1174">
+		<widget class="GtkImage" id="image1454">
 		  <property name="visible">True</property>
 		  <property name="stock">gtk-new</property>
 		  <property name="icon_size">1</property>
@@ -17352,7 +17345,7 @@ Maybe I'll refactor later</property>
 	      <property name="use_underline">True</property>
 
 	      <child internal-child="image">
-		<widget class="GtkImage" id="image1175">
+		<widget class="GtkImage" id="image1455">
 		  <property name="visible">True</property>
 		  <property name="stock">gtk-clear</property>
 		  <property name="icon_size">1</property>
diff --git a/src/roster_window.py b/src/roster_window.py
index 60d62dd7b..fd2107435 100644
--- a/src/roster_window.py
+++ b/src/roster_window.py
@@ -557,9 +557,6 @@ class RosterWindow:
 		server += '/announce/motd/delete'
 		gajim.connections[account].send_motd(server)
 
-	def on_online_users_menuitem_activate(self, widget, account):
-		pass #FIXME: impement disco in users for 0.9
-	
 	def on_history_manager_menuitem_activate(self, widget):
 		if os.name == 'nt': # FIXME: test it actually works..
 			try:
@@ -578,7 +575,6 @@ class RosterWindow:
 			'send_single_message_menuitem')
 		xml_console_menuitem = xml.get_widget('xml_console_menuitem')
 		administrator_menuitem = xml.get_widget('administrator_menuitem')
-		online_users_menuitem = xml.get_widget('online_users_menuitem')
 		send_server_message_menuitem = xml.get_widget(
 			'send_server_message_menuitem')
 		set_motd_menuitem = xml.get_widget('set_motd_menuitem')
@@ -591,12 +587,6 @@ class RosterWindow:
 		xml_console_menuitem.connect('activate',
 			self.on_xml_console_menuitem_activate, account)
 
-		#FIXME: 0.9 should have this: it does disco in the place where users are
-		online_users_menuitem.set_no_show_all(True)
-		online_users_menuitem.hide()
-		online_users_menuitem.connect('activate',
-			self.on_online_users_menuitem_activate, account)
-
 		send_server_message_menuitem.connect('activate',
 			self.on_send_server_message_menuitem_activate, account)