From 220c7e08dbcce8325c8695573643e7448d98b9e1 Mon Sep 17 00:00:00 2001
From: Felix Kaser <f.kaser@gmx.net>
Date: Thu, 3 Dec 2009 00:18:16 +0100
Subject: change position of the infobar

---
 src/empathy-accounts-dialog.c  |  7 ++++---
 src/empathy-accounts-dialog.ui | 39 +++++++++++++++++++--------------------
 2 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/src/empathy-accounts-dialog.c b/src/empathy-accounts-dialog.c
index bdb7bd109..cf1330173 100644
--- a/src/empathy-accounts-dialog.c
+++ b/src/empathy-accounts-dialog.c
@@ -75,9 +75,9 @@ typedef struct {
   GtkWidget *window;
 
   GtkWidget *alignment_settings;
+  GtkWidget *alignment_infobar;
 
   GtkWidget *vbox_details;
-  GtkWidget *vbox_name;
   GtkWidget *infobar;
   GtkWidget *label_status;
   GtkWidget *frame_no_protocol;
@@ -1608,9 +1608,9 @@ accounts_dialog_build_ui (EmpathyAccountsDialog *dialog)
   gui = empathy_builder_get_file (filename,
       "accounts_dialog", &priv->window,
       "vbox_details", &priv->vbox_details,
-      "vbox_name", &priv->vbox_name,
       "frame_no_protocol", &priv->frame_no_protocol,
       "alignment_settings", &priv->alignment_settings,
+      "alignment_infobar", &priv->alignment_infobar,
       "treeview", &priv->treeview,
       "frame_new_account", &priv->frame_new_account,
       "hbox_type", &priv->hbox_type,
@@ -1661,7 +1661,8 @@ accounts_dialog_build_ui (EmpathyAccountsDialog *dialog)
         priv->parent_window);
 
   priv->infobar = gtk_info_bar_new ();
-  gtk_box_pack_end_defaults (GTK_BOX (priv->vbox_name), priv->infobar);
+  gtk_container_add (GTK_CONTAINER (priv->alignment_infobar),
+      priv->infobar);
 
   priv->label_status = gtk_label_new (NULL);
   content_area = gtk_info_bar_get_content_area (GTK_INFO_BAR (priv->infobar));
diff --git a/src/empathy-accounts-dialog.ui b/src/empathy-accounts-dialog.ui
index 86f5e3292..0c59e4d3e 100644
--- a/src/empathy-accounts-dialog.ui
+++ b/src/empathy-accounts-dialog.ui
@@ -99,26 +99,14 @@
                         <property name="visible">True</property>
                         <property name="spacing">6</property>
                         <child>
-                          <object class="GtkVBox" id="vbox_name">
+                          <object class="GtkLabel" id="label_name">
                             <property name="visible">True</property>
-                            <property name="orientation">vertical</property>
-                            <child>
-                              <object class="GtkLabel" id="label_name">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="selectable">True</property>
-                                <attributes>
-                                  <attribute name="weight" value="bold"/>
-                                  <attribute name="scale" value="1.200000"/>
-                                </attributes>
-                              </object>
-                              <packing>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <placeholder/>
-                            </child>
+                            <property name="can_focus">True</property>
+                            <property name="selectable">True</property>
+                            <attributes>
+                              <attribute name="weight" value="bold"/>
+                              <attribute name="scale" value="1.200000"/>
+                            </attributes>
                           </object>
                           <packing>
                             <property name="position">0</property>
@@ -144,6 +132,17 @@
                         <property name="position">0</property>
                       </packing>
                     </child>
+                    <child>
+                      <object class="GtkAlignment" id="alignment_infobar">
+                        <property name="visible">True</property>
+                        <child>
+                          <placeholder/>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
                     <child>
                       <object class="GtkAlignment" id="alignment_settings">
                         <property name="visible">True</property>
@@ -154,7 +153,7 @@
                         </child>
                       </object>
                       <packing>
-                        <property name="position">1</property>
+                        <property name="position">2</property>
                       </packing>
                     </child>
                   </object>
-- 
cgit v1.2.3