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.

6 files changed, 0 insertions, 42 deletions

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"