From 320b8fa61ffe9ae0c5ceca1f05ee0de31f25d588 Mon Sep 17 00:00:00 2001
From: Pavel Machek <pavel@ucw.cz>
Date: Thu, 14 Sep 2017 20:42:39 +0200
Subject: [PATCH] Reorder entries in the menu, so that shutdown is always
 available, (#569)

* Reorder entries in the menu, so that shutdown is always available,
even on N900.
* increase `pkgrel`
---
 main/postmarketos-demos/APKBUILD |  6 +++---
 main/postmarketos-demos/main.c   | 14 +++++++-------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/main/postmarketos-demos/APKBUILD b/main/postmarketos-demos/APKBUILD
index 54cb7259d..beb1efb85 100644
--- a/main/postmarketos-demos/APKBUILD
+++ b/main/postmarketos-demos/APKBUILD
@@ -1,6 +1,6 @@
 pkgname=postmarketos-demos
-pkgver=4
-pkgrel=5
+pkgver=5
+pkgrel=0
 pkgdesc="Simple touch menu for a few demo programs"
 url="https://github.com/postmarketOS"
 arch="all"
@@ -20,5 +20,5 @@ package() {
 	install -D -m755 "$srcdir"/postmarketos-demos \
 		"$pkgdir"/usr/bin/postmarketos-demos || return 1
 }
-sha512sums="ae51469e6105dfd07e1ffb2ab3b6e2261239ca80b6e897951e7223cc8dd8fcb7c98f06f2e3870203a2f840ce4b5d425b4943ae0091631bbf48ae283d3cf1f86a  main.c
+sha512sums="f9093f79a1ae189637269318d7001b619d35ad68b291b7979de2f619f74bdb4cc6779dd2f98962fa1ba17b65c0d5b84dac5cd99c35b9b24fae00e65ab68d664d  main.c
 83d8a95e9e1e95dffa8661e547444e83e72e572dcd0c637376f678bbd20a351c4b971a315311edefeb58a4cca14fd3e586fb581a262b2d217e25092459539b98  Makefile"
diff --git a/main/postmarketos-demos/main.c b/main/postmarketos-demos/main.c
index 0bcd941f3..ef3c94c69 100644
--- a/main/postmarketos-demos/main.c
+++ b/main/postmarketos-demos/main.c
@@ -16,6 +16,12 @@ static void activate(GtkApplication *app, gpointer user_data)
 	gtk_container_add(GTK_CONTAINER (window), button_box);
 
 	const char *programs[] = {
+		"Shutdown",
+			"poweroff &",
+		"GTK3 Demo",
+			"gtk3-demo &",
+		"Firefox (XWayland)",
+			"firefox &",
 		"weston-presentation-shm (Animation)",
 			"weston-presentation-shm &",
 		"weston-simple-damage (Animation)",
@@ -25,15 +31,9 @@ static void activate(GtkApplication *app, gpointer user_data)
 		"weston-editor (Touch)",
 			"weston-editor &",
 		"htop (Terminal)",
-			"weston-terminal --shell=/usr/bin/htop &",
-		"Firefox (XWayland)",
-			"firefox &",
-		"GTK3 Demo",
-			"gtk3-demo &",
+			"weston-terminal -f --shell=/usr/bin/htop &",
 		"Restart Weston",
 			"killall weston &",
-		"Shutdown",
-			"poweroff &"
 	};
 
 	for(int i=0;i<(sizeof(programs) / sizeof(const char*));i+=2)