Use gtk_icon_size_lookup_for_settings() here.

2004-10-25  Christian Persch  <chpe@cvs.gnome.org>

	* embed/downloader-view.c: (downloader_view_add_download):
	* lib/widgets/ephy-spinner.c: (ephy_spinner_cache_get_images),
	(ephy_spinner_size_request):
	* src/ephy-notebook.c: (tab_label_style_set_cb):
	* src/window-commands.c: (window_cmd_help_about):

	Use gtk_icon_size_lookup_for_settings() here.

5 files changed, 22 insertions, 7 deletions

diff --git a/ChangeLog b/ChangeLog
index bc86eea4a..8dbf981d6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2004-10-25  Christian Persch  <chpe@cvs.gnome.org>
+
+	* embed/downloader-view.c: (downloader_view_add_download):
+	* lib/widgets/ephy-spinner.c: (ephy_spinner_cache_get_images),
+	(ephy_spinner_size_request):
+	* src/ephy-notebook.c: (tab_label_style_set_cb):
+	* src/window-commands.c: (window_cmd_help_about):
+
+	Use gtk_icon_size_lookup_for_settings() here.
+
 2004-10-24  Christian Persch  <chpe@cvs.gnome.org>
 
 	* lib/ephy-node.c: (callback), (ephy_node_set_property),
diff --git a/embed/downloader-view.c b/embed/downloader-view.c
index 785a491ad..2cab89d82 100644
--- a/embed/downloader-view.c
+++ b/embed/downloader-view.c
@@ -486,7 +486,8 @@ downloader_view_add_download (DownloaderView *dv,
 				       mime, GNOME_ICON_LOOKUP_FLAGS_NONE, NULL);
 	g_free (mime);
 	
-	gtk_icon_size_lookup (GTK_ICON_SIZE_MENU, &width, &height);
+	gtk_icon_size_lookup_for_settings (gtk_widget_get_settings (GTK_WIDGET (dv)),
+					   GTK_ICON_SIZE_MENU, &width, &height);
 	width *= 2;
 
 	icon_info = gtk_icon_theme_lookup_icon (theme, icon_name, width, 0);
diff --git a/lib/widgets/ephy-spinner.c b/lib/widgets/ephy-spinner.c
index ab98dc4cb..13a9d80d7 100644
--- a/lib/widgets/ephy-spinner.c
+++ b/lib/widgets/ephy-spinner.c
@@ -38,6 +38,7 @@
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <gtk/gtkicontheme.h>
 #include <gtk/gtkiconfactory.h>
+#include <gtk/gtksettings.h>
 
 /* Spinner cache implementation */
 
@@ -350,7 +351,7 @@ ephy_spinner_cache_get_images (EphySpinnerCache *cache,
 		return ephy_spinner_images_copy ((EphySpinnerImages *) element->data);
 	}
 
-	if (!gtk_icon_size_lookup (size, &w, &h))
+	if (!gtk_icon_size_lookup_for_settings (gtk_settings_get_default (), size, &w, &h))
 	{
 		g_warning ("Failed to lookup icon size\n");
 		return NULL;
@@ -751,9 +752,10 @@ ephy_spinner_size_request (GtkWidget *widget,
 	if (!ephy_spinner_load_images (spinner))
 	{
 		requisition->width = requisition->height = 0;
-		gtk_icon_size_lookup (spinner->details->size,
-				      &requisition->width,
-				      &requisition->height);
+		gtk_icon_size_lookup_for_settings (gtk_widget_get_settings (widget),
+						   spinner->details->size,
+						   &requisition->width,
+					           &requisition->height);
 		return;
 	}
 
diff --git a/src/ephy-notebook.c b/src/ephy-notebook.c
index f3f39011c..3acde1c30 100644
--- a/src/ephy-notebook.c
+++ b/src/ephy-notebook.c
@@ -834,7 +834,8 @@ tab_label_style_set_cb (GtkWidget *label,
 	LOG ("tab_label_size_request_cb label %p char_width %d total %d",
 	     label, char_width, TAB_WIDTH_N_CHARS * PANGO_PIXELS (char_width))
 
-	gtk_icon_size_lookup (GTK_ICON_SIZE_MENU, &w, &h);
+	gtk_icon_size_lookup_for_settings (gtk_widget_get_settings (label),
+					   GTK_ICON_SIZE_MENU, &w, &h);
 
 	gtk_widget_set_size_request
 		(hbox, TAB_WIDTH_N_CHARS * PANGO_PIXELS(char_width) + 2 * w, -1);
diff --git a/src/window-commands.c b/src/window-commands.c
index a0d935887..43b43f608 100644
--- a/src/window-commands.c
+++ b/src/window-commands.c
@@ -954,8 +954,9 @@ window_cmd_help_about (GtkAction *action,
 		return;
 	}
 
-	gtk_icon_size_lookup (GTK_ICON_SIZE_DIALOG, &size, NULL);
 	/* FIXME multihead: use the icon theme for the correct screen, not for the default screen */
+	gtk_icon_size_lookup_for_settings (gtk_settings_get_default (),
+					   GTK_ICON_SIZE_DIALOG, &size, NULL);
 	icon = gtk_icon_theme_load_icon (gtk_icon_theme_get_default (),
 					 "web-browser", size, 0 , NULL);
 	if (icon == NULL)