Shift the array correctly. Fixes #134055, patch by Tosten Schoenfeld

2004-02-11  Federico Mena Quintero  <federico@ximian.com>

	* gtk/gtkicontheme.c (gtk_icon_theme_prepend_search_path): Shift
	the array correctly.  Fixes #134055, patch by Tosten Schoenfeld
	<kaffeetisch@gmx.de>.

diff --git a/ChangeLog b/ChangeLog
index 1399a74996e359fd13156b224858c52b3727a63b..3a010a10c2469a044282bd5b7feaf78cb3f82563 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-02-11  Federico Mena Quintero  <federico@ximian.com>
+
+       * gtk/gtkicontheme.c (gtk_icon_theme_prepend_search_path): Shift
+       the array correctly.  Fixes #134055, patch by Tosten Schoenfeld
+       <kaffeetisch@gmx.de>.
+
 Wed Feb 11 02:23:39 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkcontainer.c (gtk_container_real_set_focus_child): Handle

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 1399a74996e359fd13156b224858c52b3727a63b..3a010a10c2469a044282bd5b7feaf78cb3f82563 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+2004-02-11  Federico Mena Quintero  <federico@ximian.com>
+
+       * gtk/gtkicontheme.c (gtk_icon_theme_prepend_search_path): Shift
+       the array correctly.  Fixes #134055, patch by Tosten Schoenfeld
+       <kaffeetisch@gmx.de>.
+
 Wed Feb 11 02:23:39 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkcontainer.c (gtk_container_real_set_focus_child): Handle

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 1399a74996e359fd13156b224858c52b3727a63b..3a010a10c2469a044282bd5b7feaf78cb3f82563 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+2004-02-11  Federico Mena Quintero  <federico@ximian.com>
+
+       * gtk/gtkicontheme.c (gtk_icon_theme_prepend_search_path): Shift
+       the array correctly.  Fixes #134055, patch by Tosten Schoenfeld
+       <kaffeetisch@gmx.de>.
+
 Wed Feb 11 02:23:39 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkcontainer.c (gtk_container_real_set_focus_child): Handle

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 1399a74996e359fd13156b224858c52b3727a63b..3a010a10c2469a044282bd5b7feaf78cb3f82563 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+2004-02-11  Federico Mena Quintero  <federico@ximian.com>
+
+       * gtk/gtkicontheme.c (gtk_icon_theme_prepend_search_path): Shift
+       the array correctly.  Fixes #134055, patch by Tosten Schoenfeld
+       <kaffeetisch@gmx.de>.
+
 Wed Feb 11 02:23:39 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkcontainer.c (gtk_container_real_set_focus_child): Handle

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 1399a74996e359fd13156b224858c52b3727a63b..3a010a10c2469a044282bd5b7feaf78cb3f82563 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+2004-02-11  Federico Mena Quintero  <federico@ximian.com>
+
+       * gtk/gtkicontheme.c (gtk_icon_theme_prepend_search_path): Shift
+       the array correctly.  Fixes #134055, patch by Tosten Schoenfeld
+       <kaffeetisch@gmx.de>.
+
 Wed Feb 11 02:23:39 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkcontainer.c (gtk_container_real_set_focus_child): Handle

diff --git a/gtk/gtkicontheme.c b/gtk/gtkicontheme.c
index 93f09c7c589a474f6c91d09267f1d013979666d3..01a91f563527f8062683d889018d071b68ce502c 100644 (file)
--- 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);