empathy r2438 - trunk/src

[xclaesse svn gnome org]

Author: xclaesse
Date: Wed Feb 11 19:43:42 2009
New Revision: 2438
URL: http://svn.gnome.org/viewvc/empathy?rev=2438&view=rev

Log:
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>

Modified:
   trunk/src/empathy-call-window.glade

Modified: trunk/src/empathy-call-window.glade
==============================================================================
--- trunk/src/empathy-call-window.glade	(original)
+++ trunk/src/empathy-call-window.glade	Wed Feb 11 19:43:42 2009
@@ -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>