From 68fb5e488ecf7c80622af3d00edab5348e70917c Mon Sep 17 00:00:00 2001
From: Pablo Barciela <scow@riseup.net>
Date: Sat, 10 Mar 2018 16:42:15 +0100
Subject: avoid gtk_dialog_add_buttons with stock ids

---
 src/caja-connect-server-dialog.c        | 14 ++++++++------
 src/caja-location-dialog.c              | 18 ++++++++++++------
 src/file-manager/fm-directory-view.c    | 13 +++++++++----
 src/file-manager/fm-properties-window.c | 13 +++++++++----
 4 files changed, 38 insertions(+), 20 deletions(-)

(limited to 'src')

diff --git a/src/caja-connect-server-dialog.c b/src/caja-connect-server-dialog.c
index a515f1e5..aa1ff1c1 100644
--- a/src/caja-connect-server-dialog.c
+++ b/src/caja-connect-server-dialog.c
@@ -1113,14 +1113,16 @@ caja_connect_server_dialog_init (CajaConnectServerDialog *dialog)
                             G_BINDING_DEFAULT |
                             G_BINDING_SYNC_CREATE);
 
-
-
-    gtk_dialog_add_button (GTK_DIALOG (dialog),
-                           "gtk-help",
+    eel_dialog_add_button (GTK_DIALOG (dialog),
+                           _("_Help"),
+                           "help-browser",
                            GTK_RESPONSE_HELP);
-    gtk_dialog_add_button (GTK_DIALOG (dialog),
-                           "gtk-cancel",
+
+    eel_dialog_add_button (GTK_DIALOG (dialog),
+                           _("_Cancel"),
+                           "process-stop",
                            GTK_RESPONSE_CANCEL);
+
     connect_button = gtk_dialog_add_button (GTK_DIALOG (dialog),
     					_("C_onnect"),
     					RESPONSE_CONNECT);
diff --git a/src/caja-location-dialog.c b/src/caja-location-dialog.c
index f5354eb9..e207a1ef 100644
--- a/src/caja-location-dialog.c
+++ b/src/caja-location-dialog.c
@@ -185,15 +185,21 @@ caja_location_dialog_init (CajaLocationDialog *dialog)
     gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
                         box, FALSE, TRUE, 0);
 
-    gtk_dialog_add_button (GTK_DIALOG (dialog),
-                           "gtk-help",
+    eel_dialog_add_button (GTK_DIALOG (dialog),
+                           _("_Help"),
+                           "help-browser",
                            GTK_RESPONSE_HELP);
-    gtk_dialog_add_button (GTK_DIALOG (dialog),
-                           "gtk-cancel",
+
+    eel_dialog_add_button (GTK_DIALOG (dialog),
+                           _("_Cancel"),
+                           "process-stop",
                            GTK_RESPONSE_CANCEL);
-    gtk_dialog_add_button (GTK_DIALOG (dialog),
-                           "gtk-open",
+
+    eel_dialog_add_button (GTK_DIALOG (dialog),
+                           _("_Open"),
+                           "document-open",
                            RESPONSE_OPEN);
+
     gtk_dialog_set_default_response (GTK_DIALOG (dialog),
                                      RESPONSE_OPEN);
 
diff --git a/src/file-manager/fm-directory-view.c b/src/file-manager/fm-directory-view.c
index ed6097dd..a561609d 100644
--- a/src/file-manager/fm-directory-view.c
+++ b/src/file-manager/fm-directory-view.c
@@ -1337,8 +1337,10 @@ action_save_search_as_callback (GtkAction *action,
 						      0,
 						      "gtk-cancel", GTK_RESPONSE_CANCEL,
 						      NULL);
-		save_button = gtk_dialog_add_button (GTK_DIALOG (dialog),
-						     "gtk-save", GTK_RESPONSE_OK);
+
+		save_button = eel_dialog_add_button (GTK_DIALOG (dialog), _("_Save"),
+						     "document-save", GTK_RESPONSE_OK);
+
 		gtk_dialog_set_default_response (GTK_DIALOG (dialog),
 						 GTK_RESPONSE_OK);
 		gtk_container_set_border_width (GTK_CONTAINER (dialog), 5);
@@ -10269,8 +10271,11 @@ ask_link_action (FMDirectoryView *view)
 
 	gtk_dialog_add_button (GTK_DIALOG (dialog),
 			       _("Make a _Link"), 0);
-	gtk_dialog_add_button (GTK_DIALOG (dialog),
-			       "gtk-cancel", 1);
+
+	eel_dialog_add_button (GTK_DIALOG (dialog),
+			       _("_Cancel"),
+			       "process-stop", 1);
+
 	gtk_dialog_add_button (GTK_DIALOG (dialog),
 			       _("_Download"), 2);
 
diff --git a/src/file-manager/fm-properties-window.c b/src/file-manager/fm-properties-window.c
index acea165a..d4ce8944 100644
--- a/src/file-manager/fm-properties-window.c
+++ b/src/file-manager/fm-properties-window.c
@@ -5168,10 +5168,15 @@ create_properties_window (StartupData *startup_data)
 	/* append pages from available views */
 	append_extension_pages (window);
 
-	gtk_dialog_add_buttons (GTK_DIALOG (window),
-				"gtk-help", GTK_RESPONSE_HELP,
-				"gtk-close", GTK_RESPONSE_CLOSE,
-				NULL);
+        eel_dialog_add_button (GTK_DIALOG (window),
+                               _("_Help"),
+                               "help-browser",
+                               GTK_RESPONSE_HELP);
+
+        eel_dialog_add_button (GTK_DIALOG (window),
+                               _("_Close"),
+                               "window-close",
+                               GTK_RESPONSE_CLOSE);
 
 	/* FIXME - HIGificiation, should be done inside GTK+ */
 	gtk_container_set_border_width (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (window))), 12);
-- 
cgit v1.2.1