2006-02-12 [colin] 2.0.0cvs45

	* src/folderview.c
	* src/main.c
	* src/mainwindow.c
		Fix "stuff" when quitting

diff --git a/ChangeLog b/ChangeLog
index 7a1dad39805f9869376692a22b0fe76a5e1d9566..962eb16e2e32608acaa28e2e3f72406dbf6fe330 100644 (file)
--- 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
 2006-02-12 [wwp]       2.0.0cvs44
 
        * src/prefs_themes.c

diff --git a/PATCHSETS b/PATCHSETS
index 4f0afbbb9c0d0b0053445340d551aa0f4e3638d8..6cd248a81c19b9183d5f219018c4444be1af6e56 100644 (file)
--- 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.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 d40b91aa2372a602194414b48782efbde5d99d2a..9431f55b039b123fa520b31763081024811165c9 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=0
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=44
+EXTRA_VERSION=45

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/folderview.c b/src/folderview.c
index 4297f2e7f3d597b6f707a20c364fd0e5832c7601..026727c13deb5a5a03cdb80b5e164a8329dc91f0 100644 (file)
--- 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;
 
        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..."));
 
        debug_print("Setting folder info...\n");
        STATUSBAR_PUSH(mainwin, _("Setting folder info..."));
 

diff --git a/src/main.c b/src/main.c
index c4147e3c2dd5928e1900fe24ef306505c18354f8..324a9d6c2f89d922bdd4f3b8c229235054ea340b 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -623,7 +623,7 @@ static void exit_sylpheed(MainWindow *mainwin)
 
        lock_socket_remove();
 
 
        lock_socket_remove();
 

-       main_window_destroy(mainwin);
+       main_window_destroy_all();

        
        plugin_unload_all("GTK2");
 
        
        plugin_unload_all("GTK2");
 

diff --git a/src/mainwindow.c b/src/mainwindow.c
index b5203d277f9b57549acdc9255d68657f965f05a6..feed330bff6b6f891b4418c1ff96527bd542c3cf 100644 (file)
--- 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);
 
                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);
                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
 }
 
 #if 0