aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMarco Pesenti Gritti <marco@gnome.org>2003-09-27 18:17:12 +0800
committerMarco Pesenti Gritti <marco@src.gnome.org>2003-09-27 18:17:12 +0800
commiteed2331e611eb281440c1bcb5f76b2e547f1e0a7 (patch)
tree5b19372449ec82830ffb679293de05d498e6232f /src
parent66a44625b35868a79da71ec78de700d9b8ff7619 (diff)
downloadgsoc2013-epiphany-eed2331e611eb281440c1bcb5f76b2e547f1e0a7.tar
gsoc2013-epiphany-eed2331e611eb281440c1bcb5f76b2e547f1e0a7.tar.gz
gsoc2013-epiphany-eed2331e611eb281440c1bcb5f76b2e547f1e0a7.tar.bz2
gsoc2013-epiphany-eed2331e611eb281440c1bcb5f76b2e547f1e0a7.tar.lz
gsoc2013-epiphany-eed2331e611eb281440c1bcb5f76b2e547f1e0a7.tar.xz
gsoc2013-epiphany-eed2331e611eb281440c1bcb5f76b2e547f1e0a7.tar.zst
gsoc2013-epiphany-eed2331e611eb281440c1bcb5f76b2e547f1e0a7.zip
Use gtkicontheme, and use it also for mime icons.
2003-09-27 Marco Pesenti Gritti <marco@gnome.org> * embed/mozilla/ContentHandler.cpp: * lib/ephy-gui.c: (make_mime_name), (ephy_gui_get_pixbuf_from_mime_type): * lib/ephy-gui.h: * lib/widgets/ephy-spinner.c: (ephy_spinner_init), (ephy_spinner_theme_changed), (ephy_spinner_load_images), (ephy_spinner_finalize): * src/ephy-shell.c: (ephy_shell_init): Use gtkicontheme, and use it also for mime icons.
Diffstat (limited to 'src')
-rw-r--r--src/ephy-shell.c25
1 files changed, 15 insertions, 10 deletions
diff --git a/src/ephy-shell.c b/src/ephy-shell.c
index a1c72d89a..93041eadd 100644
--- a/src/ephy-shell.c
+++ b/src/ephy-shell.c
@@ -53,7 +53,7 @@
#include <gtk/gtkmessagedialog.h>
#include <dirent.h>
#include <libgnomevfs/gnome-vfs-init.h>
-#include <libgnomeui/gnome-icon-theme.h>
+#include <gtk/gtkicontheme.h>
#include <glade/glade-init.h>
#ifdef ENABLE_NAUTILUS_VIEW
@@ -202,8 +202,9 @@ ephy_shell_init (EphyShell *gs)
{
EphyEmbedSingle *single;
EphyShell **ptr = &ephy_shell;
- GnomeIconTheme *icon_theme;
- char *file;
+ GtkIconTheme *icon_theme;
+ GtkIconInfo *icon_info;
+ const char *icon_file;
gs->priv = EPHY_SHELL_GET_PRIVATE (gs);
@@ -257,15 +258,19 @@ ephy_shell_init (EphyShell *gs)
ephy_shell_load_plugins (gs);
- icon_theme = gnome_icon_theme_new ();
- file = gnome_icon_theme_lookup_icon (icon_theme, "web-browser",
- -1, NULL, NULL);
- g_object_unref (icon_theme);
+ /* FIXME listen on icon changes */
+ icon_theme = gtk_icon_theme_get_default ();
+ icon_info = gtk_icon_theme_lookup_icon (icon_theme, "web-browser", -1, -1);
- if (file)
+ if (icon_info)
{
- gtk_window_set_default_icon_from_file (file, NULL);
- g_free (file);
+
+ icon_file = gtk_icon_info_get_filename (icon_info);
+ g_return_if_fail (icon_file != NULL);
+
+ gtk_window_set_default_icon_from_file (icon_file, NULL);
+
+ gtk_icon_info_free (icon_info);
}
else
{