Merge lp:~julien-spautz/slingshot/insert-text-in-middle into lp:~elementary-pantheon/slingshot/trunk

[Julien Spautz]

Slingshot inserts text at the end of the SearchBar, even if the cursor is in the middle. This fixes it by checking if the SearchBar has focus or not. It also seems to fix bug #1114557 where the bell rings on first keystroke, but I'm not sure why. Maybe because 'searchbar.move_cursor (Gtk.MovementStep.BUFFER_ENDS, 0, false);' fails on an empty Gtk.Entry.

[Andrea Basso (voluntatefaber)]

review: Approve

=== modified file 'src/Backend/DBusService.vala'
--- src/Backend/DBusService.vala	2012-07-18 02:43:57 +0000
+++ src/Backend/DBusService.vala	2013-02-11 23:01:25 +0000
@@ -69,4 +69,4 @@
             service.on_view_visibility_change ();
         }
     }
-}
\ No newline at end of file
+}

=== modified file 'src/SlingshotView.vala'
--- src/SlingshotView.vala	2013-02-06 20:36:45 +0000
+++ src/SlingshotView.vala	2013-02-11 23:01:25 +0000
@@ -452,8 +452,10 @@
                     }
                     break;
                 default:
-                    searchbar.grab_focus ();
-                    searchbar.move_cursor (Gtk.MovementStep.BUFFER_ENDS, 0, false);
+                    if (!searchbar.has_focus) {
+                        searchbar.grab_focus ();
+                        searchbar.move_cursor (Gtk.MovementStep.BUFFER_ENDS, 0, false);
+                    }
                     return base.key_press_event (event);
 
             }