From e507eb3429817c1cbd5b0bc5abbdbc69c8e5219e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B8ren=20Sandmann?= Date: Tue, 24 Aug 2004 22:37:23 +0000 Subject: [PATCH] Fix logical errors in gtk_list_store_move_before/after(). (#150983, patch MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Wed Aug 25 00:09:07 2004 Søren Sandmann * gtk/gtkliststore.c (gtk_list_store_move_after): Fix logical errors in gtk_list_store_move_before/after(). (#150983, patch by Robert Ögren). --- ChangeLog | 4 ++-- ChangeLog.pre-2-10 | 4 ++-- ChangeLog.pre-2-6 | 4 ++-- ChangeLog.pre-2-8 | 4 ++-- gtk/gtkliststore.c | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index b45fe1e6de..7a07fee53f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,8 +5,8 @@ Wed Aug 25 00:22:48 2004 Søren Sandmann Wed Aug 25 00:09:07 2004 Søren Sandmann * gtk/gtkliststore.c (gtk_list_store_move_after): Fix logical - errors in gtk_list_store_move_before/after(). (#150159, Robert - Ögren). + errors in gtk_list_store_move_before/after(). (#150983, patch by + Robert Ögren). Tue Aug 24 21:46:42 2004 Søren Sandmann diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index b45fe1e6de..7a07fee53f 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -5,8 +5,8 @@ Wed Aug 25 00:22:48 2004 Søren Sandmann Wed Aug 25 00:09:07 2004 Søren Sandmann * gtk/gtkliststore.c (gtk_list_store_move_after): Fix logical - errors in gtk_list_store_move_before/after(). (#150159, Robert - Ögren). + errors in gtk_list_store_move_before/after(). (#150983, patch by + Robert Ögren). Tue Aug 24 21:46:42 2004 Søren Sandmann diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index b45fe1e6de..7a07fee53f 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -5,8 +5,8 @@ Wed Aug 25 00:22:48 2004 Søren Sandmann Wed Aug 25 00:09:07 2004 Søren Sandmann * gtk/gtkliststore.c (gtk_list_store_move_after): Fix logical - errors in gtk_list_store_move_before/after(). (#150159, Robert - Ögren). + errors in gtk_list_store_move_before/after(). (#150983, patch by + Robert Ögren). Tue Aug 24 21:46:42 2004 Søren Sandmann diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index b45fe1e6de..7a07fee53f 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -5,8 +5,8 @@ Wed Aug 25 00:22:48 2004 Søren Sandmann Wed Aug 25 00:09:07 2004 Søren Sandmann * gtk/gtkliststore.c (gtk_list_store_move_after): Fix logical - errors in gtk_list_store_move_before/after(). (#150159, Robert - Ögren). + errors in gtk_list_store_move_before/after(). (#150983, patch by + Robert Ögren). Tue Aug 24 21:46:42 2004 Søren Sandmann diff --git a/gtk/gtkliststore.c b/gtk/gtkliststore.c index df29412c7a..9146168b7c 100644 --- a/gtk/gtkliststore.c +++ b/gtk/gtkliststore.c @@ -1550,7 +1550,7 @@ gtk_list_store_move_before (GtkListStore *store, g_return_if_fail (VALID_ITER (position, store)); if (position) - pos = _gtk_sequence_ptr_get_position (iter->user_data); + pos = _gtk_sequence_ptr_get_position (position->user_data); else pos = -1; @@ -1583,7 +1583,7 @@ gtk_list_store_move_after (GtkListStore *store, g_return_if_fail (VALID_ITER (position, store)); if (position) - pos = _gtk_sequence_ptr_get_position (iter->user_data); + pos = _gtk_sequence_ptr_get_position (position->user_data) + 1; else pos = 0;