[gnome-initial-setup/shell/4765: 8/362] Revert "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/shell/4765: 8/362] Revert "Don't show yelp when the user hits escape"
- Date: Thu, 19 Mar 2015 01:21:44 +0000 (UTC)
commit 708ad561f6ce2ca6860f62c38c06a78bcab96c9c
Author: Cosimo Cecchi <cosimo endlessm com>
Date: Thu Apr 17 16:10:07 2014 -0700
Revert "Don't show yelp when the user hits escape"
This reverts commit f2e34e8bfc82d14eeff6dc94e11239b21a6da83d.
data/gnome-welcome-tour | 3 ++-
player/player.c | 5 +----
2 files changed, 3 insertions(+), 5 deletions(-)
---
diff --git a/data/gnome-welcome-tour b/data/gnome-welcome-tour
index a93066e..0d90576 100755
--- a/data/gnome-welcome-tour
+++ b/data/gnome-welcome-tour
@@ -30,4 +30,5 @@ 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 c7714a9..57a1ed1 100644
--- a/player/player.c
+++ b/player/player.c
@@ -31,8 +31,6 @@
#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 "#fcfcfc"
static ClutterColor bg_color;
@@ -69,7 +67,6 @@ key_press_cb (ClutterActor *stage,
switch (clutter_event_get_key_symbol ( (event)))
{
case CLUTTER_Escape:
- ret = EXIT_FAILURE;
clutter_actor_destroy (stage);
break;
}
@@ -186,5 +183,5 @@ main (int argc, char *argv[])
clutter_actor_show (stage);
clutter_main ();
- return ret;
+ return EXIT_SUCCESS;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]