aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mail/ChangeLog3
-rw-r--r--mail/mail-display.c5
2 files changed, 8 insertions, 0 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index b986b52ca3..a559042fb1 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,5 +1,8 @@
2003-03-25 Jeffrey Stedfast <fejj@ximian.com>
+ * mail-display.c (popup_window_destroy_cb): Remove the
+ timeout. Should fix bug #40275.
+
* subscribe-dialog.c: Remove search entry which never worked right
(and can't work as users expect anyway, since we don't do
namespace stripping). Fixes bug #40083.
diff --git a/mail/mail-display.c b/mail/mail-display.c
index 83e8136057..15ba0fd8f4 100644
--- a/mail/mail-display.c
+++ b/mail/mail-display.c
@@ -2280,6 +2280,11 @@ popup_window_destroy_cb (PopupInfo *pop, GObject *deadbeef)
{
the_popup = NULL;
+ if (pop->destroy_timeout != 0) {
+ gtk_timeout_remove (pop->destroy_timeout);
+ pop->destroy_timeout = 0;
+ }
+
popup_info_free (pop);
}