From 2cd264470b958475c5ffa7153d16f65ee274a826 Mon Sep 17 00:00:00 2001
From: hiro <hiro@ee746299-78ed-0310-b773-934348b2243d>
Date: Tue, 31 Jan 2006 02:13:20 +0000
Subject: added 'Mark thread as read' to the main menu.

git-svn-id: svn://sylpheed.sraoss.jp/sylpheed/trunk@945 ee746299-78ed-0310-b773-934348b2243d
---
 ChangeLog         |  6 ++++++
 ChangeLog.ja      |  6 ++++++
 src/mainwindow.c  | 13 ++++++++++++-
 src/summaryview.c |  2 ++
 4 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 25d488bb..66de7609 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-01-31
+
+	* src/mainwindow.c: added 'Mark thread as read' menu.
+	* src/summaryview.c: summary_mark_thread_as_read(): fixed leaks of
+	  GtkTreePath list.
+
 2006-01-30
 
 	* src/summaryview.[ch]: implemented 'Mark thread as read'.
diff --git a/ChangeLog.ja b/ChangeLog.ja
index 0e24b0e9..5ca08aba 100644
--- a/ChangeLog.ja
+++ b/ChangeLog.ja
@@ -1,3 +1,9 @@
+2006-01-31
+
+	* src/mainwindow.c: 「スレッドを読んだことにする」メニューを追加。
+	* src/summaryview.c: summary_mark_thread_as_read(): GtkTreePath の
+	  リストのリークを修正。
+
 2006-01-30
 
 	* src/summaryview.[ch]: 「スレッドを読んだことにする」を実装。
diff --git a/src/mainwindow.c b/src/mainwindow.c
index 90f9a3b7..5aee0933 100644
--- a/src/mainwindow.c
+++ b/src/mainwindow.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2005 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2006 Hiroyuki Yamamoto
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -327,6 +327,9 @@ static void mark_as_unread_cb		(MainWindow	*mainwin,
 static void mark_as_read_cb		(MainWindow	*mainwin,
 					 guint		 action,
 					 GtkWidget	*widget);
+static void mark_thread_as_read_cb	(MainWindow	*mainwin,
+					 guint		 action,
+					 GtkWidget	*widget);
 static void mark_all_read_cb		(MainWindow	*mainwin,
 					 guint		 action,
 					 GtkWidget	*widget);
@@ -726,6 +729,8 @@ static GtkItemFactoryEntry mainwin_entries[] =
 	{N_("/_Message/_Mark/Mark as unr_ead"),	"<shift>exclam", mark_as_unread_cb, 0, NULL},
 	{N_("/_Message/_Mark/Mark as rea_d"),
 						NULL, mark_as_read_cb, 0, NULL},
+	{N_("/_Message/_Mark/Mark _thread as read"),
+						NULL, mark_thread_as_read_cb, 0, NULL},
 	{N_("/_Message/_Mark/Mark all _read"),	NULL, mark_all_read_cb, 0, NULL},
 	{N_("/_Message/---"),			NULL, NULL, 0, "<Separator>"},
 	{N_("/_Message/_Delete"),		"<control>D", delete_cb, 0, NULL},
@@ -3139,6 +3144,12 @@ static void mark_as_read_cb(MainWindow *mainwin, guint action,
 	summary_mark_as_read(mainwin->summaryview);
 }
 
+static void mark_thread_as_read_cb(MainWindow *mainwin, guint action,
+				   GtkWidget *widget)
+{
+	summary_mark_thread_as_read(mainwin->summaryview);
+}
+
 static void mark_all_read_cb(MainWindow *mainwin, guint action,
 			     GtkWidget *widget)
 {
diff --git a/src/summaryview.c b/src/summaryview.c
index f2d554f2..9dcf2215 100644
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -2831,7 +2831,9 @@ void summary_mark_thread_as_read(SummaryView *summaryview)
 	}
 
 	g_slist_free(msglist);
+	g_slist_foreach(top_rows, (GFunc)gtk_tree_path_free, NULL);
 	g_slist_free(top_rows);
+	g_slist_foreach(thr_rows, (GFunc)gtk_tree_path_free, NULL);
 	g_slist_free(thr_rows);
 
 	SORT_UNBLOCK(SORT_BY_UNREAD);
-- 
cgit v1.2.3