From: Colin Leroy <colin@colino.net>
Date: Fri, 10 Dec 2004 11:02:55 +0000 (+0000)
Subject: 2004-12-10 [colin]	0.9.13cvs12.1
X-Git-Tag: gtk2_win32_last_merge~32
X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=a712af12c5b599f4a7f18b8117506bf4af0f4864

2004-12-10 [colin]	0.9.13cvs12.1

	* src/prefs_themes.c
	* src/mainwindow.c
	* src/messageview.c
		Sync with HEAD
---

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index da30fe50d..45c197777 100644
--- a/ChangeLog-gtk2.claws
+++ b/ChangeLog-gtk2.claws
@@ -1,3 +1,10 @@
+2004-12-10 [colin]	0.9.13cvs12.1
+
+	* src/prefs_themes.c
+	* src/mainwindow.c
+	* src/messageview.c
+		Sync with HEAD
+
 2004-12-09 [colin]	0.9.13cvs10.1
 
 	* src/procmime.c
diff --git a/PATCHSETS b/PATCHSETS
index 55a6ec4dd..4ce37bf79 100644
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -285,3 +285,4 @@
 ( cvs diff -u -r 1.5.2.8 -r 1.5.2.9 src/gtk/pluginwindow.c; ) > 0.9.13cvs8.2.patchset
 ( cvs diff -u -r 1.2.2.3 -r 1.2.2.4 src/gtk/colorlabel.c; ) > 0.9.13cvs9.1.patchset
 ( cvs diff -u -r 1.49.2.27 -r 1.49.2.28 src/procmime.c; ) > 0.9.13cvs10.1.patchset
+( cvs diff -u -r 1.3.2.14 -r 1.3.2.15 src/prefs_themes.c; cvs diff -u -r 1.274.2.25 -r 1.274.2.26 src/mainwindow.c; cvs diff -u -r 1.94.2.36 -r 1.94.2.37 src/messageview.c; ) > 0.9.13cvs12.1.patchset
diff --git a/configure.ac b/configure.ac
index 13cea0314..c2281b7c8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=13
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=10
+EXTRA_VERSION=12
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=.1
 
diff --git a/src/mainwindow.c b/src/mainwindow.c
index 7fda8ebc3..c7efcaa3c 100644
--- a/src/mainwindow.c
+++ b/src/mainwindow.c
@@ -2014,6 +2014,9 @@ static void main_window_set_widgets(MainWindow *mainwin, SeparateType type)
 				 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_size_request(GTK_WIDGET_PTR(mainwin->folderview),
@@ -2304,6 +2307,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->messageview->statusbar = mainwin->statusbar;
+	mainwin->messageview->statusbar_cid = mainwin->messageview_cid;
+
 	return TRUE;
 }
 
diff --git a/src/messageview.c b/src/messageview.c
index 05b9fc913..2d7b3c9ea 100644
--- a/src/messageview.c
+++ b/src/messageview.c
@@ -1553,7 +1553,7 @@ void messageview_set_menu_sensitive(MessageView *messageview)
 	GtkItemFactory *ifactory;
 	GtkWidget *menuitem;
 
-	if (!messageview && !messageview->new_window) 
+	if (!messageview || !messageview->new_window) 
 		return;
 	/* do some smart things */
 	if (!messageview->menubar) return;
diff --git a/src/prefs_themes.c b/src/prefs_themes.c
index 904e2bc15..5620e5ee9 100644
--- a/src/prefs_themes.c
+++ b/src/prefs_themes.c
@@ -117,13 +117,13 @@ typedef struct _CopyInfo {
 static ThemesData *prefs_themes_data;
 
 StockPixmap prefs_themes_icons[PREVIEW_ICONS] = { 
-	STOCK_PIXMAP_MAIL,
+	STOCK_PIXMAP_DIR_CLOSE,
+	STOCK_PIXMAP_MAIL_SEND,
 	STOCK_PIXMAP_MAIL_RECEIVE, 
-	STOCK_PIXMAP_DOWN_ARROW, 
-	STOCK_PIXMAP_MAIL_SEND_QUEUE, 
+	STOCK_PIXMAP_MAIL_ATTACH,
 	STOCK_PIXMAP_BOOK, 
-	STOCK_PIXMAP_MIME_TEXT_HTML, 
-	STOCK_PIXMAP_PRIVACY_PASSED
+	STOCK_PIXMAP_MIME_TEXT_PLAIN, 
+	STOCK_PIXMAP_REPLIED
 };