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

Set mail_display->destroyed = TRUE. This is a workaround for the

Browse Source 
2003-02-11  Jeffrey Stedfast  <fejj@ximian.com>

	* mail-display.c (mail_display_destroy): Set
	mail_display->destroyed = TRUE. This is a workaround for the
	GTK_OBJECT_DESTROYED() macro that we used to use before.

svn path=/trunk/; revision=19883
This commit is contained in:
Jeffrey Stedfast
2003-02-11 20:45:27 +00:00
committed by Jeffrey Stedfast
parent 39bc77da50
commit de02508770
3 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mail/ChangeLog
View File

@ -1,3 +1,9 @@
2003-02-11 Jeffrey Stedfast <fejj@ximian.com>
* mail-display.c (mail_display_destroy): Set
mail_display->destroyed = TRUE. This is a workaround for the
GTK_OBJECT_DESTROYED() macro that we used to use before.
2003-02-10 Jeffrey Stedfast <fejj@ximian.com> 2003-02-10 Jeffrey Stedfast <fejj@ximian.com>
* message-list.c (build_tree): Use g_signal_emit() rather than * message-list.c (build_tree): Use g_signal_emit() rather than

19
mail/mail-display.c
View File

@ -1589,11 +1589,8 @@ load_content_loaded (struct _mail_msg *mm)
{ {
struct _load_content_msg *m = (struct _load_content_msg *)mm; struct _load_content_msg *m = (struct _load_content_msg *)mm;
#warning "object_destroy check?" if (m->display->destroyed)
#if 0
if (GTK_OBJECT_DESTROYED (m->display))
return; return;
#endif
if (m->display->current_message == m->message) { if (m->display->current_message == m->message) {
if (m->handle) { if (m->handle) {
@ -1637,11 +1634,9 @@ stream_write_or_redisplay_when_loaded (MailDisplay *md,
struct _load_content_msg *m; struct _load_content_msg *m;
GHashTable *loading; GHashTable *loading;
#if 0 if (md->destroyed)
#warning "GTK_OBJECT_DESTROYED"
if (GTK_OBJECT_DESTROYED (md))
return; return;
#endif
loading = g_datalist_get_data (md->data, "loading"); loading = g_datalist_get_data (md->data, "loading");
if (loading) { if (loading) {
if (g_hash_table_lookup (loading, key)) if (g_hash_table_lookup (loading, key))
@ -1909,11 +1904,9 @@ mail_display_render (MailDisplay *md, GtkHTML *html, gboolean reset_scroll)
void void
mail_display_redisplay (MailDisplay *md, gboolean reset_scroll) mail_display_redisplay (MailDisplay *md, gboolean reset_scroll)
{ {
#if 0 if (md->destroyed)
#warning "GTK_OBJECT_DESTROYED"
if (GTK_OBJECT_DESTROYED (md))
return; return;
#endif
fetch_cancel(md); fetch_cancel(md);
md->last_active = NULL; md->last_active = NULL;
@ -2088,6 +2081,8 @@ mail_display_destroy (GtkObject *object)
g_free (mail_display->priv); g_free (mail_display->priv);
mail_display->priv = NULL; mail_display->priv = NULL;
mail_display->destroyed = TRUE;
mail_display_parent_class->destroy (object); mail_display_parent_class->destroy (object);
} }

1
mail/mail-display.h
View File

@ -79,6 +79,7 @@ struct _MailDisplay {
MailConfigDisplayStyle display_style; MailConfigDisplayStyle display_style;
guint printing : 1; guint printing : 1;
guint destroyed: 1;
}; };
typedef struct { typedef struct {