aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonathon Jongsma <jonathon.jongsma@collabora.co.uk>2009-02-12 03:43:42 +0800
committerXavier Claessens <xclaesse@src.gnome.org>2009-02-12 03:43:42 +0800
commit27fde0e200664a302a704fa75b6d5c72eb2bca7f (patch)
treec392d1dbea24b3d26bd17a0acd8b10262b6e155c
parentf37b9439fe64eb869231843692637139b4a6dcef (diff)
downloadgsoc2013-empathy-27fde0e200664a302a704fa75b6d5c72eb2bca7f.tar
gsoc2013-empathy-27fde0e200664a302a704fa75b6d5c72eb2bca7f.tar.gz
gsoc2013-empathy-27fde0e200664a302a704fa75b6d5c72eb2bca7f.tar.bz2
gsoc2013-empathy-27fde0e200664a302a704fa75b6d5c72eb2bca7f.tar.lz
gsoc2013-empathy-27fde0e200664a302a704fa75b6d5c72eb2bca7f.tar.xz
gsoc2013-empathy-27fde0e200664a302a704fa75b6d5c72eb2bca7f.tar.zst
gsoc2013-empathy-27fde0e200664a302a704fa75b6d5c72eb2bca7f.zip
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
-rw-r--r--src/empathy-call-window.glade14
1 files changed, 5 insertions, 9 deletions
diff --git a/src/empathy-call-window.glade b/src/empathy-call-window.glade
index 2cd61557e..77a68c7ca 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>
@@ -23,13 +25,6 @@
</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>
<property name="label" translatable="yes">Hang up</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>