From c53a3286bda75a13b844c947129c7ac4240029f9 Mon Sep 17 00:00:00 2001
From: Yann Leboulanger <asterix@lagaule.org>
Date: Fri, 1 Jul 2005 17:55:41 +0000
Subject: [PATCH] don't show text formating button for 0.8 release

---
 src/chat.py               | 8 ++++----
 src/groupchat_window.py   | 1 +
 src/gtkgui.glade          | 3 ---
 src/tabbed_chat_window.py | 1 +
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/chat.py b/src/chat.py
index a3a6159db..83fe90439 100644
--- a/src/chat.py
+++ b/src/chat.py
@@ -302,6 +302,10 @@ class Chat:
 		self.show_title()
 
 	def new_tab(self, jid):
+		#FIXME: text formating buttons will be hidden in 0.8 release
+		for w in ['bold_togglebutton', 'italic_togglebutton', 'underline_togglebutton']:
+			self.xmls[jid].get_widget(w).set_no_show_all(True)
+
 		self.set_compact_view(self.always_compact_view)
 		self.nb_unread[jid] = 0
 		self.last_message_time[jid] = 0
@@ -388,10 +392,6 @@ class Chat:
 		xm.signal_connect('on_close_button_clicked',
 			self.on_close_button_clicked, jid)
 
-		#FIXME: text formating buttons will be hidden in 0.8 release
-		for w in ['bold_togglebutton', 'italic_togglebutton', 'underline_togglebutton']:
-			self.xmls[jid].get_widget(w).set_no_show_all(True)
-
 		child = self.childs[jid]
 		self.notebook.append_page(child, tab_hbox)
 
diff --git a/src/groupchat_window.py b/src/groupchat_window.py
index 04a33ae9a..7422cbbb9 100644
--- a/src/groupchat_window.py
+++ b/src/groupchat_window.py
@@ -865,6 +865,7 @@ class GroupchatWindow(chat.Chat):
 		self.show_title()
 		self.set_subject(room_jid, '') # Set an empty subject to show the room_jid
 		conversation_textview.grab_focus()
+		self.childs[room_jid].show_all()
 
 	def on_treeview_size_allocate(self, widget, allocation):
 		"""The MUC treeview has resized. Move the hpaneds in all tabs to match"""
diff --git a/src/gtkgui.glade b/src/gtkgui.glade
index 34dad0e80..62e58c5cd 100644
--- a/src/gtkgui.glade
+++ b/src/gtkgui.glade
@@ -8318,7 +8318,6 @@ Custom</property>
 	  <child>
 	    <widget class="GtkVBox" id="gc_vbox">
 	      <property name="border_width">3</property>
-	      <property name="visible">True</property>
 	      <property name="homogeneous">False</property>
 	      <property name="spacing">1</property>
 
@@ -8522,7 +8521,6 @@ Custom</property>
 
 		  <child>
 		    <widget class="GtkHBox" id="input_hbox">
-		      <property name="visible">True</property>
 		      <property name="homogeneous">False</property>
 		      <property name="spacing">1</property>
 
@@ -9775,7 +9773,6 @@ Custom</property>
       <child>
 	<widget class="GtkVBox" id="chats_vbox">
 	  <property name="border_width">3</property>
-	  <property name="visible">True</property>
 	  <property name="can_focus">True</property>
 	  <property name="homogeneous">False</property>
 	  <property name="spacing">1</property>
diff --git a/src/tabbed_chat_window.py b/src/tabbed_chat_window.py
index 6ecb97000..84a9eb412 100644
--- a/src/tabbed_chat_window.py
+++ b/src/tabbed_chat_window.py
@@ -262,6 +262,7 @@ class TabbedChatWindow(chat.Chat):
 			self.read_queue(user.jid)
 
 		gajim.connections[self.account].request_vcard(user.jid)
+		self.childs[user.jid].show_all()
 
 	def on_message_textview_key_press_event(self, widget, event):
 		"""When a key is pressed: