summaryrefslogtreecommitdiff
path: root/src/library/TrashPage.c
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2017-11-12 16:48:02 +0100
committerJörg Frings-Fürst <debian@jff-webhosting.net>2017-11-12 16:48:02 +0100
commitabdaad68fb94e2d61448a6dfc14847df8a2c32b9 (patch)
tree26855c5dd3bfffdbf319d5ba4a38223a28de3e7c /src/library/TrashPage.c
parent0f67b3cc674377559e66c5a6729fd499049a992f (diff)
parentdd7f98a232efe86f6e6055119c9414a0f9d9e67b (diff)
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'src/library/TrashPage.c')
-rw-r--r--src/library/TrashPage.c253
1 files changed, 122 insertions, 131 deletions
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"
}