From eb1c785d4fbe5022fcfb4d3c5f55aebb5282e283 Mon Sep 17 00:00:00 2001 From: Federico Mena Quintero Date: Wed, 11 Feb 2004 16:28:22 +0000 Subject: [PATCH] Shift the array correctly. Fixes #134055, patch by Tosten Schoenfeld 2004-02-11 Federico Mena Quintero * gtk/gtkicontheme.c (gtk_icon_theme_prepend_search_path): Shift the array correctly. Fixes #134055, patch by Tosten Schoenfeld . --- ChangeLog | 6 ++++++ ChangeLog.pre-2-10 | 6 ++++++ ChangeLog.pre-2-4 | 6 ++++++ ChangeLog.pre-2-6 | 6 ++++++ ChangeLog.pre-2-8 | 6 ++++++ gtk/gtkicontheme.c | 4 ++-- 6 files changed, 32 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1399a74996..3a010a10c2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2004-02-11 Federico Mena Quintero + + * gtk/gtkicontheme.c (gtk_icon_theme_prepend_search_path): Shift + the array correctly. Fixes #134055, patch by Tosten Schoenfeld + . + Wed Feb 11 02:23:39 2004 Matthias Clasen * gtk/gtkcontainer.c (gtk_container_real_set_focus_child): Handle diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 1399a74996..3a010a10c2 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +2004-02-11 Federico Mena Quintero + + * gtk/gtkicontheme.c (gtk_icon_theme_prepend_search_path): Shift + the array correctly. Fixes #134055, patch by Tosten Schoenfeld + . + Wed Feb 11 02:23:39 2004 Matthias Clasen * gtk/gtkcontainer.c (gtk_container_real_set_focus_child): Handle diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 1399a74996..3a010a10c2 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,9 @@ +2004-02-11 Federico Mena Quintero + + * gtk/gtkicontheme.c (gtk_icon_theme_prepend_search_path): Shift + the array correctly. Fixes #134055, patch by Tosten Schoenfeld + . + Wed Feb 11 02:23:39 2004 Matthias Clasen * gtk/gtkcontainer.c (gtk_container_real_set_focus_child): Handle diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 1399a74996..3a010a10c2 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +2004-02-11 Federico Mena Quintero + + * gtk/gtkicontheme.c (gtk_icon_theme_prepend_search_path): Shift + the array correctly. Fixes #134055, patch by Tosten Schoenfeld + . + Wed Feb 11 02:23:39 2004 Matthias Clasen * gtk/gtkcontainer.c (gtk_container_real_set_focus_child): Handle diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 1399a74996..3a010a10c2 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +2004-02-11 Federico Mena Quintero + + * gtk/gtkicontheme.c (gtk_icon_theme_prepend_search_path): Shift + the array correctly. Fixes #134055, patch by Tosten Schoenfeld + . + Wed Feb 11 02:23:39 2004 Matthias Clasen * gtk/gtkcontainer.c (gtk_container_real_set_focus_child): Handle diff --git a/gtk/gtkicontheme.c b/gtk/gtkicontheme.c index 93f09c7c58..01a91f5635 100644 --- a/gtk/gtkicontheme.c +++ b/gtk/gtkicontheme.c @@ -747,8 +747,8 @@ gtk_icon_theme_prepend_search_path (GtkIconTheme *icon_theme, priv->search_path_len++; priv->search_path = g_renew (gchar *, priv->search_path, priv->search_path_len); - for (i = 0; i < priv->search_path_len - 1; i++) - priv->search_path[i+1] = priv->search_path[i]; + for (i = priv->search_path_len - 1; i > 0; i--) + priv->search_path[i] = priv->search_path[i - 1]; priv->search_path[0] = g_strdup (path);