From 989e19963822b5dc48d0074f876a29c695f63158 Mon Sep 17 00:00:00 2001 From: Not Zed Date: Tue, 26 Nov 2002 06:43:31 +0000 Subject: gtk_widget_set_parent_window -> gtk_window_set_transient_for. 2002-11-26 Not Zed * mail-account-editor.c (mail_account_editor_new): gtk_widget_set_parent_window -> gtk_window_set_transient_for. * mail-callbacks.c (composer_send_queued_cb): dont unref composer. * message-browser.c (message_browser_destroy): moved back from finalise. 2002-11-25 Not Zed * message-list.c (message_list_dispose): move saving tree state here. (message_list_finalise): And take it from here. * mail-display.c (mail_display_destroy): @#$@# gtk. changed this around a bit. (mail_display_init): Fix prototype, its a gobject. (mail_display_init): ref/sink the invisible gtkobject. svn path=/trunk/; revision=18919 --- mail/message-browser.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'mail/message-browser.c') diff --git a/mail/message-browser.c b/mail/message-browser.c index 592d436e35..7ecdbdd997 100644 --- a/mail/message-browser.c +++ b/mail/message-browser.c @@ -61,23 +61,26 @@ static GtkAllocation last_allocation = { 0, 0 }; static BonoboWindowClass *message_browser_parent_class; static void -message_browser_finalise (GObject *object) +message_browser_destroy (GtkObject *object) { MessageBrowser *message_browser; message_browser = MESSAGE_BROWSER (object); - g_signal_handlers_disconnect_matched(message_browser->fb, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, message_browser); - g_object_unref((message_browser->fb)); + if (message_browser->fb) { + g_signal_handlers_disconnect_matched(message_browser->fb, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, message_browser); + g_object_unref((message_browser->fb)); + message_browser->fb = NULL; + } - if (G_OBJECT_CLASS (message_browser_parent_class)->finalize) - (G_OBJECT_CLASS (message_browser_parent_class)->finalize) (object); + if (GTK_OBJECT_CLASS (message_browser_parent_class)->destroy) + (GTK_OBJECT_CLASS (message_browser_parent_class)->destroy) (object); } static void message_browser_class_init (GObjectClass *object_class) { - object_class->finalize = message_browser_finalise; + ((GtkObjectClass *)object_class)->destroy = message_browser_destroy; message_browser_parent_class = g_type_class_ref(PARENT_TYPE); } -- cgit v1.2.3