From 726dec7bfdafeae5d1cbaf00149aa0659ce589a4 Mon Sep 17 00:00:00 2001
From: Xavier Claessens <xclaesse@gmail.com>
Date: Wed, 23 May 2007 23:01:46 +0000
Subject: New objects: GossipAccountChooser and GossipNewChatroom, we can now
 join

2007-05-24  Xavier Claessens  <xclaesse@gmail.com>

	* libempathy-gtk/gossip-account-chooser.c:
	* libempathy-gtk/gossip-new-chatroom-dialog.c:
	* libempathy-gtk/gossip-account-widget-jabber.c:
	* libempathy-gtk/gossip-account-chooser.h:
	* libempathy-gtk/gossip-new-chatroom-dialog.h:
	* libempathy-gtk/gossip-group-chat.c:
	* libempathy-gtk/empathy-main-window.c:
	* libempathy-gtk/gossip-new-chatroom-dialog.glade:
	* libempathy-gtk/gossip-account-widget-jabber.glade:
	* libempathy-gtk/Makefile.am:
	* libempathy/empathy-tp-chatroom.c:
	* data/gtalk.profile:
	* data/jabber.profile:
	* data/salut.profile:
	* data/Makefile.am:
	* data/empathy.desktop.in.in:
	* data/msn.profile:
	* data/irc.profile: New objects: GossipAccountChooser and
	GossipNewChatroom, we can now join any chatroom. Adding IRC profile.


svn path=/trunk/; revision=89
---
 libempathy-gtk/gossip-account-widget-jabber.glade | 59 ++++-------------------
 1 file changed, 10 insertions(+), 49 deletions(-)

(limited to 'libempathy-gtk/gossip-account-widget-jabber.glade')

diff --git a/libempathy-gtk/gossip-account-widget-jabber.glade b/libempathy-gtk/gossip-account-widget-jabber.glade
index 19d13990a..12eec7576 100644
--- a/libempathy-gtk/gossip-account-widget-jabber.glade
+++ b/libempathy-gtk/gossip-account-widget-jabber.glade
@@ -309,62 +309,23 @@
       </child>
 
       <child>
-	<widget class="GtkVBox" id="vbox1">
+	<widget class="GtkEntry" id="entry_id">
 	  <property name="visible">True</property>
-	  <property name="homogeneous">False</property>
-	  <property name="spacing">0</property>
-
-	  <child>
-	    <widget class="GtkEntry" id="entry_id">
-	      <property name="visible">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="editable">True</property>
-	      <property name="visibility">True</property>
-	      <property name="max_length">0</property>
-	      <property name="text" translatable="yes"></property>
-	      <property name="has_frame">True</property>
-	      <property name="invisible_char">*</property>
-	      <property name="activates_default">False</property>
-	    </widget>
-	    <packing>
-	      <property name="padding">0</property>
-	      <property name="expand">False</property>
-	      <property name="fill">False</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="label1">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">&lt;small&gt;&lt;b&gt;&lt;span foreground=&quot;#555&quot;&gt;Example: user@jabber.org&lt;/span&gt;&lt;/b&gt;&lt;/small&gt;</property>
-	      <property name="use_underline">False</property>
-	      <property name="use_markup">True</property>
-	      <property name="justify">GTK_JUSTIFY_LEFT</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">0</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-	      <property name="width_chars">-1</property>
-	      <property name="single_line_mode">False</property>
-	      <property name="angle">0</property>
-	    </widget>
-	    <packing>
-	      <property name="padding">0</property>
-	      <property name="expand">False</property>
-	      <property name="fill">False</property>
-	    </packing>
-	  </child>
+	  <property name="can_focus">True</property>
+	  <property name="editable">True</property>
+	  <property name="visibility">True</property>
+	  <property name="max_length">0</property>
+	  <property name="text" translatable="yes"></property>
+	  <property name="has_frame">True</property>
+	  <property name="invisible_char">*</property>
+	  <property name="activates_default">False</property>
 	</widget>
 	<packing>
 	  <property name="left_attach">1</property>
 	  <property name="right_attach">3</property>
 	  <property name="top_attach">0</property>
 	  <property name="bottom_attach">1</property>
-	  <property name="x_options">fill</property>
-	  <property name="y_options">fill</property>
+	  <property name="y_options"></property>
 	</packing>
       </child>
     </widget>
-- 
cgit v1.2.3