diff options
Diffstat (limited to 'src/library')
| -rw-r--r-- | src/library/Branch.c | 579 | ||||
| -rw-r--r-- | src/library/FlaggedPage.c | 84 | ||||
| -rw-r--r-- | src/library/FlaggedSidebarEntry.c | 116 | ||||
| -rw-r--r-- | src/library/ImportQueuePage.c | 418 | ||||
| -rw-r--r-- | src/library/ImportQueueSidebarEntry.c | 52 | ||||
| -rw-r--r-- | src/library/LastImportPage.c | 162 | ||||
| -rw-r--r-- | src/library/LastImportSidebarEntry.c | 80 | ||||
| -rw-r--r-- | src/library/Library.c | 6 | ||||
| -rw-r--r-- | src/library/LibraryWindow.c | 3284 | ||||
| -rw-r--r-- | src/library/OfflinePage.c | 351 | ||||
| -rw-r--r-- | src/library/OfflineSidebarEntry.c | 100 | ||||
| -rw-r--r-- | src/library/TrashPage.c | 253 | ||||
| -rw-r--r-- | src/library/TrashSidebarEntry.c | 112 |
13 files changed, 2805 insertions, 2792 deletions
diff --git a/src/library/Branch.c b/src/library/Branch.c index 9a3d452..92955e2 100644 --- a/src/library/Branch.c +++ b/src/library/Branch.c @@ -1,4 +1,4 @@ -/* Branch.c generated by valac 0.34.7, the Vala compiler +/* Branch.c generated by valac 0.36.6, the Vala compiler * generated from Branch.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -239,6 +239,11 @@ typedef struct _CollectionPageClass CollectionPageClass; typedef struct _LibraryMainPage LibraryMainPage; typedef struct _LibraryMainPageClass LibraryMainPageClass; typedef struct _LibraryHideablePageEntryPrivate LibraryHideablePageEntryPrivate; +enum { + LIBRARY_HIDEABLE_PAGE_ENTRY_VISIBILITY_CHANGED_SIGNAL, + LIBRARY_HIDEABLE_PAGE_ENTRY_LAST_SIGNAL +}; +static guint library_hideable_page_entry_signals[LIBRARY_HIDEABLE_PAGE_ENTRY_LAST_SIGNAL] = {0}; typedef struct _PagePrivate PagePrivate; #define TYPE_PAGE_WINDOW (page_window_get_type ()) @@ -786,12 +791,12 @@ GType library_trash_sidebar_entry_get_type (void) G_GNUC_CONST; #define LIBRARY_BRANCH_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), LIBRARY_TYPE_BRANCH, LibraryBranchPrivate)) enum { LIBRARY_BRANCH_DUMMY_PROPERTY, - LIBRARY_BRANCH_PHOTOS_ENTRY, - LIBRARY_BRANCH_FLAGGED_ENTRY, - LIBRARY_BRANCH_LAST_IMPORTED_ENTRY, - LIBRARY_BRANCH_IMPORT_QUEUE_ENTRY, - LIBRARY_BRANCH_OFFLINE_ENTRY, - LIBRARY_BRANCH_TRASH_ENTRY + LIBRARY_BRANCH_PHOTOS_ENTRY_PROPERTY, + LIBRARY_BRANCH_FLAGGED_ENTRY_PROPERTY, + LIBRARY_BRANCH_LAST_IMPORTED_ENTRY_PROPERTY, + LIBRARY_BRANCH_IMPORT_QUEUE_ENTRY_PROPERTY, + LIBRARY_BRANCH_OFFLINE_ENTRY_PROPERTY, + LIBRARY_BRANCH_TRASH_ENTRY_PROPERTY }; static GType library_branch_entry_position_get_type (void) G_GNUC_CONST G_GNUC_UNUSED; #define LIBRARY_BRANCH_POSITION_DATA "x-photos-entry-position" @@ -847,7 +852,7 @@ static void library_branch_update_entry_visibility (LibraryBranch* self, Library gboolean library_hideable_page_entry_get_visible (LibraryHideablePageEntry* self); gboolean sidebar_branch_has_entry (SidebarBranch* self, SidebarEntry* entry); void sidebar_branch_prune (SidebarBranch* self, SidebarEntry* entry); -static void library_branch_finalize (GObject* obj); +static void library_branch_finalize (GObject * obj); static void _vala_library_branch_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec); static void _vala_library_branch_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec); GType sidebar_selectable_entry_get_type (void) G_GNUC_CONST; @@ -871,11 +876,11 @@ GType library_main_page_get_type (void) G_GNUC_CONST; #define LIBRARY_HIDEABLE_PAGE_ENTRY_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), LIBRARY_TYPE_HIDEABLE_PAGE_ENTRY, LibraryHideablePageEntryPrivate)) enum { LIBRARY_HIDEABLE_PAGE_ENTRY_DUMMY_PROPERTY, - LIBRARY_HIDEABLE_PAGE_ENTRY_VISIBLE + LIBRARY_HIDEABLE_PAGE_ENTRY_VISIBLE_PROPERTY }; LibraryHideablePageEntry* library_hideable_page_entry_construct (GType object_type); void library_hideable_page_entry_set_visible (LibraryHideablePageEntry* self, gboolean value); -static void library_hideable_page_entry_finalize (GObject* obj); +static void library_hideable_page_entry_finalize (GObject * obj); static void _vala_library_hideable_page_entry_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec); static void _vala_library_hideable_page_entry_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec); GType page_window_get_type (void) G_GNUC_CONST; @@ -991,170 +996,167 @@ 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 995 "Branch.c" +#line 1000 "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 1002 "Branch.c" +#line 1007 "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 1009 "Branch.c" +#line 1014 "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 1016 "Branch.c" +#line 1021 "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 1023 "Branch.c" +#line 1028 "Branch.c" } LibraryBranch* library_branch_construct (GType object_type) { LibraryBranch * self = NULL; - const gchar* _tmp0_ = NULL; - SidebarHeader* _tmp1_ = NULL; - SidebarHeader* _tmp2_ = NULL; - LibraryPhotosEntry* _tmp3_ = NULL; - LibraryPhotosEntry* _tmp4_ = NULL; - LibraryTrashSidebarEntry* _tmp5_ = NULL; - LibraryTrashSidebarEntry* _tmp6_ = NULL; - LibraryLastImportSidebarEntry* _tmp7_ = NULL; - LibraryLastImportSidebarEntry* _tmp8_ = NULL; - LibraryFlaggedSidebarEntry* _tmp9_ = NULL; - LibraryFlaggedSidebarEntry* _tmp10_ = NULL; - LibraryOfflineSidebarEntry* _tmp11_ = NULL; - LibraryOfflineSidebarEntry* _tmp12_ = NULL; - LibraryImportQueueSidebarEntry* _tmp13_ = NULL; - LibraryImportQueueSidebarEntry* _tmp14_ = NULL; - LibraryPhotosEntry* _tmp15_ = NULL; - LibraryTrashSidebarEntry* _tmp16_ = NULL; - LibraryFlaggedSidebarEntry* _tmp17_ = NULL; - LibraryLastImportSidebarEntry* _tmp18_ = NULL; - LibraryImportQueueSidebarEntry* _tmp19_ = NULL; - LibraryOfflineSidebarEntry* _tmp20_ = NULL; -#line 30 "/home/jens/Source/shotwell/src/library/Branch.vala" - _tmp0_ = _ ("Library"); + SidebarHeader* _tmp0_; + SidebarHeader* _tmp1_; + LibraryPhotosEntry* _tmp2_; + LibraryPhotosEntry* _tmp3_; + LibraryTrashSidebarEntry* _tmp4_; + LibraryTrashSidebarEntry* _tmp5_; + LibraryLastImportSidebarEntry* _tmp6_; + LibraryLastImportSidebarEntry* _tmp7_; + LibraryFlaggedSidebarEntry* _tmp8_; + LibraryFlaggedSidebarEntry* _tmp9_; + LibraryOfflineSidebarEntry* _tmp10_; + LibraryOfflineSidebarEntry* _tmp11_; + LibraryImportQueueSidebarEntry* _tmp12_; + LibraryImportQueueSidebarEntry* _tmp13_; + LibraryPhotosEntry* _tmp14_; + LibraryTrashSidebarEntry* _tmp15_; + LibraryFlaggedSidebarEntry* _tmp16_; + LibraryLastImportSidebarEntry* _tmp17_; + LibraryImportQueueSidebarEntry* _tmp18_; + LibraryOfflineSidebarEntry* _tmp19_; #line 30 "/home/jens/Source/shotwell/src/library/Branch.vala" - _tmp1_ = sidebar_header_new (_tmp0_, TRUE); + _tmp0_ = sidebar_header_new (_ ("Library"), TRUE); #line 30 "/home/jens/Source/shotwell/src/library/Branch.vala" - _tmp2_ = _tmp1_; + _tmp1_ = _tmp0_; #line 30 "/home/jens/Source/shotwell/src/library/Branch.vala" - self = (LibraryBranch*) sidebar_branch_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, SIDEBAR_TYPE_ENTRY, SidebarEntry), SIDEBAR_BRANCH_OPTIONS_STARTUP_OPEN_GROUPING, _library_branch_comparator_gcompare_func, NULL); + self = (LibraryBranch*) sidebar_branch_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, SIDEBAR_TYPE_ENTRY, SidebarEntry), SIDEBAR_BRANCH_OPTIONS_STARTUP_OPEN_GROUPING, _library_branch_comparator_gcompare_func, NULL); #line 30 "/home/jens/Source/shotwell/src/library/Branch.vala" - _g_object_unref0 (_tmp2_); + _g_object_unref0 (_tmp1_); #line 33 "/home/jens/Source/shotwell/src/library/Branch.vala" - _tmp3_ = library_photos_entry_new (); + _tmp2_ = library_photos_entry_new (); #line 33 "/home/jens/Source/shotwell/src/library/Branch.vala" - _tmp4_ = _tmp3_; + _tmp3_ = _tmp2_; #line 33 "/home/jens/Source/shotwell/src/library/Branch.vala" - library_branch_set_photos_entry (self, _tmp4_); + library_branch_set_photos_entry (self, _tmp3_); #line 33 "/home/jens/Source/shotwell/src/library/Branch.vala" - _g_object_unref0 (_tmp4_); + _g_object_unref0 (_tmp3_); #line 34 "/home/jens/Source/shotwell/src/library/Branch.vala" - _tmp5_ = library_trash_sidebar_entry_new (); + _tmp4_ = library_trash_sidebar_entry_new (); #line 34 "/home/jens/Source/shotwell/src/library/Branch.vala" - _tmp6_ = _tmp5_; + _tmp5_ = _tmp4_; #line 34 "/home/jens/Source/shotwell/src/library/Branch.vala" - library_branch_set_trash_entry (self, _tmp6_); + library_branch_set_trash_entry (self, _tmp5_); #line 34 "/home/jens/Source/shotwell/src/library/Branch.vala" - _g_object_unref0 (_tmp6_); + _g_object_unref0 (_tmp5_); #line 35 "/home/jens/Source/shotwell/src/library/Branch.vala" - _tmp7_ = library_last_import_sidebar_entry_new (); + _tmp6_ = library_last_import_sidebar_entry_new (); #line 35 "/home/jens/Source/shotwell/src/library/Branch.vala" - _tmp8_ = _tmp7_; + _tmp7_ = _tmp6_; #line 35 "/home/jens/Source/shotwell/src/library/Branch.vala" - library_branch_set_last_imported_entry (self, _tmp8_); + library_branch_set_last_imported_entry (self, _tmp7_); #line 35 "/home/jens/Source/shotwell/src/library/Branch.vala" - _g_object_unref0 (_tmp8_); + _g_object_unref0 (_tmp7_); #line 36 "/home/jens/Source/shotwell/src/library/Branch.vala" - _tmp9_ = library_flagged_sidebar_entry_new (); + _tmp8_ = library_flagged_sidebar_entry_new (); #line 36 "/home/jens/Source/shotwell/src/library/Branch.vala" - _tmp10_ = _tmp9_; + _tmp9_ = _tmp8_; #line 36 "/home/jens/Source/shotwell/src/library/Branch.vala" - library_branch_set_flagged_entry (self, _tmp10_); + library_branch_set_flagged_entry (self, _tmp9_); #line 36 "/home/jens/Source/shotwell/src/library/Branch.vala" - _g_object_unref0 (_tmp10_); + _g_object_unref0 (_tmp9_); #line 37 "/home/jens/Source/shotwell/src/library/Branch.vala" - _tmp11_ = library_offline_sidebar_entry_new (); + _tmp10_ = library_offline_sidebar_entry_new (); #line 37 "/home/jens/Source/shotwell/src/library/Branch.vala" - _tmp12_ = _tmp11_; + _tmp11_ = _tmp10_; #line 37 "/home/jens/Source/shotwell/src/library/Branch.vala" - library_branch_set_offline_entry (self, _tmp12_); + library_branch_set_offline_entry (self, _tmp11_); #line 37 "/home/jens/Source/shotwell/src/library/Branch.vala" - _g_object_unref0 (_tmp12_); + _g_object_unref0 (_tmp11_); #line 38 "/home/jens/Source/shotwell/src/library/Branch.vala" - _tmp13_ = library_import_queue_sidebar_entry_new (); + _tmp12_ = library_import_queue_sidebar_entry_new (); #line 38 "/home/jens/Source/shotwell/src/library/Branch.vala" - _tmp14_ = _tmp13_; + _tmp13_ = _tmp12_; #line 38 "/home/jens/Source/shotwell/src/library/Branch.vala" - library_branch_set_import_queue_entry (self, _tmp14_); + library_branch_set_import_queue_entry (self, _tmp13_); #line 38 "/home/jens/Source/shotwell/src/library/Branch.vala" - _g_object_unref0 (_tmp14_); + _g_object_unref0 (_tmp13_); #line 40 "/home/jens/Source/shotwell/src/library/Branch.vala" - _tmp15_ = self->priv->_photos_entry; + _tmp14_ = self->priv->_photos_entry; #line 40 "/home/jens/Source/shotwell/src/library/Branch.vala" - library_branch_insert (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, SIDEBAR_TYPE_ENTRY, SidebarEntry), (gint) LIBRARY_BRANCH_ENTRY_POSITION_PHOTOS); + library_branch_insert (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, SIDEBAR_TYPE_ENTRY, SidebarEntry), (gint) LIBRARY_BRANCH_ENTRY_POSITION_PHOTOS); #line 41 "/home/jens/Source/shotwell/src/library/Branch.vala" - _tmp16_ = self->priv->_trash_entry; + _tmp15_ = self->priv->_trash_entry; #line 41 "/home/jens/Source/shotwell/src/library/Branch.vala" - library_branch_insert (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, SIDEBAR_TYPE_ENTRY, SidebarEntry), (gint) LIBRARY_BRANCH_ENTRY_POSITION_TRASH); + library_branch_insert (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, SIDEBAR_TYPE_ENTRY, SidebarEntry), (gint) LIBRARY_BRANCH_ENTRY_POSITION_TRASH); #line 43 "/home/jens/Source/shotwell/src/library/Branch.vala" - _tmp17_ = self->priv->_flagged_entry; + _tmp16_ = self->priv->_flagged_entry; #line 43 "/home/jens/Source/shotwell/src/library/Branch.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, LIBRARY_TYPE_HIDEABLE_PAGE_ENTRY, LibraryHideablePageEntry), "visibility-changed", (GCallback) _library_branch_on_flagged_visibility_changed_library_hideable_page_entry_visibility_changed, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, LIBRARY_TYPE_HIDEABLE_PAGE_ENTRY, LibraryHideablePageEntry), "visibility-changed", (GCallback) _library_branch_on_flagged_visibility_changed_library_hideable_page_entry_visibility_changed, self, 0); #line 44 "/home/jens/Source/shotwell/src/library/Branch.vala" library_branch_on_flagged_visibility_changed (self); #line 46 "/home/jens/Source/shotwell/src/library/Branch.vala" - _tmp18_ = self->priv->_last_imported_entry; + _tmp17_ = self->priv->_last_imported_entry; #line 46 "/home/jens/Source/shotwell/src/library/Branch.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, LIBRARY_TYPE_HIDEABLE_PAGE_ENTRY, LibraryHideablePageEntry), "visibility-changed", (GCallback) _library_branch_on_last_imported_visibility_changed_library_hideable_page_entry_visibility_changed, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, LIBRARY_TYPE_HIDEABLE_PAGE_ENTRY, LibraryHideablePageEntry), "visibility-changed", (GCallback) _library_branch_on_last_imported_visibility_changed_library_hideable_page_entry_visibility_changed, self, 0); #line 47 "/home/jens/Source/shotwell/src/library/Branch.vala" library_branch_on_last_imported_visibility_changed (self); #line 49 "/home/jens/Source/shotwell/src/library/Branch.vala" - _tmp19_ = self->priv->_import_queue_entry; + _tmp18_ = self->priv->_import_queue_entry; #line 49 "/home/jens/Source/shotwell/src/library/Branch.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, LIBRARY_TYPE_HIDEABLE_PAGE_ENTRY, LibraryHideablePageEntry), "visibility-changed", (GCallback) _library_branch_on_import_queue_visibility_changed_library_hideable_page_entry_visibility_changed, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, LIBRARY_TYPE_HIDEABLE_PAGE_ENTRY, LibraryHideablePageEntry), "visibility-changed", (GCallback) _library_branch_on_import_queue_visibility_changed_library_hideable_page_entry_visibility_changed, self, 0); #line 50 "/home/jens/Source/shotwell/src/library/Branch.vala" library_branch_on_import_queue_visibility_changed (self); #line 52 "/home/jens/Source/shotwell/src/library/Branch.vala" - _tmp20_ = self->priv->_offline_entry; + _tmp19_ = self->priv->_offline_entry; #line 52 "/home/jens/Source/shotwell/src/library/Branch.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, LIBRARY_TYPE_HIDEABLE_PAGE_ENTRY, LibraryHideablePageEntry), "visibility-changed", (GCallback) _library_branch_on_offline_visibility_changed_library_hideable_page_entry_visibility_changed, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, LIBRARY_TYPE_HIDEABLE_PAGE_ENTRY, LibraryHideablePageEntry), "visibility-changed", (GCallback) _library_branch_on_offline_visibility_changed_library_hideable_page_entry_visibility_changed, self, 0); #line 53 "/home/jens/Source/shotwell/src/library/Branch.vala" library_branch_on_offline_visibility_changed (self); #line 29 "/home/jens/Source/shotwell/src/library/Branch.vala" return self; -#line 1142 "Branch.c" +#line 1144 "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 1149 "Branch.c" +#line 1151 "Branch.c" } static void library_branch_insert (LibraryBranch* self, SidebarEntry* entry, gint position) { - SidebarEntry* _tmp0_ = NULL; - gint _tmp1_ = 0; - SidebarEntry* _tmp2_ = NULL; - SidebarEntry* _tmp3_ = NULL; - SidebarEntry* _tmp4_ = NULL; + SidebarEntry* _tmp0_; + gint _tmp1_; + SidebarEntry* _tmp2_; + SidebarEntry* _tmp3_; + SidebarEntry* _tmp4_; #line 56 "/home/jens/Source/shotwell/src/library/Branch.vala" g_return_if_fail (LIBRARY_IS_BRANCH (self)); #line 56 "/home/jens/Source/shotwell/src/library/Branch.vala" @@ -1175,62 +1177,62 @@ 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 1179 "Branch.c" +#line 1181 "Branch.c" } static void library_branch_on_flagged_visibility_changed (LibraryBranch* self) { - LibraryFlaggedSidebarEntry* _tmp0_ = NULL; + LibraryFlaggedSidebarEntry* _tmp0_; #line 61 "/home/jens/Source/shotwell/src/library/Branch.vala" g_return_if_fail (LIBRARY_IS_BRANCH (self)); #line 62 "/home/jens/Source/shotwell/src/library/Branch.vala" _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 1191 "Branch.c" +#line 1193 "Branch.c" } static void library_branch_on_last_imported_visibility_changed (LibraryBranch* self) { - LibraryLastImportSidebarEntry* _tmp0_ = NULL; + LibraryLastImportSidebarEntry* _tmp0_; #line 65 "/home/jens/Source/shotwell/src/library/Branch.vala" g_return_if_fail (LIBRARY_IS_BRANCH (self)); #line 66 "/home/jens/Source/shotwell/src/library/Branch.vala" _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 1203 "Branch.c" +#line 1205 "Branch.c" } static void library_branch_on_import_queue_visibility_changed (LibraryBranch* self) { - LibraryImportQueueSidebarEntry* _tmp0_ = NULL; + LibraryImportQueueSidebarEntry* _tmp0_; #line 69 "/home/jens/Source/shotwell/src/library/Branch.vala" g_return_if_fail (LIBRARY_IS_BRANCH (self)); #line 70 "/home/jens/Source/shotwell/src/library/Branch.vala" _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 1215 "Branch.c" +#line 1217 "Branch.c" } static void library_branch_on_offline_visibility_changed (LibraryBranch* self) { - LibraryOfflineSidebarEntry* _tmp0_ = NULL; + LibraryOfflineSidebarEntry* _tmp0_; #line 73 "/home/jens/Source/shotwell/src/library/Branch.vala" g_return_if_fail (LIBRARY_IS_BRANCH (self)); #line 74 "/home/jens/Source/shotwell/src/library/Branch.vala" _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 1227 "Branch.c" +#line 1229 "Branch.c" } static void library_branch_update_entry_visibility (LibraryBranch* self, LibraryHideablePageEntry* entry, gint position) { - LibraryHideablePageEntry* _tmp0_ = NULL; - gboolean _tmp1_ = FALSE; - gboolean _tmp2_ = FALSE; + LibraryHideablePageEntry* _tmp0_; + gboolean _tmp1_; + gboolean _tmp2_; #line 77 "/home/jens/Source/shotwell/src/library/Branch.vala" g_return_if_fail (LIBRARY_IS_BRANCH (self)); #line 77 "/home/jens/Source/shotwell/src/library/Branch.vala" @@ -1243,42 +1245,42 @@ 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 1247 "Branch.c" - LibraryHideablePageEntry* _tmp3_ = NULL; - gboolean _tmp4_ = FALSE; +#line 1249 "Branch.c" + LibraryHideablePageEntry* _tmp3_; + gboolean _tmp4_; #line 79 "/home/jens/Source/shotwell/src/library/Branch.vala" _tmp3_ = entry; #line 79 "/home/jens/Source/shotwell/src/library/Branch.vala" _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 1256 "Branch.c" - LibraryHideablePageEntry* _tmp5_ = NULL; - gint _tmp6_ = 0; +#line 1258 "Branch.c" + LibraryHideablePageEntry* _tmp5_; + gint _tmp6_; #line 80 "/home/jens/Source/shotwell/src/library/Branch.vala" _tmp5_ = entry; #line 80 "/home/jens/Source/shotwell/src/library/Branch.vala" _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 1265 "Branch.c" +#line 1267 "Branch.c" } } else { - LibraryHideablePageEntry* _tmp7_ = NULL; - gboolean _tmp8_ = FALSE; + LibraryHideablePageEntry* _tmp7_; + gboolean _tmp8_; #line 81 "/home/jens/Source/shotwell/src/library/Branch.vala" _tmp7_ = entry; #line 81 "/home/jens/Source/shotwell/src/library/Branch.vala" _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 1276 "Branch.c" - LibraryHideablePageEntry* _tmp9_ = NULL; +#line 1278 "Branch.c" + LibraryHideablePageEntry* _tmp9_; #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 1282 "Branch.c" +#line 1284 "Branch.c" } } } @@ -1286,10 +1288,10 @@ static void library_branch_update_entry_visibility (LibraryBranch* self, Library static gint library_branch_comparator (SidebarEntry* a, SidebarEntry* b) { gint result = 0; - SidebarEntry* _tmp0_ = NULL; - gconstpointer _tmp1_ = NULL; - SidebarEntry* _tmp2_ = NULL; - gconstpointer _tmp3_ = NULL; + SidebarEntry* _tmp0_; + gconstpointer _tmp1_; + SidebarEntry* _tmp2_; + gconstpointer _tmp3_; #line 86 "/home/jens/Source/shotwell/src/library/Branch.vala" g_return_val_if_fail (SIDEBAR_IS_ENTRY (a), 0); #line 86 "/home/jens/Source/shotwell/src/library/Branch.vala" @@ -1306,13 +1308,13 @@ 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 1310 "Branch.c" +#line 1312 "Branch.c" } LibraryPhotosEntry* library_branch_get_photos_entry (LibraryBranch* self) { LibraryPhotosEntry* result; - LibraryPhotosEntry* _tmp0_ = NULL; + LibraryPhotosEntry* _tmp0_; #line 10 "/home/jens/Source/shotwell/src/library/Branch.vala" g_return_val_if_fail (LIBRARY_IS_BRANCH (self), NULL); #line 10 "/home/jens/Source/shotwell/src/library/Branch.vala" @@ -1321,39 +1323,43 @@ LibraryPhotosEntry* library_branch_get_photos_entry (LibraryBranch* self) { result = _tmp0_; #line 10 "/home/jens/Source/shotwell/src/library/Branch.vala" return result; -#line 1325 "Branch.c" +#line 1327 "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 1332 "Branch.c" +#line 1334 "Branch.c" } static void library_branch_set_photos_entry (LibraryBranch* self, LibraryPhotosEntry* value) { - LibraryPhotosEntry* _tmp0_ = NULL; - LibraryPhotosEntry* _tmp1_ = NULL; #line 10 "/home/jens/Source/shotwell/src/library/Branch.vala" g_return_if_fail (LIBRARY_IS_BRANCH (self)); #line 10 "/home/jens/Source/shotwell/src/library/Branch.vala" - _tmp0_ = value; + if (library_branch_get_photos_entry (self) != value) { +#line 1343 "Branch.c" + LibraryPhotosEntry* _tmp0_; + LibraryPhotosEntry* _tmp1_; #line 10 "/home/jens/Source/shotwell/src/library/Branch.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp0_ = value; #line 10 "/home/jens/Source/shotwell/src/library/Branch.vala" - _g_object_unref0 (self->priv->_photos_entry); + _tmp1_ = _g_object_ref0 (_tmp0_); #line 10 "/home/jens/Source/shotwell/src/library/Branch.vala" - self->priv->_photos_entry = _tmp1_; + _g_object_unref0 (self->priv->_photos_entry); #line 10 "/home/jens/Source/shotwell/src/library/Branch.vala" - g_object_notify ((GObject *) self, "photos-entry"); -#line 1351 "Branch.c" + self->priv->_photos_entry = _tmp1_; +#line 10 "/home/jens/Source/shotwell/src/library/Branch.vala" + g_object_notify ((GObject *) self, "photos-entry"); +#line 1356 "Branch.c" + } } LibraryFlaggedSidebarEntry* library_branch_get_flagged_entry (LibraryBranch* self) { LibraryFlaggedSidebarEntry* result; - LibraryFlaggedSidebarEntry* _tmp0_ = NULL; + LibraryFlaggedSidebarEntry* _tmp0_; #line 11 "/home/jens/Source/shotwell/src/library/Branch.vala" g_return_val_if_fail (LIBRARY_IS_BRANCH (self), NULL); #line 11 "/home/jens/Source/shotwell/src/library/Branch.vala" @@ -1362,32 +1368,36 @@ LibraryFlaggedSidebarEntry* library_branch_get_flagged_entry (LibraryBranch* sel result = _tmp0_; #line 11 "/home/jens/Source/shotwell/src/library/Branch.vala" return result; -#line 1366 "Branch.c" +#line 1372 "Branch.c" } static void library_branch_set_flagged_entry (LibraryBranch* self, LibraryFlaggedSidebarEntry* value) { - LibraryFlaggedSidebarEntry* _tmp0_ = NULL; - LibraryFlaggedSidebarEntry* _tmp1_ = NULL; #line 11 "/home/jens/Source/shotwell/src/library/Branch.vala" g_return_if_fail (LIBRARY_IS_BRANCH (self)); #line 11 "/home/jens/Source/shotwell/src/library/Branch.vala" - _tmp0_ = value; + if (library_branch_get_flagged_entry (self) != value) { +#line 1381 "Branch.c" + LibraryFlaggedSidebarEntry* _tmp0_; + LibraryFlaggedSidebarEntry* _tmp1_; #line 11 "/home/jens/Source/shotwell/src/library/Branch.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp0_ = value; #line 11 "/home/jens/Source/shotwell/src/library/Branch.vala" - _g_object_unref0 (self->priv->_flagged_entry); + _tmp1_ = _g_object_ref0 (_tmp0_); +#line 11 "/home/jens/Source/shotwell/src/library/Branch.vala" + _g_object_unref0 (self->priv->_flagged_entry); #line 11 "/home/jens/Source/shotwell/src/library/Branch.vala" - self->priv->_flagged_entry = _tmp1_; + self->priv->_flagged_entry = _tmp1_; #line 11 "/home/jens/Source/shotwell/src/library/Branch.vala" - g_object_notify ((GObject *) self, "flagged-entry"); -#line 1385 "Branch.c" + g_object_notify ((GObject *) self, "flagged-entry"); +#line 1394 "Branch.c" + } } LibraryLastImportSidebarEntry* library_branch_get_last_imported_entry (LibraryBranch* self) { LibraryLastImportSidebarEntry* result; - LibraryLastImportSidebarEntry* _tmp0_ = NULL; + LibraryLastImportSidebarEntry* _tmp0_; #line 12 "/home/jens/Source/shotwell/src/library/Branch.vala" g_return_val_if_fail (LIBRARY_IS_BRANCH (self), NULL); #line 12 "/home/jens/Source/shotwell/src/library/Branch.vala" @@ -1396,32 +1406,36 @@ LibraryLastImportSidebarEntry* library_branch_get_last_imported_entry (LibraryBr result = _tmp0_; #line 12 "/home/jens/Source/shotwell/src/library/Branch.vala" return result; -#line 1400 "Branch.c" +#line 1410 "Branch.c" } static void library_branch_set_last_imported_entry (LibraryBranch* self, LibraryLastImportSidebarEntry* value) { - LibraryLastImportSidebarEntry* _tmp0_ = NULL; - LibraryLastImportSidebarEntry* _tmp1_ = NULL; #line 12 "/home/jens/Source/shotwell/src/library/Branch.vala" g_return_if_fail (LIBRARY_IS_BRANCH (self)); #line 12 "/home/jens/Source/shotwell/src/library/Branch.vala" - _tmp0_ = value; + if (library_branch_get_last_imported_entry (self) != value) { +#line 1419 "Branch.c" + LibraryLastImportSidebarEntry* _tmp0_; + LibraryLastImportSidebarEntry* _tmp1_; #line 12 "/home/jens/Source/shotwell/src/library/Branch.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp0_ = value; #line 12 "/home/jens/Source/shotwell/src/library/Branch.vala" - _g_object_unref0 (self->priv->_last_imported_entry); + _tmp1_ = _g_object_ref0 (_tmp0_); #line 12 "/home/jens/Source/shotwell/src/library/Branch.vala" - self->priv->_last_imported_entry = _tmp1_; + _g_object_unref0 (self->priv->_last_imported_entry); #line 12 "/home/jens/Source/shotwell/src/library/Branch.vala" - g_object_notify ((GObject *) self, "last-imported-entry"); -#line 1419 "Branch.c" + 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 1432 "Branch.c" + } } LibraryImportQueueSidebarEntry* library_branch_get_import_queue_entry (LibraryBranch* self) { LibraryImportQueueSidebarEntry* result; - LibraryImportQueueSidebarEntry* _tmp0_ = NULL; + LibraryImportQueueSidebarEntry* _tmp0_; #line 13 "/home/jens/Source/shotwell/src/library/Branch.vala" g_return_val_if_fail (LIBRARY_IS_BRANCH (self), NULL); #line 13 "/home/jens/Source/shotwell/src/library/Branch.vala" @@ -1430,32 +1444,36 @@ LibraryImportQueueSidebarEntry* library_branch_get_import_queue_entry (LibraryBr result = _tmp0_; #line 13 "/home/jens/Source/shotwell/src/library/Branch.vala" return result; -#line 1434 "Branch.c" +#line 1448 "Branch.c" } static void library_branch_set_import_queue_entry (LibraryBranch* self, LibraryImportQueueSidebarEntry* value) { - LibraryImportQueueSidebarEntry* _tmp0_ = NULL; - LibraryImportQueueSidebarEntry* _tmp1_ = NULL; #line 13 "/home/jens/Source/shotwell/src/library/Branch.vala" g_return_if_fail (LIBRARY_IS_BRANCH (self)); #line 13 "/home/jens/Source/shotwell/src/library/Branch.vala" - _tmp0_ = value; + if (library_branch_get_import_queue_entry (self) != value) { +#line 1457 "Branch.c" + LibraryImportQueueSidebarEntry* _tmp0_; + LibraryImportQueueSidebarEntry* _tmp1_; #line 13 "/home/jens/Source/shotwell/src/library/Branch.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp0_ = value; #line 13 "/home/jens/Source/shotwell/src/library/Branch.vala" - _g_object_unref0 (self->priv->_import_queue_entry); + _tmp1_ = _g_object_ref0 (_tmp0_); #line 13 "/home/jens/Source/shotwell/src/library/Branch.vala" - self->priv->_import_queue_entry = _tmp1_; + _g_object_unref0 (self->priv->_import_queue_entry); #line 13 "/home/jens/Source/shotwell/src/library/Branch.vala" - g_object_notify ((GObject *) self, "import-queue-entry"); -#line 1453 "Branch.c" + 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 1470 "Branch.c" + } } LibraryOfflineSidebarEntry* library_branch_get_offline_entry (LibraryBranch* self) { LibraryOfflineSidebarEntry* result; - LibraryOfflineSidebarEntry* _tmp0_ = NULL; + LibraryOfflineSidebarEntry* _tmp0_; #line 14 "/home/jens/Source/shotwell/src/library/Branch.vala" g_return_val_if_fail (LIBRARY_IS_BRANCH (self), NULL); #line 14 "/home/jens/Source/shotwell/src/library/Branch.vala" @@ -1464,32 +1482,36 @@ LibraryOfflineSidebarEntry* library_branch_get_offline_entry (LibraryBranch* sel result = _tmp0_; #line 14 "/home/jens/Source/shotwell/src/library/Branch.vala" return result; -#line 1468 "Branch.c" +#line 1486 "Branch.c" } static void library_branch_set_offline_entry (LibraryBranch* self, LibraryOfflineSidebarEntry* value) { - LibraryOfflineSidebarEntry* _tmp0_ = NULL; - LibraryOfflineSidebarEntry* _tmp1_ = NULL; #line 14 "/home/jens/Source/shotwell/src/library/Branch.vala" g_return_if_fail (LIBRARY_IS_BRANCH (self)); #line 14 "/home/jens/Source/shotwell/src/library/Branch.vala" - _tmp0_ = value; + if (library_branch_get_offline_entry (self) != value) { +#line 1495 "Branch.c" + LibraryOfflineSidebarEntry* _tmp0_; + LibraryOfflineSidebarEntry* _tmp1_; #line 14 "/home/jens/Source/shotwell/src/library/Branch.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp0_ = value; #line 14 "/home/jens/Source/shotwell/src/library/Branch.vala" - _g_object_unref0 (self->priv->_offline_entry); + _tmp1_ = _g_object_ref0 (_tmp0_); +#line 14 "/home/jens/Source/shotwell/src/library/Branch.vala" + _g_object_unref0 (self->priv->_offline_entry); #line 14 "/home/jens/Source/shotwell/src/library/Branch.vala" - self->priv->_offline_entry = _tmp1_; + self->priv->_offline_entry = _tmp1_; #line 14 "/home/jens/Source/shotwell/src/library/Branch.vala" - g_object_notify ((GObject *) self, "offline-entry"); -#line 1487 "Branch.c" + g_object_notify ((GObject *) self, "offline-entry"); +#line 1508 "Branch.c" + } } LibraryTrashSidebarEntry* library_branch_get_trash_entry (LibraryBranch* self) { LibraryTrashSidebarEntry* result; - LibraryTrashSidebarEntry* _tmp0_ = NULL; + LibraryTrashSidebarEntry* _tmp0_; #line 15 "/home/jens/Source/shotwell/src/library/Branch.vala" g_return_val_if_fail (LIBRARY_IS_BRANCH (self), NULL); #line 15 "/home/jens/Source/shotwell/src/library/Branch.vala" @@ -1498,26 +1520,30 @@ LibraryTrashSidebarEntry* library_branch_get_trash_entry (LibraryBranch* self) { result = _tmp0_; #line 15 "/home/jens/Source/shotwell/src/library/Branch.vala" return result; -#line 1502 "Branch.c" +#line 1524 "Branch.c" } static void library_branch_set_trash_entry (LibraryBranch* self, LibraryTrashSidebarEntry* value) { - LibraryTrashSidebarEntry* _tmp0_ = NULL; - LibraryTrashSidebarEntry* _tmp1_ = NULL; #line 15 "/home/jens/Source/shotwell/src/library/Branch.vala" g_return_if_fail (LIBRARY_IS_BRANCH (self)); #line 15 "/home/jens/Source/shotwell/src/library/Branch.vala" - _tmp0_ = value; + if (library_branch_get_trash_entry (self) != value) { +#line 1533 "Branch.c" + LibraryTrashSidebarEntry* _tmp0_; + LibraryTrashSidebarEntry* _tmp1_; #line 15 "/home/jens/Source/shotwell/src/library/Branch.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp0_ = value; #line 15 "/home/jens/Source/shotwell/src/library/Branch.vala" - _g_object_unref0 (self->priv->_trash_entry); + _tmp1_ = _g_object_ref0 (_tmp0_); #line 15 "/home/jens/Source/shotwell/src/library/Branch.vala" - self->priv->_trash_entry = _tmp1_; + _g_object_unref0 (self->priv->_trash_entry); #line 15 "/home/jens/Source/shotwell/src/library/Branch.vala" - g_object_notify ((GObject *) self, "trash-entry"); -#line 1521 "Branch.c" + self->priv->_trash_entry = _tmp1_; +#line 15 "/home/jens/Source/shotwell/src/library/Branch.vala" + g_object_notify ((GObject *) self, "trash-entry"); +#line 1546 "Branch.c" + } } @@ -1533,29 +1559,29 @@ static void library_branch_class_init (LibraryBranchClass * klass) { #line 7 "/home/jens/Source/shotwell/src/library/Branch.vala" G_OBJECT_CLASS (klass)->finalize = library_branch_finalize; #line 7 "/home/jens/Source/shotwell/src/library/Branch.vala" - g_object_class_install_property (G_OBJECT_CLASS (klass), LIBRARY_BRANCH_PHOTOS_ENTRY, g_param_spec_object ("photos-entry", "photos-entry", "photos-entry", LIBRARY_TYPE_PHOTOS_ENTRY, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); + g_object_class_install_property (G_OBJECT_CLASS (klass), LIBRARY_BRANCH_PHOTOS_ENTRY_PROPERTY, g_param_spec_object ("photos-entry", "photos-entry", "photos-entry", LIBRARY_TYPE_PHOTOS_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_FLAGGED_ENTRY, g_param_spec_object ("flagged-entry", "flagged-entry", "flagged-entry", LIBRARY_TYPE_FLAGGED_SIDEBAR_ENTRY, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); + g_object_class_install_property (G_OBJECT_CLASS (klass), LIBRARY_BRANCH_FLAGGED_ENTRY_PROPERTY, g_param_spec_object ("flagged-entry", "flagged-entry", "flagged-entry", LIBRARY_TYPE_FLAGGED_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_LAST_IMPORTED_ENTRY, g_param_spec_object ("last-imported-entry", "last-imported-entry", "last-imported-entry", LIBRARY_TYPE_LAST_IMPORT_SIDEBAR_ENTRY, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); + g_object_class_install_property (G_OBJECT_CLASS (klass), LIBRARY_BRANCH_LAST_IMPORTED_ENTRY_PROPERTY, g_param_spec_object ("last-imported-entry", "last-imported-entry", "last-imported-entry", LIBRARY_TYPE_LAST_IMPORT_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_IMPORT_QUEUE_ENTRY, g_param_spec_object ("import-queue-entry", "import-queue-entry", "import-queue-entry", LIBRARY_TYPE_IMPORT_QUEUE_SIDEBAR_ENTRY, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); + g_object_class_install_property (G_OBJECT_CLASS (klass), LIBRARY_BRANCH_IMPORT_QUEUE_ENTRY_PROPERTY, g_param_spec_object ("import-queue-entry", "import-queue-entry", "import-queue-entry", LIBRARY_TYPE_IMPORT_QUEUE_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_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)); + g_object_class_install_property (G_OBJECT_CLASS (klass), LIBRARY_BRANCH_OFFLINE_ENTRY_PROPERTY, 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 1548 "Branch.c" + g_object_class_install_property (G_OBJECT_CLASS (klass), LIBRARY_BRANCH_TRASH_ENTRY_PROPERTY, 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 1574 "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 1555 "Branch.c" +#line 1581 "Branch.c" } -static void library_branch_finalize (GObject* obj) { +static void library_branch_finalize (GObject * obj) { LibraryBranch * self; #line 7 "/home/jens/Source/shotwell/src/library/Branch.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, LIBRARY_TYPE_BRANCH, LibraryBranch); @@ -1573,7 +1599,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 1577 "Branch.c" +#line 1603 "Branch.c" } @@ -1595,48 +1621,48 @@ static void _vala_library_branch_get_property (GObject * object, guint property_ #line 7 "/home/jens/Source/shotwell/src/library/Branch.vala" switch (property_id) { #line 7 "/home/jens/Source/shotwell/src/library/Branch.vala" - case LIBRARY_BRANCH_PHOTOS_ENTRY: + case LIBRARY_BRANCH_PHOTOS_ENTRY_PROPERTY: #line 7 "/home/jens/Source/shotwell/src/library/Branch.vala" g_value_set_object (value, library_branch_get_photos_entry (self)); #line 7 "/home/jens/Source/shotwell/src/library/Branch.vala" break; #line 7 "/home/jens/Source/shotwell/src/library/Branch.vala" - case LIBRARY_BRANCH_FLAGGED_ENTRY: + case LIBRARY_BRANCH_FLAGGED_ENTRY_PROPERTY: #line 7 "/home/jens/Source/shotwell/src/library/Branch.vala" g_value_set_object (value, library_branch_get_flagged_entry (self)); #line 7 "/home/jens/Source/shotwell/src/library/Branch.vala" break; #line 7 "/home/jens/Source/shotwell/src/library/Branch.vala" - case LIBRARY_BRANCH_LAST_IMPORTED_ENTRY: + case LIBRARY_BRANCH_LAST_IMPORTED_ENTRY_PROPERTY: #line 7 "/home/jens/Source/shotwell/src/library/Branch.vala" g_value_set_object (value, library_branch_get_last_imported_entry (self)); #line 7 "/home/jens/Source/shotwell/src/library/Branch.vala" break; #line 7 "/home/jens/Source/shotwell/src/library/Branch.vala" - case LIBRARY_BRANCH_IMPORT_QUEUE_ENTRY: + case LIBRARY_BRANCH_IMPORT_QUEUE_ENTRY_PROPERTY: #line 7 "/home/jens/Source/shotwell/src/library/Branch.vala" g_value_set_object (value, library_branch_get_import_queue_entry (self)); #line 7 "/home/jens/Source/shotwell/src/library/Branch.vala" break; #line 7 "/home/jens/Source/shotwell/src/library/Branch.vala" - case LIBRARY_BRANCH_OFFLINE_ENTRY: + case LIBRARY_BRANCH_OFFLINE_ENTRY_PROPERTY: #line 7 "/home/jens/Source/shotwell/src/library/Branch.vala" g_value_set_object (value, library_branch_get_offline_entry (self)); #line 7 "/home/jens/Source/shotwell/src/library/Branch.vala" break; #line 7 "/home/jens/Source/shotwell/src/library/Branch.vala" - case LIBRARY_BRANCH_TRASH_ENTRY: + case LIBRARY_BRANCH_TRASH_ENTRY_PROPERTY: #line 7 "/home/jens/Source/shotwell/src/library/Branch.vala" g_value_set_object (value, library_branch_get_trash_entry (self)); #line 7 "/home/jens/Source/shotwell/src/library/Branch.vala" break; -#line 1634 "Branch.c" +#line 1660 "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 1640 "Branch.c" +#line 1666 "Branch.c" } } @@ -1647,48 +1673,48 @@ static void _vala_library_branch_set_property (GObject * object, guint property_ #line 7 "/home/jens/Source/shotwell/src/library/Branch.vala" switch (property_id) { #line 7 "/home/jens/Source/shotwell/src/library/Branch.vala" - case LIBRARY_BRANCH_PHOTOS_ENTRY: + case LIBRARY_BRANCH_PHOTOS_ENTRY_PROPERTY: #line 7 "/home/jens/Source/shotwell/src/library/Branch.vala" library_branch_set_photos_entry (self, g_value_get_object (value)); #line 7 "/home/jens/Source/shotwell/src/library/Branch.vala" break; #line 7 "/home/jens/Source/shotwell/src/library/Branch.vala" - case LIBRARY_BRANCH_FLAGGED_ENTRY: + case LIBRARY_BRANCH_FLAGGED_ENTRY_PROPERTY: #line 7 "/home/jens/Source/shotwell/src/library/Branch.vala" library_branch_set_flagged_entry (self, g_value_get_object (value)); #line 7 "/home/jens/Source/shotwell/src/library/Branch.vala" break; #line 7 "/home/jens/Source/shotwell/src/library/Branch.vala" - case LIBRARY_BRANCH_LAST_IMPORTED_ENTRY: + case LIBRARY_BRANCH_LAST_IMPORTED_ENTRY_PROPERTY: #line 7 "/home/jens/Source/shotwell/src/library/Branch.vala" library_branch_set_last_imported_entry (self, g_value_get_object (value)); #line 7 "/home/jens/Source/shotwell/src/library/Branch.vala" break; #line 7 "/home/jens/Source/shotwell/src/library/Branch.vala" - case LIBRARY_BRANCH_IMPORT_QUEUE_ENTRY: + case LIBRARY_BRANCH_IMPORT_QUEUE_ENTRY_PROPERTY: #line 7 "/home/jens/Source/shotwell/src/library/Branch.vala" library_branch_set_import_queue_entry (self, g_value_get_object (value)); #line 7 "/home/jens/Source/shotwell/src/library/Branch.vala" break; #line 7 "/home/jens/Source/shotwell/src/library/Branch.vala" - case LIBRARY_BRANCH_OFFLINE_ENTRY: + case LIBRARY_BRANCH_OFFLINE_ENTRY_PROPERTY: #line 7 "/home/jens/Source/shotwell/src/library/Branch.vala" library_branch_set_offline_entry (self, g_value_get_object (value)); #line 7 "/home/jens/Source/shotwell/src/library/Branch.vala" break; #line 7 "/home/jens/Source/shotwell/src/library/Branch.vala" - case LIBRARY_BRANCH_TRASH_ENTRY: + case LIBRARY_BRANCH_TRASH_ENTRY_PROPERTY: #line 7 "/home/jens/Source/shotwell/src/library/Branch.vala" library_branch_set_trash_entry (self, g_value_get_object (value)); #line 7 "/home/jens/Source/shotwell/src/library/Branch.vala" break; -#line 1686 "Branch.c" +#line 1712 "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 1692 "Branch.c" +#line 1718 "Branch.c" } } @@ -1699,40 +1725,37 @@ 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 1703 "Branch.c" +#line 1729 "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 1710 "Branch.c" +#line 1736 "Branch.c" } static gchar* library_photos_entry_real_get_sidebar_name (SidebarSimplePageEntry* base) { LibraryPhotosEntry * self; gchar* result = NULL; - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; + gchar* _tmp0_; #line 96 "/home/jens/Source/shotwell/src/library/Branch.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, LIBRARY_TYPE_PHOTOS_ENTRY, LibraryPhotosEntry); #line 97 "/home/jens/Source/shotwell/src/library/Branch.vala" - _tmp0_ = _ ("Photos"); + _tmp0_ = g_strdup (_ ("Photos")); #line 97 "/home/jens/Source/shotwell/src/library/Branch.vala" - _tmp1_ = g_strdup (_tmp0_); -#line 97 "/home/jens/Source/shotwell/src/library/Branch.vala" - result = _tmp1_; + result = _tmp0_; #line 97 "/home/jens/Source/shotwell/src/library/Branch.vala" return result; -#line 1729 "Branch.c" +#line 1752 "Branch.c" } static gchar* library_photos_entry_real_get_sidebar_icon (SidebarSimplePageEntry* base) { LibraryPhotosEntry * self; gchar* result = NULL; - gchar* _tmp0_ = NULL; + gchar* _tmp0_; #line 100 "/home/jens/Source/shotwell/src/library/Branch.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, LIBRARY_TYPE_PHOTOS_ENTRY, LibraryPhotosEntry); #line 101 "/home/jens/Source/shotwell/src/library/Branch.vala" @@ -1741,14 +1764,14 @@ 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 1745 "Branch.c" +#line 1768 "Branch.c" } static Page* library_photos_entry_real_create_page (SidebarSimplePageEntry* base) { LibraryPhotosEntry * self; Page* result = NULL; - LibraryMainPage* _tmp0_ = NULL; + LibraryMainPage* _tmp0_; #line 104 "/home/jens/Source/shotwell/src/library/Branch.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, LIBRARY_TYPE_PHOTOS_ENTRY, LibraryPhotosEntry); #line 105 "/home/jens/Source/shotwell/src/library/Branch.vala" @@ -1759,7 +1782,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 1763 "Branch.c" +#line 1786 "Branch.c" } @@ -1767,12 +1790,12 @@ static void library_photos_entry_class_init (LibraryPhotosEntryClass * klass) { #line 91 "/home/jens/Source/shotwell/src/library/Branch.vala" library_photos_entry_parent_class = g_type_class_peek_parent (klass); #line 91 "/home/jens/Source/shotwell/src/library/Branch.vala" - ((SidebarSimplePageEntryClass *) klass)->get_sidebar_name = (gchar* (*)(SidebarSimplePageEntry*)) library_photos_entry_real_get_sidebar_name; + ((SidebarSimplePageEntryClass *) klass)->get_sidebar_name = (gchar* (*) (SidebarSimplePageEntry *)) library_photos_entry_real_get_sidebar_name; #line 91 "/home/jens/Source/shotwell/src/library/Branch.vala" - ((SidebarSimplePageEntryClass *) klass)->get_sidebar_icon = (gchar* (*)(SidebarSimplePageEntry*)) library_photos_entry_real_get_sidebar_icon; + ((SidebarSimplePageEntryClass *) klass)->get_sidebar_icon = (gchar* (*) (SidebarSimplePageEntry *)) library_photos_entry_real_get_sidebar_icon; #line 91 "/home/jens/Source/shotwell/src/library/Branch.vala" - ((SidebarSimplePageEntryClass *) klass)->create_page = (Page* (*)(SidebarSimplePageEntry*)) library_photos_entry_real_create_page; -#line 1776 "Branch.c" + ((SidebarSimplePageEntryClass *) klass)->create_page = (Page* (*) (SidebarSimplePageEntry *)) library_photos_entry_real_create_page; +#line 1799 "Branch.c" } @@ -1798,13 +1821,13 @@ 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 1802 "Branch.c" +#line 1825 "Branch.c" } gboolean library_hideable_page_entry_get_visible (LibraryHideablePageEntry* self) { gboolean result; - gboolean _tmp0_ = FALSE; + gboolean _tmp0_; #line 115 "/home/jens/Source/shotwell/src/library/Branch.vala" g_return_val_if_fail (LIBRARY_IS_HIDEABLE_PAGE_ENTRY (self), FALSE); #line 115 "/home/jens/Source/shotwell/src/library/Branch.vala" @@ -1813,15 +1836,15 @@ gboolean library_hideable_page_entry_get_visible (LibraryHideablePageEntry* self result = _tmp0_; #line 115 "/home/jens/Source/shotwell/src/library/Branch.vala" return result; -#line 1817 "Branch.c" +#line 1840 "Branch.c" } void library_hideable_page_entry_set_visible (LibraryHideablePageEntry* self, gboolean value) { - gboolean _tmp0_ = FALSE; - gboolean _tmp1_ = FALSE; - gboolean _tmp2_ = FALSE; - gboolean _tmp3_ = FALSE; + gboolean _tmp0_; + gboolean _tmp1_; + gboolean _tmp2_; + gboolean _tmp3_; #line 116 "/home/jens/Source/shotwell/src/library/Branch.vala" g_return_if_fail (LIBRARY_IS_HIDEABLE_PAGE_ENTRY (self)); #line 117 "/home/jens/Source/shotwell/src/library/Branch.vala" @@ -1832,7 +1855,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 1836 "Branch.c" +#line 1859 "Branch.c" } #line 120 "/home/jens/Source/shotwell/src/library/Branch.vala" _tmp2_ = value; @@ -1841,10 +1864,10 @@ void library_hideable_page_entry_set_visible (LibraryHideablePageEntry* self, gb #line 121 "/home/jens/Source/shotwell/src/library/Branch.vala" _tmp3_ = value; #line 121 "/home/jens/Source/shotwell/src/library/Branch.vala" - g_signal_emit_by_name (self, "visibility-changed", _tmp3_); + g_signal_emit (self, library_hideable_page_entry_signals[LIBRARY_HIDEABLE_PAGE_ENTRY_VISIBILITY_CHANGED_SIGNAL], 0, _tmp3_); #line 116 "/home/jens/Source/shotwell/src/library/Branch.vala" g_object_notify ((GObject *) self, "visible"); -#line 1848 "Branch.c" +#line 1871 "Branch.c" } @@ -1860,10 +1883,10 @@ static void library_hideable_page_entry_class_init (LibraryHideablePageEntryClas #line 109 "/home/jens/Source/shotwell/src/library/Branch.vala" G_OBJECT_CLASS (klass)->finalize = library_hideable_page_entry_finalize; #line 109 "/home/jens/Source/shotwell/src/library/Branch.vala" - 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)); + g_object_class_install_property (G_OBJECT_CLASS (klass), LIBRARY_HIDEABLE_PAGE_ENTRY_VISIBLE_PROPERTY, 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 1867 "Branch.c" + library_hideable_page_entry_signals[LIBRARY_HIDEABLE_PAGE_ENTRY_VISIBILITY_CHANGED_SIGNAL] = 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 1890 "Branch.c" } @@ -1872,17 +1895,17 @@ 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 1876 "Branch.c" +#line 1899 "Branch.c" } -static void library_hideable_page_entry_finalize (GObject* obj) { +static void library_hideable_page_entry_finalize (GObject * obj) { LibraryHideablePageEntry * self; #line 109 "/home/jens/Source/shotwell/src/library/Branch.vala" 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 1886 "Branch.c" +#line 1909 "Branch.c" } @@ -1904,18 +1927,18 @@ static void _vala_library_hideable_page_entry_get_property (GObject * object, gu #line 109 "/home/jens/Source/shotwell/src/library/Branch.vala" switch (property_id) { #line 109 "/home/jens/Source/shotwell/src/library/Branch.vala" - case LIBRARY_HIDEABLE_PAGE_ENTRY_VISIBLE: + case LIBRARY_HIDEABLE_PAGE_ENTRY_VISIBLE_PROPERTY: #line 109 "/home/jens/Source/shotwell/src/library/Branch.vala" g_value_set_boolean (value, library_hideable_page_entry_get_visible (self)); #line 109 "/home/jens/Source/shotwell/src/library/Branch.vala" break; -#line 1913 "Branch.c" +#line 1936 "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 1919 "Branch.c" +#line 1942 "Branch.c" } } @@ -1926,18 +1949,18 @@ static void _vala_library_hideable_page_entry_set_property (GObject * object, gu #line 109 "/home/jens/Source/shotwell/src/library/Branch.vala" switch (property_id) { #line 109 "/home/jens/Source/shotwell/src/library/Branch.vala" - case LIBRARY_HIDEABLE_PAGE_ENTRY_VISIBLE: + case LIBRARY_HIDEABLE_PAGE_ENTRY_VISIBLE_PROPERTY: #line 109 "/home/jens/Source/shotwell/src/library/Branch.vala" library_hideable_page_entry_set_visible (self, g_value_get_boolean (value)); #line 109 "/home/jens/Source/shotwell/src/library/Branch.vala" break; -#line 1935 "Branch.c" +#line 1958 "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 1941 "Branch.c" +#line 1964 "Branch.c" } } @@ -1946,15 +1969,15 @@ 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 1950 "Branch.c" +#line 1973 "Branch.c" { GeeIterator* _sources_it = NULL; - MediaCollectionRegistry* _tmp0_ = NULL; - MediaCollectionRegistry* _tmp1_ = NULL; - GeeCollection* _tmp2_ = NULL; - GeeCollection* _tmp3_ = NULL; - GeeIterator* _tmp4_ = NULL; - GeeIterator* _tmp5_ = NULL; + MediaCollectionRegistry* _tmp0_; + MediaCollectionRegistry* _tmp1_; + GeeCollection* _tmp2_; + GeeCollection* _tmp3_; + GeeIterator* _tmp4_; + GeeIterator* _tmp5_; #line 135 "/home/jens/Source/shotwell/src/library/Branch.vala" _tmp0_ = media_collection_registry_get_instance (); #line 135 "/home/jens/Source/shotwell/src/library/Branch.vala" @@ -1975,21 +1998,21 @@ 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 1979 "Branch.c" - GeeIterator* _tmp6_ = NULL; - gboolean _tmp7_ = FALSE; +#line 2002 "Branch.c" + GeeIterator* _tmp6_; + gboolean _tmp7_; MediaSourceCollection* sources = NULL; - GeeIterator* _tmp8_ = NULL; - gpointer _tmp9_ = NULL; - ViewCollection* _tmp10_ = NULL; - ViewCollection* _tmp11_ = NULL; - MediaSourceCollection* _tmp12_ = NULL; - CollectionViewManager* _tmp13_ = NULL; - CollectionViewManager* _tmp14_ = NULL; - ProgressMonitor _tmp15_ = NULL; - void* _tmp15__target = NULL; - ViewCollectionMonitor* _tmp16_ = NULL; - ViewCollectionMonitor* _tmp17_ = NULL; + GeeIterator* _tmp8_; + gpointer _tmp9_; + ViewCollection* _tmp10_; + ViewCollection* _tmp11_; + MediaSourceCollection* _tmp12_; + CollectionViewManager* _tmp13_; + CollectionViewManager* _tmp14_; + ProgressMonitor _tmp15_; + void* _tmp15__target; + ViewCollectionMonitor* _tmp16_; + ViewCollectionMonitor* _tmp17_; #line 135 "/home/jens/Source/shotwell/src/library/Branch.vala" _tmp6_ = _sources_it; #line 135 "/home/jens/Source/shotwell/src/library/Branch.vala" @@ -1998,7 +2021,7 @@ LibraryMainPage* library_main_page_construct (GType object_type, ProgressMonitor if (!_tmp7_) { #line 135 "/home/jens/Source/shotwell/src/library/Branch.vala" break; -#line 2002 "Branch.c" +#line 2025 "Branch.c" } #line 135 "/home/jens/Source/shotwell/src/library/Branch.vala" _tmp8_ = _sources_it; @@ -2032,22 +2055,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 2036 "Branch.c" +#line 2059 "Branch.c" } #line 135 "/home/jens/Source/shotwell/src/library/Branch.vala" _g_object_unref0 (_sources_it); -#line 2040 "Branch.c" +#line 2063 "Branch.c" } #line 132 "/home/jens/Source/shotwell/src/library/Branch.vala" return self; -#line 2044 "Branch.c" +#line 2067 "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 2051 "Branch.c" +#line 2074 "Branch.c" } @@ -2055,8 +2078,8 @@ static void library_main_page_real_get_config_photos_sort (MediaPage* base, gboo LibraryMainPage * self; gboolean _vala_sort_order = FALSE; gint _vala_sort_by = 0; - ConfigFacade* _tmp0_ = NULL; - ConfigFacade* _tmp1_ = NULL; + ConfigFacade* _tmp0_; + ConfigFacade* _tmp1_; gboolean _tmp2_ = FALSE; gint _tmp3_ = 0; #line 139 "/home/jens/Source/shotwell/src/library/Branch.vala" @@ -2077,23 +2100,23 @@ 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 2081 "Branch.c" +#line 2104 "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 2087 "Branch.c" +#line 2110 "Branch.c" } } static void library_main_page_real_set_config_photos_sort (MediaPage* base, gboolean sort_order, gint sort_by) { LibraryMainPage * self; - ConfigFacade* _tmp0_ = NULL; - ConfigFacade* _tmp1_ = NULL; - gboolean _tmp2_ = FALSE; - gint _tmp3_ = 0; + ConfigFacade* _tmp0_; + ConfigFacade* _tmp1_; + gboolean _tmp2_; + gint _tmp3_; #line 143 "/home/jens/Source/shotwell/src/library/Branch.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, LIBRARY_TYPE_MAIN_PAGE, LibraryMainPage); #line 144 "/home/jens/Source/shotwell/src/library/Branch.vala" @@ -2108,7 +2131,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 2112 "Branch.c" +#line 2135 "Branch.c" } @@ -2116,10 +2139,10 @@ static void library_main_page_class_init (LibraryMainPageClass * klass) { #line 129 "/home/jens/Source/shotwell/src/library/Branch.vala" library_main_page_parent_class = g_type_class_peek_parent (klass); #line 129 "/home/jens/Source/shotwell/src/library/Branch.vala" - ((MediaPageClass *) klass)->get_config_photos_sort = (void (*)(MediaPage*, gboolean*, gint*)) library_main_page_real_get_config_photos_sort; + ((MediaPageClass *) klass)->get_config_photos_sort = (void (*) (MediaPage *, gboolean*, gint*)) library_main_page_real_get_config_photos_sort; #line 129 "/home/jens/Source/shotwell/src/library/Branch.vala" - ((MediaPageClass *) klass)->set_config_photos_sort = (void (*)(MediaPage*, gboolean, gint)) library_main_page_real_set_config_photos_sort; -#line 2123 "Branch.c" + ((MediaPageClass *) klass)->set_config_photos_sort = (void (*) (MediaPage *, gboolean, gint)) library_main_page_real_set_config_photos_sort; +#line 2146 "Branch.c" } diff --git a/src/library/FlaggedPage.c b/src/library/FlaggedPage.c index 849e784..16a31da 100644 --- a/src/library/FlaggedPage.c +++ b/src/library/FlaggedPage.c @@ -1,4 +1,4 @@ -/* FlaggedPage.c generated by valac 0.34.7, the Vala compiler +/* FlaggedPage.c generated by valac 0.36.6, the Vala compiler * generated from FlaggedPage.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -809,12 +809,12 @@ static guint flagged_page_flagged_search_view_filter_real_get_criteria (SearchVi GType search_filter_criteria_get_type (void) G_GNUC_CONST; CollectionPageCollectionSearchViewFilter* collection_page_collection_search_view_filter_new (void); CollectionPageCollectionSearchViewFilter* collection_page_collection_search_view_filter_construct (GType object_type); -static void flagged_page_finalize (GObject* obj); +static void flagged_page_finalize (GObject * obj); FlaggedPage* flagged_page_construct (GType object_type) { FlaggedPage * self = NULL; - FlaggedPageFlaggedViewManager* _tmp0_ = NULL; + FlaggedPageFlaggedViewManager* _tmp0_; #line 34 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala" self = (FlaggedPage*) collection_page_construct (object_type, FLAGGED_PAGE_NAME); #line 36 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala" @@ -826,12 +826,12 @@ FlaggedPage* flagged_page_construct (GType object_type) { #line 827 "FlaggedPage.c" { GeeIterator* _sources_it = NULL; - MediaCollectionRegistry* _tmp1_ = NULL; - MediaCollectionRegistry* _tmp2_ = NULL; - GeeCollection* _tmp3_ = NULL; - GeeCollection* _tmp4_ = NULL; - GeeIterator* _tmp5_ = NULL; - GeeIterator* _tmp6_ = NULL; + MediaCollectionRegistry* _tmp1_; + MediaCollectionRegistry* _tmp2_; + GeeCollection* _tmp3_; + GeeCollection* _tmp4_; + GeeIterator* _tmp5_; + GeeIterator* _tmp6_; #line 38 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala" _tmp1_ = media_collection_registry_get_instance (); #line 38 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala" @@ -853,18 +853,18 @@ FlaggedPage* flagged_page_construct (GType object_type) { #line 38 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala" while (TRUE) { #line 856 "FlaggedPage.c" - GeeIterator* _tmp7_ = NULL; - gboolean _tmp8_ = FALSE; + GeeIterator* _tmp7_; + gboolean _tmp8_; MediaSourceCollection* sources = NULL; - GeeIterator* _tmp9_ = NULL; - gpointer _tmp10_ = NULL; - ViewCollection* _tmp11_ = NULL; - ViewCollection* _tmp12_ = NULL; - MediaSourceCollection* _tmp13_ = NULL; - ViewManager* _tmp14_ = NULL; - Alteration* _tmp15_ = NULL; - ViewCollectionMonitor* _tmp16_ = NULL; - ViewCollectionMonitor* _tmp17_ = NULL; + GeeIterator* _tmp9_; + gpointer _tmp10_; + ViewCollection* _tmp11_; + ViewCollection* _tmp12_; + MediaSourceCollection* _tmp13_; + ViewManager* _tmp14_; + Alteration* _tmp15_; + ViewCollectionMonitor* _tmp16_; + ViewCollectionMonitor* _tmp17_; #line 38 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala" _tmp7_ = _sources_it; #line 38 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala" @@ -924,8 +924,8 @@ static void flagged_page_real_get_config_photos_sort (MediaPage* base, gboolean* FlaggedPage * self; gboolean _vala_sort_order = FALSE; gint _vala_sort_by = 0; - ConfigFacade* _tmp0_ = NULL; - ConfigFacade* _tmp1_ = NULL; + ConfigFacade* _tmp0_; + ConfigFacade* _tmp1_; gboolean _tmp2_ = FALSE; gint _tmp3_ = 0; #line 42 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala" @@ -959,10 +959,10 @@ static void flagged_page_real_get_config_photos_sort (MediaPage* base, gboolean* static void flagged_page_real_set_config_photos_sort (MediaPage* base, gboolean sort_order, gint sort_by) { FlaggedPage * self; - ConfigFacade* _tmp0_ = NULL; - ConfigFacade* _tmp1_ = NULL; - gboolean _tmp2_ = FALSE; - gint _tmp3_ = 0; + ConfigFacade* _tmp0_; + ConfigFacade* _tmp1_; + gboolean _tmp2_; + gint _tmp3_; #line 46 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_FLAGGED_PAGE, FlaggedPage); #line 47 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala" @@ -991,8 +991,8 @@ static gpointer _view_filter_ref0 (gpointer self) { static SearchViewFilter* flagged_page_real_get_search_view_filter (CheckerboardPage* base) { FlaggedPage * self; SearchViewFilter* result = NULL; - FlaggedPageFlaggedSearchViewFilter* _tmp0_ = NULL; - SearchViewFilter* _tmp1_ = NULL; + FlaggedPageFlaggedSearchViewFilter* _tmp0_; + SearchViewFilter* _tmp1_; #line 50 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_FLAGGED_PAGE, FlaggedPage); #line 51 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala" @@ -1009,7 +1009,7 @@ static SearchViewFilter* flagged_page_real_get_search_view_filter (CheckerboardP static FlaggedPageFlaggedViewManager* flagged_page_flagged_view_manager_construct (GType object_type, FlaggedPage* owner) { FlaggedPageFlaggedViewManager* self = NULL; - FlaggedPage* _tmp0_ = NULL; + FlaggedPage* _tmp0_; #line 11 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala" g_return_val_if_fail (IS_FLAGGED_PAGE (owner), NULL); #line 12 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala" @@ -1040,10 +1040,10 @@ static gboolean flagged_page_flagged_view_manager_real_include_in_view (ViewMana FlaggedPageFlaggedViewManager * self; gboolean result = FALSE; Flaggable* flaggable = NULL; - DataSource* _tmp0_ = NULL; - Flaggable* _tmp1_ = NULL; + DataSource* _tmp0_; + Flaggable* _tmp1_; gboolean _tmp2_ = FALSE; - Flaggable* _tmp3_ = NULL; + Flaggable* _tmp3_; #line 15 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, FLAGGED_PAGE_TYPE_FLAGGED_VIEW_MANAGER, FlaggedPageFlaggedViewManager); #line 15 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala" @@ -1059,8 +1059,8 @@ static gboolean flagged_page_flagged_view_manager_real_include_in_view (ViewMana #line 18 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala" if (_tmp3_ != NULL) { #line 1062 "FlaggedPage.c" - Flaggable* _tmp4_ = NULL; - gboolean _tmp5_ = FALSE; + Flaggable* _tmp4_; + gboolean _tmp5_; #line 18 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala" _tmp4_ = flaggable; #line 18 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala" @@ -1087,7 +1087,7 @@ static void flagged_page_flagged_view_manager_class_init (FlaggedPageFlaggedView #line 10 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala" 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 = (gboolean (*)(ViewManager*, DataSource*)) flagged_page_flagged_view_manager_real_include_in_view; + ((ViewManagerClass *) klass)->include_in_view = (gboolean (*) (ViewManager *, DataSource*)) flagged_page_flagged_view_manager_real_include_in_view; #line 1092 "FlaggedPage.c" } @@ -1142,7 +1142,7 @@ static void flagged_page_flagged_search_view_filter_class_init (FlaggedPageFlagg #line 22 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala" 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 = (guint (*)(SearchViewFilter*)) flagged_page_flagged_search_view_filter_real_get_criteria; + ((SearchViewFilterClass *) klass)->get_criteria = (guint (*) (SearchViewFilter *)) flagged_page_flagged_search_view_filter_real_get_criteria; #line 1147 "FlaggedPage.c" } @@ -1169,11 +1169,11 @@ static void flagged_page_class_init (FlaggedPageClass * klass) { #line 7 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala" g_type_class_add_private (klass, sizeof (FlaggedPagePrivate)); #line 7 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala" - ((MediaPageClass *) klass)->get_config_photos_sort = (void (*)(MediaPage*, gboolean*, gint*)) flagged_page_real_get_config_photos_sort; + ((MediaPageClass *) klass)->get_config_photos_sort = (void (*) (MediaPage *, gboolean*, gint*)) flagged_page_real_get_config_photos_sort; #line 7 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala" - ((MediaPageClass *) klass)->set_config_photos_sort = (void (*)(MediaPage*, gboolean, gint)) flagged_page_real_set_config_photos_sort; + ((MediaPageClass *) klass)->set_config_photos_sort = (void (*) (MediaPage *, gboolean, gint)) flagged_page_real_set_config_photos_sort; #line 7 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala" - ((CheckerboardPageClass *) klass)->get_search_view_filter = (SearchViewFilter* (*)(CheckerboardPage*)) flagged_page_real_get_search_view_filter; + ((CheckerboardPageClass *) klass)->get_search_view_filter = (SearchViewFilter* (*) (CheckerboardPage *)) 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 1180 "FlaggedPage.c" @@ -1181,8 +1181,8 @@ static void flagged_page_class_init (FlaggedPageClass * klass) { static void flagged_page_instance_init (FlaggedPage * self) { - Alteration* _tmp0_ = NULL; - FlaggedPageFlaggedSearchViewFilter* _tmp1_ = NULL; + Alteration* _tmp0_; + FlaggedPageFlaggedSearchViewFilter* _tmp1_; #line 7 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala" self->priv = FLAGGED_PAGE_GET_PRIVATE (self); #line 30 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala" @@ -1197,7 +1197,7 @@ static void flagged_page_instance_init (FlaggedPage * self) { } -static void flagged_page_finalize (GObject* obj) { +static void flagged_page_finalize (GObject * obj) { FlaggedPage * self; #line 7 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_FLAGGED_PAGE, FlaggedPage); diff --git a/src/library/FlaggedSidebarEntry.c b/src/library/FlaggedSidebarEntry.c index 38df252..01f84fd 100644 --- a/src/library/FlaggedSidebarEntry.c +++ b/src/library/FlaggedSidebarEntry.c @@ -1,4 +1,4 @@ -/* FlaggedSidebarEntry.c generated by valac 0.34.7, the Vala compiler +/* FlaggedSidebarEntry.c generated by valac 0.36.6, the Vala compiler * generated from FlaggedSidebarEntry.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -359,7 +359,7 @@ struct _LibraryFlaggedSidebarEntryClass { static gpointer library_flagged_sidebar_entry_parent_class = NULL; -static SidebarInternalDropTargetEntryIface* library_flagged_sidebar_entry_sidebar_internal_drop_target_entry_parent_iface = NULL; +static SidebarInternalDropTargetEntryIface * library_flagged_sidebar_entry_sidebar_internal_drop_target_entry_parent_iface = NULL; GType sidebar_tree_get_type (void) G_GNUC_CONST; GType sidebar_entry_get_type (void) G_GNUC_CONST; @@ -433,7 +433,7 @@ GType multiple_data_source_at_once_command_get_type (void) G_GNUC_CONST; GType flag_unflag_command_get_type (void) G_GNUC_CONST; static gboolean library_flagged_sidebar_entry_real_internal_drop_received_arbitrary (SidebarInternalDropTargetEntry* base, GtkSelectionData* data); GeeCollection* media_source_collection_get_flagged (MediaSourceCollection* self); -static void library_flagged_sidebar_entry_finalize (GObject* obj); +static void library_flagged_sidebar_entry_finalize (GObject * obj); static void _library_flagged_sidebar_entry_on_flagged_contents_altered_media_source_collection_flagged_contents_altered (MediaSourceCollection* _sender, gpointer self) { @@ -445,18 +445,18 @@ static void _library_flagged_sidebar_entry_on_flagged_contents_altered_media_sou LibraryFlaggedSidebarEntry* library_flagged_sidebar_entry_construct (GType object_type) { LibraryFlaggedSidebarEntry * self = NULL; - gint _tmp11_ = 0; + gint _tmp11_; #line 8 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala" self = (LibraryFlaggedSidebarEntry*) library_hideable_page_entry_construct (object_type); #line 452 "FlaggedSidebarEntry.c" { GeeIterator* _media_sources_it = NULL; - MediaCollectionRegistry* _tmp0_ = NULL; - MediaCollectionRegistry* _tmp1_ = NULL; - GeeCollection* _tmp2_ = NULL; - GeeCollection* _tmp3_ = NULL; - GeeIterator* _tmp4_ = NULL; - GeeIterator* _tmp5_ = NULL; + MediaCollectionRegistry* _tmp0_; + MediaCollectionRegistry* _tmp1_; + GeeCollection* _tmp2_; + GeeCollection* _tmp3_; + GeeIterator* _tmp4_; + GeeIterator* _tmp5_; #line 9 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala" _tmp0_ = media_collection_registry_get_instance (); #line 9 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala" @@ -478,12 +478,12 @@ LibraryFlaggedSidebarEntry* library_flagged_sidebar_entry_construct (GType objec #line 9 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala" while (TRUE) { #line 481 "FlaggedSidebarEntry.c" - GeeIterator* _tmp6_ = NULL; - gboolean _tmp7_ = FALSE; + GeeIterator* _tmp6_; + gboolean _tmp7_; MediaSourceCollection* media_sources = NULL; - GeeIterator* _tmp8_ = NULL; - gpointer _tmp9_ = NULL; - MediaSourceCollection* _tmp10_ = NULL; + GeeIterator* _tmp8_; + gpointer _tmp9_; + MediaSourceCollection* _tmp10_; #line 9 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala" _tmp6_ = _media_sources_it; #line 9 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala" @@ -532,7 +532,7 @@ LibraryFlaggedSidebarEntry* library_flagged_sidebar_entry_new (void) { static gchar* library_flagged_sidebar_entry_real_get_sidebar_name (SidebarSimplePageEntry* base) { LibraryFlaggedSidebarEntry * self; gchar* result = NULL; - gchar* _tmp0_ = NULL; + gchar* _tmp0_; #line 20 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, LIBRARY_TYPE_FLAGGED_SIDEBAR_ENTRY, LibraryFlaggedSidebarEntry); #line 21 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala" @@ -548,7 +548,7 @@ static gchar* library_flagged_sidebar_entry_real_get_sidebar_name (SidebarSimple static gchar* library_flagged_sidebar_entry_real_get_sidebar_icon (SidebarSimplePageEntry* base) { LibraryFlaggedSidebarEntry * self; gchar* result = NULL; - gchar* _tmp0_ = NULL; + gchar* _tmp0_; #line 24 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, LIBRARY_TYPE_FLAGGED_SIDEBAR_ENTRY, LibraryFlaggedSidebarEntry); #line 25 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala" @@ -564,7 +564,7 @@ static gchar* library_flagged_sidebar_entry_real_get_sidebar_icon (SidebarSimple static Page* library_flagged_sidebar_entry_real_create_page (SidebarSimplePageEntry* base) { LibraryFlaggedSidebarEntry * self; Page* result = NULL; - FlaggedPage* _tmp0_ = NULL; + FlaggedPage* _tmp0_; #line 28 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, LIBRARY_TYPE_FLAGGED_SIDEBAR_ENTRY, LibraryFlaggedSidebarEntry); #line 29 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala" @@ -582,11 +582,11 @@ static Page* library_flagged_sidebar_entry_real_create_page (SidebarSimplePageEn static gboolean library_flagged_sidebar_entry_real_internal_drop_received (SidebarInternalDropTargetEntry* base, GeeList* media) { LibraryFlaggedSidebarEntry * self; gboolean result = FALSE; - CommandManager* _tmp0_ = NULL; - CommandManager* _tmp1_ = NULL; - GeeList* _tmp2_ = NULL; - FlagUnflagCommand* _tmp3_ = NULL; - FlagUnflagCommand* _tmp4_ = NULL; + CommandManager* _tmp0_; + CommandManager* _tmp1_; + GeeList* _tmp2_; + FlagUnflagCommand* _tmp3_; + FlagUnflagCommand* _tmp4_; #line 32 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, LIBRARY_TYPE_FLAGGED_SIDEBAR_ENTRY, LibraryFlaggedSidebarEntry); #line 32 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala" @@ -631,7 +631,7 @@ static gboolean library_flagged_sidebar_entry_real_internal_drop_received_arbitr static void library_flagged_sidebar_entry_on_flagged_contents_altered (LibraryFlaggedSidebarEntry* self) { - gint _tmp0_ = 0; + gint _tmp0_; #line 42 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala" g_return_if_fail (LIBRARY_IS_FLAGGED_SIDEBAR_ENTRY (self)); #line 43 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala" @@ -652,12 +652,12 @@ static gint library_flagged_sidebar_entry_get_total_flagged (LibraryFlaggedSideb #line 653 "FlaggedSidebarEntry.c" { GeeIterator* _media_sources_it = NULL; - MediaCollectionRegistry* _tmp0_ = NULL; - MediaCollectionRegistry* _tmp1_ = NULL; - GeeCollection* _tmp2_ = NULL; - GeeCollection* _tmp3_ = NULL; - GeeIterator* _tmp4_ = NULL; - GeeIterator* _tmp5_ = NULL; + MediaCollectionRegistry* _tmp0_; + MediaCollectionRegistry* _tmp1_; + GeeCollection* _tmp2_; + GeeCollection* _tmp3_; + GeeIterator* _tmp4_; + GeeIterator* _tmp5_; #line 48 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala" _tmp0_ = media_collection_registry_get_instance (); #line 48 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala" @@ -679,17 +679,17 @@ static gint library_flagged_sidebar_entry_get_total_flagged (LibraryFlaggedSideb #line 48 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala" while (TRUE) { #line 682 "FlaggedSidebarEntry.c" - GeeIterator* _tmp6_ = NULL; - gboolean _tmp7_ = FALSE; + GeeIterator* _tmp6_; + gboolean _tmp7_; MediaSourceCollection* media_sources = NULL; - GeeIterator* _tmp8_ = NULL; - gpointer _tmp9_ = NULL; - gint _tmp10_ = 0; - MediaSourceCollection* _tmp11_ = NULL; - GeeCollection* _tmp12_ = NULL; - GeeCollection* _tmp13_ = NULL; - gint _tmp14_ = 0; - gint _tmp15_ = 0; + GeeIterator* _tmp8_; + gpointer _tmp9_; + gint _tmp10_; + MediaSourceCollection* _tmp11_; + GeeCollection* _tmp12_; + GeeCollection* _tmp13_; + gint _tmp14_; + gint _tmp15_; #line 48 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala" _tmp6_ = _media_sources_it; #line 48 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala" @@ -742,11 +742,11 @@ static void library_flagged_sidebar_entry_class_init (LibraryFlaggedSidebarEntry #line 7 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala" library_flagged_sidebar_entry_parent_class = g_type_class_peek_parent (klass); #line 7 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala" - ((SidebarSimplePageEntryClass *) klass)->get_sidebar_name = (gchar* (*)(SidebarSimplePageEntry*)) library_flagged_sidebar_entry_real_get_sidebar_name; + ((SidebarSimplePageEntryClass *) klass)->get_sidebar_name = (gchar* (*) (SidebarSimplePageEntry *)) library_flagged_sidebar_entry_real_get_sidebar_name; #line 7 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala" - ((SidebarSimplePageEntryClass *) klass)->get_sidebar_icon = (gchar* (*)(SidebarSimplePageEntry*)) library_flagged_sidebar_entry_real_get_sidebar_icon; + ((SidebarSimplePageEntryClass *) klass)->get_sidebar_icon = (gchar* (*) (SidebarSimplePageEntry *)) library_flagged_sidebar_entry_real_get_sidebar_icon; #line 7 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala" - ((SidebarSimplePageEntryClass *) klass)->create_page = (Page* (*)(SidebarSimplePageEntry*)) library_flagged_sidebar_entry_real_create_page; + ((SidebarSimplePageEntryClass *) klass)->create_page = (Page* (*) (SidebarSimplePageEntry *)) library_flagged_sidebar_entry_real_create_page; #line 7 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala" G_OBJECT_CLASS (klass)->finalize = library_flagged_sidebar_entry_finalize; #line 753 "FlaggedSidebarEntry.c" @@ -757,9 +757,9 @@ static void library_flagged_sidebar_entry_sidebar_internal_drop_target_entry_int #line 7 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala" library_flagged_sidebar_entry_sidebar_internal_drop_target_entry_parent_iface = g_type_interface_peek_parent (iface); #line 7 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala" - iface->internal_drop_received = (gboolean (*)(SidebarInternalDropTargetEntry*, GeeList*)) library_flagged_sidebar_entry_real_internal_drop_received; + iface->internal_drop_received = (gboolean (*) (SidebarInternalDropTargetEntry *, GeeList*)) library_flagged_sidebar_entry_real_internal_drop_received; #line 7 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala" - iface->internal_drop_received_arbitrary = (gboolean (*)(SidebarInternalDropTargetEntry*, GtkSelectionData*)) library_flagged_sidebar_entry_real_internal_drop_received_arbitrary; + iface->internal_drop_received_arbitrary = (gboolean (*) (SidebarInternalDropTargetEntry *, GtkSelectionData*)) library_flagged_sidebar_entry_real_internal_drop_received_arbitrary; #line 764 "FlaggedSidebarEntry.c" } @@ -768,19 +768,19 @@ static void library_flagged_sidebar_entry_instance_init (LibraryFlaggedSidebarEn } -static void library_flagged_sidebar_entry_finalize (GObject* obj) { +static void library_flagged_sidebar_entry_finalize (GObject * obj) { LibraryFlaggedSidebarEntry * self; #line 7 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, LIBRARY_TYPE_FLAGGED_SIDEBAR_ENTRY, LibraryFlaggedSidebarEntry); #line 776 "FlaggedSidebarEntry.c" { GeeIterator* _media_sources_it = NULL; - MediaCollectionRegistry* _tmp0_ = NULL; - MediaCollectionRegistry* _tmp1_ = NULL; - GeeCollection* _tmp2_ = NULL; - GeeCollection* _tmp3_ = NULL; - GeeIterator* _tmp4_ = NULL; - GeeIterator* _tmp5_ = NULL; + MediaCollectionRegistry* _tmp0_; + MediaCollectionRegistry* _tmp1_; + GeeCollection* _tmp2_; + GeeCollection* _tmp3_; + GeeIterator* _tmp4_; + GeeIterator* _tmp5_; #line 16 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala" _tmp0_ = media_collection_registry_get_instance (); #line 16 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala" @@ -802,13 +802,13 @@ static void library_flagged_sidebar_entry_finalize (GObject* obj) { #line 16 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala" while (TRUE) { #line 805 "FlaggedSidebarEntry.c" - GeeIterator* _tmp6_ = NULL; - gboolean _tmp7_ = FALSE; + GeeIterator* _tmp6_; + gboolean _tmp7_; MediaSourceCollection* media_sources = NULL; - GeeIterator* _tmp8_ = NULL; - gpointer _tmp9_ = NULL; - MediaSourceCollection* _tmp10_ = NULL; - guint _tmp11_ = 0U; + GeeIterator* _tmp8_; + gpointer _tmp9_; + MediaSourceCollection* _tmp10_; + guint _tmp11_; #line 16 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala" _tmp6_ = _media_sources_it; #line 16 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala" diff --git a/src/library/ImportQueuePage.c b/src/library/ImportQueuePage.c index a2794b7..c8d1841 100644 --- a/src/library/ImportQueuePage.c +++ b/src/library/ImportQueuePage.c @@ -1,4 +1,4 @@ -/* ImportQueuePage.c generated by valac 0.34.7, the Vala compiler +/* ImportQueuePage.c generated by valac 0.36.6, the Vala compiler * generated from ImportQueuePage.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -297,6 +297,12 @@ typedef struct _VideoClass VideoClass; typedef struct _VideoView VideoView; typedef struct _VideoViewClass VideoViewClass; #define _g_free0(var) (var = (g_free (var), NULL)) +enum { + IMPORT_QUEUE_PAGE_BATCH_ADDED_SIGNAL, + IMPORT_QUEUE_PAGE_BATCH_REMOVED_SIGNAL, + IMPORT_QUEUE_PAGE_LAST_SIGNAL +}; +static guint import_queue_page_signals[IMPORT_QUEUE_PAGE_LAST_SIGNAL] = {0}; #define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg); #define _vala_return_if_fail(expr, msg) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return; } #define _vala_return_val_if_fail(expr, msg, val) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return val; } @@ -545,29 +551,29 @@ gchar* data_object_get_name (DataObject* self); void single_photo_page_blank_display (SinglePhotoPage* self); void page_window_set_normal_cursor (PageWindow* self); void app_window_error_message (const gchar* message, GtkWindow* parent); -static void import_queue_page_finalize (GObject* obj); +static void import_queue_page_finalize (GObject * obj); static const GActionEntry IMPORT_QUEUE_PAGE_entries[1] = {{"Stop", _import_queue_page_on_stop_gsimple_action_activate_callback}}; 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 556 "ImportQueuePage.c" +#line 562 "ImportQueuePage.c" } ImportQueuePage* import_queue_page_construct (GType object_type) { ImportQueuePage * self = NULL; GtkToolbar* toolbar = NULL; - GtkToolbar* _tmp0_ = NULL; + GtkToolbar* _tmp0_; GtkToolButton* stop_button = NULL; - GtkToolButton* _tmp1_ = NULL; + GtkToolButton* _tmp1_; GtkSeparatorToolItem* separator = NULL; - GtkSeparatorToolItem* _tmp2_ = NULL; + GtkSeparatorToolItem* _tmp2_; GtkToolItem* progress_item = NULL; - GtkToolItem* _tmp3_ = NULL; - GtkProgressBar* _tmp4_ = NULL; - GtkProgressBar* _tmp5_ = NULL; + GtkToolItem* _tmp3_; + GtkProgressBar* _tmp4_; + GtkProgressBar* _tmp5_; #line 25 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" self = (ImportQueuePage*) single_photo_page_construct (object_type, IMPORT_QUEUE_PAGE_NAME, FALSE); #line 28 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" @@ -624,21 +630,21 @@ 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 628 "ImportQueuePage.c" +#line 634 "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 635 "ImportQueuePage.c" +#line 641 "ImportQueuePage.c" } static void import_queue_page_real_init_collect_ui_filenames (Page* base, GeeList* ui_filenames) { ImportQueuePage * self; - GeeList* _tmp0_ = NULL; - GeeList* _tmp1_ = NULL; + GeeList* _tmp0_; + GeeList* _tmp1_; #line 56 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_IMPORT_QUEUE_PAGE, ImportQueuePage); #line 56 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" @@ -651,14 +657,14 @@ 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 655 "ImportQueuePage.c" +#line 661 "ImportQueuePage.c" } static void import_queue_page_real_add_actions (Page* base, GActionMap* map) { ImportQueuePage * self; - GActionMap* _tmp0_ = NULL; - GActionMap* _tmp1_ = NULL; + GActionMap* _tmp0_; + GActionMap* _tmp1_; #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" @@ -671,13 +677,13 @@ static void import_queue_page_real_add_actions (Page* base, GActionMap* map) { _tmp1_ = map; #line 69 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" g_action_map_add_action_entries (_tmp1_, IMPORT_QUEUE_PAGE_entries, G_N_ELEMENTS (IMPORT_QUEUE_PAGE_entries), self); -#line 675 "ImportQueuePage.c" +#line 681 "ImportQueuePage.c" } static void import_queue_page_real_remove_actions (Page* base, GActionMap* map) { ImportQueuePage * self; - GActionMap* _tmp0_ = NULL; + GActionMap* _tmp0_; #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" @@ -686,7 +692,7 @@ static void import_queue_page_real_remove_actions (Page* base, GActionMap* map) _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" +#line 696 "ImportQueuePage.c" { GActionEntry* entry_collection = NULL; gint entry_collection_length1 = 0; @@ -698,15 +704,15 @@ static void import_queue_page_real_remove_actions (Page* base, GActionMap* map) 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" +#line 708 "ImportQueuePage.c" GActionEntry entry = {0}; #line 74 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" entry = entry_collection[entry_it]; -#line 706 "ImportQueuePage.c" +#line 712 "ImportQueuePage.c" { - GActionMap* _tmp1_ = NULL; - GActionEntry _tmp2_ = {0}; - const gchar* _tmp3_ = NULL; + GActionMap* _tmp1_; + GActionEntry _tmp2_; + const gchar* _tmp3_; #line 75 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp1_ = map; #line 75 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" @@ -715,7 +721,7 @@ static void import_queue_page_real_remove_actions (Page* base, GActionMap* map) _tmp3_ = _tmp2_.name; #line 75 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" g_action_map_remove_action (_tmp1_, _tmp3_); -#line 719 "ImportQueuePage.c" +#line 725 "ImportQueuePage.c" } } } @@ -725,62 +731,62 @@ static void import_queue_page_real_remove_actions (Page* base, GActionMap* map) 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 729 "ImportQueuePage.c" +#line 735 "ImportQueuePage.c" } static void _import_queue_page_on_preparing_batch_import_preparing (BatchImport* _sender, gpointer self) { #line 83 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" import_queue_page_on_preparing ((ImportQueuePage*) self); -#line 736 "ImportQueuePage.c" +#line 742 "ImportQueuePage.c" } static void _import_queue_page_on_progress_batch_import_progress (BatchImport* _sender, guint64 completed_bytes, guint64 total_bytes, gpointer self) { #line 84 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" import_queue_page_on_progress ((ImportQueuePage*) self, completed_bytes, total_bytes); -#line 743 "ImportQueuePage.c" +#line 749 "ImportQueuePage.c" } static void _import_queue_page_on_imported_batch_import_imported (BatchImport* _sender, MediaSource* source, GdkPixbuf* pixbuf, gint to_follow, gpointer self) { #line 85 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" import_queue_page_on_imported ((ImportQueuePage*) self, source, pixbuf, to_follow); -#line 750 "ImportQueuePage.c" +#line 756 "ImportQueuePage.c" } static void _import_queue_page_on_import_complete_batch_import_import_complete (BatchImport* _sender, ImportManifest* manifest, BatchImportRoll* import_roll, gpointer self) { #line 86 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" import_queue_page_on_import_complete ((ImportQueuePage*) self, _sender, manifest, import_roll); -#line 757 "ImportQueuePage.c" +#line 763 "ImportQueuePage.c" } static void _import_queue_page_on_fatal_error_batch_import_fatal_error (BatchImport* _sender, ImportResult _result_, const gchar* message, gpointer self) { #line 87 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" import_queue_page_on_fatal_error ((ImportQueuePage*) self, _result_, message); -#line 764 "ImportQueuePage.c" +#line 770 "ImportQueuePage.c" } void import_queue_page_enqueue_and_schedule (ImportQueuePage* self, BatchImport* batch_import, gboolean allow_user_cancel) { - GeeArrayList* _tmp0_ = NULL; - BatchImport* _tmp1_ = NULL; - gboolean _tmp2_ = FALSE; - BatchImport* _tmp3_ = NULL; - BatchImport* _tmp4_ = NULL; - BatchImport* _tmp5_ = NULL; - BatchImport* _tmp6_ = NULL; - BatchImport* _tmp7_ = NULL; - BatchImport* _tmp8_ = NULL; - gboolean _tmp9_ = FALSE; - GeeArrayList* _tmp12_ = NULL; - BatchImport* _tmp13_ = NULL; - BatchImport* _tmp14_ = NULL; - GeeArrayList* _tmp15_ = NULL; - gint _tmp16_ = 0; - gint _tmp17_ = 0; + GeeArrayList* _tmp0_; + BatchImport* _tmp1_; + gboolean _tmp2_; + BatchImport* _tmp3_; + BatchImport* _tmp4_; + BatchImport* _tmp5_; + BatchImport* _tmp6_; + BatchImport* _tmp7_; + BatchImport* _tmp8_; + gboolean _tmp9_; + GeeArrayList* _tmp12_; + BatchImport* _tmp13_; + BatchImport* _tmp14_; + GeeArrayList* _tmp15_; + gint _tmp16_; + gint _tmp17_; #line 79 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" g_return_if_fail (IS_IMPORT_QUEUE_PAGE (self)); #line 79 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" @@ -821,16 +827,16 @@ void import_queue_page_enqueue_and_schedule (ImportQueuePage* self, BatchImport* _tmp9_ = allow_user_cancel; #line 89 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" if (!_tmp9_) { -#line 825 "ImportQueuePage.c" - GeeHashSet* _tmp10_ = NULL; - BatchImport* _tmp11_ = NULL; +#line 831 "ImportQueuePage.c" + GeeHashSet* _tmp10_; + BatchImport* _tmp11_; #line 90 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp10_ = self->priv->cancel_unallowed; #line 90 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp11_ = batch_import; #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 834 "ImportQueuePage.c" +#line 840 "ImportQueuePage.c" } #line 92 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp12_ = self->priv->queue; @@ -841,7 +847,7 @@ void import_queue_page_enqueue_and_schedule (ImportQueuePage* self, BatchImport* #line 93 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp14_ = batch_import; #line 93 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - g_signal_emit_by_name (self, "batch-added", _tmp14_); + g_signal_emit (self, import_queue_page_signals[IMPORT_QUEUE_PAGE_BATCH_ADDED_SIGNAL], 0, _tmp14_); #line 95 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp15_ = self->priv->queue; #line 95 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" @@ -850,25 +856,25 @@ void import_queue_page_enqueue_and_schedule (ImportQueuePage* self, BatchImport* _tmp17_ = _tmp16_; #line 95 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" if (_tmp17_ == 1) { -#line 854 "ImportQueuePage.c" - BatchImport* _tmp18_ = NULL; +#line 860 "ImportQueuePage.c" + BatchImport* _tmp18_; #line 96 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp18_ = batch_import; #line 96 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" batch_import_schedule (_tmp18_); -#line 860 "ImportQueuePage.c" +#line 866 "ImportQueuePage.c" } #line 98 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" import_queue_page_update_stop_action (self); -#line 864 "ImportQueuePage.c" +#line 870 "ImportQueuePage.c" } gint import_queue_page_get_batch_count (ImportQueuePage* self) { gint result = 0; - GeeArrayList* _tmp0_ = NULL; - gint _tmp1_ = 0; - gint _tmp2_ = 0; + GeeArrayList* _tmp0_; + gint _tmp1_; + gint _tmp2_; #line 101 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" g_return_val_if_fail (IS_IMPORT_QUEUE_PAGE (self), 0); #line 102 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" @@ -881,15 +887,15 @@ gint import_queue_page_get_batch_count (ImportQueuePage* self) { result = _tmp2_; #line 102 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" return result; -#line 885 "ImportQueuePage.c" +#line 891 "ImportQueuePage.c" } static void import_queue_page_update_stop_action (ImportQueuePage* self) { gboolean _tmp0_ = FALSE; - GeeHashSet* _tmp1_ = NULL; - BatchImport* _tmp2_ = NULL; - gboolean _tmp3_ = FALSE; + GeeHashSet* _tmp1_; + BatchImport* _tmp2_; + gboolean _tmp3_; #line 105 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" g_return_if_fail (IS_IMPORT_QUEUE_PAGE (self)); #line 106 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" @@ -900,10 +906,10 @@ static void import_queue_page_update_stop_action (ImportQueuePage* self) { _tmp3_ = gee_abstract_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp2_); #line 106 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" if (!_tmp3_) { -#line 904 "ImportQueuePage.c" - GeeArrayList* _tmp4_ = NULL; - gint _tmp5_ = 0; - gint _tmp6_ = 0; +#line 910 "ImportQueuePage.c" + GeeArrayList* _tmp4_; + gint _tmp5_; + gint _tmp6_; #line 106 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp4_ = self->priv->queue; #line 106 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" @@ -912,31 +918,31 @@ static void import_queue_page_update_stop_action (ImportQueuePage* self) { _tmp6_ = _tmp5_; #line 106 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp0_ = _tmp6_ > 0; -#line 916 "ImportQueuePage.c" +#line 922 "ImportQueuePage.c" } else { #line 106 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp0_ = FALSE; -#line 920 "ImportQueuePage.c" +#line 926 "ImportQueuePage.c" } #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 924 "ImportQueuePage.c" +#line 930 "ImportQueuePage.c" } static gpointer _g_object_ref0 (gpointer self) { #line 119 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" return self ? g_object_ref (self) : NULL; -#line 931 "ImportQueuePage.c" +#line 937 "ImportQueuePage.c" } static void import_queue_page_on_stop (ImportQueuePage* self) { - GeeArrayList* _tmp0_ = NULL; - gint _tmp1_ = 0; - gint _tmp2_ = 0; - AppWindow* _tmp3_ = NULL; - AppWindow* _tmp4_ = NULL; + GeeArrayList* _tmp0_; + gint _tmp1_; + gint _tmp2_; + AppWindow* _tmp3_; + AppWindow* _tmp4_; #line 109 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" g_return_if_fail (IS_IMPORT_QUEUE_PAGE (self)); #line 110 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" @@ -951,7 +957,7 @@ static void import_queue_page_on_stop (ImportQueuePage* self) { if (_tmp2_ == 0) { #line 113 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" return; -#line 955 "ImportQueuePage.c" +#line 961 "ImportQueuePage.c" } #line 115 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp3_ = app_window_get_instance (); @@ -963,15 +969,15 @@ static void import_queue_page_on_stop (ImportQueuePage* self) { _g_object_unref0 (_tmp4_); #line 116 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" self->priv->stopped = TRUE; -#line 967 "ImportQueuePage.c" +#line 973 "ImportQueuePage.c" { GeeArrayList* _batch_import_list = NULL; - GeeArrayList* _tmp5_ = NULL; - GeeArrayList* _tmp6_ = NULL; + GeeArrayList* _tmp5_; + GeeArrayList* _tmp6_; gint _batch_import_size = 0; - GeeArrayList* _tmp7_ = NULL; - gint _tmp8_ = 0; - gint _tmp9_ = 0; + GeeArrayList* _tmp7_; + gint _tmp8_; + gint _tmp9_; gint _batch_import_index = 0; #line 119 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp5_ = self->priv->queue; @@ -991,15 +997,15 @@ static void import_queue_page_on_stop (ImportQueuePage* self) { _batch_import_index = -1; #line 119 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" while (TRUE) { -#line 995 "ImportQueuePage.c" - gint _tmp10_ = 0; - gint _tmp11_ = 0; - gint _tmp12_ = 0; +#line 1001 "ImportQueuePage.c" + gint _tmp10_; + gint _tmp11_; + gint _tmp12_; BatchImport* batch_import = NULL; - GeeArrayList* _tmp13_ = NULL; - gint _tmp14_ = 0; - gpointer _tmp15_ = NULL; - BatchImport* _tmp16_ = NULL; + GeeArrayList* _tmp13_; + gint _tmp14_; + gpointer _tmp15_; + BatchImport* _tmp16_; #line 119 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp10_ = _batch_import_index; #line 119 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" @@ -1012,7 +1018,7 @@ static void import_queue_page_on_stop (ImportQueuePage* self) { if (!(_tmp11_ < _tmp12_)) { #line 119 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" break; -#line 1016 "ImportQueuePage.c" +#line 1022 "ImportQueuePage.c" } #line 119 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp13_ = _batch_import_list; @@ -1028,18 +1034,18 @@ static void import_queue_page_on_stop (ImportQueuePage* self) { batch_import_user_halt (_tmp16_); #line 119 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _g_object_unref0 (batch_import); -#line 1032 "ImportQueuePage.c" +#line 1038 "ImportQueuePage.c" } #line 119 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _g_object_unref0 (_batch_import_list); -#line 1036 "ImportQueuePage.c" +#line 1042 "ImportQueuePage.c" } } static void import_queue_page_on_starting (ImportQueuePage* self, BatchImport* batch_import) { - BatchImport* _tmp0_ = NULL; - BatchImport* _tmp1_ = NULL; + BatchImport* _tmp0_; + BatchImport* _tmp1_; #line 123 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" g_return_if_fail (IS_IMPORT_QUEUE_PAGE (self)); #line 123 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" @@ -1054,36 +1060,33 @@ static void import_queue_page_on_starting (ImportQueuePage* self, BatchImport* b _g_object_unref0 (self->priv->current_batch); #line 125 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" self->priv->current_batch = _tmp1_; -#line 1058 "ImportQueuePage.c" +#line 1064 "ImportQueuePage.c" } static void import_queue_page_on_preparing (ImportQueuePage* self) { - GtkProgressBar* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; - GtkProgressBar* _tmp2_ = NULL; + GtkProgressBar* _tmp0_; + GtkProgressBar* _tmp1_; #line 128 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" g_return_if_fail (IS_IMPORT_QUEUE_PAGE (self)); #line 129 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp0_ = self->priv->progress_bar; #line 129 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp1_ = _ ("Preparing to import…"); -#line 129 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - gtk_progress_bar_set_text (_tmp0_, _tmp1_); + gtk_progress_bar_set_text (_tmp0_, _ ("Preparing to import…")); #line 130 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp2_ = self->priv->progress_bar; + _tmp1_ = self->priv->progress_bar; #line 130 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - gtk_progress_bar_pulse (_tmp2_); -#line 1078 "ImportQueuePage.c" + gtk_progress_bar_pulse (_tmp1_); +#line 1081 "ImportQueuePage.c" } static void import_queue_page_on_progress (ImportQueuePage* self, guint64 completed_bytes, guint64 total_bytes) { gdouble _tmp0_ = 0.0; - guint64 _tmp1_ = 0ULL; - guint64 _tmp2_ = 0ULL; + guint64 _tmp1_; + guint64 _tmp2_; gdouble pct = 0.0; - GtkProgressBar* _tmp5_ = NULL; + GtkProgressBar* _tmp5_; #line 133 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" g_return_if_fail (IS_IMPORT_QUEUE_PAGE (self)); #line 134 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" @@ -1092,20 +1095,20 @@ static void import_queue_page_on_progress (ImportQueuePage* self, guint64 comple _tmp2_ = total_bytes; #line 134 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" if (_tmp1_ <= _tmp2_) { -#line 1096 "ImportQueuePage.c" - guint64 _tmp3_ = 0ULL; - guint64 _tmp4_ = 0ULL; +#line 1099 "ImportQueuePage.c" + guint64 _tmp3_; + guint64 _tmp4_; #line 134 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp3_ = completed_bytes; #line 134 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp4_ = total_bytes; #line 134 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp0_ = ((gdouble) _tmp3_) / ((gdouble) _tmp4_); -#line 1105 "ImportQueuePage.c" +#line 1108 "ImportQueuePage.c" } else { #line 135 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp0_ = 0.0; -#line 1109 "ImportQueuePage.c" +#line 1112 "ImportQueuePage.c" } #line 134 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" pct = _tmp0_; @@ -1113,28 +1116,27 @@ static void import_queue_page_on_progress (ImportQueuePage* self, guint64 comple _tmp5_ = self->priv->progress_bar; #line 136 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" gtk_progress_bar_set_fraction (_tmp5_, pct); -#line 1117 "ImportQueuePage.c" +#line 1120 "ImportQueuePage.c" } static void import_queue_page_on_imported (ImportQueuePage* self, ThumbnailSource* source, GdkPixbuf* pixbuf, gint to_follow) { gboolean _tmp0_ = FALSE; - gint _tmp1_ = 0; - GdkPixbuf* _tmp3_ = NULL; - GdkPixbuf* _tmp4_ = NULL; + gint _tmp1_; + GdkPixbuf* _tmp3_; + GdkPixbuf* _tmp4_; Dimensions _tmp5_ = {0}; - ViewCollection* _tmp6_ = NULL; - ViewCollection* _tmp7_ = NULL; + ViewCollection* _tmp6_; + ViewCollection* _tmp7_; gboolean _tmp8_ = FALSE; - ThumbnailSource* _tmp9_ = NULL; - GtkProgressBar* _tmp22_ = NULL; - GtkProgressBar* _tmp23_ = NULL; - const gchar* _tmp24_ = NULL; - ThumbnailSource* _tmp25_ = NULL; - gchar* _tmp26_ = NULL; - gchar* _tmp27_ = NULL; - gchar* _tmp28_ = NULL; - gchar* _tmp29_ = NULL; + ThumbnailSource* _tmp9_; + GtkProgressBar* _tmp22_; + GtkProgressBar* _tmp23_; + ThumbnailSource* _tmp24_; + gchar* _tmp25_; + gchar* _tmp26_; + gchar* _tmp27_; + gchar* _tmp28_; #line 143 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" g_return_if_fail (IS_IMPORT_QUEUE_PAGE (self)); #line 143 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" @@ -1147,20 +1149,20 @@ static void import_queue_page_on_imported (ImportQueuePage* self, ThumbnailSourc if (_tmp1_ > 0) { #line 145 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp0_ = TRUE; -#line 1151 "ImportQueuePage.c" +#line 1153 "ImportQueuePage.c" } else { - gboolean _tmp2_ = FALSE; + gboolean _tmp2_; #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 145 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp0_ = !_tmp2_; -#line 1158 "ImportQueuePage.c" +#line 1160 "ImportQueuePage.c" } #line 145 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" if (_tmp0_) { #line 146 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" return; -#line 1164 "ImportQueuePage.c" +#line 1166 "ImportQueuePage.c" } #line 148 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp3_ = pixbuf; @@ -1182,13 +1184,13 @@ static void import_queue_page_on_imported (ImportQueuePage* self, ThumbnailSourc _tmp9_ = source; #line 152 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp9_, TYPE_LIBRARY_PHOTO)) { -#line 1186 "ImportQueuePage.c" - ViewCollection* _tmp10_ = NULL; - ViewCollection* _tmp11_ = NULL; - ThumbnailSource* _tmp12_ = NULL; - PhotoView* _tmp13_ = NULL; - PhotoView* _tmp14_ = NULL; - gboolean _tmp15_ = FALSE; +#line 1188 "ImportQueuePage.c" + ViewCollection* _tmp10_; + ViewCollection* _tmp11_; + ThumbnailSource* _tmp12_; + PhotoView* _tmp13_; + PhotoView* _tmp14_; + gboolean _tmp15_; #line 152 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp10_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 152 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" @@ -1207,14 +1209,14 @@ static void import_queue_page_on_imported (ImportQueuePage* self, ThumbnailSourc _g_object_unref0 (_tmp14_); #line 152 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _data_collection_unref0 (_tmp11_); -#line 1211 "ImportQueuePage.c" +#line 1213 "ImportQueuePage.c" } else { - ViewCollection* _tmp16_ = NULL; - ViewCollection* _tmp17_ = NULL; - ThumbnailSource* _tmp18_ = NULL; - VideoView* _tmp19_ = NULL; - VideoView* _tmp20_ = NULL; - gboolean _tmp21_ = FALSE; + ViewCollection* _tmp16_; + ViewCollection* _tmp17_; + ThumbnailSource* _tmp18_; + VideoView* _tmp19_; + VideoView* _tmp20_; + gboolean _tmp21_; #line 153 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp16_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 153 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" @@ -1233,7 +1235,7 @@ static void import_queue_page_on_imported (ImportQueuePage* self, ThumbnailSourc _g_object_unref0 (_tmp20_); #line 153 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _data_collection_unref0 (_tmp17_); -#line 1237 "ImportQueuePage.c" +#line 1239 "ImportQueuePage.c" } #line 155 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp22_ = self->priv->progress_bar; @@ -1242,60 +1244,58 @@ static void import_queue_page_on_imported (ImportQueuePage* self, ThumbnailSourc #line 156 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp23_ = self->priv->progress_bar; #line 156 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp24_ = _ ("Imported %s"); -#line 156 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp25_ = source; + _tmp24_ = source; #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)); + _tmp25_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, TYPE_DATA_OBJECT, DataObject)); #line 156 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp27_ = _tmp26_; + _tmp26_ = _tmp25_; #line 156 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp28_ = g_strdup_printf (_tmp24_, _tmp27_); + _tmp27_ = g_strdup_printf (_ ("Imported %s"), _tmp26_); #line 156 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp29_ = _tmp28_; + _tmp28_ = _tmp27_; #line 156 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - gtk_progress_bar_set_text (_tmp23_, _tmp29_); + gtk_progress_bar_set_text (_tmp23_, _tmp28_); #line 156 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _g_free0 (_tmp29_); + _g_free0 (_tmp28_); #line 156 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _g_free0 (_tmp27_); + _g_free0 (_tmp26_); #line 1263 "ImportQueuePage.c" } static void import_queue_page_on_import_complete (ImportQueuePage* self, BatchImport* batch_import, ImportManifest* manifest, BatchImportRoll* import_roll) { - BatchImport* _tmp0_ = NULL; - BatchImport* _tmp1_ = NULL; - GeeArrayList* _tmp2_ = NULL; - gint _tmp3_ = 0; - gint _tmp4_ = 0; - GeeArrayList* _tmp5_ = NULL; - gpointer _tmp6_ = NULL; - BatchImport* _tmp7_ = NULL; - BatchImport* _tmp8_ = NULL; + BatchImport* _tmp0_; + BatchImport* _tmp1_; + GeeArrayList* _tmp2_; + gint _tmp3_; + gint _tmp4_; + GeeArrayList* _tmp5_; + gpointer _tmp6_; + BatchImport* _tmp7_; + BatchImport* _tmp8_; gboolean removed = FALSE; - GeeArrayList* _tmp9_ = NULL; - BatchImport* _tmp10_ = NULL; - gboolean _tmp11_ = FALSE; - gboolean _tmp12_ = FALSE; - GeeHashSet* _tmp13_ = NULL; - BatchImport* _tmp14_ = NULL; - BatchImport* _tmp15_ = NULL; - guint _tmp16_ = 0U; - BatchImport* _tmp17_ = NULL; - guint _tmp18_ = 0U; - BatchImport* _tmp19_ = NULL; - guint _tmp20_ = 0U; - BatchImport* _tmp21_ = NULL; - guint _tmp22_ = 0U; - BatchImport* _tmp23_ = NULL; - guint _tmp24_ = 0U; - BatchImport* _tmp25_ = NULL; - guint _tmp26_ = 0U; - GeeArrayList* _tmp27_ = NULL; - gint _tmp28_ = 0; - gint _tmp29_ = 0; - BatchImport* _tmp39_ = NULL; + GeeArrayList* _tmp9_; + BatchImport* _tmp10_; + gboolean _tmp11_; + gboolean _tmp12_; + GeeHashSet* _tmp13_; + BatchImport* _tmp14_; + BatchImport* _tmp15_; + guint _tmp16_; + BatchImport* _tmp17_; + guint _tmp18_; + BatchImport* _tmp19_; + guint _tmp20_; + BatchImport* _tmp21_; + guint _tmp22_; + BatchImport* _tmp23_; + guint _tmp24_; + BatchImport* _tmp25_; + guint _tmp26_; + GeeArrayList* _tmp27_; + gint _tmp28_; + gint _tmp29_; + BatchImport* _tmp39_; #line 159 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" g_return_if_fail (IS_IMPORT_QUEUE_PAGE (self)); #line 159 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" @@ -1397,9 +1397,9 @@ static void import_queue_page_on_import_complete (ImportQueuePage* self, BatchIm #line 182 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" if (_tmp29_ > 0) { #line 1400 "ImportQueuePage.c" - GeeArrayList* _tmp30_ = NULL; - gpointer _tmp31_ = NULL; - BatchImport* _tmp32_ = NULL; + GeeArrayList* _tmp30_; + gpointer _tmp31_; + BatchImport* _tmp32_; #line 183 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp30_ = self->priv->queue; #line 183 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" @@ -1412,10 +1412,10 @@ static void import_queue_page_on_import_complete (ImportQueuePage* self, BatchIm _g_object_unref0 (_tmp32_); #line 1414 "ImportQueuePage.c" } else { - GtkProgressBar* _tmp33_ = NULL; - GtkProgressBar* _tmp34_ = NULL; - GtkProgressBar* _tmp35_ = NULL; - gboolean _tmp36_ = FALSE; + GtkProgressBar* _tmp33_; + GtkProgressBar* _tmp34_; + GtkProgressBar* _tmp35_; + gboolean _tmp36_; #line 186 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp33_ = self->priv->progress_bar; #line 186 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" @@ -1435,8 +1435,8 @@ static void import_queue_page_on_import_complete (ImportQueuePage* self, BatchIm #line 198 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" if (_tmp36_) { #line 1438 "ImportQueuePage.c" - AppWindow* _tmp37_ = NULL; - AppWindow* _tmp38_ = NULL; + AppWindow* _tmp37_; + AppWindow* _tmp38_; #line 199 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp37_ = app_window_get_instance (); #line 199 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" @@ -1456,13 +1456,13 @@ static void import_queue_page_on_import_complete (ImportQueuePage* self, BatchIm #line 207 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp39_ = batch_import; #line 207 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - g_signal_emit_by_name (self, "batch-removed", _tmp39_); + g_signal_emit (self, import_queue_page_signals[IMPORT_QUEUE_PAGE_BATCH_REMOVED_SIGNAL], 0, _tmp39_); #line 1461 "ImportQueuePage.c" } static void import_queue_page_on_fatal_error (ImportQueuePage* self, ImportResult _result_, const gchar* message) { - const gchar* _tmp0_ = NULL; + const gchar* _tmp0_; #line 210 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" g_return_if_fail (IS_IMPORT_QUEUE_PAGE (self)); #line 210 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" @@ -1481,25 +1481,25 @@ static void import_queue_page_class_init (ImportQueuePageClass * klass) { #line 7 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" g_type_class_add_private (klass, sizeof (ImportQueuePagePrivate)); #line 7 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - ((PageClass *) klass)->init_collect_ui_filenames = (void (*)(Page*, GeeList*)) import_queue_page_real_init_collect_ui_filenames; + ((PageClass *) klass)->init_collect_ui_filenames = (void (*) (Page *, GeeList*)) import_queue_page_real_init_collect_ui_filenames; #line 7 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - ((PageClass *) klass)->add_actions = (void (*)(Page*, GActionMap*)) import_queue_page_real_add_actions; + ((PageClass *) klass)->add_actions = (void (*) (Page *, GActionMap*)) import_queue_page_real_add_actions; #line 7 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - ((PageClass *) klass)->remove_actions = (void (*)(Page*, GActionMap*)) import_queue_page_real_remove_actions; + ((PageClass *) klass)->remove_actions = (void (*) (Page *, GActionMap*)) 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); + import_queue_page_signals[IMPORT_QUEUE_PAGE_BATCH_ADDED_SIGNAL] = 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); + import_queue_page_signals[IMPORT_QUEUE_PAGE_BATCH_REMOVED_SIGNAL] = 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 1496 "ImportQueuePage.c" } static void import_queue_page_instance_init (ImportQueuePage * self) { - GeeArrayList* _tmp0_ = NULL; - GeeHashSet* _tmp1_ = NULL; - GtkProgressBar* _tmp2_ = NULL; + GeeArrayList* _tmp0_; + GeeHashSet* _tmp1_; + GtkProgressBar* _tmp2_; #line 7 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" self->priv = IMPORT_QUEUE_PAGE_GET_PRIVATE (self); #line 10 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" @@ -1524,7 +1524,7 @@ static void import_queue_page_instance_init (ImportQueuePage * self) { } -static void import_queue_page_finalize (GObject* obj) { +static void import_queue_page_finalize (GObject * obj) { ImportQueuePage * self; #line 7 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_IMPORT_QUEUE_PAGE, ImportQueuePage); diff --git a/src/library/ImportQueueSidebarEntry.c b/src/library/ImportQueueSidebarEntry.c index cd17564..bd9e970 100644 --- a/src/library/ImportQueueSidebarEntry.c +++ b/src/library/ImportQueueSidebarEntry.c @@ -1,4 +1,4 @@ -/* ImportQueueSidebarEntry.c generated by valac 0.34.7, the Vala compiler +/* ImportQueueSidebarEntry.c generated by valac 0.36.6, the Vala compiler * generated from ImportQueueSidebarEntry.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -272,7 +272,7 @@ LibraryImportQueueSidebarEntry* library_import_queue_sidebar_entry_new (void) { static gchar* library_import_queue_sidebar_entry_real_get_sidebar_name (SidebarSimplePageEntry* base) { LibraryImportQueueSidebarEntry * self; gchar* result = NULL; - gchar* _tmp0_ = NULL; + gchar* _tmp0_; #line 19 "/home/jens/Source/shotwell/src/library/ImportQueueSidebarEntry.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, LIBRARY_TYPE_IMPORT_QUEUE_SIDEBAR_ENTRY, LibraryImportQueueSidebarEntry); #line 20 "/home/jens/Source/shotwell/src/library/ImportQueueSidebarEntry.vala" @@ -288,7 +288,7 @@ static gchar* library_import_queue_sidebar_entry_real_get_sidebar_name (SidebarS static gchar* library_import_queue_sidebar_entry_real_get_sidebar_icon (SidebarSimplePageEntry* base) { LibraryImportQueueSidebarEntry * self; gchar* result = NULL; - gchar* _tmp0_ = NULL; + gchar* _tmp0_; #line 23 "/home/jens/Source/shotwell/src/library/ImportQueueSidebarEntry.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, LIBRARY_TYPE_IMPORT_QUEUE_SIDEBAR_ENTRY, LibraryImportQueueSidebarEntry); #line 24 "/home/jens/Source/shotwell/src/library/ImportQueueSidebarEntry.vala" @@ -304,7 +304,7 @@ static gchar* library_import_queue_sidebar_entry_real_get_sidebar_icon (SidebarS static Page* library_import_queue_sidebar_entry_real_create_page (SidebarSimplePageEntry* base) { LibraryImportQueueSidebarEntry * self; Page* result = NULL; - ImportQueuePage* _tmp0_ = NULL; + ImportQueuePage* _tmp0_; #line 27 "/home/jens/Source/shotwell/src/library/ImportQueueSidebarEntry.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, LIBRARY_TYPE_IMPORT_QUEUE_SIDEBAR_ENTRY, LibraryImportQueueSidebarEntry); #line 28 "/home/jens/Source/shotwell/src/library/ImportQueueSidebarEntry.vala" @@ -321,8 +321,8 @@ static Page* library_import_queue_sidebar_entry_real_create_page (SidebarSimpleP static ImportQueuePage* library_import_queue_sidebar_entry_get_queue_page (LibraryImportQueueSidebarEntry* self) { ImportQueuePage* result = NULL; - Page* _tmp0_ = NULL; - ImportQueuePage* _tmp1_ = NULL; + Page* _tmp0_; + ImportQueuePage* _tmp1_; #line 31 "/home/jens/Source/shotwell/src/library/ImportQueueSidebarEntry.vala" g_return_val_if_fail (LIBRARY_IS_IMPORT_QUEUE_SIDEBAR_ENTRY (self), NULL); #line 32 "/home/jens/Source/shotwell/src/library/ImportQueueSidebarEntry.vala" @@ -358,10 +358,10 @@ static void _library_import_queue_sidebar_entry_on_batch_added_or_removed_import static void library_import_queue_sidebar_entry_on_page_created (LibraryImportQueueSidebarEntry* self) { - ImportQueuePage* _tmp0_ = NULL; - ImportQueuePage* _tmp1_ = NULL; - ImportQueuePage* _tmp2_ = NULL; - ImportQueuePage* _tmp3_ = NULL; + ImportQueuePage* _tmp0_; + ImportQueuePage* _tmp1_; + ImportQueuePage* _tmp2_; + ImportQueuePage* _tmp3_; #line 35 "/home/jens/Source/shotwell/src/library/ImportQueueSidebarEntry.vala" g_return_if_fail (LIBRARY_IS_IMPORT_QUEUE_SIDEBAR_ENTRY (self)); #line 36 "/home/jens/Source/shotwell/src/library/ImportQueueSidebarEntry.vala" @@ -385,12 +385,12 @@ static void library_import_queue_sidebar_entry_on_page_created (LibraryImportQue static void library_import_queue_sidebar_entry_on_destroying_page (LibraryImportQueueSidebarEntry* self) { - ImportQueuePage* _tmp0_ = NULL; - ImportQueuePage* _tmp1_ = NULL; - guint _tmp2_ = 0U; - ImportQueuePage* _tmp3_ = NULL; - ImportQueuePage* _tmp4_ = NULL; - guint _tmp5_ = 0U; + ImportQueuePage* _tmp0_; + ImportQueuePage* _tmp1_; + guint _tmp2_; + ImportQueuePage* _tmp3_; + ImportQueuePage* _tmp4_; + guint _tmp5_; #line 40 "/home/jens/Source/shotwell/src/library/ImportQueueSidebarEntry.vala" g_return_if_fail (LIBRARY_IS_IMPORT_QUEUE_SIDEBAR_ENTRY (self)); #line 41 "/home/jens/Source/shotwell/src/library/ImportQueueSidebarEntry.vala" @@ -418,9 +418,9 @@ static void library_import_queue_sidebar_entry_on_destroying_page (LibraryImport static void library_import_queue_sidebar_entry_on_batch_added_or_removed (LibraryImportQueueSidebarEntry* self) { - ImportQueuePage* _tmp0_ = NULL; - ImportQueuePage* _tmp1_ = NULL; - gint _tmp2_ = 0; + ImportQueuePage* _tmp0_; + ImportQueuePage* _tmp1_; + gint _tmp2_; #line 45 "/home/jens/Source/shotwell/src/library/ImportQueueSidebarEntry.vala" g_return_if_fail (LIBRARY_IS_IMPORT_QUEUE_SIDEBAR_ENTRY (self)); #line 46 "/home/jens/Source/shotwell/src/library/ImportQueueSidebarEntry.vala" @@ -438,10 +438,10 @@ static void library_import_queue_sidebar_entry_on_batch_added_or_removed (Librar void library_import_queue_sidebar_entry_enqueue_and_schedule (LibraryImportQueueSidebarEntry* self, BatchImport* batch_import, gboolean allow_user_cancel) { - ImportQueuePage* _tmp0_ = NULL; - ImportQueuePage* _tmp1_ = NULL; - BatchImport* _tmp2_ = NULL; - gboolean _tmp3_ = FALSE; + ImportQueuePage* _tmp0_; + ImportQueuePage* _tmp1_; + BatchImport* _tmp2_; + gboolean _tmp3_; #line 49 "/home/jens/Source/shotwell/src/library/ImportQueueSidebarEntry.vala" g_return_if_fail (LIBRARY_IS_IMPORT_QUEUE_SIDEBAR_ENTRY (self)); #line 49 "/home/jens/Source/shotwell/src/library/ImportQueueSidebarEntry.vala" @@ -468,11 +468,11 @@ static void library_import_queue_sidebar_entry_class_init (LibraryImportQueueSid #line 7 "/home/jens/Source/shotwell/src/library/ImportQueueSidebarEntry.vala" library_import_queue_sidebar_entry_parent_class = g_type_class_peek_parent (klass); #line 7 "/home/jens/Source/shotwell/src/library/ImportQueueSidebarEntry.vala" - ((SidebarSimplePageEntryClass *) klass)->get_sidebar_name = (gchar* (*)(SidebarSimplePageEntry*)) library_import_queue_sidebar_entry_real_get_sidebar_name; + ((SidebarSimplePageEntryClass *) klass)->get_sidebar_name = (gchar* (*) (SidebarSimplePageEntry *)) library_import_queue_sidebar_entry_real_get_sidebar_name; #line 7 "/home/jens/Source/shotwell/src/library/ImportQueueSidebarEntry.vala" - ((SidebarSimplePageEntryClass *) klass)->get_sidebar_icon = (gchar* (*)(SidebarSimplePageEntry*)) library_import_queue_sidebar_entry_real_get_sidebar_icon; + ((SidebarSimplePageEntryClass *) klass)->get_sidebar_icon = (gchar* (*) (SidebarSimplePageEntry *)) library_import_queue_sidebar_entry_real_get_sidebar_icon; #line 7 "/home/jens/Source/shotwell/src/library/ImportQueueSidebarEntry.vala" - ((SidebarSimplePageEntryClass *) klass)->create_page = (Page* (*)(SidebarSimplePageEntry*)) library_import_queue_sidebar_entry_real_create_page; + ((SidebarSimplePageEntryClass *) klass)->create_page = (Page* (*) (SidebarSimplePageEntry *)) library_import_queue_sidebar_entry_real_create_page; #line 477 "ImportQueueSidebarEntry.c" } diff --git a/src/library/LastImportPage.c b/src/library/LastImportPage.c index 41a084f..fae86fe 100644 --- a/src/library/LastImportPage.c +++ b/src/library/LastImportPage.c @@ -1,4 +1,4 @@ -/* LastImportPage.c generated by valac 0.34.7, the Vala compiler +/* LastImportPage.c generated by valac 0.36.6, the Vala compiler * generated from LastImportPage.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -702,8 +702,8 @@ static gboolean last_import_page_last_import_view_manager_real_include_in_view ( GType thumbnail_source_get_type (void) G_GNUC_CONST; GType media_source_get_type (void) G_GNUC_CONST; void media_source_get_import_id (MediaSource* self, ImportID* result); -static void last_import_page_last_import_view_manager_finalize (ViewManager* obj); -static void last_import_page_finalize (GObject* obj); +static void last_import_page_last_import_view_manager_finalize (ViewManager * obj); +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) { @@ -720,12 +720,12 @@ LastImportPage* last_import_page_construct (GType object_type) { #line 721 "LastImportPage.c" { GeeIterator* _col_it = NULL; - MediaCollectionRegistry* _tmp0_ = NULL; - MediaCollectionRegistry* _tmp1_ = NULL; - GeeCollection* _tmp2_ = NULL; - GeeCollection* _tmp3_ = NULL; - GeeIterator* _tmp4_ = NULL; - GeeIterator* _tmp5_ = NULL; + MediaCollectionRegistry* _tmp0_; + MediaCollectionRegistry* _tmp1_; + GeeCollection* _tmp2_; + GeeCollection* _tmp3_; + GeeIterator* _tmp4_; + GeeIterator* _tmp5_; #line 31 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" _tmp0_ = media_collection_registry_get_instance (); #line 31 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" @@ -747,12 +747,12 @@ LastImportPage* last_import_page_construct (GType object_type) { #line 31 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" while (TRUE) { #line 750 "LastImportPage.c" - GeeIterator* _tmp6_ = NULL; - gboolean _tmp7_ = FALSE; + GeeIterator* _tmp6_; + gboolean _tmp7_; MediaSourceCollection* col = NULL; - GeeIterator* _tmp8_ = NULL; - gpointer _tmp9_ = NULL; - MediaSourceCollection* _tmp10_ = NULL; + GeeIterator* _tmp8_; + gpointer _tmp9_; + MediaSourceCollection* _tmp10_; #line 31 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" _tmp6_ = _col_it; #line 31 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" @@ -798,20 +798,20 @@ LastImportPage* last_import_page_new (void) { static void last_import_page_on_import_rolls_altered (LastImportPage* self) { ImportID* current_last_import_id = NULL; - MediaCollectionRegistry* _tmp0_ = NULL; - MediaCollectionRegistry* _tmp1_ = NULL; - ImportID* _tmp2_ = NULL; - ImportID* _tmp3_ = NULL; - ImportID* _tmp4_ = NULL; - ImportID* _tmp9_ = NULL; - gint64 _tmp10_ = 0LL; - ImportID _tmp11_ = {0}; - gint64 _tmp12_ = 0LL; - ImportID* _tmp13_ = NULL; - ViewCollection* _tmp14_ = NULL; - ViewCollection* _tmp15_ = NULL; - ViewCollection* _tmp16_ = NULL; - ViewCollection* _tmp17_ = NULL; + MediaCollectionRegistry* _tmp0_; + MediaCollectionRegistry* _tmp1_; + ImportID* _tmp2_; + ImportID* _tmp3_; + ImportID* _tmp4_; + ImportID* _tmp9_; + gint64 _tmp10_; + ImportID _tmp11_; + gint64 _tmp12_; + ImportID* _tmp13_; + ViewCollection* _tmp14_; + ViewCollection* _tmp15_; + ViewCollection* _tmp16_; + ViewCollection* _tmp17_; #line 45 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" g_return_if_fail (IS_LAST_IMPORT_PAGE (self)); #line 47 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" @@ -831,10 +831,10 @@ static void last_import_page_on_import_rolls_altered (LastImportPage* self) { #line 50 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" if (_tmp4_ == NULL) { #line 834 "LastImportPage.c" - ViewCollection* _tmp5_ = NULL; - ViewCollection* _tmp6_ = NULL; - ViewCollection* _tmp7_ = NULL; - ViewCollection* _tmp8_ = NULL; + ViewCollection* _tmp5_; + ViewCollection* _tmp6_; + ViewCollection* _tmp7_; + ViewCollection* _tmp8_; #line 51 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" _tmp5_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 51 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" @@ -896,12 +896,12 @@ static void last_import_page_on_import_rolls_altered (LastImportPage* self) { #line 897 "LastImportPage.c" { GeeIterator* _col_it = NULL; - MediaCollectionRegistry* _tmp18_ = NULL; - MediaCollectionRegistry* _tmp19_ = NULL; - GeeCollection* _tmp20_ = NULL; - GeeCollection* _tmp21_ = NULL; - GeeIterator* _tmp22_ = NULL; - GeeIterator* _tmp23_ = NULL; + MediaCollectionRegistry* _tmp18_; + MediaCollectionRegistry* _tmp19_; + GeeCollection* _tmp20_; + GeeCollection* _tmp21_; + GeeIterator* _tmp22_; + GeeIterator* _tmp23_; #line 65 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" _tmp18_ = media_collection_registry_get_instance (); #line 65 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" @@ -923,20 +923,20 @@ static void last_import_page_on_import_rolls_altered (LastImportPage* self) { #line 65 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" while (TRUE) { #line 926 "LastImportPage.c" - GeeIterator* _tmp24_ = NULL; - gboolean _tmp25_ = FALSE; + GeeIterator* _tmp24_; + gboolean _tmp25_; MediaSourceCollection* col = NULL; - GeeIterator* _tmp26_ = NULL; - gpointer _tmp27_ = NULL; - ViewCollection* _tmp28_ = NULL; - ViewCollection* _tmp29_ = NULL; - MediaSourceCollection* _tmp30_ = NULL; - ImportID _tmp31_ = {0}; - LastImportPageLastImportViewManager* _tmp32_ = NULL; - LastImportPageLastImportViewManager* _tmp33_ = NULL; - Alteration* _tmp34_ = NULL; - ViewCollectionMonitor* _tmp35_ = NULL; - ViewCollectionMonitor* _tmp36_ = NULL; + GeeIterator* _tmp26_; + gpointer _tmp27_; + ViewCollection* _tmp28_; + ViewCollection* _tmp29_; + MediaSourceCollection* _tmp30_; + ImportID _tmp31_; + LastImportPageLastImportViewManager* _tmp32_; + LastImportPageLastImportViewManager* _tmp33_; + Alteration* _tmp34_; + ViewCollectionMonitor* _tmp35_; + ViewCollectionMonitor* _tmp36_; #line 65 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" _tmp24_ = _col_it; #line 65 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" @@ -995,8 +995,8 @@ static void last_import_page_real_get_config_photos_sort (MediaPage* base, gbool LastImportPage * self; gboolean _vala_sort_order = FALSE; gint _vala_sort_by = 0; - ConfigFacade* _tmp0_ = NULL; - ConfigFacade* _tmp1_ = NULL; + ConfigFacade* _tmp0_; + ConfigFacade* _tmp1_; gboolean _tmp2_ = FALSE; gint _tmp3_ = 0; #line 71 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" @@ -1030,10 +1030,10 @@ static void last_import_page_real_get_config_photos_sort (MediaPage* base, gbool static void last_import_page_real_set_config_photos_sort (MediaPage* base, gboolean sort_order, gint sort_by) { LastImportPage * self; - ConfigFacade* _tmp0_ = NULL; - ConfigFacade* _tmp1_ = NULL; - gboolean _tmp2_ = FALSE; - gint _tmp3_ = 0; + ConfigFacade* _tmp0_; + ConfigFacade* _tmp1_; + gboolean _tmp2_; + gint _tmp3_; #line 75 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LAST_IMPORT_PAGE, LastImportPage); #line 76 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" @@ -1054,8 +1054,8 @@ static void last_import_page_real_set_config_photos_sort (MediaPage* base, gbool static LastImportPageLastImportViewManager* last_import_page_last_import_view_manager_construct (GType object_type, LastImportPage* owner, ImportID* import_id) { LastImportPageLastImportViewManager* self = NULL; - LastImportPage* _tmp0_ = NULL; - ImportID _tmp1_ = {0}; + LastImportPage* _tmp0_; + ImportID _tmp1_; #line 13 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" g_return_val_if_fail (IS_LAST_IMPORT_PAGE (owner), NULL); #line 13 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" @@ -1084,11 +1084,11 @@ static LastImportPageLastImportViewManager* last_import_page_last_import_view_ma static gboolean last_import_page_last_import_view_manager_real_include_in_view (ViewManager* base, DataSource* source) { LastImportPageLastImportViewManager * self; gboolean result = FALSE; - DataSource* _tmp0_ = NULL; + DataSource* _tmp0_; ImportID _tmp1_ = {0}; - gint64 _tmp2_ = 0LL; - ImportID _tmp3_ = {0}; - gint64 _tmp4_ = 0LL; + gint64 _tmp2_; + ImportID _tmp3_; + gint64 _tmp4_; #line 19 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, LAST_IMPORT_PAGE_TYPE_LAST_IMPORT_VIEW_MANAGER, LastImportPageLastImportViewManager); #line 19 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" @@ -1119,7 +1119,7 @@ static void last_import_page_last_import_view_manager_class_init (LastImportPage #line 10 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" g_type_class_add_private (klass, sizeof (LastImportPageLastImportViewManagerPrivate)); #line 10 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" - ((ViewManagerClass *) klass)->include_in_view = (gboolean (*)(ViewManager*, DataSource*)) last_import_page_last_import_view_manager_real_include_in_view; + ((ViewManagerClass *) klass)->include_in_view = (gboolean (*) (ViewManager *, DataSource*)) last_import_page_last_import_view_manager_real_include_in_view; #line 1124 "LastImportPage.c" } @@ -1131,7 +1131,7 @@ static void last_import_page_last_import_view_manager_instance_init (LastImportP } -static void last_import_page_last_import_view_manager_finalize (ViewManager* obj) { +static void last_import_page_last_import_view_manager_finalize (ViewManager * obj) { LastImportPageLastImportViewManager * self; #line 10 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, LAST_IMPORT_PAGE_TYPE_LAST_IMPORT_VIEW_MANAGER, LastImportPageLastImportViewManager); @@ -1159,9 +1159,9 @@ static void last_import_page_class_init (LastImportPageClass * klass) { #line 7 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" g_type_class_add_private (klass, sizeof (LastImportPagePrivate)); #line 7 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" - ((MediaPageClass *) klass)->get_config_photos_sort = (void (*)(MediaPage*, gboolean*, gint*)) last_import_page_real_get_config_photos_sort; + ((MediaPageClass *) klass)->get_config_photos_sort = (void (*) (MediaPage *, gboolean*, gint*)) last_import_page_real_get_config_photos_sort; #line 7 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" - ((MediaPageClass *) klass)->set_config_photos_sort = (void (*)(MediaPage*, gboolean, gint)) last_import_page_real_set_config_photos_sort; + ((MediaPageClass *) klass)->set_config_photos_sort = (void (*) (MediaPage *, gboolean, gint)) 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 1168 "LastImportPage.c" @@ -1169,7 +1169,7 @@ static void last_import_page_class_init (LastImportPageClass * klass) { static void last_import_page_instance_init (LastImportPage * self) { - Alteration* _tmp0_ = NULL; + Alteration* _tmp0_; #line 7 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" self->priv = LAST_IMPORT_PAGE_GET_PRIVATE (self); #line 24 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" @@ -1182,19 +1182,19 @@ static void last_import_page_instance_init (LastImportPage * self) { } -static void last_import_page_finalize (GObject* obj) { +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 1190 "LastImportPage.c" { GeeIterator* _col_it = NULL; - MediaCollectionRegistry* _tmp0_ = NULL; - MediaCollectionRegistry* _tmp1_ = NULL; - GeeCollection* _tmp2_ = NULL; - GeeCollection* _tmp3_ = NULL; - GeeIterator* _tmp4_ = NULL; - GeeIterator* _tmp5_ = NULL; + MediaCollectionRegistry* _tmp0_; + MediaCollectionRegistry* _tmp1_; + GeeCollection* _tmp2_; + GeeCollection* _tmp3_; + GeeIterator* _tmp4_; + GeeIterator* _tmp5_; #line 40 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" _tmp0_ = media_collection_registry_get_instance (); #line 40 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" @@ -1216,13 +1216,13 @@ static void last_import_page_finalize (GObject* obj) { #line 40 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" while (TRUE) { #line 1219 "LastImportPage.c" - GeeIterator* _tmp6_ = NULL; - gboolean _tmp7_ = FALSE; + GeeIterator* _tmp6_; + gboolean _tmp7_; MediaSourceCollection* col = NULL; - GeeIterator* _tmp8_ = NULL; - gpointer _tmp9_ = NULL; - MediaSourceCollection* _tmp10_ = NULL; - guint _tmp11_ = 0U; + GeeIterator* _tmp8_; + gpointer _tmp9_; + MediaSourceCollection* _tmp10_; + guint _tmp11_; #line 40 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" _tmp6_ = _col_it; #line 40 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" diff --git a/src/library/LastImportSidebarEntry.c b/src/library/LastImportSidebarEntry.c index 5032c53..03684ca 100644 --- a/src/library/LastImportSidebarEntry.c +++ b/src/library/LastImportSidebarEntry.c @@ -1,4 +1,4 @@ -/* LastImportSidebarEntry.c generated by valac 0.34.7, the Vala compiler +/* LastImportSidebarEntry.c generated by valac 0.36.6, the Vala compiler * generated from LastImportSidebarEntry.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -315,7 +315,7 @@ GType checkerboard_page_get_type (void) G_GNUC_CONST; GType media_page_get_type (void) G_GNUC_CONST; GType collection_page_get_type (void) G_GNUC_CONST; GType last_import_page_get_type (void) G_GNUC_CONST; -static void library_last_import_sidebar_entry_finalize (GObject* obj); +static void library_last_import_sidebar_entry_finalize (GObject * obj); static void _library_last_import_sidebar_entry_on_import_rolls_altered_media_source_collection_import_roll_altered (MediaSourceCollection* _sender, gpointer self) { @@ -327,21 +327,21 @@ static void _library_last_import_sidebar_entry_on_import_rolls_altered_media_sou LibraryLastImportSidebarEntry* library_last_import_sidebar_entry_construct (GType object_type) { LibraryLastImportSidebarEntry * self = NULL; - MediaCollectionRegistry* _tmp11_ = NULL; - MediaCollectionRegistry* _tmp12_ = NULL; - ImportID* _tmp13_ = NULL; - ImportID* _tmp14_ = NULL; + MediaCollectionRegistry* _tmp11_; + MediaCollectionRegistry* _tmp12_; + ImportID* _tmp13_; + ImportID* _tmp14_; #line 8 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala" self = (LibraryLastImportSidebarEntry*) library_hideable_page_entry_construct (object_type); #line 337 "LastImportSidebarEntry.c" { GeeIterator* _media_sources_it = NULL; - MediaCollectionRegistry* _tmp0_ = NULL; - MediaCollectionRegistry* _tmp1_ = NULL; - GeeCollection* _tmp2_ = NULL; - GeeCollection* _tmp3_ = NULL; - GeeIterator* _tmp4_ = NULL; - GeeIterator* _tmp5_ = NULL; + MediaCollectionRegistry* _tmp0_; + MediaCollectionRegistry* _tmp1_; + GeeCollection* _tmp2_; + GeeCollection* _tmp3_; + GeeIterator* _tmp4_; + GeeIterator* _tmp5_; #line 9 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala" _tmp0_ = media_collection_registry_get_instance (); #line 9 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala" @@ -363,12 +363,12 @@ LibraryLastImportSidebarEntry* library_last_import_sidebar_entry_construct (GTyp #line 9 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala" while (TRUE) { #line 366 "LastImportSidebarEntry.c" - GeeIterator* _tmp6_ = NULL; - gboolean _tmp7_ = FALSE; + GeeIterator* _tmp6_; + gboolean _tmp7_; MediaSourceCollection* media_sources = NULL; - GeeIterator* _tmp8_ = NULL; - gpointer _tmp9_ = NULL; - MediaSourceCollection* _tmp10_ = NULL; + GeeIterator* _tmp8_; + gpointer _tmp9_; + MediaSourceCollection* _tmp10_; #line 9 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala" _tmp6_ = _media_sources_it; #line 9 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala" @@ -427,7 +427,7 @@ LibraryLastImportSidebarEntry* library_last_import_sidebar_entry_new (void) { static gchar* library_last_import_sidebar_entry_real_get_sidebar_name (SidebarSimplePageEntry* base) { LibraryLastImportSidebarEntry * self; gchar* result = NULL; - gchar* _tmp0_ = NULL; + gchar* _tmp0_; #line 20 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, LIBRARY_TYPE_LAST_IMPORT_SIDEBAR_ENTRY, LibraryLastImportSidebarEntry); #line 21 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala" @@ -443,7 +443,7 @@ static gchar* library_last_import_sidebar_entry_real_get_sidebar_name (SidebarSi static gchar* library_last_import_sidebar_entry_real_get_sidebar_icon (SidebarSimplePageEntry* base) { LibraryLastImportSidebarEntry * self; gchar* result = NULL; - gchar* _tmp0_ = NULL; + gchar* _tmp0_; #line 24 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, LIBRARY_TYPE_LAST_IMPORT_SIDEBAR_ENTRY, LibraryLastImportSidebarEntry); #line 25 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala" @@ -459,7 +459,7 @@ static gchar* library_last_import_sidebar_entry_real_get_sidebar_icon (SidebarSi static Page* library_last_import_sidebar_entry_real_create_page (SidebarSimplePageEntry* base) { LibraryLastImportSidebarEntry * self; Page* result = NULL; - LastImportPage* _tmp0_ = NULL; + LastImportPage* _tmp0_; #line 28 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, LIBRARY_TYPE_LAST_IMPORT_SIDEBAR_ENTRY, LibraryLastImportSidebarEntry); #line 29 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala" @@ -475,10 +475,10 @@ static Page* library_last_import_sidebar_entry_real_create_page (SidebarSimplePa static void library_last_import_sidebar_entry_on_import_rolls_altered (LibraryLastImportSidebarEntry* self) { - MediaCollectionRegistry* _tmp0_ = NULL; - MediaCollectionRegistry* _tmp1_ = NULL; - ImportID* _tmp2_ = NULL; - ImportID* _tmp3_ = NULL; + MediaCollectionRegistry* _tmp0_; + MediaCollectionRegistry* _tmp1_; + ImportID* _tmp2_; + ImportID* _tmp3_; #line 32 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala" g_return_if_fail (LIBRARY_IS_LAST_IMPORT_SIDEBAR_ENTRY (self)); #line 33 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala" @@ -503,11 +503,11 @@ static void library_last_import_sidebar_entry_class_init (LibraryLastImportSideb #line 7 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala" library_last_import_sidebar_entry_parent_class = g_type_class_peek_parent (klass); #line 7 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala" - ((SidebarSimplePageEntryClass *) klass)->get_sidebar_name = (gchar* (*)(SidebarSimplePageEntry*)) library_last_import_sidebar_entry_real_get_sidebar_name; + ((SidebarSimplePageEntryClass *) klass)->get_sidebar_name = (gchar* (*) (SidebarSimplePageEntry *)) library_last_import_sidebar_entry_real_get_sidebar_name; #line 7 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala" - ((SidebarSimplePageEntryClass *) klass)->get_sidebar_icon = (gchar* (*)(SidebarSimplePageEntry*)) library_last_import_sidebar_entry_real_get_sidebar_icon; + ((SidebarSimplePageEntryClass *) klass)->get_sidebar_icon = (gchar* (*) (SidebarSimplePageEntry *)) library_last_import_sidebar_entry_real_get_sidebar_icon; #line 7 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala" - ((SidebarSimplePageEntryClass *) klass)->create_page = (Page* (*)(SidebarSimplePageEntry*)) library_last_import_sidebar_entry_real_create_page; + ((SidebarSimplePageEntryClass *) klass)->create_page = (Page* (*) (SidebarSimplePageEntry *)) library_last_import_sidebar_entry_real_create_page; #line 7 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala" G_OBJECT_CLASS (klass)->finalize = library_last_import_sidebar_entry_finalize; #line 514 "LastImportSidebarEntry.c" @@ -518,19 +518,19 @@ static void library_last_import_sidebar_entry_instance_init (LibraryLastImportSi } -static void library_last_import_sidebar_entry_finalize (GObject* obj) { +static void library_last_import_sidebar_entry_finalize (GObject * obj) { LibraryLastImportSidebarEntry * self; #line 7 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, LIBRARY_TYPE_LAST_IMPORT_SIDEBAR_ENTRY, LibraryLastImportSidebarEntry); #line 526 "LastImportSidebarEntry.c" { GeeIterator* _media_sources_it = NULL; - MediaCollectionRegistry* _tmp0_ = NULL; - MediaCollectionRegistry* _tmp1_ = NULL; - GeeCollection* _tmp2_ = NULL; - GeeCollection* _tmp3_ = NULL; - GeeIterator* _tmp4_ = NULL; - GeeIterator* _tmp5_ = NULL; + MediaCollectionRegistry* _tmp0_; + MediaCollectionRegistry* _tmp1_; + GeeCollection* _tmp2_; + GeeCollection* _tmp3_; + GeeIterator* _tmp4_; + GeeIterator* _tmp5_; #line 16 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala" _tmp0_ = media_collection_registry_get_instance (); #line 16 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala" @@ -552,13 +552,13 @@ static void library_last_import_sidebar_entry_finalize (GObject* obj) { #line 16 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala" while (TRUE) { #line 555 "LastImportSidebarEntry.c" - GeeIterator* _tmp6_ = NULL; - gboolean _tmp7_ = FALSE; + GeeIterator* _tmp6_; + gboolean _tmp7_; MediaSourceCollection* media_sources = NULL; - GeeIterator* _tmp8_ = NULL; - gpointer _tmp9_ = NULL; - MediaSourceCollection* _tmp10_ = NULL; - guint _tmp11_ = 0U; + GeeIterator* _tmp8_; + gpointer _tmp9_; + MediaSourceCollection* _tmp10_; + guint _tmp11_; #line 16 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala" _tmp6_ = _media_sources_it; #line 16 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala" diff --git a/src/library/Library.c b/src/library/Library.c index bb7907e..460fc05 100644 --- a/src/library/Library.c +++ b/src/library/Library.c @@ -1,4 +1,4 @@ -/* Library.c generated by valac 0.34.7, the Vala compiler +/* Library.c generated by valac 0.36.6, the Vala compiler * generated from Library.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -22,8 +22,8 @@ void library_trash_sidebar_entry_terminate (void); void library_init (GError** error) { - gboolean _tmp0_ = FALSE; - gboolean _tmp1_ = FALSE; + gboolean _tmp0_; + gboolean _tmp1_; #line 10 "/home/jens/Source/shotwell/src/library/Library.vala" library_trash_sidebar_entry_init (); #line 11 "/home/jens/Source/shotwell/src/library/Library.vala" diff --git a/src/library/LibraryWindow.c b/src/library/LibraryWindow.c index 526b38f..00ba201 100644 --- a/src/library/LibraryWindow.c +++ b/src/library/LibraryWindow.c @@ -1,4 +1,4 @@ -/* LibraryWindow.c generated by valac 0.34.7, the Vala compiler +/* LibraryWindow.c generated by valac 0.36.6, the Vala compiler * generated from LibraryWindow.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -1506,7 +1506,7 @@ gint view_collection_get_selected_count (ViewCollection* self); GeeList* view_collection_get_selected_sources_of_type (ViewCollection* self, GType t); GType library_photo_get_type (void) G_GNUC_CONST; GeeList* view_collection_get_sources_of_type (ViewCollection* self, GType t); -static gboolean library_window_get_fullscreen_photo (LibraryWindow* self, Page* page, CollectionPage** collection, Photo** start, ViewCollection** view_collection); +static gboolean library_window_get_fullscreen_photo (LibraryWindow* self, Page* page, CollectionPage* * collection, Photo* * start, ViewCollection* * view_collection); GType events_directory_page_get_type (void) G_GNUC_CONST; gint data_collection_get_count (DataCollection* self); DataObject* data_collection_get_at (DataCollection* self, gint index); @@ -1732,8 +1732,8 @@ enum { 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); +static void library_window_fullscreen_photo_page_finalize (GObject * obj); +static void library_window_finalize (GObject * obj); static void _vala_library_window_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec); static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func); static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func); @@ -1972,57 +1972,57 @@ static void _library_window_on_update_properties_now_one_shot_callback (gpointer LibraryWindow* library_window_construct (GType object_type, ProgressMonitor progress_monitor, void* progress_monitor_target) { LibraryWindow * self = NULL; - SidebarTree* _tmp0_ = NULL; - SidebarTree* _tmp1_ = NULL; - SidebarTree* _tmp2_ = NULL; - SidebarTree* _tmp3_ = NULL; - SidebarTree* _tmp4_ = NULL; - SidebarTree* _tmp5_ = NULL; - LibraryBranch* _tmp6_ = NULL; - SidebarTree* _tmp7_ = NULL; - TagsBranch* _tmp8_ = NULL; - SidebarTree* _tmp9_ = NULL; - FoldersBranch* _tmp10_ = NULL; - SidebarTree* _tmp11_ = NULL; - EventsBranch* _tmp12_ = NULL; - SidebarTree* _tmp13_ = NULL; - CameraBranch* _tmp14_ = NULL; - SidebarTree* _tmp15_ = NULL; - SearchesBranch* _tmp16_ = NULL; - ExtendedPropertiesWindow* _tmp17_ = NULL; - ExtendedPropertiesWindow* _tmp18_ = NULL; - ExtendedPropertiesWindow* _tmp19_ = NULL; - OneShotScheduler* _tmp20_ = NULL; - SearchFilterActions* _tmp21_ = NULL; - SearchFilterToolbar* _tmp22_ = NULL; - LibraryBranch* _tmp23_ = NULL; - LibraryPhotosEntry* _tmp24_ = NULL; - LibraryPhotosEntry* _tmp25_ = NULL; - Page* _tmp26_ = NULL; - Page* _tmp27_ = NULL; + SidebarTree* _tmp0_; + SidebarTree* _tmp1_; + SidebarTree* _tmp2_; + SidebarTree* _tmp3_; + SidebarTree* _tmp4_; + SidebarTree* _tmp5_; + LibraryBranch* _tmp6_; + SidebarTree* _tmp7_; + TagsBranch* _tmp8_; + SidebarTree* _tmp9_; + FoldersBranch* _tmp10_; + SidebarTree* _tmp11_; + EventsBranch* _tmp12_; + SidebarTree* _tmp13_; + CameraBranch* _tmp14_; + SidebarTree* _tmp15_; + SearchesBranch* _tmp16_; + ExtendedPropertiesWindow* _tmp17_; + ExtendedPropertiesWindow* _tmp18_; + ExtendedPropertiesWindow* _tmp19_; + OneShotScheduler* _tmp20_; + SearchFilterActions* _tmp21_; + SearchFilterToolbar* _tmp22_; + LibraryBranch* _tmp23_; + LibraryPhotosEntry* _tmp24_; + LibraryPhotosEntry* _tmp25_; + Page* _tmp26_; + Page* _tmp27_; GtkTargetEntry* main_window_dnd_targets = NULL; - GtkTargetEntry _tmp40_ = {0}; - GtkTargetEntry _tmp41_ = {0}; - GtkTargetEntry* _tmp42_ = NULL; - gint main_window_dnd_targets_length1 = 0; - gint _main_window_dnd_targets_size_ = 0; - GtkTargetEntry* _tmp43_ = NULL; - gint _tmp43__length1 = 0; - MetadataWriter* _tmp44_ = NULL; - MetadataWriter* _tmp45_ = NULL; + GtkTargetEntry _tmp40_; + GtkTargetEntry _tmp41_; + GtkTargetEntry* _tmp42_; + gint main_window_dnd_targets_length1; + gint _main_window_dnd_targets_size_; + GtkTargetEntry* _tmp43_; + gint _tmp43__length1; + MetadataWriter* _tmp44_; + MetadataWriter* _tmp45_; LibraryMonitor* monitor = NULL; - LibraryMonitorPool* _tmp46_ = NULL; - LibraryMonitorPool* _tmp47_ = NULL; - LibraryMonitor* _tmp48_ = NULL; - LibraryMonitor* _tmp49_ = NULL; - LibraryMonitor* _tmp50_ = NULL; - LibraryMonitorPool* _tmp52_ = NULL; - LibraryMonitorPool* _tmp53_ = NULL; - LibraryMonitorPool* _tmp54_ = NULL; - LibraryMonitorPool* _tmp55_ = NULL; - CameraTable* _tmp56_ = NULL; - CameraTable* _tmp57_ = NULL; - GtkProgressBar* _tmp58_ = NULL; + LibraryMonitorPool* _tmp46_; + LibraryMonitorPool* _tmp47_; + LibraryMonitor* _tmp48_; + LibraryMonitor* _tmp49_; + LibraryMonitor* _tmp50_; + LibraryMonitorPool* _tmp52_; + LibraryMonitorPool* _tmp53_; + LibraryMonitorPool* _tmp54_; + LibraryMonitorPool* _tmp55_; + CameraTable* _tmp56_; + CameraTable* _tmp57_; + GtkProgressBar* _tmp58_; #line 217 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" static const gchar* accels[] = {"<Primary>f", "F8", NULL}; #line 152 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -2138,12 +2138,12 @@ LibraryWindow* library_window_construct (GType object_type, ProgressMonitor prog #line 2139 "LibraryWindow.c" { GeeIterator* _media_sources_it = NULL; - MediaCollectionRegistry* _tmp28_ = NULL; - MediaCollectionRegistry* _tmp29_ = NULL; - GeeCollection* _tmp30_ = NULL; - GeeCollection* _tmp31_ = NULL; - GeeIterator* _tmp32_ = NULL; - GeeIterator* _tmp33_ = NULL; + MediaCollectionRegistry* _tmp28_; + MediaCollectionRegistry* _tmp29_; + GeeCollection* _tmp30_; + GeeCollection* _tmp31_; + GeeIterator* _tmp32_; + GeeIterator* _tmp33_; #line 186 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp28_ = media_collection_registry_get_instance (); #line 186 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -2165,13 +2165,13 @@ LibraryWindow* library_window_construct (GType object_type, ProgressMonitor prog #line 186 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" while (TRUE) { #line 2168 "LibraryWindow.c" - GeeIterator* _tmp34_ = NULL; - gboolean _tmp35_ = FALSE; + GeeIterator* _tmp34_; + gboolean _tmp35_; MediaSourceCollection* media_sources = NULL; - GeeIterator* _tmp36_ = NULL; - gpointer _tmp37_ = NULL; - MediaSourceCollection* _tmp38_ = NULL; - MediaSourceCollection* _tmp39_ = NULL; + GeeIterator* _tmp36_; + gpointer _tmp37_; + MediaSourceCollection* _tmp38_; + MediaSourceCollection* _tmp39_; #line 186 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp34_ = _media_sources_it; #line 186 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -2251,7 +2251,7 @@ LibraryWindow* library_window_construct (GType object_type, ProgressMonitor prog #line 205 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp50_ != NULL) { #line 2254 "LibraryWindow.c" - LibraryMonitor* _tmp51_ = NULL; + LibraryMonitor* _tmp51_; #line 206 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp51_ = monitor; #line 206 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -2348,17 +2348,17 @@ static void _library_window_on_library_monitor_auto_import_progress_library_moni static void library_window_on_library_monitor_installed (LibraryWindow* self, LibraryMonitor* monitor) { - LibraryMonitor* _tmp0_ = NULL; - GFile* _tmp1_ = NULL; - GFile* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; - gchar* _tmp4_ = NULL; - LibraryMonitor* _tmp5_ = NULL; - LibraryMonitor* _tmp6_ = NULL; - LibraryMonitor* _tmp7_ = NULL; - LibraryMonitor* _tmp8_ = NULL; - LibraryMonitor* _tmp9_ = NULL; - LibraryMonitor* _tmp10_ = NULL; + LibraryMonitor* _tmp0_; + GFile* _tmp1_; + GFile* _tmp2_; + gchar* _tmp3_; + gchar* _tmp4_; + LibraryMonitor* _tmp5_; + LibraryMonitor* _tmp6_; + LibraryMonitor* _tmp7_; + LibraryMonitor* _tmp8_; + LibraryMonitor* _tmp9_; + LibraryMonitor* _tmp10_; #line 249 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); #line 249 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -2408,23 +2408,23 @@ static void library_window_on_library_monitor_installed (LibraryWindow* self, Li static void library_window_on_library_monitor_destroyed (LibraryWindow* self, LibraryMonitor* monitor) { - LibraryMonitor* _tmp0_ = NULL; - GFile* _tmp1_ = NULL; - GFile* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; - gchar* _tmp4_ = NULL; - LibraryMonitor* _tmp5_ = NULL; - guint _tmp6_ = 0U; - LibraryMonitor* _tmp7_ = NULL; - guint _tmp8_ = 0U; - LibraryMonitor* _tmp9_ = NULL; - guint _tmp10_ = 0U; - LibraryMonitor* _tmp11_ = NULL; - guint _tmp12_ = 0U; - LibraryMonitor* _tmp13_ = NULL; - guint _tmp14_ = 0U; - LibraryMonitor* _tmp15_ = NULL; - guint _tmp16_ = 0U; + LibraryMonitor* _tmp0_; + GFile* _tmp1_; + GFile* _tmp2_; + gchar* _tmp3_; + gchar* _tmp4_; + LibraryMonitor* _tmp5_; + guint _tmp6_; + LibraryMonitor* _tmp7_; + guint _tmp8_; + LibraryMonitor* _tmp9_; + guint _tmp10_; + LibraryMonitor* _tmp11_; + guint _tmp12_; + LibraryMonitor* _tmp13_; + guint _tmp14_; + LibraryMonitor* _tmp15_; + guint _tmp16_; #line 260 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); #line 260 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -2508,21 +2508,21 @@ static GVariant* _variant_new3 (gboolean value) { static void library_window_real_add_actions (AppWindow* base) { LibraryWindow * self; - SearchFilterActions* _tmp0_ = NULL; - gint _tmp1_ = 0; - GActionEntry* _tmp2_ = NULL; - SearchFilterActions* _tmp3_ = NULL; - GAction* _tmp4_ = NULL; - ConfigFacade* _tmp5_ = NULL; - ConfigFacade* _tmp6_ = NULL; - gboolean _tmp7_ = FALSE; - GVariant* _tmp8_ = NULL; - GAction* _tmp9_ = NULL; - gboolean _tmp10_ = FALSE; - GVariant* _tmp11_ = NULL; - GAction* _tmp12_ = NULL; - gboolean _tmp13_ = FALSE; - GVariant* _tmp14_ = NULL; + SearchFilterActions* _tmp0_; + gint _tmp1_; + GActionEntry* _tmp2_; + SearchFilterActions* _tmp3_; + GAction* _tmp4_; + ConfigFacade* _tmp5_; + ConfigFacade* _tmp6_; + gboolean _tmp7_; + GVariant* _tmp8_; + GAction* _tmp9_; + gboolean _tmp10_; + GVariant* _tmp11_; + GAction* _tmp12_; + gboolean _tmp13_; + GVariant* _tmp14_; #line 292 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_WINDOW, LibraryWindow); #line 293 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -2593,13 +2593,13 @@ static void _library_window_on_view_filter_removed_view_collection_view_filter_r static void library_window_real_switched_pages (PageWindow* base, Page* old_page, Page* new_page) { LibraryWindow * self; - Page* _tmp0_ = NULL; - Page* _tmp1_ = NULL; - Page* _tmp2_ = NULL; - Page* _tmp11_ = NULL; - SearchFilterActions* _tmp18_ = NULL; - Page* _tmp19_ = NULL; - Page* _tmp20_ = NULL; + Page* _tmp0_; + Page* _tmp1_; + Page* _tmp2_; + Page* _tmp11_; + SearchFilterActions* _tmp18_; + Page* _tmp19_; + Page* _tmp20_; #line 302 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_WINDOW, LibraryWindow); #line 302 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -2617,14 +2617,14 @@ static void library_window_real_switched_pages (PageWindow* base, Page* old_page #line 306 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp2_ != NULL) { #line 2620 "LibraryWindow.c" - Page* _tmp3_ = NULL; - ViewCollection* _tmp4_ = NULL; - ViewCollection* _tmp5_ = NULL; - guint _tmp6_ = 0U; - Page* _tmp7_ = NULL; - ViewCollection* _tmp8_ = NULL; - ViewCollection* _tmp9_ = NULL; - guint _tmp10_ = 0U; + Page* _tmp3_; + ViewCollection* _tmp4_; + ViewCollection* _tmp5_; + guint _tmp6_; + Page* _tmp7_; + ViewCollection* _tmp8_; + ViewCollection* _tmp9_; + guint _tmp10_; #line 307 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = old_page; #line 307 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -2656,12 +2656,12 @@ static void library_window_real_switched_pages (PageWindow* base, Page* old_page #line 311 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp11_ != NULL) { #line 2659 "LibraryWindow.c" - Page* _tmp12_ = NULL; - ViewCollection* _tmp13_ = NULL; - ViewCollection* _tmp14_ = NULL; - Page* _tmp15_ = NULL; - ViewCollection* _tmp16_ = NULL; - ViewCollection* _tmp17_ = NULL; + Page* _tmp12_; + ViewCollection* _tmp13_; + ViewCollection* _tmp14_; + Page* _tmp15_; + ViewCollection* _tmp16_; + ViewCollection* _tmp17_; #line 312 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp12_ = new_page; #line 312 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -2704,7 +2704,7 @@ static void _library_window_on_view_filter_refreshed_view_filter_refresh (ViewFi static void library_window_on_view_filter_installed (LibraryWindow* self, ViewFilter* filter) { - ViewFilter* _tmp0_ = NULL; + ViewFilter* _tmp0_; #line 319 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); #line 319 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -2718,8 +2718,8 @@ static void library_window_on_view_filter_installed (LibraryWindow* self, ViewFi static void library_window_on_view_filter_removed (LibraryWindow* self, ViewFilter* filter) { - ViewFilter* _tmp0_ = NULL; - guint _tmp1_ = 0U; + ViewFilter* _tmp0_; + guint _tmp1_; #line 323 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); #line 323 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -2749,16 +2749,16 @@ static GVariant* _variant_new4 (gboolean value) { static void library_window_on_view_filter_refreshed (LibraryWindow* self) { - Page* _tmp0_ = NULL; - Page* _tmp1_ = NULL; - ViewCollection* _tmp2_ = NULL; - ViewCollection* _tmp3_ = NULL; - gboolean _tmp4_ = FALSE; - gboolean _tmp5_ = FALSE; + Page* _tmp0_; + Page* _tmp1_; + ViewCollection* _tmp2_; + ViewCollection* _tmp3_; + gboolean _tmp4_; + gboolean _tmp5_; GAction* action = NULL; - GAction* _tmp6_ = NULL; - GAction* _tmp7_ = NULL; - GAction* _tmp8_ = NULL; + GAction* _tmp6_; + GAction* _tmp7_; + GAction* _tmp8_; #line 327 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); #line 330 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -2794,8 +2794,8 @@ static void library_window_on_view_filter_refreshed (LibraryWindow* self) { #line 336 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp8_ != NULL) { #line 2797 "LibraryWindow.c" - GAction* _tmp9_ = NULL; - GVariant* _tmp10_ = NULL; + GAction* _tmp9_; + GVariant* _tmp10_; #line 337 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp9_ = action; #line 337 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -2815,23 +2815,23 @@ static void library_window_on_view_filter_refreshed (LibraryWindow* self) { static void library_window_real_show_all (GtkWidget* base) { LibraryWindow * self; GAction* basic_properties_action = NULL; - Page* _tmp0_ = NULL; - Page* _tmp1_ = NULL; - GAction* _tmp2_ = NULL; - GAction* _tmp3_ = NULL; - GAction* _tmp4_ = NULL; - GAction* _tmp5_ = NULL; - GVariant* _tmp6_ = NULL; - GVariant* _tmp7_ = NULL; - gboolean _tmp8_ = FALSE; - gboolean _tmp9_ = FALSE; + Page* _tmp0_; + Page* _tmp1_; + GAction* _tmp2_; + GAction* _tmp3_; + GAction* _tmp4_; + GAction* _tmp5_; + GVariant* _tmp6_; + GVariant* _tmp7_; + gboolean _tmp8_; + gboolean _tmp9_; CheckerboardPage* current_page = NULL; - Page* _tmp11_ = NULL; - CheckerboardPage* _tmp12_ = NULL; - CheckerboardPage* _tmp13_ = NULL; - gboolean _tmp15_ = FALSE; - CheckerboardPage* _tmp16_ = NULL; - gboolean _tmp17_ = FALSE; + Page* _tmp11_; + CheckerboardPage* _tmp12_; + CheckerboardPage* _tmp13_; + gboolean _tmp15_; + CheckerboardPage* _tmp16_; + gboolean _tmp17_; #line 341 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_WINDOW, LibraryWindow); #line 342 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -2867,7 +2867,7 @@ static void library_window_real_show_all (GtkWidget* base) { #line 348 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp9_) { #line 2870 "LibraryWindow.c" - GtkFrame* _tmp10_ = NULL; + GtkFrame* _tmp10_; #line 349 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp10_ = self->priv->bottom_frame; #line 349 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -2891,7 +2891,7 @@ static void library_window_real_show_all (GtkWidget* base) { #line 353 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp13_ != NULL) { #line 2894 "LibraryWindow.c" - CheckerboardPage* _tmp14_ = NULL; + CheckerboardPage* _tmp14_; #line 354 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp14_ = current_page; #line 354 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -2918,9 +2918,9 @@ static void library_window_real_show_all (GtkWidget* base) { LibraryWindow* library_window_get_app (void) { LibraryWindow* result = NULL; - AppWindow* _tmp0_ = NULL; - AppWindow* _tmp1_ = NULL; - LibraryWindow* _tmp2_ = NULL; + AppWindow* _tmp0_; + AppWindow* _tmp1_; + LibraryWindow* _tmp2_; #line 363 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = app_window_instance; #line 363 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -2954,7 +2954,7 @@ gboolean library_window_is_mount_uri_supported (const gchar* uri) { #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 2957 "LibraryWindow.c" - gchar* _tmp0_ = NULL; + gchar* _tmp0_; gchar* scheme = NULL; #line 370 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = g_strdup (scheme_collection[scheme_it]); @@ -2962,9 +2962,9 @@ gboolean library_window_is_mount_uri_supported (const gchar* uri) { scheme = _tmp0_; #line 2964 "LibraryWindow.c" { - const gchar* _tmp1_ = NULL; - const gchar* _tmp2_ = NULL; - gboolean _tmp3_ = FALSE; + const gchar* _tmp1_; + const gchar* _tmp2_; + gboolean _tmp3_; #line 371 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = uri; #line 371 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -2998,7 +2998,7 @@ gboolean library_window_is_mount_uri_supported (const gchar* uri) { static gchar* library_window_real_get_app_role (AppWindow* base) { LibraryWindow * self; gchar* result = NULL; - gchar* _tmp0_ = NULL; + gchar* _tmp0_; #line 378 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_WINDOW, LibraryWindow); #line 379 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -3013,10 +3013,10 @@ static gchar* library_window_real_get_app_role (AppWindow* base) { void library_window_rename_tag_in_sidebar (LibraryWindow* self, Tag* tag) { TagsSidebarEntry* entry = NULL; - TagsBranch* _tmp0_ = NULL; - Tag* _tmp1_ = NULL; - TagsSidebarEntry* _tmp2_ = NULL; - TagsSidebarEntry* _tmp3_ = NULL; + TagsBranch* _tmp0_; + Tag* _tmp1_; + TagsSidebarEntry* _tmp2_; + TagsSidebarEntry* _tmp3_; #line 382 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); #line 382 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -3034,8 +3034,8 @@ void library_window_rename_tag_in_sidebar (LibraryWindow* self, Tag* tag) { #line 384 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp3_ != NULL) { #line 3037 "LibraryWindow.c" - SidebarTree* _tmp4_ = NULL; - TagsSidebarEntry* _tmp5_ = NULL; + SidebarTree* _tmp4_; + TagsSidebarEntry* _tmp5_; #line 385 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp4_ = self->priv->sidebar_tree; #line 385 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -3056,10 +3056,10 @@ void library_window_rename_tag_in_sidebar (LibraryWindow* self, Tag* tag) { void library_window_rename_event_in_sidebar (LibraryWindow* self, Event* event) { EventsEventEntry* entry = NULL; - EventsBranch* _tmp0_ = NULL; - Event* _tmp1_ = NULL; - EventsEventEntry* _tmp2_ = NULL; - EventsEventEntry* _tmp3_ = NULL; + EventsBranch* _tmp0_; + Event* _tmp1_; + EventsEventEntry* _tmp2_; + EventsEventEntry* _tmp3_; #line 390 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); #line 390 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -3077,8 +3077,8 @@ void library_window_rename_event_in_sidebar (LibraryWindow* self, Event* event) #line 392 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp3_ != NULL) { #line 3080 "LibraryWindow.c" - SidebarTree* _tmp4_ = NULL; - EventsEventEntry* _tmp5_ = NULL; + SidebarTree* _tmp4_; + EventsEventEntry* _tmp5_; #line 393 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp4_ = self->priv->sidebar_tree; #line 393 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -3099,10 +3099,10 @@ void library_window_rename_event_in_sidebar (LibraryWindow* self, Event* event) void library_window_rename_search_in_sidebar (LibraryWindow* self, SavedSearch* search) { SearchesSidebarEntry* entry = NULL; - SearchesBranch* _tmp0_ = NULL; - SavedSearch* _tmp1_ = NULL; - SearchesSidebarEntry* _tmp2_ = NULL; - SearchesSidebarEntry* _tmp3_ = NULL; + SearchesBranch* _tmp0_; + SavedSearch* _tmp1_; + SearchesSidebarEntry* _tmp2_; + SearchesSidebarEntry* _tmp3_; #line 398 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); #line 398 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -3120,8 +3120,8 @@ void library_window_rename_search_in_sidebar (LibraryWindow* self, SavedSearch* #line 400 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp3_ != NULL) { #line 3123 "LibraryWindow.c" - SidebarTree* _tmp4_ = NULL; - SearchesSidebarEntry* _tmp5_ = NULL; + SidebarTree* _tmp4_; + SearchesSidebarEntry* _tmp5_; #line 401 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp4_ = self->priv->sidebar_tree; #line 401 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -3142,15 +3142,15 @@ void library_window_rename_search_in_sidebar (LibraryWindow* self, SavedSearch* static void library_window_real_on_quit (AppWindow* base) { LibraryWindow * self; - ConfigFacade* _tmp0_ = NULL; - ConfigFacade* _tmp1_ = NULL; - gboolean _tmp2_ = FALSE; - Dimensions _tmp3_ = {0}; - ConfigFacade* _tmp4_ = NULL; - ConfigFacade* _tmp5_ = NULL; - GtkPaned* _tmp6_ = NULL; - gint _tmp7_ = 0; - gint _tmp8_ = 0; + ConfigFacade* _tmp0_; + ConfigFacade* _tmp1_; + gboolean _tmp2_; + Dimensions _tmp3_; + ConfigFacade* _tmp4_; + ConfigFacade* _tmp5_; + GtkPaned* _tmp6_; + gint _tmp7_; + gint _tmp8_; #line 406 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_WINDOW, LibraryWindow); #line 407 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -3188,16 +3188,16 @@ static void library_window_real_on_quit (AppWindow* base) { static Photo* library_window_get_start_fullscreen_photo (LibraryWindow* self, CollectionPage* page) { Photo* result = NULL; ViewCollection* view = NULL; - CollectionPage* _tmp0_ = NULL; - ViewCollection* _tmp1_ = NULL; + CollectionPage* _tmp0_; + ViewCollection* _tmp1_; GeeList* _tmp2_ = NULL; - ViewCollection* _tmp3_ = NULL; - gint _tmp4_ = 0; + ViewCollection* _tmp3_; + gint _tmp4_; GeeList* sources = NULL; - GeeList* _tmp9_ = NULL; + GeeList* _tmp9_; Photo* _tmp10_ = NULL; gboolean _tmp11_ = FALSE; - GeeList* _tmp12_ = NULL; + GeeList* _tmp12_; #line 414 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_val_if_fail (IS_LIBRARY_WINDOW (self), NULL); #line 414 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -3215,8 +3215,8 @@ static Photo* library_window_get_start_fullscreen_photo (LibraryWindow* self, Co #line 419 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp4_ > 0) { #line 3218 "LibraryWindow.c" - ViewCollection* _tmp5_ = NULL; - GeeList* _tmp6_ = NULL; + ViewCollection* _tmp5_; + GeeList* _tmp6_; #line 420 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp5_ = view; #line 420 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -3227,8 +3227,8 @@ static Photo* library_window_get_start_fullscreen_photo (LibraryWindow* self, Co _tmp2_ = _tmp6_; #line 3229 "LibraryWindow.c" } else { - ViewCollection* _tmp7_ = NULL; - GeeList* _tmp8_ = NULL; + ViewCollection* _tmp7_; + GeeList* _tmp8_; #line 421 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp7_ = view; #line 421 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -3248,9 +3248,9 @@ static Photo* library_window_get_start_fullscreen_photo (LibraryWindow* self, Co #line 423 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp12_ != NULL) { #line 3251 "LibraryWindow.c" - GeeList* _tmp13_ = NULL; - gint _tmp14_ = 0; - gint _tmp15_ = 0; + GeeList* _tmp13_; + gint _tmp14_; + gint _tmp15_; #line 423 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp13_ = sources; #line 423 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -3268,8 +3268,8 @@ static Photo* library_window_get_start_fullscreen_photo (LibraryWindow* self, Co #line 423 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp11_) { #line 3271 "LibraryWindow.c" - GeeList* _tmp16_ = NULL; - gpointer _tmp17_ = NULL; + GeeList* _tmp16_; + gpointer _tmp17_; #line 424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp16_ = sources; #line 424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -3300,14 +3300,14 @@ static Photo* library_window_get_start_fullscreen_photo (LibraryWindow* self, Co } -static gboolean library_window_get_fullscreen_photo (LibraryWindow* self, Page* page, CollectionPage** collection, Photo** start, ViewCollection** view_collection) { +static gboolean library_window_get_fullscreen_photo (LibraryWindow* self, Page* page, CollectionPage* * collection, Photo* * start, ViewCollection* * view_collection) { CollectionPage* _vala_collection = NULL; Photo* _vala_start = NULL; ViewCollection* _vala_view_collection = NULL; gboolean result = FALSE; - Page* _tmp0_ = NULL; - Page* _tmp8_ = NULL; - Page* _tmp30_ = NULL; + Page* _tmp0_; + Page* _tmp8_; + Page* _tmp30_; #line 427 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_val_if_fail (IS_LIBRARY_WINDOW (self), FALSE); #line 427 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -3329,14 +3329,14 @@ static gboolean library_window_get_fullscreen_photo (LibraryWindow* self, Page* #line 434 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_COLLECTION_PAGE)) { #line 3332 "LibraryWindow.c" - Page* _tmp1_ = NULL; - CollectionPage* _tmp2_ = NULL; + Page* _tmp1_; + CollectionPage* _tmp2_; Photo* photo = NULL; - CollectionPage* _tmp3_ = NULL; - Photo* _tmp4_ = NULL; - Photo* _tmp5_ = NULL; - Photo* _tmp6_ = NULL; - Photo* _tmp7_ = NULL; + CollectionPage* _tmp3_; + Photo* _tmp4_; + Photo* _tmp5_; + Photo* _tmp6_; + Photo* _tmp7_; #line 435 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = page; #line 435 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -3449,30 +3449,30 @@ static gboolean library_window_get_fullscreen_photo (LibraryWindow* self, Page* if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp8_, TYPE_EVENTS_DIRECTORY_PAGE)) { #line 3451 "LibraryWindow.c" ViewCollection* view = NULL; - Page* _tmp9_ = NULL; - ViewCollection* _tmp10_ = NULL; - ViewCollection* _tmp11_ = NULL; - gint _tmp12_ = 0; + Page* _tmp9_; + ViewCollection* _tmp10_; + ViewCollection* _tmp11_; + gint _tmp12_; Event* event = NULL; - ViewCollection* _tmp13_ = NULL; - DataObject* _tmp14_ = NULL; - DataView* _tmp15_ = NULL; - DataSource* _tmp16_ = NULL; - Event* _tmp17_ = NULL; - Event* _tmp18_ = NULL; + ViewCollection* _tmp13_; + DataObject* _tmp14_; + DataView* _tmp15_; + DataSource* _tmp16_; + Event* _tmp17_; + Event* _tmp18_; EventsEventEntry* entry = NULL; - EventsBranch* _tmp19_ = NULL; - Event* _tmp20_ = NULL; - EventsEventEntry* _tmp21_ = NULL; - EventsEventEntry* _tmp22_ = NULL; - EventsEventEntry* _tmp23_ = NULL; - Page* _tmp24_ = NULL; + EventsBranch* _tmp19_; + Event* _tmp20_; + EventsEventEntry* _tmp21_; + EventsEventEntry* _tmp22_; + EventsEventEntry* _tmp23_; + Page* _tmp24_; Photo* photo = NULL; - CollectionPage* _tmp25_ = NULL; - Photo* _tmp26_ = NULL; - Photo* _tmp27_ = NULL; - Photo* _tmp28_ = NULL; - Photo* _tmp29_ = NULL; + CollectionPage* _tmp25_; + Photo* _tmp26_; + Photo* _tmp27_; + Photo* _tmp28_; + Photo* _tmp29_; #line 447 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp9_ = page; #line 447 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -3759,20 +3759,20 @@ static gboolean library_window_get_fullscreen_photo (LibraryWindow* self, Page* if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp30_, TYPE_LIBRARY_PHOTO_PAGE)) { #line 3761 "LibraryWindow.c" LibraryPhotoPage* photo_page = NULL; - Page* _tmp31_ = NULL; - LibraryPhotoPage* _tmp32_ = NULL; + Page* _tmp31_; + LibraryPhotoPage* _tmp32_; CollectionPage* controller = NULL; - LibraryPhotoPage* _tmp33_ = NULL; - CollectionPage* _tmp34_ = NULL; - CollectionPage* _tmp35_ = NULL; - LibraryPhotoPage* _tmp36_ = NULL; - gboolean _tmp37_ = FALSE; - CollectionPage* _tmp38_ = NULL; - CollectionPage* _tmp39_ = NULL; - LibraryPhotoPage* _tmp40_ = NULL; - Photo* _tmp41_ = NULL; - LibraryPhotoPage* _tmp42_ = NULL; - ViewCollection* _tmp43_ = NULL; + LibraryPhotoPage* _tmp33_; + CollectionPage* _tmp34_; + CollectionPage* _tmp35_; + LibraryPhotoPage* _tmp36_; + gboolean _tmp37_; + CollectionPage* _tmp38_; + CollectionPage* _tmp39_; + LibraryPhotoPage* _tmp40_; + Photo* _tmp41_; + LibraryPhotoPage* _tmp42_; + ViewCollection* _tmp43_; #line 471 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp31_ = page; #line 471 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -3980,22 +3980,22 @@ static gboolean library_window_get_fullscreen_photo (LibraryWindow* self, Page* static void library_window_real_on_fullscreen (AppWindow* base) { LibraryWindow * self; Page* current_page = NULL; - Page* _tmp0_ = NULL; - Page* _tmp1_ = NULL; + Page* _tmp0_; + Page* _tmp1_; CollectionPage* collection = NULL; Photo* start = NULL; ViewCollection* view = NULL; - Page* _tmp2_ = NULL; + Page* _tmp2_; CollectionPage* _tmp3_ = NULL; Photo* _tmp4_ = NULL; ViewCollection* _tmp5_ = NULL; - gboolean _tmp6_ = FALSE; + gboolean _tmp6_; LibraryWindowFullscreenPhotoPage* fs_photo = NULL; - CollectionPage* _tmp7_ = NULL; - Photo* _tmp8_ = NULL; - ViewCollection* _tmp9_ = NULL; - LibraryWindowFullscreenPhotoPage* _tmp10_ = NULL; - LibraryWindowFullscreenPhotoPage* _tmp11_ = NULL; + CollectionPage* _tmp7_; + Photo* _tmp8_; + ViewCollection* _tmp9_; + LibraryWindowFullscreenPhotoPage* _tmp10_; + LibraryWindowFullscreenPhotoPage* _tmp11_; #line 490 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_WINDOW, LibraryWindow); #line 491 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -4092,142 +4092,139 @@ static void _g_slist_free__g_free0_ (GSList* self) { static void library_window_on_file_import (LibraryWindow* self) { GtkFileChooserDialog* import_dialog = NULL; - const gchar* _tmp0_ = NULL; - GtkFileChooserDialog* _tmp1_ = NULL; - GtkFileChooserDialog* _tmp2_ = NULL; - GtkFileChooserDialog* _tmp3_ = NULL; - GtkFileChooserDialog* _tmp4_ = NULL; - const gchar* _tmp5_ = NULL; + GtkFileChooserDialog* _tmp0_; + GtkFileChooserDialog* _tmp1_; + GtkFileChooserDialog* _tmp2_; + GtkFileChooserDialog* _tmp3_; + const gchar* _tmp4_; gint response = 0; - GtkFileChooserDialog* _tmp6_ = NULL; - gint _tmp7_ = 0; - gint _tmp8_ = 0; - GtkFileChooserDialog* _tmp23_ = NULL; - gchar* _tmp24_ = NULL; - GtkFileChooserDialog* _tmp25_ = NULL; + GtkFileChooserDialog* _tmp5_; + gint _tmp6_; + gint _tmp7_; + GtkFileChooserDialog* _tmp22_; + gchar* _tmp23_; + GtkFileChooserDialog* _tmp24_; #line 506 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); #line 507 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp0_ = _ ("Import From Folder"); -#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); + _tmp0_ = (GtkFileChooserDialog*) gtk_file_chooser_dialog_new (_ ("Import From Folder"), NULL, GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER, RESOURCES_CANCEL_LABEL, GTK_RESPONSE_CANCEL, RESOURCES_OK_LABEL, GTK_RESPONSE_OK, NULL); #line 507 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - g_object_ref_sink (_tmp1_); + g_object_ref_sink (_tmp0_); #line 507 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - import_dialog = _tmp1_; + import_dialog = _tmp0_; #line 510 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp2_ = import_dialog; + _tmp1_ = import_dialog; #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); + gtk_file_chooser_set_local_only (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser), FALSE); #line 511 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp3_ = import_dialog; + _tmp2_ = import_dialog; #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); + gtk_file_chooser_set_select_multiple (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser), TRUE); #line 512 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp4_ = import_dialog; + _tmp3_ = import_dialog; #line 512 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp5_ = self->priv->import_dir; + _tmp4_ = self->priv->import_dir; #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_); + gtk_file_chooser_set_current_folder (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser), _tmp4_); #line 514 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp6_ = import_dialog; + _tmp5_ = import_dialog; #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)); + _tmp6_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_dialog_get_type (), GtkDialog)); #line 514 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - response = _tmp7_; + response = _tmp6_; #line 516 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp8_ = response; + _tmp7_ = response; #line 516 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - if (_tmp8_ == ((gint) GTK_RESPONSE_OK)) { -#line 4143 "LibraryWindow.c" - GtkResponseType _tmp9_ = 0; - GtkFileChooserDialog* _tmp10_ = NULL; - gchar* _tmp11_ = NULL; - gchar* _tmp12_ = NULL; - GFile* _tmp13_ = NULL; - GFile* _tmp14_ = NULL; - gboolean _tmp15_ = FALSE; - gboolean _tmp16_ = FALSE; + if (_tmp7_ == ((gint) GTK_RESPONSE_OK)) { +#line 4140 "LibraryWindow.c" + GtkResponseType _tmp8_ = 0; + GtkFileChooserDialog* _tmp9_; + gchar* _tmp10_; + gchar* _tmp11_; + GFile* _tmp12_; + GFile* _tmp13_; + gboolean _tmp14_; + gboolean _tmp15_; GtkResponseType copy_files_response = 0; - GtkResponseType _tmp18_ = 0; + GtkResponseType _tmp17_; #line 519 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp10_ = import_dialog; + _tmp9_ = import_dialog; #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)); + _tmp10_ = gtk_file_chooser_get_uri (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser)); #line 519 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp12_ = _tmp11_; + _tmp11_ = _tmp10_; #line 519 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp13_ = g_file_new_for_uri (_tmp12_); + _tmp12_ = g_file_new_for_uri (_tmp11_); #line 519 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp14_ = _tmp13_; + _tmp13_ = _tmp12_; #line 519 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp15_ = app_dirs_is_in_import_dir (_tmp14_); + _tmp14_ = app_dirs_is_in_import_dir (_tmp13_); #line 519 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp16_ = _tmp15_; + _tmp15_ = _tmp14_; #line 519 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _g_object_unref0 (_tmp14_); + _g_object_unref0 (_tmp13_); #line 519 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _g_free0 (_tmp12_); + _g_free0 (_tmp11_); #line 519 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - if (_tmp16_) { + if (_tmp15_) { #line 520 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp9_ = GTK_RESPONSE_REJECT; -#line 4176 "LibraryWindow.c" + _tmp8_ = GTK_RESPONSE_REJECT; +#line 4173 "LibraryWindow.c" } else { - GtkResponseType _tmp17_ = 0; + GtkResponseType _tmp16_; #line 520 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp17_ = copy_files_dialog (); + _tmp16_ = copy_files_dialog (); #line 520 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp9_ = _tmp17_; -#line 4183 "LibraryWindow.c" + _tmp8_ = _tmp16_; +#line 4180 "LibraryWindow.c" } #line 518 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - copy_files_response = _tmp9_; + copy_files_response = _tmp8_; #line 522 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp18_ = copy_files_response; + _tmp17_ = copy_files_response; #line 522 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - if (_tmp18_ != GTK_RESPONSE_CANCEL) { -#line 4191 "LibraryWindow.c" - GtkFileChooserDialog* _tmp19_ = NULL; - GSList* _tmp20_ = NULL; - GSList* _tmp21_ = NULL; - GtkResponseType _tmp22_ = 0; + if (_tmp17_ != GTK_RESPONSE_CANCEL) { +#line 4188 "LibraryWindow.c" + GtkFileChooserDialog* _tmp18_; + GSList* _tmp19_; + GSList* _tmp20_; + GtkResponseType _tmp21_; #line 523 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp19_ = import_dialog; + _tmp18_ = import_dialog; #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)); + _tmp19_ = gtk_file_chooser_get_uris (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser)); #line 523 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp21_ = _tmp20_; + _tmp20_ = _tmp19_; #line 523 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp22_ = copy_files_response; + _tmp21_ = copy_files_response; #line 523 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - library_window_dispatch_import_jobs (self, _tmp21_, "folders", _tmp22_ == GTK_RESPONSE_ACCEPT); + library_window_dispatch_import_jobs (self, _tmp20_, "folders", _tmp21_ == GTK_RESPONSE_ACCEPT); #line 523 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - __g_slist_free__g_free0_0 (_tmp21_); -#line 4208 "LibraryWindow.c" + __g_slist_free__g_free0_0 (_tmp20_); +#line 4205 "LibraryWindow.c" } } #line 528 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp23_ = import_dialog; + _tmp22_ = import_dialog; #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)); + _tmp23_ = gtk_file_chooser_get_current_folder (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser)); #line 528 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_free0 (self->priv->import_dir); #line 528 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - self->priv->import_dir = _tmp24_; + self->priv->import_dir = _tmp23_; #line 529 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp25_ = import_dialog; + _tmp24_ = import_dialog; #line 529 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, gtk_widget_get_type (), GtkWidget)); + gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, gtk_widget_get_type (), GtkWidget)); #line 506 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (import_dialog); -#line 4225 "LibraryWindow.c" +#line 4222 "LibraryWindow.c" } static void library_window_on_external_library_import (LibraryWindow* self) { GtkDialog* import_dialog = NULL; - DataImportsUIDataImportsDialog* _tmp0_ = NULL; + DataImportsUIDataImportsDialog* _tmp0_; #line 532 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); #line 533 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -4238,16 +4235,16 @@ static void library_window_on_external_library_import (LibraryWindow* self) { gtk_dialog_run (import_dialog); #line 532 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (import_dialog); -#line 4242 "LibraryWindow.c" +#line 4239 "LibraryWindow.c" } static void library_window_real_update_common_action_availability (AppWindow* base, Page* old_page, Page* new_page) { LibraryWindow * self; - Page* _tmp0_ = NULL; - Page* _tmp1_ = NULL; + Page* _tmp0_; + Page* _tmp1_; gboolean is_checkerboard = FALSE; - Page* _tmp2_ = NULL; + Page* _tmp2_; #line 538 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_WINDOW, LibraryWindow); #line 538 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -4268,7 +4265,7 @@ static void library_window_real_update_common_action_availability (AppWindow* ba app_window_set_common_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), "CommonDisplaySearchbar", is_checkerboard); #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 4272 "LibraryWindow.c" +#line 4269 "LibraryWindow.c" } @@ -4277,15 +4274,15 @@ static void library_window_real_update_common_actions (AppWindow* base, Page* pa CollectionPage* collection = NULL; Photo* start = NULL; gboolean can_fullscreen = FALSE; - Page* _tmp0_ = NULL; + Page* _tmp0_; CollectionPage* _tmp1_ = NULL; Photo* _tmp2_ = NULL; - gboolean _tmp3_ = FALSE; - gboolean _tmp4_ = FALSE; - gboolean _tmp5_ = FALSE; - Page* _tmp6_ = NULL; - gint _tmp7_ = 0; - gint _tmp8_ = 0; + gboolean _tmp3_; + gboolean _tmp4_; + gboolean _tmp5_; + Page* _tmp6_; + gint _tmp7_; + gint _tmp8_; #line 547 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_WINDOW, LibraryWindow); #line 547 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -4328,27 +4325,27 @@ static void library_window_real_update_common_actions (AppWindow* base, Page* pa _g_object_unref0 (start); #line 547 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (collection); -#line 4332 "LibraryWindow.c" +#line 4329 "LibraryWindow.c" } static void library_window_on_trashcan_contents_altered (LibraryWindow* self) { - gboolean _tmp0_ = FALSE; + gboolean _tmp0_; #line 563 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); #line 564 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = library_window_can_empty_trash (self); #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 4344 "LibraryWindow.c" +#line 4341 "LibraryWindow.c" } static gboolean library_window_can_empty_trash (LibraryWindow* self) { gboolean result = FALSE; gboolean _tmp0_ = FALSE; - LibraryPhotoSourceCollection* _tmp1_ = NULL; - gint _tmp2_ = 0; + LibraryPhotoSourceCollection* _tmp1_; + gint _tmp2_; #line 567 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_val_if_fail (IS_LIBRARY_WINDOW (self), FALSE); #line 568 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -4359,39 +4356,37 @@ static gboolean library_window_can_empty_trash (LibraryWindow* self) { if (_tmp2_ > 0) { #line 568 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = TRUE; -#line 4363 "LibraryWindow.c" +#line 4360 "LibraryWindow.c" } else { - VideoSourceCollection* _tmp3_ = NULL; - gint _tmp4_ = 0; + VideoSourceCollection* _tmp3_; + gint _tmp4_; #line 568 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = video_global; #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 568 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = _tmp4_ > 0; -#line 4373 "LibraryWindow.c" +#line 4370 "LibraryWindow.c" } #line 568 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" result = _tmp0_; #line 568 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return result; -#line 4379 "LibraryWindow.c" +#line 4376 "LibraryWindow.c" } static void library_window_on_empty_trash (LibraryWindow* self) { GeeArrayList* to_remove = NULL; - GeeArrayList* _tmp0_ = NULL; - LibraryPhotoSourceCollection* _tmp1_ = NULL; - GeeCollection* _tmp2_ = NULL; - GeeCollection* _tmp3_ = NULL; - VideoSourceCollection* _tmp4_ = NULL; - GeeCollection* _tmp5_ = NULL; - GeeCollection* _tmp6_ = NULL; - const gchar* _tmp7_ = NULL; - const gchar* _tmp8_ = NULL; - CommandManager* _tmp9_ = NULL; - CommandManager* _tmp10_ = NULL; + GeeArrayList* _tmp0_; + LibraryPhotoSourceCollection* _tmp1_; + GeeCollection* _tmp2_; + GeeCollection* _tmp3_; + VideoSourceCollection* _tmp4_; + GeeCollection* _tmp5_; + GeeCollection* _tmp6_; + CommandManager* _tmp7_; + CommandManager* _tmp8_; #line 571 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); #line 572 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -4419,28 +4414,24 @@ static void library_window_on_empty_trash (LibraryWindow* self) { #line 574 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp6_); #line 576 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp7_ = _ ("Empty Trash"); -#line 576 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp8_ = _ ("Emptying Trash…"); -#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_); + remove_from_app (G_TYPE_CHECK_INSTANCE_CAST (to_remove, GEE_TYPE_COLLECTION, GeeCollection), _ ("Empty Trash"), _ ("Emptying Trash…")); #line 578 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp9_ = app_window_get_command_manager (); + _tmp7_ = app_window_get_command_manager (); #line 578 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp10_ = _tmp9_; + _tmp8_ = _tmp7_; #line 578 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - command_manager_reset (_tmp10_); + command_manager_reset (_tmp8_); #line 578 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _command_manager_unref0 (_tmp10_); + _command_manager_unref0 (_tmp8_); #line 571 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (to_remove); -#line 4438 "LibraryWindow.c" +#line 4429 "LibraryWindow.c" } static void library_window_on_new_search (LibraryWindow* self) { - SavedSearchDialog* _tmp0_ = NULL; - SavedSearchDialog* _tmp1_ = NULL; + SavedSearchDialog* _tmp0_; + SavedSearchDialog* _tmp1_; #line 581 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); #line 582 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -4451,19 +4442,19 @@ static void library_window_on_new_search (LibraryWindow* self) { saved_search_dialog_show (_tmp1_); #line 582 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _saved_search_dialog_unref0 (_tmp1_); -#line 4455 "LibraryWindow.c" +#line 4446 "LibraryWindow.c" } static gboolean library_window_can_jump_to_event (LibraryWindow* self) { gboolean result = FALSE; ViewCollection* view = NULL; - Page* _tmp0_ = NULL; - Page* _tmp1_ = NULL; - ViewCollection* _tmp2_ = NULL; - ViewCollection* _tmp3_ = NULL; - ViewCollection* _tmp4_ = NULL; - gint _tmp5_ = 0; + Page* _tmp0_; + Page* _tmp1_; + ViewCollection* _tmp2_; + ViewCollection* _tmp3_; + ViewCollection* _tmp4_; + gint _tmp5_; #line 585 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_val_if_fail (IS_LIBRARY_WINDOW (self), FALSE); #line 586 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -4484,11 +4475,11 @@ static gboolean library_window_can_jump_to_event (LibraryWindow* self) { _tmp5_ = view_collection_get_selected_count (_tmp4_); #line 587 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp5_ == 1) { -#line 4488 "LibraryWindow.c" +#line 4479 "LibraryWindow.c" DataSource* selected_source = NULL; - ViewCollection* _tmp6_ = NULL; - DataSource* _tmp7_ = NULL; - DataSource* _tmp8_ = NULL; + ViewCollection* _tmp6_; + DataSource* _tmp7_; + DataSource* _tmp8_; #line 588 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp6_ = view; #line 588 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -4507,20 +4498,20 @@ static gboolean library_window_can_jump_to_event (LibraryWindow* self) { _data_collection_unref0 (view); #line 590 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return result; -#line 4511 "LibraryWindow.c" +#line 4502 "LibraryWindow.c" } else { - DataSource* _tmp9_ = NULL; + DataSource* _tmp9_; #line 591 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp9_ = selected_source; #line 591 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp9_, TYPE_MEDIA_SOURCE)) { -#line 4518 "LibraryWindow.c" - ViewCollection* _tmp10_ = NULL; - DataSource* _tmp11_ = NULL; - MediaSource* _tmp12_ = NULL; - Event* _tmp13_ = NULL; - Event* _tmp14_ = NULL; - gboolean _tmp15_ = FALSE; +#line 4509 "LibraryWindow.c" + ViewCollection* _tmp10_; + DataSource* _tmp11_; + MediaSource* _tmp12_; + Event* _tmp13_; + Event* _tmp14_; + gboolean _tmp15_; #line 592 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp10_ = view; #line 592 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -4545,7 +4536,7 @@ static gboolean library_window_can_jump_to_event (LibraryWindow* self) { _data_collection_unref0 (view); #line 592 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return result; -#line 4549 "LibraryWindow.c" +#line 4540 "LibraryWindow.c" } else { #line 594 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" result = FALSE; @@ -4555,12 +4546,12 @@ static gboolean library_window_can_jump_to_event (LibraryWindow* self) { _data_collection_unref0 (view); #line 594 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return result; -#line 4559 "LibraryWindow.c" +#line 4550 "LibraryWindow.c" } } #line 587 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (selected_source); -#line 4564 "LibraryWindow.c" +#line 4555 "LibraryWindow.c" } else { #line 596 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" result = FALSE; @@ -4568,31 +4559,31 @@ static gboolean library_window_can_jump_to_event (LibraryWindow* self) { _data_collection_unref0 (view); #line 596 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return result; -#line 4572 "LibraryWindow.c" +#line 4563 "LibraryWindow.c" } #line 585 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _data_collection_unref0 (view); -#line 4576 "LibraryWindow.c" +#line 4567 "LibraryWindow.c" } static void library_window_on_jump_to_event (LibraryWindow* self) { ViewCollection* view = NULL; - Page* _tmp0_ = NULL; - Page* _tmp1_ = NULL; - ViewCollection* _tmp2_ = NULL; - ViewCollection* _tmp3_ = NULL; - ViewCollection* _tmp4_ = NULL; - gint _tmp5_ = 0; + Page* _tmp0_; + Page* _tmp1_; + ViewCollection* _tmp2_; + ViewCollection* _tmp3_; + ViewCollection* _tmp4_; + gint _tmp5_; MediaSource* media = NULL; - ViewCollection* _tmp6_ = NULL; - DataSource* _tmp7_ = NULL; - MediaSource* _tmp8_ = NULL; - MediaSource* _tmp9_ = NULL; - MediaSource* _tmp10_ = NULL; - Event* _tmp11_ = NULL; - Event* _tmp12_ = NULL; - gboolean _tmp13_ = FALSE; + ViewCollection* _tmp6_; + DataSource* _tmp7_; + MediaSource* _tmp8_; + MediaSource* _tmp9_; + MediaSource* _tmp10_; + Event* _tmp11_; + Event* _tmp12_; + gboolean _tmp13_; #line 600 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); #line 601 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -4617,7 +4608,7 @@ static void library_window_on_jump_to_event (LibraryWindow* self) { _data_collection_unref0 (view); #line 604 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return; -#line 4621 "LibraryWindow.c" +#line 4612 "LibraryWindow.c" } #line 606 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp6_ = view; @@ -4629,7 +4620,7 @@ static void library_window_on_jump_to_event (LibraryWindow* self) { if (_tmp8_ == NULL) { #line 606 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp7_); -#line 4633 "LibraryWindow.c" +#line 4624 "LibraryWindow.c" } #line 606 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" media = _tmp8_; @@ -4643,7 +4634,7 @@ static void library_window_on_jump_to_event (LibraryWindow* self) { _data_collection_unref0 (view); #line 608 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return; -#line 4647 "LibraryWindow.c" +#line 4638 "LibraryWindow.c" } #line 610 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp10_ = media; @@ -4657,10 +4648,10 @@ static void library_window_on_jump_to_event (LibraryWindow* self) { _g_object_unref0 (_tmp12_); #line 610 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp13_) { -#line 4661 "LibraryWindow.c" - MediaSource* _tmp14_ = NULL; - Event* _tmp15_ = NULL; - Event* _tmp16_ = NULL; +#line 4652 "LibraryWindow.c" + MediaSource* _tmp14_; + Event* _tmp15_; + Event* _tmp16_; #line 611 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp14_ = media; #line 611 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -4671,29 +4662,29 @@ static void library_window_on_jump_to_event (LibraryWindow* self) { library_window_switch_to_event (self, _tmp16_); #line 611 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp16_); -#line 4675 "LibraryWindow.c" +#line 4666 "LibraryWindow.c" } #line 600 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (media); #line 600 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _data_collection_unref0 (view); -#line 4681 "LibraryWindow.c" +#line 4672 "LibraryWindow.c" } static GVariant* _variant_new5 (gboolean value) { #line 616 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return g_variant_ref_sink (g_variant_new_boolean (value)); -#line 4688 "LibraryWindow.c" +#line 4679 "LibraryWindow.c" } static void library_window_on_find (LibraryWindow* self) { GAction* action = NULL; - GAction* _tmp0_ = NULL; - GAction* _tmp1_ = NULL; - GVariant* _tmp2_ = NULL; - SearchFilterToolbar* _tmp3_ = NULL; + GAction* _tmp0_; + GAction* _tmp1_; + GVariant* _tmp2_; + SearchFilterToolbar* _tmp3_; #line 614 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); #line 615 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -4714,37 +4705,37 @@ static void library_window_on_find (LibraryWindow* self) { search_filter_toolbar_take_focus (_tmp3_); #line 614 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (action); -#line 4718 "LibraryWindow.c" +#line 4709 "LibraryWindow.c" } static void library_window_on_media_altered (LibraryWindow* self) { - gboolean _tmp0_ = FALSE; + gboolean _tmp0_; #line 622 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); #line 623 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = library_window_can_jump_to_event (self); #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 4730 "LibraryWindow.c" +#line 4721 "LibraryWindow.c" } static void library_window_on_clear_search (LibraryWindow* self) { - gboolean _tmp0_ = FALSE; + gboolean _tmp0_; #line 626 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); #line 627 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = self->priv->is_search_toolbar_visible; #line 627 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp0_) { -#line 4742 "LibraryWindow.c" - SearchFilterActions* _tmp1_ = NULL; +#line 4733 "LibraryWindow.c" + SearchFilterActions* _tmp1_; #line 628 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = self->priv->search_actions; #line 628 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" search_filter_actions_reset (_tmp1_); -#line 4748 "LibraryWindow.c" +#line 4739 "LibraryWindow.c" } } @@ -4752,10 +4743,10 @@ static void library_window_on_clear_search (LibraryWindow* self) { gint library_window_get_events_sort (LibraryWindow* self) { gint result = 0; GSimpleAction* action = NULL; - GAction* _tmp0_ = NULL; - GSimpleAction* _tmp1_ = NULL; + GAction* _tmp0_; + GSimpleAction* _tmp1_; gint _tmp2_ = 0; - GSimpleAction* _tmp3_ = NULL; + GSimpleAction* _tmp3_; #line 631 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_val_if_fail (IS_LIBRARY_WINDOW (self), 0); #line 632 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -4768,14 +4759,14 @@ gint library_window_get_events_sort (LibraryWindow* self) { _tmp3_ = action; #line 634 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp3_ != NULL) { -#line 4772 "LibraryWindow.c" +#line 4763 "LibraryWindow.c" gint _tmp4_ = 0; - GSimpleAction* _tmp5_ = NULL; - GVariant* _tmp6_ = NULL; - GVariant* _tmp7_ = NULL; - GVariant* _tmp8_ = NULL; - const gchar* _tmp9_ = NULL; - gboolean _tmp10_ = FALSE; + GSimpleAction* _tmp5_; + GVariant* _tmp6_; + GVariant* _tmp7_; + GVariant* _tmp8_; + const gchar* _tmp9_; + gboolean _tmp10_; #line 634 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp5_ = action; #line 634 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -4794,19 +4785,19 @@ gint library_window_get_events_sort (LibraryWindow* self) { if (_tmp10_) { #line 635 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp4_ = 0; -#line 4798 "LibraryWindow.c" +#line 4789 "LibraryWindow.c" } else { #line 635 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp4_ = 1; -#line 4802 "LibraryWindow.c" +#line 4793 "LibraryWindow.c" } #line 634 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = _tmp4_; -#line 4806 "LibraryWindow.c" +#line 4797 "LibraryWindow.c" } else { #line 636 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = 1; -#line 4810 "LibraryWindow.c" +#line 4801 "LibraryWindow.c" } #line 634 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" result = _tmp2_; @@ -4814,17 +4805,17 @@ gint library_window_get_events_sort (LibraryWindow* self) { _g_object_unref0 (action); #line 634 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return result; -#line 4818 "LibraryWindow.c" +#line 4809 "LibraryWindow.c" } static void library_window_on_events_sort_changed (LibraryWindow* self, GSimpleAction* action, GVariant* value) { - ConfigFacade* _tmp0_ = NULL; - ConfigFacade* _tmp1_ = NULL; - GVariant* _tmp2_ = NULL; - const gchar* _tmp3_ = NULL; - GSimpleAction* _tmp4_ = NULL; - GVariant* _tmp5_ = NULL; + ConfigFacade* _tmp0_; + ConfigFacade* _tmp1_; + GVariant* _tmp2_; + const gchar* _tmp3_; + GSimpleAction* _tmp4_; + GVariant* _tmp5_; #line 639 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); #line 639 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -4847,7 +4838,7 @@ static void library_window_on_events_sort_changed (LibraryWindow* self, GSimpleA _tmp5_ = value; #line 644 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_simple_action_set_state (_tmp4_, _tmp5_); -#line 4851 "LibraryWindow.c" +#line 4842 "LibraryWindow.c" } @@ -4856,20 +4847,20 @@ static void library_window_on_preferences (LibraryWindow* self) { g_return_if_fail (IS_LIBRARY_WINDOW (self)); #line 648 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" preferences_dialog_show (); -#line 4860 "LibraryWindow.c" +#line 4851 "LibraryWindow.c" } static void library_window_on_display_basic_properties (LibraryWindow* self, GSimpleAction* action, GVariant* value) { gboolean display = FALSE; - GVariant* _tmp0_ = NULL; - gboolean _tmp1_ = FALSE; - gboolean _tmp2_ = FALSE; - ConfigFacade* _tmp10_ = NULL; - ConfigFacade* _tmp11_ = NULL; - gboolean _tmp12_ = FALSE; - GSimpleAction* _tmp13_ = NULL; - GVariant* _tmp14_ = NULL; + GVariant* _tmp0_; + gboolean _tmp1_; + gboolean _tmp2_; + ConfigFacade* _tmp10_; + ConfigFacade* _tmp11_; + gboolean _tmp12_; + GSimpleAction* _tmp13_; + GVariant* _tmp14_; #line 651 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); #line 651 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -4884,11 +4875,11 @@ static void library_window_on_display_basic_properties (LibraryWindow* self, GSi _tmp2_ = display; #line 654 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp2_) { -#line 4888 "LibraryWindow.c" - BasicProperties* _tmp3_ = NULL; - Page* _tmp4_ = NULL; - Page* _tmp5_ = NULL; - GtkFrame* _tmp6_ = NULL; +#line 4879 "LibraryWindow.c" + BasicProperties* _tmp3_; + Page* _tmp4_; + Page* _tmp5_; + GtkFrame* _tmp6_; #line 655 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = self->priv->basic_properties; #line 655 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -4903,23 +4894,23 @@ static void library_window_on_display_basic_properties (LibraryWindow* self, GSi _tmp6_ = self->priv->bottom_frame; #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 4907 "LibraryWindow.c" +#line 4898 "LibraryWindow.c" } else { - GtkPaned* _tmp7_ = NULL; - GtkWidget* _tmp8_ = NULL; + GtkPaned* _tmp7_; + GtkWidget* _tmp8_; #line 658 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp7_ = self->priv->sidebar_paned; #line 658 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp8_ = gtk_paned_get_child2 (_tmp7_); #line 658 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp8_ != NULL) { -#line 4917 "LibraryWindow.c" - GtkFrame* _tmp9_ = NULL; +#line 4908 "LibraryWindow.c" + GtkFrame* _tmp9_; #line 659 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp9_ = self->priv->bottom_frame; #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 4923 "LibraryWindow.c" +#line 4914 "LibraryWindow.c" } } #line 664 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -4938,33 +4929,33 @@ static void library_window_on_display_basic_properties (LibraryWindow* self, GSi _tmp14_ = value; #line 665 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_simple_action_set_state (_tmp13_, _tmp14_); -#line 4942 "LibraryWindow.c" +#line 4933 "LibraryWindow.c" } static gboolean _variant_get6 (GVariant* value) { #line 669 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return g_variant_get_boolean (value); -#line 4949 "LibraryWindow.c" +#line 4940 "LibraryWindow.c" } static GVariant* _variant_new7 (gboolean value) { #line 669 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return g_variant_ref_sink (g_variant_new_boolean (value)); -#line 4956 "LibraryWindow.c" +#line 4947 "LibraryWindow.c" } static void library_window_on_action_toggle (LibraryWindow* self, GAction* action, GVariant* value) { GVariant* new_state = NULL; - GAction* _tmp0_ = NULL; - GVariant* _tmp1_ = NULL; - GVariant* _tmp2_ = NULL; - gboolean _tmp3_ = FALSE; - GVariant* _tmp4_ = NULL; - GVariant* _tmp5_ = NULL; - GAction* _tmp6_ = NULL; + GAction* _tmp0_; + GVariant* _tmp1_; + GVariant* _tmp2_; + gboolean _tmp3_; + GVariant* _tmp4_; + GVariant* _tmp5_; + GAction* _tmp6_; #line 668 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); #line 668 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -4991,13 +4982,13 @@ static void library_window_on_action_toggle (LibraryWindow* self, GAction* actio g_action_change_state (_tmp6_, new_state); #line 668 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_variant_unref0 (new_state); -#line 4995 "LibraryWindow.c" +#line 4986 "LibraryWindow.c" } static void library_window_on_action_radio (LibraryWindow* self, GAction* action, GVariant* value) { - GAction* _tmp0_ = NULL; - GVariant* _tmp1_ = NULL; + GAction* _tmp0_; + GVariant* _tmp1_; #line 673 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); #line 673 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -5008,17 +4999,17 @@ static void library_window_on_action_radio (LibraryWindow* self, GAction* action _tmp1_ = value; #line 674 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_action_change_state (_tmp0_, _tmp1_); -#line 5012 "LibraryWindow.c" +#line 5003 "LibraryWindow.c" } static void library_window_on_display_extended_properties (LibraryWindow* self, GSimpleAction* action, GVariant* value) { gboolean display = FALSE; - GVariant* _tmp0_ = NULL; - gboolean _tmp1_ = FALSE; - gboolean _tmp2_ = FALSE; - GSimpleAction* _tmp8_ = NULL; - GVariant* _tmp9_ = NULL; + GVariant* _tmp0_; + gboolean _tmp1_; + gboolean _tmp2_; + GSimpleAction* _tmp8_; + GVariant* _tmp9_; #line 677 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); #line 677 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -5033,11 +5024,11 @@ static void library_window_on_display_extended_properties (LibraryWindow* self, _tmp2_ = display; #line 680 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp2_) { -#line 5037 "LibraryWindow.c" - ExtendedPropertiesWindow* _tmp3_ = NULL; - Page* _tmp4_ = NULL; - Page* _tmp5_ = NULL; - ExtendedPropertiesWindow* _tmp6_ = NULL; +#line 5028 "LibraryWindow.c" + ExtendedPropertiesWindow* _tmp3_; + Page* _tmp4_; + Page* _tmp5_; + ExtendedPropertiesWindow* _tmp6_; #line 681 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = self->priv->extended_properties; #line 681 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -5052,14 +5043,14 @@ static void library_window_on_display_extended_properties (LibraryWindow* self, _tmp6_ = self->priv->extended_properties; #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 5056 "LibraryWindow.c" +#line 5047 "LibraryWindow.c" } else { - ExtendedPropertiesWindow* _tmp7_ = NULL; + ExtendedPropertiesWindow* _tmp7_; #line 684 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp7_ = self->priv->extended_properties; #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 5063 "LibraryWindow.c" +#line 5054 "LibraryWindow.c" } #line 687 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp8_ = action; @@ -5067,25 +5058,25 @@ static void library_window_on_display_extended_properties (LibraryWindow* self, _tmp9_ = value; #line 687 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_simple_action_set_state (_tmp8_, _tmp9_); -#line 5071 "LibraryWindow.c" +#line 5062 "LibraryWindow.c" } static GVariant* _variant_new8 (gboolean value) { #line 695 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return g_variant_ref_sink (g_variant_new_boolean (value)); -#line 5078 "LibraryWindow.c" +#line 5069 "LibraryWindow.c" } static void library_window_on_display_searchbar (LibraryWindow* self, GSimpleAction* action, GVariant* value) { gboolean is_shown = FALSE; - GVariant* _tmp0_ = NULL; - gboolean _tmp1_ = FALSE; - ConfigFacade* _tmp2_ = NULL; - ConfigFacade* _tmp3_ = NULL; - GSimpleAction* _tmp4_ = NULL; - GVariant* _tmp5_ = NULL; + GVariant* _tmp0_; + gboolean _tmp1_; + ConfigFacade* _tmp2_; + ConfigFacade* _tmp3_; + GSimpleAction* _tmp4_; + GVariant* _tmp5_; #line 690 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); #line 690 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -5114,20 +5105,20 @@ static void library_window_on_display_searchbar (LibraryWindow* self, GSimpleAct g_simple_action_set_state (_tmp4_, _tmp5_); #line 695 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_variant_unref0 (_tmp5_); -#line 5118 "LibraryWindow.c" +#line 5109 "LibraryWindow.c" } void library_window_show_search_bar (LibraryWindow* self, gboolean display) { - Page* _tmp0_ = NULL; - Page* _tmp1_ = NULL; - gboolean _tmp2_ = FALSE; - gboolean _tmp3_ = FALSE; - gboolean _tmp4_ = FALSE; - Page* _tmp5_ = NULL; - CheckerboardPage* _tmp6_ = NULL; - CheckerboardPage* _tmp7_ = NULL; - gboolean _tmp8_ = FALSE; + Page* _tmp0_; + Page* _tmp1_; + gboolean _tmp2_; + gboolean _tmp3_; + gboolean _tmp4_; + Page* _tmp5_; + CheckerboardPage* _tmp6_; + CheckerboardPage* _tmp7_; + gboolean _tmp8_; #line 698 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); #line 699 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -5142,7 +5133,7 @@ void library_window_show_search_bar (LibraryWindow* self, gboolean display) { if (_tmp2_) { #line 700 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return; -#line 5146 "LibraryWindow.c" +#line 5137 "LibraryWindow.c" } #line 702 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = display; @@ -5158,7 +5149,7 @@ void library_window_show_search_bar (LibraryWindow* self, gboolean display) { if (_tmp6_ == NULL) { #line 703 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp5_); -#line 5162 "LibraryWindow.c" +#line 5153 "LibraryWindow.c" } #line 703 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp7_ = _tmp6_; @@ -5170,22 +5161,22 @@ void library_window_show_search_bar (LibraryWindow* self, gboolean display) { _tmp8_ = display; #line 704 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (!_tmp8_) { -#line 5174 "LibraryWindow.c" - SearchFilterActions* _tmp9_ = NULL; +#line 5165 "LibraryWindow.c" + SearchFilterActions* _tmp9_; #line 705 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp9_ = self->priv->search_actions; #line 705 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" search_filter_actions_reset (_tmp9_); -#line 5180 "LibraryWindow.c" +#line 5171 "LibraryWindow.c" } } static void library_window_on_display_sidebar (LibraryWindow* self, GSimpleAction* action, GVariant* variant) { - GVariant* _tmp0_ = NULL; - gboolean _tmp1_ = FALSE; - GSimpleAction* _tmp2_ = NULL; - GVariant* _tmp3_ = NULL; + GVariant* _tmp0_; + gboolean _tmp1_; + GSimpleAction* _tmp2_; + GVariant* _tmp3_; #line 708 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); #line 708 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -5202,16 +5193,16 @@ static void library_window_on_display_sidebar (LibraryWindow* self, GSimpleActio _tmp3_ = variant; #line 711 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_simple_action_set_state (_tmp2_, _tmp3_); -#line 5206 "LibraryWindow.c" +#line 5197 "LibraryWindow.c" } static void library_window_set_sidebar_visible (LibraryWindow* self, gboolean visible) { - GtkPaned* _tmp0_ = NULL; - gboolean _tmp1_ = FALSE; - ConfigFacade* _tmp2_ = NULL; - ConfigFacade* _tmp3_ = NULL; - gboolean _tmp4_ = FALSE; + GtkPaned* _tmp0_; + gboolean _tmp1_; + ConfigFacade* _tmp2_; + ConfigFacade* _tmp3_; + gboolean _tmp4_; #line 714 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); #line 715 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -5230,16 +5221,16 @@ static void library_window_set_sidebar_visible (LibraryWindow* self, gboolean vi configuration_facade_set_display_sidebar (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp4_); #line 716 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp3_); -#line 5234 "LibraryWindow.c" +#line 5225 "LibraryWindow.c" } static gboolean library_window_is_sidebar_visible (LibraryWindow* self) { gboolean result = FALSE; - ConfigFacade* _tmp0_ = NULL; - ConfigFacade* _tmp1_ = NULL; - gboolean _tmp2_ = FALSE; - gboolean _tmp3_ = FALSE; + ConfigFacade* _tmp0_; + ConfigFacade* _tmp1_; + gboolean _tmp2_; + gboolean _tmp3_; #line 719 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_val_if_fail (IS_LIBRARY_WINDOW (self), FALSE); #line 720 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -5256,15 +5247,15 @@ static gboolean library_window_is_sidebar_visible (LibraryWindow* self) { result = _tmp3_; #line 720 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return result; -#line 5260 "LibraryWindow.c" +#line 5251 "LibraryWindow.c" } static void library_window_on_display_toolbar (LibraryWindow* self, GSimpleAction* action, GVariant* variant) { - GVariant* _tmp0_ = NULL; - gboolean _tmp1_ = FALSE; - GSimpleAction* _tmp2_ = NULL; - GVariant* _tmp3_ = NULL; + GVariant* _tmp0_; + gboolean _tmp1_; + GSimpleAction* _tmp2_; + GVariant* _tmp3_; #line 723 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); #line 723 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -5281,23 +5272,23 @@ static void library_window_on_display_toolbar (LibraryWindow* self, GSimpleActio _tmp3_ = variant; #line 726 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_simple_action_set_state (_tmp2_, _tmp3_); -#line 5285 "LibraryWindow.c" +#line 5276 "LibraryWindow.c" } static void library_window_set_toolbar_visible (LibraryWindow* self, gboolean visible) { - Page* _tmp0_ = NULL; - Page* _tmp1_ = NULL; - gboolean _tmp2_ = FALSE; + Page* _tmp0_; + Page* _tmp1_; + gboolean _tmp2_; GtkToolbar* toolbar = NULL; - Page* _tmp3_ = NULL; - Page* _tmp4_ = NULL; - GtkToolbar* _tmp5_ = NULL; - GtkToolbar* _tmp6_ = NULL; - GtkToolbar* _tmp7_ = NULL; - ConfigFacade* _tmp10_ = NULL; - ConfigFacade* _tmp11_ = NULL; - gboolean _tmp12_ = FALSE; + Page* _tmp3_; + Page* _tmp4_; + GtkToolbar* _tmp5_; + GtkToolbar* _tmp6_; + GtkToolbar* _tmp7_; + ConfigFacade* _tmp10_; + ConfigFacade* _tmp11_; + gboolean _tmp12_; #line 729 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); #line 730 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -5312,7 +5303,7 @@ static void library_window_set_toolbar_visible (LibraryWindow* self, gboolean vi if (_tmp2_) { #line 731 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return; -#line 5316 "LibraryWindow.c" +#line 5307 "LibraryWindow.c" } #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)); @@ -5330,16 +5321,16 @@ static void library_window_set_toolbar_visible (LibraryWindow* self, gboolean vi _tmp7_ = toolbar; #line 735 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp7_ != NULL) { -#line 5334 "LibraryWindow.c" - GtkRevealer* _tmp8_ = NULL; - gboolean _tmp9_ = FALSE; +#line 5325 "LibraryWindow.c" + GtkRevealer* _tmp8_; + gboolean _tmp9_; #line 736 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp8_ = self->priv->toolbar_revealer; #line 736 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp9_ = visible; #line 736 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" gtk_revealer_set_reveal_child (_tmp8_, _tmp9_); -#line 5343 "LibraryWindow.c" +#line 5334 "LibraryWindow.c" } #line 738 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp10_ = config_facade_get_instance (); @@ -5353,16 +5344,16 @@ static void library_window_set_toolbar_visible (LibraryWindow* self, gboolean vi _g_object_unref0 (_tmp11_); #line 729 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (toolbar); -#line 5357 "LibraryWindow.c" +#line 5348 "LibraryWindow.c" } static gboolean library_window_is_toolbar_visible (LibraryWindow* self) { gboolean result = FALSE; - ConfigFacade* _tmp0_ = NULL; - ConfigFacade* _tmp1_ = NULL; - gboolean _tmp2_ = FALSE; - gboolean _tmp3_ = FALSE; + ConfigFacade* _tmp0_; + ConfigFacade* _tmp1_; + gboolean _tmp2_; + gboolean _tmp3_; #line 741 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_val_if_fail (IS_LIBRARY_WINDOW (self), FALSE); #line 742 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -5379,7 +5370,7 @@ static gboolean library_window_is_toolbar_visible (LibraryWindow* self) { result = _tmp3_; #line 742 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return result; -#line 5383 "LibraryWindow.c" +#line 5374 "LibraryWindow.c" } @@ -5388,7 +5379,7 @@ static void library_window_show_extended_properties (LibraryWindow* self) { g_return_if_fail (IS_LIBRARY_WINDOW (self)); #line 746 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_sync_extended_properties (self, TRUE); -#line 5392 "LibraryWindow.c" +#line 5383 "LibraryWindow.c" } @@ -5397,26 +5388,26 @@ static void library_window_hide_extended_properties (LibraryWindow* self) { g_return_if_fail (IS_LIBRARY_WINDOW (self)); #line 750 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_sync_extended_properties (self, FALSE); -#line 5401 "LibraryWindow.c" +#line 5392 "LibraryWindow.c" } static GVariant* _variant_new9 (gboolean value) { #line 755 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return g_variant_ref_sink (g_variant_new_boolean (value)); -#line 5408 "LibraryWindow.c" +#line 5399 "LibraryWindow.c" } static void library_window_sync_extended_properties (LibraryWindow* self, gboolean show) { GAction* action = NULL; - GAction* _tmp0_ = NULL; - GAction* _tmp1_ = NULL; - gboolean _tmp2_ = FALSE; - GVariant* _tmp3_ = NULL; - ConfigFacade* _tmp4_ = NULL; - ConfigFacade* _tmp5_ = NULL; - gboolean _tmp6_ = FALSE; + GAction* _tmp0_; + GAction* _tmp1_; + gboolean _tmp2_; + GVariant* _tmp3_; + ConfigFacade* _tmp4_; + ConfigFacade* _tmp5_; + gboolean _tmp6_; #line 753 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); #line 754 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -5445,16 +5436,16 @@ static void library_window_sync_extended_properties (LibraryWindow* self, gboole _g_object_unref0 (_tmp5_); #line 753 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (action); -#line 5449 "LibraryWindow.c" +#line 5440 "LibraryWindow.c" } void library_window_enqueue_batch_import (LibraryWindow* self, BatchImport* batch_import, gboolean allow_user_cancel) { - LibraryBranch* _tmp0_ = NULL; - LibraryImportQueueSidebarEntry* _tmp1_ = NULL; - LibraryImportQueueSidebarEntry* _tmp2_ = NULL; - BatchImport* _tmp3_ = NULL; - gboolean _tmp4_ = FALSE; + LibraryBranch* _tmp0_; + LibraryImportQueueSidebarEntry* _tmp1_; + LibraryImportQueueSidebarEntry* _tmp2_; + BatchImport* _tmp3_; + gboolean _tmp4_; #line 761 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); #line 761 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -5471,12 +5462,12 @@ void library_window_enqueue_batch_import (LibraryWindow* self, BatchImport* batc _tmp4_ = allow_user_cancel; #line 762 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_import_queue_sidebar_entry_enqueue_and_schedule (_tmp2_, _tmp3_, _tmp4_); -#line 5475 "LibraryWindow.c" +#line 5466 "LibraryWindow.c" } static void library_window_import_reporter (LibraryWindow* self, ImportManifest* manifest) { - ImportManifest* _tmp0_ = NULL; + ImportManifest* _tmp0_; #line 765 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); #line 765 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -5485,31 +5476,31 @@ static void library_window_import_reporter (LibraryWindow* self, ImportManifest* _tmp0_ = manifest; #line 766 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" import_ui_report_manifest (_tmp0_, TRUE, NULL); -#line 5489 "LibraryWindow.c" +#line 5480 "LibraryWindow.c" } static void _library_window_import_reporter_batch_import_import_reporter (ImportManifest* manifest, BatchImportRoll* import_roll, gpointer self) { #line 797 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_import_reporter ((LibraryWindow*) self, manifest); -#line 5496 "LibraryWindow.c" +#line 5487 "LibraryWindow.c" } static void library_window_dispatch_import_jobs (LibraryWindow* self, GSList* uris, const gchar* job_name, gboolean copy_to_library) { gboolean _tmp0_ = FALSE; - GFile* _tmp1_ = NULL; - GFile* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; - gchar* _tmp4_ = NULL; - const gchar* _tmp5_ = NULL; - gboolean _tmp6_ = FALSE; + GFile* _tmp1_; + GFile* _tmp2_; + gchar* _tmp3_; + gchar* _tmp4_; + const gchar* _tmp5_; + gboolean _tmp6_; GeeArrayList* jobs = NULL; - GeeArrayList* _tmp18_ = NULL; - GSList* _tmp19_ = NULL; - GeeArrayList* _tmp33_ = NULL; - gint _tmp34_ = 0; - gint _tmp35_ = 0; + GeeArrayList* _tmp15_; + GSList* _tmp16_; + GeeArrayList* _tmp29_; + gint _tmp30_; + gint _tmp31_; #line 769 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); #line 769 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -5532,213 +5523,200 @@ static void library_window_dispatch_import_jobs (LibraryWindow* self, GSList* ur _g_object_unref0 (_tmp2_); #line 770 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp6_) { -#line 5536 "LibraryWindow.c" - gboolean _tmp7_ = FALSE; +#line 5527 "LibraryWindow.c" + gboolean _tmp7_; #line 770 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp7_ = self->priv->notify_library_is_home_dir; #line 770 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = _tmp7_; -#line 5542 "LibraryWindow.c" +#line 5533 "LibraryWindow.c" } else { #line 770 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = FALSE; -#line 5546 "LibraryWindow.c" +#line 5537 "LibraryWindow.c" } #line 770 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp0_) { -#line 5550 "LibraryWindow.c" +#line 5541 "LibraryWindow.c" GtkResponseType response = 0; - const gchar* _tmp8_ = NULL; - gchar* _tmp9_ = NULL; - gchar* _tmp10_ = NULL; - const gchar* _tmp11_ = NULL; - const gchar* _tmp12_ = NULL; - AppWindow* _tmp13_ = NULL; - AppWindow* _tmp14_ = NULL; - GtkResponseType _tmp15_ = 0; - GtkResponseType _tmp16_ = 0; - GtkResponseType _tmp17_ = 0; -#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 <span weight=\"bold\">Edit %s Preference" \ -"s</span>.\n" "Do you want to continue importing photos?"); + gchar* _tmp8_; + gchar* _tmp9_; + AppWindow* _tmp10_; + AppWindow* _tmp11_; + GtkResponseType _tmp12_; + GtkResponseType _tmp13_; + GtkResponseType _tmp14_; #line 771 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp9_ = g_strdup_printf (_tmp8_, "▸"); + _tmp8_ = g_strdup_printf (_ ("Shotwell is configured to import photos to your home directory.\n" "We recommend changing this in <span weight=\"bold\">Edit %s Preference" \ +"s</span>.\n" "Do you want to continue importing photos?"), "▸"); #line 771 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp10_ = _tmp9_; -#line 771 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp11_ = _ ("_Import"); -#line 771 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp12_ = _ ("Library Location"); + _tmp9_ = _tmp8_; #line 771 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp13_ = app_window_get_instance (); + _tmp10_ = app_window_get_instance (); #line 771 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp14_ = _tmp13_; + _tmp11_ = _tmp10_; #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)); + _tmp12_ = app_window_affirm_cancel_question (_tmp9_, _ ("_Import"), _ ("Library Location"), G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_window_get_type (), GtkWindow)); #line 771 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp16_ = _tmp15_; + _tmp13_ = _tmp12_; #line 771 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _g_object_unref0 (_tmp14_); + _g_object_unref0 (_tmp11_); #line 771 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _g_free0 (_tmp10_); + _g_free0 (_tmp9_); #line 771 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - response = _tmp16_; + response = _tmp13_; #line 777 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp17_ = response; + _tmp14_ = response; #line 777 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - if (_tmp17_ == GTK_RESPONSE_CANCEL) { + if (_tmp14_ == GTK_RESPONSE_CANCEL) { #line 778 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return; -#line 5592 "LibraryWindow.c" +#line 5574 "LibraryWindow.c" } #line 780 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" self->priv->notify_library_is_home_dir = FALSE; -#line 5596 "LibraryWindow.c" +#line 5578 "LibraryWindow.c" } #line 783 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp18_ = gee_array_list_new (TYPE_FILE_IMPORT_JOB, (GBoxedCopyFunc) batch_import_job_ref, (GDestroyNotify) batch_import_job_unref, NULL, NULL, NULL); + _tmp15_ = gee_array_list_new (TYPE_FILE_IMPORT_JOB, (GBoxedCopyFunc) batch_import_job_ref, (GDestroyNotify) batch_import_job_unref, NULL, NULL, NULL); #line 783 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - jobs = _tmp18_; + jobs = _tmp15_; #line 784 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp19_ = uris; -#line 5604 "LibraryWindow.c" + _tmp16_ = uris; +#line 5586 "LibraryWindow.c" { GSList* uri_collection = NULL; GSList* uri_it = NULL; #line 784 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - uri_collection = _tmp19_; + uri_collection = _tmp16_; #line 784 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" for (uri_it = uri_collection; uri_it != NULL; uri_it = uri_it->next) { -#line 5612 "LibraryWindow.c" - gchar* _tmp20_ = NULL; +#line 5594 "LibraryWindow.c" + gchar* _tmp17_; gchar* uri = NULL; #line 784 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp20_ = g_strdup ((const gchar*) uri_it->data); + _tmp17_ = g_strdup ((const gchar*) uri_it->data); #line 784 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - uri = _tmp20_; -#line 5619 "LibraryWindow.c" + uri = _tmp17_; +#line 5601 "LibraryWindow.c" { GFile* file_or_dir = NULL; - const gchar* _tmp21_ = NULL; - GFile* _tmp22_ = NULL; - GFile* _tmp23_ = NULL; - gchar* _tmp24_ = NULL; - gchar* _tmp25_ = NULL; - gboolean _tmp26_ = FALSE; - GeeArrayList* _tmp28_ = NULL; - GFile* _tmp29_ = NULL; - gboolean _tmp30_ = FALSE; - FileImportJob* _tmp31_ = NULL; - FileImportJob* _tmp32_ = NULL; + const gchar* _tmp18_; + GFile* _tmp19_; + GFile* _tmp20_; + gchar* _tmp21_; + gchar* _tmp22_; + gboolean _tmp23_; + GeeArrayList* _tmp24_; + GFile* _tmp25_; + gboolean _tmp26_; + FileImportJob* _tmp27_; + FileImportJob* _tmp28_; #line 785 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp21_ = uri; + _tmp18_ = uri; #line 785 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp22_ = g_file_new_for_uri (_tmp21_); + _tmp19_ = g_file_new_for_uri (_tmp18_); #line 785 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - file_or_dir = _tmp22_; + file_or_dir = _tmp19_; #line 786 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp23_ = file_or_dir; + _tmp20_ = file_or_dir; #line 786 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp24_ = g_file_get_path (_tmp23_); + _tmp21_ = g_file_get_path (_tmp20_); #line 786 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp25_ = _tmp24_; + _tmp22_ = _tmp21_; #line 786 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp26_ = _tmp25_ == NULL; + _tmp23_ = _tmp22_ == NULL; #line 786 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _g_free0 (_tmp25_); + _g_free0 (_tmp22_); #line 786 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - if (_tmp26_) { -#line 5651 "LibraryWindow.c" - const gchar* _tmp27_ = NULL; + if (_tmp23_) { #line 788 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp27_ = _ ("Photos cannot be imported from this directory."); -#line 788 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - app_window_error_message (_tmp27_, NULL); + app_window_error_message (_ ("Photos cannot be imported from this directory."), NULL); #line 790 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (file_or_dir); #line 790 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_free0 (uri); #line 790 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" continue; -#line 5663 "LibraryWindow.c" +#line 5641 "LibraryWindow.c" } #line 793 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp28_ = jobs; + _tmp24_ = jobs; #line 793 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp29_ = file_or_dir; + _tmp25_ = file_or_dir; #line 793 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp30_ = copy_to_library; + _tmp26_ = copy_to_library; #line 793 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp31_ = file_import_job_new (_tmp29_, _tmp30_); + _tmp27_ = file_import_job_new (_tmp25_, _tmp26_); #line 793 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp32_ = _tmp31_; + _tmp28_ = _tmp27_; #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_); + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp28_); #line 793 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _batch_import_job_unref0 (_tmp32_); + _batch_import_job_unref0 (_tmp28_); #line 784 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (file_or_dir); #line 784 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_free0 (uri); -#line 5683 "LibraryWindow.c" +#line 5661 "LibraryWindow.c" } } } #line 796 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp33_ = jobs; + _tmp29_ = jobs; #line 796 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp34_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp30_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 796 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp35_ = _tmp34_; + _tmp31_ = _tmp30_; #line 796 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - if (_tmp35_ > 0) { -#line 5695 "LibraryWindow.c" + if (_tmp31_ > 0) { +#line 5673 "LibraryWindow.c" BatchImport* batch_import = NULL; - GeeArrayList* _tmp36_ = NULL; - const gchar* _tmp37_ = NULL; - BatchImport* _tmp38_ = NULL; - BatchImport* _tmp39_ = NULL; + GeeArrayList* _tmp32_; + const gchar* _tmp33_; + BatchImport* _tmp34_; + BatchImport* _tmp35_; #line 797 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp36_ = jobs; + _tmp32_ = jobs; #line 797 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp37_ = job_name; + _tmp33_ = job_name; #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); + _tmp34_ = batch_import_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, GEE_TYPE_ITERABLE, GeeIterable), _tmp33_, _library_window_import_reporter_batch_import_import_reporter, self, NULL, NULL, NULL, NULL, NULL); #line 797 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - batch_import = _tmp38_; + batch_import = _tmp34_; #line 798 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp39_ = batch_import; + _tmp35_ = batch_import; #line 798 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - library_window_enqueue_batch_import (self, _tmp39_, TRUE); + library_window_enqueue_batch_import (self, _tmp35_, TRUE); #line 799 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_switch_to_import_queue_page (self); #line 796 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (batch_import); -#line 5717 "LibraryWindow.c" +#line 5695 "LibraryWindow.c" } #line 769 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (jobs); -#line 5721 "LibraryWindow.c" +#line 5699 "LibraryWindow.c" } static GdkDragAction library_window_get_drag_action (LibraryWindow* self) { GdkDragAction result = 0; GdkModifierType mask = 0; - GdkWindow* _tmp0_ = NULL; - GdkDisplay* _tmp1_ = NULL; - GdkDeviceManager* _tmp2_ = NULL; - GdkDevice* _tmp3_ = NULL; + GdkWindow* _tmp0_; + GdkDisplay* _tmp1_; + GdkDeviceManager* _tmp2_; + GdkDevice* _tmp3_; GdkModifierType _tmp4_ = 0; gboolean ctrl = FALSE; - GdkModifierType _tmp5_ = 0; + GdkModifierType _tmp5_; gboolean alt = FALSE; - GdkModifierType _tmp6_ = 0; + GdkModifierType _tmp6_; gboolean shift = FALSE; - GdkModifierType _tmp7_ = 0; + GdkModifierType _tmp7_; gboolean _tmp8_ = FALSE; gboolean _tmp9_ = FALSE; - gboolean _tmp10_ = FALSE; + gboolean _tmp10_; #line 803 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_val_if_fail (IS_LIBRARY_WINDOW (self), 0); #line 806 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -5769,31 +5747,31 @@ static GdkDragAction library_window_get_drag_action (LibraryWindow* self) { _tmp10_ = ctrl; #line 813 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp10_) { -#line 5772 "LibraryWindow.c" - gboolean _tmp11_ = FALSE; +#line 5750 "LibraryWindow.c" + gboolean _tmp11_; #line 813 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp11_ = alt; #line 813 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp9_ = !_tmp11_; -#line 5778 "LibraryWindow.c" +#line 5756 "LibraryWindow.c" } else { #line 813 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp9_ = FALSE; -#line 5782 "LibraryWindow.c" +#line 5760 "LibraryWindow.c" } #line 813 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp9_) { -#line 5786 "LibraryWindow.c" - gboolean _tmp12_ = FALSE; +#line 5764 "LibraryWindow.c" + gboolean _tmp12_; #line 813 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp12_ = shift; #line 813 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp8_ = !_tmp12_; -#line 5792 "LibraryWindow.c" +#line 5770 "LibraryWindow.c" } else { #line 813 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp8_ = FALSE; -#line 5796 "LibraryWindow.c" +#line 5774 "LibraryWindow.c" } #line 813 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp8_) { @@ -5801,40 +5779,40 @@ static GdkDragAction library_window_get_drag_action (LibraryWindow* self) { result = GDK_ACTION_COPY; #line 814 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return result; -#line 5804 "LibraryWindow.c" +#line 5782 "LibraryWindow.c" } else { gboolean _tmp13_ = FALSE; gboolean _tmp14_ = FALSE; - gboolean _tmp15_ = FALSE; + gboolean _tmp15_; #line 815 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp15_ = ctrl; #line 815 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (!_tmp15_) { -#line 5813 "LibraryWindow.c" - gboolean _tmp16_ = FALSE; +#line 5791 "LibraryWindow.c" + gboolean _tmp16_; #line 815 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp16_ = alt; #line 815 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp14_ = _tmp16_; -#line 5819 "LibraryWindow.c" +#line 5797 "LibraryWindow.c" } else { #line 815 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp14_ = FALSE; -#line 5823 "LibraryWindow.c" +#line 5801 "LibraryWindow.c" } #line 815 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp14_) { -#line 5827 "LibraryWindow.c" - gboolean _tmp17_ = FALSE; +#line 5805 "LibraryWindow.c" + gboolean _tmp17_; #line 815 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp17_ = shift; #line 815 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp13_ = !_tmp17_; -#line 5833 "LibraryWindow.c" +#line 5811 "LibraryWindow.c" } else { #line 815 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp13_ = FALSE; -#line 5837 "LibraryWindow.c" +#line 5815 "LibraryWindow.c" } #line 815 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp13_) { @@ -5842,40 +5820,40 @@ static GdkDragAction library_window_get_drag_action (LibraryWindow* self) { result = GDK_ACTION_ASK; #line 816 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return result; -#line 5845 "LibraryWindow.c" +#line 5823 "LibraryWindow.c" } else { gboolean _tmp18_ = FALSE; gboolean _tmp19_ = FALSE; - gboolean _tmp20_ = FALSE; + gboolean _tmp20_; #line 817 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp20_ = ctrl; #line 817 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp20_) { -#line 5854 "LibraryWindow.c" - gboolean _tmp21_ = FALSE; +#line 5832 "LibraryWindow.c" + gboolean _tmp21_; #line 817 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp21_ = alt; #line 817 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp19_ = !_tmp21_; -#line 5860 "LibraryWindow.c" +#line 5838 "LibraryWindow.c" } else { #line 817 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp19_ = FALSE; -#line 5864 "LibraryWindow.c" +#line 5842 "LibraryWindow.c" } #line 817 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp19_) { -#line 5868 "LibraryWindow.c" - gboolean _tmp22_ = FALSE; +#line 5846 "LibraryWindow.c" + gboolean _tmp22_; #line 817 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp22_ = shift; #line 817 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp18_ = _tmp22_; -#line 5874 "LibraryWindow.c" +#line 5852 "LibraryWindow.c" } else { #line 817 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp18_ = FALSE; -#line 5878 "LibraryWindow.c" +#line 5856 "LibraryWindow.c" } #line 817 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp18_) { @@ -5883,13 +5861,13 @@ static GdkDragAction library_window_get_drag_action (LibraryWindow* self) { result = GDK_ACTION_LINK; #line 818 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return result; -#line 5886 "LibraryWindow.c" +#line 5864 "LibraryWindow.c" } else { #line 820 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" result = GDK_ACTION_DEFAULT; #line 820 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return result; -#line 5892 "LibraryWindow.c" +#line 5870 "LibraryWindow.c" } } } @@ -5900,19 +5878,19 @@ static gboolean library_window_real_drag_motion (GtkWidget* base, GdkDragContext LibraryWindow * self; gboolean result = FALSE; GdkAtom target = 0U; - GdkDragContext* _tmp0_ = NULL; - GtkTargetList* _tmp1_ = NULL; - GdkAtom _tmp2_ = 0U; - GdkAtom _tmp3_ = 0U; - GdkAtom _tmp4_ = 0U; - GdkDragContext* _tmp7_ = NULL; - GtkWidget* _tmp8_ = NULL; + GdkDragContext* _tmp0_; + GtkTargetList* _tmp1_; + GdkAtom _tmp2_; + GdkAtom _tmp3_; + GdkAtom _tmp4_; + GdkDragContext* _tmp7_; + GtkWidget* _tmp8_; GdkDragAction drag_action = 0; - GdkDragAction _tmp11_ = 0; - GdkDragAction _tmp12_ = 0; - GdkDragContext* _tmp13_ = NULL; - GdkDragAction _tmp14_ = 0; - guint _tmp15_ = 0U; + GdkDragAction _tmp11_; + GdkDragAction _tmp12_; + GdkDragContext* _tmp13_; + GdkDragAction _tmp14_; + guint _tmp15_; #line 823 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_WINDOW, LibraryWindow); #line 823 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -5931,9 +5909,9 @@ static gboolean library_window_real_drag_motion (GtkWidget* base, GdkDragContext _tmp4_ = GDK_NONE; #line 825 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp3_ == _tmp4_) { -#line 5934 "LibraryWindow.c" - GdkDragContext* _tmp5_ = NULL; - guint _tmp6_ = 0U; +#line 5912 "LibraryWindow.c" + GdkDragContext* _tmp5_; + guint _tmp6_; #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" @@ -5946,7 +5924,7 @@ static gboolean library_window_real_drag_motion (GtkWidget* base, GdkDragContext result = TRUE; #line 829 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return result; -#line 5949 "LibraryWindow.c" +#line 5927 "LibraryWindow.c" } #line 833 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp7_ = context; @@ -5954,9 +5932,9 @@ static gboolean library_window_real_drag_motion (GtkWidget* base, GdkDragContext _tmp8_ = gtk_drag_get_source_widget (_tmp7_); #line 833 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp8_ != NULL) { -#line 5957 "LibraryWindow.c" - GdkDragContext* _tmp9_ = NULL; - guint _tmp10_ = 0U; +#line 5935 "LibraryWindow.c" + GdkDragContext* _tmp9_; + guint _tmp10_; #line 834 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp9_ = context; #line 834 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -5967,7 +5945,7 @@ static gboolean library_window_real_drag_motion (GtkWidget* base, GdkDragContext result = TRUE; #line 836 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return result; -#line 5970 "LibraryWindow.c" +#line 5948 "LibraryWindow.c" } #line 840 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp11_ = library_window_get_drag_action (self); @@ -5979,7 +5957,7 @@ static gboolean library_window_real_drag_motion (GtkWidget* base, GdkDragContext if (_tmp12_ == GDK_ACTION_DEFAULT) { #line 843 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" drag_action = GDK_ACTION_ASK; -#line 5982 "LibraryWindow.c" +#line 5960 "LibraryWindow.c" } #line 845 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp13_ = context; @@ -5993,16 +5971,16 @@ static gboolean library_window_real_drag_motion (GtkWidget* base, GdkDragContext result = TRUE; #line 847 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return result; -#line 5996 "LibraryWindow.c" +#line 5974 "LibraryWindow.c" } static void library_window_real_drag_data_received (GtkWidget* base, GdkDragContext* context, gint x, gint y, GtkSelectionData* selection_data, guint info, guint time) { LibraryWindow * self; - GtkSelectionData* _tmp0_ = NULL; - guchar* _tmp1_ = NULL; - GdkDragContext* _tmp2_ = NULL; - GtkWidget* _tmp3_ = NULL; + GtkSelectionData* _tmp0_; + guchar* _tmp1_; + GdkDragContext* _tmp2_; + GtkWidget* _tmp3_; #line 850 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_WINDOW, LibraryWindow); #line 850 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -6017,7 +5995,7 @@ static void library_window_real_drag_data_received (GtkWidget* base, GdkDragCont if (-1 < 0) { #line 853 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_debug ("LibraryWindow.vala:853: failed to retrieve SelectionData"); -#line 6020 "LibraryWindow.c" +#line 5998 "LibraryWindow.c" } #line 857 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = context; @@ -6025,11 +6003,11 @@ static void library_window_real_drag_data_received (GtkWidget* base, GdkDragCont _tmp3_ = gtk_drag_get_source_widget (_tmp2_); #line 857 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp3_ == NULL) { -#line 6028 "LibraryWindow.c" - GdkDragContext* _tmp4_ = NULL; - GtkSelectionData* _tmp5_ = NULL; - guint _tmp6_ = 0U; - guint _tmp7_ = 0U; +#line 6006 "LibraryWindow.c" + GdkDragContext* _tmp4_; + GtkSelectionData* _tmp5_; + guint _tmp6_; + guint _tmp7_; #line 858 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp4_ = context; #line 858 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -6040,39 +6018,39 @@ static void library_window_real_drag_data_received (GtkWidget* base, GdkDragCont _tmp7_ = time; #line 858 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_external_drop_handler (self, _tmp4_, NULL, _tmp5_, _tmp6_, _tmp7_); -#line 6043 "LibraryWindow.c" +#line 6021 "LibraryWindow.c" } else { - GdkDragContext* _tmp8_ = NULL; - guint _tmp9_ = 0U; + GdkDragContext* _tmp8_; + guint _tmp9_; #line 860 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp8_ = context; #line 860 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp9_ = time; #line 860 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" gtk_drag_finish (_tmp8_, FALSE, FALSE, (guint32) _tmp9_); -#line 6053 "LibraryWindow.c" +#line 6031 "LibraryWindow.c" } } static void library_window_external_drop_handler (LibraryWindow* self, GdkDragContext* context, SidebarEntry* entry, GtkSelectionData* data, guint info, guint time) { gchar** uris_array = NULL; - GtkSelectionData* _tmp0_ = NULL; - gchar** _tmp1_ = NULL; - gchar** _tmp2_ = NULL; - gint uris_array_length1 = 0; - gint _uris_array_size_ = 0; + GtkSelectionData* _tmp0_; + gchar** _tmp1_; + gchar** _tmp2_; + gint uris_array_length1; + gint _uris_array_size_; GSList* uris = NULL; - gchar** _tmp3_ = NULL; - gint _tmp3__length1 = 0; + gchar** _tmp3_; + gint _tmp3__length1; GdkDragAction selected_action = 0; - GdkDragContext* _tmp7_ = NULL; - GdkDragAction _tmp8_ = 0; - GdkDragAction _tmp9_ = 0; - GSList* _tmp21_ = NULL; - GdkDragAction _tmp22_ = 0; - GdkDragContext* _tmp23_ = NULL; - guint _tmp24_ = 0U; + GdkDragContext* _tmp7_; + GdkDragAction _tmp8_; + GdkDragAction _tmp9_; + GSList* _tmp21_; + GdkDragAction _tmp22_; + GdkDragContext* _tmp23_; + guint _tmp24_; #line 863 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); #line 863 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -6097,7 +6075,7 @@ static void library_window_external_drop_handler (LibraryWindow* self, GdkDragCo _tmp3_ = uris_array; #line 868 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3__length1 = uris_array_length1; -#line 6100 "LibraryWindow.c" +#line 6078 "LibraryWindow.c" { gchar** uri_collection = NULL; gint uri_collection_length1 = 0; @@ -6109,17 +6087,17 @@ static void library_window_external_drop_handler (LibraryWindow* self, GdkDragCo uri_collection_length1 = _tmp3__length1; #line 868 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" for (uri_it = 0; uri_it < _tmp3__length1; uri_it = uri_it + 1) { -#line 6112 "LibraryWindow.c" - gchar* _tmp4_ = NULL; +#line 6090 "LibraryWindow.c" + gchar* _tmp4_; gchar* uri = NULL; #line 868 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp4_ = g_strdup (uri_collection[uri_it]); #line 868 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" uri = _tmp4_; -#line 6119 "LibraryWindow.c" +#line 6097 "LibraryWindow.c" { - const gchar* _tmp5_ = NULL; - gchar* _tmp6_ = NULL; + const gchar* _tmp5_; + gchar* _tmp6_; #line 869 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp5_ = uri; #line 869 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -6128,7 +6106,7 @@ static void library_window_external_drop_handler (LibraryWindow* self, GdkDragCo uris = g_slist_append (uris, _tmp6_); #line 868 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_free0 (uri); -#line 6131 "LibraryWindow.c" +#line 6109 "LibraryWindow.c" } } } @@ -6142,15 +6120,15 @@ static void library_window_external_drop_handler (LibraryWindow* self, GdkDragCo _tmp9_ = selected_action; #line 872 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp9_ == GDK_ACTION_ASK) { -#line 6145 "LibraryWindow.c" +#line 6123 "LibraryWindow.c" GtkResponseType _result_ = 0; - GSList* _tmp10_ = NULL; - GtkResponseType _tmp18_ = 0; + GSList* _tmp10_; + GtkResponseType _tmp18_; #line 874 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _result_ = GTK_RESPONSE_REJECT; #line 875 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp10_ = uris; -#line 6153 "LibraryWindow.c" +#line 6131 "LibraryWindow.c" { GSList* uri_collection = NULL; GSList* uri_it = NULL; @@ -6158,20 +6136,20 @@ static void library_window_external_drop_handler (LibraryWindow* self, GdkDragCo uri_collection = _tmp10_; #line 875 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" for (uri_it = uri_collection; uri_it != NULL; uri_it = uri_it->next) { -#line 6161 "LibraryWindow.c" - gchar* _tmp11_ = NULL; +#line 6139 "LibraryWindow.c" + gchar* _tmp11_; gchar* uri = NULL; #line 875 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp11_ = g_strdup ((const gchar*) uri_it->data); #line 875 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" uri = _tmp11_; -#line 6168 "LibraryWindow.c" +#line 6146 "LibraryWindow.c" { - const gchar* _tmp12_ = NULL; - GFile* _tmp13_ = NULL; - GFile* _tmp14_ = NULL; - gboolean _tmp15_ = FALSE; - gboolean _tmp16_ = FALSE; + const gchar* _tmp12_; + GFile* _tmp13_; + GFile* _tmp14_; + gboolean _tmp15_; + gboolean _tmp16_; #line 876 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp12_ = uri; #line 876 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -6186,8 +6164,8 @@ static void library_window_external_drop_handler (LibraryWindow* self, GdkDragCo _g_object_unref0 (_tmp14_); #line 876 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp16_) { -#line 6189 "LibraryWindow.c" - GtkResponseType _tmp17_ = 0; +#line 6167 "LibraryWindow.c" + GtkResponseType _tmp17_; #line 877 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp17_ = copy_files_dialog (); #line 877 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -6196,11 +6174,11 @@ static void library_window_external_drop_handler (LibraryWindow* self, GdkDragCo _g_free0 (uri); #line 879 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" break; -#line 6199 "LibraryWindow.c" +#line 6177 "LibraryWindow.c" } #line 875 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_free0 (uri); -#line 6203 "LibraryWindow.c" +#line 6181 "LibraryWindow.c" } } } @@ -6210,28 +6188,28 @@ static void library_window_external_drop_handler (LibraryWindow* self, GdkDragCo switch (_tmp18_) { #line 883 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" case GTK_RESPONSE_ACCEPT: -#line 6213 "LibraryWindow.c" +#line 6191 "LibraryWindow.c" { #line 885 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" selected_action = GDK_ACTION_COPY; #line 886 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" break; -#line 6219 "LibraryWindow.c" +#line 6197 "LibraryWindow.c" } #line 883 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" case GTK_RESPONSE_REJECT: -#line 6223 "LibraryWindow.c" +#line 6201 "LibraryWindow.c" { #line 889 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" selected_action = GDK_ACTION_LINK; #line 890 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" break; -#line 6229 "LibraryWindow.c" +#line 6207 "LibraryWindow.c" } default: { - GdkDragContext* _tmp19_ = NULL; - guint _tmp20_ = 0U; + GdkDragContext* _tmp19_; + guint _tmp20_; #line 894 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp19_ = context; #line 894 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -6244,7 +6222,7 @@ static void library_window_external_drop_handler (LibraryWindow* self, GdkDragCo uris_array = (_vala_array_free (uris_array, uris_array_length1, (GDestroyNotify) g_free), NULL); #line 896 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return; -#line 6247 "LibraryWindow.c" +#line 6225 "LibraryWindow.c" } } } @@ -6264,16 +6242,16 @@ static void library_window_external_drop_handler (LibraryWindow* self, GdkDragCo __g_slist_free__g_free0_0 (uris); #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 6267 "LibraryWindow.c" +#line 6245 "LibraryWindow.c" } void library_window_switch_to_library_page (LibraryWindow* self) { - LibraryBranch* _tmp0_ = NULL; - LibraryPhotosEntry* _tmp1_ = NULL; - LibraryPhotosEntry* _tmp2_ = NULL; - Page* _tmp3_ = NULL; - Page* _tmp4_ = NULL; + LibraryBranch* _tmp0_; + LibraryPhotosEntry* _tmp1_; + LibraryPhotosEntry* _tmp2_; + Page* _tmp3_; + Page* _tmp4_; #line 905 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); #line 906 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -6290,16 +6268,16 @@ void library_window_switch_to_library_page (LibraryWindow* self) { library_window_switch_to_page (self, _tmp4_); #line 906 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp4_); -#line 6293 "LibraryWindow.c" +#line 6271 "LibraryWindow.c" } void library_window_switch_to_event (LibraryWindow* self, Event* event) { EventsEventEntry* entry = NULL; - EventsBranch* _tmp0_ = NULL; - Event* _tmp1_ = NULL; - EventsEventEntry* _tmp2_ = NULL; - EventsEventEntry* _tmp3_ = NULL; + EventsBranch* _tmp0_; + Event* _tmp1_; + EventsEventEntry* _tmp2_; + EventsEventEntry* _tmp3_; #line 909 "/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" @@ -6316,10 +6294,10 @@ void library_window_switch_to_event (LibraryWindow* self, Event* event) { _tmp3_ = entry; #line 911 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp3_ != NULL) { -#line 6319 "LibraryWindow.c" - EventsEventEntry* _tmp4_ = NULL; - Page* _tmp5_ = NULL; - Page* _tmp6_ = NULL; +#line 6297 "LibraryWindow.c" + EventsEventEntry* _tmp4_; + Page* _tmp5_; + Page* _tmp6_; #line 912 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp4_ = entry; #line 912 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -6330,20 +6308,20 @@ void library_window_switch_to_event (LibraryWindow* self, Event* event) { library_window_switch_to_page (self, _tmp6_); #line 912 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp6_); -#line 6333 "LibraryWindow.c" +#line 6311 "LibraryWindow.c" } #line 909 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (entry); -#line 6337 "LibraryWindow.c" +#line 6315 "LibraryWindow.c" } void library_window_switch_to_tag (LibraryWindow* self, Tag* tag) { TagsSidebarEntry* entry = NULL; - TagsBranch* _tmp0_ = NULL; - Tag* _tmp1_ = NULL; - TagsSidebarEntry* _tmp2_ = NULL; - TagsSidebarEntry* _tmp3_ = NULL; + TagsBranch* _tmp0_; + Tag* _tmp1_; + TagsSidebarEntry* _tmp2_; + TagsSidebarEntry* _tmp3_; #line 915 "/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" @@ -6360,10 +6338,10 @@ void library_window_switch_to_tag (LibraryWindow* self, Tag* tag) { _tmp3_ = entry; #line 917 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp3_ != NULL) { -#line 6363 "LibraryWindow.c" - TagsSidebarEntry* _tmp4_ = NULL; - Page* _tmp5_ = NULL; - Page* _tmp6_ = NULL; +#line 6341 "LibraryWindow.c" + TagsSidebarEntry* _tmp4_; + Page* _tmp5_; + Page* _tmp6_; #line 918 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp4_ = entry; #line 918 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -6374,20 +6352,20 @@ void library_window_switch_to_tag (LibraryWindow* self, Tag* tag) { library_window_switch_to_page (self, _tmp6_); #line 918 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp6_); -#line 6377 "LibraryWindow.c" +#line 6355 "LibraryWindow.c" } #line 915 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (entry); -#line 6381 "LibraryWindow.c" +#line 6359 "LibraryWindow.c" } void library_window_switch_to_saved_search (LibraryWindow* self, SavedSearch* search) { SearchesSidebarEntry* entry = NULL; - SearchesBranch* _tmp0_ = NULL; - SavedSearch* _tmp1_ = NULL; - SearchesSidebarEntry* _tmp2_ = NULL; - SearchesSidebarEntry* _tmp3_ = NULL; + SearchesBranch* _tmp0_; + SavedSearch* _tmp1_; + SearchesSidebarEntry* _tmp2_; + SearchesSidebarEntry* _tmp3_; #line 921 "/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" @@ -6404,10 +6382,10 @@ void library_window_switch_to_saved_search (LibraryWindow* self, SavedSearch* se _tmp3_ = entry; #line 923 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp3_ != NULL) { -#line 6407 "LibraryWindow.c" - SearchesSidebarEntry* _tmp4_ = NULL; - Page* _tmp5_ = NULL; - Page* _tmp6_ = NULL; +#line 6385 "LibraryWindow.c" + SearchesSidebarEntry* _tmp4_; + Page* _tmp5_; + Page* _tmp6_; #line 924 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp4_ = entry; #line 924 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -6418,26 +6396,26 @@ void library_window_switch_to_saved_search (LibraryWindow* self, SavedSearch* se library_window_switch_to_page (self, _tmp6_); #line 924 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp6_); -#line 6421 "LibraryWindow.c" +#line 6399 "LibraryWindow.c" } #line 921 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (entry); -#line 6425 "LibraryWindow.c" +#line 6403 "LibraryWindow.c" } void library_window_switch_to_photo_page (LibraryWindow* self, CollectionPage* controller, Photo* current) { - CollectionPage* _tmp0_ = NULL; - ViewCollection* _tmp1_ = NULL; - ViewCollection* _tmp2_ = NULL; - Photo* _tmp3_ = NULL; - DataView* _tmp4_ = NULL; - DataView* _tmp5_ = NULL; - LibraryPhotoPage* _tmp6_ = NULL; - LibraryPhotoPage* _tmp9_ = NULL; - CollectionPage* _tmp10_ = NULL; - Photo* _tmp11_ = NULL; - LibraryPhotoPage* _tmp12_ = NULL; + CollectionPage* _tmp0_; + ViewCollection* _tmp1_; + ViewCollection* _tmp2_; + Photo* _tmp3_; + DataView* _tmp4_; + DataView* _tmp5_; + LibraryPhotoPage* _tmp6_; + LibraryPhotoPage* _tmp9_; + CollectionPage* _tmp10_; + Photo* _tmp11_; + LibraryPhotoPage* _tmp12_; #line 927 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); #line 927 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -6466,9 +6444,9 @@ void library_window_switch_to_photo_page (LibraryWindow* self, CollectionPage* c _tmp6_ = self->priv->photo_page; #line 929 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp6_ == NULL) { -#line 6469 "LibraryWindow.c" - LibraryPhotoPage* _tmp7_ = NULL; - LibraryPhotoPage* _tmp8_ = NULL; +#line 6447 "LibraryWindow.c" + LibraryPhotoPage* _tmp7_; + LibraryPhotoPage* _tmp8_; #line 930 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp7_ = library_photo_page_new (); #line 930 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -6483,7 +6461,7 @@ void library_window_switch_to_photo_page (LibraryWindow* self, CollectionPage* c library_window_add_to_stack (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_PAGE, Page)); #line 935 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" spin_event_loop (); -#line 6486 "LibraryWindow.c" +#line 6464 "LibraryWindow.c" } #line 938 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp9_ = self->priv->photo_page; @@ -6497,16 +6475,16 @@ void library_window_switch_to_photo_page (LibraryWindow* self, CollectionPage* c _tmp12_ = self->priv->photo_page; #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 6500 "LibraryWindow.c" +#line 6478 "LibraryWindow.c" } void library_window_switch_to_import_queue_page (LibraryWindow* self) { - LibraryBranch* _tmp0_ = NULL; - LibraryImportQueueSidebarEntry* _tmp1_ = NULL; - LibraryImportQueueSidebarEntry* _tmp2_ = NULL; - Page* _tmp3_ = NULL; - Page* _tmp4_ = NULL; + LibraryBranch* _tmp0_; + LibraryImportQueueSidebarEntry* _tmp1_; + LibraryImportQueueSidebarEntry* _tmp2_; + Page* _tmp3_; + Page* _tmp4_; #line 942 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); #line 943 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -6523,26 +6501,26 @@ void library_window_switch_to_import_queue_page (LibraryWindow* self) { library_window_switch_to_page (self, _tmp4_); #line 943 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp4_); -#line 6526 "LibraryWindow.c" +#line 6504 "LibraryWindow.c" } static void library_window_on_camera_added (LibraryWindow* self, DiscoveredCamera* camera) { CameraSidebarEntry* entry = NULL; - CameraBranch* _tmp0_ = NULL; - DiscoveredCamera* _tmp1_ = NULL; - CameraSidebarEntry* _tmp2_ = NULL; - CameraSidebarEntry* _tmp3_ = NULL; + CameraBranch* _tmp0_; + DiscoveredCamera* _tmp1_; + CameraSidebarEntry* _tmp2_; + CameraSidebarEntry* _tmp3_; ImportPage* page = NULL; - CameraSidebarEntry* _tmp4_ = NULL; - Page* _tmp5_ = NULL; + CameraSidebarEntry* _tmp4_; + Page* _tmp5_; GFile* uri_file = NULL; - DiscoveredCamera* _tmp6_ = NULL; - const gchar* _tmp7_ = NULL; - GFile* _tmp8_ = NULL; + DiscoveredCamera* _tmp6_; + const gchar* _tmp7_; + GFile* _tmp8_; GMount* mount = NULL; gboolean _tmp13_ = FALSE; - GMount* _tmp14_ = NULL; + GMount* _tmp14_; GError * _inner_error_ = NULL; #line 946 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); @@ -6564,7 +6542,7 @@ static void library_window_on_camera_added (LibraryWindow* self, DiscoveredCamer _g_object_unref0 (entry); #line 949 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return; -#line 6567 "LibraryWindow.c" +#line 6545 "LibraryWindow.c" } #line 951 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp4_ = entry; @@ -6582,12 +6560,12 @@ static void library_window_on_camera_added (LibraryWindow* self, DiscoveredCamer uri_file = _tmp8_; #line 955 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" mount = NULL; -#line 6585 "LibraryWindow.c" +#line 6563 "LibraryWindow.c" { GMount* _tmp9_ = NULL; - GFile* _tmp10_ = NULL; - GMount* _tmp11_ = NULL; - GMount* _tmp12_ = NULL; + GFile* _tmp10_; + GMount* _tmp11_; + GMount* _tmp12_; #line 957 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp10_ = uri_file; #line 957 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -6596,7 +6574,7 @@ static void library_window_on_camera_added (LibraryWindow* self, DiscoveredCamer _tmp9_ = _tmp11_; #line 957 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 6599 "LibraryWindow.c" +#line 6577 "LibraryWindow.c" goto __catch42_g_error; } #line 957 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -6609,7 +6587,7 @@ static void library_window_on_camera_added (LibraryWindow* self, DiscoveredCamer mount = _tmp12_; #line 956 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp9_); -#line 6612 "LibraryWindow.c" +#line 6590 "LibraryWindow.c" } goto __finally42; __catch42_g_error: @@ -6621,7 +6599,7 @@ static void library_window_on_camera_added (LibraryWindow* self, DiscoveredCamer _inner_error_ = NULL; #line 956 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_error_free0 (err); -#line 6624 "LibraryWindow.c" +#line 6602 "LibraryWindow.c" } __finally42: #line 956 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -6640,16 +6618,16 @@ static void library_window_on_camera_added (LibraryWindow* self, DiscoveredCamer g_clear_error (&_inner_error_); #line 956 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return; -#line 6643 "LibraryWindow.c" +#line 6621 "LibraryWindow.c" } #line 963 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp14_ = mount; #line 963 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp14_ != NULL) { -#line 6649 "LibraryWindow.c" - DiscoveredCamera* _tmp15_ = NULL; - const gchar* _tmp16_ = NULL; - gboolean _tmp17_ = FALSE; +#line 6627 "LibraryWindow.c" + DiscoveredCamera* _tmp15_; + const gchar* _tmp16_; + gboolean _tmp17_; #line 963 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp15_ = camera; #line 963 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -6658,18 +6636,18 @@ static void library_window_on_camera_added (LibraryWindow* self, DiscoveredCamer _tmp17_ = g_str_has_prefix (_tmp16_, "file://"); #line 963 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp13_ = !_tmp17_; -#line 6661 "LibraryWindow.c" +#line 6639 "LibraryWindow.c" } else { #line 963 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp13_ = FALSE; -#line 6665 "LibraryWindow.c" +#line 6643 "LibraryWindow.c" } #line 963 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp13_) { -#line 6669 "LibraryWindow.c" - ImportPage* _tmp18_ = NULL; - GMount* _tmp19_ = NULL; - gboolean _tmp20_ = FALSE; +#line 6647 "LibraryWindow.c" + ImportPage* _tmp18_; + GMount* _tmp19_; + gboolean _tmp20_; #line 964 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp18_ = page; #line 964 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -6678,25 +6656,25 @@ static void library_window_on_camera_added (LibraryWindow* self, DiscoveredCamer _tmp20_ = import_page_unmount_camera (_tmp18_, _tmp19_); #line 964 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp20_) { -#line 6681 "LibraryWindow.c" - ImportPage* _tmp21_ = NULL; +#line 6659 "LibraryWindow.c" + ImportPage* _tmp21_; #line 965 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp21_ = page; #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 6687 "LibraryWindow.c" +#line 6665 "LibraryWindow.c" } else { #line 967 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" app_window_error_message ("Unable to unmount the camera at this time.", NULL); -#line 6691 "LibraryWindow.c" +#line 6669 "LibraryWindow.c" } } else { - ImportPage* _tmp22_ = NULL; + ImportPage* _tmp22_; #line 969 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp22_ = page; #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 6699 "LibraryWindow.c" +#line 6677 "LibraryWindow.c" } #line 946 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (mount); @@ -6706,15 +6684,15 @@ static void library_window_on_camera_added (LibraryWindow* self, DiscoveredCamer _g_object_unref0 (page); #line 946 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (entry); -#line 6709 "LibraryWindow.c" +#line 6687 "LibraryWindow.c" } void library_window_add_to_stack (LibraryWindow* self, Page* page) { - Page* _tmp0_ = NULL; - GtkStack* _tmp1_ = NULL; - Page* _tmp2_ = NULL; - GtkStack* _tmp3_ = NULL; + Page* _tmp0_; + GtkStack* _tmp1_; + Page* _tmp2_; + GtkStack* _tmp3_; #line 974 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); #line 974 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -6733,14 +6711,14 @@ void library_window_add_to_stack (LibraryWindow* self, Page* page) { _tmp3_ = self->priv->stack; #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 6736 "LibraryWindow.c" +#line 6714 "LibraryWindow.c" } static void library_window_remove_from_stack (LibraryWindow* self, Page* page) { - GtkStack* _tmp0_ = NULL; - Page* _tmp1_ = NULL; - GtkStack* _tmp2_ = NULL; + GtkStack* _tmp0_; + Page* _tmp1_; + GtkStack* _tmp2_; #line 983 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); #line 983 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -6755,79 +6733,79 @@ static void library_window_remove_from_stack (LibraryWindow* self, Page* page) { _tmp2_ = self->priv->stack; #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 6758 "LibraryWindow.c" +#line 6736 "LibraryWindow.c" } static GVariant* _variant_new10 (gboolean value) { #line 994 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return g_variant_ref_sink (g_variant_new_boolean (value)); -#line 6765 "LibraryWindow.c" +#line 6743 "LibraryWindow.c" } static GVariant* _variant_new11 (gboolean value) { #line 998 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return g_variant_ref_sink (g_variant_new_boolean (value)); -#line 6772 "LibraryWindow.c" +#line 6750 "LibraryWindow.c" } static GVariant* _variant_new12 (gboolean value) { #line 1002 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return g_variant_ref_sink (g_variant_new_boolean (value)); -#line 6779 "LibraryWindow.c" +#line 6757 "LibraryWindow.c" } static GVariant* _variant_new13 (const gchar* value) { #line 1013 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return g_variant_ref_sink (g_variant_new_string (value)); -#line 6786 "LibraryWindow.c" +#line 6764 "LibraryWindow.c" } static void library_window_load_configuration (LibraryWindow* self) { GAction* basic_display_action = NULL; - GAction* _tmp0_ = NULL; - GAction* _tmp1_ = NULL; - GAction* _tmp2_ = NULL; - GAction* _tmp3_ = NULL; - ConfigFacade* _tmp4_ = NULL; - ConfigFacade* _tmp5_ = NULL; - gboolean _tmp6_ = FALSE; - GVariant* _tmp7_ = NULL; + GAction* _tmp0_; + GAction* _tmp1_; + GAction* _tmp2_; + GAction* _tmp3_; + ConfigFacade* _tmp4_; + ConfigFacade* _tmp5_; + gboolean _tmp6_; + GVariant* _tmp7_; GAction* extended_display_action = NULL; - GAction* _tmp8_ = NULL; - GAction* _tmp9_ = NULL; - GAction* _tmp10_ = NULL; - GAction* _tmp11_ = NULL; - ConfigFacade* _tmp12_ = NULL; - ConfigFacade* _tmp13_ = NULL; - gboolean _tmp14_ = FALSE; - GVariant* _tmp15_ = NULL; + GAction* _tmp8_; + GAction* _tmp9_; + GAction* _tmp10_; + GAction* _tmp11_; + ConfigFacade* _tmp12_; + ConfigFacade* _tmp13_; + gboolean _tmp14_; + GVariant* _tmp15_; GAction* search_bar_display_action = NULL; - GAction* _tmp16_ = NULL; - GAction* _tmp17_ = NULL; - GAction* _tmp18_ = NULL; - GAction* _tmp19_ = NULL; - ConfigFacade* _tmp20_ = NULL; - ConfigFacade* _tmp21_ = NULL; - gboolean _tmp22_ = FALSE; - GVariant* _tmp23_ = NULL; + GAction* _tmp16_; + GAction* _tmp17_; + GAction* _tmp18_; + GAction* _tmp19_; + ConfigFacade* _tmp20_; + ConfigFacade* _tmp21_; + gboolean _tmp22_; + GVariant* _tmp23_; GAction* sort_events_action = NULL; - GAction* _tmp24_ = NULL; - GAction* _tmp25_ = NULL; - GAction* _tmp26_ = NULL; + GAction* _tmp24_; + GAction* _tmp25_; + GAction* _tmp26_; const gchar* _tmp27_ = NULL; - ConfigFacade* _tmp28_ = NULL; - ConfigFacade* _tmp29_ = NULL; - gboolean _tmp30_ = FALSE; - gboolean _tmp31_ = FALSE; + ConfigFacade* _tmp28_; + ConfigFacade* _tmp29_; + gboolean _tmp30_; + gboolean _tmp31_; gchar* event_sort_val = NULL; - gchar* _tmp32_ = NULL; - GAction* _tmp33_ = NULL; - GVariant* _tmp34_ = NULL; + gchar* _tmp32_; + GAction* _tmp33_; + GVariant* _tmp34_; #line 991 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); #line 992 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -6932,11 +6910,11 @@ static void library_window_load_configuration (LibraryWindow* self) { if (_tmp31_) { #line 1010 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp27_ = LIBRARY_WINDOW_SORT_EVENTS_ORDER_ASCENDING; -#line 6935 "LibraryWindow.c" +#line 6913 "LibraryWindow.c" } else { #line 1011 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp27_ = LIBRARY_WINDOW_SORT_EVENTS_ORDER_DESCENDING; -#line 6939 "LibraryWindow.c" +#line 6917 "LibraryWindow.c" } #line 1010 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp32_ = g_strdup (_tmp27_); @@ -6960,7 +6938,7 @@ static void library_window_load_configuration (LibraryWindow* self) { _g_object_unref0 (extended_display_action); #line 991 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (basic_display_action); -#line 6963 "LibraryWindow.c" +#line 6941 "LibraryWindow.c" } @@ -6969,19 +6947,19 @@ static gboolean _library_window_on_pulse_background_progress_bar_gsource_func (g result = library_window_on_pulse_background_progress_bar ((LibraryWindow*) self); #line 1028 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return result; -#line 6972 "LibraryWindow.c" +#line 6950 "LibraryWindow.c" } static void library_window_start_pulse_background_progress_bar (LibraryWindow* self, const gchar* label, gint priority) { - gint _tmp0_ = 0; - gint _tmp1_ = 0; - gint _tmp2_ = 0; - gint _tmp3_ = 0; - GtkProgressBar* _tmp4_ = NULL; - const gchar* _tmp5_ = NULL; - GtkProgressBar* _tmp6_ = NULL; - guint _tmp7_ = 0U; + gint _tmp0_; + gint _tmp1_; + gint _tmp2_; + gint _tmp3_; + GtkProgressBar* _tmp4_; + const gchar* _tmp5_; + GtkProgressBar* _tmp6_; + guint _tmp7_; #line 1016 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); #line 1016 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -6994,7 +6972,7 @@ static void library_window_start_pulse_background_progress_bar (LibraryWindow* s if (_tmp0_ < _tmp1_) { #line 1018 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return; -#line 6997 "LibraryWindow.c" +#line 6975 "LibraryWindow.c" } #line 1020 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = priority; @@ -7020,13 +6998,13 @@ static void library_window_start_pulse_background_progress_bar (LibraryWindow* s _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 1028 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" self->priv->background_progress_pulse_id = _tmp7_; -#line 7023 "LibraryWindow.c" +#line 7001 "LibraryWindow.c" } static gboolean library_window_on_pulse_background_progress_bar (LibraryWindow* self) { gboolean result = FALSE; - GtkProgressBar* _tmp0_ = NULL; + GtkProgressBar* _tmp0_; #line 1032 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_val_if_fail (IS_LIBRARY_WINDOW (self), FALSE); #line 1033 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -7037,15 +7015,15 @@ static gboolean library_window_on_pulse_background_progress_bar (LibraryWindow* result = TRUE; #line 1035 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return result; -#line 7040 "LibraryWindow.c" +#line 7018 "LibraryWindow.c" } static void library_window_stop_pulse_background_progress_bar (LibraryWindow* self, gint priority, gboolean clear) { - gint _tmp0_ = 0; - gint _tmp1_ = 0; - guint _tmp2_ = 0U; - gboolean _tmp4_ = FALSE; + gint _tmp0_; + gint _tmp1_; + guint _tmp2_; + gboolean _tmp4_; #line 1038 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); #line 1039 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -7056,56 +7034,55 @@ static void library_window_stop_pulse_background_progress_bar (LibraryWindow* se if (_tmp0_ < _tmp1_) { #line 1040 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return; -#line 7059 "LibraryWindow.c" +#line 7037 "LibraryWindow.c" } #line 1042 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = self->priv->background_progress_pulse_id; #line 1042 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp2_ != ((guint) 0)) { -#line 7065 "LibraryWindow.c" - guint _tmp3_ = 0U; +#line 7043 "LibraryWindow.c" + guint _tmp3_; #line 1043 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = self->priv->background_progress_pulse_id; #line 1043 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_source_remove (_tmp3_); #line 1044 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" self->priv->background_progress_pulse_id = (guint) 0; -#line 7073 "LibraryWindow.c" +#line 7051 "LibraryWindow.c" } #line 1047 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp4_ = clear; #line 1047 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp4_) { -#line 7079 "LibraryWindow.c" - gint _tmp5_ = 0; +#line 7057 "LibraryWindow.c" + gint _tmp5_; #line 1048 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp5_ = priority; #line 1048 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_clear_background_progress_bar (self, _tmp5_); -#line 7085 "LibraryWindow.c" +#line 7063 "LibraryWindow.c" } } static void library_window_update_background_progress_bar (LibraryWindow* self, const gchar* label, gint priority, gdouble count, gdouble total) { - gint _tmp0_ = 0; - gint _tmp1_ = 0; - gint _tmp2_ = 0; + gint _tmp0_; + gint _tmp1_; + gint _tmp2_; gboolean _tmp3_ = FALSE; gboolean _tmp4_ = FALSE; - gdouble _tmp5_ = 0.0; - gint _tmp10_ = 0; + gdouble _tmp5_; + gint _tmp10_; gdouble fraction = 0.0; - gdouble _tmp11_ = 0.0; - gdouble _tmp12_ = 0.0; - GtkProgressBar* _tmp13_ = NULL; - gdouble _tmp14_ = 0.0; - GtkProgressBar* _tmp15_ = NULL; - const gchar* _tmp16_ = NULL; - const gchar* _tmp17_ = NULL; - gdouble _tmp18_ = 0.0; - gchar* _tmp19_ = NULL; - gchar* _tmp20_ = NULL; + gdouble _tmp11_; + gdouble _tmp12_; + GtkProgressBar* _tmp13_; + gdouble _tmp14_; + GtkProgressBar* _tmp15_; + const gchar* _tmp16_; + gdouble _tmp17_; + gchar* _tmp18_; + gchar* _tmp19_; #line 1051 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); #line 1051 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -7118,7 +7095,7 @@ static void library_window_update_background_progress_bar (LibraryWindow* self, if (_tmp0_ < _tmp1_) { #line 1054 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return; -#line 7121 "LibraryWindow.c" +#line 7098 "LibraryWindow.c" } #line 1056 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = priority; @@ -7130,42 +7107,42 @@ static void library_window_update_background_progress_bar (LibraryWindow* self, if (_tmp5_ <= 0.0) { #line 1058 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp4_ = TRUE; -#line 7133 "LibraryWindow.c" +#line 7110 "LibraryWindow.c" } else { - gdouble _tmp6_ = 0.0; + gdouble _tmp6_; #line 1058 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp6_ = total; #line 1058 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp4_ = _tmp6_ <= 0.0; -#line 7140 "LibraryWindow.c" +#line 7117 "LibraryWindow.c" } #line 1058 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp4_) { #line 1058 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = TRUE; -#line 7146 "LibraryWindow.c" +#line 7123 "LibraryWindow.c" } else { - gdouble _tmp7_ = 0.0; - gdouble _tmp8_ = 0.0; + gdouble _tmp7_; + gdouble _tmp8_; #line 1058 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp7_ = count; #line 1058 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp8_ = total; #line 1058 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = _tmp7_ >= _tmp8_; -#line 7156 "LibraryWindow.c" +#line 7133 "LibraryWindow.c" } #line 1058 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp3_) { -#line 7160 "LibraryWindow.c" - gint _tmp9_ = 0; +#line 7137 "LibraryWindow.c" + gint _tmp9_; #line 1059 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp9_ = priority; #line 1059 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_clear_background_progress_bar (self, _tmp9_); #line 1061 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return; -#line 7168 "LibraryWindow.c" +#line 7145 "LibraryWindow.c" } #line 1064 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp10_ = priority; @@ -7186,31 +7163,29 @@ static void library_window_update_background_progress_bar (LibraryWindow* self, #line 1068 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp15_ = self->priv->background_progress_bar; #line 1068 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp16_ = _ ("%s (%d%%)"); -#line 1068 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp17_ = label; + _tmp16_ = label; #line 1068 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp18_ = fraction; + _tmp17_ = fraction; #line 1068 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp19_ = g_strdup_printf (_tmp16_, _tmp17_, (gint) (_tmp18_ * 100.0)); + _tmp18_ = g_strdup_printf (_ ("%s (%d%%)"), _tmp16_, (gint) (_tmp17_ * 100.0)); #line 1068 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp20_ = _tmp19_; + _tmp19_ = _tmp18_; #line 1068 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - gtk_progress_bar_set_text (_tmp15_, _tmp20_); + gtk_progress_bar_set_text (_tmp15_, _tmp19_); #line 1068 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _g_free0 (_tmp20_); + _g_free0 (_tmp19_); #line 1069 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_show_background_progress_bar (self); -#line 7204 "LibraryWindow.c" +#line 7179 "LibraryWindow.c" } static void library_window_clear_background_progress_bar (LibraryWindow* self, gint priority) { - gint _tmp0_ = 0; - gint _tmp1_ = 0; - gint _tmp2_ = 0; - GtkProgressBar* _tmp3_ = NULL; - GtkProgressBar* _tmp4_ = NULL; + gint _tmp0_; + gint _tmp1_; + gint _tmp2_; + GtkProgressBar* _tmp3_; + GtkProgressBar* _tmp4_; #line 1078 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); #line 1079 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -7221,7 +7196,7 @@ static void library_window_clear_background_progress_bar (LibraryWindow* self, g if (_tmp0_ < _tmp1_) { #line 1080 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return; -#line 7224 "LibraryWindow.c" +#line 7199 "LibraryWindow.c" } #line 1082 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = priority; @@ -7239,22 +7214,22 @@ static void library_window_clear_background_progress_bar (LibraryWindow* self, g gtk_progress_bar_set_text (_tmp4_, ""); #line 1088 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_hide_background_progress_bar (self); -#line 7242 "LibraryWindow.c" +#line 7217 "LibraryWindow.c" } static void library_window_show_background_progress_bar (LibraryWindow* self) { - gboolean _tmp0_ = FALSE; + gboolean _tmp0_; #line 1096 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); #line 1097 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = self->priv->background_progress_displayed; #line 1097 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (!_tmp0_) { -#line 7254 "LibraryWindow.c" - GtkBox* _tmp1_ = NULL; - GtkFrame* _tmp2_ = NULL; - GtkFrame* _tmp3_ = NULL; +#line 7229 "LibraryWindow.c" + GtkBox* _tmp1_; + GtkFrame* _tmp2_; + GtkFrame* _tmp3_; #line 1098 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = self->priv->top_section; #line 1098 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -7267,22 +7242,22 @@ static void library_window_show_background_progress_bar (LibraryWindow* self) { gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget)); #line 1100 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" self->priv->background_progress_displayed = TRUE; -#line 7270 "LibraryWindow.c" +#line 7245 "LibraryWindow.c" } } static void library_window_hide_background_progress_bar (LibraryWindow* self) { - gboolean _tmp0_ = FALSE; + gboolean _tmp0_; #line 1104 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); #line 1105 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = self->priv->background_progress_displayed; #line 1105 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp0_) { -#line 7283 "LibraryWindow.c" - GtkBox* _tmp1_ = NULL; - GtkFrame* _tmp2_ = NULL; +#line 7258 "LibraryWindow.c" + GtkBox* _tmp1_; + GtkFrame* _tmp2_; #line 1106 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = self->priv->top_section; #line 1106 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -7291,20 +7266,17 @@ static void library_window_hide_background_progress_bar (LibraryWindow* self) { 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 1107 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" self->priv->background_progress_displayed = FALSE; -#line 7294 "LibraryWindow.c" +#line 7269 "LibraryWindow.c" } } static void library_window_on_library_monitor_discovery_started (LibraryWindow* self) { - const gchar* _tmp0_ = NULL; #line 1111 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); #line 1112 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp0_ = _ ("Updating library…"); -#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 7307 "LibraryWindow.c" + library_window_start_pulse_background_progress_bar (self, _ ("Updating library…"), LIBRARY_WINDOW_STARTUP_SCAN_PROGRESS_PRIORITY); +#line 7279 "LibraryWindow.c" } @@ -7313,12 +7285,12 @@ static void library_window_on_library_monitor_discovery_completed (LibraryWindow g_return_if_fail (IS_LIBRARY_WINDOW (self)); #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 7316 "LibraryWindow.c" +#line 7288 "LibraryWindow.c" } static void library_window_on_library_monitor_auto_update_progress (LibraryWindow* self, gint completed_files, gint total_files) { - gint _tmp0_ = 0; + gint _tmp0_; #line 1119 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); #line 1120 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -7327,56 +7299,47 @@ static void library_window_on_library_monitor_auto_update_progress (LibraryWindo if (_tmp0_ < LIBRARY_WINDOW_MIN_PROGRESS_BAR_FILES) { #line 1121 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_clear_background_progress_bar (self, LIBRARY_WINDOW_REALTIME_UPDATE_PROGRESS_PRIORITY); -#line 7330 "LibraryWindow.c" +#line 7302 "LibraryWindow.c" } else { - const gchar* _tmp1_ = NULL; - gint _tmp2_ = 0; - gint _tmp3_ = 0; -#line 1123 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp1_ = _ ("Updating library…"); + gint _tmp1_; + gint _tmp2_; #line 1123 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp2_ = completed_files; + _tmp1_ = completed_files; #line 1123 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp3_ = total_files; + _tmp2_ = total_files; #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 7343 "LibraryWindow.c" + library_window_update_background_progress_bar (self, _ ("Updating library…"), LIBRARY_WINDOW_REALTIME_UPDATE_PROGRESS_PRIORITY, (gdouble) _tmp1_, (gdouble) _tmp2_); +#line 7312 "LibraryWindow.c" } } static void library_window_on_library_monitor_auto_import_preparing (LibraryWindow* self) { - const gchar* _tmp0_ = NULL; #line 1128 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); #line 1129 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp0_ = _ ("Preparing to auto-import photos…"); -#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 7356 "LibraryWindow.c" + library_window_start_pulse_background_progress_bar (self, _ ("Preparing to auto-import photos…"), LIBRARY_WINDOW_REALTIME_IMPORT_PROGRESS_PRIORITY); +#line 7322 "LibraryWindow.c" } static void library_window_on_library_monitor_auto_import_progress (LibraryWindow* self, guint64 completed_bytes, guint64 total_bytes) { - const gchar* _tmp0_ = NULL; - guint64 _tmp1_ = 0ULL; - guint64 _tmp2_ = 0ULL; + guint64 _tmp0_; + guint64 _tmp1_; #line 1133 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); #line 1134 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp0_ = _ ("Auto-importing photos…"); -#line 1134 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp1_ = completed_bytes; + _tmp0_ = completed_bytes; #line 1134 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp2_ = total_bytes; + _tmp1_ = total_bytes; #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 7374 "LibraryWindow.c" + library_window_update_background_progress_bar (self, _ ("Auto-importing photos…"), LIBRARY_WINDOW_REALTIME_IMPORT_PROGRESS_PRIORITY, (gdouble) _tmp0_, (gdouble) _tmp1_); +#line 7337 "LibraryWindow.c" } static void library_window_on_metadata_writer_progress (LibraryWindow* self, guint completed, guint total) { - guint _tmp0_ = 0U; + guint _tmp0_; #line 1138 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); #line 1139 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -7385,76 +7348,73 @@ static void library_window_on_metadata_writer_progress (LibraryWindow* self, gui if (_tmp0_ < ((guint) LIBRARY_WINDOW_MIN_PROGRESS_BAR_FILES)) { #line 1140 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_clear_background_progress_bar (self, LIBRARY_WINDOW_METADATA_WRITER_PROGRESS_PRIORITY); -#line 7388 "LibraryWindow.c" +#line 7351 "LibraryWindow.c" } else { - const gchar* _tmp1_ = NULL; - guint _tmp2_ = 0U; - guint _tmp3_ = 0U; + guint _tmp1_; + guint _tmp2_; #line 1142 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp1_ = _ ("Writing metadata to files…"); + _tmp1_ = completed; #line 1142 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp2_ = completed; + _tmp2_ = total; #line 1142 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp3_ = total; -#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 7401 "LibraryWindow.c" + library_window_update_background_progress_bar (self, _ ("Writing metadata to files…"), LIBRARY_WINDOW_METADATA_WRITER_PROGRESS_PRIORITY, (gdouble) _tmp1_, (gdouble) _tmp2_); +#line 7361 "LibraryWindow.c" } } static void library_window_create_layout (LibraryWindow* self, Page* start_page) { GtkScrolledWindow* scrolled_sidebar = NULL; - GtkScrolledWindow* _tmp0_ = NULL; - SidebarTree* _tmp1_ = NULL; - GtkFrame* _tmp2_ = NULL; - GtkFrame* _tmp3_ = NULL; - GtkProgressBar* _tmp4_ = NULL; - GtkFrame* _tmp5_ = NULL; - GtkStyleContext* _tmp6_ = NULL; - BasicProperties* _tmp7_ = NULL; - BasicProperties* _tmp8_ = NULL; - BasicProperties* _tmp9_ = NULL; - BasicProperties* _tmp10_ = NULL; - BasicProperties* _tmp11_ = NULL; - BasicProperties* _tmp12_ = NULL; - BasicProperties* _tmp13_ = NULL; - BasicProperties* _tmp14_ = NULL; - GtkFrame* _tmp15_ = NULL; - BasicProperties* _tmp16_ = NULL; - GtkFrame* _tmp17_ = NULL; - GtkStyleContext* _tmp18_ = NULL; - GtkBox* _tmp19_ = NULL; - GtkPaned* _tmp20_ = NULL; - GtkBox* _tmp21_ = NULL; - GtkPaned* _tmp22_ = NULL; - GtkFrame* _tmp23_ = NULL; - GtkPaned* _tmp24_ = NULL; - GtkBox* _tmp25_ = NULL; - GtkBox* _tmp26_ = NULL; - SearchFilterToolbar* _tmp27_ = NULL; - GtkBox* _tmp28_ = NULL; - GtkStack* _tmp29_ = NULL; - GtkBox* _tmp30_ = NULL; - GtkRevealer* _tmp31_ = NULL; - GtkPaned* _tmp32_ = NULL; - GtkPaned* _tmp33_ = NULL; - GtkPaned* _tmp34_ = NULL; - SidebarTree* _tmp35_ = NULL; - GtkPaned* _tmp36_ = NULL; - GtkBox* _tmp37_ = NULL; - GtkPaned* _tmp38_ = NULL; - ConfigFacade* _tmp39_ = NULL; - ConfigFacade* _tmp40_ = NULL; - gint _tmp41_ = 0; - GtkStack* _tmp42_ = NULL; - gint _tmp43_ = 0; - gint _tmp44_ = 0; - GtkBox* _tmp45_ = NULL; - GtkPaned* _tmp46_ = NULL; - GtkBox* _tmp47_ = NULL; - Page* _tmp48_ = NULL; - Page* _tmp49_ = NULL; + GtkScrolledWindow* _tmp0_; + SidebarTree* _tmp1_; + GtkFrame* _tmp2_; + GtkFrame* _tmp3_; + GtkProgressBar* _tmp4_; + GtkFrame* _tmp5_; + GtkStyleContext* _tmp6_; + BasicProperties* _tmp7_; + BasicProperties* _tmp8_; + BasicProperties* _tmp9_; + BasicProperties* _tmp10_; + BasicProperties* _tmp11_; + BasicProperties* _tmp12_; + BasicProperties* _tmp13_; + BasicProperties* _tmp14_; + GtkFrame* _tmp15_; + BasicProperties* _tmp16_; + GtkFrame* _tmp17_; + GtkStyleContext* _tmp18_; + GtkBox* _tmp19_; + GtkPaned* _tmp20_; + GtkBox* _tmp21_; + GtkPaned* _tmp22_; + GtkFrame* _tmp23_; + GtkPaned* _tmp24_; + GtkBox* _tmp25_; + GtkBox* _tmp26_; + SearchFilterToolbar* _tmp27_; + GtkBox* _tmp28_; + GtkStack* _tmp29_; + GtkBox* _tmp30_; + GtkRevealer* _tmp31_; + GtkPaned* _tmp32_; + GtkPaned* _tmp33_; + GtkPaned* _tmp34_; + SidebarTree* _tmp35_; + GtkPaned* _tmp36_; + GtkBox* _tmp37_; + GtkPaned* _tmp38_; + ConfigFacade* _tmp39_; + ConfigFacade* _tmp40_; + gint _tmp41_; + GtkStack* _tmp42_; + gint _tmp43_; + gint _tmp44_; + GtkBox* _tmp45_; + GtkPaned* _tmp46_; + GtkBox* _tmp47_; + Page* _tmp48_; + Page* _tmp49_; #line 1147 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); #line 1147 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -7641,13 +7601,13 @@ static void library_window_create_layout (LibraryWindow* self, Page* start_page) 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 7644 "LibraryWindow.c" +#line 7604 "LibraryWindow.c" } static void library_window_real_set_current_page (PageWindow* base, Page* page) { LibraryWindow * self; - Page* _tmp0_ = NULL; + Page* _tmp0_; #line 1200 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_WINDOW, LibraryWindow); #line 1200 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -7656,63 +7616,63 @@ static void library_window_real_set_current_page (PageWindow* base, Page* page) _tmp0_ = page; #line 1202 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_switch_to_page (self, _tmp0_); -#line 7659 "LibraryWindow.c" +#line 7619 "LibraryWindow.c" } void library_window_set_page_switching_enabled (LibraryWindow* self, gboolean should_enable) { - gboolean _tmp0_ = FALSE; + gboolean _tmp0_; #line 1205 "/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" _tmp0_ = should_enable; #line 1206 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" self->priv->page_switching_enabled = _tmp0_; -#line 7671 "LibraryWindow.c" +#line 7631 "LibraryWindow.c" } void library_window_switch_to_page (LibraryWindow* self, Page* page) { - gboolean _tmp0_ = FALSE; - Page* _tmp1_ = NULL; - Page* _tmp2_ = NULL; - Page* _tmp3_ = NULL; - gboolean _tmp4_ = FALSE; + gboolean _tmp0_; + Page* _tmp1_; + Page* _tmp2_; + Page* _tmp3_; + gboolean _tmp4_; Page* current_page = NULL; - Page* _tmp5_ = NULL; - Page* _tmp6_ = NULL; - GtkStack* _tmp16_ = NULL; - Page* _tmp17_ = NULL; - Page* _tmp18_ = NULL; - Page* _tmp19_ = NULL; - gboolean _tmp21_ = FALSE; - Page* _tmp22_ = NULL; + Page* _tmp5_; + Page* _tmp6_; + GtkStack* _tmp16_; + Page* _tmp17_; + Page* _tmp18_; + Page* _tmp19_; + gboolean _tmp21_; + Page* _tmp22_; SidebarEntry* entry = NULL; - GeeHashMap* _tmp23_ = NULL; - Page* _tmp24_ = NULL; - gpointer _tmp25_ = NULL; - SidebarEntry* _tmp26_ = NULL; - Page* _tmp37_ = NULL; - Page* _tmp39_ = NULL; - Page* _tmp40_ = NULL; - Page* _tmp41_ = NULL; - Page* _tmp42_ = NULL; - Page* _tmp43_ = NULL; - GMenuModel* _tmp44_ = NULL; - GMenuModel* _tmp45_ = NULL; + GeeHashMap* _tmp23_; + Page* _tmp24_; + gpointer _tmp25_; + SidebarEntry* _tmp26_; + Page* _tmp37_; + Page* _tmp39_; + Page* _tmp40_; + Page* _tmp41_; + Page* _tmp42_; + Page* _tmp43_; + GMenuModel* _tmp44_; + GMenuModel* _tmp45_; gboolean old = FALSE; - GtkSettings* _tmp46_ = NULL; - gboolean _tmp47_ = FALSE; - gboolean _tmp48_ = FALSE; - GtkSettings* _tmp49_ = NULL; - gboolean _tmp50_ = FALSE; - GtkSettings* _tmp51_ = NULL; - gboolean _tmp52_ = FALSE; + GtkSettings* _tmp46_; + gboolean _tmp47_; + gboolean _tmp48_; + GtkSettings* _tmp49_; + gboolean _tmp50_; + GtkSettings* _tmp51_; + gboolean _tmp52_; GtkToolbar* toolbar = NULL; - Page* _tmp53_ = NULL; - GtkToolbar* _tmp54_ = NULL; - GtkToolbar* _tmp55_ = NULL; - Page* _tmp61_ = NULL; + Page* _tmp53_; + GtkToolbar* _tmp54_; + GtkToolbar* _tmp55_; + Page* _tmp61_; #line 1209 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); #line 1209 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -7723,7 +7683,7 @@ void library_window_switch_to_page (LibraryWindow* self, Page* page) { if (!_tmp0_) { #line 1211 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return; -#line 7726 "LibraryWindow.c" +#line 7686 "LibraryWindow.c" } #line 1213 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = page; @@ -7739,7 +7699,7 @@ void library_window_switch_to_page (LibraryWindow* self, Page* page) { if (_tmp4_) { #line 1214 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return; -#line 7742 "LibraryWindow.c" +#line 7702 "LibraryWindow.c" } #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)); @@ -7749,14 +7709,14 @@ void library_window_switch_to_page (LibraryWindow* self, Page* page) { _tmp6_ = current_page; #line 1217 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp6_ != NULL) { -#line 7752 "LibraryWindow.c" +#line 7712 "LibraryWindow.c" GtkToolbar* toolbar = NULL; - Page* _tmp7_ = NULL; - GtkToolbar* _tmp8_ = NULL; - GtkToolbar* _tmp9_ = NULL; - Page* _tmp12_ = NULL; - Page* _tmp13_ = NULL; - Page* _tmp15_ = NULL; + Page* _tmp7_; + GtkToolbar* _tmp8_; + GtkToolbar* _tmp9_; + Page* _tmp12_; + Page* _tmp13_; + Page* _tmp15_; #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 1219 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -7771,16 +7731,16 @@ void library_window_switch_to_page (LibraryWindow* self, Page* page) { _tmp9_ = toolbar; #line 1222 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp9_ != NULL) { -#line 7774 "LibraryWindow.c" - GtkRevealer* _tmp10_ = NULL; - GtkToolbar* _tmp11_ = NULL; +#line 7734 "LibraryWindow.c" + GtkRevealer* _tmp10_; + GtkToolbar* _tmp11_; #line 1223 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp10_ = self->priv->toolbar_revealer; #line 1223 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp11_ = toolbar; #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 7783 "LibraryWindow.c" +#line 7743 "LibraryWindow.c" } #line 1225 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp12_ = current_page; @@ -7790,13 +7750,13 @@ void library_window_switch_to_page (LibraryWindow* self, Page* page) { _tmp13_ = current_page; #line 1229 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp13_, TYPE_LIBRARY_PHOTO_PAGE)) { -#line 7793 "LibraryWindow.c" - SidebarTree* _tmp14_ = NULL; +#line 7753 "LibraryWindow.c" + SidebarTree* _tmp14_; #line 1230 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp14_ = self->priv->sidebar_tree; #line 1230 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" sidebar_tree_enable_editing (_tmp14_); -#line 7799 "LibraryWindow.c" +#line 7759 "LibraryWindow.c" } #line 1233 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp15_ = current_page; @@ -7804,7 +7764,7 @@ void library_window_switch_to_page (LibraryWindow* self, Page* page) { library_window_unsubscribe_from_basic_information (self, _tmp15_); #line 1217 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (toolbar); -#line 7807 "LibraryWindow.c" +#line 7767 "LibraryWindow.c" } #line 1236 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp16_ = self->priv->stack; @@ -7820,13 +7780,13 @@ void library_window_switch_to_page (LibraryWindow* self, Page* page) { _tmp19_ = page; #line 1246 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp19_, TYPE_LIBRARY_PHOTO_PAGE)) { -#line 7823 "LibraryWindow.c" - SidebarTree* _tmp20_ = NULL; +#line 7783 "LibraryWindow.c" + SidebarTree* _tmp20_; #line 1247 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp20_ = self->priv->sidebar_tree; #line 1247 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" sidebar_tree_disable_editing (_tmp20_); -#line 7829 "LibraryWindow.c" +#line 7789 "LibraryWindow.c" } #line 1250 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp21_ = library_window_should_show_search_bar (self); @@ -7846,14 +7806,14 @@ void library_window_switch_to_page (LibraryWindow* self, Page* page) { _tmp26_ = entry; #line 1254 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp26_ != NULL) { -#line 7849 "LibraryWindow.c" +#line 7809 "LibraryWindow.c" SidebarExpandableEntry* expandable_entry = NULL; - SidebarEntry* _tmp27_ = NULL; - SidebarExpandableEntry* _tmp28_ = NULL; + SidebarEntry* _tmp27_; + SidebarExpandableEntry* _tmp28_; gboolean _tmp29_ = FALSE; - SidebarExpandableEntry* _tmp30_ = NULL; - SidebarTree* _tmp35_ = NULL; - SidebarEntry* _tmp36_ = NULL; + SidebarExpandableEntry* _tmp30_; + SidebarTree* _tmp35_; + SidebarEntry* _tmp36_; #line 1257 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp27_ = entry; #line 1257 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -7864,33 +7824,33 @@ void library_window_switch_to_page (LibraryWindow* self, Page* page) { _tmp30_ = expandable_entry; #line 1258 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp30_ != NULL) { -#line 7867 "LibraryWindow.c" - SidebarExpandableEntry* _tmp31_ = NULL; - gboolean _tmp32_ = FALSE; +#line 7827 "LibraryWindow.c" + SidebarExpandableEntry* _tmp31_; + gboolean _tmp32_; #line 1258 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp31_ = expandable_entry; #line 1258 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp32_ = sidebar_expandable_entry_expand_on_select (_tmp31_); #line 1258 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp29_ = _tmp32_; -#line 7876 "LibraryWindow.c" +#line 7836 "LibraryWindow.c" } else { #line 1258 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp29_ = FALSE; -#line 7880 "LibraryWindow.c" +#line 7840 "LibraryWindow.c" } #line 1258 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp29_) { -#line 7884 "LibraryWindow.c" - SidebarTree* _tmp33_ = NULL; - SidebarEntry* _tmp34_ = NULL; +#line 7844 "LibraryWindow.c" + SidebarTree* _tmp33_; + SidebarEntry* _tmp34_; #line 1259 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp33_ = self->priv->sidebar_tree; #line 1259 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp34_ = entry; #line 1259 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" sidebar_tree_expand_to_entry (_tmp33_, _tmp34_); -#line 7893 "LibraryWindow.c" +#line 7853 "LibraryWindow.c" } #line 1261 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp35_ = self->priv->sidebar_tree; @@ -7900,7 +7860,7 @@ void library_window_switch_to_page (LibraryWindow* self, Page* page) { sidebar_tree_place_cursor (_tmp35_, _tmp36_, TRUE); #line 1254 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (expandable_entry); -#line 7903 "LibraryWindow.c" +#line 7863 "LibraryWindow.c" } #line 1264 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_on_update_properties (self); @@ -7908,13 +7868,13 @@ void library_window_switch_to_page (LibraryWindow* self, Page* page) { _tmp37_ = page; #line 1266 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp37_, TYPE_CHECKERBOARD_PAGE)) { -#line 7911 "LibraryWindow.c" - Page* _tmp38_ = NULL; +#line 7871 "LibraryWindow.c" + Page* _tmp38_; #line 1267 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp38_ = page; #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 7917 "LibraryWindow.c" +#line 7877 "LibraryWindow.c" } #line 1269 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp39_ = page; @@ -7974,12 +7934,12 @@ void library_window_switch_to_page (LibraryWindow* self, Page* page) { _tmp55_ = toolbar; #line 1283 "/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 7937 "LibraryWindow.c" + GtkRevealer* _tmp56_; + GtkToolbar* _tmp57_; + GtkToolbar* _tmp58_; + GtkRevealer* _tmp59_; + gboolean _tmp60_; #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" @@ -7996,7 +7956,7 @@ void library_window_switch_to_page (LibraryWindow* self, Page* page) { _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 7959 "LibraryWindow.c" } #line 1289 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp61_ = page; @@ -8008,21 +7968,21 @@ void library_window_switch_to_page (LibraryWindow* self, Page* page) { _g_object_unref0 (entry); #line 1209 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (current_page); -#line 8011 "LibraryWindow.c" +#line 7971 "LibraryWindow.c" } static void library_window_init_view_filter (LibraryWindow* self, CheckerboardPage* page) { - SearchFilterToolbar* _tmp0_ = NULL; - CheckerboardPage* _tmp1_ = NULL; - SearchViewFilter* _tmp2_ = NULL; - SearchViewFilter* _tmp3_ = NULL; - CheckerboardPage* _tmp4_ = NULL; - ViewCollection* _tmp5_ = NULL; - ViewCollection* _tmp6_ = NULL; - CheckerboardPage* _tmp7_ = NULL; - SearchViewFilter* _tmp8_ = NULL; - SearchViewFilter* _tmp9_ = NULL; + SearchFilterToolbar* _tmp0_; + CheckerboardPage* _tmp1_; + SearchViewFilter* _tmp2_; + SearchViewFilter* _tmp3_; + CheckerboardPage* _tmp4_; + ViewCollection* _tmp5_; + ViewCollection* _tmp6_; + CheckerboardPage* _tmp7_; + SearchViewFilter* _tmp8_; + SearchViewFilter* _tmp9_; #line 1292 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); #line 1292 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -8057,16 +8017,16 @@ static void library_window_init_view_filter (LibraryWindow* self, CheckerboardPa _view_filter_unref0 (_tmp9_); #line 1294 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _data_collection_unref0 (_tmp6_); -#line 8060 "LibraryWindow.c" +#line 8020 "LibraryWindow.c" } static gboolean library_window_should_show_search_bar (LibraryWindow* self) { gboolean result = FALSE; gboolean _tmp0_ = FALSE; - Page* _tmp1_ = NULL; - Page* _tmp2_ = NULL; - gboolean _tmp3_ = FALSE; + Page* _tmp1_; + Page* _tmp2_; + gboolean _tmp3_; #line 1297 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_val_if_fail (IS_LIBRARY_WINDOW (self), FALSE); #line 1298 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -8079,30 +8039,30 @@ static gboolean library_window_should_show_search_bar (LibraryWindow* self) { _g_object_unref0 (_tmp2_); #line 1298 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp3_) { -#line 8082 "LibraryWindow.c" - gboolean _tmp4_ = FALSE; +#line 8042 "LibraryWindow.c" + gboolean _tmp4_; #line 1298 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp4_ = self->priv->is_search_toolbar_visible; #line 1298 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = _tmp4_; -#line 8088 "LibraryWindow.c" +#line 8048 "LibraryWindow.c" } else { #line 1298 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = FALSE; -#line 8092 "LibraryWindow.c" +#line 8052 "LibraryWindow.c" } #line 1298 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" result = _tmp0_; #line 1298 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return result; -#line 8098 "LibraryWindow.c" +#line 8058 "LibraryWindow.c" } static void library_window_toggle_search_bar (LibraryWindow* self, gboolean show, CheckerboardPage* page) { - SearchFilterToolbar* _tmp0_ = NULL; - gboolean _tmp1_ = FALSE; - gboolean _tmp2_ = FALSE; + SearchFilterToolbar* _tmp0_; + gboolean _tmp1_; + gboolean _tmp2_; #line 1302 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); #line 1302 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -8117,18 +8077,18 @@ static void library_window_toggle_search_bar (LibraryWindow* self, gboolean show _tmp2_ = show; #line 1304 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp2_) { -#line 8120 "LibraryWindow.c" - CheckerboardPage* _tmp3_ = NULL; - SearchFilterToolbar* _tmp4_ = NULL; - CheckerboardPage* _tmp5_ = NULL; - SearchViewFilter* _tmp6_ = NULL; - SearchViewFilter* _tmp7_ = NULL; - CheckerboardPage* _tmp8_ = NULL; - ViewCollection* _tmp9_ = NULL; - ViewCollection* _tmp10_ = NULL; - CheckerboardPage* _tmp11_ = NULL; - SearchViewFilter* _tmp12_ = NULL; - SearchViewFilter* _tmp13_ = NULL; +#line 8080 "LibraryWindow.c" + CheckerboardPage* _tmp3_; + SearchFilterToolbar* _tmp4_; + CheckerboardPage* _tmp5_; + SearchViewFilter* _tmp6_; + SearchViewFilter* _tmp7_; + CheckerboardPage* _tmp8_; + ViewCollection* _tmp9_; + ViewCollection* _tmp10_; + CheckerboardPage* _tmp11_; + SearchViewFilter* _tmp12_; + SearchViewFilter* _tmp13_; #line 1305 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = page; #line 1305 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -8163,19 +8123,19 @@ static void library_window_toggle_search_bar (LibraryWindow* self, gboolean show _view_filter_unref0 (_tmp13_); #line 1307 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _data_collection_unref0 (_tmp10_); -#line 8166 "LibraryWindow.c" +#line 8126 "LibraryWindow.c" } else { - CheckerboardPage* _tmp14_ = NULL; + CheckerboardPage* _tmp14_; #line 1309 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp14_ = page; #line 1309 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp14_ != NULL) { -#line 8173 "LibraryWindow.c" - CheckerboardPage* _tmp15_ = NULL; - ViewCollection* _tmp16_ = NULL; - ViewCollection* _tmp17_ = NULL; - DisabledViewFilter* _tmp18_ = NULL; - DisabledViewFilter* _tmp19_ = NULL; +#line 8133 "LibraryWindow.c" + CheckerboardPage* _tmp15_; + ViewCollection* _tmp16_; + ViewCollection* _tmp17_; + DisabledViewFilter* _tmp18_; + DisabledViewFilter* _tmp19_; #line 1310 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp15_ = page; #line 1310 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -8192,20 +8152,20 @@ static void library_window_toggle_search_bar (LibraryWindow* self, gboolean show _view_filter_unref0 (_tmp19_); #line 1310 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _data_collection_unref0 (_tmp17_); -#line 8195 "LibraryWindow.c" +#line 8155 "LibraryWindow.c" } } } static void library_window_on_page_created (LibraryWindow* self, SidebarPageRepresentative* entry, Page* page) { - GeeHashMap* _tmp0_ = NULL; - Page* _tmp1_ = NULL; - gboolean _tmp2_ = FALSE; - GeeHashMap* _tmp3_ = NULL; - Page* _tmp4_ = NULL; - SidebarPageRepresentative* _tmp5_ = NULL; - Page* _tmp6_ = NULL; + GeeHashMap* _tmp0_; + Page* _tmp1_; + gboolean _tmp2_; + GeeHashMap* _tmp3_; + Page* _tmp4_; + SidebarPageRepresentative* _tmp5_; + Page* _tmp6_; #line 1314 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); #line 1314 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -8232,20 +8192,20 @@ static void library_window_on_page_created (LibraryWindow* self, SidebarPageRepr _tmp6_ = page; #line 1318 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_add_to_stack (self, _tmp6_); -#line 8235 "LibraryWindow.c" +#line 8195 "LibraryWindow.c" } static void library_window_on_destroying_page (LibraryWindow* self, SidebarPageRepresentative* entry, Page* page) { - Page* _tmp0_ = NULL; - Page* _tmp1_ = NULL; - Page* _tmp2_ = NULL; - gboolean _tmp3_ = FALSE; - Page* _tmp9_ = NULL; + Page* _tmp0_; + Page* _tmp1_; + Page* _tmp2_; + gboolean _tmp3_; + Page* _tmp9_; gboolean removed = FALSE; - GeeHashMap* _tmp10_ = NULL; - Page* _tmp11_ = NULL; - gboolean _tmp12_ = FALSE; + GeeHashMap* _tmp10_; + Page* _tmp11_; + gboolean _tmp12_; #line 1321 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); #line 1321 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -8264,12 +8224,12 @@ static void library_window_on_destroying_page (LibraryWindow* self, SidebarPageR _g_object_unref0 (_tmp2_); #line 1323 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp3_) { -#line 8267 "LibraryWindow.c" - LibraryBranch* _tmp4_ = NULL; - LibraryPhotosEntry* _tmp5_ = NULL; - LibraryPhotosEntry* _tmp6_ = NULL; - Page* _tmp7_ = NULL; - Page* _tmp8_ = NULL; +#line 8227 "LibraryWindow.c" + LibraryBranch* _tmp4_; + LibraryPhotosEntry* _tmp5_; + LibraryPhotosEntry* _tmp6_; + Page* _tmp7_; + Page* _tmp8_; #line 1324 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp4_ = self->priv->library_branch; #line 1324 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -8284,7 +8244,7 @@ static void library_window_on_destroying_page (LibraryWindow* self, SidebarPageR library_window_switch_to_page (self, _tmp8_); #line 1324 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp8_); -#line 8287 "LibraryWindow.c" +#line 8247 "LibraryWindow.c" } #line 1326 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp9_ = page; @@ -8300,15 +8260,15 @@ static void library_window_on_destroying_page (LibraryWindow* self, SidebarPageR removed = _tmp12_; #line 1329 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _vala_assert (removed, "removed"); -#line 8303 "LibraryWindow.c" +#line 8263 "LibraryWindow.c" } static void library_window_on_sidebar_entry_selected (LibraryWindow* self, SidebarSelectableEntry* selectable) { SidebarPageRepresentative* page_rep = NULL; - SidebarSelectableEntry* _tmp0_ = NULL; - SidebarPageRepresentative* _tmp1_ = NULL; - SidebarPageRepresentative* _tmp2_ = NULL; + SidebarSelectableEntry* _tmp0_; + SidebarPageRepresentative* _tmp1_; + SidebarPageRepresentative* _tmp2_; #line 1332 "/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" @@ -8323,10 +8283,10 @@ static void library_window_on_sidebar_entry_selected (LibraryWindow* self, Sideb _tmp2_ = page_rep; #line 1334 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp2_ != NULL) { -#line 8326 "LibraryWindow.c" - SidebarPageRepresentative* _tmp3_ = NULL; - Page* _tmp4_ = NULL; - Page* _tmp5_ = NULL; +#line 8286 "LibraryWindow.c" + SidebarPageRepresentative* _tmp3_; + Page* _tmp4_; + Page* _tmp5_; #line 1335 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = page_rep; #line 1335 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -8337,31 +8297,31 @@ static void library_window_on_sidebar_entry_selected (LibraryWindow* self, Sideb library_window_switch_to_page (self, _tmp5_); #line 1335 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp5_); -#line 8340 "LibraryWindow.c" +#line 8300 "LibraryWindow.c" } #line 1332 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (page_rep); -#line 8344 "LibraryWindow.c" +#line 8304 "LibraryWindow.c" } static void library_window_on_sidebar_selected_entry_removed (LibraryWindow* self, SidebarSelectableEntry* selectable) { LibraryLastImportSidebarEntry* last_import_entry = NULL; - LibraryBranch* _tmp0_ = NULL; - LibraryLastImportSidebarEntry* _tmp1_ = NULL; - LibraryLastImportSidebarEntry* _tmp2_ = NULL; - LibraryLastImportSidebarEntry* _tmp3_ = NULL; + LibraryBranch* _tmp0_; + LibraryLastImportSidebarEntry* _tmp1_; + LibraryLastImportSidebarEntry* _tmp2_; + LibraryLastImportSidebarEntry* _tmp3_; gboolean _tmp4_ = FALSE; - SidebarSelectableEntry* _tmp5_ = NULL; + SidebarSelectableEntry* _tmp5_; gboolean _tmp12_ = FALSE; - SidebarSelectableEntry* _tmp13_ = NULL; + SidebarSelectableEntry* _tmp13_; gboolean _tmp21_ = FALSE; - SidebarSelectableEntry* _tmp22_ = NULL; - LibraryBranch* _tmp30_ = NULL; - LibraryPhotosEntry* _tmp31_ = NULL; - LibraryPhotosEntry* _tmp32_ = NULL; - Page* _tmp33_ = NULL; - Page* _tmp34_ = NULL; + SidebarSelectableEntry* _tmp22_; + LibraryBranch* _tmp30_; + LibraryPhotosEntry* _tmp31_; + LibraryPhotosEntry* _tmp32_; + Page* _tmp33_; + Page* _tmp34_; #line 1338 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); #line 1338 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -8380,10 +8340,10 @@ static void library_window_on_sidebar_selected_entry_removed (LibraryWindow* sel _tmp5_ = selectable; #line 1345 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp5_, LIBRARY_TYPE_IMPORT_QUEUE_SIDEBAR_ENTRY)) { -#line 8383 "LibraryWindow.c" - LibraryLastImportSidebarEntry* _tmp6_ = NULL; - gboolean _tmp7_ = FALSE; - gboolean _tmp8_ = FALSE; +#line 8343 "LibraryWindow.c" + LibraryLastImportSidebarEntry* _tmp6_; + gboolean _tmp7_; + gboolean _tmp8_; #line 1345 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp6_ = last_import_entry; #line 1345 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -8392,18 +8352,18 @@ static void library_window_on_sidebar_selected_entry_removed (LibraryWindow* sel _tmp8_ = _tmp7_; #line 1345 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp4_ = _tmp8_; -#line 8395 "LibraryWindow.c" +#line 8355 "LibraryWindow.c" } else { #line 1345 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp4_ = FALSE; -#line 8399 "LibraryWindow.c" +#line 8359 "LibraryWindow.c" } #line 1345 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp4_) { -#line 8403 "LibraryWindow.c" - LibraryLastImportSidebarEntry* _tmp9_ = NULL; - Page* _tmp10_ = NULL; - Page* _tmp11_ = NULL; +#line 8363 "LibraryWindow.c" + LibraryLastImportSidebarEntry* _tmp9_; + Page* _tmp10_; + Page* _tmp11_; #line 1346 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp9_ = last_import_entry; #line 1346 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -8418,35 +8378,35 @@ static void library_window_on_sidebar_selected_entry_removed (LibraryWindow* sel _g_object_unref0 (last_import_entry); #line 1348 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return; -#line 8421 "LibraryWindow.c" +#line 8381 "LibraryWindow.c" } #line 1352 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp13_ = selectable; #line 1352 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp13_, EVENTS_TYPE_EVENT_ENTRY)) { -#line 8427 "LibraryWindow.c" - EventsBranch* _tmp14_ = NULL; - gboolean _tmp15_ = FALSE; +#line 8387 "LibraryWindow.c" + EventsBranch* _tmp14_; + gboolean _tmp15_; #line 1352 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp14_ = self->priv->events_branch; #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 1352 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp12_ = _tmp15_; -#line 8436 "LibraryWindow.c" +#line 8396 "LibraryWindow.c" } else { #line 1352 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp12_ = FALSE; -#line 8440 "LibraryWindow.c" +#line 8400 "LibraryWindow.c" } #line 1352 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp12_) { -#line 8444 "LibraryWindow.c" - EventsBranch* _tmp16_ = NULL; - EventsMasterDirectoryEntry* _tmp17_ = NULL; - EventsMasterDirectoryEntry* _tmp18_ = NULL; - Page* _tmp19_ = NULL; - Page* _tmp20_ = NULL; +#line 8404 "LibraryWindow.c" + EventsBranch* _tmp16_; + EventsMasterDirectoryEntry* _tmp17_; + EventsMasterDirectoryEntry* _tmp18_; + Page* _tmp19_; + Page* _tmp20_; #line 1353 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp16_ = self->priv->events_branch; #line 1353 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -8467,35 +8427,35 @@ static void library_window_on_sidebar_selected_entry_removed (LibraryWindow* sel _g_object_unref0 (last_import_entry); #line 1355 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return; -#line 8470 "LibraryWindow.c" +#line 8430 "LibraryWindow.c" } #line 1359 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp22_ = selectable; #line 1359 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp22_, EVENTS_TYPE_DIRECTORY_ENTRY)) { -#line 8476 "LibraryWindow.c" - EventsBranch* _tmp23_ = NULL; - gboolean _tmp24_ = FALSE; +#line 8436 "LibraryWindow.c" + EventsBranch* _tmp23_; + gboolean _tmp24_; #line 1359 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp23_ = self->priv->events_branch; #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 1359 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp21_ = _tmp24_; -#line 8485 "LibraryWindow.c" +#line 8445 "LibraryWindow.c" } else { #line 1359 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp21_ = FALSE; -#line 8489 "LibraryWindow.c" +#line 8449 "LibraryWindow.c" } #line 1359 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp21_) { -#line 8493 "LibraryWindow.c" - EventsBranch* _tmp25_ = NULL; - EventsMasterDirectoryEntry* _tmp26_ = NULL; - EventsMasterDirectoryEntry* _tmp27_ = NULL; - Page* _tmp28_ = NULL; - Page* _tmp29_ = NULL; +#line 8453 "LibraryWindow.c" + EventsBranch* _tmp25_; + EventsMasterDirectoryEntry* _tmp26_; + EventsMasterDirectoryEntry* _tmp27_; + Page* _tmp28_; + Page* _tmp29_; #line 1360 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp25_ = self->priv->events_branch; #line 1360 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -8516,7 +8476,7 @@ static void library_window_on_sidebar_selected_entry_removed (LibraryWindow* sel _g_object_unref0 (last_import_entry); #line 1362 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return; -#line 8519 "LibraryWindow.c" +#line 8479 "LibraryWindow.c" } #line 1366 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp30_ = self->priv->library_branch; @@ -8534,42 +8494,42 @@ static void library_window_on_sidebar_selected_entry_removed (LibraryWindow* sel _g_object_unref0 (_tmp34_); #line 1338 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (last_import_entry); -#line 8537 "LibraryWindow.c" +#line 8497 "LibraryWindow.c" } static void _library_window_on_update_properties_view_collection_items_state_changed (ViewCollection* _sender, GeeIterable* changed, gpointer self) { #line 1372 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_on_update_properties ((LibraryWindow*) self); -#line 8544 "LibraryWindow.c" +#line 8504 "LibraryWindow.c" } static void _library_window_on_update_properties_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self) { #line 1373 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_on_update_properties ((LibraryWindow*) self); -#line 8551 "LibraryWindow.c" +#line 8511 "LibraryWindow.c" } static void _library_window_on_update_properties_data_collection_contents_altered (DataCollection* _sender, GeeIterable* added, GeeIterable* removed, gpointer self) { #line 1374 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_on_update_properties ((LibraryWindow*) self); -#line 8558 "LibraryWindow.c" +#line 8518 "LibraryWindow.c" } static void _library_window_on_update_properties_view_collection_items_visibility_changed (ViewCollection* _sender, GeeCollection* changed, gpointer self) { #line 1375 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_on_update_properties ((LibraryWindow*) self); -#line 8565 "LibraryWindow.c" +#line 8525 "LibraryWindow.c" } static void library_window_subscribe_for_basic_information (LibraryWindow* self, Page* page) { ViewCollection* view = NULL; - Page* _tmp0_ = NULL; - ViewCollection* _tmp1_ = NULL; + Page* _tmp0_; + ViewCollection* _tmp1_; #line 1369 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); #line 1369 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -8590,18 +8550,18 @@ static void library_window_subscribe_for_basic_information (LibraryWindow* self, g_signal_connect_object (view, "items-visibility-changed", (GCallback) _library_window_on_update_properties_view_collection_items_visibility_changed, self, 0); #line 1369 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _data_collection_unref0 (view); -#line 8593 "LibraryWindow.c" +#line 8553 "LibraryWindow.c" } static void library_window_unsubscribe_from_basic_information (LibraryWindow* self, Page* page) { ViewCollection* view = NULL; - Page* _tmp0_ = NULL; - ViewCollection* _tmp1_ = NULL; - guint _tmp2_ = 0U; - guint _tmp3_ = 0U; - guint _tmp4_ = 0U; - guint _tmp5_ = 0U; + Page* _tmp0_; + ViewCollection* _tmp1_; + guint _tmp2_; + guint _tmp3_; + guint _tmp4_; + guint _tmp5_; #line 1378 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); #line 1378 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -8630,29 +8590,29 @@ static void library_window_unsubscribe_from_basic_information (LibraryWindow* se 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 1378 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _data_collection_unref0 (view); -#line 8633 "LibraryWindow.c" +#line 8593 "LibraryWindow.c" } static void library_window_on_update_properties (LibraryWindow* self) { - OneShotScheduler* _tmp0_ = NULL; + OneShotScheduler* _tmp0_; #line 1387 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); #line 1388 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = self->priv->properties_scheduler; #line 1388 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" one_shot_scheduler_at_idle (_tmp0_); -#line 8645 "LibraryWindow.c" +#line 8605 "LibraryWindow.c" } static void library_window_on_update_properties_now (LibraryWindow* self) { - GtkFrame* _tmp0_ = NULL; - gboolean _tmp1_ = FALSE; - gboolean _tmp2_ = FALSE; - ExtendedPropertiesWindow* _tmp6_ = NULL; - gboolean _tmp7_ = FALSE; - gboolean _tmp8_ = FALSE; + GtkFrame* _tmp0_; + gboolean _tmp1_; + gboolean _tmp2_; + ExtendedPropertiesWindow* _tmp6_; + gboolean _tmp7_; + gboolean _tmp8_; #line 1391 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); #line 1392 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -8663,10 +8623,10 @@ static void library_window_on_update_properties_now (LibraryWindow* self) { _tmp2_ = _tmp1_; #line 1392 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp2_) { -#line 8666 "LibraryWindow.c" - BasicProperties* _tmp3_ = NULL; - Page* _tmp4_ = NULL; - Page* _tmp5_ = NULL; +#line 8626 "LibraryWindow.c" + BasicProperties* _tmp3_; + Page* _tmp4_; + Page* _tmp5_; #line 1393 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = self->priv->basic_properties; #line 1393 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -8677,7 +8637,7 @@ static void library_window_on_update_properties_now (LibraryWindow* self) { properties_update_properties (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_PROPERTIES, Properties), _tmp5_); #line 1393 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp5_); -#line 8680 "LibraryWindow.c" +#line 8640 "LibraryWindow.c" } #line 1395 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp6_ = self->priv->extended_properties; @@ -8687,10 +8647,10 @@ static void library_window_on_update_properties_now (LibraryWindow* self) { _tmp8_ = _tmp7_; #line 1395 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp8_) { -#line 8690 "LibraryWindow.c" - ExtendedPropertiesWindow* _tmp9_ = NULL; - Page* _tmp10_ = NULL; - Page* _tmp11_ = NULL; +#line 8650 "LibraryWindow.c" + ExtendedPropertiesWindow* _tmp9_; + Page* _tmp10_; + Page* _tmp11_; #line 1396 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp9_ = self->priv->extended_properties; #line 1396 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -8701,143 +8661,185 @@ static void library_window_on_update_properties_now (LibraryWindow* self) { extended_properties_window_update_properties (_tmp9_, _tmp11_); #line 1396 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp11_); -#line 8704 "LibraryWindow.c" +#line 8664 "LibraryWindow.c" } } static gchar* string_replace (const gchar* self, const gchar* old, const gchar* replacement) { gchar* result = NULL; + gboolean _tmp0_ = FALSE; + gboolean _tmp1_ = FALSE; GError * _inner_error_ = NULL; -#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1407 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1407 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (old != NULL, NULL); -#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1407 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (replacement != NULL, NULL); -#line 8718 "LibraryWindow.c" +#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + if ((*((gchar*) self)) == '\0') { +#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp1_ = TRUE; +#line 8684 "LibraryWindow.c" + } else { + const gchar* _tmp2_; +#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp2_ = old; +#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp1_ = (*((gchar*) _tmp2_)) == '\0'; +#line 8691 "LibraryWindow.c" + } +#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + if (_tmp1_) { +#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp0_ = TRUE; +#line 8697 "LibraryWindow.c" + } else { + const gchar* _tmp3_; + const gchar* _tmp4_; +#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp3_ = old; +#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp4_ = replacement; +#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp0_ = g_strcmp0 (_tmp3_, _tmp4_) == 0; +#line 8707 "LibraryWindow.c" + } +#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + if (_tmp0_) { +#line 8711 "LibraryWindow.c" + gchar* _tmp5_; +#line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp5_ = g_strdup (self); +#line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + result = _tmp5_; +#line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + return result; +#line 8719 "LibraryWindow.c" + } { GRegex* regex = NULL; - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; - GRegex* _tmp3_ = NULL; - GRegex* _tmp4_ = NULL; - gchar* _tmp5_ = NULL; - GRegex* _tmp6_ = NULL; - const gchar* _tmp7_ = NULL; - gchar* _tmp8_ = NULL; - gchar* _tmp9_ = NULL; -#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" - _tmp0_ = old; -#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.34/vapi/glib-2.0.vapi" - _tmp2_ = _tmp1_; -#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.34/vapi/glib-2.0.vapi" - _tmp4_ = _tmp3_; -#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" - _g_free0 (_tmp2_); -#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" - regex = _tmp4_; -#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + const gchar* _tmp6_; + gchar* _tmp7_; + gchar* _tmp8_; + GRegex* _tmp9_; + GRegex* _tmp10_; + gchar* _tmp11_ = NULL; + GRegex* _tmp12_; + const gchar* _tmp13_; + gchar* _tmp14_; + gchar* _tmp15_; +#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp6_ = old; +#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp7_ = g_regex_escape_string (_tmp6_, -1); +#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp8_ = _tmp7_; +#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp9_ = g_regex_new (_tmp8_, 0, 0, &_inner_error_); +#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp10_ = _tmp9_; +#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + _g_free0 (_tmp8_); +#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + regex = _tmp10_; +#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_inner_error_->domain == G_REGEX_ERROR) { -#line 8749 "LibraryWindow.c" +#line 8751 "LibraryWindow.c" goto __catch44_g_regex_error; } -#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1412 "/usr/share/vala-0.36/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.34/vapi/glib-2.0.vapi" +#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_clear_error (&_inner_error_); -#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" return NULL; -#line 8758 "LibraryWindow.c" +#line 8760 "LibraryWindow.c" } -#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" - _tmp6_ = regex; -#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" - _tmp7_ = replacement; -#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.34/vapi/glib-2.0.vapi" - _tmp5_ = _tmp8_; -#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp12_ = regex; +#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp13_ = replacement; +#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp14_ = g_regex_replace_literal (_tmp12_, self, (gssize) -1, 0, _tmp13_, 0, &_inner_error_); +#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp11_ = _tmp14_; +#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _g_regex_unref0 (regex); -#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_inner_error_->domain == G_REGEX_ERROR) { -#line 8774 "LibraryWindow.c" +#line 8776 "LibraryWindow.c" goto __catch44_g_regex_error; } -#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _g_regex_unref0 (regex); -#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1413 "/usr/share/vala-0.36/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.34/vapi/glib-2.0.vapi" +#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_clear_error (&_inner_error_); -#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" return NULL; -#line 8785 "LibraryWindow.c" +#line 8787 "LibraryWindow.c" } -#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" - _tmp9_ = _tmp5_; -#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" - _tmp5_ = NULL; -#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" - result = _tmp9_; -#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" - _g_free0 (_tmp5_); -#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp15_ = _tmp11_; +#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp11_ = NULL; +#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + result = _tmp15_; +#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + _g_free0 (_tmp11_); +#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _g_regex_unref0 (regex); -#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" return result; -#line 8799 "LibraryWindow.c" +#line 8801 "LibraryWindow.c" } goto __finally44; __catch44_g_regex_error: { GError* e = NULL; -#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" e = _inner_error_; -#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _inner_error_ = NULL; -#line 1385 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1415 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_assert_not_reached (); -#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _g_error_free0 (e); -#line 8813 "LibraryWindow.c" +#line 8815 "LibraryWindow.c" } __finally44: -#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1411 "/usr/share/vala-0.36/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.34/vapi/glib-2.0.vapi" +#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_clear_error (&_inner_error_); -#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" return NULL; -#line 8824 "LibraryWindow.c" +#line 8826 "LibraryWindow.c" } } void library_window_mounted_camera_shell_notification (LibraryWindow* self, const gchar* uri, gboolean at_startup) { - const gchar* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; - gboolean _tmp2_ = FALSE; + const gchar* _tmp0_; + const gchar* _tmp1_; + gboolean _tmp2_; GFile* uri_file = NULL; - const gchar* _tmp4_ = NULL; - GFile* _tmp5_ = NULL; + const gchar* _tmp4_; + GFile* _tmp5_; GMount* mount = NULL; gchar* alt_uri = NULL; - const gchar* _tmp12_ = NULL; - gboolean _tmp13_ = FALSE; - gboolean _tmp18_ = FALSE; + const gchar* _tmp12_; + gboolean _tmp13_; + gboolean _tmp18_; GError * _inner_error_ = NULL; #line 1399 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); @@ -8853,15 +8855,15 @@ void library_window_mounted_camera_shell_notification (LibraryWindow* self, cons _tmp2_ = library_window_is_mount_uri_supported (_tmp1_); #line 1403 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (!_tmp2_) { -#line 8856 "LibraryWindow.c" - const gchar* _tmp3_ = NULL; +#line 8858 "LibraryWindow.c" + const gchar* _tmp3_; #line 1404 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = uri; #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 8864 "LibraryWindow.c" +#line 8866 "LibraryWindow.c" } #line 1409 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp4_ = uri; @@ -8871,12 +8873,12 @@ void library_window_mounted_camera_shell_notification (LibraryWindow* self, cons uri_file = _tmp5_; #line 1412 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" mount = NULL; -#line 8874 "LibraryWindow.c" +#line 8876 "LibraryWindow.c" { GMount* _tmp6_ = NULL; - GFile* _tmp7_ = NULL; - GMount* _tmp8_ = NULL; - GMount* _tmp9_ = NULL; + GFile* _tmp7_; + GMount* _tmp8_; + GMount* _tmp9_; #line 1414 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp7_ = uri_file; #line 1414 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -8885,7 +8887,7 @@ void library_window_mounted_camera_shell_notification (LibraryWindow* self, cons _tmp6_ = _tmp8_; #line 1414 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 8888 "LibraryWindow.c" +#line 8890 "LibraryWindow.c" goto __catch43_g_error; } #line 1414 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -8898,14 +8900,14 @@ void library_window_mounted_camera_shell_notification (LibraryWindow* self, cons mount = _tmp9_; #line 1413 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp6_); -#line 8901 "LibraryWindow.c" +#line 8903 "LibraryWindow.c" } goto __finally43; __catch43_g_error: { GError* err = NULL; - GError* _tmp10_ = NULL; - const gchar* _tmp11_ = NULL; + GError* _tmp10_; + const gchar* _tmp11_; #line 1413 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" err = _inner_error_; #line 1413 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -8924,7 +8926,7 @@ void library_window_mounted_camera_shell_notification (LibraryWindow* self, cons _g_object_unref0 (uri_file); #line 1418 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return; -#line 8927 "LibraryWindow.c" +#line 8929 "LibraryWindow.c" } __finally43: #line 1413 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -8939,7 +8941,7 @@ void library_window_mounted_camera_shell_notification (LibraryWindow* self, cons g_clear_error (&_inner_error_); #line 1413 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return; -#line 8942 "LibraryWindow.c" +#line 8944 "LibraryWindow.c" } #line 1422 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" alt_uri = NULL; @@ -8949,11 +8951,11 @@ void library_window_mounted_camera_shell_notification (LibraryWindow* self, cons _tmp13_ = g_str_has_prefix (_tmp12_, "file://"); #line 1423 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp13_) { -#line 8952 "LibraryWindow.c" - const gchar* _tmp14_ = NULL; - gchar* _tmp15_ = NULL; - gchar* _tmp16_ = NULL; - gchar* _tmp17_ = NULL; +#line 8954 "LibraryWindow.c" + const gchar* _tmp14_; + gchar* _tmp15_; + gchar* _tmp16_; + gchar* _tmp17_; #line 1424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp14_ = uri; #line 1424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -8968,33 +8970,33 @@ void library_window_mounted_camera_shell_notification (LibraryWindow* self, cons alt_uri = _tmp17_; #line 1424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_free0 (_tmp16_); -#line 8971 "LibraryWindow.c" +#line 8973 "LibraryWindow.c" } #line 1427 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp18_ = at_startup; #line 1427 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp18_) { -#line 8977 "LibraryWindow.c" - const gchar* _tmp19_ = NULL; - gboolean _tmp20_ = FALSE; - const gchar* _tmp23_ = NULL; - gboolean _tmp24_ = FALSE; +#line 8979 "LibraryWindow.c" + const gchar* _tmp19_; + gboolean _tmp20_; + const gchar* _tmp23_; + gboolean _tmp24_; #line 1428 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp19_ = uri; #line 1428 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp20_ = is_string_empty (_tmp19_); #line 1428 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (!_tmp20_) { -#line 8988 "LibraryWindow.c" - GeeHashSet* _tmp21_ = NULL; - const gchar* _tmp22_ = NULL; +#line 8990 "LibraryWindow.c" + GeeHashSet* _tmp21_; + const gchar* _tmp22_; #line 1429 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp21_ = library_window_initial_camera_uris; #line 1429 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp22_ = uri; #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 8997 "LibraryWindow.c" +#line 8999 "LibraryWindow.c" } #line 1431 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp23_ = alt_uri; @@ -9002,16 +9004,16 @@ void library_window_mounted_camera_shell_notification (LibraryWindow* self, cons _tmp24_ = is_string_empty (_tmp23_); #line 1431 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (!_tmp24_) { -#line 9005 "LibraryWindow.c" - GeeHashSet* _tmp25_ = NULL; - const gchar* _tmp26_ = NULL; +#line 9007 "LibraryWindow.c" + GeeHashSet* _tmp25_; + const gchar* _tmp26_; #line 1432 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp25_ = library_window_initial_camera_uris; #line 1432 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp26_ = alt_uri; #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 9014 "LibraryWindow.c" +#line 9016 "LibraryWindow.c" } } #line 1399 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -9020,7 +9022,7 @@ void library_window_mounted_camera_shell_notification (LibraryWindow* self, cons _g_object_unref0 (mount); #line 1399 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (uri_file); -#line 9023 "LibraryWindow.c" +#line 9025 "LibraryWindow.c" } @@ -9029,14 +9031,14 @@ static gboolean library_window_real_key_press_event (GtkWidget* base, GdkEventKe gboolean result = FALSE; gboolean _tmp0_ = FALSE; gboolean _tmp1_ = FALSE; - SidebarTree* _tmp2_ = NULL; - gboolean _tmp3_ = FALSE; - gboolean _tmp4_ = FALSE; - GdkEventKey* _tmp11_ = NULL; - gboolean _tmp12_ = FALSE; - GdkEventKey* _tmp13_ = NULL; - guint _tmp14_ = 0U; - const gchar* _tmp15_ = NULL; + SidebarTree* _tmp2_; + gboolean _tmp3_; + gboolean _tmp4_; + GdkEventKey* _tmp11_; + gboolean _tmp12_; + GdkEventKey* _tmp13_; + guint _tmp14_; + const gchar* _tmp15_; #line 1436 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_WINDOW, LibraryWindow); #line 1436 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -9049,10 +9051,10 @@ static gboolean library_window_real_key_press_event (GtkWidget* base, GdkEventKe _tmp4_ = _tmp3_; #line 1437 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp4_) { -#line 9052 "LibraryWindow.c" - SidebarTree* _tmp5_ = NULL; - GdkEventKey* _tmp6_ = NULL; - gboolean _tmp7_ = FALSE; +#line 9054 "LibraryWindow.c" + SidebarTree* _tmp5_; + GdkEventKey* _tmp6_; + gboolean _tmp7_; #line 1437 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp5_ = self->priv->sidebar_tree; #line 1437 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -9061,17 +9063,17 @@ static gboolean library_window_real_key_press_event (GtkWidget* base, GdkEventKe _tmp7_ = sidebar_tree_is_keypress_interpreted (_tmp5_, _tmp6_); #line 1437 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = _tmp7_; -#line 9064 "LibraryWindow.c" +#line 9066 "LibraryWindow.c" } else { #line 1437 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = FALSE; -#line 9068 "LibraryWindow.c" +#line 9070 "LibraryWindow.c" } #line 1437 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp1_) { -#line 9072 "LibraryWindow.c" - SidebarTree* _tmp8_ = NULL; - GdkEventKey* _tmp9_ = NULL; +#line 9074 "LibraryWindow.c" + SidebarTree* _tmp8_; + GdkEventKey* _tmp9_; gboolean _tmp10_ = FALSE; #line 1438 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp8_ = self->priv->sidebar_tree; @@ -9081,11 +9083,11 @@ static gboolean library_window_real_key_press_event (GtkWidget* base, GdkEventKe g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_widget_get_type (), GtkWidget), "key-press-event", _tmp9_, &_tmp10_); #line 1438 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = _tmp10_; -#line 9084 "LibraryWindow.c" +#line 9086 "LibraryWindow.c" } else { #line 1437 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = FALSE; -#line 9088 "LibraryWindow.c" +#line 9090 "LibraryWindow.c" } #line 1437 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp0_) { @@ -9093,7 +9095,7 @@ static gboolean library_window_real_key_press_event (GtkWidget* base, GdkEventKe result = TRUE; #line 1439 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return result; -#line 9096 "LibraryWindow.c" +#line 9098 "LibraryWindow.c" } #line 1442 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp11_ = event; @@ -9105,7 +9107,7 @@ static gboolean library_window_real_key_press_event (GtkWidget* base, GdkEventKe result = TRUE; #line 1443 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return result; -#line 9108 "LibraryWindow.c" +#line 9110 "LibraryWindow.c" } #line 1445 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp13_ = event; @@ -9121,20 +9123,20 @@ static gboolean library_window_real_key_press_event (GtkWidget* base, GdkEventKe result = TRUE; #line 1447 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return result; -#line 9124 "LibraryWindow.c" +#line 9126 "LibraryWindow.c" } #line 1450 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" result = FALSE; #line 1450 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return result; -#line 9130 "LibraryWindow.c" +#line 9132 "LibraryWindow.c" } gint library_window_get_PAGE_MIN_WIDTH (void) { gint result; - gint _tmp0_ = 0; - gint _tmp1_ = 0; + gint _tmp0_; + gint _tmp1_; #line 12 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = thumbnail_get_MAX_SCALE (); #line 12 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -9143,25 +9145,25 @@ 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 9146 "LibraryWindow.c" +#line 9148 "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 9153 "LibraryWindow.c" +#line 9155 "LibraryWindow.c" } static LibraryWindowFullscreenPhotoPage* library_window_fullscreen_photo_page_construct (GType object_type, CollectionPage* collection, Photo* start, ViewCollection* view) { LibraryWindowFullscreenPhotoPage * self = NULL; - CollectionPage* _tmp0_ = NULL; - CollectionPage* _tmp1_ = NULL; - Photo* _tmp2_ = NULL; - Photo* _tmp3_ = NULL; - ViewCollection* _tmp4_ = NULL; - ViewCollection* _tmp5_ = NULL; + CollectionPage* _tmp0_; + CollectionPage* _tmp1_; + Photo* _tmp2_; + Photo* _tmp3_; + ViewCollection* _tmp4_; + ViewCollection* _tmp5_; #line 75 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_val_if_fail (IS_COLLECTION_PAGE (collection), NULL); #line 75 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -9196,22 +9198,22 @@ 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 9199 "LibraryWindow.c" +#line 9201 "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 9206 "LibraryWindow.c" +#line 9208 "LibraryWindow.c" } static void library_window_fullscreen_photo_page_real_switched_to (Page* base) { LibraryWindowFullscreenPhotoPage * self; - CollectionPage* _tmp0_ = NULL; - Photo* _tmp1_ = NULL; - ViewCollection* _tmp2_ = NULL; + CollectionPage* _tmp0_; + Photo* _tmp1_; + ViewCollection* _tmp2_; #line 81 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, LIBRARY_WINDOW_TYPE_FULLSCREEN_PHOTO_PAGE, LibraryWindowFullscreenPhotoPage); #line 82 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -9224,7 +9226,7 @@ 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 9227 "LibraryWindow.c" +#line 9229 "LibraryWindow.c" } @@ -9232,13 +9234,13 @@ 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" +#line 9237 "LibraryWindow.c" } static void library_window_fullscreen_photo_page_real_init_collect_ui_filenames (Page* base, GeeList* ui_filenames) { LibraryWindowFullscreenPhotoPage * self; - GeeList* _tmp0_ = NULL; + GeeList* _tmp0_; #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 90 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -9247,7 +9249,7 @@ static void library_window_fullscreen_photo_page_real_init_collect_ui_filenames _tmp0_ = ui_filenames; #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 9250 "LibraryWindow.c" +#line 9252 "LibraryWindow.c" } @@ -9257,25 +9259,25 @@ static void library_window_fullscreen_photo_page_class_init (LibraryWindowFullsc #line 70 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_type_class_add_private (klass, sizeof (LibraryWindowFullscreenPhotoPagePrivate)); #line 70 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - ((PageClass *) klass)->switched_to = (void (*)(Page*)) library_window_fullscreen_photo_page_real_switched_to; + ((PageClass *) klass)->switched_to = (void (*) (Page *)) library_window_fullscreen_photo_page_real_switched_to; #line 70 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - ((PageClass *) klass)->switching_from = (void (*)(Page*)) library_window_fullscreen_photo_page_real_switching_from; + ((PageClass *) klass)->switching_from = (void (*) (Page *)) library_window_fullscreen_photo_page_real_switching_from; #line 70 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - ((PageClass *) klass)->init_collect_ui_filenames = (void (*)(Page*, GeeList*)) library_window_fullscreen_photo_page_real_init_collect_ui_filenames; + ((PageClass *) klass)->init_collect_ui_filenames = (void (*) (Page *, GeeList*)) 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 9267 "LibraryWindow.c" +#line 9269 "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 9274 "LibraryWindow.c" +#line 9276 "LibraryWindow.c" } -static void library_window_fullscreen_photo_page_finalize (GObject* obj) { +static void library_window_fullscreen_photo_page_finalize (GObject * obj) { LibraryWindowFullscreenPhotoPage * self; #line 70 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, LIBRARY_WINDOW_TYPE_FULLSCREEN_PHOTO_PAGE, LibraryWindowFullscreenPhotoPage); @@ -9287,7 +9289,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 9290 "LibraryWindow.c" +#line 9292 "LibraryWindow.c" } @@ -9304,35 +9306,35 @@ static GType library_window_fullscreen_photo_page_get_type (void) { static void library_window_class_init (LibraryWindowClass * klass) { - GeeHashSet* _tmp0_ = NULL; + GeeHashSet* _tmp0_; #line 7 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_parent_class = g_type_class_peek_parent (klass); #line 7 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_type_class_add_private (klass, sizeof (LibraryWindowPrivate)); #line 7 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - ((AppWindowClass *) klass)->add_actions = (void (*)(AppWindow*)) library_window_real_add_actions; + ((AppWindowClass *) klass)->add_actions = (void (*) (AppWindow *)) library_window_real_add_actions; #line 7 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - ((PageWindowClass *) klass)->switched_pages = (void (*)(PageWindow*, Page*, Page*)) library_window_real_switched_pages; + ((PageWindowClass *) klass)->switched_pages = (void (*) (PageWindow *, Page*, Page*)) library_window_real_switched_pages; #line 7 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - ((GtkWidgetClass *) klass)->show_all = (void (*)(GtkWidget*)) library_window_real_show_all; + ((GtkWidgetClass *) klass)->show_all = (void (*) (GtkWidget *)) library_window_real_show_all; #line 7 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - ((AppWindowClass *) klass)->get_app_role = (gchar* (*)(AppWindow*)) library_window_real_get_app_role; + ((AppWindowClass *) klass)->get_app_role = (gchar* (*) (AppWindow *)) library_window_real_get_app_role; #line 7 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - ((AppWindowClass *) klass)->on_quit = (void (*)(AppWindow*)) library_window_real_on_quit; + ((AppWindowClass *) klass)->on_quit = (void (*) (AppWindow *)) library_window_real_on_quit; #line 7 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - ((AppWindowClass *) klass)->on_fullscreen = (void (*)(AppWindow*)) library_window_real_on_fullscreen; + ((AppWindowClass *) klass)->on_fullscreen = (void (*) (AppWindow *)) library_window_real_on_fullscreen; #line 7 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - ((AppWindowClass *) klass)->update_common_action_availability = (void (*)(AppWindow*, Page*, Page*)) library_window_real_update_common_action_availability; + ((AppWindowClass *) klass)->update_common_action_availability = (void (*) (AppWindow *, Page*, Page*)) library_window_real_update_common_action_availability; #line 7 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - ((AppWindowClass *) klass)->update_common_actions = (void (*)(AppWindow*, Page*, gint, gint)) library_window_real_update_common_actions; + ((AppWindowClass *) klass)->update_common_actions = (void (*) (AppWindow *, Page*, gint, gint)) library_window_real_update_common_actions; #line 7 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - ((GtkWidgetClass *) klass)->drag_motion = (gboolean (*)(GtkWidget*, GdkDragContext*, gint, gint, guint)) library_window_real_drag_motion; + ((GtkWidgetClass *) klass)->drag_motion = (gboolean (*) (GtkWidget *, GdkDragContext*, gint, gint, guint)) library_window_real_drag_motion; #line 7 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - ((GtkWidgetClass *) klass)->drag_data_received = (void (*)(GtkWidget*, GdkDragContext*, gint, gint, GtkSelectionData*, guint, guint)) library_window_real_drag_data_received; + ((GtkWidgetClass *) klass)->drag_data_received = (void (*) (GtkWidget *, GdkDragContext*, gint, gint, GtkSelectionData*, guint, guint)) library_window_real_drag_data_received; #line 7 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - ((PageWindowClass *) klass)->set_current_page = (void (*)(PageWindow*, Page*)) library_window_real_set_current_page; + ((PageWindowClass *) klass)->set_current_page = (void (*) (PageWindow *, Page*)) library_window_real_set_current_page; #line 7 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - ((GtkWidgetClass *) klass)->key_press_event = (gboolean (*)(GtkWidget*, GdkEventKey*)) library_window_real_key_press_event; + ((GtkWidgetClass *) klass)->key_press_event = (gboolean (*) (GtkWidget *, GdkEventKey*)) library_window_real_key_press_event; #line 7 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" G_OBJECT_CLASS (klass)->get_property = _vala_library_window_get_property; #line 7 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -9341,31 +9343,31 @@ static void library_window_class_init (LibraryWindowClass * klass) { _tmp0_ = gee_hash_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL, NULL, NULL, NULL); #line 121 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_initial_camera_uris = _tmp0_; -#line 9344 "LibraryWindow.c" +#line 9346 "LibraryWindow.c" } static void library_window_instance_init (LibraryWindow * self) { - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; - GtkPaned* _tmp2_ = NULL; - GtkPaned* _tmp3_ = NULL; - GtkFrame* _tmp4_ = NULL; - LibraryBranch* _tmp5_ = NULL; - TagsBranch* _tmp6_ = NULL; - FoldersBranch* _tmp7_ = NULL; - EventsBranch* _tmp8_ = NULL; - CameraBranch* _tmp9_ = NULL; - SearchesBranch* _tmp10_ = NULL; - GeeHashMap* _tmp11_ = NULL; - SearchFilterActions* _tmp12_ = NULL; - GtkBox* _tmp13_ = NULL; - GtkFrame* _tmp14_ = NULL; - GtkProgressBar* _tmp15_ = NULL; - BasicProperties* _tmp16_ = NULL; - GtkStack* _tmp17_ = NULL; - GtkBox* _tmp18_ = NULL; - GtkRevealer* _tmp19_ = NULL; + const gchar* _tmp0_; + gchar* _tmp1_; + GtkPaned* _tmp2_; + GtkPaned* _tmp3_; + GtkFrame* _tmp4_; + LibraryBranch* _tmp5_; + TagsBranch* _tmp6_; + FoldersBranch* _tmp7_; + EventsBranch* _tmp8_; + CameraBranch* _tmp9_; + SearchesBranch* _tmp10_; + GeeHashMap* _tmp11_; + SearchFilterActions* _tmp12_; + GtkBox* _tmp13_; + GtkFrame* _tmp14_; + GtkProgressBar* _tmp15_; + BasicProperties* _tmp16_; + GtkStack* _tmp17_; + GtkBox* _tmp18_; + GtkRevealer* _tmp19_; #line 7 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" self->priv = LIBRARY_WINDOW_GET_PRIVATE (self); #line 97 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -9482,44 +9484,44 @@ static void library_window_instance_init (LibraryWindow * self) { self->priv->current_progress_priority = 0; #line 145 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" self->priv->background_progress_pulse_id = (guint) 0; -#line 9485 "LibraryWindow.c" +#line 9487 "LibraryWindow.c" } -static void library_window_finalize (GObject* obj) { +static void library_window_finalize (GObject * obj) { LibraryWindow * self; - SidebarTree* _tmp0_ = NULL; - guint _tmp1_ = 0U; - SidebarTree* _tmp2_ = NULL; - guint _tmp3_ = 0U; - SidebarTree* _tmp4_ = NULL; - guint _tmp5_ = 0U; - SidebarTree* _tmp6_ = NULL; - guint _tmp7_ = 0U; - Page* _tmp8_ = NULL; - Page* _tmp9_ = NULL; - ExtendedPropertiesWindow* _tmp10_ = NULL; - guint _tmp11_ = 0U; - ExtendedPropertiesWindow* _tmp12_ = NULL; - guint _tmp13_ = 0U; - MetadataWriter* _tmp28_ = NULL; - MetadataWriter* _tmp29_ = NULL; - guint _tmp30_ = 0U; + SidebarTree* _tmp0_; + guint _tmp1_; + SidebarTree* _tmp2_; + guint _tmp3_; + SidebarTree* _tmp4_; + guint _tmp5_; + SidebarTree* _tmp6_; + guint _tmp7_; + Page* _tmp8_; + Page* _tmp9_; + ExtendedPropertiesWindow* _tmp10_; + guint _tmp11_; + ExtendedPropertiesWindow* _tmp12_; + guint _tmp13_; + MetadataWriter* _tmp28_; + MetadataWriter* _tmp29_; + guint _tmp30_; LibraryMonitor* monitor = NULL; - LibraryMonitorPool* _tmp31_ = NULL; - LibraryMonitorPool* _tmp32_ = NULL; - LibraryMonitor* _tmp33_ = NULL; - LibraryMonitor* _tmp34_ = NULL; - LibraryMonitor* _tmp35_ = NULL; - LibraryMonitorPool* _tmp37_ = NULL; - LibraryMonitorPool* _tmp38_ = NULL; - guint _tmp39_ = 0U; - LibraryMonitorPool* _tmp40_ = NULL; - LibraryMonitorPool* _tmp41_ = NULL; - guint _tmp42_ = 0U; - CameraTable* _tmp43_ = NULL; - CameraTable* _tmp44_ = NULL; - guint _tmp45_ = 0U; + LibraryMonitorPool* _tmp31_; + LibraryMonitorPool* _tmp32_; + LibraryMonitor* _tmp33_; + LibraryMonitor* _tmp34_; + LibraryMonitor* _tmp35_; + LibraryMonitorPool* _tmp37_; + LibraryMonitorPool* _tmp38_; + guint _tmp39_; + LibraryMonitorPool* _tmp40_; + LibraryMonitorPool* _tmp41_; + guint _tmp42_; + CameraTable* _tmp43_; + CameraTable* _tmp44_; + guint _tmp45_; #line 7 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_LIBRARY_WINDOW, LibraryWindow); #line 222 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -9566,15 +9568,15 @@ static void library_window_finalize (GObject* obj) { g_signal_parse_name ("show", gtk_widget_get_type (), &_tmp13_, NULL, FALSE); #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 9569 "LibraryWindow.c" +#line 9571 "LibraryWindow.c" { GeeIterator* _media_sources_it = NULL; - MediaCollectionRegistry* _tmp14_ = NULL; - MediaCollectionRegistry* _tmp15_ = NULL; - GeeCollection* _tmp16_ = NULL; - GeeCollection* _tmp17_ = NULL; - GeeIterator* _tmp18_ = NULL; - GeeIterator* _tmp19_ = NULL; + MediaCollectionRegistry* _tmp14_; + MediaCollectionRegistry* _tmp15_; + GeeCollection* _tmp16_; + GeeCollection* _tmp17_; + GeeIterator* _tmp18_; + GeeIterator* _tmp19_; #line 232 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp14_ = media_collection_registry_get_instance (); #line 232 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -9595,16 +9597,16 @@ static void library_window_finalize (GObject* obj) { _media_sources_it = _tmp19_; #line 232 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" while (TRUE) { -#line 9598 "LibraryWindow.c" - GeeIterator* _tmp20_ = NULL; - gboolean _tmp21_ = FALSE; +#line 9600 "LibraryWindow.c" + GeeIterator* _tmp20_; + gboolean _tmp21_; MediaSourceCollection* media_sources = NULL; - GeeIterator* _tmp22_ = NULL; - gpointer _tmp23_ = NULL; - MediaSourceCollection* _tmp24_ = NULL; - guint _tmp25_ = 0U; - MediaSourceCollection* _tmp26_ = NULL; - guint _tmp27_ = 0U; + GeeIterator* _tmp22_; + gpointer _tmp23_; + MediaSourceCollection* _tmp24_; + guint _tmp25_; + MediaSourceCollection* _tmp26_; + guint _tmp27_; #line 232 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp20_ = _media_sources_it; #line 232 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -9613,7 +9615,7 @@ static void library_window_finalize (GObject* obj) { if (!_tmp21_) { #line 232 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" break; -#line 9616 "LibraryWindow.c" +#line 9618 "LibraryWindow.c" } #line 232 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp22_ = _media_sources_it; @@ -9635,11 +9637,11 @@ static void library_window_finalize (GObject* obj) { 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 232 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _data_collection_unref0 (media_sources); -#line 9638 "LibraryWindow.c" +#line 9640 "LibraryWindow.c" } #line 232 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_media_sources_it); -#line 9642 "LibraryWindow.c" +#line 9644 "LibraryWindow.c" } #line 237 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp28_ = metadata_writer_get_instance (); @@ -9667,13 +9669,13 @@ static void library_window_finalize (GObject* obj) { _tmp35_ = monitor; #line 240 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp35_ != NULL) { -#line 9670 "LibraryWindow.c" - LibraryMonitor* _tmp36_ = NULL; +#line 9672 "LibraryWindow.c" + LibraryMonitor* _tmp36_; #line 241 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp36_ = monitor; #line 241 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_on_library_monitor_destroyed (self, _tmp36_); -#line 9676 "LibraryWindow.c" +#line 9678 "LibraryWindow.c" } #line 243 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp37_ = library_monitor_pool_get_instance (); @@ -9759,7 +9761,7 @@ static void library_window_finalize (GObject* obj) { _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 9762 "LibraryWindow.c" +#line 9764 "LibraryWindow.c" } @@ -9780,13 +9782,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 9783 "LibraryWindow.c" +#line 9785 "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 9789 "LibraryWindow.c" +#line 9791 "LibraryWindow.c" } } diff --git a/src/library/OfflinePage.c b/src/library/OfflinePage.c index f789adf..b3a06a0 100644 --- a/src/library/OfflinePage.c +++ b/src/library/OfflinePage.c @@ -1,4 +1,4 @@ -/* OfflinePage.c generated by valac 0.34.7, the Vala compiler +/* OfflinePage.c generated by valac 0.36.6, the Vala compiler * generated from OfflinePage.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -857,7 +857,7 @@ enum { static guint offline_page_offline_search_view_filter_real_get_criteria (SearchViewFilter* base); GType search_filter_criteria_get_type (void) G_GNUC_CONST; DefaultSearchViewFilter* default_search_view_filter_construct (GType object_type); -static void offline_page_finalize (GObject* obj); +static void offline_page_finalize (GObject * obj); static const GActionEntry OFFLINE_PAGE_entries[1] = {{"RemoveFromLibrary", _offline_page_on_remove_from_library_gsimple_action_activate_callback}}; @@ -877,17 +877,17 @@ static void _offline_page_on_remove_from_library_gsimple_action_activate_callbac OfflinePage* offline_page_construct (GType object_type) { OfflinePage * self = NULL; - ViewCollection* _tmp0_ = NULL; - ViewCollection* _tmp1_ = NULL; - MediaViewTracker* _tmp2_ = NULL; - LibraryPhotoSourceCollection* _tmp3_ = NULL; - VideoSourceCollection* _tmp4_ = NULL; - LibraryPhotoSourceCollection* _tmp5_ = NULL; - GeeCollection* _tmp6_ = NULL; - GeeCollection* _tmp7_ = NULL; - VideoSourceCollection* _tmp8_ = NULL; - GeeCollection* _tmp9_ = NULL; - GeeCollection* _tmp10_ = NULL; + ViewCollection* _tmp0_; + ViewCollection* _tmp1_; + MediaViewTracker* _tmp2_; + LibraryPhotoSourceCollection* _tmp3_; + VideoSourceCollection* _tmp4_; + LibraryPhotoSourceCollection* _tmp5_; + GeeCollection* _tmp6_; + GeeCollection* _tmp7_; + VideoSourceCollection* _tmp8_; + GeeCollection* _tmp9_; + GeeCollection* _tmp10_; #line 29 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" self = (OfflinePage*) checkerboard_page_construct (object_type, OFFLINE_PAGE_NAME); #line 31 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" @@ -949,8 +949,8 @@ OfflinePage* offline_page_new (void) { static void offline_page_real_init_collect_ui_filenames (Page* base, GeeList* ui_filenames) { OfflinePage * self; - GeeList* _tmp0_ = NULL; - GeeList* _tmp1_ = NULL; + GeeList* _tmp0_; + GeeList* _tmp1_; #line 49 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_OFFLINE_PAGE, OfflinePage); #line 49 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" @@ -969,8 +969,8 @@ static void offline_page_real_init_collect_ui_filenames (Page* base, GeeList* ui static void offline_page_real_add_actions (Page* base, GActionMap* map) { OfflinePage * self; - GActionMap* _tmp0_ = NULL; - GActionMap* _tmp1_ = NULL; + GActionMap* _tmp0_; + GActionMap* _tmp1_; #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" @@ -989,7 +989,7 @@ static void offline_page_real_add_actions (Page* base, GActionMap* map) { static void offline_page_real_remove_actions (Page* base, GActionMap* map) { OfflinePage * self; - GActionMap* _tmp0_ = NULL; + GActionMap* _tmp0_; #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" @@ -1016,9 +1016,9 @@ static void offline_page_real_remove_actions (Page* base, GActionMap* map) { entry = entry_collection[entry_it]; #line 1018 "OfflinePage.c" { - GActionMap* _tmp1_ = NULL; - GActionEntry _tmp2_ = {0}; - const gchar* _tmp3_ = NULL; + GActionMap* _tmp1_; + GActionEntry _tmp2_; + const gchar* _tmp3_; #line 68 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _tmp1_ = map; #line 68 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" @@ -1044,8 +1044,8 @@ static gpointer _core_tracker_ref0 (gpointer self) { static CoreViewTracker* offline_page_real_get_view_tracker (CheckerboardPage* base) { OfflinePage * self; CoreViewTracker* result = NULL; - MediaViewTracker* _tmp0_ = NULL; - CoreViewTracker* _tmp1_ = NULL; + MediaViewTracker* _tmp0_; + CoreViewTracker* _tmp1_; #line 72 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_OFFLINE_PAGE, OfflinePage); #line 73 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" @@ -1062,9 +1062,9 @@ static CoreViewTracker* offline_page_real_get_view_tracker (CheckerboardPage* ba static void offline_page_real_update_actions (Page* base, gint selected_count, gint count) { OfflinePage * self; - gint _tmp0_ = 0; - gint _tmp1_ = 0; - gint _tmp2_ = 0; + gint _tmp0_; + gint _tmp1_; + gint _tmp2_; #line 76 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_OFFLINE_PAGE, OfflinePage); #line 77 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" @@ -1082,8 +1082,8 @@ static void offline_page_real_update_actions (Page* base, gint selected_count, g static void offline_page_on_offline_contents_altered (OfflinePage* self, GeeCollection* added, GeeCollection* removed) { - GeeCollection* _tmp0_ = NULL; - GeeCollection* _tmp12_ = NULL; + GeeCollection* _tmp0_; + GeeCollection* _tmp12_; #line 82 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" g_return_if_fail (IS_OFFLINE_PAGE (self)); #line 82 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" @@ -1097,8 +1097,8 @@ static void offline_page_on_offline_contents_altered (OfflinePage* self, GeeColl #line 1098 "OfflinePage.c" { GeeIterator* _source_it = NULL; - GeeCollection* _tmp1_ = NULL; - GeeIterator* _tmp2_ = NULL; + GeeCollection* _tmp1_; + GeeIterator* _tmp2_; #line 85 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _tmp1_ = added; #line 85 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" @@ -1108,16 +1108,16 @@ static void offline_page_on_offline_contents_altered (OfflinePage* self, GeeColl #line 85 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" while (TRUE) { #line 1111 "OfflinePage.c" - GeeIterator* _tmp3_ = NULL; - gboolean _tmp4_ = FALSE; + GeeIterator* _tmp3_; + gboolean _tmp4_; MediaSource* source = NULL; - GeeIterator* _tmp5_ = NULL; - gpointer _tmp6_ = NULL; - ViewCollection* _tmp7_ = NULL; - ViewCollection* _tmp8_ = NULL; - MediaSource* _tmp9_ = NULL; - OfflinePageOfflineView* _tmp10_ = NULL; - OfflinePageOfflineView* _tmp11_ = NULL; + GeeIterator* _tmp5_; + gpointer _tmp6_; + ViewCollection* _tmp7_; + ViewCollection* _tmp8_; + MediaSource* _tmp9_; + OfflinePageOfflineView* _tmp10_; + OfflinePageOfflineView* _tmp11_; #line 85 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _tmp3_ = _source_it; #line 85 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" @@ -1165,13 +1165,13 @@ static void offline_page_on_offline_contents_altered (OfflinePage* self, GeeColl if (_tmp12_ != NULL) { #line 1167 "OfflinePage.c" Marker* marker = NULL; - ViewCollection* _tmp13_ = NULL; - ViewCollection* _tmp14_ = NULL; - Marker* _tmp15_ = NULL; - Marker* _tmp16_ = NULL; - ViewCollection* _tmp29_ = NULL; - ViewCollection* _tmp30_ = NULL; - Marker* _tmp31_ = NULL; + ViewCollection* _tmp13_; + ViewCollection* _tmp14_; + Marker* _tmp15_; + Marker* _tmp16_; + ViewCollection* _tmp29_; + ViewCollection* _tmp30_; + Marker* _tmp31_; #line 90 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _tmp13_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 90 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" @@ -1187,8 +1187,8 @@ static void offline_page_on_offline_contents_altered (OfflinePage* self, GeeColl #line 1188 "OfflinePage.c" { GeeIterator* _source_it = NULL; - GeeCollection* _tmp17_ = NULL; - GeeIterator* _tmp18_ = NULL; + GeeCollection* _tmp17_; + GeeIterator* _tmp18_; #line 91 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _tmp17_ = removed; #line 91 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" @@ -1198,17 +1198,17 @@ static void offline_page_on_offline_contents_altered (OfflinePage* self, GeeColl #line 91 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" while (TRUE) { #line 1201 "OfflinePage.c" - GeeIterator* _tmp19_ = NULL; - gboolean _tmp20_ = FALSE; + GeeIterator* _tmp19_; + gboolean _tmp20_; MediaSource* source = NULL; - GeeIterator* _tmp21_ = NULL; - gpointer _tmp22_ = NULL; - Marker* _tmp23_ = NULL; - ViewCollection* _tmp24_ = NULL; - ViewCollection* _tmp25_ = NULL; - MediaSource* _tmp26_ = NULL; - DataView* _tmp27_ = NULL; - DataView* _tmp28_ = NULL; + GeeIterator* _tmp21_; + gpointer _tmp22_; + Marker* _tmp23_; + ViewCollection* _tmp24_; + ViewCollection* _tmp25_; + MediaSource* _tmp26_; + DataView* _tmp27_; + DataView* _tmp28_; #line 91 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _tmp19_ = _source_it; #line 91 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" @@ -1279,37 +1279,37 @@ static gboolean _progress_dialog_monitor_progress_monitor (guint64 current, guin static void offline_page_on_remove_from_library (OfflinePage* self) { GeeCollection* sources = NULL; - ViewCollection* _tmp0_ = NULL; - ViewCollection* _tmp1_ = NULL; - GeeList* _tmp2_ = NULL; - GeeCollection* _tmp3_ = NULL; - GeeCollection* _tmp4_ = NULL; - gint _tmp5_ = 0; - gint _tmp6_ = 0; - AppWindow* _tmp7_ = NULL; - AppWindow* _tmp8_ = NULL; - GeeCollection* _tmp9_ = NULL; - gint _tmp10_ = 0; - gint _tmp11_ = 0; - gboolean _tmp12_ = FALSE; - gboolean _tmp13_ = FALSE; - AppWindow* _tmp14_ = NULL; - AppWindow* _tmp15_ = NULL; + ViewCollection* _tmp0_; + ViewCollection* _tmp1_; + GeeList* _tmp2_; + GeeCollection* _tmp3_; + GeeCollection* _tmp4_; + gint _tmp5_; + gint _tmp6_; + AppWindow* _tmp7_; + AppWindow* _tmp8_; + GeeCollection* _tmp9_; + gint _tmp10_; + gint _tmp11_; + gboolean _tmp12_; + gboolean _tmp13_; + AppWindow* _tmp14_; + AppWindow* _tmp15_; ProgressDialog* progress = NULL; - GeeCollection* _tmp16_ = NULL; - gint _tmp17_ = 0; - gint _tmp18_ = 0; + GeeCollection* _tmp16_; + gint _tmp17_; + gint _tmp18_; GeeArrayList* photos = NULL; - GeeArrayList* _tmp23_ = NULL; + GeeArrayList* _tmp22_; GeeArrayList* videos = NULL; - GeeArrayList* _tmp24_ = NULL; - GeeCollection* _tmp25_ = NULL; - GeeArrayList* _tmp26_ = NULL; - GeeArrayList* _tmp27_ = NULL; - ProgressDialog* _tmp28_ = NULL; - ProgressDialog* _tmp39_ = NULL; - AppWindow* _tmp41_ = NULL; - AppWindow* _tmp42_ = NULL; + GeeArrayList* _tmp23_; + GeeCollection* _tmp24_; + GeeArrayList* _tmp25_; + GeeArrayList* _tmp26_; + ProgressDialog* _tmp27_; + ProgressDialog* _tmp38_; + AppWindow* _tmp40_; + AppWindow* _tmp41_; #line 97 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" g_return_if_fail (IS_OFFLINE_PAGE (self)); #line 98 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" @@ -1381,111 +1381,108 @@ static void offline_page_on_remove_from_library (OfflinePage* self) { #line 109 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" if (_tmp18_ >= 20) { #line 1384 "OfflinePage.c" - AppWindow* _tmp19_ = NULL; - AppWindow* _tmp20_ = NULL; - const gchar* _tmp21_ = NULL; - ProgressDialog* _tmp22_ = NULL; + AppWindow* _tmp19_; + AppWindow* _tmp20_; + ProgressDialog* _tmp21_; #line 110 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _tmp19_ = app_window_get_instance (); #line 110 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _tmp20_ = _tmp19_; #line 110 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - _tmp21_ = _ ("Deleting…"); + _tmp21_ = progress_dialog_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, gtk_window_get_type (), GtkWindow), _ ("Deleting…"), NULL); #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 110 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - g_object_ref_sink (_tmp22_); + g_object_ref_sink (_tmp21_); #line 110 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _g_object_unref0 (progress); #line 110 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - progress = _tmp22_; + progress = _tmp21_; #line 110 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _g_object_unref0 (_tmp20_); -#line 1405 "OfflinePage.c" +#line 1402 "OfflinePage.c" } #line 112 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - _tmp23_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); + _tmp22_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 112 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - photos = _tmp23_; + photos = _tmp22_; #line 113 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - _tmp24_ = gee_array_list_new (TYPE_VIDEO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); + _tmp23_ = gee_array_list_new (TYPE_VIDEO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 113 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - videos = _tmp24_; + videos = _tmp23_; #line 114 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - _tmp25_ = sources; + _tmp24_ = sources; #line 114 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - _tmp26_ = photos; + _tmp25_ = photos; #line 114 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - _tmp27_ = videos; + _tmp26_ = videos; #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)); + media_source_collection_filter_media (_tmp24_, G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, GEE_TYPE_COLLECTION, GeeCollection)); #line 116 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - _tmp28_ = progress; + _tmp27_ = progress; #line 116 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - if (_tmp28_ != NULL) { -#line 1427 "OfflinePage.c" - LibraryPhotoSourceCollection* _tmp29_ = NULL; - GeeArrayList* _tmp30_ = NULL; - ProgressDialog* _tmp31_ = NULL; - VideoSourceCollection* _tmp32_ = NULL; - GeeArrayList* _tmp33_ = NULL; - ProgressDialog* _tmp34_ = NULL; + if (_tmp27_ != NULL) { +#line 1424 "OfflinePage.c" + LibraryPhotoSourceCollection* _tmp28_; + GeeArrayList* _tmp29_; + ProgressDialog* _tmp30_; + VideoSourceCollection* _tmp31_; + GeeArrayList* _tmp32_; + ProgressDialog* _tmp33_; #line 117 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - _tmp29_ = library_photo_global; + _tmp28_ = library_photo_global; #line 117 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - _tmp30_ = photos; + _tmp29_ = photos; #line 117 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - _tmp31_ = progress; + _tmp30_ = progress; #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); + media_source_collection_remove_from_app (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, GEE_TYPE_COLLECTION, GeeCollection), FALSE, _progress_dialog_monitor_progress_monitor, _tmp30_, NULL); #line 118 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - _tmp32_ = video_global; + _tmp31_ = video_global; #line 118 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - _tmp33_ = videos; + _tmp32_ = videos; #line 118 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - _tmp34_ = progress; + _tmp33_ = progress; #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 1450 "OfflinePage.c" + media_source_collection_remove_from_app (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, GEE_TYPE_COLLECTION, GeeCollection), FALSE, _progress_dialog_monitor_progress_monitor, _tmp33_, NULL); +#line 1447 "OfflinePage.c" } else { - LibraryPhotoSourceCollection* _tmp35_ = NULL; - GeeArrayList* _tmp36_ = NULL; - VideoSourceCollection* _tmp37_ = NULL; - GeeArrayList* _tmp38_ = NULL; + LibraryPhotoSourceCollection* _tmp34_; + GeeArrayList* _tmp35_; + VideoSourceCollection* _tmp36_; + GeeArrayList* _tmp37_; #line 120 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - _tmp35_ = library_photo_global; + _tmp34_ = library_photo_global; #line 120 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - _tmp36_ = photos; + _tmp35_ = photos; #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); + media_source_collection_remove_from_app (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, GEE_TYPE_COLLECTION, GeeCollection), FALSE, NULL, NULL, NULL); #line 121 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - _tmp37_ = video_global; + _tmp36_ = video_global; #line 121 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - _tmp38_ = videos; + _tmp37_ = videos; #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 1468 "OfflinePage.c" + media_source_collection_remove_from_app (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, GEE_TYPE_COLLECTION, GeeCollection), FALSE, NULL, NULL, NULL); +#line 1465 "OfflinePage.c" } #line 124 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - _tmp39_ = progress; + _tmp38_ = progress; #line 124 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - if (_tmp39_ != NULL) { -#line 1474 "OfflinePage.c" - ProgressDialog* _tmp40_ = NULL; + if (_tmp38_ != NULL) { +#line 1471 "OfflinePage.c" + ProgressDialog* _tmp39_; #line 125 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - _tmp40_ = progress; + _tmp39_ = progress; #line 125 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - progress_dialog_close (_tmp40_); -#line 1480 "OfflinePage.c" + progress_dialog_close (_tmp39_); +#line 1477 "OfflinePage.c" } #line 127 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - _tmp41_ = app_window_get_instance (); + _tmp40_ = app_window_get_instance (); #line 127 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - _tmp42_ = _tmp41_; + _tmp41_ = _tmp40_; #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)); + page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, TYPE_PAGE_WINDOW, PageWindow)); #line 127 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - _g_object_unref0 (_tmp42_); + _g_object_unref0 (_tmp41_); #line 97 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _g_object_unref0 (videos); #line 97 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" @@ -1494,22 +1491,22 @@ static void offline_page_on_remove_from_library (OfflinePage* self) { _g_object_unref0 (progress); #line 97 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _g_object_unref0 (sources); -#line 1498 "OfflinePage.c" +#line 1495 "OfflinePage.c" } static gpointer _view_filter_ref0 (gpointer self) { #line 131 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" return self ? view_filter_ref (self) : NULL; -#line 1505 "OfflinePage.c" +#line 1502 "OfflinePage.c" } static SearchViewFilter* offline_page_real_get_search_view_filter (CheckerboardPage* base) { OfflinePage * self; SearchViewFilter* result = NULL; - OfflinePageOfflineSearchViewFilter* _tmp0_ = NULL; - SearchViewFilter* _tmp1_ = NULL; + OfflinePageOfflineSearchViewFilter* _tmp0_; + SearchViewFilter* _tmp1_; #line 130 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_OFFLINE_PAGE, OfflinePage); #line 131 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" @@ -1520,17 +1517,17 @@ static SearchViewFilter* offline_page_real_get_search_view_filter (CheckerboardP result = _tmp1_; #line 131 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" return result; -#line 1524 "OfflinePage.c" +#line 1521 "OfflinePage.c" } static OfflinePageOfflineView* offline_page_offline_view_construct (GType object_type, MediaSource* source) { OfflinePageOfflineView * self = NULL; - MediaSource* _tmp0_ = NULL; - gint _tmp1_ = 0; - gint _tmp2_ = 0; - MediaSource* _tmp3_ = NULL; - gboolean _tmp4_ = FALSE; + MediaSource* _tmp0_; + gint _tmp1_; + gint _tmp2_; + MediaSource* _tmp3_; + gboolean _tmp4_; #line 11 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" g_return_val_if_fail (IS_MEDIA_SOURCE (source), NULL); #line 12 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" @@ -1549,21 +1546,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 1553 "OfflinePage.c" +#line 1550 "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 1560 "OfflinePage.c" +#line 1557 "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 1567 "OfflinePage.c" +#line 1564 "OfflinePage.c" } @@ -1592,7 +1589,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 1596 "OfflinePage.c" +#line 1593 "OfflinePage.c" } @@ -1602,14 +1599,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 1606 "OfflinePage.c" +#line 1603 "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 1613 "OfflinePage.c" +#line 1610 "OfflinePage.c" } @@ -1617,8 +1614,8 @@ static void offline_page_offline_search_view_filter_class_init (OfflinePageOffli #line 18 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" 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 = (guint (*)(SearchViewFilter*)) offline_page_offline_search_view_filter_real_get_criteria; -#line 1622 "OfflinePage.c" + ((SearchViewFilterClass *) klass)->get_criteria = (guint (*) (SearchViewFilter *)) offline_page_offline_search_view_filter_real_get_criteria; +#line 1619 "OfflinePage.c" } @@ -1644,41 +1641,41 @@ static void offline_page_class_init (OfflinePageClass * klass) { #line 7 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" g_type_class_add_private (klass, sizeof (OfflinePagePrivate)); #line 7 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - ((PageClass *) klass)->init_collect_ui_filenames = (void (*)(Page*, GeeList*)) offline_page_real_init_collect_ui_filenames; + ((PageClass *) klass)->init_collect_ui_filenames = (void (*) (Page *, GeeList*)) offline_page_real_init_collect_ui_filenames; #line 7 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - ((PageClass *) klass)->add_actions = (void (*)(Page*, GActionMap*)) offline_page_real_add_actions; + ((PageClass *) klass)->add_actions = (void (*) (Page *, GActionMap*)) offline_page_real_add_actions; #line 7 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - ((PageClass *) klass)->remove_actions = (void (*)(Page*, GActionMap*)) offline_page_real_remove_actions; + ((PageClass *) klass)->remove_actions = (void (*) (Page *, GActionMap*)) offline_page_real_remove_actions; #line 7 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - ((CheckerboardPageClass *) klass)->get_view_tracker = (CoreViewTracker* (*)(CheckerboardPage*)) offline_page_real_get_view_tracker; + ((CheckerboardPageClass *) klass)->get_view_tracker = (CoreViewTracker* (*) (CheckerboardPage *)) offline_page_real_get_view_tracker; #line 7 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - ((PageClass *) klass)->update_actions = (void (*)(Page*, gint, gint)) offline_page_real_update_actions; + ((PageClass *) klass)->update_actions = (void (*) (Page *, gint, gint)) offline_page_real_update_actions; #line 7 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - ((CheckerboardPageClass *) klass)->get_search_view_filter = (SearchViewFilter* (*)(CheckerboardPage*)) offline_page_real_get_search_view_filter; + ((CheckerboardPageClass *) klass)->get_search_view_filter = (SearchViewFilter* (*) (CheckerboardPage *)) 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 1661 "OfflinePage.c" +#line 1658 "OfflinePage.c" } static void offline_page_instance_init (OfflinePage * self) { - OfflinePageOfflineSearchViewFilter* _tmp0_ = NULL; + OfflinePageOfflineSearchViewFilter* _tmp0_; #line 7 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" self->priv = OFFLINE_PAGE_GET_PRIVATE (self); #line 25 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _tmp0_ = offline_page_offline_search_view_filter_new (); #line 25 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" self->priv->search_filter = _tmp0_; -#line 1673 "OfflinePage.c" +#line 1670 "OfflinePage.c" } -static void offline_page_finalize (GObject* obj) { +static void offline_page_finalize (GObject * obj) { OfflinePage * self; - LibraryPhotoSourceCollection* _tmp0_ = NULL; - guint _tmp1_ = 0U; - VideoSourceCollection* _tmp2_ = NULL; - guint _tmp3_ = 0U; + LibraryPhotoSourceCollection* _tmp0_; + guint _tmp1_; + VideoSourceCollection* _tmp2_; + guint _tmp3_; #line 7 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_OFFLINE_PAGE, OfflinePage); #line 45 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" @@ -1699,7 +1696,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 1703 "OfflinePage.c" +#line 1700 "OfflinePage.c" } diff --git a/src/library/OfflineSidebarEntry.c b/src/library/OfflineSidebarEntry.c index 215616d..0be13f0 100644 --- a/src/library/OfflineSidebarEntry.c +++ b/src/library/OfflineSidebarEntry.c @@ -1,4 +1,4 @@ -/* OfflineSidebarEntry.c generated by valac 0.34.7, the Vala compiler +/* OfflineSidebarEntry.c generated by valac 0.36.6, the Vala compiler * generated from OfflineSidebarEntry.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -328,7 +328,7 @@ OfflinePage* offline_page_new (void); OfflinePage* offline_page_construct (GType object_type); GType checkerboard_page_get_type (void) G_GNUC_CONST; GType offline_page_get_type (void) G_GNUC_CONST; -static void library_offline_sidebar_entry_finalize (GObject* obj); +static void library_offline_sidebar_entry_finalize (GObject * obj); static void _library_offline_sidebar_entry_on_offline_contents_altered_media_source_collection_trashcan_contents_altered (MediaSourceCollection* _sender, GeeCollection* added, GeeCollection* removed, gpointer self) { @@ -347,18 +347,18 @@ static void _library_offline_sidebar_entry_on_offline_contents_altered_media_sou LibraryOfflineSidebarEntry* library_offline_sidebar_entry_construct (GType object_type) { LibraryOfflineSidebarEntry * self = NULL; - gint _tmp11_ = 0; + gint _tmp11_; #line 8 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala" self = (LibraryOfflineSidebarEntry*) library_hideable_page_entry_construct (object_type); #line 354 "OfflineSidebarEntry.c" { GeeIterator* _media_sources_it = NULL; - MediaCollectionRegistry* _tmp0_ = NULL; - MediaCollectionRegistry* _tmp1_ = NULL; - GeeCollection* _tmp2_ = NULL; - GeeCollection* _tmp3_ = NULL; - GeeIterator* _tmp4_ = NULL; - GeeIterator* _tmp5_ = NULL; + MediaCollectionRegistry* _tmp0_; + MediaCollectionRegistry* _tmp1_; + GeeCollection* _tmp2_; + GeeCollection* _tmp3_; + GeeIterator* _tmp4_; + GeeIterator* _tmp5_; #line 10 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala" _tmp0_ = media_collection_registry_get_instance (); #line 10 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala" @@ -380,12 +380,12 @@ LibraryOfflineSidebarEntry* library_offline_sidebar_entry_construct (GType objec #line 10 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala" while (TRUE) { #line 383 "OfflineSidebarEntry.c" - GeeIterator* _tmp6_ = NULL; - gboolean _tmp7_ = FALSE; + GeeIterator* _tmp6_; + gboolean _tmp7_; MediaSourceCollection* media_sources = NULL; - GeeIterator* _tmp8_ = NULL; - gpointer _tmp9_ = NULL; - MediaSourceCollection* _tmp10_ = NULL; + GeeIterator* _tmp8_; + gpointer _tmp9_; + MediaSourceCollection* _tmp10_; #line 10 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala" _tmp6_ = _media_sources_it; #line 10 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala" @@ -432,7 +432,7 @@ LibraryOfflineSidebarEntry* library_offline_sidebar_entry_new (void) { static void library_offline_sidebar_entry_on_offline_contents_altered (LibraryOfflineSidebarEntry* self) { - gint _tmp0_ = 0; + gint _tmp0_; #line 21 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala" g_return_if_fail (LIBRARY_IS_OFFLINE_SIDEBAR_ENTRY (self)); #line 22 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala" @@ -453,12 +453,12 @@ static gint library_offline_sidebar_entry_get_total_offline (LibraryOfflineSideb #line 454 "OfflineSidebarEntry.c" { GeeIterator* _media_sources_it = NULL; - MediaCollectionRegistry* _tmp0_ = NULL; - MediaCollectionRegistry* _tmp1_ = NULL; - GeeCollection* _tmp2_ = NULL; - GeeCollection* _tmp3_ = NULL; - GeeIterator* _tmp4_ = NULL; - GeeIterator* _tmp5_ = NULL; + MediaCollectionRegistry* _tmp0_; + MediaCollectionRegistry* _tmp1_; + GeeCollection* _tmp2_; + GeeCollection* _tmp3_; + GeeIterator* _tmp4_; + GeeIterator* _tmp5_; #line 27 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala" _tmp0_ = media_collection_registry_get_instance (); #line 27 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala" @@ -480,17 +480,17 @@ static gint library_offline_sidebar_entry_get_total_offline (LibraryOfflineSideb #line 27 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala" while (TRUE) { #line 483 "OfflineSidebarEntry.c" - GeeIterator* _tmp6_ = NULL; - gboolean _tmp7_ = FALSE; + GeeIterator* _tmp6_; + gboolean _tmp7_; MediaSourceCollection* media_sources = NULL; - GeeIterator* _tmp8_ = NULL; - gpointer _tmp9_ = NULL; - gint _tmp10_ = 0; - MediaSourceCollection* _tmp11_ = NULL; - GeeCollection* _tmp12_ = NULL; - GeeCollection* _tmp13_ = NULL; - gint _tmp14_ = 0; - gint _tmp15_ = 0; + GeeIterator* _tmp8_; + gpointer _tmp9_; + gint _tmp10_; + MediaSourceCollection* _tmp11_; + GeeCollection* _tmp12_; + GeeCollection* _tmp13_; + gint _tmp14_; + gint _tmp15_; #line 27 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala" _tmp6_ = _media_sources_it; #line 27 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala" @@ -542,7 +542,7 @@ static gint library_offline_sidebar_entry_get_total_offline (LibraryOfflineSideb static gchar* library_offline_sidebar_entry_real_get_sidebar_name (SidebarSimplePageEntry* base) { LibraryOfflineSidebarEntry * self; gchar* result = NULL; - gchar* _tmp0_ = NULL; + gchar* _tmp0_; #line 33 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, LIBRARY_TYPE_OFFLINE_SIDEBAR_ENTRY, LibraryOfflineSidebarEntry); #line 34 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala" @@ -558,7 +558,7 @@ static gchar* library_offline_sidebar_entry_real_get_sidebar_name (SidebarSimple static gchar* library_offline_sidebar_entry_real_get_sidebar_icon (SidebarSimplePageEntry* base) { LibraryOfflineSidebarEntry * self; gchar* result = NULL; - gchar* _tmp0_ = NULL; + gchar* _tmp0_; #line 37 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, LIBRARY_TYPE_OFFLINE_SIDEBAR_ENTRY, LibraryOfflineSidebarEntry); #line 38 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala" @@ -574,7 +574,7 @@ static gchar* library_offline_sidebar_entry_real_get_sidebar_icon (SidebarSimple static Page* library_offline_sidebar_entry_real_create_page (SidebarSimplePageEntry* base) { LibraryOfflineSidebarEntry * self; Page* result = NULL; - OfflinePage* _tmp0_ = NULL; + OfflinePage* _tmp0_; #line 41 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, LIBRARY_TYPE_OFFLINE_SIDEBAR_ENTRY, LibraryOfflineSidebarEntry); #line 42 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala" @@ -593,11 +593,11 @@ static void library_offline_sidebar_entry_class_init (LibraryOfflineSidebarEntry #line 7 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala" library_offline_sidebar_entry_parent_class = g_type_class_peek_parent (klass); #line 7 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala" - ((SidebarSimplePageEntryClass *) klass)->get_sidebar_name = (gchar* (*)(SidebarSimplePageEntry*)) library_offline_sidebar_entry_real_get_sidebar_name; + ((SidebarSimplePageEntryClass *) klass)->get_sidebar_name = (gchar* (*) (SidebarSimplePageEntry *)) library_offline_sidebar_entry_real_get_sidebar_name; #line 7 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala" - ((SidebarSimplePageEntryClass *) klass)->get_sidebar_icon = (gchar* (*)(SidebarSimplePageEntry*)) library_offline_sidebar_entry_real_get_sidebar_icon; + ((SidebarSimplePageEntryClass *) klass)->get_sidebar_icon = (gchar* (*) (SidebarSimplePageEntry *)) library_offline_sidebar_entry_real_get_sidebar_icon; #line 7 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala" - ((SidebarSimplePageEntryClass *) klass)->create_page = (Page* (*)(SidebarSimplePageEntry*)) library_offline_sidebar_entry_real_create_page; + ((SidebarSimplePageEntryClass *) klass)->create_page = (Page* (*) (SidebarSimplePageEntry *)) library_offline_sidebar_entry_real_create_page; #line 7 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala" G_OBJECT_CLASS (klass)->finalize = library_offline_sidebar_entry_finalize; #line 604 "OfflineSidebarEntry.c" @@ -608,19 +608,19 @@ static void library_offline_sidebar_entry_instance_init (LibraryOfflineSidebarEn } -static void library_offline_sidebar_entry_finalize (GObject* obj) { +static void library_offline_sidebar_entry_finalize (GObject * obj) { LibraryOfflineSidebarEntry * self; #line 7 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, LIBRARY_TYPE_OFFLINE_SIDEBAR_ENTRY, LibraryOfflineSidebarEntry); #line 616 "OfflineSidebarEntry.c" { GeeIterator* _media_sources_it = NULL; - MediaCollectionRegistry* _tmp0_ = NULL; - MediaCollectionRegistry* _tmp1_ = NULL; - GeeCollection* _tmp2_ = NULL; - GeeCollection* _tmp3_ = NULL; - GeeIterator* _tmp4_ = NULL; - GeeIterator* _tmp5_ = NULL; + MediaCollectionRegistry* _tmp0_; + MediaCollectionRegistry* _tmp1_; + GeeCollection* _tmp2_; + GeeCollection* _tmp3_; + GeeIterator* _tmp4_; + GeeIterator* _tmp5_; #line 17 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala" _tmp0_ = media_collection_registry_get_instance (); #line 17 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala" @@ -642,13 +642,13 @@ static void library_offline_sidebar_entry_finalize (GObject* obj) { #line 17 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala" while (TRUE) { #line 645 "OfflineSidebarEntry.c" - GeeIterator* _tmp6_ = NULL; - gboolean _tmp7_ = FALSE; + GeeIterator* _tmp6_; + gboolean _tmp7_; MediaSourceCollection* media_sources = NULL; - GeeIterator* _tmp8_ = NULL; - gpointer _tmp9_ = NULL; - MediaSourceCollection* _tmp10_ = NULL; - guint _tmp11_ = 0U; + GeeIterator* _tmp8_; + gpointer _tmp9_; + MediaSourceCollection* _tmp10_; + guint _tmp11_; #line 17 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala" _tmp6_ = _media_sources_it; #line 17 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala" diff --git a/src/library/TrashPage.c b/src/library/TrashPage.c index b323541..98ee9c1 100644 --- a/src/library/TrashPage.c +++ b/src/library/TrashPage.c @@ -1,4 +1,4 @@ -/* TrashPage.c generated by valac 0.34.7, the Vala compiler +/* TrashPage.c generated by valac 0.36.6, the Vala compiler * generated from TrashPage.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -864,7 +864,7 @@ enum { static guint trash_page_trash_search_view_filter_real_get_criteria (SearchViewFilter* base); GType search_filter_criteria_get_type (void) G_GNUC_CONST; DefaultSearchViewFilter* default_search_view_filter_construct (GType object_type); -static void trash_page_finalize (GObject* obj); +static void trash_page_finalize (GObject * obj); static const GActionEntry TRASH_PAGE_entries[2] = {{"Delete", _trash_page_on_delete_gsimple_action_activate_callback}, {"Restore", _trash_page_on_restore_gsimple_action_activate_callback}}; @@ -891,17 +891,17 @@ static void _trash_page_on_trashcan_contents_altered_media_source_collection_tra TrashPage* trash_page_construct (GType object_type) { TrashPage * self = NULL; - ViewCollection* _tmp0_ = NULL; - ViewCollection* _tmp1_ = NULL; - MediaViewTracker* _tmp2_ = NULL; - LibraryPhotoSourceCollection* _tmp3_ = NULL; - VideoSourceCollection* _tmp4_ = NULL; - LibraryPhotoSourceCollection* _tmp5_ = NULL; - GeeCollection* _tmp6_ = NULL; - GeeCollection* _tmp7_ = NULL; - VideoSourceCollection* _tmp8_ = NULL; - GeeCollection* _tmp9_ = NULL; - GeeCollection* _tmp10_ = NULL; + ViewCollection* _tmp0_; + ViewCollection* _tmp1_; + MediaViewTracker* _tmp2_; + LibraryPhotoSourceCollection* _tmp3_; + VideoSourceCollection* _tmp4_; + LibraryPhotoSourceCollection* _tmp5_; + GeeCollection* _tmp6_; + GeeCollection* _tmp7_; + VideoSourceCollection* _tmp8_; + GeeCollection* _tmp9_; + GeeCollection* _tmp10_; #line 29 "/home/jens/Source/shotwell/src/library/TrashPage.vala" self = (TrashPage*) checkerboard_page_construct (object_type, TRASH_PAGE_NAME); #line 31 "/home/jens/Source/shotwell/src/library/TrashPage.vala" @@ -965,8 +965,8 @@ TrashPage* trash_page_new (void) { static void trash_page_real_init_collect_ui_filenames (Page* base, GeeList* ui_filenames) { TrashPage * self; - GeeList* _tmp0_ = NULL; - GeeList* _tmp1_ = NULL; + GeeList* _tmp0_; + GeeList* _tmp1_; #line 44 "/home/jens/Source/shotwell/src/library/TrashPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TRASH_PAGE, TrashPage); #line 44 "/home/jens/Source/shotwell/src/library/TrashPage.vala" @@ -985,8 +985,8 @@ static void trash_page_real_init_collect_ui_filenames (Page* base, GeeList* ui_f static void trash_page_real_add_actions (Page* base, GActionMap* map) { TrashPage * self; - GActionMap* _tmp0_ = NULL; - GActionMap* _tmp1_ = NULL; + GActionMap* _tmp0_; + GActionMap* _tmp1_; #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" @@ -1005,7 +1005,7 @@ static void trash_page_real_add_actions (Page* base, GActionMap* map) { static void trash_page_real_remove_actions (Page* base, GActionMap* map) { TrashPage * self; - GActionMap* _tmp0_ = NULL; + GActionMap* _tmp0_; #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" @@ -1032,9 +1032,9 @@ static void trash_page_real_remove_actions (Page* base, GActionMap* map) { entry = entry_collection[entry_it]; #line 1034 "TrashPage.c" { - GActionMap* _tmp1_ = NULL; - GActionEntry _tmp2_ = {0}; - const gchar* _tmp3_ = NULL; + GActionMap* _tmp1_; + GActionEntry _tmp2_; + const gchar* _tmp3_; #line 64 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp1_ = map; #line 64 "/home/jens/Source/shotwell/src/library/TrashPage.vala" @@ -1060,8 +1060,8 @@ static gpointer _core_tracker_ref0 (gpointer self) { static CoreViewTracker* trash_page_real_get_view_tracker (CheckerboardPage* base) { TrashPage * self; CoreViewTracker* result = NULL; - MediaViewTracker* _tmp0_ = NULL; - CoreViewTracker* _tmp1_ = NULL; + MediaViewTracker* _tmp0_; + CoreViewTracker* _tmp1_; #line 68 "/home/jens/Source/shotwell/src/library/TrashPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TRASH_PAGE, TrashPage); #line 69 "/home/jens/Source/shotwell/src/library/TrashPage.vala" @@ -1079,9 +1079,9 @@ static CoreViewTracker* trash_page_real_get_view_tracker (CheckerboardPage* base static void trash_page_real_update_actions (Page* base, gint selected_count, gint count) { TrashPage * self; gboolean has_selected = FALSE; - gint _tmp0_ = 0; - gint _tmp1_ = 0; - gint _tmp2_ = 0; + gint _tmp0_; + gint _tmp1_; + gint _tmp2_; #line 72 "/home/jens/Source/shotwell/src/library/TrashPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TRASH_PAGE, TrashPage); #line 73 "/home/jens/Source/shotwell/src/library/TrashPage.vala" @@ -1109,8 +1109,8 @@ static void trash_page_real_update_actions (Page* base, gint selected_count, gin static void trash_page_on_trashcan_contents_altered (TrashPage* self, GeeCollection* added, GeeCollection* removed) { - GeeCollection* _tmp0_ = NULL; - GeeCollection* _tmp12_ = NULL; + GeeCollection* _tmp0_; + GeeCollection* _tmp12_; #line 84 "/home/jens/Source/shotwell/src/library/TrashPage.vala" g_return_if_fail (IS_TRASH_PAGE (self)); #line 84 "/home/jens/Source/shotwell/src/library/TrashPage.vala" @@ -1124,8 +1124,8 @@ static void trash_page_on_trashcan_contents_altered (TrashPage* self, GeeCollect #line 1125 "TrashPage.c" { GeeIterator* _source_it = NULL; - GeeCollection* _tmp1_ = NULL; - GeeIterator* _tmp2_ = NULL; + GeeCollection* _tmp1_; + GeeIterator* _tmp2_; #line 87 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp1_ = added; #line 87 "/home/jens/Source/shotwell/src/library/TrashPage.vala" @@ -1135,16 +1135,16 @@ static void trash_page_on_trashcan_contents_altered (TrashPage* self, GeeCollect #line 87 "/home/jens/Source/shotwell/src/library/TrashPage.vala" while (TRUE) { #line 1138 "TrashPage.c" - GeeIterator* _tmp3_ = NULL; - gboolean _tmp4_ = FALSE; + GeeIterator* _tmp3_; + gboolean _tmp4_; MediaSource* source = NULL; - GeeIterator* _tmp5_ = NULL; - gpointer _tmp6_ = NULL; - ViewCollection* _tmp7_ = NULL; - ViewCollection* _tmp8_ = NULL; - MediaSource* _tmp9_ = NULL; - TrashPageTrashView* _tmp10_ = NULL; - TrashPageTrashView* _tmp11_ = NULL; + GeeIterator* _tmp5_; + gpointer _tmp6_; + ViewCollection* _tmp7_; + ViewCollection* _tmp8_; + MediaSource* _tmp9_; + TrashPageTrashView* _tmp10_; + TrashPageTrashView* _tmp11_; #line 87 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp3_ = _source_it; #line 87 "/home/jens/Source/shotwell/src/library/TrashPage.vala" @@ -1192,13 +1192,13 @@ static void trash_page_on_trashcan_contents_altered (TrashPage* self, GeeCollect if (_tmp12_ != NULL) { #line 1194 "TrashPage.c" Marker* marker = NULL; - ViewCollection* _tmp13_ = NULL; - ViewCollection* _tmp14_ = NULL; - Marker* _tmp15_ = NULL; - Marker* _tmp16_ = NULL; - ViewCollection* _tmp29_ = NULL; - ViewCollection* _tmp30_ = NULL; - Marker* _tmp31_ = NULL; + ViewCollection* _tmp13_; + ViewCollection* _tmp14_; + Marker* _tmp15_; + Marker* _tmp16_; + ViewCollection* _tmp29_; + ViewCollection* _tmp30_; + Marker* _tmp31_; #line 92 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp13_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 92 "/home/jens/Source/shotwell/src/library/TrashPage.vala" @@ -1214,8 +1214,8 @@ static void trash_page_on_trashcan_contents_altered (TrashPage* self, GeeCollect #line 1215 "TrashPage.c" { GeeIterator* _source_it = NULL; - GeeCollection* _tmp17_ = NULL; - GeeIterator* _tmp18_ = NULL; + GeeCollection* _tmp17_; + GeeIterator* _tmp18_; #line 93 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp17_ = removed; #line 93 "/home/jens/Source/shotwell/src/library/TrashPage.vala" @@ -1225,17 +1225,17 @@ static void trash_page_on_trashcan_contents_altered (TrashPage* self, GeeCollect #line 93 "/home/jens/Source/shotwell/src/library/TrashPage.vala" while (TRUE) { #line 1228 "TrashPage.c" - GeeIterator* _tmp19_ = NULL; - gboolean _tmp20_ = FALSE; + GeeIterator* _tmp19_; + gboolean _tmp20_; MediaSource* source = NULL; - GeeIterator* _tmp21_ = NULL; - gpointer _tmp22_ = NULL; - Marker* _tmp23_ = NULL; - ViewCollection* _tmp24_ = NULL; - ViewCollection* _tmp25_ = NULL; - MediaSource* _tmp26_ = NULL; - DataView* _tmp27_ = NULL; - DataView* _tmp28_ = NULL; + GeeIterator* _tmp21_; + gpointer _tmp22_; + Marker* _tmp23_; + ViewCollection* _tmp24_; + ViewCollection* _tmp25_; + MediaSource* _tmp26_; + DataView* _tmp27_; + DataView* _tmp28_; #line 93 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp19_ = _source_it; #line 93 "/home/jens/Source/shotwell/src/library/TrashPage.vala" @@ -1296,18 +1296,18 @@ static void trash_page_on_trashcan_contents_altered (TrashPage* self, GeeCollect static void trash_page_on_restore (TrashPage* self) { - ViewCollection* _tmp0_ = NULL; - ViewCollection* _tmp1_ = NULL; - gint _tmp2_ = 0; - gboolean _tmp3_ = FALSE; - CommandManager* _tmp4_ = NULL; - CommandManager* _tmp5_ = NULL; - ViewCollection* _tmp6_ = NULL; - ViewCollection* _tmp7_ = NULL; - GeeList* _tmp8_ = NULL; - GeeCollection* _tmp9_ = NULL; - TrashUntrashPhotosCommand* _tmp10_ = NULL; - TrashUntrashPhotosCommand* _tmp11_ = NULL; + ViewCollection* _tmp0_; + ViewCollection* _tmp1_; + gint _tmp2_; + gboolean _tmp3_; + CommandManager* _tmp4_; + CommandManager* _tmp5_; + ViewCollection* _tmp6_; + ViewCollection* _tmp7_; + GeeList* _tmp8_; + GeeCollection* _tmp9_; + TrashUntrashPhotosCommand* _tmp10_; + TrashUntrashPhotosCommand* _tmp11_; #line 99 "/home/jens/Source/shotwell/src/library/TrashPage.vala" g_return_if_fail (IS_TRASH_PAGE (self)); #line 100 "/home/jens/Source/shotwell/src/library/TrashPage.vala" @@ -1359,33 +1359,29 @@ static void trash_page_on_restore (TrashPage* self) { static gchar* trash_page_real_get_view_empty_message (CheckerboardPage* base) { TrashPage * self; gchar* result = NULL; - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; + gchar* _tmp0_; #line 107 "/home/jens/Source/shotwell/src/library/TrashPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TRASH_PAGE, TrashPage); #line 108 "/home/jens/Source/shotwell/src/library/TrashPage.vala" - _tmp0_ = _ ("Trash is empty"); -#line 108 "/home/jens/Source/shotwell/src/library/TrashPage.vala" - _tmp1_ = g_strdup (_tmp0_); + _tmp0_ = g_strdup (_ ("Trash is empty")); #line 108 "/home/jens/Source/shotwell/src/library/TrashPage.vala" - result = _tmp1_; + result = _tmp0_; #line 108 "/home/jens/Source/shotwell/src/library/TrashPage.vala" return result; -#line 1375 "TrashPage.c" +#line 1372 "TrashPage.c" } static void trash_page_on_delete (TrashPage* self) { const gchar* _tmp0_ = NULL; - ViewCollection* _tmp1_ = NULL; - ViewCollection* _tmp2_ = NULL; - gint _tmp3_ = 0; - gboolean _tmp4_ = FALSE; - ViewCollection* _tmp6_ = NULL; - ViewCollection* _tmp7_ = NULL; - GeeList* _tmp8_ = NULL; - GeeCollection* _tmp9_ = NULL; - const gchar* _tmp10_ = NULL; + ViewCollection* _tmp1_; + ViewCollection* _tmp2_; + gint _tmp3_; + gboolean _tmp4_; + ViewCollection* _tmp5_; + ViewCollection* _tmp6_; + GeeList* _tmp7_; + GeeCollection* _tmp8_; #line 111 "/home/jens/Source/shotwell/src/library/TrashPage.vala" g_return_if_fail (IS_TRASH_PAGE (self)); #line 113 "/home/jens/Source/shotwell/src/library/TrashPage.vala" @@ -1402,47 +1398,42 @@ static void trash_page_on_delete (TrashPage* self) { if (_tmp4_) { #line 113 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp0_ = "Deleting a Photo"; -#line 1406 "TrashPage.c" +#line 1402 "TrashPage.c" } else { - const gchar* _tmp5_ = NULL; #line 113 "/home/jens/Source/shotwell/src/library/TrashPage.vala" - _tmp5_ = _ ("Deleting Photos"); -#line 113 "/home/jens/Source/shotwell/src/library/TrashPage.vala" - _tmp0_ = _tmp5_; -#line 1413 "TrashPage.c" + _tmp0_ = _ ("Deleting Photos"); +#line 1406 "TrashPage.c" } #line 112 "/home/jens/Source/shotwell/src/library/TrashPage.vala" - _tmp6_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp5_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 112 "/home/jens/Source/shotwell/src/library/TrashPage.vala" - _tmp7_ = _tmp6_; + _tmp6_ = _tmp5_; #line 112 "/home/jens/Source/shotwell/src/library/TrashPage.vala" - _tmp8_ = view_collection_get_selected_sources (_tmp7_); -#line 112 "/home/jens/Source/shotwell/src/library/TrashPage.vala" - _tmp9_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_COLLECTION, GeeCollection); + _tmp7_ = view_collection_get_selected_sources (_tmp6_); #line 112 "/home/jens/Source/shotwell/src/library/TrashPage.vala" - _tmp10_ = _ ("Delete"); + _tmp8_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_COLLECTION, GeeCollection); #line 112 "/home/jens/Source/shotwell/src/library/TrashPage.vala" - remove_from_app (_tmp9_, _tmp10_, _tmp0_); + remove_from_app (_tmp8_, _ ("Delete"), _tmp0_); #line 112 "/home/jens/Source/shotwell/src/library/TrashPage.vala" - _g_object_unref0 (_tmp9_); + _g_object_unref0 (_tmp8_); #line 112 "/home/jens/Source/shotwell/src/library/TrashPage.vala" - _data_collection_unref0 (_tmp7_); -#line 1431 "TrashPage.c" + _data_collection_unref0 (_tmp6_); +#line 1422 "TrashPage.c" } static gpointer _view_filter_ref0 (gpointer self) { #line 117 "/home/jens/Source/shotwell/src/library/TrashPage.vala" return self ? view_filter_ref (self) : NULL; -#line 1438 "TrashPage.c" +#line 1429 "TrashPage.c" } static SearchViewFilter* trash_page_real_get_search_view_filter (CheckerboardPage* base) { TrashPage * self; SearchViewFilter* result = NULL; - TrashPageTrashSearchViewFilter* _tmp0_ = NULL; - SearchViewFilter* _tmp1_ = NULL; + TrashPageTrashSearchViewFilter* _tmp0_; + SearchViewFilter* _tmp1_; #line 116 "/home/jens/Source/shotwell/src/library/TrashPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TRASH_PAGE, TrashPage); #line 117 "/home/jens/Source/shotwell/src/library/TrashPage.vala" @@ -1453,17 +1444,17 @@ static SearchViewFilter* trash_page_real_get_search_view_filter (CheckerboardPag result = _tmp1_; #line 117 "/home/jens/Source/shotwell/src/library/TrashPage.vala" return result; -#line 1457 "TrashPage.c" +#line 1448 "TrashPage.c" } static TrashPageTrashView* trash_page_trash_view_construct (GType object_type, MediaSource* source) { TrashPageTrashView * self = NULL; - MediaSource* _tmp0_ = NULL; - gint _tmp1_ = 0; - gint _tmp2_ = 0; - MediaSource* _tmp3_ = NULL; - gboolean _tmp4_ = FALSE; + MediaSource* _tmp0_; + gint _tmp1_; + gint _tmp2_; + MediaSource* _tmp3_; + gboolean _tmp4_; #line 11 "/home/jens/Source/shotwell/src/library/TrashPage.vala" g_return_val_if_fail (IS_MEDIA_SOURCE (source), NULL); #line 12 "/home/jens/Source/shotwell/src/library/TrashPage.vala" @@ -1482,21 +1473,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 1486 "TrashPage.c" +#line 1477 "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 1493 "TrashPage.c" +#line 1484 "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 1500 "TrashPage.c" +#line 1491 "TrashPage.c" } @@ -1525,7 +1516,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 1529 "TrashPage.c" +#line 1520 "TrashPage.c" } @@ -1535,14 +1526,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 1539 "TrashPage.c" +#line 1530 "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 1546 "TrashPage.c" +#line 1537 "TrashPage.c" } @@ -1550,8 +1541,8 @@ static void trash_page_trash_search_view_filter_class_init (TrashPageTrashSearch #line 18 "/home/jens/Source/shotwell/src/library/TrashPage.vala" 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 = (guint (*)(SearchViewFilter*)) trash_page_trash_search_view_filter_real_get_criteria; -#line 1555 "TrashPage.c" + ((SearchViewFilterClass *) klass)->get_criteria = (guint (*) (SearchViewFilter *)) trash_page_trash_search_view_filter_real_get_criteria; +#line 1546 "TrashPage.c" } @@ -1577,38 +1568,38 @@ static void trash_page_class_init (TrashPageClass * klass) { #line 7 "/home/jens/Source/shotwell/src/library/TrashPage.vala" g_type_class_add_private (klass, sizeof (TrashPagePrivate)); #line 7 "/home/jens/Source/shotwell/src/library/TrashPage.vala" - ((PageClass *) klass)->init_collect_ui_filenames = (void (*)(Page*, GeeList*)) trash_page_real_init_collect_ui_filenames; + ((PageClass *) klass)->init_collect_ui_filenames = (void (*) (Page *, GeeList*)) trash_page_real_init_collect_ui_filenames; #line 7 "/home/jens/Source/shotwell/src/library/TrashPage.vala" - ((PageClass *) klass)->add_actions = (void (*)(Page*, GActionMap*)) trash_page_real_add_actions; + ((PageClass *) klass)->add_actions = (void (*) (Page *, GActionMap*)) trash_page_real_add_actions; #line 7 "/home/jens/Source/shotwell/src/library/TrashPage.vala" - ((PageClass *) klass)->remove_actions = (void (*)(Page*, GActionMap*)) trash_page_real_remove_actions; + ((PageClass *) klass)->remove_actions = (void (*) (Page *, GActionMap*)) trash_page_real_remove_actions; #line 7 "/home/jens/Source/shotwell/src/library/TrashPage.vala" - ((CheckerboardPageClass *) klass)->get_view_tracker = (CoreViewTracker* (*)(CheckerboardPage*)) trash_page_real_get_view_tracker; + ((CheckerboardPageClass *) klass)->get_view_tracker = (CoreViewTracker* (*) (CheckerboardPage *)) trash_page_real_get_view_tracker; #line 7 "/home/jens/Source/shotwell/src/library/TrashPage.vala" - ((PageClass *) klass)->update_actions = (void (*)(Page*, gint, gint)) trash_page_real_update_actions; + ((PageClass *) klass)->update_actions = (void (*) (Page *, gint, gint)) trash_page_real_update_actions; #line 7 "/home/jens/Source/shotwell/src/library/TrashPage.vala" - ((CheckerboardPageClass *) klass)->get_view_empty_message = (gchar* (*)(CheckerboardPage*)) trash_page_real_get_view_empty_message; + ((CheckerboardPageClass *) klass)->get_view_empty_message = (gchar* (*) (CheckerboardPage *)) trash_page_real_get_view_empty_message; #line 7 "/home/jens/Source/shotwell/src/library/TrashPage.vala" - ((CheckerboardPageClass *) klass)->get_search_view_filter = (SearchViewFilter* (*)(CheckerboardPage*)) trash_page_real_get_search_view_filter; + ((CheckerboardPageClass *) klass)->get_search_view_filter = (SearchViewFilter* (*) (CheckerboardPage *)) 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 1596 "TrashPage.c" +#line 1587 "TrashPage.c" } static void trash_page_instance_init (TrashPage * self) { - TrashPageTrashSearchViewFilter* _tmp0_ = NULL; + TrashPageTrashSearchViewFilter* _tmp0_; #line 7 "/home/jens/Source/shotwell/src/library/TrashPage.vala" self->priv = TRASH_PAGE_GET_PRIVATE (self); #line 25 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp0_ = trash_page_trash_search_view_filter_new (); #line 25 "/home/jens/Source/shotwell/src/library/TrashPage.vala" self->priv->search_filter = _tmp0_; -#line 1608 "TrashPage.c" +#line 1599 "TrashPage.c" } -static void trash_page_finalize (GObject* obj) { +static void trash_page_finalize (GObject * obj) { TrashPage * self; #line 7 "/home/jens/Source/shotwell/src/library/TrashPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_TRASH_PAGE, TrashPage); @@ -1618,7 +1609,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 1622 "TrashPage.c" +#line 1613 "TrashPage.c" } diff --git a/src/library/TrashSidebarEntry.c b/src/library/TrashSidebarEntry.c index 8e620d7..9b8a030 100644 --- a/src/library/TrashSidebarEntry.c +++ b/src/library/TrashSidebarEntry.c @@ -1,4 +1,4 @@ -/* TrashSidebarEntry.c generated by valac 0.34.7, the Vala compiler +/* TrashSidebarEntry.c generated by valac 0.36.6, the Vala compiler * generated from TrashSidebarEntry.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -310,7 +310,7 @@ struct _LibraryTrashSidebarEntryClass { static gpointer library_trash_sidebar_entry_parent_class = NULL; -static SidebarInternalDropTargetEntryIface* library_trash_sidebar_entry_sidebar_internal_drop_target_entry_parent_iface = NULL; +static SidebarInternalDropTargetEntryIface * library_trash_sidebar_entry_sidebar_internal_drop_target_entry_parent_iface = NULL; GType sidebar_tree_get_type (void) G_GNUC_CONST; GType sidebar_entry_get_type (void) G_GNUC_CONST; @@ -382,7 +382,7 @@ TrashPage* trash_page_new (void); TrashPage* trash_page_construct (GType object_type); GType checkerboard_page_get_type (void) G_GNUC_CONST; GType trash_page_get_type (void) G_GNUC_CONST; -static void library_trash_sidebar_entry_finalize (GObject* obj); +static void library_trash_sidebar_entry_finalize (GObject * obj); static void _library_trash_sidebar_entry_on_trashcan_contents_altered_media_source_collection_trashcan_contents_altered (MediaSourceCollection* _sender, GeeCollection* added, GeeCollection* removed, gpointer self) { @@ -399,12 +399,12 @@ LibraryTrashSidebarEntry* library_trash_sidebar_entry_construct (GType object_ty #line 400 "TrashSidebarEntry.c" { GeeIterator* _media_sources_it = NULL; - MediaCollectionRegistry* _tmp0_ = NULL; - MediaCollectionRegistry* _tmp1_ = NULL; - GeeCollection* _tmp2_ = NULL; - GeeCollection* _tmp3_ = NULL; - GeeIterator* _tmp4_ = NULL; - GeeIterator* _tmp5_ = NULL; + MediaCollectionRegistry* _tmp0_; + MediaCollectionRegistry* _tmp1_; + GeeCollection* _tmp2_; + GeeCollection* _tmp3_; + GeeIterator* _tmp4_; + GeeIterator* _tmp5_; #line 10 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala" _tmp0_ = media_collection_registry_get_instance (); #line 10 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala" @@ -426,12 +426,12 @@ LibraryTrashSidebarEntry* library_trash_sidebar_entry_construct (GType object_ty #line 10 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala" while (TRUE) { #line 429 "TrashSidebarEntry.c" - GeeIterator* _tmp6_ = NULL; - gboolean _tmp7_ = FALSE; + GeeIterator* _tmp6_; + gboolean _tmp7_; MediaSourceCollection* media_sources = NULL; - GeeIterator* _tmp8_ = NULL; - gpointer _tmp9_ = NULL; - MediaSourceCollection* _tmp10_ = NULL; + GeeIterator* _tmp8_; + gpointer _tmp9_; + MediaSourceCollection* _tmp10_; #line 10 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala" _tmp6_ = _media_sources_it; #line 10 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala" @@ -484,7 +484,7 @@ void library_trash_sidebar_entry_terminate (void) { static gchar* library_trash_sidebar_entry_real_get_sidebar_name (SidebarSimplePageEntry* base) { LibraryTrashSidebarEntry * self; gchar* result = NULL; - gchar* _tmp0_ = NULL; + gchar* _tmp0_; #line 25 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, LIBRARY_TYPE_TRASH_SIDEBAR_ENTRY, LibraryTrashSidebarEntry); #line 26 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala" @@ -500,7 +500,7 @@ static gchar* library_trash_sidebar_entry_real_get_sidebar_name (SidebarSimplePa static gchar* library_trash_sidebar_entry_real_get_sidebar_icon (SidebarSimplePageEntry* base) { LibraryTrashSidebarEntry * self; gchar* result = NULL; - gchar* _tmp0_ = NULL; + gchar* _tmp0_; #line 29 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, LIBRARY_TYPE_TRASH_SIDEBAR_ENTRY, LibraryTrashSidebarEntry); #line 30 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala" @@ -515,15 +515,15 @@ static gchar* library_trash_sidebar_entry_real_get_sidebar_icon (SidebarSimplePa static gchar* library_trash_sidebar_entry_get_current_icon (void) { gchar* result = NULL; - gchar* _tmp13_ = NULL; + gchar* _tmp13_; { GeeIterator* _media_sources_it = NULL; - MediaCollectionRegistry* _tmp0_ = NULL; - MediaCollectionRegistry* _tmp1_ = NULL; - GeeCollection* _tmp2_ = NULL; - GeeCollection* _tmp3_ = NULL; - GeeIterator* _tmp4_ = NULL; - GeeIterator* _tmp5_ = NULL; + MediaCollectionRegistry* _tmp0_; + MediaCollectionRegistry* _tmp1_; + GeeCollection* _tmp2_; + GeeCollection* _tmp3_; + GeeIterator* _tmp4_; + GeeIterator* _tmp5_; #line 34 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala" _tmp0_ = media_collection_registry_get_instance (); #line 34 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala" @@ -545,13 +545,13 @@ static gchar* library_trash_sidebar_entry_get_current_icon (void) { #line 34 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala" while (TRUE) { #line 548 "TrashSidebarEntry.c" - GeeIterator* _tmp6_ = NULL; - gboolean _tmp7_ = FALSE; + GeeIterator* _tmp6_; + gboolean _tmp7_; MediaSourceCollection* media_sources = NULL; - GeeIterator* _tmp8_ = NULL; - gpointer _tmp9_ = NULL; - MediaSourceCollection* _tmp10_ = NULL; - gint _tmp11_ = 0; + GeeIterator* _tmp8_; + gpointer _tmp9_; + MediaSourceCollection* _tmp10_; + gint _tmp11_; #line 34 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala" _tmp6_ = _media_sources_it; #line 34 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala" @@ -575,7 +575,7 @@ static gchar* library_trash_sidebar_entry_get_current_icon (void) { #line 35 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala" if (_tmp11_ > 0) { #line 578 "TrashSidebarEntry.c" - gchar* _tmp12_ = NULL; + gchar* _tmp12_; #line 36 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala" _tmp12_ = g_strdup (RESOURCES_ICON_TRASH_FULL); #line 36 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala" @@ -609,11 +609,11 @@ static gchar* library_trash_sidebar_entry_get_current_icon (void) { static gboolean library_trash_sidebar_entry_real_internal_drop_received (SidebarInternalDropTargetEntry* base, GeeList* media) { LibraryTrashSidebarEntry * self; gboolean result = FALSE; - CommandManager* _tmp0_ = NULL; - CommandManager* _tmp1_ = NULL; - GeeList* _tmp2_ = NULL; - TrashUntrashPhotosCommand* _tmp3_ = NULL; - TrashUntrashPhotosCommand* _tmp4_ = NULL; + CommandManager* _tmp0_; + CommandManager* _tmp1_; + GeeList* _tmp2_; + TrashUntrashPhotosCommand* _tmp3_; + TrashUntrashPhotosCommand* _tmp4_; #line 42 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, LIBRARY_TYPE_TRASH_SIDEBAR_ENTRY, LibraryTrashSidebarEntry); #line 42 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala" @@ -660,7 +660,7 @@ static gboolean library_trash_sidebar_entry_real_internal_drop_received_arbitrar static Page* library_trash_sidebar_entry_real_create_page (SidebarSimplePageEntry* base) { LibraryTrashSidebarEntry * self; Page* result = NULL; - TrashPage* _tmp0_ = NULL; + TrashPage* _tmp0_; #line 52 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, LIBRARY_TYPE_TRASH_SIDEBAR_ENTRY, LibraryTrashSidebarEntry); #line 53 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala" @@ -676,8 +676,8 @@ static Page* library_trash_sidebar_entry_real_create_page (SidebarSimplePageEntr static void library_trash_sidebar_entry_on_trashcan_contents_altered (LibraryTrashSidebarEntry* self) { - gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; + gchar* _tmp0_; + gchar* _tmp1_; #line 56 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala" g_return_if_fail (LIBRARY_IS_TRASH_SIDEBAR_ENTRY (self)); #line 57 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala" @@ -696,11 +696,11 @@ static void library_trash_sidebar_entry_class_init (LibraryTrashSidebarEntryClas #line 7 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala" library_trash_sidebar_entry_parent_class = g_type_class_peek_parent (klass); #line 7 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala" - ((SidebarSimplePageEntryClass *) klass)->get_sidebar_name = (gchar* (*)(SidebarSimplePageEntry*)) library_trash_sidebar_entry_real_get_sidebar_name; + ((SidebarSimplePageEntryClass *) klass)->get_sidebar_name = (gchar* (*) (SidebarSimplePageEntry *)) library_trash_sidebar_entry_real_get_sidebar_name; #line 7 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala" - ((SidebarSimplePageEntryClass *) klass)->get_sidebar_icon = (gchar* (*)(SidebarSimplePageEntry*)) library_trash_sidebar_entry_real_get_sidebar_icon; + ((SidebarSimplePageEntryClass *) klass)->get_sidebar_icon = (gchar* (*) (SidebarSimplePageEntry *)) library_trash_sidebar_entry_real_get_sidebar_icon; #line 7 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala" - ((SidebarSimplePageEntryClass *) klass)->create_page = (Page* (*)(SidebarSimplePageEntry*)) library_trash_sidebar_entry_real_create_page; + ((SidebarSimplePageEntryClass *) klass)->create_page = (Page* (*) (SidebarSimplePageEntry *)) library_trash_sidebar_entry_real_create_page; #line 7 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala" G_OBJECT_CLASS (klass)->finalize = library_trash_sidebar_entry_finalize; #line 707 "TrashSidebarEntry.c" @@ -711,9 +711,9 @@ static void library_trash_sidebar_entry_sidebar_internal_drop_target_entry_inter #line 7 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala" library_trash_sidebar_entry_sidebar_internal_drop_target_entry_parent_iface = g_type_interface_peek_parent (iface); #line 7 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala" - iface->internal_drop_received = (gboolean (*)(SidebarInternalDropTargetEntry*, GeeList*)) library_trash_sidebar_entry_real_internal_drop_received; + iface->internal_drop_received = (gboolean (*) (SidebarInternalDropTargetEntry *, GeeList*)) library_trash_sidebar_entry_real_internal_drop_received; #line 7 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala" - iface->internal_drop_received_arbitrary = (gboolean (*)(SidebarInternalDropTargetEntry*, GtkSelectionData*)) library_trash_sidebar_entry_real_internal_drop_received_arbitrary; + iface->internal_drop_received_arbitrary = (gboolean (*) (SidebarInternalDropTargetEntry *, GtkSelectionData*)) library_trash_sidebar_entry_real_internal_drop_received_arbitrary; #line 718 "TrashSidebarEntry.c" } @@ -722,19 +722,19 @@ static void library_trash_sidebar_entry_instance_init (LibraryTrashSidebarEntry } -static void library_trash_sidebar_entry_finalize (GObject* obj) { +static void library_trash_sidebar_entry_finalize (GObject * obj) { LibraryTrashSidebarEntry * self; #line 7 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, LIBRARY_TYPE_TRASH_SIDEBAR_ENTRY, LibraryTrashSidebarEntry); #line 730 "TrashSidebarEntry.c" { GeeIterator* _media_sources_it = NULL; - MediaCollectionRegistry* _tmp0_ = NULL; - MediaCollectionRegistry* _tmp1_ = NULL; - GeeCollection* _tmp2_ = NULL; - GeeCollection* _tmp3_ = NULL; - GeeIterator* _tmp4_ = NULL; - GeeIterator* _tmp5_ = NULL; + MediaCollectionRegistry* _tmp0_; + MediaCollectionRegistry* _tmp1_; + GeeCollection* _tmp2_; + GeeCollection* _tmp3_; + GeeIterator* _tmp4_; + GeeIterator* _tmp5_; #line 15 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala" _tmp0_ = media_collection_registry_get_instance (); #line 15 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala" @@ -756,13 +756,13 @@ static void library_trash_sidebar_entry_finalize (GObject* obj) { #line 15 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala" while (TRUE) { #line 759 "TrashSidebarEntry.c" - GeeIterator* _tmp6_ = NULL; - gboolean _tmp7_ = FALSE; + GeeIterator* _tmp6_; + gboolean _tmp7_; MediaSourceCollection* media_sources = NULL; - GeeIterator* _tmp8_ = NULL; - gpointer _tmp9_ = NULL; - MediaSourceCollection* _tmp10_ = NULL; - guint _tmp11_ = 0U; + GeeIterator* _tmp8_; + gpointer _tmp9_; + MediaSourceCollection* _tmp10_; + guint _tmp11_; #line 15 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala" _tmp6_ = _media_sources_it; #line 15 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala" |