revert Owen's change (using a strdupped string as object data), so the

Sat Jan 12 16:57:31 2002  Kristian Rietveld  <kris@gtk.org>

        * gtk/gtktreeview.c (gtk_tree_view_real_start_interactive_search):
        revert Owen's change (using a strdupped string as object data), so
        the interactive search works again

diff --git a/ChangeLog b/ChangeLog
index a85eccb1256ae4fdc5a37320a75cb74d34879696..10ca8f3a3d754fb5d23e817cdb3e1c6509cdc278 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sat Jan 12 16:57:31 2002  Kristian Rietveld  <kris@gtk.org>
+
+       * gtk/gtktreeview.c (gtk_tree_view_real_start_interactive_search):
+       revert Owen's change (using a strdupped string as object data), so
+       the interactive search works again
+
 2002-01-11  Havoc Pennington  <hp@pobox.com>
 
        * gtk/gtklabel.c: put in more links to Pango markup format docs
@@ -11,7 +17,7 @@
        * gdk/win32/*.c: Add some more checks for failed GDI calls. If a
        call fails, don't use bogus values.
 
-       * gdk/win32/gdkcursor-win32.c (_gdk_win32_data_to_wcursor): Plug
+        gdk/win32/gdkcursor-win32.c (_gdk_win32_data_to_wcursor): Plug
        memory leak: g_free() the AND and XOR bitmaps after use.
        (_gdk_cursor_destroy): If we are destroying the current Windows
        cursor, set the Windows cursor to none first.

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index a85eccb1256ae4fdc5a37320a75cb74d34879696..10ca8f3a3d754fb5d23e817cdb3e1c6509cdc278 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,9 @@
+Sat Jan 12 16:57:31 2002  Kristian Rietveld  <kris@gtk.org>
+
+       * gtk/gtktreeview.c (gtk_tree_view_real_start_interactive_search):
+       revert Owen's change (using a strdupped string as object data), so
+       the interactive search works again
+
 2002-01-11  Havoc Pennington  <hp@pobox.com>
 
        * gtk/gtklabel.c: put in more links to Pango markup format docs
@@ -11,7 +17,7 @@
        * gdk/win32/*.c: Add some more checks for failed GDI calls. If a
        call fails, don't use bogus values.
 
-       * gdk/win32/gdkcursor-win32.c (_gdk_win32_data_to_wcursor): Plug
+        gdk/win32/gdkcursor-win32.c (_gdk_win32_data_to_wcursor): Plug
        memory leak: g_free() the AND and XOR bitmaps after use.
        (_gdk_cursor_destroy): If we are destroying the current Windows
        cursor, set the Windows cursor to none first.

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index a85eccb1256ae4fdc5a37320a75cb74d34879696..10ca8f3a3d754fb5d23e817cdb3e1c6509cdc278 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+Sat Jan 12 16:57:31 2002  Kristian Rietveld  <kris@gtk.org>
+
+       * gtk/gtktreeview.c (gtk_tree_view_real_start_interactive_search):
+       revert Owen's change (using a strdupped string as object data), so
+       the interactive search works again
+
 2002-01-11  Havoc Pennington  <hp@pobox.com>
 
        * gtk/gtklabel.c: put in more links to Pango markup format docs
@@ -11,7 +17,7 @@
        * gdk/win32/*.c: Add some more checks for failed GDI calls. If a
        call fails, don't use bogus values.
 
-       * gdk/win32/gdkcursor-win32.c (_gdk_win32_data_to_wcursor): Plug
+        gdk/win32/gdkcursor-win32.c (_gdk_win32_data_to_wcursor): Plug
        memory leak: g_free() the AND and XOR bitmaps after use.
        (_gdk_cursor_destroy): If we are destroying the current Windows
        cursor, set the Windows cursor to none first.

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index a85eccb1256ae4fdc5a37320a75cb74d34879696..10ca8f3a3d754fb5d23e817cdb3e1c6509cdc278 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,9 @@
+Sat Jan 12 16:57:31 2002  Kristian Rietveld  <kris@gtk.org>
+
+       * gtk/gtktreeview.c (gtk_tree_view_real_start_interactive_search):
+       revert Owen's change (using a strdupped string as object data), so
+       the interactive search works again
+
 2002-01-11  Havoc Pennington  <hp@pobox.com>
 
        * gtk/gtklabel.c: put in more links to Pango markup format docs
@@ -11,7 +17,7 @@
        * gdk/win32/*.c: Add some more checks for failed GDI calls. If a
        call fails, don't use bogus values.
 
-       * gdk/win32/gdkcursor-win32.c (_gdk_win32_data_to_wcursor): Plug
+        gdk/win32/gdkcursor-win32.c (_gdk_win32_data_to_wcursor): Plug
        memory leak: g_free() the AND and XOR bitmaps after use.
        (_gdk_cursor_destroy): If we are destroying the current Windows
        cursor, set the Windows cursor to none first.

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index a85eccb1256ae4fdc5a37320a75cb74d34879696..10ca8f3a3d754fb5d23e817cdb3e1c6509cdc278 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+Sat Jan 12 16:57:31 2002  Kristian Rietveld  <kris@gtk.org>
+
+       * gtk/gtktreeview.c (gtk_tree_view_real_start_interactive_search):
+       revert Owen's change (using a strdupped string as object data), so
+       the interactive search works again
+
 2002-01-11  Havoc Pennington  <hp@pobox.com>
 
        * gtk/gtklabel.c: put in more links to Pango markup format docs
@@ -11,7 +17,7 @@
        * gdk/win32/*.c: Add some more checks for failed GDI calls. If a
        call fails, don't use bogus values.
 
-       * gdk/win32/gdkcursor-win32.c (_gdk_win32_data_to_wcursor): Plug
+        gdk/win32/gdkcursor-win32.c (_gdk_win32_data_to_wcursor): Plug
        memory leak: g_free() the AND and XOR bitmaps after use.
        (_gdk_cursor_destroy): If we are destroying the current Windows
        cursor, set the Windows cursor to none first.

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index a85eccb1256ae4fdc5a37320a75cb74d34879696..10ca8f3a3d754fb5d23e817cdb3e1c6509cdc278 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+Sat Jan 12 16:57:31 2002  Kristian Rietveld  <kris@gtk.org>
+
+       * gtk/gtktreeview.c (gtk_tree_view_real_start_interactive_search):
+       revert Owen's change (using a strdupped string as object data), so
+       the interactive search works again
+
 2002-01-11  Havoc Pennington  <hp@pobox.com>
 
        * gtk/gtklabel.c: put in more links to Pango markup format docs
@@ -11,7 +17,7 @@
        * gdk/win32/*.c: Add some more checks for failed GDI calls. If a
        call fails, don't use bogus values.
 
-       * gdk/win32/gdkcursor-win32.c (_gdk_win32_data_to_wcursor): Plug
+        gdk/win32/gdkcursor-win32.c (_gdk_win32_data_to_wcursor): Plug
        memory leak: g_free() the AND and XOR bitmaps after use.
        (_gdk_cursor_destroy): If we are destroying the current Windows
        cursor, set the Windows cursor to none first.

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index a85eccb1256ae4fdc5a37320a75cb74d34879696..10ca8f3a3d754fb5d23e817cdb3e1c6509cdc278 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+Sat Jan 12 16:57:31 2002  Kristian Rietveld  <kris@gtk.org>
+
+       * gtk/gtktreeview.c (gtk_tree_view_real_start_interactive_search):
+       revert Owen's change (using a strdupped string as object data), so
+       the interactive search works again
+
 2002-01-11  Havoc Pennington  <hp@pobox.com>
 
        * gtk/gtklabel.c: put in more links to Pango markup format docs
@@ -11,7 +17,7 @@
        * gdk/win32/*.c: Add some more checks for failed GDI calls. If a
        call fails, don't use bogus values.
 
-       * gdk/win32/gdkcursor-win32.c (_gdk_win32_data_to_wcursor): Plug
+        gdk/win32/gdkcursor-win32.c (_gdk_win32_data_to_wcursor): Plug
        memory leak: g_free() the AND and XOR bitmaps after use.
        (_gdk_cursor_destroy): If we are destroying the current Windows
        cursor, set the Windows cursor to none first.

diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index eecd8f1d0a0037e7f3376c4c0ff485be4b693c93..e3b53ddc456a51a1091ee8c8d98a335e27ac344c 100644 (file)
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -6434,9 +6434,9 @@ gtk_tree_view_real_start_interactive_search (GtkTreeView *tree_view)
 
   /* position window */
 
-  gtk_object_set_data_full (GTK_OBJECT (window), "gtk-tree-view-text",
-                           g_strdup (gtk_entry_get_text (GTK_ENTRY (entry))),
-                           (GDestroyNotify) g_free);
+  /* yes, we point to the entry's private text thing here, a bit evil */
+  gtk_object_set_data (GTK_OBJECT (window), "gtk-tree-view-text",
+                      gtk_entry_get_text (GTK_ENTRY (entry)));
   gtk_object_set_data (GTK_OBJECT (tree_view),
                       GTK_TREE_VIEW_SEARCH_DIALOG_KEY, window);