summaryrefslogtreecommitdiff
path: root/src/library/TrashPage.c
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2018-06-25 21:12:13 +0200
committerJörg Frings-Fürst <debian@jff-webhosting.net>2018-06-25 21:12:13 +0200
commit059a62ee3c820a42fbce980c3256049adecc9100 (patch)
treee51eab94fd7d65459640ca227fb2257bb41d2acb /src/library/TrashPage.c
parent55778740c211992cc86ea87588ab62c6750f36d1 (diff)
parente8f4d7a9cdd37c5a9fb3b6991a4e9173829808da (diff)
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'src/library/TrashPage.c')
-rw-r--r--src/library/TrashPage.c729
1 files changed, 414 insertions, 315 deletions
diff --git a/src/library/TrashPage.c b/src/library/TrashPage.c
index 1e3ffc8..9d1f7a9 100644
--- a/src/library/TrashPage.c
+++ b/src/library/TrashPage.c
@@ -1,4 +1,4 @@
-/* TrashPage.c generated by valac 0.36.6, the Vala compiler
+/* TrashPage.c generated by valac 0.40.4, the Vala compiler
* generated from TrashPage.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -7,6 +7,7 @@
* (version 2.1 or later). See the COPYING file in this distribution.
*/
+
#include <glib.h>
#include <glib-object.h>
#include <gtk/gtk.h>
@@ -199,6 +200,11 @@ typedef struct _TrashPageTrashSearchViewFilterClass TrashPageTrashSearchViewFilt
typedef struct _MediaViewTracker MediaViewTracker;
typedef struct _MediaViewTrackerClass MediaViewTrackerClass;
+enum {
+ TRASH_PAGE_0_PROPERTY,
+ TRASH_PAGE_NUM_PROPERTIES
+};
+static GParamSpec* trash_page_properties[TRASH_PAGE_NUM_PROPERTIES];
#define _view_filter_unref0(var) ((var == NULL) ? NULL : (var = (view_filter_unref (var), NULL)))
#define _core_tracker_unref0(var) ((var == NULL) ? NULL : (var = (core_tracker_unref (var), NULL)))
@@ -432,6 +438,11 @@ typedef struct _Dimensions Dimensions;
typedef struct _MediaSourceItemPrivate MediaSourceItemPrivate;
typedef struct _ThumbnailPrivate ThumbnailPrivate;
typedef struct _TrashPageTrashViewPrivate TrashPageTrashViewPrivate;
+enum {
+ TRASH_PAGE_TRASH_VIEW_0_PROPERTY,
+ TRASH_PAGE_TRASH_VIEW_NUM_PROPERTIES
+};
+static GParamSpec* trash_page_trash_view_properties[TRASH_PAGE_TRASH_VIEW_NUM_PROPERTIES];
typedef struct _ViewFilterPrivate ViewFilterPrivate;
typedef struct _SearchViewFilterPrivate SearchViewFilterPrivate;
typedef struct _DefaultSearchViewFilterPrivate DefaultSearchViewFilterPrivate;
@@ -723,9 +734,15 @@ GType page_window_get_type (void) G_GNUC_CONST;
GType fullscreen_window_get_type (void) G_GNUC_CONST;
gpointer injection_group_ref (gpointer instance);
void injection_group_unref (gpointer instance);
-GParamSpec* param_spec_injection_group (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_injection_group (GValue* value, gpointer v_object);
-void value_take_injection_group (GValue* value, gpointer v_object);
+GParamSpec* param_spec_injection_group (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags);
+void value_set_injection_group (GValue* value,
+ gpointer v_object);
+void value_take_injection_group (GValue* value,
+ gpointer v_object);
gpointer value_get_injection_group (const GValue* value);
GType injection_group_get_type (void) G_GNUC_CONST;
GType checkerboard_page_get_type (void) G_GNUC_CONST;
@@ -739,17 +756,29 @@ CheckerboardPageKeyboardModifiers* checkerboard_page_keyboard_modifiers_dup (con
void checkerboard_page_keyboard_modifiers_free (CheckerboardPageKeyboardModifiers* self);
gpointer view_filter_ref (gpointer instance);
void view_filter_unref (gpointer instance);
-GParamSpec* param_spec_view_filter (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_view_filter (GValue* value, gpointer v_object);
-void value_take_view_filter (GValue* value, gpointer v_object);
+GParamSpec* param_spec_view_filter (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags);
+void value_set_view_filter (GValue* value,
+ gpointer v_object);
+void value_take_view_filter (GValue* value,
+ gpointer v_object);
gpointer value_get_view_filter (const GValue* value);
GType view_filter_get_type (void) G_GNUC_CONST;
GType search_view_filter_get_type (void) G_GNUC_CONST;
gpointer core_tracker_ref (gpointer instance);
void core_tracker_unref (gpointer instance);
-GParamSpec* core_param_spec_tracker (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void core_value_set_tracker (GValue* value, gpointer v_object);
-void core_value_take_tracker (GValue* value, gpointer v_object);
+GParamSpec* core_param_spec_tracker (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags);
+void core_value_set_tracker (GValue* value,
+ gpointer v_object);
+void core_value_take_tracker (GValue* value,
+ gpointer v_object);
gpointer core_value_get_tracker (const GValue* value);
GType core_tracker_get_type (void) G_GNUC_CONST;
GType core_view_tracker_get_type (void) G_GNUC_CONST;
@@ -758,33 +787,45 @@ GType default_search_view_filter_get_type (void) G_GNUC_CONST;
static GType trash_page_trash_search_view_filter_get_type (void) G_GNUC_CONST G_GNUC_UNUSED;
GType media_view_tracker_get_type (void) G_GNUC_CONST;
#define TRASH_PAGE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_TRASH_PAGE, TrashPagePrivate))
-enum {
- TRASH_PAGE_DUMMY_PROPERTY
-};
static TrashPageTrashSearchViewFilter* trash_page_trash_search_view_filter_new (void);
static TrashPageTrashSearchViewFilter* trash_page_trash_search_view_filter_construct (GType object_type);
#define TRASH_PAGE_NAME _ ("Trash")
static void trash_page_on_delete (TrashPage* self);
-static void _trash_page_on_delete_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+static void _trash_page_on_delete_gsimple_action_activate_callback (GSimpleAction* action,
+ GVariant* parameter,
+ gpointer self);
static void trash_page_on_restore (TrashPage* self);
-static void _trash_page_on_restore_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+static void _trash_page_on_restore_gsimple_action_activate_callback (GSimpleAction* action,
+ GVariant* parameter,
+ gpointer self);
TrashPage* trash_page_new (void);
TrashPage* trash_page_construct (GType object_type);
-CheckerboardPage* checkerboard_page_construct (GType object_type, const gchar* page_name);
-void checkerboard_page_init_item_context_menu (CheckerboardPage* self, const gchar* path);
-void checkerboard_page_init_page_context_menu (CheckerboardPage* self, const gchar* path);
-void page_init_toolbar (Page* self, const gchar* path);
+CheckerboardPage* checkerboard_page_construct (GType object_type,
+ const gchar* page_name);
+void checkerboard_page_init_item_context_menu (CheckerboardPage* self,
+ const gchar* path);
+void checkerboard_page_init_page_context_menu (CheckerboardPage* self,
+ const gchar* path);
+void page_init_toolbar (Page* self,
+ const gchar* path);
gpointer data_collection_ref (gpointer instance);
void data_collection_unref (gpointer instance);
-GParamSpec* param_spec_data_collection (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_data_collection (GValue* value, gpointer v_object);
-void value_take_data_collection (GValue* value, gpointer v_object);
+GParamSpec* param_spec_data_collection (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags);
+void value_set_data_collection (GValue* value,
+ gpointer v_object);
+void value_take_data_collection (GValue* value,
+ gpointer v_object);
gpointer value_get_data_collection (const GValue* value);
GType data_collection_get_type (void) G_GNUC_CONST;
GType view_collection_get_type (void) G_GNUC_CONST;
ViewCollection* page_get_view (Page* self);
MediaViewTracker* media_view_tracker_new (ViewCollection* collection);
-MediaViewTracker* media_view_tracker_construct (GType object_type, ViewCollection* collection);
+MediaViewTracker* media_view_tracker_construct (GType object_type,
+ ViewCollection* collection);
GType source_collection_get_type (void) G_GNUC_CONST;
GType database_source_collection_get_type (void) G_GNUC_CONST;
GType media_source_collection_get_type (void) G_GNUC_CONST;
@@ -792,74 +833,113 @@ GType library_photo_source_collection_get_type (void) G_GNUC_CONST;
GType data_source_get_type (void) G_GNUC_CONST;
GType thumbnail_source_get_type (void) G_GNUC_CONST;
GType media_source_get_type (void) G_GNUC_CONST;
-static void trash_page_on_trashcan_contents_altered (TrashPage* self, GeeCollection* added, GeeCollection* removed);
-static void _trash_page_on_trashcan_contents_altered_media_source_collection_trashcan_contents_altered (MediaSourceCollection* _sender, GeeCollection* added, GeeCollection* removed, gpointer self);
+static void trash_page_on_trashcan_contents_altered (TrashPage* self,
+ GeeCollection* added,
+ GeeCollection* removed);
+static void _trash_page_on_trashcan_contents_altered_media_source_collection_trashcan_contents_altered (MediaSourceCollection* _sender,
+ GeeCollection* added,
+ GeeCollection* removed,
+ gpointer self);
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, 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 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,
+ 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);
-void page_set_common_action_important (Page* self, const gchar* name, gboolean important);
-void page_update_actions (Page* self, gint selected_count, gint count);
-gboolean data_collection_add (DataCollection* self, DataObject* object);
+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);
+void page_set_common_action_important (Page* self,
+ const gchar* name,
+ gboolean important);
+void page_update_actions (Page* self,
+ gint selected_count,
+ gint count);
+gboolean data_collection_add (DataCollection* self,
+ DataObject* object);
static TrashPageTrashView* trash_page_trash_view_new (MediaSource* source);
-static TrashPageTrashView* trash_page_trash_view_construct (GType object_type, MediaSource* source);
+static TrashPageTrashView* trash_page_trash_view_construct (GType object_type,
+ MediaSource* source);
GType media_source_item_get_type (void) G_GNUC_CONST;
GType thumbnail_get_type (void) G_GNUC_CONST;
static GType trash_page_trash_view_get_type (void) G_GNUC_CONST G_GNUC_UNUSED;
GType marker_get_type (void) G_GNUC_CONST;
Marker* data_collection_start_marking (DataCollection* self);
-void marker_mark (Marker* self, DataObject* object);
-DataView* view_collection_get_view_for_source (ViewCollection* self, DataSource* source);
-void data_collection_remove_marked (DataCollection* self, Marker* m);
+void marker_mark (Marker* self,
+ DataObject* object);
+DataView* view_collection_get_view_for_source (ViewCollection* self,
+ DataSource* source);
+void data_collection_remove_marked (DataCollection* self,
+ Marker* m);
gint view_collection_get_selected_count (ViewCollection* self);
gpointer command_manager_ref (gpointer instance);
void command_manager_unref (gpointer instance);
-GParamSpec* param_spec_command_manager (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_command_manager (GValue* value, gpointer v_object);
-void value_take_command_manager (GValue* value, gpointer v_object);
+GParamSpec* param_spec_command_manager (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags);
+void value_set_command_manager (GValue* value,
+ gpointer v_object);
+void value_take_command_manager (GValue* value,
+ gpointer v_object);
gpointer value_get_command_manager (const GValue* value);
GType command_manager_get_type (void) G_GNUC_CONST;
CommandManager* page_get_command_manager (Page* self);
GType command_get_type (void) G_GNUC_CONST;
-void command_manager_execute (CommandManager* self, Command* command);
+void command_manager_execute (CommandManager* self,
+ Command* command);
GeeList* view_collection_get_selected_sources (ViewCollection* self);
GType photo_source_get_type (void) G_GNUC_CONST;
GType photo_get_type (void) G_GNUC_CONST;
GType library_photo_get_type (void) G_GNUC_CONST;
-TrashUntrashPhotosCommand* trash_untrash_photos_command_new (GeeCollection* sources, gboolean to_trash);
-TrashUntrashPhotosCommand* trash_untrash_photos_command_construct (GType object_type, GeeCollection* sources, gboolean to_trash);
+TrashUntrashPhotosCommand* trash_untrash_photos_command_new (GeeCollection* sources,
+ gboolean to_trash);
+TrashUntrashPhotosCommand* trash_untrash_photos_command_construct (GType object_type,
+ GeeCollection* sources,
+ gboolean to_trash);
GType page_command_get_type (void) G_GNUC_CONST;
GType trash_untrash_photos_command_get_type (void) G_GNUC_CONST;
static gchar* trash_page_real_get_view_empty_message (CheckerboardPage* base);
-void remove_from_app (GeeCollection* sources, const gchar* dialog_title, const gchar* progress_dialog_text);
+void remove_from_app (GeeCollection* sources,
+ const gchar* dialog_title,
+ const gchar* progress_dialog_text);
static SearchViewFilter* trash_page_real_get_search_view_filter (CheckerboardPage* base);
gpointer alteration_ref (gpointer instance);
void alteration_unref (gpointer instance);
-GParamSpec* param_spec_alteration (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_alteration (GValue* value, gpointer v_object);
-void value_take_alteration (GValue* value, gpointer v_object);
+GParamSpec* param_spec_alteration (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags);
+void value_set_alteration (GValue* value,
+ gpointer v_object);
+void value_take_alteration (GValue* value,
+ gpointer v_object);
gpointer value_get_alteration (const GValue* value);
GType alteration_get_type (void) G_GNUC_CONST;
GType dimensions_get_type (void) G_GNUC_CONST;
Dimensions* dimensions_dup (const Dimensions* self);
void dimensions_free (Dimensions* self);
-enum {
- TRASH_PAGE_TRASH_VIEW_DUMMY_PROPERTY
-};
gint thumbnail_get_DEFAULT_SCALE (void);
-Thumbnail* thumbnail_new (MediaSource* media, gint scale);
-Thumbnail* thumbnail_construct (GType object_type, MediaSource* media, gint scale);
+Thumbnail* thumbnail_new (MediaSource* media,
+ gint scale);
+Thumbnail* thumbnail_construct (GType object_type,
+ MediaSource* media,
+ gint scale);
gboolean media_source_is_trashed (MediaSource* self);
-enum {
- TRASH_PAGE_TRASH_SEARCH_VIEW_FILTER_DUMMY_PROPERTY
-};
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);
@@ -867,28 +947,43 @@ 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}};
-static void _trash_page_on_delete_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+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 874 "TrashPage.c"
+#line 958 "TrashPage.c"
}
-static void _trash_page_on_restore_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+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 881 "TrashPage.c"
+#line 969 "TrashPage.c"
}
-static void _trash_page_on_trashcan_contents_altered_media_source_collection_trashcan_contents_altered (MediaSourceCollection* _sender, GeeCollection* added, GeeCollection* removed, gpointer self) {
+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 888 "TrashPage.c"
+#line 981 "TrashPage.c"
}
-TrashPage* trash_page_construct (GType object_type) {
+TrashPage*
+trash_page_construct (GType object_type)
+{
TrashPage * self = NULL;
ViewCollection* _tmp0_;
ViewCollection* _tmp1_;
@@ -951,69 +1046,65 @@ TrashPage* trash_page_construct (GType object_type) {
_g_object_unref0 (_tmp10_);
#line 28 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
return self;
-#line 955 "TrashPage.c"
+#line 1050 "TrashPage.c"
}
-TrashPage* trash_page_new (void) {
+TrashPage*
+trash_page_new (void)
+{
#line 28 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
return trash_page_construct (TYPE_TRASH_PAGE);
-#line 962 "TrashPage.c"
+#line 1059 "TrashPage.c"
}
-static void trash_page_real_init_collect_ui_filenames (Page* base, GeeList* ui_filenames) {
+static void
+trash_page_real_init_collect_ui_filenames (Page* base,
+ GeeList* ui_filenames)
+{
TrashPage * self;
- 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"
g_return_if_fail (GEE_IS_LIST (ui_filenames));
#line 45 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
- _tmp0_ = ui_filenames;
-#line 45 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
- PAGE_CLASS (trash_page_parent_class)->init_collect_ui_filenames (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page), _tmp0_);
-#line 47 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
- _tmp1_ = ui_filenames;
+ PAGE_CLASS (trash_page_parent_class)->init_collect_ui_filenames (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page), 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 982 "TrashPage.c"
+ gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (ui_filenames, GEE_TYPE_COLLECTION, GeeCollection), "trash.ui");
+#line 1076 "TrashPage.c"
}
-static void trash_page_real_add_actions (Page* base, GActionMap* map) {
+static void
+trash_page_real_add_actions (Page* base,
+ GActionMap* map)
+{
TrashPage * self;
- 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"
g_return_if_fail (G_IS_ACTION_MAP (map));
#line 56 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
- _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"
- _tmp1_ = map;
+ 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), map);
#line 58 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
- g_action_map_add_action_entries (_tmp1_, TRASH_PAGE_entries, G_N_ELEMENTS (TRASH_PAGE_entries), self);
-#line 1002 "TrashPage.c"
+ g_action_map_add_action_entries (map, TRASH_PAGE_entries, G_N_ELEMENTS (TRASH_PAGE_entries), self);
+#line 1093 "TrashPage.c"
}
-static void trash_page_real_remove_actions (Page* base, GActionMap* map) {
+static void
+trash_page_real_remove_actions (Page* base,
+ GActionMap* map)
+{
TrashPage * self;
- 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"
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 1017 "TrashPage.c"
+ 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), map);
+#line 1108 "TrashPage.c"
{
GActionEntry* entry_collection = NULL;
gint entry_collection_length1 = 0;
@@ -1025,38 +1116,39 @@ static void trash_page_real_remove_actions (Page* base, GActionMap* map) {
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 1029 "TrashPage.c"
+#line 1120 "TrashPage.c"
GActionEntry entry = {0};
#line 63 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
entry = entry_collection[entry_it];
-#line 1033 "TrashPage.c"
+#line 1124 "TrashPage.c"
{
- GActionMap* _tmp1_;
- GActionEntry _tmp2_;
- const gchar* _tmp3_;
+ GActionEntry _tmp0_;
+ const gchar* _tmp1_;
#line 64 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
- _tmp1_ = map;
+ _tmp0_ = entry;
#line 64 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
- _tmp2_ = entry;
+ _tmp1_ = _tmp0_.name;
#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 1046 "TrashPage.c"
+ g_action_map_remove_action (map, _tmp1_);
+#line 1134 "TrashPage.c"
}
}
}
}
-static gpointer _core_tracker_ref0 (gpointer self) {
+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 1056 "TrashPage.c"
+#line 1146 "TrashPage.c"
}
-static CoreViewTracker* trash_page_real_get_view_tracker (CheckerboardPage* base) {
+static CoreViewTracker*
+trash_page_real_get_view_tracker (CheckerboardPage* base)
+{
TrashPage * self;
CoreViewTracker* result = NULL;
MediaViewTracker* _tmp0_;
@@ -1071,22 +1163,21 @@ static CoreViewTracker* trash_page_real_get_view_tracker (CheckerboardPage* base
result = _tmp1_;
#line 69 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
return result;
-#line 1075 "TrashPage.c"
+#line 1167 "TrashPage.c"
}
-static void trash_page_real_update_actions (Page* base, gint selected_count, gint count) {
+static void
+trash_page_real_update_actions (Page* base,
+ gint selected_count,
+ gint count)
+{
TrashPage * self;
gboolean has_selected = FALSE;
- 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"
- _tmp0_ = selected_count;
-#line 73 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
- has_selected = _tmp0_ > 0;
+ has_selected = selected_count > 0;
#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 76 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
@@ -1094,18 +1185,16 @@ static void trash_page_real_update_actions (Page* base, gint selected_count, gin
#line 77 "/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 79 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
- _tmp1_ = selected_count;
-#line 79 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
- _tmp2_ = count;
-#line 79 "/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 1103 "TrashPage.c"
+ 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), selected_count, count);
+#line 1190 "TrashPage.c"
}
-static void trash_page_on_trashcan_contents_altered (TrashPage* self, GeeCollection* added, GeeCollection* removed) {
- GeeCollection* _tmp0_;
- GeeCollection* _tmp12_;
+static void
+trash_page_on_trashcan_contents_altered (TrashPage* self,
+ GeeCollection* added,
+ GeeCollection* removed)
+{
#line 82 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
g_return_if_fail (IS_TRASH_PAGE (self));
#line 82 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
@@ -1113,196 +1202,181 @@ static void trash_page_on_trashcan_contents_altered (TrashPage* self, GeeCollect
#line 82 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
g_return_if_fail ((removed == NULL) || GEE_IS_COLLECTION (removed));
#line 84 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
- _tmp0_ = added;
-#line 84 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
- if (_tmp0_ != NULL) {
-#line 1120 "TrashPage.c"
+ if (added != NULL) {
+#line 1207 "TrashPage.c"
{
GeeIterator* _source_it = NULL;
- GeeCollection* _tmp1_;
- GeeIterator* _tmp2_;
-#line 85 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
- _tmp1_ = added;
+ GeeIterator* _tmp0_;
#line 85 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
- _tmp2_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ITERABLE, GeeIterable));
+ _tmp0_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (added, GEE_TYPE_ITERABLE, GeeIterable));
#line 85 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
- _source_it = _tmp2_;
+ _source_it = _tmp0_;
#line 85 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
while (TRUE) {
-#line 1133 "TrashPage.c"
- GeeIterator* _tmp3_;
- gboolean _tmp4_;
+#line 1217 "TrashPage.c"
+ GeeIterator* _tmp1_;
MediaSource* source = NULL;
- GeeIterator* _tmp5_;
- gpointer _tmp6_;
- ViewCollection* _tmp7_;
- ViewCollection* _tmp8_;
- MediaSource* _tmp9_;
- TrashPageTrashView* _tmp10_;
- TrashPageTrashView* _tmp11_;
+ GeeIterator* _tmp2_;
+ gpointer _tmp3_;
+ ViewCollection* _tmp4_;
+ ViewCollection* _tmp5_;
+ MediaSource* _tmp6_;
+ TrashPageTrashView* _tmp7_;
+ TrashPageTrashView* _tmp8_;
#line 85 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
- _tmp3_ = _source_it;
+ _tmp1_ = _source_it;
#line 85 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
- _tmp4_ = gee_iterator_next (_tmp3_);
-#line 85 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
- if (!_tmp4_) {
+ if (!gee_iterator_next (_tmp1_)) {
#line 85 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
break;
-#line 1152 "TrashPage.c"
+#line 1233 "TrashPage.c"
}
#line 85 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
- _tmp5_ = _source_it;
+ _tmp2_ = _source_it;
#line 85 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
- _tmp6_ = gee_iterator_get (_tmp5_);
+ _tmp3_ = gee_iterator_get (_tmp2_);
#line 85 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
- source = (MediaSource*) _tmp6_;
+ source = (MediaSource*) _tmp3_;
#line 86 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
- _tmp7_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+ _tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
#line 86 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
- _tmp8_ = _tmp7_;
+ _tmp5_ = _tmp4_;
#line 86 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
- _tmp9_ = source;
+ _tmp6_ = source;
#line 86 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
- _tmp10_ = trash_page_trash_view_new (_tmp9_);
+ _tmp7_ = trash_page_trash_view_new (_tmp6_);
#line 86 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
- _tmp11_ = _tmp10_;
+ _tmp8_ = _tmp7_;
#line 86 "/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));
+ data_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_OBJECT, DataObject));
#line 86 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
- _g_object_unref0 (_tmp11_);
+ _g_object_unref0 (_tmp8_);
#line 86 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
- _data_collection_unref0 (_tmp8_);
+ _data_collection_unref0 (_tmp5_);
#line 85 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
_g_object_unref0 (source);
-#line 1178 "TrashPage.c"
+#line 1259 "TrashPage.c"
}
#line 85 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
_g_object_unref0 (_source_it);
-#line 1182 "TrashPage.c"
+#line 1263 "TrashPage.c"
}
}
#line 89 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
- _tmp12_ = removed;
-#line 89 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
- if (_tmp12_ != NULL) {
-#line 1189 "TrashPage.c"
+ if (removed != NULL) {
+#line 1268 "TrashPage.c"
Marker* marker = NULL;
- ViewCollection* _tmp13_;
- ViewCollection* _tmp14_;
- Marker* _tmp15_;
- Marker* _tmp16_;
- ViewCollection* _tmp29_;
- ViewCollection* _tmp30_;
- Marker* _tmp31_;
+ ViewCollection* _tmp9_;
+ ViewCollection* _tmp10_;
+ Marker* _tmp11_;
+ Marker* _tmp12_;
+ ViewCollection* _tmp23_;
+ ViewCollection* _tmp24_;
+ Marker* _tmp25_;
#line 90 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
- _tmp13_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+ _tmp9_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
#line 90 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
- _tmp14_ = _tmp13_;
+ _tmp10_ = _tmp9_;
#line 90 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
- _tmp15_ = data_collection_start_marking (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_DATA_COLLECTION, DataCollection));
+ _tmp11_ = data_collection_start_marking (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_DATA_COLLECTION, DataCollection));
#line 90 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
- _tmp16_ = _tmp15_;
+ _tmp12_ = _tmp11_;
#line 90 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
- _data_collection_unref0 (_tmp14_);
+ _data_collection_unref0 (_tmp10_);
#line 90 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
- marker = _tmp16_;
-#line 1210 "TrashPage.c"
+ marker = _tmp12_;
+#line 1289 "TrashPage.c"
{
GeeIterator* _source_it = NULL;
- GeeCollection* _tmp17_;
- GeeIterator* _tmp18_;
+ GeeIterator* _tmp13_;
#line 91 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
- _tmp17_ = removed;
+ _tmp13_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (removed, GEE_TYPE_ITERABLE, GeeIterable));
#line 91 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
- _tmp18_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 91 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
- _source_it = _tmp18_;
+ _source_it = _tmp13_;
#line 91 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
while (TRUE) {
-#line 1223 "TrashPage.c"
- GeeIterator* _tmp19_;
- gboolean _tmp20_;
+#line 1299 "TrashPage.c"
+ GeeIterator* _tmp14_;
MediaSource* source = 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/TrashPage.vala"
- _tmp19_ = _source_it;
+ GeeIterator* _tmp15_;
+ gpointer _tmp16_;
+ Marker* _tmp17_;
+ ViewCollection* _tmp18_;
+ ViewCollection* _tmp19_;
+ MediaSource* _tmp20_;
+ DataView* _tmp21_;
+ DataView* _tmp22_;
#line 91 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
- _tmp20_ = gee_iterator_next (_tmp19_);
+ _tmp14_ = _source_it;
#line 91 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
- if (!_tmp20_) {
+ if (!gee_iterator_next (_tmp14_)) {
#line 91 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
break;
-#line 1243 "TrashPage.c"
+#line 1316 "TrashPage.c"
}
#line 91 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
- _tmp21_ = _source_it;
+ _tmp15_ = _source_it;
#line 91 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
- _tmp22_ = gee_iterator_get (_tmp21_);
+ _tmp16_ = gee_iterator_get (_tmp15_);
#line 91 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
- source = (MediaSource*) _tmp22_;
+ source = (MediaSource*) _tmp16_;
#line 92 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
- _tmp23_ = marker;
+ _tmp17_ = marker;
#line 92 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
- _tmp24_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+ _tmp18_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
#line 92 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
- _tmp25_ = _tmp24_;
+ _tmp19_ = _tmp18_;
#line 92 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
- _tmp26_ = source;
+ _tmp20_ = source;
#line 92 "/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));
+ _tmp21_ = view_collection_get_view_for_source (_tmp19_, G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, TYPE_DATA_SOURCE, DataSource));
#line 92 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
- _tmp28_ = _tmp27_;
+ _tmp22_ = _tmp21_;
#line 92 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
- marker_mark (_tmp23_, G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, TYPE_DATA_OBJECT, DataObject));
+ marker_mark (_tmp17_, G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, TYPE_DATA_OBJECT, DataObject));
#line 92 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
- _g_object_unref0 (_tmp28_);
+ _g_object_unref0 (_tmp22_);
#line 92 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
- _data_collection_unref0 (_tmp25_);
+ _data_collection_unref0 (_tmp19_);
#line 91 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
_g_object_unref0 (source);
-#line 1271 "TrashPage.c"
+#line 1344 "TrashPage.c"
}
#line 91 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
_g_object_unref0 (_source_it);
-#line 1275 "TrashPage.c"
+#line 1348 "TrashPage.c"
}
#line 93 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
- _tmp29_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+ _tmp23_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
#line 93 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
- _tmp30_ = _tmp29_;
+ _tmp24_ = _tmp23_;
#line 93 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
- _tmp31_ = marker;
+ _tmp25_ = marker;
#line 93 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
- data_collection_remove_marked (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, TYPE_DATA_COLLECTION, DataCollection), _tmp31_);
+ data_collection_remove_marked (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, TYPE_DATA_COLLECTION, DataCollection), _tmp25_);
#line 93 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
- _data_collection_unref0 (_tmp30_);
+ _data_collection_unref0 (_tmp24_);
#line 89 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
_g_object_unref0 (marker);
-#line 1289 "TrashPage.c"
+#line 1362 "TrashPage.c"
}
}
-static void trash_page_on_restore (TrashPage* self) {
+static void
+trash_page_on_restore (TrashPage* self)
+{
ViewCollection* _tmp0_;
ViewCollection* _tmp1_;
- gint _tmp2_;
- gboolean _tmp3_;
+ gboolean _tmp2_;
+ CommandManager* _tmp3_;
CommandManager* _tmp4_;
- CommandManager* _tmp5_;
+ ViewCollection* _tmp5_;
ViewCollection* _tmp6_;
- ViewCollection* _tmp7_;
- GeeList* _tmp8_;
- GeeCollection* _tmp9_;
+ GeeList* _tmp7_;
+ GeeCollection* _tmp8_;
+ TrashUntrashPhotosCommand* _tmp9_;
TrashUntrashPhotosCommand* _tmp10_;
- TrashUntrashPhotosCommand* _tmp11_;
#line 97 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
g_return_if_fail (IS_TRASH_PAGE (self));
#line 98 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
@@ -1310,48 +1384,48 @@ static void trash_page_on_restore (TrashPage* self) {
#line 98 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
_tmp1_ = _tmp0_;
#line 98 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
- _tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 98 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
- _tmp3_ = _tmp2_ == 0;
+ _tmp2_ = view_collection_get_selected_count (_tmp1_) == 0;
#line 98 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
_data_collection_unref0 (_tmp1_);
#line 98 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
- if (_tmp3_) {
+ if (_tmp2_) {
#line 99 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
return;
-#line 1323 "TrashPage.c"
+#line 1395 "TrashPage.c"
}
#line 101 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
- _tmp4_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+ _tmp3_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
#line 101 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
- _tmp5_ = _tmp4_;
+ _tmp4_ = _tmp3_;
#line 101 "/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 101 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
- _tmp7_ = _tmp6_;
+ _tmp6_ = _tmp5_;
#line 101 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
- _tmp8_ = view_collection_get_selected_sources (_tmp7_);
+ _tmp7_ = view_collection_get_selected_sources (_tmp6_);
#line 101 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
- _tmp9_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_COLLECTION, GeeCollection);
+ _tmp8_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_COLLECTION, GeeCollection);
#line 101 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
- _tmp10_ = trash_untrash_photos_command_new (_tmp9_, FALSE);
+ _tmp9_ = trash_untrash_photos_command_new (_tmp8_, FALSE);
#line 101 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
- _tmp11_ = _tmp10_;
+ _tmp10_ = _tmp9_;
#line 101 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
- command_manager_execute (_tmp5_, G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_COMMAND, Command));
+ command_manager_execute (_tmp4_, G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_COMMAND, Command));
#line 101 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
- _g_object_unref0 (_tmp11_);
+ _g_object_unref0 (_tmp10_);
#line 101 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
- _g_object_unref0 (_tmp9_);
+ _g_object_unref0 (_tmp8_);
#line 101 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
- _data_collection_unref0 (_tmp7_);
+ _data_collection_unref0 (_tmp6_);
#line 101 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
- _command_manager_unref0 (_tmp5_);
-#line 1351 "TrashPage.c"
+ _command_manager_unref0 (_tmp4_);
+#line 1423 "TrashPage.c"
}
-static gchar* trash_page_real_get_view_empty_message (CheckerboardPage* base) {
+static gchar*
+trash_page_real_get_view_empty_message (CheckerboardPage* base)
+{
TrashPage * self;
gchar* result = NULL;
gchar* _tmp0_;
@@ -1363,20 +1437,21 @@ static gchar* trash_page_real_get_view_empty_message (CheckerboardPage* base) {
result = _tmp0_;
#line 106 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
return result;
-#line 1367 "TrashPage.c"
+#line 1441 "TrashPage.c"
}
-static void trash_page_on_delete (TrashPage* self) {
+static void
+trash_page_on_delete (TrashPage* self)
+{
const gchar* _tmp0_ = NULL;
ViewCollection* _tmp1_;
ViewCollection* _tmp2_;
- gint _tmp3_;
- gboolean _tmp4_;
+ gboolean _tmp3_;
+ ViewCollection* _tmp4_;
ViewCollection* _tmp5_;
- ViewCollection* _tmp6_;
- GeeList* _tmp7_;
- GeeCollection* _tmp8_;
+ GeeList* _tmp6_;
+ GeeCollection* _tmp7_;
#line 109 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
g_return_if_fail (IS_TRASH_PAGE (self));
#line 111 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
@@ -1384,47 +1459,49 @@ static void trash_page_on_delete (TrashPage* self) {
#line 111 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
_tmp2_ = _tmp1_;
#line 111 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
- _tmp3_ = view_collection_get_selected_count (_tmp2_);
-#line 111 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
- _tmp4_ = _tmp3_ == 1;
+ _tmp3_ = view_collection_get_selected_count (_tmp2_) == 1;
#line 111 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
_data_collection_unref0 (_tmp2_);
#line 111 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
- if (_tmp4_) {
+ if (_tmp3_) {
#line 111 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
_tmp0_ = "Deleting a Photo";
-#line 1397 "TrashPage.c"
+#line 1470 "TrashPage.c"
} else {
#line 111 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
_tmp0_ = _ ("Deleting Photos");
-#line 1401 "TrashPage.c"
+#line 1474 "TrashPage.c"
}
#line 110 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
- _tmp5_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+ _tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
#line 110 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
- _tmp6_ = _tmp5_;
+ _tmp5_ = _tmp4_;
#line 110 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
- _tmp7_ = view_collection_get_selected_sources (_tmp6_);
+ _tmp6_ = view_collection_get_selected_sources (_tmp5_);
#line 110 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
- _tmp8_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_COLLECTION, GeeCollection);
+ _tmp7_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_COLLECTION, GeeCollection);
#line 110 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
- remove_from_app (_tmp8_, _ ("Delete"), _tmp0_);
+ remove_from_app (_tmp7_, _ ("Delete"), _tmp0_);
#line 110 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
- _g_object_unref0 (_tmp8_);
+ _g_object_unref0 (_tmp7_);
#line 110 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
- _data_collection_unref0 (_tmp6_);
-#line 1417 "TrashPage.c"
+ _data_collection_unref0 (_tmp5_);
+#line 1490 "TrashPage.c"
}
-static gpointer _view_filter_ref0 (gpointer self) {
+static gpointer
+_view_filter_ref0 (gpointer self)
+{
#line 115 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
return self ? view_filter_ref (self) : NULL;
-#line 1424 "TrashPage.c"
+#line 1499 "TrashPage.c"
}
-static SearchViewFilter* trash_page_real_get_search_view_filter (CheckerboardPage* base) {
+static SearchViewFilter*
+trash_page_real_get_search_view_filter (CheckerboardPage* base)
+{
TrashPage * self;
SearchViewFilter* result = NULL;
TrashPageTrashSearchViewFilter* _tmp0_;
@@ -1439,58 +1516,60 @@ static SearchViewFilter* trash_page_real_get_search_view_filter (CheckerboardPag
result = _tmp1_;
#line 115 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
return result;
-#line 1443 "TrashPage.c"
+#line 1520 "TrashPage.c"
}
-static TrashPageTrashView* trash_page_trash_view_construct (GType object_type, MediaSource* source) {
+static TrashPageTrashView*
+trash_page_trash_view_construct (GType object_type,
+ MediaSource* source)
+{
TrashPageTrashView * self = NULL;
- MediaSource* _tmp0_;
+ gint _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"
- _tmp0_ = source;
-#line 12 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
- _tmp1_ = thumbnail_get_DEFAULT_SCALE ();
+ _tmp0_ = thumbnail_get_DEFAULT_SCALE ();
#line 12 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
- _tmp2_ = _tmp1_;
+ _tmp1_ = _tmp0_;
#line 12 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
- self = (TrashPageTrashView*) thumbnail_construct (object_type, _tmp0_, _tmp2_);
+ self = (TrashPageTrashView*) thumbnail_construct (object_type, source, _tmp1_);
#line 14 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
- _tmp3_ = source;
-#line 14 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
- _tmp4_ = media_source_is_trashed (_tmp3_);
-#line 14 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
- _vala_assert (_tmp4_, "source.is_trashed()");
+ _vala_assert (media_source_is_trashed (source), "source.is_trashed()");
#line 11 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
return self;
-#line 1472 "TrashPage.c"
+#line 1543 "TrashPage.c"
}
-static TrashPageTrashView* trash_page_trash_view_new (MediaSource* source) {
+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 1479 "TrashPage.c"
+#line 1552 "TrashPage.c"
}
-static void trash_page_trash_view_class_init (TrashPageTrashViewClass * klass) {
+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 1486 "TrashPage.c"
+#line 1561 "TrashPage.c"
}
-static void trash_page_trash_view_instance_init (TrashPageTrashView * self) {
+static void
+trash_page_trash_view_instance_init (TrashPageTrashView * self)
+{
}
-static GType trash_page_trash_view_get_type (void) {
+static GType
+trash_page_trash_view_get_type (void)
+{
static volatile gsize trash_page_trash_view_type_id__volatile = 0;
if (g_once_init_enter (&trash_page_trash_view_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (TrashPageTrashViewClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) trash_page_trash_view_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (TrashPageTrashView), 0, (GInstanceInitFunc) trash_page_trash_view_instance_init, NULL };
@@ -1502,7 +1581,9 @@ static GType trash_page_trash_view_get_type (void) {
}
-static guint trash_page_trash_search_view_filter_real_get_criteria (SearchViewFilter* base) {
+static guint
+trash_page_trash_search_view_filter_real_get_criteria (SearchViewFilter* base)
+{
TrashPageTrashSearchViewFilter * self;
guint result = 0U;
#line 19 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
@@ -1511,41 +1592,51 @@ 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 1515 "TrashPage.c"
+#line 1596 "TrashPage.c"
}
-static TrashPageTrashSearchViewFilter* trash_page_trash_search_view_filter_construct (GType object_type) {
+static TrashPageTrashSearchViewFilter*
+trash_page_trash_search_view_filter_construct (GType object_type)
+{
TrashPageTrashSearchViewFilter* self = NULL;
#line 18 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
self = (TrashPageTrashSearchViewFilter*) default_search_view_filter_construct (object_type);
#line 18 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
return self;
-#line 1525 "TrashPage.c"
+#line 1608 "TrashPage.c"
}
-static TrashPageTrashSearchViewFilter* trash_page_trash_search_view_filter_new (void) {
+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 1532 "TrashPage.c"
+#line 1617 "TrashPage.c"
}
-static void trash_page_trash_search_view_filter_class_init (TrashPageTrashSearchViewFilterClass * klass) {
+static void
+trash_page_trash_search_view_filter_class_init (TrashPageTrashSearchViewFilterClass * klass)
+{
#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 1541 "TrashPage.c"
+#line 1628 "TrashPage.c"
}
-static void trash_page_trash_search_view_filter_instance_init (TrashPageTrashSearchViewFilter * self) {
+static void
+trash_page_trash_search_view_filter_instance_init (TrashPageTrashSearchViewFilter * self)
+{
}
-static GType trash_page_trash_search_view_filter_get_type (void) {
+static GType
+trash_page_trash_search_view_filter_get_type (void)
+{
static volatile gsize trash_page_trash_search_view_filter_type_id__volatile = 0;
if (g_once_init_enter (&trash_page_trash_search_view_filter_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (TrashPageTrashSearchViewFilterClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) trash_page_trash_search_view_filter_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (TrashPageTrashSearchViewFilter), 0, (GInstanceInitFunc) trash_page_trash_search_view_filter_instance_init, NULL };
@@ -1557,7 +1648,9 @@ static GType trash_page_trash_search_view_filter_get_type (void) {
}
-static void trash_page_class_init (TrashPageClass * klass) {
+static void
+trash_page_class_init (TrashPageClass * klass)
+{
#line 7 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
trash_page_parent_class = g_type_class_peek_parent (klass);
#line 7 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
@@ -1578,11 +1671,13 @@ static void trash_page_class_init (TrashPageClass * klass) {
((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 1582 "TrashPage.c"
+#line 1675 "TrashPage.c"
}
-static void trash_page_instance_init (TrashPage * self) {
+static void
+trash_page_instance_init (TrashPage * self)
+{
TrashPageTrashSearchViewFilter* _tmp0_;
#line 7 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
self->priv = TRASH_PAGE_GET_PRIVATE (self);
@@ -1590,11 +1685,13 @@ 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 1594 "TrashPage.c"
+#line 1689 "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);
@@ -1604,11 +1701,13 @@ 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 1608 "TrashPage.c"
+#line 1705 "TrashPage.c"
}
-GType trash_page_get_type (void) {
+GType
+trash_page_get_type (void)
+{
static volatile gsize trash_page_type_id__volatile = 0;
if (g_once_init_enter (&trash_page_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (TrashPageClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) trash_page_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (TrashPage), 0, (GInstanceInitFunc) trash_page_instance_init, NULL };