From bf26441de422173b913db70ec96839a0a426bae8 Mon Sep 17 00:00:00 2001
From: Xan Lopez <xan@igalia.com>
Date: Fri, 13 Apr 2012 15:14:57 +0200
Subject: Remove Help buttons

Since there's no Help for now.
---
 src/epiphany-bookmark-editor-ui.xml |  1 -
 src/epiphany-history-window-ui.xml  |  1 -
 src/epiphany.ui                     | 27 +++++++++++-------------
 src/prefs-dialog.ui                 | 41 ++++++++++++++++++++++---------------
 4 files changed, 37 insertions(+), 33 deletions(-)

diff --git a/src/epiphany-bookmark-editor-ui.xml b/src/epiphany-bookmark-editor-ui.xml
index 2998d4792..dcad18063 100644
--- a/src/epiphany-bookmark-editor-ui.xml
+++ b/src/epiphany-bookmark-editor-ui.xml
@@ -32,7 +32,6 @@
 </menu>
 
 <menu name="HelpMenu" action="Help">
-	<menuitem action="HelpContents"/>
 	<menuitem action="HelpAbout"/>
 </menu>
 
diff --git a/src/epiphany-history-window-ui.xml b/src/epiphany-history-window-ui.xml
index 5592ec2ef..34ed6110c 100644
--- a/src/epiphany-history-window-ui.xml
+++ b/src/epiphany-history-window-ui.xml
@@ -28,7 +28,6 @@
 </menu>
 
 <menu name="HelpMenu" action="Help">
-	<menuitem name="HelpContents" action="HelpContents"/>
 	<menuitem name="HelpAbout" action="HelpAbout"/>
 </menu>
 
diff --git a/src/epiphany.ui b/src/epiphany.ui
index 57e440ada..bca48b56d 100644
--- a/src/epiphany.ui
+++ b/src/epiphany.ui
@@ -22,6 +22,7 @@
             <child>
               <object class="GtkButton" id="close_cookie_properties_button">
                 <property name="label">gtk-close</property>
+                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
@@ -225,6 +226,7 @@
             <child>
               <object class="GtkButton" id="okbutton2">
                 <property name="label">gtk-close</property>
+                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
@@ -241,6 +243,7 @@
             <child>
               <object class="GtkButton" id="encoding_help_button">
                 <property name="label">gtk-help</property>
+                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
@@ -275,6 +278,7 @@
                 <child>
                   <object class="GtkRadioButton" id="automatic_button">
                     <property name="label" translatable="yes">&lt;b&gt;_Automatic&lt;/b&gt;</property>
+                    <property name="use_action_appearance">False</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -323,6 +327,7 @@
                 <child>
                   <object class="GtkRadioButton" id="manual_button">
                     <property name="label" translatable="yes">&lt;b&gt;_Use a different encoding:&lt;/b&gt;</property>
+                    <property name="use_action_appearance">False</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -402,24 +407,12 @@
             <property name="can_focus">False</property>
             <property name="layout_style">end</property>
             <child>
-              <object class="GtkButton" id="pdm_help_button">
-                <property name="label">gtk-help</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="can_default">True</property>
-                <property name="receives_default">False</property>
-                <property name="use_action_appearance">False</property>
-                <property name="use_stock">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">0</property>
-              </packing>
+              <placeholder/>
             </child>
             <child>
               <object class="GtkButton" id="removeallbutton">
                 <property name="label">gtk-clear</property>
+                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
@@ -436,6 +429,7 @@
             <child>
               <object class="GtkButton" id="closebutton1">
                 <property name="label">gtk-close</property>
+                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
@@ -498,6 +492,7 @@
                     <child>
                       <object class="GtkButton" id="cookies_remove_button">
                         <property name="label">gtk-remove</property>
+                        <property name="use_action_appearance">False</property>
                         <property name="visible">True</property>
                         <property name="sensitive">False</property>
                         <property name="can_focus">True</property>
@@ -515,6 +510,7 @@
                     <child>
                       <object class="GtkButton" id="cookies_properties_button">
                         <property name="label">gtk-properties</property>
+                        <property name="use_action_appearance">False</property>
                         <property name="visible">True</property>
                         <property name="sensitive">False</property>
                         <property name="can_focus">True</property>
@@ -589,6 +585,7 @@
                         <child>
                           <object class="GtkButton" id="passwords_remove_button">
                             <property name="label">gtk-remove</property>
+                            <property name="use_action_appearance">False</property>
                             <property name="visible">True</property>
                             <property name="sensitive">False</property>
                             <property name="can_focus">True</property>
@@ -620,6 +617,7 @@
                 <child>
                   <object class="GtkCheckButton" id="passwords_show_button">
                     <property name="label" translatable="yes">_Show passwords</property>
+                    <property name="use_action_appearance">False</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -659,7 +657,6 @@
       </object>
     </child>
     <action-widgets>
-      <action-widget response="-11">pdm_help_button</action-widget>
       <action-widget response="1">removeallbutton</action-widget>
       <action-widget response="-7">closebutton1</action-widget>
     </action-widgets>
diff --git a/src/prefs-dialog.ui b/src/prefs-dialog.ui
index 471ef77b5..4aff7decf 100644
--- a/src/prefs-dialog.ui
+++ b/src/prefs-dialog.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 2.12 -->
+  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkDialog" id="add_language_dialog">
     <property name="can_focus">False</property>
     <property name="border_width">5</property>
@@ -22,6 +22,7 @@
             <child>
               <object class="GtkButton" id="cancelbutton1">
                 <property name="label">gtk-cancel</property>
+                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
@@ -38,6 +39,7 @@
             <child>
               <object class="GtkButton" id="add_button">
                 <property name="label">gtk-add</property>
