From 44d71da97fd6037b37927ac2ab6c59cdd82d00e2 Mon Sep 17 00:00:00 2001 From: Christian Persch Date: Sat, 1 Apr 2006 11:56:36 +0000 Subject: Fix crash when cancelling the prompt before the timeout has run. 2006-04-01 Christian Persch * embed/mozilla/EphyPromptService.cpp: Fix crash when cancelling the prompt before the timeout has run. --- ChangeLog | 6 ++++++ embed/mozilla/EphyPromptService.cpp | 5 ++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 892f781e4..1b189943c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2006-04-01 Christian Persch + + * embed/mozilla/EphyPromptService.cpp: + + Fix crash when cancelling the prompt before the timeout has run. + 2006-03-28 Christian Persch * 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); -- cgit