From 0668ebb09e521861056cb36d9e162fbdee63f9f4 Mon Sep 17 00:00:00 2001 From: Christian Persch Date: Sat, 2 Oct 2004 12:33:51 +0000 Subject: Simply use gtk_icon_theme_load_icon(). 2004-10-02 Christian Persch * src/window-commands.c: (window_cmd_help_about): Simply use gtk_icon_theme_load_icon(). --- ChangeLog | 6 ++++++ src/window-commands.c | 22 +++++----------------- 2 files changed, 11 insertions(+), 17 deletions(-) diff --git a/ChangeLog b/ChangeLog index 74b087403..b1af0af3c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2004-10-02 Christian Persch + + * src/window-commands.c: (window_cmd_help_about): + + Simply use gtk_icon_theme_load_icon(). + 2004-10-02 Christian Persch * src/ephy-main.c: (main): diff --git a/src/window-commands.c b/src/window-commands.c index 01e5a4e52..864940dcb 100644 --- a/src/window-commands.c +++ b/src/window-commands.c @@ -931,8 +931,7 @@ window_cmd_help_about (GtkAction *action, GtkWidget** ptr; const char *icon_path; GdkPixbuf *icon = NULL; - GtkIconTheme *icon_theme; - GtkIconInfo *icon_info; + int size = 48; static char *authors[] = { "Marco Pesenti Gritti ", @@ -956,22 +955,11 @@ 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 */ - icon_theme = gtk_icon_theme_get_default (); - icon_info = gtk_icon_theme_lookup_icon (icon_theme, "web-browser", -1, 0); - - if (icon_info != NULL) - { - icon_path = gtk_icon_info_get_filename (icon_info); - - if (icon_path != NULL) - { - icon = gdk_pixbuf_new_from_file (icon_path, NULL); - } - - gtk_icon_info_free (icon_info); - } - else + icon = gtk_icon_theme_load_icon (gtk_icon_theme_get_default (), + "web-browser", size, 0 , NULL); + if (icon == NULL) { g_warning ("Web browser gnome icon not found"); } -- cgit v1.2.3