aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomasz Sterna <tomek@xiaoka.com>2011-11-14 22:47:41 +0100
committerTomasz Sterna <tomek@xiaoka.com>2011-11-14 22:47:41 +0100
commitbdb31d01651aeae6fb3d3a46a8ed091b0b774206 (patch)
tree64db07b5012a505d8973663b999dfc44fb4fd8c7
parentaf70bedd19d18a65d526fac9d14554d715177573 (diff)
Merged imcontext.patch
-rw-r--r--hildon/hildon-text-view.c16
1 files changed, 12 insertions, 4 deletions
diff --git a/hildon/hildon-text-view.c b/hildon/hildon-text-view.c
index 8bb94ab..1e3b23f 100644
--- a/hildon/hildon-text-view.c
+++ b/hildon/hildon-text-view.c
@@ -164,8 +164,12 @@ hildon_text_view_button_press_event (GtkWidget *widget,
gtk_widget_grab_focus (widget);
- if (GTK_TEXT_VIEW (widget)->editable &&
- hildon_gtk_im_context_filter_event (GTK_TEXT_VIEW (widget)->im_context, (GdkEvent*)event)) {
+ if (GTK_TEXT_VIEW (widget)->editable
+#ifdef MAEMO_GTK
+ && hildon_gtk_im_context_filter_event (GTK_TEXT_VIEW (widget)->im_context, (GdkEvent*)event)
+#endif
+ )
+ {
GTK_TEXT_VIEW (widget)->need_im_reset = TRUE;
return TRUE;
}
@@ -214,8 +218,12 @@ hildon_text_view_button_release_event (GtkWidget *widget,
GtkTextIter iter;
gint x, y;
- if (text_view->editable &&
- hildon_gtk_im_context_filter_event (text_view->im_context, (GdkEvent*)event)) {
+ if (text_view->editable
+#ifdef MAEMO_GTK
+ && hildon_gtk_im_context_filter_event (text_view->im_context, (GdkEvent*)event)
+#endif
+ )
+ {
text_view->need_im_reset = TRUE;
return TRUE;
}