applied patch from Chris Wilson which replaces a useless loop with

2006-05-29  Michael Natterer  <mitch@imendio.com>

	* gtk/gtktextview.c (gtk_text_view_target_list_notify): applied
	patch from Chris Wilson which replaces a useless loop with
	built-in access to free'd memory by a simple integer comparison.
	Fixes bug #342894.

diff --git a/ChangeLog b/ChangeLog
index ec6b6542c5e0bfea28d1980ce0103777910e47e6..99c1ad23f408da95d523039f580bb6f142ff18c0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-05-29  Michael Natterer  <mitch@imendio.com>
+
+       * gtk/gtktextview.c (gtk_text_view_target_list_notify): applied
+       patch from Chris Wilson which replaces a useless loop with
+       built-in access to free'd memory by a simple integer comparison.
+       Fixes bug #342894.
+
 2006-05-29  Kristian Rietveld  <kris@gtk.org>
 
        * gtk/gtktreeview.c (gtk_tree_view_move_cursor_up_down): select

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index ec6b6542c5e0bfea28d1980ce0103777910e47e6..99c1ad23f408da95d523039f580bb6f142ff18c0 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,10 @@
+2006-05-29  Michael Natterer  <mitch@imendio.com>
+
+       * gtk/gtktextview.c (gtk_text_view_target_list_notify): applied
+       patch from Chris Wilson which replaces a useless loop with
+       built-in access to free'd memory by a simple integer comparison.
+       Fixes bug #342894.
+
 2006-05-29  Kristian Rietveld  <kris@gtk.org>
 
        * gtk/gtktreeview.c (gtk_tree_view_move_cursor_up_down): select

diff --git a/gtk/gtktextview.c b/gtk/gtktextview.c
index 0354f14de28884239f2e3ba207d5b9e8ef92d9ff..45c250ccab1d95c4eade386dbf0edc534ec5cdc5 100644 (file)
--- a/gtk/gtktextview.c
+++ b/gtk/gtktextview.c
@@ -6883,16 +6883,13 @@ gtk_text_view_target_list_notify (GtkTextBuffer    *buffer,
   while (list)
     {
       GtkTargetPair *pair = list->data;
-      guint          info;
 
       list = g_list_next (list); /* get next element before removing */
 
-      for (info = GTK_TEXT_BUFFER_TARGET_INFO_BUFFER_CONTENTS;
-           info >= GTK_TEXT_BUFFER_TARGET_INFO_TEXT;
-           info--)
+      if (pair->info >= GTK_TEXT_BUFFER_TARGET_INFO_TEXT &&
+          pair->info <= GTK_TEXT_BUFFER_TARGET_INFO_BUFFER_CONTENTS)
         {
-          if (pair->info == info)
-            gtk_target_list_remove (view_list, pair->target);
+          gtk_target_list_remove (view_list, pair->target);
         }
     }