aboutsummaryrefslogtreecommitdiff
path: root/src/slideshow.c
diff options
context:
space:
mode:
authorThomas White <taw@bitwiz.org.uk>2014-11-27 22:15:30 +0100
committerThomas White <taw@bitwiz.org.uk>2014-11-27 22:15:30 +0100
commit25fd04356ab94d4f614bce58d1c291e4c4f1f168 (patch)
tree6873e0bfa59a9ccb0929ad380211d0c863021fb5 /src/slideshow.c
parentce4063914caf0d28b807ecefa0a6be137b178d49 (diff)
Restore "b splits"
Diffstat (limited to 'src/slideshow.c')
-rw-r--r--src/slideshow.c19
1 files changed, 5 insertions, 14 deletions
diff --git a/src/slideshow.c b/src/slideshow.c
index 77f23cd..4755ed6 100644
--- a/src/slideshow.c
+++ b/src/slideshow.c
@@ -84,8 +84,10 @@ void slideshow_rerender(SlideShow *ss)
static gint ss_destroy_sig(GtkWidget *widget, SlideShow *ss)
{
- g_object_unref(ss->p->slideshow->blank_cursor);
- ss->p->slideshow = NULL;
+ g_object_unref(ss->blank_cursor);
+ slidewindow_slideshow_ended(ss->slide_window);
+ slidewindow_redraw(ss->slide_window);
+ free(ss);
return FALSE;
}
@@ -156,9 +158,6 @@ void end_slideshow(SlideShow *ss)
if ( ss->inhibit != NULL ) do_inhibit(ss->inhibit, 0);
gtk_widget_destroy(ss->drawingarea);
gtk_widget_destroy(ss->window);
- ss->p->slideshow = NULL;
- slidewindow_redraw(ss->slide_window);
- free(ss);
}
@@ -181,15 +180,7 @@ int slideshow_linked(SlideShow *ss)
void check_toggle_blank(SlideShow *ss)
{
- if ( ss != NULL ) {
- //if ( p->prefs->b_splits ) {
- toggle_slideshow_link(ss);
- //} else {
- // p->ss_blank = 1-p->ss_blank;
- // gdk_window_invalidate_rect(p->ss_drawingarea->window,
- // NULL, FALSE);
- //} FIXME!
- }
+ toggle_slideshow_link(ss);
}