[darcs-to-svn @ Sync last things from gossip. Up to date with gossip SVN revision 2317]

svn path=/trunk/; revision=17

1 files changed, 66 insertions, 80 deletions

diff --git a/libempathy-gtk/gossip-accounts-dialog.glade b/libempathy-gtk/gossip-accounts-dialog.glade
index c3e12c9c1..58c94e694 100644
--- a/libempathy-gtk/gossip-accounts-dialog.glade
+++ b/libempathy-gtk/gossip-accounts-dialog.glade
@@ -225,28 +225,21 @@
 				  <property name="column_spacing">6</property>
 
 				  <child>
-				    <widget class="GtkLabel" id="label_type">
+				    <widget class="GtkImage" id="image_type">
 				      <property name="visible">True</property>
-				      <property name="label" translatable="yes">Jabber</property>
-				      <property name="use_underline">False</property>
-				      <property name="use_markup">False</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="stock">gtk-cut</property>
+				      <property name="icon_size">6</property>
+				      <property name="xalign">0.5</property>
+				      <property name="yalign">0</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="left_attach">0</property>
-				      <property name="right_attach">1</property>
+				      <property name="left_attach">1</property>
+				      <property name="right_attach">2</property>
 				      <property name="top_attach">0</property>
-				      <property name="bottom_attach">1</property>
+				      <property name="bottom_attach">2</property>
+				      <property name="x_options"></property>
 				      <property name="y_options"></property>
 				    </packing>
 				  </child>
@@ -279,21 +272,28 @@
 				  </child>
 
 				  <child>
-				    <widget class="GtkImage" id="image_type">
+				    <widget class="GtkLabel" id="label_type">
 				      <property name="visible">True</property>
-				      <property name="stock">gtk-cut</property>
-				      <property name="icon_size">6</property>
-				      <property name="xalign">0.5</property>
-				      <property name="yalign">0</property>
+				      <property name="label" translatable="yes">Jabber</property>
+				      <property name="use_underline">False</property>
+				      <property name="use_markup">False</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="left_attach">1</property>
-				      <property name="right_attach">2</property>
+				      <property name="left_attach">0</property>
+				      <property name="right_attach">1</property>
 				      <property name="top_attach">0</property>
-				      <property name="bottom_attach">2</property>
-				      <property name="x_options"></property>
+				      <property name="bottom_attach">1</property>
 				      <property name="y_options"></property>
 				    </packing>
 				  </child>
@@ -435,9 +435,9 @@
 			      <property name="column_spacing">6</property>
 
 			      <child>
-				<widget class="GtkLabel" id="label638">
+				<widget class="GtkLabel" id="label640">
 				  <property name="visible">True</property>
-				  <property name="label" translatable="yes">_Name:</property>
+				  <property name="label" translatable="yes">_Type:</property>
 				  <property name="use_underline">True</property>
 				  <property name="use_markup">False</property>
 				  <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -447,7 +447,6 @@
 				  <property name="yalign">0.5</property>
 				  <property name="xpad">0</property>
 				  <property name="ypad">0</property>
-				  <property name="mnemonic_widget">entry_name</property>
 				  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
 				  <property name="width_chars">-1</property>
 				  <property name="single_line_mode">False</property>
@@ -456,17 +455,17 @@
 				<packing>
 				  <property name="left_attach">0</property>
 				  <property name="right_attach">1</property>
-				  <property name="top_attach">1</property>
-				  <property name="bottom_attach">2</property>
+				  <property name="top_attach">0</property>
+				  <property name="bottom_attach">1</property>
 				  <property name="x_options"></property>
 				  <property name="y_options"></property>
 				</packing>
 			      </child>
 
 			      <child>
-				<widget class="GtkLabel" id="label640">
+				<widget class="GtkLabel" id="label638">
 				  <property name="visible">True</property>
-				  <property name="label" translatable="yes">_Type:</property>
+				  <property name="label" translatable="yes">_Name:</property>
 				  <property name="use_underline">True</property>
 				  <property name="use_markup">False</property>
 				  <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -476,6 +475,7 @@
 				  <property name="yalign">0.5</property>
 				  <property name="xpad">0</property>
 				  <property name="ypad">0</property>
+				  <property name="mnemonic_widget">entry_name</property>
 				  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
 				  <property name="width_chars">-1</property>
 				  <property name="single_line_mode">False</property>
