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" :)

diff --git a/ChangeLog b/ChangeLog
index a00f3fbaebca6262458d733e3b8e55f4859639f8..05aa7c99b35827d9b15e51295e56a30d7e902736 100644 (file)
--- 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
index e8445487a4d85721c7389fb5c7eb618f33bc3e7a..b380e39bafc3eed61d4cb847b7f0c566f1c9e74a 100644 (file)
--- 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
index 1ab7ca7bd5247beb4bb85194f2860270003dbcf2..a522900567f294e6427975f052de4724c9f8ffa2 100644 (file)
--- 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
index d56748888bcf95bd146d9b91c93d7dce91837c4b..a2d475211749301e9ede5a7b05d7b96e19d41cc3 100644 (file)
--- 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}
        };