talons

commit 6766d314f81630fc7db919772b83456f8265150d
parent 43fccca05988fffa5a259b9e0847f9fa5d51f890
Author: Colin Leroy <colin@colino.net>
Date:   Wed, 30 Apr 2008 06:46:27 +0000

2008-04-30 [colin]	3.4.0cvs18

	* src/compose.c
		Remove "Delete entire line" which was a noop
		and should be the same as "Delete line" :)

Diffstat:
M
ChangeLog
 | 
6
++++++
M
PATCHSETS
 | 
1
+
M
configure.ac
 | 
2
+-
M
src/compose.c
 | 
7
-------

4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,9 @@
+2008-04-30 [colin]	3.4.0cvs18
+
+	* src/compose.c
+		Remove "Delete entire line" which was a noop
+		and should be the same as "Delete line" :)
+
 2008-04-30 [colin]	3.4.0cvs17
 
 	* src/compose.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -3313,3 +3313,4 @@
 ( cvs diff -u -r 1.9.2.27 -r 1.9.2.28 src/common/ssl.c;  ) > 3.4.0cvs15.patchset
 ( cvs diff -u -r 1.213.2.181 -r 1.213.2.182 src/folder.c;  cvs diff -u -r 1.36.2.137 -r 1.36.2.138 src/common/utils.c;  ) > 3.4.0cvs16.patchset
 ( cvs diff -u -r 1.382.2.444 -r 1.382.2.445 src/compose.c;  ) > 3.4.0cvs17.patchset
+( cvs diff -u -r 1.382.2.445 -r 1.382.2.446 src/compose.c;  ) > 3.4.0cvs18.patchset
diff --git a/configure.ac b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=4
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=17
+EXTRA_VERSION=18
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/compose.c b/src/compose.c
@@ -152,7 +152,6 @@ typedef enum
 	COMPOSE_CALL_ADVANCED_ACTION_DELETE_FORWARD_WORD,
 	COMPOSE_CALL_ADVANCED_ACTION_DELETE_BACKWARD_WORD,
 	COMPOSE_CALL_ADVANCED_ACTION_DELETE_LINE,
-	COMPOSE_CALL_ADVANCED_ACTION_DELETE_LINE_N,
 	COMPOSE_CALL_ADVANCED_ACTION_DELETE_TO_LINE_END
 } ComposeCallAdvancedAction;
 
@@ -657,11 +656,6 @@ static GtkItemFactoryEntry compose_entries[] =
 					compose_advanced_action_cb,
 					COMPOSE_CALL_ADVANCED_ACTION_DELETE_LINE,
 					NULL},
-	{N_("/_Edit/A_dvanced/Delete entire line"),
-					NULL,
-					compose_advanced_action_cb,
-					COMPOSE_CALL_ADVANCED_ACTION_DELETE_LINE_N,
-					NULL},
 	{N_("/_Edit/A_dvanced/Delete to end of line"),
 					"<control>K",
 					compose_advanced_action_cb,
@@ -9649,7 +9643,6 @@ static void compose_advanced_action_cb(Compose *compose,
 		{textview_delete_forward_word},
 		{textview_delete_backward_word},
 		{textview_delete_line},
-		{NULL}, /* gtk_stext_delete_line_n */
 		{textview_delete_to_line_end}
 	};