+                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
@@ -150,24 +152,12 @@
             <property name="can_focus">False</property>
             <property name="layout_style">end</property>
             <child>
-              <object class="GtkButton" id="helpbutton1">
-                <property name="label">gtk-help</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="can_default">True</property>
-                <property name="receives_default">False</property>
-                <property name="use_action_appearance">False</property>
-                <property name="use_stock">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">0</property>
-              </packing>
+              <placeholder/>
             </child>
             <child>
               <object class="GtkButton" id="closebutton1">
                 <property name="label">gtk-close</property>
+                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
@@ -266,6 +256,7 @@
                                 <child>
                                   <object class="GtkCheckButton" id="automatic_downloads_checkbutton">
                                     <property name="label" translatable="yes">A_utomatically open downloaded files</property>
+                                    <property name="use_action_appearance">False</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">False</property>
@@ -353,6 +344,7 @@
                             <child>
                               <object class="GtkCheckButton" id="use_gnome_fonts_checkbutton">
                                 <property name="label" translatable="yes">_Use system fonts</property>
+                                <property name="use_action_appearance">False</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
@@ -381,6 +373,7 @@
                                     <property name="row_spacing">6</property>
                                     <child>
                                       <object class="GtkFontButton" id="sans_fontbutton">
+                                        <property name="use_action_appearance">False</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
                                         <property name="receives_default">True</property>
@@ -395,6 +388,7 @@
                                     </child>
                                     <child>
                                       <object class="GtkFontButton" id="serif_fontbutton">
+                                        <property name="use_action_appearance">False</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
                                         <property name="receives_default">True</property>
@@ -412,6 +406,7 @@
                                     </child>
                                     <child>
                                       <object class="GtkFontButton" id="mono_fontbutton">
+                                        <property name="use_action_appearance">False</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
                                         <property name="receives_default">True</property>
@@ -525,6 +520,7 @@
                             <child>
                               <object class="GtkCheckButton" id="css_checkbox">
                                 <property name="label" translatable="yes">Use custom _stylesheet</property>
+                                <property name="use_action_appearance">False</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
@@ -546,6 +542,7 @@
                                 <child>
                                   <object class="GtkButton" id="css_edit_button">
                                     <property name="label" translatable="yes">_Edit Stylesheet…</property>
+                                    <property name="use_action_appearance">False</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="can_default">True</property>
@@ -638,6 +635,7 @@
                             <child>
                               <object class="GtkCheckButton" id="popups_allow_checkbutton">
                                 <property name="label" translatable="yes">Allow popup _windows</property>
+                                <property name="use_action_appearance">False</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
@@ -654,6 +652,7 @@
                             <child>
                               <object class="GtkCheckButton" id="enable_plugins_checkbutton">
                                 <property name="label" translatable="yes">Enable _plugins</property>
+                                <property name="use_action_appearance">False</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
@@ -670,6 +669,7 @@
                             <child>
                               <object class="GtkCheckButton" id="enable_javascript_checkbutton">
                                 <property name="label" translatable="yes">Enable Java_Script</property>
+                                <property name="use_action_appearance">False</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
@@ -733,6 +733,7 @@
                             <child>
                               <object class="GtkRadioButton" id="always">
                                 <property name="label" translatable="yes">_Always accept</property>
+                                <property name="use_action_appearance">False</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
@@ -749,6 +750,7 @@
                             <child>
                               <object class="GtkRadioButton" id="no-third-party">
                                 <property name="label" translatable="yes">Only _from sites you visit</property>
+                                <property name="use_action_appearance">False</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
@@ -787,6 +789,7 @@
                             <child>
                               <object class="GtkRadioButton" id="never">
                                 <property name="label" translatable="yes">_Never accept</property>
+                                <property name="use_action_appearance">False</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
@@ -846,6 +849,7 @@
                         <child>
                           <object class="GtkCheckButton" id="remember_passwords_checkbutton">
                             <property name="label" translatable="yes">_Remember passwords</property>
+                            <property name="use_action_appearance">False</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -959,6 +963,7 @@
                                 <child>
                                   <object class="GtkButton" id="clear_cache_button">
                                     <property name="label" translatable="yes">Cl_ear</property>
+                                    <property name="use_action_appearance">False</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">False</property>
@@ -1160,6 +1165,7 @@
                                 <child>
                                   <object class="GtkButton" id="lang_add_button">
                                     <property name="label">gtk-add</property>
+                                    <property name="use_action_appearance">False</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="can_default">True</property>
@@ -1176,6 +1182,7 @@
                                 <child>
                                   <object class="GtkButton" id="lang_remove_button">
                                     <property name="label">gtk-remove</property>
+                                    <property name="use_action_appearance">False</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="can_default">True</property>
@@ -1192,6 +1199,7 @@
                                 <child>
                                   <object class="GtkButton" id="lang_up_button">
                                     <property name="label">gtk-go-up</property>
+                                    <property name="use_action_appearance">False</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="can_default">True</property>
@@ -1208,6 +1216,7 @@
                                 <child>
                                   <object class="GtkButton" id="lang_down_button">
                                     <property name="label">gtk-go-down</property>
+                                    <property name="use_action_appearance">False</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="can_default">True</property>
@@ -1296,6 +1305,7 @@
                         <child>
                           <object class="GtkCheckButton" id="enable_spell_checking_checkbutton">
                             <property name="label" translatable="yes">_Enable spell checking</property>
+                            <property name="use_action_appearance">False</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -1345,7 +1355,6 @@
       </object>
     </child>
     <action-widgets>
-      <action-widget response="-11">helpbutton1</action-widget>
       <action-widget response="-7">closebutton1</action-widget>
     </action-widgets>
   </object>
-- 
cgit v1.2.3