[gedit] More stock removal

[Paolo Borelli <pborelli src gnome org>]

commit 7d0f057d9612b493871021008fe2e3849d98b34a
Author: Paolo Borelli <pborelli gnome org>
Date:   Sat Feb 8 14:48:49 2014 +0100

    More stock removal

 gedit/gedit-encodings-dialog.ui      |   32 ++++++++++++++++----------------
 gedit/gedit-file-chooser-dialog.c    |    3 +--
 gedit/gedit-highlight-mode-dialog.ui |    8 ++++----
 gedit/gedit-preferences-dialog.ui    |    8 ++++----
 4 files changed, 25 insertions(+), 26 deletions(-)
---
diff --git a/gedit/gedit-encodings-dialog.ui b/gedit/gedit-encodings-dialog.ui
index 4f1eca9..7f0ef60 100644
--- a/gedit/gedit-encodings-dialog.ui
+++ b/gedit/gedit-encodings-dialog.ui
@@ -52,8 +52,8 @@
             <property name="border_width">5</property>
             <property name="spacing">6</property>
             <child>
-              <object class="GtkButton" id="helpbutton1">
-                <property name="label">gtk-help</property>
+              <object class="GtkButton" id="help_button">
+                <property name="label" translatable="yes">_Help</property>
                 <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
@@ -61,7 +61,7 @@
                 <property name="is_focus">False</property>
                 <property name="can_default">True</property>
                 <property name="receives_default">False</property>
-                <property name="use_stock">True</property>
+                <property name="use_underline">True</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -70,8 +70,8 @@
               </packing>
             </child>
             <child>
-              <object class="GtkButton" id="closebutton1">
-                <property name="label">gtk-cancel</property>
+              <object class="GtkButton" id="close_button">
+                <property name="label" translatable="yes">_Cancel</property>
                 <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
@@ -79,7 +79,7 @@
                 <property name="is_focus">False</property>
                 <property name="can_default">True</property>
                 <property name="receives_default">False</property>
-                <property name="use_stock">True</property>
+                <property name="use_underline">True</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -88,8 +88,8 @@
               </packing>
             </child>
             <child>
-              <object class="GtkButton" id="button1">
-                <property name="label">gtk-ok</property>
+              <object class="GtkButton" id="ok_button">
+                <property name="label" translatable="yes">_OK</property>
                 <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
@@ -97,7 +97,7 @@
                 <property name="is_focus">False</property>
                 <property name="can_default">True</property>
                 <property name="receives_default">False</property>
-                <property name="use_stock">True</property>
+                <property name="use_underline">True</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -200,7 +200,7 @@
             </child>
             <child>
               <object class="GtkButton" id="add_button">
-                <property name="label">gtk-add</property>
+                <property name="label" translatable="yes">_Add</property>
                 <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
@@ -209,7 +209,7 @@
                 <property name="receives_default">True</property>
                 <property name="halign">start</property>
                 <property name="valign">start</property>
-                <property name="use_stock">True</property>
+                <property name="use_underline">True</property>
               </object>
               <packing>
                 <property name="left_attach">0</property>
@@ -220,7 +220,7 @@
             </child>
             <child>
               <object class="GtkButton" id="remove_button">
-                <property name="label">gtk-remove</property>
+                <property name="label" translatable="yes">_Remove</property>
                 <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
@@ -229,7 +229,7 @@
                 <property name="receives_default">True</property>
                 <property name="halign">start</property>
                 <property name="valign">start</property>
-                <property name="use_stock">True</property>
+                <property name="use_underline">True</property>
               </object>
               <packing>
                 <property name="left_attach">1</property>
@@ -323,9 +323,9 @@
       </object>
     </child>
     <action-widgets>
-      <action-widget response="-11">helpbutton1</action-widget>
-      <action-widget response="-6">closebutton1</action-widget>
-      <action-widget response="-5">button1</action-widget>
+      <action-widget response="-11">help_button</action-widget>
+      <action-widget response="-6">close_button</action-widget>
+      <action-widget response="-5">ok_button</action-widget>
     </action-widgets>
   </template>
 </interface>
diff --git a/gedit/gedit-file-chooser-dialog.c b/gedit/gedit-file-chooser-dialog.c
index b31635e..e39873e 100644
--- a/gedit/gedit-file-chooser-dialog.c
+++ b/gedit/gedit-file-chooser-dialog.c
@@ -450,8 +450,7 @@ gedit_file_chooser_dialog_new_valist (const gchar          *title,
  * @title: (allow-none): Title of the dialog, or %NULL
  * @parent: (allow-none): Transient parent of the dialog, or %NULL
  * @action: Open or save mode for the dialog
- * @first_button_text: (allow-none): stock ID or text to go in
- * the first button, or %NULL
+ * @first_button_text: (allow-none): text to go in the first button, or %NULL
  * @...: (allow-none): response ID for the first button, then
  * additional (button, id) pairs, ending with %NULL
  *
diff --git a/gedit/gedit-highlight-mode-dialog.ui b/gedit/gedit-highlight-mode-dialog.ui
index 672041e..1af98bc 100644
--- a/gedit/gedit-highlight-mode-dialog.ui
+++ b/gedit/gedit-highlight-mode-dialog.ui
@@ -39,13 +39,13 @@
             <property name="spacing">6</property>
             <child>
               <object class="GtkButton" id="cancel_button">
-                <property name="label">gtk-cancel</property>
+                <property name="label" translatable="yes">_Cancel</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="has_focus">False</property>
                 <property name="is_focus">False</property>
                 <property name="receives_default">True</property>
-                <property name="use_stock">True</property>
+                <property name="use_underline">True</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -55,14 +55,14 @@
             </child>
             <child>
               <object class="GtkButton" id="ok_button">
-                <property name="label">gtk-ok</property>
+                <property name="label" translatable="yes">_OK</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="has_focus">False</property>
                 <property name="is_focus">False</property>
                 <property name="receives_default">True</property>
-                <property name="use_stock">True</property>
                 <property name="can_default">True</property>
+                <property name="use_underline">True</property>
               </object>
               <packing>
                 <property name="expand">False</property>
diff --git a/gedit/gedit-preferences-dialog.ui b/gedit/gedit-preferences-dialog.ui
index 1c749d8..21b63ca 100644
--- a/gedit/gedit-preferences-dialog.ui
+++ b/gedit/gedit-preferences-dialog.ui
@@ -44,12 +44,12 @@
             <property name="spacing">6</property>
             <child>
               <object class="GtkButton" id="helpbutton1">
-                <property name="label">gtk-help</property>
+                <property name="label" translatable="yes">_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_stock">True</property>
+                <property name="use_underline">True</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -59,12 +59,12 @@
             </child>
             <child>
               <object class="GtkButton" id="closebutton1">
-                <property name="label">gtk-close</property>
+                <property name="label" translatable="yes">_Close</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_stock">True</property>
+                <property name="use_underline">True</property>
               </object>
               <packing>
                 <property name="expand">False</property>