aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--embed/mozilla/ContentHandler.cpp7
2 files changed, 12 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 4f2a3acf0..4b51b2e45 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2003-10-28 Christian Persch <chpe@cvs.gnome.org>
+
+ * embed/mozilla/ContentHandler.cpp:
+ (MimeAskActionDialog::MimeAskActionDialog):
+
+ Add sanity check.
+
2003-10-28 Marco Pesenti Gritti <marco@gnome.org>
* embed/ephy-embed-persist.h:
diff --git a/embed/mozilla/ContentHandler.cpp b/embed/mozilla/ContentHandler.cpp
index 7da5ae25c..f1fdec95c 100644
--- a/embed/mozilla/ContentHandler.cpp
+++ b/embed/mozilla/ContentHandler.cpp
@@ -571,8 +571,11 @@ MimeAskActionDialog::MimeAskActionDialog(GContentHandler *aContentHandler,
GtkWidget *aMimeIcon = glade_xml_get_widget (mGXml,
"mime_ask_action_icon");
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);
+ if (mime_icon != NULL)
+ {
+ 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;