Add _gtk_entry_get_im_context() internal accessor

It's needed by gtktreeview

diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c
index 29281f0348dc489dfe88bcfb5a3eb85046809da1..603e6a922fe5fcf4403b44c535e625797ca61ae4 100644 (file)
--- a/gtk/gtkentry.c
+++ b/gtk/gtkentry.c
@@ -5840,6 +5840,11 @@ gtk_entry_im_context_filter_keypress (GtkEntry    *entry,
   return gtk_im_context_filter_keypress (entry->im_context, event);
 }
 
+GtkIMContext*
+_gtk_entry_get_im_context (GtkEntry *entry)
+{
+  return entry->im_context;
+}
 
 static gint
 gtk_entry_find_position (GtkEntry *entry,

diff --git a/gtk/gtkentryprivate.h b/gtk/gtkentryprivate.h
index baf0b9fe1fc7c0fb76b3cee79968e3b6ee8c9b39..63a5cd02c248c7ce1b7ac6aad4beda3323ac145e 100644 (file)
--- a/gtk/gtkentryprivate.h
+++ b/gtk/gtkentryprivate.h
@@ -84,6 +84,7 @@ void      _gtk_entry_get_borders            (GtkEntry  *entry,
 void     _gtk_entry_effective_inner_border (GtkEntry  *entry,
                                            GtkBorder *border);
 void     _gtk_entry_reset_im_context       (GtkEntry  *entry);
+GtkIMContext* _gtk_entry_get_im_context    (GtkEntry  *entry);
 G_END_DECLS
 
 #endif /* __GTK_ENTRY_PRIVATE_H__ */

diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index f45c0a18d7aaf746303f454013cff6d7c998a853..45d0625a021f6f6a673060bf6aca8bc5dcbc94fd 100644 (file)
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -47,6 +47,7 @@
 #include "gtkscrollable.h"
 #include "gtkprivate.h"
 #include "gtkwidgetprivate.h"
+#include "gtkentryprivate.h"
 
 
 /**
@@ -10467,10 +10468,12 @@ gtk_tree_view_ensure_interactive_directory (GtkTreeView *tree_view)
   g_signal_connect (tree_view->priv->search_entry,
                    "activate", G_CALLBACK (gtk_tree_view_search_activate),
                    tree_view);
-  g_signal_connect (GTK_ENTRY (tree_view->priv->search_entry)->im_context,
+
+  g_signal_connect (_gtk_entry_get_im_context (GTK_ENTRY (tree_view->priv->search_entry)),
                    "preedit-changed",
                    G_CALLBACK (gtk_tree_view_search_preedit_changed),
                    tree_view);
+
   gtk_container_add (GTK_CONTAINER (vbox),
                     tree_view->priv->search_entry);