Drop GtkStock

https://bugzilla.gnome.org/show_bug.cgi?id=707021

5 files changed, 16 insertions, 24 deletions

diff --git a/src/bookmarks/ephy-bookmark-properties.c b/src/bookmarks/ephy-bookmark-properties.c
index ec26c6100..19584c355 100644
--- a/src/bookmarks/ephy-bookmark-properties.c
+++ b/src/bookmarks/ephy-bookmark-properties.c
@@ -229,7 +229,7 @@ similar_toggled_cb (GtkWidget *button,
 	EphyBookmarkPropertiesPrivate *priv = properties->priv;
 	EphyNode *node;
 	GtkMenuShell *menu;
-	GtkWidget *item, *image;
+	GtkWidget *item;
 	GPtrArray *identical, *similar;
 	char *label;
 	gint i;
@@ -257,12 +257,9 @@ similar_toggled_cb (GtkWidget *button,
 							   "_Unify With %d Identical Bookmarks",
 							   identical->len),
 						 identical->len);
-			item = gtk_image_menu_item_new_with_mnemonic (label);
+			item = gtk_menu_item_new_with_mnemonic (label);
 			g_free (label);
-			image = gtk_image_new_from_stock (GTK_STOCK_CLEAR, GTK_ICON_SIZE_MENU);
-			gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image);
 			g_signal_connect (item, "activate", G_CALLBACK (similar_merge_cb), properties);
-			gtk_widget_show (image);
 			gtk_widget_show (item);
 			gtk_menu_shell_append (menu, item);
 	
