From c0193035f2cf59125fdf12f3178ffc1b2e28c370 Mon Sep 17 00:00:00 2001
From: Xavier Claessens <xclaesse@src.gnome.org>
Date: Tue, 11 Mar 2008 12:42:41 +0000
Subject: [PATCH] Use stock menu entries

svn path=/trunk/; revision=781
---
 libempathy-gtk/empathy-chat.glade        | 47 ++++++++++++------------
 libempathy-gtk/empathy-main-window.glade | 20 ++--------
 2 files changed, 27 insertions(+), 40 deletions(-)

diff --git a/libempathy-gtk/empathy-chat.glade b/libempathy-gtk/empathy-chat.glade
index de24beda..fc121d9d 100644
--- a/libempathy-gtk/empathy-chat.glade
+++ b/libempathy-gtk/empathy-chat.glade
@@ -255,46 +255,45 @@
                     <child>
                       <widget class="GtkImageMenuItem" id="menu_edit_cut">
                         <property name="visible">True</property>
-                        <property name="label" translatable="yes">Cu_t</property>
+                        <property name="label" translatable="yes">gtk-cut</property>
                         <property name="use_underline">True</property>
+                        <property name="use_stock">True</property>
                         <accelerator key="X" modifiers="GDK_CONTROL_MASK" signal="activate"/>
-                        <child internal-child="image">
-                          <widget class="GtkImage" id="image269">
-                            <property name="visible">True</property>
-                            <property name="stock">gtk-cut</property>
-                            <property name="icon_size">1</property>
-                          </widget>
-                        </child>
                       </widget>
                     </child>
                     <child>
                       <widget class="GtkImageMenuItem" id="menu_edit_copy">
                         <property name="visible">True</property>
-                        <property name="label" translatable="yes">_Copy</property>
+                        <property name="label" translatable="yes">gtk-copy</property>
                         <property name="use_underline">True</property>
+                        <property name="use_stock">True</property>
                         <accelerator key="C" modifiers="GDK_CONTROL_MASK" signal="activate"/>
-                        <child internal-child="image">
-                          <widget class="GtkImage" id="image270">
-                            <property name="visible">True</property>
-                            <property name="stock">gtk-copy</property>
-                            <property name="icon_size">1</property>
-                          </widget>
-                        </child>
                       </widget>
                     </child>
                     <child>
                       <widget class="GtkImageMenuItem" id="menu_edit_paste">
                         <property name="visible">True</property>
-                        <property name="label" translatable="yes">_Paste</property>
+                        <property name="label" translatable="yes">gtk-paste</property>
                         <property name="use_underline">True</property>
+                        <property name="use_stock">True</property>
                         <accelerator key="V" modifiers="GDK_CONTROL_MASK" signal="activate"/>
-                        <child internal-child="image">
-                          <widget class="GtkImage" id="image271">
-                            <property name="visible">True</property>
-                            <property name="stock">gtk-paste</property>
-                            <property name="icon_size">1</property>
-                          </widget>
-                        </child>
+                      </widget>
+                    </child>
+                    <child>
+                      <widget class="GtkSeparatorMenuItem" id="separator11">
+                        <property name="visible">True</property>
+                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                        <property name="label" translatable="yes">menuitem1</property>
+                        <property name="use_underline">True</property>
+                      </widget>
+                    </child>
+                    <child>
+                      <widget class="GtkImageMenuItem" id="menu_edit_selectall">
+                        <property name="visible">True</property>
+                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                        <property name="label" translatable="yes">gtk-select-all</property>
+                        <property name="use_underline">True</property>
+                        <property name="use_stock">True</property>
                       </widget>
                     </child>
                   </widget>
diff --git a/libempathy-gtk/empathy-main-window.glade b/libempathy-gtk/empathy-main-window.glade
index 02f69a38..5ac2187b 100644
--- a/libempathy-gtk/empathy-main-window.glade
+++ b/libempathy-gtk/empathy-main-window.glade
@@ -89,16 +89,10 @@
                     <child>
                       <widget class="GtkImageMenuItem" id="chat_quit">
                         <property name="visible">True</property>
-                        <property name="label" translatable="yes">_Quit</property>
+                        <property name="label" translatable="yes">gtk-quit</property>
                         <property name="use_underline">True</property>
+                        <property name="use_stock">True</property>
                         <accelerator key="Q" modifiers="GDK_CONTROL_MASK" signal="activate"/>
-                        <child internal-child="image">
-                          <widget class="GtkImage" id="image888">
-                            <property name="visible">True</property>
-                            <property name="stock">gtk-quit</property>
-                            <property name="icon_size">1</property>
-                          </widget>
-                        </child>
                       </widget>
                     </child>
                   </widget>
@@ -244,15 +238,9 @@
                     <child>
                       <widget class="GtkImageMenuItem" id="help_about">
                         <property name="visible">True</property>
-                        <property name="label" translatable="yes">_About</property>
+                        <property name="label" translatable="yes">gtk-about</property>
                         <property name="use_underline">True</property>
-                        <child internal-child="image">
-                          <widget class="GtkImage" id="image893">
-                            <property name="visible">True</property>
-                            <property name="stock">gtk-about</property>
-                            <property name="icon_size">1</property>
-                          </widget>
-                        </child>
+                        <property name="use_stock">True</property>
                       </widget>
                     </child>
                   </widget>
-- 
2.39.2