aboutsummaryrefslogtreecommitdiffstats
path: root/embed
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 /embed
parent66a44625b35868a79da71ec78de700d9b8ff7619 (diff)
downloadgsoc2013-epiphany-eed2331e611eb281440c1bcb5f76b2e547f1e0a7.tar.gz
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 'embed')
-rw-r--r--embed/mozilla/ContentHandler.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/embed/mozilla/ContentHandler.cpp b/embed/mozilla/ContentHandler.cpp
index e1a571bce..49152e586 100644
--- a/embed/mozilla/ContentHandler.cpp
+++ b/embed/mozilla/ContentHandler.cpp
@@ -553,6 +553,7 @@ MimeAskActionDialog::MimeAskActionDialog(GContentHandler *aContentHandler,
mContentHandler(aContentHandler),
mParent(aParentWidget)
{
+ GdkPixbuf *mime_icon;
GtkWidget *label;
GtkWidget *dialogWidget;
const char *description;
@@ -566,8 +567,9 @@ MimeAskActionDialog::MimeAskActionDialog(GContentHandler *aContentHandler,
GtkWidget *aMimeIcon = glade_xml_get_widget (mGXml,
"mime_ask_action_icon");
- gtk_image_set_from_file(GTK_IMAGE(aMimeIcon),
- gnome_vfs_mime_get_icon(aMimeType));
+ mime_icon = ephy_gui_get_pixbuf_from_mime_type (aMimeType, 32);
+ gtk_image_set_from_pixbuf (GTK_IMAGE(aMimeIcon), mime_icon);
+ g_object_unref (mime_icon);
description = gnome_vfs_mime_get_description (aMimeType);
if (!description) description = aMimeType;