aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Persch <chpe@cvs.gnome.org>2006-04-01 19:56:36 +0800
committerChristian Persch <chpe@src.gnome.org>2006-04-01 19:56:36 +0800
commit44d71da97fd6037b37927ac2ab6c59cdd82d00e2 (patch)
treeddf6d67ea6c2a88cdae03e9af853c4270b4ed8d5
parent3c6e295fa5fcac08ad9f5a7359107117db70464b (diff)
downloadgsoc2013-epiphany-44d71da97fd6037b37927ac2ab6c59cdd82d00e2.tar
gsoc2013-epiphany-44d71da97fd6037b37927ac2ab6c59cdd82d00e2.tar.gz
gsoc2013-epiphany-44d71da97fd6037b37927ac2ab6c59cdd82d00e2.tar.bz2
gsoc2013-epiphany-44d71da97fd6037b37927ac2ab6c59cdd82d00e2.tar.lz
gsoc2013-epiphany-44d71da97fd6037b37927ac2ab6c59cdd82d00e2.tar.xz
gsoc2013-epiphany-44d71da97fd6037b37927ac2ab6c59cdd82d00e2.tar.zst
gsoc2013-epiphany-44d71da97fd6037b37927ac2ab6c59cdd82d00e2.zip
Fix crash when cancelling the prompt before the timeout has run.
2006-04-01 Christian Persch <chpe@cvs.gnome.org> * embed/mozilla/EphyPromptService.cpp: Fix crash when cancelling the prompt before the timeout has run.
-rw-r--r--ChangeLog6
-rw-r--r--embed/mozilla/EphyPromptService.cpp5
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 <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);