talons

commit 6063d3ed858483f96707c6d897e6f4e42bcb7abb
parent 54cffc8b1daa6bed137aac4427d6c5bb76c86345
Author: Colin Leroy <colin@colino.net>
Date:   Tue,  8 Apr 2008 07:08:19 +0000

2008-04-08 [colin]	3.3.1cvs55

	* src/undo.c
		Probably fix corruption, introduced in cvs53

Diffstat:
M
ChangeLog
 | 
5
+++++
M
PATCHSETS
 | 
1
+
M
configure.ac
 | 
2
+-
M
src/undo.c
 | 
4
++--

4 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,8 @@
+2008-04-08 [colin]	3.3.1cvs55
+
+	* src/undo.c
+		Probably fix corruption, introduced in cvs53
+
 2008-04-04 [iwkse]	3.3.1cvs54
 
 	* src/undo.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -3289,3 +3289,4 @@
 ( cvs diff -u -r 1.59.2.66 -r 1.59.2.67 src/prefs_filtering.c;  ) > 3.3.1cvs52.patchset
 ( cvs diff -u -r 1.13.2.14 -r 1.13.2.15 src/undo.c;  ) > 3.3.1cvs53.patchset
 ( cvs diff -u -r 1.13.2.15 -r 1.13.2.16 src/undo.c;  ) > 3.3.1cvs54.patchset
+( cvs diff -u -r 1.13.2.16 -r 1.13.2.17 src/undo.c;  ) > 3.3.1cvs55.patchset
diff --git a/configure.ac b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=3
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=54
+EXTRA_VERSION=55
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/undo.c b/src/undo.c
@@ -386,8 +386,8 @@ void undo_undo(UndoMain *undostruct)
 		/* "pull" another data structure from the list */
 		if (undostruct->undo){
 			undoinfo = (UndoInfo *)undostruct->undo->data;
-			undostruct->undo = g_list_prepend(undostruct->undo, undoinfo);
-			undostruct->redo = g_list_remove(undostruct->redo, undoinfo);
+			undostruct->redo = g_list_prepend(undostruct->redo, undoinfo);
+			undostruct->undo = g_list_remove(undostruct->undo, undoinfo);
 			g_return_if_fail(undoinfo != NULL);
 			g_return_if_fail(undoinfo->action == UNDO_ACTION_REPLACE_DELETE);
 			gtk_text_buffer_insert(buffer, &start_iter, undoinfo->text, -1);