Get rid of EPHY_STOCK_EPHY

In 99% of the cases we were using it for gtk_window_set_icon_name,
which does nothing in GNOME 3. In the couple of valid use cases, just
use "web-browser" directly.

17 files changed, 2 insertions, 65 deletions

diff --git a/embed/ephy-embed.c b/embed/ephy-embed.c
index 0fbc3e53b..1842be5da 100644
--- a/embed/ephy-embed.c
+++ b/embed/ephy-embed.c
@@ -38,7 +38,6 @@
 #include "ephy-history.h"
 #include "ephy-prefs.h"
 #include "ephy-settings.h"
-#include "ephy-stock-icons.h"
 #include "ephy-string.h"
 #include "ephy-web-view.h"
 #include "nautilus-floating-bar.h"
diff --git a/lib/Makefile.am b/lib/Makefile.am
index a2826fe2f..0e4869ad8 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -25,7 +25,6 @@ NOINST_H_FILES = \
 	ephy-signal-accumulator.h		\
 	ephy-smaps.h				\
 	ephy-string.h				\
-	ephy-stock-icons.h			\
 	ephy-time-helpers.h			\
 	ephy-zoom.h
 
diff --git a/lib/ephy-file-chooser.c b/lib/ephy-file-chooser.c
index fe85eee4f..285d6027a 100644
--- a/lib/ephy-file-chooser.c
+++ b/lib/ephy-file-chooser.c
@@ -26,7 +26,6 @@
 #include "ephy-gui.h"
 #include "ephy-debug.h"
 #include "ephy-settings.h"
-#include "ephy-stock-icons.h"
 #include "ephy-string.h"
 
 #include <gtk/gtk.h>
@@ -121,8 +120,6 @@ ephy_file_chooser_constructor (GType type,
 		(GTK_FILE_CHOOSER (object), downloads_dir, NULL);
 	g_free (downloads_dir);
 
-	gtk_window_set_icon_name (GTK_WINDOW (object), EPHY_STOCK_EPHY);
-
 	return object;
 }
 
diff --git a/lib/ephy-gui.c b/lib/ephy-gui.c
index 5ad290772..f3ded522c 100644
--- a/lib/ephy-gui.c
+++ b/lib/ephy-gui.c
@@ -21,7 +21,6 @@
 #include "ephy-gui.h"
 
 #include "ephy-debug.h"
-#include "ephy-stock-icons.h"
 
 #include <ctype.h>
 #include <gdk/gdkx.h>
@@ -212,7 +211,6 @@ ephy_gui_check_location_writable (GtkWidget *parent,
 					  "create files in this directory."));
 
 			gtk_window_set_title (GTK_WINDOW (dialog), _("Directory not Writable"));
-			gtk_window_set_icon_name (GTK_WINDOW (dialog), EPHY_STOCK_EPHY);
 
 			if (parent != NULL)
 			{
@@ -249,7 +247,6 @@ ephy_gui_check_location_writable (GtkWidget *parent,
 				  "you don't have permission to overwrite it."));
 
 		gtk_window_set_title (GTK_WINDOW (dialog), _("Cannot Overwrite File"));
