callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Undo jeff's patch below for #40275, the destroy timeout is already removed

Browse Source 
2003-03-26  Not Zed  <NotZed@Ximian.com>

	* mail-display.c (popup_window_destroy_cb): Undo jeff's patch
	below for #40275, the destroy timeout is already removed in
	popup_info_free.  Unref the widget 'w' when we're done with it.
	(popup_info_free): Move everything in here to popup_window_destroy
	and remove, since nothing else uses it.
	(make_popup_window): Ref the widget so it doesn't go away before
	we're finished with it.  Really fixes bug #40275/40188.

svn path=/trunk/; revision=20512
This commit is contained in:
Not Zed
2003-03-26 03:38:30 +00:00
committed by Michael Zucci
parent 992e6be111
commit 0983e2cf91
2 changed files with 22 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
mail/ChangeLog
View File

@ -1,3 +1,13 @@
2003-03-26 Not Zed <NotZed@Ximian.com>
* mail-display.c (popup_window_destroy_cb): Undo jeff's patch
below for #40275, the destroy timeout is already removed in
popup_info_free. Unref the widget 'w' when we're done with it.
(popup_info_free): Move everything in here to popup_window_destroy
and remove, since nothing else uses it.
(make_popup_window): Ref the widget so it doesn't go away before
we're finished with it. Really fixes bug #40275/40188.
2003-03-25 Jeffrey Stedfast <fejj@ximian.com>
* mail-display.c (popup_window_destroy_cb): Remove the

35
mail/mail-display.c
View File

@ -2260,39 +2260,27 @@ struct _PopupInfo {
/* Aiieee! Global Data! */
static GtkWidget *the_popup = NULL;
static void
popup_info_free (PopupInfo *pop)
{
if (pop) {
if (pop->destroy_timeout)
gtk_timeout_remove (pop->destroy_timeout);
bonobo_event_source_client_remove_listener (bonobo_widget_get_objref (BONOBO_WIDGET (pop->w)),
pop->listener,
NULL);
CORBA_Object_release (pop->listener, NULL);
g_free (pop);
}
}
static void
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);
if (pop->destroy_timeout != 0)
g_source_remove(pop->destroy_timeout);
bonobo_event_source_client_remove_listener (bonobo_widget_get_objref (BONOBO_WIDGET (pop->w)),
pop->listener,
NULL);
CORBA_Object_release (pop->listener, NULL);
g_object_unref(pop->w);
g_free (pop);
}
static int
popup_timeout_cb (gpointer user_data)
{
PopupInfo *pop = (PopupInfo *) user_data;
pop->destroy_timeout = 0;
gtk_widget_destroy (pop->win);
@ -2358,6 +2346,7 @@ make_popup_window (GtkWidget *w)
gtk_widget_destroy (the_popup);
pop->w = w;
g_object_ref(w);
the_popup = pop->win = gtk_window_new (GTK_WINDOW_POPUP);
fr = gtk_frame_new (NULL);