From 98655aa5cae4870b377cf21b9b442fb08c4d003d Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Sat, 18 Jul 2009 01:39:02 -0400
Subject: Respect the button-images setting

Streamline the construction of some buttons, with the nice side-effect
that they now obey the button-images setting. See bug 588810.
---
 libempathy-gtk/empathy-new-message-dialog.ui | 84 +++++-----------------------
 1 file changed, 14 insertions(+), 70 deletions(-)

(limited to 'libempathy-gtk/empathy-new-message-dialog.ui')

diff --git a/libempathy-gtk/empathy-new-message-dialog.ui b/libempathy-gtk/empathy-new-message-dialog.ui
index e24095fba..a7b43818c 100644
--- a/libempathy-gtk/empathy-new-message-dialog.ui
+++ b/libempathy-gtk/empathy-new-message-dialog.ui
@@ -1,6 +1,14 @@
 <?xml version="1.0"?>
 <!--*- mode: xml -*-->
 <interface>
+  <object class="GtkImage" id="call_image">
+    <property name="icon_name">audio-input-microphone</property>
+    <property name="icon-size">4</property>
+  </object>
+  <object class="GtkImage" id="chat_image">
+    <property name="icon_name">im-message-new</property>
+    <property name="icon-size">4</property>
+  </object>
   <object class="GtkDialog" id="new_message_dialog">
     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
     <property name="border_width">5</property>
@@ -82,41 +90,9 @@
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
-                <child>
-                  <object class="GtkAlignment" id="alignment1">
-                    <property name="visible">True</property>
-                    <property name="xscale">0</property>
-                    <property name="yscale">0</property>
-                    <child>
-                      <object class="GtkHBox" id="hbox1">
-                        <property name="visible">True</property>
-                        <property name="spacing">2</property>
-                        <child>
-                          <object class="GtkImage" id="image1">
-                            <property name="visible">True</property>
-                            <property name="icon_name">audio-input-microphone</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">False</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkLabel" id="label3">
-                            <property name="visible">True</property>
-                            <property name="label" translatable="yes">C_all</property>
-                            <property name="use_underline">True</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">False</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                      </object>
-                    </child>
-                  </object>
-                </child>
+                <property name="image">call_image</property>
+                <property name="label" translatable="yes">C_all</property>
+                <property name="use_underline">True</property>
               </object>
               <packing>
                 <property name="position">1</property>
@@ -128,41 +104,9 @@
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
                 <property name="has_default">True</property>
-                <child>
-                  <object class="GtkAlignment" id="alignment2">
-                    <property name="visible">True</property>
-                    <property name="xscale">0</property>
-                    <property name="yscale">0</property>
-                    <child>
-                      <object class="GtkHBox" id="hbox2">
-                        <property name="visible">True</property>
-                        <property name="spacing">2</property>
-                        <child>
-                          <object class="GtkImage" id="image2">
-                            <property name="visible">True</property>
-                            <property name="icon_name">im-message-new</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">False</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkLabel" id="label4">
-                            <property name="visible">True</property>
-                            <property name="label" translatable="yes">C_hat</property>
-                            <property name="use_underline">True</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">False</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                      </object>
-                    </child>
-                  </object>
-                </child>
+                <property name="image">chat_image</property>
+                <property name="label" translatable="yes">C_hat</property>
+                <property name="use_underline">True</property>
               </object>
               <packing>
                 <property name="position">2</property>
-- 
cgit v1.2.3