-		gtk_window_set_icon_name (GTK_WINDOW (dialog), EPHY_STOCK_EPHY);
 
 		if (parent != NULL)
 		{
diff --git a/lib/ephy-stock-icons.h b/lib/ephy-stock-icons.h
deleted file mode 100644
index 9bf6ec52d..000000000
--- a/lib/ephy-stock-icons.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- *  Copyright © 2002 Jorn Baayen
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
-#error "Only <epiphany/epiphany.h> can be included directly."
-#endif
-
-#ifndef EPHY_STOCK_ICONS_H
-#define EPHY_STOCK_ICONS_H
-
-G_BEGIN_DECLS
-
-#define EPHY_STOCK_EPHY            "web-browser"
-
-G_END_DECLS
-
-#endif /* EPHY_STOCK_ICONS_H */
diff --git a/lib/widgets/ephy-location-entry.c b/lib/widgets/ephy-location-entry.c
index 495ad7830..24e08d58d 100644
--- a/lib/widgets/ephy-location-entry.c
+++ b/lib/widgets/ephy-location-entry.c
@@ -26,7 +26,6 @@
 #include "ephy-location-entry.h"
 #include "ephy-signal-accumulator.h"
 #include "ephy-dnd.h"
-#include "ephy-stock-icons.h"
 #include "ephy-debug.h"
 #include "ephy-gui.h"
 #include "ephy-request-about.h"
diff --git a/lib/widgets/ephy-tree-model-node.c b/lib/widgets/ephy-tree-model-node.c
index bbd3a2b56..bf97b7f1c 100644
--- a/lib/widgets/ephy-tree-model-node.c
+++ b/lib/widgets/ephy-tree-model-node.c
@@ -24,7 +24,6 @@
 #include <string.h>
 
 #include "ephy-tree-model-node.h"
-#include "ephy-stock-icons.h"
 #include "ephy-node.h"
 #include "ephy-debug.h"
 
diff --git a/src/bookmarks/ephy-bookmark-action.c b/src/bookmarks/ephy-bookmark-action.c
index 1c09b875c..29c568486 100644
--- a/src/bookmarks/ephy-bookmark-action.c
+++ b/src/bookmarks/ephy-bookmark-action.c
@@ -29,7 +29,6 @@
 #include "ephy-favicon-cache.h"
 #include "ephy-gui.h"
 #include "ephy-shell.h"
-#include "ephy-stock-icons.h"
 #include "ephy-string.h"
 
 #include <glib/gi18n.h>
diff --git a/src/bookmarks/ephy-bookmarks-ui.c b/src/bookmarks/ephy-bookmarks-ui.c
index 8cfe15057..382fe498c 100644
--- a/src/bookmarks/ephy-bookmarks-ui.c
+++ b/src/bookmarks/ephy-bookmarks-ui.c
@@ -39,7 +39,6 @@
 #include "ephy-prefs.h"
 #include "ephy-settings.h"
 #include "ephy-shell.h"
-#include "ephy-stock-icons.h"
 #include "ephy-string.h"
 #include "ephy-topic-action-group.h"
 #include "ephy-topic-action.h"
diff --git a/src/bookmarks/ephy-bookmarks.c b/src/bookmarks/ephy-bookmarks.c
index 1cd51e639..3c796b8d9 100644
--- a/src/bookmarks/ephy-bookmarks.c
+++ b/src/bookmarks/ephy-bookmarks.c
@@ -36,7 +36,6 @@
 #include "ephy-prefs.h"
 #include "ephy-settings.h"
 #include "ephy-signal-accumulator.h"
-#include "ephy-stock-icons.h"
 
 #include <string.h>
 #include <glib/gi18n.h>
@@ -447,7 +446,6 @@ redirect_cb (EphyHistory *history,
 	gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_REJECT);
 
 	gtk_window_set_title (GTK_WINDOW (dialog), _("Update Bookmark?"));
-	gtk_window_set_icon_name (GTK_WINDOW (dialog), EPHY_STOCK_EPHY);
 
 	g_object_set_data_full (G_OBJECT (dialog), UPDATE_URI_DATA_KEY,
 				g_strdup (to_uri), (GDestroyNotify) g_free);
diff --git a/src/ephy-history-window.c b/src/ephy-history-window.c
index 4c46e8333..e5d6e6d79 100644
--- a/src/ephy-history-window.c
+++ b/src/ephy-history-window.c
@@ -33,9 +33,7 @@
 #include "window-commands.h"
 #include "ephy-file-helpers.h"
 #include "ephy-debug.h"
-#include "ephy-stock-icons.h"
 #include "ephy-gui.h"
-#include "ephy-stock-icons.h"
 #include "ephy-search-entry.h"
 #include "ephy-session.h"
 #include "ephy-favicon-cache.h"
@@ -234,7 +232,6 @@ confirmation_dialog_construct (EphyHistoryWindow *editor)
 	gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_CANCEL);
 
 	gtk_window_set_title (GTK_WINDOW (dialog), _("Clear History"));
-	gtk_window_set_icon_name (GTK_WINDOW (dialog), EPHY_STOCK_EPHY);
 
 	g_signal_connect (dialog, "response",
 			  G_CALLBACK (confirmation_dialog_response_cb),
diff --git a/src/ephy-main.c b/src/ephy-main.c
index 0fca11d59..e4ddc7735 100644
--- a/src/ephy-main.c
+++ b/src/ephy-main.c
@@ -29,7 +29,6 @@
 #include "ephy-settings.h"
 #include "ephy-shell.h"
 #include "ephy-state.h"
-#include "ephy-stock-icons.h"
 #include "ephy-string.h"
 #include "ephy-web-app-utils.h"
 
@@ -411,8 +410,7 @@ main (int argc,
       exit (1);
     }
     g_strfreev (arguments);
-    arguments = args;
-  }
+    arguments = args;  }
 
   /* Get a timestamp manually if need be */
   if (user_time == 0)
