diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | embed/mozilla/EphyPromptService.cpp | 5 |
2 files changed, 8 insertions, 3 deletions
@@ -1,3 +1,9 @@ +2006-04-01 Christian Persch <chpe@cvs.gnome.org> + + * embed/mozilla/EphyPromptService.cpp: + + Fix crash when cancelling the prompt before the timeout has run. + 2006-03-28 Christian Persch <chpe@cvs.gnome.org> * embed/mozilla/EphyPromptService.cpp: diff --git a/embed/mozilla/EphyPromptService.cpp b/embed/mozilla/EphyPromptService.cpp index bee062ddf..4f3d1446c 100644 --- a/embed/mozilla/EphyPromptService.cpp +++ b/embed/mozilla/EphyPromptService.cpp @@ -454,11 +454,10 @@ EnableResponse (GtkDialog *aDialog) } static void -RemoveTimeout (GObject *aDialog) +RemoveTimeout (gpointer idptr) { - guint timeout; + guint timeout = GPOINTER_TO_UINT (idptr); - timeout = GPOINTER_TO_UINT (g_object_get_data (aDialog, TIMEOUT_DATA_KEY)); g_return_if_fail (timeout != 0); g_source_remove (timeout); |