Merge lp://qastaging/~gandalfn/slingshot/fix-input-event into lp://qastaging/~elementary-pantheon/slingshot/trunk

Are these supposed to be here?

<<<<<<< TREE
=======
>>>>>>> MERGE-SOURCE

Conflicts with trunk.

> Are these supposed to be here?
>
> <<<<<<< TREE
> =======
> >>>>>>> MERGE-SOURCE

After fixing that part of the patch, gandalfn's merge proposal works.

This patch is very similar to the pantheon-debian patch:
https://gitlab.com/pantheon-debian/slingshot-launcher/commit/db8474f079a02ad005d662040ff6452c1e2f0b05

Except for this section:
@@ -402,8 +408,10 @@
                 case "9":
                     int page = int.parse (key);

- if (event.state != Gdk.ModifierType.MOD1_MASK)
- return false;
+ if (event.state != Gdk.ModifierType.MOD1_MASK) {
+ search_entry.key_press_event (event);
+ return true;
+ }

                     if (modality == Modality.NORMAL_VIEW) {
                         if (page < 0 || page == 9)

Is either preferrable for any reason?

This seems to be an inactive branch. Perhaps we should create a new merge request based on this.

>>matzipan
I've updated my branch, rebased upstream, and reimplemented gandalfn's method:
https://code.launchpad.net/~quequotion/slingshot/fix-1635776/+merge/310705

I am rejecting this branch because we are accepting the simpler proposal (https://code.launchpad.net/~santileortiz/slingshot/fix-1635776/+merge/314255), which removes old hacky code that appears to be the source of the problem.

However, we've already reverted 1 commit that intended to fix this problem, so please stick around to make sure the problem is finally solved.