@@ -275,7 +272,7 @@ similar_toggled_cb (GtkWidget *button,
 				node = g_ptr_array_index (identical, i);
 				label = g_strdup_printf (_("Show “%s”"),
 							 ephy_node_get_property_string (node, EPHY_NODE_BMK_PROP_TITLE));
-				item = gtk_image_menu_item_new_with_label (label);
+				item = gtk_menu_item_new_with_mnemonic (label);
 				g_free (label);
 				g_signal_connect (item, "activate", G_CALLBACK (similar_show_cb), node);
 				gtk_widget_show (item);
@@ -297,7 +294,7 @@ similar_toggled_cb (GtkWidget *button,
 				node = g_ptr_array_index (similar, i);
 				label = g_strdup_printf (_("Show “%s”"),
 							 ephy_node_get_property_string (node, EPHY_NODE_BMK_PROP_TITLE));
-				item = gtk_image_menu_item_new_with_label (label);
+				item = gtk_menu_item_new_with_mnemonic (label);
 				g_free (label);
 				g_signal_connect (item, "activate", G_CALLBACK (similar_show_cb), node);
 				gtk_widget_show (item);
@@ -613,7 +610,7 @@ ephy_bookmark_properties_constructor (GType type,
 	text = g_strdup_printf (ngettext("%d _Similar", "%d _Similar", 0), 0);
 	gtk_button_set_label (GTK_BUTTON (priv->warning), text);
 	g_free (text);
-	widget = gtk_image_new_from_stock (GTK_STOCK_DIALOG_WARNING, GTK_ICON_SIZE_BUTTON);
+	widget = gtk_image_new_from_icon_name (_("dialog-warning"), GTK_ICON_SIZE_BUTTON);
 	gtk_widget_show (widget);
 	gtk_button_set_image (GTK_BUTTON (priv->warning), widget);
 	g_object_set (priv->warning, "sensitive", FALSE, NULL);
@@ -626,7 +623,7 @@ ephy_bookmark_properties_constructor (GType type,
 			  G_CALLBACK (similar_release_cb), properties);
 		
 	gtk_dialog_add_button (dialog,
-			       GTK_STOCK_HELP,
+			       _("_Help"),
 			       GTK_RESPONSE_HELP);
 
 	action_area = gtk_dialog_get_action_area (dialog);
@@ -639,17 +636,17 @@ ephy_bookmark_properties_constructor (GType type,
 	if (priv->creating)
 	{
 		gtk_dialog_add_button (dialog,
-				       GTK_STOCK_CANCEL,
+				       _("_Cancel"),
 				       GTK_RESPONSE_CANCEL);
 		gtk_dialog_add_button (dialog,
-				       GTK_STOCK_ADD,
+				       _("_Add"),
 				       GTK_RESPONSE_ACCEPT);
 		gtk_dialog_set_default_response (dialog, GTK_RESPONSE_ACCEPT);
 	}
 	else
 	{
 		gtk_dialog_add_button (dialog,
-				       GTK_STOCK_CLOSE,
+				       _("_Close"),
 				       GTK_RESPONSE_CLOSE);
 		gtk_dialog_set_default_response (dialog, GTK_RESPONSE_CLOSE);
 	}
diff --git a/src/bookmarks/ephy-bookmarks-editor.c b/src/bookmarks/ephy-bookmarks-editor.c
index 6d3fdfccf..659fda7d3 100644
--- a/src/bookmarks/ephy-bookmarks-editor.c
+++ b/src/bookmarks/ephy-bookmarks-editor.c
@@ -812,10 +812,10 @@ cmd_bookmarks_import (GtkAction *action,
 	dialog = gtk_dialog_new_with_buttons (_("Import Bookmarks"),
 					      GTK_WINDOW (editor),
 					      GTK_DIALOG_DESTROY_WITH_PARENT,
-					      GTK_STOCK_CANCEL,
+					      _("_Cancel"),
 					      GTK_RESPONSE_CANCEL,
 					      _("I_mport"),
-					      GTK_RESPONSE_OK,
+					      _("_OK"),
 					      NULL);
 	content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
 
diff --git a/src/ephy-history-window.c b/src/ephy-history-window.c
index a0adb7279..91133cc8e 100644
--- a/src/ephy-history-window.c
+++ b/src/ephy-history-window.c
@@ -209,7 +209,7 @@ confirmation_dialog_response_cb (GtkWidget *dialog,
 static GtkWidget *
 confirmation_dialog_construct (EphyHistoryWindow *editor)
 {
-	GtkWidget *dialog, *button, *image;
+	GtkWidget *dialog, *button;
 
 	dialog = gtk_message_dialog_new
 		(GTK_WINDOW (editor),
@@ -227,9 +227,6 @@ confirmation_dialog_construct (EphyHistoryWindow *editor)
 				     GTK_WINDOW (dialog));
 	
 	button = gtk_button_new_with_mnemonic (_("Cl_ear"));
-	image = gtk_image_new_from_stock (GTK_STOCK_CLEAR, GTK_ICON_SIZE_BUTTON);
-	gtk_button_set_image (GTK_BUTTON (button), image);
-	/* don't show the image! see bug #307818 */
 	gtk_widget_show (button);
 	gtk_dialog_add_action_widget (GTK_DIALOG (dialog), button, GTK_RESPONSE_ACCEPT);
 	
diff --git a/src/pdm-dialog.c b/src/pdm-dialog.c
index 80df90b5a..46d20ca61 100644
--- a/src/pdm-dialog.c
+++ b/src/pdm-dialog.c
@@ -320,7 +320,7 @@ pdm_dialog_show_clear_all_dialog (EphyDialog *edialog,
 	GtkWidget *dialog, *vbox;
 	GtkWidget *check, *label, *content_area;
 	PdmClearAllDialogButtons *checkbuttons;
-	GtkWidget *button, *icon;
+	GtkWidget *button;
 
 	dialog = gtk_message_dialog_new_with_markup (GTK_WINDOW (parent),
 						     GTK_DIALOG_DESTROY_WITH_PARENT |
@@ -338,9 +338,9 @@ pdm_dialog_show_clear_all_dialog (EphyDialog *edialog,
 	gtk_window_set_title (GTK_WINDOW (dialog), _("Clear All Personal Data"));
 
 	gtk_dialog_add_buttons (GTK_DIALOG (dialog),
-				GTK_STOCK_HELP,
+				_("_Help"),
 				GTK_RESPONSE_HELP,
-				GTK_STOCK_CANCEL,
+				_("_Cancel"),
 				GTK_RESPONSE_CANCEL,
 				NULL);
 
@@ -348,8 +348,6 @@ pdm_dialog_show_clear_all_dialog (EphyDialog *edialog,
 	button = gtk_dialog_add_button (GTK_DIALOG (dialog),
 					_("Cl_ear"),
 					GTK_RESPONSE_OK);
-	icon = gtk_image_new_from_stock (GTK_STOCK_CLEAR, GTK_ICON_SIZE_BUTTON);
-	gtk_button_set_image (GTK_BUTTON (button), icon);
 	gtk_widget_show (button);
 
 	gtk_dialog_set_default_response (GTK_DIALOG (dialog),
diff --git a/src/window-commands.c b/src/window-commands.c
index eb97a9d1e..7a3db8436 100644
--- a/src/window-commands.c
+++ b/src/window-commands.c
@@ -989,7 +989,7 @@ window_cmd_file_save_as_application (GtkAction *action,
 	dialog = gtk_dialog_new_with_buttons (_("Create Web Application"),
 					      GTK_WINDOW (window),
 					      GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
-					      GTK_STOCK_CANCEL,
+					      _("_Cancel"),
 					      GTK_RESPONSE_CANCEL,
 					      _("C_reate"),
 					      GTK_RESPONSE_OK,