[Xfce4-commits] <parole:master> Unfullscreen on GDK_Escape+clean up the Makefile.

[Ali Abdallah]

Updating branch refs/heads/master
         to b53691c45b654224203346811f01f1b0ba6cf2f8 (commit)
       from 4c15db9f735cd2e2cb98dea40fcf8a95c6eb7927 (commit)

commit b53691c45b654224203346811f01f1b0ba6cf2f8
Author: Ali Abdallah <ali at ali-xfce.org>
Date:   Thu Nov 19 12:50:53 2009 +0100

    Unfullscreen on GDK_Escape+clean up the Makefile.

 parole/Makefile.am     |    2 --
 parole/parole-player.c |    3 +++
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/parole/Makefile.am b/parole/Makefile.am
index dbe78a0..325acfc 100644
--- a/parole/Makefile.am
+++ b/parole/Makefile.am
@@ -164,10 +164,8 @@ stamp-enum-gtypes.h: $(parole_glib_enum_headers) Makefile
 enum-gtypes.c: $(parole_glib_enum_headers) Makefile
 	( cd $(srcdir) && glib-mkenums \
 		--fhead "#include \"enum-gtypes.h\"\n\n" \
-		--fhead "#include \"parole-gst.h\"\n\n" \
 		--fhead "#include \"parole-plugin.h\"\n\n" \
 		--fhead "#include \"parole-pl-parser.h\"\n\n" \
-		--fhead "#include \"parole-stream.h\"\n\n" \
 		--fhead "#include \"parole-conf.h\"\n\n" \
 		--fhead "#include \"parole-button.h\"\n\n" \
 		--fprod "\n/* enumerations from \"@filename@\" */" \
diff --git a/parole/parole-player.c b/parole/parole-player.c
index d1d7c83..9744b1e 100644
--- a/parole/parole-player.c
+++ b/parole/parole-player.c
@@ -1408,6 +1408,9 @@ parole_player_handle_key_press (GdkEventKey *ev, ParolePlayer *player)
 	    parole_player_stop_clicked (NULL, player);
 	    ret_val = TRUE;
 	    break;
+	case GDK_Escape:
+	    parole_player_full_screen (player, FALSE);
+	    break;
 #ifdef HAVE_XF86_KEYSYM
 	case XF86XK_OpenURL:
 	    parole_player_full_screen (player, FALSE);