[gnome-dictionary] app: Remove use of deprecated stock items

[Emmanuele Bassi <ebassi src gnome org>]

commit 496b111cf6d317235aa648f1fd520cff4f794857
Author: Emmanuele Bassi <ebassi gnome org>
Date:   Mon Feb 23 13:44:26 2015 +0000

    app: Remove use of deprecated stock items
    
    We want proper labels, and we want to drop deprecation warnings.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=745022

 src/gdict-pref-dialog.c   |   18 +++++-------------
 src/gdict-sidebar.c       |    3 +--
 src/gdict-source-dialog.c |   24 ++++++------------------
 src/gdict-window.c        |    4 ++--
 4 files changed, 14 insertions(+), 35 deletions(-)
---
diff --git a/src/gdict-pref-dialog.c b/src/gdict-pref-dialog.c
index f31dfb8..3aaee56 100644
--- a/src/gdict-pref-dialog.c
+++ b/src/gdict-pref-dialog.c
@@ -385,24 +385,16 @@ source_remove_clicked_cb (GtkWidget       *widget,
                                                _("This will permanently remove the "
                                                  "dictionary source from the list."));
       
-      gtk_dialog_add_button (GTK_DIALOG (confirm_dialog),
-                            GTK_STOCK_CANCEL,
-                            GTK_RESPONSE_CANCEL);
-      gtk_dialog_add_button (GTK_DIALOG (confirm_dialog),
-                            GTK_STOCK_REMOVE,
-                            GTK_RESPONSE_OK);
+      gtk_dialog_add_button (GTK_DIALOG (confirm_dialog), _("_Cancel"), GTK_RESPONSE_CANCEL);
+      gtk_dialog_add_button (GTK_DIALOG (confirm_dialog), _("_Remove"), GTK_RESPONSE_OK);
       
       gtk_window_set_title (GTK_WINDOW (confirm_dialog), "");
       
       response = gtk_dialog_run (GTK_DIALOG (confirm_dialog));
-      if (response == GTK_RESPONSE_CANCEL)
-        {
-          gtk_widget_destroy (confirm_dialog);
-          
-          goto out;
-        }
-      
       gtk_widget_destroy (confirm_dialog);
+
+      if (response == GTK_RESPONSE_CANCEL)
+        goto out;
     }
   
   if (gdict_source_loader_remove_source (dialog->loader, name))
diff --git a/src/gdict-sidebar.c b/src/gdict-sidebar.c
index 6c1d268..efa3888 100644
--- a/src/gdict-sidebar.c
+++ b/src/gdict-sidebar.c
@@ -363,8 +363,7 @@ gdict_sidebar_init (GdictSidebar *sidebar)
   close_button = gtk_button_new ();
   gtk_button_set_relief (GTK_BUTTON (close_button), GTK_RELIEF_NONE);
   gtk_button_set_image (GTK_BUTTON (close_button),
-                       gtk_image_new_from_stock (GTK_STOCK_CLOSE,
-                                                 GTK_ICON_SIZE_SMALL_TOOLBAR));
+                       gtk_image_new_from_icon_name ("window-close", GTK_ICON_SIZE_SMALL_TOOLBAR));
   g_signal_connect (close_button, "clicked",
                    G_CALLBACK (gdict_sidebar_close_clicked_cb),
                    sidebar);
diff --git a/src/gdict-source-dialog.c b/src/gdict-source-dialog.c
index 2dbd6ca..4964f52 100644
--- a/src/gdict-source-dialog.c
+++ b/src/gdict-source-dialog.c
@@ -610,9 +610,7 @@ gdict_source_dialog_constructor (GType                  type,
                    dialog);
 
   /* the help button is always visible */
-  dialog->help_button = gtk_dialog_add_button (GTK_DIALOG (dialog),
-                                              GTK_STOCK_HELP,
-                                              GTK_RESPONSE_HELP);
+  dialog->help_button = gtk_dialog_add_button (GTK_DIALOG (dialog), _("_Help"), GTK_RESPONSE_HELP);
   
   vbox = GTK_WIDGET (gtk_builder_get_object (dialog->builder, "db-vbox"));
   dialog->db_chooser = gdict_database_chooser_new ();
@@ -638,29 +636,19 @@ gdict_source_dialog_constructor (GType                  type,
       gtk_widget_set_sensitive (dialog->transport_combo, FALSE);
 
       /* we just allow closing the dialog */
-      dialog->close_button  = gtk_dialog_add_button (GTK_DIALOG (dialog),
-                                                    GTK_STOCK_CLOSE,
-                                                    GTK_RESPONSE_CANCEL);
+      dialog->close_button = gtk_dialog_add_button (GTK_DIALOG (dialog), _("_Close"), GTK_RESPONSE_CANCEL);
       break;
     case GDICT_SOURCE_DIALOG_CREATE:
-      dialog->cancel_button = gtk_dialog_add_button (GTK_DIALOG (dialog),
-                                                    GTK_STOCK_CANCEL,
-                                                    GTK_RESPONSE_CANCEL);
-      dialog->add_button    = gtk_dialog_add_button (GTK_DIALOG (dialog),
-                                                    GTK_STOCK_ADD,
-                                                    GTK_RESPONSE_ACCEPT);
+      dialog->cancel_button = gtk_dialog_add_button (GTK_DIALOG (dialog), _("_Cancel"), GTK_RESPONSE_CANCEL);
+      dialog->add_button = gtk_dialog_add_button (GTK_DIALOG (dialog), _("_Add"), GTK_RESPONSE_ACCEPT);
       /* the "add" button sensitivity is controlled by the transport_combo
        * since it's the only setting that makes a source usable.
        */
       gtk_widget_set_sensitive (dialog->add_button, FALSE);
       break;
     case GDICT_SOURCE_DIALOG_EDIT:
-      dialog->cancel_button = gtk_dialog_add_button (GTK_DIALOG (dialog),
-                                                    GTK_STOCK_CANCEL,
-                                                    GTK_RESPONSE_CANCEL);
-      dialog->close_button  = gtk_dialog_add_button (GTK_DIALOG (dialog),
-                                                    GTK_STOCK_CLOSE,
-                                                    GTK_RESPONSE_CLOSE);
+      dialog->cancel_button = gtk_dialog_add_button (GTK_DIALOG (dialog), _("C_ancel"), GTK_RESPONSE_CANCEL);
+      dialog->close_button = gtk_dialog_add_button (GTK_DIALOG (dialog), _("_Close"), GTK_RESPONSE_CLOSE);
       break;
     default:
       g_assert_not_reached ();
diff --git a/src/gdict-window.c b/src/gdict-window.c
index 7c1e67e..5b958a7 100644
--- a/src/gdict-window.c
+++ b/src/gdict-window.c
@@ -910,8 +910,8 @@ gdict_window_cmd_save_as (GSimpleAction   *action,
   dialog = gtk_file_chooser_dialog_new (_("Save a Copy"),
                                        GTK_WINDOW (window),
                                        GTK_FILE_CHOOSER_ACTION_SAVE,
-                                       GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-                                       GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT,
+                                        _("_Cancel"), GTK_RESPONSE_CANCEL,
+                                        _("_Save"), GTK_RESPONSE_ACCEPT,
                                        NULL);
   gtk_file_chooser_set_do_overwrite_confirmation (GTK_FILE_CHOOSER (dialog), TRUE);