Minor code cleanup.

2005-10-20  Christian Persch  <chpe@cvs.gnome.org>

	* lib/ephy-stock-icons.c: (ephy_stock_icons_init):

	Minor code cleanup.

2 files changed, 27 insertions, 6 deletions

diff --git a/ChangeLog b/ChangeLog
index 92596cf99..c61945e35 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+2005-10-20  Christian Persch  <chpe@cvs.gnome.org>
+
+	* lib/ephy-stock-icons.c: (ephy_stock_icons_init):
+
+	Minor code cleanup.
+
+2005-10-20  Christian Persch  <chpe@cvs.gnome.org>
+
+	* lib/ephy-stock-icons.c: (ephy_stock_icons_init):
+	* lib/ephy-stock-icons.h:
+	* src/ephy-fullscreen-popup.c: (ephy_fullscreen_popup_constructor):
+	* src/ephy-toolbar.c: (ephy_toolbar_constructor):
+	* src/ephy-window.c:
+
+	Remove fullscreen and leave-fullscreen stock icons; they're available
+	in gtk+ since 2.8.
+
 2005-10-18  Christian Persch  <chpe@cvs.gnome.org>
 
 	* src/bookmarks/ephy-bookmarks-import.c: (xbel_parse_folder),
diff --git a/lib/ephy-stock-icons.c b/lib/ephy-stock-icons.c
index 961dd50b9..07ae50c06 100644
--- a/lib/ephy-stock-icons.c
+++ b/lib/ephy-stock-icons.c
@@ -60,39 +60,43 @@ ephy_stock_icons_init (void)
 	};
 
 	factory = gtk_icon_factory_new ();
-	gtk_icon_factory_add_default (factory);
 
 	for (i = 0; i < (int) G_N_ELEMENTS (items); i++)
 	{
 		char *fn;
 
-		icon_set = gtk_icon_set_new ();
 		icon_source = gtk_icon_source_new ();
 
 		fn = g_strconcat (items[i].stock_id, ".png", NULL);
+		gtk_icon_source_set_icon_name (icon_source, items[i].stock_id);
 		gtk_icon_source_set_filename (icon_source, ephy_file (fn));
 		g_free (fn);
 
+		icon_set = gtk_icon_set_new ();
 		gtk_icon_set_add_source (icon_set, icon_source);
+		gtk_icon_source_free (icon_source);
+
 		gtk_icon_factory_add (factory, items[i].stock_id, icon_set);
 		gtk_icon_set_unref (icon_set);
-		gtk_icon_source_free (icon_source);
 	}
 
 	gtk_stock_add_static (items, G_N_ELEMENTS (items));
 
 	for (i = 0; i < (int) G_N_ELEMENTS (icon_theme_items); i++)
 	{
-		icon_set = gtk_icon_set_new ();
 		icon_source = gtk_icon_source_new ();
 		gtk_icon_source_set_icon_name (icon_source, icon_theme_items[i]);
+
+		icon_set = gtk_icon_set_new ();
 		gtk_icon_set_add_source (icon_set, icon_source);
+		gtk_icon_source_free (icon_source);
+
 		gtk_icon_factory_add (factory, icon_theme_items[i], icon_set);
 		gtk_icon_set_unref (icon_set);
-		gtk_icon_source_free (icon_source);
 	}
 
-	g_object_unref (G_OBJECT (factory));
+	gtk_icon_factory_add_default (factory);
+	g_object_unref (factory);
 
 	gtk_icon_size_register (EPHY_ICON_SIZE_TAB_BUTTON, 10, 10);
 }