From a5c2880b454fcf5d3db7d1d551331ad1eaa0cc81 Mon Sep 17 00:00:00 2001
From: Yann Leboulanger <asterix@lagaule.org>
Date: Sat, 18 Mar 2006 09:59:04 +0000
Subject: [PATCH] remove profile_avatar menuitem that sometimes appear

---
 src/gtkgui.glade     | 39 +++++++++------------------------------
 src/roster_window.py |  6 ------
 2 files changed, 9 insertions(+), 36 deletions(-)

diff --git a/src/gtkgui.glade b/src/gtkgui.glade
index 2d2de94c7..71cec8896 100644
--- a/src/gtkgui.glade
+++ b/src/gtkgui.glade
@@ -53,7 +53,7 @@
 		      <property name="use_underline">True</property>
 
 		      <child internal-child="image">
-			<widget class="GtkImage" id="image1298">
+			<widget class="GtkImage" id="image1444">
 			  <property name="visible">True</property>
 			  <property name="stock">gtk-jump-to</property>
 			  <property name="icon_size">1</property>
@@ -73,7 +73,7 @@
 		      <property name="use_underline">True</property>
 
 		      <child internal-child="image">
-			<widget class="GtkImage" id="image1299">
+			<widget class="GtkImage" id="image1445">
 			  <property name="visible">True</property>
 			  <property name="stock">gtk-connect</property>
 			  <property name="icon_size">1</property>
@@ -99,7 +99,7 @@
 		      <property name="use_underline">True</property>
 
 		      <child internal-child="image">
-			<widget class="GtkImage" id="image1300">
+			<widget class="GtkImage" id="image1446">
 			  <property name="visible">True</property>
 			  <property name="stock">gtk-add</property>
 			  <property name="icon_size">1</property>
@@ -119,7 +119,7 @@
 		      <property name="use_underline">True</property>
 
 		      <child internal-child="image">
-			<widget class="GtkImage" id="image1301">
+			<widget class="GtkImage" id="image1447">
 			  <property name="visible">True</property>
 			  <property name="stock">gtk-find</property>
 			  <property name="icon_size">1</property>
@@ -166,7 +166,7 @@
 		      <accelerator key="Q" modifiers="GDK_CONTROL_MASK" signal="activate"/>
 
 		      <child internal-child="image">
-			<widget class="GtkImage" id="image1302">
+			<widget class="GtkImage" id="image1448">
 			  <property name="visible">True</property>
 			  <property name="stock">gtk-quit</property>
 			  <property name="icon_size">1</property>
@@ -201,7 +201,7 @@
 		      <accelerator key="A" modifiers="GDK_CONTROL_MASK" signal="activate"/>
 
 		      <child internal-child="image">
-			<widget class="GtkImage" id="image1303">
+			<widget class="GtkImage" id="image1449">
 			  <property name="visible">True</property>
 			  <property name="stock">gtk-network</property>
 			  <property name="icon_size">1</property>
@@ -223,7 +223,7 @@
 		      <accelerator key="T" modifiers="GDK_CONTROL_MASK" signal="activate"/>
 
 		      <child internal-child="image">
-			<widget class="GtkImage" id="image1304">
+			<widget class="GtkImage" id="image1450">
 			  <property name="visible">True</property>
 			  <property name="stock">gtk-file</property>
 			  <property name="icon_size">1</property>
@@ -236,27 +236,6 @@
 		    </widget>
 		  </child>
 
-		  <child>
-		    <widget class="GtkImageMenuItem" id="profile_avatar_menuitem">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">Profile, Avatar</property>
-		      <property name="use_underline">True</property>
-		      <signal name="activate" handler="on_profile_avatar_activate" last_modification_time="Thu, 09 Jun 2005 22:22:16 GMT"/>
-
-		      <child internal-child="image">
-			<widget class="GtkImage" id="image1305">
-			  <property name="visible">True</property>
-			  <property name="stock">gtk-properties</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="GtkSeparatorMenuItem" id="separator2">
 		      <property name="visible">True</property>
@@ -272,7 +251,7 @@
 		      <accelerator key="P" modifiers="GDK_CONTROL_MASK" signal="activate"/>
 
 		      <child internal-child="image">
-			<widget class="GtkImage" id="image1306">
+			<widget class="GtkImage" id="image1451">
 			  <property name="visible">True</property>
 			  <property name="stock">gtk-preferences</property>
 			  <property name="icon_size">1</property>
@@ -307,7 +286,7 @@
 		      <signal name="activate" handler="on_contents_menuitem_activate" last_modification_time="Thu, 06 Oct 2005 23:29:10 GMT"/>
 
 		      <child internal-child="image">
-			<widget class="GtkImage" id="image1307">
+			<widget class="GtkImage" id="image1452">
 			  <property name="visible">True</property>
 			  <property name="stock">gtk-help</property>
 			  <property name="icon_size">1</property>
diff --git a/src/roster_window.py b/src/roster_window.py
index aa47167a1..41726b56f 100644
--- a/src/roster_window.py
+++ b/src/roster_window.py
@@ -576,7 +576,6 @@ class RosterWindow:
 		advanced_menuitem = self.xml.get_widget('advanced_menuitem')
 		show_offline_contacts_menuitem = self.xml.get_widget(
 			'show_offline_contacts_menuitem')
-		profile_avatar_menuitem = self.xml.get_widget('profile_avatar_menuitem')
 
 		# make it sensitive. it is insensitive only if no accounts are *available*
 		advanced_menuitem.set_sensitive(True)
@@ -736,10 +735,6 @@ class RosterWindow:
 			elif len(gajim.connections) == 0: # user has no accounts
 				advanced_menuitem.set_sensitive(False)
 
-		#FIXME: Gajim 0.9 should have this visible
-		profile_avatar_menuitem.set_no_show_all(True)
-		profile_avatar_menuitem.hide()
-
 		if at_least_one_account_connected:
 			new_message_menuitem.set_sensitive(True)
 			join_gc_menuitem.set_sensitive(True)
@@ -753,7 +748,6 @@ class RosterWindow:
 			add_new_contact_menuitem.set_sensitive(False)
 			service_disco_menuitem.set_sensitive(False)
 			show_offline_contacts_menuitem.set_sensitive(False)
-			profile_avatar_menuitem.set_sensitive(False)
 
 		self.actions_menu_needs_rebuild = False