> 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?
« Back to merge proposal
> 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: /gitlab. com/pantheon- debian/ slingshot- launcher/ commit/ db8474f079a02ad 005d662040ff645 2c1e2f0b05
https:/
Except for this section:
case "9":
int page = int.parse (key);
@@ -402,8 +408,10 @@
- if (event.state != Gdk.ModifierTyp e.MOD1_ MASK) e.MOD1_ MASK) { entry.key_ press_event (event);
- return false;
+ if (event.state != Gdk.ModifierTyp
+ search_
+ return true;
+ }
Is either preferrable for any reason?