2004-12-10 [colin] 0.9.13cvs12

	* src/messageview.c
		Fix logic error
	* src/mainwindow.c
		Fix corruptions when de-separating messageview

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 6efe0067cd7874fa0cec2c2506ac296bfece4176..dc2440f399d623a6d77d685574605747a3b21871 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,10 @@
+2004-12-10 [colin]     0.9.13cvs12
+
+       * src/messageview.c
+               Fix logic error
+       * src/mainwindow.c
+               Fix corruptions when de-separating messageview
+

 2004-12-10 [paul]      0.9.13cvs11
 
        * src/prefs_themes.c
 2004-12-10 [paul]      0.9.13cvs11
 
        * src/prefs_themes.c

diff --git a/PATCHSETS b/PATCHSETS
index da4b791e6f4b0a027d00e9ad24a01b72425a98fd..7a812966d46d155f45be18d8868f6df94edb80df 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -181,3 +181,4 @@
 ( cvs diff -u -r 1.4 -r 1.5 src/gtk/colorlabel.c; ) > 0.9.13cvs9.patchset
 ( cvs diff -u -r 1.100 -r 1.101 src/procmime.c; ) > 0.9.13cvs10.patchset
 ( cvs diff -u -r 1.7 -r 1.8 src/prefs_themes.c; ) > 0.9.13cvs11.patchset
 ( cvs diff -u -r 1.4 -r 1.5 src/gtk/colorlabel.c; ) > 0.9.13cvs9.patchset
 ( cvs diff -u -r 1.100 -r 1.101 src/procmime.c; ) > 0.9.13cvs10.patchset
 ( cvs diff -u -r 1.7 -r 1.8 src/prefs_themes.c; ) > 0.9.13cvs11.patchset

+( cvs diff -u -r 1.127 -r 1.128 src/messageview.c; cvs diff -u -r 1.314 -r 1.315 src/mainwindow.c; ) > 0.9.13cvs12.patchset

diff --git a/configure.ac b/configure.ac
index eb07f30d4035c4d78c18f99a1dddd3a853f22b4e..4fbd4c6d33fa5ce949fd6863068b7a33308c964d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=13
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=13
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=11
+EXTRA_VERSION=12

 EXTRA_RELEASE=
 
 if test \( $EXTRA_VERSION -eq 0 \) -o \( "x$EXTRA_RELEASE" != "x" \); then
 EXTRA_RELEASE=
 
 if test \( $EXTRA_VERSION -eq 0 \) -o \( "x$EXTRA_RELEASE" != "x" \); then

diff --git a/src/mainwindow.c b/src/mainwindow.c
index 12ae4b535d14f843a96a2dfdd1eecb181167da4a..06b187409d657f7efed3dea8f978badecfbddbe0 100644 (file)
--- a/src/mainwindow.c
+++ b/src/mainwindow.c
@@ -1997,6 +1997,9 @@ static void main_window_set_widgets(MainWindow *mainwin, SeparateType type)
                                   mainwin);
                if (messageview_is_visible(mainwin->messageview))
                        gtk_widget_show(messagewin);
                                   mainwin);
                if (messageview_is_visible(mainwin->messageview))
                        gtk_widget_show(messagewin);

+       } else {
+               mainwin->messageview->statusbar = mainwin->statusbar;
+               mainwin->messageview->statusbar_cid = mainwin->messageview_cid;

        }
 
        gtk_widget_set_usize(GTK_WIDGET_PTR(mainwin->folderview),
        }
 
        gtk_widget_set_usize(GTK_WIDGET_PTR(mainwin->folderview),


@@ -2283,6 +2286,9 @@ static gint message_window_close_cb(GtkWidget *widget, GdkEventAny *event,
                (mainwin->menu_factory, "/View/Show or hide/Message view");
        gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem), FALSE);
 
                (mainwin->menu_factory, "/View/Show or hide/Message view");
        gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem), FALSE);
 

+       mainwin->messageview->statusbar = mainwin->statusbar;
+       mainwin->messageview->statusbar_cid = mainwin->messageview_cid;
+

        return TRUE;
 }
 
        return TRUE;
 }
 

diff --git a/src/messageview.c b/src/messageview.c
index d84b1b310f58018c6ce9ba51ea9e06082d284532..2373a58bd377c359f76528591e7cf6b8a7fdb6d8 100644 (file)
--- a/src/messageview.c
+++ b/src/messageview.c
@@ -1536,7 +1536,7 @@ void messageview_set_menu_sensitive(MessageView *messageview)
        GtkItemFactory *ifactory;
        GtkWidget *menuitem;
 
        GtkItemFactory *ifactory;
        GtkWidget *menuitem;
 

-       if (!messageview && !messageview->new_window) 
+       if (!messageview || !messageview->new_window) 

                return;
        /* do some smart things */
        if (!messageview->menubar) return;
                return;
        /* do some smart things */
        if (!messageview->menubar) return;