@@ -484,45 +484,31 @@
 				<packing>
 				  <property name="left_attach">0</property>
 				  <property name="right_attach">1</property>
-				  <property name="top_attach">0</property>
-				  <property name="bottom_attach">1</property>
+				  <property name="top_attach">1</property>
+				  <property name="bottom_attach">2</property>
 				  <property name="x_options"></property>
 				  <property name="y_options"></property>
 				</packing>
 			      </child>
 
 			      <child>
-				<widget class="GtkHBox" id="hbox180">
+				<widget class="GtkEntry" id="entry_name">
 				  <property name="visible">True</property>
-				  <property name="homogeneous">False</property>
-				  <property name="spacing">6</property>
-
-				  <child>
-				    <widget class="GtkEntry" id="entry_name">
-				      <property name="visible">True</property>
-				      <property name="tooltip" translatable="yes">A unique name for this account to identify it personally to you.</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">True</property>
-				      <property name="fill">True</property>
-				    </packing>
-				  </child>
+				  <property name="tooltip" translatable="yes">A unique name for this account to identify it personally to you.</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="left_attach">1</property>
 				  <property name="right_attach">2</property>
 				  <property name="top_attach">1</property>
 				  <property name="bottom_attach">2</property>
-				  <property name="x_options"></property>
 				  <property name="y_options"></property>
 				</packing>
 			      </child>
@@ -541,23 +527,6 @@
 			      <property name="spacing">6</property>
 
 			      <child>
-				<widget class="GtkButton" id="button_cancel">
-				  <property name="visible">True</property>
-				  <property name="can_focus">True</property>
-				  <property name="label">gtk-cancel</property>
-				  <property name="use_stock">True</property>
-				  <property name="relief">GTK_RELIEF_NORMAL</property>
-				  <property name="focus_on_click">True</property>
-				</widget>
-				<packing>
-				  <property name="padding">0</property>
-				  <property name="expand">False</property>
-				  <property name="fill">False</property>
-				  <property name="pack_type">GTK_PACK_END</property>
-				</packing>
-			      </child>
-
-			      <child>
 				<widget class="GtkButton" id="button_create">
 				  <property name="visible">True</property>
 				  <property name="sensitive">False</property>
@@ -566,7 +535,7 @@
 				  <property name="focus_on_click">True</property>
 
 				  <child>
-				    <widget class="GtkAlignment" id="alignment30">
+				    <widget class="GtkAlignment" id="alignment1">
 				      <property name="visible">True</property>
 				      <property name="xalign">0.5</property>
 				      <property name="yalign">0.5</property>
@@ -578,13 +547,13 @@
 				      <property name="right_padding">0</property>
 
 				      <child>
-					<widget class="GtkHBox" id="hbox181">
+					<widget class="GtkHBox" id="hbox1">
 					  <property name="visible">True</property>
 					  <property name="homogeneous">False</property>
 					  <property name="spacing">2</property>
 
 					  <child>
-					    <widget class="GtkImage" id="image838">
+					    <widget class="GtkImage" id="image1">
 					      <property name="visible">True</property>
 					      <property name="stock">gtk-new</property>
 					      <property name="icon_size">4</property>
@@ -601,9 +570,9 @@
 					  </child>
 
 					  <child>
-					    <widget class="GtkLabel" id="label642">
+					    <widget class="GtkLabel" id="label1">
 					      <property name="visible">True</property>
-					      <property name="label" translatable="yes">Cr_eate!</property>
+					      <property name="label" translatable="yes">Cr_eate</property>
 					      <property name="use_underline">True</property>
 					      <property name="use_markup">False</property>
 					      <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -636,6 +605,23 @@
 				  <property name="pack_type">GTK_PACK_END</property>
 				</packing>
 			      </child>
+
+			      <child>
+				<widget class="GtkButton" id="button_back">
+				  <property name="visible">True</property>
+				  <property name="can_focus">True</property>
+				  <property name="label">gtk-go-back</property>
+				  <property name="use_stock">True</property>
+				  <property name="relief">GTK_RELIEF_NORMAL</property>
+				  <property name="focus_on_click">True</property>
+				</widget>
+				<packing>
+				  <property name="padding">0</property>
+				  <property name="expand">False</property>
+				  <property name="fill">False</property>
+				  <property name="pack_type">GTK_PACK_END</property>
+				</packing>
+			      </child>
 			    </widget>
 			    <packing>
 			      <property name="padding">0</property>