From: Jonathon Jongsma <jonathon.jongsma@collabora.co.uk>
Date: Wed, 11 Feb 2009 19:43:42 +0000 (+0000)
Subject: Fix 'hang up' icon size in menu, remove extra menuitem2
X-Git-Url: https://git.0d.be/?p=empathy.git;a=commitdiff_plain;h=27fde0e200664a302a704fa75b6d5c72eb2bca7f

Fix 'hang up' icon size in menu, remove extra menuitem2

At the same time, i also changed the stock ID from 'stop' to 'cancel' since
cancel was actually used for the toolbar 'hang up' button.  In my current theme,
the stop and cancel buttons are the same, but in theory they could be different,
so it's safer to use the same stock ID.
This fixes bug #570397

From: Jonathon Jongsma <jonathon.jongsma@collabora.co.uk>
Signed-off-by: Sjoerd Simons <sjoerd.simons@collabora.co.uk>

svn path=/trunk/; revision=2438
---

diff --git a/src/empathy-call-window.glade b/src/empathy-call-window.glade
index 2cd61557..77a68c7c 100644
--- a/src/empathy-call-window.glade
+++ b/src/empathy-call-window.glade
@@ -1,4 +1,6 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
+<!--Generated with glade3 3.4.5 on Tue Feb  3 22:03:45 2009 -->
 <glade-interface>
   <widget class="GtkWindow" id="call_window">
     <child>
@@ -22,13 +24,6 @@
                         <property name="use_underline">True</property>
                       </widget>
                     </child>
-                    <child>
-                      <widget class="GtkSeparatorMenuItem" id="menuitem2">
-                        <property name="visible">True</property>
-                        <property name="label" translatable="yes">menuitem2</property>
-                        <property name="use_underline">True</property>
-                      </widget>
-                    </child>
                     <child>
                       <widget class="GtkImageMenuItem" id="menuhangup">
                         <property name="visible">True</property>
@@ -37,7 +32,8 @@
                         <child internal-child="image">
                           <widget class="GtkImage" id="menu-item-image1">
                             <property name="visible">True</property>
-                            <property name="stock">gtk-stop</property>
+                            <property name="stock">gtk-cancel</property>
+                            <property name="icon_size">1</property>
                           </widget>
                         </child>
                       </widget>