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 ++++++++++++++++++++++++++------------------------- 1 file changed, 70 insertions(+), 69 deletions(-) (limited to 'src/library/Branch.c') 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" } -- cgit v1.2.3