From 8d38057de5faf8ac98329bcdc3992b7ec7fa0dfe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Jard=C3=B3n?= <jjardon@gnome.org>
Date: Thu, 22 Oct 2009 05:59:05 +0200
Subject: [PATCH] Remove deprecated GtkEntry stuff from docs and tutorial.

Also, substitue the deprecated functions with the new ones in
documentation and in tests code
---
 docs/faq/gtk-faq.sgml                 |  8 ++--
 docs/reference/gtk/gtk-sections.txt   |  6 ---
 docs/reference/gtk/tmpl/gtkentry.sgml | 54 ---------------------------
 modules/other/gail/tests/ferret.c     |  2 +-
 4 files changed, 5 insertions(+), 65 deletions(-)

diff --git a/docs/faq/gtk-faq.sgml b/docs/faq/gtk-faq.sgml
index 01c71d3bea..508d2310bb 100644
--- a/docs/faq/gtk-faq.sgml
+++ b/docs/faq/gtk-faq.sgml
@@ -2527,15 +2527,15 @@ using the following expression:</para>
 
 <para>If you don't want the user to be able to modify the
 content of this entry, you can use the
-gtk_entry_set_editable() function:</para>
+gtk_editable_set_editable() function:</para>
 
 
 <programlisting role="C">
-      void gtk_entry_set_editable(GtkEntry *entry, 
-                                  gboolean editable);
+void gtk_editable_set_editable (GtkEditable *editable,
+                                gboolean     is_editable);
 </programlisting>
 
-<para>Set the editable parameter to FALSE to disable typing
+<para>Set the is_editable parameter to FALSE to disable typing
 into the entry.</para>
 </sect1>
 
diff --git a/docs/reference/gtk/gtk-sections.txt b/docs/reference/gtk/gtk-sections.txt
index 73bc325c56..0372338870 100644
--- a/docs/reference/gtk/gtk-sections.txt
+++ b/docs/reference/gtk/gtk-sections.txt
@@ -1257,20 +1257,14 @@ gtk_old_editable_get_type
 GtkEntry
 gtk_entry_new
 gtk_entry_new_with_buffer
-gtk_entry_new_with_max_length
 gtk_entry_get_buffer
 gtk_entry_set_buffer
 gtk_entry_set_text
-gtk_entry_append_text
-gtk_entry_prepend_text
-gtk_entry_set_position
 gtk_entry_get_text
 gtk_entry_get_text_length
-gtk_entry_select_region
 gtk_entry_set_visibility
 gtk_entry_set_invisible_char
 gtk_entry_unset_invisible_char
-gtk_entry_set_editable
 gtk_entry_set_max_length
 gtk_entry_get_activates_default
 gtk_entry_get_has_frame
diff --git a/docs/reference/gtk/tmpl/gtkentry.sgml b/docs/reference/gtk/tmpl/gtkentry.sgml
index be938a1adc..692c1bf7ea 100644
--- a/docs/reference/gtk/tmpl/gtkentry.sgml
+++ b/docs/reference/gtk/tmpl/gtkentry.sgml
@@ -423,14 +423,6 @@ The #GtkEntry-struct struct contains only private data.
 @Returns: 
 
 
-<!-- ##### FUNCTION gtk_entry_new_with_max_length ##### -->
-<para>
-</para>
-
-@max: 
-@Returns: 
-
-
 <!-- ##### FUNCTION gtk_entry_get_buffer ##### -->
 <para>
 
@@ -458,33 +450,6 @@ The #GtkEntry-struct struct contains only private data.
 @text: 
 
 
-<!-- ##### FUNCTION gtk_entry_append_text ##### -->
-<para>
-
-</para>
-
-@entry: 
-@text: 
-
-
-<!-- ##### FUNCTION gtk_entry_prepend_text ##### -->
-<para>
-
-</para>
-
-@entry: 
-@text: 
-
-
-<!-- ##### FUNCTION gtk_entry_set_position ##### -->
-<para>
-
-</para>
-
-@entry: 
-@position: 
-
-
 <!-- ##### FUNCTION gtk_entry_get_text ##### -->
 <para>
 
@@ -503,16 +468,6 @@ The #GtkEntry-struct struct contains only private data.
 @Returns: 
 
 
-<!-- ##### FUNCTION gtk_entry_select_region ##### -->
-<para>
-
-</para>
-
-@entry: 
-@start: 
-@end: 
-
-
 <!-- ##### FUNCTION gtk_entry_set_visibility ##### -->
 <para>
 
@@ -539,15 +494,6 @@ The #GtkEntry-struct struct contains only private data.
 @entry: 
 
 
-<!-- ##### FUNCTION gtk_entry_set_editable ##### -->
-<para>
-
-</para>
-
-@entry: 
-@editable: 
-
-
 <!-- ##### FUNCTION gtk_entry_set_max_length ##### -->
 <para>
 </para>
diff --git a/modules/other/gail/tests/ferret.c b/modules/other/gail/tests/ferret.c
index e6145ae20a..bd2f0b04a1 100644
--- a/modules/other/gail/tests/ferret.c
+++ b/modules/other/gail/tests/ferret.c
@@ -1977,7 +1977,7 @@ _get_name_value(GroupInfo *group, const gchar *label,
         name_value->label = GTK_LABEL(gtk_label_new(label));
         name_value->string = gtk_label_new (NULL);
         name_value->boolean = gtk_check_button_new ();
-        name_value->text = gtk_entry_new_with_max_length (1000);
+        gtk_entry_buffer_set_max_length (gtk_entry_get_buffer (name_value->text), 1000);
         name_value->button = GTK_BUTTON(gtk_button_new ());
 
         gtk_box_pack_end(GTK_BOX(name_value->column1),