Merge branch 'gtk-2-90'

Conflicts:
	gtk/gtkentry.h

diff --cc docs/reference/gtk/gtk-sections.txt
Simple merge

diff --cc gtk/gtk.symbols
Simple merge

diff --cc gtk/gtkentry.c
Simple merge

diff --cc gtk/gtkentry.h
index 9bbba0b2cd0055108d0c45607c31c60816bceeda,f0a3dd74c09bdabe8e093738fc8ab43863ec9416..9bf5f85ff5471641fbf96ee0a68388b35476a362
--- 1/gtk/gtkentry.h
--- 2/gtk/gtkentry.h
+++ b/gtk/gtkentry.h
@@@ -302,33 -302,9 +302,14 @@@ void         gtk_entry_set_icon_drag_so
                                                          GtkTargetList        *target_list,
                                                          GdkDragAction         actions);
  gint         gtk_entry_get_current_icon_drag_source      (GtkEntry             *entry);
- 
- GdkWindow  * gtk_entry_get_icon_window                   (GtkEntry             *entry,
+ GdkWindow*   gtk_entry_get_icon_window                   (GtkEntry             *entry,
                                                            GtkEntryIconPosition  icon_pos);
  
- /* Deprecated compatibility functions
-  */
- 
- #ifndef GTK_DISABLE_DEPRECATED
- GtkWidget* gtk_entry_new_with_max_length      (gint           max);
- void       gtk_entry_append_text              (GtkEntry      *entry,
-                                                const gchar   *text);
- void       gtk_entry_prepend_text             (GtkEntry      *entry,
-                                                const gchar   *text);
- void       gtk_entry_set_position             (GtkEntry      *entry,
-                                                gint           position);
- void       gtk_entry_select_region            (GtkEntry      *entry,
-                                                gint           start,
-                                                gint           end);
- void       gtk_entry_set_editable             (GtkEntry      *entry,
-                                                gboolean       editable);
- #endif /* GTK_DISABLE_DEPRECATED */
- 
 +gboolean    gtk_entry_im_context_filter_keypress         (GtkEntry             *entry,
 +                                                          GdkEventKey          *event);
 +void        gtk_entry_reset_im_context                   (GtkEntry             *entry);
 +
 +
  G_END_DECLS
  
  #endif /* __GTK_ENTRY_H__ */

diff --cc gtk/gtklabel.c
Simple merge

diff --cc gtk/gtktextview.h
Simple merge

diff --cc gtk/gtktreemodel.h
Simple merge

diff --cc gtk/gtktreemodelfilter.h
Simple merge