@@ -454,7 +452,6 @@ main (int argc,
 
     g_set_prgname ("epiphany");
     g_set_application_name (_("Web"));
-    gtk_window_set_default_icon_name (EPHY_STOCK_EPHY);
   }
 
   _ephy_shell_create_instance (mode);
diff --git a/src/ephy-session.c b/src/ephy-session.c
index a03d15690..0c1933ed9 100644
--- a/src/ephy-session.c
+++ b/src/ephy-session.c
@@ -38,7 +38,6 @@
 #include "ephy-request-about.h"
 #include "ephy-settings.h"
 #include "ephy-shell.h"
-#include "ephy-stock-icons.h"
 #include "ephy-window.h"
 
 #include <errno.h>
@@ -231,7 +230,6 @@ client_quit_requested_cb (EggSMClient *sm_client,
 			       _("_Abort Downloads"), GTK_RESPONSE_ACCEPT);
 
 	gtk_window_set_title (GTK_WINDOW (dialog), "");
-	gtk_window_set_icon_name (GTK_WINDOW (dialog), EPHY_STOCK_EPHY);
 	gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_CENTER);
 	gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_REJECT);
 
diff --git a/src/ephy-window.c b/src/ephy-window.c
index f2cf7b248..19b3031de 100644
--- a/src/ephy-window.c
+++ b/src/ephy-window.c
@@ -52,7 +52,6 @@
 #include "ephy-settings.h"
 #include "ephy-shell.h"
 #include "ephy-state.h"
-#include "ephy-stock-icons.h"
 #include "ephy-toolbar.h"
 #include "ephy-type-builtins.h"
 #include "ephy-web-view.h"
@@ -431,8 +430,6 @@ construct_confirm_close_dialog (EphyWindow *window,
 	gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_CANCEL);
 
 	/* FIXME gtk_window_set_title (GTK_WINDOW (dialog), _("Close Document?")); */
-	gtk_window_set_icon_name (GTK_WINDOW (dialog), EPHY_STOCK_EPHY);
-
 	gtk_window_group_add_window (gtk_window_get_group (GTK_WINDOW (window)),
 				     GTK_WINDOW (dialog));
 
diff --git a/src/pdm-dialog.c b/src/pdm-dialog.c
index fe92f8bf9..cb88d2484 100644
--- a/src/pdm-dialog.c
+++ b/src/pdm-dialog.c
@@ -30,7 +30,6 @@
 #include "ephy-gui.h"
 #include "ephy-state.h"
 #include "ephy-string.h"
-#include "ephy-stock-icons.h"
 #include "ephy-debug.h"
 #include "ephy-time-helpers.h"
 #include "ephy-embed-single.h"
@@ -1481,8 +1480,6 @@ pdm_dialog_init (PdmDialog *dialog)
 
 	ephy_gui_ensure_window_group (GTK_WINDOW (window));
 
-	gtk_window_set_icon_name (GTK_WINDOW (window), EPHY_STOCK_EPHY);
-
 	g_signal_connect (window, "response",
 			  G_CALLBACK (pdm_dialog_response_cb), dialog);
 	/*
diff --git a/src/window-commands.c b/src/window-commands.c
index 4a6440b64..394bee9c2 100644
--- a/src/window-commands.c
+++ b/src/window-commands.c
@@ -46,7 +46,6 @@
 #include "ephy-settings.h"
 #include "ephy-shell.h"
 #include "ephy-state.h"
-#include "ephy-stock-icons.h"
 #include "ephy-string.h"
 #include "ephy-web-app-utils.h"
 #include "ephy-zoom.h"
@@ -1241,7 +1240,7 @@ window_cmd_help_about (GtkAction *action,
 			        * line seperated by newlines (\n).
 			        */
 			       "translator-credits", _("translator-credits"),
-			       "logo-icon-name", EPHY_STOCK_EPHY,
+			       "logo-icon-name", "web-browser",
 			       "website", "http://www.gnome.org/projects/epiphany",
 			       "website-label", _("Web Website"),
 			       "license", licence,
diff --git a/tests/ephy-embed-single.c b/tests/ephy-embed-single.c
index 8a90c12a7..03ad035cf 100644
--- a/tests/ephy-embed-single.c
+++ b/tests/ephy-embed-single.c
@@ -28,7 +28,6 @@
 #include "ephy-embed-prefs.h"
 #include "ephy-file-helpers.h"
 #include "ephy-shell.h"
-#include "ephy-stock-icons.h"
 #include <gtk/gtk.h>
 
 static void