From c532e9704aa92d5921e2d59033decaf1748dd397 Mon Sep 17 00:00:00 2001 From: Colin Leroy Date: Sun, 12 Feb 2006 20:56:16 +0000 Subject: [PATCH] 2006-02-12 [colin] 2.0.0cvs45 * src/folderview.c * src/main.c * src/mainwindow.c Fix "stuff" when quitting --- ChangeLog | 7 +++++++ PATCHSETS | 1 + configure.ac | 2 +- src/folderview.c | 3 +++ src/main.c | 2 +- src/mainwindow.c | 5 +++++ 6 files changed, 18 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7a1dad398..962eb16e2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2006-02-12 [colin] 2.0.0cvs45 + + * src/folderview.c + * src/main.c + * src/mainwindow.c + Fix "stuff" when quitting + 2006-02-12 [wwp] 2.0.0cvs44 * src/prefs_themes.c diff --git a/PATCHSETS b/PATCHSETS index 4f0afbbb9..6cd248a81 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -1228,3 +1228,4 @@ ( cvs diff -u -r 1.5.2.11 -r 1.5.2.12 src/exporthtml.c; cvs diff -u -r 1.12.2.12 -r 1.12.2.13 src/html.c; cvs diff -u -r 1.3.2.4 -r 1.3.2.5 src/html.h; cvs diff -u -r 1.49.2.71 -r 1.49.2.72 src/procmime.c; cvs diff -u -r 1.96.2.94 -r 1.96.2.95 src/textview.c; ) > 2.0.0cvs42.patchset ( cvs diff -u -r 1.395.2.168 -r 1.395.2.169 src/summaryview.c; ) > 2.0.0cvs43.patchset ( cvs diff -u -r 1.3.2.38 -r 1.3.2.39 src/prefs_themes.c; ) > 2.0.0cvs44.patchset +( cvs diff -u -r 1.207.2.88 -r 1.207.2.89 src/folderview.c; cvs diff -u -r 1.115.2.74 -r 1.115.2.75 src/main.c; cvs diff -u -r 1.274.2.95 -r 1.274.2.96 src/mainwindow.c; ) > 2.0.0cvs45.patchset diff --git a/configure.ac b/configure.ac index d40b91aa2..9431f55b0 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ MINOR_VERSION=0 MICRO_VERSION=0 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=44 +EXTRA_VERSION=45 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/src/folderview.c b/src/folderview.c index 4297f2e7f..026727c13 100644 --- a/src/folderview.c +++ b/src/folderview.c @@ -660,6 +660,9 @@ void folderview_set(FolderView *folderview) GtkCTree *ctree = GTK_CTREE(folderview->ctree); MainWindow *mainwin = folderview->mainwin; + if (!mainwin) + return; + debug_print("Setting folder info...\n"); STATUSBAR_PUSH(mainwin, _("Setting folder info...")); diff --git a/src/main.c b/src/main.c index c4147e3c2..324a9d6c2 100644 --- a/src/main.c +++ b/src/main.c @@ -623,7 +623,7 @@ static void exit_sylpheed(MainWindow *mainwin) lock_socket_remove(); - main_window_destroy(mainwin); + main_window_destroy_all(); plugin_unload_all("GTK2"); diff --git a/src/mainwindow.c b/src/mainwindow.c index b5203d277..feed330bf 100644 --- a/src/mainwindow.c +++ b/src/mainwindow.c @@ -2359,12 +2359,17 @@ void main_window_destroy_all(void) TOOLBAR_DESTROY_ACTIONS(mainwin->toolbar->action_list); TOOLBAR_DESTROY_ITEMS(mainwin->toolbar->item_list); + mainwin->folderview->mainwin = NULL; + mainwin->summaryview->mainwin = NULL; + mainwin->messageview->mainwin = NULL; + g_free(mainwin->toolbar); g_free(mainwin); mainwin_list = g_list_remove(mainwin_list, mainwin); } g_list_free(mainwin_list); + mainwin_list = NULL; } #if 0 -- 2.25.1