From a7ff7c49085c320c1e0a2ffb66cc6d283c5acb8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sat, 21 Jan 2017 19:17:10 +0100 Subject: New upstream version 0.25.3 --- src/library/Branch.c | 139 +- src/library/FlaggedPage.c | 61 +- src/library/FlaggedSidebarEntry.c | 2 +- src/library/ImportQueuePage.c | 696 ++-- src/library/ImportQueuePage.vala | 15 +- src/library/ImportQueueSidebarEntry.c | 2 +- src/library/LastImportPage.c | 75 +- src/library/LastImportSidebarEntry.c | 2 +- src/library/Library.c | 2 +- src/library/LibraryWindow.c | 6231 +++++++++++++++++---------------- src/library/LibraryWindow.vala | 16 +- src/library/OfflinePage.c | 510 +-- src/library/OfflinePage.vala | 13 +- src/library/OfflineSidebarEntry.c | 2 +- src/library/TrashPage.c | 432 +-- src/library/TrashPage.vala | 13 +- src/library/TrashSidebarEntry.c | 2 +- 17 files changed, 4209 insertions(+), 4004 deletions(-) (limited to 'src/library') diff --git a/src/library/Branch.c b/src/library/Branch.c index e7131b0..be0fedc 100644 --- a/src/library/Branch.c +++ b/src/library/Branch.c @@ -1,4 +1,4 @@ -/* Branch.c generated by valac 0.32.1, the Vala compiler +/* Branch.c generated by valac 0.34.4, the Vala compiler * generated from Branch.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -14,8 +14,8 @@ #include #include #include -#include #include +#include #define SIDEBAR_TYPE_BRANCH (sidebar_branch_get_type ()) @@ -624,7 +624,8 @@ struct _PageClass { void (*ready) (Page* self); void (*switching_to_fullscreen) (Page* self, FullscreenWindow* fsw); void (*returning_from_fullscreen) (Page* self, FullscreenWindow* fsw); - void (*add_actions) (Page* self); + void (*add_actions) (Page* self, GActionMap* map); + void (*remove_actions) (Page* self, GActionMap* map); void (*init_collect_ui_filenames) (Page* self, GeeList* ui_filenames); InjectionGroup** (*init_collect_injection_groups) (Page* self, int* result_length1); void (*init_actions) (Page* self, gint selected_count, gint count); @@ -990,35 +991,35 @@ static gint _library_branch_comparator_gcompare_func (gconstpointer a, gconstpoi result = library_branch_comparator ((SidebarEntry*) a, (SidebarEntry*) b); #line 30 "/home/jens/Source/shotwell/src/library/Branch.vala" return result; -#line 994 "Branch.c" +#line 995 "Branch.c" } static void _library_branch_on_flagged_visibility_changed_library_hideable_page_entry_visibility_changed (LibraryHideablePageEntry* _sender, gboolean visible, gpointer self) { #line 43 "/home/jens/Source/shotwell/src/library/Branch.vala" library_branch_on_flagged_visibility_changed ((LibraryBranch*) self); -#line 1001 "Branch.c" +#line 1002 "Branch.c" } static void _library_branch_on_last_imported_visibility_changed_library_hideable_page_entry_visibility_changed (LibraryHideablePageEntry* _sender, gboolean visible, gpointer self) { #line 46 "/home/jens/Source/shotwell/src/library/Branch.vala" library_branch_on_last_imported_visibility_changed ((LibraryBranch*) self); -#line 1008 "Branch.c" +#line 1009 "Branch.c" } static void _library_branch_on_import_queue_visibility_changed_library_hideable_page_entry_visibility_changed (LibraryHideablePageEntry* _sender, gboolean visible, gpointer self) { #line 49 "/home/jens/Source/shotwell/src/library/Branch.vala" library_branch_on_import_queue_visibility_changed ((LibraryBranch*) self); -#line 1015 "Branch.c" +#line 1016 "Branch.c" } static void _library_branch_on_offline_visibility_changed_library_hideable_page_entry_visibility_changed (LibraryHideablePageEntry* _sender, gboolean visible, gpointer self) { #line 52 "/home/jens/Source/shotwell/src/library/Branch.vala" library_branch_on_offline_visibility_changed ((LibraryBranch*) self); -#line 1022 "Branch.c" +#line 1023 "Branch.c" } @@ -1137,14 +1138,14 @@ LibraryBranch* library_branch_construct (GType object_type) { library_branch_on_offline_visibility_changed (self); #line 29 "/home/jens/Source/shotwell/src/library/Branch.vala" return self; -#line 1141 "Branch.c" +#line 1142 "Branch.c" } LibraryBranch* library_branch_new (void) { #line 29 "/home/jens/Source/shotwell/src/library/Branch.vala" return library_branch_construct (LIBRARY_TYPE_BRANCH); -#line 1148 "Branch.c" +#line 1149 "Branch.c" } @@ -1174,7 +1175,7 @@ static void library_branch_insert (LibraryBranch* self, SidebarEntry* entry, gin sidebar_branch_graft (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp3_, _tmp4_, NULL); #line 58 "/home/jens/Source/shotwell/src/library/Branch.vala" _g_object_unref0 (_tmp3_); -#line 1178 "Branch.c" +#line 1179 "Branch.c" } @@ -1186,7 +1187,7 @@ static void library_branch_on_flagged_visibility_changed (LibraryBranch* self) { _tmp0_ = self->priv->_flagged_entry; #line 62 "/home/jens/Source/shotwell/src/library/Branch.vala" library_branch_update_entry_visibility (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, LIBRARY_TYPE_HIDEABLE_PAGE_ENTRY, LibraryHideablePageEntry), (gint) LIBRARY_BRANCH_ENTRY_POSITION_FLAGGED); -#line 1190 "Branch.c" +#line 1191 "Branch.c" } @@ -1198,7 +1199,7 @@ static void library_branch_on_last_imported_visibility_changed (LibraryBranch* s _tmp0_ = self->priv->_last_imported_entry; #line 66 "/home/jens/Source/shotwell/src/library/Branch.vala" library_branch_update_entry_visibility (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, LIBRARY_TYPE_HIDEABLE_PAGE_ENTRY, LibraryHideablePageEntry), (gint) LIBRARY_BRANCH_ENTRY_POSITION_LAST_IMPORTED); -#line 1202 "Branch.c" +#line 1203 "Branch.c" } @@ -1210,7 +1211,7 @@ static void library_branch_on_import_queue_visibility_changed (LibraryBranch* se _tmp0_ = self->priv->_import_queue_entry; #line 70 "/home/jens/Source/shotwell/src/library/Branch.vala" library_branch_update_entry_visibility (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, LIBRARY_TYPE_HIDEABLE_PAGE_ENTRY, LibraryHideablePageEntry), (gint) LIBRARY_BRANCH_ENTRY_POSITION_IMPORT_QUEUE); -#line 1214 "Branch.c" +#line 1215 "Branch.c" } @@ -1222,7 +1223,7 @@ static void library_branch_on_offline_visibility_changed (LibraryBranch* self) { _tmp0_ = self->priv->_offline_entry; #line 74 "/home/jens/Source/shotwell/src/library/Branch.vala" library_branch_update_entry_visibility (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, LIBRARY_TYPE_HIDEABLE_PAGE_ENTRY, LibraryHideablePageEntry), (gint) LIBRARY_BRANCH_ENTRY_POSITION_OFFLINE); -#line 1226 "Branch.c" +#line 1227 "Branch.c" } @@ -1242,7 +1243,7 @@ static void library_branch_update_entry_visibility (LibraryBranch* self, Library _tmp2_ = _tmp1_; #line 78 "/home/jens/Source/shotwell/src/library/Branch.vala" if (_tmp2_) { -#line 1246 "Branch.c" +#line 1247 "Branch.c" LibraryHideablePageEntry* _tmp3_ = NULL; gboolean _tmp4_ = FALSE; #line 79 "/home/jens/Source/shotwell/src/library/Branch.vala" @@ -1251,7 +1252,7 @@ static void library_branch_update_entry_visibility (LibraryBranch* self, Library _tmp4_ = sidebar_branch_has_entry (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, SIDEBAR_TYPE_ENTRY, SidebarEntry)); #line 79 "/home/jens/Source/shotwell/src/library/Branch.vala" if (!_tmp4_) { -#line 1255 "Branch.c" +#line 1256 "Branch.c" LibraryHideablePageEntry* _tmp5_ = NULL; gint _tmp6_ = 0; #line 80 "/home/jens/Source/shotwell/src/library/Branch.vala" @@ -1260,7 +1261,7 @@ static void library_branch_update_entry_visibility (LibraryBranch* self, Library _tmp6_ = position; #line 80 "/home/jens/Source/shotwell/src/library/Branch.vala" library_branch_insert (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, SIDEBAR_TYPE_ENTRY, SidebarEntry), _tmp6_); -#line 1264 "Branch.c" +#line 1265 "Branch.c" } } else { LibraryHideablePageEntry* _tmp7_ = NULL; @@ -1271,13 +1272,13 @@ static void library_branch_update_entry_visibility (LibraryBranch* self, Library _tmp8_ = sidebar_branch_has_entry (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, SIDEBAR_TYPE_ENTRY, SidebarEntry)); #line 81 "/home/jens/Source/shotwell/src/library/Branch.vala" if (_tmp8_) { -#line 1275 "Branch.c" +#line 1276 "Branch.c" LibraryHideablePageEntry* _tmp9_ = NULL; #line 82 "/home/jens/Source/shotwell/src/library/Branch.vala" _tmp9_ = entry; #line 82 "/home/jens/Source/shotwell/src/library/Branch.vala" sidebar_branch_prune (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, SIDEBAR_TYPE_ENTRY, SidebarEntry)); -#line 1281 "Branch.c" +#line 1282 "Branch.c" } } } @@ -1305,7 +1306,7 @@ static gint library_branch_comparator (SidebarEntry* a, SidebarEntry* b) { result = ((gint) ((gintptr) _tmp1_)) - ((gint) ((gintptr) _tmp3_)); #line 87 "/home/jens/Source/shotwell/src/library/Branch.vala" return result; -#line 1309 "Branch.c" +#line 1310 "Branch.c" } @@ -1320,14 +1321,14 @@ LibraryPhotosEntry* library_branch_get_photos_entry (LibraryBranch* self) { result = _tmp0_; #line 10 "/home/jens/Source/shotwell/src/library/Branch.vala" return result; -#line 1324 "Branch.c" +#line 1325 "Branch.c" } static gpointer _g_object_ref0 (gpointer self) { #line 10 "/home/jens/Source/shotwell/src/library/Branch.vala" return self ? g_object_ref (self) : NULL; -#line 1331 "Branch.c" +#line 1332 "Branch.c" } @@ -1346,7 +1347,7 @@ static void library_branch_set_photos_entry (LibraryBranch* self, LibraryPhotosE self->priv->_photos_entry = _tmp1_; #line 10 "/home/jens/Source/shotwell/src/library/Branch.vala" g_object_notify ((GObject *) self, "photos-entry"); -#line 1350 "Branch.c" +#line 1351 "Branch.c" } @@ -1361,7 +1362,7 @@ LibraryFlaggedSidebarEntry* library_branch_get_flagged_entry (LibraryBranch* sel result = _tmp0_; #line 11 "/home/jens/Source/shotwell/src/library/Branch.vala" return result; -#line 1365 "Branch.c" +#line 1366 "Branch.c" } @@ -1380,7 +1381,7 @@ static void library_branch_set_flagged_entry (LibraryBranch* self, LibraryFlagge self->priv->_flagged_entry = _tmp1_; #line 11 "/home/jens/Source/shotwell/src/library/Branch.vala" g_object_notify ((GObject *) self, "flagged-entry"); -#line 1384 "Branch.c" +#line 1385 "Branch.c" } @@ -1395,7 +1396,7 @@ LibraryLastImportSidebarEntry* library_branch_get_last_imported_entry (LibraryBr result = _tmp0_; #line 12 "/home/jens/Source/shotwell/src/library/Branch.vala" return result; -#line 1399 "Branch.c" +#line 1400 "Branch.c" } @@ -1414,7 +1415,7 @@ static void library_branch_set_last_imported_entry (LibraryBranch* self, Library self->priv->_last_imported_entry = _tmp1_; #line 12 "/home/jens/Source/shotwell/src/library/Branch.vala" g_object_notify ((GObject *) self, "last-imported-entry"); -#line 1418 "Branch.c" +#line 1419 "Branch.c" } @@ -1429,7 +1430,7 @@ LibraryImportQueueSidebarEntry* library_branch_get_import_queue_entry (LibraryBr result = _tmp0_; #line 13 "/home/jens/Source/shotwell/src/library/Branch.vala" return result; -#line 1433 "Branch.c" +#line 1434 "Branch.c" } @@ -1448,7 +1449,7 @@ static void library_branch_set_import_queue_entry (LibraryBranch* self, LibraryI self->priv->_import_queue_entry = _tmp1_; #line 13 "/home/jens/Source/shotwell/src/library/Branch.vala" g_object_notify ((GObject *) self, "import-queue-entry"); -#line 1452 "Branch.c" +#line 1453 "Branch.c" } @@ -1463,7 +1464,7 @@ LibraryOfflineSidebarEntry* library_branch_get_offline_entry (LibraryBranch* sel result = _tmp0_; #line 14 "/home/jens/Source/shotwell/src/library/Branch.vala" return result; -#line 1467 "Branch.c" +#line 1468 "Branch.c" } @@ -1482,7 +1483,7 @@ static void library_branch_set_offline_entry (LibraryBranch* self, LibraryOfflin self->priv->_offline_entry = _tmp1_; #line 14 "/home/jens/Source/shotwell/src/library/Branch.vala" g_object_notify ((GObject *) self, "offline-entry"); -#line 1486 "Branch.c" +#line 1487 "Branch.c" } @@ -1497,7 +1498,7 @@ LibraryTrashSidebarEntry* library_branch_get_trash_entry (LibraryBranch* self) { result = _tmp0_; #line 15 "/home/jens/Source/shotwell/src/library/Branch.vala" return result; -#line 1501 "Branch.c" +#line 1502 "Branch.c" } @@ -1516,7 +1517,7 @@ static void library_branch_set_trash_entry (LibraryBranch* self, LibraryTrashSid self->priv->_trash_entry = _tmp1_; #line 15 "/home/jens/Source/shotwell/src/library/Branch.vala" g_object_notify ((GObject *) self, "trash-entry"); -#line 1520 "Branch.c" +#line 1521 "Branch.c" } @@ -1543,14 +1544,14 @@ static void library_branch_class_init (LibraryBranchClass * klass) { g_object_class_install_property (G_OBJECT_CLASS (klass), LIBRARY_BRANCH_OFFLINE_ENTRY, g_param_spec_object ("offline-entry", "offline-entry", "offline-entry", LIBRARY_TYPE_OFFLINE_SIDEBAR_ENTRY, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); #line 7 "/home/jens/Source/shotwell/src/library/Branch.vala" g_object_class_install_property (G_OBJECT_CLASS (klass), LIBRARY_BRANCH_TRASH_ENTRY, g_param_spec_object ("trash-entry", "trash-entry", "trash-entry", LIBRARY_TYPE_TRASH_SIDEBAR_ENTRY, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); -#line 1547 "Branch.c" +#line 1548 "Branch.c" } static void library_branch_instance_init (LibraryBranch * self) { #line 7 "/home/jens/Source/shotwell/src/library/Branch.vala" self->priv = LIBRARY_BRANCH_GET_PRIVATE (self); -#line 1554 "Branch.c" +#line 1555 "Branch.c" } @@ -1572,7 +1573,7 @@ static void library_branch_finalize (GObject* obj) { _g_object_unref0 (self->priv->_trash_entry); #line 7 "/home/jens/Source/shotwell/src/library/Branch.vala" G_OBJECT_CLASS (library_branch_parent_class)->finalize (obj); -#line 1576 "Branch.c" +#line 1577 "Branch.c" } @@ -1629,13 +1630,13 @@ static void _vala_library_branch_get_property (GObject * object, guint property_ g_value_set_object (value, library_branch_get_trash_entry (self)); #line 7 "/home/jens/Source/shotwell/src/library/Branch.vala" break; -#line 1633 "Branch.c" +#line 1634 "Branch.c" default: #line 7 "/home/jens/Source/shotwell/src/library/Branch.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 7 "/home/jens/Source/shotwell/src/library/Branch.vala" break; -#line 1639 "Branch.c" +#line 1640 "Branch.c" } } @@ -1681,13 +1682,13 @@ static void _vala_library_branch_set_property (GObject * object, guint property_ library_branch_set_trash_entry (self, g_value_get_object (value)); #line 7 "/home/jens/Source/shotwell/src/library/Branch.vala" break; -#line 1685 "Branch.c" +#line 1686 "Branch.c" default: #line 7 "/home/jens/Source/shotwell/src/library/Branch.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 7 "/home/jens/Source/shotwell/src/library/Branch.vala" break; -#line 1691 "Branch.c" +#line 1692 "Branch.c" } } @@ -1698,14 +1699,14 @@ LibraryPhotosEntry* library_photos_entry_construct (GType object_type) { self = (LibraryPhotosEntry*) sidebar_simple_page_entry_construct (object_type); #line 93 "/home/jens/Source/shotwell/src/library/Branch.vala" return self; -#line 1702 "Branch.c" +#line 1703 "Branch.c" } LibraryPhotosEntry* library_photos_entry_new (void) { #line 93 "/home/jens/Source/shotwell/src/library/Branch.vala" return library_photos_entry_construct (LIBRARY_TYPE_PHOTOS_ENTRY); -#line 1709 "Branch.c" +#line 1710 "Branch.c" } @@ -1724,7 +1725,7 @@ static gchar* library_photos_entry_real_get_sidebar_name (SidebarSimplePageEntry result = _tmp1_; #line 97 "/home/jens/Source/shotwell/src/library/Branch.vala" return result; -#line 1728 "Branch.c" +#line 1729 "Branch.c" } @@ -1740,7 +1741,7 @@ static gchar* library_photos_entry_real_get_sidebar_icon (SidebarSimplePageEntry result = _tmp0_; #line 101 "/home/jens/Source/shotwell/src/library/Branch.vala" return result; -#line 1744 "Branch.c" +#line 1745 "Branch.c" } @@ -1758,7 +1759,7 @@ static Page* library_photos_entry_real_create_page (SidebarSimplePageEntry* base result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PAGE, Page); #line 105 "/home/jens/Source/shotwell/src/library/Branch.vala" return result; -#line 1762 "Branch.c" +#line 1763 "Branch.c" } @@ -1771,7 +1772,7 @@ static void library_photos_entry_class_init (LibraryPhotosEntryClass * klass) { ((SidebarSimplePageEntryClass *) klass)->get_sidebar_icon = library_photos_entry_real_get_sidebar_icon; #line 91 "/home/jens/Source/shotwell/src/library/Branch.vala" ((SidebarSimplePageEntryClass *) klass)->create_page = library_photos_entry_real_create_page; -#line 1775 "Branch.c" +#line 1776 "Branch.c" } @@ -1797,7 +1798,7 @@ LibraryHideablePageEntry* library_hideable_page_entry_construct (GType object_ty self = (LibraryHideablePageEntry*) sidebar_simple_page_entry_construct (object_type); #line 125 "/home/jens/Source/shotwell/src/library/Branch.vala" return self; -#line 1801 "Branch.c" +#line 1802 "Branch.c" } @@ -1812,7 +1813,7 @@ gboolean library_hideable_page_entry_get_visible (LibraryHideablePageEntry* self result = _tmp0_; #line 115 "/home/jens/Source/shotwell/src/library/Branch.vala" return result; -#line 1816 "Branch.c" +#line 1817 "Branch.c" } @@ -1831,7 +1832,7 @@ void library_hideable_page_entry_set_visible (LibraryHideablePageEntry* self, gb if (_tmp0_ == _tmp1_) { #line 118 "/home/jens/Source/shotwell/src/library/Branch.vala" return; -#line 1835 "Branch.c" +#line 1836 "Branch.c" } #line 120 "/home/jens/Source/shotwell/src/library/Branch.vala" _tmp2_ = value; @@ -1843,7 +1844,7 @@ void library_hideable_page_entry_set_visible (LibraryHideablePageEntry* self, gb g_signal_emit_by_name (self, "visibility-changed", _tmp3_); #line 116 "/home/jens/Source/shotwell/src/library/Branch.vala" g_object_notify ((GObject *) self, "visible"); -#line 1847 "Branch.c" +#line 1848 "Branch.c" } @@ -1862,7 +1863,7 @@ static void library_hideable_page_entry_class_init (LibraryHideablePageEntryClas g_object_class_install_property (G_OBJECT_CLASS (klass), LIBRARY_HIDEABLE_PAGE_ENTRY_VISIBLE, g_param_spec_boolean ("visible", "visible", "visible", FALSE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE)); #line 109 "/home/jens/Source/shotwell/src/library/Branch.vala" g_signal_new ("visibility_changed", LIBRARY_TYPE_HIDEABLE_PAGE_ENTRY, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__BOOLEAN, G_TYPE_NONE, 1, G_TYPE_BOOLEAN); -#line 1866 "Branch.c" +#line 1867 "Branch.c" } @@ -1871,7 +1872,7 @@ static void library_hideable_page_entry_instance_init (LibraryHideablePageEntry self->priv = LIBRARY_HIDEABLE_PAGE_ENTRY_GET_PRIVATE (self); #line 113 "/home/jens/Source/shotwell/src/library/Branch.vala" self->priv->show_entry = FALSE; -#line 1875 "Branch.c" +#line 1876 "Branch.c" } @@ -1881,7 +1882,7 @@ static void library_hideable_page_entry_finalize (GObject* obj) { self = G_TYPE_CHECK_INSTANCE_CAST (obj, LIBRARY_TYPE_HIDEABLE_PAGE_ENTRY, LibraryHideablePageEntry); #line 109 "/home/jens/Source/shotwell/src/library/Branch.vala" G_OBJECT_CLASS (library_hideable_page_entry_parent_class)->finalize (obj); -#line 1885 "Branch.c" +#line 1886 "Branch.c" } @@ -1908,13 +1909,13 @@ static void _vala_library_hideable_page_entry_get_property (GObject * object, gu g_value_set_boolean (value, library_hideable_page_entry_get_visible (self)); #line 109 "/home/jens/Source/shotwell/src/library/Branch.vala" break; -#line 1912 "Branch.c" +#line 1913 "Branch.c" default: #line 109 "/home/jens/Source/shotwell/src/library/Branch.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 109 "/home/jens/Source/shotwell/src/library/Branch.vala" break; -#line 1918 "Branch.c" +#line 1919 "Branch.c" } } @@ -1930,13 +1931,13 @@ static void _vala_library_hideable_page_entry_set_property (GObject * object, gu library_hideable_page_entry_set_visible (self, g_value_get_boolean (value)); #line 109 "/home/jens/Source/shotwell/src/library/Branch.vala" break; -#line 1934 "Branch.c" +#line 1935 "Branch.c" default: #line 109 "/home/jens/Source/shotwell/src/library/Branch.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 109 "/home/jens/Source/shotwell/src/library/Branch.vala" break; -#line 1940 "Branch.c" +#line 1941 "Branch.c" } } @@ -1945,7 +1946,7 @@ LibraryMainPage* library_main_page_construct (GType object_type, ProgressMonitor LibraryMainPage * self = NULL; #line 133 "/home/jens/Source/shotwell/src/library/Branch.vala" self = (LibraryMainPage*) collection_page_construct (object_type, LIBRARY_MAIN_PAGE_NAME); -#line 1949 "Branch.c" +#line 1950 "Branch.c" { GeeIterator* _sources_it = NULL; MediaCollectionRegistry* _tmp0_ = NULL; @@ -1974,7 +1975,7 @@ LibraryMainPage* library_main_page_construct (GType object_type, ProgressMonitor _sources_it = _tmp5_; #line 135 "/home/jens/Source/shotwell/src/library/Branch.vala" while (TRUE) { -#line 1978 "Branch.c" +#line 1979 "Branch.c" GeeIterator* _tmp6_ = NULL; gboolean _tmp7_ = FALSE; MediaSourceCollection* sources = NULL; @@ -1997,7 +1998,7 @@ LibraryMainPage* library_main_page_construct (GType object_type, ProgressMonitor if (!_tmp7_) { #line 135 "/home/jens/Source/shotwell/src/library/Branch.vala" break; -#line 2001 "Branch.c" +#line 2002 "Branch.c" } #line 135 "/home/jens/Source/shotwell/src/library/Branch.vala" _tmp8_ = _sources_it; @@ -2031,22 +2032,22 @@ LibraryMainPage* library_main_page_construct (GType object_type, ProgressMonitor _data_collection_unref0 (_tmp11_); #line 135 "/home/jens/Source/shotwell/src/library/Branch.vala" _data_collection_unref0 (sources); -#line 2035 "Branch.c" +#line 2036 "Branch.c" } #line 135 "/home/jens/Source/shotwell/src/library/Branch.vala" _g_object_unref0 (_sources_it); -#line 2039 "Branch.c" +#line 2040 "Branch.c" } #line 132 "/home/jens/Source/shotwell/src/library/Branch.vala" return self; -#line 2043 "Branch.c" +#line 2044 "Branch.c" } LibraryMainPage* library_main_page_new (ProgressMonitor monitor, void* monitor_target) { #line 132 "/home/jens/Source/shotwell/src/library/Branch.vala" return library_main_page_construct (LIBRARY_TYPE_MAIN_PAGE, monitor, monitor_target); -#line 2050 "Branch.c" +#line 2051 "Branch.c" } @@ -2076,13 +2077,13 @@ static void library_main_page_real_get_config_photos_sort (MediaPage* base, gboo if (sort_order) { #line 139 "/home/jens/Source/shotwell/src/library/Branch.vala" *sort_order = _vala_sort_order; -#line 2080 "Branch.c" +#line 2081 "Branch.c" } #line 139 "/home/jens/Source/shotwell/src/library/Branch.vala" if (sort_by) { #line 139 "/home/jens/Source/shotwell/src/library/Branch.vala" *sort_by = _vala_sort_by; -#line 2086 "Branch.c" +#line 2087 "Branch.c" } } @@ -2107,7 +2108,7 @@ static void library_main_page_real_set_config_photos_sort (MediaPage* base, gboo configuration_facade_set_library_photos_sort (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp2_, _tmp3_); #line 144 "/home/jens/Source/shotwell/src/library/Branch.vala" _g_object_unref0 (_tmp1_); -#line 2111 "Branch.c" +#line 2112 "Branch.c" } @@ -2118,7 +2119,7 @@ static void library_main_page_class_init (LibraryMainPageClass * klass) { ((MediaPageClass *) klass)->get_config_photos_sort = library_main_page_real_get_config_photos_sort; #line 129 "/home/jens/Source/shotwell/src/library/Branch.vala" ((MediaPageClass *) klass)->set_config_photos_sort = library_main_page_real_set_config_photos_sort; -#line 2122 "Branch.c" +#line 2123 "Branch.c" } diff --git a/src/library/FlaggedPage.c b/src/library/FlaggedPage.c index 16cef0f..09dafd0 100644 --- a/src/library/FlaggedPage.c +++ b/src/library/FlaggedPage.c @@ -1,4 +1,4 @@ -/* FlaggedPage.c generated by valac 0.32.1, the Vala compiler +/* FlaggedPage.c generated by valac 0.34.4, the Vala compiler * generated from FlaggedPage.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -12,9 +12,9 @@ #include #include #include +#include #include #include -#include #include @@ -427,7 +427,8 @@ struct _PageClass { void (*ready) (Page* self); void (*switching_to_fullscreen) (Page* self, FullscreenWindow* fsw); void (*returning_from_fullscreen) (Page* self, FullscreenWindow* fsw); - void (*add_actions) (Page* self); + void (*add_actions) (Page* self, GActionMap* map); + void (*remove_actions) (Page* self, GActionMap* map); void (*init_collect_ui_filenames) (Page* self, GeeList* ui_filenames); InjectionGroup** (*init_collect_injection_groups) (Page* self, int* result_length1); void (*init_actions) (Page* self, gint selected_count, gint count); @@ -822,7 +823,7 @@ FlaggedPage* flagged_page_construct (GType object_type) { _view_manager_unref0 (self->priv->view_manager); #line 36 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala" self->priv->view_manager = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_VIEW_MANAGER, ViewManager); -#line 826 "FlaggedPage.c" +#line 827 "FlaggedPage.c" { GeeIterator* _sources_it = NULL; MediaCollectionRegistry* _tmp1_ = NULL; @@ -851,7 +852,7 @@ FlaggedPage* flagged_page_construct (GType object_type) { _sources_it = _tmp6_; #line 38 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala" while (TRUE) { -#line 855 "FlaggedPage.c" +#line 856 "FlaggedPage.c" GeeIterator* _tmp7_ = NULL; gboolean _tmp8_ = FALSE; MediaSourceCollection* sources = NULL; @@ -872,7 +873,7 @@ FlaggedPage* flagged_page_construct (GType object_type) { if (!_tmp8_) { #line 38 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala" break; -#line 876 "FlaggedPage.c" +#line 877 "FlaggedPage.c" } #line 38 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala" _tmp9_ = _sources_it; @@ -900,22 +901,22 @@ FlaggedPage* flagged_page_construct (GType object_type) { _data_collection_unref0 (_tmp12_); #line 38 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala" _data_collection_unref0 (sources); -#line 904 "FlaggedPage.c" +#line 905 "FlaggedPage.c" } #line 38 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala" _g_object_unref0 (_sources_it); -#line 908 "FlaggedPage.c" +#line 909 "FlaggedPage.c" } #line 33 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala" return self; -#line 912 "FlaggedPage.c" +#line 913 "FlaggedPage.c" } FlaggedPage* flagged_page_new (void) { #line 33 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala" return flagged_page_construct (TYPE_FLAGGED_PAGE); -#line 919 "FlaggedPage.c" +#line 920 "FlaggedPage.c" } @@ -945,13 +946,13 @@ static void flagged_page_real_get_config_photos_sort (MediaPage* base, gboolean* if (sort_order) { #line 42 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala" *sort_order = _vala_sort_order; -#line 949 "FlaggedPage.c" +#line 950 "FlaggedPage.c" } #line 42 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala" if (sort_by) { #line 42 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala" *sort_by = _vala_sort_by; -#line 955 "FlaggedPage.c" +#line 956 "FlaggedPage.c" } } @@ -976,14 +977,14 @@ static void flagged_page_real_set_config_photos_sort (MediaPage* base, gboolean configuration_facade_set_library_photos_sort (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp2_, _tmp3_); #line 47 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala" _g_object_unref0 (_tmp1_); -#line 980 "FlaggedPage.c" +#line 981 "FlaggedPage.c" } static gpointer _view_filter_ref0 (gpointer self) { #line 51 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala" return self ? view_filter_ref (self) : NULL; -#line 987 "FlaggedPage.c" +#line 988 "FlaggedPage.c" } @@ -1002,7 +1003,7 @@ static SearchViewFilter* flagged_page_real_get_search_view_filter (CheckerboardP result = _tmp1_; #line 51 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala" return result; -#line 1006 "FlaggedPage.c" +#line 1007 "FlaggedPage.c" } @@ -1017,21 +1018,21 @@ static FlaggedPageFlaggedViewManager* flagged_page_flagged_view_manager_construc self = (FlaggedPageFlaggedViewManager*) collection_view_manager_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_COLLECTION_PAGE, CollectionPage)); #line 11 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala" return self; -#line 1021 "FlaggedPage.c" +#line 1022 "FlaggedPage.c" } static FlaggedPageFlaggedViewManager* flagged_page_flagged_view_manager_new (FlaggedPage* owner) { #line 11 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala" return flagged_page_flagged_view_manager_construct (FLAGGED_PAGE_TYPE_FLAGGED_VIEW_MANAGER, owner); -#line 1028 "FlaggedPage.c" +#line 1029 "FlaggedPage.c" } static gpointer _g_object_ref0 (gpointer self) { #line 16 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala" return self ? g_object_ref (self) : NULL; -#line 1035 "FlaggedPage.c" +#line 1036 "FlaggedPage.c" } @@ -1057,7 +1058,7 @@ static gboolean flagged_page_flagged_view_manager_real_include_in_view (ViewMana _tmp3_ = flaggable; #line 18 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala" if (_tmp3_ != NULL) { -#line 1061 "FlaggedPage.c" +#line 1062 "FlaggedPage.c" Flaggable* _tmp4_ = NULL; gboolean _tmp5_ = FALSE; #line 18 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala" @@ -1066,11 +1067,11 @@ static gboolean flagged_page_flagged_view_manager_real_include_in_view (ViewMana _tmp5_ = flaggable_is_flagged (_tmp4_); #line 18 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala" _tmp2_ = _tmp5_; -#line 1070 "FlaggedPage.c" +#line 1071 "FlaggedPage.c" } else { #line 18 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala" _tmp2_ = FALSE; -#line 1074 "FlaggedPage.c" +#line 1075 "FlaggedPage.c" } #line 18 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala" result = _tmp2_; @@ -1078,7 +1079,7 @@ static gboolean flagged_page_flagged_view_manager_real_include_in_view (ViewMana _g_object_unref0 (flaggable); #line 18 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala" return result; -#line 1082 "FlaggedPage.c" +#line 1083 "FlaggedPage.c" } @@ -1087,7 +1088,7 @@ static void flagged_page_flagged_view_manager_class_init (FlaggedPageFlaggedView flagged_page_flagged_view_manager_parent_class = g_type_class_peek_parent (klass); #line 10 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala" ((ViewManagerClass *) klass)->include_in_view = flagged_page_flagged_view_manager_real_include_in_view; -#line 1091 "FlaggedPage.c" +#line 1092 "FlaggedPage.c" } @@ -1116,7 +1117,7 @@ static guint flagged_page_flagged_search_view_filter_real_get_criteria (SearchVi result = (guint) (((SEARCH_FILTER_CRITERIA_TEXT | SEARCH_FILTER_CRITERIA_MEDIA) | SEARCH_FILTER_CRITERIA_RATING) | SEARCH_FILTER_CRITERIA_SAVEDSEARCH); #line 24 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala" return result; -#line 1120 "FlaggedPage.c" +#line 1121 "FlaggedPage.c" } @@ -1126,14 +1127,14 @@ static FlaggedPageFlaggedSearchViewFilter* flagged_page_flagged_search_view_filt self = (FlaggedPageFlaggedSearchViewFilter*) collection_page_collection_search_view_filter_construct (object_type); #line 22 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala" return self; -#line 1130 "FlaggedPage.c" +#line 1131 "FlaggedPage.c" } static FlaggedPageFlaggedSearchViewFilter* flagged_page_flagged_search_view_filter_new (void) { #line 22 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala" return flagged_page_flagged_search_view_filter_construct (FLAGGED_PAGE_TYPE_FLAGGED_SEARCH_VIEW_FILTER); -#line 1137 "FlaggedPage.c" +#line 1138 "FlaggedPage.c" } @@ -1142,7 +1143,7 @@ static void flagged_page_flagged_search_view_filter_class_init (FlaggedPageFlagg flagged_page_flagged_search_view_filter_parent_class = g_type_class_peek_parent (klass); #line 22 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala" ((SearchViewFilterClass *) klass)->get_criteria = flagged_page_flagged_search_view_filter_real_get_criteria; -#line 1146 "FlaggedPage.c" +#line 1147 "FlaggedPage.c" } @@ -1175,7 +1176,7 @@ static void flagged_page_class_init (FlaggedPageClass * klass) { ((CheckerboardPageClass *) klass)->get_search_view_filter = flagged_page_real_get_search_view_filter; #line 7 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala" G_OBJECT_CLASS (klass)->finalize = flagged_page_finalize; -#line 1179 "FlaggedPage.c" +#line 1180 "FlaggedPage.c" } @@ -1192,7 +1193,7 @@ static void flagged_page_instance_init (FlaggedPage * self) { _tmp1_ = flagged_page_flagged_search_view_filter_new (); #line 31 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala" self->priv->search_filter = _tmp1_; -#line 1196 "FlaggedPage.c" +#line 1197 "FlaggedPage.c" } @@ -1208,7 +1209,7 @@ static void flagged_page_finalize (GObject* obj) { _view_filter_unref0 (self->priv->search_filter); #line 7 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala" G_OBJECT_CLASS (flagged_page_parent_class)->finalize (obj); -#line 1212 "FlaggedPage.c" +#line 1213 "FlaggedPage.c" } diff --git a/src/library/FlaggedSidebarEntry.c b/src/library/FlaggedSidebarEntry.c index 7eb90aa..5ed7427 100644 --- a/src/library/FlaggedSidebarEntry.c +++ b/src/library/FlaggedSidebarEntry.c @@ -1,4 +1,4 @@ -/* FlaggedSidebarEntry.c generated by valac 0.32.1, the Vala compiler +/* FlaggedSidebarEntry.c generated by valac 0.34.4, the Vala compiler * generated from FlaggedSidebarEntry.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/library/ImportQueuePage.c b/src/library/ImportQueuePage.c index b46e179..b64083a 100644 --- a/src/library/ImportQueuePage.c +++ b/src/library/ImportQueuePage.c @@ -1,4 +1,4 @@ -/* ImportQueuePage.c generated by valac 0.32.1, the Vala compiler +/* ImportQueuePage.c generated by valac 0.34.4, the Vala compiler * generated from ImportQueuePage.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -12,12 +12,12 @@ #include #include #include +#include #include #include #include #include #include -#include #include #include #include @@ -112,16 +112,6 @@ typedef struct _BatchImport BatchImport; typedef struct _BatchImportClass BatchImportClass; #define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL))) -#define TYPE_APP_WINDOW (app_window_get_type ()) -#define APP_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_APP_WINDOW, AppWindow)) -#define APP_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_APP_WINDOW, AppWindowClass)) -#define IS_APP_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_APP_WINDOW)) -#define IS_APP_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_APP_WINDOW)) -#define APP_WINDOW_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_APP_WINDOW, AppWindowClass)) - -typedef struct _AppWindow AppWindow; -typedef struct _AppWindowClass AppWindowClass; - #define TYPE_DATA_OBJECT (data_object_get_type ()) #define DATA_OBJECT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_DATA_OBJECT, DataObject)) #define DATA_OBJECT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_DATA_OBJECT, DataObjectClass)) @@ -184,6 +174,16 @@ typedef struct _BatchImportRollClass BatchImportRollClass; #define TYPE_IMPORT_RESULT (import_result_get_type ()) +#define TYPE_APP_WINDOW (app_window_get_type ()) +#define APP_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_APP_WINDOW, AppWindow)) +#define APP_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_APP_WINDOW, AppWindowClass)) +#define IS_APP_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_APP_WINDOW)) +#define IS_APP_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_APP_WINDOW)) +#define APP_WINDOW_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_APP_WINDOW, AppWindowClass)) + +typedef struct _AppWindow AppWindow; +typedef struct _AppWindowClass AppWindowClass; + #define TYPE_DIRECTION (direction_get_type ()) #define TYPE_DATA_COLLECTION (data_collection_get_type ()) @@ -322,7 +322,8 @@ struct _PageClass { void (*ready) (Page* self); void (*switching_to_fullscreen) (Page* self, FullscreenWindow* fsw); void (*returning_from_fullscreen) (Page* self, FullscreenWindow* fsw); - void (*add_actions) (Page* self); + void (*add_actions) (Page* self, GActionMap* map); + void (*remove_actions) (Page* self, GActionMap* map); void (*init_collect_ui_filenames) (Page* self, GeeList* ui_filenames); InjectionGroup** (*init_collect_injection_groups) (Page* self, int* result_length1); void (*init_actions) (Page* self, gint selected_count, gint count); @@ -468,10 +469,10 @@ SinglePhotoPage* single_photo_page_construct (GType object_type, const gchar* pa GtkToolbar* page_get_toolbar (Page* self); static void import_queue_page_real_init_collect_ui_filenames (Page* base, GeeList* ui_filenames); void page_init_collect_ui_filenames (Page* self, GeeList* ui_filenames); -static void import_queue_page_real_add_actions (Page* base); -void page_add_actions (Page* self); -GType app_window_get_type (void) G_GNUC_CONST; -AppWindow* app_window_get_instance (void); +static void import_queue_page_real_add_actions (Page* base, GActionMap* map); +void page_add_actions (Page* self, GActionMap* map); +static void import_queue_page_real_remove_actions (Page* base, GActionMap* map); +void page_remove_actions (Page* self, GActionMap* map); void import_queue_page_enqueue_and_schedule (ImportQueuePage* self, BatchImport* batch_import, gboolean allow_user_cancel); static void import_queue_page_on_starting (ImportQueuePage* self, BatchImport* batch_import); static void _import_queue_page_on_starting_batch_import_starting (BatchImport* _sender, gpointer self); @@ -508,6 +509,8 @@ void batch_import_schedule (BatchImport* self); static void import_queue_page_update_stop_action (ImportQueuePage* self); gint import_queue_page_get_batch_count (ImportQueuePage* self); void page_set_action_sensitive (Page* self, const gchar* name, gboolean sensitive); +GType app_window_get_type (void) G_GNUC_CONST; +AppWindow* app_window_get_instance (void); void page_window_set_busy_cursor (PageWindow* self); void batch_import_user_halt (BatchImport* self); gboolean page_is_in_view (Page* self); @@ -549,7 +552,7 @@ static const GActionEntry IMPORT_QUEUE_PAGE_entries[1] = {{"Stop", _import_queue static void _import_queue_page_on_stop_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { #line 62 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" import_queue_page_on_stop ((ImportQueuePage*) self); -#line 553 "ImportQueuePage.c" +#line 556 "ImportQueuePage.c" } @@ -621,14 +624,14 @@ ImportQueuePage* import_queue_page_construct (GType object_type) { _g_object_unref0 (toolbar); #line 24 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" return self; -#line 625 "ImportQueuePage.c" +#line 628 "ImportQueuePage.c" } ImportQueuePage* import_queue_page_new (void) { #line 24 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" return import_queue_page_construct (TYPE_IMPORT_QUEUE_PAGE); -#line 632 "ImportQueuePage.c" +#line 635 "ImportQueuePage.c" } @@ -648,69 +651,116 @@ static void import_queue_page_real_init_collect_ui_filenames (Page* base, GeeLis _tmp1_ = ui_filenames; #line 59 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" PAGE_CLASS (import_queue_page_parent_class)->init_collect_ui_filenames (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), TYPE_PAGE, Page), _tmp1_); -#line 652 "ImportQueuePage.c" +#line 655 "ImportQueuePage.c" } -static void import_queue_page_real_add_actions (Page* base) { +static void import_queue_page_real_add_actions (Page* base, GActionMap* map) { ImportQueuePage * self; - AppWindow* _tmp0_ = NULL; - AppWindow* _tmp1_ = NULL; + GActionMap* _tmp0_ = NULL; + GActionMap* _tmp1_ = NULL; #line 66 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_IMPORT_QUEUE_PAGE, ImportQueuePage); +#line 66 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" + g_return_if_fail (G_IS_ACTION_MAP (map)); #line 67 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - PAGE_CLASS (import_queue_page_parent_class)->add_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), TYPE_PAGE, Page)); -#line 69 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp0_ = app_window_get_instance (); -#line 69 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp1_ = _tmp0_; + _tmp0_ = map; +#line 67 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" + PAGE_CLASS (import_queue_page_parent_class)->add_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), TYPE_PAGE, Page), _tmp0_); #line 69 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - g_action_map_add_action_entries (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, g_action_map_get_type (), GActionMap), IMPORT_QUEUE_PAGE_entries, G_N_ELEMENTS (IMPORT_QUEUE_PAGE_entries), self); + _tmp1_ = map; #line 69 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _g_object_unref0 (_tmp1_); -#line 672 "ImportQueuePage.c" + g_action_map_add_action_entries (_tmp1_, IMPORT_QUEUE_PAGE_entries, G_N_ELEMENTS (IMPORT_QUEUE_PAGE_entries), self); +#line 675 "ImportQueuePage.c" } -static void _import_queue_page_on_starting_batch_import_starting (BatchImport* _sender, gpointer self) { +static void import_queue_page_real_remove_actions (Page* base, GActionMap* map) { + ImportQueuePage * self; + GActionMap* _tmp0_ = NULL; +#line 72 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" + self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_IMPORT_QUEUE_PAGE, ImportQueuePage); +#line 72 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" + g_return_if_fail (G_IS_ACTION_MAP (map)); +#line 73 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" + _tmp0_ = map; +#line 73 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" + PAGE_CLASS (import_queue_page_parent_class)->remove_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), TYPE_PAGE, Page), _tmp0_); +#line 690 "ImportQueuePage.c" + { + GActionEntry* entry_collection = NULL; + gint entry_collection_length1 = 0; + gint _entry_collection_size_ = 0; + gint entry_it = 0; +#line 74 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" + entry_collection = IMPORT_QUEUE_PAGE_entries; +#line 74 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" + entry_collection_length1 = G_N_ELEMENTS (IMPORT_QUEUE_PAGE_entries); +#line 74 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" + for (entry_it = 0; entry_it < G_N_ELEMENTS (IMPORT_QUEUE_PAGE_entries); entry_it = entry_it + 1) { +#line 702 "ImportQueuePage.c" + GActionEntry entry = {0}; +#line 74 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" + entry = entry_collection[entry_it]; +#line 706 "ImportQueuePage.c" + { + GActionMap* _tmp1_ = NULL; + GActionEntry _tmp2_ = {0}; + const gchar* _tmp3_ = NULL; +#line 75 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" + _tmp1_ = map; +#line 75 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" + _tmp2_ = entry; +#line 75 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" + _tmp3_ = _tmp2_.name; #line 75 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" + g_action_map_remove_action (_tmp1_, _tmp3_); +#line 719 "ImportQueuePage.c" + } + } + } +} + + +static void _import_queue_page_on_starting_batch_import_starting (BatchImport* _sender, gpointer self) { +#line 82 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" import_queue_page_on_starting ((ImportQueuePage*) self, _sender); -#line 679 "ImportQueuePage.c" +#line 729 "ImportQueuePage.c" } static void _import_queue_page_on_preparing_batch_import_preparing (BatchImport* _sender, gpointer self) { -#line 76 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 83 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" import_queue_page_on_preparing ((ImportQueuePage*) self); -#line 686 "ImportQueuePage.c" +#line 736 "ImportQueuePage.c" } static void _import_queue_page_on_progress_batch_import_progress (BatchImport* _sender, guint64 completed_bytes, guint64 total_bytes, gpointer self) { -#line 77 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 84 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" import_queue_page_on_progress ((ImportQueuePage*) self, completed_bytes, total_bytes); -#line 693 "ImportQueuePage.c" +#line 743 "ImportQueuePage.c" } static void _import_queue_page_on_imported_batch_import_imported (BatchImport* _sender, MediaSource* source, GdkPixbuf* pixbuf, gint to_follow, gpointer self) { -#line 78 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 85 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" import_queue_page_on_imported ((ImportQueuePage*) self, source, pixbuf, to_follow); -#line 700 "ImportQueuePage.c" +#line 750 "ImportQueuePage.c" } static void _import_queue_page_on_import_complete_batch_import_import_complete (BatchImport* _sender, ImportManifest* manifest, BatchImportRoll* import_roll, gpointer self) { -#line 79 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 86 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" import_queue_page_on_import_complete ((ImportQueuePage*) self, _sender, manifest, import_roll); -#line 707 "ImportQueuePage.c" +#line 757 "ImportQueuePage.c" } static void _import_queue_page_on_fatal_error_batch_import_fatal_error (BatchImport* _sender, ImportResult _result_, const gchar* message, gpointer self) { -#line 80 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 87 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" import_queue_page_on_fatal_error ((ImportQueuePage*) self, _result_, message); -#line 714 "ImportQueuePage.c" +#line 764 "ImportQueuePage.c" } @@ -731,86 +781,86 @@ void import_queue_page_enqueue_and_schedule (ImportQueuePage* self, BatchImport* GeeArrayList* _tmp15_ = NULL; gint _tmp16_ = 0; gint _tmp17_ = 0; -#line 72 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 79 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" g_return_if_fail (IS_IMPORT_QUEUE_PAGE (self)); -#line 72 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 79 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" g_return_if_fail (IS_BATCH_IMPORT (batch_import)); -#line 73 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 80 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp0_ = self->priv->queue; -#line 73 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 80 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp1_ = batch_import; -#line 73 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 80 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp2_ = gee_abstract_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp1_); -#line 73 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 80 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _vala_assert (!_tmp2_, "!queue.contains(batch_import)"); -#line 75 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 82 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp3_ = batch_import; -#line 75 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 82 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" g_signal_connect_object (_tmp3_, "starting", (GCallback) _import_queue_page_on_starting_batch_import_starting, self, 0); -#line 76 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 83 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp4_ = batch_import; -#line 76 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 83 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" g_signal_connect_object (_tmp4_, "preparing", (GCallback) _import_queue_page_on_preparing_batch_import_preparing, self, 0); -#line 77 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 84 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp5_ = batch_import; -#line 77 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 84 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" g_signal_connect_object (_tmp5_, "progress", (GCallback) _import_queue_page_on_progress_batch_import_progress, self, 0); -#line 78 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 85 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp6_ = batch_import; -#line 78 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 85 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" g_signal_connect_object (_tmp6_, "imported", (GCallback) _import_queue_page_on_imported_batch_import_imported, self, 0); -#line 79 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 86 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp7_ = batch_import; -#line 79 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 86 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" g_signal_connect_object (_tmp7_, "import-complete", (GCallback) _import_queue_page_on_import_complete_batch_import_import_complete, self, 0); -#line 80 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 87 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp8_ = batch_import; -#line 80 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 87 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" g_signal_connect_object (_tmp8_, "fatal-error", (GCallback) _import_queue_page_on_fatal_error_batch_import_fatal_error, self, 0); -#line 82 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 89 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp9_ = allow_user_cancel; -#line 82 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 89 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" if (!_tmp9_) { -#line 775 "ImportQueuePage.c" +#line 825 "ImportQueuePage.c" GeeHashSet* _tmp10_ = NULL; BatchImport* _tmp11_ = NULL; -#line 83 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 90 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp10_ = self->priv->cancel_unallowed; -#line 83 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 90 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp11_ = batch_import; -#line 83 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 90 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp11_); -#line 784 "ImportQueuePage.c" +#line 834 "ImportQueuePage.c" } -#line 85 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 92 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp12_ = self->priv->queue; -#line 85 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 92 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp13_ = batch_import; -#line 85 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 92 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp13_); -#line 86 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 93 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp14_ = batch_import; -#line 86 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 93 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" g_signal_emit_by_name (self, "batch-added", _tmp14_); -#line 88 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 95 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp15_ = self->priv->queue; -#line 88 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 95 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp16_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GEE_TYPE_COLLECTION, GeeCollection)); -#line 88 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 95 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp17_ = _tmp16_; -#line 88 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 95 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" if (_tmp17_ == 1) { -#line 804 "ImportQueuePage.c" +#line 854 "ImportQueuePage.c" BatchImport* _tmp18_ = NULL; -#line 89 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 96 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp18_ = batch_import; -#line 89 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 96 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" batch_import_schedule (_tmp18_); -#line 810 "ImportQueuePage.c" +#line 860 "ImportQueuePage.c" } -#line 91 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 98 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" import_queue_page_update_stop_action (self); -#line 814 "ImportQueuePage.c" +#line 864 "ImportQueuePage.c" } @@ -819,19 +869,19 @@ gint import_queue_page_get_batch_count (ImportQueuePage* self) { GeeArrayList* _tmp0_ = NULL; gint _tmp1_ = 0; gint _tmp2_ = 0; -#line 94 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 101 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" g_return_val_if_fail (IS_IMPORT_QUEUE_PAGE (self), 0); -#line 95 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 102 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp0_ = self->priv->queue; -#line 95 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 102 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp1_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection)); -#line 95 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 102 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp2_ = _tmp1_; -#line 95 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 102 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" result = _tmp2_; -#line 95 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 102 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" return result; -#line 835 "ImportQueuePage.c" +#line 885 "ImportQueuePage.c" } @@ -840,44 +890,44 @@ static void import_queue_page_update_stop_action (ImportQueuePage* self) { GeeHashSet* _tmp1_ = NULL; BatchImport* _tmp2_ = NULL; gboolean _tmp3_ = FALSE; -#line 98 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 105 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" g_return_if_fail (IS_IMPORT_QUEUE_PAGE (self)); -#line 99 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 106 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp1_ = self->priv->cancel_unallowed; -#line 99 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 106 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp2_ = self->priv->current_batch; -#line 99 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 106 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp3_ = gee_abstract_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp2_); -#line 99 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 106 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" if (!_tmp3_) { -#line 854 "ImportQueuePage.c" +#line 904 "ImportQueuePage.c" GeeArrayList* _tmp4_ = NULL; gint _tmp5_ = 0; gint _tmp6_ = 0; -#line 99 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 106 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp4_ = self->priv->queue; -#line 99 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 106 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp5_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_COLLECTION, GeeCollection)); -#line 99 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 106 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp6_ = _tmp5_; -#line 99 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 106 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp0_ = _tmp6_ > 0; -#line 866 "ImportQueuePage.c" +#line 916 "ImportQueuePage.c" } else { -#line 99 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 106 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp0_ = FALSE; -#line 870 "ImportQueuePage.c" +#line 920 "ImportQueuePage.c" } -#line 99 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 106 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Stop", _tmp0_); -#line 874 "ImportQueuePage.c" +#line 924 "ImportQueuePage.c" } static gpointer _g_object_ref0 (gpointer self) { -#line 112 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 119 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" return self ? g_object_ref (self) : NULL; -#line 881 "ImportQueuePage.c" +#line 931 "ImportQueuePage.c" } @@ -887,33 +937,33 @@ static void import_queue_page_on_stop (ImportQueuePage* self) { gint _tmp2_ = 0; AppWindow* _tmp3_ = NULL; AppWindow* _tmp4_ = NULL; -#line 102 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 109 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" g_return_if_fail (IS_IMPORT_QUEUE_PAGE (self)); -#line 103 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 110 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" import_queue_page_update_stop_action (self); -#line 105 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 112 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp0_ = self->priv->queue; -#line 105 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 112 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp1_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection)); -#line 105 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 112 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp2_ = _tmp1_; -#line 105 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 112 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" if (_tmp2_ == 0) { -#line 106 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 113 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" return; -#line 905 "ImportQueuePage.c" +#line 955 "ImportQueuePage.c" } -#line 108 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 115 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp3_ = app_window_get_instance (); -#line 108 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 115 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp4_ = _tmp3_; -#line 108 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 115 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" page_window_set_busy_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_PAGE_WINDOW, PageWindow)); -#line 108 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 115 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _g_object_unref0 (_tmp4_); -#line 109 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 116 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" self->priv->stopped = TRUE; -#line 917 "ImportQueuePage.c" +#line 967 "ImportQueuePage.c" { GeeArrayList* _batch_import_list = NULL; GeeArrayList* _tmp5_ = NULL; @@ -923,25 +973,25 @@ static void import_queue_page_on_stop (ImportQueuePage* self) { gint _tmp8_ = 0; gint _tmp9_ = 0; gint _batch_import_index = 0; -#line 112 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 119 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp5_ = self->priv->queue; -#line 112 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 119 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp6_ = _g_object_ref0 (_tmp5_); -#line 112 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 119 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _batch_import_list = _tmp6_; -#line 112 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 119 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp7_ = _batch_import_list; -#line 112 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 119 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp8_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_COLLECTION, GeeCollection)); -#line 112 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 119 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp9_ = _tmp8_; -#line 112 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 119 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _batch_import_size = _tmp9_; -#line 112 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 119 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _batch_import_index = -1; -#line 112 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 119 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" while (TRUE) { -#line 945 "ImportQueuePage.c" +#line 995 "ImportQueuePage.c" gint _tmp10_ = 0; gint _tmp11_ = 0; gint _tmp12_ = 0; @@ -950,39 +1000,39 @@ static void import_queue_page_on_stop (ImportQueuePage* self) { gint _tmp14_ = 0; gpointer _tmp15_ = NULL; BatchImport* _tmp16_ = NULL; -#line 112 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 119 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp10_ = _batch_import_index; -#line 112 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 119 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _batch_import_index = _tmp10_ + 1; -#line 112 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 119 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp11_ = _batch_import_index; -#line 112 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 119 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp12_ = _batch_import_size; -#line 112 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 119 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" if (!(_tmp11_ < _tmp12_)) { -#line 112 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 119 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" break; -#line 966 "ImportQueuePage.c" +#line 1016 "ImportQueuePage.c" } -#line 112 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 119 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp13_ = _batch_import_list; -#line 112 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 119 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp14_ = _batch_import_index; -#line 112 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 119 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp15_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp14_); -#line 112 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 119 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" batch_import = (BatchImport*) _tmp15_; -#line 113 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 120 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp16_ = batch_import; -#line 113 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 120 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" batch_import_user_halt (_tmp16_); -#line 112 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 119 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _g_object_unref0 (batch_import); -#line 982 "ImportQueuePage.c" +#line 1032 "ImportQueuePage.c" } -#line 112 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 119 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _g_object_unref0 (_batch_import_list); -#line 986 "ImportQueuePage.c" +#line 1036 "ImportQueuePage.c" } } @@ -990,21 +1040,21 @@ static void import_queue_page_on_stop (ImportQueuePage* self) { static void import_queue_page_on_starting (ImportQueuePage* self, BatchImport* batch_import) { BatchImport* _tmp0_ = NULL; BatchImport* _tmp1_ = NULL; -#line 116 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 123 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" g_return_if_fail (IS_IMPORT_QUEUE_PAGE (self)); -#line 116 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 123 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" g_return_if_fail (IS_BATCH_IMPORT (batch_import)); -#line 117 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 124 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" import_queue_page_update_stop_action (self); -#line 118 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 125 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp0_ = batch_import; -#line 118 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 125 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp1_ = _g_object_ref0 (_tmp0_); -#line 118 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 125 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _g_object_unref0 (self->priv->current_batch); -#line 118 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 125 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" self->priv->current_batch = _tmp1_; -#line 1008 "ImportQueuePage.c" +#line 1058 "ImportQueuePage.c" } @@ -1012,19 +1062,19 @@ static void import_queue_page_on_preparing (ImportQueuePage* self) { GtkProgressBar* _tmp0_ = NULL; const gchar* _tmp1_ = NULL; GtkProgressBar* _tmp2_ = NULL; -#line 121 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 128 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" g_return_if_fail (IS_IMPORT_QUEUE_PAGE (self)); -#line 122 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 129 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp0_ = self->priv->progress_bar; -#line 122 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 129 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp1_ = _ ("Preparing to import…"); -#line 122 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 129 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" gtk_progress_bar_set_text (_tmp0_, _tmp1_); -#line 123 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 130 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp2_ = self->priv->progress_bar; -#line 123 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 130 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" gtk_progress_bar_pulse (_tmp2_); -#line 1028 "ImportQueuePage.c" +#line 1078 "ImportQueuePage.c" } @@ -1034,36 +1084,36 @@ static void import_queue_page_on_progress (ImportQueuePage* self, guint64 comple guint64 _tmp2_ = 0ULL; gdouble pct = 0.0; GtkProgressBar* _tmp5_ = NULL; -#line 126 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 133 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" g_return_if_fail (IS_IMPORT_QUEUE_PAGE (self)); -#line 127 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 134 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp1_ = completed_bytes; -#line 127 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 134 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp2_ = total_bytes; -#line 127 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 134 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" if (_tmp1_ <= _tmp2_) { -#line 1046 "ImportQueuePage.c" +#line 1096 "ImportQueuePage.c" guint64 _tmp3_ = 0ULL; guint64 _tmp4_ = 0ULL; -#line 127 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 134 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp3_ = completed_bytes; -#line 127 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 134 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp4_ = total_bytes; -#line 127 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 134 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp0_ = ((gdouble) _tmp3_) / ((gdouble) _tmp4_); -#line 1055 "ImportQueuePage.c" +#line 1105 "ImportQueuePage.c" } else { -#line 128 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 135 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp0_ = 0.0; -#line 1059 "ImportQueuePage.c" +#line 1109 "ImportQueuePage.c" } -#line 127 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 134 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" pct = _tmp0_; -#line 129 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 136 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp5_ = self->priv->progress_bar; -#line 129 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 136 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" gtk_progress_bar_set_fraction (_tmp5_, pct); -#line 1067 "ImportQueuePage.c" +#line 1117 "ImportQueuePage.c" } @@ -1085,79 +1135,79 @@ static void import_queue_page_on_imported (ImportQueuePage* self, ThumbnailSourc gchar* _tmp27_ = NULL; gchar* _tmp28_ = NULL; gchar* _tmp29_ = NULL; -#line 136 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 143 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" g_return_if_fail (IS_IMPORT_QUEUE_PAGE (self)); -#line 136 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 143 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" g_return_if_fail (IS_THUMBNAIL_SOURCE (source)); -#line 136 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 143 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" g_return_if_fail (GDK_IS_PIXBUF (pixbuf)); -#line 138 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 145 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp1_ = to_follow; -#line 138 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 145 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" if (_tmp1_ > 0) { -#line 138 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 145 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp0_ = TRUE; -#line 1101 "ImportQueuePage.c" +#line 1151 "ImportQueuePage.c" } else { gboolean _tmp2_ = FALSE; -#line 138 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 145 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp2_ = page_is_in_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 138 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 145 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp0_ = !_tmp2_; -#line 1108 "ImportQueuePage.c" +#line 1158 "ImportQueuePage.c" } -#line 138 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 145 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" if (_tmp0_) { -#line 139 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 146 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" return; -#line 1114 "ImportQueuePage.c" +#line 1164 "ImportQueuePage.c" } -#line 141 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 148 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp3_ = pixbuf; -#line 141 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 148 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp4_ = pixbuf; -#line 141 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 148 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" dimensions_for_pixbuf (_tmp4_, &_tmp5_); -#line 141 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 148 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" single_photo_page_set_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), _tmp3_, &_tmp5_, NULL); -#line 144 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 151 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp6_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 144 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 151 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp7_ = _tmp6_; -#line 144 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 151 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" data_collection_clear (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_DATA_COLLECTION, DataCollection)); -#line 144 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 151 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _data_collection_unref0 (_tmp7_); -#line 145 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 152 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp9_ = source; -#line 145 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 152 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp9_, TYPE_LIBRARY_PHOTO)) { -#line 1136 "ImportQueuePage.c" +#line 1186 "ImportQueuePage.c" ViewCollection* _tmp10_ = NULL; ViewCollection* _tmp11_ = NULL; ThumbnailSource* _tmp12_ = NULL; PhotoView* _tmp13_ = NULL; PhotoView* _tmp14_ = NULL; gboolean _tmp15_ = FALSE; -#line 145 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 152 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp10_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 145 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 152 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp11_ = _tmp10_; -#line 145 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 152 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp12_ = source; -#line 145 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 152 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp13_ = photo_view_new (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_TYPE (_tmp12_, TYPE_LIBRARY_PHOTO) ? ((LibraryPhoto*) _tmp12_) : NULL, TYPE_PHOTO_SOURCE, PhotoSource)); -#line 145 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 152 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp14_ = _tmp13_; -#line 145 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 152 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp15_ = data_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_DATA_OBJECT, DataObject)); -#line 145 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 152 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp8_ = _tmp15_; -#line 145 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 152 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _g_object_unref0 (_tmp14_); -#line 145 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 152 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _data_collection_unref0 (_tmp11_); -#line 1161 "ImportQueuePage.c" +#line 1211 "ImportQueuePage.c" } else { ViewCollection* _tmp16_ = NULL; ViewCollection* _tmp17_ = NULL; @@ -1165,51 +1215,51 @@ static void import_queue_page_on_imported (ImportQueuePage* self, ThumbnailSourc VideoView* _tmp19_ = NULL; VideoView* _tmp20_ = NULL; gboolean _tmp21_ = FALSE; -#line 146 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 153 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp16_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 146 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 153 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp17_ = _tmp16_; -#line 146 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 153 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp18_ = source; -#line 146 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 153 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp19_ = video_view_new (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_TYPE (_tmp18_, TYPE_VIDEO) ? ((Video*) _tmp18_) : NULL, TYPE_VIDEO_SOURCE, VideoSource)); -#line 146 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 153 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp20_ = _tmp19_; -#line 146 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 153 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp21_ = data_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, TYPE_DATA_OBJECT, DataObject)); -#line 146 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 153 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp8_ = _tmp21_; -#line 146 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 153 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _g_object_unref0 (_tmp20_); -#line 146 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 153 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _data_collection_unref0 (_tmp17_); -#line 1187 "ImportQueuePage.c" +#line 1237 "ImportQueuePage.c" } -#line 148 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 155 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp22_ = self->priv->progress_bar; -#line 148 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 155 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" gtk_progress_bar_set_ellipsize (_tmp22_, PANGO_ELLIPSIZE_MIDDLE); -#line 149 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 156 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp23_ = self->priv->progress_bar; -#line 149 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 156 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp24_ = _ ("Imported %s"); -#line 149 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 156 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp25_ = source; -#line 149 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 156 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp26_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, TYPE_DATA_OBJECT, DataObject)); -#line 149 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 156 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp27_ = _tmp26_; -#line 149 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 156 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp28_ = g_strdup_printf (_tmp24_, _tmp27_); -#line 149 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 156 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp29_ = _tmp28_; -#line 149 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 156 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" gtk_progress_bar_set_text (_tmp23_, _tmp29_); -#line 149 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 156 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _g_free0 (_tmp29_); -#line 149 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 156 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _g_free0 (_tmp27_); -#line 1213 "ImportQueuePage.c" +#line 1263 "ImportQueuePage.c" } @@ -1246,182 +1296,182 @@ static void import_queue_page_on_import_complete (ImportQueuePage* self, BatchIm gint _tmp28_ = 0; gint _tmp29_ = 0; BatchImport* _tmp39_ = NULL; -#line 152 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 159 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" g_return_if_fail (IS_IMPORT_QUEUE_PAGE (self)); -#line 152 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 159 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" g_return_if_fail (IS_BATCH_IMPORT (batch_import)); -#line 152 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 159 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" g_return_if_fail (IS_IMPORT_MANIFEST (manifest)); -#line 152 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 159 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" g_return_if_fail (IS_BATCH_IMPORT_ROLL (import_roll)); -#line 154 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 161 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp0_ = batch_import; -#line 154 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 161 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp1_ = self->priv->current_batch; -#line 154 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 161 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _vala_assert (_tmp0_ == _tmp1_, "batch_import == current_batch"); -#line 155 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 162 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _g_object_unref0 (self->priv->current_batch); -#line 155 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 162 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" self->priv->current_batch = NULL; -#line 157 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 164 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp2_ = self->priv->queue; -#line 157 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 164 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp3_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection)); -#line 157 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 164 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp4_ = _tmp3_; -#line 157 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 164 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _vala_assert (_tmp4_ > 0, "queue.size > 0"); -#line 158 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 165 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp5_ = self->priv->queue; -#line 158 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 165 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp6_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), 0); -#line 158 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 165 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp7_ = (BatchImport*) _tmp6_; -#line 158 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 165 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp8_ = batch_import; -#line 158 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 165 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _vala_assert (_tmp7_ == _tmp8_, "queue.get(0) == batch_import"); -#line 158 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 165 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _g_object_unref0 (_tmp7_); -#line 160 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 167 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp9_ = self->priv->queue; -#line 160 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 167 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp10_ = batch_import; -#line 160 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 167 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp11_ = gee_abstract_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp10_); -#line 160 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 167 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" removed = _tmp11_; -#line 161 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 168 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp12_ = removed; -#line 161 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 168 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _vala_assert (_tmp12_, "removed"); -#line 164 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 171 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp13_ = self->priv->cancel_unallowed; -#line 164 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 171 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp14_ = batch_import; -#line 164 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 171 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" gee_abstract_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp14_); -#line 167 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 174 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp15_ = batch_import; -#line 167 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 174 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" g_signal_parse_name ("starting", TYPE_BATCH_IMPORT, &_tmp16_, NULL, FALSE); -#line 167 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 174 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" g_signal_handlers_disconnect_matched (_tmp15_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp16_, 0, NULL, (GCallback) _import_queue_page_on_starting_batch_import_starting, self); -#line 168 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 175 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp17_ = batch_import; -#line 168 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 175 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" g_signal_parse_name ("preparing", TYPE_BATCH_IMPORT, &_tmp18_, NULL, FALSE); -#line 168 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 175 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" g_signal_handlers_disconnect_matched (_tmp17_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp18_, 0, NULL, (GCallback) _import_queue_page_on_preparing_batch_import_preparing, self); -#line 169 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 176 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp19_ = batch_import; -#line 169 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 176 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" g_signal_parse_name ("progress", TYPE_BATCH_IMPORT, &_tmp20_, NULL, FALSE); -#line 169 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 176 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" g_signal_handlers_disconnect_matched (_tmp19_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp20_, 0, NULL, (GCallback) _import_queue_page_on_progress_batch_import_progress, self); -#line 170 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 177 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp21_ = batch_import; -#line 170 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 177 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" g_signal_parse_name ("imported", TYPE_BATCH_IMPORT, &_tmp22_, NULL, FALSE); -#line 170 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 177 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" g_signal_handlers_disconnect_matched (_tmp21_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp22_, 0, NULL, (GCallback) _import_queue_page_on_imported_batch_import_imported, self); -#line 171 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 178 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp23_ = batch_import; -#line 171 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 178 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" g_signal_parse_name ("import-complete", TYPE_BATCH_IMPORT, &_tmp24_, NULL, FALSE); -#line 171 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 178 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" g_signal_handlers_disconnect_matched (_tmp23_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp24_, 0, NULL, (GCallback) _import_queue_page_on_import_complete_batch_import_import_complete, self); -#line 172 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 179 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp25_ = batch_import; -#line 172 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 179 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" g_signal_parse_name ("fatal-error", TYPE_BATCH_IMPORT, &_tmp26_, NULL, FALSE); -#line 172 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 179 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" g_signal_handlers_disconnect_matched (_tmp25_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp26_, 0, NULL, (GCallback) _import_queue_page_on_fatal_error_batch_import_fatal_error, self); -#line 175 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 182 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp27_ = self->priv->queue; -#line 175 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 182 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp28_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, GEE_TYPE_COLLECTION, GeeCollection)); -#line 175 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 182 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp29_ = _tmp28_; -#line 175 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 182 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" if (_tmp29_ > 0) { -#line 1350 "ImportQueuePage.c" +#line 1400 "ImportQueuePage.c" GeeArrayList* _tmp30_ = NULL; gpointer _tmp31_ = NULL; BatchImport* _tmp32_ = NULL; -#line 176 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 183 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp30_ = self->priv->queue; -#line 176 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 183 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp31_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), 0); -#line 176 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 183 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp32_ = (BatchImport*) _tmp31_; -#line 176 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 183 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" batch_import_schedule (_tmp32_); -#line 176 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 183 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _g_object_unref0 (_tmp32_); -#line 1364 "ImportQueuePage.c" +#line 1414 "ImportQueuePage.c" } else { GtkProgressBar* _tmp33_ = NULL; GtkProgressBar* _tmp34_ = NULL; GtkProgressBar* _tmp35_ = NULL; gboolean _tmp36_ = FALSE; -#line 179 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 186 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp33_ = self->priv->progress_bar; -#line 179 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 186 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" gtk_progress_bar_set_ellipsize (_tmp33_, PANGO_ELLIPSIZE_NONE); -#line 180 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 187 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp34_ = self->priv->progress_bar; -#line 180 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 187 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" gtk_progress_bar_set_text (_tmp34_, ""); -#line 181 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 188 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp35_ = self->priv->progress_bar; -#line 181 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - gtk_progress_bar_set_fraction (_tmp35_, 0.0); #line 188 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" + gtk_progress_bar_set_fraction (_tmp35_, 0.0); +#line 195 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" single_photo_page_blank_display (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage)); -#line 191 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 198 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp36_ = self->priv->stopped; -#line 191 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 198 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" if (_tmp36_) { -#line 1388 "ImportQueuePage.c" +#line 1438 "ImportQueuePage.c" AppWindow* _tmp37_ = NULL; AppWindow* _tmp38_ = NULL; -#line 192 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 199 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp37_ = app_window_get_instance (); -#line 192 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 199 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp38_ = _tmp37_; -#line 192 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 199 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, TYPE_PAGE_WINDOW, PageWindow)); -#line 192 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 199 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _g_object_unref0 (_tmp38_); -#line 1399 "ImportQueuePage.c" +#line 1449 "ImportQueuePage.c" } -#line 194 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 201 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" self->priv->stopped = FALSE; -#line 1403 "ImportQueuePage.c" +#line 1453 "ImportQueuePage.c" } -#line 197 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 204 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" import_queue_page_update_stop_action (self); -#line 200 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 207 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp39_ = batch_import; -#line 200 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 207 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" g_signal_emit_by_name (self, "batch-removed", _tmp39_); -#line 1411 "ImportQueuePage.c" +#line 1461 "ImportQueuePage.c" } static void import_queue_page_on_fatal_error (ImportQueuePage* self, ImportResult _result_, const gchar* message) { const gchar* _tmp0_ = NULL; -#line 203 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 210 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" g_return_if_fail (IS_IMPORT_QUEUE_PAGE (self)); -#line 203 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 210 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" g_return_if_fail (message != NULL); -#line 204 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 211 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp0_ = message; -#line 204 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 211 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" app_window_error_message (_tmp0_, NULL); -#line 1425 "ImportQueuePage.c" +#line 1475 "ImportQueuePage.c" } @@ -1434,13 +1484,15 @@ static void import_queue_page_class_init (ImportQueuePageClass * klass) { ((PageClass *) klass)->init_collect_ui_filenames = import_queue_page_real_init_collect_ui_filenames; #line 7 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" ((PageClass *) klass)->add_actions = import_queue_page_real_add_actions; +#line 7 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" + ((PageClass *) klass)->remove_actions = import_queue_page_real_remove_actions; #line 7 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" G_OBJECT_CLASS (klass)->finalize = import_queue_page_finalize; #line 7 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" g_signal_new ("batch_added", TYPE_IMPORT_QUEUE_PAGE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, TYPE_BATCH_IMPORT); #line 7 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" g_signal_new ("batch_removed", TYPE_IMPORT_QUEUE_PAGE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, TYPE_BATCH_IMPORT); -#line 1444 "ImportQueuePage.c" +#line 1496 "ImportQueuePage.c" } @@ -1468,7 +1520,7 @@ static void import_queue_page_instance_init (ImportQueuePage * self) { self->priv->progress_bar = _tmp2_; #line 14 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" self->priv->stopped = FALSE; -#line 1472 "ImportQueuePage.c" +#line 1524 "ImportQueuePage.c" } @@ -1486,7 +1538,7 @@ static void import_queue_page_finalize (GObject* obj) { _g_object_unref0 (self->priv->progress_bar); #line 7 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" G_OBJECT_CLASS (import_queue_page_parent_class)->finalize (obj); -#line 1490 "ImportQueuePage.c" +#line 1542 "ImportQueuePage.c" } diff --git a/src/library/ImportQueuePage.vala b/src/library/ImportQueuePage.vala index a2f2290..feb525d 100644 --- a/src/library/ImportQueuePage.vala +++ b/src/library/ImportQueuePage.vala @@ -63,12 +63,19 @@ public class ImportQueuePage : SinglePhotoPage { {"Stop", on_stop } }; - protected override void add_actions () { - base.add_actions (); + protected override void add_actions (GLib.ActionMap map) { + base.add_actions(map); - AppWindow.get_instance ().add_action_entries (entries, this); + map.add_action_entries(entries, this); } - + + protected override void remove_actions(GLib.ActionMap map) { + base.remove_actions(map); + foreach (var entry in entries) { + map.remove_action(entry.name); + } + } + public void enqueue_and_schedule(BatchImport batch_import, bool allow_user_cancel) { assert(!queue.contains(batch_import)); diff --git a/src/library/ImportQueueSidebarEntry.c b/src/library/ImportQueueSidebarEntry.c index 8b71718..fb038d9 100644 --- a/src/library/ImportQueueSidebarEntry.c +++ b/src/library/ImportQueueSidebarEntry.c @@ -1,4 +1,4 @@ -/* ImportQueueSidebarEntry.c generated by valac 0.32.1, the Vala compiler +/* ImportQueueSidebarEntry.c generated by valac 0.34.4, the Vala compiler * generated from ImportQueueSidebarEntry.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/library/LastImportPage.c b/src/library/LastImportPage.c index fbec432..bfaa3ed 100644 --- a/src/library/LastImportPage.c +++ b/src/library/LastImportPage.c @@ -1,4 +1,4 @@ -/* LastImportPage.c generated by valac 0.32.1, the Vala compiler +/* LastImportPage.c generated by valac 0.34.4, the Vala compiler * generated from LastImportPage.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -12,9 +12,9 @@ #include #include #include +#include #include #include -#include #include @@ -385,7 +385,8 @@ struct _PageClass { void (*ready) (Page* self); void (*switching_to_fullscreen) (Page* self, FullscreenWindow* fsw); void (*returning_from_fullscreen) (Page* self, FullscreenWindow* fsw); - void (*add_actions) (Page* self); + void (*add_actions) (Page* self, GActionMap* map); + void (*remove_actions) (Page* self, GActionMap* map); void (*init_collect_ui_filenames) (Page* self, GeeList* ui_filenames); InjectionGroup** (*init_collect_injection_groups) (Page* self, int* result_length1); void (*init_actions) (Page* self, gint selected_count, gint count); @@ -708,7 +709,7 @@ static void last_import_page_finalize (GObject* obj); static void _last_import_page_on_import_rolls_altered_media_source_collection_import_roll_altered (MediaSourceCollection* _sender, gpointer self) { #line 41 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" last_import_page_on_import_rolls_altered ((LastImportPage*) self); -#line 712 "LastImportPage.c" +#line 713 "LastImportPage.c" } @@ -716,7 +717,7 @@ LastImportPage* last_import_page_construct (GType object_type) { LastImportPage * self = NULL; #line 28 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" self = (LastImportPage*) collection_page_construct (object_type, LAST_IMPORT_PAGE_NAME); -#line 720 "LastImportPage.c" +#line 721 "LastImportPage.c" { GeeIterator* _col_it = NULL; MediaCollectionRegistry* _tmp0_ = NULL; @@ -745,7 +746,7 @@ LastImportPage* last_import_page_construct (GType object_type) { _col_it = _tmp5_; #line 31 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" while (TRUE) { -#line 749 "LastImportPage.c" +#line 750 "LastImportPage.c" GeeIterator* _tmp6_ = NULL; gboolean _tmp7_ = FALSE; MediaSourceCollection* col = NULL; @@ -760,7 +761,7 @@ LastImportPage* last_import_page_construct (GType object_type) { if (!_tmp7_) { #line 31 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" break; -#line 764 "LastImportPage.c" +#line 765 "LastImportPage.c" } #line 31 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" _tmp8_ = _col_it; @@ -774,24 +775,24 @@ LastImportPage* last_import_page_construct (GType object_type) { g_signal_connect_object (_tmp10_, "import-roll-altered", (GCallback) _last_import_page_on_import_rolls_altered_media_source_collection_import_roll_altered, self, 0); #line 31 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" _data_collection_unref0 (col); -#line 778 "LastImportPage.c" +#line 779 "LastImportPage.c" } #line 31 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" _g_object_unref0 (_col_it); -#line 782 "LastImportPage.c" +#line 783 "LastImportPage.c" } #line 36 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" last_import_page_on_import_rolls_altered (self); #line 27 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" return self; -#line 788 "LastImportPage.c" +#line 789 "LastImportPage.c" } LastImportPage* last_import_page_new (void) { #line 27 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" return last_import_page_construct (TYPE_LAST_IMPORT_PAGE); -#line 795 "LastImportPage.c" +#line 796 "LastImportPage.c" } @@ -829,7 +830,7 @@ static void last_import_page_on_import_rolls_altered (LastImportPage* self) { _tmp4_ = current_last_import_id; #line 50 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" if (_tmp4_ == NULL) { -#line 833 "LastImportPage.c" +#line 834 "LastImportPage.c" ViewCollection* _tmp5_ = NULL; ViewCollection* _tmp6_ = NULL; ViewCollection* _tmp7_ = NULL; @@ -854,7 +855,7 @@ static void last_import_page_on_import_rolls_altered (LastImportPage* self) { _import_id_free0 (current_last_import_id); #line 54 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" return; -#line 858 "LastImportPage.c" +#line 859 "LastImportPage.c" } #line 57 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" _tmp9_ = current_last_import_id; @@ -870,7 +871,7 @@ static void last_import_page_on_import_rolls_altered (LastImportPage* self) { _import_id_free0 (current_last_import_id); #line 58 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" return; -#line 874 "LastImportPage.c" +#line 875 "LastImportPage.c" } #line 60 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" _tmp13_ = current_last_import_id; @@ -892,7 +893,7 @@ static void last_import_page_on_import_rolls_altered (LastImportPage* self) { data_collection_clear (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_DATA_COLLECTION, DataCollection)); #line 63 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" _data_collection_unref0 (_tmp17_); -#line 896 "LastImportPage.c" +#line 897 "LastImportPage.c" { GeeIterator* _col_it = NULL; MediaCollectionRegistry* _tmp18_ = NULL; @@ -921,7 +922,7 @@ static void last_import_page_on_import_rolls_altered (LastImportPage* self) { _col_it = _tmp23_; #line 65 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" while (TRUE) { -#line 925 "LastImportPage.c" +#line 926 "LastImportPage.c" GeeIterator* _tmp24_ = NULL; gboolean _tmp25_ = FALSE; MediaSourceCollection* col = NULL; @@ -944,7 +945,7 @@ static void last_import_page_on_import_rolls_altered (LastImportPage* self) { if (!_tmp25_) { #line 65 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" break; -#line 948 "LastImportPage.c" +#line 949 "LastImportPage.c" } #line 65 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" _tmp26_ = _col_it; @@ -978,15 +979,15 @@ static void last_import_page_on_import_rolls_altered (LastImportPage* self) { _data_collection_unref0 (_tmp29_); #line 65 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" _data_collection_unref0 (col); -#line 982 "LastImportPage.c" +#line 983 "LastImportPage.c" } #line 65 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" _g_object_unref0 (_col_it); -#line 986 "LastImportPage.c" +#line 987 "LastImportPage.c" } #line 45 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" _import_id_free0 (current_last_import_id); -#line 990 "LastImportPage.c" +#line 991 "LastImportPage.c" } @@ -1016,13 +1017,13 @@ static void last_import_page_real_get_config_photos_sort (MediaPage* base, gbool if (sort_order) { #line 71 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" *sort_order = _vala_sort_order; -#line 1020 "LastImportPage.c" +#line 1021 "LastImportPage.c" } #line 71 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" if (sort_by) { #line 71 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" *sort_by = _vala_sort_by; -#line 1026 "LastImportPage.c" +#line 1027 "LastImportPage.c" } } @@ -1047,7 +1048,7 @@ static void last_import_page_real_set_config_photos_sort (MediaPage* base, gbool configuration_facade_set_library_photos_sort (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp2_, _tmp3_); #line 76 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" _g_object_unref0 (_tmp1_); -#line 1051 "LastImportPage.c" +#line 1052 "LastImportPage.c" } @@ -1069,14 +1070,14 @@ static LastImportPageLastImportViewManager* last_import_page_last_import_view_ma self->priv->import_id = _tmp1_; #line 13 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" return self; -#line 1073 "LastImportPage.c" +#line 1074 "LastImportPage.c" } static LastImportPageLastImportViewManager* last_import_page_last_import_view_manager_new (LastImportPage* owner, ImportID* import_id) { #line 13 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" return last_import_page_last_import_view_manager_construct (LAST_IMPORT_PAGE_TYPE_LAST_IMPORT_VIEW_MANAGER, owner, import_id); -#line 1080 "LastImportPage.c" +#line 1081 "LastImportPage.c" } @@ -1106,7 +1107,7 @@ static gboolean last_import_page_last_import_view_manager_real_include_in_view ( result = _tmp2_ == _tmp4_; #line 20 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" return result; -#line 1110 "LastImportPage.c" +#line 1111 "LastImportPage.c" } @@ -1119,14 +1120,14 @@ static void last_import_page_last_import_view_manager_class_init (LastImportPage g_type_class_add_private (klass, sizeof (LastImportPageLastImportViewManagerPrivate)); #line 10 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" ((ViewManagerClass *) klass)->include_in_view = last_import_page_last_import_view_manager_real_include_in_view; -#line 1123 "LastImportPage.c" +#line 1124 "LastImportPage.c" } static void last_import_page_last_import_view_manager_instance_init (LastImportPageLastImportViewManager * self) { #line 10 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" self->priv = LAST_IMPORT_PAGE_LAST_IMPORT_VIEW_MANAGER_GET_PRIVATE (self); -#line 1130 "LastImportPage.c" +#line 1131 "LastImportPage.c" } @@ -1136,7 +1137,7 @@ static void last_import_page_last_import_view_manager_finalize (ViewManager* obj self = G_TYPE_CHECK_INSTANCE_CAST (obj, LAST_IMPORT_PAGE_TYPE_LAST_IMPORT_VIEW_MANAGER, LastImportPageLastImportViewManager); #line 10 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" VIEW_MANAGER_CLASS (last_import_page_last_import_view_manager_parent_class)->finalize (obj); -#line 1140 "LastImportPage.c" +#line 1141 "LastImportPage.c" } @@ -1163,7 +1164,7 @@ static void last_import_page_class_init (LastImportPageClass * klass) { ((MediaPageClass *) klass)->set_config_photos_sort = last_import_page_real_set_config_photos_sort; #line 7 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" G_OBJECT_CLASS (klass)->finalize = last_import_page_finalize; -#line 1167 "LastImportPage.c" +#line 1168 "LastImportPage.c" } @@ -1177,7 +1178,7 @@ static void last_import_page_instance_init (LastImportPage * self) { _tmp0_ = alteration_new ("metadata", "import-id"); #line 25 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" self->priv->last_import_alteration = _tmp0_; -#line 1181 "LastImportPage.c" +#line 1182 "LastImportPage.c" } @@ -1185,7 +1186,7 @@ static void last_import_page_finalize (GObject* obj) { LastImportPage * self; #line 7 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_LAST_IMPORT_PAGE, LastImportPage); -#line 1189 "LastImportPage.c" +#line 1190 "LastImportPage.c" { GeeIterator* _col_it = NULL; MediaCollectionRegistry* _tmp0_ = NULL; @@ -1214,7 +1215,7 @@ static void last_import_page_finalize (GObject* obj) { _col_it = _tmp5_; #line 40 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" while (TRUE) { -#line 1218 "LastImportPage.c" +#line 1219 "LastImportPage.c" GeeIterator* _tmp6_ = NULL; gboolean _tmp7_ = FALSE; MediaSourceCollection* col = NULL; @@ -1230,7 +1231,7 @@ static void last_import_page_finalize (GObject* obj) { if (!_tmp7_) { #line 40 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" break; -#line 1234 "LastImportPage.c" +#line 1235 "LastImportPage.c" } #line 40 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" _tmp8_ = _col_it; @@ -1246,17 +1247,17 @@ static void last_import_page_finalize (GObject* obj) { g_signal_handlers_disconnect_matched (_tmp10_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp11_, 0, NULL, (GCallback) _last_import_page_on_import_rolls_altered_media_source_collection_import_roll_altered, self); #line 40 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" _data_collection_unref0 (col); -#line 1250 "LastImportPage.c" +#line 1251 "LastImportPage.c" } #line 40 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" _g_object_unref0 (_col_it); -#line 1254 "LastImportPage.c" +#line 1255 "LastImportPage.c" } #line 25 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" _alteration_unref0 (self->priv->last_import_alteration); #line 7 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" G_OBJECT_CLASS (last_import_page_parent_class)->finalize (obj); -#line 1260 "LastImportPage.c" +#line 1261 "LastImportPage.c" } diff --git a/src/library/LastImportSidebarEntry.c b/src/library/LastImportSidebarEntry.c index bdf6b91..d30c4af 100644 --- a/src/library/LastImportSidebarEntry.c +++ b/src/library/LastImportSidebarEntry.c @@ -1,4 +1,4 @@ -/* LastImportSidebarEntry.c generated by valac 0.32.1, the Vala compiler +/* LastImportSidebarEntry.c generated by valac 0.34.4, the Vala compiler * generated from LastImportSidebarEntry.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/library/Library.c b/src/library/Library.c index 4ce5d56..0e29d27 100644 --- a/src/library/Library.c +++ b/src/library/Library.c @@ -1,4 +1,4 @@ -/* Library.c generated by valac 0.32.1, the Vala compiler +/* Library.c generated by valac 0.34.4, the Vala compiler * generated from Library.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/library/LibraryWindow.c b/src/library/LibraryWindow.c index e4d802b..07c30d7 100644 --- a/src/library/LibraryWindow.c +++ b/src/library/LibraryWindow.c @@ -1,4 +1,4 @@ -/* LibraryWindow.c generated by valac 0.32.1, the Vala compiler +/* LibraryWindow.c generated by valac 0.34.4, the Vala compiler * generated from LibraryWindow.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -1084,7 +1084,8 @@ struct _PageClass { void (*ready) (Page* self); void (*switching_to_fullscreen) (Page* self, FullscreenWindow* fsw); void (*returning_from_fullscreen) (Page* self, FullscreenWindow* fsw); - void (*add_actions) (Page* self); + void (*add_actions) (Page* self, GActionMap* map); + void (*remove_actions) (Page* self, GActionMap* map); void (*init_collect_ui_filenames) (Page* self, GeeList* ui_filenames); InjectionGroup** (*init_collect_injection_groups) (Page* self, int* result_length1); void (*init_actions) (Page* self, gint selected_count, gint count); @@ -1422,6 +1423,7 @@ GType library_photos_entry_get_type (void) G_GNUC_CONST; LibraryPhotosEntry* library_branch_get_photos_entry (LibraryBranch* self); Page* sidebar_page_representative_get_page (SidebarPageRepresentative* self); static void library_window_load_configuration (LibraryWindow* self); +void application_set_accels_for_action (const gchar* action, gchar** accel, int accel_length1); GFile* directory_monitor_get_root (DirectoryMonitor* self); static void library_window_on_library_monitor_discovery_started (LibraryWindow* self); static void _library_window_on_library_monitor_discovery_started_directory_monitor_discovery_started (DirectoryMonitor* _sender, gpointer self); @@ -1670,7 +1672,6 @@ static void library_window_update_background_progress_bar (LibraryWindow* self, static void library_window_hide_background_progress_bar (LibraryWindow* self); gint configuration_facade_get_sidebar_position (ConfigurationFacade* self); gint library_window_get_PAGE_MIN_WIDTH (void); -void application_set_appmenu (GMenuModel* model); static void library_window_real_set_current_page (PageWindow* base, Page* page); void library_window_set_page_switching_enabled (LibraryWindow* self, gboolean should_enable); void application_set_menubar (GMenuModel* model); @@ -1729,6 +1730,7 @@ enum { LIBRARY_WINDOW_FULLSCREEN_PHOTO_PAGE_DUMMY_PROPERTY }; static void library_window_fullscreen_photo_page_real_switched_to (Page* base); +static void library_window_fullscreen_photo_page_real_switching_from (Page* base); static void library_window_fullscreen_photo_page_real_init_collect_ui_filenames (Page* base, GeeList* ui_filenames); static void library_window_fullscreen_photo_page_finalize (GObject* obj); static void library_window_finalize (GObject* obj); @@ -1742,86 +1744,86 @@ const GtkTargetEntry LIBRARY_WINDOW_DND_TARGET_ENTRIES[3] = {{"text/uri-list", ( static const GActionEntry LIBRARY_WINDOW_common_actions[13] = {{"CommonFileImport", _library_window_on_file_import_gsimple_action_activate_callback}, {"ExternalLibraryImport", _library_window_on_external_library_import_gsimple_action_activate_callback}, {"CommonPreferences", _library_window_on_preferences_gsimple_action_activate_callback}, {"CommonEmptyTrash", _library_window_on_empty_trash_gsimple_action_activate_callback}, {"CommonJumpToEvent", _library_window_on_jump_to_event_gsimple_action_activate_callback}, {"CommonFind", _library_window_on_find_gsimple_action_activate_callback}, {"CommonNewSearch", _library_window_on_new_search_gsimple_action_activate_callback}, {"CommonDisplayBasicProperties", _library_window_on_action_toggle_gsimple_action_activate_callback, NULL, "false", _library_window_on_display_basic_properties_gsimple_action_change_state_callback}, {"CommonDisplayExtendedProperties", _library_window_on_action_toggle_gsimple_action_activate_callback, NULL, "false", _library_window_on_display_extended_properties_gsimple_action_change_state_callback}, {"CommonDisplaySearchbar", NULL, NULL, "false", _library_window_on_display_searchbar_gsimple_action_change_state_callback}, {"CommonDisplaySidebar", _library_window_on_action_toggle_gsimple_action_activate_callback, NULL, "true", _library_window_on_display_sidebar_gsimple_action_change_state_callback}, {"CommonDisplayToolbar", NULL, NULL, "true", _library_window_on_display_toolbar_gsimple_action_change_state_callback}, {"CommonSortEvents", _library_window_on_action_radio_gsimple_action_activate_callback, "s", "'ascending'", _library_window_on_events_sort_changed_gsimple_action_change_state_callback}}; static void _library_window_on_page_created_sidebar_tree_page_created (SidebarTree* _sender, SidebarPageRepresentative* entry, Page* page, gpointer self) { -#line 216 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 222 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_on_page_created ((LibraryWindow*) self, entry, page); -#line 1748 "LibraryWindow.c" +#line 1750 "LibraryWindow.c" } static void _library_window_on_destroying_page_sidebar_tree_destroying_page (SidebarTree* _sender, SidebarPageRepresentative* entry, Page* page, gpointer self) { -#line 217 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 223 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_on_destroying_page ((LibraryWindow*) self, entry, page); -#line 1755 "LibraryWindow.c" +#line 1757 "LibraryWindow.c" } static void _library_window_on_sidebar_entry_selected_sidebar_tree_entry_selected (SidebarTree* _sender, SidebarSelectableEntry* selectable, gpointer self) { -#line 218 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 224 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_on_sidebar_entry_selected ((LibraryWindow*) self, selectable); -#line 1762 "LibraryWindow.c" +#line 1764 "LibraryWindow.c" } static void _library_window_on_sidebar_selected_entry_removed_sidebar_tree_selected_entry_removed (SidebarTree* _sender, SidebarSelectableEntry* removed, gpointer self) { -#line 219 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 225 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_on_sidebar_selected_entry_removed ((LibraryWindow*) self, removed); -#line 1769 "LibraryWindow.c" +#line 1771 "LibraryWindow.c" } static void _library_window_hide_extended_properties_gtk_widget_hide (GtkWidget* _sender, gpointer self) { -#line 223 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 229 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_hide_extended_properties ((LibraryWindow*) self); -#line 1776 "LibraryWindow.c" +#line 1778 "LibraryWindow.c" } static void _library_window_show_extended_properties_gtk_widget_show (GtkWidget* _sender, gpointer self) { -#line 224 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 230 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_show_extended_properties ((LibraryWindow*) self); -#line 1783 "LibraryWindow.c" +#line 1785 "LibraryWindow.c" } static void _library_window_on_trashcan_contents_altered_media_source_collection_trashcan_contents_altered (MediaSourceCollection* _sender, GeeCollection* added, GeeCollection* removed, gpointer self) { -#line 227 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 233 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_on_trashcan_contents_altered ((LibraryWindow*) self); -#line 1790 "LibraryWindow.c" +#line 1792 "LibraryWindow.c" } static void _library_window_on_media_altered_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self) { -#line 228 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 234 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_on_media_altered ((LibraryWindow*) self); -#line 1797 "LibraryWindow.c" +#line 1799 "LibraryWindow.c" } static void _library_window_on_metadata_writer_progress_metadata_writer_progress (MetadataWriter* _sender, guint completed, guint total, gpointer self) { -#line 231 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 237 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_on_metadata_writer_progress ((LibraryWindow*) self, completed, total); -#line 1804 "LibraryWindow.c" +#line 1806 "LibraryWindow.c" } static void _library_window_on_library_monitor_installed_library_monitor_pool_monitor_installed (LibraryMonitorPool* _sender, LibraryMonitor* monitor, gpointer self) { -#line 237 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 243 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_on_library_monitor_installed ((LibraryWindow*) self, monitor); -#line 1811 "LibraryWindow.c" +#line 1813 "LibraryWindow.c" } static void _library_window_on_library_monitor_destroyed_library_monitor_pool_monitor_destroyed (LibraryMonitorPool* _sender, LibraryMonitor* monitor, gpointer self) { -#line 238 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 244 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_on_library_monitor_destroyed ((LibraryWindow*) self, monitor); -#line 1818 "LibraryWindow.c" +#line 1820 "LibraryWindow.c" } static void _library_window_on_camera_added_camera_table_camera_added (CameraTable* _sender, DiscoveredCamera* camera, gpointer self) { -#line 240 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 246 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_on_camera_added ((LibraryWindow*) self, camera); -#line 1825 "LibraryWindow.c" +#line 1827 "LibraryWindow.c" } @@ -1850,121 +1852,121 @@ GType library_window_target_type_get_type (void) { static void _library_window_on_file_import_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { -#line 265 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 271 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_on_file_import ((LibraryWindow*) self); -#line 1856 "LibraryWindow.c" +#line 1858 "LibraryWindow.c" } static void _library_window_on_external_library_import_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { -#line 265 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 271 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_on_external_library_import ((LibraryWindow*) self); -#line 1863 "LibraryWindow.c" +#line 1865 "LibraryWindow.c" } static void _library_window_on_preferences_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { -#line 265 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 271 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_on_preferences ((LibraryWindow*) self); -#line 1870 "LibraryWindow.c" +#line 1872 "LibraryWindow.c" } static void _library_window_on_empty_trash_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { -#line 265 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 271 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_on_empty_trash ((LibraryWindow*) self); -#line 1877 "LibraryWindow.c" +#line 1879 "LibraryWindow.c" } static void _library_window_on_jump_to_event_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { -#line 265 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 271 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_on_jump_to_event ((LibraryWindow*) self); -#line 1884 "LibraryWindow.c" +#line 1886 "LibraryWindow.c" } static void _library_window_on_find_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { -#line 265 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 271 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_on_find ((LibraryWindow*) self); -#line 1891 "LibraryWindow.c" +#line 1893 "LibraryWindow.c" } static void _library_window_on_new_search_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { -#line 265 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 271 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_on_new_search ((LibraryWindow*) self); -#line 1898 "LibraryWindow.c" +#line 1900 "LibraryWindow.c" } static void _library_window_on_action_toggle_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { -#line 265 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 271 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_on_action_toggle ((LibraryWindow*) self, action, parameter); -#line 1905 "LibraryWindow.c" +#line 1907 "LibraryWindow.c" } static void _library_window_on_display_basic_properties_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self) { -#line 265 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 271 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_on_display_basic_properties ((LibraryWindow*) self, action, value); -#line 1912 "LibraryWindow.c" +#line 1914 "LibraryWindow.c" } static void _library_window_on_display_extended_properties_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self) { -#line 265 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 271 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_on_display_extended_properties ((LibraryWindow*) self, action, value); -#line 1919 "LibraryWindow.c" +#line 1921 "LibraryWindow.c" } static void _library_window_on_display_searchbar_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self) { -#line 265 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 271 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_on_display_searchbar ((LibraryWindow*) self, action, value); -#line 1926 "LibraryWindow.c" +#line 1928 "LibraryWindow.c" } static void _library_window_on_display_sidebar_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self) { -#line 265 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 271 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_on_display_sidebar ((LibraryWindow*) self, action, value); -#line 1933 "LibraryWindow.c" +#line 1935 "LibraryWindow.c" } static void _library_window_on_display_toolbar_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self) { -#line 265 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 271 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_on_display_toolbar ((LibraryWindow*) self, action, value); -#line 1940 "LibraryWindow.c" +#line 1942 "LibraryWindow.c" } static void _library_window_on_action_radio_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { -#line 265 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 271 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_on_action_radio ((LibraryWindow*) self, action, parameter); -#line 1947 "LibraryWindow.c" +#line 1949 "LibraryWindow.c" } static void _library_window_on_events_sort_changed_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self) { -#line 265 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 271 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_on_events_sort_changed ((LibraryWindow*) self, action, value); -#line 1954 "LibraryWindow.c" +#line 1956 "LibraryWindow.c" } static void _library_window_external_drop_handler_sidebar_tree_external_drop_handler (GdkDragContext* context, SidebarEntry* entry, GtkSelectionData* data, guint info, guint time, gpointer self) { -#line 152 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 154 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_external_drop_handler ((LibraryWindow*) self, context, entry, data, info, time); -#line 1961 "LibraryWindow.c" +#line 1963 "LibraryWindow.c" } static void _library_window_on_update_properties_now_one_shot_callback (gpointer self) { -#line 172 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 174 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_on_update_properties_now ((LibraryWindow*) self); -#line 1968 "LibraryWindow.c" +#line 1970 "LibraryWindow.c" } @@ -2021,117 +2023,119 @@ LibraryWindow* library_window_construct (GType object_type, ProgressMonitor prog CameraTable* _tmp56_ = NULL; CameraTable* _tmp57_ = NULL; GtkProgressBar* _tmp58_ = NULL; -#line 150 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - self = (LibraryWindow*) app_window_construct (object_type); +#line 217 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + static const gchar* accels[] = {"f", "F8", NULL}; #line 152 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + self = (LibraryWindow*) app_window_construct (object_type); +#line 154 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = sidebar_tree_new (LIBRARY_WINDOW_DND_TARGET_ENTRIES, G_N_ELEMENTS (LIBRARY_WINDOW_DND_TARGET_ENTRIES), GDK_ACTION_ASK, _library_window_external_drop_handler_sidebar_tree_external_drop_handler, self); -#line 152 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 154 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_object_ref_sink (_tmp0_); -#line 152 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 154 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (self->priv->sidebar_tree); -#line 152 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 154 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" self->priv->sidebar_tree = _tmp0_; -#line 155 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 157 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = self->priv->sidebar_tree; -#line 155 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 157 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_connect_object (_tmp1_, "page-created", (GCallback) _library_window_on_page_created_sidebar_tree_page_created, self, 0); -#line 156 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 158 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = self->priv->sidebar_tree; -#line 156 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 158 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_connect_object (_tmp2_, "destroying-page", (GCallback) _library_window_on_destroying_page_sidebar_tree_destroying_page, self, 0); -#line 157 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 159 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = self->priv->sidebar_tree; -#line 157 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 159 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_connect_object (_tmp3_, "entry-selected", (GCallback) _library_window_on_sidebar_entry_selected_sidebar_tree_entry_selected, self, 0); -#line 158 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 160 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp4_ = self->priv->sidebar_tree; -#line 158 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - g_signal_connect_object (_tmp4_, "selected-entry-removed", (GCallback) _library_window_on_sidebar_selected_entry_removed_sidebar_tree_selected_entry_removed, self, 0); #line 160 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + g_signal_connect_object (_tmp4_, "selected-entry-removed", (GCallback) _library_window_on_sidebar_selected_entry_removed_sidebar_tree_selected_entry_removed, self, 0); +#line 162 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp5_ = self->priv->sidebar_tree; -#line 160 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 162 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp6_ = self->priv->library_branch; -#line 160 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 162 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" sidebar_tree_graft (_tmp5_, G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, SIDEBAR_TYPE_BRANCH, SidebarBranch), (gint) LIBRARY_WINDOW_SIDEBAR_ROOT_POSITION_LIBRARY); -#line 161 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 163 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp7_ = self->priv->sidebar_tree; -#line 161 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 163 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp8_ = self->priv->tags_branch; -#line 161 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 163 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" sidebar_tree_graft (_tmp7_, G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, SIDEBAR_TYPE_BRANCH, SidebarBranch), (gint) LIBRARY_WINDOW_SIDEBAR_ROOT_POSITION_TAGS); -#line 162 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 164 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp9_ = self->priv->sidebar_tree; -#line 162 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 164 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp10_ = self->priv->folders_branch; -#line 162 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 164 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" sidebar_tree_graft (_tmp9_, G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, SIDEBAR_TYPE_BRANCH, SidebarBranch), (gint) LIBRARY_WINDOW_SIDEBAR_ROOT_POSITION_FOLDERS); -#line 163 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 165 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp11_ = self->priv->sidebar_tree; -#line 163 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 165 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp12_ = self->priv->events_branch; -#line 163 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 165 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" sidebar_tree_graft (_tmp11_, G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, SIDEBAR_TYPE_BRANCH, SidebarBranch), (gint) LIBRARY_WINDOW_SIDEBAR_ROOT_POSITION_EVENTS); -#line 164 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 166 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp13_ = self->priv->sidebar_tree; -#line 164 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 166 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp14_ = self->priv->camera_branch; -#line 164 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 166 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" sidebar_tree_graft (_tmp13_, G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, SIDEBAR_TYPE_BRANCH, SidebarBranch), (gint) LIBRARY_WINDOW_SIDEBAR_ROOT_POSITION_CAMERAS); -#line 165 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 167 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp15_ = self->priv->sidebar_tree; -#line 165 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 167 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp16_ = self->priv->saved_search_branch; -#line 165 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 167 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" sidebar_tree_graft (_tmp15_, G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, SIDEBAR_TYPE_BRANCH, SidebarBranch), (gint) LIBRARY_WINDOW_SIDEBAR_ROOT_POSITION_SAVED_SEARCH); -#line 168 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 170 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp17_ = extended_properties_window_new (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow)); -#line 168 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 170 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_object_ref_sink (_tmp17_); -#line 168 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 170 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (self->priv->extended_properties); -#line 168 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 170 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" self->priv->extended_properties = _tmp17_; -#line 169 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 171 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp18_ = self->priv->extended_properties; -#line 169 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 171 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_widget_get_type (), GtkWidget), "hide", (GCallback) _library_window_hide_extended_properties_gtk_widget_hide, self, 0); -#line 170 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 172 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp19_ = self->priv->extended_properties; -#line 170 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, gtk_widget_get_type (), GtkWidget), "show", (GCallback) _library_window_show_extended_properties_gtk_widget_show, self, 0); #line 172 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, gtk_widget_get_type (), GtkWidget), "show", (GCallback) _library_window_show_extended_properties_gtk_widget_show, self, 0); +#line 174 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp20_ = one_shot_scheduler_new ("LibraryWindow properties", _library_window_on_update_properties_now_one_shot_callback, self); -#line 172 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 174 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _one_shot_scheduler_unref0 (self->priv->properties_scheduler); -#line 172 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 174 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" self->priv->properties_scheduler = _tmp20_; -#line 176 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 178 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp21_ = self->priv->search_actions; -#line 176 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 178 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp22_ = search_filter_toolbar_new (_tmp21_); -#line 176 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 178 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_object_ref_sink (_tmp22_); -#line 176 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 178 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (self->priv->search_toolbar); -#line 176 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 178 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" self->priv->search_toolbar = _tmp22_; -#line 179 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 181 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp23_ = self->priv->library_branch; -#line 179 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 181 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp24_ = library_branch_get_photos_entry (_tmp23_); -#line 179 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 181 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp25_ = _tmp24_; -#line 179 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 181 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp26_ = sidebar_page_representative_get_page (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, SIDEBAR_TYPE_PAGE_REPRESENTATIVE, SidebarPageRepresentative)); -#line 179 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 181 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp27_ = _tmp26_; -#line 179 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 181 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_create_layout (self, _tmp27_); -#line 179 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 181 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp27_); -#line 182 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 184 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_load_configuration (self); -#line 2135 "LibraryWindow.c" +#line 2139 "LibraryWindow.c" { GeeIterator* _media_sources_it = NULL; MediaCollectionRegistry* _tmp28_ = NULL; @@ -2140,27 +2144,27 @@ LibraryWindow* library_window_construct (GType object_type, ProgressMonitor prog GeeCollection* _tmp31_ = NULL; GeeIterator* _tmp32_ = NULL; GeeIterator* _tmp33_ = NULL; -#line 184 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 186 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp28_ = media_collection_registry_get_instance (); -#line 184 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 186 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp29_ = _tmp28_; -#line 184 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 186 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp30_ = media_collection_registry_get_all (_tmp29_); -#line 184 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 186 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp31_ = _tmp30_; -#line 184 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 186 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp32_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 184 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 186 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp33_ = _tmp32_; -#line 184 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 186 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp31_); -#line 184 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 186 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _media_collection_registry_unref0 (_tmp29_); -#line 184 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 186 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _media_sources_it = _tmp33_; -#line 184 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 186 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" while (TRUE) { -#line 2164 "LibraryWindow.c" +#line 2168 "LibraryWindow.c" GeeIterator* _tmp34_ = NULL; gboolean _tmp35_ = FALSE; MediaSourceCollection* media_sources = NULL; @@ -2168,176 +2172,178 @@ LibraryWindow* library_window_construct (GType object_type, ProgressMonitor prog gpointer _tmp37_ = NULL; MediaSourceCollection* _tmp38_ = NULL; MediaSourceCollection* _tmp39_ = NULL; -#line 184 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 186 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp34_ = _media_sources_it; -#line 184 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 186 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp35_ = gee_iterator_next (_tmp34_); -#line 184 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 186 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (!_tmp35_) { -#line 184 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 186 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" break; -#line 2180 "LibraryWindow.c" +#line 2184 "LibraryWindow.c" } -#line 184 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 186 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp36_ = _media_sources_it; -#line 184 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 186 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp37_ = gee_iterator_get (_tmp36_); -#line 184 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 186 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" media_sources = (MediaSourceCollection*) _tmp37_; -#line 185 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 187 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp38_ = media_sources; -#line 185 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 187 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_connect_object (_tmp38_, "trashcan-contents-altered", (GCallback) _library_window_on_trashcan_contents_altered_media_source_collection_trashcan_contents_altered, self, 0); -#line 186 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 188 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp39_ = media_sources; -#line 186 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 188 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, TYPE_DATA_COLLECTION, DataCollection), "items-altered", (GCallback) _library_window_on_media_altered_data_collection_items_altered, self, 0); -#line 184 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 186 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _data_collection_unref0 (media_sources); -#line 2198 "LibraryWindow.c" +#line 2202 "LibraryWindow.c" } -#line 184 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 186 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_media_sources_it); -#line 2202 "LibraryWindow.c" +#line 2206 "LibraryWindow.c" } -#line 191 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 193 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp40_ = LIBRARY_WINDOW_DND_TARGET_ENTRIES[LIBRARY_WINDOW_TARGET_TYPE_URI_LIST]; -#line 191 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 193 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp41_ = LIBRARY_WINDOW_DND_TARGET_ENTRIES[LIBRARY_WINDOW_TARGET_TYPE_MEDIA_LIST]; -#line 191 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 193 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp42_ = g_new0 (GtkTargetEntry, 2); -#line 191 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 193 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp42_[0] = _tmp40_; -#line 191 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 193 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp42_[1] = _tmp41_; -#line 191 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 193 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" main_window_dnd_targets = _tmp42_; -#line 191 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 193 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" main_window_dnd_targets_length1 = 2; -#line 191 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 193 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _main_window_dnd_targets_size_ = main_window_dnd_targets_length1; -#line 197 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 199 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp43_ = main_window_dnd_targets; -#line 197 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 199 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp43__length1 = main_window_dnd_targets_length1; -#line 197 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 199 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" gtk_drag_dest_set (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), GTK_DEST_DEFAULT_ALL, _tmp43_, _tmp43__length1, (GDK_ACTION_COPY | GDK_ACTION_LINK) | GDK_ACTION_ASK); -#line 200 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 202 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp44_ = metadata_writer_get_instance (); -#line 200 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 202 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp45_ = _tmp44_; -#line 200 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 202 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_connect_object (_tmp45_, "progress", (GCallback) _library_window_on_metadata_writer_progress_metadata_writer_progress, self, 0); -#line 200 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _g_object_unref0 (_tmp45_); #line 202 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _g_object_unref0 (_tmp45_); +#line 204 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp46_ = library_monitor_pool_get_instance (); -#line 202 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 204 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp47_ = _tmp46_; -#line 202 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 204 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp48_ = library_monitor_pool_get_monitor (_tmp47_); -#line 202 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 204 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp49_ = _tmp48_; -#line 202 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 204 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _library_monitor_pool_unref0 (_tmp47_); -#line 202 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 204 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" monitor = _tmp49_; -#line 203 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 205 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp50_ = monitor; -#line 203 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 205 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp50_ != NULL) { -#line 2250 "LibraryWindow.c" +#line 2254 "LibraryWindow.c" LibraryMonitor* _tmp51_ = NULL; -#line 204 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 206 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp51_ = monitor; -#line 204 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 206 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_on_library_monitor_installed (self, _tmp51_); -#line 2256 "LibraryWindow.c" +#line 2260 "LibraryWindow.c" } -#line 206 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 208 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp52_ = library_monitor_pool_get_instance (); -#line 206 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 208 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp53_ = _tmp52_; -#line 206 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 208 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_connect_object (_tmp53_, "monitor-installed", (GCallback) _library_window_on_library_monitor_installed_library_monitor_pool_monitor_installed, self, 0); -#line 206 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 208 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _library_monitor_pool_unref0 (_tmp53_); -#line 207 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 209 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp54_ = library_monitor_pool_get_instance (); -#line 207 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 209 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp55_ = _tmp54_; -#line 207 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 209 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_connect_object (_tmp55_, "monitor-destroyed", (GCallback) _library_window_on_library_monitor_destroyed_library_monitor_pool_monitor_destroyed, self, 0); -#line 207 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _library_monitor_pool_unref0 (_tmp55_); #line 209 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _library_monitor_pool_unref0 (_tmp55_); +#line 211 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp56_ = camera_table_get_instance (); -#line 209 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 211 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp57_ = _tmp56_; -#line 209 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 211 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_connect_object (_tmp57_, "camera-added", (GCallback) _library_window_on_camera_added_camera_table_camera_added, self, 0); -#line 209 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _camera_table_unref0 (_tmp57_); #line 211 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _camera_table_unref0 (_tmp57_); +#line 213 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp58_ = self->priv->background_progress_bar; -#line 211 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 213 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" gtk_progress_bar_set_show_text (_tmp58_, TRUE); -#line 150 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 218 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + application_set_accels_for_action ("win.CommonDisplaySearchbar", accels, G_N_ELEMENTS (accels)); +#line 152 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (monitor); -#line 150 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 152 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" main_window_dnd_targets = (g_free (main_window_dnd_targets), NULL); -#line 150 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 152 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return self; -#line 2292 "LibraryWindow.c" +#line 2298 "LibraryWindow.c" } LibraryWindow* library_window_new (ProgressMonitor progress_monitor, void* progress_monitor_target) { -#line 150 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 152 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return library_window_construct (TYPE_LIBRARY_WINDOW, progress_monitor, progress_monitor_target); -#line 2299 "LibraryWindow.c" +#line 2305 "LibraryWindow.c" } static void _library_window_on_library_monitor_discovery_started_directory_monitor_discovery_started (DirectoryMonitor* _sender, gpointer self) { -#line 246 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 252 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_on_library_monitor_discovery_started ((LibraryWindow*) self); -#line 2306 "LibraryWindow.c" +#line 2312 "LibraryWindow.c" } static void _library_window_on_library_monitor_discovery_completed_directory_monitor_discovery_completed (DirectoryMonitor* _sender, gpointer self) { -#line 247 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 253 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_on_library_monitor_discovery_completed ((LibraryWindow*) self); -#line 2313 "LibraryWindow.c" +#line 2319 "LibraryWindow.c" } static void _library_window_on_library_monitor_discovery_completed_directory_monitor_closed (DirectoryMonitor* _sender, gpointer self) { -#line 248 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 254 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_on_library_monitor_discovery_completed ((LibraryWindow*) self); -#line 2320 "LibraryWindow.c" +#line 2326 "LibraryWindow.c" } static void _library_window_on_library_monitor_auto_update_progress_library_monitor_auto_update_progress (LibraryMonitor* _sender, gint completed_files, gint total_files, gpointer self) { -#line 249 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 255 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_on_library_monitor_auto_update_progress ((LibraryWindow*) self, completed_files, total_files); -#line 2327 "LibraryWindow.c" +#line 2333 "LibraryWindow.c" } static void _library_window_on_library_monitor_auto_import_preparing_library_monitor_auto_import_preparing (LibraryMonitor* _sender, gpointer self) { -#line 250 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 256 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_on_library_monitor_auto_import_preparing ((LibraryWindow*) self); -#line 2334 "LibraryWindow.c" +#line 2340 "LibraryWindow.c" } static void _library_window_on_library_monitor_auto_import_progress_library_monitor_auto_import_progress (LibraryMonitor* _sender, guint64 completed_bytes, guint64 total_bytes, gpointer self) { -#line 251 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 257 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_on_library_monitor_auto_import_progress ((LibraryWindow*) self, completed_bytes, total_bytes); -#line 2341 "LibraryWindow.c" +#line 2347 "LibraryWindow.c" } @@ -2353,51 +2359,51 @@ static void library_window_on_library_monitor_installed (LibraryWindow* self, Li LibraryMonitor* _tmp8_ = NULL; LibraryMonitor* _tmp9_ = NULL; LibraryMonitor* _tmp10_ = NULL; -#line 243 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 249 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 243 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 249 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_MONITOR (monitor)); -#line 244 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 250 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = monitor; -#line 244 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 250 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = directory_monitor_get_root (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DIRECTORY_MONITOR, DirectoryMonitor)); -#line 244 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 250 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = _tmp1_; -#line 244 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 250 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = g_file_get_path (_tmp2_); -#line 244 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 250 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp4_ = _tmp3_; -#line 244 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - g_debug ("LibraryWindow.vala:244: on_library_monitor_installed: %s", _tmp4_); -#line 244 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 250 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + g_debug ("LibraryWindow.vala:250: on_library_monitor_installed: %s", _tmp4_); +#line 250 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_free0 (_tmp4_); -#line 244 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 250 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp2_); -#line 246 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 252 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp5_ = monitor; -#line 246 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 252 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), "discovery-started", (GCallback) _library_window_on_library_monitor_discovery_started_directory_monitor_discovery_started, self, 0); -#line 247 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 253 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp6_ = monitor; -#line 247 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 253 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), "discovery-completed", (GCallback) _library_window_on_library_monitor_discovery_completed_directory_monitor_discovery_completed, self, 0); -#line 248 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 254 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp7_ = monitor; -#line 248 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 254 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), "closed", (GCallback) _library_window_on_library_monitor_discovery_completed_directory_monitor_closed, self, 0); -#line 249 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 255 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp8_ = monitor; -#line 249 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 255 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_connect_object (_tmp8_, "auto-update-progress", (GCallback) _library_window_on_library_monitor_auto_update_progress_library_monitor_auto_update_progress, self, 0); -#line 250 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 256 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp9_ = monitor; -#line 250 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 256 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_connect_object (_tmp9_, "auto-import-preparing", (GCallback) _library_window_on_library_monitor_auto_import_preparing_library_monitor_auto_import_preparing, self, 0); -#line 251 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 257 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp10_ = monitor; -#line 251 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 257 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_connect_object (_tmp10_, "auto-import-progress", (GCallback) _library_window_on_library_monitor_auto_import_progress_library_monitor_auto_import_progress, self, 0); -#line 2401 "LibraryWindow.c" +#line 2407 "LibraryWindow.c" } @@ -2419,84 +2425,84 @@ static void library_window_on_library_monitor_destroyed (LibraryWindow* self, Li guint _tmp14_ = 0U; LibraryMonitor* _tmp15_ = NULL; guint _tmp16_ = 0U; -#line 254 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 260 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 254 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 260 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_MONITOR (monitor)); -#line 255 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 261 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = monitor; -#line 255 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 261 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = directory_monitor_get_root (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DIRECTORY_MONITOR, DirectoryMonitor)); -#line 255 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 261 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = _tmp1_; -#line 255 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 261 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = g_file_get_path (_tmp2_); -#line 255 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 261 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp4_ = _tmp3_; -#line 255 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - g_debug ("LibraryWindow.vala:255: on_library_monitor_destroyed: %s", _tmp4_); -#line 255 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 261 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + g_debug ("LibraryWindow.vala:261: on_library_monitor_destroyed: %s", _tmp4_); +#line 261 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_free0 (_tmp4_); -#line 255 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 261 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp2_); -#line 257 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 263 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp5_ = monitor; -#line 257 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 263 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_parse_name ("discovery-started", TYPE_DIRECTORY_MONITOR, &_tmp6_, NULL, FALSE); -#line 257 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 263 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp6_, 0, NULL, (GCallback) _library_window_on_library_monitor_discovery_started_directory_monitor_discovery_started, self); -#line 258 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 264 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp7_ = monitor; -#line 258 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 264 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_parse_name ("discovery-completed", TYPE_DIRECTORY_MONITOR, &_tmp8_, NULL, FALSE); -#line 258 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 264 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp8_, 0, NULL, (GCallback) _library_window_on_library_monitor_discovery_completed_directory_monitor_discovery_completed, self); -#line 259 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 265 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp9_ = monitor; -#line 259 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 265 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_parse_name ("closed", TYPE_DIRECTORY_MONITOR, &_tmp10_, NULL, FALSE); -#line 259 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 265 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp10_, 0, NULL, (GCallback) _library_window_on_library_monitor_discovery_completed_directory_monitor_closed, self); -#line 260 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 266 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp11_ = monitor; -#line 260 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 266 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_parse_name ("auto-update-progress", TYPE_LIBRARY_MONITOR, &_tmp12_, NULL, FALSE); -#line 260 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 266 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_handlers_disconnect_matched (_tmp11_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp12_, 0, NULL, (GCallback) _library_window_on_library_monitor_auto_update_progress_library_monitor_auto_update_progress, self); -#line 261 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 267 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp13_ = monitor; -#line 261 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 267 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_parse_name ("auto-import-preparing", TYPE_LIBRARY_MONITOR, &_tmp14_, NULL, FALSE); -#line 261 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 267 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_handlers_disconnect_matched (_tmp13_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp14_, 0, NULL, (GCallback) _library_window_on_library_monitor_auto_import_preparing_library_monitor_auto_import_preparing, self); -#line 262 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 268 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp15_ = monitor; -#line 262 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 268 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_parse_name ("auto-import-progress", TYPE_LIBRARY_MONITOR, &_tmp16_, NULL, FALSE); -#line 262 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 268 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_handlers_disconnect_matched (_tmp15_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp16_, 0, NULL, (GCallback) _library_window_on_library_monitor_auto_import_progress_library_monitor_auto_import_progress, self); -#line 2479 "LibraryWindow.c" +#line 2485 "LibraryWindow.c" } static GVariant* _variant_new1 (gboolean value) { -#line 291 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 297 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return g_variant_ref_sink (g_variant_new_boolean (value)); -#line 2486 "LibraryWindow.c" +#line 2492 "LibraryWindow.c" } static GVariant* _variant_new2 (gboolean value) { -#line 292 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 298 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return g_variant_ref_sink (g_variant_new_boolean (value)); -#line 2493 "LibraryWindow.c" +#line 2499 "LibraryWindow.c" } static GVariant* _variant_new3 (gboolean value) { -#line 293 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 299 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return g_variant_ref_sink (g_variant_new_boolean (value)); -#line 2500 "LibraryWindow.c" +#line 2506 "LibraryWindow.c" } @@ -2517,71 +2523,71 @@ static void library_window_real_add_actions (AppWindow* base) { GAction* _tmp12_ = NULL; gboolean _tmp13_ = FALSE; GVariant* _tmp14_ = NULL; -#line 286 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 292 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_WINDOW, LibraryWindow); -#line 287 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 293 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" APP_WINDOW_CLASS (library_window_parent_class)->add_actions (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow)); -#line 288 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 294 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_action_map_add_action_entries (G_TYPE_CHECK_INSTANCE_CAST (self, g_action_map_get_type (), GActionMap), LIBRARY_WINDOW_common_actions, G_N_ELEMENTS (LIBRARY_WINDOW_common_actions), self); -#line 289 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 295 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = self->priv->search_actions; -#line 289 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 295 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = search_filter_actions_get_actions (_tmp0_, &_tmp1_); -#line 289 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 295 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = self->priv->search_actions; -#line 289 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 295 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_action_map_add_action_entries (G_TYPE_CHECK_INSTANCE_CAST (self, g_action_map_get_type (), GActionMap), _tmp2_, _tmp1_, _tmp3_); -#line 291 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 297 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp4_ = g_action_map_lookup_action (G_TYPE_CHECK_INSTANCE_CAST (self, g_action_map_get_type (), GActionMap), "CommonDisplaySearchbar"); -#line 291 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 297 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp5_ = config_facade_get_instance (); -#line 291 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 297 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp6_ = _tmp5_; -#line 291 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 297 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp7_ = configuration_facade_get_display_search_bar (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); -#line 291 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 297 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp8_ = _variant_new1 (_tmp7_); -#line 291 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 297 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_action_change_state (_tmp4_, _tmp8_); -#line 291 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 297 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_variant_unref0 (_tmp8_); -#line 291 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 297 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp6_); -#line 292 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 298 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp9_ = g_action_map_lookup_action (G_TYPE_CHECK_INSTANCE_CAST (self, g_action_map_get_type (), GActionMap), "CommonDisplaySidebar"); -#line 292 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 298 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp10_ = library_window_is_sidebar_visible (self); -#line 292 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 298 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp11_ = _variant_new2 (_tmp10_); -#line 292 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 298 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_action_change_state (_tmp9_, _tmp11_); -#line 292 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 298 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_variant_unref0 (_tmp11_); -#line 293 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 299 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp12_ = g_action_map_lookup_action (G_TYPE_CHECK_INSTANCE_CAST (self, g_action_map_get_type (), GActionMap), "CommonDisplayToolbar"); -#line 293 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 299 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp13_ = library_window_is_toolbar_visible (self); -#line 293 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 299 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp14_ = _variant_new3 (_tmp13_); -#line 293 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 299 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_action_change_state (_tmp12_, _tmp14_); -#line 293 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 299 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_variant_unref0 (_tmp14_); -#line 2571 "LibraryWindow.c" +#line 2577 "LibraryWindow.c" } static void _library_window_on_view_filter_installed_view_collection_view_filter_installed (ViewCollection* _sender, ViewFilter* filer, gpointer self) { -#line 301 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 307 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_on_view_filter_installed ((LibraryWindow*) self, filer); -#line 2578 "LibraryWindow.c" +#line 2584 "LibraryWindow.c" } static void _library_window_on_view_filter_removed_view_collection_view_filter_removed (ViewCollection* _sender, ViewFilter* filer, gpointer self) { -#line 302 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 308 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_on_view_filter_removed ((LibraryWindow*) self, filer); -#line 2585 "LibraryWindow.c" +#line 2591 "LibraryWindow.c" } @@ -2594,23 +2600,23 @@ static void library_window_real_switched_pages (PageWindow* base, Page* old_page SearchFilterActions* _tmp18_ = NULL; Page* _tmp19_ = NULL; Page* _tmp20_ = NULL; -#line 296 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 302 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_WINDOW, LibraryWindow); -#line 296 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 302 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail ((old_page == NULL) || IS_PAGE (old_page)); -#line 296 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 302 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail ((new_page == NULL) || IS_PAGE (new_page)); -#line 297 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 303 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = old_page; -#line 297 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 303 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = new_page; -#line 297 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 303 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" PAGE_WINDOW_CLASS (library_window_parent_class)->switched_pages (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), TYPE_PAGE_WINDOW, PageWindow), _tmp0_, _tmp1_); -#line 300 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 306 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = old_page; -#line 300 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 306 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp2_ != NULL) { -#line 2614 "LibraryWindow.c" +#line 2620 "LibraryWindow.c" Page* _tmp3_ = NULL; ViewCollection* _tmp4_ = NULL; ViewCollection* _tmp5_ = NULL; @@ -2619,126 +2625,126 @@ static void library_window_real_switched_pages (PageWindow* base, Page* old_page ViewCollection* _tmp8_ = NULL; ViewCollection* _tmp9_ = NULL; guint _tmp10_ = 0U; -#line 301 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 307 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = old_page; -#line 301 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 307 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp4_ = page_get_view (_tmp3_); -#line 301 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 307 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp5_ = _tmp4_; -#line 301 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 307 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_parse_name ("view-filter-installed", TYPE_VIEW_COLLECTION, &_tmp6_, NULL, FALSE); -#line 301 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 307 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_handlers_disconnect_matched (_tmp5_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp6_, 0, NULL, (GCallback) _library_window_on_view_filter_installed_view_collection_view_filter_installed, self); -#line 301 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 307 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _data_collection_unref0 (_tmp5_); -#line 302 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 308 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp7_ = old_page; -#line 302 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 308 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp8_ = page_get_view (_tmp7_); -#line 302 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 308 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp9_ = _tmp8_; -#line 302 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 308 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_parse_name ("view-filter-removed", TYPE_VIEW_COLLECTION, &_tmp10_, NULL, FALSE); -#line 302 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 308 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_handlers_disconnect_matched (_tmp9_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp10_, 0, NULL, (GCallback) _library_window_on_view_filter_removed_view_collection_view_filter_removed, self); -#line 302 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 308 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _data_collection_unref0 (_tmp9_); -#line 2647 "LibraryWindow.c" +#line 2653 "LibraryWindow.c" } -#line 305 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 311 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp11_ = new_page; -#line 305 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 311 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp11_ != NULL) { -#line 2653 "LibraryWindow.c" +#line 2659 "LibraryWindow.c" Page* _tmp12_ = NULL; ViewCollection* _tmp13_ = NULL; ViewCollection* _tmp14_ = NULL; Page* _tmp15_ = NULL; ViewCollection* _tmp16_ = NULL; ViewCollection* _tmp17_ = NULL; -#line 306 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 312 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp12_ = new_page; -#line 306 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 312 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp13_ = page_get_view (_tmp12_); -#line 306 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 312 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp14_ = _tmp13_; -#line 306 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 312 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_connect_object (_tmp14_, "view-filter-installed", (GCallback) _library_window_on_view_filter_installed_view_collection_view_filter_installed, self, 0); -#line 306 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 312 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _data_collection_unref0 (_tmp14_); -#line 307 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 313 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp15_ = new_page; -#line 307 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 313 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp16_ = page_get_view (_tmp15_); -#line 307 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 313 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp17_ = _tmp16_; -#line 307 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 313 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_connect_object (_tmp17_, "view-filter-removed", (GCallback) _library_window_on_view_filter_removed_view_collection_view_filter_removed, self, 0); -#line 307 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 313 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _data_collection_unref0 (_tmp17_); -#line 2680 "LibraryWindow.c" +#line 2686 "LibraryWindow.c" } -#line 310 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 316 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp18_ = self->priv->search_actions; -#line 310 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 316 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp19_ = old_page; -#line 310 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 316 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp20_ = new_page; -#line 310 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 316 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" search_filter_actions_monitor_page_contents (_tmp18_, _tmp19_, _tmp20_); -#line 2690 "LibraryWindow.c" +#line 2696 "LibraryWindow.c" } static void _library_window_on_view_filter_refreshed_view_filter_refresh (ViewFilter* _sender, gpointer self) { -#line 314 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 320 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_on_view_filter_refreshed ((LibraryWindow*) self); -#line 2697 "LibraryWindow.c" +#line 2703 "LibraryWindow.c" } static void library_window_on_view_filter_installed (LibraryWindow* self, ViewFilter* filter) { ViewFilter* _tmp0_ = NULL; -#line 313 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 319 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 313 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 319 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_VIEW_FILTER (filter)); -#line 314 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 320 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = filter; -#line 314 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 320 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_connect_object (_tmp0_, "refresh", (GCallback) _library_window_on_view_filter_refreshed_view_filter_refresh, self, 0); -#line 2711 "LibraryWindow.c" +#line 2717 "LibraryWindow.c" } static void library_window_on_view_filter_removed (LibraryWindow* self, ViewFilter* filter) { ViewFilter* _tmp0_ = NULL; guint _tmp1_ = 0U; -#line 317 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 323 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 317 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 323 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_VIEW_FILTER (filter)); -#line 318 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 324 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = filter; -#line 318 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 324 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_parse_name ("refresh", TYPE_VIEW_FILTER, &_tmp1_, NULL, FALSE); -#line 318 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 324 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _library_window_on_view_filter_refreshed_view_filter_refresh, self); -#line 2728 "LibraryWindow.c" +#line 2734 "LibraryWindow.c" } static gpointer _g_object_ref0 (gpointer self) { -#line 328 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 334 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return self ? g_object_ref (self) : NULL; -#line 2735 "LibraryWindow.c" +#line 2741 "LibraryWindow.c" } static GVariant* _variant_new4 (gboolean value) { -#line 331 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 337 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return g_variant_ref_sink (g_variant_new_boolean (value)); -#line 2742 "LibraryWindow.c" +#line 2748 "LibraryWindow.c" } @@ -2753,56 +2759,56 @@ static void library_window_on_view_filter_refreshed (LibraryWindow* self) { GAction* _tmp6_ = NULL; GAction* _tmp7_ = NULL; GAction* _tmp8_ = NULL; -#line 321 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 327 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 324 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 330 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow)); -#line 324 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 330 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = _tmp0_; -#line 324 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 330 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = page_get_view (_tmp1_); -#line 324 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 330 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = _tmp2_; -#line 324 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 330 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp4_ = view_collection_are_items_filtered_out (_tmp3_); -#line 324 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 330 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp5_ = !_tmp4_; -#line 324 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 330 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _data_collection_unref0 (_tmp3_); -#line 324 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 330 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp1_); -#line 324 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 330 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp5_) { -#line 325 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 331 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return; -#line 2779 "LibraryWindow.c" +#line 2785 "LibraryWindow.c" } -#line 328 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 334 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp6_ = g_action_map_lookup_action (G_TYPE_CHECK_INSTANCE_CAST (self, g_action_map_get_type (), GActionMap), "CommonDisplaySearchbar"); -#line 328 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 334 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp7_ = _g_object_ref0 (_tmp6_); -#line 328 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 334 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" action = _tmp7_; -#line 330 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 336 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp8_ = action; -#line 330 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 336 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp8_ != NULL) { -#line 2791 "LibraryWindow.c" +#line 2797 "LibraryWindow.c" GAction* _tmp9_ = NULL; GVariant* _tmp10_ = NULL; -#line 331 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 337 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp9_ = action; -#line 331 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 337 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp10_ = _variant_new4 (TRUE); -#line 331 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 337 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_action_change_state (_tmp9_, _tmp10_); -#line 331 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 337 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_variant_unref0 (_tmp10_); -#line 2802 "LibraryWindow.c" +#line 2808 "LibraryWindow.c" } -#line 321 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 327 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (action); -#line 2806 "LibraryWindow.c" +#line 2812 "LibraryWindow.c" } @@ -2826,87 +2832,87 @@ static void library_window_real_show_all (GtkWidget* base) { gboolean _tmp15_ = FALSE; CheckerboardPage* _tmp16_ = NULL; gboolean _tmp17_ = FALSE; -#line 335 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 341 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_WINDOW, LibraryWindow); -#line 336 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 342 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" GTK_WIDGET_CLASS (library_window_parent_class)->show_all (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), gtk_widget_get_type (), GtkWidget)); -#line 338 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 344 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow)); -#line 338 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 344 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = _tmp0_; -#line 338 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 344 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = page_get_common_action (_tmp1_, "CommonDisplayBasicProperties", TRUE); -#line 338 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 344 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = _tmp2_; -#line 338 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 344 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp1_); -#line 338 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 344 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" basic_properties_action = _tmp3_; -#line 340 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 346 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp4_ = basic_properties_action; -#line 340 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 346 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _vala_assert (_tmp4_ != NULL, "basic_properties_action != null"); -#line 342 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 348 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp5_ = basic_properties_action; -#line 342 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 348 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp6_ = g_action_get_state (_tmp5_); -#line 342 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 348 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp7_ = _tmp6_; -#line 342 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 348 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp8_ = g_variant_get_boolean (_tmp7_); -#line 342 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 348 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp9_ = !_tmp8_; -#line 342 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 348 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_variant_unref0 (_tmp7_); -#line 342 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 348 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp9_) { -#line 2864 "LibraryWindow.c" +#line 2870 "LibraryWindow.c" GtkFrame* _tmp10_ = NULL; -#line 343 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 349 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp10_ = self->priv->bottom_frame; -#line 343 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 349 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_widget_get_type (), GtkWidget)); -#line 2870 "LibraryWindow.c" +#line 2876 "LibraryWindow.c" } -#line 346 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 352 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp11_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow)); -#line 346 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 352 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp12_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp11_, TYPE_CHECKERBOARD_PAGE) ? ((CheckerboardPage*) _tmp11_) : NULL; -#line 346 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 352 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp12_ == NULL) { -#line 346 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 352 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp11_); -#line 2880 "LibraryWindow.c" +#line 2886 "LibraryWindow.c" } -#line 346 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 352 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" current_page = _tmp12_; -#line 347 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 353 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp13_ = current_page; -#line 347 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 353 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp13_ != NULL) { -#line 2888 "LibraryWindow.c" +#line 2894 "LibraryWindow.c" CheckerboardPage* _tmp14_ = NULL; -#line 348 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 354 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp14_ = current_page; -#line 348 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 354 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_init_view_filter (self, _tmp14_); -#line 2894 "LibraryWindow.c" +#line 2900 "LibraryWindow.c" } -#line 350 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 356 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp15_ = library_window_should_show_search_bar (self); -#line 350 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 356 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp16_ = current_page; -#line 350 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 356 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_toggle_search_bar (self, _tmp15_, _tmp16_); -#line 353 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 359 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp17_ = library_window_is_sidebar_visible (self); -#line 353 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 359 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_set_sidebar_visible (self, _tmp17_); -#line 335 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 341 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (current_page); -#line 335 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 341 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (basic_properties_action); -#line 2910 "LibraryWindow.c" +#line 2916 "LibraryWindow.c" } @@ -2915,77 +2921,77 @@ LibraryWindow* library_window_get_app (void) { AppWindow* _tmp0_ = NULL; AppWindow* _tmp1_ = NULL; LibraryWindow* _tmp2_ = NULL; -#line 357 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 363 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = app_window_instance; -#line 357 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 363 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _vala_assert (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_LIBRARY_WINDOW), "instance is LibraryWindow"); -#line 359 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 365 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = app_window_instance; -#line 359 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 365 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_LIBRARY_WINDOW, LibraryWindow)); -#line 359 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 365 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" result = _tmp2_; -#line 359 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 365 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return result; -#line 2931 "LibraryWindow.c" +#line 2937 "LibraryWindow.c" } gboolean library_window_is_mount_uri_supported (const gchar* uri) { gboolean result = FALSE; -#line 363 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 369 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_val_if_fail (uri != NULL, FALSE); -#line 2939 "LibraryWindow.c" +#line 2945 "LibraryWindow.c" { const gchar** scheme_collection = NULL; gint scheme_collection_length1 = 0; gint _scheme_collection_size_ = 0; gint scheme_it = 0; -#line 364 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 370 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" scheme_collection = LIBRARY_WINDOW_SUPPORTED_MOUNT_SCHEMES; -#line 364 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 370 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" scheme_collection_length1 = G_N_ELEMENTS (LIBRARY_WINDOW_SUPPORTED_MOUNT_SCHEMES); -#line 364 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 370 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" for (scheme_it = 0; scheme_it < G_N_ELEMENTS (LIBRARY_WINDOW_SUPPORTED_MOUNT_SCHEMES); scheme_it = scheme_it + 1) { -#line 2951 "LibraryWindow.c" +#line 2957 "LibraryWindow.c" gchar* _tmp0_ = NULL; gchar* scheme = NULL; -#line 364 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 370 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = g_strdup (scheme_collection[scheme_it]); -#line 364 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 370 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" scheme = _tmp0_; -#line 2958 "LibraryWindow.c" +#line 2964 "LibraryWindow.c" { const gchar* _tmp1_ = NULL; const gchar* _tmp2_ = NULL; gboolean _tmp3_ = FALSE; -#line 365 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 371 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = uri; -#line 365 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 371 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = scheme; -#line 365 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 371 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = g_str_has_prefix (_tmp1_, _tmp2_); -#line 365 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 371 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp3_) { -#line 366 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 372 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" result = TRUE; -#line 366 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 372 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_free0 (scheme); -#line 366 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 372 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return result; -#line 2977 "LibraryWindow.c" +#line 2983 "LibraryWindow.c" } -#line 364 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 370 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_free0 (scheme); -#line 2981 "LibraryWindow.c" +#line 2987 "LibraryWindow.c" } } } -#line 369 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 375 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" result = FALSE; -#line 369 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 375 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return result; -#line 2989 "LibraryWindow.c" +#line 2995 "LibraryWindow.c" } @@ -2993,15 +2999,15 @@ static gchar* library_window_real_get_app_role (AppWindow* base) { LibraryWindow * self; gchar* result = NULL; gchar* _tmp0_ = NULL; -#line 372 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 378 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_WINDOW, LibraryWindow); -#line 373 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 379 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = g_strdup (RESOURCES_APP_LIBRARY_ROLE); -#line 373 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 379 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" result = _tmp0_; -#line 373 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 379 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return result; -#line 3005 "LibraryWindow.c" +#line 3011 "LibraryWindow.c" } @@ -3011,40 +3017,40 @@ void library_window_rename_tag_in_sidebar (LibraryWindow* self, Tag* tag) { Tag* _tmp1_ = NULL; TagsSidebarEntry* _tmp2_ = NULL; TagsSidebarEntry* _tmp3_ = NULL; -#line 376 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 382 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 376 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 382 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_TAG (tag)); -#line 377 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 383 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = self->priv->tags_branch; -#line 377 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 383 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = tag; -#line 377 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 383 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = tags_branch_get_entry_for_tag (_tmp0_, _tmp1_); -#line 377 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 383 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" entry = _tmp2_; -#line 378 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 384 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = entry; -#line 378 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 384 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp3_ != NULL) { -#line 3031 "LibraryWindow.c" +#line 3037 "LibraryWindow.c" SidebarTree* _tmp4_ = NULL; TagsSidebarEntry* _tmp5_ = NULL; -#line 379 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 385 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp4_ = self->priv->sidebar_tree; -#line 379 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 385 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp5_ = entry; -#line 379 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 385 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" sidebar_tree_rename_entry_in_place (_tmp4_, G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, SIDEBAR_TYPE_ENTRY, SidebarEntry)); -#line 3040 "LibraryWindow.c" +#line 3046 "LibraryWindow.c" } else { -#line 381 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - g_debug ("LibraryWindow.vala:381: No tag entry found for rename"); -#line 3044 "LibraryWindow.c" +#line 387 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + g_debug ("LibraryWindow.vala:387: No tag entry found for rename"); +#line 3050 "LibraryWindow.c" } -#line 376 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 382 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (entry); -#line 3048 "LibraryWindow.c" +#line 3054 "LibraryWindow.c" } @@ -3054,40 +3060,40 @@ void library_window_rename_event_in_sidebar (LibraryWindow* self, Event* event) Event* _tmp1_ = NULL; EventsEventEntry* _tmp2_ = NULL; EventsEventEntry* _tmp3_ = NULL; -#line 384 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 390 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 384 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 390 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_EVENT (event)); -#line 385 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 391 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = self->priv->events_branch; -#line 385 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 391 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = event; -#line 385 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 391 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = events_branch_get_entry_for_event (_tmp0_, _tmp1_); -#line 385 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 391 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" entry = _tmp2_; -#line 386 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 392 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = entry; -#line 386 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 392 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp3_ != NULL) { -#line 3074 "LibraryWindow.c" +#line 3080 "LibraryWindow.c" SidebarTree* _tmp4_ = NULL; EventsEventEntry* _tmp5_ = NULL; -#line 387 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 393 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp4_ = self->priv->sidebar_tree; -#line 387 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 393 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp5_ = entry; -#line 387 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 393 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" sidebar_tree_rename_entry_in_place (_tmp4_, G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, SIDEBAR_TYPE_ENTRY, SidebarEntry)); -#line 3083 "LibraryWindow.c" +#line 3089 "LibraryWindow.c" } else { -#line 389 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - g_debug ("LibraryWindow.vala:389: No event entry found for rename"); -#line 3087 "LibraryWindow.c" +#line 395 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + g_debug ("LibraryWindow.vala:395: No event entry found for rename"); +#line 3093 "LibraryWindow.c" } -#line 384 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 390 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (entry); -#line 3091 "LibraryWindow.c" +#line 3097 "LibraryWindow.c" } @@ -3097,40 +3103,40 @@ void library_window_rename_search_in_sidebar (LibraryWindow* self, SavedSearch* SavedSearch* _tmp1_ = NULL; SearchesSidebarEntry* _tmp2_ = NULL; SearchesSidebarEntry* _tmp3_ = NULL; -#line 392 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 398 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 392 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 398 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_SAVED_SEARCH (search)); -#line 393 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 399 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = self->priv->saved_search_branch; -#line 393 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 399 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = search; -#line 393 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 399 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = searches_branch_get_entry_for_saved_search (_tmp0_, _tmp1_); -#line 393 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 399 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" entry = _tmp2_; -#line 394 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 400 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = entry; -#line 394 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 400 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp3_ != NULL) { -#line 3117 "LibraryWindow.c" +#line 3123 "LibraryWindow.c" SidebarTree* _tmp4_ = NULL; SearchesSidebarEntry* _tmp5_ = NULL; -#line 395 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 401 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp4_ = self->priv->sidebar_tree; -#line 395 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 401 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp5_ = entry; -#line 395 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 401 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" sidebar_tree_rename_entry_in_place (_tmp4_, G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, SIDEBAR_TYPE_ENTRY, SidebarEntry)); -#line 3126 "LibraryWindow.c" +#line 3132 "LibraryWindow.c" } else { -#line 397 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - g_debug ("LibraryWindow.vala:397: No search entry found for rename"); -#line 3130 "LibraryWindow.c" +#line 403 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + g_debug ("LibraryWindow.vala:403: No search entry found for rename"); +#line 3136 "LibraryWindow.c" } -#line 392 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 398 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (entry); -#line 3134 "LibraryWindow.c" +#line 3140 "LibraryWindow.c" } @@ -3145,37 +3151,37 @@ static void library_window_real_on_quit (AppWindow* base) { GtkPaned* _tmp6_ = NULL; gint _tmp7_ = 0; gint _tmp8_ = 0; -#line 400 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 406 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_WINDOW, LibraryWindow); -#line 401 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 407 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = config_facade_get_instance (); -#line 401 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 407 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = _tmp0_; -#line 401 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 407 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow)->maximized; -#line 401 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 407 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow)->dimensions; -#line 401 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 407 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" configuration_facade_set_library_window_state (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp2_, &_tmp3_); -#line 401 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 407 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp1_); -#line 403 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 409 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp4_ = config_facade_get_instance (); -#line 403 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 409 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp5_ = _tmp4_; -#line 403 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 409 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp6_ = self->priv->client_paned; -#line 403 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 409 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp7_ = gtk_paned_get_position (_tmp6_); -#line 403 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 409 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp8_ = _tmp7_; -#line 403 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 409 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" configuration_facade_set_sidebar_position (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp8_); -#line 403 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 409 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp5_); -#line 405 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 411 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" APP_WINDOW_CLASS (library_window_parent_class)->on_quit (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow)); -#line 3179 "LibraryWindow.c" +#line 3185 "LibraryWindow.c" } @@ -3192,105 +3198,105 @@ static Photo* library_window_get_start_fullscreen_photo (LibraryWindow* self, Co Photo* _tmp10_ = NULL; gboolean _tmp11_ = FALSE; GeeList* _tmp12_ = NULL; -#line 408 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 414 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_val_if_fail (IS_LIBRARY_WINDOW (self), NULL); -#line 408 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 414 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_val_if_fail (IS_COLLECTION_PAGE (page), NULL); -#line 409 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 415 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = page; -#line 409 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 415 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PAGE, Page)); -#line 409 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 415 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" view = _tmp1_; -#line 413 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 419 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = view; -#line 413 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 419 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp4_ = view_collection_get_selected_count (_tmp3_); -#line 413 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 419 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp4_ > 0) { -#line 3212 "LibraryWindow.c" +#line 3218 "LibraryWindow.c" ViewCollection* _tmp5_ = NULL; GeeList* _tmp6_ = NULL; -#line 414 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 420 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp5_ = view; -#line 414 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 420 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp6_ = view_collection_get_selected_sources_of_type (_tmp5_, TYPE_LIBRARY_PHOTO); -#line 414 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 420 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp2_); -#line 414 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 420 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = _tmp6_; -#line 3223 "LibraryWindow.c" +#line 3229 "LibraryWindow.c" } else { ViewCollection* _tmp7_ = NULL; GeeList* _tmp8_ = NULL; -#line 415 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 421 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp7_ = view; -#line 415 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 421 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp8_ = view_collection_get_sources_of_type (_tmp7_, TYPE_LIBRARY_PHOTO); -#line 415 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 421 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp2_); -#line 415 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 421 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = _tmp8_; -#line 3235 "LibraryWindow.c" +#line 3241 "LibraryWindow.c" } -#line 413 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 419 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp9_ = _g_object_ref0 (_tmp2_); -#line 413 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 419 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" sources = _tmp9_; -#line 417 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 423 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp12_ = sources; -#line 417 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 423 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp12_ != NULL) { -#line 3245 "LibraryWindow.c" +#line 3251 "LibraryWindow.c" GeeList* _tmp13_ = NULL; gint _tmp14_ = 0; gint _tmp15_ = 0; -#line 417 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 423 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp13_ = sources; -#line 417 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 423 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp14_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_COLLECTION, GeeCollection)); -#line 417 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 423 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp15_ = _tmp14_; -#line 417 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 423 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp11_ = _tmp15_ != 0; -#line 3257 "LibraryWindow.c" +#line 3263 "LibraryWindow.c" } else { -#line 417 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 423 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp11_ = FALSE; -#line 3261 "LibraryWindow.c" +#line 3267 "LibraryWindow.c" } -#line 417 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 423 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp11_) { -#line 3265 "LibraryWindow.c" +#line 3271 "LibraryWindow.c" GeeList* _tmp16_ = NULL; gpointer _tmp17_ = NULL; -#line 418 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp16_ = sources; -#line 418 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp17_ = gee_list_get (_tmp16_, 0); -#line 418 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp10_); -#line 418 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp10_ = G_TYPE_CHECK_INSTANCE_CAST ((DataSource*) _tmp17_, TYPE_PHOTO, Photo); -#line 3276 "LibraryWindow.c" +#line 3282 "LibraryWindow.c" } else { -#line 418 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp10_); -#line 418 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp10_ = NULL; -#line 3282 "LibraryWindow.c" +#line 3288 "LibraryWindow.c" } -#line 417 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 423 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" result = _tmp10_; -#line 417 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 423 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (sources); -#line 417 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 423 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp2_); -#line 417 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 423 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _data_collection_unref0 (view); -#line 417 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 423 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return result; -#line 3294 "LibraryWindow.c" +#line 3300 "LibraryWindow.c" } @@ -3302,27 +3308,27 @@ static gboolean library_window_get_fullscreen_photo (LibraryWindow* self, Page* Page* _tmp0_ = NULL; Page* _tmp8_ = NULL; Page* _tmp30_ = NULL; -#line 421 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 427 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_val_if_fail (IS_LIBRARY_WINDOW (self), FALSE); -#line 421 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 427 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_val_if_fail (IS_PAGE (page), FALSE); -#line 423 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 429 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_vala_collection); -#line 423 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 429 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _vala_collection = NULL; -#line 424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 430 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_vala_start); -#line 424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 430 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _vala_start = NULL; -#line 425 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 431 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _data_collection_unref0 (_vala_view_collection); -#line 425 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 431 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _vala_view_collection = NULL; -#line 428 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 434 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = page; -#line 428 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 434 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_COLLECTION_PAGE)) { -#line 3326 "LibraryWindow.c" +#line 3332 "LibraryWindow.c" Page* _tmp1_ = NULL; CollectionPage* _tmp2_ = NULL; Photo* photo = NULL; @@ -3331,117 +3337,117 @@ static gboolean library_window_get_fullscreen_photo (LibraryWindow* self, Page* Photo* _tmp5_ = NULL; Photo* _tmp6_ = NULL; Photo* _tmp7_ = NULL; -#line 429 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 435 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = page; -#line 429 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 435 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_COLLECTION_PAGE, CollectionPage)); -#line 429 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 435 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_vala_collection); -#line 429 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 435 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _vala_collection = _tmp2_; -#line 430 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 436 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = _vala_collection; -#line 430 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 436 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp4_ = library_window_get_start_fullscreen_photo (self, _tmp3_); -#line 430 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 436 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" photo = _tmp4_; -#line 431 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 437 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp5_ = photo; -#line 431 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 437 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp5_ == NULL) { -#line 432 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 438 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" result = FALSE; -#line 432 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 438 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (photo); -#line 432 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 438 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (collection) { -#line 432 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 438 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" *collection = _vala_collection; -#line 3361 "LibraryWindow.c" +#line 3367 "LibraryWindow.c" } else { -#line 432 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 438 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_vala_collection); -#line 3365 "LibraryWindow.c" +#line 3371 "LibraryWindow.c" } -#line 432 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 438 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (start) { -#line 432 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 438 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" *start = _vala_start; -#line 3371 "LibraryWindow.c" +#line 3377 "LibraryWindow.c" } else { -#line 432 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 438 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_vala_start); -#line 3375 "LibraryWindow.c" +#line 3381 "LibraryWindow.c" } -#line 432 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 438 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (view_collection) { -#line 432 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 438 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" *view_collection = _vala_view_collection; -#line 3381 "LibraryWindow.c" +#line 3387 "LibraryWindow.c" } else { -#line 432 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 438 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _data_collection_unref0 (_vala_view_collection); -#line 3385 "LibraryWindow.c" +#line 3391 "LibraryWindow.c" } -#line 432 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 438 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return result; -#line 3389 "LibraryWindow.c" +#line 3395 "LibraryWindow.c" } -#line 434 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 440 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp6_ = photo; -#line 434 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 440 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp7_ = _g_object_ref0 (_tmp6_); -#line 434 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 440 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_vala_start); -#line 434 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 440 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _vala_start = _tmp7_; -#line 435 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 441 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _data_collection_unref0 (_vala_view_collection); -#line 435 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 441 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _vala_view_collection = NULL; -#line 437 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 443 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" result = TRUE; -#line 437 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 443 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (photo); -#line 437 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 443 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (collection) { -#line 437 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 443 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" *collection = _vala_collection; -#line 3411 "LibraryWindow.c" +#line 3417 "LibraryWindow.c" } else { -#line 437 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 443 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_vala_collection); -#line 3415 "LibraryWindow.c" +#line 3421 "LibraryWindow.c" } -#line 437 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 443 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (start) { -#line 437 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 443 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" *start = _vala_start; -#line 3421 "LibraryWindow.c" +#line 3427 "LibraryWindow.c" } else { -#line 437 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 443 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_vala_start); -#line 3425 "LibraryWindow.c" +#line 3431 "LibraryWindow.c" } -#line 437 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 443 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (view_collection) { -#line 437 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 443 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" *view_collection = _vala_view_collection; -#line 3431 "LibraryWindow.c" +#line 3437 "LibraryWindow.c" } else { -#line 437 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 443 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _data_collection_unref0 (_vala_view_collection); -#line 3435 "LibraryWindow.c" +#line 3441 "LibraryWindow.c" } -#line 437 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 443 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return result; -#line 3439 "LibraryWindow.c" +#line 3445 "LibraryWindow.c" } -#line 440 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 446 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp8_ = page; -#line 440 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 446 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp8_, TYPE_EVENTS_DIRECTORY_PAGE)) { -#line 3445 "LibraryWindow.c" +#line 3451 "LibraryWindow.c" ViewCollection* view = NULL; Page* _tmp9_ = NULL; ViewCollection* _tmp10_ = NULL; @@ -3467,291 +3473,291 @@ static gboolean library_window_get_fullscreen_photo (LibraryWindow* self, Page* Photo* _tmp27_ = NULL; Photo* _tmp28_ = NULL; Photo* _tmp29_ = NULL; -#line 441 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 447 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp9_ = page; -#line 441 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 447 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp10_ = page_get_view (_tmp9_); -#line 441 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 447 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" view = _tmp10_; -#line 442 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 448 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp11_ = view; -#line 442 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 448 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp12_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_DATA_COLLECTION, DataCollection)); -#line 442 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 448 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp12_ == 0) { -#line 443 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 449 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" result = FALSE; -#line 443 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 449 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _data_collection_unref0 (view); -#line 443 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 449 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (collection) { -#line 443 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 449 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" *collection = _vala_collection; -#line 3491 "LibraryWindow.c" +#line 3497 "LibraryWindow.c" } else { -#line 443 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 449 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_vala_collection); -#line 3495 "LibraryWindow.c" +#line 3501 "LibraryWindow.c" } -#line 443 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 449 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (start) { -#line 443 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 449 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" *start = _vala_start; -#line 3501 "LibraryWindow.c" +#line 3507 "LibraryWindow.c" } else { -#line 443 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 449 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_vala_start); -#line 3505 "LibraryWindow.c" +#line 3511 "LibraryWindow.c" } -#line 443 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 449 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (view_collection) { -#line 443 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 449 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" *view_collection = _vala_view_collection; -#line 3511 "LibraryWindow.c" +#line 3517 "LibraryWindow.c" } else { -#line 443 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 449 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _data_collection_unref0 (_vala_view_collection); -#line 3515 "LibraryWindow.c" +#line 3521 "LibraryWindow.c" } -#line 443 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 449 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return result; -#line 3519 "LibraryWindow.c" +#line 3525 "LibraryWindow.c" } -#line 445 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 451 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp13_ = view; -#line 445 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 451 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp14_ = data_collection_get_at (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_DATA_COLLECTION, DataCollection), 0); -#line 445 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 451 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp15_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_DATA_VIEW, DataView); -#line 445 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 451 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp16_ = data_view_get_source (_tmp15_); -#line 445 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 451 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp17_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_EVENT, Event); -#line 445 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 451 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp15_); -#line 445 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 451 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" event = _tmp17_; -#line 446 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 452 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp18_ = event; -#line 446 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 452 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp18_ == NULL) { -#line 447 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 453 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" result = FALSE; -#line 447 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 453 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (event); -#line 447 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 453 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _data_collection_unref0 (view); -#line 447 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 453 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (collection) { -#line 447 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 453 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" *collection = _vala_collection; -#line 3549 "LibraryWindow.c" +#line 3555 "LibraryWindow.c" } else { -#line 447 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 453 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_vala_collection); -#line 3553 "LibraryWindow.c" +#line 3559 "LibraryWindow.c" } -#line 447 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 453 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (start) { -#line 447 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 453 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" *start = _vala_start; -#line 3559 "LibraryWindow.c" +#line 3565 "LibraryWindow.c" } else { -#line 447 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 453 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_vala_start); -#line 3563 "LibraryWindow.c" +#line 3569 "LibraryWindow.c" } -#line 447 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 453 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (view_collection) { -#line 447 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 453 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" *view_collection = _vala_view_collection; -#line 3569 "LibraryWindow.c" +#line 3575 "LibraryWindow.c" } else { -#line 447 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 453 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _data_collection_unref0 (_vala_view_collection); -#line 3573 "LibraryWindow.c" +#line 3579 "LibraryWindow.c" } -#line 447 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 453 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return result; -#line 3577 "LibraryWindow.c" +#line 3583 "LibraryWindow.c" } -#line 449 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 455 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp19_ = self->priv->events_branch; -#line 449 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 455 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp20_ = event; -#line 449 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 455 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp21_ = events_branch_get_entry_for_event (_tmp19_, _tmp20_); -#line 449 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 455 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" entry = _tmp21_; -#line 450 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 456 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp22_ = entry; -#line 450 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 456 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp22_ == NULL) { -#line 451 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 457 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" result = FALSE; -#line 451 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 457 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (entry); -#line 451 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 457 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (event); -#line 451 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 457 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _data_collection_unref0 (view); -#line 451 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 457 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (collection) { -#line 451 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 457 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" *collection = _vala_collection; -#line 3603 "LibraryWindow.c" +#line 3609 "LibraryWindow.c" } else { -#line 451 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 457 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_vala_collection); -#line 3607 "LibraryWindow.c" +#line 3613 "LibraryWindow.c" } -#line 451 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 457 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (start) { -#line 451 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 457 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" *start = _vala_start; -#line 3613 "LibraryWindow.c" +#line 3619 "LibraryWindow.c" } else { -#line 451 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 457 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_vala_start); -#line 3617 "LibraryWindow.c" +#line 3623 "LibraryWindow.c" } -#line 451 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 457 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (view_collection) { -#line 451 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 457 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" *view_collection = _vala_view_collection; -#line 3623 "LibraryWindow.c" +#line 3629 "LibraryWindow.c" } else { -#line 451 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 457 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _data_collection_unref0 (_vala_view_collection); -#line 3627 "LibraryWindow.c" +#line 3633 "LibraryWindow.c" } -#line 451 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 457 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return result; -#line 3631 "LibraryWindow.c" +#line 3637 "LibraryWindow.c" } -#line 453 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 459 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp23_ = entry; -#line 453 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 459 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp24_ = sidebar_page_representative_get_page (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, SIDEBAR_TYPE_PAGE_REPRESENTATIVE, SidebarPageRepresentative)); -#line 453 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 459 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_vala_collection); -#line 453 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 459 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _vala_collection = G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, TYPE_EVENT_PAGE, EventPage), TYPE_COLLECTION_PAGE, CollectionPage); -#line 454 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 460 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp25_ = _vala_collection; -#line 454 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 460 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp26_ = library_window_get_start_fullscreen_photo (self, _tmp25_); -#line 454 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 460 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" photo = _tmp26_; -#line 455 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 461 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp27_ = photo; -#line 455 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 461 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp27_ == NULL) { -#line 456 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 462 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" result = FALSE; -#line 456 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 462 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (photo); -#line 456 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 462 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (entry); -#line 456 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 462 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (event); -#line 456 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 462 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _data_collection_unref0 (view); -#line 456 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 462 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (collection) { -#line 456 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 462 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" *collection = _vala_collection; -#line 3665 "LibraryWindow.c" +#line 3671 "LibraryWindow.c" } else { -#line 456 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 462 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_vala_collection); -#line 3669 "LibraryWindow.c" +#line 3675 "LibraryWindow.c" } -#line 456 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 462 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (start) { -#line 456 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 462 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" *start = _vala_start; -#line 3675 "LibraryWindow.c" +#line 3681 "LibraryWindow.c" } else { -#line 456 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 462 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_vala_start); -#line 3679 "LibraryWindow.c" +#line 3685 "LibraryWindow.c" } -#line 456 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 462 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (view_collection) { -#line 456 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 462 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" *view_collection = _vala_view_collection; -#line 3685 "LibraryWindow.c" +#line 3691 "LibraryWindow.c" } else { -#line 456 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 462 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _data_collection_unref0 (_vala_view_collection); -#line 3689 "LibraryWindow.c" +#line 3695 "LibraryWindow.c" } -#line 456 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 462 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return result; -#line 3693 "LibraryWindow.c" +#line 3699 "LibraryWindow.c" } -#line 458 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 464 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp28_ = photo; -#line 458 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 464 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp29_ = _g_object_ref0 (_tmp28_); -#line 458 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 464 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_vala_start); -#line 458 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 464 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _vala_start = _tmp29_; -#line 459 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 465 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _data_collection_unref0 (_vala_view_collection); -#line 459 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 465 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _vala_view_collection = NULL; -#line 461 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 467 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" result = TRUE; -#line 461 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 467 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (photo); -#line 461 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 467 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (entry); -#line 461 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 467 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (event); -#line 461 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 467 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _data_collection_unref0 (view); -#line 461 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 467 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (collection) { -#line 461 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 467 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" *collection = _vala_collection; -#line 3721 "LibraryWindow.c" +#line 3727 "LibraryWindow.c" } else { -#line 461 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 467 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_vala_collection); -#line 3725 "LibraryWindow.c" +#line 3731 "LibraryWindow.c" } -#line 461 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 467 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (start) { -#line 461 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 467 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" *start = _vala_start; -#line 3731 "LibraryWindow.c" +#line 3737 "LibraryWindow.c" } else { -#line 461 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 467 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_vala_start); -#line 3735 "LibraryWindow.c" +#line 3741 "LibraryWindow.c" } -#line 461 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 467 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (view_collection) { -#line 461 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 467 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" *view_collection = _vala_view_collection; -#line 3741 "LibraryWindow.c" +#line 3747 "LibraryWindow.c" } else { -#line 461 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 467 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _data_collection_unref0 (_vala_view_collection); -#line 3745 "LibraryWindow.c" +#line 3751 "LibraryWindow.c" } -#line 461 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 467 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return result; -#line 3749 "LibraryWindow.c" +#line 3755 "LibraryWindow.c" } -#line 464 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 470 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp30_ = page; -#line 464 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 470 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp30_, TYPE_LIBRARY_PHOTO_PAGE)) { -#line 3755 "LibraryWindow.c" +#line 3761 "LibraryWindow.c" LibraryPhotoPage* photo_page = NULL; Page* _tmp31_ = NULL; LibraryPhotoPage* _tmp32_ = NULL; @@ -3767,207 +3773,207 @@ static gboolean library_window_get_fullscreen_photo (LibraryWindow* self, Page* Photo* _tmp41_ = NULL; LibraryPhotoPage* _tmp42_ = NULL; ViewCollection* _tmp43_ = NULL; -#line 465 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 471 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp31_ = page; -#line 465 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 471 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp32_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage)); -#line 465 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 471 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" photo_page = _tmp32_; -#line 467 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 473 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp33_ = photo_page; -#line 467 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 473 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp34_ = library_photo_page_get_controller_page (_tmp33_); -#line 467 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 473 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" controller = _tmp34_; -#line 468 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 474 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp35_ = controller; -#line 468 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 474 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp35_ == NULL) { -#line 469 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 475 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" result = FALSE; -#line 469 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 475 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (controller); -#line 469 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 475 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (photo_page); -#line 469 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 475 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (collection) { -#line 469 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 475 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" *collection = _vala_collection; -#line 3797 "LibraryWindow.c" +#line 3803 "LibraryWindow.c" } else { -#line 469 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 475 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_vala_collection); -#line 3801 "LibraryWindow.c" +#line 3807 "LibraryWindow.c" } -#line 469 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 475 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (start) { -#line 469 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 475 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" *start = _vala_start; -#line 3807 "LibraryWindow.c" +#line 3813 "LibraryWindow.c" } else { -#line 469 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 475 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_vala_start); -#line 3811 "LibraryWindow.c" +#line 3817 "LibraryWindow.c" } -#line 469 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 475 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (view_collection) { -#line 469 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 475 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" *view_collection = _vala_view_collection; -#line 3817 "LibraryWindow.c" +#line 3823 "LibraryWindow.c" } else { -#line 469 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 475 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _data_collection_unref0 (_vala_view_collection); -#line 3821 "LibraryWindow.c" +#line 3827 "LibraryWindow.c" } -#line 469 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 475 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return result; -#line 3825 "LibraryWindow.c" +#line 3831 "LibraryWindow.c" } -#line 471 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 477 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp36_ = photo_page; -#line 471 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 477 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp37_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, TYPE_EDITING_HOST_PAGE, EditingHostPage)); -#line 471 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 477 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (!_tmp37_) { -#line 472 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 478 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" result = FALSE; -#line 472 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 478 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (controller); -#line 472 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 478 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (photo_page); -#line 472 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 478 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (collection) { -#line 472 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 478 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" *collection = _vala_collection; -#line 3843 "LibraryWindow.c" +#line 3849 "LibraryWindow.c" } else { -#line 472 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 478 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_vala_collection); -#line 3847 "LibraryWindow.c" +#line 3853 "LibraryWindow.c" } -#line 472 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 478 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (start) { -#line 472 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 478 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" *start = _vala_start; -#line 3853 "LibraryWindow.c" +#line 3859 "LibraryWindow.c" } else { -#line 472 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 478 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_vala_start); -#line 3857 "LibraryWindow.c" +#line 3863 "LibraryWindow.c" } -#line 472 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 478 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (view_collection) { -#line 472 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 478 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" *view_collection = _vala_view_collection; -#line 3863 "LibraryWindow.c" +#line 3869 "LibraryWindow.c" } else { -#line 472 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 478 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _data_collection_unref0 (_vala_view_collection); -#line 3867 "LibraryWindow.c" +#line 3873 "LibraryWindow.c" } -#line 472 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 478 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return result; -#line 3871 "LibraryWindow.c" +#line 3877 "LibraryWindow.c" } -#line 474 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 480 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp38_ = controller; -#line 474 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 480 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp39_ = _g_object_ref0 (_tmp38_); -#line 474 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 480 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_vala_collection); -#line 474 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 480 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _vala_collection = _tmp39_; -#line 475 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 481 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp40_ = photo_page; -#line 475 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 481 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp41_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, TYPE_EDITING_HOST_PAGE, EditingHostPage)); -#line 475 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 481 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_vala_start); -#line 475 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 481 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _vala_start = _tmp41_; -#line 476 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 482 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp42_ = photo_page; -#line 476 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 482 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp43_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, TYPE_PAGE, Page)); -#line 476 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 482 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _data_collection_unref0 (_vala_view_collection); -#line 476 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 482 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _vala_view_collection = _tmp43_; -#line 478 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 484 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" result = TRUE; -#line 478 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 484 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (controller); -#line 478 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 484 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (photo_page); -#line 478 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 484 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (collection) { -#line 478 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 484 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" *collection = _vala_collection; -#line 3907 "LibraryWindow.c" +#line 3913 "LibraryWindow.c" } else { -#line 478 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 484 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_vala_collection); -#line 3911 "LibraryWindow.c" +#line 3917 "LibraryWindow.c" } -#line 478 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 484 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (start) { -#line 478 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 484 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" *start = _vala_start; -#line 3917 "LibraryWindow.c" +#line 3923 "LibraryWindow.c" } else { -#line 478 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 484 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_vala_start); -#line 3921 "LibraryWindow.c" +#line 3927 "LibraryWindow.c" } -#line 478 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 484 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (view_collection) { -#line 478 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 484 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" *view_collection = _vala_view_collection; -#line 3927 "LibraryWindow.c" +#line 3933 "LibraryWindow.c" } else { -#line 478 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 484 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _data_collection_unref0 (_vala_view_collection); -#line 3931 "LibraryWindow.c" +#line 3937 "LibraryWindow.c" } -#line 478 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 484 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return result; -#line 3935 "LibraryWindow.c" +#line 3941 "LibraryWindow.c" } -#line 481 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 487 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" result = FALSE; -#line 481 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 487 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (collection) { -#line 481 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 487 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" *collection = _vala_collection; -#line 3943 "LibraryWindow.c" +#line 3949 "LibraryWindow.c" } else { -#line 481 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 487 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_vala_collection); -#line 3947 "LibraryWindow.c" +#line 3953 "LibraryWindow.c" } -#line 481 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 487 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (start) { -#line 481 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 487 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" *start = _vala_start; -#line 3953 "LibraryWindow.c" +#line 3959 "LibraryWindow.c" } else { -#line 481 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 487 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_vala_start); -#line 3957 "LibraryWindow.c" +#line 3963 "LibraryWindow.c" } -#line 481 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 487 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (view_collection) { -#line 481 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 487 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" *view_collection = _vala_view_collection; -#line 3963 "LibraryWindow.c" +#line 3969 "LibraryWindow.c" } else { -#line 481 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 487 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _data_collection_unref0 (_vala_view_collection); -#line 3967 "LibraryWindow.c" +#line 3973 "LibraryWindow.c" } -#line 481 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 487 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return result; -#line 3971 "LibraryWindow.c" +#line 3977 "LibraryWindow.c" } @@ -3990,97 +3996,97 @@ static void library_window_real_on_fullscreen (AppWindow* base) { ViewCollection* _tmp9_ = NULL; LibraryWindowFullscreenPhotoPage* _tmp10_ = NULL; LibraryWindowFullscreenPhotoPage* _tmp11_ = NULL; -#line 484 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 490 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_WINDOW, LibraryWindow); -#line 485 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 491 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow)); -#line 485 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 491 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" current_page = _tmp0_; -#line 486 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 492 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = current_page; -#line 486 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 492 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp1_ == NULL) { -#line 487 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 493 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (current_page); -#line 487 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 493 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return; -#line 4008 "LibraryWindow.c" +#line 4014 "LibraryWindow.c" } -#line 491 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 497 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" view = NULL; -#line 492 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 498 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = current_page; -#line 492 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 498 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp6_ = library_window_get_fullscreen_photo (self, _tmp2_, &_tmp3_, &_tmp4_, &_tmp5_); -#line 492 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 498 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (collection); -#line 492 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 498 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" collection = _tmp3_; -#line 492 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 498 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (start); -#line 492 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 498 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" start = _tmp4_; -#line 492 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 498 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _data_collection_unref0 (view); -#line 492 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 498 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" view = _tmp5_; -#line 492 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 498 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (!_tmp6_) { -#line 493 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 499 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _data_collection_unref0 (view); -#line 493 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 499 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (start); -#line 493 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 499 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (collection); -#line 493 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 499 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (current_page); -#line 493 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 499 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return; -#line 4040 "LibraryWindow.c" +#line 4046 "LibraryWindow.c" } -#line 495 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 501 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp7_ = collection; -#line 495 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 501 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp8_ = start; -#line 495 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 501 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp9_ = view; -#line 495 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 501 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp10_ = library_window_fullscreen_photo_page_new (_tmp7_, _tmp8_, _tmp9_); -#line 495 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 501 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_object_ref_sink (_tmp10_); -#line 495 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 501 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" fs_photo = _tmp10_; -#line 497 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 503 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp11_ = fs_photo; -#line 497 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 503 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" app_window_go_fullscreen (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_PAGE, Page)); -#line 484 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 490 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (fs_photo); -#line 484 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 490 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _data_collection_unref0 (view); -#line 484 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 490 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (start); -#line 484 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 490 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (collection); -#line 484 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 490 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (current_page); -#line 4068 "LibraryWindow.c" +#line 4074 "LibraryWindow.c" } static void _g_free0_ (gpointer var) { -#line 517 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 523 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" var = (g_free (var), NULL); -#line 4075 "LibraryWindow.c" +#line 4081 "LibraryWindow.c" } static void _g_slist_free__g_free0_ (GSList* self) { -#line 517 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 523 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_slist_foreach (self, (GFunc) _g_free0_, NULL); -#line 517 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 523 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_slist_free (self); -#line 4084 "LibraryWindow.c" +#line 4090 "LibraryWindow.c" } @@ -4099,41 +4105,41 @@ static void library_window_on_file_import (LibraryWindow* self) { GtkFileChooserDialog* _tmp23_ = NULL; gchar* _tmp24_ = NULL; GtkFileChooserDialog* _tmp25_ = NULL; -#line 500 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 506 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 501 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 507 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = _ ("Import From Folder"); -#line 501 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 507 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = (GtkFileChooserDialog*) gtk_file_chooser_dialog_new (_tmp0_, NULL, GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER, RESOURCES_CANCEL_LABEL, GTK_RESPONSE_CANCEL, RESOURCES_OK_LABEL, GTK_RESPONSE_OK, NULL); -#line 501 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 507 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_object_ref_sink (_tmp1_); -#line 501 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 507 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" import_dialog = _tmp1_; -#line 504 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 510 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = import_dialog; -#line 504 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 510 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" gtk_file_chooser_set_local_only (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser), FALSE); -#line 505 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 511 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = import_dialog; -#line 505 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 511 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" gtk_file_chooser_set_select_multiple (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser), TRUE); -#line 506 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 512 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp4_ = import_dialog; -#line 506 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 512 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp5_ = self->priv->import_dir; -#line 506 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 512 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" gtk_file_chooser_set_current_folder (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser), _tmp5_); -#line 508 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 514 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp6_ = import_dialog; -#line 508 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 514 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp7_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_dialog_get_type (), GtkDialog)); -#line 508 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 514 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" response = _tmp7_; -#line 510 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 516 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp8_ = response; -#line 510 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 516 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp8_ == ((gint) GTK_RESPONSE_OK)) { -#line 4137 "LibraryWindow.c" +#line 4143 "LibraryWindow.c" GtkResponseType _tmp9_ = 0; GtkFileChooserDialog* _tmp10_ = NULL; gchar* _tmp11_ = NULL; @@ -4144,95 +4150,95 @@ static void library_window_on_file_import (LibraryWindow* self) { gboolean _tmp16_ = FALSE; GtkResponseType copy_files_response = 0; GtkResponseType _tmp18_ = 0; -#line 513 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 519 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp10_ = import_dialog; -#line 513 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 519 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp11_ = gtk_file_chooser_get_uri (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser)); -#line 513 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 519 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp12_ = _tmp11_; -#line 513 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 519 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp13_ = g_file_new_for_uri (_tmp12_); -#line 513 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 519 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp14_ = _tmp13_; -#line 513 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 519 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp15_ = app_dirs_is_in_import_dir (_tmp14_); -#line 513 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 519 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp16_ = _tmp15_; -#line 513 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 519 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp14_); -#line 513 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 519 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_free0 (_tmp12_); -#line 513 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 519 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp16_) { -#line 514 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 520 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp9_ = GTK_RESPONSE_REJECT; -#line 4170 "LibraryWindow.c" +#line 4176 "LibraryWindow.c" } else { GtkResponseType _tmp17_ = 0; -#line 514 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 520 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp17_ = copy_files_dialog (); -#line 514 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 520 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp9_ = _tmp17_; -#line 4177 "LibraryWindow.c" +#line 4183 "LibraryWindow.c" } -#line 512 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 518 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" copy_files_response = _tmp9_; -#line 516 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 522 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp18_ = copy_files_response; -#line 516 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 522 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp18_ != GTK_RESPONSE_CANCEL) { -#line 4185 "LibraryWindow.c" +#line 4191 "LibraryWindow.c" GtkFileChooserDialog* _tmp19_ = NULL; GSList* _tmp20_ = NULL; GSList* _tmp21_ = NULL; GtkResponseType _tmp22_ = 0; -#line 517 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 523 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp19_ = import_dialog; -#line 517 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 523 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp20_ = gtk_file_chooser_get_uris (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser)); -#line 517 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 523 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp21_ = _tmp20_; -#line 517 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 523 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp22_ = copy_files_response; -#line 517 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 523 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_dispatch_import_jobs (self, _tmp21_, "folders", _tmp22_ == GTK_RESPONSE_ACCEPT); -#line 517 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 523 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" __g_slist_free__g_free0_0 (_tmp21_); -#line 4202 "LibraryWindow.c" +#line 4208 "LibraryWindow.c" } } -#line 522 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 528 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp23_ = import_dialog; -#line 522 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 528 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp24_ = gtk_file_chooser_get_current_folder (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser)); -#line 522 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 528 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_free0 (self->priv->import_dir); -#line 522 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 528 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" self->priv->import_dir = _tmp24_; -#line 523 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 529 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp25_ = import_dialog; -#line 523 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 529 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, gtk_widget_get_type (), GtkWidget)); -#line 500 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 506 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (import_dialog); -#line 4219 "LibraryWindow.c" +#line 4225 "LibraryWindow.c" } static void library_window_on_external_library_import (LibraryWindow* self) { GtkDialog* import_dialog = NULL; DataImportsUIDataImportsDialog* _tmp0_ = NULL; -#line 526 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 532 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 527 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 533 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = data_imports_ui_data_imports_dialog_get_or_create_instance (); -#line 527 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 533 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" import_dialog = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_dialog_get_type (), GtkDialog); -#line 529 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 535 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" gtk_dialog_run (import_dialog); -#line 526 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 532 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (import_dialog); -#line 4236 "LibraryWindow.c" +#line 4242 "LibraryWindow.c" } @@ -4242,27 +4248,27 @@ static void library_window_real_update_common_action_availability (AppWindow* ba Page* _tmp1_ = NULL; gboolean is_checkerboard = FALSE; Page* _tmp2_ = NULL; -#line 532 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 538 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_WINDOW, LibraryWindow); -#line 532 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 538 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail ((old_page == NULL) || IS_PAGE (old_page)); -#line 532 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 538 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail ((new_page == NULL) || IS_PAGE (new_page)); -#line 533 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 539 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = old_page; -#line 533 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 539 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = new_page; -#line 533 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 539 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" APP_WINDOW_CLASS (library_window_parent_class)->update_common_action_availability (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), _tmp0_, _tmp1_); -#line 535 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 541 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = new_page; -#line 535 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 541 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" is_checkerboard = G_TYPE_CHECK_INSTANCE_TYPE (_tmp2_, TYPE_CHECKERBOARD_PAGE); -#line 537 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 543 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" app_window_set_common_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), "CommonDisplaySearchbar", is_checkerboard); -#line 538 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 544 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" app_window_set_common_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), "CommonFind", is_checkerboard); -#line 4266 "LibraryWindow.c" +#line 4272 "LibraryWindow.c" } @@ -4280,61 +4286,61 @@ static void library_window_real_update_common_actions (AppWindow* base, Page* pa Page* _tmp6_ = NULL; gint _tmp7_ = 0; gint _tmp8_ = 0; -#line 541 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 547 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_WINDOW, LibraryWindow); -#line 541 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - g_return_if_fail (IS_PAGE (page)); #line 547 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + g_return_if_fail (IS_PAGE (page)); +#line 553 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = page; -#line 547 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 553 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = library_window_get_fullscreen_photo (self, _tmp0_, &_tmp1_, &_tmp2_, NULL); -#line 547 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 553 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (collection); -#line 547 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 553 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" collection = _tmp1_; -#line 547 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 553 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (start); -#line 547 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 553 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" start = _tmp2_; -#line 547 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 553 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" can_fullscreen = _tmp3_; -#line 549 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 555 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp4_ = library_window_can_empty_trash (self); -#line 549 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 555 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" app_window_set_common_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), "CommonEmptyTrash", _tmp4_); -#line 550 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 556 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" app_window_set_common_action_visible (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), "CommonJumpToEvent", TRUE); -#line 551 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 557 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp5_ = library_window_can_jump_to_event (self); -#line 551 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 557 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" app_window_set_common_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), "CommonJumpToEvent", _tmp5_); -#line 552 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 558 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" app_window_set_common_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), "CommonFullscreen", can_fullscreen); -#line 554 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 560 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp6_ = page; -#line 554 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 560 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp7_ = selected_count; -#line 554 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 560 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp8_ = count; -#line 554 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 560 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" APP_WINDOW_CLASS (library_window_parent_class)->update_common_actions (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), _tmp6_, _tmp7_, _tmp8_); -#line 541 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 547 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (start); -#line 541 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 547 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (collection); -#line 4326 "LibraryWindow.c" +#line 4332 "LibraryWindow.c" } static void library_window_on_trashcan_contents_altered (LibraryWindow* self) { gboolean _tmp0_ = FALSE; -#line 557 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 563 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 558 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 564 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = library_window_can_empty_trash (self); -#line 558 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 564 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" app_window_set_common_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), "CommonEmptyTrash", _tmp0_); -#line 4338 "LibraryWindow.c" +#line 4344 "LibraryWindow.c" } @@ -4343,33 +4349,33 @@ static gboolean library_window_can_empty_trash (LibraryWindow* self) { gboolean _tmp0_ = FALSE; LibraryPhotoSourceCollection* _tmp1_ = NULL; gint _tmp2_ = 0; -#line 561 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 567 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_val_if_fail (IS_LIBRARY_WINDOW (self), FALSE); -#line 562 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 568 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = library_photo_global; -#line 562 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 568 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = media_source_collection_get_trashcan_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection)); -#line 562 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 568 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp2_ > 0) { -#line 562 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 568 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = TRUE; -#line 4357 "LibraryWindow.c" +#line 4363 "LibraryWindow.c" } else { VideoSourceCollection* _tmp3_ = NULL; gint _tmp4_ = 0; -#line 562 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 568 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = video_global; -#line 562 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 568 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp4_ = media_source_collection_get_trashcan_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection)); -#line 562 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 568 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = _tmp4_ > 0; -#line 4367 "LibraryWindow.c" +#line 4373 "LibraryWindow.c" } -#line 562 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 568 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" result = _tmp0_; -#line 562 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 568 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return result; -#line 4373 "LibraryWindow.c" +#line 4379 "LibraryWindow.c" } @@ -4386,66 +4392,66 @@ static void library_window_on_empty_trash (LibraryWindow* self) { const gchar* _tmp8_ = NULL; CommandManager* _tmp9_ = NULL; CommandManager* _tmp10_ = NULL; -#line 565 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 571 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 566 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 572 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = gee_array_list_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL); -#line 566 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 572 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" to_remove = _tmp0_; -#line 567 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 573 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = library_photo_global; -#line 567 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 573 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = media_source_collection_get_trashcan_contents (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection)); -#line 567 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 573 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = _tmp2_; -#line 567 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 573 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" gee_array_list_add_all (to_remove, _tmp3_); -#line 567 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 573 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp3_); -#line 568 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 574 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp4_ = video_global; -#line 568 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 574 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp5_ = media_source_collection_get_trashcan_contents (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection)); -#line 568 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 574 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp6_ = _tmp5_; -#line 568 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 574 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" gee_array_list_add_all (to_remove, _tmp6_); -#line 568 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 574 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp6_); -#line 570 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 576 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp7_ = _ ("Empty Trash"); -#line 570 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 576 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp8_ = _ ("Emptying Trash…"); -#line 570 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 576 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" remove_from_app (G_TYPE_CHECK_INSTANCE_CAST (to_remove, GEE_TYPE_COLLECTION, GeeCollection), _tmp7_, _tmp8_); -#line 572 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 578 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp9_ = app_window_get_command_manager (); -#line 572 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 578 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp10_ = _tmp9_; -#line 572 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 578 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" command_manager_reset (_tmp10_); -#line 572 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 578 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _command_manager_unref0 (_tmp10_); -#line 565 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 571 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (to_remove); -#line 4432 "LibraryWindow.c" +#line 4438 "LibraryWindow.c" } static void library_window_on_new_search (LibraryWindow* self) { SavedSearchDialog* _tmp0_ = NULL; SavedSearchDialog* _tmp1_ = NULL; -#line 575 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 581 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 576 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 582 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = saved_search_dialog_new (); -#line 576 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 582 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = _tmp0_; -#line 576 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 582 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" saved_search_dialog_show (_tmp1_); -#line 576 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 582 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _saved_search_dialog_unref0 (_tmp1_); -#line 4449 "LibraryWindow.c" +#line 4455 "LibraryWindow.c" } @@ -4458,115 +4464,115 @@ static gboolean library_window_can_jump_to_event (LibraryWindow* self) { ViewCollection* _tmp3_ = NULL; ViewCollection* _tmp4_ = NULL; gint _tmp5_ = 0; -#line 579 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 585 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_val_if_fail (IS_LIBRARY_WINDOW (self), FALSE); -#line 580 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 586 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow)); -#line 580 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 586 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = _tmp0_; -#line 580 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 586 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = page_get_view (_tmp1_); -#line 580 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 586 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = _tmp2_; -#line 580 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 586 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp1_); -#line 580 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 586 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" view = _tmp3_; -#line 581 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 587 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp4_ = view; -#line 581 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 587 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp5_ = view_collection_get_selected_count (_tmp4_); -#line 581 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 587 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp5_ == 1) { -#line 4482 "LibraryWindow.c" +#line 4488 "LibraryWindow.c" DataSource* selected_source = NULL; ViewCollection* _tmp6_ = NULL; DataSource* _tmp7_ = NULL; DataSource* _tmp8_ = NULL; -#line 582 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 588 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp6_ = view; -#line 582 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 588 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp7_ = view_collection_get_selected_source_at (_tmp6_, 0); -#line 582 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 588 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" selected_source = _tmp7_; -#line 583 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 589 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp8_ = selected_source; -#line 583 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 589 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp8_, TYPE_EVENT)) { -#line 584 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 590 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" result = TRUE; -#line 584 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 590 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (selected_source); -#line 584 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 590 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _data_collection_unref0 (view); -#line 584 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 590 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return result; -#line 4505 "LibraryWindow.c" +#line 4511 "LibraryWindow.c" } else { DataSource* _tmp9_ = NULL; -#line 585 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 591 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp9_ = selected_source; -#line 585 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 591 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp9_, TYPE_MEDIA_SOURCE)) { -#line 4512 "LibraryWindow.c" +#line 4518 "LibraryWindow.c" ViewCollection* _tmp10_ = NULL; DataSource* _tmp11_ = NULL; MediaSource* _tmp12_ = NULL; Event* _tmp13_ = NULL; Event* _tmp14_ = NULL; gboolean _tmp15_ = FALSE; -#line 586 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 592 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp10_ = view; -#line 586 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 592 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp11_ = view_collection_get_selected_source_at (_tmp10_, 0); -#line 586 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 592 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp12_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_MEDIA_SOURCE, MediaSource); -#line 586 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 592 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp13_ = media_source_get_event (_tmp12_); -#line 586 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 592 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp14_ = _tmp13_; -#line 586 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 592 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp15_ = _tmp14_ != NULL; -#line 586 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 592 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp14_); -#line 586 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 592 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp12_); -#line 586 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 592 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" result = _tmp15_; -#line 586 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 592 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (selected_source); -#line 586 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 592 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _data_collection_unref0 (view); -#line 586 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 592 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return result; -#line 4543 "LibraryWindow.c" +#line 4549 "LibraryWindow.c" } else { -#line 588 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 594 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" result = FALSE; -#line 588 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 594 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (selected_source); -#line 588 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 594 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _data_collection_unref0 (view); -#line 588 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 594 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return result; -#line 4553 "LibraryWindow.c" +#line 4559 "LibraryWindow.c" } } -#line 581 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 587 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (selected_source); -#line 4558 "LibraryWindow.c" +#line 4564 "LibraryWindow.c" } else { -#line 590 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 596 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" result = FALSE; -#line 590 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 596 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _data_collection_unref0 (view); -#line 590 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 596 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return result; -#line 4566 "LibraryWindow.c" +#line 4572 "LibraryWindow.c" } -#line 579 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 585 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _data_collection_unref0 (view); -#line 4570 "LibraryWindow.c" +#line 4576 "LibraryWindow.c" } @@ -4587,98 +4593,98 @@ static void library_window_on_jump_to_event (LibraryWindow* self) { Event* _tmp11_ = NULL; Event* _tmp12_ = NULL; gboolean _tmp13_ = FALSE; -#line 594 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 600 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 595 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 601 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow)); -#line 595 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 601 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = _tmp0_; -#line 595 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 601 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = page_get_view (_tmp1_); -#line 595 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 601 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = _tmp2_; -#line 595 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 601 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp1_); -#line 595 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 601 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" view = _tmp3_; -#line 597 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 603 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp4_ = view; -#line 597 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 603 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp5_ = view_collection_get_selected_count (_tmp4_); -#line 597 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 603 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp5_ != 1) { -#line 598 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 604 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _data_collection_unref0 (view); -#line 598 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 604 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return; -#line 4615 "LibraryWindow.c" +#line 4621 "LibraryWindow.c" } -#line 600 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 606 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp6_ = view; -#line 600 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 606 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp7_ = view_collection_get_selected_source_at (_tmp6_, 0); -#line 600 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 606 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp8_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp7_, TYPE_MEDIA_SOURCE) ? ((MediaSource*) _tmp7_) : NULL; -#line 600 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 606 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp8_ == NULL) { -#line 600 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 606 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp7_); -#line 4627 "LibraryWindow.c" +#line 4633 "LibraryWindow.c" } -#line 600 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 606 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" media = _tmp8_; -#line 601 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 607 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp9_ = media; -#line 601 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 607 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp9_ == NULL) { -#line 602 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 608 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (media); -#line 602 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 608 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _data_collection_unref0 (view); -#line 602 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 608 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return; -#line 4641 "LibraryWindow.c" +#line 4647 "LibraryWindow.c" } -#line 604 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 610 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp10_ = media; -#line 604 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 610 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp11_ = media_source_get_event (_tmp10_); -#line 604 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 610 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp12_ = _tmp11_; -#line 604 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 610 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp13_ = _tmp12_ != NULL; -#line 604 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 610 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp12_); -#line 604 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 610 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp13_) { -#line 4655 "LibraryWindow.c" +#line 4661 "LibraryWindow.c" MediaSource* _tmp14_ = NULL; Event* _tmp15_ = NULL; Event* _tmp16_ = NULL; -#line 605 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 611 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp14_ = media; -#line 605 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 611 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp15_ = media_source_get_event (_tmp14_); -#line 605 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 611 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp16_ = _tmp15_; -#line 605 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 611 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_switch_to_event (self, _tmp16_); -#line 605 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 611 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp16_); -#line 4669 "LibraryWindow.c" +#line 4675 "LibraryWindow.c" } -#line 594 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 600 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (media); -#line 594 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 600 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _data_collection_unref0 (view); -#line 4675 "LibraryWindow.c" +#line 4681 "LibraryWindow.c" } static GVariant* _variant_new5 (gboolean value) { -#line 610 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 616 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return g_variant_ref_sink (g_variant_new_boolean (value)); -#line 4682 "LibraryWindow.c" +#line 4688 "LibraryWindow.c" } @@ -4688,57 +4694,57 @@ static void library_window_on_find (LibraryWindow* self) { GAction* _tmp1_ = NULL; GVariant* _tmp2_ = NULL; SearchFilterToolbar* _tmp3_ = NULL; -#line 608 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 614 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 609 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 615 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = g_action_map_lookup_action (G_TYPE_CHECK_INSTANCE_CAST (self, g_action_map_get_type (), GActionMap), "CommonDisplaySearchbar"); -#line 609 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 615 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = _g_object_ref0 (_tmp0_); -#line 609 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 615 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" action = _tmp1_; -#line 610 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 616 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = _variant_new5 (TRUE); -#line 610 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 616 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_action_change_state (action, _tmp2_); -#line 610 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 616 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_variant_unref0 (_tmp2_); -#line 613 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 619 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = self->priv->search_toolbar; -#line 613 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 619 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" search_filter_toolbar_take_focus (_tmp3_); -#line 608 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 614 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (action); -#line 4712 "LibraryWindow.c" +#line 4718 "LibraryWindow.c" } static void library_window_on_media_altered (LibraryWindow* self) { gboolean _tmp0_ = FALSE; -#line 616 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 622 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 617 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 623 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = library_window_can_jump_to_event (self); -#line 617 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 623 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" app_window_set_common_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), "CommonJumpToEvent", _tmp0_); -#line 4724 "LibraryWindow.c" +#line 4730 "LibraryWindow.c" } static void library_window_on_clear_search (LibraryWindow* self) { gboolean _tmp0_ = FALSE; -#line 620 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 626 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 621 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 627 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = self->priv->is_search_toolbar_visible; -#line 621 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 627 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp0_) { -#line 4736 "LibraryWindow.c" +#line 4742 "LibraryWindow.c" SearchFilterActions* _tmp1_ = NULL; -#line 622 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 628 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = self->priv->search_actions; -#line 622 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 628 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" search_filter_actions_reset (_tmp1_); -#line 4742 "LibraryWindow.c" +#line 4748 "LibraryWindow.c" } } @@ -4750,19 +4756,19 @@ gint library_window_get_events_sort (LibraryWindow* self) { GSimpleAction* _tmp1_ = NULL; gint _tmp2_ = 0; GSimpleAction* _tmp3_ = NULL; -#line 625 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 631 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_val_if_fail (IS_LIBRARY_WINDOW (self), 0); -#line 626 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 632 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = g_action_map_lookup_action (G_TYPE_CHECK_INSTANCE_CAST (self, g_action_map_get_type (), GActionMap), "CommonSortEvents"); -#line 626 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 632 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, g_simple_action_get_type ()) ? ((GSimpleAction*) _tmp0_) : NULL); -#line 626 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 632 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" action = _tmp1_; -#line 628 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 634 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = action; -#line 628 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 634 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp3_ != NULL) { -#line 4766 "LibraryWindow.c" +#line 4772 "LibraryWindow.c" gint _tmp4_ = 0; GSimpleAction* _tmp5_ = NULL; GVariant* _tmp6_ = NULL; @@ -4770,45 +4776,45 @@ gint library_window_get_events_sort (LibraryWindow* self) { GVariant* _tmp8_ = NULL; const gchar* _tmp9_ = NULL; gboolean _tmp10_ = FALSE; -#line 628 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 634 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp5_ = action; -#line 628 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 634 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp6_ = g_action_get_state (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, g_action_get_type (), GAction)); -#line 628 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 634 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp7_ = _tmp6_; -#line 628 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 634 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp8_ = _tmp7_; -#line 628 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 634 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp9_ = g_variant_get_string (_tmp8_, NULL); -#line 628 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 634 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp10_ = g_strcmp0 (_tmp9_, LIBRARY_WINDOW_SORT_EVENTS_ORDER_ASCENDING) == 0; -#line 628 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 634 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_variant_unref0 (_tmp8_); -#line 628 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 634 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp10_) { -#line 629 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 635 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp4_ = 0; -#line 4792 "LibraryWindow.c" +#line 4798 "LibraryWindow.c" } else { -#line 629 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 635 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp4_ = 1; -#line 4796 "LibraryWindow.c" +#line 4802 "LibraryWindow.c" } -#line 628 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 634 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = _tmp4_; -#line 4800 "LibraryWindow.c" +#line 4806 "LibraryWindow.c" } else { -#line 630 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 636 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = 1; -#line 4804 "LibraryWindow.c" +#line 4810 "LibraryWindow.c" } -#line 628 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 634 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" result = _tmp2_; -#line 628 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 634 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (action); -#line 628 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 634 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return result; -#line 4812 "LibraryWindow.c" +#line 4818 "LibraryWindow.c" } @@ -4819,38 +4825,38 @@ static void library_window_on_events_sort_changed (LibraryWindow* self, GSimpleA const gchar* _tmp3_ = NULL; GSimpleAction* _tmp4_ = NULL; GVariant* _tmp5_ = NULL; -#line 633 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 639 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 633 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 639 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (G_IS_SIMPLE_ACTION (action)); -#line 635 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 641 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = config_facade_get_instance (); -#line 635 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 641 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = _tmp0_; -#line 635 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 641 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = value; -#line 635 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 641 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = g_variant_get_string (_tmp2_, NULL); -#line 635 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 641 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" configuration_facade_set_events_sort_ascending (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), g_strcmp0 (_tmp3_, LIBRARY_WINDOW_SORT_EVENTS_ORDER_ASCENDING) == 0); -#line 635 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 641 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp1_); -#line 638 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 644 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp4_ = action; -#line 638 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 644 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp5_ = value; -#line 638 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 644 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_simple_action_set_state (_tmp4_, _tmp5_); -#line 4845 "LibraryWindow.c" +#line 4851 "LibraryWindow.c" } static void library_window_on_preferences (LibraryWindow* self) { -#line 641 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 647 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 642 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 648 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" preferences_dialog_show (); -#line 4854 "LibraryWindow.c" +#line 4860 "LibraryWindow.c" } @@ -4864,89 +4870,89 @@ static void library_window_on_display_basic_properties (LibraryWindow* self, GSi gboolean _tmp12_ = FALSE; GSimpleAction* _tmp13_ = NULL; GVariant* _tmp14_ = NULL; -#line 645 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 651 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 645 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 651 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (G_IS_SIMPLE_ACTION (action)); -#line 646 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 652 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = value; -#line 646 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 652 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = g_variant_get_boolean (_tmp0_); -#line 646 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 652 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" display = _tmp1_; -#line 648 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 654 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = display; -#line 648 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 654 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp2_) { -#line 4882 "LibraryWindow.c" +#line 4888 "LibraryWindow.c" BasicProperties* _tmp3_ = NULL; Page* _tmp4_ = NULL; Page* _tmp5_ = NULL; GtkFrame* _tmp6_ = NULL; -#line 649 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 655 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = self->priv->basic_properties; -#line 649 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 655 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp4_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow)); -#line 649 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 655 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp5_ = _tmp4_; -#line 649 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 655 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" properties_update_properties (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_PROPERTIES, Properties), _tmp5_); -#line 649 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 655 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp5_); -#line 650 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 656 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp6_ = self->priv->bottom_frame; -#line 650 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 656 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" gtk_widget_show (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_widget_get_type (), GtkWidget)); -#line 4901 "LibraryWindow.c" +#line 4907 "LibraryWindow.c" } else { GtkPaned* _tmp7_ = NULL; GtkWidget* _tmp8_ = NULL; -#line 652 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 658 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp7_ = self->priv->sidebar_paned; -#line 652 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 658 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp8_ = gtk_paned_get_child2 (_tmp7_); -#line 652 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 658 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp8_ != NULL) { -#line 4911 "LibraryWindow.c" +#line 4917 "LibraryWindow.c" GtkFrame* _tmp9_ = NULL; -#line 653 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 659 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp9_ = self->priv->bottom_frame; -#line 653 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 659 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_widget_get_type (), GtkWidget)); -#line 4917 "LibraryWindow.c" +#line 4923 "LibraryWindow.c" } } -#line 658 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 664 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp10_ = config_facade_get_instance (); -#line 658 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 664 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp11_ = _tmp10_; -#line 658 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 664 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp12_ = display; -#line 658 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 664 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" configuration_facade_set_display_basic_properties (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp12_); -#line 658 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 664 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp11_); -#line 659 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 665 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp13_ = action; -#line 659 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 665 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp14_ = value; -#line 659 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 665 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_simple_action_set_state (_tmp13_, _tmp14_); -#line 4936 "LibraryWindow.c" +#line 4942 "LibraryWindow.c" } static gboolean _variant_get6 (GVariant* value) { -#line 663 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 669 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return g_variant_get_boolean (value); -#line 4943 "LibraryWindow.c" +#line 4949 "LibraryWindow.c" } static GVariant* _variant_new7 (gboolean value) { -#line 663 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 669 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return g_variant_ref_sink (g_variant_new_boolean (value)); -#line 4950 "LibraryWindow.c" +#line 4956 "LibraryWindow.c" } @@ -4959,50 +4965,50 @@ static void library_window_on_action_toggle (LibraryWindow* self, GAction* actio GVariant* _tmp4_ = NULL; GVariant* _tmp5_ = NULL; GAction* _tmp6_ = NULL; -#line 662 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 668 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 662 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 668 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (G_IS_ACTION (action)); -#line 663 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 669 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = action; -#line 663 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 669 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = g_action_get_state (_tmp0_); -#line 663 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 669 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = _tmp1_; -#line 663 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 669 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = _variant_get6 (_tmp2_); -#line 663 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 669 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp4_ = _variant_new7 (!_tmp3_); -#line 663 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 669 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp5_ = _tmp4_; -#line 663 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 669 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_variant_unref0 (_tmp2_); -#line 663 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 669 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" new_state = _tmp5_; -#line 664 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 670 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp6_ = action; -#line 664 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 670 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_action_change_state (_tmp6_, new_state); -#line 662 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 668 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_variant_unref0 (new_state); -#line 4989 "LibraryWindow.c" +#line 4995 "LibraryWindow.c" } static void library_window_on_action_radio (LibraryWindow* self, GAction* action, GVariant* value) { GAction* _tmp0_ = NULL; GVariant* _tmp1_ = NULL; -#line 667 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 673 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 667 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 673 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (G_IS_ACTION (action)); -#line 668 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 674 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = action; -#line 668 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 674 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = value; -#line 668 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 674 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_action_change_state (_tmp0_, _tmp1_); -#line 5006 "LibraryWindow.c" +#line 5012 "LibraryWindow.c" } @@ -5013,62 +5019,62 @@ static void library_window_on_display_extended_properties (LibraryWindow* self, gboolean _tmp2_ = FALSE; GSimpleAction* _tmp8_ = NULL; GVariant* _tmp9_ = NULL; -#line 671 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 677 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 671 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 677 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (G_IS_SIMPLE_ACTION (action)); -#line 672 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 678 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = value; -#line 672 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 678 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = g_variant_get_boolean (_tmp0_); -#line 672 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 678 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" display = _tmp1_; -#line 674 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 680 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = display; -#line 674 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 680 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp2_) { -#line 5031 "LibraryWindow.c" +#line 5037 "LibraryWindow.c" ExtendedPropertiesWindow* _tmp3_ = NULL; Page* _tmp4_ = NULL; Page* _tmp5_ = NULL; ExtendedPropertiesWindow* _tmp6_ = NULL; -#line 675 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 681 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = self->priv->extended_properties; -#line 675 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 681 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp4_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow)); -#line 675 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 681 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp5_ = _tmp4_; -#line 675 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 681 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" extended_properties_window_update_properties (_tmp3_, _tmp5_); -#line 675 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 681 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp5_); -#line 676 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 682 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp6_ = self->priv->extended_properties; -#line 676 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 682 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_widget_get_type (), GtkWidget)); -#line 5050 "LibraryWindow.c" +#line 5056 "LibraryWindow.c" } else { ExtendedPropertiesWindow* _tmp7_ = NULL; -#line 678 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 684 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp7_ = self->priv->extended_properties; -#line 678 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 684 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_widget_get_type (), GtkWidget)); -#line 5057 "LibraryWindow.c" +#line 5063 "LibraryWindow.c" } -#line 681 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 687 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp8_ = action; -#line 681 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 687 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp9_ = value; -#line 681 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 687 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_simple_action_set_state (_tmp8_, _tmp9_); -#line 5065 "LibraryWindow.c" +#line 5071 "LibraryWindow.c" } static GVariant* _variant_new8 (gboolean value) { -#line 689 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 695 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return g_variant_ref_sink (g_variant_new_boolean (value)); -#line 5072 "LibraryWindow.c" +#line 5078 "LibraryWindow.c" } @@ -5080,35 +5086,35 @@ static void library_window_on_display_searchbar (LibraryWindow* self, GSimpleAct ConfigFacade* _tmp3_ = NULL; GSimpleAction* _tmp4_ = NULL; GVariant* _tmp5_ = NULL; -#line 684 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 690 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 684 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 690 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (G_IS_SIMPLE_ACTION (action)); -#line 685 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 691 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = value; -#line 685 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 691 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = g_variant_get_boolean (_tmp0_); -#line 685 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 691 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" is_shown = _tmp1_; -#line 687 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 693 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = config_facade_get_instance (); -#line 687 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 693 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = _tmp2_; -#line 687 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 693 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" configuration_facade_set_display_search_bar (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), is_shown); -#line 687 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 693 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp3_); -#line 688 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 694 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_show_search_bar (self, is_shown); -#line 689 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 695 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp4_ = action; -#line 689 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 695 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp5_ = _variant_new8 (is_shown); -#line 689 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 695 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_simple_action_set_state (_tmp4_, _tmp5_); -#line 689 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 695 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_variant_unref0 (_tmp5_); -#line 5112 "LibraryWindow.c" +#line 5118 "LibraryWindow.c" } @@ -5122,55 +5128,55 @@ void library_window_show_search_bar (LibraryWindow* self, gboolean display) { CheckerboardPage* _tmp6_ = NULL; CheckerboardPage* _tmp7_ = NULL; gboolean _tmp8_ = FALSE; -#line 692 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 698 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 693 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 699 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow)); -#line 693 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 699 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = _tmp0_; -#line 693 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 699 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = !G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, TYPE_CHECKERBOARD_PAGE); -#line 693 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 699 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp1_); -#line 693 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 699 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp2_) { -#line 694 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 700 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return; -#line 5140 "LibraryWindow.c" +#line 5146 "LibraryWindow.c" } -#line 696 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 702 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = display; -#line 696 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 702 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" self->priv->is_search_toolbar_visible = _tmp3_; -#line 697 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 703 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp4_ = library_window_should_show_search_bar (self); -#line 697 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 703 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp5_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow)); -#line 697 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 703 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp6_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp5_, TYPE_CHECKERBOARD_PAGE) ? ((CheckerboardPage*) _tmp5_) : NULL; -#line 697 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 703 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp6_ == NULL) { -#line 697 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 703 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp5_); -#line 5156 "LibraryWindow.c" +#line 5162 "LibraryWindow.c" } -#line 697 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 703 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp7_ = _tmp6_; -#line 697 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 703 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_toggle_search_bar (self, _tmp4_, _tmp7_); -#line 697 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 703 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp7_); -#line 698 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 704 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp8_ = display; -#line 698 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 704 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (!_tmp8_) { -#line 5168 "LibraryWindow.c" +#line 5174 "LibraryWindow.c" SearchFilterActions* _tmp9_ = NULL; -#line 699 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 705 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp9_ = self->priv->search_actions; -#line 699 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 705 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" search_filter_actions_reset (_tmp9_); -#line 5174 "LibraryWindow.c" +#line 5180 "LibraryWindow.c" } } @@ -5180,23 +5186,23 @@ static void library_window_on_display_sidebar (LibraryWindow* self, GSimpleActio gboolean _tmp1_ = FALSE; GSimpleAction* _tmp2_ = NULL; GVariant* _tmp3_ = NULL; -#line 702 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 708 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 702 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 708 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (G_IS_SIMPLE_ACTION (action)); -#line 703 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 709 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = variant; -#line 703 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 709 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = g_variant_get_boolean (_tmp0_); -#line 703 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 709 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_set_sidebar_visible (self, _tmp1_); -#line 705 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 711 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = action; -#line 705 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 711 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = variant; -#line 705 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 711 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_simple_action_set_state (_tmp2_, _tmp3_); -#line 5200 "LibraryWindow.c" +#line 5206 "LibraryWindow.c" } @@ -5206,25 +5212,25 @@ static void library_window_set_sidebar_visible (LibraryWindow* self, gboolean vi ConfigFacade* _tmp2_ = NULL; ConfigFacade* _tmp3_ = NULL; gboolean _tmp4_ = FALSE; -#line 708 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 714 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 709 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 715 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = self->priv->sidebar_paned; -#line 709 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 715 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = visible; -#line 709 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 715 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" gtk_widget_set_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), _tmp1_); -#line 710 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 716 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = config_facade_get_instance (); -#line 710 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 716 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = _tmp2_; -#line 710 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 716 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp4_ = visible; -#line 710 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 716 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" configuration_facade_set_display_sidebar (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp4_); -#line 710 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 716 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp3_); -#line 5228 "LibraryWindow.c" +#line 5234 "LibraryWindow.c" } @@ -5234,23 +5240,23 @@ static gboolean library_window_is_sidebar_visible (LibraryWindow* self) { ConfigFacade* _tmp1_ = NULL; gboolean _tmp2_ = FALSE; gboolean _tmp3_ = FALSE; -#line 713 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 719 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_val_if_fail (IS_LIBRARY_WINDOW (self), FALSE); -#line 714 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 720 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = config_facade_get_instance (); -#line 714 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 720 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = _tmp0_; -#line 714 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 720 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = configuration_facade_get_display_sidebar (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); -#line 714 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 720 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = _tmp2_; -#line 714 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 720 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp1_); -#line 714 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 720 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" result = _tmp3_; -#line 714 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 720 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return result; -#line 5254 "LibraryWindow.c" +#line 5260 "LibraryWindow.c" } @@ -5259,23 +5265,23 @@ static void library_window_on_display_toolbar (LibraryWindow* self, GSimpleActio gboolean _tmp1_ = FALSE; GSimpleAction* _tmp2_ = NULL; GVariant* _tmp3_ = NULL; -#line 717 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 723 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 717 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 723 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (G_IS_SIMPLE_ACTION (action)); -#line 718 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 724 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = variant; -#line 718 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 724 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = g_variant_get_boolean (_tmp0_); -#line 718 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 724 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_set_toolbar_visible (self, _tmp1_); -#line 720 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 726 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = action; -#line 720 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 726 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = variant; -#line 720 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 726 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_simple_action_set_state (_tmp2_, _tmp3_); -#line 5279 "LibraryWindow.c" +#line 5285 "LibraryWindow.c" } @@ -5292,62 +5298,62 @@ static void library_window_set_toolbar_visible (LibraryWindow* self, gboolean vi ConfigFacade* _tmp10_ = NULL; ConfigFacade* _tmp11_ = NULL; gboolean _tmp12_ = FALSE; -#line 723 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 729 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 724 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 730 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow)); -#line 724 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 730 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = _tmp0_; -#line 724 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 730 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = _tmp1_ == NULL; -#line 724 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 730 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp1_); -#line 724 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 730 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp2_) { -#line 725 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 731 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return; -#line 5310 "LibraryWindow.c" +#line 5316 "LibraryWindow.c" } -#line 728 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 734 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow)); -#line 728 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 734 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp4_ = _tmp3_; -#line 728 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 734 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp5_ = page_get_toolbar (_tmp4_); -#line 728 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 734 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp6_ = _tmp5_; -#line 728 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 734 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp4_); -#line 728 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 734 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" toolbar = _tmp6_; -#line 729 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 735 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp7_ = toolbar; -#line 729 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 735 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp7_ != NULL) { -#line 5328 "LibraryWindow.c" +#line 5334 "LibraryWindow.c" GtkRevealer* _tmp8_ = NULL; gboolean _tmp9_ = FALSE; -#line 730 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 736 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp8_ = self->priv->toolbar_revealer; -#line 730 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 736 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp9_ = visible; -#line 730 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 736 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" gtk_revealer_set_reveal_child (_tmp8_, _tmp9_); -#line 5337 "LibraryWindow.c" +#line 5343 "LibraryWindow.c" } -#line 732 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 738 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp10_ = config_facade_get_instance (); -#line 732 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 738 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp11_ = _tmp10_; -#line 732 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 738 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp12_ = visible; -#line 732 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 738 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" configuration_facade_set_display_toolbar (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp12_); -#line 732 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 738 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp11_); -#line 723 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 729 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (toolbar); -#line 5351 "LibraryWindow.c" +#line 5357 "LibraryWindow.c" } @@ -5357,48 +5363,48 @@ static gboolean library_window_is_toolbar_visible (LibraryWindow* self) { ConfigFacade* _tmp1_ = NULL; gboolean _tmp2_ = FALSE; gboolean _tmp3_ = FALSE; -#line 735 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 741 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_val_if_fail (IS_LIBRARY_WINDOW (self), FALSE); -#line 736 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 742 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = config_facade_get_instance (); -#line 736 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 742 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = _tmp0_; -#line 736 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 742 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = configuration_facade_get_display_toolbar (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); -#line 736 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 742 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = _tmp2_; -#line 736 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 742 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp1_); -#line 736 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 742 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" result = _tmp3_; -#line 736 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 742 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return result; -#line 5377 "LibraryWindow.c" +#line 5383 "LibraryWindow.c" } static void library_window_show_extended_properties (LibraryWindow* self) { -#line 739 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 745 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 740 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 746 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_sync_extended_properties (self, TRUE); -#line 5386 "LibraryWindow.c" +#line 5392 "LibraryWindow.c" } static void library_window_hide_extended_properties (LibraryWindow* self) { -#line 743 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 749 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 744 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 750 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_sync_extended_properties (self, FALSE); -#line 5395 "LibraryWindow.c" +#line 5401 "LibraryWindow.c" } static GVariant* _variant_new9 (gboolean value) { -#line 749 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 755 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return g_variant_ref_sink (g_variant_new_boolean (value)); -#line 5402 "LibraryWindow.c" +#line 5408 "LibraryWindow.c" } @@ -5411,35 +5417,35 @@ static void library_window_sync_extended_properties (LibraryWindow* self, gboole ConfigFacade* _tmp4_ = NULL; ConfigFacade* _tmp5_ = NULL; gboolean _tmp6_ = FALSE; -#line 747 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 753 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 748 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 754 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = g_action_map_lookup_action (G_TYPE_CHECK_INSTANCE_CAST (self, g_action_map_get_type (), GActionMap), "CommonDisplayExtendedProperties"); -#line 748 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 754 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = _g_object_ref0 (_tmp0_); -#line 748 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 754 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" action = _tmp1_; -#line 749 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 755 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = show; -#line 749 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 755 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = _variant_new9 (_tmp2_); -#line 749 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 755 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_action_change_state (action, _tmp3_); -#line 749 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 755 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_variant_unref0 (_tmp3_); -#line 752 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 758 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp4_ = config_facade_get_instance (); -#line 752 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 758 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp5_ = _tmp4_; -#line 752 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 758 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp6_ = show; -#line 752 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 758 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" configuration_facade_set_display_extended_properties (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp6_); -#line 752 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 758 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp5_); -#line 747 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 753 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (action); -#line 5443 "LibraryWindow.c" +#line 5449 "LibraryWindow.c" } @@ -5449,44 +5455,44 @@ void library_window_enqueue_batch_import (LibraryWindow* self, BatchImport* batc LibraryImportQueueSidebarEntry* _tmp2_ = NULL; BatchImport* _tmp3_ = NULL; gboolean _tmp4_ = FALSE; -#line 755 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 761 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 755 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 761 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_BATCH_IMPORT (batch_import)); -#line 756 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 762 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = self->priv->library_branch; -#line 756 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 762 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = library_branch_get_import_queue_entry (_tmp0_); -#line 756 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 762 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = _tmp1_; -#line 756 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 762 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = batch_import; -#line 756 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 762 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp4_ = allow_user_cancel; -#line 756 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 762 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_import_queue_sidebar_entry_enqueue_and_schedule (_tmp2_, _tmp3_, _tmp4_); -#line 5469 "LibraryWindow.c" +#line 5475 "LibraryWindow.c" } static void library_window_import_reporter (LibraryWindow* self, ImportManifest* manifest) { ImportManifest* _tmp0_ = NULL; -#line 759 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 765 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 759 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 765 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_IMPORT_MANIFEST (manifest)); -#line 760 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 766 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = manifest; -#line 760 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 766 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" import_ui_report_manifest (_tmp0_, TRUE, NULL); -#line 5483 "LibraryWindow.c" +#line 5489 "LibraryWindow.c" } static void _library_window_import_reporter_batch_import_import_reporter (ImportManifest* manifest, BatchImportRoll* import_roll, gpointer self) { -#line 791 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 797 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_import_reporter ((LibraryWindow*) self, manifest); -#line 5490 "LibraryWindow.c" +#line 5496 "LibraryWindow.c" } @@ -5504,43 +5510,43 @@ static void library_window_dispatch_import_jobs (LibraryWindow* self, GSList* ur GeeArrayList* _tmp33_ = NULL; gint _tmp34_ = 0; gint _tmp35_ = 0; -#line 763 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 769 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 763 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 769 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (job_name != NULL); -#line 764 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 770 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = app_dirs_get_import_dir (); -#line 764 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 770 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = _tmp1_; -#line 764 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 770 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = g_file_get_path (_tmp2_); -#line 764 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 770 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp4_ = _tmp3_; -#line 764 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 770 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp5_ = g_get_home_dir (); -#line 764 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 770 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp6_ = g_strcmp0 (_tmp4_, _tmp5_) == 0; -#line 764 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 770 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_free0 (_tmp4_); -#line 764 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 770 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp2_); -#line 764 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 770 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp6_) { -#line 5530 "LibraryWindow.c" +#line 5536 "LibraryWindow.c" gboolean _tmp7_ = FALSE; -#line 764 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 770 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp7_ = self->priv->notify_library_is_home_dir; -#line 764 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 770 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = _tmp7_; -#line 5536 "LibraryWindow.c" +#line 5542 "LibraryWindow.c" } else { -#line 764 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 770 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = FALSE; -#line 5540 "LibraryWindow.c" +#line 5546 "LibraryWindow.c" } -#line 764 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 770 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp0_) { -#line 5544 "LibraryWindow.c" +#line 5550 "LibraryWindow.c" GtkResponseType response = 0; const gchar* _tmp8_ = NULL; gchar* _tmp9_ = NULL; @@ -5552,65 +5558,65 @@ static void library_window_dispatch_import_jobs (LibraryWindow* self, GSList* ur GtkResponseType _tmp15_ = 0; GtkResponseType _tmp16_ = 0; GtkResponseType _tmp17_ = 0; -#line 765 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 771 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp8_ = _ ("Shotwell is configured to import photos to your home directory.\n" "We recommend changing this in Edit %s Preference" \ "s.\n" "Do you want to continue importing photos?"); -#line 765 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 771 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp9_ = g_strdup_printf (_tmp8_, "▸"); -#line 765 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 771 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp10_ = _tmp9_; -#line 765 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 771 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp11_ = _ ("_Import"); -#line 765 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 771 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp12_ = _ ("Library Location"); -#line 765 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 771 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp13_ = app_window_get_instance (); -#line 765 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 771 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp14_ = _tmp13_; -#line 765 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 771 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp15_ = app_window_affirm_cancel_question (_tmp10_, _tmp11_, _tmp12_, G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_window_get_type (), GtkWindow)); -#line 765 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 771 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp16_ = _tmp15_; -#line 765 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 771 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp14_); -#line 765 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 771 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_free0 (_tmp10_); -#line 765 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - response = _tmp16_; #line 771 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + response = _tmp16_; +#line 777 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp17_ = response; -#line 771 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 777 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp17_ == GTK_RESPONSE_CANCEL) { -#line 772 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 778 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return; -#line 5586 "LibraryWindow.c" +#line 5592 "LibraryWindow.c" } -#line 774 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 780 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" self->priv->notify_library_is_home_dir = FALSE; -#line 5590 "LibraryWindow.c" +#line 5596 "LibraryWindow.c" } -#line 777 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 783 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp18_ = gee_array_list_new (TYPE_FILE_IMPORT_JOB, (GBoxedCopyFunc) batch_import_job_ref, batch_import_job_unref, NULL, NULL, NULL); -#line 777 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 783 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" jobs = _tmp18_; -#line 778 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 784 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp19_ = uris; -#line 5598 "LibraryWindow.c" +#line 5604 "LibraryWindow.c" { GSList* uri_collection = NULL; GSList* uri_it = NULL; -#line 778 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 784 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" uri_collection = _tmp19_; -#line 778 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 784 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" for (uri_it = uri_collection; uri_it != NULL; uri_it = uri_it->next) { -#line 5606 "LibraryWindow.c" +#line 5612 "LibraryWindow.c" gchar* _tmp20_ = NULL; gchar* uri = NULL; -#line 778 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 784 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp20_ = g_strdup ((const gchar*) uri_it->data); -#line 778 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 784 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" uri = _tmp20_; -#line 5613 "LibraryWindow.c" +#line 5619 "LibraryWindow.c" { GFile* file_or_dir = NULL; const gchar* _tmp21_ = NULL; @@ -5624,95 +5630,95 @@ static void library_window_dispatch_import_jobs (LibraryWindow* self, GSList* ur gboolean _tmp30_ = FALSE; FileImportJob* _tmp31_ = NULL; FileImportJob* _tmp32_ = NULL; -#line 779 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 785 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp21_ = uri; -#line 779 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 785 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp22_ = g_file_new_for_uri (_tmp21_); -#line 779 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 785 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" file_or_dir = _tmp22_; -#line 780 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 786 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp23_ = file_or_dir; -#line 780 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 786 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp24_ = g_file_get_path (_tmp23_); -#line 780 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 786 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp25_ = _tmp24_; -#line 780 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 786 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp26_ = _tmp25_ == NULL; -#line 780 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 786 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_free0 (_tmp25_); -#line 780 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 786 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp26_) { -#line 5645 "LibraryWindow.c" +#line 5651 "LibraryWindow.c" const gchar* _tmp27_ = NULL; -#line 782 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 788 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp27_ = _ ("Photos cannot be imported from this directory."); -#line 782 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 788 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" app_window_error_message (_tmp27_, NULL); -#line 784 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 790 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (file_or_dir); -#line 784 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 790 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_free0 (uri); -#line 784 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 790 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" continue; -#line 5657 "LibraryWindow.c" +#line 5663 "LibraryWindow.c" } -#line 787 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 793 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp28_ = jobs; -#line 787 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 793 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp29_ = file_or_dir; -#line 787 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 793 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp30_ = copy_to_library; -#line 787 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 793 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp31_ = file_import_job_new (_tmp29_, _tmp30_); -#line 787 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 793 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp32_ = _tmp31_; -#line 787 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 793 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp32_); -#line 787 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 793 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _batch_import_job_unref0 (_tmp32_); -#line 778 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 784 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (file_or_dir); -#line 778 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 784 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_free0 (uri); -#line 5677 "LibraryWindow.c" +#line 5683 "LibraryWindow.c" } } } -#line 790 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 796 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp33_ = jobs; -#line 790 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 796 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp34_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, GEE_TYPE_COLLECTION, GeeCollection)); -#line 790 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 796 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp35_ = _tmp34_; -#line 790 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 796 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp35_ > 0) { -#line 5689 "LibraryWindow.c" +#line 5695 "LibraryWindow.c" BatchImport* batch_import = NULL; GeeArrayList* _tmp36_ = NULL; const gchar* _tmp37_ = NULL; BatchImport* _tmp38_ = NULL; BatchImport* _tmp39_ = NULL; -#line 791 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 797 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp36_ = jobs; -#line 791 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 797 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp37_ = job_name; -#line 791 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 797 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp38_ = batch_import_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, GEE_TYPE_ITERABLE, GeeIterable), _tmp37_, _library_window_import_reporter_batch_import_import_reporter, self, NULL, NULL, NULL, NULL, NULL); -#line 791 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 797 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" batch_import = _tmp38_; -#line 792 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 798 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp39_ = batch_import; -#line 792 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 798 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_enqueue_batch_import (self, _tmp39_, TRUE); -#line 793 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 799 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_switch_to_import_queue_page (self); -#line 790 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 796 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (batch_import); -#line 5711 "LibraryWindow.c" +#line 5717 "LibraryWindow.c" } -#line 763 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 769 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (jobs); -#line 5715 "LibraryWindow.c" +#line 5721 "LibraryWindow.c" } @@ -5733,157 +5739,157 @@ static GdkDragAction library_window_get_drag_action (LibraryWindow* self) { gboolean _tmp8_ = FALSE; gboolean _tmp9_ = FALSE; gboolean _tmp10_ = FALSE; -#line 797 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 803 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_val_if_fail (IS_LIBRARY_WINDOW (self), 0); -#line 800 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 806 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = gtk_widget_get_window (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget)); -#line 800 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 806 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = gdk_display_get_default (); -#line 800 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 806 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = gdk_display_get_device_manager (_tmp1_); -#line 800 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 806 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = gdk_device_manager_get_client_pointer (_tmp2_); -#line 800 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 806 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" gdk_window_get_device_position (_tmp0_, _tmp3_, NULL, NULL, &_tmp4_); -#line 800 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 806 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" mask = _tmp4_; -#line 803 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 809 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp5_ = mask; -#line 803 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 809 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" ctrl = (_tmp5_ & GDK_CONTROL_MASK) != 0; -#line 804 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 810 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp6_ = mask; -#line 804 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 810 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" alt = (_tmp6_ & GDK_MOD1_MASK) != 0; -#line 805 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 811 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp7_ = mask; -#line 805 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 811 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" shift = (_tmp7_ & GDK_SHIFT_MASK) != 0; -#line 807 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 813 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp10_ = ctrl; -#line 807 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 813 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp10_) { -#line 5766 "LibraryWindow.c" +#line 5772 "LibraryWindow.c" gboolean _tmp11_ = FALSE; -#line 807 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 813 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp11_ = alt; -#line 807 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 813 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp9_ = !_tmp11_; -#line 5772 "LibraryWindow.c" +#line 5778 "LibraryWindow.c" } else { -#line 807 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 813 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp9_ = FALSE; -#line 5776 "LibraryWindow.c" +#line 5782 "LibraryWindow.c" } -#line 807 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 813 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp9_) { -#line 5780 "LibraryWindow.c" +#line 5786 "LibraryWindow.c" gboolean _tmp12_ = FALSE; -#line 807 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 813 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp12_ = shift; -#line 807 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 813 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp8_ = !_tmp12_; -#line 5786 "LibraryWindow.c" +#line 5792 "LibraryWindow.c" } else { -#line 807 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 813 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp8_ = FALSE; -#line 5790 "LibraryWindow.c" +#line 5796 "LibraryWindow.c" } -#line 807 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 813 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp8_) { -#line 808 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 814 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" result = GDK_ACTION_COPY; -#line 808 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 814 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return result; -#line 5798 "LibraryWindow.c" +#line 5804 "LibraryWindow.c" } else { gboolean _tmp13_ = FALSE; gboolean _tmp14_ = FALSE; gboolean _tmp15_ = FALSE; -#line 809 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 815 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp15_ = ctrl; -#line 809 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 815 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (!_tmp15_) { -#line 5807 "LibraryWindow.c" +#line 5813 "LibraryWindow.c" gboolean _tmp16_ = FALSE; -#line 809 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 815 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp16_ = alt; -#line 809 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 815 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp14_ = _tmp16_; -#line 5813 "LibraryWindow.c" +#line 5819 "LibraryWindow.c" } else { -#line 809 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 815 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp14_ = FALSE; -#line 5817 "LibraryWindow.c" +#line 5823 "LibraryWindow.c" } -#line 809 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 815 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp14_) { -#line 5821 "LibraryWindow.c" +#line 5827 "LibraryWindow.c" gboolean _tmp17_ = FALSE; -#line 809 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 815 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp17_ = shift; -#line 809 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 815 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp13_ = !_tmp17_; -#line 5827 "LibraryWindow.c" +#line 5833 "LibraryWindow.c" } else { -#line 809 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 815 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp13_ = FALSE; -#line 5831 "LibraryWindow.c" +#line 5837 "LibraryWindow.c" } -#line 809 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 815 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp13_) { -#line 810 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 816 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" result = GDK_ACTION_ASK; -#line 810 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 816 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return result; -#line 5839 "LibraryWindow.c" +#line 5845 "LibraryWindow.c" } else { gboolean _tmp18_ = FALSE; gboolean _tmp19_ = FALSE; gboolean _tmp20_ = FALSE; -#line 811 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 817 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp20_ = ctrl; -#line 811 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 817 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp20_) { -#line 5848 "LibraryWindow.c" +#line 5854 "LibraryWindow.c" gboolean _tmp21_ = FALSE; -#line 811 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 817 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp21_ = alt; -#line 811 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 817 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp19_ = !_tmp21_; -#line 5854 "LibraryWindow.c" +#line 5860 "LibraryWindow.c" } else { -#line 811 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 817 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp19_ = FALSE; -#line 5858 "LibraryWindow.c" +#line 5864 "LibraryWindow.c" } -#line 811 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 817 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp19_) { -#line 5862 "LibraryWindow.c" +#line 5868 "LibraryWindow.c" gboolean _tmp22_ = FALSE; -#line 811 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 817 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp22_ = shift; -#line 811 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 817 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp18_ = _tmp22_; -#line 5868 "LibraryWindow.c" +#line 5874 "LibraryWindow.c" } else { -#line 811 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 817 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp18_ = FALSE; -#line 5872 "LibraryWindow.c" +#line 5878 "LibraryWindow.c" } -#line 811 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 817 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp18_) { -#line 812 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 818 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" result = GDK_ACTION_LINK; -#line 812 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 818 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return result; -#line 5880 "LibraryWindow.c" +#line 5886 "LibraryWindow.c" } else { -#line 814 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 820 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" result = GDK_ACTION_DEFAULT; -#line 814 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 820 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return result; -#line 5886 "LibraryWindow.c" +#line 5892 "LibraryWindow.c" } } } @@ -5907,87 +5913,87 @@ static gboolean library_window_real_drag_motion (GtkWidget* base, GdkDragContext GdkDragContext* _tmp13_ = NULL; GdkDragAction _tmp14_ = 0; guint _tmp15_ = 0U; -#line 817 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 823 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_WINDOW, LibraryWindow); -#line 817 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 823 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_val_if_fail (GDK_IS_DRAG_CONTEXT (context), FALSE); -#line 818 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 824 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = context; -#line 818 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 824 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = gtk_drag_dest_get_target_list (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget)); -#line 818 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 824 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = gtk_drag_dest_find_target (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), _tmp0_, _tmp1_); -#line 818 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 824 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" target = _tmp2_; -#line 819 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 825 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = target; -#line 819 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 825 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp4_ = GDK_NONE; -#line 819 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 825 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp3_ == _tmp4_) { -#line 5928 "LibraryWindow.c" +#line 5934 "LibraryWindow.c" GdkDragContext* _tmp5_ = NULL; guint _tmp6_ = 0U; -#line 820 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - g_debug ("LibraryWindow.vala:820: drag target is GDK_NONE"); -#line 821 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 826 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + g_debug ("LibraryWindow.vala:826: drag target is GDK_NONE"); +#line 827 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp5_ = context; -#line 821 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 827 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp6_ = time; -#line 821 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 827 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" gdk_drag_status (_tmp5_, 0, (guint32) _tmp6_); -#line 823 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 829 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" result = TRUE; -#line 823 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 829 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return result; -#line 5943 "LibraryWindow.c" +#line 5949 "LibraryWindow.c" } -#line 827 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 833 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp7_ = context; -#line 827 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 833 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp8_ = gtk_drag_get_source_widget (_tmp7_); -#line 827 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 833 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp8_ != NULL) { -#line 5951 "LibraryWindow.c" +#line 5957 "LibraryWindow.c" GdkDragContext* _tmp9_ = NULL; guint _tmp10_ = 0U; -#line 828 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 834 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp9_ = context; -#line 828 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 834 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp10_ = time; -#line 828 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 834 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" gdk_drag_status (_tmp9_, GDK_ACTION_PRIVATE, (guint32) _tmp10_); -#line 830 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 836 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" result = TRUE; -#line 830 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 836 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return result; -#line 5964 "LibraryWindow.c" +#line 5970 "LibraryWindow.c" } -#line 834 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 840 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp11_ = library_window_get_drag_action (self); -#line 834 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 840 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" drag_action = _tmp11_; -#line 836 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 842 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp12_ = drag_action; -#line 836 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 842 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp12_ == GDK_ACTION_DEFAULT) { -#line 837 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 843 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" drag_action = GDK_ACTION_ASK; -#line 5976 "LibraryWindow.c" +#line 5982 "LibraryWindow.c" } -#line 839 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 845 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp13_ = context; -#line 839 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 845 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp14_ = drag_action; -#line 839 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 845 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp15_ = time; -#line 839 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 845 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" gdk_drag_status (_tmp13_, _tmp14_, (guint32) _tmp15_); -#line 841 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 847 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" result = TRUE; -#line 841 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 847 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return result; -#line 5990 "LibraryWindow.c" +#line 5996 "LibraryWindow.c" } @@ -5997,54 +6003,54 @@ static void library_window_real_drag_data_received (GtkWidget* base, GdkDragCont guchar* _tmp1_ = NULL; GdkDragContext* _tmp2_ = NULL; GtkWidget* _tmp3_ = NULL; -#line 844 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 850 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_WINDOW, LibraryWindow); -#line 844 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 850 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (GDK_IS_DRAG_CONTEXT (context)); -#line 844 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 850 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (selection_data != NULL); -#line 846 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 852 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = selection_data; -#line 846 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 852 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = gtk_selection_data_get_data (_tmp0_); -#line 846 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 852 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (-1 < 0) { -#line 847 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - g_debug ("LibraryWindow.vala:847: failed to retrieve SelectionData"); -#line 6014 "LibraryWindow.c" +#line 853 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + g_debug ("LibraryWindow.vala:853: failed to retrieve SelectionData"); +#line 6020 "LibraryWindow.c" } -#line 851 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 857 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = context; -#line 851 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 857 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = gtk_drag_get_source_widget (_tmp2_); -#line 851 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 857 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp3_ == NULL) { -#line 6022 "LibraryWindow.c" +#line 6028 "LibraryWindow.c" GdkDragContext* _tmp4_ = NULL; GtkSelectionData* _tmp5_ = NULL; guint _tmp6_ = 0U; guint _tmp7_ = 0U; -#line 852 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 858 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp4_ = context; -#line 852 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 858 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp5_ = selection_data; -#line 852 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 858 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp6_ = info; -#line 852 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 858 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp7_ = time; -#line 852 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 858 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_external_drop_handler (self, _tmp4_, NULL, _tmp5_, _tmp6_, _tmp7_); -#line 6037 "LibraryWindow.c" +#line 6043 "LibraryWindow.c" } else { GdkDragContext* _tmp8_ = NULL; guint _tmp9_ = 0U; -#line 854 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 860 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp8_ = context; -#line 854 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 860 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp9_ = time; -#line 854 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 860 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" gtk_drag_finish (_tmp8_, FALSE, FALSE, (guint32) _tmp9_); -#line 6047 "LibraryWindow.c" +#line 6053 "LibraryWindow.c" } } @@ -6067,198 +6073,198 @@ static void library_window_external_drop_handler (LibraryWindow* self, GdkDragCo GdkDragAction _tmp22_ = 0; GdkDragContext* _tmp23_ = NULL; guint _tmp24_ = 0U; -#line 857 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 863 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 857 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 863 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (GDK_IS_DRAG_CONTEXT (context)); -#line 857 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 863 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail ((entry == NULL) || SIDEBAR_IS_ENTRY (entry)); -#line 857 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 863 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (data != NULL); -#line 859 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 865 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = data; -#line 859 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 865 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = _tmp1_ = gtk_selection_data_get_uris (_tmp0_); -#line 859 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 865 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" uris_array = _tmp2_; -#line 859 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 865 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" uris_array_length1 = _vala_array_length (_tmp1_); -#line 859 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 865 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _uris_array_size_ = uris_array_length1; -#line 861 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 867 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" uris = NULL; -#line 862 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 868 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = uris_array; -#line 862 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 868 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3__length1 = uris_array_length1; -#line 6094 "LibraryWindow.c" +#line 6100 "LibraryWindow.c" { gchar** uri_collection = NULL; gint uri_collection_length1 = 0; gint _uri_collection_size_ = 0; gint uri_it = 0; -#line 862 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 868 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" uri_collection = _tmp3_; -#line 862 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 868 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" uri_collection_length1 = _tmp3__length1; -#line 862 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 868 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" for (uri_it = 0; uri_it < _tmp3__length1; uri_it = uri_it + 1) { -#line 6106 "LibraryWindow.c" +#line 6112 "LibraryWindow.c" gchar* _tmp4_ = NULL; gchar* uri = NULL; -#line 862 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 868 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp4_ = g_strdup (uri_collection[uri_it]); -#line 862 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 868 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" uri = _tmp4_; -#line 6113 "LibraryWindow.c" +#line 6119 "LibraryWindow.c" { const gchar* _tmp5_ = NULL; gchar* _tmp6_ = NULL; -#line 863 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 869 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp5_ = uri; -#line 863 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 869 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp6_ = g_strdup (_tmp5_); -#line 863 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 869 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" uris = g_slist_append (uris, _tmp6_); -#line 862 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 868 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_free0 (uri); -#line 6125 "LibraryWindow.c" +#line 6131 "LibraryWindow.c" } } } -#line 865 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 871 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp7_ = context; -#line 865 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 871 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp8_ = gdk_drag_context_get_selected_action (_tmp7_); -#line 865 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 871 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" selected_action = _tmp8_; -#line 866 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 872 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp9_ = selected_action; -#line 866 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 872 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp9_ == GDK_ACTION_ASK) { -#line 6139 "LibraryWindow.c" +#line 6145 "LibraryWindow.c" GtkResponseType _result_ = 0; GSList* _tmp10_ = NULL; GtkResponseType _tmp18_ = 0; -#line 868 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 874 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _result_ = GTK_RESPONSE_REJECT; -#line 869 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 875 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp10_ = uris; -#line 6147 "LibraryWindow.c" +#line 6153 "LibraryWindow.c" { GSList* uri_collection = NULL; GSList* uri_it = NULL; -#line 869 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 875 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" uri_collection = _tmp10_; -#line 869 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 875 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" for (uri_it = uri_collection; uri_it != NULL; uri_it = uri_it->next) { -#line 6155 "LibraryWindow.c" +#line 6161 "LibraryWindow.c" gchar* _tmp11_ = NULL; gchar* uri = NULL; -#line 869 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 875 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp11_ = g_strdup ((const gchar*) uri_it->data); -#line 869 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 875 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" uri = _tmp11_; -#line 6162 "LibraryWindow.c" +#line 6168 "LibraryWindow.c" { const gchar* _tmp12_ = NULL; GFile* _tmp13_ = NULL; GFile* _tmp14_ = NULL; gboolean _tmp15_ = FALSE; gboolean _tmp16_ = FALSE; -#line 870 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 876 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp12_ = uri; -#line 870 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 876 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp13_ = g_file_new_for_uri (_tmp12_); -#line 870 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 876 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp14_ = _tmp13_; -#line 870 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 876 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp15_ = app_dirs_is_in_import_dir (_tmp14_); -#line 870 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 876 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp16_ = !_tmp15_; -#line 870 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 876 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp14_); -#line 870 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 876 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp16_) { -#line 6183 "LibraryWindow.c" +#line 6189 "LibraryWindow.c" GtkResponseType _tmp17_ = 0; -#line 871 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 877 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp17_ = copy_files_dialog (); -#line 871 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 877 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _result_ = _tmp17_; -#line 873 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 879 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_free0 (uri); -#line 873 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 879 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" break; -#line 6193 "LibraryWindow.c" +#line 6199 "LibraryWindow.c" } -#line 869 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 875 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_free0 (uri); -#line 6197 "LibraryWindow.c" +#line 6203 "LibraryWindow.c" } } } -#line 877 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 883 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp18_ = _result_; -#line 877 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 883 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" switch (_tmp18_) { -#line 877 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 883 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" case GTK_RESPONSE_ACCEPT: -#line 6207 "LibraryWindow.c" +#line 6213 "LibraryWindow.c" { -#line 879 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 885 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" selected_action = GDK_ACTION_COPY; -#line 880 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 886 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" break; -#line 6213 "LibraryWindow.c" +#line 6219 "LibraryWindow.c" } -#line 877 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 883 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" case GTK_RESPONSE_REJECT: -#line 6217 "LibraryWindow.c" +#line 6223 "LibraryWindow.c" { -#line 883 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 889 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" selected_action = GDK_ACTION_LINK; -#line 884 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 890 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" break; -#line 6223 "LibraryWindow.c" +#line 6229 "LibraryWindow.c" } default: { GdkDragContext* _tmp19_ = NULL; guint _tmp20_ = 0U; -#line 888 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 894 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp19_ = context; -#line 888 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 894 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp20_ = time; -#line 888 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 894 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" gtk_drag_finish (_tmp19_, FALSE, FALSE, (guint32) _tmp20_); -#line 890 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 896 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" __g_slist_free__g_free0_0 (uris); -#line 890 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 896 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" uris_array = (_vala_array_free (uris_array, uris_array_length1, (GDestroyNotify) g_free), NULL); -#line 890 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 896 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return; -#line 6241 "LibraryWindow.c" +#line 6247 "LibraryWindow.c" } } } -#line 894 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 900 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp21_ = uris; -#line 894 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 900 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp22_ = selected_action; -#line 894 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 900 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_dispatch_import_jobs (self, _tmp21_, "drag-and-drop", _tmp22_ == GDK_ACTION_COPY); -#line 896 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 902 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp23_ = context; -#line 896 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 902 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp24_ = time; -#line 896 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 902 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" gtk_drag_finish (_tmp23_, TRUE, FALSE, (guint32) _tmp24_); -#line 857 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 863 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" __g_slist_free__g_free0_0 (uris); -#line 857 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 863 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" uris_array = (_vala_array_free (uris_array, uris_array_length1, (GDestroyNotify) g_free), NULL); -#line 6261 "LibraryWindow.c" +#line 6267 "LibraryWindow.c" } @@ -6268,23 +6274,23 @@ void library_window_switch_to_library_page (LibraryWindow* self) { LibraryPhotosEntry* _tmp2_ = NULL; Page* _tmp3_ = NULL; Page* _tmp4_ = NULL; -#line 899 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 905 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 900 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 906 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = self->priv->library_branch; -#line 900 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 906 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = library_branch_get_photos_entry (_tmp0_); -#line 900 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 906 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = _tmp1_; -#line 900 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 906 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = sidebar_page_representative_get_page (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, SIDEBAR_TYPE_PAGE_REPRESENTATIVE, SidebarPageRepresentative)); -#line 900 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 906 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp4_ = _tmp3_; -#line 900 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 906 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_switch_to_page (self, _tmp4_); -#line 900 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 906 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp4_); -#line 6287 "LibraryWindow.c" +#line 6293 "LibraryWindow.c" } @@ -6294,41 +6300,41 @@ void library_window_switch_to_event (LibraryWindow* self, Event* event) { Event* _tmp1_ = NULL; EventsEventEntry* _tmp2_ = NULL; EventsEventEntry* _tmp3_ = NULL; -#line 903 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 909 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 903 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 909 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_EVENT (event)); -#line 904 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 910 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = self->priv->events_branch; -#line 904 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 910 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = event; -#line 904 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 910 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = events_branch_get_entry_for_event (_tmp0_, _tmp1_); -#line 904 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 910 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" entry = _tmp2_; -#line 905 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 911 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = entry; -#line 905 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 911 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp3_ != NULL) { -#line 6313 "LibraryWindow.c" +#line 6319 "LibraryWindow.c" EventsEventEntry* _tmp4_ = NULL; Page* _tmp5_ = NULL; Page* _tmp6_ = NULL; -#line 906 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 912 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp4_ = entry; -#line 906 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 912 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp5_ = sidebar_page_representative_get_page (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, SIDEBAR_TYPE_PAGE_REPRESENTATIVE, SidebarPageRepresentative)); -#line 906 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 912 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp6_ = _tmp5_; -#line 906 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 912 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_switch_to_page (self, _tmp6_); -#line 906 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 912 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp6_); -#line 6327 "LibraryWindow.c" +#line 6333 "LibraryWindow.c" } -#line 903 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 909 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (entry); -#line 6331 "LibraryWindow.c" +#line 6337 "LibraryWindow.c" } @@ -6338,41 +6344,41 @@ void library_window_switch_to_tag (LibraryWindow* self, Tag* tag) { Tag* _tmp1_ = NULL; TagsSidebarEntry* _tmp2_ = NULL; TagsSidebarEntry* _tmp3_ = NULL; -#line 909 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 915 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 909 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 915 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_TAG (tag)); -#line 910 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 916 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = self->priv->tags_branch; -#line 910 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 916 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = tag; -#line 910 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 916 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = tags_branch_get_entry_for_tag (_tmp0_, _tmp1_); -#line 910 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 916 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" entry = _tmp2_; -#line 911 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 917 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = entry; -#line 911 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 917 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp3_ != NULL) { -#line 6357 "LibraryWindow.c" +#line 6363 "LibraryWindow.c" TagsSidebarEntry* _tmp4_ = NULL; Page* _tmp5_ = NULL; Page* _tmp6_ = NULL; -#line 912 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 918 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp4_ = entry; -#line 912 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 918 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp5_ = sidebar_page_representative_get_page (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, SIDEBAR_TYPE_PAGE_REPRESENTATIVE, SidebarPageRepresentative)); -#line 912 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 918 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp6_ = _tmp5_; -#line 912 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 918 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_switch_to_page (self, _tmp6_); -#line 912 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 918 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp6_); -#line 6371 "LibraryWindow.c" +#line 6377 "LibraryWindow.c" } -#line 909 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 915 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (entry); -#line 6375 "LibraryWindow.c" +#line 6381 "LibraryWindow.c" } @@ -6382,41 +6388,41 @@ void library_window_switch_to_saved_search (LibraryWindow* self, SavedSearch* se SavedSearch* _tmp1_ = NULL; SearchesSidebarEntry* _tmp2_ = NULL; SearchesSidebarEntry* _tmp3_ = NULL; -#line 915 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 921 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 915 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 921 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_SAVED_SEARCH (search)); -#line 916 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 922 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = self->priv->saved_search_branch; -#line 916 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 922 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = search; -#line 916 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 922 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = searches_branch_get_entry_for_saved_search (_tmp0_, _tmp1_); -#line 916 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 922 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" entry = _tmp2_; -#line 917 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 923 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = entry; -#line 917 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 923 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp3_ != NULL) { -#line 6401 "LibraryWindow.c" +#line 6407 "LibraryWindow.c" SearchesSidebarEntry* _tmp4_ = NULL; Page* _tmp5_ = NULL; Page* _tmp6_ = NULL; -#line 918 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 924 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp4_ = entry; -#line 918 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 924 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp5_ = sidebar_page_representative_get_page (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, SIDEBAR_TYPE_PAGE_REPRESENTATIVE, SidebarPageRepresentative)); -#line 918 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 924 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp6_ = _tmp5_; -#line 918 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 924 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_switch_to_page (self, _tmp6_); -#line 918 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 924 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp6_); -#line 6415 "LibraryWindow.c" +#line 6421 "LibraryWindow.c" } -#line 915 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 921 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (entry); -#line 6419 "LibraryWindow.c" +#line 6425 "LibraryWindow.c" } @@ -6432,66 +6438,66 @@ void library_window_switch_to_photo_page (LibraryWindow* self, CollectionPage* c CollectionPage* _tmp10_ = NULL; Photo* _tmp11_ = NULL; LibraryPhotoPage* _tmp12_ = NULL; -#line 921 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 927 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 921 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 927 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_COLLECTION_PAGE (controller)); -#line 921 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 927 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_PHOTO (current)); -#line 922 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 928 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = controller; -#line 922 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 928 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PAGE, Page)); -#line 922 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 928 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = _tmp1_; -#line 922 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 928 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = current; -#line 922 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 928 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp4_ = view_collection_get_view_for_source (_tmp2_, G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_DATA_SOURCE, DataSource)); -#line 922 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 928 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp5_ = _tmp4_; -#line 922 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 928 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _vala_assert (_tmp5_ != NULL, "controller.get_view().get_view_for_source(current) != null"); -#line 922 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 928 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp5_); -#line 922 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 928 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _data_collection_unref0 (_tmp2_); -#line 923 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 929 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp6_ = self->priv->photo_page; -#line 923 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 929 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp6_ == NULL) { -#line 6463 "LibraryWindow.c" +#line 6469 "LibraryWindow.c" LibraryPhotoPage* _tmp7_ = NULL; LibraryPhotoPage* _tmp8_ = NULL; -#line 924 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 930 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp7_ = library_photo_page_new (); -#line 924 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 930 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_object_ref_sink (_tmp7_); -#line 924 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 930 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (self->priv->photo_page); -#line 924 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 930 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" self->priv->photo_page = _tmp7_; -#line 925 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 931 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp8_ = self->priv->photo_page; -#line 925 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 931 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_add_to_stack (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_PAGE, Page)); -#line 929 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 935 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" spin_event_loop (); -#line 6480 "LibraryWindow.c" +#line 6486 "LibraryWindow.c" } -#line 932 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 938 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp9_ = self->priv->photo_page; -#line 932 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 938 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp10_ = controller; -#line 932 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 938 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp11_ = current; -#line 932 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 938 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_photo_page_display_for_collection (_tmp9_, _tmp10_, _tmp11_, NULL); -#line 933 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 939 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp12_ = self->priv->photo_page; -#line 933 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 939 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_switch_to_page (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_PAGE, Page)); -#line 6494 "LibraryWindow.c" +#line 6500 "LibraryWindow.c" } @@ -6501,23 +6507,23 @@ void library_window_switch_to_import_queue_page (LibraryWindow* self) { LibraryImportQueueSidebarEntry* _tmp2_ = NULL; Page* _tmp3_ = NULL; Page* _tmp4_ = NULL; -#line 936 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 942 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 937 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 943 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = self->priv->library_branch; -#line 937 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 943 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = library_branch_get_import_queue_entry (_tmp0_); -#line 937 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 943 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = _tmp1_; -#line 937 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 943 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = sidebar_page_representative_get_page (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, SIDEBAR_TYPE_PAGE_REPRESENTATIVE, SidebarPageRepresentative)); -#line 937 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 943 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp4_ = _tmp3_; -#line 937 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 943 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_switch_to_page (self, _tmp4_); -#line 937 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 943 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp4_); -#line 6520 "LibraryWindow.c" +#line 6526 "LibraryWindow.c" } @@ -6538,169 +6544,169 @@ static void library_window_on_camera_added (LibraryWindow* self, DiscoveredCamer gboolean _tmp13_ = FALSE; GMount* _tmp14_ = NULL; GError * _inner_error_ = NULL; -#line 940 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 946 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 940 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 946 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_DISCOVERED_CAMERA (camera)); -#line 941 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 947 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = self->priv->camera_branch; -#line 941 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 947 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = camera; -#line 941 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 947 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = camera_branch_get_entry_for_camera (_tmp0_, _tmp1_); -#line 941 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 947 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" entry = _tmp2_; -#line 942 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 948 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = entry; -#line 942 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 948 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp3_ == NULL) { -#line 943 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 949 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (entry); -#line 943 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 949 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return; -#line 6561 "LibraryWindow.c" +#line 6567 "LibraryWindow.c" } -#line 945 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 951 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp4_ = entry; -#line 945 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 951 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp5_ = sidebar_page_representative_get_page (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, SIDEBAR_TYPE_PAGE_REPRESENTATIVE, SidebarPageRepresentative)); -#line 945 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 951 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" page = G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_IMPORT_PAGE, ImportPage); -#line 946 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 952 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp6_ = camera; -#line 946 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 952 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp7_ = _tmp6_->uri; -#line 946 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 952 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp8_ = g_file_new_for_uri (_tmp7_); -#line 946 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 952 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" uri_file = _tmp8_; -#line 949 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 955 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" mount = NULL; -#line 6579 "LibraryWindow.c" +#line 6585 "LibraryWindow.c" { GMount* _tmp9_ = NULL; GFile* _tmp10_ = NULL; GMount* _tmp11_ = NULL; GMount* _tmp12_ = NULL; -#line 951 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 957 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp10_ = uri_file; -#line 951 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 957 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp11_ = g_file_find_enclosing_mount (_tmp10_, NULL, &_inner_error_); -#line 951 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 957 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp9_ = _tmp11_; -#line 951 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 957 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 6593 "LibraryWindow.c" - goto __catch39_g_error; +#line 6599 "LibraryWindow.c" + goto __catch41_g_error; } -#line 951 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 957 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp12_ = _tmp9_; -#line 951 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 957 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp9_ = NULL; -#line 951 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 957 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (mount); -#line 951 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 957 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" mount = _tmp12_; -#line 950 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 956 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp9_); -#line 6606 "LibraryWindow.c" +#line 6612 "LibraryWindow.c" } - goto __finally39; - __catch39_g_error: + goto __finally41; + __catch41_g_error: { GError* err = NULL; -#line 950 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 956 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" err = _inner_error_; -#line 950 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 956 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _inner_error_ = NULL; -#line 950 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 956 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_error_free0 (err); -#line 6618 "LibraryWindow.c" +#line 6624 "LibraryWindow.c" } - __finally39: -#line 950 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + __finally41: +#line 956 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 950 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 956 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (mount); -#line 950 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 956 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (uri_file); -#line 950 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 956 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (page); -#line 950 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 956 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (entry); -#line 950 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 956 "/home/jens/Source/shotwell/src/library/LibraryWindow.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 950 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 956 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_clear_error (&_inner_error_); -#line 950 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 956 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return; -#line 6637 "LibraryWindow.c" +#line 6643 "LibraryWindow.c" } -#line 957 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 963 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp14_ = mount; -#line 957 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 963 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp14_ != NULL) { -#line 6643 "LibraryWindow.c" +#line 6649 "LibraryWindow.c" DiscoveredCamera* _tmp15_ = NULL; const gchar* _tmp16_ = NULL; gboolean _tmp17_ = FALSE; -#line 957 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 963 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp15_ = camera; -#line 957 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 963 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp16_ = _tmp15_->uri; -#line 957 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 963 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp17_ = g_str_has_prefix (_tmp16_, "file://"); -#line 957 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 963 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp13_ = !_tmp17_; -#line 6655 "LibraryWindow.c" +#line 6661 "LibraryWindow.c" } else { -#line 957 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 963 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp13_ = FALSE; -#line 6659 "LibraryWindow.c" +#line 6665 "LibraryWindow.c" } -#line 957 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 963 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp13_) { -#line 6663 "LibraryWindow.c" +#line 6669 "LibraryWindow.c" ImportPage* _tmp18_ = NULL; GMount* _tmp19_ = NULL; gboolean _tmp20_ = FALSE; -#line 958 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 964 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp18_ = page; -#line 958 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 964 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp19_ = mount; -#line 958 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 964 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp20_ = import_page_unmount_camera (_tmp18_, _tmp19_); -#line 958 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 964 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp20_) { -#line 6675 "LibraryWindow.c" +#line 6681 "LibraryWindow.c" ImportPage* _tmp21_ = NULL; -#line 959 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 965 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp21_ = page; -#line 959 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 965 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_switch_to_page (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, TYPE_PAGE, Page)); -#line 6681 "LibraryWindow.c" +#line 6687 "LibraryWindow.c" } else { -#line 961 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 967 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" app_window_error_message ("Unable to unmount the camera at this time.", NULL); -#line 6685 "LibraryWindow.c" +#line 6691 "LibraryWindow.c" } } else { ImportPage* _tmp22_ = NULL; -#line 963 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 969 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp22_ = page; -#line 963 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 969 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_switch_to_page (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, TYPE_PAGE, Page)); -#line 6693 "LibraryWindow.c" +#line 6699 "LibraryWindow.c" } -#line 940 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 946 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (mount); -#line 940 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 946 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (uri_file); -#line 940 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 946 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (page); -#line 940 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 946 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (entry); -#line 6703 "LibraryWindow.c" +#line 6709 "LibraryWindow.c" } @@ -6709,25 +6715,25 @@ void library_window_add_to_stack (LibraryWindow* self, Page* page) { GtkStack* _tmp1_ = NULL; Page* _tmp2_ = NULL; GtkStack* _tmp3_ = NULL; -#line 968 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 974 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 968 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 974 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_PAGE (page)); -#line 970 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 976 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = page; -#line 970 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 976 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget)); -#line 972 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 978 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = self->priv->stack; -#line 972 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 978 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = page; -#line 972 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 978 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget)); -#line 974 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 980 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = self->priv->stack; -#line 974 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 980 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget)); -#line 6730 "LibraryWindow.c" +#line 6736 "LibraryWindow.c" } @@ -6735,49 +6741,49 @@ static void library_window_remove_from_stack (LibraryWindow* self, Page* page) { GtkStack* _tmp0_ = NULL; Page* _tmp1_ = NULL; GtkStack* _tmp2_ = NULL; -#line 977 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 983 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 977 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 983 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_PAGE (page)); -#line 978 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 984 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = self->priv->stack; -#line 978 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 984 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = page; -#line 978 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 984 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" gtk_container_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_widget_get_type (), GtkWidget)); -#line 981 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 987 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = self->priv->stack; -#line 981 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 987 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget)); -#line 6752 "LibraryWindow.c" +#line 6758 "LibraryWindow.c" } static GVariant* _variant_new10 (gboolean value) { -#line 988 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 994 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return g_variant_ref_sink (g_variant_new_boolean (value)); -#line 6759 "LibraryWindow.c" +#line 6765 "LibraryWindow.c" } static GVariant* _variant_new11 (gboolean value) { -#line 992 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 998 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return g_variant_ref_sink (g_variant_new_boolean (value)); -#line 6766 "LibraryWindow.c" +#line 6772 "LibraryWindow.c" } static GVariant* _variant_new12 (gboolean value) { -#line 996 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1002 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return g_variant_ref_sink (g_variant_new_boolean (value)); -#line 6773 "LibraryWindow.c" +#line 6779 "LibraryWindow.c" } static GVariant* _variant_new13 (const gchar* value) { -#line 1007 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1013 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return g_variant_ref_sink (g_variant_new_string (value)); -#line 6780 "LibraryWindow.c" +#line 6786 "LibraryWindow.c" } @@ -6822,148 +6828,148 @@ static void library_window_load_configuration (LibraryWindow* self) { gchar* _tmp32_ = NULL; GAction* _tmp33_ = NULL; GVariant* _tmp34_ = NULL; -#line 985 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 991 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 986 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 992 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = g_action_map_lookup_action (G_TYPE_CHECK_INSTANCE_CAST (self, g_action_map_get_type (), GActionMap), "CommonDisplayBasicProperties"); -#line 986 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 992 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = _g_object_ref0 (_tmp0_); -#line 986 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 992 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" basic_display_action = _tmp1_; -#line 987 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 993 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = basic_display_action; -#line 987 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 993 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _vala_assert (_tmp2_ != NULL, "basic_display_action != null"); -#line 988 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 994 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = basic_display_action; -#line 988 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 994 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp4_ = config_facade_get_instance (); -#line 988 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 994 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp5_ = _tmp4_; -#line 988 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 994 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp6_ = configuration_facade_get_display_basic_properties (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); -#line 988 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 994 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp7_ = _variant_new10 (_tmp6_); -#line 988 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 994 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_action_change_state (_tmp3_, _tmp7_); -#line 988 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 994 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_variant_unref0 (_tmp7_); -#line 988 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 994 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp5_); -#line 990 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 996 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp8_ = g_action_map_lookup_action (G_TYPE_CHECK_INSTANCE_CAST (self, g_action_map_get_type (), GActionMap), "CommonDisplayExtendedProperties"); -#line 990 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 996 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp9_ = _g_object_ref0 (_tmp8_); -#line 990 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 996 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" extended_display_action = _tmp9_; -#line 991 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 997 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp10_ = extended_display_action; -#line 991 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 997 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _vala_assert (_tmp10_ != NULL, "extended_display_action != null"); -#line 992 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 998 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp11_ = extended_display_action; -#line 992 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 998 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp12_ = config_facade_get_instance (); -#line 992 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 998 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp13_ = _tmp12_; -#line 992 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 998 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp14_ = configuration_facade_get_display_extended_properties (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); -#line 992 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 998 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp15_ = _variant_new11 (_tmp14_); -#line 992 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 998 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_action_change_state (_tmp11_, _tmp15_); -#line 992 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 998 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_variant_unref0 (_tmp15_); -#line 992 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 998 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp13_); -#line 994 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1000 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp16_ = g_action_map_lookup_action (G_TYPE_CHECK_INSTANCE_CAST (self, g_action_map_get_type (), GActionMap), "CommonDisplaySearchbar"); -#line 994 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1000 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp17_ = _g_object_ref0 (_tmp16_); -#line 994 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1000 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" search_bar_display_action = _tmp17_; -#line 995 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1001 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp18_ = search_bar_display_action; -#line 995 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1001 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _vala_assert (_tmp18_ != NULL, "search_bar_display_action != null"); -#line 996 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1002 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp19_ = search_bar_display_action; -#line 996 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1002 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp20_ = config_facade_get_instance (); -#line 996 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1002 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp21_ = _tmp20_; -#line 996 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1002 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp22_ = configuration_facade_get_display_search_bar (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); -#line 996 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1002 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp23_ = _variant_new12 (_tmp22_); -#line 996 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1002 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_action_change_state (_tmp19_, _tmp23_); -#line 996 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1002 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_variant_unref0 (_tmp23_); -#line 996 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1002 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp21_); -#line 998 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1004 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp24_ = g_action_map_lookup_action (G_TYPE_CHECK_INSTANCE_CAST (self, g_action_map_get_type (), GActionMap), "CommonSortEvents"); -#line 998 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1004 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp25_ = _g_object_ref0 (_tmp24_); -#line 998 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1004 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" sort_events_action = _tmp25_; -#line 999 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1005 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp26_ = sort_events_action; -#line 999 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1005 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _vala_assert (_tmp26_ != NULL, "sort_events_action != null"); -#line 1004 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1010 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp28_ = config_facade_get_instance (); -#line 1004 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1010 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp29_ = _tmp28_; -#line 1004 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1010 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp30_ = configuration_facade_get_events_sort_ascending (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); -#line 1004 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1010 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp31_ = _tmp30_; -#line 1004 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1010 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp29_); -#line 1004 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1010 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp31_) { -#line 1004 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1010 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp27_ = LIBRARY_WINDOW_SORT_EVENTS_ORDER_ASCENDING; -#line 6929 "LibraryWindow.c" +#line 6935 "LibraryWindow.c" } else { -#line 1005 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1011 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp27_ = LIBRARY_WINDOW_SORT_EVENTS_ORDER_DESCENDING; -#line 6933 "LibraryWindow.c" +#line 6939 "LibraryWindow.c" } -#line 1004 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1010 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp32_ = g_strdup (_tmp27_); -#line 1004 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1010 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" event_sort_val = _tmp32_; -#line 1007 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1013 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp33_ = sort_events_action; -#line 1007 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1013 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp34_ = _variant_new13 (event_sort_val); -#line 1007 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1013 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_action_change_state (_tmp33_, _tmp34_); -#line 1007 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1013 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_variant_unref0 (_tmp34_); -#line 985 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 991 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_free0 (event_sort_val); -#line 985 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 991 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (sort_events_action); -#line 985 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 991 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (search_bar_display_action); -#line 985 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 991 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (extended_display_action); -#line 985 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 991 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (basic_display_action); -#line 6957 "LibraryWindow.c" +#line 6963 "LibraryWindow.c" } static gboolean _library_window_on_pulse_background_progress_bar_gsource_func (gpointer self) { gboolean result; result = library_window_on_pulse_background_progress_bar ((LibraryWindow*) self); -#line 1022 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1028 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return result; -#line 6966 "LibraryWindow.c" +#line 6972 "LibraryWindow.c" } @@ -6976,62 +6982,62 @@ static void library_window_start_pulse_background_progress_bar (LibraryWindow* s const gchar* _tmp5_ = NULL; GtkProgressBar* _tmp6_ = NULL; guint _tmp7_ = 0U; -#line 1010 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1016 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 1010 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1016 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (label != NULL); -#line 1011 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1017 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = priority; -#line 1011 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1017 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = self->priv->current_progress_priority; -#line 1011 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1017 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp0_ < _tmp1_) { -#line 1012 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1018 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return; -#line 6991 "LibraryWindow.c" +#line 6997 "LibraryWindow.c" } -#line 1014 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1020 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = priority; -#line 1014 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1020 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_stop_pulse_background_progress_bar (self, _tmp2_, FALSE); -#line 1016 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1022 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = priority; -#line 1016 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1022 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" self->priv->current_progress_priority = _tmp3_; -#line 1018 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1024 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp4_ = self->priv->background_progress_bar; -#line 1018 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1024 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp5_ = label; -#line 1018 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1024 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" gtk_progress_bar_set_text (_tmp4_, _tmp5_); -#line 1019 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1025 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp6_ = self->priv->background_progress_bar; -#line 1019 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1025 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" gtk_progress_bar_pulse (_tmp6_); -#line 1020 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1026 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_show_background_progress_bar (self); -#line 1022 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1028 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp7_ = g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) LIBRARY_WINDOW_BACKGROUND_PROGRESS_PULSE_MSEC, _library_window_on_pulse_background_progress_bar_gsource_func, g_object_ref (self), g_object_unref); -#line 1022 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1028 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" self->priv->background_progress_pulse_id = _tmp7_; -#line 7017 "LibraryWindow.c" +#line 7023 "LibraryWindow.c" } static gboolean library_window_on_pulse_background_progress_bar (LibraryWindow* self) { gboolean result = FALSE; GtkProgressBar* _tmp0_ = NULL; -#line 1026 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1032 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_val_if_fail (IS_LIBRARY_WINDOW (self), FALSE); -#line 1027 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1033 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = self->priv->background_progress_bar; -#line 1027 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1033 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" gtk_progress_bar_pulse (_tmp0_); -#line 1029 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1035 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" result = TRUE; -#line 1029 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1035 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return result; -#line 7034 "LibraryWindow.c" +#line 7040 "LibraryWindow.c" } @@ -7040,43 +7046,43 @@ static void library_window_stop_pulse_background_progress_bar (LibraryWindow* se gint _tmp1_ = 0; guint _tmp2_ = 0U; gboolean _tmp4_ = FALSE; -#line 1032 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1038 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 1033 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1039 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = priority; -#line 1033 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1039 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = self->priv->current_progress_priority; -#line 1033 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1039 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp0_ < _tmp1_) { -#line 1034 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1040 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return; -#line 7053 "LibraryWindow.c" +#line 7059 "LibraryWindow.c" } -#line 1036 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1042 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = self->priv->background_progress_pulse_id; -#line 1036 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1042 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp2_ != ((guint) 0)) { -#line 7059 "LibraryWindow.c" +#line 7065 "LibraryWindow.c" guint _tmp3_ = 0U; -#line 1037 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1043 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = self->priv->background_progress_pulse_id; -#line 1037 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1043 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_source_remove (_tmp3_); -#line 1038 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1044 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" self->priv->background_progress_pulse_id = (guint) 0; -#line 7067 "LibraryWindow.c" +#line 7073 "LibraryWindow.c" } -#line 1041 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1047 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp4_ = clear; -#line 1041 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1047 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp4_) { -#line 7073 "LibraryWindow.c" +#line 7079 "LibraryWindow.c" gint _tmp5_ = 0; -#line 1042 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1048 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp5_ = priority; -#line 1042 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1048 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_clear_background_progress_bar (self, _tmp5_); -#line 7079 "LibraryWindow.c" +#line 7085 "LibraryWindow.c" } } @@ -7100,102 +7106,102 @@ static void library_window_update_background_progress_bar (LibraryWindow* self, gdouble _tmp18_ = 0.0; gchar* _tmp19_ = NULL; gchar* _tmp20_ = NULL; -#line 1045 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1051 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 1045 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1051 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (label != NULL); -#line 1047 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1053 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = priority; -#line 1047 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1053 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = self->priv->current_progress_priority; -#line 1047 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1053 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp0_ < _tmp1_) { -#line 1048 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1054 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return; -#line 7115 "LibraryWindow.c" +#line 7121 "LibraryWindow.c" } -#line 1050 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1056 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = priority; -#line 1050 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1056 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_stop_pulse_background_progress_bar (self, _tmp2_, FALSE); -#line 1052 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1058 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp5_ = count; -#line 1052 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1058 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp5_ <= 0.0) { -#line 1052 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1058 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp4_ = TRUE; -#line 7127 "LibraryWindow.c" +#line 7133 "LibraryWindow.c" } else { gdouble _tmp6_ = 0.0; -#line 1052 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1058 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp6_ = total; -#line 1052 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1058 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp4_ = _tmp6_ <= 0.0; -#line 7134 "LibraryWindow.c" +#line 7140 "LibraryWindow.c" } -#line 1052 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1058 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp4_) { -#line 1052 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1058 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = TRUE; -#line 7140 "LibraryWindow.c" +#line 7146 "LibraryWindow.c" } else { gdouble _tmp7_ = 0.0; gdouble _tmp8_ = 0.0; -#line 1052 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1058 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp7_ = count; -#line 1052 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1058 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp8_ = total; -#line 1052 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1058 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = _tmp7_ >= _tmp8_; -#line 7150 "LibraryWindow.c" +#line 7156 "LibraryWindow.c" } -#line 1052 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1058 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp3_) { -#line 7154 "LibraryWindow.c" +#line 7160 "LibraryWindow.c" gint _tmp9_ = 0; -#line 1053 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1059 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp9_ = priority; -#line 1053 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1059 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_clear_background_progress_bar (self, _tmp9_); -#line 1055 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1061 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return; -#line 7162 "LibraryWindow.c" +#line 7168 "LibraryWindow.c" } -#line 1058 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1064 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp10_ = priority; -#line 1058 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1064 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" self->priv->current_progress_priority = _tmp10_; -#line 1060 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1066 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp11_ = count; -#line 1060 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1066 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp12_ = total; -#line 1060 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1066 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" fraction = _tmp11_ / _tmp12_; -#line 1061 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1067 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp13_ = self->priv->background_progress_bar; -#line 1061 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1067 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp14_ = fraction; -#line 1061 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1067 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" gtk_progress_bar_set_fraction (_tmp13_, _tmp14_); -#line 1062 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1068 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp15_ = self->priv->background_progress_bar; -#line 1062 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1068 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp16_ = _ ("%s (%d%%)"); -#line 1062 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1068 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp17_ = label; -#line 1062 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1068 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp18_ = fraction; -#line 1062 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1068 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp19_ = g_strdup_printf (_tmp16_, _tmp17_, (gint) (_tmp18_ * 100.0)); -#line 1062 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1068 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp20_ = _tmp19_; -#line 1062 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1068 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" gtk_progress_bar_set_text (_tmp15_, _tmp20_); -#line 1062 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1068 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_free0 (_tmp20_); -#line 1063 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1069 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_show_background_progress_bar (self); -#line 7198 "LibraryWindow.c" +#line 7204 "LibraryWindow.c" } @@ -7205,149 +7211,149 @@ static void library_window_clear_background_progress_bar (LibraryWindow* self, g gint _tmp2_ = 0; GtkProgressBar* _tmp3_ = NULL; GtkProgressBar* _tmp4_ = NULL; -#line 1072 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1078 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 1073 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1079 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = priority; -#line 1073 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1079 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = self->priv->current_progress_priority; -#line 1073 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1079 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp0_ < _tmp1_) { -#line 1074 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1080 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return; -#line 7218 "LibraryWindow.c" +#line 7224 "LibraryWindow.c" } -#line 1076 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1082 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = priority; -#line 1076 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1082 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_stop_pulse_background_progress_bar (self, _tmp2_, FALSE); -#line 1078 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1084 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" self->priv->current_progress_priority = 0; -#line 1080 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1086 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = self->priv->background_progress_bar; -#line 1080 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1086 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" gtk_progress_bar_set_fraction (_tmp3_, 0.0); -#line 1081 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1087 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp4_ = self->priv->background_progress_bar; -#line 1081 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1087 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" gtk_progress_bar_set_text (_tmp4_, ""); -#line 1082 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1088 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_hide_background_progress_bar (self); -#line 7236 "LibraryWindow.c" +#line 7242 "LibraryWindow.c" } static void library_window_show_background_progress_bar (LibraryWindow* self) { gboolean _tmp0_ = FALSE; -#line 1090 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1096 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 1091 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1097 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = self->priv->background_progress_displayed; -#line 1091 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1097 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (!_tmp0_) { -#line 7248 "LibraryWindow.c" +#line 7254 "LibraryWindow.c" GtkBox* _tmp1_ = NULL; GtkFrame* _tmp2_ = NULL; GtkFrame* _tmp3_ = NULL; -#line 1092 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1098 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = self->priv->top_section; -#line 1092 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1098 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = self->priv->background_progress_frame; -#line 1092 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1098 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" gtk_box_pack_end (_tmp1_, G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0); -#line 1093 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1099 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = self->priv->background_progress_frame; -#line 1093 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1099 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget)); -#line 1094 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1100 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" self->priv->background_progress_displayed = TRUE; -#line 7264 "LibraryWindow.c" +#line 7270 "LibraryWindow.c" } } static void library_window_hide_background_progress_bar (LibraryWindow* self) { gboolean _tmp0_ = FALSE; -#line 1098 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1104 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 1099 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1105 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = self->priv->background_progress_displayed; -#line 1099 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1105 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp0_) { -#line 7277 "LibraryWindow.c" +#line 7283 "LibraryWindow.c" GtkBox* _tmp1_ = NULL; GtkFrame* _tmp2_ = NULL; -#line 1100 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1106 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = self->priv->top_section; -#line 1100 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1106 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = self->priv->background_progress_frame; -#line 1100 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1106 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" gtk_container_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget)); -#line 1101 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1107 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" self->priv->background_progress_displayed = FALSE; -#line 7288 "LibraryWindow.c" +#line 7294 "LibraryWindow.c" } } static void library_window_on_library_monitor_discovery_started (LibraryWindow* self) { const gchar* _tmp0_ = NULL; -#line 1105 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1111 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 1106 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1112 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = _ ("Updating library…"); -#line 1106 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1112 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_start_pulse_background_progress_bar (self, _tmp0_, LIBRARY_WINDOW_STARTUP_SCAN_PROGRESS_PRIORITY); -#line 7301 "LibraryWindow.c" +#line 7307 "LibraryWindow.c" } static void library_window_on_library_monitor_discovery_completed (LibraryWindow* self) { -#line 1109 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1115 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 1110 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1116 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_stop_pulse_background_progress_bar (self, LIBRARY_WINDOW_STARTUP_SCAN_PROGRESS_PRIORITY, TRUE); -#line 7310 "LibraryWindow.c" +#line 7316 "LibraryWindow.c" } static void library_window_on_library_monitor_auto_update_progress (LibraryWindow* self, gint completed_files, gint total_files) { gint _tmp0_ = 0; -#line 1113 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1119 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 1114 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1120 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = total_files; -#line 1114 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1120 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp0_ < LIBRARY_WINDOW_MIN_PROGRESS_BAR_FILES) { -#line 1115 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1121 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_clear_background_progress_bar (self, LIBRARY_WINDOW_REALTIME_UPDATE_PROGRESS_PRIORITY); -#line 7324 "LibraryWindow.c" +#line 7330 "LibraryWindow.c" } else { const gchar* _tmp1_ = NULL; gint _tmp2_ = 0; gint _tmp3_ = 0; -#line 1117 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1123 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = _ ("Updating library…"); -#line 1117 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1123 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = completed_files; -#line 1117 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1123 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = total_files; -#line 1117 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1123 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_update_background_progress_bar (self, _tmp1_, LIBRARY_WINDOW_REALTIME_UPDATE_PROGRESS_PRIORITY, (gdouble) _tmp2_, (gdouble) _tmp3_); -#line 7337 "LibraryWindow.c" +#line 7343 "LibraryWindow.c" } } static void library_window_on_library_monitor_auto_import_preparing (LibraryWindow* self) { const gchar* _tmp0_ = NULL; -#line 1122 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1128 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 1123 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1129 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = _ ("Preparing to auto-import photos…"); -#line 1123 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1129 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_start_pulse_background_progress_bar (self, _tmp0_, LIBRARY_WINDOW_REALTIME_IMPORT_PROGRESS_PRIORITY); -#line 7350 "LibraryWindow.c" +#line 7356 "LibraryWindow.c" } @@ -7355,44 +7361,44 @@ static void library_window_on_library_monitor_auto_import_progress (LibraryWindo const gchar* _tmp0_ = NULL; guint64 _tmp1_ = 0ULL; guint64 _tmp2_ = 0ULL; -#line 1127 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1133 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 1128 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1134 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = _ ("Auto-importing photos…"); -#line 1128 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1134 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = completed_bytes; -#line 1128 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1134 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = total_bytes; -#line 1128 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1134 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_update_background_progress_bar (self, _tmp0_, LIBRARY_WINDOW_REALTIME_IMPORT_PROGRESS_PRIORITY, (gdouble) _tmp1_, (gdouble) _tmp2_); -#line 7368 "LibraryWindow.c" +#line 7374 "LibraryWindow.c" } static void library_window_on_metadata_writer_progress (LibraryWindow* self, guint completed, guint total) { guint _tmp0_ = 0U; -#line 1132 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1138 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 1133 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1139 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = total; -#line 1133 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1139 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp0_ < ((guint) LIBRARY_WINDOW_MIN_PROGRESS_BAR_FILES)) { -#line 1134 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1140 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_clear_background_progress_bar (self, LIBRARY_WINDOW_METADATA_WRITER_PROGRESS_PRIORITY); -#line 7382 "LibraryWindow.c" +#line 7388 "LibraryWindow.c" } else { const gchar* _tmp1_ = NULL; guint _tmp2_ = 0U; guint _tmp3_ = 0U; -#line 1136 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1142 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = _ ("Writing metadata to files…"); -#line 1136 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1142 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = completed; -#line 1136 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1142 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = total; -#line 1136 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1142 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_update_background_progress_bar (self, _tmp1_, LIBRARY_WINDOW_METADATA_WRITER_PROGRESS_PRIORITY, (gdouble) _tmp2_, (gdouble) _tmp3_); -#line 7395 "LibraryWindow.c" +#line 7401 "LibraryWindow.c" } } @@ -7447,235 +7453,222 @@ static void library_window_create_layout (LibraryWindow* self, Page* start_page) GtkBox* _tmp45_ = NULL; GtkPaned* _tmp46_ = NULL; GtkBox* _tmp47_ = NULL; - GtkBuilder* builder = NULL; - GtkBuilder* _tmp48_ = NULL; - GObject* _tmp49_ = NULL; - Page* _tmp50_ = NULL; - Page* _tmp51_ = NULL; -#line 1141 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + Page* _tmp48_ = NULL; + Page* _tmp49_ = NULL; +#line 1147 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 1141 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1147 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_PAGE (start_page)); -#line 1144 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1150 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = (GtkScrolledWindow*) gtk_scrolled_window_new (NULL, NULL); -#line 1144 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1150 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_object_ref_sink (_tmp0_); -#line 1144 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1150 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" scrolled_sidebar = _tmp0_; -#line 1145 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1151 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" gtk_scrolled_window_set_policy (scrolled_sidebar, GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC); -#line 1146 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1152 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = self->priv->sidebar_tree; -#line 1146 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1152 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (scrolled_sidebar, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_widget_get_type (), GtkWidget)); -#line 1148 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1154 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = self->priv->background_progress_frame; -#line 1148 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1154 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" gtk_container_set_border_width (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_container_get_type (), GtkContainer), (guint) 2); -#line 1149 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1155 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = self->priv->background_progress_frame; -#line 1149 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1155 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp4_ = self->priv->background_progress_bar; -#line 1149 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1155 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_widget_get_type (), GtkWidget)); -#line 1150 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1156 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp5_ = self->priv->background_progress_frame; -#line 1150 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1156 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp6_ = gtk_widget_get_style_context (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_widget_get_type (), GtkWidget)); -#line 1150 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1156 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" gtk_style_context_remove_class (_tmp6_, "frame"); -#line 1153 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1159 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp7_ = self->priv->basic_properties; -#line 1153 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1159 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_FILL); -#line 1154 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1160 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp8_ = self->priv->basic_properties; -#line 1154 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1160 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" gtk_widget_set_valign (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_CENTER); -#line 1155 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1161 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp9_ = self->priv->basic_properties; -#line 1155 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1161 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" gtk_widget_set_hexpand (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_widget_get_type (), GtkWidget), TRUE); -#line 1156 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1162 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp10_ = self->priv->basic_properties; -#line 1156 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1162 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" gtk_widget_set_vexpand (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_widget_get_type (), GtkWidget), FALSE); -#line 1157 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1163 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp11_ = self->priv->basic_properties; -#line 1157 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1163 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" gtk_widget_set_margin_top (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_widget_get_type (), GtkWidget), 10); -#line 1158 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1164 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp12_ = self->priv->basic_properties; -#line 1158 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1164 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" gtk_widget_set_margin_bottom (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_widget_get_type (), GtkWidget), 10); -#line 1159 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1165 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp13_ = self->priv->basic_properties; -#line 1159 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1165 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" gtk_widget_set_margin_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, gtk_widget_get_type (), GtkWidget), 6); -#line 1160 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1166 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp14_ = self->priv->basic_properties; -#line 1160 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1166 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" gtk_widget_set_margin_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_widget_get_type (), GtkWidget), 0); -#line 1162 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1168 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp15_ = self->priv->bottom_frame; -#line 1162 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1168 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp16_ = self->priv->basic_properties; -#line 1162 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1168 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, gtk_widget_get_type (), GtkWidget)); -#line 1163 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1169 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp17_ = self->priv->bottom_frame; -#line 1163 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1169 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp18_ = gtk_widget_get_style_context (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_widget_get_type (), GtkWidget)); -#line 1163 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1169 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" gtk_style_context_remove_class (_tmp18_, "frame"); -#line 1167 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1173 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp19_ = self->priv->top_section; -#line 1167 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1173 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" gtk_box_pack_start (_tmp19_, G_TYPE_CHECK_INSTANCE_CAST (scrolled_sidebar, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0); -#line 1169 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1175 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp20_ = self->priv->sidebar_paned; -#line 1169 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1175 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp21_ = self->priv->top_section; -#line 1169 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1175 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" gtk_paned_pack1 (_tmp20_, G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, gtk_widget_get_type (), GtkWidget), TRUE, FALSE); -#line 1170 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1176 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp22_ = self->priv->sidebar_paned; -#line 1170 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1176 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp23_ = self->priv->bottom_frame; -#line 1170 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1176 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" gtk_paned_pack2 (_tmp22_, G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE); -#line 1171 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1177 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp24_ = self->priv->sidebar_paned; -#line 1171 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1177 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" gtk_paned_set_position (_tmp24_, 1000); -#line 1173 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1179 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp25_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); -#line 1173 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1179 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_object_ref_sink (_tmp25_); -#line 1173 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1179 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (self->priv->right_vbox); -#line 1173 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1179 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" self->priv->right_vbox = _tmp25_; -#line 1174 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1180 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp26_ = self->priv->right_vbox; -#line 1174 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1180 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp27_ = self->priv->search_toolbar; -#line 1174 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1180 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" gtk_box_pack_start (_tmp26_, G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0); -#line 1175 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1181 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp28_ = self->priv->right_vbox; -#line 1175 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1181 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp29_ = self->priv->stack; -#line 1175 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1181 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" gtk_box_pack_start (_tmp28_, G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0); -#line 1176 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1182 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp30_ = self->priv->right_vbox; -#line 1176 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1182 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp31_ = self->priv->toolbar_revealer; -#line 1176 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1182 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, gtk_widget_get_type (), GtkWidget)); -#line 1178 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1184 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp32_ = (GtkPaned*) gtk_paned_new (GTK_ORIENTATION_HORIZONTAL); -#line 1178 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1184 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_object_ref_sink (_tmp32_); -#line 1178 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1184 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (self->priv->client_paned); -#line 1178 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1184 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" self->priv->client_paned = _tmp32_; -#line 1179 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1185 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp33_ = self->priv->client_paned; -#line 1179 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1185 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp34_ = self->priv->sidebar_paned; -#line 1179 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1185 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" gtk_paned_pack1 (_tmp33_, G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE); -#line 1180 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1186 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp35_ = self->priv->sidebar_tree; -#line 1180 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1186 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, gtk_widget_get_type (), GtkWidget), LIBRARY_WINDOW_SIDEBAR_MIN_WIDTH, -1); -#line 1181 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1187 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp36_ = self->priv->client_paned; -#line 1181 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1187 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp37_ = self->priv->right_vbox; -#line 1181 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1187 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" gtk_paned_pack2 (_tmp36_, G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, gtk_widget_get_type (), GtkWidget), TRUE, FALSE); -#line 1182 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1188 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp38_ = self->priv->client_paned; -#line 1182 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1188 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp39_ = config_facade_get_instance (); -#line 1182 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1188 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp40_ = _tmp39_; -#line 1182 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1188 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp41_ = configuration_facade_get_sidebar_position (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); -#line 1182 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1188 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" gtk_paned_set_position (_tmp38_, _tmp41_); -#line 1182 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1188 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp40_); -#line 1184 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1190 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp42_ = self->priv->stack; -#line 1184 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1190 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp43_ = library_window_get_PAGE_MIN_WIDTH (); -#line 1184 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1190 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp44_ = _tmp43_; -#line 1184 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1190 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, gtk_widget_get_type (), GtkWidget), _tmp44_, -1); -#line 1186 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1192 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp45_ = self->priv->layout; -#line 1186 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1192 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp46_ = self->priv->client_paned; -#line 1186 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1192 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" gtk_box_pack_end (_tmp45_, G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0); -#line 1188 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp47_ = self->priv->layout; -#line 1188 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp47_, gtk_widget_get_type (), GtkWidget)); -#line 1190 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp48_ = gtk_builder_new_from_resource ("/org/gnome/Shotwell/appmenu.ui"); -#line 1190 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - builder = _tmp48_; -#line 1191 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp49_ = gtk_builder_get_object (builder, "appmenu"); -#line 1191 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - application_set_appmenu (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_TYPE (_tmp49_, g_menu_get_type ()) ? ((GMenu*) _tmp49_) : NULL, g_menu_model_get_type (), GMenuModel)); -#line 1193 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp50_ = start_page; -#line 1193 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - library_window_switch_to_page (self, _tmp50_); #line 1194 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp51_ = start_page; + _tmp47_ = self->priv->layout; #line 1194 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - gtk_widget_grab_focus (G_TYPE_CHECK_INSTANCE_CAST (_tmp51_, gtk_widget_get_type (), GtkWidget)); -#line 1141 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _g_object_unref0 (builder); -#line 1141 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp47_, gtk_widget_get_type (), GtkWidget)); +#line 1196 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp48_ = start_page; +#line 1196 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + library_window_switch_to_page (self, _tmp48_); +#line 1197 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp49_ = start_page; +#line 1197 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + gtk_widget_grab_focus (G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, gtk_widget_get_type (), GtkWidget)); +#line 1147 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (scrolled_sidebar); -#line 7651 "LibraryWindow.c" +#line 7644 "LibraryWindow.c" } static void library_window_real_set_current_page (PageWindow* base, Page* page) { LibraryWindow * self; Page* _tmp0_ = NULL; -#line 1197 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1200 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_WINDOW, LibraryWindow); -#line 1197 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1200 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_PAGE (page)); -#line 1199 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1202 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = page; -#line 1199 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1202 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_switch_to_page (self, _tmp0_); -#line 7666 "LibraryWindow.c" +#line 7659 "LibraryWindow.c" } void library_window_set_page_switching_enabled (LibraryWindow* self, gboolean should_enable) { gboolean _tmp0_ = FALSE; -#line 1202 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1205 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 1203 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1206 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = should_enable; -#line 1203 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1206 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" self->priv->page_switching_enabled = _tmp0_; -#line 7678 "LibraryWindow.c" +#line 7671 "LibraryWindow.c" } @@ -7707,48 +7700,56 @@ void library_window_switch_to_page (LibraryWindow* self, Page* page) { Page* _tmp43_ = NULL; GMenuModel* _tmp44_ = NULL; GMenuModel* _tmp45_ = NULL; + gboolean old = FALSE; + GtkSettings* _tmp46_ = NULL; + gboolean _tmp47_ = FALSE; + gboolean _tmp48_ = FALSE; + GtkSettings* _tmp49_ = NULL; + gboolean _tmp50_ = FALSE; + GtkSettings* _tmp51_ = NULL; + gboolean _tmp52_ = FALSE; GtkToolbar* toolbar = NULL; - Page* _tmp46_ = NULL; - GtkToolbar* _tmp47_ = NULL; - GtkToolbar* _tmp48_ = NULL; - Page* _tmp54_ = NULL; -#line 1206 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + Page* _tmp53_ = NULL; + GtkToolbar* _tmp54_ = NULL; + GtkToolbar* _tmp55_ = NULL; + Page* _tmp61_ = NULL; +#line 1209 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 1206 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1209 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_PAGE (page)); -#line 1207 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1210 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = self->priv->page_switching_enabled; -#line 1207 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1210 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (!_tmp0_) { -#line 1208 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1211 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return; -#line 7725 "LibraryWindow.c" +#line 7726 "LibraryWindow.c" } -#line 1210 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1213 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = page; -#line 1210 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1213 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow)); -#line 1210 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1213 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = _tmp2_; -#line 1210 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1213 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp4_ = _tmp1_ == _tmp3_; -#line 1210 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1213 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp3_); -#line 1210 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1213 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp4_) { -#line 1211 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1214 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return; -#line 7741 "LibraryWindow.c" +#line 7742 "LibraryWindow.c" } -#line 1213 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1216 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp5_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow)); -#line 1213 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1216 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" current_page = _tmp5_; -#line 1214 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1217 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp6_ = current_page; -#line 1214 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1217 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp6_ != NULL) { -#line 7751 "LibraryWindow.c" +#line 7752 "LibraryWindow.c" GtkToolbar* toolbar = NULL; Page* _tmp7_ = NULL; GtkToolbar* _tmp8_ = NULL; @@ -7756,96 +7757,96 @@ void library_window_switch_to_page (LibraryWindow* self, Page* page) { Page* _tmp12_ = NULL; Page* _tmp13_ = NULL; Page* _tmp15_ = NULL; -#line 1215 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1218 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" gtk_application_window_set_show_menubar (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_application_window_get_type (), GtkApplicationWindow), FALSE); -#line 1216 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1219 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" application_set_menubar (NULL); -#line 1218 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1221 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp7_ = current_page; -#line 1218 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1221 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp8_ = page_get_toolbar (_tmp7_); -#line 1218 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1221 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" toolbar = _tmp8_; -#line 1219 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1222 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp9_ = toolbar; -#line 1219 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1222 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp9_ != NULL) { -#line 7773 "LibraryWindow.c" +#line 7774 "LibraryWindow.c" GtkRevealer* _tmp10_ = NULL; GtkToolbar* _tmp11_ = NULL; -#line 1220 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1223 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp10_ = self->priv->toolbar_revealer; -#line 1220 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1223 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp11_ = toolbar; -#line 1220 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1223 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" gtk_container_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_widget_get_type (), GtkWidget)); -#line 7782 "LibraryWindow.c" +#line 7783 "LibraryWindow.c" } -#line 1222 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1225 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp12_ = current_page; -#line 1222 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1225 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" page_switching_from (_tmp12_); -#line 1226 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1229 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp13_ = current_page; -#line 1226 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1229 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp13_, TYPE_LIBRARY_PHOTO_PAGE)) { -#line 7792 "LibraryWindow.c" +#line 7793 "LibraryWindow.c" SidebarTree* _tmp14_ = NULL; -#line 1227 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1230 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp14_ = self->priv->sidebar_tree; -#line 1227 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1230 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" sidebar_tree_enable_editing (_tmp14_); -#line 7798 "LibraryWindow.c" +#line 7799 "LibraryWindow.c" } -#line 1230 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1233 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp15_ = current_page; -#line 1230 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1233 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_unsubscribe_from_basic_information (self, _tmp15_); -#line 1214 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1217 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (toolbar); -#line 7806 "LibraryWindow.c" +#line 7807 "LibraryWindow.c" } -#line 1233 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1236 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp16_ = self->priv->stack; -#line 1233 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1236 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp17_ = page; -#line 1233 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1236 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" gtk_stack_set_visible_child (_tmp16_, G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_widget_get_type (), GtkWidget)); -#line 1237 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1240 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp18_ = page; -#line 1237 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1240 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" PAGE_WINDOW_CLASS (library_window_parent_class)->set_current_page (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), TYPE_PAGE_WINDOW, PageWindow), _tmp18_); -#line 1243 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1246 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp19_ = page; -#line 1243 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1246 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp19_, TYPE_LIBRARY_PHOTO_PAGE)) { -#line 7822 "LibraryWindow.c" +#line 7823 "LibraryWindow.c" SidebarTree* _tmp20_ = NULL; -#line 1244 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1247 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp20_ = self->priv->sidebar_tree; -#line 1244 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1247 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" sidebar_tree_disable_editing (_tmp20_); -#line 7828 "LibraryWindow.c" +#line 7829 "LibraryWindow.c" } -#line 1247 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1250 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp21_ = library_window_should_show_search_bar (self); -#line 1247 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1250 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp22_ = page; -#line 1247 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - library_window_toggle_search_bar (self, _tmp21_, G_TYPE_CHECK_INSTANCE_TYPE (_tmp22_, TYPE_CHECKERBOARD_PAGE) ? ((CheckerboardPage*) _tmp22_) : NULL); #line 1250 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + library_window_toggle_search_bar (self, _tmp21_, G_TYPE_CHECK_INSTANCE_TYPE (_tmp22_, TYPE_CHECKERBOARD_PAGE) ? ((CheckerboardPage*) _tmp22_) : NULL); +#line 1253 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp23_ = self->priv->page_map; -#line 1250 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1253 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp24_ = page; -#line 1250 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1253 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp25_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp24_); -#line 1250 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1253 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" entry = (SidebarEntry*) _tmp25_; -#line 1251 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1254 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp26_ = entry; -#line 1251 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1254 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp26_ != NULL) { -#line 7848 "LibraryWindow.c" +#line 7849 "LibraryWindow.c" SidebarExpandableEntry* expandable_entry = NULL; SidebarEntry* _tmp27_ = NULL; SidebarExpandableEntry* _tmp28_ = NULL; @@ -7853,141 +7854,161 @@ void library_window_switch_to_page (LibraryWindow* self, Page* page) { SidebarExpandableEntry* _tmp30_ = NULL; SidebarTree* _tmp35_ = NULL; SidebarEntry* _tmp36_ = NULL; -#line 1254 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1257 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp27_ = entry; -#line 1254 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1257 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp28_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp27_, SIDEBAR_TYPE_EXPANDABLE_ENTRY) ? ((SidebarExpandableEntry*) _tmp27_) : NULL); -#line 1254 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1257 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" expandable_entry = _tmp28_; -#line 1255 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1258 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp30_ = expandable_entry; -#line 1255 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1258 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp30_ != NULL) { -#line 7866 "LibraryWindow.c" +#line 7867 "LibraryWindow.c" SidebarExpandableEntry* _tmp31_ = NULL; gboolean _tmp32_ = FALSE; -#line 1255 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1258 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp31_ = expandable_entry; -#line 1255 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1258 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp32_ = sidebar_expandable_entry_expand_on_select (_tmp31_); -#line 1255 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1258 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp29_ = _tmp32_; -#line 7875 "LibraryWindow.c" +#line 7876 "LibraryWindow.c" } else { -#line 1255 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1258 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp29_ = FALSE; -#line 7879 "LibraryWindow.c" +#line 7880 "LibraryWindow.c" } -#line 1255 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1258 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp29_) { -#line 7883 "LibraryWindow.c" +#line 7884 "LibraryWindow.c" SidebarTree* _tmp33_ = NULL; SidebarEntry* _tmp34_ = NULL; -#line 1256 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1259 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp33_ = self->priv->sidebar_tree; -#line 1256 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1259 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp34_ = entry; -#line 1256 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1259 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" sidebar_tree_expand_to_entry (_tmp33_, _tmp34_); -#line 7892 "LibraryWindow.c" +#line 7893 "LibraryWindow.c" } -#line 1258 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1261 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp35_ = self->priv->sidebar_tree; -#line 1258 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1261 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp36_ = entry; -#line 1258 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1261 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" sidebar_tree_place_cursor (_tmp35_, _tmp36_, TRUE); -#line 1251 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1254 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (expandable_entry); -#line 7902 "LibraryWindow.c" +#line 7903 "LibraryWindow.c" } -#line 1261 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1264 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_on_update_properties (self); -#line 1263 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1266 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp37_ = page; -#line 1263 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1266 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp37_, TYPE_CHECKERBOARD_PAGE)) { -#line 7910 "LibraryWindow.c" +#line 7911 "LibraryWindow.c" Page* _tmp38_ = NULL; -#line 1264 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1267 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp38_ = page; -#line 1264 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1267 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_init_view_filter (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, TYPE_CHECKERBOARD_PAGE, CheckerboardPage)); -#line 7916 "LibraryWindow.c" +#line 7917 "LibraryWindow.c" } -#line 1266 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1269 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp39_ = page; -#line 1266 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, gtk_widget_get_type (), GtkWidget)); #line 1269 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, gtk_widget_get_type (), GtkWidget)); +#line 1272 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp40_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow)); -#line 1269 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1272 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp41_ = _tmp40_; -#line 1269 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1272 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_subscribe_for_basic_information (self, _tmp41_); -#line 1269 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1272 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp41_); -#line 1271 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1274 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp42_ = page; -#line 1271 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1274 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" page_switched_to (_tmp42_); -#line 1273 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1276 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp43_ = page; -#line 1273 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1276 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp44_ = page_get_menubar (_tmp43_); -#line 1273 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp45_ = _tmp44_; -#line 1273 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - application_set_menubar (_tmp45_); -#line 1273 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _g_object_unref0 (_tmp45_); -#line 1274 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - gtk_application_window_set_show_menubar (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_application_window_get_type (), GtkApplicationWindow), TRUE); #line 1276 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp46_ = page; + _tmp45_ = _tmp44_; #line 1276 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp47_ = page_get_toolbar (_tmp46_); + application_set_menubar (_tmp45_); #line 1276 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - toolbar = _tmp47_; -#line 1277 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp48_ = toolbar; + _g_object_unref0 (_tmp45_); #line 1277 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - if (_tmp48_ != NULL) { -#line 7956 "LibraryWindow.c" - GtkRevealer* _tmp49_ = NULL; - GtkToolbar* _tmp50_ = NULL; - GtkToolbar* _tmp51_ = NULL; - GtkRevealer* _tmp52_ = NULL; - gboolean _tmp53_ = FALSE; + gtk_application_window_set_show_menubar (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_application_window_get_type (), GtkApplicationWindow), TRUE); #line 1278 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp49_ = self->priv->toolbar_revealer; + _tmp46_ = gtk_widget_get_settings (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget)); #line 1278 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp50_ = toolbar; + g_object_get (_tmp46_, "gtk-shell-shows-menubar", &_tmp47_, NULL); #line 1278 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, gtk_widget_get_type (), GtkWidget)); + _tmp48_ = _tmp47_; +#line 1278 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + old = _tmp48_; +#line 1279 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp49_ = gtk_widget_get_settings (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget)); #line 1279 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp51_ = toolbar; + _tmp50_ = old; #line 1279 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp51_, gtk_widget_get_type (), GtkWidget)); + g_object_set (_tmp49_, "gtk-shell-shows-menubar", !_tmp50_, NULL); #line 1280 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp52_ = self->priv->toolbar_revealer; + _tmp51_ = gtk_widget_get_settings (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget)); #line 1280 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp53_ = library_window_is_toolbar_visible (self); + _tmp52_ = old; #line 1280 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - gtk_revealer_set_reveal_child (_tmp52_, _tmp53_); -#line 7978 "LibraryWindow.c" - } + g_object_set (_tmp51_, "gtk-shell-shows-menubar", _tmp52_, NULL); +#line 1282 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp53_ = page; +#line 1282 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp54_ = page_get_toolbar (_tmp53_); +#line 1282 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + toolbar = _tmp54_; #line 1283 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp54_ = page; + _tmp55_ = toolbar; #line 1283 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - page_ready (_tmp54_); -#line 1206 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + if (_tmp55_ != NULL) { +#line 7977 "LibraryWindow.c" + GtkRevealer* _tmp56_ = NULL; + GtkToolbar* _tmp57_ = NULL; + GtkToolbar* _tmp58_ = NULL; + GtkRevealer* _tmp59_ = NULL; + gboolean _tmp60_ = FALSE; +#line 1284 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp56_ = self->priv->toolbar_revealer; +#line 1284 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp57_ = toolbar; +#line 1284 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp56_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp57_, gtk_widget_get_type (), GtkWidget)); +#line 1285 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp58_ = toolbar; +#line 1285 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp58_, gtk_widget_get_type (), GtkWidget)); +#line 1286 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp59_ = self->priv->toolbar_revealer; +#line 1286 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp60_ = library_window_is_toolbar_visible (self); +#line 1286 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + gtk_revealer_set_reveal_child (_tmp59_, _tmp60_); +#line 7999 "LibraryWindow.c" + } +#line 1289 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp61_ = page; +#line 1289 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + page_ready (_tmp61_); +#line 1209 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (toolbar); -#line 1206 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1209 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (entry); -#line 1206 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1209 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (current_page); -#line 7990 "LibraryWindow.c" +#line 8011 "LibraryWindow.c" } @@ -8002,41 +8023,41 @@ static void library_window_init_view_filter (LibraryWindow* self, CheckerboardPa CheckerboardPage* _tmp7_ = NULL; SearchViewFilter* _tmp8_ = NULL; SearchViewFilter* _tmp9_ = NULL; -#line 1286 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1292 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 1286 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1292 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_CHECKERBOARD_PAGE (page)); -#line 1287 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1293 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = self->priv->search_toolbar; -#line 1287 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1293 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = page; -#line 1287 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1293 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = checkerboard_page_get_search_view_filter (_tmp1_); -#line 1287 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1293 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = _tmp2_; -#line 1287 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1293 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" search_filter_toolbar_set_view_filter (_tmp0_, _tmp3_); -#line 1287 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1293 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _view_filter_unref0 (_tmp3_); -#line 1288 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1294 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp4_ = page; -#line 1288 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1294 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp5_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_PAGE, Page)); -#line 1288 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1294 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp6_ = _tmp5_; -#line 1288 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1294 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp7_ = page; -#line 1288 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1294 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp8_ = checkerboard_page_get_search_view_filter (_tmp7_); -#line 1288 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1294 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp9_ = _tmp8_; -#line 1288 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1294 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" view_collection_install_view_filter (_tmp6_, G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_VIEW_FILTER, ViewFilter)); -#line 1288 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1294 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _view_filter_unref0 (_tmp9_); -#line 1288 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1294 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _data_collection_unref0 (_tmp6_); -#line 8039 "LibraryWindow.c" +#line 8060 "LibraryWindow.c" } @@ -8046,35 +8067,35 @@ static gboolean library_window_should_show_search_bar (LibraryWindow* self) { Page* _tmp1_ = NULL; Page* _tmp2_ = NULL; gboolean _tmp3_ = FALSE; -#line 1291 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1297 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_val_if_fail (IS_LIBRARY_WINDOW (self), FALSE); -#line 1292 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1298 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow)); -#line 1292 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1298 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = _tmp1_; -#line 1292 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1298 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp2_, TYPE_CHECKERBOARD_PAGE); -#line 1292 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1298 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp2_); -#line 1292 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1298 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp3_) { -#line 8061 "LibraryWindow.c" +#line 8082 "LibraryWindow.c" gboolean _tmp4_ = FALSE; -#line 1292 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1298 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp4_ = self->priv->is_search_toolbar_visible; -#line 1292 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1298 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = _tmp4_; -#line 8067 "LibraryWindow.c" +#line 8088 "LibraryWindow.c" } else { -#line 1292 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1298 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = FALSE; -#line 8071 "LibraryWindow.c" +#line 8092 "LibraryWindow.c" } -#line 1292 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1298 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" result = _tmp0_; -#line 1292 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1298 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return result; -#line 8077 "LibraryWindow.c" +#line 8098 "LibraryWindow.c" } @@ -8082,21 +8103,21 @@ static void library_window_toggle_search_bar (LibraryWindow* self, gboolean show SearchFilterToolbar* _tmp0_ = NULL; gboolean _tmp1_ = FALSE; gboolean _tmp2_ = FALSE; -#line 1296 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1302 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 1296 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1302 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail ((page == NULL) || IS_CHECKERBOARD_PAGE (page)); -#line 1297 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1303 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = self->priv->search_toolbar; -#line 1297 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1303 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = show; -#line 1297 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1303 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" gtk_revealer_set_reveal_child (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_revealer_get_type (), GtkRevealer), _tmp1_); -#line 1298 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1304 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = show; -#line 1298 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1304 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp2_) { -#line 8099 "LibraryWindow.c" +#line 8120 "LibraryWindow.c" CheckerboardPage* _tmp3_ = NULL; SearchFilterToolbar* _tmp4_ = NULL; CheckerboardPage* _tmp5_ = NULL; @@ -8108,70 +8129,70 @@ static void library_window_toggle_search_bar (LibraryWindow* self, gboolean show CheckerboardPage* _tmp11_ = NULL; SearchViewFilter* _tmp12_ = NULL; SearchViewFilter* _tmp13_ = NULL; -#line 1299 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1305 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = page; -#line 1299 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1305 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _vala_assert (NULL != _tmp3_, "null != page"); -#line 1300 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1306 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp4_ = self->priv->search_toolbar; -#line 1300 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1306 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp5_ = page; -#line 1300 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1306 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp6_ = checkerboard_page_get_search_view_filter (_tmp5_); -#line 1300 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1306 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp7_ = _tmp6_; -#line 1300 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1306 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" search_filter_toolbar_set_view_filter (_tmp4_, _tmp7_); -#line 1300 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1306 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _view_filter_unref0 (_tmp7_); -#line 1301 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1307 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp8_ = page; -#line 1301 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1307 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp9_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_PAGE, Page)); -#line 1301 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1307 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp10_ = _tmp9_; -#line 1301 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1307 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp11_ = page; -#line 1301 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1307 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp12_ = checkerboard_page_get_search_view_filter (_tmp11_); -#line 1301 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1307 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp13_ = _tmp12_; -#line 1301 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1307 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" view_collection_install_view_filter (_tmp10_, G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_VIEW_FILTER, ViewFilter)); -#line 1301 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1307 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _view_filter_unref0 (_tmp13_); -#line 1301 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1307 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _data_collection_unref0 (_tmp10_); -#line 8145 "LibraryWindow.c" +#line 8166 "LibraryWindow.c" } else { CheckerboardPage* _tmp14_ = NULL; -#line 1303 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1309 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp14_ = page; -#line 1303 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1309 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp14_ != NULL) { -#line 8152 "LibraryWindow.c" +#line 8173 "LibraryWindow.c" CheckerboardPage* _tmp15_ = NULL; ViewCollection* _tmp16_ = NULL; ViewCollection* _tmp17_ = NULL; DisabledViewFilter* _tmp18_ = NULL; DisabledViewFilter* _tmp19_ = NULL; -#line 1304 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1310 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp15_ = page; -#line 1304 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1310 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp16_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_PAGE, Page)); -#line 1304 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1310 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp17_ = _tmp16_; -#line 1304 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1310 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp18_ = disabled_view_filter_new (); -#line 1304 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1310 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp19_ = _tmp18_; -#line 1304 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1310 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" view_collection_install_view_filter (_tmp17_, G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, TYPE_VIEW_FILTER, ViewFilter)); -#line 1304 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1310 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _view_filter_unref0 (_tmp19_); -#line 1304 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1310 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _data_collection_unref0 (_tmp17_); -#line 8174 "LibraryWindow.c" +#line 8195 "LibraryWindow.c" } } } @@ -8185,33 +8206,33 @@ static void library_window_on_page_created (LibraryWindow* self, SidebarPageRepr Page* _tmp4_ = NULL; SidebarPageRepresentative* _tmp5_ = NULL; Page* _tmp6_ = NULL; -#line 1308 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1314 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 1308 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1314 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (SIDEBAR_IS_PAGE_REPRESENTATIVE (entry)); -#line 1308 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1314 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_PAGE (page)); -#line 1309 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1315 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = self->priv->page_map; -#line 1309 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1315 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = page; -#line 1309 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1315 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_); -#line 1309 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1315 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _vala_assert (!_tmp2_, "!page_map.has_key(page)"); -#line 1310 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1316 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = self->priv->page_map; -#line 1310 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1316 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp4_ = page; -#line 1310 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1316 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp5_ = entry; -#line 1310 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1316 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp4_, G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, SIDEBAR_TYPE_ENTRY, SidebarEntry)); -#line 1312 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1318 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp6_ = page; -#line 1312 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1318 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_add_to_stack (self, _tmp6_); -#line 8214 "LibraryWindow.c" +#line 8235 "LibraryWindow.c" } @@ -8225,61 +8246,61 @@ static void library_window_on_destroying_page (LibraryWindow* self, SidebarPageR GeeHashMap* _tmp10_ = NULL; Page* _tmp11_ = NULL; gboolean _tmp12_ = FALSE; -#line 1315 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1321 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 1315 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1321 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (SIDEBAR_IS_PAGE_REPRESENTATIVE (entry)); -#line 1315 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1321 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_PAGE (page)); -#line 1317 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1323 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = page; -#line 1317 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1323 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow)); -#line 1317 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1323 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = _tmp1_; -#line 1317 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1323 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = _tmp0_ == _tmp2_; -#line 1317 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1323 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp2_); -#line 1317 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1323 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp3_) { -#line 8246 "LibraryWindow.c" +#line 8267 "LibraryWindow.c" LibraryBranch* _tmp4_ = NULL; LibraryPhotosEntry* _tmp5_ = NULL; LibraryPhotosEntry* _tmp6_ = NULL; Page* _tmp7_ = NULL; Page* _tmp8_ = NULL; -#line 1318 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1324 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp4_ = self->priv->library_branch; -#line 1318 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1324 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp5_ = library_branch_get_photos_entry (_tmp4_); -#line 1318 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1324 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp6_ = _tmp5_; -#line 1318 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1324 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp7_ = sidebar_page_representative_get_page (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, SIDEBAR_TYPE_PAGE_REPRESENTATIVE, SidebarPageRepresentative)); -#line 1318 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1324 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp8_ = _tmp7_; -#line 1318 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1324 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_switch_to_page (self, _tmp8_); -#line 1318 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1324 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp8_); -#line 8266 "LibraryWindow.c" +#line 8287 "LibraryWindow.c" } -#line 1320 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1326 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp9_ = page; -#line 1320 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1326 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_remove_from_stack (self, _tmp9_); -#line 1322 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1328 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp10_ = self->priv->page_map; -#line 1322 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1328 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp11_ = page; -#line 1322 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1328 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp12_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp11_, NULL); -#line 1322 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1328 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" removed = _tmp12_; -#line 1323 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1329 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _vala_assert (removed, "removed"); -#line 8282 "LibraryWindow.c" +#line 8303 "LibraryWindow.c" } @@ -8288,39 +8309,39 @@ static void library_window_on_sidebar_entry_selected (LibraryWindow* self, Sideb SidebarSelectableEntry* _tmp0_ = NULL; SidebarPageRepresentative* _tmp1_ = NULL; SidebarPageRepresentative* _tmp2_ = NULL; -#line 1326 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1332 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 1326 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1332 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (SIDEBAR_IS_SELECTABLE_ENTRY (selectable)); -#line 1327 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1333 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = selectable; -#line 1327 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1333 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, SIDEBAR_TYPE_PAGE_REPRESENTATIVE) ? ((SidebarPageRepresentative*) _tmp0_) : NULL); -#line 1327 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1333 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" page_rep = _tmp1_; -#line 1328 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1334 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = page_rep; -#line 1328 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1334 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp2_ != NULL) { -#line 8305 "LibraryWindow.c" +#line 8326 "LibraryWindow.c" SidebarPageRepresentative* _tmp3_ = NULL; Page* _tmp4_ = NULL; Page* _tmp5_ = NULL; -#line 1329 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1335 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = page_rep; -#line 1329 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1335 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp4_ = sidebar_page_representative_get_page (_tmp3_); -#line 1329 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1335 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp5_ = _tmp4_; -#line 1329 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1335 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_switch_to_page (self, _tmp5_); -#line 1329 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1335 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp5_); -#line 8319 "LibraryWindow.c" +#line 8340 "LibraryWindow.c" } -#line 1326 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1332 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (page_rep); -#line 8323 "LibraryWindow.c" +#line 8344 "LibraryWindow.c" } @@ -8341,207 +8362,207 @@ static void library_window_on_sidebar_selected_entry_removed (LibraryWindow* sel LibraryPhotosEntry* _tmp32_ = NULL; Page* _tmp33_ = NULL; Page* _tmp34_ = NULL; -#line 1332 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1338 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 1332 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1338 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (SIDEBAR_IS_SELECTABLE_ENTRY (selectable)); -#line 1336 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1342 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = self->priv->library_branch; -#line 1336 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1342 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = library_branch_get_last_imported_entry (_tmp0_); -#line 1336 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1342 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = _tmp1_; -#line 1336 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1342 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = _g_object_ref0 (_tmp2_); -#line 1336 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1342 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" last_import_entry = _tmp3_; -#line 1339 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1345 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp5_ = selectable; -#line 1339 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1345 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp5_, LIBRARY_TYPE_IMPORT_QUEUE_SIDEBAR_ENTRY)) { -#line 8362 "LibraryWindow.c" +#line 8383 "LibraryWindow.c" LibraryLastImportSidebarEntry* _tmp6_ = NULL; gboolean _tmp7_ = FALSE; gboolean _tmp8_ = FALSE; -#line 1339 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1345 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp6_ = last_import_entry; -#line 1339 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1345 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp7_ = library_hideable_page_entry_get_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, LIBRARY_TYPE_HIDEABLE_PAGE_ENTRY, LibraryHideablePageEntry)); -#line 1339 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1345 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp8_ = _tmp7_; -#line 1339 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1345 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp4_ = _tmp8_; -#line 8374 "LibraryWindow.c" +#line 8395 "LibraryWindow.c" } else { -#line 1339 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1345 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp4_ = FALSE; -#line 8378 "LibraryWindow.c" +#line 8399 "LibraryWindow.c" } -#line 1339 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1345 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp4_) { -#line 8382 "LibraryWindow.c" +#line 8403 "LibraryWindow.c" LibraryLastImportSidebarEntry* _tmp9_ = NULL; Page* _tmp10_ = NULL; Page* _tmp11_ = NULL; -#line 1340 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1346 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp9_ = last_import_entry; -#line 1340 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1346 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp10_ = sidebar_page_representative_get_page (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, SIDEBAR_TYPE_PAGE_REPRESENTATIVE, SidebarPageRepresentative)); -#line 1340 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1346 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp11_ = _tmp10_; -#line 1340 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1346 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_switch_to_page (self, _tmp11_); -#line 1340 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1346 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp11_); -#line 1342 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1348 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (last_import_entry); -#line 1342 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1348 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return; -#line 8400 "LibraryWindow.c" +#line 8421 "LibraryWindow.c" } -#line 1346 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1352 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp13_ = selectable; -#line 1346 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1352 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp13_, EVENTS_TYPE_EVENT_ENTRY)) { -#line 8406 "LibraryWindow.c" +#line 8427 "LibraryWindow.c" EventsBranch* _tmp14_ = NULL; gboolean _tmp15_ = FALSE; -#line 1346 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1352 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp14_ = self->priv->events_branch; -#line 1346 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1352 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp15_ = sidebar_branch_get_show_branch (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, SIDEBAR_TYPE_BRANCH, SidebarBranch)); -#line 1346 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1352 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp12_ = _tmp15_; -#line 8415 "LibraryWindow.c" +#line 8436 "LibraryWindow.c" } else { -#line 1346 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1352 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp12_ = FALSE; -#line 8419 "LibraryWindow.c" +#line 8440 "LibraryWindow.c" } -#line 1346 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1352 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp12_) { -#line 8423 "LibraryWindow.c" +#line 8444 "LibraryWindow.c" EventsBranch* _tmp16_ = NULL; EventsMasterDirectoryEntry* _tmp17_ = NULL; EventsMasterDirectoryEntry* _tmp18_ = NULL; Page* _tmp19_ = NULL; Page* _tmp20_ = NULL; -#line 1347 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1353 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp16_ = self->priv->events_branch; -#line 1347 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1353 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp17_ = events_branch_get_master_entry (_tmp16_); -#line 1347 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1353 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp18_ = _tmp17_; -#line 1347 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1353 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp19_ = sidebar_page_representative_get_page (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, SIDEBAR_TYPE_PAGE_REPRESENTATIVE, SidebarPageRepresentative)); -#line 1347 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1353 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp20_ = _tmp19_; -#line 1347 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1353 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_switch_to_page (self, _tmp20_); -#line 1347 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1353 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp20_); -#line 1347 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1353 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp18_); -#line 1349 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1355 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (last_import_entry); -#line 1349 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1355 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return; -#line 8449 "LibraryWindow.c" +#line 8470 "LibraryWindow.c" } -#line 1353 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1359 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp22_ = selectable; -#line 1353 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1359 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp22_, EVENTS_TYPE_DIRECTORY_ENTRY)) { -#line 8455 "LibraryWindow.c" +#line 8476 "LibraryWindow.c" EventsBranch* _tmp23_ = NULL; gboolean _tmp24_ = FALSE; -#line 1353 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1359 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp23_ = self->priv->events_branch; -#line 1353 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1359 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp24_ = sidebar_branch_get_show_branch (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, SIDEBAR_TYPE_BRANCH, SidebarBranch)); -#line 1353 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1359 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp21_ = _tmp24_; -#line 8464 "LibraryWindow.c" +#line 8485 "LibraryWindow.c" } else { -#line 1353 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1359 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp21_ = FALSE; -#line 8468 "LibraryWindow.c" +#line 8489 "LibraryWindow.c" } -#line 1353 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1359 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp21_) { -#line 8472 "LibraryWindow.c" +#line 8493 "LibraryWindow.c" EventsBranch* _tmp25_ = NULL; EventsMasterDirectoryEntry* _tmp26_ = NULL; EventsMasterDirectoryEntry* _tmp27_ = NULL; Page* _tmp28_ = NULL; Page* _tmp29_ = NULL; -#line 1354 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1360 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp25_ = self->priv->events_branch; -#line 1354 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1360 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp26_ = events_branch_get_master_entry (_tmp25_); -#line 1354 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1360 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp27_ = _tmp26_; -#line 1354 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1360 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp28_ = sidebar_page_representative_get_page (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, SIDEBAR_TYPE_PAGE_REPRESENTATIVE, SidebarPageRepresentative)); -#line 1354 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1360 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp29_ = _tmp28_; -#line 1354 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1360 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_switch_to_page (self, _tmp29_); -#line 1354 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1360 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp29_); -#line 1354 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1360 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp27_); -#line 1356 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1362 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (last_import_entry); -#line 1356 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1362 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return; -#line 8498 "LibraryWindow.c" +#line 8519 "LibraryWindow.c" } -#line 1360 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1366 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp30_ = self->priv->library_branch; -#line 1360 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1366 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp31_ = library_branch_get_photos_entry (_tmp30_); -#line 1360 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1366 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp32_ = _tmp31_; -#line 1360 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1366 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp33_ = sidebar_page_representative_get_page (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, SIDEBAR_TYPE_PAGE_REPRESENTATIVE, SidebarPageRepresentative)); -#line 1360 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1366 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp34_ = _tmp33_; -#line 1360 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1366 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_switch_to_page (self, _tmp34_); -#line 1360 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1366 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp34_); -#line 1332 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1338 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (last_import_entry); -#line 8516 "LibraryWindow.c" +#line 8537 "LibraryWindow.c" } static void _library_window_on_update_properties_view_collection_items_state_changed (ViewCollection* _sender, GeeIterable* changed, gpointer self) { -#line 1366 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1372 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_on_update_properties ((LibraryWindow*) self); -#line 8523 "LibraryWindow.c" +#line 8544 "LibraryWindow.c" } static void _library_window_on_update_properties_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self) { -#line 1367 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1373 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_on_update_properties ((LibraryWindow*) self); -#line 8530 "LibraryWindow.c" +#line 8551 "LibraryWindow.c" } static void _library_window_on_update_properties_data_collection_contents_altered (DataCollection* _sender, GeeIterable* added, GeeIterable* removed, gpointer self) { -#line 1368 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1374 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_on_update_properties ((LibraryWindow*) self); -#line 8537 "LibraryWindow.c" +#line 8558 "LibraryWindow.c" } static void _library_window_on_update_properties_view_collection_items_visibility_changed (ViewCollection* _sender, GeeCollection* changed, gpointer self) { -#line 1369 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1375 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_on_update_properties ((LibraryWindow*) self); -#line 8544 "LibraryWindow.c" +#line 8565 "LibraryWindow.c" } @@ -8549,27 +8570,27 @@ static void library_window_subscribe_for_basic_information (LibraryWindow* self, ViewCollection* view = NULL; Page* _tmp0_ = NULL; ViewCollection* _tmp1_ = NULL; -#line 1363 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1369 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 1363 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1369 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_PAGE (page)); -#line 1364 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1370 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = page; -#line 1364 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1370 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = page_get_view (_tmp0_); -#line 1364 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1370 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" view = _tmp1_; -#line 1366 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1372 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_connect_object (view, "items-state-changed", (GCallback) _library_window_on_update_properties_view_collection_items_state_changed, self, 0); -#line 1367 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1373 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (view, TYPE_DATA_COLLECTION, DataCollection), "items-altered", (GCallback) _library_window_on_update_properties_data_collection_items_altered, self, 0); -#line 1368 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1374 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (view, TYPE_DATA_COLLECTION, DataCollection), "contents-altered", (GCallback) _library_window_on_update_properties_data_collection_contents_altered, self, 0); -#line 1369 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1375 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_connect_object (view, "items-visibility-changed", (GCallback) _library_window_on_update_properties_view_collection_items_visibility_changed, self, 0); -#line 1363 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1369 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _data_collection_unref0 (view); -#line 8572 "LibraryWindow.c" +#line 8593 "LibraryWindow.c" } @@ -8581,47 +8602,47 @@ static void library_window_unsubscribe_from_basic_information (LibraryWindow* se guint _tmp3_ = 0U; guint _tmp4_ = 0U; guint _tmp5_ = 0U; -#line 1372 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1378 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 1372 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1378 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_PAGE (page)); -#line 1373 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1379 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = page; -#line 1373 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1379 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = page_get_view (_tmp0_); -#line 1373 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1379 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" view = _tmp1_; -#line 1375 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1381 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_parse_name ("items-state-changed", TYPE_VIEW_COLLECTION, &_tmp2_, NULL, FALSE); -#line 1375 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1381 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_handlers_disconnect_matched (view, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp2_, 0, NULL, (GCallback) _library_window_on_update_properties_view_collection_items_state_changed, self); -#line 1376 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1382 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_parse_name ("items-altered", TYPE_DATA_COLLECTION, &_tmp3_, NULL, FALSE); -#line 1376 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1382 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (view, TYPE_DATA_COLLECTION, DataCollection), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _library_window_on_update_properties_data_collection_items_altered, self); -#line 1377 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1383 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_parse_name ("contents-altered", TYPE_DATA_COLLECTION, &_tmp4_, NULL, FALSE); -#line 1377 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1383 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (view, TYPE_DATA_COLLECTION, DataCollection), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp4_, 0, NULL, (GCallback) _library_window_on_update_properties_data_collection_contents_altered, self); -#line 1378 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1384 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_parse_name ("items-visibility-changed", TYPE_VIEW_COLLECTION, &_tmp5_, NULL, FALSE); -#line 1378 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1384 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_handlers_disconnect_matched (view, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp5_, 0, NULL, (GCallback) _library_window_on_update_properties_view_collection_items_visibility_changed, self); -#line 1372 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1378 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _data_collection_unref0 (view); -#line 8612 "LibraryWindow.c" +#line 8633 "LibraryWindow.c" } static void library_window_on_update_properties (LibraryWindow* self) { OneShotScheduler* _tmp0_ = NULL; -#line 1381 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1387 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 1382 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1388 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = self->priv->properties_scheduler; -#line 1382 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1388 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" one_shot_scheduler_at_idle (_tmp0_); -#line 8624 "LibraryWindow.c" +#line 8645 "LibraryWindow.c" } @@ -8632,55 +8653,55 @@ static void library_window_on_update_properties_now (LibraryWindow* self) { ExtendedPropertiesWindow* _tmp6_ = NULL; gboolean _tmp7_ = FALSE; gboolean _tmp8_ = FALSE; -#line 1385 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1391 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 1386 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1392 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = self->priv->bottom_frame; -#line 1386 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1392 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = gtk_widget_get_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget)); -#line 1386 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1392 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = _tmp1_; -#line 1386 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1392 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp2_) { -#line 8645 "LibraryWindow.c" +#line 8666 "LibraryWindow.c" BasicProperties* _tmp3_ = NULL; Page* _tmp4_ = NULL; Page* _tmp5_ = NULL; -#line 1387 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1393 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = self->priv->basic_properties; -#line 1387 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1393 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp4_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow)); -#line 1387 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1393 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp5_ = _tmp4_; -#line 1387 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1393 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" properties_update_properties (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_PROPERTIES, Properties), _tmp5_); -#line 1387 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1393 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp5_); -#line 8659 "LibraryWindow.c" +#line 8680 "LibraryWindow.c" } -#line 1389 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1395 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp6_ = self->priv->extended_properties; -#line 1389 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1395 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp7_ = gtk_widget_get_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_widget_get_type (), GtkWidget)); -#line 1389 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1395 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp8_ = _tmp7_; -#line 1389 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1395 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp8_) { -#line 8669 "LibraryWindow.c" +#line 8690 "LibraryWindow.c" ExtendedPropertiesWindow* _tmp9_ = NULL; Page* _tmp10_ = NULL; Page* _tmp11_ = NULL; -#line 1390 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1396 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp9_ = self->priv->extended_properties; -#line 1390 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1396 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp10_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow)); -#line 1390 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1396 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp11_ = _tmp10_; -#line 1390 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1396 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" extended_properties_window_update_properties (_tmp9_, _tmp11_); -#line 1390 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1396 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp11_); -#line 8683 "LibraryWindow.c" +#line 8704 "LibraryWindow.c" } } @@ -8688,13 +8709,13 @@ static void library_window_on_update_properties_now (LibraryWindow* self) { static gchar* string_replace (const gchar* self, const gchar* old, const gchar* replacement) { gchar* result = NULL; GError * _inner_error_ = NULL; -#line 1380 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1380 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_return_val_if_fail (old != NULL, NULL); -#line 1380 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_return_val_if_fail (replacement != NULL, NULL); -#line 8697 "LibraryWindow.c" +#line 8718 "LibraryWindow.c" { GRegex* regex = NULL; const gchar* _tmp0_ = NULL; @@ -8707,100 +8728,100 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar* const gchar* _tmp7_ = NULL; gchar* _tmp8_ = NULL; gchar* _tmp9_ = NULL; -#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp0_ = old; -#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp1_ = g_regex_escape_string (_tmp0_, -1); -#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp2_ = _tmp1_; -#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp3_ = g_regex_new (_tmp2_, 0, 0, &_inner_error_); -#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp4_ = _tmp3_; -#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _g_free0 (_tmp2_); -#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" regex = _tmp4_; -#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_inner_error_->domain == G_REGEX_ERROR) { -#line 8728 "LibraryWindow.c" - goto __catch41_g_regex_error; +#line 8749 "LibraryWindow.c" + goto __catch43_g_regex_error; } -#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_clear_error (&_inner_error_); -#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return NULL; -#line 8737 "LibraryWindow.c" +#line 8758 "LibraryWindow.c" } -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp6_ = regex; -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp7_ = replacement; -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp8_ = g_regex_replace_literal (_tmp6_, self, (gssize) -1, 0, _tmp7_, 0, &_inner_error_); -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp5_ = _tmp8_; -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _g_regex_unref0 (regex); -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_inner_error_->domain == G_REGEX_ERROR) { -#line 8753 "LibraryWindow.c" - goto __catch41_g_regex_error; +#line 8774 "LibraryWindow.c" + goto __catch43_g_regex_error; } -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _g_regex_unref0 (regex); -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_clear_error (&_inner_error_); -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return NULL; -#line 8764 "LibraryWindow.c" +#line 8785 "LibraryWindow.c" } -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp9_ = _tmp5_; -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp5_ = NULL; -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" result = _tmp9_; -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _g_free0 (_tmp5_); -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _g_regex_unref0 (regex); -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return result; -#line 8778 "LibraryWindow.c" +#line 8799 "LibraryWindow.c" } - goto __finally41; - __catch41_g_regex_error: + goto __finally43; + __catch43_g_regex_error: { GError* e = NULL; -#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" e = _inner_error_; -#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _inner_error_ = NULL; -#line 1385 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1385 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_assert_not_reached (); -#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _g_error_free0 (e); -#line 8792 "LibraryWindow.c" +#line 8813 "LibraryWindow.c" } - __finally41: -#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" + __finally43: +#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" 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 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_clear_error (&_inner_error_); -#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return NULL; -#line 8803 "LibraryWindow.c" +#line 8824 "LibraryWindow.c" } } @@ -8818,188 +8839,188 @@ void library_window_mounted_camera_shell_notification (LibraryWindow* self, cons gboolean _tmp13_ = FALSE; gboolean _tmp18_ = FALSE; GError * _inner_error_ = NULL; -#line 1393 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1399 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 1393 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1399 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (uri != NULL); -#line 1394 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1400 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = uri; -#line 1394 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - g_debug ("LibraryWindow.vala:1394: mount point reported: %s", _tmp0_); -#line 1397 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1400 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + g_debug ("LibraryWindow.vala:1400: mount point reported: %s", _tmp0_); +#line 1403 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = uri; -#line 1397 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1403 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = library_window_is_mount_uri_supported (_tmp1_); -#line 1397 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1403 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (!_tmp2_) { -#line 8835 "LibraryWindow.c" +#line 8856 "LibraryWindow.c" const gchar* _tmp3_ = NULL; -#line 1398 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1404 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = uri; -#line 1398 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - g_debug ("LibraryWindow.vala:1398: Unsupported mount scheme: %s", _tmp3_); -#line 1400 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1404 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + g_debug ("LibraryWindow.vala:1404: Unsupported mount scheme: %s", _tmp3_); +#line 1406 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return; -#line 8843 "LibraryWindow.c" +#line 8864 "LibraryWindow.c" } -#line 1403 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1409 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp4_ = uri; -#line 1403 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1409 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp5_ = g_file_new_for_uri (_tmp4_); -#line 1403 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1409 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" uri_file = _tmp5_; -#line 1406 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1412 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" mount = NULL; -#line 8853 "LibraryWindow.c" +#line 8874 "LibraryWindow.c" { GMount* _tmp6_ = NULL; GFile* _tmp7_ = NULL; GMount* _tmp8_ = NULL; GMount* _tmp9_ = NULL; -#line 1408 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1414 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp7_ = uri_file; -#line 1408 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1414 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp8_ = g_file_find_enclosing_mount (_tmp7_, NULL, &_inner_error_); -#line 1408 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1414 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp6_ = _tmp8_; -#line 1408 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1414 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 8867 "LibraryWindow.c" - goto __catch40_g_error; +#line 8888 "LibraryWindow.c" + goto __catch42_g_error; } -#line 1408 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1414 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp9_ = _tmp6_; -#line 1408 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1414 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp6_ = NULL; -#line 1408 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1414 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (mount); -#line 1408 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1414 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" mount = _tmp9_; -#line 1407 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1413 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp6_); -#line 8880 "LibraryWindow.c" +#line 8901 "LibraryWindow.c" } - goto __finally40; - __catch40_g_error: + goto __finally42; + __catch42_g_error: { GError* err = NULL; GError* _tmp10_ = NULL; const gchar* _tmp11_ = NULL; -#line 1407 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1413 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" err = _inner_error_; -#line 1407 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1413 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _inner_error_ = NULL; -#line 1410 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1416 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp10_ = err; -#line 1410 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1416 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp11_ = _tmp10_->message; -#line 1410 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - g_debug ("LibraryWindow.vala:1410: %s", _tmp11_); -#line 1412 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1416 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + g_debug ("LibraryWindow.vala:1416: %s", _tmp11_); +#line 1418 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_error_free0 (err); -#line 1412 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1418 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (mount); -#line 1412 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1418 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (uri_file); -#line 1412 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1418 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return; -#line 8906 "LibraryWindow.c" +#line 8927 "LibraryWindow.c" } - __finally40: -#line 1407 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + __finally42: +#line 1413 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1407 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1413 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (mount); -#line 1407 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1413 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (uri_file); -#line 1407 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1413 "/home/jens/Source/shotwell/src/library/LibraryWindow.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 1407 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1413 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_clear_error (&_inner_error_); -#line 1407 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1413 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return; -#line 8921 "LibraryWindow.c" +#line 8942 "LibraryWindow.c" } -#line 1416 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1422 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" alt_uri = NULL; -#line 1417 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1423 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp12_ = uri; -#line 1417 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1423 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp13_ = g_str_has_prefix (_tmp12_, "file://"); -#line 1417 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1423 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp13_) { -#line 8931 "LibraryWindow.c" +#line 8952 "LibraryWindow.c" const gchar* _tmp14_ = NULL; gchar* _tmp15_ = NULL; gchar* _tmp16_ = NULL; gchar* _tmp17_ = NULL; -#line 1418 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp14_ = uri; -#line 1418 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp15_ = string_replace (_tmp14_, "file://", "disk:"); -#line 1418 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp16_ = _tmp15_; -#line 1418 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp17_ = camera_table_get_port_uri (_tmp16_); -#line 1418 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_free0 (alt_uri); -#line 1418 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" alt_uri = _tmp17_; -#line 1418 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_free0 (_tmp16_); -#line 8950 "LibraryWindow.c" +#line 8971 "LibraryWindow.c" } -#line 1421 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1427 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp18_ = at_startup; -#line 1421 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1427 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp18_) { -#line 8956 "LibraryWindow.c" +#line 8977 "LibraryWindow.c" const gchar* _tmp19_ = NULL; gboolean _tmp20_ = FALSE; const gchar* _tmp23_ = NULL; gboolean _tmp24_ = FALSE; -#line 1422 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1428 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp19_ = uri; -#line 1422 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1428 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp20_ = is_string_empty (_tmp19_); -#line 1422 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1428 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (!_tmp20_) { -#line 8967 "LibraryWindow.c" +#line 8988 "LibraryWindow.c" GeeHashSet* _tmp21_ = NULL; const gchar* _tmp22_ = NULL; -#line 1423 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1429 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp21_ = library_window_initial_camera_uris; -#line 1423 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1429 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp22_ = uri; -#line 1423 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1429 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp22_); -#line 8976 "LibraryWindow.c" +#line 8997 "LibraryWindow.c" } -#line 1425 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1431 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp23_ = alt_uri; -#line 1425 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1431 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp24_ = is_string_empty (_tmp23_); -#line 1425 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1431 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (!_tmp24_) { -#line 8984 "LibraryWindow.c" +#line 9005 "LibraryWindow.c" GeeHashSet* _tmp25_ = NULL; const gchar* _tmp26_ = NULL; -#line 1426 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1432 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp25_ = library_window_initial_camera_uris; -#line 1426 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1432 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp26_ = alt_uri; -#line 1426 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1432 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp26_); -#line 8993 "LibraryWindow.c" +#line 9014 "LibraryWindow.c" } } -#line 1393 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1399 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_free0 (alt_uri); -#line 1393 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1399 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (mount); -#line 1393 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1399 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (uri_file); -#line 9002 "LibraryWindow.c" +#line 9023 "LibraryWindow.c" } @@ -9016,97 +9037,97 @@ static gboolean library_window_real_key_press_event (GtkWidget* base, GdkEventKe GdkEventKey* _tmp13_ = NULL; guint _tmp14_ = 0U; const gchar* _tmp15_ = NULL; -#line 1430 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1436 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_WINDOW, LibraryWindow); -#line 1430 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1436 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_val_if_fail (event != NULL, FALSE); -#line 1431 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1437 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = self->priv->sidebar_tree; -#line 1431 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1437 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_object_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget), "has-focus", &_tmp3_, NULL); -#line 1431 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1437 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp4_ = _tmp3_; -#line 1431 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1437 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp4_) { -#line 9031 "LibraryWindow.c" +#line 9052 "LibraryWindow.c" SidebarTree* _tmp5_ = NULL; GdkEventKey* _tmp6_ = NULL; gboolean _tmp7_ = FALSE; -#line 1431 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1437 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp5_ = self->priv->sidebar_tree; -#line 1431 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1437 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp6_ = event; -#line 1431 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1437 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp7_ = sidebar_tree_is_keypress_interpreted (_tmp5_, _tmp6_); -#line 1431 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1437 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = _tmp7_; -#line 9043 "LibraryWindow.c" +#line 9064 "LibraryWindow.c" } else { -#line 1431 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1437 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = FALSE; -#line 9047 "LibraryWindow.c" +#line 9068 "LibraryWindow.c" } -#line 1431 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1437 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp1_) { -#line 9051 "LibraryWindow.c" +#line 9072 "LibraryWindow.c" SidebarTree* _tmp8_ = NULL; GdkEventKey* _tmp9_ = NULL; gboolean _tmp10_ = FALSE; -#line 1432 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1438 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp8_ = self->priv->sidebar_tree; -#line 1432 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1438 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp9_ = event; -#line 1432 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1438 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_widget_get_type (), GtkWidget), "key-press-event", _tmp9_, &_tmp10_); -#line 1432 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1438 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = _tmp10_; -#line 9063 "LibraryWindow.c" +#line 9084 "LibraryWindow.c" } else { -#line 1431 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1437 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = FALSE; -#line 9067 "LibraryWindow.c" +#line 9088 "LibraryWindow.c" } -#line 1431 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1437 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp0_) { -#line 1433 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1439 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" result = TRUE; -#line 1433 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1439 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return result; -#line 9075 "LibraryWindow.c" +#line 9096 "LibraryWindow.c" } -#line 1436 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1442 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp11_ = event; -#line 1436 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1442 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp12_ = GTK_WIDGET_CLASS (library_window_parent_class)->key_press_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), gtk_widget_get_type (), GtkWidget), _tmp11_); -#line 1436 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1442 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp12_) { -#line 1437 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1443 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" result = TRUE; -#line 1437 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1443 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return result; -#line 9087 "LibraryWindow.c" +#line 9108 "LibraryWindow.c" } -#line 1439 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1445 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp13_ = event; -#line 1439 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1445 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp14_ = _tmp13_->keyval; -#line 1439 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1445 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp15_ = gdk_keyval_name (_tmp14_); -#line 1439 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1445 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (g_strcmp0 (_tmp15_, "Escape") == 0) { -#line 1440 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1446 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_on_clear_search (self); -#line 1441 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1447 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" result = TRUE; -#line 1441 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1447 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return result; -#line 9103 "LibraryWindow.c" +#line 9124 "LibraryWindow.c" } -#line 1444 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1450 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" result = FALSE; -#line 1444 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1450 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return result; -#line 9109 "LibraryWindow.c" +#line 9130 "LibraryWindow.c" } @@ -9122,14 +9143,14 @@ gint library_window_get_PAGE_MIN_WIDTH (void) { result = _tmp1_ + (CHECKERBOARD_LAYOUT_COLUMN_GUTTER_PADDING * 2); #line 12 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return result; -#line 9125 "LibraryWindow.c" +#line 9146 "LibraryWindow.c" } static gpointer _data_collection_ref0 (gpointer self) { #line 78 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return self ? data_collection_ref (self) : NULL; -#line 9132 "LibraryWindow.c" +#line 9153 "LibraryWindow.c" } @@ -9175,14 +9196,14 @@ static LibraryWindowFullscreenPhotoPage* library_window_fullscreen_photo_page_co self->priv->view = _tmp5_; #line 75 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return self; -#line 9178 "LibraryWindow.c" +#line 9199 "LibraryWindow.c" } static LibraryWindowFullscreenPhotoPage* library_window_fullscreen_photo_page_new (CollectionPage* collection, Photo* start, ViewCollection* view) { #line 75 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return library_window_fullscreen_photo_page_construct (LIBRARY_WINDOW_TYPE_FULLSCREEN_PHOTO_PAGE, collection, start, view); -#line 9185 "LibraryWindow.c" +#line 9206 "LibraryWindow.c" } @@ -9203,22 +9224,30 @@ static void library_window_fullscreen_photo_page_real_switched_to (Page* base) { library_photo_page_display_for_collection (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage), _tmp0_, _tmp1_, _tmp2_); #line 84 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" PAGE_CLASS (library_window_fullscreen_photo_page_parent_class)->switched_to (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage), TYPE_PAGE, Page)); -#line 9206 "LibraryWindow.c" +#line 9227 "LibraryWindow.c" +} + + +static void library_window_fullscreen_photo_page_real_switching_from (Page* base) { + LibraryWindowFullscreenPhotoPage * self; +#line 87 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + self = G_TYPE_CHECK_INSTANCE_CAST (base, LIBRARY_WINDOW_TYPE_FULLSCREEN_PHOTO_PAGE, LibraryWindowFullscreenPhotoPage); +#line 9235 "LibraryWindow.c" } static void library_window_fullscreen_photo_page_real_init_collect_ui_filenames (Page* base, GeeList* ui_filenames) { LibraryWindowFullscreenPhotoPage * self; GeeList* _tmp0_ = NULL; -#line 87 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 90 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, LIBRARY_WINDOW_TYPE_FULLSCREEN_PHOTO_PAGE, LibraryWindowFullscreenPhotoPage); -#line 87 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - g_return_if_fail (GEE_IS_LIST (ui_filenames)); #line 90 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + g_return_if_fail (GEE_IS_LIST (ui_filenames)); +#line 93 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = ui_filenames; -#line 90 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 93 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection), "photo_context.ui"); -#line 9221 "LibraryWindow.c" +#line 9250 "LibraryWindow.c" } @@ -9229,18 +9258,20 @@ static void library_window_fullscreen_photo_page_class_init (LibraryWindowFullsc g_type_class_add_private (klass, sizeof (LibraryWindowFullscreenPhotoPagePrivate)); #line 70 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" ((PageClass *) klass)->switched_to = library_window_fullscreen_photo_page_real_switched_to; +#line 70 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + ((PageClass *) klass)->switching_from = library_window_fullscreen_photo_page_real_switching_from; #line 70 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" ((PageClass *) klass)->init_collect_ui_filenames = library_window_fullscreen_photo_page_real_init_collect_ui_filenames; #line 70 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" G_OBJECT_CLASS (klass)->finalize = library_window_fullscreen_photo_page_finalize; -#line 9236 "LibraryWindow.c" +#line 9267 "LibraryWindow.c" } static void library_window_fullscreen_photo_page_instance_init (LibraryWindowFullscreenPhotoPage * self) { #line 70 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" self->priv = LIBRARY_WINDOW_FULLSCREEN_PHOTO_PAGE_GET_PRIVATE (self); -#line 9243 "LibraryWindow.c" +#line 9274 "LibraryWindow.c" } @@ -9256,7 +9287,7 @@ static void library_window_fullscreen_photo_page_finalize (GObject* obj) { _data_collection_unref0 (self->priv->view); #line 70 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" G_OBJECT_CLASS (library_window_fullscreen_photo_page_parent_class)->finalize (obj); -#line 9259 "LibraryWindow.c" +#line 9290 "LibraryWindow.c" } @@ -9306,11 +9337,11 @@ static void library_window_class_init (LibraryWindowClass * klass) { G_OBJECT_CLASS (klass)->get_property = _vala_library_window_get_property; #line 7 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" G_OBJECT_CLASS (klass)->finalize = library_window_finalize; -#line 119 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 121 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = gee_hash_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL, NULL, NULL, NULL, NULL); -#line 119 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 121 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_initial_camera_uris = _tmp0_; -#line 9313 "LibraryWindow.c" +#line 9344 "LibraryWindow.c" } @@ -9337,121 +9368,121 @@ static void library_window_instance_init (LibraryWindow * self) { GtkRevealer* _tmp19_ = NULL; #line 7 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" self->priv = LIBRARY_WINDOW_GET_PRIVATE (self); -#line 95 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 97 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = g_get_home_dir (); -#line 95 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 97 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = g_strdup (_tmp0_); -#line 95 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - self->priv->import_dir = _tmp1_; #line 97 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + self->priv->import_dir = _tmp1_; +#line 99 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = (GtkPaned*) gtk_paned_new (GTK_ORIENTATION_VERTICAL); -#line 97 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 99 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_object_ref_sink (_tmp2_); -#line 97 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 99 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" self->priv->sidebar_paned = _tmp2_; -#line 98 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 100 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = (GtkPaned*) gtk_paned_new (GTK_ORIENTATION_HORIZONTAL); -#line 98 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 100 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_object_ref_sink (_tmp3_); -#line 98 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 100 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" self->priv->client_paned = _tmp3_; -#line 99 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 101 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp4_ = (GtkFrame*) gtk_frame_new (NULL); -#line 99 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 101 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_object_ref_sink (_tmp4_); -#line 99 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - self->priv->bottom_frame = _tmp4_; #line 101 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + self->priv->bottom_frame = _tmp4_; +#line 103 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" self->priv->properties_scheduler = NULL; -#line 102 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 104 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" self->priv->notify_library_is_home_dir = TRUE; -#line 106 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 108 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp5_ = library_branch_new (); -#line 106 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 108 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" self->priv->library_branch = _tmp5_; -#line 107 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 109 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp6_ = tags_branch_new (); -#line 107 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 109 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" self->priv->tags_branch = _tmp6_; -#line 108 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 110 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp7_ = folders_branch_new (); -#line 108 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 110 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" self->priv->folders_branch = _tmp7_; -#line 109 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 111 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp8_ = events_branch_new (); -#line 109 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 111 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" self->priv->events_branch = _tmp8_; -#line 110 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 112 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp9_ = camera_branch_new (); -#line 110 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 112 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" self->priv->camera_branch = _tmp9_; -#line 111 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 113 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp10_ = searches_branch_new (); -#line 111 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 113 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" self->priv->saved_search_branch = _tmp10_; -#line 112 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - self->priv->page_switching_enabled = TRUE; #line 114 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + self->priv->page_switching_enabled = TRUE; +#line 116 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp11_ = gee_hash_map_new (TYPE_PAGE, (GBoxedCopyFunc) g_object_ref, g_object_unref, SIDEBAR_TYPE_ENTRY, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); -#line 114 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - self->priv->page_map = _tmp11_; #line 116 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + self->priv->page_map = _tmp11_; +#line 118 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" self->priv->photo_page = NULL; -#line 121 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 123 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" self->priv->is_search_toolbar_visible = FALSE; -#line 126 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 128 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp12_ = search_filter_actions_new (); -#line 126 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 128 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" self->priv->search_actions = _tmp12_; -#line 129 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 131 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp13_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); -#line 129 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 131 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_object_ref_sink (_tmp13_); -#line 129 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 131 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" self->priv->top_section = _tmp13_; -#line 130 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 132 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp14_ = (GtkFrame*) gtk_frame_new (NULL); -#line 130 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 132 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_object_ref_sink (_tmp14_); -#line 130 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 132 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" self->priv->background_progress_frame = _tmp14_; -#line 131 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 133 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp15_ = (GtkProgressBar*) gtk_progress_bar_new (); -#line 131 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 133 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_object_ref_sink (_tmp15_); -#line 131 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 133 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" self->priv->background_progress_bar = _tmp15_; -#line 132 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - self->priv->background_progress_displayed = FALSE; #line 134 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + self->priv->background_progress_displayed = FALSE; +#line 136 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp16_ = basic_properties_new (); -#line 134 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 136 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_object_ref_sink (_tmp16_); -#line 134 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 136 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" self->priv->basic_properties = _tmp16_; -#line 137 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 139 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp17_ = (GtkStack*) gtk_stack_new (); -#line 137 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 139 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_object_ref_sink (_tmp17_); -#line 137 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 139 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" self->priv->stack = _tmp17_; -#line 138 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 140 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp18_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); -#line 138 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 140 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_object_ref_sink (_tmp18_); -#line 138 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - self->priv->layout = _tmp18_; #line 140 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + self->priv->layout = _tmp18_; +#line 142 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp19_ = (GtkRevealer*) gtk_revealer_new (); -#line 140 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 142 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_object_ref_sink (_tmp19_); -#line 140 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - self->priv->toolbar_revealer = _tmp19_; #line 142 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + self->priv->toolbar_revealer = _tmp19_; +#line 144 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" self->priv->current_progress_priority = 0; -#line 143 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 145 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" self->priv->background_progress_pulse_id = (guint) 0; -#line 9454 "LibraryWindow.c" +#line 9485 "LibraryWindow.c" } @@ -9491,51 +9522,51 @@ static void library_window_finalize (GObject* obj) { guint _tmp45_ = 0U; #line 7 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_LIBRARY_WINDOW, LibraryWindow); -#line 216 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 222 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = self->priv->sidebar_tree; -#line 216 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 222 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_parse_name ("page-created", SIDEBAR_TYPE_TREE, &_tmp1_, NULL, FALSE); -#line 216 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 222 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _library_window_on_page_created_sidebar_tree_page_created, self); -#line 217 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 223 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = self->priv->sidebar_tree; -#line 217 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 223 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_parse_name ("destroying-page", SIDEBAR_TYPE_TREE, &_tmp3_, NULL, FALSE); -#line 217 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 223 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _library_window_on_destroying_page_sidebar_tree_destroying_page, self); -#line 218 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 224 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp4_ = self->priv->sidebar_tree; -#line 218 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 224 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_parse_name ("entry-selected", SIDEBAR_TYPE_TREE, &_tmp5_, NULL, FALSE); -#line 218 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 224 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_handlers_disconnect_matched (_tmp4_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp5_, 0, NULL, (GCallback) _library_window_on_sidebar_entry_selected_sidebar_tree_entry_selected, self); -#line 219 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 225 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp6_ = self->priv->sidebar_tree; -#line 219 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 225 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_parse_name ("selected-entry-removed", SIDEBAR_TYPE_TREE, &_tmp7_, NULL, FALSE); -#line 219 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 225 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_handlers_disconnect_matched (_tmp6_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp7_, 0, NULL, (GCallback) _library_window_on_sidebar_selected_entry_removed_sidebar_tree_selected_entry_removed, self); -#line 221 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 227 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp8_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow)); -#line 221 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 227 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp9_ = _tmp8_; -#line 221 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 227 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_unsubscribe_from_basic_information (self, _tmp9_); -#line 221 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 227 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp9_); -#line 223 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 229 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp10_ = self->priv->extended_properties; -#line 223 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 229 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_parse_name ("hide", gtk_widget_get_type (), &_tmp11_, NULL, FALSE); -#line 223 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 229 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_widget_get_type (), GtkWidget), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp11_, 0, NULL, (GCallback) _library_window_hide_extended_properties_gtk_widget_hide, self); -#line 224 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 230 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp12_ = self->priv->extended_properties; -#line 224 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 230 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_parse_name ("show", gtk_widget_get_type (), &_tmp13_, NULL, FALSE); -#line 224 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 230 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_widget_get_type (), GtkWidget), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp13_, 0, NULL, (GCallback) _library_window_show_extended_properties_gtk_widget_show, self); -#line 9538 "LibraryWindow.c" +#line 9569 "LibraryWindow.c" { GeeIterator* _media_sources_it = NULL; MediaCollectionRegistry* _tmp14_ = NULL; @@ -9544,27 +9575,27 @@ static void library_window_finalize (GObject* obj) { GeeCollection* _tmp17_ = NULL; GeeIterator* _tmp18_ = NULL; GeeIterator* _tmp19_ = NULL; -#line 226 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 232 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp14_ = media_collection_registry_get_instance (); -#line 226 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 232 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp15_ = _tmp14_; -#line 226 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 232 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp16_ = media_collection_registry_get_all (_tmp15_); -#line 226 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 232 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp17_ = _tmp16_; -#line 226 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 232 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp18_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 226 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 232 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp19_ = _tmp18_; -#line 226 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 232 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp17_); -#line 226 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 232 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _media_collection_registry_unref0 (_tmp15_); -#line 226 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 232 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _media_sources_it = _tmp19_; -#line 226 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 232 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" while (TRUE) { -#line 9567 "LibraryWindow.c" +#line 9598 "LibraryWindow.c" GeeIterator* _tmp20_ = NULL; gboolean _tmp21_ = FALSE; MediaSourceCollection* media_sources = NULL; @@ -9574,161 +9605,161 @@ static void library_window_finalize (GObject* obj) { guint _tmp25_ = 0U; MediaSourceCollection* _tmp26_ = NULL; guint _tmp27_ = 0U; -#line 226 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 232 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp20_ = _media_sources_it; -#line 226 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 232 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp21_ = gee_iterator_next (_tmp20_); -#line 226 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 232 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (!_tmp21_) { -#line 226 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 232 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" break; -#line 9585 "LibraryWindow.c" +#line 9616 "LibraryWindow.c" } -#line 226 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 232 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp22_ = _media_sources_it; -#line 226 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 232 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp23_ = gee_iterator_get (_tmp22_); -#line 226 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 232 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" media_sources = (MediaSourceCollection*) _tmp23_; -#line 227 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 233 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp24_ = media_sources; -#line 227 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 233 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_parse_name ("trashcan-contents-altered", TYPE_MEDIA_SOURCE_COLLECTION, &_tmp25_, NULL, FALSE); -#line 227 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 233 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_handlers_disconnect_matched (_tmp24_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp25_, 0, NULL, (GCallback) _library_window_on_trashcan_contents_altered_media_source_collection_trashcan_contents_altered, self); -#line 228 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 234 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp26_ = media_sources; -#line 228 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 234 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_parse_name ("items-altered", TYPE_DATA_COLLECTION, &_tmp27_, NULL, FALSE); -#line 228 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 234 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, TYPE_DATA_COLLECTION, DataCollection), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp27_, 0, NULL, (GCallback) _library_window_on_media_altered_data_collection_items_altered, self); -#line 226 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 232 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _data_collection_unref0 (media_sources); -#line 9607 "LibraryWindow.c" +#line 9638 "LibraryWindow.c" } -#line 226 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 232 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_media_sources_it); -#line 9611 "LibraryWindow.c" +#line 9642 "LibraryWindow.c" } -#line 231 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 237 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp28_ = metadata_writer_get_instance (); -#line 231 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 237 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp29_ = _tmp28_; -#line 231 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 237 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_parse_name ("progress", TYPE_METADATA_WRITER, &_tmp30_, NULL, FALSE); -#line 231 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 237 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_handlers_disconnect_matched (_tmp29_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp30_, 0, NULL, (GCallback) _library_window_on_metadata_writer_progress_metadata_writer_progress, self); -#line 231 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 237 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp29_); -#line 233 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 239 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp31_ = library_monitor_pool_get_instance (); -#line 233 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 239 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp32_ = _tmp31_; -#line 233 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 239 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp33_ = library_monitor_pool_get_monitor (_tmp32_); -#line 233 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 239 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp34_ = _tmp33_; -#line 233 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 239 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _library_monitor_pool_unref0 (_tmp32_); -#line 233 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 239 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" monitor = _tmp34_; -#line 234 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 240 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp35_ = monitor; -#line 234 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 240 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp35_ != NULL) { -#line 9639 "LibraryWindow.c" +#line 9670 "LibraryWindow.c" LibraryMonitor* _tmp36_ = NULL; -#line 235 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 241 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp36_ = monitor; -#line 235 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 241 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_on_library_monitor_destroyed (self, _tmp36_); -#line 9645 "LibraryWindow.c" +#line 9676 "LibraryWindow.c" } -#line 237 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 243 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp37_ = library_monitor_pool_get_instance (); -#line 237 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 243 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp38_ = _tmp37_; -#line 237 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 243 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_parse_name ("monitor-installed", TYPE_LIBRARY_MONITOR_POOL, &_tmp39_, NULL, FALSE); -#line 237 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 243 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_handlers_disconnect_matched (_tmp38_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp39_, 0, NULL, (GCallback) _library_window_on_library_monitor_installed_library_monitor_pool_monitor_installed, self); -#line 237 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 243 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _library_monitor_pool_unref0 (_tmp38_); -#line 238 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 244 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp40_ = library_monitor_pool_get_instance (); -#line 238 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 244 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp41_ = _tmp40_; -#line 238 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 244 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_parse_name ("monitor-destroyed", TYPE_LIBRARY_MONITOR_POOL, &_tmp42_, NULL, FALSE); -#line 238 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 244 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_handlers_disconnect_matched (_tmp41_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp42_, 0, NULL, (GCallback) _library_window_on_library_monitor_destroyed_library_monitor_pool_monitor_destroyed, self); -#line 238 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 244 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _library_monitor_pool_unref0 (_tmp41_); -#line 240 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 246 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp43_ = camera_table_get_instance (); -#line 240 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 246 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp44_ = _tmp43_; -#line 240 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 246 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_parse_name ("camera-added", TYPE_CAMERA_TABLE, &_tmp45_, NULL, FALSE); -#line 240 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 246 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_handlers_disconnect_matched (_tmp44_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp45_, 0, NULL, (GCallback) _library_window_on_camera_added_camera_table_camera_added, self); -#line 240 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 246 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _camera_table_unref0 (_tmp44_); #line 7 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (monitor); -#line 95 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _g_free0 (self->priv->import_dir); #line 97 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _g_free0 (self->priv->import_dir); +#line 99 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (self->priv->sidebar_paned); -#line 98 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 100 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (self->priv->client_paned); -#line 99 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _g_object_unref0 (self->priv->bottom_frame); #line 101 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _g_object_unref0 (self->priv->bottom_frame); +#line 103 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _one_shot_scheduler_unref0 (self->priv->properties_scheduler); -#line 105 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 107 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (self->priv->sidebar_tree); -#line 106 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 108 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (self->priv->library_branch); -#line 107 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 109 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (self->priv->tags_branch); -#line 108 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 110 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (self->priv->folders_branch); -#line 109 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 111 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (self->priv->events_branch); -#line 110 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 112 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (self->priv->camera_branch); -#line 111 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 113 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (self->priv->saved_search_branch); -#line 114 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _g_object_unref0 (self->priv->page_map); #line 116 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _g_object_unref0 (self->priv->page_map); +#line 118 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (self->priv->photo_page); -#line 126 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 128 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _search_filter_actions_unref0 (self->priv->search_actions); -#line 127 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _g_object_unref0 (self->priv->search_toolbar); #line 129 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _g_object_unref0 (self->priv->search_toolbar); +#line 131 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (self->priv->top_section); -#line 130 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 132 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (self->priv->background_progress_frame); -#line 131 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 133 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (self->priv->background_progress_bar); -#line 134 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 136 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (self->priv->basic_properties); -#line 135 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _g_object_unref0 (self->priv->extended_properties); #line 137 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _g_object_unref0 (self->priv->extended_properties); +#line 139 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (self->priv->stack); -#line 138 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 140 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (self->priv->layout); -#line 139 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 141 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (self->priv->right_vbox); -#line 140 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 142 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (self->priv->toolbar_revealer); #line 7 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" G_OBJECT_CLASS (library_window_parent_class)->finalize (obj); -#line 9731 "LibraryWindow.c" +#line 9762 "LibraryWindow.c" } @@ -9749,13 +9780,13 @@ static void _vala_library_window_get_property (GObject * object, guint property_ self = G_TYPE_CHECK_INSTANCE_CAST (object, TYPE_LIBRARY_WINDOW, LibraryWindow); #line 7 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" switch (property_id) { -#line 9752 "LibraryWindow.c" +#line 9783 "LibraryWindow.c" default: #line 7 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 7 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" break; -#line 9758 "LibraryWindow.c" +#line 9789 "LibraryWindow.c" } } diff --git a/src/library/LibraryWindow.vala b/src/library/LibraryWindow.vala index 628bc36..0a39318 100644 --- a/src/library/LibraryWindow.vala +++ b/src/library/LibraryWindow.vala @@ -84,12 +84,14 @@ public class LibraryWindow : AppWindow { base.switched_to(); } + public override void switching_from() { + } + protected override void init_collect_ui_filenames(Gee.List ui_filenames) { // We intentionally don't call the base class here since we don't want the // top-level menu in photo.ui. ui_filenames.add("photo_context.ui"); } - } private string import_dir = Environment.get_home_dir(); @@ -209,7 +211,11 @@ public class LibraryWindow : AppWindow { CameraTable.get_instance().camera_added.connect(on_camera_added); background_progress_bar.set_show_text(true); - + + // Need to re-install F8 here as it will overwrite the binding created + // by the menu + const string[] accels = { "f", "F8", null }; + Application.set_accels_for_action("win.CommonDisplaySearchbar", accels); } ~LibraryWindow() { @@ -1187,9 +1193,6 @@ public class LibraryWindow : AppWindow { add(layout); - var builder = new Gtk.Builder.from_resource ("/org/gnome/Shotwell/appmenu.ui"); - Application.set_appmenu (builder.get_object ("appmenu") as GLib.Menu); - switch_to_page(start_page); start_page.grab_focus(); } @@ -1272,6 +1275,9 @@ public class LibraryWindow : AppWindow { Application.set_menubar (page.get_menubar ()); set_show_menubar (true); + var old = get_settings().gtk_shell_shows_menubar; + get_settings().gtk_shell_shows_menubar = !old; + get_settings().gtk_shell_shows_menubar = old; Gtk.Toolbar toolbar = page.get_toolbar(); if (toolbar != null) { diff --git a/src/library/OfflinePage.c b/src/library/OfflinePage.c index b8ec792..1117bcd 100644 --- a/src/library/OfflinePage.c +++ b/src/library/OfflinePage.c @@ -1,4 +1,4 @@ -/* OfflinePage.c generated by valac 0.32.1, the Vala compiler +/* OfflinePage.c generated by valac 0.34.4, the Vala compiler * generated from OfflinePage.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -12,10 +12,10 @@ #include #include #include +#include #include #include #include -#include #include #include #include @@ -304,16 +304,6 @@ typedef struct _ViewCollectionClass ViewCollectionClass; #define _data_collection_unref0(var) ((var == NULL) ? NULL : (var = (data_collection_unref (var), NULL))) #define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL))) -#define TYPE_APP_WINDOW (app_window_get_type ()) -#define APP_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_APP_WINDOW, AppWindow)) -#define APP_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_APP_WINDOW, AppWindowClass)) -#define IS_APP_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_APP_WINDOW)) -#define IS_APP_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_APP_WINDOW)) -#define APP_WINDOW_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_APP_WINDOW, AppWindowClass)) - -typedef struct _AppWindow AppWindow; -typedef struct _AppWindowClass AppWindowClass; - #define TYPE_MEDIA_SOURCE_ITEM (media_source_item_get_type ()) #define MEDIA_SOURCE_ITEM(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_MEDIA_SOURCE_ITEM, MediaSourceItem)) #define MEDIA_SOURCE_ITEM_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_MEDIA_SOURCE_ITEM, MediaSourceItemClass)) @@ -352,6 +342,16 @@ typedef struct _OfflinePageOfflineViewClass OfflinePageOfflineViewClass; typedef struct _Marker Marker; typedef struct _MarkerIface MarkerIface; +#define TYPE_APP_WINDOW (app_window_get_type ()) +#define APP_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_APP_WINDOW, AppWindow)) +#define APP_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_APP_WINDOW, AppWindowClass)) +#define IS_APP_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_APP_WINDOW)) +#define IS_APP_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_APP_WINDOW)) +#define APP_WINDOW_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_APP_WINDOW, AppWindowClass)) + +typedef struct _AppWindow AppWindow; +typedef struct _AppWindowClass AppWindowClass; + #define TYPE_PROGRESS_DIALOG (progress_dialog_get_type ()) #define PROGRESS_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_PROGRESS_DIALOG, ProgressDialog)) #define PROGRESS_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_PROGRESS_DIALOG, ProgressDialogClass)) @@ -462,7 +462,8 @@ struct _PageClass { void (*ready) (Page* self); void (*switching_to_fullscreen) (Page* self, FullscreenWindow* fsw); void (*returning_from_fullscreen) (Page* self, FullscreenWindow* fsw); - void (*add_actions) (Page* self); + void (*add_actions) (Page* self, GActionMap* map); + void (*remove_actions) (Page* self, GActionMap* map); void (*init_collect_ui_filenames) (Page* self, GeeList* ui_filenames); InjectionGroup** (*init_collect_injection_groups) (Page* self, int* result_length1); void (*init_actions) (Page* self, gint selected_count, gint count); @@ -794,10 +795,10 @@ MediaViewTracker* media_view_tracker_construct (GType object_type, ViewCollectio GeeCollection* media_source_collection_get_offline_bin_contents (MediaSourceCollection* self); static void offline_page_real_init_collect_ui_filenames (Page* base, GeeList* ui_filenames); void page_init_collect_ui_filenames (Page* self, GeeList* ui_filenames); -static void offline_page_real_add_actions (Page* base); -void page_add_actions (Page* self); -GType app_window_get_type (void) G_GNUC_CONST; -AppWindow* app_window_get_instance (void); +static void offline_page_real_add_actions (Page* base, GActionMap* map); +void page_add_actions (Page* self, GActionMap* map); +static void offline_page_real_remove_actions (Page* base, GActionMap* map); +void page_remove_actions (Page* self, GActionMap* map); static CoreViewTracker* offline_page_real_get_view_tracker (CheckerboardPage* base); static void offline_page_real_update_actions (Page* base, gint selected_count, gint count); void page_set_action_sensitive (Page* self, const gchar* name, gboolean sensitive); @@ -815,6 +816,8 @@ DataView* view_collection_get_view_for_source (ViewCollection* self, DataSource* void data_collection_remove_marked (DataCollection* self, Marker* m); GeeList* view_collection_get_selected_sources (ViewCollection* self); gboolean remove_offline_dialog (GtkWindow* owner, gint count); +GType app_window_get_type (void) G_GNUC_CONST; +AppWindow* app_window_get_instance (void); void page_window_set_busy_cursor (PageWindow* self); GType progress_dialog_get_type (void) G_GNUC_CONST; ProgressDialog* progress_dialog_new (GtkWindow* owner, const gchar* text, GCancellable* cancellable); @@ -861,14 +864,14 @@ static const GActionEntry OFFLINE_PAGE_entries[1] = {{"RemoveFromLibrary", _offl static void _offline_page_on_offline_contents_altered_media_source_collection_offline_contents_altered (MediaSourceCollection* _sender, GeeCollection* added, GeeCollection* removed, gpointer self) { #line 45 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" offline_page_on_offline_contents_altered ((OfflinePage*) self, added, removed); -#line 865 "OfflinePage.c" +#line 868 "OfflinePage.c" } static void _offline_page_on_remove_from_library_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { #line 55 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" offline_page_on_remove_from_library ((OfflinePage*) self); -#line 872 "OfflinePage.c" +#line 875 "OfflinePage.c" } @@ -933,14 +936,14 @@ OfflinePage* offline_page_construct (GType object_type) { _g_object_unref0 (_tmp10_); #line 28 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" return self; -#line 937 "OfflinePage.c" +#line 940 "OfflinePage.c" } OfflinePage* offline_page_new (void) { #line 28 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" return offline_page_construct (TYPE_OFFLINE_PAGE); -#line 944 "OfflinePage.c" +#line 947 "OfflinePage.c" } @@ -960,34 +963,81 @@ static void offline_page_real_init_collect_ui_filenames (Page* base, GeeList* ui _tmp1_ = ui_filenames; #line 52 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection), "offline.ui"); -#line 964 "OfflinePage.c" +#line 967 "OfflinePage.c" } -static void offline_page_real_add_actions (Page* base) { +static void offline_page_real_add_actions (Page* base, GActionMap* map) { OfflinePage * self; - AppWindow* _tmp0_ = NULL; - AppWindow* _tmp1_ = NULL; + GActionMap* _tmp0_ = NULL; + GActionMap* _tmp1_ = NULL; #line 59 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_OFFLINE_PAGE, OfflinePage); +#line 59 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" + g_return_if_fail (G_IS_ACTION_MAP (map)); #line 60 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - PAGE_CLASS (offline_page_parent_class)->add_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page)); -#line 62 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - _tmp0_ = app_window_get_instance (); -#line 62 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - _tmp1_ = _tmp0_; + _tmp0_ = map; +#line 60 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" + PAGE_CLASS (offline_page_parent_class)->add_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page), _tmp0_); #line 62 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - g_action_map_add_action_entries (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, g_action_map_get_type (), GActionMap), OFFLINE_PAGE_entries, G_N_ELEMENTS (OFFLINE_PAGE_entries), self); + _tmp1_ = map; #line 62 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - _g_object_unref0 (_tmp1_); -#line 984 "OfflinePage.c" + g_action_map_add_action_entries (_tmp1_, OFFLINE_PAGE_entries, G_N_ELEMENTS (OFFLINE_PAGE_entries), self); +#line 987 "OfflinePage.c" } -static gpointer _core_tracker_ref0 (gpointer self) { +static void offline_page_real_remove_actions (Page* base, GActionMap* map) { + OfflinePage * self; + GActionMap* _tmp0_ = NULL; +#line 65 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" + self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_OFFLINE_PAGE, OfflinePage); +#line 65 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" + g_return_if_fail (G_IS_ACTION_MAP (map)); +#line 66 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" + _tmp0_ = map; #line 66 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" + PAGE_CLASS (offline_page_parent_class)->remove_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page), _tmp0_); +#line 1002 "OfflinePage.c" + { + GActionEntry* entry_collection = NULL; + gint entry_collection_length1 = 0; + gint _entry_collection_size_ = 0; + gint entry_it = 0; +#line 67 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" + entry_collection = OFFLINE_PAGE_entries; +#line 67 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" + entry_collection_length1 = G_N_ELEMENTS (OFFLINE_PAGE_entries); +#line 67 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" + for (entry_it = 0; entry_it < G_N_ELEMENTS (OFFLINE_PAGE_entries); entry_it = entry_it + 1) { +#line 1014 "OfflinePage.c" + GActionEntry entry = {0}; +#line 67 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" + entry = entry_collection[entry_it]; +#line 1018 "OfflinePage.c" + { + GActionMap* _tmp1_ = NULL; + GActionEntry _tmp2_ = {0}; + const gchar* _tmp3_ = NULL; +#line 68 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" + _tmp1_ = map; +#line 68 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" + _tmp2_ = entry; +#line 68 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" + _tmp3_ = _tmp2_.name; +#line 68 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" + g_action_map_remove_action (_tmp1_, _tmp3_); +#line 1031 "OfflinePage.c" + } + } + } +} + + +static gpointer _core_tracker_ref0 (gpointer self) { +#line 73 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" return self ? core_tracker_ref (self) : NULL; -#line 991 "OfflinePage.c" +#line 1041 "OfflinePage.c" } @@ -996,17 +1046,17 @@ static CoreViewTracker* offline_page_real_get_view_tracker (CheckerboardPage* ba CoreViewTracker* result = NULL; MediaViewTracker* _tmp0_ = NULL; CoreViewTracker* _tmp1_ = NULL; -#line 65 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 72 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_OFFLINE_PAGE, OfflinePage); -#line 66 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 73 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _tmp0_ = self->priv->tracker; -#line 66 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 73 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _tmp1_ = _core_tracker_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, CORE_TYPE_VIEW_TRACKER, CoreViewTracker)); -#line 66 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 73 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" result = _tmp1_; -#line 66 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 73 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" return result; -#line 1010 "OfflinePage.c" +#line 1060 "OfflinePage.c" } @@ -1015,49 +1065,49 @@ static void offline_page_real_update_actions (Page* base, gint selected_count, g gint _tmp0_ = 0; gint _tmp1_ = 0; gint _tmp2_ = 0; -#line 69 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 76 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_OFFLINE_PAGE, OfflinePage); -#line 70 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 77 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _tmp0_ = selected_count; -#line 70 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 77 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RemoveFromLibrary", _tmp0_ > 0); -#line 72 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 79 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _tmp1_ = selected_count; -#line 72 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 79 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _tmp2_ = count; -#line 72 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 79 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" PAGE_CLASS (offline_page_parent_class)->update_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page), _tmp1_, _tmp2_); -#line 1031 "OfflinePage.c" +#line 1081 "OfflinePage.c" } static void offline_page_on_offline_contents_altered (OfflinePage* self, GeeCollection* added, GeeCollection* removed) { GeeCollection* _tmp0_ = NULL; GeeCollection* _tmp12_ = NULL; -#line 75 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 82 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" g_return_if_fail (IS_OFFLINE_PAGE (self)); -#line 75 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 82 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" g_return_if_fail ((added == NULL) || GEE_IS_COLLECTION (added)); -#line 75 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 82 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" g_return_if_fail ((removed == NULL) || GEE_IS_COLLECTION (removed)); -#line 77 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 84 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _tmp0_ = added; -#line 77 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 84 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" if (_tmp0_ != NULL) { -#line 1048 "OfflinePage.c" +#line 1098 "OfflinePage.c" { GeeIterator* _source_it = NULL; GeeCollection* _tmp1_ = NULL; GeeIterator* _tmp2_ = NULL; -#line 78 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 85 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _tmp1_ = added; -#line 78 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 85 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _tmp2_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 78 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 85 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _source_it = _tmp2_; -#line 78 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 85 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" while (TRUE) { -#line 1061 "OfflinePage.c" +#line 1111 "OfflinePage.c" GeeIterator* _tmp3_ = NULL; gboolean _tmp4_ = FALSE; MediaSource* source = NULL; @@ -1068,52 +1118,52 @@ static void offline_page_on_offline_contents_altered (OfflinePage* self, GeeColl MediaSource* _tmp9_ = NULL; OfflinePageOfflineView* _tmp10_ = NULL; OfflinePageOfflineView* _tmp11_ = NULL; -#line 78 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 85 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _tmp3_ = _source_it; -#line 78 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 85 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _tmp4_ = gee_iterator_next (_tmp3_); -#line 78 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 85 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" if (!_tmp4_) { -#line 78 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 85 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" break; -#line 1080 "OfflinePage.c" +#line 1130 "OfflinePage.c" } -#line 78 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 85 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _tmp5_ = _source_it; -#line 78 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 85 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _tmp6_ = gee_iterator_get (_tmp5_); -#line 78 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 85 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" source = (MediaSource*) _tmp6_; -#line 79 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 86 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _tmp7_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 79 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 86 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _tmp8_ = _tmp7_; -#line 79 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 86 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _tmp9_ = source; -#line 79 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 86 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _tmp10_ = offline_page_offline_view_new (_tmp9_); -#line 79 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 86 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _tmp11_ = _tmp10_; -#line 79 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 86 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" data_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_DATA_OBJECT, DataObject)); -#line 79 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 86 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _g_object_unref0 (_tmp11_); -#line 79 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 86 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _data_collection_unref0 (_tmp8_); -#line 78 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 85 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _g_object_unref0 (source); -#line 1106 "OfflinePage.c" +#line 1156 "OfflinePage.c" } -#line 78 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 85 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _g_object_unref0 (_source_it); -#line 1110 "OfflinePage.c" +#line 1160 "OfflinePage.c" } } -#line 82 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 89 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _tmp12_ = removed; -#line 82 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 89 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" if (_tmp12_ != NULL) { -#line 1117 "OfflinePage.c" +#line 1167 "OfflinePage.c" Marker* marker = NULL; ViewCollection* _tmp13_ = NULL; ViewCollection* _tmp14_ = NULL; @@ -1122,32 +1172,32 @@ static void offline_page_on_offline_contents_altered (OfflinePage* self, GeeColl ViewCollection* _tmp29_ = NULL; ViewCollection* _tmp30_ = NULL; Marker* _tmp31_ = NULL; -#line 83 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 90 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _tmp13_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 83 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 90 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _tmp14_ = _tmp13_; -#line 83 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 90 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _tmp15_ = data_collection_start_marking (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_DATA_COLLECTION, DataCollection)); -#line 83 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 90 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _tmp16_ = _tmp15_; -#line 83 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 90 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _data_collection_unref0 (_tmp14_); -#line 83 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 90 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" marker = _tmp16_; -#line 1138 "OfflinePage.c" +#line 1188 "OfflinePage.c" { GeeIterator* _source_it = NULL; GeeCollection* _tmp17_ = NULL; GeeIterator* _tmp18_ = NULL; -#line 84 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 91 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _tmp17_ = removed; -#line 84 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 91 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _tmp18_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 84 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 91 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _source_it = _tmp18_; -#line 84 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 91 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" while (TRUE) { -#line 1151 "OfflinePage.c" +#line 1201 "OfflinePage.c" GeeIterator* _tmp19_ = NULL; gboolean _tmp20_ = FALSE; MediaSource* source = NULL; @@ -1159,61 +1209,61 @@ static void offline_page_on_offline_contents_altered (OfflinePage* self, GeeColl MediaSource* _tmp26_ = NULL; DataView* _tmp27_ = NULL; DataView* _tmp28_ = NULL; -#line 84 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 91 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _tmp19_ = _source_it; -#line 84 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 91 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _tmp20_ = gee_iterator_next (_tmp19_); -#line 84 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 91 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" if (!_tmp20_) { -#line 84 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 91 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" break; -#line 1171 "OfflinePage.c" +#line 1221 "OfflinePage.c" } -#line 84 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 91 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _tmp21_ = _source_it; -#line 84 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 91 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _tmp22_ = gee_iterator_get (_tmp21_); -#line 84 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 91 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" source = (MediaSource*) _tmp22_; -#line 85 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 92 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _tmp23_ = marker; -#line 85 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 92 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _tmp24_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 85 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 92 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _tmp25_ = _tmp24_; -#line 85 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 92 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _tmp26_ = source; -#line 85 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 92 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _tmp27_ = view_collection_get_view_for_source (_tmp25_, G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, TYPE_DATA_SOURCE, DataSource)); -#line 85 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 92 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _tmp28_ = _tmp27_; -#line 85 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 92 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" marker_mark (_tmp23_, G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, TYPE_DATA_OBJECT, DataObject)); -#line 85 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 92 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _g_object_unref0 (_tmp28_); -#line 85 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 92 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _data_collection_unref0 (_tmp25_); -#line 84 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 91 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _g_object_unref0 (source); -#line 1199 "OfflinePage.c" +#line 1249 "OfflinePage.c" } -#line 84 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 91 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _g_object_unref0 (_source_it); -#line 1203 "OfflinePage.c" +#line 1253 "OfflinePage.c" } -#line 86 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 93 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _tmp29_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 86 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 93 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _tmp30_ = _tmp29_; -#line 86 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 93 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _tmp31_ = marker; -#line 86 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 93 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" data_collection_remove_marked (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, TYPE_DATA_COLLECTION, DataCollection), _tmp31_); -#line 86 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 93 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _data_collection_unref0 (_tmp30_); -#line 82 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 89 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _g_object_unref0 (marker); -#line 1217 "OfflinePage.c" +#line 1267 "OfflinePage.c" } } @@ -1221,9 +1271,9 @@ static void offline_page_on_offline_contents_altered (OfflinePage* self, GeeColl static gboolean _progress_dialog_monitor_progress_monitor (guint64 current, guint64 total, gboolean do_event_loop, gpointer self) { gboolean result; result = progress_dialog_monitor ((ProgressDialog*) self, current, total, do_event_loop); -#line 110 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 117 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" return result; -#line 1227 "OfflinePage.c" +#line 1277 "OfflinePage.c" } @@ -1260,198 +1310,198 @@ static void offline_page_on_remove_from_library (OfflinePage* self) { ProgressDialog* _tmp39_ = NULL; AppWindow* _tmp41_ = NULL; AppWindow* _tmp42_ = NULL; -#line 90 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 97 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" g_return_if_fail (IS_OFFLINE_PAGE (self)); -#line 91 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 98 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 91 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 98 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _tmp1_ = _tmp0_; -#line 91 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 98 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _tmp2_ = view_collection_get_selected_sources (_tmp1_); -#line 91 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 98 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _tmp3_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection); -#line 91 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 98 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _data_collection_unref0 (_tmp1_); -#line 91 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 98 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" sources = _tmp3_; -#line 93 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 100 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _tmp4_ = sources; -#line 93 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 100 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _tmp5_ = gee_collection_get_size (_tmp4_); -#line 93 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 100 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _tmp6_ = _tmp5_; -#line 93 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 100 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" if (_tmp6_ == 0) { -#line 94 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 101 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _g_object_unref0 (sources); -#line 94 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 101 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" return; -#line 1290 "OfflinePage.c" +#line 1340 "OfflinePage.c" } -#line 96 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 103 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _tmp7_ = app_window_get_instance (); -#line 96 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 103 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _tmp8_ = _tmp7_; -#line 96 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 103 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _tmp9_ = sources; -#line 96 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 103 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _tmp10_ = gee_collection_get_size (_tmp9_); -#line 96 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 103 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _tmp11_ = _tmp10_; -#line 96 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 103 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _tmp12_ = remove_offline_dialog (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_window_get_type (), GtkWindow), _tmp11_); -#line 96 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 103 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _tmp13_ = !_tmp12_; -#line 96 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 103 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _g_object_unref0 (_tmp8_); -#line 96 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 103 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" if (_tmp13_) { -#line 97 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 104 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _g_object_unref0 (sources); -#line 97 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 104 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" return; -#line 1314 "OfflinePage.c" +#line 1364 "OfflinePage.c" } -#line 99 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 106 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _tmp14_ = app_window_get_instance (); -#line 99 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 106 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _tmp15_ = _tmp14_; -#line 99 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 106 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" page_window_set_busy_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_PAGE_WINDOW, PageWindow)); -#line 99 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 106 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _g_object_unref0 (_tmp15_); -#line 101 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 108 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" progress = NULL; -#line 102 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 109 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _tmp16_ = sources; -#line 102 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 109 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _tmp17_ = gee_collection_get_size (_tmp16_); -#line 102 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 109 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _tmp18_ = _tmp17_; -#line 102 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 109 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" if (_tmp18_ >= 20) { -#line 1334 "OfflinePage.c" +#line 1384 "OfflinePage.c" AppWindow* _tmp19_ = NULL; AppWindow* _tmp20_ = NULL; const gchar* _tmp21_ = NULL; ProgressDialog* _tmp22_ = NULL; -#line 103 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 110 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _tmp19_ = app_window_get_instance (); -#line 103 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 110 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _tmp20_ = _tmp19_; -#line 103 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 110 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _tmp21_ = _ ("Deleting…"); -#line 103 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 110 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _tmp22_ = progress_dialog_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, gtk_window_get_type (), GtkWindow), _tmp21_, NULL); -#line 103 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 110 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" g_object_ref_sink (_tmp22_); -#line 103 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 110 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _g_object_unref0 (progress); -#line 103 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 110 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" progress = _tmp22_; -#line 103 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 110 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _g_object_unref0 (_tmp20_); -#line 1355 "OfflinePage.c" +#line 1405 "OfflinePage.c" } -#line 105 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 112 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _tmp23_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL); -#line 105 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 112 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" photos = _tmp23_; -#line 106 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 113 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _tmp24_ = gee_array_list_new (TYPE_VIDEO, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL); -#line 106 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 113 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" videos = _tmp24_; -#line 107 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 114 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _tmp25_ = sources; -#line 107 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 114 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _tmp26_ = photos; -#line 107 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 114 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _tmp27_ = videos; -#line 107 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 114 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" media_source_collection_filter_media (_tmp25_, G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, GEE_TYPE_COLLECTION, GeeCollection)); -#line 109 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 116 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _tmp28_ = progress; -#line 109 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 116 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" if (_tmp28_ != NULL) { -#line 1377 "OfflinePage.c" +#line 1427 "OfflinePage.c" LibraryPhotoSourceCollection* _tmp29_ = NULL; GeeArrayList* _tmp30_ = NULL; ProgressDialog* _tmp31_ = NULL; VideoSourceCollection* _tmp32_ = NULL; GeeArrayList* _tmp33_ = NULL; ProgressDialog* _tmp34_ = NULL; -#line 110 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 117 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _tmp29_ = library_photo_global; -#line 110 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 117 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _tmp30_ = photos; -#line 110 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 117 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _tmp31_ = progress; -#line 110 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 117 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" media_source_collection_remove_from_app (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, GEE_TYPE_COLLECTION, GeeCollection), FALSE, _progress_dialog_monitor_progress_monitor, _tmp31_, NULL); -#line 111 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 118 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _tmp32_ = video_global; -#line 111 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 118 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _tmp33_ = videos; -#line 111 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 118 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _tmp34_ = progress; -#line 111 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 118 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" media_source_collection_remove_from_app (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, GEE_TYPE_COLLECTION, GeeCollection), FALSE, _progress_dialog_monitor_progress_monitor, _tmp34_, NULL); -#line 1400 "OfflinePage.c" +#line 1450 "OfflinePage.c" } else { LibraryPhotoSourceCollection* _tmp35_ = NULL; GeeArrayList* _tmp36_ = NULL; VideoSourceCollection* _tmp37_ = NULL; GeeArrayList* _tmp38_ = NULL; -#line 113 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 120 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _tmp35_ = library_photo_global; -#line 113 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 120 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _tmp36_ = photos; -#line 113 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 120 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" media_source_collection_remove_from_app (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, GEE_TYPE_COLLECTION, GeeCollection), FALSE, NULL, NULL, NULL); -#line 114 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 121 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _tmp37_ = video_global; -#line 114 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 121 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _tmp38_ = videos; -#line 114 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 121 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" media_source_collection_remove_from_app (G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, GEE_TYPE_COLLECTION, GeeCollection), FALSE, NULL, NULL, NULL); -#line 1418 "OfflinePage.c" +#line 1468 "OfflinePage.c" } -#line 117 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 124 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _tmp39_ = progress; -#line 117 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 124 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" if (_tmp39_ != NULL) { -#line 1424 "OfflinePage.c" +#line 1474 "OfflinePage.c" ProgressDialog* _tmp40_ = NULL; -#line 118 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 125 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _tmp40_ = progress; -#line 118 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 125 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" progress_dialog_close (_tmp40_); -#line 1430 "OfflinePage.c" +#line 1480 "OfflinePage.c" } -#line 120 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 127 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _tmp41_ = app_window_get_instance (); -#line 120 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 127 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _tmp42_ = _tmp41_; -#line 120 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 127 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, TYPE_PAGE_WINDOW, PageWindow)); -#line 120 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 127 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _g_object_unref0 (_tmp42_); -#line 90 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 97 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _g_object_unref0 (videos); -#line 90 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 97 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _g_object_unref0 (photos); -#line 90 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 97 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _g_object_unref0 (progress); -#line 90 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 97 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _g_object_unref0 (sources); -#line 1448 "OfflinePage.c" +#line 1498 "OfflinePage.c" } static gpointer _view_filter_ref0 (gpointer self) { -#line 124 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 131 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" return self ? view_filter_ref (self) : NULL; -#line 1455 "OfflinePage.c" +#line 1505 "OfflinePage.c" } @@ -1460,17 +1510,17 @@ static SearchViewFilter* offline_page_real_get_search_view_filter (CheckerboardP SearchViewFilter* result = NULL; OfflinePageOfflineSearchViewFilter* _tmp0_ = NULL; SearchViewFilter* _tmp1_ = NULL; -#line 123 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 130 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_OFFLINE_PAGE, OfflinePage); -#line 124 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 131 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _tmp0_ = self->priv->search_filter; -#line 124 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 131 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _tmp1_ = _view_filter_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter)); -#line 124 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 131 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" result = _tmp1_; -#line 124 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 131 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" return result; -#line 1474 "OfflinePage.c" +#line 1524 "OfflinePage.c" } @@ -1499,21 +1549,21 @@ static OfflinePageOfflineView* offline_page_offline_view_construct (GType object _vala_assert (_tmp4_, "source.is_offline()"); #line 11 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" return self; -#line 1503 "OfflinePage.c" +#line 1553 "OfflinePage.c" } static OfflinePageOfflineView* offline_page_offline_view_new (MediaSource* source) { #line 11 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" return offline_page_offline_view_construct (OFFLINE_PAGE_TYPE_OFFLINE_VIEW, source); -#line 1510 "OfflinePage.c" +#line 1560 "OfflinePage.c" } static void offline_page_offline_view_class_init (OfflinePageOfflineViewClass * klass) { #line 10 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" offline_page_offline_view_parent_class = g_type_class_peek_parent (klass); -#line 1517 "OfflinePage.c" +#line 1567 "OfflinePage.c" } @@ -1542,7 +1592,7 @@ static guint offline_page_offline_search_view_filter_real_get_criteria (SearchVi result = (guint) ((((SEARCH_FILTER_CRITERIA_TEXT | SEARCH_FILTER_CRITERIA_FLAG) | SEARCH_FILTER_CRITERIA_MEDIA) | SEARCH_FILTER_CRITERIA_RATING) | SEARCH_FILTER_CRITERIA_SAVEDSEARCH); #line 20 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" return result; -#line 1546 "OfflinePage.c" +#line 1596 "OfflinePage.c" } @@ -1552,14 +1602,14 @@ static OfflinePageOfflineSearchViewFilter* offline_page_offline_search_view_filt self = (OfflinePageOfflineSearchViewFilter*) default_search_view_filter_construct (object_type); #line 18 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" return self; -#line 1556 "OfflinePage.c" +#line 1606 "OfflinePage.c" } static OfflinePageOfflineSearchViewFilter* offline_page_offline_search_view_filter_new (void) { #line 18 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" return offline_page_offline_search_view_filter_construct (OFFLINE_PAGE_TYPE_OFFLINE_SEARCH_VIEW_FILTER); -#line 1563 "OfflinePage.c" +#line 1613 "OfflinePage.c" } @@ -1568,7 +1618,7 @@ static void offline_page_offline_search_view_filter_class_init (OfflinePageOffli offline_page_offline_search_view_filter_parent_class = g_type_class_peek_parent (klass); #line 18 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" ((SearchViewFilterClass *) klass)->get_criteria = offline_page_offline_search_view_filter_real_get_criteria; -#line 1572 "OfflinePage.c" +#line 1622 "OfflinePage.c" } @@ -1597,6 +1647,8 @@ static void offline_page_class_init (OfflinePageClass * klass) { ((PageClass *) klass)->init_collect_ui_filenames = offline_page_real_init_collect_ui_filenames; #line 7 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" ((PageClass *) klass)->add_actions = offline_page_real_add_actions; +#line 7 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" + ((PageClass *) klass)->remove_actions = offline_page_real_remove_actions; #line 7 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" ((CheckerboardPageClass *) klass)->get_view_tracker = offline_page_real_get_view_tracker; #line 7 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" @@ -1605,7 +1657,7 @@ static void offline_page_class_init (OfflinePageClass * klass) { ((CheckerboardPageClass *) klass)->get_search_view_filter = offline_page_real_get_search_view_filter; #line 7 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" G_OBJECT_CLASS (klass)->finalize = offline_page_finalize; -#line 1609 "OfflinePage.c" +#line 1661 "OfflinePage.c" } @@ -1617,7 +1669,7 @@ static void offline_page_instance_init (OfflinePage * self) { _tmp0_ = offline_page_offline_search_view_filter_new (); #line 25 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" self->priv->search_filter = _tmp0_; -#line 1621 "OfflinePage.c" +#line 1673 "OfflinePage.c" } @@ -1647,7 +1699,7 @@ static void offline_page_finalize (GObject* obj) { _core_tracker_unref0 (self->priv->tracker); #line 7 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" G_OBJECT_CLASS (offline_page_parent_class)->finalize (obj); -#line 1651 "OfflinePage.c" +#line 1703 "OfflinePage.c" } diff --git a/src/library/OfflinePage.vala b/src/library/OfflinePage.vala index bd916d0..1982618 100644 --- a/src/library/OfflinePage.vala +++ b/src/library/OfflinePage.vala @@ -56,10 +56,17 @@ public class OfflinePage : CheckerboardPage { { "RemoveFromLibrary", on_remove_from_library } }; - protected override void add_actions () { - base.add_actions (); + protected override void add_actions (GLib.ActionMap map) { + base.add_actions(map); - AppWindow.get_instance ().add_action_entries (entries, this); + map.add_action_entries(entries, this); + } + + protected override void remove_actions(GLib.ActionMap map) { + base.remove_actions(map); + foreach (var entry in entries) { + map.remove_action(entry.name); + } } public override Core.ViewTracker? get_view_tracker() { diff --git a/src/library/OfflineSidebarEntry.c b/src/library/OfflineSidebarEntry.c index a2025d1..1a19cd3 100644 --- a/src/library/OfflineSidebarEntry.c +++ b/src/library/OfflineSidebarEntry.c @@ -1,4 +1,4 @@ -/* OfflineSidebarEntry.c generated by valac 0.32.1, the Vala compiler +/* OfflineSidebarEntry.c generated by valac 0.34.4, the Vala compiler * generated from OfflineSidebarEntry.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/library/TrashPage.c b/src/library/TrashPage.c index 8c6cf47..c108bba 100644 --- a/src/library/TrashPage.c +++ b/src/library/TrashPage.c @@ -1,4 +1,4 @@ -/* TrashPage.c generated by valac 0.32.1, the Vala compiler +/* TrashPage.c generated by valac 0.34.4, the Vala compiler * generated from TrashPage.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -12,10 +12,10 @@ #include #include #include +#include #include #include #include -#include #include #include #include @@ -304,16 +304,6 @@ typedef struct _VideoSourceCollection VideoSourceCollection; typedef struct _VideoSourceCollectionClass VideoSourceCollectionClass; #define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL))) -#define TYPE_APP_WINDOW (app_window_get_type ()) -#define APP_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_APP_WINDOW, AppWindow)) -#define APP_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_APP_WINDOW, AppWindowClass)) -#define IS_APP_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_APP_WINDOW)) -#define IS_APP_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_APP_WINDOW)) -#define APP_WINDOW_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_APP_WINDOW, AppWindowClass)) - -typedef struct _AppWindow AppWindow; -typedef struct _AppWindowClass AppWindowClass; - #define TYPE_MEDIA_SOURCE_ITEM (media_source_item_get_type ()) #define MEDIA_SOURCE_ITEM(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_MEDIA_SOURCE_ITEM, MediaSourceItem)) #define MEDIA_SOURCE_ITEM_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_MEDIA_SOURCE_ITEM, MediaSourceItemClass)) @@ -473,7 +463,8 @@ struct _PageClass { void (*ready) (Page* self); void (*switching_to_fullscreen) (Page* self, FullscreenWindow* fsw); void (*returning_from_fullscreen) (Page* self, FullscreenWindow* fsw); - void (*add_actions) (Page* self); + void (*add_actions) (Page* self, GActionMap* map); + void (*remove_actions) (Page* self, GActionMap* map); void (*init_collect_ui_filenames) (Page* self, GeeList* ui_filenames); InjectionGroup** (*init_collect_injection_groups) (Page* self, int* result_length1); void (*init_actions) (Page* self, gint selected_count, gint count); @@ -807,10 +798,10 @@ GType video_source_collection_get_type (void) G_GNUC_CONST; GeeCollection* media_source_collection_get_trashcan_contents (MediaSourceCollection* self); static void trash_page_real_init_collect_ui_filenames (Page* base, GeeList* ui_filenames); void page_init_collect_ui_filenames (Page* self, GeeList* ui_filenames); -static void trash_page_real_add_actions (Page* base); -void page_add_actions (Page* self); -GType app_window_get_type (void) G_GNUC_CONST; -AppWindow* app_window_get_instance (void); +static void trash_page_real_add_actions (Page* base, GActionMap* map); +void page_add_actions (Page* self, GActionMap* map); +static void trash_page_real_remove_actions (Page* base, GActionMap* map); +void page_remove_actions (Page* self, GActionMap* map); static CoreViewTracker* trash_page_real_get_view_tracker (CheckerboardPage* base); static void trash_page_real_update_actions (Page* base, gint selected_count, gint count); void page_set_action_sensitive (Page* self, const gchar* name, gboolean sensitive); @@ -880,21 +871,21 @@ static const GActionEntry TRASH_PAGE_entries[2] = {{"Delete", _trash_page_on_del static void _trash_page_on_delete_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { #line 50 "/home/jens/Source/shotwell/src/library/TrashPage.vala" trash_page_on_delete ((TrashPage*) self); -#line 884 "TrashPage.c" +#line 875 "TrashPage.c" } static void _trash_page_on_restore_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { #line 50 "/home/jens/Source/shotwell/src/library/TrashPage.vala" trash_page_on_restore ((TrashPage*) self); -#line 891 "TrashPage.c" +#line 882 "TrashPage.c" } static void _trash_page_on_trashcan_contents_altered_media_source_collection_trashcan_contents_altered (MediaSourceCollection* _sender, GeeCollection* added, GeeCollection* removed, gpointer self) { #line 38 "/home/jens/Source/shotwell/src/library/TrashPage.vala" trash_page_on_trashcan_contents_altered ((TrashPage*) self, added, removed); -#line 898 "TrashPage.c" +#line 889 "TrashPage.c" } @@ -961,14 +952,14 @@ TrashPage* trash_page_construct (GType object_type) { _g_object_unref0 (_tmp10_); #line 28 "/home/jens/Source/shotwell/src/library/TrashPage.vala" return self; -#line 965 "TrashPage.c" +#line 956 "TrashPage.c" } TrashPage* trash_page_new (void) { #line 28 "/home/jens/Source/shotwell/src/library/TrashPage.vala" return trash_page_construct (TYPE_TRASH_PAGE); -#line 972 "TrashPage.c" +#line 963 "TrashPage.c" } @@ -988,34 +979,81 @@ static void trash_page_real_init_collect_ui_filenames (Page* base, GeeList* ui_f _tmp1_ = ui_filenames; #line 47 "/home/jens/Source/shotwell/src/library/TrashPage.vala" gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection), "trash.ui"); -#line 992 "TrashPage.c" +#line 983 "TrashPage.c" } -static void trash_page_real_add_actions (Page* base) { +static void trash_page_real_add_actions (Page* base, GActionMap* map) { TrashPage * self; - AppWindow* _tmp0_ = NULL; - AppWindow* _tmp1_ = NULL; + GActionMap* _tmp0_ = NULL; + GActionMap* _tmp1_ = NULL; #line 55 "/home/jens/Source/shotwell/src/library/TrashPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TRASH_PAGE, TrashPage); +#line 55 "/home/jens/Source/shotwell/src/library/TrashPage.vala" + g_return_if_fail (G_IS_ACTION_MAP (map)); #line 56 "/home/jens/Source/shotwell/src/library/TrashPage.vala" - PAGE_CLASS (trash_page_parent_class)->add_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page)); -#line 58 "/home/jens/Source/shotwell/src/library/TrashPage.vala" - _tmp0_ = app_window_get_instance (); -#line 58 "/home/jens/Source/shotwell/src/library/TrashPage.vala" - _tmp1_ = _tmp0_; + _tmp0_ = map; +#line 56 "/home/jens/Source/shotwell/src/library/TrashPage.vala" + PAGE_CLASS (trash_page_parent_class)->add_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page), _tmp0_); #line 58 "/home/jens/Source/shotwell/src/library/TrashPage.vala" - g_action_map_add_action_entries (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, g_action_map_get_type (), GActionMap), TRASH_PAGE_entries, G_N_ELEMENTS (TRASH_PAGE_entries), self); + _tmp1_ = map; #line 58 "/home/jens/Source/shotwell/src/library/TrashPage.vala" - _g_object_unref0 (_tmp1_); -#line 1012 "TrashPage.c" + g_action_map_add_action_entries (_tmp1_, TRASH_PAGE_entries, G_N_ELEMENTS (TRASH_PAGE_entries), self); +#line 1003 "TrashPage.c" } -static gpointer _core_tracker_ref0 (gpointer self) { +static void trash_page_real_remove_actions (Page* base, GActionMap* map) { + TrashPage * self; + GActionMap* _tmp0_ = NULL; +#line 61 "/home/jens/Source/shotwell/src/library/TrashPage.vala" + self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TRASH_PAGE, TrashPage); +#line 61 "/home/jens/Source/shotwell/src/library/TrashPage.vala" + g_return_if_fail (G_IS_ACTION_MAP (map)); #line 62 "/home/jens/Source/shotwell/src/library/TrashPage.vala" + _tmp0_ = map; +#line 62 "/home/jens/Source/shotwell/src/library/TrashPage.vala" + PAGE_CLASS (trash_page_parent_class)->remove_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page), _tmp0_); +#line 1018 "TrashPage.c" + { + GActionEntry* entry_collection = NULL; + gint entry_collection_length1 = 0; + gint _entry_collection_size_ = 0; + gint entry_it = 0; +#line 63 "/home/jens/Source/shotwell/src/library/TrashPage.vala" + entry_collection = TRASH_PAGE_entries; +#line 63 "/home/jens/Source/shotwell/src/library/TrashPage.vala" + entry_collection_length1 = G_N_ELEMENTS (TRASH_PAGE_entries); +#line 63 "/home/jens/Source/shotwell/src/library/TrashPage.vala" + for (entry_it = 0; entry_it < G_N_ELEMENTS (TRASH_PAGE_entries); entry_it = entry_it + 1) { +#line 1030 "TrashPage.c" + GActionEntry entry = {0}; +#line 63 "/home/jens/Source/shotwell/src/library/TrashPage.vala" + entry = entry_collection[entry_it]; +#line 1034 "TrashPage.c" + { + GActionMap* _tmp1_ = NULL; + GActionEntry _tmp2_ = {0}; + const gchar* _tmp3_ = NULL; +#line 64 "/home/jens/Source/shotwell/src/library/TrashPage.vala" + _tmp1_ = map; +#line 64 "/home/jens/Source/shotwell/src/library/TrashPage.vala" + _tmp2_ = entry; +#line 64 "/home/jens/Source/shotwell/src/library/TrashPage.vala" + _tmp3_ = _tmp2_.name; +#line 64 "/home/jens/Source/shotwell/src/library/TrashPage.vala" + g_action_map_remove_action (_tmp1_, _tmp3_); +#line 1047 "TrashPage.c" + } + } + } +} + + +static gpointer _core_tracker_ref0 (gpointer self) { +#line 69 "/home/jens/Source/shotwell/src/library/TrashPage.vala" return self ? core_tracker_ref (self) : NULL; -#line 1019 "TrashPage.c" +#line 1057 "TrashPage.c" } @@ -1024,17 +1062,17 @@ static CoreViewTracker* trash_page_real_get_view_tracker (CheckerboardPage* base CoreViewTracker* result = NULL; MediaViewTracker* _tmp0_ = NULL; CoreViewTracker* _tmp1_ = NULL; -#line 61 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 68 "/home/jens/Source/shotwell/src/library/TrashPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TRASH_PAGE, TrashPage); -#line 62 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 69 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp0_ = self->priv->tracker; -#line 62 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 69 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp1_ = _core_tracker_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, CORE_TYPE_VIEW_TRACKER, CoreViewTracker)); -#line 62 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 69 "/home/jens/Source/shotwell/src/library/TrashPage.vala" result = _tmp1_; -#line 62 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 69 "/home/jens/Source/shotwell/src/library/TrashPage.vala" return result; -#line 1038 "TrashPage.c" +#line 1076 "TrashPage.c" } @@ -1044,59 +1082,59 @@ static void trash_page_real_update_actions (Page* base, gint selected_count, gin gint _tmp0_ = 0; gint _tmp1_ = 0; gint _tmp2_ = 0; -#line 65 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 72 "/home/jens/Source/shotwell/src/library/TrashPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TRASH_PAGE, TrashPage); -#line 66 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 73 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp0_ = selected_count; -#line 66 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 73 "/home/jens/Source/shotwell/src/library/TrashPage.vala" has_selected = _tmp0_ > 0; -#line 68 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 75 "/home/jens/Source/shotwell/src/library/TrashPage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Delete", has_selected); -#line 69 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 76 "/home/jens/Source/shotwell/src/library/TrashPage.vala" page_set_action_important (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Delete", TRUE); -#line 70 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 77 "/home/jens/Source/shotwell/src/library/TrashPage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Restore", has_selected); -#line 71 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 78 "/home/jens/Source/shotwell/src/library/TrashPage.vala" page_set_action_important (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Restore", TRUE); -#line 72 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 79 "/home/jens/Source/shotwell/src/library/TrashPage.vala" page_set_common_action_important (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "CommonEmptyTrash", TRUE); -#line 74 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 81 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp1_ = selected_count; -#line 74 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 81 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp2_ = count; -#line 74 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 81 "/home/jens/Source/shotwell/src/library/TrashPage.vala" PAGE_CLASS (trash_page_parent_class)->update_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page), _tmp1_, _tmp2_); -#line 1070 "TrashPage.c" +#line 1108 "TrashPage.c" } static void trash_page_on_trashcan_contents_altered (TrashPage* self, GeeCollection* added, GeeCollection* removed) { GeeCollection* _tmp0_ = NULL; GeeCollection* _tmp12_ = NULL; -#line 77 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 84 "/home/jens/Source/shotwell/src/library/TrashPage.vala" g_return_if_fail (IS_TRASH_PAGE (self)); -#line 77 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 84 "/home/jens/Source/shotwell/src/library/TrashPage.vala" g_return_if_fail ((added == NULL) || GEE_IS_COLLECTION (added)); -#line 77 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 84 "/home/jens/Source/shotwell/src/library/TrashPage.vala" g_return_if_fail ((removed == NULL) || GEE_IS_COLLECTION (removed)); -#line 79 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 86 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp0_ = added; -#line 79 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 86 "/home/jens/Source/shotwell/src/library/TrashPage.vala" if (_tmp0_ != NULL) { -#line 1087 "TrashPage.c" +#line 1125 "TrashPage.c" { GeeIterator* _source_it = NULL; GeeCollection* _tmp1_ = NULL; GeeIterator* _tmp2_ = NULL; -#line 80 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 87 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp1_ = added; -#line 80 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 87 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp2_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 80 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 87 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _source_it = _tmp2_; -#line 80 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 87 "/home/jens/Source/shotwell/src/library/TrashPage.vala" while (TRUE) { -#line 1100 "TrashPage.c" +#line 1138 "TrashPage.c" GeeIterator* _tmp3_ = NULL; gboolean _tmp4_ = FALSE; MediaSource* source = NULL; @@ -1107,52 +1145,52 @@ static void trash_page_on_trashcan_contents_altered (TrashPage* self, GeeCollect MediaSource* _tmp9_ = NULL; TrashPageTrashView* _tmp10_ = NULL; TrashPageTrashView* _tmp11_ = NULL; -#line 80 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 87 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp3_ = _source_it; -#line 80 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 87 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp4_ = gee_iterator_next (_tmp3_); -#line 80 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 87 "/home/jens/Source/shotwell/src/library/TrashPage.vala" if (!_tmp4_) { -#line 80 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 87 "/home/jens/Source/shotwell/src/library/TrashPage.vala" break; -#line 1119 "TrashPage.c" +#line 1157 "TrashPage.c" } -#line 80 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 87 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp5_ = _source_it; -#line 80 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 87 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp6_ = gee_iterator_get (_tmp5_); -#line 80 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 87 "/home/jens/Source/shotwell/src/library/TrashPage.vala" source = (MediaSource*) _tmp6_; -#line 81 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 88 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp7_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 81 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 88 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp8_ = _tmp7_; -#line 81 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 88 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp9_ = source; -#line 81 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 88 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp10_ = trash_page_trash_view_new (_tmp9_); -#line 81 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 88 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp11_ = _tmp10_; -#line 81 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 88 "/home/jens/Source/shotwell/src/library/TrashPage.vala" data_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_DATA_OBJECT, DataObject)); -#line 81 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 88 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _g_object_unref0 (_tmp11_); -#line 81 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 88 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _data_collection_unref0 (_tmp8_); -#line 80 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 87 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _g_object_unref0 (source); -#line 1145 "TrashPage.c" +#line 1183 "TrashPage.c" } -#line 80 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 87 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _g_object_unref0 (_source_it); -#line 1149 "TrashPage.c" +#line 1187 "TrashPage.c" } } -#line 84 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 91 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp12_ = removed; -#line 84 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 91 "/home/jens/Source/shotwell/src/library/TrashPage.vala" if (_tmp12_ != NULL) { -#line 1156 "TrashPage.c" +#line 1194 "TrashPage.c" Marker* marker = NULL; ViewCollection* _tmp13_ = NULL; ViewCollection* _tmp14_ = NULL; @@ -1161,32 +1199,32 @@ static void trash_page_on_trashcan_contents_altered (TrashPage* self, GeeCollect ViewCollection* _tmp29_ = NULL; ViewCollection* _tmp30_ = NULL; Marker* _tmp31_ = NULL; -#line 85 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 92 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp13_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 85 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 92 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp14_ = _tmp13_; -#line 85 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 92 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp15_ = data_collection_start_marking (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_DATA_COLLECTION, DataCollection)); -#line 85 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 92 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp16_ = _tmp15_; -#line 85 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 92 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _data_collection_unref0 (_tmp14_); -#line 85 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 92 "/home/jens/Source/shotwell/src/library/TrashPage.vala" marker = _tmp16_; -#line 1177 "TrashPage.c" +#line 1215 "TrashPage.c" { GeeIterator* _source_it = NULL; GeeCollection* _tmp17_ = NULL; GeeIterator* _tmp18_ = NULL; -#line 86 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 93 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp17_ = removed; -#line 86 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 93 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp18_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 86 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 93 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _source_it = _tmp18_; -#line 86 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 93 "/home/jens/Source/shotwell/src/library/TrashPage.vala" while (TRUE) { -#line 1190 "TrashPage.c" +#line 1228 "TrashPage.c" GeeIterator* _tmp19_ = NULL; gboolean _tmp20_ = FALSE; MediaSource* source = NULL; @@ -1198,61 +1236,61 @@ static void trash_page_on_trashcan_contents_altered (TrashPage* self, GeeCollect MediaSource* _tmp26_ = NULL; DataView* _tmp27_ = NULL; DataView* _tmp28_ = NULL; -#line 86 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 93 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp19_ = _source_it; -#line 86 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 93 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp20_ = gee_iterator_next (_tmp19_); -#line 86 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 93 "/home/jens/Source/shotwell/src/library/TrashPage.vala" if (!_tmp20_) { -#line 86 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 93 "/home/jens/Source/shotwell/src/library/TrashPage.vala" break; -#line 1210 "TrashPage.c" +#line 1248 "TrashPage.c" } -#line 86 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 93 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp21_ = _source_it; -#line 86 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 93 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp22_ = gee_iterator_get (_tmp21_); -#line 86 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 93 "/home/jens/Source/shotwell/src/library/TrashPage.vala" source = (MediaSource*) _tmp22_; -#line 87 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 94 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp23_ = marker; -#line 87 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 94 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp24_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 87 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 94 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp25_ = _tmp24_; -#line 87 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 94 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp26_ = source; -#line 87 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 94 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp27_ = view_collection_get_view_for_source (_tmp25_, G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, TYPE_DATA_SOURCE, DataSource)); -#line 87 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 94 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp28_ = _tmp27_; -#line 87 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 94 "/home/jens/Source/shotwell/src/library/TrashPage.vala" marker_mark (_tmp23_, G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, TYPE_DATA_OBJECT, DataObject)); -#line 87 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 94 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _g_object_unref0 (_tmp28_); -#line 87 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 94 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _data_collection_unref0 (_tmp25_); -#line 86 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 93 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _g_object_unref0 (source); -#line 1238 "TrashPage.c" +#line 1276 "TrashPage.c" } -#line 86 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 93 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _g_object_unref0 (_source_it); -#line 1242 "TrashPage.c" +#line 1280 "TrashPage.c" } -#line 88 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 95 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp29_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 88 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 95 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp30_ = _tmp29_; -#line 88 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 95 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp31_ = marker; -#line 88 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 95 "/home/jens/Source/shotwell/src/library/TrashPage.vala" data_collection_remove_marked (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, TYPE_DATA_COLLECTION, DataCollection), _tmp31_); -#line 88 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 95 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _data_collection_unref0 (_tmp30_); -#line 84 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 91 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _g_object_unref0 (marker); -#line 1256 "TrashPage.c" +#line 1294 "TrashPage.c" } } @@ -1270,51 +1308,51 @@ static void trash_page_on_restore (TrashPage* self) { GeeCollection* _tmp9_ = NULL; TrashUntrashPhotosCommand* _tmp10_ = NULL; TrashUntrashPhotosCommand* _tmp11_ = NULL; -#line 92 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 99 "/home/jens/Source/shotwell/src/library/TrashPage.vala" g_return_if_fail (IS_TRASH_PAGE (self)); -#line 93 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 100 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 93 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 100 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp1_ = _tmp0_; -#line 93 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 100 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp2_ = view_collection_get_selected_count (_tmp1_); -#line 93 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 100 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp3_ = _tmp2_ == 0; -#line 93 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 100 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _data_collection_unref0 (_tmp1_); -#line 93 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 100 "/home/jens/Source/shotwell/src/library/TrashPage.vala" if (_tmp3_) { -#line 94 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 101 "/home/jens/Source/shotwell/src/library/TrashPage.vala" return; -#line 1290 "TrashPage.c" +#line 1328 "TrashPage.c" } -#line 96 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 103 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp4_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 96 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 103 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp5_ = _tmp4_; -#line 96 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 103 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp6_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 96 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 103 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp7_ = _tmp6_; -#line 96 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 103 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp8_ = view_collection_get_selected_sources (_tmp7_); -#line 96 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 103 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp9_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_COLLECTION, GeeCollection); -#line 96 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 103 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp10_ = trash_untrash_photos_command_new (_tmp9_, FALSE); -#line 96 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 103 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp11_ = _tmp10_; -#line 96 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 103 "/home/jens/Source/shotwell/src/library/TrashPage.vala" command_manager_execute (_tmp5_, G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_COMMAND, Command)); -#line 96 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 103 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _g_object_unref0 (_tmp11_); -#line 96 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 103 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _g_object_unref0 (_tmp9_); -#line 96 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 103 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _data_collection_unref0 (_tmp7_); -#line 96 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 103 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _command_manager_unref0 (_tmp5_); -#line 1318 "TrashPage.c" +#line 1356 "TrashPage.c" } @@ -1323,17 +1361,17 @@ static gchar* trash_page_real_get_view_empty_message (CheckerboardPage* base) { gchar* result = NULL; const gchar* _tmp0_ = NULL; gchar* _tmp1_ = NULL; -#line 100 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 107 "/home/jens/Source/shotwell/src/library/TrashPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TRASH_PAGE, TrashPage); -#line 101 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 108 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp0_ = _ ("Trash is empty"); -#line 101 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 108 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp1_ = g_strdup (_tmp0_); -#line 101 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 108 "/home/jens/Source/shotwell/src/library/TrashPage.vala" result = _tmp1_; -#line 101 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 108 "/home/jens/Source/shotwell/src/library/TrashPage.vala" return result; -#line 1337 "TrashPage.c" +#line 1375 "TrashPage.c" } @@ -1348,55 +1386,55 @@ static void trash_page_on_delete (TrashPage* self) { GeeList* _tmp8_ = NULL; GeeCollection* _tmp9_ = NULL; const gchar* _tmp10_ = NULL; -#line 104 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 111 "/home/jens/Source/shotwell/src/library/TrashPage.vala" g_return_if_fail (IS_TRASH_PAGE (self)); -#line 106 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 113 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp1_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 106 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 113 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp2_ = _tmp1_; -#line 106 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 113 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp3_ = view_collection_get_selected_count (_tmp2_); -#line 106 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 113 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp4_ = _tmp3_ == 1; -#line 106 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 113 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _data_collection_unref0 (_tmp2_); -#line 106 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 113 "/home/jens/Source/shotwell/src/library/TrashPage.vala" if (_tmp4_) { -#line 106 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 113 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp0_ = "Deleting a Photo"; -#line 1368 "TrashPage.c" +#line 1406 "TrashPage.c" } else { const gchar* _tmp5_ = NULL; -#line 106 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 113 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp5_ = _ ("Deleting Photos"); -#line 106 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 113 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp0_ = _tmp5_; -#line 1375 "TrashPage.c" +#line 1413 "TrashPage.c" } -#line 105 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 112 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp6_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 105 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 112 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp7_ = _tmp6_; -#line 105 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 112 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp8_ = view_collection_get_selected_sources (_tmp7_); -#line 105 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 112 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp9_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_COLLECTION, GeeCollection); -#line 105 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 112 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp10_ = _ ("Delete"); -#line 105 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 112 "/home/jens/Source/shotwell/src/library/TrashPage.vala" remove_from_app (_tmp9_, _tmp10_, _tmp0_); -#line 105 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 112 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _g_object_unref0 (_tmp9_); -#line 105 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 112 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _data_collection_unref0 (_tmp7_); -#line 1393 "TrashPage.c" +#line 1431 "TrashPage.c" } static gpointer _view_filter_ref0 (gpointer self) { -#line 110 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 117 "/home/jens/Source/shotwell/src/library/TrashPage.vala" return self ? view_filter_ref (self) : NULL; -#line 1400 "TrashPage.c" +#line 1438 "TrashPage.c" } @@ -1405,17 +1443,17 @@ static SearchViewFilter* trash_page_real_get_search_view_filter (CheckerboardPag SearchViewFilter* result = NULL; TrashPageTrashSearchViewFilter* _tmp0_ = NULL; SearchViewFilter* _tmp1_ = NULL; -#line 109 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 116 "/home/jens/Source/shotwell/src/library/TrashPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TRASH_PAGE, TrashPage); -#line 110 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 117 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp0_ = self->priv->search_filter; -#line 110 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 117 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp1_ = _view_filter_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter)); -#line 110 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 117 "/home/jens/Source/shotwell/src/library/TrashPage.vala" result = _tmp1_; -#line 110 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 117 "/home/jens/Source/shotwell/src/library/TrashPage.vala" return result; -#line 1419 "TrashPage.c" +#line 1457 "TrashPage.c" } @@ -1444,21 +1482,21 @@ static TrashPageTrashView* trash_page_trash_view_construct (GType object_type, M _vala_assert (_tmp4_, "source.is_trashed()"); #line 11 "/home/jens/Source/shotwell/src/library/TrashPage.vala" return self; -#line 1448 "TrashPage.c" +#line 1486 "TrashPage.c" } static TrashPageTrashView* trash_page_trash_view_new (MediaSource* source) { #line 11 "/home/jens/Source/shotwell/src/library/TrashPage.vala" return trash_page_trash_view_construct (TRASH_PAGE_TYPE_TRASH_VIEW, source); -#line 1455 "TrashPage.c" +#line 1493 "TrashPage.c" } static void trash_page_trash_view_class_init (TrashPageTrashViewClass * klass) { #line 10 "/home/jens/Source/shotwell/src/library/TrashPage.vala" trash_page_trash_view_parent_class = g_type_class_peek_parent (klass); -#line 1462 "TrashPage.c" +#line 1500 "TrashPage.c" } @@ -1487,7 +1525,7 @@ static guint trash_page_trash_search_view_filter_real_get_criteria (SearchViewFi result = (guint) ((((SEARCH_FILTER_CRITERIA_TEXT | SEARCH_FILTER_CRITERIA_FLAG) | SEARCH_FILTER_CRITERIA_MEDIA) | SEARCH_FILTER_CRITERIA_RATING) | SEARCH_FILTER_CRITERIA_SAVEDSEARCH); #line 20 "/home/jens/Source/shotwell/src/library/TrashPage.vala" return result; -#line 1491 "TrashPage.c" +#line 1529 "TrashPage.c" } @@ -1497,14 +1535,14 @@ static TrashPageTrashSearchViewFilter* trash_page_trash_search_view_filter_const self = (TrashPageTrashSearchViewFilter*) default_search_view_filter_construct (object_type); #line 18 "/home/jens/Source/shotwell/src/library/TrashPage.vala" return self; -#line 1501 "TrashPage.c" +#line 1539 "TrashPage.c" } static TrashPageTrashSearchViewFilter* trash_page_trash_search_view_filter_new (void) { #line 18 "/home/jens/Source/shotwell/src/library/TrashPage.vala" return trash_page_trash_search_view_filter_construct (TRASH_PAGE_TYPE_TRASH_SEARCH_VIEW_FILTER); -#line 1508 "TrashPage.c" +#line 1546 "TrashPage.c" } @@ -1513,7 +1551,7 @@ static void trash_page_trash_search_view_filter_class_init (TrashPageTrashSearch trash_page_trash_search_view_filter_parent_class = g_type_class_peek_parent (klass); #line 18 "/home/jens/Source/shotwell/src/library/TrashPage.vala" ((SearchViewFilterClass *) klass)->get_criteria = trash_page_trash_search_view_filter_real_get_criteria; -#line 1517 "TrashPage.c" +#line 1555 "TrashPage.c" } @@ -1542,6 +1580,8 @@ static void trash_page_class_init (TrashPageClass * klass) { ((PageClass *) klass)->init_collect_ui_filenames = trash_page_real_init_collect_ui_filenames; #line 7 "/home/jens/Source/shotwell/src/library/TrashPage.vala" ((PageClass *) klass)->add_actions = trash_page_real_add_actions; +#line 7 "/home/jens/Source/shotwell/src/library/TrashPage.vala" + ((PageClass *) klass)->remove_actions = trash_page_real_remove_actions; #line 7 "/home/jens/Source/shotwell/src/library/TrashPage.vala" ((CheckerboardPageClass *) klass)->get_view_tracker = trash_page_real_get_view_tracker; #line 7 "/home/jens/Source/shotwell/src/library/TrashPage.vala" @@ -1552,7 +1592,7 @@ static void trash_page_class_init (TrashPageClass * klass) { ((CheckerboardPageClass *) klass)->get_search_view_filter = trash_page_real_get_search_view_filter; #line 7 "/home/jens/Source/shotwell/src/library/TrashPage.vala" G_OBJECT_CLASS (klass)->finalize = trash_page_finalize; -#line 1556 "TrashPage.c" +#line 1596 "TrashPage.c" } @@ -1564,7 +1604,7 @@ static void trash_page_instance_init (TrashPage * self) { _tmp0_ = trash_page_trash_search_view_filter_new (); #line 25 "/home/jens/Source/shotwell/src/library/TrashPage.vala" self->priv->search_filter = _tmp0_; -#line 1568 "TrashPage.c" +#line 1608 "TrashPage.c" } @@ -1578,7 +1618,7 @@ static void trash_page_finalize (GObject* obj) { _core_tracker_unref0 (self->priv->tracker); #line 7 "/home/jens/Source/shotwell/src/library/TrashPage.vala" G_OBJECT_CLASS (trash_page_parent_class)->finalize (obj); -#line 1582 "TrashPage.c" +#line 1622 "TrashPage.c" } diff --git a/src/library/TrashPage.vala b/src/library/TrashPage.vala index 943c5e1..c06fbbf 100644 --- a/src/library/TrashPage.vala +++ b/src/library/TrashPage.vala @@ -52,10 +52,17 @@ public class TrashPage : CheckerboardPage { { "Restore", on_restore } }; - protected override void add_actions () { - base.add_actions (); + protected override void add_actions(GLib.ActionMap map) { + base.add_actions(map); - AppWindow.get_instance ().add_action_entries (entries, this); + map.add_action_entries (entries, this); + } + + protected override void remove_actions(GLib.ActionMap map) { + base.remove_actions(map); + foreach (var entry in entries) { + map.remove_action(entry.name); + } } public override Core.ViewTracker? get_view_tracker() { diff --git a/src/library/TrashSidebarEntry.c b/src/library/TrashSidebarEntry.c index 0346c07..0eca1b9 100644 --- a/src/library/TrashSidebarEntry.c +++ b/src/library/TrashSidebarEntry.c @@ -1,4 +1,4 @@ -/* TrashSidebarEntry.c generated by valac 0.32.1, the Vala compiler +/* TrashSidebarEntry.c generated by valac 0.34.4, the Vala compiler * generated from TrashSidebarEntry.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. -- cgit v1.2.3