[gnome-initial-setup] Don't show yelp when the user hits escape
- From: Jasper St. Pierre <jstpierre src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-initial-setup] Don't show yelp when the user hits escape
- Date: Wed, 3 Jul 2013 20:43:25 +0000 (UTC)
commit f2e34e8bfc82d14eeff6dc94e11239b21a6da83d
Author: Jasper St. Pierre <jstpierre mecheye net>
Date: Wed Jul 3 15:19:00 2013 -0400
Don't show yelp when the user hits escape
data/gnome-welcome-tour | 3 +--
player/player.c | 5 ++++-
2 files changed, 5 insertions(+), 3 deletions(-)
---
diff --git a/data/gnome-welcome-tour b/data/gnome-welcome-tour
index 47e50ca..a77e884 100755
--- a/data/gnome-welcome-tour
+++ b/data/gnome-welcome-tour
@@ -30,5 +30,4 @@ for name in $locale $lang 'C'; do
fi
done
-/usr/libexec/gnome-initial-setup-player $intro_path &
-yelp help:gnome-help/getting-started
+/usr/libexec/gnome-initial-setup-player $intro_path && yelp help:gnome-help/getting-started
diff --git a/player/player.c b/player/player.c
index 06c2351..49aa30a 100644
--- a/player/player.c
+++ b/player/player.c
@@ -31,6 +31,8 @@
#include <clutter/x11/clutter-x11.h>
#include <clutter-gst/clutter-gst.h>
+static int ret = EXIT_SUCCESS;
+
#define FADE_OUT_TIME 500
#define BG_COLOR "#d3d8ce"
static ClutterColor bg_color;
@@ -67,6 +69,7 @@ key_press_cb (ClutterActor *stage,
switch (clutter_event_get_key_symbol ( (event)))
{
case CLUTTER_Escape:
+ ret = EXIT_FAILURE;
clutter_actor_destroy (stage);
break;
}
@@ -183,5 +186,5 @@ main (int argc, char *argv[])
clutter_actor_show (stage);
clutter_main ();
- return EXIT_SUCCESS;
+ return ret;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]