[nautilus/gnome-3-8] query-editor: Don't grab focus if we already have it

[Rui Matos <rtcm src gnome org>]

commit c291a2648f81352691c530a2ebe12000fe739581
Author: Rui Matos <tiagomatos gmail com>
Date:   Wed Apr 17 16:32:30 2013 +0200

    query-editor: Don't grab focus if we already have it
    
    Grabbing the focus to a GtkEntry causes its selection to be set which
    in turn causes it to reset the IM context. Avoid doing that when we
    already have the search entry focused to not mess the IM context.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=698205

 src/nautilus-query-editor.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/src/nautilus-query-editor.c b/src/nautilus-query-editor.c
index 7c75f4b..219fb93 100644
--- a/src/nautilus-query-editor.c
+++ b/src/nautilus-query-editor.c
@@ -197,7 +197,7 @@ nautilus_query_editor_grab_focus (GtkWidget *widget)
 {
        NautilusQueryEditor *editor = NAUTILUS_QUERY_EDITOR (widget);
 
-       if (gtk_widget_get_visible (widget)) {
+       if (gtk_widget_get_visible (widget) && !gtk_widget_is_focus (editor->details->entry)) {
                /* avoid selecting the entry text */
                gtk_widget_grab_focus (editor->details->entry);
                gtk_editable_set_position (GTK_EDITABLE (editor->details->entry), -1);