From 104671cac3692b816ee3636b778d37d0f4dee485 Mon Sep 17 00:00:00 2001
From: hiro <hiro@ee746299-78ed-0310-b773-934348b2243d>
Date: Fri, 25 Nov 2005 09:00:45 +0000
Subject: fixed warning of imageview.

git-svn-id: svn://sylpheed.sraoss.jp/sylpheed/trunk@778 ee746299-78ed-0310-b773-934348b2243d
---
 ChangeLog       |  6 ++++++
 ChangeLog.ja    |  7 +++++++
 src/imageview.c |  2 ++
 src/mimeview.c  | 11 +++++++++++
 4 files changed, 26 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 8e82d06e..75ea2189 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-11-25
+
+	* src/imageview.c: size_allocate_cb(): don't update image view if
+	  image_data doesn't exist.
+	* src/mimeview.c: mimeview_change_view_type(): clear hidden view.
+
 2005-11-25
 
 	* libsylph/session.[ch]: session_read_data_as_file_cb(): don't write
diff --git a/ChangeLog.ja b/ChangeLog.ja
index d4dccf5e..37b9e29b 100644
--- a/ChangeLog.ja
+++ b/ChangeLog.ja
@@ -1,3 +1,10 @@
+2005-11-25
+
+	* src/imageview.c: size_allocate_cb(): image_data が存在しなければ
+	  イメージビューを更新しないようにした。
+	* src/mimeview.c: mimeview_change_view_type(): 隠したビューをクリア
+	  するようにした。
+
 2005-11-25
 
 	* libsylph/session.[ch]: session_read_data_as_file_cb(): バッファが
diff --git a/src/imageview.c b/src/imageview.c
index 312794f7..77f33006 100644
--- a/src/imageview.c
+++ b/src/imageview.c
@@ -246,6 +246,8 @@ static void size_allocate_cb(GtkWidget *widget,GtkAllocation *allocation,
 		}
 		if (!imageview->scrolledwin->parent)
 			return;
+		if (!imageview->image_data)
+			return;
 		imageview_show_image(imageview, NULL, NULL, TRUE);
 		imageview->resizing = TRUE;
 	}
diff --git a/src/mimeview.c b/src/mimeview.c
index a23c058b..86b9134d 100644
--- a/src/mimeview.c
+++ b/src/mimeview.c
@@ -729,6 +729,17 @@ static void mimeview_change_view_type(MimeView *mimeview, MimeViewType type)
 		g_list_free(children);
 	}
 
+	switch (mimeview->type) {
+	case MIMEVIEW_IMAGE:
+		imageview_clear(mimeview->imageview);
+		break;
+	case MIMEVIEW_TEXT:
+		textview_clear(mimeview->textview);
+		break;
+	default:
+		break;
+	}
+
 	switch (type) {
 	case MIMEVIEW_IMAGE:
 		gtk_container_add(GTK_CONTAINER(mimeview->mime_vbox),
-- 
cgit v1.2.3