From 34bdfa8eb1ca1c23a72a1ef42217d1a7ec293b68 Mon Sep 17 00:00:00 2001
From: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Fri, 20 Jan 2012 15:19:53 +0100
Subject: contact-widget: move hbox_presence to grid_contact

There is no point keeping this even more complicated that it already is.

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

(limited to 'libempathy-gtk/empathy-contact-widget.ui')

diff --git a/libempathy-gtk/empathy-contact-widget.ui b/libempathy-gtk/empathy-contact-widget.ui
index 244e46e00..2d58f2dae 100644
--- a/libempathy-gtk/empathy-contact-widget.ui
+++ b/libempathy-gtk/empathy-contact-widget.ui
@@ -49,39 +49,28 @@
                   </packing>
                 </child>
                 <child>
-                  <placeholder/>
-                </child>
-                <child>
-                  <placeholder/>
-                </child>
-                <child>
-                  <placeholder/>
-                </child>
-              </object>
-              <packing>
-                <property name="position">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 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="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="position">0</property>
+                    <property name="top_attach">3</property>
+                    <property name="left_attach">0</property>
                   </packing>
                 </child>
-                <child>
-                  <placeholder/>
-                </child>
               </object>
               <packing>
-                <property name="position">1</property>
+                <property name="position">0</property>
               </packing>
             </child>
           </object>
-- 
cgit v1.2.3