From 140d5bcc021f83c8b5057c87764c72c60659c16a Mon Sep 17 00:00:00 2001
From: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Fri, 20 Jan 2012 15:31:43 +0100
Subject: contact-widget: merge grid_contact and main_grid_contact

No point keeping the extra widgets now.

https://bugzilla.gnome.org/show_bug.cgi?id=666714
---
 libempathy-gtk/empathy-contact-widget.ui | 122 +++++++++++++------------------
 1 file changed, 52 insertions(+), 70 deletions(-)

(limited to 'libempathy-gtk')

diff --git a/libempathy-gtk/empathy-contact-widget.ui b/libempathy-gtk/empathy-contact-widget.ui
index 9e2132c9f..39223aedf 100644
--- a/libempathy-gtk/empathy-contact-widget.ui
+++ b/libempathy-gtk/empathy-contact-widget.ui
@@ -5,71 +5,63 @@
   <object class="GtkVBox" id="vbox_contact_widget">
     <property name="spacing">6</property>
     <child>
-      <object class="GtkGrid" id="main_grid_contact">
+    <object class="GtkGrid" id="grid_contact">
         <property name="visible">True</property>
-        <property name="column-spacing">6</property>
+        <property name="column_spacing">6</property>
+        <property name="row_spacing">6</property>
         <child>
-          <object class="GtkVBox" id="vbox225">
+          <object class="GtkLabel" id="label680">
+            <property name="visible">True</property>
+            <property name="xalign">0</property>
+            <property name="label" translatable="yes">Account:</property>
+          </object>
+          <packing>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkLabel" id="label655">
+            <property name="visible">True</property>
+            <property name="xalign">0</property>
+            <property name="label" translatable="yes" comments="Identifier to connect to Instant Messaging network">Identifier:</property>
+          </object>
+          <packing>
+            <property name="top_attach">1</property>
+            <property name="left_attach">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkLabel" id="label_alias">
+            <property name="visible">True</property>
+            <property name="xalign">0</property>
+            <property name="label" translatable="yes">Alias:</property>
+          </object>
+          <packing>
+            <property name="top_attach">2</property>
+            <property name="left_attach">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkHBox" id="hbox_presence">
             <property name="visible">True</property>
             <property name="spacing">6</property>
             <child>
-              <object class="GtkGrid" id="grid_contact">
-                <property name="visible">True</property>
-                <property name="column_spacing">6</property>
-                <property name="row_spacing">6</property>
-                <child>
-                  <object class="GtkLabel" id="label680">
-                    <property name="visible">True</property>
-                    <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Account:</property>
-                  </object>
-                  <packing>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="label655">
-                    <property name="visible">True</property>
-                    <property name="xalign">0</property>
-                    <property name="label" translatable="yes" comments="Identifier to connect to Instant Messaging network">Identifier:</property>
-                  </object>
-                  <packing>
-                    <property name="top_attach">1</property>
-                    <property name="left_attach">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="label_alias">
-                    <property name="visible">True</property>
-                    <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Alias:</property>
-                  </object>
-                  <packing>
-                    <property name="top_attach">2</property>
-                    <property name="left_attach">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkHBox" id="hbox_presence">
-                    <property name="visible">True</property>
-                    <property name="spacing">6</property>
-                    <child>
-                      <object class="GtkImage" id="image_state">
-                        <property name="stock">gtk-missing-image</property>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">False</property>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="top_attach">3</property>
-                    <property name="left_attach">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkVBox" id="vbox_avatar">
+              <object class="GtkImage" id="image_state">
+                <property name="stock">gtk-missing-image</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="top_attach">3</property>
+            <property name="left_attach">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkVBox" id="vbox_avatar">
                     <property name="visible">True</property>
                     <child>
                       <placeholder/>
@@ -82,16 +74,6 @@
                   </packing>
                 </child>
               </object>
-              <packing>
-                <property name="position">0</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="top-attach">0</property>
-          </packing>
-        </child>
-      </object>
       <packing>
         <property name="position">0</property>
       </packing>
-- 
cgit v1.2.3