From a7ff7c49085c320c1e0a2ffb66cc6d283c5acb8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sat, 21 Jan 2017 19:17:10 +0100 Subject: New upstream version 0.25.3 --- src/library/TrashPage.c | 432 ++++++++++++++++++++++++++---------------------- 1 file changed, 236 insertions(+), 196 deletions(-) (limited to 'src/library/TrashPage.c') diff --git a/src/library/TrashPage.c b/src/library/TrashPage.c index 8c6cf47..c108bba 100644 --- a/src/library/TrashPage.c +++ b/src/library/TrashPage.c @@ -1,4 +1,4 @@ -/* TrashPage.c generated by valac 0.32.1, the Vala compiler +/* TrashPage.c generated by valac 0.34.4, the Vala compiler * generated from TrashPage.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -12,10 +12,10 @@ #include #include #include +#include #include #include #include -#include #include #include #include @@ -304,16 +304,6 @@ typedef struct _VideoSourceCollection VideoSourceCollection; typedef struct _VideoSourceCollectionClass VideoSourceCollectionClass; #define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL))) -#define TYPE_APP_WINDOW (app_window_get_type ()) -#define APP_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_APP_WINDOW, AppWindow)) -#define APP_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_APP_WINDOW, AppWindowClass)) -#define IS_APP_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_APP_WINDOW)) -#define IS_APP_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_APP_WINDOW)) -#define APP_WINDOW_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_APP_WINDOW, AppWindowClass)) - -typedef struct _AppWindow AppWindow; -typedef struct _AppWindowClass AppWindowClass; - #define TYPE_MEDIA_SOURCE_ITEM (media_source_item_get_type ()) #define MEDIA_SOURCE_ITEM(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_MEDIA_SOURCE_ITEM, MediaSourceItem)) #define MEDIA_SOURCE_ITEM_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_MEDIA_SOURCE_ITEM, MediaSourceItemClass)) @@ -473,7 +463,8 @@ struct _PageClass { void (*ready) (Page* self); void (*switching_to_fullscreen) (Page* self, FullscreenWindow* fsw); void (*returning_from_fullscreen) (Page* self, FullscreenWindow* fsw); - void (*add_actions) (Page* self); + void (*add_actions) (Page* self, GActionMap* map); + void (*remove_actions) (Page* self, GActionMap* map); void (*init_collect_ui_filenames) (Page* self, GeeList* ui_filenames); InjectionGroup** (*init_collect_injection_groups) (Page* self, int* result_length1); void (*init_actions) (Page* self, gint selected_count, gint count); @@ -807,10 +798,10 @@ GType video_source_collection_get_type (void) G_GNUC_CONST; GeeCollection* media_source_collection_get_trashcan_contents (MediaSourceCollection* self); static void trash_page_real_init_collect_ui_filenames (Page* base, GeeList* ui_filenames); void page_init_collect_ui_filenames (Page* self, GeeList* ui_filenames); -static void trash_page_real_add_actions (Page* base); -void page_add_actions (Page* self); -GType app_window_get_type (void) G_GNUC_CONST; -AppWindow* app_window_get_instance (void); +static void trash_page_real_add_actions (Page* base, GActionMap* map); +void page_add_actions (Page* self, GActionMap* map); +static void trash_page_real_remove_actions (Page* base, GActionMap* map); +void page_remove_actions (Page* self, GActionMap* map); static CoreViewTracker* trash_page_real_get_view_tracker (CheckerboardPage* base); static void trash_page_real_update_actions (Page* base, gint selected_count, gint count); void page_set_action_sensitive (Page* self, const gchar* name, gboolean sensitive); @@ -880,21 +871,21 @@ static const GActionEntry TRASH_PAGE_entries[2] = {{"Delete", _trash_page_on_del static void _trash_page_on_delete_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { #line 50 "/home/jens/Source/shotwell/src/library/TrashPage.vala" trash_page_on_delete ((TrashPage*) self); -#line 884 "TrashPage.c" +#line 875 "TrashPage.c" } static void _trash_page_on_restore_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { #line 50 "/home/jens/Source/shotwell/src/library/TrashPage.vala" trash_page_on_restore ((TrashPage*) self); -#line 891 "TrashPage.c" +#line 882 "TrashPage.c" } static void _trash_page_on_trashcan_contents_altered_media_source_collection_trashcan_contents_altered (MediaSourceCollection* _sender, GeeCollection* added, GeeCollection* removed, gpointer self) { #line 38 "/home/jens/Source/shotwell/src/library/TrashPage.vala" trash_page_on_trashcan_contents_altered ((TrashPage*) self, added, removed); -#line 898 "TrashPage.c" +#line 889 "TrashPage.c" } @@ -961,14 +952,14 @@ TrashPage* trash_page_construct (GType object_type) { _g_object_unref0 (_tmp10_); #line 28 "/home/jens/Source/shotwell/src/library/TrashPage.vala" return self; -#line 965 "TrashPage.c" +#line 956 "TrashPage.c" } TrashPage* trash_page_new (void) { #line 28 "/home/jens/Source/shotwell/src/library/TrashPage.vala" return trash_page_construct (TYPE_TRASH_PAGE); -#line 972 "TrashPage.c" +#line 963 "TrashPage.c" } @@ -988,34 +979,81 @@ static void trash_page_real_init_collect_ui_filenames (Page* base, GeeList* ui_f _tmp1_ = ui_filenames; #line 47 "/home/jens/Source/shotwell/src/library/TrashPage.vala" gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection), "trash.ui"); -#line 992 "TrashPage.c" +#line 983 "TrashPage.c" } -static void trash_page_real_add_actions (Page* base) { +static void trash_page_real_add_actions (Page* base, GActionMap* map) { TrashPage * self; - AppWindow* _tmp0_ = NULL; - AppWindow* _tmp1_ = NULL; + GActionMap* _tmp0_ = NULL; + GActionMap* _tmp1_ = NULL; #line 55 "/home/jens/Source/shotwell/src/library/TrashPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TRASH_PAGE, TrashPage); +#line 55 "/home/jens/Source/shotwell/src/library/TrashPage.vala" + g_return_if_fail (G_IS_ACTION_MAP (map)); #line 56 "/home/jens/Source/shotwell/src/library/TrashPage.vala" - PAGE_CLASS (trash_page_parent_class)->add_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page)); -#line 58 "/home/jens/Source/shotwell/src/library/TrashPage.vala" - _tmp0_ = app_window_get_instance (); -#line 58 "/home/jens/Source/shotwell/src/library/TrashPage.vala" - _tmp1_ = _tmp0_; + _tmp0_ = map; +#line 56 "/home/jens/Source/shotwell/src/library/TrashPage.vala" + PAGE_CLASS (trash_page_parent_class)->add_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page), _tmp0_); #line 58 "/home/jens/Source/shotwell/src/library/TrashPage.vala" - g_action_map_add_action_entries (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, g_action_map_get_type (), GActionMap), TRASH_PAGE_entries, G_N_ELEMENTS (TRASH_PAGE_entries), self); + _tmp1_ = map; #line 58 "/home/jens/Source/shotwell/src/library/TrashPage.vala" - _g_object_unref0 (_tmp1_); -#line 1012 "TrashPage.c" + g_action_map_add_action_entries (_tmp1_, TRASH_PAGE_entries, G_N_ELEMENTS (TRASH_PAGE_entries), self); +#line 1003 "TrashPage.c" } -static gpointer _core_tracker_ref0 (gpointer self) { +static void trash_page_real_remove_actions (Page* base, GActionMap* map) { + TrashPage * self; + GActionMap* _tmp0_ = NULL; +#line 61 "/home/jens/Source/shotwell/src/library/TrashPage.vala" + self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TRASH_PAGE, TrashPage); +#line 61 "/home/jens/Source/shotwell/src/library/TrashPage.vala" + g_return_if_fail (G_IS_ACTION_MAP (map)); #line 62 "/home/jens/Source/shotwell/src/library/TrashPage.vala" + _tmp0_ = map; +#line 62 "/home/jens/Source/shotwell/src/library/TrashPage.vala" + PAGE_CLASS (trash_page_parent_class)->remove_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page), _tmp0_); +#line 1018 "TrashPage.c" + { + GActionEntry* entry_collection = NULL; + gint entry_collection_length1 = 0; + gint _entry_collection_size_ = 0; + gint entry_it = 0; +#line 63 "/home/jens/Source/shotwell/src/library/TrashPage.vala" + entry_collection = TRASH_PAGE_entries; +#line 63 "/home/jens/Source/shotwell/src/library/TrashPage.vala" + entry_collection_length1 = G_N_ELEMENTS (TRASH_PAGE_entries); +#line 63 "/home/jens/Source/shotwell/src/library/TrashPage.vala" + for (entry_it = 0; entry_it < G_N_ELEMENTS (TRASH_PAGE_entries); entry_it = entry_it + 1) { +#line 1030 "TrashPage.c" + GActionEntry entry = {0}; +#line 63 "/home/jens/Source/shotwell/src/library/TrashPage.vala" + entry = entry_collection[entry_it]; +#line 1034 "TrashPage.c" + { + GActionMap* _tmp1_ = NULL; + GActionEntry _tmp2_ = {0}; + const gchar* _tmp3_ = NULL; +#line 64 "/home/jens/Source/shotwell/src/library/TrashPage.vala" + _tmp1_ = map; +#line 64 "/home/jens/Source/shotwell/src/library/TrashPage.vala" + _tmp2_ = entry; +#line 64 "/home/jens/Source/shotwell/src/library/TrashPage.vala" + _tmp3_ = _tmp2_.name; +#line 64 "/home/jens/Source/shotwell/src/library/TrashPage.vala" + g_action_map_remove_action (_tmp1_, _tmp3_); +#line 1047 "TrashPage.c" + } + } + } +} + + +static gpointer _core_tracker_ref0 (gpointer self) { +#line 69 "/home/jens/Source/shotwell/src/library/TrashPage.vala" return self ? core_tracker_ref (self) : NULL; -#line 1019 "TrashPage.c" +#line 1057 "TrashPage.c" } @@ -1024,17 +1062,17 @@ static CoreViewTracker* trash_page_real_get_view_tracker (CheckerboardPage* base CoreViewTracker* result = NULL; MediaViewTracker* _tmp0_ = NULL; CoreViewTracker* _tmp1_ = NULL; -#line 61 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 68 "/home/jens/Source/shotwell/src/library/TrashPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TRASH_PAGE, TrashPage); -#line 62 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 69 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp0_ = self->priv->tracker; -#line 62 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 69 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp1_ = _core_tracker_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, CORE_TYPE_VIEW_TRACKER, CoreViewTracker)); -#line 62 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 69 "/home/jens/Source/shotwell/src/library/TrashPage.vala" result = _tmp1_; -#line 62 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 69 "/home/jens/Source/shotwell/src/library/TrashPage.vala" return result; -#line 1038 "TrashPage.c" +#line 1076 "TrashPage.c" } @@ -1044,59 +1082,59 @@ static void trash_page_real_update_actions (Page* base, gint selected_count, gin gint _tmp0_ = 0; gint _tmp1_ = 0; gint _tmp2_ = 0; -#line 65 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 72 "/home/jens/Source/shotwell/src/library/TrashPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TRASH_PAGE, TrashPage); -#line 66 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 73 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp0_ = selected_count; -#line 66 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 73 "/home/jens/Source/shotwell/src/library/TrashPage.vala" has_selected = _tmp0_ > 0; -#line 68 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 75 "/home/jens/Source/shotwell/src/library/TrashPage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Delete", has_selected); -#line 69 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 76 "/home/jens/Source/shotwell/src/library/TrashPage.vala" page_set_action_important (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Delete", TRUE); -#line 70 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 77 "/home/jens/Source/shotwell/src/library/TrashPage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Restore", has_selected); -#line 71 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 78 "/home/jens/Source/shotwell/src/library/TrashPage.vala" page_set_action_important (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Restore", TRUE); -#line 72 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 79 "/home/jens/Source/shotwell/src/library/TrashPage.vala" page_set_common_action_important (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "CommonEmptyTrash", TRUE); -#line 74 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 81 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp1_ = selected_count; -#line 74 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 81 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp2_ = count; -#line 74 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 81 "/home/jens/Source/shotwell/src/library/TrashPage.vala" PAGE_CLASS (trash_page_parent_class)->update_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page), _tmp1_, _tmp2_); -#line 1070 "TrashPage.c" +#line 1108 "TrashPage.c" } static void trash_page_on_trashcan_contents_altered (TrashPage* self, GeeCollection* added, GeeCollection* removed) { GeeCollection* _tmp0_ = NULL; GeeCollection* _tmp12_ = NULL; -#line 77 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 84 "/home/jens/Source/shotwell/src/library/TrashPage.vala" g_return_if_fail (IS_TRASH_PAGE (self)); -#line 77 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 84 "/home/jens/Source/shotwell/src/library/TrashPage.vala" g_return_if_fail ((added == NULL) || GEE_IS_COLLECTION (added)); -#line 77 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 84 "/home/jens/Source/shotwell/src/library/TrashPage.vala" g_return_if_fail ((removed == NULL) || GEE_IS_COLLECTION (removed)); -#line 79 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 86 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp0_ = added; -#line 79 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 86 "/home/jens/Source/shotwell/src/library/TrashPage.vala" if (_tmp0_ != NULL) { -#line 1087 "TrashPage.c" +#line 1125 "TrashPage.c" { GeeIterator* _source_it = NULL; GeeCollection* _tmp1_ = NULL; GeeIterator* _tmp2_ = NULL; -#line 80 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 87 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp1_ = added; -#line 80 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 87 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp2_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 80 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 87 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _source_it = _tmp2_; -#line 80 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 87 "/home/jens/Source/shotwell/src/library/TrashPage.vala" while (TRUE) { -#line 1100 "TrashPage.c" +#line 1138 "TrashPage.c" GeeIterator* _tmp3_ = NULL; gboolean _tmp4_ = FALSE; MediaSource* source = NULL; @@ -1107,52 +1145,52 @@ static void trash_page_on_trashcan_contents_altered (TrashPage* self, GeeCollect MediaSource* _tmp9_ = NULL; TrashPageTrashView* _tmp10_ = NULL; TrashPageTrashView* _tmp11_ = NULL; -#line 80 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 87 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp3_ = _source_it; -#line 80 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 87 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp4_ = gee_iterator_next (_tmp3_); -#line 80 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 87 "/home/jens/Source/shotwell/src/library/TrashPage.vala" if (!_tmp4_) { -#line 80 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 87 "/home/jens/Source/shotwell/src/library/TrashPage.vala" break; -#line 1119 "TrashPage.c" +#line 1157 "TrashPage.c" } -#line 80 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 87 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp5_ = _source_it; -#line 80 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 87 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp6_ = gee_iterator_get (_tmp5_); -#line 80 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 87 "/home/jens/Source/shotwell/src/library/TrashPage.vala" source = (MediaSource*) _tmp6_; -#line 81 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 88 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp7_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 81 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 88 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp8_ = _tmp7_; -#line 81 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 88 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp9_ = source; -#line 81 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 88 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp10_ = trash_page_trash_view_new (_tmp9_); -#line 81 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 88 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp11_ = _tmp10_; -#line 81 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 88 "/home/jens/Source/shotwell/src/library/TrashPage.vala" data_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_DATA_OBJECT, DataObject)); -#line 81 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 88 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _g_object_unref0 (_tmp11_); -#line 81 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 88 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _data_collection_unref0 (_tmp8_); -#line 80 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 87 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _g_object_unref0 (source); -#line 1145 "TrashPage.c" +#line 1183 "TrashPage.c" } -#line 80 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 87 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _g_object_unref0 (_source_it); -#line 1149 "TrashPage.c" +#line 1187 "TrashPage.c" } } -#line 84 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 91 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp12_ = removed; -#line 84 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 91 "/home/jens/Source/shotwell/src/library/TrashPage.vala" if (_tmp12_ != NULL) { -#line 1156 "TrashPage.c" +#line 1194 "TrashPage.c" Marker* marker = NULL; ViewCollection* _tmp13_ = NULL; ViewCollection* _tmp14_ = NULL; @@ -1161,32 +1199,32 @@ static void trash_page_on_trashcan_contents_altered (TrashPage* self, GeeCollect ViewCollection* _tmp29_ = NULL; ViewCollection* _tmp30_ = NULL; Marker* _tmp31_ = NULL; -#line 85 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 92 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp13_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 85 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 92 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp14_ = _tmp13_; -#line 85 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 92 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp15_ = data_collection_start_marking (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_DATA_COLLECTION, DataCollection)); -#line 85 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 92 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp16_ = _tmp15_; -#line 85 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 92 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _data_collection_unref0 (_tmp14_); -#line 85 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 92 "/home/jens/Source/shotwell/src/library/TrashPage.vala" marker = _tmp16_; -#line 1177 "TrashPage.c" +#line 1215 "TrashPage.c" { GeeIterator* _source_it = NULL; GeeCollection* _tmp17_ = NULL; GeeIterator* _tmp18_ = NULL; -#line 86 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 93 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp17_ = removed; -#line 86 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 93 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp18_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 86 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 93 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _source_it = _tmp18_; -#line 86 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 93 "/home/jens/Source/shotwell/src/library/TrashPage.vala" while (TRUE) { -#line 1190 "TrashPage.c" +#line 1228 "TrashPage.c" GeeIterator* _tmp19_ = NULL; gboolean _tmp20_ = FALSE; MediaSource* source = NULL; @@ -1198,61 +1236,61 @@ static void trash_page_on_trashcan_contents_altered (TrashPage* self, GeeCollect MediaSource* _tmp26_ = NULL; DataView* _tmp27_ = NULL; DataView* _tmp28_ = NULL; -#line 86 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 93 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp19_ = _source_it; -#line 86 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 93 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp20_ = gee_iterator_next (_tmp19_); -#line 86 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 93 "/home/jens/Source/shotwell/src/library/TrashPage.vala" if (!_tmp20_) { -#line 86 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 93 "/home/jens/Source/shotwell/src/library/TrashPage.vala" break; -#line 1210 "TrashPage.c" +#line 1248 "TrashPage.c" } -#line 86 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 93 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp21_ = _source_it; -#line 86 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 93 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp22_ = gee_iterator_get (_tmp21_); -#line 86 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 93 "/home/jens/Source/shotwell/src/library/TrashPage.vala" source = (MediaSource*) _tmp22_; -#line 87 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 94 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp23_ = marker; -#line 87 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 94 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp24_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 87 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 94 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp25_ = _tmp24_; -#line 87 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 94 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp26_ = source; -#line 87 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 94 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp27_ = view_collection_get_view_for_source (_tmp25_, G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, TYPE_DATA_SOURCE, DataSource)); -#line 87 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 94 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp28_ = _tmp27_; -#line 87 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 94 "/home/jens/Source/shotwell/src/library/TrashPage.vala" marker_mark (_tmp23_, G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, TYPE_DATA_OBJECT, DataObject)); -#line 87 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 94 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _g_object_unref0 (_tmp28_); -#line 87 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 94 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _data_collection_unref0 (_tmp25_); -#line 86 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 93 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _g_object_unref0 (source); -#line 1238 "TrashPage.c" +#line 1276 "TrashPage.c" } -#line 86 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 93 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _g_object_unref0 (_source_it); -#line 1242 "TrashPage.c" +#line 1280 "TrashPage.c" } -#line 88 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 95 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp29_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 88 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 95 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp30_ = _tmp29_; -#line 88 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 95 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp31_ = marker; -#line 88 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 95 "/home/jens/Source/shotwell/src/library/TrashPage.vala" data_collection_remove_marked (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, TYPE_DATA_COLLECTION, DataCollection), _tmp31_); -#line 88 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 95 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _data_collection_unref0 (_tmp30_); -#line 84 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 91 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _g_object_unref0 (marker); -#line 1256 "TrashPage.c" +#line 1294 "TrashPage.c" } } @@ -1270,51 +1308,51 @@ static void trash_page_on_restore (TrashPage* self) { GeeCollection* _tmp9_ = NULL; TrashUntrashPhotosCommand* _tmp10_ = NULL; TrashUntrashPhotosCommand* _tmp11_ = NULL; -#line 92 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 99 "/home/jens/Source/shotwell/src/library/TrashPage.vala" g_return_if_fail (IS_TRASH_PAGE (self)); -#line 93 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 100 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 93 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 100 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp1_ = _tmp0_; -#line 93 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 100 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp2_ = view_collection_get_selected_count (_tmp1_); -#line 93 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 100 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp3_ = _tmp2_ == 0; -#line 93 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 100 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _data_collection_unref0 (_tmp1_); -#line 93 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 100 "/home/jens/Source/shotwell/src/library/TrashPage.vala" if (_tmp3_) { -#line 94 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 101 "/home/jens/Source/shotwell/src/library/TrashPage.vala" return; -#line 1290 "TrashPage.c" +#line 1328 "TrashPage.c" } -#line 96 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 103 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp4_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 96 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 103 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp5_ = _tmp4_; -#line 96 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 103 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp6_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 96 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 103 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp7_ = _tmp6_; -#line 96 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 103 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp8_ = view_collection_get_selected_sources (_tmp7_); -#line 96 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 103 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp9_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_COLLECTION, GeeCollection); -#line 96 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 103 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp10_ = trash_untrash_photos_command_new (_tmp9_, FALSE); -#line 96 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 103 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp11_ = _tmp10_; -#line 96 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 103 "/home/jens/Source/shotwell/src/library/TrashPage.vala" command_manager_execute (_tmp5_, G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_COMMAND, Command)); -#line 96 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 103 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _g_object_unref0 (_tmp11_); -#line 96 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 103 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _g_object_unref0 (_tmp9_); -#line 96 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 103 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _data_collection_unref0 (_tmp7_); -#line 96 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 103 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _command_manager_unref0 (_tmp5_); -#line 1318 "TrashPage.c" +#line 1356 "TrashPage.c" } @@ -1323,17 +1361,17 @@ static gchar* trash_page_real_get_view_empty_message (CheckerboardPage* base) { gchar* result = NULL; const gchar* _tmp0_ = NULL; gchar* _tmp1_ = NULL; -#line 100 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 107 "/home/jens/Source/shotwell/src/library/TrashPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TRASH_PAGE, TrashPage); -#line 101 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 108 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp0_ = _ ("Trash is empty"); -#line 101 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 108 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp1_ = g_strdup (_tmp0_); -#line 101 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 108 "/home/jens/Source/shotwell/src/library/TrashPage.vala" result = _tmp1_; -#line 101 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 108 "/home/jens/Source/shotwell/src/library/TrashPage.vala" return result; -#line 1337 "TrashPage.c" +#line 1375 "TrashPage.c" } @@ -1348,55 +1386,55 @@ static void trash_page_on_delete (TrashPage* self) { GeeList* _tmp8_ = NULL; GeeCollection* _tmp9_ = NULL; const gchar* _tmp10_ = NULL; -#line 104 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 111 "/home/jens/Source/shotwell/src/library/TrashPage.vala" g_return_if_fail (IS_TRASH_PAGE (self)); -#line 106 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 113 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp1_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 106 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 113 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp2_ = _tmp1_; -#line 106 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 113 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp3_ = view_collection_get_selected_count (_tmp2_); -#line 106 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 113 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp4_ = _tmp3_ == 1; -#line 106 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 113 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _data_collection_unref0 (_tmp2_); -#line 106 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 113 "/home/jens/Source/shotwell/src/library/TrashPage.vala" if (_tmp4_) { -#line 106 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 113 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp0_ = "Deleting a Photo"; -#line 1368 "TrashPage.c" +#line 1406 "TrashPage.c" } else { const gchar* _tmp5_ = NULL; -#line 106 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 113 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp5_ = _ ("Deleting Photos"); -#line 106 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 113 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp0_ = _tmp5_; -#line 1375 "TrashPage.c" +#line 1413 "TrashPage.c" } -#line 105 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 112 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp6_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 105 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 112 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp7_ = _tmp6_; -#line 105 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 112 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp8_ = view_collection_get_selected_sources (_tmp7_); -#line 105 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 112 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp9_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_COLLECTION, GeeCollection); -#line 105 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 112 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp10_ = _ ("Delete"); -#line 105 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 112 "/home/jens/Source/shotwell/src/library/TrashPage.vala" remove_from_app (_tmp9_, _tmp10_, _tmp0_); -#line 105 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 112 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _g_object_unref0 (_tmp9_); -#line 105 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 112 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _data_collection_unref0 (_tmp7_); -#line 1393 "TrashPage.c" +#line 1431 "TrashPage.c" } static gpointer _view_filter_ref0 (gpointer self) { -#line 110 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 117 "/home/jens/Source/shotwell/src/library/TrashPage.vala" return self ? view_filter_ref (self) : NULL; -#line 1400 "TrashPage.c" +#line 1438 "TrashPage.c" } @@ -1405,17 +1443,17 @@ static SearchViewFilter* trash_page_real_get_search_view_filter (CheckerboardPag SearchViewFilter* result = NULL; TrashPageTrashSearchViewFilter* _tmp0_ = NULL; SearchViewFilter* _tmp1_ = NULL; -#line 109 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 116 "/home/jens/Source/shotwell/src/library/TrashPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TRASH_PAGE, TrashPage); -#line 110 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 117 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp0_ = self->priv->search_filter; -#line 110 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 117 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp1_ = _view_filter_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter)); -#line 110 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 117 "/home/jens/Source/shotwell/src/library/TrashPage.vala" result = _tmp1_; -#line 110 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 117 "/home/jens/Source/shotwell/src/library/TrashPage.vala" return result; -#line 1419 "TrashPage.c" +#line 1457 "TrashPage.c" } @@ -1444,21 +1482,21 @@ static TrashPageTrashView* trash_page_trash_view_construct (GType object_type, M _vala_assert (_tmp4_, "source.is_trashed()"); #line 11 "/home/jens/Source/shotwell/src/library/TrashPage.vala" return self; -#line 1448 "TrashPage.c" +#line 1486 "TrashPage.c" } static TrashPageTrashView* trash_page_trash_view_new (MediaSource* source) { #line 11 "/home/jens/Source/shotwell/src/library/TrashPage.vala" return trash_page_trash_view_construct (TRASH_PAGE_TYPE_TRASH_VIEW, source); -#line 1455 "TrashPage.c" +#line 1493 "TrashPage.c" } static void trash_page_trash_view_class_init (TrashPageTrashViewClass * klass) { #line 10 "/home/jens/Source/shotwell/src/library/TrashPage.vala" trash_page_trash_view_parent_class = g_type_class_peek_parent (klass); -#line 1462 "TrashPage.c" +#line 1500 "TrashPage.c" } @@ -1487,7 +1525,7 @@ static guint trash_page_trash_search_view_filter_real_get_criteria (SearchViewFi result = (guint) ((((SEARCH_FILTER_CRITERIA_TEXT | SEARCH_FILTER_CRITERIA_FLAG) | SEARCH_FILTER_CRITERIA_MEDIA) | SEARCH_FILTER_CRITERIA_RATING) | SEARCH_FILTER_CRITERIA_SAVEDSEARCH); #line 20 "/home/jens/Source/shotwell/src/library/TrashPage.vala" return result; -#line 1491 "TrashPage.c" +#line 1529 "TrashPage.c" } @@ -1497,14 +1535,14 @@ static TrashPageTrashSearchViewFilter* trash_page_trash_search_view_filter_const self = (TrashPageTrashSearchViewFilter*) default_search_view_filter_construct (object_type); #line 18 "/home/jens/Source/shotwell/src/library/TrashPage.vala" return self; -#line 1501 "TrashPage.c" +#line 1539 "TrashPage.c" } static TrashPageTrashSearchViewFilter* trash_page_trash_search_view_filter_new (void) { #line 18 "/home/jens/Source/shotwell/src/library/TrashPage.vala" return trash_page_trash_search_view_filter_construct (TRASH_PAGE_TYPE_TRASH_SEARCH_VIEW_FILTER); -#line 1508 "TrashPage.c" +#line 1546 "TrashPage.c" } @@ -1513,7 +1551,7 @@ static void trash_page_trash_search_view_filter_class_init (TrashPageTrashSearch trash_page_trash_search_view_filter_parent_class = g_type_class_peek_parent (klass); #line 18 "/home/jens/Source/shotwell/src/library/TrashPage.vala" ((SearchViewFilterClass *) klass)->get_criteria = trash_page_trash_search_view_filter_real_get_criteria; -#line 1517 "TrashPage.c" +#line 1555 "TrashPage.c" } @@ -1542,6 +1580,8 @@ static void trash_page_class_init (TrashPageClass * klass) { ((PageClass *) klass)->init_collect_ui_filenames = trash_page_real_init_collect_ui_filenames; #line 7 "/home/jens/Source/shotwell/src/library/TrashPage.vala" ((PageClass *) klass)->add_actions = trash_page_real_add_actions; +#line 7 "/home/jens/Source/shotwell/src/library/TrashPage.vala" + ((PageClass *) klass)->remove_actions = trash_page_real_remove_actions; #line 7 "/home/jens/Source/shotwell/src/library/TrashPage.vala" ((CheckerboardPageClass *) klass)->get_view_tracker = trash_page_real_get_view_tracker; #line 7 "/home/jens/Source/shotwell/src/library/TrashPage.vala" @@ -1552,7 +1592,7 @@ static void trash_page_class_init (TrashPageClass * klass) { ((CheckerboardPageClass *) klass)->get_search_view_filter = trash_page_real_get_search_view_filter; #line 7 "/home/jens/Source/shotwell/src/library/TrashPage.vala" G_OBJECT_CLASS (klass)->finalize = trash_page_finalize; -#line 1556 "TrashPage.c" +#line 1596 "TrashPage.c" } @@ -1564,7 +1604,7 @@ static void trash_page_instance_init (TrashPage * self) { _tmp0_ = trash_page_trash_search_view_filter_new (); #line 25 "/home/jens/Source/shotwell/src/library/TrashPage.vala" self->priv->search_filter = _tmp0_; -#line 1568 "TrashPage.c" +#line 1608 "TrashPage.c" } @@ -1578,7 +1618,7 @@ static void trash_page_finalize (GObject* obj) { _core_tracker_unref0 (self->priv->tracker); #line 7 "/home/jens/Source/shotwell/src/library/TrashPage.vala" G_OBJECT_CLASS (trash_page_parent_class)->finalize (obj); -#line 1582 "TrashPage.c" +#line 1622 "TrashPage.c" } -- cgit v1.2.3