From 9e7cd144725a270e0460b21747619f447ca87684 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Fri, 14 Apr 2017 18:51:46 +0200 Subject: New upstream version 0.26.1 --- src/SlideshowPage.c | 288 ++++++++++++++++++++++++++-------------------------- 1 file changed, 145 insertions(+), 143 deletions(-) (limited to 'src/SlideshowPage.c') diff --git a/src/SlideshowPage.c b/src/SlideshowPage.c index 84f1c80..c188275 100644 --- a/src/SlideshowPage.c +++ b/src/SlideshowPage.c @@ -1,4 +1,4 @@ -/* SlideshowPage.c generated by valac 0.34.4, the Vala compiler +/* SlideshowPage.c generated by valac 0.34.7, the Vala compiler * generated from SlideshowPage.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -776,7 +776,7 @@ SlideshowPage* slideshow_page_construct (GType object_type, SourceCollection* so #line 146 "/home/jens/Source/shotwell/src/SlideshowPage.vala" pluggables = _tmp8_; #line 147 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp9_ = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL, NULL); + _tmp9_ = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL); #line 147 "/home/jens/Source/shotwell/src/SlideshowPage.vala" a = _tmp9_; #line 148 "/home/jens/Source/shotwell/src/SlideshowPage.vala" @@ -1066,24 +1066,24 @@ static gboolean slideshow_page_get_next_photo (SlideshowPage* self, Photo* start #line 1067 "SlideshowPage.c" DataSource* forward = NULL; DataSource* back = NULL; - ViewCollection* _tmp40_ = NULL; - Photo* _tmp41_ = NULL; - DataSource* _tmp42_ = NULL; + ViewCollection* _tmp41_ = NULL; + Photo* _tmp42_ = NULL; DataSource* _tmp43_ = NULL; - PixbufCache* _tmp44_ = NULL; - DataSource* _tmp45_ = NULL; - PixbufCache* _tmp46_ = NULL; - DataSource* _tmp47_ = NULL; + DataSource* _tmp44_ = NULL; + PixbufCache* _tmp45_ = NULL; + DataSource* _tmp46_ = NULL; + PixbufCache* _tmp47_ = NULL; + DataSource* _tmp48_ = NULL; GeeSet* neighbors = NULL; - ViewCollection* _tmp48_ = NULL; - Photo* _tmp49_ = NULL; - GeeSet* _tmp50_ = NULL; + ViewCollection* _tmp49_ = NULL; + Photo* _tmp50_ = NULL; GeeSet* _tmp51_ = NULL; - DataSource* _tmp52_ = NULL; - GeeSet* _tmp53_ = NULL; - DataSource* _tmp54_ = NULL; - PixbufCache* _tmp55_ = NULL; - GeeSet* _tmp56_ = NULL; + GeeSet* _tmp52_ = NULL; + DataSource* _tmp53_ = NULL; + GeeSet* _tmp54_ = NULL; + DataSource* _tmp55_ = NULL; + PixbufCache* _tmp56_ = NULL; + GeeSet* _tmp57_ = NULL; #line 222 "/home/jens/Source/shotwell/src/SlideshowPage.vala" if (!_tmp2_) { #line 1090 "SlideshowPage.c" @@ -1335,66 +1335,68 @@ static gboolean slideshow_page_get_next_photo (SlideshowPage* self, Photo* start __finally461: #line 223 "/home/jens/Source/shotwell/src/SlideshowPage.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { +#line 1339 "SlideshowPage.c" + gboolean _tmp40_ = FALSE; #line 223 "/home/jens/Source/shotwell/src/SlideshowPage.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); #line 223 "/home/jens/Source/shotwell/src/SlideshowPage.vala" g_clear_error (&_inner_error_); #line 223 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - return FALSE; -#line 1345 "SlideshowPage.c" + return _tmp40_; +#line 1347 "SlideshowPage.c" } #line 253 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp40_ = self->priv->controller; + _tmp41_ = self->priv->controller; #line 253 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp41_ = _vala_next; + _tmp42_ = _vala_next; #line 253 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - view_collection_get_immediate_neighbors (_tmp40_, G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, TYPE_DATA_SOURCE, DataSource), &_tmp42_, &_tmp43_, PHOTO_TYPENAME); + view_collection_get_immediate_neighbors (_tmp41_, G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, TYPE_DATA_SOURCE, DataSource), &_tmp43_, &_tmp44_, PHOTO_TYPENAME); #line 253 "/home/jens/Source/shotwell/src/SlideshowPage.vala" _g_object_unref0 (forward); #line 253 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - forward = _tmp42_; + forward = _tmp43_; #line 253 "/home/jens/Source/shotwell/src/SlideshowPage.vala" _g_object_unref0 (back); #line 253 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - back = _tmp43_; + back = _tmp44_; #line 254 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp44_ = self->priv->cache; + _tmp45_ = self->priv->cache; #line 254 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp45_ = forward; + _tmp46_ = forward; #line 254 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - pixbuf_cache_prefetch (_tmp44_, G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, TYPE_PHOTO, Photo), BACKGROUND_JOB_JOB_PRIORITY_HIGHEST, FALSE); + pixbuf_cache_prefetch (_tmp45_, G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, TYPE_PHOTO, Photo), BACKGROUND_JOB_JOB_PRIORITY_HIGHEST, FALSE); #line 255 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp46_ = self->priv->cache; + _tmp47_ = self->priv->cache; #line 255 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp47_ = back; + _tmp48_ = back; #line 255 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - pixbuf_cache_prefetch (_tmp46_, G_TYPE_CHECK_INSTANCE_CAST (_tmp47_, TYPE_PHOTO, Photo), BACKGROUND_JOB_JOB_PRIORITY_NORMAL, FALSE); + pixbuf_cache_prefetch (_tmp47_, G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, TYPE_PHOTO, Photo), BACKGROUND_JOB_JOB_PRIORITY_NORMAL, FALSE); #line 257 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp48_ = self->priv->controller; + _tmp49_ = self->priv->controller; #line 257 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp49_ = _vala_next; + _tmp50_ = _vala_next; #line 257 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp50_ = view_collection_get_extended_neighbors (_tmp48_, G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, TYPE_DATA_SOURCE, DataSource), PHOTO_TYPENAME); + _tmp51_ = view_collection_get_extended_neighbors (_tmp49_, G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, TYPE_DATA_SOURCE, DataSource), PHOTO_TYPENAME); #line 257 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - neighbors = _tmp50_; + neighbors = _tmp51_; #line 258 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp51_ = neighbors; + _tmp52_ = neighbors; #line 258 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp52_ = forward; + _tmp53_ = forward; #line 258 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - gee_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp51_, GEE_TYPE_COLLECTION, GeeCollection), _tmp52_); + gee_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp52_, GEE_TYPE_COLLECTION, GeeCollection), _tmp53_); #line 259 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp53_ = neighbors; + _tmp54_ = neighbors; #line 259 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp54_ = back; + _tmp55_ = back; #line 259 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - gee_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp53_, GEE_TYPE_COLLECTION, GeeCollection), _tmp54_); + gee_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp54_, GEE_TYPE_COLLECTION, GeeCollection), _tmp55_); #line 261 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp55_ = self->priv->cache; + _tmp56_ = self->priv->cache; #line 261 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - _tmp56_ = neighbors; + _tmp57_ = neighbors; #line 261 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - pixbuf_cache_prefetch_many (_tmp55_, G_TYPE_CHECK_INSTANCE_CAST (_tmp56_, GEE_TYPE_COLLECTION, GeeCollection), BACKGROUND_JOB_JOB_PRIORITY_LOWEST, FALSE); + pixbuf_cache_prefetch_many (_tmp56_, G_TYPE_CHECK_INSTANCE_CAST (_tmp57_, GEE_TYPE_COLLECTION, GeeCollection), BACKGROUND_JOB_JOB_PRIORITY_LOWEST, FALSE); #line 263 "/home/jens/Source/shotwell/src/SlideshowPage.vala" result = TRUE; #line 263 "/home/jens/Source/shotwell/src/SlideshowPage.vala" @@ -1407,46 +1409,46 @@ static gboolean slideshow_page_get_next_photo (SlideshowPage* self, Photo* start if (next) { #line 263 "/home/jens/Source/shotwell/src/SlideshowPage.vala" *next = _vala_next; -#line 1411 "SlideshowPage.c" +#line 1413 "SlideshowPage.c" } else { #line 263 "/home/jens/Source/shotwell/src/SlideshowPage.vala" _g_object_unref0 (_vala_next); -#line 1415 "SlideshowPage.c" +#line 1417 "SlideshowPage.c" } #line 263 "/home/jens/Source/shotwell/src/SlideshowPage.vala" if (next_pixbuf) { #line 263 "/home/jens/Source/shotwell/src/SlideshowPage.vala" *next_pixbuf = _vala_next_pixbuf; -#line 1421 "SlideshowPage.c" +#line 1423 "SlideshowPage.c" } else { #line 263 "/home/jens/Source/shotwell/src/SlideshowPage.vala" _g_object_unref0 (_vala_next_pixbuf); -#line 1425 "SlideshowPage.c" +#line 1427 "SlideshowPage.c" } #line 263 "/home/jens/Source/shotwell/src/SlideshowPage.vala" return result; -#line 1429 "SlideshowPage.c" +#line 1431 "SlideshowPage.c" } } #line 218 "/home/jens/Source/shotwell/src/SlideshowPage.vala" if (next) { #line 218 "/home/jens/Source/shotwell/src/SlideshowPage.vala" *next = _vala_next; -#line 1436 "SlideshowPage.c" +#line 1438 "SlideshowPage.c" } else { #line 218 "/home/jens/Source/shotwell/src/SlideshowPage.vala" _g_object_unref0 (_vala_next); -#line 1440 "SlideshowPage.c" +#line 1442 "SlideshowPage.c" } #line 218 "/home/jens/Source/shotwell/src/SlideshowPage.vala" if (next_pixbuf) { #line 218 "/home/jens/Source/shotwell/src/SlideshowPage.vala" *next_pixbuf = _vala_next_pixbuf; -#line 1446 "SlideshowPage.c" +#line 1448 "SlideshowPage.c" } else { #line 218 "/home/jens/Source/shotwell/src/SlideshowPage.vala" _g_object_unref0 (_vala_next_pixbuf); -#line 1450 "SlideshowPage.c" +#line 1452 "SlideshowPage.c" } } @@ -1461,7 +1463,7 @@ static void slideshow_page_on_play_pause (SlideshowPage* self) { _tmp0_ = self->priv->playing; #line 268 "/home/jens/Source/shotwell/src/SlideshowPage.vala" if (_tmp0_) { -#line 1465 "SlideshowPage.c" +#line 1467 "SlideshowPage.c" GtkToolButton* _tmp1_ = NULL; GtkToolButton* _tmp2_ = NULL; const gchar* _tmp3_ = NULL; @@ -1483,7 +1485,7 @@ static void slideshow_page_on_play_pause (SlideshowPage* self) { _tmp5_ = _ ("Continue the slideshow"); #line 271 "/home/jens/Source/shotwell/src/SlideshowPage.vala" gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_tool_item_get_type (), GtkToolItem), _tmp5_); -#line 1487 "SlideshowPage.c" +#line 1489 "SlideshowPage.c" } else { GtkToolButton* _tmp6_ = NULL; GtkToolButton* _tmp7_ = NULL; @@ -1506,7 +1508,7 @@ static void slideshow_page_on_play_pause (SlideshowPage* self) { _tmp10_ = _ ("Pause the slideshow"); #line 275 "/home/jens/Source/shotwell/src/SlideshowPage.vala" gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_tool_item_get_type (), GtkToolItem), _tmp10_); -#line 1510 "SlideshowPage.c" +#line 1512 "SlideshowPage.c" } #line 278 "/home/jens/Source/shotwell/src/SlideshowPage.vala" _tmp11_ = self->priv->playing; @@ -1516,7 +1518,7 @@ static void slideshow_page_on_play_pause (SlideshowPage* self) { _tmp12_ = self->priv->timer; #line 281 "/home/jens/Source/shotwell/src/SlideshowPage.vala" g_timer_start (_tmp12_); -#line 1520 "SlideshowPage.c" +#line 1522 "SlideshowPage.c" } @@ -1563,7 +1565,7 @@ static void slideshow_page_real_on_previous_photo (SinglePhotoPage* base) { prev_view = _tmp7_; #line 291 "/home/jens/Source/shotwell/src/SlideshowPage.vala" while (TRUE) { -#line 1567 "SlideshowPage.c" +#line 1569 "SlideshowPage.c" DataView* _tmp8_ = NULL; DataView* _tmp9_ = NULL; DataSource* _tmp10_ = NULL; @@ -1580,7 +1582,7 @@ static void slideshow_page_real_on_previous_photo (SinglePhotoPage* base) { if (!(_tmp8_ != NULL)) { #line 291 "/home/jens/Source/shotwell/src/SlideshowPage.vala" break; -#line 1584 "SlideshowPage.c" +#line 1586 "SlideshowPage.c" } #line 292 "/home/jens/Source/shotwell/src/SlideshowPage.vala" _tmp9_ = prev_view; @@ -1594,7 +1596,7 @@ static void slideshow_page_real_on_previous_photo (SinglePhotoPage* base) { _g_object_unref0 (_tmp11_); #line 292 "/home/jens/Source/shotwell/src/SlideshowPage.vala" if (_tmp12_) { -#line 1598 "SlideshowPage.c" +#line 1600 "SlideshowPage.c" DataView* _tmp13_ = NULL; DataSource* _tmp14_ = NULL; #line 293 "/home/jens/Source/shotwell/src/SlideshowPage.vala" @@ -1607,7 +1609,7 @@ static void slideshow_page_real_on_previous_photo (SinglePhotoPage* base) { prev_photo = G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_PHOTO, Photo); #line 294 "/home/jens/Source/shotwell/src/SlideshowPage.vala" break; -#line 1611 "SlideshowPage.c" +#line 1613 "SlideshowPage.c" } #line 297 "/home/jens/Source/shotwell/src/SlideshowPage.vala" _tmp15_ = self->priv->controller; @@ -1638,7 +1640,7 @@ static void slideshow_page_real_on_previous_photo (SinglePhotoPage* base) { _g_object_unref0 (view); #line 301 "/home/jens/Source/shotwell/src/SlideshowPage.vala" return; -#line 1641 "SlideshowPage.c" +#line 1643 "SlideshowPage.c" } } #line 305 "/home/jens/Source/shotwell/src/SlideshowPage.vala" @@ -1653,7 +1655,7 @@ static void slideshow_page_real_on_previous_photo (SinglePhotoPage* base) { _g_object_unref0 (prev_photo); #line 284 "/home/jens/Source/shotwell/src/SlideshowPage.vala" _g_object_unref0 (view); -#line 1656 "SlideshowPage.c" +#line 1658 "SlideshowPage.c" } @@ -1705,7 +1707,7 @@ static void slideshow_page_real_on_next_photo (SinglePhotoPage* base) { next_view = _tmp7_; #line 315 "/home/jens/Source/shotwell/src/SlideshowPage.vala" while (TRUE) { -#line 1708 "SlideshowPage.c" +#line 1710 "SlideshowPage.c" DataView* _tmp8_ = NULL; DataView* _tmp9_ = NULL; DataSource* _tmp10_ = NULL; @@ -1722,7 +1724,7 @@ static void slideshow_page_real_on_next_photo (SinglePhotoPage* base) { if (!(_tmp8_ != NULL)) { #line 315 "/home/jens/Source/shotwell/src/SlideshowPage.vala" break; -#line 1725 "SlideshowPage.c" +#line 1727 "SlideshowPage.c" } #line 316 "/home/jens/Source/shotwell/src/SlideshowPage.vala" _tmp9_ = next_view; @@ -1736,7 +1738,7 @@ static void slideshow_page_real_on_next_photo (SinglePhotoPage* base) { _g_object_unref0 (_tmp11_); #line 316 "/home/jens/Source/shotwell/src/SlideshowPage.vala" if (_tmp12_) { -#line 1739 "SlideshowPage.c" +#line 1741 "SlideshowPage.c" DataView* _tmp13_ = NULL; DataSource* _tmp14_ = NULL; #line 317 "/home/jens/Source/shotwell/src/SlideshowPage.vala" @@ -1749,7 +1751,7 @@ static void slideshow_page_real_on_next_photo (SinglePhotoPage* base) { next_photo = G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_PHOTO, Photo); #line 318 "/home/jens/Source/shotwell/src/SlideshowPage.vala" break; -#line 1752 "SlideshowPage.c" +#line 1754 "SlideshowPage.c" } #line 321 "/home/jens/Source/shotwell/src/SlideshowPage.vala" _tmp15_ = self->priv->controller; @@ -1780,7 +1782,7 @@ static void slideshow_page_real_on_next_photo (SinglePhotoPage* base) { _g_object_unref0 (view); #line 325 "/home/jens/Source/shotwell/src/SlideshowPage.vala" return; -#line 1782 "SlideshowPage.c" +#line 1784 "SlideshowPage.c" } } #line 329 "/home/jens/Source/shotwell/src/SlideshowPage.vala" @@ -1801,7 +1803,7 @@ static void slideshow_page_real_on_next_photo (SinglePhotoPage* base) { if (_tmp24_) { #line 331 "/home/jens/Source/shotwell/src/SlideshowPage.vala" slideshow_page_random_transition_effect (self); -#line 1803 "SlideshowPage.c" +#line 1805 "SlideshowPage.c" } #line 334 "/home/jens/Source/shotwell/src/SlideshowPage.vala" _tmp25_ = next_photo; @@ -1815,7 +1817,7 @@ static void slideshow_page_real_on_next_photo (SinglePhotoPage* base) { _g_object_unref0 (next_photo); #line 308 "/home/jens/Source/shotwell/src/SlideshowPage.vala" _g_object_unref0 (view); -#line 1817 "SlideshowPage.c" +#line 1819 "SlideshowPage.c" } @@ -1857,7 +1859,7 @@ static void slideshow_page_advance (SlideshowPage* self, Photo* photo, Direction next_pixbuf = _tmp5_; #line 342 "/home/jens/Source/shotwell/src/SlideshowPage.vala" if (_tmp6_) { -#line 1859 "SlideshowPage.c" +#line 1861 "SlideshowPage.c" GdkPixbuf* _tmp7_ = NULL; Photo* _tmp8_ = NULL; Dimensions _tmp9_ = {0}; @@ -1872,7 +1874,7 @@ static void slideshow_page_advance (SlideshowPage* self, Photo* photo, Direction _tmp10_ = direction; #line 343 "/home/jens/Source/shotwell/src/SlideshowPage.vala" single_photo_page_set_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), _tmp7_, &_tmp9_, &_tmp10_); -#line 1874 "SlideshowPage.c" +#line 1876 "SlideshowPage.c" } #line 346 "/home/jens/Source/shotwell/src/SlideshowPage.vala" _tmp11_ = self->priv->timer; @@ -1880,7 +1882,7 @@ static void slideshow_page_advance (SlideshowPage* self, Photo* photo, Direction g_timer_start (_tmp11_); #line 337 "/home/jens/Source/shotwell/src/SlideshowPage.vala" _g_object_unref0 (next_pixbuf); -#line 1882 "SlideshowPage.c" +#line 1884 "SlideshowPage.c" } @@ -1904,7 +1906,7 @@ static gboolean slideshow_page_auto_advance (SlideshowPage* self) { result = FALSE; #line 351 "/home/jens/Source/shotwell/src/SlideshowPage.vala" return result; -#line 1906 "SlideshowPage.c" +#line 1908 "SlideshowPage.c" } #line 353 "/home/jens/Source/shotwell/src/SlideshowPage.vala" _tmp1_ = self->priv->playing; @@ -1914,7 +1916,7 @@ static gboolean slideshow_page_auto_advance (SlideshowPage* self) { result = TRUE; #line 354 "/home/jens/Source/shotwell/src/SlideshowPage.vala" return result; -#line 1916 "SlideshowPage.c" +#line 1918 "SlideshowPage.c" } #line 356 "/home/jens/Source/shotwell/src/SlideshowPage.vala" _tmp2_ = self->priv->timer; @@ -1936,7 +1938,7 @@ static gboolean slideshow_page_auto_advance (SlideshowPage* self) { result = TRUE; #line 357 "/home/jens/Source/shotwell/src/SlideshowPage.vala" return result; -#line 1938 "SlideshowPage.c" +#line 1940 "SlideshowPage.c" } #line 359 "/home/jens/Source/shotwell/src/SlideshowPage.vala" single_photo_page_on_next_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage)); @@ -1944,7 +1946,7 @@ static gboolean slideshow_page_auto_advance (SlideshowPage* self) { result = TRUE; #line 361 "/home/jens/Source/shotwell/src/SlideshowPage.vala" return result; -#line 1946 "SlideshowPage.c" +#line 1948 "SlideshowPage.c" } @@ -1959,7 +1961,7 @@ static gboolean slideshow_page_real_key_press_event (GtkWidget* base, GdkEventKe GQuark _tmp5_ = 0U; #line 366 "/home/jens/Source/shotwell/src/SlideshowPage.vala" static GQuark _tmp4_label0 = 0; -#line 1961 "SlideshowPage.c" +#line 1963 "SlideshowPage.c" gboolean _tmp6_ = FALSE; gboolean _tmp7_ = FALSE; #line 364 "/home/jens/Source/shotwell/src/SlideshowPage.vala" @@ -1982,27 +1984,27 @@ static gboolean slideshow_page_real_key_press_event (GtkWidget* base, GdkEventKe if (_tmp5_ == ((0 != _tmp4_label0) ? _tmp4_label0 : (_tmp4_label0 = g_quark_from_static_string ("space")))) { #line 366 "/home/jens/Source/shotwell/src/SlideshowPage.vala" switch (0) { -#line 1984 "SlideshowPage.c" +#line 1986 "SlideshowPage.c" default: { #line 368 "/home/jens/Source/shotwell/src/SlideshowPage.vala" slideshow_page_on_play_pause (self); #line 369 "/home/jens/Source/shotwell/src/SlideshowPage.vala" break; -#line 1991 "SlideshowPage.c" +#line 1993 "SlideshowPage.c" } } } else { #line 366 "/home/jens/Source/shotwell/src/SlideshowPage.vala" switch (0) { -#line 1997 "SlideshowPage.c" +#line 1999 "SlideshowPage.c" default: { #line 372 "/home/jens/Source/shotwell/src/SlideshowPage.vala" handled = FALSE; #line 373 "/home/jens/Source/shotwell/src/SlideshowPage.vala" break; -#line 2004 "SlideshowPage.c" +#line 2006 "SlideshowPage.c" } } } @@ -2014,11 +2016,11 @@ static gboolean slideshow_page_real_key_press_event (GtkWidget* base, GdkEventKe result = TRUE; #line 377 "/home/jens/Source/shotwell/src/SlideshowPage.vala" return result; -#line 2016 "SlideshowPage.c" +#line 2018 "SlideshowPage.c" } #line 379 "/home/jens/Source/shotwell/src/SlideshowPage.vala" if (GTK_WIDGET_CLASS (slideshow_page_parent_class)->key_press_event != NULL) { -#line 2020 "SlideshowPage.c" +#line 2022 "SlideshowPage.c" GdkEventKey* _tmp8_ = NULL; gboolean _tmp9_ = FALSE; #line 379 "/home/jens/Source/shotwell/src/SlideshowPage.vala" @@ -2027,17 +2029,17 @@ static gboolean slideshow_page_real_key_press_event (GtkWidget* base, GdkEventKe _tmp9_ = GTK_WIDGET_CLASS (slideshow_page_parent_class)->key_press_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), gtk_widget_get_type (), GtkWidget), _tmp8_); #line 379 "/home/jens/Source/shotwell/src/SlideshowPage.vala" _tmp7_ = _tmp9_; -#line 2029 "SlideshowPage.c" +#line 2031 "SlideshowPage.c" } else { #line 379 "/home/jens/Source/shotwell/src/SlideshowPage.vala" _tmp7_ = TRUE; -#line 2033 "SlideshowPage.c" +#line 2035 "SlideshowPage.c" } #line 379 "/home/jens/Source/shotwell/src/SlideshowPage.vala" result = _tmp7_; #line 379 "/home/jens/Source/shotwell/src/SlideshowPage.vala" return result; -#line 2039 "SlideshowPage.c" +#line 2041 "SlideshowPage.c" } @@ -2078,7 +2080,7 @@ static void slideshow_page_on_change_settings (SlideshowPage* self) { _tmp4_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_dialog_get_type (), GtkDialog)); #line 390 "/home/jens/Source/shotwell/src/SlideshowPage.vala" if (_tmp4_ == ((gint) GTK_RESPONSE_OK)) { -#line 2080 "SlideshowPage.c" +#line 2082 "SlideshowPage.c" ConfigFacade* _tmp5_ = NULL; ConfigFacade* _tmp6_ = NULL; SlideshowPageSettingsDialog* _tmp7_ = NULL; @@ -2150,7 +2152,7 @@ static void slideshow_page_on_change_settings (SlideshowPage* self) { _g_object_unref0 (_tmp19_); #line 398 "/home/jens/Source/shotwell/src/SlideshowPage.vala" slideshow_page_update_transition_effect (self); -#line 2152 "SlideshowPage.c" +#line 2154 "SlideshowPage.c" } #line 401 "/home/jens/Source/shotwell/src/SlideshowPage.vala" _tmp22_ = settings_dialog; @@ -2166,7 +2168,7 @@ static void slideshow_page_on_change_settings (SlideshowPage* self) { g_timer_start (_tmp24_); #line 382 "/home/jens/Source/shotwell/src/SlideshowPage.vala" _g_object_unref0 (settings_dialog); -#line 2168 "SlideshowPage.c" +#line 2170 "SlideshowPage.c" } @@ -2211,7 +2213,7 @@ static void slideshow_page_update_transition_effect (SlideshowPage* self) { single_photo_page_set_transition (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), effect_id, (gint) (effect_delay * 1000.0)); #line 406 "/home/jens/Source/shotwell/src/SlideshowPage.vala" _g_free0 (effect_id); -#line 2213 "SlideshowPage.c" +#line 2215 "SlideshowPage.c" } @@ -2251,7 +2253,7 @@ static void slideshow_page_random_transition_effect (SlideshowPage* self) { _tmp5__length1 = self->priv->transitions_length1; #line 416 "/home/jens/Source/shotwell/src/SlideshowPage.vala" if (0 < _tmp5__length1) { -#line 2253 "SlideshowPage.c" +#line 2255 "SlideshowPage.c" gint random = 0; gchar** _tmp6_ = NULL; gint _tmp6__length1 = 0; @@ -2283,7 +2285,7 @@ static void slideshow_page_random_transition_effect (SlideshowPage* self) { _g_free0 (effect_id); #line 418 "/home/jens/Source/shotwell/src/SlideshowPage.vala" effect_id = _tmp11_; -#line 2285 "SlideshowPage.c" +#line 2287 "SlideshowPage.c" } #line 420 "/home/jens/Source/shotwell/src/SlideshowPage.vala" _tmp12_ = effect_id; @@ -2293,7 +2295,7 @@ static void slideshow_page_random_transition_effect (SlideshowPage* self) { single_photo_page_set_transition (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), _tmp12_, (gint) (_tmp13_ * 1000.0)); #line 413 "/home/jens/Source/shotwell/src/SlideshowPage.vala" _g_free0 (effect_id); -#line 2295 "SlideshowPage.c" +#line 2297 "SlideshowPage.c" } @@ -2366,14 +2368,14 @@ static void slideshow_page_paint_title (SlideshowPage* self, cairo_t* ctx, Dimen if (_tmp3_ == NULL) { #line 428 "/home/jens/Source/shotwell/src/SlideshowPage.vala" _tmp2_ = TRUE; -#line 2368 "SlideshowPage.c" +#line 2370 "SlideshowPage.c" } else { const gchar* _tmp4_ = NULL; #line 428 "/home/jens/Source/shotwell/src/SlideshowPage.vala" _tmp4_ = title; #line 428 "/home/jens/Source/shotwell/src/SlideshowPage.vala" _tmp2_ = g_strcmp0 (_tmp4_, "") == 0; -#line 2375 "SlideshowPage.c" +#line 2377 "SlideshowPage.c" } #line 428 "/home/jens/Source/shotwell/src/SlideshowPage.vala" if (_tmp2_) { @@ -2381,7 +2383,7 @@ static void slideshow_page_paint_title (SlideshowPage* self, cairo_t* ctx, Dimen _g_free0 (title); #line 429 "/home/jens/Source/shotwell/src/SlideshowPage.vala" return; -#line 2383 "SlideshowPage.c" +#line 2385 "SlideshowPage.c" } #line 431 "/home/jens/Source/shotwell/src/SlideshowPage.vala" _tmp5_ = title; @@ -2449,7 +2451,7 @@ static void slideshow_page_paint_title (SlideshowPage* self, cairo_t* ctx, Dimen _tmp27_ = _tmp26_.height; #line 445 "/home/jens/Source/shotwell/src/SlideshowPage.vala" if ((_tmp24_ + _tmp25_) >= (_tmp27_ * 0.95)) { -#line 2451 "SlideshowPage.c" +#line 2453 "SlideshowPage.c" Dimensions _tmp28_ = {0}; gint _tmp29_ = 0; gint _tmp30_ = 0; @@ -2461,7 +2463,7 @@ static void slideshow_page_paint_title (SlideshowPage* self, cairo_t* ctx, Dimen _tmp30_ = title_height; #line 446 "/home/jens/Source/shotwell/src/SlideshowPage.vala" y = (_tmp29_ * 0.95) - _tmp30_; -#line 2463 "SlideshowPage.c" +#line 2465 "SlideshowPage.c" } #line 448 "/home/jens/Source/shotwell/src/SlideshowPage.vala" _tmp31_ = x; @@ -2473,7 +2475,7 @@ static void slideshow_page_paint_title (SlideshowPage* self, cairo_t* ctx, Dimen _tmp34_ = _tmp33_.width; #line 448 "/home/jens/Source/shotwell/src/SlideshowPage.vala" if ((_tmp31_ + _tmp32_) >= (_tmp34_ * 0.95)) { -#line 2475 "SlideshowPage.c" +#line 2477 "SlideshowPage.c" Dimensions _tmp35_ = {0}; gint _tmp36_ = 0; gint _tmp37_ = 0; @@ -2485,7 +2487,7 @@ static void slideshow_page_paint_title (SlideshowPage* self, cairo_t* ctx, Dimen _tmp37_ = title_width; #line 449 "/home/jens/Source/shotwell/src/SlideshowPage.vala" x = (gdouble) ((_tmp36_ / 2) - (_tmp37_ / 2)); -#line 2487 "SlideshowPage.c" +#line 2489 "SlideshowPage.c" } #line 451 "/home/jens/Source/shotwell/src/SlideshowPage.vala" _tmp38_ = ctx; @@ -2531,7 +2533,7 @@ static void slideshow_page_paint_title (SlideshowPage* self, cairo_t* ctx, Dimen _g_object_unref0 (layout); #line 424 "/home/jens/Source/shotwell/src/SlideshowPage.vala" _g_free0 (title); -#line 2533 "SlideshowPage.c" +#line 2535 "SlideshowPage.c" } @@ -2568,21 +2570,21 @@ static void slideshow_page_real_paint (SinglePhotoPage* base, cairo_t* ctx, Dime _g_object_unref0 (_tmp4_); #line 463 "/home/jens/Source/shotwell/src/SlideshowPage.vala" if (_tmp6_) { -#line 2570 "SlideshowPage.c" +#line 2572 "SlideshowPage.c" gboolean _tmp7_ = FALSE; #line 463 "/home/jens/Source/shotwell/src/SlideshowPage.vala" _tmp7_ = single_photo_page_is_transition_in_progress (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage)); #line 463 "/home/jens/Source/shotwell/src/SlideshowPage.vala" _tmp2_ = !_tmp7_; -#line 2576 "SlideshowPage.c" +#line 2578 "SlideshowPage.c" } else { #line 463 "/home/jens/Source/shotwell/src/SlideshowPage.vala" _tmp2_ = FALSE; -#line 2580 "SlideshowPage.c" +#line 2582 "SlideshowPage.c" } #line 463 "/home/jens/Source/shotwell/src/SlideshowPage.vala" if (_tmp2_) { -#line 2584 "SlideshowPage.c" +#line 2586 "SlideshowPage.c" cairo_t* _tmp8_ = NULL; Dimensions _tmp9_ = {0}; #line 464 "/home/jens/Source/shotwell/src/SlideshowPage.vala" @@ -2591,7 +2593,7 @@ static void slideshow_page_real_paint (SinglePhotoPage* base, cairo_t* ctx, Dime _tmp9_ = *ctx_dim; #line 464 "/home/jens/Source/shotwell/src/SlideshowPage.vala" slideshow_page_paint_title (self, _tmp8_, &_tmp9_); -#line 2593 "SlideshowPage.c" +#line 2595 "SlideshowPage.c" } } @@ -2601,14 +2603,14 @@ static gint _utf8_ci_compare_gcompare_data_func (gconstpointer a, gconstpointer result = utf8_ci_compare (a, b); #line 73 "/home/jens/Source/shotwell/src/SlideshowPage.vala" return result; -#line 2603 "SlideshowPage.c" +#line 2605 "SlideshowPage.c" } static void _slideshow_page_settings_dialog_on_transition_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) { #line 84 "/home/jens/Source/shotwell/src/SlideshowPage.vala" slideshow_page_settings_dialog_on_transition_changed ((SlideshowPageSettingsDialog*) self); -#line 2610 "SlideshowPage.c" +#line 2612 "SlideshowPage.c" } @@ -2843,7 +2845,7 @@ static SlideshowPageSettingsDialog* slideshow_page_settings_dialog_construct (GT gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, gtk_combo_box_get_type (), GtkComboBox), 0); #line 72 "/home/jens/Source/shotwell/src/SlideshowPage.vala" i = 1; -#line 2845 "SlideshowPage.c" +#line 2847 "SlideshowPage.c" { GeeIterator* _display_name_it = NULL; TransitionEffectsManager* _tmp43_ = NULL; @@ -2872,7 +2874,7 @@ static SlideshowPageSettingsDialog* slideshow_page_settings_dialog_construct (GT _display_name_it = _tmp48_; #line 73 "/home/jens/Source/shotwell/src/SlideshowPage.vala" while (TRUE) { -#line 2874 "SlideshowPage.c" +#line 2876 "SlideshowPage.c" GeeIterator* _tmp49_ = NULL; gboolean _tmp50_ = FALSE; gchar* display_name = NULL; @@ -2898,7 +2900,7 @@ static SlideshowPageSettingsDialog* slideshow_page_settings_dialog_construct (GT if (!_tmp50_) { #line 73 "/home/jens/Source/shotwell/src/SlideshowPage.vala" break; -#line 2900 "SlideshowPage.c" +#line 2902 "SlideshowPage.c" } #line 73 "/home/jens/Source/shotwell/src/SlideshowPage.vala" _tmp51_ = _display_name_it; @@ -2916,7 +2918,7 @@ static SlideshowPageSettingsDialog* slideshow_page_settings_dialog_construct (GT _g_free0 (display_name); #line 76 "/home/jens/Source/shotwell/src/SlideshowPage.vala" continue; -#line 2918 "SlideshowPage.c" +#line 2920 "SlideshowPage.c" } #line 78 "/home/jens/Source/shotwell/src/SlideshowPage.vala" _tmp55_ = self->priv->transition_effect_selector; @@ -2944,7 +2946,7 @@ static SlideshowPageSettingsDialog* slideshow_page_settings_dialog_construct (GT _transition_effects_manager_unref0 (_tmp59_); #line 79 "/home/jens/Source/shotwell/src/SlideshowPage.vala" if (_tmp63_) { -#line 2946 "SlideshowPage.c" +#line 2948 "SlideshowPage.c" GtkComboBoxText* _tmp64_ = NULL; gint _tmp65_ = 0; #line 80 "/home/jens/Source/shotwell/src/SlideshowPage.vala" @@ -2953,7 +2955,7 @@ static SlideshowPageSettingsDialog* slideshow_page_settings_dialog_construct (GT _tmp65_ = i; #line 80 "/home/jens/Source/shotwell/src/SlideshowPage.vala" gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp64_, gtk_combo_box_get_type (), GtkComboBox), _tmp65_); -#line 2955 "SlideshowPage.c" +#line 2957 "SlideshowPage.c" } #line 82 "/home/jens/Source/shotwell/src/SlideshowPage.vala" _tmp66_ = i; @@ -2961,11 +2963,11 @@ static SlideshowPageSettingsDialog* slideshow_page_settings_dialog_construct (GT i = _tmp66_ + 1; #line 73 "/home/jens/Source/shotwell/src/SlideshowPage.vala" _g_free0 (display_name); -#line 2963 "SlideshowPage.c" +#line 2965 "SlideshowPage.c" } #line 73 "/home/jens/Source/shotwell/src/SlideshowPage.vala" _g_object_unref0 (_display_name_it); -#line 2967 "SlideshowPage.c" +#line 2969 "SlideshowPage.c" } #line 84 "/home/jens/Source/shotwell/src/SlideshowPage.vala" _tmp67_ = self->priv->transition_effect_selector; @@ -3073,14 +3075,14 @@ static SlideshowPageSettingsDialog* slideshow_page_settings_dialog_construct (GT _g_object_unref0 (adjustment); #line 37 "/home/jens/Source/shotwell/src/SlideshowPage.vala" return self; -#line 3075 "SlideshowPage.c" +#line 3077 "SlideshowPage.c" } static SlideshowPageSettingsDialog* slideshow_page_settings_dialog_new (void) { #line 37 "/home/jens/Source/shotwell/src/SlideshowPage.vala" return slideshow_page_settings_dialog_construct (SLIDESHOW_PAGE_TYPE_SETTINGS_DIALOG); -#line 3082 "SlideshowPage.c" +#line 3084 "SlideshowPage.c" } @@ -3105,17 +3107,17 @@ static void slideshow_page_settings_dialog_on_transition_changed (SlideshowPageS _tmp3_ = selected; #line 110 "/home/jens/Source/shotwell/src/SlideshowPage.vala" if (_tmp3_ != NULL) { -#line 3107 "SlideshowPage.c" +#line 3109 "SlideshowPage.c" const gchar* _tmp4_ = NULL; #line 111 "/home/jens/Source/shotwell/src/SlideshowPage.vala" _tmp4_ = selected; #line 111 "/home/jens/Source/shotwell/src/SlideshowPage.vala" _tmp2_ = g_strcmp0 (_tmp4_, TRANSITION_EFFECTS_MANAGER_NULL_EFFECT_ID) != 0; -#line 3113 "SlideshowPage.c" +#line 3115 "SlideshowPage.c" } else { #line 110 "/home/jens/Source/shotwell/src/SlideshowPage.vala" _tmp2_ = FALSE; -#line 3117 "SlideshowPage.c" +#line 3119 "SlideshowPage.c" } #line 110 "/home/jens/Source/shotwell/src/SlideshowPage.vala" sensitive = _tmp2_; @@ -3129,7 +3131,7 @@ static void slideshow_page_settings_dialog_on_transition_changed (SlideshowPageS gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_widget_get_type (), GtkWidget), sensitive); #line 108 "/home/jens/Source/shotwell/src/SlideshowPage.vala" _g_free0 (selected); -#line 3131 "SlideshowPage.c" +#line 3133 "SlideshowPage.c" } @@ -3147,7 +3149,7 @@ static gdouble slideshow_page_settings_dialog_get_delay (SlideshowPageSettingsDi result = _tmp1_; #line 118 "/home/jens/Source/shotwell/src/SlideshowPage.vala" return result; -#line 3149 "SlideshowPage.c" +#line 3151 "SlideshowPage.c" } @@ -3165,7 +3167,7 @@ static gdouble slideshow_page_settings_dialog_get_transition_delay (SlideshowPag result = _tmp1_; #line 122 "/home/jens/Source/shotwell/src/SlideshowPage.vala" return result; -#line 3167 "SlideshowPage.c" +#line 3169 "SlideshowPage.c" } @@ -3196,7 +3198,7 @@ static gchar* slideshow_page_settings_dialog_get_transition_effect_id (Slideshow _tmp2_ = active; #line 127 "/home/jens/Source/shotwell/src/SlideshowPage.vala" if (_tmp2_ == NULL) { -#line 3198 "SlideshowPage.c" +#line 3200 "SlideshowPage.c" gchar* _tmp3_ = NULL; #line 128 "/home/jens/Source/shotwell/src/SlideshowPage.vala" _tmp3_ = g_strdup (TRANSITION_EFFECTS_MANAGER_NULL_EFFECT_ID); @@ -3206,7 +3208,7 @@ static gchar* slideshow_page_settings_dialog_get_transition_effect_id (Slideshow _g_free0 (active); #line 128 "/home/jens/Source/shotwell/src/SlideshowPage.vala" return result; -#line 3208 "SlideshowPage.c" +#line 3210 "SlideshowPage.c" } #line 130 "/home/jens/Source/shotwell/src/SlideshowPage.vala" _tmp4_ = transition_effects_manager_get_instance (); @@ -3226,17 +3228,17 @@ static gchar* slideshow_page_settings_dialog_get_transition_effect_id (Slideshow _tmp10_ = id; #line 132 "/home/jens/Source/shotwell/src/SlideshowPage.vala" if (_tmp10_ != NULL) { -#line 3228 "SlideshowPage.c" +#line 3230 "SlideshowPage.c" const gchar* _tmp11_ = NULL; #line 132 "/home/jens/Source/shotwell/src/SlideshowPage.vala" _tmp11_ = id; #line 132 "/home/jens/Source/shotwell/src/SlideshowPage.vala" _tmp9_ = _tmp11_; -#line 3234 "SlideshowPage.c" +#line 3236 "SlideshowPage.c" } else { #line 132 "/home/jens/Source/shotwell/src/SlideshowPage.vala" _tmp9_ = TRANSITION_EFFECTS_MANAGER_NULL_EFFECT_ID; -#line 3238 "SlideshowPage.c" +#line 3240 "SlideshowPage.c" } #line 132 "/home/jens/Source/shotwell/src/SlideshowPage.vala" _tmp12_ = g_strdup (_tmp9_); @@ -3248,7 +3250,7 @@ static gchar* slideshow_page_settings_dialog_get_transition_effect_id (Slideshow _g_free0 (active); #line 132 "/home/jens/Source/shotwell/src/SlideshowPage.vala" return result; -#line 3250 "SlideshowPage.c" +#line 3252 "SlideshowPage.c" } @@ -3269,7 +3271,7 @@ static gboolean slideshow_page_settings_dialog_get_show_title (SlideshowPageSett result = _tmp2_; #line 136 "/home/jens/Source/shotwell/src/SlideshowPage.vala" return result; -#line 3271 "SlideshowPage.c" +#line 3273 "SlideshowPage.c" } @@ -3280,7 +3282,7 @@ static void slideshow_page_settings_dialog_class_init (SlideshowPageSettingsDial g_type_class_add_private (klass, sizeof (SlideshowPageSettingsDialogPrivate)); #line 26 "/home/jens/Source/shotwell/src/SlideshowPage.vala" G_OBJECT_CLASS (klass)->finalize = slideshow_page_settings_dialog_finalize; -#line 3282 "SlideshowPage.c" +#line 3284 "SlideshowPage.c" } @@ -3289,7 +3291,7 @@ static void slideshow_page_settings_dialog_instance_init (SlideshowPageSettingsD self->priv = SLIDESHOW_PAGE_SETTINGS_DIALOG_GET_PRIVATE (self); #line 27 "/home/jens/Source/shotwell/src/SlideshowPage.vala" self->priv->builder = NULL; -#line 3291 "SlideshowPage.c" +#line 3293 "SlideshowPage.c" } @@ -3317,7 +3319,7 @@ static void slideshow_page_settings_dialog_finalize (GObject* obj) { _g_object_unref0 (self->priv->pane); #line 26 "/home/jens/Source/shotwell/src/SlideshowPage.vala" G_OBJECT_CLASS (slideshow_page_settings_dialog_parent_class)->finalize (obj); -#line 3319 "SlideshowPage.c" +#line 3321 "SlideshowPage.c" } @@ -3339,22 +3341,22 @@ static void slideshow_page_class_init (SlideshowPageClass * klass) { #line 7 "/home/jens/Source/shotwell/src/SlideshowPage.vala" g_type_class_add_private (klass, sizeof (SlideshowPagePrivate)); #line 7 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - ((PageClass *) klass)->switched_to = slideshow_page_real_switched_to; + ((PageClass *) klass)->switched_to = (void (*)(Page*)) slideshow_page_real_switched_to; #line 7 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - ((PageClass *) klass)->switching_from = slideshow_page_real_switching_from; + ((PageClass *) klass)->switching_from = (void (*)(Page*)) slideshow_page_real_switching_from; #line 7 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - ((SinglePhotoPageClass *) klass)->on_previous_photo = slideshow_page_real_on_previous_photo; + ((SinglePhotoPageClass *) klass)->on_previous_photo = (void (*)(SinglePhotoPage*)) slideshow_page_real_on_previous_photo; #line 7 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - ((SinglePhotoPageClass *) klass)->on_next_photo = slideshow_page_real_on_next_photo; + ((SinglePhotoPageClass *) klass)->on_next_photo = (void (*)(SinglePhotoPage*)) slideshow_page_real_on_next_photo; #line 7 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - ((GtkWidgetClass *) klass)->key_press_event = slideshow_page_real_key_press_event; + ((GtkWidgetClass *) klass)->key_press_event = (gboolean (*)(GtkWidget*, GdkEventKey*)) slideshow_page_real_key_press_event; #line 7 "/home/jens/Source/shotwell/src/SlideshowPage.vala" - ((SinglePhotoPageClass *) klass)->paint = slideshow_page_real_paint; + ((SinglePhotoPageClass *) klass)->paint = (void (*)(SinglePhotoPage*, cairo_t*, Dimensions*)) slideshow_page_real_paint; #line 7 "/home/jens/Source/shotwell/src/SlideshowPage.vala" G_OBJECT_CLASS (klass)->finalize = slideshow_page_finalize; #line 7 "/home/jens/Source/shotwell/src/SlideshowPage.vala" g_signal_new ("hide_toolbar", TYPE_SLIDESHOW_PAGE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); -#line 3356 "SlideshowPage.c" +#line 3358 "SlideshowPage.c" } @@ -3372,7 +3374,7 @@ static void slideshow_page_instance_init (SlideshowPage * self) { self->priv->playing = TRUE; #line 19 "/home/jens/Source/shotwell/src/SlideshowPage.vala" self->priv->exiting = FALSE; -#line 3374 "SlideshowPage.c" +#line 3376 "SlideshowPage.c" } @@ -3400,7 +3402,7 @@ static void slideshow_page_finalize (GObject* obj) { _screensaver_unref0 (self->priv->screensaver); #line 7 "/home/jens/Source/shotwell/src/SlideshowPage.vala" G_OBJECT_CLASS (slideshow_page_parent_class)->finalize (obj); -#line 3402 "SlideshowPage.c" +#line 3404 "SlideshowPage.c" } -- cgit v1.2.3