aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rwxr-xr-xlib/egg/egg-editable-toolbar.c3
2 files changed, 9 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 7c9727ae6..8f1e4c39c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-05-30 Frederic Peters <fpeters@0d.be>
+
+ * lib/egg/egg-editable-toolbar.c: (action_sensitive_cb)
+
+ Fix crash when moving zoom widget on toolbar (#338682)
+
2006-05-29 Christian Persch <chpe@cvs.gnome.org>
* lib/ephy-file-helpers.c: (ephy_file_launch_application),
diff --git a/lib/egg/egg-editable-toolbar.c b/lib/egg/egg-editable-toolbar.c
index b7fa0951d..104326fbf 100755
--- a/lib/egg/egg-editable-toolbar.c
+++ b/lib/egg/egg-editable-toolbar.c
@@ -532,6 +532,9 @@ action_sensitive_cb (GtkAction *action,
EggEditableToolbar *etoolbar = EGG_EDITABLE_TOOLBAR
(gtk_widget_get_ancestor (GTK_WIDGET (item), EGG_TYPE_EDITABLE_TOOLBAR));
+ if (etoolbar == NULL)
+ return;
+
if (etoolbar->priv->edit_mode > 0)
{
gtk_widget_set_sensitive (GTK_WIDGET (item), TRUE);