From: Paul Mangan <paul@claws-mail.org>
Date: Thu, 17 Apr 2003 22:36:18 +0000 (+0000)
Subject: remove 'Open next message on deletion' option
X-Git-Tag: rel_0_9_0~106
X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=444b506bf31c4db86f493bc088529ab96308a7b8

remove 'Open next message on deletion' option
---

diff --git a/ChangeLog.claws b/ChangeLog.claws
index a9bcabac0..ef0429337 100644
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,12 @@
+2003-04-17 [paul]	0.8.11claws100
+
+	* src/prefs_common.[ch]
+	  src/summaryview.c
+	  	remove 'Open next message on deletion' option,
+		as the same effect can now be achieved via the
+		'Always open messages in summary when selected'
+		option.
+
 2003-04-17 [paul]	0.8.11claws99
 
 	* sync with 0.8.11cvs28
diff --git a/configure.ac b/configure.ac
index fbfd7a612..71b9967dc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=8
 MICRO_VERSION=11
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws99
+EXTRA_VERSION=claws100
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target
diff --git a/src/prefs_common.c b/src/prefs_common.c
index abc8dc738..3a0ca92e8 100644
--- a/src/prefs_common.c
+++ b/src/prefs_common.c
@@ -211,7 +211,6 @@ static struct Interface {
 	GtkWidget *checkbtn_show_msg_with_cursor;
 	GtkWidget *checkbtn_openunread;
 	GtkWidget *checkbtn_mark_as_read_on_newwin;
-	GtkWidget *checkbtn_open_on_delete;
 	GtkWidget *checkbtn_openinbox;
 	GtkWidget *checkbtn_immedexec;
  	GtkWidget *optmenu_nextunreadmsgdialog;
@@ -757,10 +756,6 @@ static PrefParam param[] = {
 	 &prefs_common.mark_as_read_on_new_window,
 	 P_BOOL, &interface.checkbtn_mark_as_read_on_newwin,
 	 prefs_set_data_from_toggle, prefs_set_toggle},
-	{"open_on_delete", "TRUE",
-	 &prefs_common.open_on_delete,
-	 P_BOOL, &interface.checkbtn_open_on_delete,
-	 prefs_set_data_from_toggle, prefs_set_toggle},
 	{"open_inbox_on_inc", "FALSE", &prefs_common.open_inbox_on_inc,
 	 P_BOOL, &interface.checkbtn_openinbox,
 	 prefs_set_data_from_toggle, prefs_set_toggle},
@@ -2664,7 +2659,6 @@ static void prefs_interface_create(void)
 	GtkWidget *checkbtn_show_msg_with_cursor;
 	GtkWidget *checkbtn_openunread;
 	GtkWidget *checkbtn_mark_as_read_on_newwin;
-	GtkWidget *checkbtn_open_on_delete;
 	GtkWidget *checkbtn_openinbox;
 	GtkWidget *checkbtn_immedexec;
 	GtkWidget *hbox1;
@@ -2710,10 +2704,6 @@ static void prefs_interface_create(void)
 		(vbox2, checkbtn_mark_as_read_on_newwin,
 		 _("Only mark message as read when opened in new window"));
 
-	PACK_CHECK_BUTTON
-		(vbox2, checkbtn_open_on_delete,
-		 _("Open next message on deletion"));
-
 	PACK_CHECK_BUTTON
 		(vbox2, checkbtn_openinbox,
 		 _("Go to inbox after receiving new mail"));
@@ -2792,8 +2782,6 @@ static void prefs_interface_create(void)
 	interface.checkbtn_openunread         = checkbtn_openunread;
 	interface.checkbtn_mark_as_read_on_newwin
 					      = checkbtn_mark_as_read_on_newwin;
-	interface.checkbtn_open_on_delete
-					      = checkbtn_open_on_delete;
 	interface.checkbtn_openinbox          = checkbtn_openinbox;
 	interface.checkbtn_immedexec          = checkbtn_immedexec;
 	interface.optmenu_nextunreadmsgdialog = optmenu_nextunreadmsgdialog;
diff --git a/src/prefs_common.h b/src/prefs_common.h
index 3e495eaf1..0ab15a2a9 100644
--- a/src/prefs_common.h
+++ b/src/prefs_common.h
@@ -245,7 +245,6 @@ struct _PrefsCommon
 	gboolean show_msg_with_cursor_key;
 	gboolean open_unread_on_enter;
 	gboolean mark_as_read_on_new_window;
-	gboolean open_on_delete;
 	gboolean open_inbox_on_inc;
 	gboolean immediate_exec;
 	NextUnreadMsgDialogShow next_unread_msg_dialog;
diff --git a/src/summaryview.c b/src/summaryview.c
index 6e3678c25..2fe10529f 100644
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -3094,20 +3094,7 @@ void summary_delete(SummaryView *summaryview)
 	if (!node)
 		node = summary_find_prev_msg(summaryview, sel_last);
 
-	if (node && prefs_common.open_on_delete) {
-		if (sel_last && node == gtkut_ctree_node_next(ctree, sel_last))
-			summary_step(summaryview, GTK_SCROLL_STEP_FORWARD);
-		else if (sel_last && node == GTK_CTREE_NODE_PREV(sel_last))
-			summary_step(summaryview, GTK_SCROLL_STEP_BACKWARD);
-		else
-			summary_select_node
-				(summaryview, node,
-				 messageview_is_visible(summaryview->messageview),
-				 FALSE);
-	}
-	else {
-		summary_select_node(summaryview, node, FALSE, FALSE);
-	}
+	summary_select_node(summaryview, node, FALSE, FALSE);
 	
 	if (prefs_common.immediate_exec || item->stype == F_TRASH) {
 		summary_execute(summaryview);