aboutsummaryrefslogtreecommitdiff
path: root/src/slideshow.c
diff options
context:
space:
mode:
authorThomas White <taw@physics.org>2011-06-01 18:35:40 +0200
committerThomas White <taw@physics.org>2011-06-01 18:35:49 +0200
commitbcc9f89407ed1e632da249623fd63e493439ec39 (patch)
tree1d604ab225156548592165d01ef531c88ab623a9 /src/slideshow.c
parent247a81c6e1b78d91fc6126d03f4018eabba43119 (diff)
Make escape in main window also exit slideshow
Diffstat (limited to 'src/slideshow.c')
-rw-r--r--src/slideshow.c12
1 files changed, 10 insertions, 2 deletions
diff --git a/src/slideshow.c b/src/slideshow.c
index 933a4dd..a7c98b0 100644
--- a/src/slideshow.c
+++ b/src/slideshow.c
@@ -120,6 +120,15 @@ static gint next_slide_sig(GtkWidget *widget, struct presentation *p)
}
+void end_slideshow(struct presentation *p)
+{
+ gtk_widget_destroy(p->ss_drawingarea);
+ gtk_widget_destroy(p->slideshow);
+ p->slideshow = NULL;
+ notify_slide_changed(p);
+}
+
+
static gboolean ss_key_press_sig(GtkWidget *da, GdkEventKey *event,
struct presentation *p)
{
@@ -141,8 +150,7 @@ static gboolean ss_key_press_sig(GtkWidget *da, GdkEventKey *event,
break;
case GDK_KEY_Escape :
- gtk_widget_destroy(p->ss_drawingarea);
- gtk_widget_destroy(p->slideshow);
+ end_slideshow(p);
break;
}