summaryrefslogtreecommitdiff
path: root/src/core/ViewCollection.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/core/ViewCollection.c
parent55778740c211992cc86ea87588ab62c6750f36d1 (diff)
parente8f4d7a9cdd37c5a9fb3b6991a4e9173829808da (diff)
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'src/core/ViewCollection.c')
-rw-r--r--src/core/ViewCollection.c7441
1 files changed, 3702 insertions, 3739 deletions
diff --git a/src/core/ViewCollection.c b/src/core/ViewCollection.c
index f1dc3ad..20c7fd1 100644
--- a/src/core/ViewCollection.c
+++ b/src/core/ViewCollection.c
@@ -1,4 +1,4 @@
-/* ViewCollection.c generated by valac 0.36.6, the Vala compiler
+/* ViewCollection.c generated by valac 0.40.4, the Vala compiler
* generated from ViewCollection.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -21,6 +21,7 @@
/* The default implementation provides a browser which orders the view in the order they're*/
/* stored in DataCollection, which is not specified.*/
+
#include <glib.h>
#include <glib-object.h>
#include <stdlib.h>
@@ -203,6 +204,11 @@ typedef struct _ViewCollectionToggleListsPrivate ViewCollectionToggleListsPrivat
typedef struct _ViewCollectionParamSpecMonitor ViewCollectionParamSpecMonitor;
#define _view_manager_unref0(var) ((var == NULL) ? NULL : (var = (view_manager_unref (var), NULL)))
enum {
+ VIEW_COLLECTION_TOGGLE_LISTS_0_PROPERTY,
+ VIEW_COLLECTION_TOGGLE_LISTS_NUM_PROPERTIES
+};
+static GParamSpec* view_collection_toggle_lists_properties[VIEW_COLLECTION_TOGGLE_LISTS_NUM_PROPERTIES];
+enum {
VIEW_COLLECTION_ITEMS_SELECTED_SIGNAL,
VIEW_COLLECTION_ITEMS_UNSELECTED_SIGNAL,
VIEW_COLLECTION_ITEMS_STATE_CHANGED_SIGNAL,
@@ -216,18 +222,18 @@ enum {
VIEW_COLLECTION_GEOMETRIES_ALTERED_SIGNAL,
VIEW_COLLECTION_VIEW_FILTER_INSTALLED_SIGNAL,
VIEW_COLLECTION_VIEW_FILTER_REMOVED_SIGNAL,
- VIEW_COLLECTION_LAST_SIGNAL
+ VIEW_COLLECTION_NUM_SIGNALS
};
-static guint view_collection_signals[VIEW_COLLECTION_LAST_SIGNAL] = {0};
+static guint view_collection_signals[VIEW_COLLECTION_NUM_SIGNALS] = {0};
typedef struct _ViewManagerPrivate ViewManagerPrivate;
typedef struct _ParamSpecViewManager ParamSpecViewManager;
typedef struct _ViewFilterPrivate ViewFilterPrivate;
typedef struct _ParamSpecViewFilter ParamSpecViewFilter;
enum {
VIEW_FILTER_REFRESH_SIGNAL,
- VIEW_FILTER_LAST_SIGNAL
+ VIEW_FILTER_NUM_SIGNALS
};
-static guint view_filter_signals[VIEW_FILTER_LAST_SIGNAL] = {0};
+static guint view_filter_signals[VIEW_FILTER_NUM_SIGNALS] = {0};
#define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg);
#define _vala_return_if_fail(expr, msg) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return; }
#define _vala_return_val_if_fail(expr, msg, val) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return val; }
@@ -440,17 +446,29 @@ static gpointer view_filter_parent_class = NULL;
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 data_object_get_type (void) G_GNUC_CONST;
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 marker_get_type (void) G_GNUC_CONST;
@@ -458,60 +476,99 @@ GType view_collection_get_type (void) G_GNUC_CONST;
GType data_view_get_type (void) G_GNUC_CONST;
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 source_collection_get_type (void) G_GNUC_CONST;
gpointer view_collection_monitor_ref (gpointer instance);
void view_collection_monitor_unref (gpointer instance);
-GParamSpec* view_collection_param_spec_monitor (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void view_collection_value_set_monitor (GValue* value, gpointer v_object);
-void view_collection_value_take_monitor (GValue* value, gpointer v_object);
+GParamSpec* view_collection_param_spec_monitor (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags);
+void view_collection_value_set_monitor (GValue* value,
+ gpointer v_object);
+void view_collection_value_take_monitor (GValue* value,
+ gpointer v_object);
gpointer view_collection_value_get_monitor (const GValue* value);
GType view_collection_monitor_get_type (void) G_GNUC_CONST;
static GType view_collection_monitor_impl_get_type (void) G_GNUC_CONST G_GNUC_UNUSED;
GType data_source_get_type (void) G_GNUC_CONST;
gpointer data_set_ref (gpointer instance);
void data_set_unref (gpointer instance);
-GParamSpec* param_spec_data_set (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_data_set (GValue* value, gpointer v_object);
-void value_take_data_set (GValue* value, gpointer v_object);
+GParamSpec* param_spec_data_set (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags);
+void value_set_data_set (GValue* value,
+ gpointer v_object);
+void value_take_data_set (GValue* value,
+ gpointer v_object);
gpointer value_get_data_set (const GValue* value);
GType data_set_get_type (void) G_GNUC_CONST;
#define VIEW_COLLECTION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_VIEW_COLLECTION, ViewCollectionPrivate))
-enum {
- VIEW_COLLECTION_DUMMY_PROPERTY
-};
DataSet* data_set_new (void);
DataSet* data_set_construct (GType object_type);
ViewCollection* view_collection_new (const gchar* name);
-ViewCollection* view_collection_construct (GType object_type, const gchar* name);
+ViewCollection* view_collection_construct (GType object_type,
+ const gchar* name);
DataCollection* data_collection_new (const gchar* name);
-DataCollection* data_collection_construct (GType object_type, const gchar* name);
-void view_collection_notify_items_selected_unselected (ViewCollection* self, GeeCollection* selected, GeeCollection* unselected);
-static void view_collection_real_notify_items_selected_unselected (ViewCollection* self, GeeCollection* selected, GeeCollection* unselected);
+DataCollection* data_collection_construct (GType object_type,
+ const gchar* name);
+void view_collection_notify_items_selected_unselected (ViewCollection* self,
+ GeeCollection* selected,
+ GeeCollection* unselected);
+static void view_collection_real_notify_items_selected_unselected (ViewCollection* self,
+ GeeCollection* selected,
+ GeeCollection* unselected);
void view_collection_notify_selection_group_altered (ViewCollection* self);
static void view_collection_real_notify_selection_group_altered (ViewCollection* self);
-void view_collection_notify_item_view_altered (ViewCollection* self, DataView* view);
-static void view_collection_real_notify_item_view_altered (ViewCollection* self, DataView* view);
-void view_collection_notify_views_altered (ViewCollection* self, GeeCollection* views);
-static void view_collection_real_notify_views_altered (ViewCollection* self, GeeCollection* views);
-void view_collection_notify_item_geometry_altered (ViewCollection* self, DataView* view);
-static void view_collection_real_notify_item_geometry_altered (ViewCollection* self, DataView* view);
-void view_collection_notify_geometries_altered (ViewCollection* self, GeeCollection* views);
-static void view_collection_real_notify_geometries_altered (ViewCollection* self, GeeCollection* views);
-void view_collection_notify_items_shown (ViewCollection* self, GeeCollection* shown);
-static void view_collection_real_notify_items_shown (ViewCollection* self, GeeCollection* shown);
-void view_collection_notify_items_hidden (ViewCollection* self, GeeCollection* hidden);
-static void view_collection_real_notify_items_hidden (ViewCollection* self, GeeCollection* hidden);
-void view_collection_notify_items_visibility_changed (ViewCollection* self, GeeCollection* changed);
-static void view_collection_real_notify_items_visibility_changed (ViewCollection* self, GeeCollection* changed);
-void view_collection_notify_view_filter_installed (ViewCollection* self, ViewFilter* filter);
-static void view_collection_real_notify_view_filter_installed (ViewCollection* self, ViewFilter* filter);
-void view_collection_notify_view_filter_removed (ViewCollection* self, ViewFilter* filter);
-static void view_collection_real_notify_view_filter_removed (ViewCollection* self, ViewFilter* filter);
+void view_collection_notify_item_view_altered (ViewCollection* self,
+ DataView* view);
+static void view_collection_real_notify_item_view_altered (ViewCollection* self,
+ DataView* view);
+void view_collection_notify_views_altered (ViewCollection* self,
+ GeeCollection* views);
+static void view_collection_real_notify_views_altered (ViewCollection* self,
+ GeeCollection* views);
+void view_collection_notify_item_geometry_altered (ViewCollection* self,
+ DataView* view);
+static void view_collection_real_notify_item_geometry_altered (ViewCollection* self,
+ DataView* view);
+void view_collection_notify_geometries_altered (ViewCollection* self,
+ GeeCollection* views);
+static void view_collection_real_notify_geometries_altered (ViewCollection* self,
+ GeeCollection* views);
+void view_collection_notify_items_shown (ViewCollection* self,
+ GeeCollection* shown);
+static void view_collection_real_notify_items_shown (ViewCollection* self,
+ GeeCollection* shown);
+void view_collection_notify_items_hidden (ViewCollection* self,
+ GeeCollection* hidden);
+static void view_collection_real_notify_items_hidden (ViewCollection* self,
+ GeeCollection* hidden);
+void view_collection_notify_items_visibility_changed (ViewCollection* self,
+ GeeCollection* changed);
+static void view_collection_real_notify_items_visibility_changed (ViewCollection* self,
+ GeeCollection* changed);
+void view_collection_notify_view_filter_installed (ViewCollection* self,
+ ViewFilter* filter);
+static void view_collection_real_notify_view_filter_installed (ViewCollection* self,
+ ViewFilter* filter);
+void view_collection_notify_view_filter_removed (ViewCollection* self,
+ ViewFilter* filter);
+static void view_collection_real_notify_view_filter_removed (ViewCollection* self,
+ ViewFilter* filter);
static void view_collection_real_clear (DataCollection* base);
gchar* data_collection_to_string (DataCollection* self);
void data_collection_clear (DataCollection* self);
@@ -519,79 +576,179 @@ static void view_collection_real_close (DataCollection* base);
void view_collection_halt_all_monitoring (ViewCollection* self);
void view_collection_halt_mirroring (ViewCollection* self);
static void view_collection_on_view_filter_refresh (ViewCollection* self);
-static void _view_collection_on_view_filter_refresh_view_filter_refresh (ViewFilter* _sender, gpointer self);
+static void _view_collection_on_view_filter_refresh_view_filter_refresh (ViewFilter* _sender,
+ gpointer self);
void data_collection_close (DataCollection* self);
gpointer view_manager_ref (gpointer instance);
void view_manager_unref (gpointer instance);
-GParamSpec* param_spec_view_manager (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_view_manager (GValue* value, gpointer v_object);
-void value_take_view_manager (GValue* value, gpointer v_object);
+GParamSpec* param_spec_view_manager (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags);
+void value_set_view_manager (GValue* value,
+ gpointer v_object);
+void value_take_view_manager (GValue* value,
+ gpointer v_object);
gpointer value_get_view_manager (const GValue* value);
GType view_manager_get_type (void) G_GNUC_CONST;
-ViewCollectionMonitor* view_collection_monitor_source_collection (ViewCollection* self, SourceCollection* sources, ViewManager* manager, Alteration* prereq, GeeCollection* initial, ProgressMonitor progress_monitor, void* progress_monitor_target);
+ViewCollectionMonitor* view_collection_monitor_source_collection (ViewCollection* self,
+ SourceCollection* sources,
+ ViewManager* manager,
+ Alteration* prereq,
+ GeeCollection* initial,
+ ProgressMonitor progress_monitor,
+ void* progress_monitor_target);
void data_collection_freeze_notifications (DataCollection* self);
-static ViewCollectionMonitorImpl* view_collection_monitor_impl_new (ViewCollection* owner, SourceCollection* sources, ViewManager* manager, Alteration* prereq);
-static ViewCollectionMonitorImpl* view_collection_monitor_impl_construct (GType object_type, ViewCollection* owner, SourceCollection* sources, ViewManager* manager, Alteration* prereq);
-DataView* view_manager_create_view (ViewManager* self, DataSource* source);
-GeeCollection* data_collection_add_many (DataCollection* self, GeeCollection* objects, ProgressMonitor monitor, void* monitor_target);
-static void view_collection_add_sources (ViewCollection* self, SourceCollection* sources, GeeIterable* added, ProgressMonitor progress_monitor, void* progress_monitor_target);
+static ViewCollectionMonitorImpl* view_collection_monitor_impl_new (ViewCollection* owner,
+ SourceCollection* sources,
+ ViewManager* manager,
+ Alteration* prereq);
+static ViewCollectionMonitorImpl* view_collection_monitor_impl_construct (GType object_type,
+ ViewCollection* owner,
+ SourceCollection* sources,
+ ViewManager* manager,
+ Alteration* prereq);
+DataView* view_manager_create_view (ViewManager* self,
+ DataSource* source);
+GeeCollection* data_collection_add_many (DataCollection* self,
+ GeeCollection* objects,
+ ProgressMonitor monitor,
+ void* monitor_target);
+static void view_collection_add_sources (ViewCollection* self,
+ SourceCollection* sources,
+ GeeIterable* added,
+ ProgressMonitor progress_monitor,
+ void* progress_monitor_target);
GeeCollection* data_collection_get_all (DataCollection* self);
void data_collection_thaw_notifications (DataCollection* self);
-void view_collection_halt_monitoring (ViewCollection* self, ViewCollectionMonitor* m);
-void view_collection_mirror (ViewCollection* self, ViewCollection* to_mirror, CreateView mirroring_ctor, void* mirroring_ctor_target, CreateViewPredicate should_mirror, void* should_mirror_target);
-void data_collection_set_comparator (DataCollection* self, Comparator comparator, void* comparator_target, ComparatorPredicate predicate, void* predicate_target);
-Comparator data_collection_get_comparator (DataCollection* self, void** result_target);
-ComparatorPredicate data_collection_get_comparator_predicate (DataCollection* self, void** result_target);
-static void view_collection_on_mirror_contents_added (ViewCollection* self, GeeIterable* added);
-static void _view_collection_on_mirror_contents_added_data_collection_items_added (DataCollection* _sender, GeeIterable* added, gpointer self);
-static void view_collection_on_mirror_contents_removed (ViewCollection* self, GeeIterable* removed);
-static void _view_collection_on_mirror_contents_removed_data_collection_items_removed (DataCollection* _sender, GeeIterable* removed, gpointer self);
-void view_collection_copy_into (ViewCollection* self, ViewCollection* to_copy, CreateView copying_ctor, void* copying_ctor_target, CreateViewPredicate should_copy, void* should_copy_target);
+void view_collection_halt_monitoring (ViewCollection* self,
+ ViewCollectionMonitor* m);
+void view_collection_mirror (ViewCollection* self,
+ ViewCollection* to_mirror,
+ CreateView mirroring_ctor,
+ void* mirroring_ctor_target,
+ CreateViewPredicate should_mirror,
+ void* should_mirror_target);
+void data_collection_set_comparator (DataCollection* self,
+ Comparator comparator,
+ void* comparator_target,
+ ComparatorPredicate predicate,
+ void* predicate_target);
+Comparator data_collection_get_comparator (DataCollection* self,
+ void** result_target);
+ComparatorPredicate data_collection_get_comparator_predicate (DataCollection* self,
+ void** result_target);
+static void view_collection_on_mirror_contents_added (ViewCollection* self,
+ GeeIterable* added);
+static void _view_collection_on_mirror_contents_added_data_collection_items_added (DataCollection* _sender,
+ GeeIterable* added,
+ gpointer self);
+static void view_collection_on_mirror_contents_removed (ViewCollection* self,
+ GeeIterable* removed);
+static void _view_collection_on_mirror_contents_removed_data_collection_items_removed (DataCollection* _sender,
+ GeeIterable* removed,
+ gpointer self);
+void view_collection_copy_into (ViewCollection* self,
+ ViewCollection* to_copy,
+ CreateView copying_ctor,
+ void* copying_ctor_target,
+ CreateViewPredicate should_copy,
+ void* should_copy_target);
DataSource* data_view_get_source (DataView* self);
-gboolean view_collection_is_view_filter_installed (ViewCollection* self, ViewFilter* f);
-void view_collection_install_view_filter (ViewCollection* self, ViewFilter* f);
-void view_collection_remove_view_filter (ViewCollection* self, ViewFilter* f);
-static void view_collection_filter_altered_items (ViewCollection* self, GeeCollection* views);
-static gboolean view_collection_is_in_filter (ViewCollection* self, DataView* view);
-gboolean view_filter_predicate (ViewFilter* self, DataView* view);
-static gboolean view_collection_real_valid_type (DataCollection* base, DataObject* object);
-static void view_collection_on_sources_added (ViewCollection* self, DataCollection* sources, GeeIterable* added);
-gboolean view_manager_include_in_view (ViewManager* self, DataSource* source);
-static DataView* _view_manager_create_view_create_view (DataSource* source, gpointer self);
-gboolean data_collection_add (DataCollection* self, DataObject* object);
-static gboolean view_collection_real_add (DataCollection* base, DataObject* object);
-void data_view_internal_set_visible (DataView* self, gboolean visible);
+gboolean view_collection_is_view_filter_installed (ViewCollection* self,
+ ViewFilter* f);
+void view_collection_install_view_filter (ViewCollection* self,
+ ViewFilter* f);
+void view_collection_remove_view_filter (ViewCollection* self,
+ ViewFilter* f);
+static void view_collection_filter_altered_items (ViewCollection* self,
+ GeeCollection* views);
+static gboolean view_collection_is_in_filter (ViewCollection* self,
+ DataView* view);
+gboolean view_filter_predicate (ViewFilter* self,
+ DataView* view);
+static gboolean view_collection_real_valid_type (DataCollection* base,
+ DataObject* object);
+static void view_collection_on_sources_added (ViewCollection* self,
+ DataCollection* sources,
+ GeeIterable* added);
+gboolean view_manager_include_in_view (ViewManager* self,
+ DataSource* source);
+static DataView* _view_manager_create_view_create_view (DataSource* source,
+ gpointer self);
+gboolean data_collection_add (DataCollection* self,
+ DataObject* object);
+static gboolean view_collection_real_add (DataCollection* base,
+ DataObject* object);
+void data_view_internal_set_visible (DataView* self,
+ gboolean visible);
GeeCollection* data_collection_get_singleton (DataObject* object);
-static GeeCollection* view_collection_real_add_many (DataCollection* base, GeeCollection* objects, ProgressMonitor monitor, void* monitor_target);
-static void view_collection_on_sources_removed (ViewCollection* self, GeeIterable* removed);
+static GeeCollection* view_collection_real_add_many (DataCollection* base,
+ GeeCollection* objects,
+ ProgressMonitor monitor,
+ void* monitor_target);
+static void view_collection_on_sources_removed (ViewCollection* self,
+ GeeIterable* removed);
Marker* data_collection_start_marking (DataCollection* self);
-void marker_mark (Marker* self, DataObject* object);
+void marker_mark (Marker* self,
+ DataObject* object);
gint marker_get_count (Marker* self);
-void data_collection_remove_marked (DataCollection* self, Marker* m);
-static void view_collection_on_sources_altered (ViewCollection* self, DataCollection* collection, GeeMap* items);
-gboolean alteration_contains_any (Alteration* self, Alteration* other);
-gboolean view_collection_has_view_for_source (ViewCollection* self, DataSource* source);
-DataView* view_collection_get_view_for_source (ViewCollection* self, DataSource* source);
-gboolean data_set_contains (DataSet* self, DataObject* object);
-gboolean data_set_resort_object (DataSet* self, DataObject* object, Alteration* alteration);
-static gboolean view_collection_is_visible (ViewCollection* self, DataView* view);
-Marker* data_collection_mark_many (DataCollection* self, GeeCollection* objects);
+void data_collection_remove_marked (DataCollection* self,
+ Marker* m);
+static void view_collection_on_sources_altered (ViewCollection* self,
+ DataCollection* collection,
+ GeeMap* items);
+gboolean alteration_contains_any (Alteration* self,
+ Alteration* other);
+gboolean view_collection_has_view_for_source (ViewCollection* self,
+ DataSource* source);
+DataView* view_collection_get_view_for_source (ViewCollection* self,
+ DataSource* source);
+gboolean data_set_contains (DataSet* self,
+ DataObject* object);
+gboolean data_set_resort_object (DataSet* self,
+ DataObject* object,
+ Alteration* alteration);
+static gboolean view_collection_is_visible (ViewCollection* self,
+ DataView* view);
+Marker* data_collection_mark_many (DataCollection* self,
+ GeeCollection* objects);
void data_collection_notify_ordering_changed (DataCollection* self);
-static void view_collection_real_notify_items_added (DataCollection* base, GeeIterable* added);
+static void view_collection_real_notify_items_added (DataCollection* base,
+ GeeIterable* added);
gboolean data_view_is_selected (DataView* self);
gboolean data_view_is_visible (DataView* self);
-static gboolean view_collection_add_many_visible (ViewCollection* self, GeeCollection* many);
-static void view_collection_add_many_selected (ViewCollection* self, GeeCollection* views);
-void data_collection_notify_items_added (DataCollection* self, GeeIterable* added);
-static void view_collection_real_notify_items_removed (DataCollection* base, GeeIterable* removed);
-gboolean data_set_remove (DataSet* self, DataObject* object);
-static void view_collection_remove_many_selected (ViewCollection* self, GeeCollection* views);
-void data_collection_notify_items_removed (DataCollection* self, GeeIterable* removed);
-static void view_collection_show_items (ViewCollection* self, GeeList* to_show);
-static void view_collection_hide_items (ViewCollection* self, GeeList* to_hide);
-static void view_collection_real_items_altered (DataCollection* base, GeeMap* map);
-static void view_collection_real_set_comparator (DataCollection* base, Comparator comparator, void* comparator_target, ComparatorPredicate predicate, void* predicate_target);
-void data_set_set_comparator (DataSet* self, Comparator user_comparator, void* user_comparator_target, ComparatorPredicate comparator_predicate, void* comparator_predicate_target);
+static gboolean view_collection_add_many_visible (ViewCollection* self,
+ GeeCollection* many);
+static void view_collection_add_many_selected (ViewCollection* self,
+ GeeCollection* views);
+void data_collection_notify_items_added (DataCollection* self,
+ GeeIterable* added);
+static void view_collection_real_notify_items_removed (DataCollection* base,
+ GeeIterable* removed);
+gboolean data_set_remove (DataSet* self,
+ DataObject* object);
+static void view_collection_remove_many_selected (ViewCollection* self,
+ GeeCollection* views);
+void data_collection_notify_items_removed (DataCollection* self,
+ GeeIterable* removed);
+static void view_collection_show_items (ViewCollection* self,
+ GeeList* to_show);
+static void view_collection_hide_items (ViewCollection* self,
+ GeeList* to_hide);
+static void view_collection_real_items_altered (DataCollection* base,
+ GeeMap* map);
+static void view_collection_real_set_comparator (DataCollection* base,
+ Comparator comparator,
+ void* comparator_target,
+ ComparatorPredicate predicate,
+ void* predicate_target);
+void data_set_set_comparator (DataSet* self,
+ Comparator user_comparator,
+ void* user_comparator_target,
+ ComparatorPredicate comparator_predicate,
+ void* comparator_predicate_target);
static void view_collection_real_reset_comparator (DataCollection* base);
void data_set_reset_comparator (DataSet* self);
void data_collection_reset_comparator (DataCollection* self);
@@ -602,14 +759,22 @@ static gint view_collection_real_get_count (DataCollection* base);
gint data_set_get_count (DataSet* self);
gint data_collection_get_count (DataCollection* self);
gint view_collection_get_unfiltered_count (ViewCollection* self);
-static DataObject* view_collection_real_get_at (DataCollection* base, gint index);
-DataObject* data_set_get_at (DataSet* self, gint index);
-DataObject* data_collection_get_at (DataCollection* self, gint index);
-static gint view_collection_real_index_of (DataCollection* base, DataObject* object);
-gint data_set_index_of (DataSet* self, DataObject* object);
-gint data_collection_index_of (DataCollection* self, DataObject* object);
-static gboolean view_collection_real_contains (DataCollection* base, DataObject* object);
-gboolean data_collection_contains (DataCollection* self, DataObject* object);
+static DataObject* view_collection_real_get_at (DataCollection* base,
+ gint index);
+DataObject* data_set_get_at (DataSet* self,
+ gint index);
+DataObject* data_collection_get_at (DataCollection* self,
+ gint index);
+static gint view_collection_real_index_of (DataCollection* base,
+ DataObject* object);
+gint data_set_index_of (DataSet* self,
+ DataObject* object);
+gint data_collection_index_of (DataCollection* self,
+ DataObject* object);
+static gboolean view_collection_real_contains (DataCollection* base,
+ DataObject* object);
+gboolean data_collection_contains (DataCollection* self,
+ DataObject* object);
DataView* view_collection_get_first (ViewCollection* self);
static DataView* view_collection_real_get_first (ViewCollection* self);
DataView* view_collection_get_first_unrejected (ViewCollection* self);
@@ -618,576 +783,649 @@ GType thumbnail_source_get_type (void) G_GNUC_CONST;
GType media_source_get_type (void) G_GNUC_CONST;
GType rating_get_type (void) G_GNUC_CONST;
Rating media_source_get_rating (MediaSource* self);
-DataView* view_collection_get_next (ViewCollection* self, DataView* view);
+DataView* view_collection_get_next (ViewCollection* self,
+ DataView* view);
DataView* view_collection_get_last (ViewCollection* self);
static DataView* view_collection_real_get_last (ViewCollection* self);
-static DataView* view_collection_real_get_next (ViewCollection* self, DataView* view);
-DataView* view_collection_get_previous (ViewCollection* self, DataView* view);
-static DataView* view_collection_real_get_previous (ViewCollection* self, DataView* view);
-gboolean view_collection_get_immediate_neighbors (ViewCollection* self, DataSource* home, DataSource* * next, DataSource* * prev, const gchar* type_selector);
+static DataView* view_collection_real_get_next (ViewCollection* self,
+ DataView* view);
+DataView* view_collection_get_previous (ViewCollection* self,
+ DataView* view);
+static DataView* view_collection_real_get_previous (ViewCollection* self,
+ DataView* view);
+gboolean view_collection_get_immediate_neighbors (ViewCollection* self,
+ DataSource* home,
+ DataSource* * next,
+ DataSource* * prev,
+ const gchar* type_selector);
gchar* data_source_get_typename (DataSource* self);
-GeeSet* view_collection_get_extended_neighbors (ViewCollection* self, DataSource* home, const gchar* typename);
-gboolean data_set_add_many (DataSet* self, GeeCollection* objects);
-gboolean data_set_remove_many (DataSet* self, GeeCollection* objects);
-void view_collection_select_marked (ViewCollection* self, Marker* marker);
-void data_collection_act_on_marked (DataCollection* self, Marker* m, MarkedAction action, void* action_target, ProgressMonitor monitor, void* monitor_target, GObject* user);
-static gboolean view_collection_select_item (ViewCollection* self, DataObject* object, GObject* user);
-static gboolean _view_collection_select_item_marked_action (DataObject* object, GObject* user, gpointer self);
+GeeSet* view_collection_get_extended_neighbors (ViewCollection* self,
+ DataSource* home,
+ const gchar* typename);
+gboolean data_set_add_many (DataSet* self,
+ GeeCollection* objects);
+gboolean data_set_remove_many (DataSet* self,
+ GeeCollection* objects);
+void view_collection_select_marked (ViewCollection* self,
+ Marker* marker);
+void data_collection_act_on_marked (DataCollection* self,
+ Marker* m,
+ MarkedAction action,
+ void* action_target,
+ ProgressMonitor monitor,
+ void* monitor_target,
+ GObject* user);
+static gboolean view_collection_select_item (ViewCollection* self,
+ DataObject* object,
+ GObject* user);
+static gboolean _view_collection_select_item_marked_action (DataObject* object,
+ GObject* user,
+ gpointer self);
void view_collection_select_all (ViewCollection* self);
void marker_mark_all (Marker* self);
-void data_view_internal_set_selected (DataView* self, gboolean selected);
-void view_collection_unselect_marked (ViewCollection* self, Marker* marker);
-static gboolean view_collection_unselect_item (ViewCollection* self, DataObject* object, GObject* user);
-static gboolean _view_collection_unselect_item_marked_action (DataObject* object, GObject* user, gpointer self);
+void data_view_internal_set_selected (DataView* self,
+ gboolean selected);
+void view_collection_unselect_marked (ViewCollection* self,
+ Marker* marker);
+static gboolean view_collection_unselect_item (ViewCollection* self,
+ DataObject* object,
+ GObject* user);
+static gboolean _view_collection_unselect_item_marked_action (DataObject* object,
+ GObject* user,
+ gpointer self);
void view_collection_unselect_all (ViewCollection* self);
-void marker_mark_many (Marker* self, GeeCollection* list);
+void marker_mark_many (Marker* self,
+ GeeCollection* list);
GeeList* view_collection_get_selected (ViewCollection* self);
-void view_collection_unselect_all_but (ViewCollection* self, DataView* exception);
-void view_collection_unselect_and_select_marked (ViewCollection* self, Marker* unselect, Marker* select);
-void view_collection_toggle_marked (ViewCollection* self, Marker* marker);
+void view_collection_unselect_all_but (ViewCollection* self,
+ DataView* exception);
+void view_collection_unselect_and_select_marked (ViewCollection* self,
+ Marker* unselect,
+ Marker* select);
+void view_collection_toggle_marked (ViewCollection* self,
+ Marker* marker);
static GType view_collection_toggle_lists_get_type (void) G_GNUC_CONST G_GNUC_UNUSED;
static ViewCollectionToggleLists* view_collection_toggle_lists_new (void);
static ViewCollectionToggleLists* view_collection_toggle_lists_construct (GType object_type);
-static gboolean view_collection_toggle_item (ViewCollection* self, DataObject* object, GObject* user);
-static gboolean _view_collection_toggle_item_marked_action (DataObject* object, GObject* user, gpointer self);
+static gboolean view_collection_toggle_item (ViewCollection* self,
+ DataObject* object,
+ GObject* user);
+static gboolean _view_collection_toggle_item_marked_action (DataObject* object,
+ GObject* user,
+ gpointer self);
gboolean data_view_internal_toggle (DataView* self);
gint view_collection_get_selected_count (ViewCollection* self);
-DataView* view_collection_get_selected_at (ViewCollection* self, gint index);
+DataView* view_collection_get_selected_at (ViewCollection* self,
+ gint index);
DataSet* data_collection_get_dataset_copy (DataCollection* self);
-gboolean view_collection_has_view_for_source_with_filtered (ViewCollection* self, DataSource* source);
-DataView* view_collection_get_view_for_source_filtered (ViewCollection* self, DataSource* source);
+gboolean view_collection_has_view_for_source_with_filtered (ViewCollection* self,
+ DataSource* source);
+DataView* view_collection_get_view_for_source_filtered (ViewCollection* self,
+ DataSource* source);
GeeCollection* view_collection_get_sources (ViewCollection* self);
-gboolean view_collection_has_source_of_type (ViewCollection* self, GType t);
-gint view_collection_get_sources_of_type_count (ViewCollection* self, GType t);
-GeeList* view_collection_get_sources_of_type (ViewCollection* self, GType t);
+gboolean view_collection_has_source_of_type (ViewCollection* self,
+ GType t);
+gint view_collection_get_sources_of_type_count (ViewCollection* self,
+ GType t);
+GeeList* view_collection_get_sources_of_type (ViewCollection* self,
+ GType t);
GeeList* view_collection_get_selected_sources (ViewCollection* self);
-DataSource* view_collection_get_selected_source_at (ViewCollection* self, gint index);
-GeeList* view_collection_get_selected_sources_of_type (ViewCollection* self, GType t);
-gint view_collection_index_of_source (ViewCollection* self, DataSource* source);
-void view_collection_internal_notify_view_altered (ViewCollection* self, DataView* view);
+DataSource* view_collection_get_selected_source_at (ViewCollection* self,
+ gint index);
+GeeList* view_collection_get_selected_sources_of_type (ViewCollection* self,
+ GType t);
+gint view_collection_index_of_source (ViewCollection* self,
+ DataSource* source);
+void view_collection_internal_notify_view_altered (ViewCollection* self,
+ DataView* view);
gboolean data_collection_are_notifications_frozen (DataCollection* self);
-void view_collection_internal_notify_geometry_altered (ViewCollection* self, DataView* view);
+void view_collection_internal_notify_geometry_altered (ViewCollection* self,
+ DataView* view);
static void view_collection_real_notify_thawed (DataCollection* base);
void data_collection_notify_thawed (DataCollection* self);
gboolean view_collection_are_items_filtered_out (ViewCollection* self);
-static void view_collection_real_items_selected (ViewCollection* self, GeeIterable* selected);
-static void view_collection_real_items_unselected (ViewCollection* self, GeeIterable* unselected);
-static void view_collection_real_items_state_changed (ViewCollection* self, GeeIterable* changed);
+static void view_collection_real_items_selected (ViewCollection* self,
+ GeeIterable* selected);
+static void view_collection_real_items_unselected (ViewCollection* self,
+ GeeIterable* unselected);
+static void view_collection_real_items_state_changed (ViewCollection* self,
+ GeeIterable* changed);
static void view_collection_real_selection_group_altered (ViewCollection* self);
-static void view_collection_real_items_shown (ViewCollection* self, GeeCollection* visible);
-static void view_collection_real_items_hidden (ViewCollection* self, GeeCollection* hidden);
-static void view_collection_real_items_visibility_changed (ViewCollection* self, GeeCollection* changed);
-static void view_collection_real_item_view_altered (ViewCollection* self, DataView* view);
-static void view_collection_real_item_geometry_altered (ViewCollection* self, DataView* view);
-static void view_collection_real_views_altered (ViewCollection* self, GeeCollection* views);
-static void view_collection_real_geometries_altered (ViewCollection* self, GeeCollection* views);
-static void view_collection_real_view_filter_installed (ViewCollection* self, ViewFilter* filer);
-static void g_cclosure_user_marshal_VOID__VIEW_FILTER (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data);
-static void view_collection_real_view_filter_removed (ViewCollection* self, ViewFilter* filer);
-enum {
- VIEW_COLLECTION_MONITOR_DUMMY_PROPERTY
-};
+static void view_collection_real_items_shown (ViewCollection* self,
+ GeeCollection* visible);
+static void view_collection_real_items_hidden (ViewCollection* self,
+ GeeCollection* hidden);
+static void view_collection_real_items_visibility_changed (ViewCollection* self,
+ GeeCollection* changed);
+static void view_collection_real_item_view_altered (ViewCollection* self,
+ DataView* view);
+static void view_collection_real_item_geometry_altered (ViewCollection* self,
+ DataView* view);
+static void view_collection_real_views_altered (ViewCollection* self,
+ GeeCollection* views);
+static void view_collection_real_geometries_altered (ViewCollection* self,
+ GeeCollection* views);
+static void view_collection_real_view_filter_installed (ViewCollection* self,
+ ViewFilter* filer);
+static void g_cclosure_user_marshal_VOID__VIEW_FILTER (GClosure * closure,
+ GValue * return_value,
+ guint n_param_values,
+ const GValue * param_values,
+ gpointer invocation_hint,
+ gpointer marshal_data);
+static void view_collection_real_view_filter_removed (ViewCollection* self,
+ ViewFilter* filer);
ViewCollectionMonitor* view_collection_monitor_new (void);
ViewCollectionMonitor* view_collection_monitor_construct (GType object_type);
static void view_collection_monitor_finalize (ViewCollectionMonitor * obj);
-enum {
- VIEW_COLLECTION_MONITOR_IMPL_DUMMY_PROPERTY
-};
-static void _view_collection_on_sources_added_data_collection_items_added (DataCollection* _sender, GeeIterable* added, gpointer self);
-static void _view_collection_on_sources_removed_data_collection_items_removed (DataCollection* _sender, GeeIterable* removed, gpointer self);
-static void _view_collection_on_sources_altered_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self);
+static void _view_collection_on_sources_added_data_collection_items_added (DataCollection* _sender,
+ GeeIterable* added,
+ gpointer self);
+static void _view_collection_on_sources_removed_data_collection_items_removed (DataCollection* _sender,
+ GeeIterable* removed,
+ gpointer self);
+static void _view_collection_on_sources_altered_data_collection_items_altered (DataCollection* _sender,
+ GeeMap* items,
+ gpointer self);
static void view_collection_monitor_impl_finalize (ViewCollectionMonitor * obj);
-enum {
- VIEW_COLLECTION_TOGGLE_LISTS_DUMMY_PROPERTY
-};
static void view_collection_toggle_lists_finalize (GObject * obj);
static void view_collection_finalize (DataCollection * obj);
-enum {
- VIEW_MANAGER_DUMMY_PROPERTY
-};
-static gboolean view_manager_real_include_in_view (ViewManager* self, DataSource* source);
-static DataView* view_manager_real_create_view (ViewManager* self, DataSource* source);
+static gboolean view_manager_real_include_in_view (ViewManager* self,
+ DataSource* source);
+static DataView* view_manager_real_create_view (ViewManager* self,
+ DataSource* source);
ViewManager* view_manager_construct (GType object_type);
static void view_manager_finalize (ViewManager * obj);
-enum {
- VIEW_FILTER_DUMMY_PROPERTY
-};
-static gboolean view_filter_real_predicate (ViewFilter* self, DataView* view);
+static gboolean view_filter_real_predicate (ViewFilter* self,
+ DataView* view);
ViewFilter* view_filter_construct (GType object_type);
static void view_filter_real_refresh (ViewFilter* self);
static void view_filter_finalize (ViewFilter * obj);
-ViewCollection* view_collection_construct (GType object_type, const gchar* name) {
+ViewCollection*
+view_collection_construct (GType object_type,
+ const gchar* name)
+{
ViewCollection* self = NULL;
- const gchar* _tmp0_;
#line 125 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_val_if_fail (name != NULL, NULL);
#line 126 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp0_ = name;
-#line 126 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- self = (ViewCollection*) data_collection_construct (object_type, _tmp0_);
+ self = (ViewCollection*) data_collection_construct (object_type, name);
#line 125 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return self;
-#line 733 "ViewCollection.c"
+#line 958 "ViewCollection.c"
}
-ViewCollection* view_collection_new (const gchar* name) {
+ViewCollection*
+view_collection_new (const gchar* name)
+{
#line 125 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return view_collection_construct (TYPE_VIEW_COLLECTION, name);
-#line 740 "ViewCollection.c"
+#line 967 "ViewCollection.c"
}
-static gpointer _g_object_ref0 (gpointer self) {
+static gpointer
+_g_object_ref0 (gpointer self)
+{
#line 142 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return self ? g_object_ref (self) : NULL;
-#line 747 "ViewCollection.c"
+#line 976 "ViewCollection.c"
}
-static void view_collection_real_notify_items_selected_unselected (ViewCollection* self, GeeCollection* selected, GeeCollection* unselected) {
+static void
+view_collection_real_notify_items_selected_unselected (ViewCollection* self,
+ GeeCollection* selected,
+ GeeCollection* unselected)
+{
gboolean _tmp0_ = FALSE;
- GeeCollection* _tmp1_;
gboolean has_selected = FALSE;
- gboolean _tmp5_ = FALSE;
- GeeCollection* _tmp6_;
+ gboolean _tmp3_ = FALSE;
gboolean has_unselected = FALSE;
- gboolean _tmp10_;
- gboolean _tmp12_;
+ gboolean _tmp6_;
+ gboolean _tmp7_;
GeeCollection* sum = NULL;
- gboolean _tmp14_ = FALSE;
- gboolean _tmp15_;
- GeeCollection* _tmp32_;
+ gboolean _tmp8_ = FALSE;
+ gboolean _tmp9_;
+ GeeCollection* _tmp22_;
#line 129 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_if_fail ((selected == NULL) || GEE_IS_COLLECTION (selected));
#line 129 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_if_fail ((unselected == NULL) || GEE_IS_COLLECTION (unselected));
#line 131 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp1_ = selected;
-#line 131 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- if (_tmp1_ != NULL) {
-#line 772 "ViewCollection.c"
- GeeCollection* _tmp2_;
- gint _tmp3_;
- gint _tmp4_;
-#line 131 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp2_ = selected;
+ if (selected != NULL) {
+#line 1001 "ViewCollection.c"
+ gint _tmp1_;
+ gint _tmp2_;
#line 131 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp3_ = gee_collection_get_size (_tmp2_);
+ _tmp1_ = gee_collection_get_size (selected);
#line 131 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp4_ = _tmp3_;
+ _tmp2_ = _tmp1_;
#line 131 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp0_ = _tmp4_ > 0;
-#line 784 "ViewCollection.c"
+ _tmp0_ = _tmp2_ > 0;
+#line 1010 "ViewCollection.c"
} else {
#line 131 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp0_ = FALSE;
-#line 788 "ViewCollection.c"
+#line 1014 "ViewCollection.c"
}
#line 131 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
has_selected = _tmp0_;
#line 132 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp6_ = unselected;
-#line 132 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- if (_tmp6_ != NULL) {
-#line 796 "ViewCollection.c"
- GeeCollection* _tmp7_;
- gint _tmp8_;
- gint _tmp9_;
-#line 132 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp7_ = unselected;
+ if (unselected != NULL) {
+#line 1020 "ViewCollection.c"
+ gint _tmp4_;
+ gint _tmp5_;
#line 132 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp8_ = gee_collection_get_size (_tmp7_);
+ _tmp4_ = gee_collection_get_size (unselected);
#line 132 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp9_ = _tmp8_;
+ _tmp5_ = _tmp4_;
#line 132 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp5_ = _tmp9_ > 0;
-#line 808 "ViewCollection.c"
+ _tmp3_ = _tmp5_ > 0;
+#line 1029 "ViewCollection.c"
} else {
#line 132 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp5_ = FALSE;
-#line 812 "ViewCollection.c"
+ _tmp3_ = FALSE;
+#line 1033 "ViewCollection.c"
}
#line 132 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- has_unselected = _tmp5_;
+ has_unselected = _tmp3_;
#line 134 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp10_ = has_selected;
+ _tmp6_ = has_selected;
#line 134 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- if (_tmp10_) {
-#line 820 "ViewCollection.c"
- GeeCollection* _tmp11_;
-#line 135 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp11_ = selected;
+ if (_tmp6_) {
#line 135 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- g_signal_emit (self, view_collection_signals[VIEW_COLLECTION_ITEMS_SELECTED_SIGNAL], 0, G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 826 "ViewCollection.c"
+ g_signal_emit (self, view_collection_signals[VIEW_COLLECTION_ITEMS_SELECTED_SIGNAL], 0, G_TYPE_CHECK_INSTANCE_CAST (selected, GEE_TYPE_ITERABLE, GeeIterable));
+#line 1043 "ViewCollection.c"
}
#line 137 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp12_ = has_unselected;
+ _tmp7_ = has_unselected;
#line 137 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- if (_tmp12_) {
-#line 832 "ViewCollection.c"
- GeeCollection* _tmp13_;
-#line 138 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp13_ = unselected;
+ if (_tmp7_) {
#line 138 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- g_signal_emit (self, view_collection_signals[VIEW_COLLECTION_ITEMS_UNSELECTED_SIGNAL], 0, G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 838 "ViewCollection.c"
+ g_signal_emit (self, view_collection_signals[VIEW_COLLECTION_ITEMS_UNSELECTED_SIGNAL], 0, G_TYPE_CHECK_INSTANCE_CAST (unselected, GEE_TYPE_ITERABLE, GeeIterable));
+#line 1051 "ViewCollection.c"
}
#line 141 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp15_ = has_selected;
+ _tmp9_ = has_selected;
#line 141 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- if (_tmp15_) {
-#line 844 "ViewCollection.c"
- gboolean _tmp16_;
+ if (_tmp9_) {
+#line 1057 "ViewCollection.c"
+ gboolean _tmp10_;
#line 141 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp16_ = has_unselected;
+ _tmp10_ = has_unselected;
#line 141 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp14_ = !_tmp16_;
-#line 850 "ViewCollection.c"
+ _tmp8_ = !_tmp10_;
+#line 1063 "ViewCollection.c"
} else {
#line 141 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp14_ = FALSE;
-#line 854 "ViewCollection.c"
+ _tmp8_ = FALSE;
+#line 1067 "ViewCollection.c"
}
#line 141 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- if (_tmp14_) {
-#line 858 "ViewCollection.c"
- GeeCollection* _tmp17_;
- GeeCollection* _tmp18_;
-#line 142 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp17_ = selected;
+ if (_tmp8_) {
+#line 1071 "ViewCollection.c"
+ GeeCollection* _tmp11_;
#line 142 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp18_ = _g_object_ref0 (_tmp17_);
+ _tmp11_ = _g_object_ref0 (selected);
#line 142 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (sum);
#line 142 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- sum = _tmp18_;
-#line 869 "ViewCollection.c"
+ sum = _tmp11_;
+#line 1079 "ViewCollection.c"
} else {
- gboolean _tmp19_ = FALSE;
- gboolean _tmp20_;
+ gboolean _tmp12_ = FALSE;
+ gboolean _tmp13_;
#line 143 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp20_ = has_selected;
+ _tmp13_ = has_selected;
#line 143 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- if (!_tmp20_) {
-#line 877 "ViewCollection.c"
- gboolean _tmp21_;
+ if (!_tmp13_) {
+#line 1087 "ViewCollection.c"
+ gboolean _tmp14_;
#line 143 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp21_ = has_unselected;
+ _tmp14_ = has_unselected;
#line 143 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp19_ = _tmp21_;
-#line 883 "ViewCollection.c"
+ _tmp12_ = _tmp14_;
+#line 1093 "ViewCollection.c"
} else {
#line 143 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp19_ = FALSE;
-#line 887 "ViewCollection.c"
+ _tmp12_ = FALSE;
+#line 1097 "ViewCollection.c"
}
#line 143 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- if (_tmp19_) {
-#line 891 "ViewCollection.c"
- GeeCollection* _tmp22_;
- GeeCollection* _tmp23_;
-#line 144 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp22_ = unselected;
+ if (_tmp12_) {
+#line 1101 "ViewCollection.c"
+ GeeCollection* _tmp15_;
#line 144 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp23_ = _g_object_ref0 (_tmp22_);
+ _tmp15_ = _g_object_ref0 (unselected);
#line 144 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (sum);
#line 144 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- sum = _tmp23_;
-#line 902 "ViewCollection.c"
+ sum = _tmp15_;
+#line 1109 "ViewCollection.c"
} else {
- gboolean _tmp24_ = FALSE;
- gboolean _tmp25_;
+ gboolean _tmp16_ = FALSE;
+ gboolean _tmp17_;
#line 145 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp25_ = has_selected;
+ _tmp17_ = has_selected;
#line 145 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- if (!_tmp25_) {
-#line 910 "ViewCollection.c"
- gboolean _tmp26_;
+ if (!_tmp17_) {
+#line 1117 "ViewCollection.c"
+ gboolean _tmp18_;
#line 145 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp26_ = has_unselected;
+ _tmp18_ = has_unselected;
#line 145 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp24_ = !_tmp26_;
-#line 916 "ViewCollection.c"
+ _tmp16_ = !_tmp18_;
+#line 1123 "ViewCollection.c"
} else {
#line 145 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp24_ = FALSE;
-#line 920 "ViewCollection.c"
+ _tmp16_ = FALSE;
+#line 1127 "ViewCollection.c"
}
#line 145 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- if (_tmp24_) {
+ if (_tmp16_) {
#line 146 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (sum);
#line 146 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
sum = NULL;
-#line 928 "ViewCollection.c"
+#line 1135 "ViewCollection.c"
} else {
- GeeHashSet* _tmp27_;
- GeeCollection* _tmp28_;
- GeeCollection* _tmp29_;
- GeeCollection* _tmp30_;
- GeeCollection* _tmp31_;
+ GeeHashSet* _tmp19_;
+ GeeCollection* _tmp20_;
+ GeeCollection* _tmp21_;
#line 148 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp27_ = gee_hash_set_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL);
+ _tmp19_ = gee_hash_set_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL);
#line 148 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (sum);
#line 148 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- sum = G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, GEE_TYPE_COLLECTION, GeeCollection);
+ sum = G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GEE_TYPE_COLLECTION, GeeCollection);
#line 149 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp28_ = sum;
+ _tmp20_ = sum;
#line 149 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp29_ = selected;
-#line 149 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- gee_collection_add_all (_tmp28_, _tmp29_);
-#line 150 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp30_ = sum;
+ gee_collection_add_all (_tmp20_, selected);
#line 150 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp31_ = unselected;
+ _tmp21_ = sum;
#line 150 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- gee_collection_add_all (_tmp30_, _tmp31_);
-#line 953 "ViewCollection.c"
+ gee_collection_add_all (_tmp21_, unselected);
+#line 1154 "ViewCollection.c"
}
}
}
#line 153 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp32_ = sum;
+ _tmp22_ = sum;
#line 153 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- if (_tmp32_ != NULL) {
-#line 961 "ViewCollection.c"
- GeeCollection* _tmp33_;
+ if (_tmp22_ != NULL) {
+#line 1162 "ViewCollection.c"
+ GeeCollection* _tmp23_;
#line 154 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp33_ = sum;
+ _tmp23_ = sum;
#line 154 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- g_signal_emit (self, view_collection_signals[VIEW_COLLECTION_ITEMS_STATE_CHANGED_SIGNAL], 0, G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, GEE_TYPE_ITERABLE, GeeIterable));
+ g_signal_emit (self, view_collection_signals[VIEW_COLLECTION_ITEMS_STATE_CHANGED_SIGNAL], 0, G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GEE_TYPE_ITERABLE, GeeIterable));
#line 155 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
view_collection_notify_selection_group_altered (self);
-#line 969 "ViewCollection.c"
+#line 1170 "ViewCollection.c"
}
#line 129 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (sum);
-#line 973 "ViewCollection.c"
+#line 1174 "ViewCollection.c"
}
-void view_collection_notify_items_selected_unselected (ViewCollection* self, GeeCollection* selected, GeeCollection* unselected) {
+void
+view_collection_notify_items_selected_unselected (ViewCollection* self,
+ GeeCollection* selected,
+ GeeCollection* unselected)
+{
#line 129 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_if_fail (IS_VIEW_COLLECTION (self));
#line 129 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
VIEW_COLLECTION_GET_CLASS (self)->notify_items_selected_unselected (self, selected, unselected);
-#line 982 "ViewCollection.c"
+#line 1187 "ViewCollection.c"
}
-static void view_collection_real_notify_selection_group_altered (ViewCollection* self) {
+static void
+view_collection_real_notify_selection_group_altered (ViewCollection* self)
+{
#line 160 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_signal_emit (self, view_collection_signals[VIEW_COLLECTION_SELECTION_GROUP_ALTERED_SIGNAL], 0);
-#line 989 "ViewCollection.c"
+#line 1196 "ViewCollection.c"
}
-void view_collection_notify_selection_group_altered (ViewCollection* self) {
+void
+view_collection_notify_selection_group_altered (ViewCollection* self)
+{
#line 159 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_if_fail (IS_VIEW_COLLECTION (self));
#line 159 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
VIEW_COLLECTION_GET_CLASS (self)->notify_selection_group_altered (self);
-#line 998 "ViewCollection.c"
+#line 1207 "ViewCollection.c"
}
-static void view_collection_real_notify_item_view_altered (ViewCollection* self, DataView* view) {
- DataView* _tmp0_;
+static void
+view_collection_real_notify_item_view_altered (ViewCollection* self,
+ DataView* view)
+{
#line 163 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_if_fail (IS_DATA_VIEW (view));
#line 164 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp0_ = view;
-#line 164 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- g_signal_emit (self, view_collection_signals[VIEW_COLLECTION_ITEM_VIEW_ALTERED_SIGNAL], 0, _tmp0_);
-#line 1010 "ViewCollection.c"
+ g_signal_emit (self, view_collection_signals[VIEW_COLLECTION_ITEM_VIEW_ALTERED_SIGNAL], 0, view);
+#line 1219 "ViewCollection.c"
}
-void view_collection_notify_item_view_altered (ViewCollection* self, DataView* view) {
+void
+view_collection_notify_item_view_altered (ViewCollection* self,
+ DataView* view)
+{
#line 163 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_if_fail (IS_VIEW_COLLECTION (self));
#line 163 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
VIEW_COLLECTION_GET_CLASS (self)->notify_item_view_altered (self, view);
-#line 1019 "ViewCollection.c"
+#line 1231 "ViewCollection.c"
}
-static void view_collection_real_notify_views_altered (ViewCollection* self, GeeCollection* views) {
- GeeCollection* _tmp0_;
+static void
+view_collection_real_notify_views_altered (ViewCollection* self,
+ GeeCollection* views)
+{
#line 167 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_if_fail (GEE_IS_COLLECTION (views));
#line 168 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp0_ = views;
-#line 168 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- g_signal_emit (self, view_collection_signals[VIEW_COLLECTION_VIEWS_ALTERED_SIGNAL], 0, _tmp0_);
-#line 1031 "ViewCollection.c"
+ g_signal_emit (self, view_collection_signals[VIEW_COLLECTION_VIEWS_ALTERED_SIGNAL], 0, views);
+#line 1243 "ViewCollection.c"
}
-void view_collection_notify_views_altered (ViewCollection* self, GeeCollection* views) {
+void
+view_collection_notify_views_altered (ViewCollection* self,
+ GeeCollection* views)
+{
#line 167 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_if_fail (IS_VIEW_COLLECTION (self));
#line 167 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
VIEW_COLLECTION_GET_CLASS (self)->notify_views_altered (self, views);
-#line 1040 "ViewCollection.c"
+#line 1255 "ViewCollection.c"
}
-static void view_collection_real_notify_item_geometry_altered (ViewCollection* self, DataView* view) {
- DataView* _tmp0_;
+static void
+view_collection_real_notify_item_geometry_altered (ViewCollection* self,
+ DataView* view)
+{
#line 171 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_if_fail (IS_DATA_VIEW (view));
#line 172 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp0_ = view;
-#line 172 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- g_signal_emit (self, view_collection_signals[VIEW_COLLECTION_ITEM_GEOMETRY_ALTERED_SIGNAL], 0, _tmp0_);
-#line 1052 "ViewCollection.c"
+ g_signal_emit (self, view_collection_signals[VIEW_COLLECTION_ITEM_GEOMETRY_ALTERED_SIGNAL], 0, view);
+#line 1267 "ViewCollection.c"
}
-void view_collection_notify_item_geometry_altered (ViewCollection* self, DataView* view) {
+void
+view_collection_notify_item_geometry_altered (ViewCollection* self,
+ DataView* view)
+{
#line 171 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_if_fail (IS_VIEW_COLLECTION (self));
#line 171 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
VIEW_COLLECTION_GET_CLASS (self)->notify_item_geometry_altered (self, view);
-#line 1061 "ViewCollection.c"
+#line 1279 "ViewCollection.c"
}
-static void view_collection_real_notify_geometries_altered (ViewCollection* self, GeeCollection* views) {
- GeeCollection* _tmp0_;
+static void
+view_collection_real_notify_geometries_altered (ViewCollection* self,
+ GeeCollection* views)
+{
#line 175 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_if_fail (GEE_IS_COLLECTION (views));
#line 176 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp0_ = views;
-#line 176 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- g_signal_emit (self, view_collection_signals[VIEW_COLLECTION_GEOMETRIES_ALTERED_SIGNAL], 0, _tmp0_);
-#line 1073 "ViewCollection.c"
+ g_signal_emit (self, view_collection_signals[VIEW_COLLECTION_GEOMETRIES_ALTERED_SIGNAL], 0, views);
+#line 1291 "ViewCollection.c"
}
-void view_collection_notify_geometries_altered (ViewCollection* self, GeeCollection* views) {
+void
+view_collection_notify_geometries_altered (ViewCollection* self,
+ GeeCollection* views)
+{
#line 175 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_if_fail (IS_VIEW_COLLECTION (self));
#line 175 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
VIEW_COLLECTION_GET_CLASS (self)->notify_geometries_altered (self, views);
-#line 1082 "ViewCollection.c"
+#line 1303 "ViewCollection.c"
}
-static void view_collection_real_notify_items_shown (ViewCollection* self, GeeCollection* shown) {
- GeeCollection* _tmp0_;
+static void
+view_collection_real_notify_items_shown (ViewCollection* self,
+ GeeCollection* shown)
+{
#line 179 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_if_fail (GEE_IS_COLLECTION (shown));
#line 180 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp0_ = shown;
-#line 180 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- g_signal_emit (self, view_collection_signals[VIEW_COLLECTION_ITEMS_SHOWN_SIGNAL], 0, _tmp0_);
-#line 1094 "ViewCollection.c"
+ g_signal_emit (self, view_collection_signals[VIEW_COLLECTION_ITEMS_SHOWN_SIGNAL], 0, shown);
+#line 1315 "ViewCollection.c"
}
-void view_collection_notify_items_shown (ViewCollection* self, GeeCollection* shown) {
+void
+view_collection_notify_items_shown (ViewCollection* self,
+ GeeCollection* shown)
+{
#line 179 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_if_fail (IS_VIEW_COLLECTION (self));
#line 179 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
VIEW_COLLECTION_GET_CLASS (self)->notify_items_shown (self, shown);
-#line 1103 "ViewCollection.c"
+#line 1327 "ViewCollection.c"
}
-static void view_collection_real_notify_items_hidden (ViewCollection* self, GeeCollection* hidden) {
- GeeCollection* _tmp0_;
+static void
+view_collection_real_notify_items_hidden (ViewCollection* self,
+ GeeCollection* hidden)
+{
#line 183 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_if_fail (GEE_IS_COLLECTION (hidden));
#line 184 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp0_ = hidden;
-#line 184 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- g_signal_emit (self, view_collection_signals[VIEW_COLLECTION_ITEMS_HIDDEN_SIGNAL], 0, _tmp0_);
-#line 1115 "ViewCollection.c"
+ g_signal_emit (self, view_collection_signals[VIEW_COLLECTION_ITEMS_HIDDEN_SIGNAL], 0, hidden);
+#line 1339 "ViewCollection.c"
}
-void view_collection_notify_items_hidden (ViewCollection* self, GeeCollection* hidden) {
+void
+view_collection_notify_items_hidden (ViewCollection* self,
+ GeeCollection* hidden)
+{
#line 183 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_if_fail (IS_VIEW_COLLECTION (self));
#line 183 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
VIEW_COLLECTION_GET_CLASS (self)->notify_items_hidden (self, hidden);
-#line 1124 "ViewCollection.c"
+#line 1351 "ViewCollection.c"
}
-static void view_collection_real_notify_items_visibility_changed (ViewCollection* self, GeeCollection* changed) {
- GeeCollection* _tmp0_;
+static void
+view_collection_real_notify_items_visibility_changed (ViewCollection* self,
+ GeeCollection* changed)
+{
#line 187 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_if_fail (GEE_IS_COLLECTION (changed));
#line 188 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp0_ = changed;
-#line 188 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- g_signal_emit (self, view_collection_signals[VIEW_COLLECTION_ITEMS_VISIBILITY_CHANGED_SIGNAL], 0, _tmp0_);
-#line 1136 "ViewCollection.c"
+ g_signal_emit (self, view_collection_signals[VIEW_COLLECTION_ITEMS_VISIBILITY_CHANGED_SIGNAL], 0, changed);
+#line 1363 "ViewCollection.c"
}
-void view_collection_notify_items_visibility_changed (ViewCollection* self, GeeCollection* changed) {
+void
+view_collection_notify_items_visibility_changed (ViewCollection* self,
+ GeeCollection* changed)
+{
#line 187 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_if_fail (IS_VIEW_COLLECTION (self));
#line 187 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
VIEW_COLLECTION_GET_CLASS (self)->notify_items_visibility_changed (self, changed);
-#line 1145 "ViewCollection.c"
+#line 1375 "ViewCollection.c"
}
-static void view_collection_real_notify_view_filter_installed (ViewCollection* self, ViewFilter* filter) {
- ViewFilter* _tmp0_;
+static void
+view_collection_real_notify_view_filter_installed (ViewCollection* self,
+ ViewFilter* filter)
+{
#line 191 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_if_fail (IS_VIEW_FILTER (filter));
#line 192 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp0_ = filter;
-#line 192 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- g_signal_emit (self, view_collection_signals[VIEW_COLLECTION_VIEW_FILTER_INSTALLED_SIGNAL], 0, _tmp0_);
-#line 1157 "ViewCollection.c"
+ g_signal_emit (self, view_collection_signals[VIEW_COLLECTION_VIEW_FILTER_INSTALLED_SIGNAL], 0, filter);
+#line 1387 "ViewCollection.c"
}
-void view_collection_notify_view_filter_installed (ViewCollection* self, ViewFilter* filter) {
+void
+view_collection_notify_view_filter_installed (ViewCollection* self,
+ ViewFilter* filter)
+{
#line 191 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_if_fail (IS_VIEW_COLLECTION (self));
#line 191 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
VIEW_COLLECTION_GET_CLASS (self)->notify_view_filter_installed (self, filter);
-#line 1166 "ViewCollection.c"
+#line 1399 "ViewCollection.c"
}
-static void view_collection_real_notify_view_filter_removed (ViewCollection* self, ViewFilter* filter) {
- ViewFilter* _tmp0_;
+static void
+view_collection_real_notify_view_filter_removed (ViewCollection* self,
+ ViewFilter* filter)
+{
#line 195 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_if_fail (IS_VIEW_FILTER (filter));
#line 196 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp0_ = filter;
-#line 196 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- g_signal_emit (self, view_collection_signals[VIEW_COLLECTION_VIEW_FILTER_REMOVED_SIGNAL], 0, _tmp0_);
-#line 1178 "ViewCollection.c"
+ g_signal_emit (self, view_collection_signals[VIEW_COLLECTION_VIEW_FILTER_REMOVED_SIGNAL], 0, filter);
+#line 1411 "ViewCollection.c"
}
-void view_collection_notify_view_filter_removed (ViewCollection* self, ViewFilter* filter) {
+void
+view_collection_notify_view_filter_removed (ViewCollection* self,
+ ViewFilter* filter)
+{
#line 195 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_if_fail (IS_VIEW_COLLECTION (self));
#line 195 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
VIEW_COLLECTION_GET_CLASS (self)->notify_view_filter_removed (self, filter);
-#line 1187 "ViewCollection.c"
+#line 1423 "ViewCollection.c"
}
-static void view_collection_real_clear (DataCollection* base) {
+static void
+view_collection_real_clear (DataCollection* base)
+{
ViewCollection * self;
gboolean _tmp0_ = FALSE;
GeeHashMultiMap* _tmp1_;
@@ -1205,18 +1443,18 @@ static void view_collection_real_clear (DataCollection* base) {
if (_tmp3_ > 0) {
#line 202 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp0_ = TRUE;
-#line 1209 "ViewCollection.c"
+#line 1447 "ViewCollection.c"
} else {
ViewCollection* _tmp4_;
#line 202 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp4_ = self->priv->mirroring;
#line 202 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp0_ = _tmp4_ != NULL;
-#line 1216 "ViewCollection.c"
+#line 1454 "ViewCollection.c"
}
#line 202 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (_tmp0_) {
-#line 1220 "ViewCollection.c"
+#line 1458 "ViewCollection.c"
gchar* _tmp5_;
gchar* _tmp6_;
#line 203 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -1230,31 +1468,36 @@ static void view_collection_real_clear (DataCollection* base) {
_g_free0 (_tmp6_);
#line 205 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return;
-#line 1233 "ViewCollection.c"
+#line 1471 "ViewCollection.c"
}
#line 208 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
DATA_COLLECTION_CLASS (view_collection_parent_class)->clear (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection));
-#line 1237 "ViewCollection.c"
+#line 1475 "ViewCollection.c"
}
-static void _view_collection_on_view_filter_refresh_view_filter_refresh (ViewFilter* _sender, gpointer self) {
+static void
+_view_collection_on_view_filter_refresh_view_filter_refresh (ViewFilter* _sender,
+ gpointer self)
+{
#line 215 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
view_collection_on_view_filter_refresh ((ViewCollection*) self);
-#line 1244 "ViewCollection.c"
+#line 1485 "ViewCollection.c"
}
-static void view_collection_real_close (DataCollection* base) {
+static void
+view_collection_real_close (DataCollection* base)
+{
ViewCollection * self;
- GeeSet* _tmp8_;
+ GeeSet* _tmp7_;
#line 211 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIEW_COLLECTION, ViewCollection);
#line 212 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
view_collection_halt_all_monitoring (self);
#line 213 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
view_collection_halt_mirroring (self);
-#line 1257 "ViewCollection.c"
+#line 1500 "ViewCollection.c"
{
GeeIterator* _f_it = NULL;
GeeSet* _tmp0_;
@@ -1267,66 +1510,66 @@ static void view_collection_real_close (DataCollection* base) {
_f_it = _tmp1_;
#line 214 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
while (TRUE) {
-#line 1270 "ViewCollection.c"
+#line 1513 "ViewCollection.c"
GeeIterator* _tmp2_;
- gboolean _tmp3_;
ViewFilter* f = NULL;
- GeeIterator* _tmp4_;
- gpointer _tmp5_;
- ViewFilter* _tmp6_;
- guint _tmp7_;
+ GeeIterator* _tmp3_;
+ gpointer _tmp4_;
+ ViewFilter* _tmp5_;
+ guint _tmp6_;
#line 214 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp2_ = _f_it;
#line 214 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp3_ = gee_iterator_next (_tmp2_);
-#line 214 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- if (!_tmp3_) {
+ if (!gee_iterator_next (_tmp2_)) {
#line 214 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
break;
-#line 1286 "ViewCollection.c"
+#line 1526 "ViewCollection.c"
}
#line 214 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp4_ = _f_it;
+ _tmp3_ = _f_it;
#line 214 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp5_ = gee_iterator_get (_tmp4_);
+ _tmp4_ = gee_iterator_get (_tmp3_);
#line 214 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- f = (ViewFilter*) _tmp5_;
+ f = (ViewFilter*) _tmp4_;
#line 215 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp6_ = f;
+ _tmp5_ = f;
#line 215 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- g_signal_parse_name ("refresh", TYPE_VIEW_FILTER, &_tmp7_, NULL, FALSE);
+ g_signal_parse_name ("refresh", TYPE_VIEW_FILTER, &_tmp6_, NULL, FALSE);
#line 215 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- g_signal_handlers_disconnect_matched (_tmp6_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp7_, 0, NULL, (GCallback) _view_collection_on_view_filter_refresh_view_filter_refresh, self);
+ g_signal_handlers_disconnect_matched (_tmp5_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp6_, 0, NULL, (GCallback) _view_collection_on_view_filter_refresh_view_filter_refresh, self);
#line 214 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_view_filter_unref0 (f);
-#line 1302 "ViewCollection.c"
+#line 1542 "ViewCollection.c"
}
#line 214 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (_f_it);
-#line 1306 "ViewCollection.c"
+#line 1546 "ViewCollection.c"
}
#line 216 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp8_ = self->priv->filters;
+ _tmp7_ = self->priv->filters;
#line 216 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- gee_collection_clear (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_COLLECTION, GeeCollection));
+ gee_collection_clear (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_COLLECTION, GeeCollection));
#line 218 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
DATA_COLLECTION_CLASS (view_collection_parent_class)->close (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection));
-#line 1314 "ViewCollection.c"
+#line 1554 "ViewCollection.c"
}
-ViewCollectionMonitor* view_collection_monitor_source_collection (ViewCollection* self, SourceCollection* sources, ViewManager* manager, Alteration* prereq, GeeCollection* initial, ProgressMonitor progress_monitor, void* progress_monitor_target) {
+ViewCollectionMonitor*
+view_collection_monitor_source_collection (ViewCollection* self,
+ SourceCollection* sources,
+ ViewManager* manager,
+ Alteration* prereq,
+ GeeCollection* initial,
+ ProgressMonitor progress_monitor,
+ void* progress_monitor_target)
+{
ViewCollectionMonitor* result = NULL;
ViewCollectionMonitorImpl* monitor = NULL;
- SourceCollection* _tmp0_;
- ViewManager* _tmp1_;
- Alteration* _tmp2_;
- ViewCollectionMonitorImpl* _tmp3_;
- GeeHashMultiMap* _tmp4_;
- SourceCollection* _tmp5_;
- ViewCollectionMonitorImpl* _tmp6_;
- gboolean _tmp7_ = FALSE;
- GeeCollection* _tmp8_;
+ ViewCollectionMonitorImpl* _tmp0_;
+ GeeHashMultiMap* _tmp1_;
+ ViewCollectionMonitorImpl* _tmp2_;
+ gboolean _tmp3_ = FALSE;
#line 221 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_val_if_fail (IS_VIEW_COLLECTION (self), NULL);
#line 221 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -1342,160 +1585,120 @@ ViewCollectionMonitor* view_collection_monitor_source_collection (ViewCollection
#line 227 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
data_collection_freeze_notifications (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection));
#line 230 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp0_ = sources;
-#line 230 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp1_ = manager;
-#line 230 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp2_ = prereq;
+ _tmp0_ = view_collection_monitor_impl_new (self, sources, manager, prereq);
#line 230 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp3_ = view_collection_monitor_impl_new (self, _tmp0_, _tmp1_, _tmp2_);
-#line 230 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- monitor = _tmp3_;
-#line 231 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp4_ = self->priv->monitors;
+ monitor = _tmp0_;
#line 231 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp5_ = sources;
+ _tmp1_ = self->priv->monitors;
#line 231 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp6_ = monitor;
+ _tmp2_ = monitor;
#line 231 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- gee_multi_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_MULTI_MAP, GeeMultiMap), _tmp5_, _tmp6_);
+ gee_multi_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_MULTI_MAP, GeeMultiMap), sources, _tmp2_);
#line 233 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp8_ = initial;
-#line 233 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- if (_tmp8_ != NULL) {
-#line 1366 "ViewCollection.c"
- GeeCollection* _tmp9_;
- gint _tmp10_;
- gint _tmp11_;
-#line 233 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp9_ = initial;
+ if (initial != NULL) {
+#line 1599 "ViewCollection.c"
+ gint _tmp4_;
+ gint _tmp5_;
#line 233 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp10_ = gee_collection_get_size (_tmp9_);
+ _tmp4_ = gee_collection_get_size (initial);
#line 233 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp11_ = _tmp10_;
+ _tmp5_ = _tmp4_;
#line 233 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp7_ = _tmp11_ > 0;
-#line 1378 "ViewCollection.c"
+ _tmp3_ = _tmp5_ > 0;
+#line 1608 "ViewCollection.c"
} else {
#line 233 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp7_ = FALSE;
-#line 1382 "ViewCollection.c"
+ _tmp3_ = FALSE;
+#line 1612 "ViewCollection.c"
}
#line 233 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- if (_tmp7_) {
-#line 1386 "ViewCollection.c"
+ if (_tmp3_) {
+#line 1616 "ViewCollection.c"
GeeArrayList* created_views = NULL;
- GeeArrayList* _tmp12_;
- GeeArrayList* _tmp24_;
- ProgressMonitor _tmp25_;
- void* _tmp25__target;
- GeeCollection* _tmp26_;
- GeeCollection* _tmp27_;
+ GeeArrayList* _tmp6_;
+ GeeArrayList* _tmp15_;
+ GeeCollection* _tmp16_;
+ GeeCollection* _tmp17_;
#line 235 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp12_ = gee_array_list_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
+ _tmp6_ = gee_array_list_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
#line 235 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- created_views = _tmp12_;
-#line 1398 "ViewCollection.c"
+ created_views = _tmp6_;
+#line 1626 "ViewCollection.c"
{
GeeIterator* _source_it = NULL;
- GeeCollection* _tmp13_;
- GeeIterator* _tmp14_;
-#line 236 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp13_ = initial;
+ GeeIterator* _tmp7_;
#line 236 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp14_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_ITERABLE, GeeIterable));
+ _tmp7_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (initial, GEE_TYPE_ITERABLE, GeeIterable));
#line 236 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _source_it = _tmp14_;
+ _source_it = _tmp7_;
#line 236 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
while (TRUE) {
-#line 1411 "ViewCollection.c"
- GeeIterator* _tmp15_;
- gboolean _tmp16_;
+#line 1636 "ViewCollection.c"
+ GeeIterator* _tmp8_;
DataSource* source = NULL;
- GeeIterator* _tmp17_;
- gpointer _tmp18_;
- GeeArrayList* _tmp19_;
- ViewManager* _tmp20_;
- DataSource* _tmp21_;
- DataView* _tmp22_;
- DataView* _tmp23_;
-#line 236 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp15_ = _source_it;
+ GeeIterator* _tmp9_;
+ gpointer _tmp10_;
+ GeeArrayList* _tmp11_;
+ DataSource* _tmp12_;
+ DataView* _tmp13_;
+ DataView* _tmp14_;
#line 236 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp16_ = gee_iterator_next (_tmp15_);
+ _tmp8_ = _source_it;
#line 236 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- if (!_tmp16_) {
+ if (!gee_iterator_next (_tmp8_)) {
#line 236 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
break;
-#line 1430 "ViewCollection.c"
+#line 1651 "ViewCollection.c"
}
#line 236 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp17_ = _source_it;
+ _tmp9_ = _source_it;
#line 236 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp18_ = gee_iterator_get (_tmp17_);
+ _tmp10_ = gee_iterator_get (_tmp9_);
#line 236 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- source = (DataSource*) _tmp18_;
-#line 237 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp19_ = created_views;
+ source = (DataSource*) _tmp10_;
#line 237 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp20_ = manager;
+ _tmp11_ = created_views;
#line 237 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp21_ = source;
+ _tmp12_ = source;
#line 237 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp22_ = view_manager_create_view (_tmp20_, _tmp21_);
+ _tmp13_ = view_manager_create_view (manager, _tmp12_);
#line 237 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp23_ = _tmp22_;
+ _tmp14_ = _tmp13_;
#line 237 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp23_);
+ gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp14_);
#line 237 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _g_object_unref0 (_tmp23_);
+ _g_object_unref0 (_tmp14_);
#line 236 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (source);
-#line 1454 "ViewCollection.c"
+#line 1673 "ViewCollection.c"
}
#line 236 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (_source_it);
-#line 1458 "ViewCollection.c"
+#line 1677 "ViewCollection.c"
}
#line 239 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp24_ = created_views;
-#line 239 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp25_ = progress_monitor;
-#line 239 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp25__target = progress_monitor_target;
+ _tmp15_ = created_views;
#line 239 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp26_ = data_collection_add_many (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GEE_TYPE_COLLECTION, GeeCollection), _tmp25_, _tmp25__target);
+ _tmp16_ = data_collection_add_many (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GEE_TYPE_COLLECTION, GeeCollection), progress_monitor, progress_monitor_target);
#line 239 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp27_ = _tmp26_;
+ _tmp17_ = _tmp16_;
#line 239 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _g_object_unref0 (_tmp27_);
+ _g_object_unref0 (_tmp17_);
#line 233 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (created_views);
-#line 1474 "ViewCollection.c"
+#line 1689 "ViewCollection.c"
} else {
- SourceCollection* _tmp28_;
- SourceCollection* _tmp29_;
- GeeCollection* _tmp30_;
- GeeIterable* _tmp31_;
- ProgressMonitor _tmp32_;
- void* _tmp32__target;
-#line 242 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp28_ = sources;
-#line 242 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp29_ = sources;
-#line 242 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp30_ = data_collection_get_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, TYPE_DATA_COLLECTION, DataCollection));
-#line 242 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp31_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, GEE_TYPE_ITERABLE, GeeIterable);
+ GeeCollection* _tmp18_;
+ GeeIterable* _tmp19_;
#line 242 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp32_ = progress_monitor;
+ _tmp18_ = data_collection_get_all (G_TYPE_CHECK_INSTANCE_CAST (sources, TYPE_DATA_COLLECTION, DataCollection));
#line 242 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp32__target = progress_monitor_target;
+ _tmp19_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_ITERABLE, GeeIterable);
#line 242 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- view_collection_add_sources (self, _tmp28_, _tmp31_, _tmp32_, _tmp32__target);
+ view_collection_add_sources (self, sources, _tmp19_, progress_monitor, progress_monitor_target);
#line 242 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _g_object_unref0 (_tmp31_);
-#line 1498 "ViewCollection.c"
+ _g_object_unref0 (_tmp19_);
+#line 1701 "ViewCollection.c"
}
#line 245 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
data_collection_thaw_notifications (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection));
@@ -1503,52 +1706,53 @@ ViewCollectionMonitor* view_collection_monitor_source_collection (ViewCollection
result = G_TYPE_CHECK_INSTANCE_CAST (monitor, VIEW_COLLECTION_TYPE_MONITOR, ViewCollectionMonitor);
#line 247 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return result;
-#line 1506 "ViewCollection.c"
+#line 1709 "ViewCollection.c"
}
-static gpointer _view_collection_monitor_ref0 (gpointer self) {
+static gpointer
+_view_collection_monitor_ref0 (gpointer self)
+{
#line 251 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return self ? view_collection_monitor_ref (self) : NULL;
-#line 1513 "ViewCollection.c"
+#line 1718 "ViewCollection.c"
}
-void view_collection_halt_monitoring (ViewCollection* self, ViewCollectionMonitor* m) {
+void
+view_collection_halt_monitoring (ViewCollection* self,
+ ViewCollectionMonitor* m)
+{
ViewCollectionMonitorImpl* monitor = NULL;
- ViewCollectionMonitor* _tmp0_;
- ViewCollectionMonitorImpl* _tmp1_;
+ ViewCollectionMonitorImpl* _tmp0_;
gboolean removed = FALSE;
- GeeHashMultiMap* _tmp2_;
- SourceCollection* _tmp3_;
- gboolean _tmp4_;
+ GeeHashMultiMap* _tmp1_;
+ SourceCollection* _tmp2_;
#line 250 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_if_fail (IS_VIEW_COLLECTION (self));
#line 250 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_if_fail (VIEW_COLLECTION_IS_MONITOR (m));
#line 251 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp0_ = m;
-#line 251 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp1_ = _view_collection_monitor_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, VIEW_COLLECTION_TYPE_MONITOR_IMPL, ViewCollectionMonitorImpl));
+ _tmp0_ = _view_collection_monitor_ref0 (G_TYPE_CHECK_INSTANCE_CAST (m, VIEW_COLLECTION_TYPE_MONITOR_IMPL, ViewCollectionMonitorImpl));
#line 251 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- monitor = _tmp1_;
+ monitor = _tmp0_;
#line 253 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp2_ = self->priv->monitors;
-#line 253 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp3_ = monitor->sources;
+ _tmp1_ = self->priv->monitors;
#line 253 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp4_ = gee_multi_map_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_MULTI_MAP, GeeMultiMap), _tmp3_, monitor);
+ _tmp2_ = monitor->sources;
#line 253 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- removed = _tmp4_;
+ removed = gee_multi_map_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_MULTI_MAP, GeeMultiMap), _tmp2_, monitor);
#line 254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_vala_assert (removed, "removed");
#line 250 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_view_collection_monitor_unref0 (monitor);
-#line 1547 "ViewCollection.c"
+#line 1749 "ViewCollection.c"
}
-void view_collection_halt_all_monitoring (ViewCollection* self) {
+void
+view_collection_halt_all_monitoring (ViewCollection* self)
+{
GeeHashMultiMap* _tmp0_;
#line 257 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_if_fail (IS_VIEW_COLLECTION (self));
@@ -1556,49 +1760,59 @@ void view_collection_halt_all_monitoring (ViewCollection* self) {
_tmp0_ = self->priv->monitors;
#line 258 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
gee_multi_map_clear (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_MULTI_MAP, GeeMultiMap));
-#line 1559 "ViewCollection.c"
+#line 1763 "ViewCollection.c"
}
-static gpointer _data_collection_ref0 (gpointer self) {
+static gpointer
+_data_collection_ref0 (gpointer self)
+{
#line 267 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return self ? data_collection_ref (self) : NULL;
-#line 1566 "ViewCollection.c"
+#line 1772 "ViewCollection.c"
}
-static void _view_collection_on_mirror_contents_added_data_collection_items_added (DataCollection* _sender, GeeIterable* added, gpointer self) {
+static void
+_view_collection_on_mirror_contents_added_data_collection_items_added (DataCollection* _sender,
+ GeeIterable* added,
+ gpointer self)
+{
#line 275 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
view_collection_on_mirror_contents_added ((ViewCollection*) self, added);
-#line 1573 "ViewCollection.c"
+#line 1783 "ViewCollection.c"
}
-static void _view_collection_on_mirror_contents_removed_data_collection_items_removed (DataCollection* _sender, GeeIterable* removed, gpointer self) {
+static void
+_view_collection_on_mirror_contents_removed_data_collection_items_removed (DataCollection* _sender,
+ GeeIterable* removed,
+ gpointer self)
+{
#line 276 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
view_collection_on_mirror_contents_removed ((ViewCollection*) self, removed);
-#line 1580 "ViewCollection.c"
+#line 1794 "ViewCollection.c"
}
-void view_collection_mirror (ViewCollection* self, ViewCollection* to_mirror, CreateView mirroring_ctor, void* mirroring_ctor_target, CreateViewPredicate should_mirror, void* should_mirror_target) {
+void
+view_collection_mirror (ViewCollection* self,
+ ViewCollection* to_mirror,
+ CreateView mirroring_ctor,
+ void* mirroring_ctor_target,
+ CreateViewPredicate should_mirror,
+ void* should_mirror_target)
+{
ViewCollection* _tmp0_;
- ViewCollection* _tmp1_;
- CreateView _tmp2_;
- void* _tmp2__target;
- CreateViewPredicate _tmp3_;
- void* _tmp3__target;
- ViewCollection* _tmp4_;
- void* _tmp5_;
- Comparator _tmp6_;
- ViewCollection* _tmp7_;
- void* _tmp8_;
- ComparatorPredicate _tmp9_;
- ViewCollection* _tmp10_;
- GeeCollection* _tmp11_;
- GeeCollection* _tmp12_;
- ViewCollection* _tmp13_;
- ViewCollection* _tmp14_;
+ void* _tmp1_;
+ Comparator _tmp2_;
+ void* _tmp3_;
+ ComparatorPredicate _tmp4_;
+ ViewCollection* _tmp5_;
+ GeeCollection* _tmp6_;
+ GeeCollection* _tmp7_;
+ ViewCollection* _tmp8_;
+ ViewCollection* _tmp9_;
#line 261 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_if_fail (IS_VIEW_COLLECTION (self));
#line 261 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -1610,62 +1824,50 @@ void view_collection_mirror (ViewCollection* self, ViewCollection* to_mirror, Cr
#line 265 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
data_collection_clear (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection));
#line 267 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp0_ = to_mirror;
-#line 267 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp1_ = _data_collection_ref0 (_tmp0_);
+ _tmp0_ = _data_collection_ref0 (to_mirror);
#line 267 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_data_collection_unref0 (self->priv->mirroring);
#line 267 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- self->priv->mirroring = _tmp1_;
-#line 268 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp2_ = mirroring_ctor;
+ self->priv->mirroring = _tmp0_;
#line 268 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp2__target = mirroring_ctor_target;
+ self->priv->mirroring_ctor = mirroring_ctor;
#line 268 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- self->priv->mirroring_ctor = _tmp2_;
-#line 268 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- self->priv->mirroring_ctor_target = _tmp2__target;
-#line 269 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp3_ = should_mirror;
-#line 269 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp3__target = should_mirror_target;
+ self->priv->mirroring_ctor_target = mirroring_ctor_target;
#line 269 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- self->priv->should_mirror = _tmp3_;
+ self->priv->should_mirror = should_mirror;
#line 269 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- self->priv->should_mirror_target = _tmp3__target;
-#line 270 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp4_ = to_mirror;
-#line 270 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp6_ = data_collection_get_comparator (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_DATA_COLLECTION, DataCollection), &_tmp5_);
+ self->priv->should_mirror_target = should_mirror_target;
#line 270 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp7_ = to_mirror;
+ _tmp2_ = data_collection_get_comparator (G_TYPE_CHECK_INSTANCE_CAST (to_mirror, TYPE_DATA_COLLECTION, DataCollection), &_tmp1_);
#line 270 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp9_ = data_collection_get_comparator_predicate (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_DATA_COLLECTION, DataCollection), &_tmp8_);
+ _tmp4_ = data_collection_get_comparator_predicate (G_TYPE_CHECK_INSTANCE_CAST (to_mirror, TYPE_DATA_COLLECTION, DataCollection), &_tmp3_);
#line 270 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- data_collection_set_comparator (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), _tmp6_, _tmp5_, _tmp9_, _tmp8_);
+ data_collection_set_comparator (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), _tmp2_, _tmp1_, _tmp4_, _tmp3_);
#line 273 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp10_ = self->priv->mirroring;
+ _tmp5_ = self->priv->mirroring;
#line 273 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp11_ = data_collection_get_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_DATA_COLLECTION, DataCollection));
+ _tmp6_ = data_collection_get_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_DATA_COLLECTION, DataCollection));
#line 273 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp12_ = _tmp11_;
+ _tmp7_ = _tmp6_;
#line 273 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- view_collection_on_mirror_contents_added (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_ITERABLE, GeeIterable));
+ view_collection_on_mirror_contents_added (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ITERABLE, GeeIterable));
#line 273 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _g_object_unref0 (_tmp12_);
+ _g_object_unref0 (_tmp7_);
#line 275 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp13_ = self->priv->mirroring;
+ _tmp8_ = self->priv->mirroring;
#line 275 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_DATA_COLLECTION, DataCollection), "items-added", (GCallback) _view_collection_on_mirror_contents_added_data_collection_items_added, self);
+ g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_COLLECTION, DataCollection), "items-added", (GCallback) _view_collection_on_mirror_contents_added_data_collection_items_added, self);
#line 276 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp14_ = self->priv->mirroring;
+ _tmp9_ = self->priv->mirroring;
#line 276 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_DATA_COLLECTION, DataCollection), "items-removed", (GCallback) _view_collection_on_mirror_contents_removed_data_collection_items_removed, self);
-#line 1664 "ViewCollection.c"
+ g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_DATA_COLLECTION, DataCollection), "items-removed", (GCallback) _view_collection_on_mirror_contents_removed_data_collection_items_removed, self);
+#line 1864 "ViewCollection.c"
}
-void view_collection_halt_mirroring (ViewCollection* self) {
+void
+view_collection_halt_mirroring (ViewCollection* self)
+{
ViewCollection* _tmp0_;
#line 279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_if_fail (IS_VIEW_COLLECTION (self));
@@ -1673,7 +1875,7 @@ void view_collection_halt_mirroring (ViewCollection* self) {
_tmp0_ = self->priv->mirroring;
#line 280 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (_tmp0_ != NULL) {
-#line 1676 "ViewCollection.c"
+#line 1878 "ViewCollection.c"
ViewCollection* _tmp1_;
guint _tmp2_;
ViewCollection* _tmp3_;
@@ -1690,22 +1892,29 @@ void view_collection_halt_mirroring (ViewCollection* self) {
g_signal_parse_name ("items-removed", TYPE_DATA_COLLECTION, &_tmp4_, NULL, FALSE);
#line 282 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_DATA_COLLECTION, DataCollection), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp4_, 0, NULL, (GCallback) _view_collection_on_mirror_contents_removed_data_collection_items_removed, self);
-#line 1693 "ViewCollection.c"
+#line 1895 "ViewCollection.c"
}
#line 285 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_data_collection_unref0 (self->priv->mirroring);
#line 285 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
self->priv->mirroring = NULL;
-#line 1699 "ViewCollection.c"
+#line 1901 "ViewCollection.c"
}
-void view_collection_copy_into (ViewCollection* self, ViewCollection* to_copy, CreateView copying_ctor, void* copying_ctor_target, CreateViewPredicate should_copy, void* should_copy_target) {
+void
+view_collection_copy_into (ViewCollection* self,
+ ViewCollection* to_copy,
+ CreateView copying_ctor,
+ void* copying_ctor_target,
+ CreateViewPredicate should_copy,
+ void* should_copy_target)
+{
GeeArrayList* copy_view = NULL;
GeeArrayList* _tmp0_;
- GeeArrayList* _tmp25_;
- GeeCollection* _tmp26_;
- GeeCollection* _tmp27_;
+ GeeArrayList* _tmp20_;
+ GeeCollection* _tmp21_;
+ GeeCollection* _tmp22_;
#line 288 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_if_fail (IS_VIEW_COLLECTION (self));
#line 288 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -1714,148 +1923,128 @@ void view_collection_copy_into (ViewCollection* self, ViewCollection* to_copy, C
_tmp0_ = gee_array_list_new (TYPE_DATA_OBJECT, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
#line 291 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
copy_view = _tmp0_;
-#line 1717 "ViewCollection.c"
+#line 1926 "ViewCollection.c"
{
GeeIterator* _object_it = NULL;
- ViewCollection* _tmp1_;
+ GeeCollection* _tmp1_;
GeeCollection* _tmp2_;
- GeeCollection* _tmp3_;
+ GeeIterator* _tmp3_;
GeeIterator* _tmp4_;
- GeeIterator* _tmp5_;
-#line 292 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp1_ = to_copy;
#line 292 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp2_ = data_collection_get_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_COLLECTION, DataCollection));
+ _tmp1_ = data_collection_get_all (G_TYPE_CHECK_INSTANCE_CAST (to_copy, TYPE_DATA_COLLECTION, DataCollection));
#line 292 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp3_ = _tmp2_;
+ _tmp2_ = _tmp1_;
#line 292 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp4_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ITERABLE, GeeIterable));
+ _tmp3_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ITERABLE, GeeIterable));
#line 292 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp5_ = _tmp4_;
+ _tmp4_ = _tmp3_;
#line 292 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _g_object_unref0 (_tmp3_);
+ _g_object_unref0 (_tmp2_);
#line 292 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _object_it = _tmp5_;
+ _object_it = _tmp4_;
#line 292 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
while (TRUE) {
-#line 1741 "ViewCollection.c"
- GeeIterator* _tmp6_;
- gboolean _tmp7_;
+#line 1947 "ViewCollection.c"
+ GeeIterator* _tmp5_;
DataObject* object = NULL;
- GeeIterator* _tmp8_;
- gpointer _tmp9_;
+ GeeIterator* _tmp6_;
+ gpointer _tmp7_;
DataView* view = NULL;
- DataObject* _tmp10_;
- DataView* _tmp11_;
- CreateViewPredicate _tmp12_;
- void* _tmp12__target;
- DataView* _tmp13_;
- DataSource* _tmp14_;
- DataSource* _tmp15_;
- gboolean _tmp16_;
- gboolean _tmp17_;
-#line 292 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp6_ = _object_it;
+ DataObject* _tmp8_;
+ DataView* _tmp9_;
+ DataView* _tmp10_;
+ DataSource* _tmp11_;
+ DataSource* _tmp12_;
+ gboolean _tmp13_;
#line 292 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp7_ = gee_iterator_next (_tmp6_);
+ _tmp5_ = _object_it;
#line 292 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- if (!_tmp7_) {
+ if (!gee_iterator_next (_tmp5_)) {
#line 292 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
break;
-#line 1765 "ViewCollection.c"
+#line 1965 "ViewCollection.c"
}
#line 292 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp8_ = _object_it;
+ _tmp6_ = _object_it;
#line 292 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp9_ = gee_iterator_get (_tmp8_);
+ _tmp7_ = gee_iterator_get (_tmp6_);
#line 292 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- object = (DataObject*) _tmp9_;
+ object = (DataObject*) _tmp7_;
#line 293 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp10_ = object;
+ _tmp8_ = object;
#line 293 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp11_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_DATA_VIEW, DataView));
+ _tmp9_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_VIEW, DataView));
#line 293 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- view = _tmp11_;
-#line 294 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp12_ = should_copy;
-#line 294 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp12__target = should_copy_target;
-#line 294 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp13_ = view;
+ view = _tmp9_;
#line 294 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp14_ = data_view_get_source (_tmp13_);
+ _tmp10_ = view;
#line 294 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp15_ = _tmp14_;
+ _tmp11_ = data_view_get_source (_tmp10_);
#line 294 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp16_ = _tmp12_ (_tmp15_, _tmp12__target);
+ _tmp12_ = _tmp11_;
#line 294 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp17_ = _tmp16_;
+ _tmp13_ = should_copy (_tmp12_, should_copy_target);
#line 294 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _g_object_unref0 (_tmp15_);
+ _g_object_unref0 (_tmp12_);
#line 294 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- if (_tmp17_) {
-#line 1797 "ViewCollection.c"
- GeeArrayList* _tmp18_;
- CreateView _tmp19_;
- void* _tmp19__target;
- DataView* _tmp20_;
- DataSource* _tmp21_;
- DataSource* _tmp22_;
- DataView* _tmp23_;
- DataView* _tmp24_;
-#line 295 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp18_ = copy_view;
-#line 295 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp19_ = copying_ctor;
+ if (_tmp13_) {
+#line 1991 "ViewCollection.c"
+ GeeArrayList* _tmp14_;
+ DataView* _tmp15_;
+ DataSource* _tmp16_;
+ DataSource* _tmp17_;
+ DataView* _tmp18_;
+ DataView* _tmp19_;
#line 295 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp19__target = copying_ctor_target;
+ _tmp14_ = copy_view;
#line 295 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp20_ = view;
+ _tmp15_ = view;
#line 295 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp21_ = data_view_get_source (_tmp20_);
+ _tmp16_ = data_view_get_source (_tmp15_);
#line 295 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp22_ = _tmp21_;
+ _tmp17_ = _tmp16_;
#line 295 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp23_ = _tmp19_ (_tmp22_, _tmp19__target);
+ _tmp18_ = copying_ctor (_tmp17_, copying_ctor_target);
#line 295 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp24_ = _tmp23_;
+ _tmp19_ = _tmp18_;
#line 295 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, TYPE_DATA_OBJECT, DataObject));
+ gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, TYPE_DATA_OBJECT, DataObject));
#line 295 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _g_object_unref0 (_tmp24_);
+ _g_object_unref0 (_tmp19_);
#line 295 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _g_object_unref0 (_tmp22_);
-#line 1828 "ViewCollection.c"
+ _g_object_unref0 (_tmp17_);
+#line 2016 "ViewCollection.c"
}
#line 292 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (view);
#line 292 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (object);
-#line 1834 "ViewCollection.c"
+#line 2022 "ViewCollection.c"
}
#line 292 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (_object_it);
-#line 1838 "ViewCollection.c"
+#line 2026 "ViewCollection.c"
}
#line 298 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp25_ = copy_view;
+ _tmp20_ = copy_view;
#line 298 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp26_ = data_collection_add_many (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, GEE_TYPE_COLLECTION, GeeCollection), NULL, NULL);
+ _tmp21_ = data_collection_add_many (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, GEE_TYPE_COLLECTION, GeeCollection), NULL, NULL);
#line 298 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp27_ = _tmp26_;
+ _tmp22_ = _tmp21_;
#line 298 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _g_object_unref0 (_tmp27_);
+ _g_object_unref0 (_tmp22_);
#line 288 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (copy_view);
-#line 1850 "ViewCollection.c"
+#line 2038 "ViewCollection.c"
}
-gboolean view_collection_is_view_filter_installed (ViewCollection* self, ViewFilter* f) {
+gboolean
+view_collection_is_view_filter_installed (ViewCollection* self,
+ ViewFilter* f)
+{
gboolean result = FALSE;
GeeSet* _tmp0_;
- ViewFilter* _tmp1_;
- gboolean _tmp2_;
#line 301 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_val_if_fail (IS_VIEW_COLLECTION (self), FALSE);
#line 301 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -1863,103 +2052,77 @@ gboolean view_collection_is_view_filter_installed (ViewCollection* self, ViewFil
#line 302 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp0_ = self->priv->filters;
#line 302 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp1_ = f;
-#line 302 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp2_ = gee_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection), _tmp1_);
-#line 302 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- result = _tmp2_;
+ result = gee_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection), f);
#line 302 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return result;
-#line 1873 "ViewCollection.c"
+#line 2058 "ViewCollection.c"
}
-void view_collection_install_view_filter (ViewCollection* self, ViewFilter* f) {
- ViewFilter* _tmp0_;
- gboolean _tmp1_;
- GeeSet* _tmp2_;
- ViewFilter* _tmp3_;
- ViewFilter* _tmp4_;
- ViewFilter* _tmp5_;
+void
+view_collection_install_view_filter (ViewCollection* self,
+ ViewFilter* f)
+{
+ GeeSet* _tmp0_;
#line 305 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_if_fail (IS_VIEW_COLLECTION (self));
#line 305 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_if_fail (IS_VIEW_FILTER (f));
#line 306 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp0_ = f;
-#line 306 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp1_ = view_collection_is_view_filter_installed (self, _tmp0_);
-#line 306 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- if (_tmp1_) {
+ if (view_collection_is_view_filter_installed (self, f)) {
#line 307 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return;
-#line 1896 "ViewCollection.c"
+#line 2075 "ViewCollection.c"
}
#line 309 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp2_ = self->priv->filters;
-#line 309 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp3_ = f;
+ _tmp0_ = self->priv->filters;
#line 309 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection), _tmp3_);
+ gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection), f);
#line 310 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp4_ = f;
-#line 310 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- g_signal_connect (_tmp4_, "refresh", (GCallback) _view_collection_on_view_filter_refresh_view_filter_refresh, self);
+ g_signal_connect (f, "refresh", (GCallback) _view_collection_on_view_filter_refresh_view_filter_refresh, self);
#line 313 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
view_collection_on_view_filter_refresh (self);
#line 316 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp5_ = f;
-#line 316 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- view_collection_notify_view_filter_installed (self, _tmp5_);
-#line 1914 "ViewCollection.c"
+ view_collection_notify_view_filter_installed (self, f);
+#line 2087 "ViewCollection.c"
}
-void view_collection_remove_view_filter (ViewCollection* self, ViewFilter* f) {
- ViewFilter* _tmp0_;
- gboolean _tmp1_;
- GeeSet* _tmp2_;
- ViewFilter* _tmp3_;
- ViewFilter* _tmp4_;
- guint _tmp5_;
- ViewFilter* _tmp6_;
+void
+view_collection_remove_view_filter (ViewCollection* self,
+ ViewFilter* f)
+{
+ GeeSet* _tmp0_;
+ guint _tmp1_;
#line 319 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_if_fail (IS_VIEW_COLLECTION (self));
#line 319 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_if_fail (IS_VIEW_FILTER (f));
#line 320 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp0_ = f;
-#line 320 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp1_ = view_collection_is_view_filter_installed (self, _tmp0_);
-#line 320 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- if (!_tmp1_) {
+ if (!view_collection_is_view_filter_installed (self, f)) {
#line 321 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return;
-#line 1938 "ViewCollection.c"
+#line 2105 "ViewCollection.c"
}
#line 323 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp2_ = self->priv->filters;
-#line 323 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp3_ = f;
+ _tmp0_ = self->priv->filters;
#line 323 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- gee_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection), _tmp3_);
-#line 324 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp4_ = f;
+ gee_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection), f);
#line 324 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- g_signal_parse_name ("refresh", TYPE_VIEW_FILTER, &_tmp5_, NULL, FALSE);
+ g_signal_parse_name ("refresh", TYPE_VIEW_FILTER, &_tmp1_, NULL, FALSE);
#line 324 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- g_signal_handlers_disconnect_matched (_tmp4_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp5_, 0, NULL, (GCallback) _view_collection_on_view_filter_refresh_view_filter_refresh, self);
+ g_signal_handlers_disconnect_matched (f, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _view_collection_on_view_filter_refresh_view_filter_refresh, self);
#line 327 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
view_collection_on_view_filter_refresh (self);
#line 330 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp6_ = f;
-#line 330 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- view_collection_notify_view_filter_removed (self, _tmp6_);
-#line 1958 "ViewCollection.c"
+ view_collection_notify_view_filter_removed (self, f);
+#line 2119 "ViewCollection.c"
}
-static void view_collection_on_view_filter_refresh (ViewCollection* self) {
+static void
+view_collection_on_view_filter_refresh (ViewCollection* self)
+{
GeeCollection* _tmp0_;
GeeCollection* _tmp1_;
#line 333 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -1972,17 +2135,20 @@ static void view_collection_on_view_filter_refresh (ViewCollection* self) {
view_collection_filter_altered_items (self, _tmp1_);
#line 334 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (_tmp1_);
-#line 1975 "ViewCollection.c"
+#line 2138 "ViewCollection.c"
}
-static gboolean view_collection_is_in_filter (ViewCollection* self, DataView* view) {
+static gboolean
+view_collection_is_in_filter (ViewCollection* self,
+ DataView* view)
+{
gboolean result = FALSE;
#line 338 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_val_if_fail (IS_VIEW_COLLECTION (self), FALSE);
#line 338 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_val_if_fail (IS_DATA_VIEW (view), FALSE);
-#line 1985 "ViewCollection.c"
+#line 2151 "ViewCollection.c"
{
GeeIterator* _f_it = NULL;
GeeSet* _tmp0_;
@@ -1995,39 +2161,30 @@ static gboolean view_collection_is_in_filter (ViewCollection* self, DataView* vi
_f_it = _tmp1_;
#line 339 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
while (TRUE) {
-#line 1998 "ViewCollection.c"
+#line 2164 "ViewCollection.c"
GeeIterator* _tmp2_;
- gboolean _tmp3_;
ViewFilter* f = NULL;
- GeeIterator* _tmp4_;
- gpointer _tmp5_;
- ViewFilter* _tmp6_;
- DataView* _tmp7_;
- gboolean _tmp8_;
+ GeeIterator* _tmp3_;
+ gpointer _tmp4_;
+ ViewFilter* _tmp5_;
#line 339 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp2_ = _f_it;
#line 339 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp3_ = gee_iterator_next (_tmp2_);
-#line 339 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- if (!_tmp3_) {
+ if (!gee_iterator_next (_tmp2_)) {
#line 339 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
break;
-#line 2015 "ViewCollection.c"
+#line 2176 "ViewCollection.c"
}
#line 339 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp4_ = _f_it;
+ _tmp3_ = _f_it;
#line 339 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp5_ = gee_iterator_get (_tmp4_);
+ _tmp4_ = gee_iterator_get (_tmp3_);
#line 339 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- f = (ViewFilter*) _tmp5_;
-#line 340 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp6_ = f;
-#line 340 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp7_ = view;
+ f = (ViewFilter*) _tmp4_;
#line 340 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp8_ = view_filter_predicate (_tmp6_, _tmp7_);
+ _tmp5_ = f;
#line 340 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- if (!_tmp8_) {
+ if (!view_filter_predicate (_tmp5_, view)) {
#line 341 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
result = FALSE;
#line 341 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -2036,45 +2193,47 @@ static gboolean view_collection_is_in_filter (ViewCollection* self, DataView* vi
_g_object_unref0 (_f_it);
#line 341 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return result;
-#line 2039 "ViewCollection.c"
+#line 2196 "ViewCollection.c"
}
#line 339 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_view_filter_unref0 (f);
-#line 2043 "ViewCollection.c"
+#line 2200 "ViewCollection.c"
}
#line 339 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (_f_it);
-#line 2047 "ViewCollection.c"
+#line 2204 "ViewCollection.c"
}
#line 343 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
result = TRUE;
#line 343 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return result;
-#line 2053 "ViewCollection.c"
+#line 2210 "ViewCollection.c"
}
-static gboolean view_collection_real_valid_type (DataCollection* base, DataObject* object) {
+static gboolean
+view_collection_real_valid_type (DataCollection* base,
+ DataObject* object)
+{
ViewCollection * self;
gboolean result = FALSE;
- DataObject* _tmp0_;
#line 346 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIEW_COLLECTION, ViewCollection);
#line 346 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_val_if_fail (IS_DATA_OBJECT (object), FALSE);
#line 347 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp0_ = object;
-#line 347 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- result = G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_DATA_VIEW);
+ result = G_TYPE_CHECK_INSTANCE_TYPE (object, TYPE_DATA_VIEW);
#line 347 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return result;
-#line 2071 "ViewCollection.c"
+#line 2228 "ViewCollection.c"
}
-static void view_collection_on_sources_added (ViewCollection* self, DataCollection* sources, GeeIterable* added) {
- DataCollection* _tmp0_;
- GeeIterable* _tmp1_;
+static void
+view_collection_on_sources_added (ViewCollection* self,
+ DataCollection* sources,
+ GeeIterable* added)
+{
#line 350 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_if_fail (IS_VIEW_COLLECTION (self));
#line 350 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -2082,28 +2241,33 @@ static void view_collection_on_sources_added (ViewCollection* self, DataCollecti
#line 350 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_if_fail (GEE_IS_ITERABLE (added));
#line 351 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp0_ = sources;
-#line 351 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp1_ = added;
-#line 351 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- view_collection_add_sources (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_SOURCE_COLLECTION, SourceCollection), _tmp1_, NULL, NULL);
-#line 2090 "ViewCollection.c"
+ view_collection_add_sources (self, G_TYPE_CHECK_INSTANCE_CAST (sources, TYPE_SOURCE_COLLECTION, SourceCollection), added, NULL, NULL);
+#line 2245 "ViewCollection.c"
}
-static DataView* _view_manager_create_view_create_view (DataSource* source, gpointer self) {
+static DataView*
+_view_manager_create_view_create_view (DataSource* source,
+ gpointer self)
+{
DataView* result;
result = view_manager_create_view ((ViewManager*) self, source);
#line 364 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return result;
-#line 2099 "ViewCollection.c"
+#line 2257 "ViewCollection.c"
}
-static void view_collection_add_sources (ViewCollection* self, SourceCollection* sources, GeeIterable* added, ProgressMonitor progress_monitor, void* progress_monitor_target) {
+static void
+view_collection_add_sources (ViewCollection* self,
+ SourceCollection* sources,
+ GeeIterable* added,
+ ProgressMonitor progress_monitor,
+ void* progress_monitor_target)
+{
DataView* created_view = NULL;
GeeArrayList* created_views = NULL;
- DataView* _tmp37_;
+ DataView* _tmp32_;
#line 354 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_if_fail (IS_VIEW_COLLECTION (self));
#line 354 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -2114,122 +2278,107 @@ static void view_collection_add_sources (ViewCollection* self, SourceCollection*
created_view = NULL;
#line 359 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
created_views = NULL;
-#line 2117 "ViewCollection.c"
+#line 2281 "ViewCollection.c"
{
GeeIterator* _source_it = NULL;
- GeeIterable* _tmp0_;
- GeeIterator* _tmp1_;
-#line 360 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp0_ = added;
+ GeeIterator* _tmp0_;
#line 360 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp1_ = gee_iterable_iterator (_tmp0_);
+ _tmp0_ = gee_iterable_iterator (added);
#line 360 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _source_it = _tmp1_;
+ _source_it = _tmp0_;
#line 360 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
while (TRUE) {
-#line 2130 "ViewCollection.c"
- GeeIterator* _tmp2_;
- gboolean _tmp3_;
+#line 2291 "ViewCollection.c"
+ GeeIterator* _tmp1_;
DataSource* source = NULL;
- GeeIterator* _tmp4_;
- gpointer _tmp5_;
+ GeeIterator* _tmp2_;
+ gpointer _tmp3_;
CreateView factory = NULL;
void* factory_target;
GDestroyNotify factory_target_destroy_notify;
- CreateView _tmp22_;
- void* _tmp22__target;
-#line 360 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp2_ = _source_it;
+ CreateView _tmp17_;
+ void* _tmp17__target;
#line 360 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp3_ = gee_iterator_next (_tmp2_);
+ _tmp1_ = _source_it;
#line 360 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- if (!_tmp3_) {
+ if (!gee_iterator_next (_tmp1_)) {
#line 360 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
break;
-#line 2149 "ViewCollection.c"
+#line 2307 "ViewCollection.c"
}
#line 360 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp4_ = _source_it;
+ _tmp2_ = _source_it;
#line 360 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp5_ = gee_iterator_get (_tmp4_);
+ _tmp3_ = gee_iterator_get (_tmp2_);
#line 360 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- source = (DataSource*) _tmp5_;
+ source = (DataSource*) _tmp3_;
#line 361 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
factory = NULL;
#line 361 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
factory_target = NULL;
#line 361 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
factory_target_destroy_notify = NULL;
-#line 2163 "ViewCollection.c"
+#line 2321 "ViewCollection.c"
{
GeeIterator* _monitor_it = NULL;
- GeeHashMultiMap* _tmp6_;
- SourceCollection* _tmp7_;
- GeeCollection* _tmp8_;
- GeeCollection* _tmp9_;
- GeeIterator* _tmp10_;
- GeeIterator* _tmp11_;
-#line 362 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp6_ = self->priv->monitors;
+ GeeHashMultiMap* _tmp4_;
+ GeeCollection* _tmp5_;
+ GeeCollection* _tmp6_;
+ GeeIterator* _tmp7_;
+ GeeIterator* _tmp8_;
#line 362 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp7_ = sources;
+ _tmp4_ = self->priv->monitors;
#line 362 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp8_ = gee_multi_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_MULTI_MAP, GeeMultiMap), _tmp7_);
+ _tmp5_ = gee_multi_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_MULTI_MAP, GeeMultiMap), sources);
#line 362 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp9_ = _tmp8_;
+ _tmp6_ = _tmp5_;
#line 362 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp10_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ITERABLE, GeeIterable));
+ _tmp7_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ITERABLE, GeeIterable));
#line 362 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp11_ = _tmp10_;
+ _tmp8_ = _tmp7_;
#line 362 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _g_object_unref0 (_tmp9_);
+ _g_object_unref0 (_tmp6_);
#line 362 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _monitor_it = _tmp11_;
+ _monitor_it = _tmp8_;
#line 362 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
while (TRUE) {
-#line 2190 "ViewCollection.c"
- GeeIterator* _tmp12_;
- gboolean _tmp13_;
+#line 2345 "ViewCollection.c"
+ GeeIterator* _tmp9_;
ViewCollectionMonitorImpl* monitor = NULL;
- GeeIterator* _tmp14_;
- gpointer _tmp15_;
- ViewCollectionMonitorImpl* _tmp16_;
- ViewManager* _tmp17_;
- DataSource* _tmp18_;
- gboolean _tmp19_;
+ GeeIterator* _tmp10_;
+ gpointer _tmp11_;
+ ViewCollectionMonitorImpl* _tmp12_;
+ ViewManager* _tmp13_;
+ DataSource* _tmp14_;
#line 362 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp12_ = _monitor_it;
+ _tmp9_ = _monitor_it;
#line 362 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp13_ = gee_iterator_next (_tmp12_);
-#line 362 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- if (!_tmp13_) {
+ if (!gee_iterator_next (_tmp9_)) {
#line 362 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
break;
-#line 2208 "ViewCollection.c"
+#line 2359 "ViewCollection.c"
}
#line 362 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp14_ = _monitor_it;
+ _tmp10_ = _monitor_it;
#line 362 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp15_ = gee_iterator_get (_tmp14_);
+ _tmp11_ = gee_iterator_get (_tmp10_);
#line 362 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- monitor = (ViewCollectionMonitorImpl*) _tmp15_;
-#line 363 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp16_ = monitor;
+ monitor = (ViewCollectionMonitorImpl*) _tmp11_;
#line 363 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp17_ = _tmp16_->manager;
+ _tmp12_ = monitor;
#line 363 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp18_ = source;
+ _tmp13_ = _tmp12_->manager;
#line 363 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp19_ = view_manager_include_in_view (_tmp17_, _tmp18_);
+ _tmp14_ = source;
#line 363 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- if (_tmp19_) {
-#line 2226 "ViewCollection.c"
- ViewCollectionMonitorImpl* _tmp20_;
- ViewManager* _tmp21_;
+ if (view_manager_include_in_view (_tmp13_, _tmp14_)) {
+#line 2375 "ViewCollection.c"
+ ViewCollectionMonitorImpl* _tmp15_;
+ ViewManager* _tmp16_;
#line 364 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp20_ = monitor;
+ _tmp15_ = monitor;
#line 364 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp21_ = _tmp20_->manager;
+ _tmp16_ = _tmp15_->manager;
#line 364 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
(factory_target_destroy_notify == NULL) ? NULL : (factory_target_destroy_notify (factory_target), NULL);
#line 364 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -2241,112 +2390,112 @@ static void view_collection_add_sources (ViewCollection* self, SourceCollection*
#line 364 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
factory = _view_manager_create_view_create_view;
#line 364 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- factory_target = view_manager_ref (_tmp21_);
+ factory_target = view_manager_ref (_tmp16_);
#line 364 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
factory_target_destroy_notify = view_manager_unref;
#line 366 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_view_collection_monitor_unref0 (monitor);
#line 366 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
break;
-#line 2251 "ViewCollection.c"
+#line 2400 "ViewCollection.c"
}
#line 362 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_view_collection_monitor_unref0 (monitor);
-#line 2255 "ViewCollection.c"
+#line 2404 "ViewCollection.c"
}
#line 362 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (_monitor_it);
-#line 2259 "ViewCollection.c"
+#line 2408 "ViewCollection.c"
}
#line 370 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp22_ = factory;
+ _tmp17_ = factory;
#line 370 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp22__target = factory_target;
+ _tmp17__target = factory_target;
#line 370 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- if (_tmp22_ != NULL) {
-#line 2267 "ViewCollection.c"
+ if (_tmp17_ != NULL) {
+#line 2416 "ViewCollection.c"
DataView* new_view = NULL;
- CreateView _tmp23_;
- void* _tmp23__target;
- DataSource* _tmp24_;
- DataView* _tmp25_;
- GeeArrayList* _tmp26_;
+ CreateView _tmp18_;
+ void* _tmp18__target;
+ DataSource* _tmp19_;
+ DataView* _tmp20_;
+ GeeArrayList* _tmp21_;
#line 371 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp23_ = factory;
+ _tmp18_ = factory;
#line 371 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp23__target = factory_target;
+ _tmp18__target = factory_target;
#line 371 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp24_ = source;
+ _tmp19_ = source;
#line 371 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp25_ = _tmp23_ (_tmp24_, _tmp23__target);
+ _tmp20_ = _tmp18_ (_tmp19_, _tmp18__target);
#line 371 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- new_view = _tmp25_;
+ new_view = _tmp20_;
#line 375 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp26_ = created_views;
+ _tmp21_ = created_views;
#line 375 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- if (_tmp26_ != NULL) {
-#line 2288 "ViewCollection.c"
- GeeArrayList* _tmp27_;
- DataView* _tmp28_;
+ if (_tmp21_ != NULL) {
+#line 2437 "ViewCollection.c"
+ GeeArrayList* _tmp22_;
+ DataView* _tmp23_;
#line 376 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp27_ = created_views;
+ _tmp22_ = created_views;
#line 376 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp28_ = new_view;
+ _tmp23_ = new_view;
#line 376 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp28_);
-#line 2297 "ViewCollection.c"
+ gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp23_);
+#line 2446 "ViewCollection.c"
} else {
- DataView* _tmp29_;
+ DataView* _tmp24_;
#line 377 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp29_ = created_view;
+ _tmp24_ = created_view;
#line 377 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- if (_tmp29_ == NULL) {
-#line 2304 "ViewCollection.c"
- DataView* _tmp30_;
- DataView* _tmp31_;
+ if (_tmp24_ == NULL) {
+#line 2453 "ViewCollection.c"
+ DataView* _tmp25_;
+ DataView* _tmp26_;
#line 378 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp30_ = new_view;
+ _tmp25_ = new_view;
#line 378 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp31_ = _g_object_ref0 (_tmp30_);
+ _tmp26_ = _g_object_ref0 (_tmp25_);
#line 378 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (created_view);
#line 378 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- created_view = _tmp31_;
-#line 2315 "ViewCollection.c"
+ created_view = _tmp26_;
+#line 2464 "ViewCollection.c"
} else {
- GeeArrayList* _tmp32_;
- GeeArrayList* _tmp33_;
- DataView* _tmp34_;
- GeeArrayList* _tmp35_;
- DataView* _tmp36_;
+ GeeArrayList* _tmp27_;
+ GeeArrayList* _tmp28_;
+ DataView* _tmp29_;
+ GeeArrayList* _tmp30_;
+ DataView* _tmp31_;
#line 380 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp32_ = gee_array_list_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
+ _tmp27_ = gee_array_list_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
#line 380 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (created_views);
#line 380 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- created_views = _tmp32_;
+ created_views = _tmp27_;
#line 381 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp33_ = created_views;
+ _tmp28_ = created_views;
#line 381 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp34_ = created_view;
+ _tmp29_ = created_view;
#line 381 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp34_);
+ gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp29_);
#line 382 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (created_view);
#line 382 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
created_view = NULL;
#line 383 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp35_ = created_views;
+ _tmp30_ = created_views;
#line 383 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp36_ = new_view;
+ _tmp31_ = new_view;
#line 383 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp36_);
-#line 2344 "ViewCollection.c"
+ gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp31_);
+#line 2493 "ViewCollection.c"
}
}
#line 370 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (new_view);
-#line 2349 "ViewCollection.c"
+#line 2498 "ViewCollection.c"
}
#line 360 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
(factory_target_destroy_notify == NULL) ? NULL : (factory_target_destroy_notify (factory_target), NULL);
@@ -2358,346 +2507,319 @@ static void view_collection_add_sources (ViewCollection* self, SourceCollection*
factory_target_destroy_notify = NULL;
#line 360 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (source);
-#line 2361 "ViewCollection.c"
+#line 2510 "ViewCollection.c"
}
#line 360 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (_source_it);
-#line 2365 "ViewCollection.c"
+#line 2514 "ViewCollection.c"
}
#line 388 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp37_ = created_view;
+ _tmp32_ = created_view;
#line 388 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- if (_tmp37_ != NULL) {
-#line 2371 "ViewCollection.c"
- DataView* _tmp38_;
+ if (_tmp32_ != NULL) {
+#line 2520 "ViewCollection.c"
+ DataView* _tmp33_;
#line 389 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp38_ = created_view;
+ _tmp33_ = created_view;
#line 389 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- data_collection_add (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, TYPE_DATA_OBJECT, DataObject));
-#line 2377 "ViewCollection.c"
+ data_collection_add (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, TYPE_DATA_OBJECT, DataObject));
+#line 2526 "ViewCollection.c"
} else {
- gboolean _tmp39_ = FALSE;
- GeeArrayList* _tmp40_;
+ gboolean _tmp34_ = FALSE;
+ GeeArrayList* _tmp35_;
#line 390 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp40_ = created_views;
+ _tmp35_ = created_views;
#line 390 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- if (_tmp40_ != NULL) {
-#line 2385 "ViewCollection.c"
- GeeArrayList* _tmp41_;
- gint _tmp42_;
- gint _tmp43_;
+ if (_tmp35_ != NULL) {
+#line 2534 "ViewCollection.c"
+ GeeArrayList* _tmp36_;
+ gint _tmp37_;
+ gint _tmp38_;
#line 390 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp41_ = created_views;
+ _tmp36_ = created_views;
#line 390 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp42_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
+ _tmp37_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
#line 390 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp43_ = _tmp42_;
+ _tmp38_ = _tmp37_;
#line 390 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp39_ = _tmp43_ > 0;
-#line 2397 "ViewCollection.c"
+ _tmp34_ = _tmp38_ > 0;
+#line 2546 "ViewCollection.c"
} else {
#line 390 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp39_ = FALSE;
-#line 2401 "ViewCollection.c"
+ _tmp34_ = FALSE;
+#line 2550 "ViewCollection.c"
}
#line 390 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- if (_tmp39_) {
-#line 2405 "ViewCollection.c"
- GeeArrayList* _tmp44_;
- ProgressMonitor _tmp45_;
- void* _tmp45__target;
- GeeCollection* _tmp46_;
- GeeCollection* _tmp47_;
-#line 391 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp44_ = created_views;
+ if (_tmp34_) {
+#line 2554 "ViewCollection.c"
+ GeeArrayList* _tmp39_;
+ GeeCollection* _tmp40_;
+ GeeCollection* _tmp41_;
#line 391 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp45_ = progress_monitor;
+ _tmp39_ = created_views;
#line 391 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp45__target = progress_monitor_target;
+ _tmp40_ = data_collection_add_many (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, GEE_TYPE_COLLECTION, GeeCollection), progress_monitor, progress_monitor_target);
#line 391 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp46_ = data_collection_add_many (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, GEE_TYPE_COLLECTION, GeeCollection), _tmp45_, _tmp45__target);
+ _tmp41_ = _tmp40_;
#line 391 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp47_ = _tmp46_;
-#line 391 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _g_object_unref0 (_tmp47_);
-#line 2423 "ViewCollection.c"
+ _g_object_unref0 (_tmp41_);
+#line 2566 "ViewCollection.c"
}
}
#line 354 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (created_views);
#line 354 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (created_view);
-#line 2430 "ViewCollection.c"
+#line 2573 "ViewCollection.c"
}
-static gboolean view_collection_real_add (DataCollection* base, DataObject* object) {
+static gboolean
+view_collection_real_add (DataCollection* base,
+ DataObject* object)
+{
ViewCollection * self;
gboolean result = FALSE;
- DataObject* _tmp0_;
- DataObject* _tmp1_;
- gboolean _tmp2_;
- DataObject* _tmp3_;
- GeeCollection* _tmp4_;
- GeeCollection* _tmp5_;
+ GeeCollection* _tmp0_;
+ GeeCollection* _tmp1_;
#line 394 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIEW_COLLECTION, ViewCollection);
#line 394 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_val_if_fail (IS_DATA_OBJECT (object), FALSE);
#line 395 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp0_ = object;
-#line 395 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- data_view_internal_set_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATA_VIEW, DataView), TRUE);
-#line 397 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp1_ = object;
-#line 397 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp2_ = DATA_COLLECTION_CLASS (view_collection_parent_class)->add (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), _tmp1_);
+ data_view_internal_set_visible (G_TYPE_CHECK_INSTANCE_CAST (object, TYPE_DATA_VIEW, DataView), TRUE);
#line 397 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- if (!_tmp2_) {
+ if (!DATA_COLLECTION_CLASS (view_collection_parent_class)->add (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), object)) {
#line 398 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
result = FALSE;
#line 398 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return result;
-#line 2461 "ViewCollection.c"
+#line 2597 "ViewCollection.c"
}
#line 400 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp3_ = object;
-#line 400 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp4_ = data_collection_get_singleton (_tmp3_);
+ _tmp0_ = data_collection_get_singleton (object);
#line 400 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp5_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_COLLECTION, GeeCollection);
+ _tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection);
#line 400 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- view_collection_filter_altered_items (self, _tmp5_);
+ view_collection_filter_altered_items (self, _tmp1_);
#line 400 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _g_object_unref0 (_tmp5_);
+ _g_object_unref0 (_tmp1_);
#line 402 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
result = TRUE;
#line 402 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return result;
-#line 2477 "ViewCollection.c"
+#line 2611 "ViewCollection.c"
}
-static GeeCollection* view_collection_real_add_many (DataCollection* base, GeeCollection* objects, ProgressMonitor monitor, void* monitor_target) {
+static GeeCollection*
+view_collection_real_add_many (DataCollection* base,
+ GeeCollection* objects,
+ ProgressMonitor monitor,
+ void* monitor_target)
+{
ViewCollection * self;
GeeCollection* result = NULL;
GeeCollection* return_list = NULL;
- GeeCollection* _tmp7_;
- ProgressMonitor _tmp8_;
- void* _tmp8__target;
- GeeCollection* _tmp9_;
+ GeeCollection* _tmp5_;
#line 405 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIEW_COLLECTION, ViewCollection);
#line 405 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_val_if_fail (GEE_IS_COLLECTION (objects), NULL);
-#line 2493 "ViewCollection.c"
+#line 2629 "ViewCollection.c"
{
GeeIterator* _object_it = NULL;
- GeeCollection* _tmp0_;
- GeeIterator* _tmp1_;
+ GeeIterator* _tmp0_;
#line 407 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp0_ = objects;
-#line 407 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp1_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ITERABLE, GeeIterable));
+ _tmp0_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (objects, GEE_TYPE_ITERABLE, GeeIterable));
#line 407 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _object_it = _tmp1_;
+ _object_it = _tmp0_;
#line 407 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
while (TRUE) {
-#line 2506 "ViewCollection.c"
- GeeIterator* _tmp2_;
- gboolean _tmp3_;
+#line 2639 "ViewCollection.c"
+ GeeIterator* _tmp1_;
DataObject* object = NULL;
- GeeIterator* _tmp4_;
- gpointer _tmp5_;
- DataObject* _tmp6_;
-#line 407 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp2_ = _object_it;
+ GeeIterator* _tmp2_;
+ gpointer _tmp3_;
+ DataObject* _tmp4_;
#line 407 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp3_ = gee_iterator_next (_tmp2_);
+ _tmp1_ = _object_it;
#line 407 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- if (!_tmp3_) {
+ if (!gee_iterator_next (_tmp1_)) {
#line 407 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
break;
-#line 2521 "ViewCollection.c"
+#line 2651 "ViewCollection.c"
}
#line 407 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp4_ = _object_it;
+ _tmp2_ = _object_it;
#line 407 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp5_ = gee_iterator_get (_tmp4_);
+ _tmp3_ = gee_iterator_get (_tmp2_);
#line 407 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- object = (DataObject*) _tmp5_;
+ object = (DataObject*) _tmp3_;
#line 408 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp6_ = object;
+ _tmp4_ = object;
#line 408 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- data_view_internal_set_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_DATA_VIEW, DataView), TRUE);
+ data_view_internal_set_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_DATA_VIEW, DataView), TRUE);
#line 407 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (object);
-#line 2535 "ViewCollection.c"
+#line 2665 "ViewCollection.c"
}
#line 407 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (_object_it);
-#line 2539 "ViewCollection.c"
+#line 2669 "ViewCollection.c"
}
#line 410 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp7_ = objects;
-#line 410 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp8_ = monitor;
-#line 410 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp8__target = monitor_target;
+ _tmp5_ = DATA_COLLECTION_CLASS (view_collection_parent_class)->add_many (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), objects, monitor, monitor_target);
#line 410 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp9_ = DATA_COLLECTION_CLASS (view_collection_parent_class)->add_many (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), _tmp7_, _tmp8_, _tmp8__target);
-#line 410 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- return_list = _tmp9_;
+ return_list = _tmp5_;
#line 412 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
view_collection_filter_altered_items (self, G_TYPE_CHECK_INSTANCE_CAST (return_list, GEE_TYPE_COLLECTION, GeeCollection));
#line 414 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
result = return_list;
#line 414 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return result;
-#line 2557 "ViewCollection.c"
+#line 2681 "ViewCollection.c"
}
-static void view_collection_on_sources_removed (ViewCollection* self, GeeIterable* removed) {
+static void
+view_collection_on_sources_removed (ViewCollection* self,
+ GeeIterable* removed)
+{
Marker* marker = NULL;
- gboolean _tmp14_ = FALSE;
- Marker* _tmp15_;
+ gboolean _tmp12_ = FALSE;
+ Marker* _tmp13_;
#line 417 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_if_fail (IS_VIEW_COLLECTION (self));
#line 417 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_if_fail (GEE_IS_ITERABLE (removed));
#line 419 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
marker = NULL;
-#line 2571 "ViewCollection.c"
+#line 2698 "ViewCollection.c"
{
GeeIterator* _source_it = NULL;
- GeeIterable* _tmp0_;
- GeeIterator* _tmp1_;
-#line 420 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp0_ = removed;
+ GeeIterator* _tmp0_;
#line 420 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp1_ = gee_iterable_iterator (_tmp0_);
+ _tmp0_ = gee_iterable_iterator (removed);
#line 420 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _source_it = _tmp1_;
+ _source_it = _tmp0_;
#line 420 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
while (TRUE) {
-#line 2584 "ViewCollection.c"
- GeeIterator* _tmp2_;
- gboolean _tmp3_;
+#line 2708 "ViewCollection.c"
+ GeeIterator* _tmp1_;
DataSource* source = NULL;
- GeeIterator* _tmp4_;
- gpointer _tmp5_;
+ GeeIterator* _tmp2_;
+ gpointer _tmp3_;
DataView* view = NULL;
- GeeHashMap* _tmp6_;
- DataSource* _tmp7_;
- gpointer _tmp8_;
- DataView* _tmp9_;
-#line 420 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp2_ = _source_it;
+ GeeHashMap* _tmp4_;
+ DataSource* _tmp5_;
+ gpointer _tmp6_;
+ DataView* _tmp7_;
#line 420 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp3_ = gee_iterator_next (_tmp2_);
+ _tmp1_ = _source_it;
#line 420 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- if (!_tmp3_) {
+ if (!gee_iterator_next (_tmp1_)) {
#line 420 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
break;
-#line 2603 "ViewCollection.c"
+#line 2724 "ViewCollection.c"
}
#line 420 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp4_ = _source_it;
+ _tmp2_ = _source_it;
#line 420 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp5_ = gee_iterator_get (_tmp4_);
+ _tmp3_ = gee_iterator_get (_tmp2_);
#line 420 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- source = (DataSource*) _tmp5_;
+ source = (DataSource*) _tmp3_;
#line 421 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp6_ = self->priv->source_map;
+ _tmp4_ = self->priv->source_map;
#line 421 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp7_ = source;
+ _tmp5_ = source;
#line 421 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp8_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp7_);
+ _tmp6_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp5_);
#line 421 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- view = (DataView*) _tmp8_;
+ view = (DataView*) _tmp6_;
#line 424 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp9_ = view;
+ _tmp7_ = view;
#line 424 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- if (_tmp9_ != NULL) {
-#line 2623 "ViewCollection.c"
+ if (_tmp7_ != NULL) {
+#line 2744 "ViewCollection.c"
+ Marker* _tmp8_;
Marker* _tmp10_;
- Marker* _tmp12_;
- DataView* _tmp13_;
+ DataView* _tmp11_;
#line 425 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp10_ = marker;
+ _tmp8_ = marker;
#line 425 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- if (_tmp10_ == NULL) {
-#line 2631 "ViewCollection.c"
- Marker* _tmp11_;
+ if (_tmp8_ == NULL) {
+#line 2752 "ViewCollection.c"
+ Marker* _tmp9_;
#line 426 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp11_ = data_collection_start_marking (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection));
+ _tmp9_ = data_collection_start_marking (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection));
#line 426 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (marker);
#line 426 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- marker = _tmp11_;
-#line 2639 "ViewCollection.c"
+ marker = _tmp9_;
+#line 2760 "ViewCollection.c"
}
#line 428 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp12_ = marker;
+ _tmp10_ = marker;
#line 428 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp13_ = view;
+ _tmp11_ = view;
#line 428 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- marker_mark (_tmp12_, G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_DATA_OBJECT, DataObject));
-#line 2647 "ViewCollection.c"
+ marker_mark (_tmp10_, G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_DATA_OBJECT, DataObject));
+#line 2768 "ViewCollection.c"
}
#line 420 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (view);
#line 420 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (source);
-#line 2653 "ViewCollection.c"
+#line 2774 "ViewCollection.c"
}
#line 420 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (_source_it);
-#line 2657 "ViewCollection.c"
+#line 2778 "ViewCollection.c"
}
#line 432 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp15_ = marker;
-#line 432 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- if (_tmp15_ != NULL) {
-#line 2663 "ViewCollection.c"
- Marker* _tmp16_;
- gint _tmp17_;
+ _tmp13_ = marker;
#line 432 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp16_ = marker;
+ if (_tmp13_ != NULL) {
+#line 2784 "ViewCollection.c"
+ Marker* _tmp14_;
#line 432 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp17_ = marker_get_count (_tmp16_);
+ _tmp14_ = marker;
#line 432 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp14_ = _tmp17_ != 0;
-#line 2672 "ViewCollection.c"
+ _tmp12_ = marker_get_count (_tmp14_) != 0;
+#line 2790 "ViewCollection.c"
} else {
#line 432 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp14_ = FALSE;
-#line 2676 "ViewCollection.c"
+ _tmp12_ = FALSE;
+#line 2794 "ViewCollection.c"
}
#line 432 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- if (_tmp14_) {
-#line 2680 "ViewCollection.c"
- Marker* _tmp18_;
+ if (_tmp12_) {
+#line 2798 "ViewCollection.c"
+ Marker* _tmp15_;
#line 433 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp18_ = marker;
+ _tmp15_ = marker;
#line 433 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- data_collection_remove_marked (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), _tmp18_);
-#line 2686 "ViewCollection.c"
+ data_collection_remove_marked (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), _tmp15_);
+#line 2804 "ViewCollection.c"
}
#line 417 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (marker);
-#line 2690 "ViewCollection.c"
+#line 2808 "ViewCollection.c"
}
-static void view_collection_on_sources_altered (ViewCollection* self, DataCollection* collection, GeeMap* items) {
+static void
+view_collection_on_sources_altered (ViewCollection* self,
+ DataCollection* collection,
+ GeeMap* items)
+{
GeeArrayList* to_add = NULL;
GeeArrayList* to_remove = NULL;
gboolean ordering_changed = FALSE;
- GeeArrayList* _tmp82_;
- GeeArrayList* _tmp86_;
- gboolean _tmp90_;
+ GeeArrayList* _tmp69_;
+ GeeArrayList* _tmp73_;
+ gboolean _tmp77_;
#line 436 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_if_fail (IS_VIEW_COLLECTION (self));
#line 436 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -2710,223 +2832,202 @@ static void view_collection_on_sources_altered (ViewCollection* self, DataCollec
to_remove = NULL;
#line 441 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
ordering_changed = FALSE;
-#line 2713 "ViewCollection.c"
+#line 2835 "ViewCollection.c"
{
GeeIterator* _object_it = NULL;
- GeeMap* _tmp0_;
+ GeeSet* _tmp0_;
GeeSet* _tmp1_;
GeeSet* _tmp2_;
- GeeSet* _tmp3_;
+ GeeIterator* _tmp3_;
GeeIterator* _tmp4_;
- GeeIterator* _tmp5_;
#line 442 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp0_ = items;
+ _tmp0_ = gee_map_get_keys (items);
#line 442 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp1_ = gee_map_get_keys (_tmp0_);
+ _tmp1_ = _tmp0_;
#line 442 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp2_ = _tmp1_;
#line 442 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp3_ = _tmp2_;
-#line 442 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp4_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ITERABLE, GeeIterable));
+ _tmp3_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ITERABLE, GeeIterable));
#line 442 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp5_ = _tmp4_;
+ _tmp4_ = _tmp3_;
#line 442 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _g_object_unref0 (_tmp3_);
+ _g_object_unref0 (_tmp2_);
#line 442 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _object_it = _tmp5_;
+ _object_it = _tmp4_;
#line 442 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
while (TRUE) {
-#line 2740 "ViewCollection.c"
- GeeIterator* _tmp6_;
- gboolean _tmp7_;
+#line 2859 "ViewCollection.c"
+ GeeIterator* _tmp5_;
DataObject* object = NULL;
- GeeIterator* _tmp8_;
- gpointer _tmp9_;
+ GeeIterator* _tmp6_;
+ gpointer _tmp7_;
Alteration* alteration = NULL;
- GeeMap* _tmp10_;
- DataObject* _tmp11_;
- gpointer _tmp12_;
+ DataObject* _tmp8_;
+ gpointer _tmp9_;
DataSource* source = NULL;
- DataObject* _tmp13_;
- DataSource* _tmp14_;
+ DataObject* _tmp10_;
+ DataSource* _tmp11_;
ViewCollectionMonitorImpl* monitor = NULL;
gboolean ignored = FALSE;
- gboolean _tmp38_;
- gboolean _tmp40_ = FALSE;
- ViewCollectionMonitorImpl* _tmp41_;
-#line 442 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp6_ = _object_it;
+ gboolean _tmp31_;
+ gboolean _tmp33_ = FALSE;
+ ViewCollectionMonitorImpl* _tmp34_;
#line 442 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp7_ = gee_iterator_next (_tmp6_);
+ _tmp5_ = _object_it;
#line 442 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- if (!_tmp7_) {
+ if (!gee_iterator_next (_tmp5_)) {
#line 442 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
break;
-#line 2766 "ViewCollection.c"
+#line 2881 "ViewCollection.c"
}
#line 442 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp8_ = _object_it;
+ _tmp6_ = _object_it;
#line 442 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp9_ = gee_iterator_get (_tmp8_);
+ _tmp7_ = gee_iterator_get (_tmp6_);
#line 442 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- object = (DataObject*) _tmp9_;
+ object = (DataObject*) _tmp7_;
#line 443 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp10_ = items;
+ _tmp8_ = object;
#line 443 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp11_ = object;
+ _tmp9_ = gee_map_get (items, _tmp8_);
#line 443 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp12_ = gee_map_get (_tmp10_, _tmp11_);
-#line 443 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- alteration = (Alteration*) _tmp12_;
+ alteration = (Alteration*) _tmp9_;
#line 444 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp13_ = object;
+ _tmp10_ = object;
#line 444 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp14_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_DATA_SOURCE, DataSource));
+ _tmp11_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_DATA_SOURCE, DataSource));
#line 444 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- source = _tmp14_;
+ source = _tmp11_;
#line 446 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
monitor = NULL;
#line 447 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
ignored = TRUE;
-#line 2792 "ViewCollection.c"
+#line 2905 "ViewCollection.c"
{
GeeIterator* _monitor_impl_it = NULL;
- GeeHashMultiMap* _tmp15_;
- DataCollection* _tmp16_;
- GeeCollection* _tmp17_;
- GeeCollection* _tmp18_;
- GeeIterator* _tmp19_;
- GeeIterator* _tmp20_;
-#line 448 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp15_ = self->priv->monitors;
+ GeeHashMultiMap* _tmp12_;
+ GeeCollection* _tmp13_;
+ GeeCollection* _tmp14_;
+ GeeIterator* _tmp15_;
+ GeeIterator* _tmp16_;
#line 448 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp16_ = collection;
+ _tmp12_ = self->priv->monitors;
#line 448 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp17_ = gee_multi_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GEE_TYPE_MULTI_MAP, GeeMultiMap), G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_SOURCE_COLLECTION, SourceCollection));
+ _tmp13_ = gee_multi_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_MULTI_MAP, GeeMultiMap), G_TYPE_CHECK_INSTANCE_CAST (collection, TYPE_SOURCE_COLLECTION, SourceCollection));
#line 448 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp18_ = _tmp17_;
+ _tmp14_ = _tmp13_;
#line 448 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp19_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_ITERABLE, GeeIterable));
+ _tmp15_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_ITERABLE, GeeIterable));
#line 448 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp20_ = _tmp19_;
+ _tmp16_ = _tmp15_;
#line 448 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _g_object_unref0 (_tmp18_);
+ _g_object_unref0 (_tmp14_);
#line 448 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _monitor_impl_it = _tmp20_;
+ _monitor_impl_it = _tmp16_;
#line 448 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
while (TRUE) {
-#line 2819 "ViewCollection.c"
- GeeIterator* _tmp21_;
- gboolean _tmp22_;
+#line 2929 "ViewCollection.c"
+ GeeIterator* _tmp17_;
ViewCollectionMonitorImpl* monitor_impl = NULL;
- GeeIterator* _tmp23_;
- gpointer _tmp24_;
- gboolean _tmp25_ = FALSE;
+ GeeIterator* _tmp18_;
+ gpointer _tmp19_;
+ gboolean _tmp20_ = FALSE;
+ ViewCollectionMonitorImpl* _tmp21_;
+ Alteration* _tmp22_;
ViewCollectionMonitorImpl* _tmp26_;
- Alteration* _tmp27_;
- ViewCollectionMonitorImpl* _tmp32_;
- ViewManager* _tmp33_;
- DataSource* _tmp34_;
- gboolean _tmp35_;
+ ViewManager* _tmp27_;
+ DataSource* _tmp28_;
#line 448 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp21_ = _monitor_impl_it;
+ _tmp17_ = _monitor_impl_it;
#line 448 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp22_ = gee_iterator_next (_tmp21_);
-#line 448 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- if (!_tmp22_) {
+ if (!gee_iterator_next (_tmp17_)) {
#line 448 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
break;
-#line 2840 "ViewCollection.c"
+#line 2946 "ViewCollection.c"
}
#line 448 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp23_ = _monitor_impl_it;
+ _tmp18_ = _monitor_impl_it;
#line 448 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp24_ = gee_iterator_get (_tmp23_);
+ _tmp19_ = gee_iterator_get (_tmp18_);
#line 448 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- monitor_impl = (ViewCollectionMonitorImpl*) _tmp24_;
+ monitor_impl = (ViewCollectionMonitorImpl*) _tmp19_;
#line 449 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp26_ = monitor_impl;
+ _tmp21_ = monitor_impl;
#line 449 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp27_ = _tmp26_->prereq;
+ _tmp22_ = _tmp21_->prereq;
#line 449 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- if (_tmp27_ != NULL) {
-#line 2854 "ViewCollection.c"
- Alteration* _tmp28_;
- ViewCollectionMonitorImpl* _tmp29_;
- Alteration* _tmp30_;
- gboolean _tmp31_;
+ if (_tmp22_ != NULL) {
+#line 2960 "ViewCollection.c"
+ Alteration* _tmp23_;
+ ViewCollectionMonitorImpl* _tmp24_;
+ Alteration* _tmp25_;
#line 449 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp28_ = alteration;
+ _tmp23_ = alteration;
#line 449 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp29_ = monitor_impl;
+ _tmp24_ = monitor_impl;
#line 449 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp30_ = _tmp29_->prereq;
+ _tmp25_ = _tmp24_->prereq;
#line 449 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp31_ = alteration_contains_any (_tmp28_, _tmp30_);
-#line 449 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp25_ = !_tmp31_;
-#line 2869 "ViewCollection.c"
+ _tmp20_ = !alteration_contains_any (_tmp23_, _tmp25_);
+#line 2972 "ViewCollection.c"
} else {
#line 449 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp25_ = FALSE;
-#line 2873 "ViewCollection.c"
+ _tmp20_ = FALSE;
+#line 2976 "ViewCollection.c"
}
#line 449 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- if (_tmp25_) {
+ if (_tmp20_) {
#line 450 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_view_collection_monitor_unref0 (monitor_impl);
#line 450 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
continue;
-#line 2881 "ViewCollection.c"
+#line 2984 "ViewCollection.c"
}
#line 452 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
ignored = FALSE;
#line 454 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp32_ = monitor_impl;
-#line 454 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp33_ = _tmp32_->manager;
+ _tmp26_ = monitor_impl;
#line 454 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp34_ = source;
+ _tmp27_ = _tmp26_->manager;
#line 454 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp35_ = view_manager_include_in_view (_tmp33_, _tmp34_);
+ _tmp28_ = source;
#line 454 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- if (_tmp35_) {
-#line 2895 "ViewCollection.c"
- ViewCollectionMonitorImpl* _tmp36_;
- ViewCollectionMonitorImpl* _tmp37_;
+ if (view_manager_include_in_view (_tmp27_, _tmp28_)) {
+#line 2996 "ViewCollection.c"
+ ViewCollectionMonitorImpl* _tmp29_;
+ ViewCollectionMonitorImpl* _tmp30_;
#line 455 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp36_ = monitor_impl;
+ _tmp29_ = monitor_impl;
#line 455 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp37_ = _view_collection_monitor_ref0 (_tmp36_);
+ _tmp30_ = _view_collection_monitor_ref0 (_tmp29_);
#line 455 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_view_collection_monitor_unref0 (monitor);
#line 455 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- monitor = _tmp37_;
+ monitor = _tmp30_;
#line 457 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_view_collection_monitor_unref0 (monitor_impl);
#line 457 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
break;
-#line 2910 "ViewCollection.c"
+#line 3011 "ViewCollection.c"
}
#line 448 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_view_collection_monitor_unref0 (monitor_impl);
-#line 2914 "ViewCollection.c"
+#line 3015 "ViewCollection.c"
}
#line 448 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (_monitor_impl_it);
-#line 2918 "ViewCollection.c"
+#line 3019 "ViewCollection.c"
}
#line 461 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp38_ = ignored;
+ _tmp31_ = ignored;
#line 461 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- if (_tmp38_) {
-#line 2924 "ViewCollection.c"
- ViewCollectionMonitorImpl* _tmp39_;
+ if (_tmp31_) {
+#line 3025 "ViewCollection.c"
+ ViewCollectionMonitorImpl* _tmp32_;
#line 462 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp39_ = monitor;
+ _tmp32_ = monitor;
#line 462 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _vala_assert (_tmp39_ == NULL, "monitor == null");
+ _vala_assert (_tmp32_ == NULL, "monitor == null");
#line 464 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_view_collection_monitor_unref0 (monitor);
#line 464 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -2937,230 +3038,212 @@ static void view_collection_on_sources_altered (ViewCollection* self, DataCollec
_g_object_unref0 (object);
#line 464 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
continue;
-#line 2940 "ViewCollection.c"
+#line 3041 "ViewCollection.c"
}
#line 467 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp41_ = monitor;
-#line 467 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- if (_tmp41_ != NULL) {
-#line 2946 "ViewCollection.c"
- DataSource* _tmp42_;
- gboolean _tmp43_;
+ _tmp34_ = monitor;
#line 467 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp42_ = source;
+ if (_tmp34_ != NULL) {
+#line 3047 "ViewCollection.c"
+ DataSource* _tmp35_;
#line 467 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp43_ = view_collection_has_view_for_source (self, _tmp42_);
+ _tmp35_ = source;
#line 467 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp40_ = !_tmp43_;
-#line 2955 "ViewCollection.c"
+ _tmp33_ = !view_collection_has_view_for_source (self, _tmp35_);
+#line 3053 "ViewCollection.c"
} else {
#line 467 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp40_ = FALSE;
-#line 2959 "ViewCollection.c"
+ _tmp33_ = FALSE;
+#line 3057 "ViewCollection.c"
}
#line 467 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- if (_tmp40_) {
-#line 2963 "ViewCollection.c"
- GeeArrayList* _tmp44_;
- GeeArrayList* _tmp46_;
- ViewCollectionMonitorImpl* _tmp47_;
- ViewManager* _tmp48_;
- DataSource* _tmp49_;
- DataView* _tmp50_;
- DataView* _tmp51_;
+ if (_tmp33_) {
+#line 3061 "ViewCollection.c"
+ GeeArrayList* _tmp36_;
+ GeeArrayList* _tmp38_;
+ ViewCollectionMonitorImpl* _tmp39_;
+ ViewManager* _tmp40_;
+ DataSource* _tmp41_;
+ DataView* _tmp42_;
+ DataView* _tmp43_;
#line 468 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp44_ = to_add;
+ _tmp36_ = to_add;
#line 468 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- if (_tmp44_ == NULL) {
-#line 2975 "ViewCollection.c"
- GeeArrayList* _tmp45_;
+ if (_tmp36_ == NULL) {
+#line 3073 "ViewCollection.c"
+ GeeArrayList* _tmp37_;
#line 469 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp45_ = gee_array_list_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
+ _tmp37_ = gee_array_list_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
#line 469 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (to_add);
#line 469 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- to_add = _tmp45_;
-#line 2983 "ViewCollection.c"
+ to_add = _tmp37_;
+#line 3081 "ViewCollection.c"
}
#line 471 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp46_ = to_add;
+ _tmp38_ = to_add;
#line 471 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp47_ = monitor;
+ _tmp39_ = monitor;
#line 471 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp48_ = _tmp47_->manager;
+ _tmp40_ = _tmp39_->manager;
#line 471 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp49_ = source;
+ _tmp41_ = source;
#line 471 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp50_ = view_manager_create_view (_tmp48_, _tmp49_);
+ _tmp42_ = view_manager_create_view (_tmp40_, _tmp41_);
#line 471 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp51_ = _tmp50_;
+ _tmp43_ = _tmp42_;
#line 471 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp51_);
+ gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp43_);
#line 471 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _g_object_unref0 (_tmp51_);
-#line 3001 "ViewCollection.c"
+ _g_object_unref0 (_tmp43_);
+#line 3099 "ViewCollection.c"
} else {
- gboolean _tmp52_ = FALSE;
- ViewCollectionMonitorImpl* _tmp53_;
+ gboolean _tmp44_ = FALSE;
+ ViewCollectionMonitorImpl* _tmp45_;
#line 472 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp53_ = monitor;
+ _tmp45_ = monitor;
#line 472 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- if (_tmp53_ == NULL) {
-#line 3009 "ViewCollection.c"
- DataSource* _tmp54_;
- gboolean _tmp55_;
+ if (_tmp45_ == NULL) {
+#line 3107 "ViewCollection.c"
+ DataSource* _tmp46_;
#line 472 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp54_ = source;
+ _tmp46_ = source;
#line 472 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp55_ = view_collection_has_view_for_source (self, _tmp54_);
-#line 472 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp52_ = _tmp55_;
-#line 3018 "ViewCollection.c"
+ _tmp44_ = view_collection_has_view_for_source (self, _tmp46_);
+#line 3113 "ViewCollection.c"
} else {
#line 472 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp52_ = FALSE;
-#line 3022 "ViewCollection.c"
+ _tmp44_ = FALSE;
+#line 3117 "ViewCollection.c"
}
#line 472 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- if (_tmp52_) {
-#line 3026 "ViewCollection.c"
- GeeArrayList* _tmp56_;
- GeeArrayList* _tmp58_;
- DataSource* _tmp59_;
- DataView* _tmp60_;
- DataView* _tmp61_;
+ if (_tmp44_) {
+#line 3121 "ViewCollection.c"
+ GeeArrayList* _tmp47_;
+ GeeArrayList* _tmp49_;
+ DataSource* _tmp50_;
+ DataView* _tmp51_;
+ DataView* _tmp52_;
#line 473 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp56_ = to_remove;
+ _tmp47_ = to_remove;
#line 473 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- if (_tmp56_ == NULL) {
-#line 3036 "ViewCollection.c"
- GeeArrayList* _tmp57_;
+ if (_tmp47_ == NULL) {
+#line 3131 "ViewCollection.c"
+ GeeArrayList* _tmp48_;
#line 474 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp57_ = gee_array_list_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
+ _tmp48_ = gee_array_list_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
#line 474 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (to_remove);
#line 474 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- to_remove = _tmp57_;
-#line 3044 "ViewCollection.c"
+ to_remove = _tmp48_;
+#line 3139 "ViewCollection.c"
}
#line 476 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp58_ = to_remove;
+ _tmp49_ = to_remove;
#line 476 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp59_ = source;
+ _tmp50_ = source;
#line 476 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp60_ = view_collection_get_view_for_source (self, _tmp59_);
+ _tmp51_ = view_collection_get_view_for_source (self, _tmp50_);
#line 476 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp61_ = _tmp60_;
+ _tmp52_ = _tmp51_;
#line 476 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp58_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp61_);
+ gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp52_);
#line 476 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _g_object_unref0 (_tmp61_);
-#line 3058 "ViewCollection.c"
+ _g_object_unref0 (_tmp52_);
+#line 3153 "ViewCollection.c"
} else {
- gboolean _tmp62_ = FALSE;
- ViewCollectionMonitorImpl* _tmp63_;
-#line 477 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp63_ = monitor;
+ gboolean _tmp53_ = FALSE;
+ ViewCollectionMonitorImpl* _tmp54_;
#line 477 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- if (_tmp63_ != NULL) {
-#line 3066 "ViewCollection.c"
- DataSource* _tmp64_;
- gboolean _tmp65_;
+ _tmp54_ = monitor;
#line 477 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp64_ = source;
+ if (_tmp54_ != NULL) {
+#line 3161 "ViewCollection.c"
+ DataSource* _tmp55_;
#line 477 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp65_ = view_collection_has_view_for_source (self, _tmp64_);
+ _tmp55_ = source;
#line 477 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp62_ = _tmp65_;
-#line 3075 "ViewCollection.c"
+ _tmp53_ = view_collection_has_view_for_source (self, _tmp55_);
+#line 3167 "ViewCollection.c"
} else {
#line 477 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp62_ = FALSE;
-#line 3079 "ViewCollection.c"
+ _tmp53_ = FALSE;
+#line 3171 "ViewCollection.c"
}
#line 477 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- if (_tmp62_) {
-#line 3083 "ViewCollection.c"
+ if (_tmp53_) {
+#line 3175 "ViewCollection.c"
DataView* view = NULL;
- DataSource* _tmp66_;
- DataView* _tmp67_;
- DataSet* _tmp68_;
- DataView* _tmp69_;
- gboolean _tmp70_;
- gboolean _tmp74_ = FALSE;
- DataSet* _tmp75_;
+ DataSource* _tmp56_;
+ DataView* _tmp57_;
+ DataSet* _tmp58_;
+ DataView* _tmp59_;
+ gboolean _tmp63_ = FALSE;
+ DataSet* _tmp64_;
#line 478 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp66_ = source;
+ _tmp56_ = source;
#line 478 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp67_ = view_collection_get_view_for_source (self, _tmp66_);
+ _tmp57_ = view_collection_get_view_for_source (self, _tmp56_);
#line 478 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- view = _tmp67_;
+ view = _tmp57_;
#line 480 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp68_ = self->priv->selected;
+ _tmp58_ = self->priv->selected;
#line 480 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp69_ = view;
+ _tmp59_ = view;
#line 480 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp70_ = data_set_contains (_tmp68_, G_TYPE_CHECK_INSTANCE_CAST (_tmp69_, TYPE_DATA_OBJECT, DataObject));
-#line 480 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- if (_tmp70_) {
-#line 3106 "ViewCollection.c"
- DataSet* _tmp71_;
- DataView* _tmp72_;
- Alteration* _tmp73_;
+ if (data_set_contains (_tmp58_, G_TYPE_CHECK_INSTANCE_CAST (_tmp59_, TYPE_DATA_OBJECT, DataObject))) {
+#line 3195 "ViewCollection.c"
+ DataSet* _tmp60_;
+ DataView* _tmp61_;
+ Alteration* _tmp62_;
#line 481 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp71_ = self->priv->selected;
+ _tmp60_ = self->priv->selected;
#line 481 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp72_ = view;
+ _tmp61_ = view;
#line 481 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp73_ = alteration;
+ _tmp62_ = alteration;
#line 481 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- data_set_resort_object (_tmp71_, G_TYPE_CHECK_INSTANCE_CAST (_tmp72_, TYPE_DATA_OBJECT, DataObject), _tmp73_);
-#line 3118 "ViewCollection.c"
+ data_set_resort_object (_tmp60_, G_TYPE_CHECK_INSTANCE_CAST (_tmp61_, TYPE_DATA_OBJECT, DataObject), _tmp62_);
+#line 3207 "ViewCollection.c"
}
#line 483 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp75_ = self->priv->visible;
-#line 483 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- if (_tmp75_ != NULL) {
-#line 3124 "ViewCollection.c"
- DataView* _tmp76_;
- gboolean _tmp77_;
+ _tmp64_ = self->priv->visible;
#line 483 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp76_ = view;
+ if (_tmp64_ != NULL) {
+#line 3213 "ViewCollection.c"
+ DataView* _tmp65_;
#line 483 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp77_ = view_collection_is_visible (self, _tmp76_);
+ _tmp65_ = view;
#line 483 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp74_ = _tmp77_;
-#line 3133 "ViewCollection.c"
+ _tmp63_ = view_collection_is_visible (self, _tmp65_);
+#line 3219 "ViewCollection.c"
} else {
#line 483 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp74_ = FALSE;
-#line 3137 "ViewCollection.c"
+ _tmp63_ = FALSE;
+#line 3223 "ViewCollection.c"
}
#line 483 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- if (_tmp74_) {
-#line 3141 "ViewCollection.c"
- DataSet* _tmp78_;
- DataView* _tmp79_;
- Alteration* _tmp80_;
- gboolean _tmp81_;
+ if (_tmp63_) {
+#line 3227 "ViewCollection.c"
+ DataSet* _tmp66_;
+ DataView* _tmp67_;
+ Alteration* _tmp68_;
#line 484 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp78_ = self->priv->visible;
+ _tmp66_ = self->priv->visible;
#line 484 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp79_ = view;
+ _tmp67_ = view;
#line 484 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp80_ = alteration;
+ _tmp68_ = alteration;
#line 484 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp81_ = data_set_resort_object (_tmp78_, G_TYPE_CHECK_INSTANCE_CAST (_tmp79_, TYPE_DATA_OBJECT, DataObject), _tmp80_);
-#line 484 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- if (_tmp81_) {
+ if (data_set_resort_object (_tmp66_, G_TYPE_CHECK_INSTANCE_CAST (_tmp67_, TYPE_DATA_OBJECT, DataObject), _tmp68_)) {
#line 485 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
ordering_changed = TRUE;
-#line 3158 "ViewCollection.c"
+#line 3241 "ViewCollection.c"
}
}
#line 477 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (view);
-#line 3163 "ViewCollection.c"
+#line 3246 "ViewCollection.c"
}
}
}
@@ -3172,72 +3255,75 @@ static void view_collection_on_sources_altered (ViewCollection* self, DataCollec
_alteration_unref0 (alteration);
#line 442 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (object);
-#line 3175 "ViewCollection.c"
+#line 3258 "ViewCollection.c"
}
#line 442 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (_object_it);
-#line 3179 "ViewCollection.c"
+#line 3262 "ViewCollection.c"
}
#line 490 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp82_ = to_add;
+ _tmp69_ = to_add;
#line 490 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- if (_tmp82_ != NULL) {
-#line 3185 "ViewCollection.c"
- GeeArrayList* _tmp83_;
- GeeCollection* _tmp84_;
- GeeCollection* _tmp85_;
+ if (_tmp69_ != NULL) {
+#line 3268 "ViewCollection.c"
+ GeeArrayList* _tmp70_;
+ GeeCollection* _tmp71_;
+ GeeCollection* _tmp72_;
#line 491 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp83_ = to_add;
+ _tmp70_ = to_add;
#line 491 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp84_ = data_collection_add_many (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp83_, GEE_TYPE_COLLECTION, GeeCollection), NULL, NULL);
+ _tmp71_ = data_collection_add_many (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp70_, GEE_TYPE_COLLECTION, GeeCollection), NULL, NULL);
#line 491 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp85_ = _tmp84_;
+ _tmp72_ = _tmp71_;
#line 491 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _g_object_unref0 (_tmp85_);
-#line 3197 "ViewCollection.c"
+ _g_object_unref0 (_tmp72_);
+#line 3280 "ViewCollection.c"
}
#line 493 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp86_ = to_remove;
+ _tmp73_ = to_remove;
#line 493 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- if (_tmp86_ != NULL) {
-#line 3203 "ViewCollection.c"
- GeeArrayList* _tmp87_;
- Marker* _tmp88_;
- Marker* _tmp89_;
+ if (_tmp73_ != NULL) {
+#line 3286 "ViewCollection.c"
+ GeeArrayList* _tmp74_;
+ Marker* _tmp75_;
+ Marker* _tmp76_;
#line 494 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp87_ = to_remove;
+ _tmp74_ = to_remove;
#line 494 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp88_ = data_collection_mark_many (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp87_, GEE_TYPE_COLLECTION, GeeCollection));
+ _tmp75_ = data_collection_mark_many (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp74_, GEE_TYPE_COLLECTION, GeeCollection));
#line 494 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp89_ = _tmp88_;
+ _tmp76_ = _tmp75_;
#line 494 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- data_collection_remove_marked (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), _tmp89_);
+ data_collection_remove_marked (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), _tmp76_);
#line 494 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _g_object_unref0 (_tmp89_);
-#line 3217 "ViewCollection.c"
+ _g_object_unref0 (_tmp76_);
+#line 3300 "ViewCollection.c"
}
#line 496 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp90_ = ordering_changed;
+ _tmp77_ = ordering_changed;
#line 496 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- if (_tmp90_) {
+ if (_tmp77_) {
#line 497 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
data_collection_notify_ordering_changed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection));
-#line 3225 "ViewCollection.c"
+#line 3308 "ViewCollection.c"
}
#line 436 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (to_remove);
#line 436 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (to_add);
-#line 3231 "ViewCollection.c"
+#line 3314 "ViewCollection.c"
}
-static void view_collection_on_mirror_contents_added (ViewCollection* self, GeeIterable* added) {
+static void
+view_collection_on_mirror_contents_added (ViewCollection* self,
+ GeeIterable* added)
+{
GeeArrayList* to_add = NULL;
GeeArrayList* _tmp0_;
- GeeArrayList* _tmp19_;
- gint _tmp20_;
- gint _tmp21_;
+ GeeArrayList* _tmp16_;
+ gint _tmp17_;
+ gint _tmp18_;
#line 500 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_if_fail (IS_VIEW_COLLECTION (self));
#line 500 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -3246,148 +3332,142 @@ static void view_collection_on_mirror_contents_added (ViewCollection* self, GeeI
_tmp0_ = gee_array_list_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
#line 501 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
to_add = _tmp0_;
-#line 3249 "ViewCollection.c"
+#line 3335 "ViewCollection.c"
{
GeeIterator* _object_it = NULL;
- GeeIterable* _tmp1_;
- GeeIterator* _tmp2_;
-#line 502 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp1_ = added;
+ GeeIterator* _tmp1_;
#line 502 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp2_ = gee_iterable_iterator (_tmp1_);
+ _tmp1_ = gee_iterable_iterator (added);
#line 502 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _object_it = _tmp2_;
+ _object_it = _tmp1_;
#line 502 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
while (TRUE) {
-#line 3262 "ViewCollection.c"
- GeeIterator* _tmp3_;
- gboolean _tmp4_;
+#line 3345 "ViewCollection.c"
+ GeeIterator* _tmp2_;
DataObject* object = NULL;
- GeeIterator* _tmp5_;
- gpointer _tmp6_;
+ GeeIterator* _tmp3_;
+ gpointer _tmp4_;
DataSource* source = NULL;
- DataObject* _tmp7_;
- DataSource* _tmp8_;
- gboolean _tmp9_ = FALSE;
- CreateViewPredicate _tmp10_;
- void* _tmp10__target;
+ DataObject* _tmp5_;
+ DataSource* _tmp6_;
+ gboolean _tmp7_ = FALSE;
+ CreateViewPredicate _tmp8_;
+ void* _tmp8__target;
#line 502 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp3_ = _object_it;
-#line 502 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp4_ = gee_iterator_next (_tmp3_);
+ _tmp2_ = _object_it;
#line 502 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- if (!_tmp4_) {
+ if (!gee_iterator_next (_tmp2_)) {
#line 502 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
break;
-#line 3282 "ViewCollection.c"
+#line 3362 "ViewCollection.c"
}
#line 502 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp5_ = _object_it;
+ _tmp3_ = _object_it;
#line 502 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp6_ = gee_iterator_get (_tmp5_);
+ _tmp4_ = gee_iterator_get (_tmp3_);
#line 502 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- object = (DataObject*) _tmp6_;
+ object = (DataObject*) _tmp4_;
#line 503 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp7_ = object;
+ _tmp5_ = object;
#line 503 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp8_ = data_view_get_source (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_DATA_VIEW, DataView));
+ _tmp6_ = data_view_get_source (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_DATA_VIEW, DataView));
#line 503 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- source = _tmp8_;
+ source = _tmp6_;
#line 505 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp10_ = self->priv->should_mirror;
+ _tmp8_ = self->priv->should_mirror;
#line 505 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp10__target = self->priv->should_mirror_target;
+ _tmp8__target = self->priv->should_mirror_target;
#line 505 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- if (_tmp10_ == NULL) {
+ if (_tmp8_ == NULL) {
#line 505 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp9_ = TRUE;
-#line 3304 "ViewCollection.c"
+ _tmp7_ = TRUE;
+#line 3384 "ViewCollection.c"
} else {
- CreateViewPredicate _tmp11_;
- void* _tmp11__target;
- DataSource* _tmp12_;
- gboolean _tmp13_;
-#line 505 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp11_ = self->priv->should_mirror;
+ CreateViewPredicate _tmp9_;
+ void* _tmp9__target;
+ DataSource* _tmp10_;
#line 505 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp11__target = self->priv->should_mirror_target;
+ _tmp9_ = self->priv->should_mirror;
#line 505 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp12_ = source;
+ _tmp9__target = self->priv->should_mirror_target;
#line 505 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp13_ = _tmp11_ (_tmp12_, _tmp11__target);
+ _tmp10_ = source;
#line 505 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp9_ = _tmp13_;
-#line 3320 "ViewCollection.c"
+ _tmp7_ = _tmp9_ (_tmp10_, _tmp9__target);
+#line 3397 "ViewCollection.c"
}
#line 505 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- if (_tmp9_) {
-#line 3324 "ViewCollection.c"
- GeeArrayList* _tmp14_;
- CreateView _tmp15_;
- void* _tmp15__target;
- DataSource* _tmp16_;
- DataView* _tmp17_;
- DataView* _tmp18_;
+ if (_tmp7_) {
+#line 3401 "ViewCollection.c"
+ GeeArrayList* _tmp11_;
+ CreateView _tmp12_;
+ void* _tmp12__target;
+ DataSource* _tmp13_;
+ DataView* _tmp14_;
+ DataView* _tmp15_;
#line 506 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp14_ = to_add;
+ _tmp11_ = to_add;
#line 506 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp15_ = self->priv->mirroring_ctor;
+ _tmp12_ = self->priv->mirroring_ctor;
#line 506 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp15__target = self->priv->mirroring_ctor_target;
+ _tmp12__target = self->priv->mirroring_ctor_target;
#line 506 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp16_ = source;
+ _tmp13_ = source;
#line 506 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp17_ = _tmp15_ (_tmp16_, _tmp15__target);
+ _tmp14_ = _tmp12_ (_tmp13_, _tmp12__target);
#line 506 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp18_ = _tmp17_;
+ _tmp15_ = _tmp14_;
#line 506 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp18_);
+ gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp15_);
#line 506 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _g_object_unref0 (_tmp18_);
-#line 3347 "ViewCollection.c"
+ _g_object_unref0 (_tmp15_);
+#line 3424 "ViewCollection.c"
}
#line 502 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (source);
#line 502 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (object);
-#line 3353 "ViewCollection.c"
+#line 3430 "ViewCollection.c"
}
#line 502 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (_object_it);
-#line 3357 "ViewCollection.c"
+#line 3434 "ViewCollection.c"
}
#line 509 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp19_ = to_add;
+ _tmp16_ = to_add;
#line 509 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp20_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
+ _tmp17_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
#line 509 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp21_ = _tmp20_;
+ _tmp18_ = _tmp17_;
#line 509 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- if (_tmp21_ > 0) {
-#line 3367 "ViewCollection.c"
- GeeArrayList* _tmp22_;
- GeeCollection* _tmp23_;
- GeeCollection* _tmp24_;
+ if (_tmp18_ > 0) {
+#line 3444 "ViewCollection.c"
+ GeeArrayList* _tmp19_;
+ GeeCollection* _tmp20_;
+ GeeCollection* _tmp21_;
#line 510 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp22_ = to_add;
+ _tmp19_ = to_add;
#line 510 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp23_ = data_collection_add_many (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, GEE_TYPE_COLLECTION, GeeCollection), NULL, NULL);
+ _tmp20_ = data_collection_add_many (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GEE_TYPE_COLLECTION, GeeCollection), NULL, NULL);
#line 510 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp24_ = _tmp23_;
+ _tmp21_ = _tmp20_;
#line 510 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _g_object_unref0 (_tmp24_);
-#line 3379 "ViewCollection.c"
+ _g_object_unref0 (_tmp21_);
+#line 3456 "ViewCollection.c"
}
#line 500 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (to_add);
-#line 3383 "ViewCollection.c"
+#line 3460 "ViewCollection.c"
}
-static void view_collection_on_mirror_contents_removed (ViewCollection* self, GeeIterable* removed) {
+static void
+view_collection_on_mirror_contents_removed (ViewCollection* self,
+ GeeIterable* removed)
+{
Marker* marker = NULL;
Marker* _tmp0_;
- Marker* _tmp17_;
+ Marker* _tmp15_;
#line 513 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_if_fail (IS_VIEW_COLLECTION (self));
#line 513 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -3396,112 +3476,108 @@ static void view_collection_on_mirror_contents_removed (ViewCollection* self, Ge
_tmp0_ = data_collection_start_marking (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection));
#line 514 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
marker = _tmp0_;
-#line 3399 "ViewCollection.c"
+#line 3479 "ViewCollection.c"
{
GeeIterator* _object_it = NULL;
- GeeIterable* _tmp1_;
- GeeIterator* _tmp2_;
-#line 515 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp1_ = removed;
+ GeeIterator* _tmp1_;
#line 515 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp2_ = gee_iterable_iterator (_tmp1_);
+ _tmp1_ = gee_iterable_iterator (removed);
#line 515 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _object_it = _tmp2_;
+ _object_it = _tmp1_;
#line 515 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
while (TRUE) {
-#line 3412 "ViewCollection.c"
- GeeIterator* _tmp3_;
- gboolean _tmp4_;
+#line 3489 "ViewCollection.c"
+ GeeIterator* _tmp2_;
DataObject* object = NULL;
- GeeIterator* _tmp5_;
- gpointer _tmp6_;
+ GeeIterator* _tmp3_;
+ gpointer _tmp4_;
DataView* view = NULL;
- DataObject* _tmp7_;
- DataView* _tmp8_;
+ DataObject* _tmp5_;
+ DataView* _tmp6_;
DataView* our_view = NULL;
- DataView* _tmp9_;
- DataSource* _tmp10_;
- DataSource* _tmp11_;
+ DataView* _tmp7_;
+ DataSource* _tmp8_;
+ DataSource* _tmp9_;
+ DataView* _tmp10_;
+ DataView* _tmp11_;
DataView* _tmp12_;
- DataView* _tmp13_;
+ Marker* _tmp13_;
DataView* _tmp14_;
- Marker* _tmp15_;
- DataView* _tmp16_;
#line 515 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp3_ = _object_it;
-#line 515 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp4_ = gee_iterator_next (_tmp3_);
+ _tmp2_ = _object_it;
#line 515 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- if (!_tmp4_) {
+ if (!gee_iterator_next (_tmp2_)) {
#line 515 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
break;
-#line 3438 "ViewCollection.c"
+#line 3512 "ViewCollection.c"
}
#line 515 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp5_ = _object_it;
+ _tmp3_ = _object_it;
#line 515 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp6_ = gee_iterator_get (_tmp5_);
+ _tmp4_ = gee_iterator_get (_tmp3_);
#line 515 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- object = (DataObject*) _tmp6_;
+ object = (DataObject*) _tmp4_;
#line 516 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp7_ = object;
+ _tmp5_ = object;
#line 516 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp8_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_DATA_VIEW, DataView));
+ _tmp6_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_DATA_VIEW, DataView));
#line 516 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- view = _tmp8_;
+ view = _tmp6_;
#line 518 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp9_ = view;
+ _tmp7_ = view;
#line 518 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp10_ = data_view_get_source (_tmp9_);
+ _tmp8_ = data_view_get_source (_tmp7_);
#line 518 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp11_ = _tmp10_;
+ _tmp9_ = _tmp8_;
#line 518 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp12_ = view_collection_get_view_for_source (self, _tmp11_);
+ _tmp10_ = view_collection_get_view_for_source (self, _tmp9_);
#line 518 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp13_ = _tmp12_;
+ _tmp11_ = _tmp10_;
#line 518 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _g_object_unref0 (_tmp11_);
+ _g_object_unref0 (_tmp9_);
#line 518 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- our_view = _tmp13_;
+ our_view = _tmp11_;
#line 519 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp14_ = our_view;
+ _tmp12_ = our_view;
#line 519 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _vala_assert (_tmp14_ != NULL, "our_view != null");
+ _vala_assert (_tmp12_ != NULL, "our_view != null");
#line 521 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp15_ = marker;
+ _tmp13_ = marker;
#line 521 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp16_ = our_view;
+ _tmp14_ = our_view;
#line 521 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- marker_mark (_tmp15_, G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_DATA_OBJECT, DataObject));
+ marker_mark (_tmp13_, G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_DATA_OBJECT, DataObject));
#line 515 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (our_view);
#line 515 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (view);
#line 515 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (object);
-#line 3482 "ViewCollection.c"
+#line 3556 "ViewCollection.c"
}
#line 515 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (_object_it);
-#line 3486 "ViewCollection.c"
+#line 3560 "ViewCollection.c"
}
#line 524 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp17_ = marker;
+ _tmp15_ = marker;
#line 524 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- data_collection_remove_marked (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), _tmp17_);
+ data_collection_remove_marked (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), _tmp15_);
#line 513 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (marker);
-#line 3494 "ViewCollection.c"
+#line 3568 "ViewCollection.c"
}
-static void view_collection_real_notify_items_added (DataCollection* base, GeeIterable* added) {
+static void
+view_collection_real_notify_items_added (DataCollection* base,
+ GeeIterable* added)
+{
ViewCollection * self;
GeeArrayList* added_visible = NULL;
GeeArrayList* added_selected = NULL;
- GeeArrayList* _tmp30_;
- GeeArrayList* _tmp34_;
- GeeIterable* _tmp37_;
+ GeeArrayList* _tmp25_;
+ GeeArrayList* _tmp28_;
#line 528 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIEW_COLLECTION, ViewCollection);
#line 528 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -3510,479 +3586,435 @@ static void view_collection_real_notify_items_added (DataCollection* base, GeeIt
added_visible = NULL;
#line 530 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
added_selected = NULL;
-#line 3513 "ViewCollection.c"
+#line 3589 "ViewCollection.c"
{
GeeIterator* _object_it = NULL;
- GeeIterable* _tmp0_;
- GeeIterator* _tmp1_;
+ GeeIterator* _tmp0_;
#line 532 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp0_ = added;
+ _tmp0_ = gee_iterable_iterator (added);
#line 532 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp1_ = gee_iterable_iterator (_tmp0_);
-#line 532 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _object_it = _tmp1_;
+ _object_it = _tmp0_;
#line 532 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
while (TRUE) {
-#line 3526 "ViewCollection.c"
- GeeIterator* _tmp2_;
- gboolean _tmp3_;
+#line 3599 "ViewCollection.c"
+ GeeIterator* _tmp1_;
DataObject* object = NULL;
- GeeIterator* _tmp4_;
- gpointer _tmp5_;
+ GeeIterator* _tmp2_;
+ gpointer _tmp3_;
DataView* view = NULL;
- DataObject* _tmp6_;
+ DataObject* _tmp4_;
+ DataView* _tmp5_;
+ GeeHashMap* _tmp6_;
DataView* _tmp7_;
- GeeHashMap* _tmp8_;
- DataView* _tmp9_;
- DataSource* _tmp10_;
- DataSource* _tmp11_;
+ DataSource* _tmp8_;
+ DataSource* _tmp9_;
+ DataView* _tmp10_;
+ gboolean _tmp11_ = FALSE;
DataView* _tmp12_;
- gboolean _tmp13_ = FALSE;
- DataView* _tmp14_;
- gboolean _tmp15_;
- gboolean _tmp22_ = FALSE;
- DataView* _tmp23_;
- gboolean _tmp24_;
-#line 532 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp2_ = _object_it;
+ gboolean _tmp18_ = FALSE;
+ DataView* _tmp19_;
#line 532 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp3_ = gee_iterator_next (_tmp2_);
+ _tmp1_ = _object_it;
#line 532 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- if (!_tmp3_) {
+ if (!gee_iterator_next (_tmp1_)) {
#line 532 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
break;
-#line 3554 "ViewCollection.c"
+#line 3622 "ViewCollection.c"
}
#line 532 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp4_ = _object_it;
+ _tmp2_ = _object_it;
#line 532 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp5_ = gee_iterator_get (_tmp4_);
+ _tmp3_ = gee_iterator_get (_tmp2_);
#line 532 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- object = (DataObject*) _tmp5_;
+ object = (DataObject*) _tmp3_;
#line 533 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp6_ = object;
+ _tmp4_ = object;
#line 533 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp7_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_DATA_VIEW, DataView));
+ _tmp5_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_DATA_VIEW, DataView));
#line 533 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- view = _tmp7_;
+ view = _tmp5_;
#line 534 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp8_ = self->priv->source_map;
+ _tmp6_ = self->priv->source_map;
#line 534 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp9_ = view;
+ _tmp7_ = view;
#line 534 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp10_ = data_view_get_source (_tmp9_);
+ _tmp8_ = data_view_get_source (_tmp7_);
#line 534 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp11_ = _tmp10_;
+ _tmp9_ = _tmp8_;
#line 534 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp12_ = view;
+ _tmp10_ = view;
#line 534 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp11_, _tmp12_);
+ gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp9_, _tmp10_);
#line 534 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _g_object_unref0 (_tmp11_);
-#line 536 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp14_ = view;
-#line 536 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp15_ = data_view_is_selected (_tmp14_);
+ _g_object_unref0 (_tmp9_);
#line 536 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- if (_tmp15_) {
-#line 3588 "ViewCollection.c"
- DataView* _tmp16_;
- gboolean _tmp17_;
+ _tmp12_ = view;
#line 536 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp16_ = view;
+ if (data_view_is_selected (_tmp12_)) {
+#line 3654 "ViewCollection.c"
+ DataView* _tmp13_;
#line 536 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp17_ = data_view_is_visible (_tmp16_);
+ _tmp13_ = view;
#line 536 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp13_ = _tmp17_;
-#line 3597 "ViewCollection.c"
+ _tmp11_ = data_view_is_visible (_tmp13_);
+#line 3660 "ViewCollection.c"
} else {
#line 536 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp13_ = FALSE;
-#line 3601 "ViewCollection.c"
+ _tmp11_ = FALSE;
+#line 3664 "ViewCollection.c"
}
#line 536 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- if (_tmp13_) {
-#line 3605 "ViewCollection.c"
- GeeArrayList* _tmp18_;
- GeeArrayList* _tmp20_;
- DataView* _tmp21_;
+ if (_tmp11_) {
+#line 3668 "ViewCollection.c"
+ GeeArrayList* _tmp14_;
+ GeeArrayList* _tmp16_;
+ DataView* _tmp17_;
#line 537 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp18_ = added_selected;
+ _tmp14_ = added_selected;
#line 537 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- if (_tmp18_ == NULL) {
-#line 3613 "ViewCollection.c"
- GeeArrayList* _tmp19_;
+ if (_tmp14_ == NULL) {
+#line 3676 "ViewCollection.c"
+ GeeArrayList* _tmp15_;
#line 538 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp19_ = gee_array_list_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
+ _tmp15_ = gee_array_list_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
#line 538 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (added_selected);
#line 538 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- added_selected = _tmp19_;
-#line 3621 "ViewCollection.c"
+ added_selected = _tmp15_;
+#line 3684 "ViewCollection.c"
}
#line 540 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp20_ = added_selected;
+ _tmp16_ = added_selected;
#line 540 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp21_ = view;
+ _tmp17_ = view;
#line 540 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp21_);
-#line 3629 "ViewCollection.c"
+ gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp17_);
+#line 3692 "ViewCollection.c"
}
#line 544 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp23_ = view;
+ _tmp19_ = view;
#line 544 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp24_ = data_view_is_visible (_tmp23_);
+ if (data_view_is_visible (_tmp19_)) {
+#line 3698 "ViewCollection.c"
+ DataSet* _tmp20_;
#line 544 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- if (_tmp24_) {
-#line 3637 "ViewCollection.c"
- DataSet* _tmp25_;
+ _tmp20_ = self->priv->visible;
#line 544 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp25_ = self->priv->visible;
-#line 544 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp22_ = _tmp25_ != NULL;
-#line 3643 "ViewCollection.c"
+ _tmp18_ = _tmp20_ != NULL;
+#line 3704 "ViewCollection.c"
} else {
#line 544 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp22_ = FALSE;
-#line 3647 "ViewCollection.c"
+ _tmp18_ = FALSE;
+#line 3708 "ViewCollection.c"
}
#line 544 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- if (_tmp22_) {
-#line 3651 "ViewCollection.c"
- GeeArrayList* _tmp26_;
- GeeArrayList* _tmp28_;
- DataView* _tmp29_;
+ if (_tmp18_) {
+#line 3712 "ViewCollection.c"
+ GeeArrayList* _tmp21_;
+ GeeArrayList* _tmp23_;
+ DataView* _tmp24_;
#line 545 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp26_ = added_visible;
+ _tmp21_ = added_visible;
#line 545 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- if (_tmp26_ == NULL) {
-#line 3659 "ViewCollection.c"
- GeeArrayList* _tmp27_;
+ if (_tmp21_ == NULL) {
+#line 3720 "ViewCollection.c"
+ GeeArrayList* _tmp22_;
#line 546 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp27_ = gee_array_list_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
+ _tmp22_ = gee_array_list_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
#line 546 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (added_visible);
#line 546 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- added_visible = _tmp27_;
-#line 3667 "ViewCollection.c"
+ added_visible = _tmp22_;
+#line 3728 "ViewCollection.c"
}
#line 548 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp28_ = added_visible;
+ _tmp23_ = added_visible;
#line 548 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp29_ = view;
+ _tmp24_ = view;
#line 548 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp29_);
-#line 3675 "ViewCollection.c"
+ gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp24_);
+#line 3736 "ViewCollection.c"
}
#line 532 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (view);
#line 532 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (object);
-#line 3681 "ViewCollection.c"
+#line 3742 "ViewCollection.c"
}
#line 532 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (_object_it);
-#line 3685 "ViewCollection.c"
+#line 3746 "ViewCollection.c"
}
#line 552 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp30_ = added_visible;
+ _tmp25_ = added_visible;
#line 552 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- if (_tmp30_ != NULL) {
-#line 3691 "ViewCollection.c"
+ if (_tmp25_ != NULL) {
+#line 3752 "ViewCollection.c"
gboolean is_added = FALSE;
- GeeArrayList* _tmp31_;
- gboolean _tmp32_;
- gboolean _tmp33_;
-#line 553 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp31_ = added_visible;
+ GeeArrayList* _tmp26_;
+ gboolean _tmp27_;
#line 553 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp32_ = view_collection_add_many_visible (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, GEE_TYPE_COLLECTION, GeeCollection));
+ _tmp26_ = added_visible;
#line 553 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- is_added = _tmp32_;
+ is_added = view_collection_add_many_visible (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, GEE_TYPE_COLLECTION, GeeCollection));
#line 554 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp33_ = is_added;
+ _tmp27_ = is_added;
#line 554 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _vala_assert (_tmp33_, "is_added");
-#line 3706 "ViewCollection.c"
+ _vala_assert (_tmp27_, "is_added");
+#line 3764 "ViewCollection.c"
}
#line 557 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp34_ = added_selected;
+ _tmp28_ = added_selected;
#line 557 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- if (_tmp34_ != NULL) {
-#line 3712 "ViewCollection.c"
- GeeArrayList* _tmp35_;
- GeeArrayList* _tmp36_;
+ if (_tmp28_ != NULL) {
+#line 3770 "ViewCollection.c"
+ GeeArrayList* _tmp29_;
+ GeeArrayList* _tmp30_;
#line 558 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp35_ = added_selected;
+ _tmp29_ = added_selected;
#line 558 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- view_collection_add_many_selected (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, GEE_TYPE_COLLECTION, GeeCollection));
+ view_collection_add_many_selected (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, GEE_TYPE_COLLECTION, GeeCollection));
#line 559 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp36_ = added_selected;
+ _tmp30_ = added_selected;
#line 559 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- view_collection_notify_items_selected_unselected (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, GEE_TYPE_COLLECTION, GeeCollection), NULL);
-#line 3723 "ViewCollection.c"
+ view_collection_notify_items_selected_unselected (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, GEE_TYPE_COLLECTION, GeeCollection), NULL);
+#line 3781 "ViewCollection.c"
}
#line 562 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp37_ = added;
-#line 562 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- DATA_COLLECTION_CLASS (view_collection_parent_class)->notify_items_added (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), _tmp37_);
+ DATA_COLLECTION_CLASS (view_collection_parent_class)->notify_items_added (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), added);
#line 528 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (added_selected);
#line 528 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (added_visible);
-#line 3733 "ViewCollection.c"
+#line 3789 "ViewCollection.c"
}
-static void view_collection_real_notify_items_removed (DataCollection* base, GeeIterable* removed) {
+static void
+view_collection_real_notify_items_removed (DataCollection* base,
+ GeeIterable* removed)
+{
ViewCollection * self;
GeeArrayList* selected_removed = NULL;
- GeeArrayList* _tmp42_;
- GeeIterable* _tmp44_;
+ GeeArrayList* _tmp33_;
#line 566 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIEW_COLLECTION, ViewCollection);
#line 566 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_if_fail (GEE_IS_ITERABLE (removed));
#line 567 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
selected_removed = NULL;
-#line 3748 "ViewCollection.c"
+#line 3806 "ViewCollection.c"
{
GeeIterator* _object_it = NULL;
- GeeIterable* _tmp0_;
- GeeIterator* _tmp1_;
+ GeeIterator* _tmp0_;
#line 568 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp0_ = removed;
+ _tmp0_ = gee_iterable_iterator (removed);
#line 568 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp1_ = gee_iterable_iterator (_tmp0_);
-#line 568 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _object_it = _tmp1_;
+ _object_it = _tmp0_;
#line 568 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
while (TRUE) {
-#line 3761 "ViewCollection.c"
- GeeIterator* _tmp2_;
- gboolean _tmp3_;
+#line 3816 "ViewCollection.c"
+ GeeIterator* _tmp1_;
DataObject* object = NULL;
- GeeIterator* _tmp4_;
- gpointer _tmp5_;
+ GeeIterator* _tmp2_;
+ gpointer _tmp3_;
DataView* view = NULL;
- DataObject* _tmp6_;
+ DataObject* _tmp4_;
+ DataView* _tmp5_;
+ GeeHashMap* _tmp6_;
DataView* _tmp7_;
- GeeHashMap* _tmp8_;
- DataView* _tmp9_;
- DataSource* _tmp10_;
- DataSource* _tmp11_;
- gboolean _tmp12_;
- gboolean _tmp13_;
-#line 568 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp2_ = _object_it;
+ DataSource* _tmp8_;
+ DataSource* _tmp9_;
+ gboolean _tmp10_;
#line 568 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp3_ = gee_iterator_next (_tmp2_);
+ _tmp1_ = _object_it;
#line 568 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- if (!_tmp3_) {
+ if (!gee_iterator_next (_tmp1_)) {
#line 568 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
break;
-#line 3784 "ViewCollection.c"
+#line 3835 "ViewCollection.c"
}
#line 568 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp4_ = _object_it;
+ _tmp2_ = _object_it;
#line 568 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp5_ = gee_iterator_get (_tmp4_);
+ _tmp3_ = gee_iterator_get (_tmp2_);
#line 568 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- object = (DataObject*) _tmp5_;
+ object = (DataObject*) _tmp3_;
#line 569 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp6_ = object;
+ _tmp4_ = object;
#line 569 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp7_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_DATA_VIEW, DataView));
+ _tmp5_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_DATA_VIEW, DataView));
#line 569 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- view = _tmp7_;
+ view = _tmp5_;
#line 575 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp8_ = self->priv->source_map;
-#line 575 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp9_ = view;
+ _tmp6_ = self->priv->source_map;
#line 575 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp10_ = data_view_get_source (_tmp9_);
+ _tmp7_ = view;
#line 575 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp11_ = _tmp10_;
+ _tmp8_ = data_view_get_source (_tmp7_);
#line 575 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp12_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp11_);
+ _tmp9_ = _tmp8_;
#line 575 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp13_ = _tmp12_;
+ _tmp10_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp9_);
#line 575 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _g_object_unref0 (_tmp11_);
+ _g_object_unref0 (_tmp9_);
#line 575 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- if (_tmp13_) {
-#line 3814 "ViewCollection.c"
+ if (_tmp10_) {
+#line 3863 "ViewCollection.c"
gboolean is_removed = FALSE;
- GeeHashMap* _tmp14_;
- DataView* _tmp15_;
- DataSource* _tmp16_;
- DataSource* _tmp17_;
- gboolean _tmp18_;
- gboolean _tmp19_;
- gboolean _tmp20_;
- DataView* _tmp21_;
- gboolean _tmp22_;
- gboolean _tmp34_ = FALSE;
- DataView* _tmp35_;
- gboolean _tmp36_;
+ GeeHashMap* _tmp11_;
+ DataView* _tmp12_;
+ DataSource* _tmp13_;
+ DataSource* _tmp14_;
+ gboolean _tmp15_;
+ gboolean _tmp16_;
+ gboolean _tmp17_;
+ DataView* _tmp18_;
+ gboolean _tmp27_ = FALSE;
+ DataView* _tmp28_;
#line 576 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp14_ = self->priv->source_map;
+ _tmp11_ = self->priv->source_map;
#line 576 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp15_ = view;
+ _tmp12_ = view;
#line 576 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp16_ = data_view_get_source (_tmp15_);
+ _tmp13_ = data_view_get_source (_tmp12_);
#line 576 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp17_ = _tmp16_;
+ _tmp14_ = _tmp13_;
#line 576 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp18_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp17_, NULL);
+ _tmp15_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp14_, NULL);
#line 576 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp19_ = _tmp18_;
+ _tmp16_ = _tmp15_;
#line 576 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _g_object_unref0 (_tmp17_);
+ _g_object_unref0 (_tmp14_);
#line 576 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- is_removed = _tmp19_;
+ is_removed = _tmp16_;
#line 577 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp20_ = is_removed;
+ _tmp17_ = is_removed;
#line 577 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _vala_assert (_tmp20_, "is_removed");
+ _vala_assert (_tmp17_, "is_removed");
#line 579 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp21_ = view;
+ _tmp18_ = view;
#line 579 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp22_ = data_view_is_selected (_tmp21_);
-#line 579 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- if (_tmp22_) {
-#line 3854 "ViewCollection.c"
- DataSet* _tmp23_;
- DataView* _tmp24_;
- gboolean _tmp25_;
- DataView* _tmp26_;
- gboolean _tmp27_;
- DataView* _tmp28_;
- gboolean _tmp29_;
-#line 581 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp23_ = self->priv->selected;
-#line 581 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp24_ = view;
+ if (data_view_is_selected (_tmp18_)) {
+#line 3899 "ViewCollection.c"
+ DataSet* _tmp19_;
+ DataView* _tmp20_;
+ DataView* _tmp21_;
+ DataView* _tmp22_;
#line 581 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp25_ = data_set_contains (_tmp23_, G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, TYPE_DATA_OBJECT, DataObject));
+ _tmp19_ = self->priv->selected;
#line 581 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp26_ = view;
+ _tmp20_ = view;
#line 581 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp27_ = data_view_is_visible (_tmp26_);
+ _tmp21_ = view;
#line 581 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _vala_assert (_tmp25_ == _tmp27_, "selected.contains(view) == view.is_visible()");
-#line 583 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp28_ = view;
+ _vala_assert (data_set_contains (_tmp19_, G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, TYPE_DATA_OBJECT, DataObject)) == data_view_is_visible (_tmp21_), "selected.contains(view) == view.is_visible()");
#line 583 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp29_ = data_view_is_visible (_tmp28_);
+ _tmp22_ = view;
#line 583 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- if (_tmp29_) {
-#line 3880 "ViewCollection.c"
- GeeArrayList* _tmp30_;
- GeeArrayList* _tmp32_;
- DataView* _tmp33_;
+ if (data_view_is_visible (_tmp22_)) {
+#line 3916 "ViewCollection.c"
+ GeeArrayList* _tmp23_;
+ GeeArrayList* _tmp25_;
+ DataView* _tmp26_;
#line 584 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp30_ = selected_removed;
+ _tmp23_ = selected_removed;
#line 584 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- if (_tmp30_ == NULL) {
-#line 3888 "ViewCollection.c"
- GeeArrayList* _tmp31_;
+ if (_tmp23_ == NULL) {
+#line 3924 "ViewCollection.c"
+ GeeArrayList* _tmp24_;
#line 585 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp31_ = gee_array_list_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
+ _tmp24_ = gee_array_list_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
#line 585 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (selected_removed);
#line 585 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- selected_removed = _tmp31_;
-#line 3896 "ViewCollection.c"
+ selected_removed = _tmp24_;
+#line 3932 "ViewCollection.c"
}
#line 587 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp32_ = selected_removed;
+ _tmp25_ = selected_removed;
#line 587 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp33_ = view;
+ _tmp26_ = view;
#line 587 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp33_);
-#line 3904 "ViewCollection.c"
+ gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp26_);
+#line 3940 "ViewCollection.c"
}
}
#line 591 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp35_ = view;
-#line 591 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp36_ = data_view_is_visible (_tmp35_);
+ _tmp28_ = view;
#line 591 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- if (_tmp36_) {
-#line 3913 "ViewCollection.c"
- DataSet* _tmp37_;
+ if (data_view_is_visible (_tmp28_)) {
+#line 3947 "ViewCollection.c"
+ DataSet* _tmp29_;
#line 591 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp37_ = self->priv->visible;
+ _tmp29_ = self->priv->visible;
#line 591 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp34_ = _tmp37_ != NULL;
-#line 3919 "ViewCollection.c"
+ _tmp27_ = _tmp29_ != NULL;
+#line 3953 "ViewCollection.c"
} else {
#line 591 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp34_ = FALSE;
-#line 3923 "ViewCollection.c"
+ _tmp27_ = FALSE;
+#line 3957 "ViewCollection.c"
}
#line 591 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- if (_tmp34_) {
-#line 3927 "ViewCollection.c"
- DataSet* _tmp38_;
- DataView* _tmp39_;
- gboolean _tmp40_;
- gboolean _tmp41_;
-#line 592 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp38_ = self->priv->visible;
+ if (_tmp27_) {
+#line 3961 "ViewCollection.c"
+ DataSet* _tmp30_;
+ DataView* _tmp31_;
+ gboolean _tmp32_;
#line 592 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp39_ = view;
+ _tmp30_ = self->priv->visible;
#line 592 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp40_ = data_set_remove (_tmp38_, G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, TYPE_DATA_OBJECT, DataObject));
+ _tmp31_ = view;
#line 592 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- is_removed = _tmp40_;
+ is_removed = data_set_remove (_tmp30_, G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, TYPE_DATA_OBJECT, DataObject));
#line 593 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp41_ = is_removed;
+ _tmp32_ = is_removed;
#line 593 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _vala_assert (_tmp41_, "is_removed");
-#line 3944 "ViewCollection.c"
+ _vala_assert (_tmp32_, "is_removed");
+#line 3975 "ViewCollection.c"
}
}
#line 568 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (view);
#line 568 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (object);
-#line 3951 "ViewCollection.c"
+#line 3982 "ViewCollection.c"
}
#line 568 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (_object_it);
-#line 3955 "ViewCollection.c"
+#line 3986 "ViewCollection.c"
}
#line 598 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp42_ = selected_removed;
+ _tmp33_ = selected_removed;
#line 598 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- if (_tmp42_ != NULL) {
-#line 3961 "ViewCollection.c"
- GeeArrayList* _tmp43_;
+ if (_tmp33_ != NULL) {
+#line 3992 "ViewCollection.c"
+ GeeArrayList* _tmp34_;
#line 599 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp43_ = selected_removed;
+ _tmp34_ = selected_removed;
#line 599 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- view_collection_remove_many_selected (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, GEE_TYPE_COLLECTION, GeeCollection));
+ view_collection_remove_many_selected (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, GEE_TYPE_COLLECTION, GeeCollection));
#line 604 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
view_collection_notify_selection_group_altered (self);
-#line 3969 "ViewCollection.c"
+#line 4000 "ViewCollection.c"
}
#line 607 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp44_ = removed;
-#line 607 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- DATA_COLLECTION_CLASS (view_collection_parent_class)->notify_items_removed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), _tmp44_);
+ DATA_COLLECTION_CLASS (view_collection_parent_class)->notify_items_removed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), removed);
#line 566 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (selected_removed);
-#line 3977 "ViewCollection.c"
+#line 4006 "ViewCollection.c"
}
-static void view_collection_filter_altered_items (ViewCollection* self, GeeCollection* views) {
+static void
+view_collection_filter_altered_items (ViewCollection* self,
+ GeeCollection* views)
+{
GeeArrayList* to_show = NULL;
GeeArrayList* to_hide = NULL;
- GeeArrayList* _tmp20_;
- GeeArrayList* _tmp22_;
+ GeeArrayList* _tmp15_;
+ GeeArrayList* _tmp17_;
#line 610 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_if_fail (IS_VIEW_COLLECTION (self));
#line 610 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -3991,256 +4023,210 @@ static void view_collection_filter_altered_items (ViewCollection* self, GeeColle
to_show = NULL;
#line 614 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
to_hide = NULL;
-#line 3994 "ViewCollection.c"
+#line 4026 "ViewCollection.c"
{
GeeIterator* _view_it = NULL;
- GeeCollection* _tmp0_;
- GeeIterator* _tmp1_;
+ GeeIterator* _tmp0_;
#line 619 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp0_ = views;
+ _tmp0_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (views, GEE_TYPE_ITERABLE, GeeIterable));
#line 619 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp1_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 619 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _view_it = _tmp1_;
+ _view_it = _tmp0_;
#line 619 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
while (TRUE) {
-#line 4007 "ViewCollection.c"
- GeeIterator* _tmp2_;
- gboolean _tmp3_;
+#line 4036 "ViewCollection.c"
+ GeeIterator* _tmp1_;
DataView* view = NULL;
- GeeIterator* _tmp4_;
- gpointer _tmp5_;
- DataView* _tmp6_;
- gboolean _tmp7_;
-#line 619 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp2_ = _view_it;
+ GeeIterator* _tmp2_;
+ gpointer _tmp3_;
+ DataView* _tmp4_;
#line 619 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp3_ = gee_iterator_next (_tmp2_);
+ _tmp1_ = _view_it;
#line 619 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- if (!_tmp3_) {
+ if (!gee_iterator_next (_tmp1_)) {
#line 619 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
break;
-#line 4023 "ViewCollection.c"
+#line 4048 "ViewCollection.c"
}
#line 619 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp4_ = _view_it;
+ _tmp2_ = _view_it;
#line 619 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp5_ = gee_iterator_get (_tmp4_);
+ _tmp3_ = gee_iterator_get (_tmp2_);
#line 619 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- view = (DataView*) _tmp5_;
-#line 620 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp6_ = view;
+ view = (DataView*) _tmp3_;
#line 620 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp7_ = view_collection_is_in_filter (self, _tmp6_);
+ _tmp4_ = view;
#line 620 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- if (_tmp7_) {
-#line 4037 "ViewCollection.c"
- DataView* _tmp8_;
- gboolean _tmp9_;
-#line 621 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp8_ = view;
+ if (view_collection_is_in_filter (self, _tmp4_)) {
+#line 4060 "ViewCollection.c"
+ DataView* _tmp5_;
#line 621 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp9_ = data_view_is_visible (_tmp8_);
+ _tmp5_ = view;
#line 621 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- if (!_tmp9_) {
-#line 4046 "ViewCollection.c"
- GeeArrayList* _tmp10_;
- GeeArrayList* _tmp12_;
- DataView* _tmp13_;
+ if (!data_view_is_visible (_tmp5_)) {
+#line 4066 "ViewCollection.c"
+ GeeArrayList* _tmp6_;
+ GeeArrayList* _tmp8_;
+ DataView* _tmp9_;
#line 622 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp10_ = to_show;
+ _tmp6_ = to_show;
#line 622 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- if (_tmp10_ == NULL) {
-#line 4054 "ViewCollection.c"
- GeeArrayList* _tmp11_;
+ if (_tmp6_ == NULL) {
+#line 4074 "ViewCollection.c"
+ GeeArrayList* _tmp7_;
#line 623 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp11_ = gee_array_list_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
+ _tmp7_ = gee_array_list_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
#line 623 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (to_show);
#line 623 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- to_show = _tmp11_;
-#line 4062 "ViewCollection.c"
+ to_show = _tmp7_;
+#line 4082 "ViewCollection.c"
}
#line 625 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp12_ = to_show;
+ _tmp8_ = to_show;
#line 625 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp13_ = view;
+ _tmp9_ = view;
#line 625 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp13_);
-#line 4070 "ViewCollection.c"
+ gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp9_);
+#line 4090 "ViewCollection.c"
}
} else {
- DataView* _tmp14_;
- gboolean _tmp15_;
+ DataView* _tmp10_;
#line 628 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp14_ = view;
-#line 628 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp15_ = data_view_is_visible (_tmp14_);
+ _tmp10_ = view;
#line 628 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- if (_tmp15_) {
-#line 4081 "ViewCollection.c"
- GeeArrayList* _tmp16_;
- GeeArrayList* _tmp18_;
- DataView* _tmp19_;
+ if (data_view_is_visible (_tmp10_)) {
+#line 4098 "ViewCollection.c"
+ GeeArrayList* _tmp11_;
+ GeeArrayList* _tmp13_;
+ DataView* _tmp14_;
#line 629 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp16_ = to_hide;
+ _tmp11_ = to_hide;
#line 629 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- if (_tmp16_ == NULL) {
-#line 4089 "ViewCollection.c"
- GeeArrayList* _tmp17_;
+ if (_tmp11_ == NULL) {
+#line 4106 "ViewCollection.c"
+ GeeArrayList* _tmp12_;
#line 630 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp17_ = gee_array_list_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
+ _tmp12_ = gee_array_list_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
#line 630 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (to_hide);
#line 630 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- to_hide = _tmp17_;
-#line 4097 "ViewCollection.c"
+ to_hide = _tmp12_;
+#line 4114 "ViewCollection.c"
}
#line 632 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp18_ = to_hide;
+ _tmp13_ = to_hide;
#line 632 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp19_ = view;
+ _tmp14_ = view;
#line 632 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp19_);
-#line 4105 "ViewCollection.c"
+ gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp14_);
+#line 4122 "ViewCollection.c"
}
}
#line 619 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (view);
-#line 4110 "ViewCollection.c"
+#line 4127 "ViewCollection.c"
}
#line 619 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (_view_it);
-#line 4114 "ViewCollection.c"
+#line 4131 "ViewCollection.c"
}
#line 641 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp20_ = to_show;
+ _tmp15_ = to_show;
#line 641 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- if (_tmp20_ != NULL) {
-#line 4120 "ViewCollection.c"
- GeeArrayList* _tmp21_;
+ if (_tmp15_ != NULL) {
+#line 4137 "ViewCollection.c"
+ GeeArrayList* _tmp16_;
#line 642 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp21_ = to_show;
+ _tmp16_ = to_show;
#line 642 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- view_collection_show_items (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, GEE_TYPE_LIST, GeeList));
-#line 4126 "ViewCollection.c"
+ view_collection_show_items (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_LIST, GeeList));
+#line 4143 "ViewCollection.c"
}
#line 644 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp22_ = to_hide;
+ _tmp17_ = to_hide;
#line 644 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- if (_tmp22_ != NULL) {
-#line 4132 "ViewCollection.c"
- GeeArrayList* _tmp23_;
+ if (_tmp17_ != NULL) {
+#line 4149 "ViewCollection.c"
+ GeeArrayList* _tmp18_;
#line 645 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp23_ = to_hide;
+ _tmp18_ = to_hide;
#line 645 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- view_collection_hide_items (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GEE_TYPE_LIST, GeeList));
-#line 4138 "ViewCollection.c"
+ view_collection_hide_items (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_LIST, GeeList));
+#line 4155 "ViewCollection.c"
}
#line 610 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (to_hide);
#line 610 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (to_show);
-#line 4144 "ViewCollection.c"
+#line 4161 "ViewCollection.c"
}
-static void view_collection_real_items_altered (DataCollection* base, GeeMap* map) {
+static void
+view_collection_real_items_altered (DataCollection* base,
+ GeeMap* map)
+{
ViewCollection * self;
- GeeMap* _tmp0_;
+ GeeSet* _tmp0_;
GeeSet* _tmp1_;
- GeeSet* _tmp2_;
- GeeCollection* _tmp3_;
- GeeMap* _tmp4_;
+ GeeCollection* _tmp2_;
#line 648 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIEW_COLLECTION, ViewCollection);
#line 648 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_if_fail (GEE_IS_MAP (map));
#line 650 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp0_ = map;
-#line 650 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp1_ = gee_map_get_keys (_tmp0_);
+ _tmp0_ = gee_map_get_keys (map);
#line 650 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp2_ = _tmp1_;
+ _tmp1_ = _tmp0_;
#line 650 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp3_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection);
+ _tmp2_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection);
#line 650 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- view_collection_filter_altered_items (self, _tmp3_);
+ view_collection_filter_altered_items (self, _tmp2_);
#line 650 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _g_object_unref0 (_tmp3_);
-#line 652 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp4_ = map;
+ _g_object_unref0 (_tmp2_);
#line 652 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- DATA_COLLECTION_CLASS (view_collection_parent_class)->items_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), _tmp4_);
-#line 4175 "ViewCollection.c"
+ DATA_COLLECTION_CLASS (view_collection_parent_class)->items_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), map);
+#line 4189 "ViewCollection.c"
}
-static void view_collection_real_set_comparator (DataCollection* base, Comparator comparator, void* comparator_target, ComparatorPredicate predicate, void* predicate_target) {
+static void
+view_collection_real_set_comparator (DataCollection* base,
+ Comparator comparator,
+ void* comparator_target,
+ ComparatorPredicate predicate,
+ void* predicate_target)
+{
ViewCollection * self;
DataSet* _tmp0_;
- Comparator _tmp1_;
- void* _tmp1__target;
- ComparatorPredicate _tmp2_;
- void* _tmp2__target;
- DataSet* _tmp3_;
- Comparator _tmp7_;
- void* _tmp7__target;
- ComparatorPredicate _tmp8_;
- void* _tmp8__target;
+ DataSet* _tmp1_;
#line 655 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIEW_COLLECTION, ViewCollection);
#line 656 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp0_ = self->priv->selected;
#line 656 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp1_ = comparator;
-#line 656 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp1__target = comparator_target;
-#line 656 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp2_ = predicate;
-#line 656 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp2__target = predicate_target;
-#line 656 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- data_set_set_comparator (_tmp0_, _tmp1_, _tmp1__target, _tmp2_, _tmp2__target);
+ data_set_set_comparator (_tmp0_, comparator, comparator_target, predicate, predicate_target);
#line 657 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp3_ = self->priv->visible;
+ _tmp1_ = self->priv->visible;
#line 657 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- if (_tmp3_ != NULL) {
-#line 4209 "ViewCollection.c"
- DataSet* _tmp4_;
- Comparator _tmp5_;
- void* _tmp5__target;
- ComparatorPredicate _tmp6_;
- void* _tmp6__target;
-#line 658 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp4_ = self->priv->visible;
-#line 658 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp5_ = comparator;
-#line 658 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp5__target = comparator_target;
-#line 658 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp6_ = predicate;
+ if (_tmp1_ != NULL) {
+#line 4213 "ViewCollection.c"
+ DataSet* _tmp2_;
#line 658 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp6__target = predicate_target;
+ _tmp2_ = self->priv->visible;
#line 658 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- data_set_set_comparator (_tmp4_, _tmp5_, _tmp5__target, _tmp6_, _tmp6__target);
-#line 4227 "ViewCollection.c"
+ data_set_set_comparator (_tmp2_, comparator, comparator_target, predicate, predicate_target);
+#line 4219 "ViewCollection.c"
}
#line 660 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp7_ = comparator;
-#line 660 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp7__target = comparator_target;
-#line 660 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp8_ = predicate;
-#line 660 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp8__target = predicate_target;
-#line 660 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- DATA_COLLECTION_CLASS (view_collection_parent_class)->set_comparator (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), _tmp7_, _tmp7__target, _tmp8_, _tmp8__target);
-#line 4239 "ViewCollection.c"
+ DATA_COLLECTION_CLASS (view_collection_parent_class)->set_comparator (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), comparator, comparator_target, predicate, predicate_target);
+#line 4223 "ViewCollection.c"
}
-static void view_collection_real_reset_comparator (DataCollection* base) {
+static void
+view_collection_real_reset_comparator (DataCollection* base)
+{
ViewCollection * self;
DataSet* _tmp0_;
DataSet* _tmp1_;
@@ -4254,21 +4240,23 @@ static void view_collection_real_reset_comparator (DataCollection* base) {
_tmp1_ = self->priv->visible;
#line 665 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (_tmp1_ != NULL) {
-#line 4257 "ViewCollection.c"
+#line 4243 "ViewCollection.c"
DataSet* _tmp2_;
#line 666 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp2_ = self->priv->visible;
#line 666 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
data_set_reset_comparator (_tmp2_);
-#line 4263 "ViewCollection.c"
+#line 4249 "ViewCollection.c"
}
#line 668 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
DATA_COLLECTION_CLASS (view_collection_parent_class)->reset_comparator (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection));
-#line 4267 "ViewCollection.c"
+#line 4253 "ViewCollection.c"
}
-static GeeCollection* view_collection_real_get_all (DataCollection* base) {
+static GeeCollection*
+view_collection_real_get_all (DataCollection* base)
+{
ViewCollection * self;
GeeCollection* result = NULL;
GeeCollection* _tmp0_ = NULL;
@@ -4279,7 +4267,7 @@ static GeeCollection* view_collection_real_get_all (DataCollection* base) {
_tmp1_ = self->priv->visible;
#line 672 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (_tmp1_ != NULL) {
-#line 4282 "ViewCollection.c"
+#line 4270 "ViewCollection.c"
DataSet* _tmp2_;
GeeList* _tmp3_;
#line 672 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -4290,7 +4278,7 @@ static GeeCollection* view_collection_real_get_all (DataCollection* base) {
_g_object_unref0 (_tmp0_);
#line 672 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 4293 "ViewCollection.c"
+#line 4281 "ViewCollection.c"
} else {
GeeCollection* _tmp4_;
#line 672 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -4299,17 +4287,19 @@ static GeeCollection* view_collection_real_get_all (DataCollection* base) {
_g_object_unref0 (_tmp0_);
#line 672 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp0_ = _tmp4_;
-#line 4302 "ViewCollection.c"
+#line 4290 "ViewCollection.c"
}
#line 672 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
result = _tmp0_;
#line 672 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return result;
-#line 4308 "ViewCollection.c"
+#line 4296 "ViewCollection.c"
}
-GeeCollection* view_collection_get_all_unfiltered (ViewCollection* self) {
+GeeCollection*
+view_collection_get_all_unfiltered (ViewCollection* self)
+{
GeeCollection* result = NULL;
GeeCollection* _tmp0_;
#line 675 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -4320,11 +4310,13 @@ GeeCollection* view_collection_get_all_unfiltered (ViewCollection* self) {
result = _tmp0_;
#line 676 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return result;
-#line 4323 "ViewCollection.c"
+#line 4313 "ViewCollection.c"
}
-static gint view_collection_real_get_count (DataCollection* base) {
+static gint
+view_collection_real_get_count (DataCollection* base)
+{
ViewCollection * self;
gint result = 0;
gint _tmp0_ = 0;
@@ -4335,48 +4327,44 @@ static gint view_collection_real_get_count (DataCollection* base) {
_tmp1_ = self->priv->visible;
#line 680 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (_tmp1_ != NULL) {
-#line 4338 "ViewCollection.c"
+#line 4330 "ViewCollection.c"
DataSet* _tmp2_;
- gint _tmp3_;
#line 680 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp2_ = self->priv->visible;
#line 680 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp3_ = data_set_get_count (_tmp2_);
-#line 680 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp0_ = _tmp3_;
-#line 4347 "ViewCollection.c"
+ _tmp0_ = data_set_get_count (_tmp2_);
+#line 4336 "ViewCollection.c"
} else {
- gint _tmp4_;
#line 680 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp4_ = DATA_COLLECTION_CLASS (view_collection_parent_class)->get_count (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection));
-#line 680 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp0_ = _tmp4_;
-#line 4354 "ViewCollection.c"
+ _tmp0_ = DATA_COLLECTION_CLASS (view_collection_parent_class)->get_count (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection));
+#line 4340 "ViewCollection.c"
}
#line 680 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
result = _tmp0_;
#line 680 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return result;
-#line 4360 "ViewCollection.c"
+#line 4346 "ViewCollection.c"
}
-gint view_collection_get_unfiltered_count (ViewCollection* self) {
+gint
+view_collection_get_unfiltered_count (ViewCollection* self)
+{
gint result = 0;
- gint _tmp0_;
#line 683 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_val_if_fail (IS_VIEW_COLLECTION (self), 0);
#line 684 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp0_ = DATA_COLLECTION_CLASS (view_collection_parent_class)->get_count (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection));
-#line 684 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- result = _tmp0_;
+ result = DATA_COLLECTION_CLASS (view_collection_parent_class)->get_count (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection));
#line 684 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return result;
-#line 4375 "ViewCollection.c"
+#line 4360 "ViewCollection.c"
}
-static DataObject* view_collection_real_get_at (DataCollection* base, gint index) {
+static DataObject*
+view_collection_real_get_at (DataCollection* base,
+ gint index)
+{
ViewCollection * self;
DataObject* result = NULL;
DataObject* _tmp0_ = NULL;
@@ -4387,43 +4375,40 @@ static DataObject* view_collection_real_get_at (DataCollection* base, gint index
_tmp1_ = self->priv->visible;
#line 688 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (_tmp1_ != NULL) {
-#line 4390 "ViewCollection.c"
+#line 4378 "ViewCollection.c"
DataSet* _tmp2_;
- gint _tmp3_;
- DataObject* _tmp4_;
+ DataObject* _tmp3_;
#line 688 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp2_ = self->priv->visible;
#line 688 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp3_ = index;
-#line 688 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp4_ = data_set_get_at (_tmp2_, _tmp3_);
+ _tmp3_ = data_set_get_at (_tmp2_, index);
#line 688 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (_tmp0_);
#line 688 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp0_ = _tmp4_;
-#line 4404 "ViewCollection.c"
+ _tmp0_ = _tmp3_;
+#line 4389 "ViewCollection.c"
} else {
- gint _tmp5_;
- DataObject* _tmp6_;
-#line 688 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp5_ = index;
+ DataObject* _tmp4_;
#line 688 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp6_ = DATA_COLLECTION_CLASS (view_collection_parent_class)->get_at (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), _tmp5_);
+ _tmp4_ = DATA_COLLECTION_CLASS (view_collection_parent_class)->get_at (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), index);
#line 688 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (_tmp0_);
#line 688 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp0_ = _tmp6_;
-#line 4416 "ViewCollection.c"
+ _tmp0_ = _tmp4_;
+#line 4398 "ViewCollection.c"
}
#line 688 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
result = _tmp0_;
#line 688 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return result;
-#line 4422 "ViewCollection.c"
+#line 4404 "ViewCollection.c"
}
-static gint view_collection_real_index_of (DataCollection* base, DataObject* object) {
+static gint
+view_collection_real_index_of (DataCollection* base,
+ DataObject* object)
+{
ViewCollection * self;
gint result = 0;
gint _tmp0_ = 0;
@@ -4436,111 +4421,91 @@ static gint view_collection_real_index_of (DataCollection* base, DataObject* obj
_tmp1_ = self->priv->visible;
#line 692 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (_tmp1_ != NULL) {
-#line 4439 "ViewCollection.c"
+#line 4424 "ViewCollection.c"
DataSet* _tmp2_;
- DataObject* _tmp3_;
- gint _tmp4_;
#line 692 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp2_ = self->priv->visible;
#line 692 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp3_ = object;
-#line 692 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp4_ = data_set_index_of (_tmp2_, _tmp3_);
-#line 692 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp0_ = _tmp4_;
-#line 4451 "ViewCollection.c"
+ _tmp0_ = data_set_index_of (_tmp2_, object);
+#line 4430 "ViewCollection.c"
} else {
- DataObject* _tmp5_;
- gint _tmp6_;
-#line 692 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp5_ = object;
#line 692 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp6_ = DATA_COLLECTION_CLASS (view_collection_parent_class)->index_of (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), _tmp5_);
-#line 692 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp0_ = _tmp6_;
-#line 4461 "ViewCollection.c"
+ _tmp0_ = DATA_COLLECTION_CLASS (view_collection_parent_class)->index_of (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), object);
+#line 4434 "ViewCollection.c"
}
#line 692 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
result = _tmp0_;
#line 692 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return result;
-#line 4467 "ViewCollection.c"
+#line 4440 "ViewCollection.c"
}
-static gboolean view_collection_real_contains (DataCollection* base, DataObject* object) {
+static gboolean
+view_collection_real_contains (DataCollection* base,
+ DataObject* object)
+{
ViewCollection * self;
gboolean result = FALSE;
- DataObject* _tmp0_;
- gboolean _tmp1_;
- DataObject* _tmp2_;
- gboolean _tmp3_;
#line 695 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIEW_COLLECTION, ViewCollection);
#line 695 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_val_if_fail (IS_DATA_OBJECT (object), FALSE);
#line 698 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp0_ = object;
-#line 698 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp1_ = DATA_COLLECTION_CLASS (view_collection_parent_class)->contains (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), _tmp0_);
-#line 698 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- if (!_tmp1_) {
+ if (!DATA_COLLECTION_CLASS (view_collection_parent_class)->contains (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), object)) {
#line 699 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
result = FALSE;
#line 699 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return result;
-#line 4492 "ViewCollection.c"
+#line 4460 "ViewCollection.c"
}
#line 702 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp2_ = object;
-#line 702 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp3_ = view_collection_is_visible (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_DATA_VIEW, DataView));
-#line 702 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- result = _tmp3_;
+ result = view_collection_is_visible (self, G_TYPE_CHECK_INSTANCE_CAST (object, TYPE_DATA_VIEW, DataView));
#line 702 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return result;
-#line 4502 "ViewCollection.c"
+#line 4466 "ViewCollection.c"
}
-static DataView* view_collection_real_get_first (ViewCollection* self) {
+static DataView*
+view_collection_real_get_first (ViewCollection* self)
+{
DataView* result = NULL;
DataView* _tmp0_ = NULL;
- gint _tmp1_;
#line 706 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp1_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection));
+ if (data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection)) > 0) {
+#line 4477 "ViewCollection.c"
+ DataObject* _tmp1_;
#line 706 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- if (_tmp1_ > 0) {
-#line 4514 "ViewCollection.c"
- DataObject* _tmp2_;
-#line 706 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp2_ = data_collection_get_at (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), 0);
+ _tmp1_ = data_collection_get_at (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), 0);
#line 706 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (_tmp0_);
#line 706 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_DATA_VIEW, DataView);
-#line 4522 "ViewCollection.c"
+ _tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_VIEW, DataView);
+#line 4485 "ViewCollection.c"
} else {
#line 706 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (_tmp0_);
#line 706 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp0_ = NULL;
-#line 4528 "ViewCollection.c"
+#line 4491 "ViewCollection.c"
}
#line 706 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
result = _tmp0_;
#line 706 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return result;
-#line 4534 "ViewCollection.c"
+#line 4497 "ViewCollection.c"
}
-DataView* view_collection_get_first (ViewCollection* self) {
+DataView*
+view_collection_get_first (ViewCollection* self)
+{
#line 705 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_val_if_fail (IS_VIEW_COLLECTION (self), NULL);
#line 705 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return VIEW_COLLECTION_GET_CLASS (self)->get_first (self);
-#line 4543 "ViewCollection.c"
+#line 4508 "ViewCollection.c"
}
@@ -4554,360 +4519,342 @@ DataView* view_collection_get_first (ViewCollection* self) {
* pathological events that have nothing but rejected images
* in them from breaking.
*/
-static DataView* view_collection_real_get_first_unrejected (ViewCollection* self) {
+static DataView*
+view_collection_real_get_first_unrejected (ViewCollection* self)
+{
DataView* result = NULL;
- gint _tmp0_;
DataView* dv = NULL;
- DataView* _tmp1_;
+ DataView* _tmp0_;
gint num_views = 0;
- gint _tmp2_;
- DataView* _tmp17_;
-#line 721 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp0_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection));
+ DataView* _tmp13_;
#line 721 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- if (_tmp0_ < 1) {
+ if (data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection)) < 1) {
#line 722 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
result = NULL;
#line 722 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return result;
-#line 4573 "ViewCollection.c"
+#line 4536 "ViewCollection.c"
}
#line 725 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp1_ = view_collection_get_first (self);
+ _tmp0_ = view_collection_get_first (self);
#line 725 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- dv = _tmp1_;
-#line 726 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp2_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection));
+ dv = _tmp0_;
#line 726 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- num_views = _tmp2_;
+ num_views = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection));
#line 728 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
while (TRUE) {
-#line 4585 "ViewCollection.c"
- gboolean _tmp3_ = FALSE;
- DataView* _tmp4_;
+#line 4546 "ViewCollection.c"
+ gboolean _tmp1_ = FALSE;
+ DataView* _tmp2_;
MediaSource* tmp = NULL;
- DataView* _tmp8_;
- DataSource* _tmp9_;
- MediaSource* _tmp10_;
- gboolean _tmp11_ = FALSE;
- MediaSource* _tmp12_;
-#line 728 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp4_ = dv;
+ DataView* _tmp5_;
+ DataSource* _tmp6_;
+ MediaSource* _tmp7_;
+ gboolean _tmp8_ = FALSE;
+ MediaSource* _tmp9_;
#line 728 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- if (_tmp4_ != NULL) {
-#line 4598 "ViewCollection.c"
- DataView* _tmp5_;
- gint _tmp6_;
- gint _tmp7_;
+ _tmp2_ = dv;
#line 728 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp5_ = dv;
+ if (_tmp2_ != NULL) {
+#line 4559 "ViewCollection.c"
+ DataView* _tmp3_;
+ gint _tmp4_;
#line 728 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp6_ = data_collection_index_of (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_DATA_OBJECT, DataObject));
+ _tmp3_ = dv;
#line 728 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp7_ = num_views;
+ _tmp4_ = num_views;
#line 728 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp3_ = _tmp6_ < (_tmp7_ - 1);
-#line 4610 "ViewCollection.c"
+ _tmp1_ = data_collection_index_of (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_DATA_OBJECT, DataObject)) < (_tmp4_ - 1);
+#line 4568 "ViewCollection.c"
} else {
#line 728 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp3_ = FALSE;
-#line 4614 "ViewCollection.c"
+ _tmp1_ = FALSE;
+#line 4572 "ViewCollection.c"
}
#line 728 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- if (!_tmp3_) {
+ if (!_tmp1_) {
#line 728 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
break;
-#line 4620 "ViewCollection.c"
+#line 4578 "ViewCollection.c"
}
#line 729 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp8_ = dv;
+ _tmp5_ = dv;
#line 729 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp9_ = data_view_get_source (_tmp8_);
+ _tmp6_ = data_view_get_source (_tmp5_);
#line 729 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp10_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp9_, TYPE_MEDIA_SOURCE) ? ((MediaSource*) _tmp9_) : NULL;
+ _tmp7_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp6_, TYPE_MEDIA_SOURCE) ? ((MediaSource*) _tmp6_) : NULL;
#line 729 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- if (_tmp10_ == NULL) {
+ if (_tmp7_ == NULL) {
#line 729 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _g_object_unref0 (_tmp9_);
-#line 4632 "ViewCollection.c"
+ _g_object_unref0 (_tmp6_);
+#line 4590 "ViewCollection.c"
}
#line 729 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- tmp = _tmp10_;
-#line 731 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp12_ = tmp;
+ tmp = _tmp7_;
#line 731 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- if (_tmp12_ != NULL) {
-#line 4640 "ViewCollection.c"
- MediaSource* _tmp13_;
- Rating _tmp14_;
+ _tmp9_ = tmp;
#line 731 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp13_ = tmp;
+ if (_tmp9_ != NULL) {
+#line 4598 "ViewCollection.c"
+ MediaSource* _tmp10_;
#line 731 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp14_ = media_source_get_rating (_tmp13_);
+ _tmp10_ = tmp;
#line 731 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp11_ = _tmp14_ != RATING_REJECTED;
-#line 4649 "ViewCollection.c"
+ _tmp8_ = media_source_get_rating (_tmp10_) != RATING_REJECTED;
+#line 4604 "ViewCollection.c"
} else {
#line 731 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp11_ = FALSE;
-#line 4653 "ViewCollection.c"
+ _tmp8_ = FALSE;
+#line 4608 "ViewCollection.c"
}
#line 731 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- if (_tmp11_) {
+ if (_tmp8_) {
#line 733 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
result = dv;
#line 733 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (tmp);
#line 733 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return result;
-#line 4663 "ViewCollection.c"
+#line 4618 "ViewCollection.c"
} else {
- DataView* _tmp15_;
- DataView* _tmp16_;
+ DataView* _tmp11_;
+ DataView* _tmp12_;
#line 735 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp15_ = dv;
+ _tmp11_ = dv;
#line 735 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp16_ = view_collection_get_next (self, _tmp15_);
+ _tmp12_ = view_collection_get_next (self, _tmp11_);
#line 735 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (dv);
#line 735 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- dv = _tmp16_;
-#line 4675 "ViewCollection.c"
+ dv = _tmp12_;
+#line 4630 "ViewCollection.c"
}
#line 728 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (tmp);
-#line 4679 "ViewCollection.c"
+#line 4634 "ViewCollection.c"
}
#line 741 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp17_ = view_collection_get_first (self);
+ _tmp13_ = view_collection_get_first (self);
#line 741 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- result = _tmp17_;
+ result = _tmp13_;
#line 741 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (dv);
#line 741 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return result;
-#line 4689 "ViewCollection.c"
+#line 4644 "ViewCollection.c"
}
-DataView* view_collection_get_first_unrejected (ViewCollection* self) {
+DataView*
+view_collection_get_first_unrejected (ViewCollection* self)
+{
#line 719 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_val_if_fail (IS_VIEW_COLLECTION (self), NULL);
#line 719 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return VIEW_COLLECTION_GET_CLASS (self)->get_first_unrejected (self);
-#line 4698 "ViewCollection.c"
+#line 4655 "ViewCollection.c"
}
-static DataView* view_collection_real_get_last (ViewCollection* self) {
+static DataView*
+view_collection_real_get_last (ViewCollection* self)
+{
DataView* result = NULL;
DataView* _tmp0_ = NULL;
- gint _tmp1_;
-#line 745 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp1_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection));
-#line 745 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- if (_tmp1_ > 0) {
-#line 4710 "ViewCollection.c"
- gint _tmp2_;
- DataObject* _tmp3_;
#line 745 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp2_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection));
+ if (data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection)) > 0) {
+#line 4666 "ViewCollection.c"
+ DataObject* _tmp1_;
#line 745 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp3_ = data_collection_get_at (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), _tmp2_ - 1);
+ _tmp1_ = data_collection_get_at (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection)) - 1);
#line 745 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (_tmp0_);
#line 745 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_DATA_VIEW, DataView);
-#line 4721 "ViewCollection.c"
+ _tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_VIEW, DataView);
+#line 4674 "ViewCollection.c"
} else {
#line 745 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (_tmp0_);
#line 745 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp0_ = NULL;
-#line 4727 "ViewCollection.c"
+#line 4680 "ViewCollection.c"
}
#line 745 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
result = _tmp0_;
#line 745 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return result;
-#line 4733 "ViewCollection.c"
+#line 4686 "ViewCollection.c"
}
-DataView* view_collection_get_last (ViewCollection* self) {
+DataView*
+view_collection_get_last (ViewCollection* self)
+{
#line 744 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_val_if_fail (IS_VIEW_COLLECTION (self), NULL);
#line 744 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return VIEW_COLLECTION_GET_CLASS (self)->get_last (self);
-#line 4742 "ViewCollection.c"
+#line 4697 "ViewCollection.c"
}
-static DataView* view_collection_real_get_next (ViewCollection* self, DataView* view) {
+static DataView*
+view_collection_real_get_next (ViewCollection* self,
+ DataView* view)
+{
DataView* result = NULL;
- gint _tmp0_;
gint index = 0;
- DataView* _tmp1_;
+ gint _tmp0_;
+ gint _tmp1_;
gint _tmp2_;
gint _tmp3_;
- gint _tmp4_;
- gint _tmp5_;
- gint _tmp6_;
- gint _tmp7_;
- DataObject* _tmp8_;
+ DataObject* _tmp4_;
#line 748 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_val_if_fail (IS_DATA_VIEW (view), NULL);
#line 749 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp0_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection));
-#line 749 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- if (_tmp0_ == 0) {
+ if (data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection)) == 0) {
#line 750 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
result = NULL;
#line 750 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return result;
-#line 4768 "ViewCollection.c"
+#line 4720 "ViewCollection.c"
}
#line 752 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp1_ = view;
-#line 752 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp2_ = data_collection_index_of (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_OBJECT, DataObject));
-#line 752 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- index = _tmp2_;
+ index = data_collection_index_of (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (view, TYPE_DATA_OBJECT, DataObject));
#line 753 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp3_ = index;
+ _tmp0_ = index;
#line 753 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- if (_tmp3_ < 0) {
+ if (_tmp0_ < 0) {
#line 754 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
result = NULL;
#line 754 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return result;
-#line 4784 "ViewCollection.c"
+#line 4732 "ViewCollection.c"
}
#line 756 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp4_ = index;
+ _tmp1_ = index;
#line 756 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- index = _tmp4_ + 1;
+ index = _tmp1_ + 1;
#line 757 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp5_ = index;
+ _tmp2_ = index;
#line 757 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp6_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection));
-#line 757 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- if (_tmp5_ >= _tmp6_) {
+ if (_tmp2_ >= data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection))) {
#line 758 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
index = 0;
-#line 4798 "ViewCollection.c"
+#line 4744 "ViewCollection.c"
}
#line 760 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp7_ = index;
+ _tmp3_ = index;
#line 760 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp8_ = data_collection_get_at (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), _tmp7_);
+ _tmp4_ = data_collection_get_at (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), _tmp3_);
#line 760 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- result = G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_VIEW, DataView);
+ result = G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_DATA_VIEW, DataView);
#line 760 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return result;
-#line 4808 "ViewCollection.c"
+#line 4754 "ViewCollection.c"
}
-DataView* view_collection_get_next (ViewCollection* self, DataView* view) {
+DataView*
+view_collection_get_next (ViewCollection* self,
+ DataView* view)
+{
#line 748 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_val_if_fail (IS_VIEW_COLLECTION (self), NULL);
#line 748 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return VIEW_COLLECTION_GET_CLASS (self)->get_next (self, view);
-#line 4817 "ViewCollection.c"
+#line 4766 "ViewCollection.c"
}
-static DataView* view_collection_real_get_previous (ViewCollection* self, DataView* view) {
+static DataView*
+view_collection_real_get_previous (ViewCollection* self,
+ DataView* view)
+{
DataView* result = NULL;
- gint _tmp0_;
gint index = 0;
- DataView* _tmp1_;
+ gint _tmp0_;
+ gint _tmp1_;
gint _tmp2_;
gint _tmp3_;
- gint _tmp4_;
- gint _tmp5_;
- gint _tmp7_;
- DataObject* _tmp8_;
+ DataObject* _tmp4_;
#line 763 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_val_if_fail (IS_DATA_VIEW (view), NULL);
#line 764 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp0_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection));
-#line 764 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- if (_tmp0_ == 0) {
+ if (data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection)) == 0) {
#line 765 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
result = NULL;
#line 765 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return result;
-#line 4842 "ViewCollection.c"
+#line 4789 "ViewCollection.c"
}
#line 767 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp1_ = view;
-#line 767 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp2_ = data_collection_index_of (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_OBJECT, DataObject));
-#line 767 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- index = _tmp2_;
+ index = data_collection_index_of (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (view, TYPE_DATA_OBJECT, DataObject));
#line 768 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp3_ = index;
+ _tmp0_ = index;
#line 768 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- if (_tmp3_ < 0) {
+ if (_tmp0_ < 0) {
#line 769 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
result = NULL;
#line 769 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return result;
-#line 4858 "ViewCollection.c"
+#line 4801 "ViewCollection.c"
}
#line 771 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp4_ = index;
+ _tmp1_ = index;
#line 771 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- index = _tmp4_ - 1;
+ index = _tmp1_ - 1;
#line 772 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp5_ = index;
+ _tmp2_ = index;
#line 772 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- if (_tmp5_ < 0) {
-#line 4868 "ViewCollection.c"
- gint _tmp6_;
-#line 773 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp6_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection));
+ if (_tmp2_ < 0) {
#line 773 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- index = _tmp6_ - 1;
-#line 4874 "ViewCollection.c"
+ index = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection)) - 1;
+#line 4813 "ViewCollection.c"
}
#line 775 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp7_ = index;
+ _tmp3_ = index;
#line 775 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp8_ = data_collection_get_at (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), _tmp7_);
+ _tmp4_ = data_collection_get_at (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), _tmp3_);
#line 775 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- result = G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_VIEW, DataView);
+ result = G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_DATA_VIEW, DataView);
#line 775 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return result;
-#line 4884 "ViewCollection.c"
+#line 4823 "ViewCollection.c"
}
-DataView* view_collection_get_previous (ViewCollection* self, DataView* view) {
+DataView*
+view_collection_get_previous (ViewCollection* self,
+ DataView* view)
+{
#line 763 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_val_if_fail (IS_VIEW_COLLECTION (self), NULL);
#line 763 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return VIEW_COLLECTION_GET_CLASS (self)->get_previous (self, view);
-#line 4893 "ViewCollection.c"
+#line 4835 "ViewCollection.c"
}
-gboolean view_collection_get_immediate_neighbors (ViewCollection* self, DataSource* home, DataSource* * next, DataSource* * prev, const gchar* type_selector) {
+gboolean
+view_collection_get_immediate_neighbors (ViewCollection* self,
+ DataSource* home,
+ DataSource* * next,
+ DataSource* * prev,
+ const gchar* type_selector)
+{
DataSource* _vala_next = NULL;
DataSource* _vala_prev = NULL;
gboolean result = FALSE;
DataView* home_view = NULL;
- DataSource* _tmp0_;
+ DataView* _tmp0_;
DataView* _tmp1_;
- DataView* _tmp2_;
DataView* next_view = NULL;
+ DataView* _tmp2_;
DataView* _tmp3_;
- DataView* _tmp4_;
DataView* prev_view = NULL;
- DataView* _tmp19_;
- DataView* _tmp20_;
+ DataView* _tmp16_;
+ DataView* _tmp17_;
#line 778 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_val_if_fail (IS_VIEW_COLLECTION (self), FALSE);
#line 778 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -4921,15 +4868,13 @@ gboolean view_collection_get_immediate_neighbors (ViewCollection* self, DataSour
#line 781 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_vala_prev = NULL;
#line 783 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp0_ = home;
+ _tmp0_ = view_collection_get_view_for_source (self, home);
#line 783 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp1_ = view_collection_get_view_for_source (self, _tmp0_);
-#line 783 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- home_view = _tmp1_;
+ home_view = _tmp0_;
#line 784 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp2_ = home_view;
+ _tmp1_ = home_view;
#line 784 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- if (_tmp2_ == NULL) {
+ if (_tmp1_ == NULL) {
#line 785 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
result = FALSE;
#line 785 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -4938,197 +4883,185 @@ gboolean view_collection_get_immediate_neighbors (ViewCollection* self, DataSour
if (next) {
#line 785 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
*next = _vala_next;
-#line 4941 "ViewCollection.c"
+#line 4886 "ViewCollection.c"
} else {
#line 785 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (_vala_next);
-#line 4945 "ViewCollection.c"
+#line 4890 "ViewCollection.c"
}
#line 785 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (prev) {
#line 785 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
*prev = _vala_prev;
-#line 4951 "ViewCollection.c"
+#line 4896 "ViewCollection.c"
} else {
#line 785 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (_vala_prev);
-#line 4955 "ViewCollection.c"
+#line 4900 "ViewCollection.c"
}
#line 785 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return result;
-#line 4959 "ViewCollection.c"
+#line 4904 "ViewCollection.c"
}
#line 787 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp3_ = home_view;
+ _tmp2_ = home_view;
#line 787 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp4_ = view_collection_get_next (self, _tmp3_);
+ _tmp3_ = view_collection_get_next (self, _tmp2_);
#line 787 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- next_view = _tmp4_;
+ next_view = _tmp3_;
#line 788 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
while (TRUE) {
-#line 4969 "ViewCollection.c"
+#line 4914 "ViewCollection.c"
+ DataView* _tmp4_;
DataView* _tmp5_;
- DataView* _tmp6_;
- gboolean _tmp7_ = FALSE;
- const gchar* _tmp8_;
- DataView* _tmp17_;
- DataView* _tmp18_;
+ gboolean _tmp6_ = FALSE;
+ DataView* _tmp14_;
+ DataView* _tmp15_;
#line 788 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp5_ = next_view;
+ _tmp4_ = next_view;
#line 788 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp6_ = home_view;
+ _tmp5_ = home_view;
#line 788 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- if (!(_tmp5_ != _tmp6_)) {
+ if (!(_tmp4_ != _tmp5_)) {
#line 788 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
break;
-#line 4984 "ViewCollection.c"
+#line 4928 "ViewCollection.c"
}
#line 789 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp8_ = type_selector;
-#line 789 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- if (_tmp8_ == NULL) {
+ if (type_selector == NULL) {
#line 789 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp7_ = TRUE;
-#line 4992 "ViewCollection.c"
+ _tmp6_ = TRUE;
+#line 4934 "ViewCollection.c"
} else {
- DataView* _tmp9_;
- DataSource* _tmp10_;
- DataSource* _tmp11_;
- gchar* _tmp12_;
- gchar* _tmp13_;
- const gchar* _tmp14_;
+ DataView* _tmp7_;
+ DataSource* _tmp8_;
+ DataSource* _tmp9_;
+ gchar* _tmp10_;
+ gchar* _tmp11_;
#line 789 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp9_ = next_view;
+ _tmp7_ = next_view;
#line 789 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp10_ = data_view_get_source (_tmp9_);
+ _tmp8_ = data_view_get_source (_tmp7_);
#line 789 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp11_ = _tmp10_;
+ _tmp9_ = _tmp8_;
#line 789 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp12_ = data_source_get_typename (_tmp11_);
+ _tmp10_ = data_source_get_typename (_tmp9_);
#line 789 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp13_ = _tmp12_;
-#line 789 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp14_ = type_selector;
+ _tmp11_ = _tmp10_;
#line 789 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp7_ = g_strcmp0 (_tmp13_, _tmp14_) == 0;
+ _tmp6_ = g_strcmp0 (_tmp11_, type_selector) == 0;
#line 789 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _g_free0 (_tmp13_);
+ _g_free0 (_tmp11_);
#line 789 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _g_object_unref0 (_tmp11_);
-#line 5018 "ViewCollection.c"
+ _g_object_unref0 (_tmp9_);
+#line 4957 "ViewCollection.c"
}
#line 789 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- if (_tmp7_) {
-#line 5022 "ViewCollection.c"
- DataView* _tmp15_;
- DataSource* _tmp16_;
+ if (_tmp6_) {
+#line 4961 "ViewCollection.c"
+ DataView* _tmp12_;
+ DataSource* _tmp13_;
#line 790 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp15_ = next_view;
+ _tmp12_ = next_view;
#line 790 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp16_ = data_view_get_source (_tmp15_);
+ _tmp13_ = data_view_get_source (_tmp12_);
#line 790 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (_vala_next);
#line 790 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _vala_next = _tmp16_;
+ _vala_next = _tmp13_;
#line 791 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
break;
-#line 5035 "ViewCollection.c"
+#line 4974 "ViewCollection.c"
}
#line 793 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp17_ = next_view;
+ _tmp14_ = next_view;
#line 793 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp18_ = view_collection_get_next (self, _tmp17_);
+ _tmp15_ = view_collection_get_next (self, _tmp14_);
#line 793 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (next_view);
#line 793 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- next_view = _tmp18_;
-#line 5045 "ViewCollection.c"
+ next_view = _tmp15_;
+#line 4984 "ViewCollection.c"
}
#line 796 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp19_ = home_view;
+ _tmp16_ = home_view;
#line 796 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp20_ = view_collection_get_previous (self, _tmp19_);
+ _tmp17_ = view_collection_get_previous (self, _tmp16_);
#line 796 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- prev_view = _tmp20_;
+ prev_view = _tmp17_;
#line 797 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
while (TRUE) {
-#line 5055 "ViewCollection.c"
- DataView* _tmp21_;
- DataView* _tmp22_;
- gboolean _tmp23_ = FALSE;
- const gchar* _tmp24_;
- DataView* _tmp33_;
- DataView* _tmp34_;
+#line 4994 "ViewCollection.c"
+ DataView* _tmp18_;
+ DataView* _tmp19_;
+ gboolean _tmp20_ = FALSE;
+ DataView* _tmp28_;
+ DataView* _tmp29_;
#line 797 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp21_ = prev_view;
+ _tmp18_ = prev_view;
#line 797 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp22_ = home_view;
+ _tmp19_ = home_view;
#line 797 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- if (!(_tmp21_ != _tmp22_)) {
+ if (!(_tmp18_ != _tmp19_)) {
#line 797 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
break;
-#line 5070 "ViewCollection.c"
+#line 5008 "ViewCollection.c"
}
#line 798 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp24_ = type_selector;
-#line 798 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- if (_tmp24_ == NULL) {
+ if (type_selector == NULL) {
#line 798 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp23_ = TRUE;
-#line 5078 "ViewCollection.c"
+ _tmp20_ = TRUE;
+#line 5014 "ViewCollection.c"
} else {
- DataView* _tmp25_;
- DataSource* _tmp26_;
- DataSource* _tmp27_;
- gchar* _tmp28_;
- gchar* _tmp29_;
- const gchar* _tmp30_;
+ DataView* _tmp21_;
+ DataSource* _tmp22_;
+ DataSource* _tmp23_;
+ gchar* _tmp24_;
+ gchar* _tmp25_;
#line 798 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp25_ = prev_view;
+ _tmp21_ = prev_view;
#line 798 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp26_ = data_view_get_source (_tmp25_);
+ _tmp22_ = data_view_get_source (_tmp21_);
#line 798 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp27_ = _tmp26_;
+ _tmp23_ = _tmp22_;
#line 798 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp28_ = data_source_get_typename (_tmp27_);
+ _tmp24_ = data_source_get_typename (_tmp23_);
#line 798 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp29_ = _tmp28_;
+ _tmp25_ = _tmp24_;
#line 798 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp30_ = type_selector;
+ _tmp20_ = g_strcmp0 (_tmp25_, type_selector) == 0;
#line 798 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp23_ = g_strcmp0 (_tmp29_, _tmp30_) == 0;
+ _g_free0 (_tmp25_);
#line 798 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _g_free0 (_tmp29_);
-#line 798 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _g_object_unref0 (_tmp27_);
-#line 5104 "ViewCollection.c"
+ _g_object_unref0 (_tmp23_);
+#line 5037 "ViewCollection.c"
}
#line 798 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- if (_tmp23_) {
-#line 5108 "ViewCollection.c"
- DataView* _tmp31_;
- DataSource* _tmp32_;
+ if (_tmp20_) {
+#line 5041 "ViewCollection.c"
+ DataView* _tmp26_;
+ DataSource* _tmp27_;
#line 799 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp31_ = prev_view;
+ _tmp26_ = prev_view;
#line 799 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp32_ = data_view_get_source (_tmp31_);
+ _tmp27_ = data_view_get_source (_tmp26_);
#line 799 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (_vala_prev);
#line 799 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _vala_prev = _tmp32_;
+ _vala_prev = _tmp27_;
#line 800 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
break;
-#line 5121 "ViewCollection.c"
+#line 5054 "ViewCollection.c"
}
#line 802 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp33_ = prev_view;
+ _tmp28_ = prev_view;
#line 802 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp34_ = view_collection_get_previous (self, _tmp33_);
+ _tmp29_ = view_collection_get_previous (self, _tmp28_);
#line 802 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (prev_view);
#line 802 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- prev_view = _tmp34_;
-#line 5131 "ViewCollection.c"
+ prev_view = _tmp29_;
+#line 5064 "ViewCollection.c"
}
#line 805 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
result = TRUE;
@@ -5142,43 +5075,44 @@ gboolean view_collection_get_immediate_neighbors (ViewCollection* self, DataSour
if (next) {
#line 805 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
*next = _vala_next;
-#line 5145 "ViewCollection.c"
+#line 5078 "ViewCollection.c"
} else {
#line 805 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (_vala_next);
-#line 5149 "ViewCollection.c"
+#line 5082 "ViewCollection.c"
}
#line 805 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (prev) {
#line 805 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
*prev = _vala_prev;
-#line 5155 "ViewCollection.c"
+#line 5088 "ViewCollection.c"
} else {
#line 805 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (_vala_prev);
-#line 5159 "ViewCollection.c"
+#line 5092 "ViewCollection.c"
}
#line 805 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return result;
-#line 5163 "ViewCollection.c"
+#line 5096 "ViewCollection.c"
}
-GeeSet* view_collection_get_extended_neighbors (ViewCollection* self, DataSource* home, const gchar* typename) {
+GeeSet*
+view_collection_get_extended_neighbors (ViewCollection* self,
+ DataSource* home,
+ const gchar* typename)
+{
GeeSet* result = NULL;
GeeSet* neighbors = NULL;
GeeHashSet* _tmp0_;
DataSource* next = NULL;
DataSource* prev = NULL;
- DataSource* _tmp1_;
- const gchar* _tmp2_;
- DataSource* _tmp3_ = NULL;
- DataSource* _tmp4_ = NULL;
- gboolean _tmp5_;
- DataSource* _tmp6_;
- DataSource* _tmp16_;
- GeeSet* _tmp26_;
- DataSource* _tmp27_;
+ DataSource* _tmp1_ = NULL;
+ DataSource* _tmp2_ = NULL;
+ gboolean _tmp3_;
+ DataSource* _tmp4_;
+ DataSource* _tmp13_;
+ GeeSet* _tmp22_;
#line 809 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_val_if_fail (IS_VIEW_COLLECTION (self), NULL);
#line 809 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -5188,21 +5122,17 @@ GeeSet* view_collection_get_extended_neighbors (ViewCollection* self, DataSource
#line 811 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
neighbors = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_SET, GeeSet);
#line 815 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp1_ = home;
-#line 815 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp2_ = typename;
-#line 815 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp5_ = view_collection_get_immediate_neighbors (self, _tmp1_, &_tmp3_, &_tmp4_, _tmp2_);
+ _tmp3_ = view_collection_get_immediate_neighbors (self, home, &_tmp1_, &_tmp2_, typename);
#line 815 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (next);
#line 815 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- next = _tmp3_;
+ next = _tmp1_;
#line 815 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (prev);
#line 815 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- prev = _tmp4_;
+ prev = _tmp2_;
#line 815 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- if (!_tmp5_) {
+ if (!_tmp3_) {
#line 816 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
result = neighbors;
#line 816 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -5211,124 +5141,116 @@ GeeSet* view_collection_get_extended_neighbors (ViewCollection* self, DataSource
_g_object_unref0 (next);
#line 816 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return result;
-#line 5214 "ViewCollection.c"
+#line 5144 "ViewCollection.c"
}
#line 819 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp6_ = next;
+ _tmp4_ = next;
#line 819 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- if (_tmp6_ != NULL) {
-#line 5220 "ViewCollection.c"
- GeeSet* _tmp7_;
- DataSource* _tmp8_;
+ if (_tmp4_ != NULL) {
+#line 5150 "ViewCollection.c"
+ GeeSet* _tmp5_;
+ DataSource* _tmp6_;
DataSource* next_next = NULL;
DataSource* next_prev = NULL;
- DataSource* _tmp9_;
- const gchar* _tmp10_;
- DataSource* _tmp11_ = NULL;
- DataSource* _tmp12_ = NULL;
- DataSource* _tmp13_;
+ DataSource* _tmp7_;
+ DataSource* _tmp8_ = NULL;
+ DataSource* _tmp9_ = NULL;
+ DataSource* _tmp10_;
#line 820 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp7_ = neighbors;
+ _tmp5_ = neighbors;
#line 820 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp8_ = next;
+ _tmp6_ = next;
#line 820 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_COLLECTION, GeeCollection), _tmp8_);
+ gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_COLLECTION, GeeCollection), _tmp6_);
#line 823 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp9_ = next;
+ _tmp7_ = next;
#line 823 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp10_ = typename;
-#line 823 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- view_collection_get_immediate_neighbors (self, _tmp9_, &_tmp11_, &_tmp12_, _tmp10_);
+ view_collection_get_immediate_neighbors (self, _tmp7_, &_tmp8_, &_tmp9_, typename);
#line 823 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (next_next);
#line 823 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- next_next = _tmp11_;
+ next_next = _tmp8_;
#line 823 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (next_prev);
#line 823 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- next_prev = _tmp12_;
+ next_prev = _tmp9_;
#line 826 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp13_ = next_next;
+ _tmp10_ = next_next;
#line 826 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- if (_tmp13_ != NULL) {
-#line 5254 "ViewCollection.c"
- GeeSet* _tmp14_;
- DataSource* _tmp15_;
+ if (_tmp10_ != NULL) {
+#line 5181 "ViewCollection.c"
+ GeeSet* _tmp11_;
+ DataSource* _tmp12_;
#line 827 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp14_ = neighbors;
+ _tmp11_ = neighbors;
#line 827 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp15_ = next_next;
+ _tmp12_ = next_next;
#line 827 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_COLLECTION, GeeCollection), _tmp15_);
-#line 5263 "ViewCollection.c"
+ gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_COLLECTION, GeeCollection), _tmp12_);
+#line 5190 "ViewCollection.c"
}
#line 819 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (next_prev);
#line 819 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (next_next);
-#line 5269 "ViewCollection.c"
+#line 5196 "ViewCollection.c"
}
#line 831 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp16_ = prev;
+ _tmp13_ = prev;
#line 831 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- if (_tmp16_ != NULL) {
-#line 5275 "ViewCollection.c"
- GeeSet* _tmp17_;
- DataSource* _tmp18_;
+ if (_tmp13_ != NULL) {
+#line 5202 "ViewCollection.c"
+ GeeSet* _tmp14_;
+ DataSource* _tmp15_;
DataSource* next_prev = NULL;
DataSource* prev_prev = NULL;
+ DataSource* _tmp16_;
+ DataSource* _tmp17_ = NULL;
+ DataSource* _tmp18_ = NULL;
DataSource* _tmp19_;
- const gchar* _tmp20_;
- DataSource* _tmp21_ = NULL;
- DataSource* _tmp22_ = NULL;
- DataSource* _tmp23_;
#line 832 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp17_ = neighbors;
+ _tmp14_ = neighbors;
#line 832 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp18_ = prev;
+ _tmp15_ = prev;
#line 832 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, GEE_TYPE_COLLECTION, GeeCollection), _tmp18_);
-#line 835 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp19_ = prev;
+ gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_COLLECTION, GeeCollection), _tmp15_);
#line 835 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp20_ = typename;
+ _tmp16_ = prev;
#line 835 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- view_collection_get_immediate_neighbors (self, _tmp19_, &_tmp21_, &_tmp22_, _tmp20_);
+ view_collection_get_immediate_neighbors (self, _tmp16_, &_tmp17_, &_tmp18_, typename);
#line 835 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (next_prev);
#line 835 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- next_prev = _tmp21_;
+ next_prev = _tmp17_;
#line 835 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (prev_prev);
#line 835 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- prev_prev = _tmp22_;
+ prev_prev = _tmp18_;
#line 838 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp23_ = prev_prev;
+ _tmp19_ = prev_prev;
#line 838 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- if (_tmp23_ != NULL) {
-#line 5309 "ViewCollection.c"
- GeeSet* _tmp24_;
- DataSource* _tmp25_;
+ if (_tmp19_ != NULL) {
+#line 5233 "ViewCollection.c"
+ GeeSet* _tmp20_;
+ DataSource* _tmp21_;
#line 839 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp24_ = neighbors;
+ _tmp20_ = neighbors;
#line 839 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp25_ = prev_prev;
+ _tmp21_ = prev_prev;
#line 839 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GEE_TYPE_COLLECTION, GeeCollection), _tmp25_);
-#line 5318 "ViewCollection.c"
+ gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, GEE_TYPE_COLLECTION, GeeCollection), _tmp21_);
+#line 5242 "ViewCollection.c"
}
#line 831 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (prev_prev);
#line 831 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (next_prev);
-#line 5324 "ViewCollection.c"
+#line 5248 "ViewCollection.c"
}
#line 843 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp26_ = neighbors;
-#line 843 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp27_ = home;
+ _tmp22_ = neighbors;
#line 843 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- gee_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, GEE_TYPE_COLLECTION, GeeCollection), _tmp27_);
+ gee_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, GEE_TYPE_COLLECTION, GeeCollection), home);
#line 845 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
result = neighbors;
#line 845 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -5337,159 +5259,144 @@ GeeSet* view_collection_get_extended_neighbors (ViewCollection* self, DataSource
_g_object_unref0 (next);
#line 845 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return result;
-#line 5340 "ViewCollection.c"
+#line 5262 "ViewCollection.c"
}
-static void view_collection_add_many_selected (ViewCollection* self, GeeCollection* views) {
- GeeCollection* _tmp0_;
+static void
+view_collection_add_many_selected (ViewCollection* self,
+ GeeCollection* views)
+{
+ gint _tmp0_;
gint _tmp1_;
- gint _tmp2_;
gboolean added = FALSE;
- DataSet* _tmp11_;
- GeeCollection* _tmp12_;
- gboolean _tmp13_;
- gboolean _tmp14_;
+ DataSet* _tmp7_;
+ gboolean _tmp8_;
#line 850 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_if_fail (IS_VIEW_COLLECTION (self));
#line 850 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_if_fail (GEE_IS_COLLECTION (views));
#line 851 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp0_ = views;
+ _tmp0_ = gee_collection_get_size (views);
#line 851 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp1_ = gee_collection_get_size (_tmp0_);
+ _tmp1_ = _tmp0_;
#line 851 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp2_ = _tmp1_;
-#line 851 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- if (_tmp2_ == 0) {
+ if (_tmp1_ == 0) {
#line 852 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return;
-#line 5367 "ViewCollection.c"
+#line 5287 "ViewCollection.c"
}
{
GeeIterator* _view_it = NULL;
- GeeCollection* _tmp3_;
- GeeIterator* _tmp4_;
+ GeeIterator* _tmp2_;
#line 854 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp3_ = views;
+ _tmp2_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (views, GEE_TYPE_ITERABLE, GeeIterable));
#line 854 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp4_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 854 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _view_it = _tmp4_;
+ _view_it = _tmp2_;
#line 854 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
while (TRUE) {
-#line 5381 "ViewCollection.c"
- GeeIterator* _tmp5_;
- gboolean _tmp6_;
+#line 5298 "ViewCollection.c"
+ GeeIterator* _tmp3_;
DataView* view = NULL;
- GeeIterator* _tmp7_;
- gpointer _tmp8_;
- DataView* _tmp9_;
- gboolean _tmp10_;
-#line 854 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp5_ = _view_it;
+ GeeIterator* _tmp4_;
+ gpointer _tmp5_;
+ DataView* _tmp6_;
#line 854 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp6_ = gee_iterator_next (_tmp5_);
+ _tmp3_ = _view_it;
#line 854 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- if (!_tmp6_) {
+ if (!gee_iterator_next (_tmp3_)) {
#line 854 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
break;
-#line 5397 "ViewCollection.c"
+#line 5310 "ViewCollection.c"
}
#line 854 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp7_ = _view_it;
+ _tmp4_ = _view_it;
#line 854 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp8_ = gee_iterator_get (_tmp7_);
+ _tmp5_ = gee_iterator_get (_tmp4_);
#line 854 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- view = (DataView*) _tmp8_;
-#line 855 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp9_ = view;
+ view = (DataView*) _tmp5_;
#line 855 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp10_ = data_view_is_visible (_tmp9_);
+ _tmp6_ = view;
#line 855 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _vala_assert (_tmp10_, "view.is_visible()");
+ _vala_assert (data_view_is_visible (_tmp6_), "view.is_visible()");
#line 854 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (view);
-#line 5413 "ViewCollection.c"
+#line 5324 "ViewCollection.c"
}
#line 854 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (_view_it);
-#line 5417 "ViewCollection.c"
+#line 5328 "ViewCollection.c"
}
#line 857 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp11_ = self->priv->selected;
-#line 857 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp12_ = views;
-#line 857 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp13_ = data_set_add_many (_tmp11_, _tmp12_);
+ _tmp7_ = self->priv->selected;
#line 857 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- added = _tmp13_;
+ added = data_set_add_many (_tmp7_, views);
#line 858 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp14_ = added;
+ _tmp8_ = added;
#line 858 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _vala_assert (_tmp14_, "added");
-#line 5431 "ViewCollection.c"
+ _vala_assert (_tmp8_, "added");
+#line 5338 "ViewCollection.c"
}
-static void view_collection_remove_many_selected (ViewCollection* self, GeeCollection* views) {
- GeeCollection* _tmp0_;
+static void
+view_collection_remove_many_selected (ViewCollection* self,
+ GeeCollection* views)
+{
+ gint _tmp0_;
gint _tmp1_;
- gint _tmp2_;
gboolean removed = FALSE;
- DataSet* _tmp3_;
- GeeCollection* _tmp4_;
- gboolean _tmp5_;
- gboolean _tmp6_;
+ DataSet* _tmp2_;
+ gboolean _tmp3_;
#line 861 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_if_fail (IS_VIEW_COLLECTION (self));
#line 861 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_if_fail (GEE_IS_COLLECTION (views));
#line 862 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp0_ = views;
+ _tmp0_ = gee_collection_get_size (views);
#line 862 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp1_ = gee_collection_get_size (_tmp0_);
+ _tmp1_ = _tmp0_;
#line 862 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp2_ = _tmp1_;
-#line 862 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- if (_tmp2_ == 0) {
+ if (_tmp1_ == 0) {
#line 863 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return;
-#line 5458 "ViewCollection.c"
+#line 5363 "ViewCollection.c"
}
#line 865 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp3_ = self->priv->selected;
-#line 865 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp4_ = views;
-#line 865 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp5_ = data_set_remove_many (_tmp3_, _tmp4_);
+ _tmp2_ = self->priv->selected;
#line 865 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- removed = _tmp5_;
+ removed = data_set_remove_many (_tmp2_, views);
#line 866 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp6_ = removed;
+ _tmp3_ = removed;
#line 866 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _vala_assert (_tmp6_, "removed");
-#line 5472 "ViewCollection.c"
+ _vala_assert (_tmp3_, "removed");
+#line 5373 "ViewCollection.c"
}
-static gboolean _view_collection_select_item_marked_action (DataObject* object, GObject* user, gpointer self) {
+static gboolean
+_view_collection_select_item_marked_action (DataObject* object,
+ GObject* user,
+ gpointer self)
+{
gboolean result;
result = view_collection_select_item ((ViewCollection*) self, object, user);
#line 872 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return result;
-#line 5481 "ViewCollection.c"
+#line 5386 "ViewCollection.c"
}
-void view_collection_select_marked (ViewCollection* self, Marker* marker) {
+void
+view_collection_select_marked (ViewCollection* self,
+ Marker* marker)
+{
GeeArrayList* selected = NULL;
GeeArrayList* _tmp0_;
- Marker* _tmp1_;
+ GeeArrayList* _tmp1_;
GeeArrayList* _tmp2_;
- GeeArrayList* _tmp3_;
+ gint _tmp3_;
gint _tmp4_;
- gint _tmp5_;
#line 870 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_if_fail (IS_VIEW_COLLECTION (self));
#line 870 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -5499,39 +5406,39 @@ void view_collection_select_marked (ViewCollection* self, Marker* marker) {
#line 871 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
selected = _tmp0_;
#line 872 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp1_ = marker;
-#line 872 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp2_ = selected;
+ _tmp1_ = selected;
#line 872 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- data_collection_act_on_marked (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), _tmp1_, _view_collection_select_item_marked_action, self, NULL, NULL, G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, G_TYPE_OBJECT, GObject));
+ data_collection_act_on_marked (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), marker, _view_collection_select_item_marked_action, self, NULL, NULL, G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, G_TYPE_OBJECT, GObject));
#line 874 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp3_ = selected;
+ _tmp2_ = selected;
#line 874 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp4_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
+ _tmp3_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
#line 874 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp5_ = _tmp4_;
+ _tmp4_ = _tmp3_;
#line 874 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- if (_tmp5_ > 0) {
-#line 5515 "ViewCollection.c"
+ if (_tmp4_ > 0) {
+#line 5420 "ViewCollection.c"
+ GeeArrayList* _tmp5_;
GeeArrayList* _tmp6_;
- GeeArrayList* _tmp7_;
#line 875 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp6_ = selected;
+ _tmp5_ = selected;
#line 875 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- view_collection_add_many_selected (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_COLLECTION, GeeCollection));
+ view_collection_add_many_selected (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_COLLECTION, GeeCollection));
#line 876 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp7_ = selected;
+ _tmp6_ = selected;
#line 876 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- view_collection_notify_items_selected_unselected (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_COLLECTION, GeeCollection), NULL);
-#line 5526 "ViewCollection.c"
+ view_collection_notify_items_selected_unselected (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_COLLECTION, GeeCollection), NULL);
+#line 5431 "ViewCollection.c"
}
#line 870 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (selected);
-#line 5530 "ViewCollection.c"
+#line 5435 "ViewCollection.c"
}
-void view_collection_select_all (ViewCollection* self) {
+void
+view_collection_select_all (ViewCollection* self)
+{
Marker* marker = NULL;
Marker* _tmp0_;
#line 881 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -5546,20 +5453,21 @@ void view_collection_select_all (ViewCollection* self) {
view_collection_select_marked (self, marker);
#line 881 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (marker);
-#line 5549 "ViewCollection.c"
+#line 5456 "ViewCollection.c"
}
-static gboolean view_collection_select_item (ViewCollection* self, DataObject* object, GObject* user) {
+static gboolean
+view_collection_select_item (ViewCollection* self,
+ DataObject* object,
+ GObject* user)
+{
gboolean result = FALSE;
DataView* view = NULL;
- DataObject* _tmp0_;
+ DataView* _tmp0_;
DataView* _tmp1_;
- DataView* _tmp2_;
- gboolean _tmp3_;
- DataView* _tmp9_;
- DataView* _tmp10_;
- gboolean _tmp11_;
+ DataView* _tmp5_;
+ DataView* _tmp6_;
#line 887 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_val_if_fail (IS_VIEW_COLLECTION (self), FALSE);
#line 887 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -5567,39 +5475,29 @@ static gboolean view_collection_select_item (ViewCollection* self, DataObject* o
#line 887 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_val_if_fail ((user == NULL) || G_IS_OBJECT (user), FALSE);
#line 888 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp0_ = object;
+ _tmp0_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (object, TYPE_DATA_VIEW, DataView));
#line 888 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATA_VIEW, DataView));
-#line 888 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- view = _tmp1_;
-#line 889 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp2_ = view;
+ view = _tmp0_;
#line 889 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp3_ = data_view_is_selected (_tmp2_);
+ _tmp1_ = view;
#line 889 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- if (_tmp3_) {
-#line 5581 "ViewCollection.c"
- DataView* _tmp4_;
- gboolean _tmp5_;
-#line 890 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp4_ = view;
+ if (data_view_is_selected (_tmp1_)) {
+#line 5485 "ViewCollection.c"
+ DataView* _tmp2_;
#line 890 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp5_ = data_view_is_visible (_tmp4_);
+ _tmp2_ = view;
#line 890 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- if (_tmp5_) {
-#line 5590 "ViewCollection.c"
- DataSet* _tmp6_;
- DataView* _tmp7_;
- gboolean _tmp8_;
+ if (data_view_is_visible (_tmp2_)) {
+#line 5491 "ViewCollection.c"
+ DataSet* _tmp3_;
+ DataView* _tmp4_;
#line 891 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp6_ = self->priv->selected;
+ _tmp3_ = self->priv->selected;
#line 891 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp7_ = view;
+ _tmp4_ = view;
#line 891 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp8_ = data_set_contains (_tmp6_, G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_DATA_OBJECT, DataObject));
-#line 891 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _vala_assert (_tmp8_, "selected.contains(view)");
-#line 5602 "ViewCollection.c"
+ _vala_assert (data_set_contains (_tmp3_, G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_DATA_OBJECT, DataObject)), "selected.contains(view)");
+#line 5500 "ViewCollection.c"
}
#line 893 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
result = TRUE;
@@ -5607,28 +5505,23 @@ static gboolean view_collection_select_item (ViewCollection* self, DataObject* o
_g_object_unref0 (view);
#line 893 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return result;
-#line 5610 "ViewCollection.c"
+#line 5508 "ViewCollection.c"
}
#line 896 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp9_ = view;
+ _tmp5_ = view;
#line 896 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- data_view_internal_set_selected (_tmp9_, TRUE);
-#line 900 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp10_ = view;
+ data_view_internal_set_selected (_tmp5_, TRUE);
#line 900 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp11_ = data_view_is_visible (_tmp10_);
+ _tmp6_ = view;
#line 900 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- if (_tmp11_) {
-#line 5622 "ViewCollection.c"
- GObject* _tmp12_;
- DataView* _tmp13_;
+ if (data_view_is_visible (_tmp6_)) {
+#line 5518 "ViewCollection.c"
+ DataView* _tmp7_;
#line 901 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp12_ = user;
+ _tmp7_ = view;
#line 901 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp13_ = view;
-#line 901 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_ARRAY_LIST, GeeArrayList), GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp13_);
-#line 5631 "ViewCollection.c"
+ gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (user, GEE_TYPE_ARRAY_LIST, GeeArrayList), GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp7_);
+#line 5524 "ViewCollection.c"
}
#line 903 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
result = TRUE;
@@ -5636,27 +5529,33 @@ static gboolean view_collection_select_item (ViewCollection* self, DataObject* o
_g_object_unref0 (view);
#line 903 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return result;
-#line 5639 "ViewCollection.c"
+#line 5532 "ViewCollection.c"
}
-static gboolean _view_collection_unselect_item_marked_action (DataObject* object, GObject* user, gpointer self) {
+static gboolean
+_view_collection_unselect_item_marked_action (DataObject* object,
+ GObject* user,
+ gpointer self)
+{
gboolean result;
result = view_collection_unselect_item ((ViewCollection*) self, object, user);
#line 909 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return result;
-#line 5648 "ViewCollection.c"
+#line 5545 "ViewCollection.c"
}
-void view_collection_unselect_marked (ViewCollection* self, Marker* marker) {
+void
+view_collection_unselect_marked (ViewCollection* self,
+ Marker* marker)
+{
GeeArrayList* unselected = NULL;
GeeArrayList* _tmp0_;
- Marker* _tmp1_;
+ GeeArrayList* _tmp1_;
GeeArrayList* _tmp2_;
- GeeArrayList* _tmp3_;
+ gint _tmp3_;
gint _tmp4_;
- gint _tmp5_;
#line 907 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_if_fail (IS_VIEW_COLLECTION (self));
#line 907 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -5666,87 +5565,87 @@ void view_collection_unselect_marked (ViewCollection* self, Marker* marker) {
#line 908 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
unselected = _tmp0_;
#line 909 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp1_ = marker;
+ _tmp1_ = unselected;
#line 909 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp2_ = unselected;
-#line 909 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- data_collection_act_on_marked (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), _tmp1_, _view_collection_unselect_item_marked_action, self, NULL, NULL, G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, G_TYPE_OBJECT, GObject));
+ data_collection_act_on_marked (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), marker, _view_collection_unselect_item_marked_action, self, NULL, NULL, G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, G_TYPE_OBJECT, GObject));
#line 911 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp3_ = unselected;
+ _tmp2_ = unselected;
#line 911 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp4_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
+ _tmp3_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
#line 911 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp5_ = _tmp4_;
+ _tmp4_ = _tmp3_;
#line 911 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- if (_tmp5_ > 0) {
-#line 5682 "ViewCollection.c"
+ if (_tmp4_ > 0) {
+#line 5579 "ViewCollection.c"
+ GeeArrayList* _tmp5_;
GeeArrayList* _tmp6_;
- GeeArrayList* _tmp7_;
#line 912 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp6_ = unselected;
+ _tmp5_ = unselected;
#line 912 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- view_collection_remove_many_selected (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_COLLECTION, GeeCollection));
+ view_collection_remove_many_selected (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_COLLECTION, GeeCollection));
#line 913 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp7_ = unselected;
+ _tmp6_ = unselected;
#line 913 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- view_collection_notify_items_selected_unselected (self, NULL, G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 5693 "ViewCollection.c"
+ view_collection_notify_items_selected_unselected (self, NULL, G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_COLLECTION, GeeCollection));
+#line 5590 "ViewCollection.c"
}
#line 907 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (unselected);
-#line 5697 "ViewCollection.c"
+#line 5594 "ViewCollection.c"
}
-void view_collection_unselect_all (ViewCollection* self) {
+void
+view_collection_unselect_all (ViewCollection* self)
+{
DataSet* _tmp0_;
- gint _tmp1_;
Marker* marker = NULL;
+ Marker* _tmp1_;
Marker* _tmp2_;
- Marker* _tmp3_;
+ GeeList* _tmp3_;
GeeList* _tmp4_;
- GeeList* _tmp5_;
- Marker* _tmp6_;
+ Marker* _tmp5_;
#line 918 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_if_fail (IS_VIEW_COLLECTION (self));
#line 919 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp0_ = self->priv->selected;
#line 919 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp1_ = data_set_get_count (_tmp0_);
-#line 919 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- if (_tmp1_ == 0) {
+ if (data_set_get_count (_tmp0_) == 0) {
#line 920 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return;
-#line 5720 "ViewCollection.c"
+#line 5616 "ViewCollection.c"
}
#line 922 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp2_ = data_collection_start_marking (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection));
+ _tmp1_ = data_collection_start_marking (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection));
#line 922 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- marker = _tmp2_;
+ marker = _tmp1_;
#line 923 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp3_ = marker;
+ _tmp2_ = marker;
#line 923 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp4_ = view_collection_get_selected (self);
+ _tmp3_ = view_collection_get_selected (self);
#line 923 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp5_ = _tmp4_;
+ _tmp4_ = _tmp3_;
#line 923 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- marker_mark_many (_tmp3_, G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_COLLECTION, GeeCollection));
+ marker_mark_many (_tmp2_, G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_COLLECTION, GeeCollection));
#line 923 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _g_object_unref0 (_tmp5_);
+ _g_object_unref0 (_tmp4_);
#line 925 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp6_ = marker;
+ _tmp5_ = marker;
#line 925 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- view_collection_unselect_marked (self, _tmp6_);
+ view_collection_unselect_marked (self, _tmp5_);
#line 918 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (marker);
-#line 5742 "ViewCollection.c"
+#line 5638 "ViewCollection.c"
}
-void view_collection_unselect_all_but (ViewCollection* self, DataView* exception) {
+void
+view_collection_unselect_all_but (ViewCollection* self,
+ DataView* exception)
+{
Marker* marker = NULL;
Marker* _tmp0_;
- Marker* _tmp15_;
+ Marker* _tmp13_;
#line 929 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_if_fail (IS_VIEW_COLLECTION (self));
#line 929 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -5755,7 +5654,7 @@ void view_collection_unselect_all_but (ViewCollection* self, DataView* exception
_tmp0_ = data_collection_start_marking (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection));
#line 930 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
marker = _tmp0_;
-#line 5758 "ViewCollection.c"
+#line 5657 "ViewCollection.c"
{
GeeIterator* _object_it = NULL;
GeeCollection* _tmp1_;
@@ -5776,86 +5675,81 @@ void view_collection_unselect_all_but (ViewCollection* self, DataView* exception
_object_it = _tmp4_;
#line 931 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
while (TRUE) {
-#line 5779 "ViewCollection.c"
+#line 5678 "ViewCollection.c"
GeeIterator* _tmp5_;
- gboolean _tmp6_;
DataObject* object = NULL;
- GeeIterator* _tmp7_;
- gpointer _tmp8_;
+ GeeIterator* _tmp6_;
+ gpointer _tmp7_;
DataView* view = NULL;
- DataObject* _tmp9_;
+ DataObject* _tmp8_;
+ DataView* _tmp9_;
DataView* _tmp10_;
- DataView* _tmp11_;
- DataView* _tmp12_;
#line 931 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp5_ = _object_it;
#line 931 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp6_ = gee_iterator_next (_tmp5_);
-#line 931 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- if (!_tmp6_) {
+ if (!gee_iterator_next (_tmp5_)) {
#line 931 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
break;
-#line 5798 "ViewCollection.c"
+#line 5693 "ViewCollection.c"
}
#line 931 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp7_ = _object_it;
+ _tmp6_ = _object_it;
#line 931 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp8_ = gee_iterator_get (_tmp7_);
+ _tmp7_ = gee_iterator_get (_tmp6_);
#line 931 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- object = (DataObject*) _tmp8_;
+ object = (DataObject*) _tmp7_;
#line 932 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp9_ = object;
+ _tmp8_ = object;
#line 932 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp10_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_DATA_VIEW, DataView));
+ _tmp9_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_VIEW, DataView));
#line 932 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- view = _tmp10_;
+ view = _tmp9_;
#line 933 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp11_ = view;
-#line 933 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp12_ = exception;
+ _tmp10_ = view;
#line 933 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- if (_tmp11_ != _tmp12_) {
-#line 5818 "ViewCollection.c"
- Marker* _tmp13_;
- DataView* _tmp14_;
+ if (_tmp10_ != exception) {
+#line 5711 "ViewCollection.c"
+ Marker* _tmp11_;
+ DataView* _tmp12_;
#line 934 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp13_ = marker;
+ _tmp11_ = marker;
#line 934 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp14_ = view;
+ _tmp12_ = view;
#line 934 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- marker_mark (_tmp13_, G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_DATA_OBJECT, DataObject));
-#line 5827 "ViewCollection.c"
+ marker_mark (_tmp11_, G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_DATA_OBJECT, DataObject));
+#line 5720 "ViewCollection.c"
}
#line 931 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (view);
#line 931 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (object);
-#line 5833 "ViewCollection.c"
+#line 5726 "ViewCollection.c"
}
#line 931 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (_object_it);
-#line 5837 "ViewCollection.c"
+#line 5730 "ViewCollection.c"
}
#line 937 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp15_ = marker;
+ _tmp13_ = marker;
#line 937 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- view_collection_unselect_marked (self, _tmp15_);
+ view_collection_unselect_marked (self, _tmp13_);
#line 929 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (marker);
-#line 5845 "ViewCollection.c"
+#line 5738 "ViewCollection.c"
}
-static gboolean view_collection_unselect_item (ViewCollection* self, DataObject* object, GObject* user) {
+static gboolean
+view_collection_unselect_item (ViewCollection* self,
+ DataObject* object,
+ GObject* user)
+{
gboolean result = FALSE;
DataView* view = NULL;
- DataObject* _tmp0_;
+ DataView* _tmp0_;
DataView* _tmp1_;
- DataView* _tmp2_;
- gboolean _tmp3_;
- DataView* _tmp7_;
- GObject* _tmp8_;
- DataView* _tmp9_;
+ DataView* _tmp4_;
+ DataView* _tmp5_;
#line 940 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_val_if_fail (IS_VIEW_COLLECTION (self), FALSE);
#line 940 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -5863,64 +5757,57 @@ static gboolean view_collection_unselect_item (ViewCollection* self, DataObject*
#line 940 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_val_if_fail ((user == NULL) || G_IS_OBJECT (user), FALSE);
#line 941 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp0_ = object;
+ _tmp0_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (object, TYPE_DATA_VIEW, DataView));
#line 941 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATA_VIEW, DataView));
-#line 941 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- view = _tmp1_;
-#line 942 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp2_ = view;
+ view = _tmp0_;
#line 942 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp3_ = data_view_is_selected (_tmp2_);
+ _tmp1_ = view;
#line 942 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- if (!_tmp3_) {
-#line 5877 "ViewCollection.c"
- DataSet* _tmp4_;
- DataView* _tmp5_;
- gboolean _tmp6_;
-#line 943 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp4_ = self->priv->selected;
+ if (!data_view_is_selected (_tmp1_)) {
+#line 5767 "ViewCollection.c"
+ DataSet* _tmp2_;
+ DataView* _tmp3_;
#line 943 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp5_ = view;
+ _tmp2_ = self->priv->selected;
#line 943 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp6_ = data_set_contains (_tmp4_, G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_DATA_OBJECT, DataObject));
+ _tmp3_ = view;
#line 943 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _vala_assert (!_tmp6_, "!selected.contains(view)");
+ _vala_assert (!data_set_contains (_tmp2_, G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_DATA_OBJECT, DataObject)), "!selected.contains(view)");
#line 945 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
result = TRUE;
#line 945 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (view);
#line 945 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return result;
-#line 5895 "ViewCollection.c"
+#line 5782 "ViewCollection.c"
}
#line 948 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp7_ = view;
+ _tmp4_ = view;
#line 948 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- data_view_internal_set_selected (_tmp7_, FALSE);
-#line 949 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp8_ = user;
+ data_view_internal_set_selected (_tmp4_, FALSE);
#line 949 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp9_ = view;
+ _tmp5_ = view;
#line 949 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_ARRAY_LIST, GeeArrayList), GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp9_);
+ gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (user, GEE_TYPE_ARRAY_LIST, GeeArrayList), GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp5_);
#line 951 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
result = TRUE;
#line 951 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (view);
#line 951 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return result;
-#line 5913 "ViewCollection.c"
+#line 5798 "ViewCollection.c"
}
-void view_collection_unselect_and_select_marked (ViewCollection* self, Marker* unselect, Marker* select) {
+void
+view_collection_unselect_and_select_marked (ViewCollection* self,
+ Marker* unselect,
+ Marker* select)
+{
GeeArrayList* unselected = NULL;
GeeArrayList* _tmp0_;
- Marker* _tmp1_;
GeeArrayList* selected = NULL;
- GeeArrayList* _tmp2_;
- Marker* _tmp3_;
+ GeeArrayList* _tmp1_;
#line 955 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_if_fail (IS_VIEW_COLLECTION (self));
#line 955 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -5932,19 +5819,15 @@ void view_collection_unselect_and_select_marked (ViewCollection* self, Marker* u
#line 956 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
unselected = _tmp0_;
#line 957 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp1_ = unselect;
-#line 957 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- data_collection_act_on_marked (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), _tmp1_, _view_collection_unselect_item_marked_action, self, NULL, NULL, G_TYPE_CHECK_INSTANCE_CAST (unselected, G_TYPE_OBJECT, GObject));
+ data_collection_act_on_marked (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), unselect, _view_collection_unselect_item_marked_action, self, NULL, NULL, G_TYPE_CHECK_INSTANCE_CAST (unselected, G_TYPE_OBJECT, GObject));
#line 959 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
view_collection_remove_many_selected (self, G_TYPE_CHECK_INSTANCE_CAST (unselected, GEE_TYPE_COLLECTION, GeeCollection));
#line 961 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp2_ = gee_array_list_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
+ _tmp1_ = gee_array_list_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
#line 961 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- selected = _tmp2_;
+ selected = _tmp1_;
#line 962 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp3_ = select;
-#line 962 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- data_collection_act_on_marked (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), _tmp3_, _view_collection_select_item_marked_action, self, NULL, NULL, G_TYPE_CHECK_INSTANCE_CAST (selected, G_TYPE_OBJECT, GObject));
+ data_collection_act_on_marked (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), select, _view_collection_select_item_marked_action, self, NULL, NULL, G_TYPE_CHECK_INSTANCE_CAST (selected, G_TYPE_OBJECT, GObject));
#line 964 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
view_collection_add_many_selected (self, G_TYPE_CHECK_INSTANCE_CAST (selected, GEE_TYPE_COLLECTION, GeeCollection));
#line 966 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -5953,27 +5836,33 @@ void view_collection_unselect_and_select_marked (ViewCollection* self, Marker* u
_g_object_unref0 (selected);
#line 955 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (unselected);
-#line 5956 "ViewCollection.c"
+#line 5839 "ViewCollection.c"
}
-static gboolean _view_collection_toggle_item_marked_action (DataObject* object, GObject* user, gpointer self) {
+static gboolean
+_view_collection_toggle_item_marked_action (DataObject* object,
+ GObject* user,
+ gpointer self)
+{
gboolean result;
result = view_collection_toggle_item ((ViewCollection*) self, object, user);
#line 973 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return result;
-#line 5965 "ViewCollection.c"
+#line 5852 "ViewCollection.c"
}
-void view_collection_toggle_marked (ViewCollection* self, Marker* marker) {
+void
+view_collection_toggle_marked (ViewCollection* self,
+ Marker* marker)
+{
ViewCollectionToggleLists* lists = NULL;
ViewCollectionToggleLists* _tmp0_;
- Marker* _tmp1_;
+ GeeArrayList* _tmp1_;
GeeArrayList* _tmp2_;
GeeArrayList* _tmp3_;
GeeArrayList* _tmp4_;
- GeeArrayList* _tmp5_;
#line 971 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_if_fail (IS_VIEW_COLLECTION (self));
#line 971 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -5983,39 +5872,38 @@ void view_collection_toggle_marked (ViewCollection* self, Marker* marker) {
#line 972 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
lists = _tmp0_;
#line 973 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp1_ = marker;
-#line 973 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- data_collection_act_on_marked (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), _tmp1_, _view_collection_toggle_item_marked_action, self, NULL, NULL, G_TYPE_CHECK_INSTANCE_CAST (lists, G_TYPE_OBJECT, GObject));
+ data_collection_act_on_marked (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), marker, _view_collection_toggle_item_marked_action, self, NULL, NULL, G_TYPE_CHECK_INSTANCE_CAST (lists, G_TYPE_OBJECT, GObject));
#line 976 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp2_ = lists->selected;
+ _tmp1_ = lists->selected;
#line 976 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- view_collection_add_many_selected (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection));
+ view_collection_add_many_selected (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection));
#line 977 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp3_ = lists->unselected;
+ _tmp2_ = lists->unselected;
#line 977 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- view_collection_remove_many_selected (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection));
+ view_collection_remove_many_selected (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection));
#line 979 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp4_ = lists->selected;
+ _tmp3_ = lists->selected;
#line 979 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp5_ = lists->unselected;
+ _tmp4_ = lists->unselected;
#line 979 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- view_collection_notify_items_selected_unselected (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_COLLECTION, GeeCollection));
+ view_collection_notify_items_selected_unselected (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_COLLECTION, GeeCollection));
#line 971 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (lists);
-#line 6005 "ViewCollection.c"
+#line 5892 "ViewCollection.c"
}
-static gboolean view_collection_toggle_item (ViewCollection* self, DataObject* object, GObject* user) {
+static gboolean
+view_collection_toggle_item (ViewCollection* self,
+ DataObject* object,
+ GObject* user)
+{
gboolean result = FALSE;
DataView* view = NULL;
- DataObject* _tmp0_;
- DataView* _tmp1_;
+ DataView* _tmp0_;
ViewCollectionToggleLists* lists = NULL;
- GObject* _tmp2_;
- ViewCollectionToggleLists* _tmp3_;
- DataView* _tmp4_;
- gboolean _tmp5_;
+ ViewCollectionToggleLists* _tmp1_;
+ DataView* _tmp2_;
#line 982 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_val_if_fail (IS_VIEW_COLLECTION (self), FALSE);
#line 982 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -6023,59 +5911,50 @@ static gboolean view_collection_toggle_item (ViewCollection* self, DataObject* o
#line 982 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_val_if_fail ((user == NULL) || G_IS_OBJECT (user), FALSE);
#line 983 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp0_ = object;
-#line 983 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATA_VIEW, DataView));
+ _tmp0_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (object, TYPE_DATA_VIEW, DataView));
#line 983 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- view = _tmp1_;
-#line 984 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp2_ = user;
+ view = _tmp0_;
#line 984 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp3_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, VIEW_COLLECTION_TYPE_TOGGLE_LISTS, ViewCollectionToggleLists));
+ _tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (user, VIEW_COLLECTION_TYPE_TOGGLE_LISTS, ViewCollectionToggleLists));
#line 984 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- lists = _tmp3_;
-#line 990 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp4_ = view;
+ lists = _tmp1_;
#line 990 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp5_ = data_view_internal_toggle (_tmp4_);
+ _tmp2_ = view;
#line 990 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- if (_tmp5_) {
-#line 6043 "ViewCollection.c"
- DataView* _tmp6_;
- gboolean _tmp7_;
-#line 991 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp6_ = view;
+ if (data_view_internal_toggle (_tmp2_)) {
+#line 5925 "ViewCollection.c"
+ DataView* _tmp3_;
#line 991 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp7_ = data_view_is_visible (_tmp6_);
+ _tmp3_ = view;
#line 991 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- if (_tmp7_) {
-#line 6052 "ViewCollection.c"
- ViewCollectionToggleLists* _tmp8_;
- GeeArrayList* _tmp9_;
- DataView* _tmp10_;
+ if (data_view_is_visible (_tmp3_)) {
+#line 5931 "ViewCollection.c"
+ ViewCollectionToggleLists* _tmp4_;
+ GeeArrayList* _tmp5_;
+ DataView* _tmp6_;
#line 992 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp8_ = lists;
+ _tmp4_ = lists;
#line 992 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp9_ = _tmp8_->selected;
+ _tmp5_ = _tmp4_->selected;
#line 992 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp10_ = view;
+ _tmp6_ = view;
#line 992 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp10_);
-#line 6064 "ViewCollection.c"
+ gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp6_);
+#line 5943 "ViewCollection.c"
}
} else {
- ViewCollectionToggleLists* _tmp11_;
- GeeArrayList* _tmp12_;
- DataView* _tmp13_;
+ ViewCollectionToggleLists* _tmp7_;
+ GeeArrayList* _tmp8_;
+ DataView* _tmp9_;
#line 994 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp11_ = lists;
+ _tmp7_ = lists;
#line 994 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp12_ = _tmp11_->unselected;
+ _tmp8_ = _tmp7_->unselected;
#line 994 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp13_ = view;
+ _tmp9_ = view;
#line 994 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp13_);
-#line 6078 "ViewCollection.c"
+ gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp9_);
+#line 5957 "ViewCollection.c"
}
#line 997 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
result = TRUE;
@@ -6085,29 +5964,30 @@ static gboolean view_collection_toggle_item (ViewCollection* self, DataObject* o
_g_object_unref0 (view);
#line 997 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return result;
-#line 6088 "ViewCollection.c"
+#line 5967 "ViewCollection.c"
}
-gint view_collection_get_selected_count (ViewCollection* self) {
+gint
+view_collection_get_selected_count (ViewCollection* self)
+{
gint result = 0;
DataSet* _tmp0_;
- gint _tmp1_;
#line 1000 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_val_if_fail (IS_VIEW_COLLECTION (self), 0);
#line 1001 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp0_ = self->priv->selected;
#line 1001 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp1_ = data_set_get_count (_tmp0_);
-#line 1001 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- result = _tmp1_;
+ result = data_set_get_count (_tmp0_);
#line 1001 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return result;
-#line 6106 "ViewCollection.c"
+#line 5984 "ViewCollection.c"
}
-GeeList* view_collection_get_selected (ViewCollection* self) {
+GeeList*
+view_collection_get_selected (ViewCollection* self)
+{
GeeList* result = NULL;
DataSet* _tmp0_;
GeeList* _tmp1_;
@@ -6121,32 +6001,35 @@ GeeList* view_collection_get_selected (ViewCollection* self) {
result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_LIST, GeeList);
#line 1005 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return result;
-#line 6124 "ViewCollection.c"
+#line 6004 "ViewCollection.c"
}
-DataView* view_collection_get_selected_at (ViewCollection* self, gint index) {
+DataView*
+view_collection_get_selected_at (ViewCollection* self,
+ gint index)
+{
DataView* result = NULL;
DataSet* _tmp0_;
- gint _tmp1_;
- DataObject* _tmp2_;
+ DataObject* _tmp1_;
#line 1008 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_val_if_fail (IS_VIEW_COLLECTION (self), NULL);
#line 1009 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp0_ = self->priv->selected;
#line 1009 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp1_ = index;
-#line 1009 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp2_ = data_set_get_at (_tmp0_, _tmp1_);
+ _tmp1_ = data_set_get_at (_tmp0_, index);
#line 1009 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- result = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_DATA_VIEW, DataView);
+ result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_VIEW, DataView);
#line 1009 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return result;
-#line 6145 "ViewCollection.c"
+#line 6025 "ViewCollection.c"
}
-static gboolean view_collection_is_visible (ViewCollection* self, DataView* view) {
+static gboolean
+view_collection_is_visible (ViewCollection* self,
+ DataView* view)
+{
gboolean result = FALSE;
gboolean _tmp0_ = FALSE;
DataSet* _tmp1_;
@@ -6158,41 +6041,34 @@ static gboolean view_collection_is_visible (ViewCollection* self, DataView* view
_tmp1_ = self->priv->visible;
#line 1013 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (_tmp1_ != NULL) {
-#line 6161 "ViewCollection.c"
+#line 6044 "ViewCollection.c"
DataSet* _tmp2_;
- DataView* _tmp3_;
- gboolean _tmp4_;
#line 1013 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp2_ = self->priv->visible;
#line 1013 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp3_ = view;
-#line 1013 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp4_ = data_set_contains (_tmp2_, G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_DATA_OBJECT, DataObject));
-#line 1013 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp0_ = _tmp4_;
-#line 6173 "ViewCollection.c"
+ _tmp0_ = data_set_contains (_tmp2_, G_TYPE_CHECK_INSTANCE_CAST (view, TYPE_DATA_OBJECT, DataObject));
+#line 6050 "ViewCollection.c"
} else {
#line 1013 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp0_ = TRUE;
-#line 6177 "ViewCollection.c"
+#line 6054 "ViewCollection.c"
}
#line 1013 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
result = _tmp0_;
#line 1013 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return result;
-#line 6183 "ViewCollection.c"
+#line 6060 "ViewCollection.c"
}
-static gboolean view_collection_add_many_visible (ViewCollection* self, GeeCollection* many) {
+static gboolean
+view_collection_add_many_visible (ViewCollection* self,
+ GeeCollection* many)
+{
gboolean result = FALSE;
DataSet* _tmp0_;
DataSet* _tmp1_;
- GeeCollection* _tmp2_;
- gboolean _tmp3_;
- DataSet* _tmp4_;
- gint _tmp5_;
- gint _tmp6_;
+ DataSet* _tmp2_;
#line 1016 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_val_if_fail (IS_VIEW_COLLECTION (self), FALSE);
#line 1016 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -6205,64 +6081,55 @@ static gboolean view_collection_add_many_visible (ViewCollection* self, GeeColle
result = TRUE;
#line 1018 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return result;
-#line 6208 "ViewCollection.c"
+#line 6084 "ViewCollection.c"
}
#line 1020 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp1_ = self->priv->visible;
#line 1020 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp2_ = many;
-#line 1020 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp3_ = data_set_add_many (_tmp1_, _tmp2_);
-#line 1020 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- if (!_tmp3_) {
+ if (!data_set_add_many (_tmp1_, many)) {
#line 1021 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
result = FALSE;
#line 1021 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return result;
-#line 6222 "ViewCollection.c"
+#line 6094 "ViewCollection.c"
}
#line 1024 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp4_ = self->priv->visible;
+ _tmp2_ = self->priv->visible;
#line 1024 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp5_ = data_set_get_count (_tmp4_);
-#line 1024 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp6_ = DATA_COLLECTION_CLASS (view_collection_parent_class)->get_count (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection));
-#line 1024 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- if (_tmp5_ == _tmp6_) {
+ if (data_set_get_count (_tmp2_) == DATA_COLLECTION_CLASS (view_collection_parent_class)->get_count (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection))) {
#line 1025 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_data_set_unref0 (self->priv->visible);
#line 1025 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
self->priv->visible = NULL;
-#line 6236 "ViewCollection.c"
+#line 6104 "ViewCollection.c"
}
#line 1027 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
result = TRUE;
#line 1027 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return result;
-#line 6242 "ViewCollection.c"
+#line 6110 "ViewCollection.c"
}
-static void view_collection_hide_items (ViewCollection* self, GeeList* to_hide) {
+static void
+view_collection_hide_items (ViewCollection* self,
+ GeeList* to_hide)
+{
GeeArrayList* unselected = NULL;
GeeArrayList* _tmp0_;
gint count = 0;
- GeeList* _tmp1_;
+ gint _tmp1_;
gint _tmp2_;
- gint _tmp3_;
- DataSet* _tmp22_;
+ DataSet* _tmp17_;
gboolean removed = FALSE;
- DataSet* _tmp24_;
- GeeList* _tmp25_;
- gboolean _tmp26_;
- gboolean _tmp27_;
- GeeArrayList* _tmp28_;
- GeeArrayList* _tmp29_;
- gint _tmp30_;
- gint _tmp31_;
- GeeList* _tmp33_;
- gint _tmp34_;
- gint _tmp35_;
+ DataSet* _tmp19_;
+ gboolean _tmp20_;
+ GeeArrayList* _tmp21_;
+ GeeArrayList* _tmp22_;
+ gint _tmp23_;
+ gint _tmp24_;
+ gint _tmp26_;
+ gint _tmp27_;
#line 1031 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_if_fail (IS_VIEW_COLLECTION (self));
#line 1031 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -6272,206 +6139,178 @@ static void view_collection_hide_items (ViewCollection* self, GeeList* to_hide)
#line 1032 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
unselected = _tmp0_;
#line 1034 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp1_ = to_hide;
+ _tmp1_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (to_hide, GEE_TYPE_COLLECTION, GeeCollection));
#line 1034 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp2_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1034 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp3_ = _tmp2_;
+ _tmp2_ = _tmp1_;
#line 1034 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- count = _tmp3_;
-#line 6282 "ViewCollection.c"
+ count = _tmp2_;
+#line 6147 "ViewCollection.c"
{
gint ctr = 0;
#line 1035 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
ctr = 0;
-#line 6287 "ViewCollection.c"
+#line 6152 "ViewCollection.c"
{
- gboolean _tmp4_ = FALSE;
+ gboolean _tmp3_ = FALSE;
#line 1035 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp4_ = TRUE;
+ _tmp3_ = TRUE;
#line 1035 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
while (TRUE) {
-#line 6294 "ViewCollection.c"
+#line 6159 "ViewCollection.c"
+ gint _tmp5_;
gint _tmp6_;
- gint _tmp7_;
DataView* view = NULL;
- GeeList* _tmp8_;
- gint _tmp9_;
- gpointer _tmp10_;
- DataView* _tmp11_;
- gboolean _tmp12_;
- DataView* _tmp13_;
- gboolean _tmp14_;
- DataView* _tmp21_;
+ gint _tmp7_;
+ gpointer _tmp8_;
+ DataView* _tmp9_;
+ DataView* _tmp10_;
+ DataView* _tmp16_;
#line 1035 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- if (!_tmp4_) {
-#line 6308 "ViewCollection.c"
- gint _tmp5_;
+ if (!_tmp3_) {
+#line 6170 "ViewCollection.c"
+ gint _tmp4_;
#line 1035 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp5_ = ctr;
+ _tmp4_ = ctr;
#line 1035 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- ctr = _tmp5_ + 1;
-#line 6314 "ViewCollection.c"
+ ctr = _tmp4_ + 1;
+#line 6176 "ViewCollection.c"
}
#line 1035 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp4_ = FALSE;
+ _tmp3_ = FALSE;
#line 1035 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp6_ = ctr;
+ _tmp5_ = ctr;
#line 1035 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp7_ = count;
+ _tmp6_ = count;
#line 1035 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- if (!(_tmp6_ < _tmp7_)) {
+ if (!(_tmp5_ < _tmp6_)) {
#line 1035 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
break;
-#line 6326 "ViewCollection.c"
+#line 6188 "ViewCollection.c"
}
#line 1036 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp8_ = to_hide;
-#line 1036 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp9_ = ctr;
+ _tmp7_ = ctr;
#line 1036 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp10_ = gee_list_get (_tmp8_, _tmp9_);
+ _tmp8_ = gee_list_get (to_hide, _tmp7_);
#line 1036 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- view = (DataView*) _tmp10_;
+ view = (DataView*) _tmp8_;
#line 1037 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp11_ = view;
+ _tmp9_ = view;
#line 1037 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp12_ = data_view_is_visible (_tmp11_);
-#line 1037 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _vala_assert (_tmp12_, "view.is_visible()");
-#line 1039 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp13_ = view;
+ _vala_assert (data_view_is_visible (_tmp9_), "view.is_visible()");
#line 1039 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp14_ = data_view_is_selected (_tmp13_);
+ _tmp10_ = view;
#line 1039 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- if (_tmp14_) {
-#line 6348 "ViewCollection.c"
- DataView* _tmp15_;
- GeeArrayList* _tmp16_;
- DataView* _tmp17_;
+ if (data_view_is_selected (_tmp10_)) {
+#line 6204 "ViewCollection.c"
+ DataView* _tmp11_;
+ GeeArrayList* _tmp12_;
+ DataView* _tmp13_;
#line 1040 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp15_ = view;
+ _tmp11_ = view;
#line 1040 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- data_view_internal_set_selected (_tmp15_, FALSE);
+ data_view_internal_set_selected (_tmp11_, FALSE);
#line 1041 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp16_ = unselected;
+ _tmp12_ = unselected;
#line 1041 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp17_ = view;
+ _tmp13_ = view;
#line 1041 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp17_);
-#line 6362 "ViewCollection.c"
+ gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp13_);
+#line 6218 "ViewCollection.c"
} else {
- DataSet* _tmp18_;
- DataView* _tmp19_;
- gboolean _tmp20_;
-#line 1043 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp18_ = self->priv->selected;
+ DataSet* _tmp14_;
+ DataView* _tmp15_;
#line 1043 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp19_ = view;
+ _tmp14_ = self->priv->selected;
#line 1043 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp20_ = data_set_contains (_tmp18_, G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, TYPE_DATA_OBJECT, DataObject));
+ _tmp15_ = view;
#line 1043 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _vala_assert (!_tmp20_, "!selected.contains(view)");
-#line 6375 "ViewCollection.c"
+ _vala_assert (!data_set_contains (_tmp14_, G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_DATA_OBJECT, DataObject)), "!selected.contains(view)");
+#line 6228 "ViewCollection.c"
}
#line 1046 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp21_ = view;
+ _tmp16_ = view;
#line 1046 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- data_view_internal_set_visible (_tmp21_, FALSE);
+ data_view_internal_set_visible (_tmp16_, FALSE);
#line 1035 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (view);
-#line 6383 "ViewCollection.c"
+#line 6236 "ViewCollection.c"
}
}
}
#line 1049 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp22_ = self->priv->visible;
+ _tmp17_ = self->priv->visible;
#line 1049 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- if (_tmp22_ == NULL) {
-#line 6391 "ViewCollection.c"
- DataSet* _tmp23_;
+ if (_tmp17_ == NULL) {
+#line 6244 "ViewCollection.c"
+ DataSet* _tmp18_;
#line 1051 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp23_ = data_collection_get_dataset_copy (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection));
+ _tmp18_ = data_collection_get_dataset_copy (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection));
#line 1051 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_data_set_unref0 (self->priv->visible);
#line 1051 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- self->priv->visible = _tmp23_;
-#line 6399 "ViewCollection.c"
+ self->priv->visible = _tmp18_;
+#line 6252 "ViewCollection.c"
}
#line 1054 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp24_ = self->priv->visible;
-#line 1054 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp25_ = to_hide;
+ _tmp19_ = self->priv->visible;
#line 1054 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp26_ = data_set_remove_many (_tmp24_, G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1054 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- removed = _tmp26_;
+ removed = data_set_remove_many (_tmp19_, G_TYPE_CHECK_INSTANCE_CAST (to_hide, GEE_TYPE_COLLECTION, GeeCollection));
#line 1055 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp27_ = removed;
+ _tmp20_ = removed;
#line 1055 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _vala_assert (_tmp27_, "removed");
+ _vala_assert (_tmp20_, "removed");
#line 1057 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp28_ = unselected;
+ _tmp21_ = unselected;
#line 1057 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- view_collection_remove_many_selected (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, GEE_TYPE_COLLECTION, GeeCollection));
+ view_collection_remove_many_selected (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, GEE_TYPE_COLLECTION, GeeCollection));
#line 1059 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp29_ = unselected;
+ _tmp22_ = unselected;
#line 1059 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp30_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
+ _tmp23_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
#line 1059 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp31_ = _tmp30_;
+ _tmp24_ = _tmp23_;
#line 1059 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- if (_tmp31_ > 0) {
-#line 6425 "ViewCollection.c"
- GeeArrayList* _tmp32_;
+ if (_tmp24_ > 0) {
+#line 6274 "ViewCollection.c"
+ GeeArrayList* _tmp25_;
#line 1060 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp32_ = unselected;
+ _tmp25_ = unselected;
#line 1060 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- view_collection_notify_items_selected_unselected (self, NULL, G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 6431 "ViewCollection.c"
+ view_collection_notify_items_selected_unselected (self, NULL, G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, GEE_TYPE_COLLECTION, GeeCollection));
+#line 6280 "ViewCollection.c"
}
#line 1062 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp33_ = to_hide;
-#line 1062 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp34_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, GEE_TYPE_COLLECTION, GeeCollection));
+ _tmp26_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (to_hide, GEE_TYPE_COLLECTION, GeeCollection));
#line 1062 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp35_ = _tmp34_;
+ _tmp27_ = _tmp26_;
#line 1062 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- if (_tmp35_ > 0) {
-#line 6441 "ViewCollection.c"
- GeeList* _tmp36_;
- GeeList* _tmp37_;
-#line 1063 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp36_ = to_hide;
+ if (_tmp27_ > 0) {
#line 1063 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- view_collection_notify_items_hidden (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, GEE_TYPE_COLLECTION, GeeCollection));
+ view_collection_notify_items_hidden (self, G_TYPE_CHECK_INSTANCE_CAST (to_hide, GEE_TYPE_COLLECTION, GeeCollection));
#line 1064 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp37_ = to_hide;
-#line 1064 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- view_collection_notify_items_visibility_changed (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 6452 "ViewCollection.c"
+ view_collection_notify_items_visibility_changed (self, G_TYPE_CHECK_INSTANCE_CAST (to_hide, GEE_TYPE_COLLECTION, GeeCollection));
+#line 6292 "ViewCollection.c"
}
#line 1031 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (unselected);
-#line 6456 "ViewCollection.c"
+#line 6296 "ViewCollection.c"
}
-static void view_collection_show_items (ViewCollection* self, GeeList* to_show) {
+static void
+view_collection_show_items (ViewCollection* self,
+ GeeList* to_show)
+{
GeeArrayList* added_selected = NULL;
GeeArrayList* _tmp0_;
gint count = 0;
- GeeList* _tmp1_;
+ gint _tmp1_;
gint _tmp2_;
- gint _tmp3_;
gboolean added = FALSE;
- GeeList* _tmp21_;
- gboolean _tmp22_;
- gboolean _tmp23_;
- GeeArrayList* _tmp24_;
- GeeList* _tmp25_;
- gint _tmp26_;
- gint _tmp27_;
+ gboolean _tmp16_;
+ GeeArrayList* _tmp17_;
+ gint _tmp18_;
+ gint _tmp19_;
#line 1069 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_if_fail (IS_VIEW_COLLECTION (self));
#line 1069 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -6481,185 +6320,160 @@ static void view_collection_show_items (ViewCollection* self, GeeList* to_show)
#line 1070 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
added_selected = _tmp0_;
#line 1072 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp1_ = to_show;
-#line 1072 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp2_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection));
+ _tmp1_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (to_show, GEE_TYPE_COLLECTION, GeeCollection));
#line 1072 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp3_ = _tmp2_;
+ _tmp2_ = _tmp1_;
#line 1072 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- count = _tmp3_;
-#line 6491 "ViewCollection.c"
+ count = _tmp2_;
+#line 6328 "ViewCollection.c"
{
gint ctr = 0;
#line 1073 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
ctr = 0;
-#line 6496 "ViewCollection.c"
+#line 6333 "ViewCollection.c"
{
- gboolean _tmp4_ = FALSE;
+ gboolean _tmp3_ = FALSE;
#line 1073 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp4_ = TRUE;
+ _tmp3_ = TRUE;
#line 1073 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
while (TRUE) {
-#line 6503 "ViewCollection.c"
+#line 6340 "ViewCollection.c"
+ gint _tmp5_;
gint _tmp6_;
- gint _tmp7_;
DataView* view = NULL;
- GeeList* _tmp8_;
- gint _tmp9_;
- gpointer _tmp10_;
+ gint _tmp7_;
+ gpointer _tmp8_;
+ DataView* _tmp9_;
+ DataView* _tmp10_;
DataView* _tmp11_;
- gboolean _tmp12_;
- DataView* _tmp13_;
- DataView* _tmp14_;
- gboolean _tmp15_;
#line 1073 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- if (!_tmp4_) {
-#line 6517 "ViewCollection.c"
- gint _tmp5_;
+ if (!_tmp3_) {
+#line 6351 "ViewCollection.c"
+ gint _tmp4_;
#line 1073 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp5_ = ctr;
+ _tmp4_ = ctr;
#line 1073 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- ctr = _tmp5_ + 1;
-#line 6523 "ViewCollection.c"
+ ctr = _tmp4_ + 1;
+#line 6357 "ViewCollection.c"
}
#line 1073 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp4_ = FALSE;
+ _tmp3_ = FALSE;
#line 1073 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp6_ = ctr;
+ _tmp5_ = ctr;
#line 1073 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp7_ = count;
+ _tmp6_ = count;
#line 1073 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- if (!(_tmp6_ < _tmp7_)) {
+ if (!(_tmp5_ < _tmp6_)) {
#line 1073 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
break;
-#line 6535 "ViewCollection.c"
+#line 6369 "ViewCollection.c"
}
#line 1074 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp8_ = to_show;
+ _tmp7_ = ctr;
#line 1074 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp9_ = ctr;
+ _tmp8_ = gee_list_get (to_show, _tmp7_);
#line 1074 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp10_ = gee_list_get (_tmp8_, _tmp9_);
-#line 1074 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- view = (DataView*) _tmp10_;
-#line 1075 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp11_ = view;
+ view = (DataView*) _tmp8_;
#line 1075 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp12_ = data_view_is_visible (_tmp11_);
+ _tmp9_ = view;
#line 1075 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _vala_assert (!_tmp12_, "!view.is_visible()");
+ _vala_assert (!data_view_is_visible (_tmp9_), "!view.is_visible()");
#line 1077 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp13_ = view;
+ _tmp10_ = view;
#line 1077 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- data_view_internal_set_visible (_tmp13_, TRUE);
-#line 1080 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp14_ = view;
+ data_view_internal_set_visible (_tmp10_, TRUE);
#line 1080 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp15_ = data_view_is_selected (_tmp14_);
+ _tmp11_ = view;
#line 1080 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- if (_tmp15_) {
-#line 6561 "ViewCollection.c"
- DataSet* _tmp16_;
- DataView* _tmp17_;
- gboolean _tmp18_;
- GeeArrayList* _tmp19_;
- DataView* _tmp20_;
-#line 1081 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp16_ = self->priv->selected;
+ if (data_view_is_selected (_tmp11_)) {
+#line 6389 "ViewCollection.c"
+ DataSet* _tmp12_;
+ DataView* _tmp13_;
+ GeeArrayList* _tmp14_;
+ DataView* _tmp15_;
#line 1081 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp17_ = view;
+ _tmp12_ = self->priv->selected;
#line 1081 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp18_ = data_set_contains (_tmp16_, G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_DATA_OBJECT, DataObject));
+ _tmp13_ = view;
#line 1081 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _vala_assert (!_tmp18_, "!selected.contains(view)");
+ _vala_assert (!data_set_contains (_tmp12_, G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_DATA_OBJECT, DataObject)), "!selected.contains(view)");
#line 1082 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp19_ = added_selected;
+ _tmp14_ = added_selected;
#line 1082 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp20_ = view;
+ _tmp15_ = view;
#line 1082 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp20_);
-#line 6581 "ViewCollection.c"
+ gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp15_);
+#line 6406 "ViewCollection.c"
}
#line 1073 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (view);
-#line 6585 "ViewCollection.c"
+#line 6410 "ViewCollection.c"
}
}
}
#line 1086 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp21_ = to_show;
-#line 1086 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp22_ = view_collection_add_many_visible (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1086 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- added = _tmp22_;
+ added = view_collection_add_many_visible (self, G_TYPE_CHECK_INSTANCE_CAST (to_show, GEE_TYPE_COLLECTION, GeeCollection));
#line 1087 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp23_ = added;
+ _tmp16_ = added;
#line 1087 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _vala_assert (_tmp23_, "added");
+ _vala_assert (_tmp16_, "added");
#line 1089 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp24_ = added_selected;
+ _tmp17_ = added_selected;
#line 1089 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- view_collection_add_many_selected (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1091 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp25_ = to_show;
+ view_collection_add_many_selected (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, GEE_TYPE_COLLECTION, GeeCollection));
#line 1091 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp26_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, GEE_TYPE_COLLECTION, GeeCollection));
+ _tmp18_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (to_show, GEE_TYPE_COLLECTION, GeeCollection));
#line 1091 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp27_ = _tmp26_;
+ _tmp19_ = _tmp18_;
#line 1091 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- if (_tmp27_ > 0) {
-#line 6611 "ViewCollection.c"
- GeeList* _tmp28_;
- GeeList* _tmp29_;
-#line 1092 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp28_ = to_show;
+ if (_tmp19_ > 0) {
#line 1092 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- view_collection_notify_items_shown (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, GEE_TYPE_COLLECTION, GeeCollection));
+ view_collection_notify_items_shown (self, G_TYPE_CHECK_INSTANCE_CAST (to_show, GEE_TYPE_COLLECTION, GeeCollection));
#line 1093 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp29_ = to_show;
-#line 1093 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- view_collection_notify_items_visibility_changed (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 6622 "ViewCollection.c"
+ view_collection_notify_items_visibility_changed (self, G_TYPE_CHECK_INSTANCE_CAST (to_show, GEE_TYPE_COLLECTION, GeeCollection));
+#line 6434 "ViewCollection.c"
}
#line 1069 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (added_selected);
-#line 6626 "ViewCollection.c"
+#line 6438 "ViewCollection.c"
}
-gboolean view_collection_has_view_for_source (ViewCollection* self, DataSource* source) {
+gboolean
+view_collection_has_view_for_source (ViewCollection* self,
+ DataSource* source)
+{
gboolean result = FALSE;
- DataSource* _tmp0_;
+ DataView* _tmp0_;
DataView* _tmp1_;
- DataView* _tmp2_;
- gboolean _tmp3_;
+ gboolean _tmp2_;
#line 1098 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_val_if_fail (IS_VIEW_COLLECTION (self), FALSE);
#line 1098 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_val_if_fail (IS_DATA_SOURCE (source), FALSE);
#line 1099 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp0_ = source;
+ _tmp0_ = view_collection_get_view_for_source (self, source);
#line 1099 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp1_ = view_collection_get_view_for_source (self, _tmp0_);
+ _tmp1_ = _tmp0_;
#line 1099 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp2_ = _tmp1_;
-#line 1099 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp3_ = _tmp2_ != NULL;
+ _tmp2_ = _tmp1_ != NULL;
#line 1099 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _g_object_unref0 (_tmp2_);
+ _g_object_unref0 (_tmp1_);
#line 1099 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- result = _tmp3_;
+ result = _tmp2_;
#line 1099 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return result;
-#line 6654 "ViewCollection.c"
+#line 6466 "ViewCollection.c"
}
-DataView* view_collection_get_view_for_source (ViewCollection* self, DataSource* source) {
+DataView*
+view_collection_get_view_for_source (ViewCollection* self,
+ DataSource* source)
+{
DataView* result = NULL;
GeeHashMap* _tmp0_;
- DataSource* _tmp1_;
- gpointer _tmp2_;
+ gpointer _tmp1_;
#line 1103 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_val_if_fail (IS_VIEW_COLLECTION (self), NULL);
#line 1103 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -6667,53 +6481,53 @@ DataView* view_collection_get_view_for_source (ViewCollection* self, DataSource*
#line 1104 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp0_ = self->priv->source_map;
#line 1104 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp1_ = source;
+ _tmp1_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), source);
#line 1104 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp2_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_);
-#line 1104 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- result = (DataView*) _tmp2_;
+ result = (DataView*) _tmp1_;
#line 1104 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return result;
-#line 6677 "ViewCollection.c"
+#line 6489 "ViewCollection.c"
}
-gboolean view_collection_has_view_for_source_with_filtered (ViewCollection* self, DataSource* source) {
+gboolean
+view_collection_has_view_for_source_with_filtered (ViewCollection* self,
+ DataSource* source)
+{
gboolean result = FALSE;
- DataSource* _tmp0_;
+ DataView* _tmp0_;
DataView* _tmp1_;
- DataView* _tmp2_;
- gboolean _tmp3_;
+ gboolean _tmp2_;
#line 1108 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_val_if_fail (IS_VIEW_COLLECTION (self), FALSE);
#line 1108 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_val_if_fail (IS_DATA_SOURCE (source), FALSE);
#line 1109 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp0_ = source;
+ _tmp0_ = view_collection_get_view_for_source_filtered (self, source);
#line 1109 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp1_ = view_collection_get_view_for_source_filtered (self, _tmp0_);
+ _tmp1_ = _tmp0_;
#line 1109 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp2_ = _tmp1_;
-#line 1109 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp3_ = _tmp2_ != NULL;
+ _tmp2_ = _tmp1_ != NULL;
#line 1109 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _g_object_unref0 (_tmp2_);
+ _g_object_unref0 (_tmp1_);
#line 1109 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- result = _tmp3_;
+ result = _tmp2_;
#line 1109 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return result;
-#line 6705 "ViewCollection.c"
+#line 6517 "ViewCollection.c"
}
-DataView* view_collection_get_view_for_source_filtered (ViewCollection* self, DataSource* source) {
+DataView*
+view_collection_get_view_for_source_filtered (ViewCollection* self,
+ DataSource* source)
+{
DataView* result = NULL;
DataView* view = NULL;
GeeHashMap* _tmp0_;
- DataSource* _tmp1_;
- gpointer _tmp2_;
- gboolean _tmp3_ = FALSE;
- DataView* _tmp4_;
+ gpointer _tmp1_;
+ gboolean _tmp2_ = FALSE;
+ DataView* _tmp3_;
#line 1113 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_val_if_fail (IS_VIEW_COLLECTION (self), NULL);
#line 1113 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -6721,49 +6535,46 @@ DataView* view_collection_get_view_for_source_filtered (ViewCollection* self, Da
#line 1114 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp0_ = self->priv->source_map;
#line 1114 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp1_ = source;
-#line 1114 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp2_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_);
+ _tmp1_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), source);
#line 1114 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- view = (DataView*) _tmp2_;
+ view = (DataView*) _tmp1_;
#line 1116 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp4_ = view;
-#line 1116 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- if (_tmp4_ != NULL) {
-#line 6733 "ViewCollection.c"
- DataView* _tmp5_;
- gboolean _tmp6_;
+ _tmp3_ = view;
#line 1116 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp5_ = view;
+ if (_tmp3_ != NULL) {
+#line 6545 "ViewCollection.c"
+ DataView* _tmp4_;
#line 1116 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp6_ = view_collection_is_in_filter (self, _tmp5_);
+ _tmp4_ = view;
#line 1116 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp3_ = !_tmp6_;
-#line 6742 "ViewCollection.c"
+ _tmp2_ = !view_collection_is_in_filter (self, _tmp4_);
+#line 6551 "ViewCollection.c"
} else {
#line 1116 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp3_ = FALSE;
-#line 6746 "ViewCollection.c"
+ _tmp2_ = FALSE;
+#line 6555 "ViewCollection.c"
}
#line 1116 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- if (_tmp3_) {
+ if (_tmp2_) {
#line 1117 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
result = NULL;
#line 1117 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (view);
#line 1117 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return result;
-#line 6756 "ViewCollection.c"
+#line 6565 "ViewCollection.c"
}
#line 1118 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
result = view;
#line 1118 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return result;
-#line 6762 "ViewCollection.c"
+#line 6571 "ViewCollection.c"
}
-GeeCollection* view_collection_get_sources (ViewCollection* self) {
+GeeCollection*
+view_collection_get_sources (ViewCollection* self)
+{
GeeCollection* result = NULL;
GeeHashMap* _tmp0_;
GeeSet* _tmp1_;
@@ -6794,85 +6605,70 @@ GeeCollection* view_collection_get_sources (ViewCollection* self) {
result = _tmp6_;
#line 1123 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return result;
-#line 6797 "ViewCollection.c"
+#line 6608 "ViewCollection.c"
}
-gboolean view_collection_has_source_of_type (ViewCollection* self, GType t) {
+gboolean
+view_collection_has_source_of_type (ViewCollection* self,
+ GType t)
+{
gboolean result = FALSE;
- GType _tmp0_;
- gboolean _tmp1_;
#line 1127 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_val_if_fail (IS_VIEW_COLLECTION (self), FALSE);
#line 1128 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp0_ = t;
-#line 1128 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp1_ = g_type_is_a (_tmp0_, TYPE_DATA_SOURCE);
-#line 1128 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _vala_assert (_tmp1_, "t.is_a(typeof(DataSource))");
-#line 6813 "ViewCollection.c"
+ _vala_assert (g_type_is_a (t, TYPE_DATA_SOURCE), "t.is_a(typeof(DataSource))");
+#line 6621 "ViewCollection.c"
{
GeeIterator* _source_it = NULL;
- GeeHashMap* _tmp2_;
+ GeeHashMap* _tmp0_;
+ GeeSet* _tmp1_;
+ GeeSet* _tmp2_;
GeeSet* _tmp3_;
- GeeSet* _tmp4_;
- GeeSet* _tmp5_;
- GeeIterator* _tmp6_;
- GeeIterator* _tmp7_;
+ GeeIterator* _tmp4_;
+ GeeIterator* _tmp5_;
#line 1130 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp2_ = self->priv->source_map;
+ _tmp0_ = self->priv->source_map;
#line 1130 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp3_ = gee_abstract_map_get_keys (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap));
+ _tmp1_ = gee_abstract_map_get_keys (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap));
#line 1130 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp4_ = _tmp3_;
+ _tmp2_ = _tmp1_;
#line 1130 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp5_ = _tmp4_;
+ _tmp3_ = _tmp2_;
#line 1130 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp6_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_ITERABLE, GeeIterable));
+ _tmp4_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ITERABLE, GeeIterable));
#line 1130 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp7_ = _tmp6_;
+ _tmp5_ = _tmp4_;
#line 1130 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _g_object_unref0 (_tmp5_);
+ _g_object_unref0 (_tmp3_);
#line 1130 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _source_it = _tmp7_;
+ _source_it = _tmp5_;
#line 1130 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
while (TRUE) {
-#line 6840 "ViewCollection.c"
- GeeIterator* _tmp8_;
- gboolean _tmp9_;
+#line 6648 "ViewCollection.c"
+ GeeIterator* _tmp6_;
DataSource* source = NULL;
- GeeIterator* _tmp10_;
- gpointer _tmp11_;
- DataSource* _tmp12_;
- GType _tmp13_;
- GType _tmp14_;
- gboolean _tmp15_;
-#line 1130 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp8_ = _source_it;
+ GeeIterator* _tmp7_;
+ gpointer _tmp8_;
+ DataSource* _tmp9_;
#line 1130 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp9_ = gee_iterator_next (_tmp8_);
+ _tmp6_ = _source_it;
#line 1130 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- if (!_tmp9_) {
+ if (!gee_iterator_next (_tmp6_)) {
#line 1130 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
break;
-#line 6858 "ViewCollection.c"
+#line 6660 "ViewCollection.c"
}
#line 1130 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp10_ = _source_it;
+ _tmp7_ = _source_it;
#line 1130 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp11_ = gee_iterator_get (_tmp10_);
+ _tmp8_ = gee_iterator_get (_tmp7_);
#line 1130 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- source = (DataSource*) _tmp11_;
-#line 1131 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp12_ = source;
-#line 1131 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp13_ = G_TYPE_FROM_INSTANCE (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, G_TYPE_OBJECT, GObject));
-#line 1131 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp14_ = t;
+ source = (DataSource*) _tmp8_;
#line 1131 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp15_ = g_type_is_a (_tmp13_, _tmp14_);
+ _tmp9_ = source;
#line 1131 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- if (_tmp15_) {
+ if (g_type_is_a (G_TYPE_FROM_INSTANCE (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, G_TYPE_OBJECT, GObject)), t)) {
#line 1132 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
result = TRUE;
#line 1132 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -6881,263 +6677,234 @@ gboolean view_collection_has_source_of_type (ViewCollection* self, GType t) {
_g_object_unref0 (_source_it);
#line 1132 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return result;
-#line 6884 "ViewCollection.c"
+#line 6680 "ViewCollection.c"
}
#line 1130 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (source);
-#line 6888 "ViewCollection.c"
+#line 6684 "ViewCollection.c"
}
#line 1130 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (_source_it);
-#line 6892 "ViewCollection.c"
+#line 6688 "ViewCollection.c"
}
#line 1135 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
result = FALSE;
#line 1135 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return result;
-#line 6898 "ViewCollection.c"
+#line 6694 "ViewCollection.c"
}
-gint view_collection_get_sources_of_type_count (ViewCollection* self, GType t) {
+gint
+view_collection_get_sources_of_type_count (ViewCollection* self,
+ GType t)
+{
gint result = 0;
- GType _tmp0_;
- gboolean _tmp1_;
gint count = 0;
#line 1138 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_val_if_fail (IS_VIEW_COLLECTION (self), 0);
#line 1139 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp0_ = t;
-#line 1139 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp1_ = g_type_is_a (_tmp0_, TYPE_DATA_SOURCE);
-#line 1139 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _vala_assert (_tmp1_, "t.is_a(typeof(DataSource))");
+ _vala_assert (g_type_is_a (t, TYPE_DATA_SOURCE), "t.is_a(typeof(DataSource))");
#line 1141 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
count = 0;
-#line 6917 "ViewCollection.c"
+#line 6710 "ViewCollection.c"
{
GeeIterator* _object_it = NULL;
- GeeCollection* _tmp2_;
- GeeCollection* _tmp3_;
- GeeIterator* _tmp4_;
- GeeIterator* _tmp5_;
+ GeeCollection* _tmp0_;
+ GeeCollection* _tmp1_;
+ GeeIterator* _tmp2_;
+ GeeIterator* _tmp3_;
#line 1142 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp2_ = data_collection_get_all (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection));
+ _tmp0_ = data_collection_get_all (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection));
#line 1142 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp3_ = _tmp2_;
+ _tmp1_ = _tmp0_;
#line 1142 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp4_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ITERABLE, GeeIterable));
+ _tmp2_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ITERABLE, GeeIterable));
#line 1142 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp5_ = _tmp4_;
+ _tmp3_ = _tmp2_;
#line 1142 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _g_object_unref0 (_tmp3_);
+ _g_object_unref0 (_tmp1_);
#line 1142 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _object_it = _tmp5_;
+ _object_it = _tmp3_;
#line 1142 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
while (TRUE) {
-#line 6938 "ViewCollection.c"
- GeeIterator* _tmp6_;
- gboolean _tmp7_;
+#line 6731 "ViewCollection.c"
+ GeeIterator* _tmp4_;
DataObject* object = NULL;
- GeeIterator* _tmp8_;
- gpointer _tmp9_;
- DataObject* _tmp10_;
- DataSource* _tmp11_;
- DataSource* _tmp12_;
- GType _tmp13_;
- GType _tmp14_;
- gboolean _tmp15_;
- gboolean _tmp16_;
-#line 1142 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp6_ = _object_it;
+ GeeIterator* _tmp5_;
+ gpointer _tmp6_;
+ DataObject* _tmp7_;
+ DataSource* _tmp8_;
+ DataSource* _tmp9_;
+ gboolean _tmp10_;
#line 1142 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp7_ = gee_iterator_next (_tmp6_);
+ _tmp4_ = _object_it;
#line 1142 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- if (!_tmp7_) {
+ if (!gee_iterator_next (_tmp4_)) {
#line 1142 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
break;
-#line 6959 "ViewCollection.c"
+#line 6746 "ViewCollection.c"
}
#line 1142 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp8_ = _object_it;
+ _tmp5_ = _object_it;
#line 1142 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp9_ = gee_iterator_get (_tmp8_);
+ _tmp6_ = gee_iterator_get (_tmp5_);
#line 1142 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- object = (DataObject*) _tmp9_;
-#line 1143 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp10_ = object;
-#line 1143 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp11_ = data_view_get_source (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_DATA_VIEW, DataView));
-#line 1143 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp12_ = _tmp11_;
+ object = (DataObject*) _tmp6_;
#line 1143 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp13_ = G_TYPE_FROM_INSTANCE (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, G_TYPE_OBJECT, GObject));
+ _tmp7_ = object;
#line 1143 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp14_ = t;
+ _tmp8_ = data_view_get_source (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_DATA_VIEW, DataView));
#line 1143 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp15_ = g_type_is_a (_tmp13_, _tmp14_);
+ _tmp9_ = _tmp8_;
#line 1143 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp16_ = _tmp15_;
+ _tmp10_ = g_type_is_a (G_TYPE_FROM_INSTANCE (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, G_TYPE_OBJECT, GObject)), t);
#line 1143 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _g_object_unref0 (_tmp12_);
+ _g_object_unref0 (_tmp9_);
#line 1143 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- if (_tmp16_) {
-#line 6985 "ViewCollection.c"
- gint _tmp17_;
+ if (_tmp10_) {
+#line 6766 "ViewCollection.c"
+ gint _tmp11_;
#line 1144 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp17_ = count;
+ _tmp11_ = count;
#line 1144 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- count = _tmp17_ + 1;
-#line 6991 "ViewCollection.c"
+ count = _tmp11_ + 1;
+#line 6772 "ViewCollection.c"
}
#line 1142 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (object);
-#line 6995 "ViewCollection.c"
+#line 6776 "ViewCollection.c"
}
#line 1142 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (_object_it);
-#line 6999 "ViewCollection.c"
+#line 6780 "ViewCollection.c"
}
#line 1147 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
result = count;
#line 1147 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return result;
-#line 7005 "ViewCollection.c"
+#line 6786 "ViewCollection.c"
}
-GeeList* view_collection_get_sources_of_type (ViewCollection* self, GType t) {
+GeeList*
+view_collection_get_sources_of_type (ViewCollection* self,
+ GType t)
+{
GeeList* result = NULL;
- GType _tmp0_;
- gboolean _tmp1_;
GeeList* sources = NULL;
#line 1150 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_val_if_fail (IS_VIEW_COLLECTION (self), NULL);
#line 1151 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp0_ = t;
-#line 1151 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp1_ = g_type_is_a (_tmp0_, TYPE_DATA_SOURCE);
-#line 1151 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _vala_assert (_tmp1_, "t.is_a(typeof(DataSource))");
+ _vala_assert (g_type_is_a (t, TYPE_DATA_SOURCE), "t.is_a(typeof(DataSource))");
#line 1153 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
sources = NULL;
-#line 7024 "ViewCollection.c"
+#line 6802 "ViewCollection.c"
{
GeeIterator* _object_it = NULL;
- GeeCollection* _tmp2_;
- GeeCollection* _tmp3_;
- GeeIterator* _tmp4_;
- GeeIterator* _tmp5_;
+ GeeCollection* _tmp0_;
+ GeeCollection* _tmp1_;
+ GeeIterator* _tmp2_;
+ GeeIterator* _tmp3_;
#line 1154 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp2_ = data_collection_get_all (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection));
+ _tmp0_ = data_collection_get_all (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection));
#line 1154 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp3_ = _tmp2_;
+ _tmp1_ = _tmp0_;
#line 1154 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp4_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ITERABLE, GeeIterable));
+ _tmp2_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ITERABLE, GeeIterable));
#line 1154 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp5_ = _tmp4_;
+ _tmp3_ = _tmp2_;
#line 1154 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _g_object_unref0 (_tmp3_);
+ _g_object_unref0 (_tmp1_);
#line 1154 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _object_it = _tmp5_;
+ _object_it = _tmp3_;
#line 1154 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
while (TRUE) {
-#line 7045 "ViewCollection.c"
- GeeIterator* _tmp6_;
- gboolean _tmp7_;
+#line 6823 "ViewCollection.c"
+ GeeIterator* _tmp4_;
DataObject* object = NULL;
- GeeIterator* _tmp8_;
- gpointer _tmp9_;
+ GeeIterator* _tmp5_;
+ gpointer _tmp6_;
DataSource* source = NULL;
- DataObject* _tmp10_;
- DataSource* _tmp11_;
- DataSource* _tmp12_;
- GType _tmp13_;
- GType _tmp14_;
- gboolean _tmp15_;
-#line 1154 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp6_ = _object_it;
+ DataObject* _tmp7_;
+ DataSource* _tmp8_;
+ DataSource* _tmp9_;
#line 1154 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp7_ = gee_iterator_next (_tmp6_);
+ _tmp4_ = _object_it;
#line 1154 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- if (!_tmp7_) {
+ if (!gee_iterator_next (_tmp4_)) {
#line 1154 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
break;
-#line 7066 "ViewCollection.c"
+#line 6838 "ViewCollection.c"
}
#line 1154 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp8_ = _object_it;
+ _tmp5_ = _object_it;
#line 1154 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp9_ = gee_iterator_get (_tmp8_);
+ _tmp6_ = gee_iterator_get (_tmp5_);
#line 1154 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- object = (DataObject*) _tmp9_;
+ object = (DataObject*) _tmp6_;
#line 1155 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp10_ = object;
+ _tmp7_ = object;
#line 1155 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp11_ = data_view_get_source (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_DATA_VIEW, DataView));
+ _tmp8_ = data_view_get_source (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_DATA_VIEW, DataView));
#line 1155 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- source = _tmp11_;
-#line 1156 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp12_ = source;
-#line 1156 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp13_ = G_TYPE_FROM_INSTANCE (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, G_TYPE_OBJECT, GObject));
-#line 1156 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp14_ = t;
+ source = _tmp8_;
#line 1156 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp15_ = g_type_is_a (_tmp13_, _tmp14_);
+ _tmp9_ = source;
#line 1156 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- if (_tmp15_) {
-#line 7090 "ViewCollection.c"
- GeeList* _tmp16_;
- GeeList* _tmp18_;
- DataSource* _tmp19_;
+ if (g_type_is_a (G_TYPE_FROM_INSTANCE (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, G_TYPE_OBJECT, GObject)), t)) {
+#line 6856 "ViewCollection.c"
+ GeeList* _tmp10_;
+ GeeList* _tmp12_;
+ DataSource* _tmp13_;
#line 1157 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp16_ = sources;
+ _tmp10_ = sources;
#line 1157 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- if (_tmp16_ == NULL) {
-#line 7098 "ViewCollection.c"
- GeeArrayList* _tmp17_;
+ if (_tmp10_ == NULL) {
+#line 6864 "ViewCollection.c"
+ GeeArrayList* _tmp11_;
#line 1158 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp17_ = gee_array_list_new (TYPE_DATA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
+ _tmp11_ = gee_array_list_new (TYPE_DATA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
#line 1158 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (sources);
#line 1158 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- sources = G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, GEE_TYPE_LIST, GeeList);
-#line 7106 "ViewCollection.c"
+ sources = G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_LIST, GeeList);
+#line 6872 "ViewCollection.c"
}
#line 1160 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp18_ = sources;
+ _tmp12_ = sources;
#line 1160 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp19_ = source;
+ _tmp13_ = source;
#line 1160 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_COLLECTION, GeeCollection), _tmp19_);
-#line 7114 "ViewCollection.c"
+ gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_COLLECTION, GeeCollection), _tmp13_);
+#line 6880 "ViewCollection.c"
}
#line 1154 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (source);
#line 1154 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (object);
-#line 7120 "ViewCollection.c"
+#line 6886 "ViewCollection.c"
}
#line 1154 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (_object_it);
-#line 7124 "ViewCollection.c"
+#line 6890 "ViewCollection.c"
}
#line 1164 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
result = sources;
#line 1164 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return result;
-#line 7130 "ViewCollection.c"
+#line 6896 "ViewCollection.c"
}
-GeeList* view_collection_get_selected_sources (ViewCollection* self) {
+GeeList*
+view_collection_get_selected_sources (ViewCollection* self)
+{
GeeList* result = NULL;
GeeList* sources = NULL;
GeeArrayList* _tmp0_;
gint count = 0;
DataSet* _tmp1_;
- gint _tmp2_;
#line 1167 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_val_if_fail (IS_VIEW_COLLECTION (self), NULL);
#line 1168 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -7147,74 +6914,72 @@ GeeList* view_collection_get_selected_sources (ViewCollection* self) {
#line 1170 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp1_ = self->priv->selected;
#line 1170 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp2_ = data_set_get_count (_tmp1_);
-#line 1170 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- count = _tmp2_;
-#line 7153 "ViewCollection.c"
+ count = data_set_get_count (_tmp1_);
+#line 6918 "ViewCollection.c"
{
gint ctr = 0;
#line 1171 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
ctr = 0;
-#line 7158 "ViewCollection.c"
+#line 6923 "ViewCollection.c"
{
- gboolean _tmp3_ = FALSE;
+ gboolean _tmp2_ = FALSE;
#line 1171 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp3_ = TRUE;
+ _tmp2_ = TRUE;
#line 1171 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
while (TRUE) {
-#line 7165 "ViewCollection.c"
+#line 6930 "ViewCollection.c"
+ gint _tmp4_;
gint _tmp5_;
- gint _tmp6_;
- GeeList* _tmp7_;
- DataSet* _tmp8_;
- gint _tmp9_;
- DataObject* _tmp10_;
- DataView* _tmp11_;
+ GeeList* _tmp6_;
+ DataSet* _tmp7_;
+ gint _tmp8_;
+ DataObject* _tmp9_;
+ DataView* _tmp10_;
+ DataSource* _tmp11_;
DataSource* _tmp12_;
- DataSource* _tmp13_;
#line 1171 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- if (!_tmp3_) {
-#line 7177 "ViewCollection.c"
- gint _tmp4_;
+ if (!_tmp2_) {
+#line 6942 "ViewCollection.c"
+ gint _tmp3_;
#line 1171 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp4_ = ctr;
+ _tmp3_ = ctr;
#line 1171 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- ctr = _tmp4_ + 1;
-#line 7183 "ViewCollection.c"
+ ctr = _tmp3_ + 1;
+#line 6948 "ViewCollection.c"
}
#line 1171 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp3_ = FALSE;
+ _tmp2_ = FALSE;
#line 1171 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp5_ = ctr;
+ _tmp4_ = ctr;
#line 1171 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp6_ = count;
+ _tmp5_ = count;
#line 1171 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- if (!(_tmp5_ < _tmp6_)) {
+ if (!(_tmp4_ < _tmp5_)) {
#line 1171 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
break;
-#line 7195 "ViewCollection.c"
+#line 6960 "ViewCollection.c"
}
#line 1172 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp7_ = sources;
+ _tmp6_ = sources;
#line 1172 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp8_ = self->priv->selected;
+ _tmp7_ = self->priv->selected;
#line 1172 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp9_ = ctr;
+ _tmp8_ = ctr;
#line 1172 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp10_ = data_set_get_at (_tmp8_, _tmp9_);
+ _tmp9_ = data_set_get_at (_tmp7_, _tmp8_);
#line 1172 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp11_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_DATA_VIEW, DataView);
+ _tmp10_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_DATA_VIEW, DataView);
#line 1172 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp12_ = data_view_get_source (_tmp11_);
+ _tmp11_ = data_view_get_source (_tmp10_);
#line 1172 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp13_ = _tmp12_;
+ _tmp12_ = _tmp11_;
#line 1172 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_COLLECTION, GeeCollection), _tmp13_);
+ gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_COLLECTION, GeeCollection), _tmp12_);
#line 1172 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _g_object_unref0 (_tmp13_);
+ _g_object_unref0 (_tmp12_);
#line 1172 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _g_object_unref0 (_tmp11_);
-#line 7217 "ViewCollection.c"
+ _g_object_unref0 (_tmp10_);
+#line 6982 "ViewCollection.c"
}
}
}
@@ -7222,69 +6987,72 @@ GeeList* view_collection_get_selected_sources (ViewCollection* self) {
result = sources;
#line 1174 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return result;
-#line 7225 "ViewCollection.c"
+#line 6990 "ViewCollection.c"
}
-DataSource* view_collection_get_selected_source_at (ViewCollection* self, gint index) {
+DataSource*
+view_collection_get_selected_source_at (ViewCollection* self,
+ gint index)
+{
DataSource* result = NULL;
DataObject* object = NULL;
DataSet* _tmp0_;
- gint _tmp1_;
- DataObject* _tmp2_;
- DataSource* _tmp3_ = NULL;
- DataObject* _tmp4_;
+ DataObject* _tmp1_;
+ DataSource* _tmp2_ = NULL;
+ DataObject* _tmp3_;
#line 1177 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_val_if_fail (IS_VIEW_COLLECTION (self), NULL);
#line 1178 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp0_ = self->priv->selected;
#line 1178 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp1_ = index;
+ _tmp1_ = data_set_get_at (_tmp0_, index);
#line 1178 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp2_ = data_set_get_at (_tmp0_, _tmp1_);
-#line 1178 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- object = _tmp2_;
+ object = _tmp1_;
#line 1180 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp4_ = object;
+ _tmp3_ = object;
#line 1180 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- if (_tmp4_ != NULL) {
-#line 7251 "ViewCollection.c"
- DataObject* _tmp5_;
- DataSource* _tmp6_;
+ if (_tmp3_ != NULL) {
+#line 7016 "ViewCollection.c"
+ DataObject* _tmp4_;
+ DataSource* _tmp5_;
#line 1180 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp5_ = object;
+ _tmp4_ = object;
#line 1180 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp6_ = data_view_get_source (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_DATA_VIEW, DataView));
+ _tmp5_ = data_view_get_source (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_DATA_VIEW, DataView));
#line 1180 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _g_object_unref0 (_tmp3_);
+ _g_object_unref0 (_tmp2_);
#line 1180 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp3_ = _tmp6_;
-#line 7262 "ViewCollection.c"
+ _tmp2_ = _tmp5_;
+#line 7027 "ViewCollection.c"
} else {
#line 1180 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _g_object_unref0 (_tmp3_);
+ _g_object_unref0 (_tmp2_);
#line 1180 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp3_ = NULL;
-#line 7268 "ViewCollection.c"
+ _tmp2_ = NULL;
+#line 7033 "ViewCollection.c"
}
#line 1180 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- result = _tmp3_;
+ result = _tmp2_;
#line 1180 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (object);
#line 1180 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return result;
-#line 7276 "ViewCollection.c"
+#line 7041 "ViewCollection.c"
}
-GeeList* view_collection_get_selected_sources_of_type (ViewCollection* self, GType t) {
+GeeList*
+view_collection_get_selected_sources_of_type (ViewCollection* self,
+ GType t)
+{
GeeList* result = NULL;
GeeList* sources = NULL;
#line 1183 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_val_if_fail (IS_VIEW_COLLECTION (self), NULL);
#line 1184 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
sources = NULL;
-#line 7287 "ViewCollection.c"
+#line 7055 "ViewCollection.c"
{
GeeList* _view_list = NULL;
GeeList* _tmp0_;
@@ -7309,7 +7077,7 @@ GeeList* view_collection_get_selected_sources_of_type (ViewCollection* self, GTy
_view_index = -1;
#line 1185 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
while (TRUE) {
-#line 7312 "ViewCollection.c"
+#line 7080 "ViewCollection.c"
gint _tmp4_;
gint _tmp5_;
gint _tmp6_;
@@ -7321,9 +7089,6 @@ GeeList* view_collection_get_selected_sources_of_type (ViewCollection* self, GTy
DataView* _tmp10_;
DataSource* _tmp11_;
DataSource* _tmp12_;
- GType _tmp13_;
- GType _tmp14_;
- gboolean _tmp15_;
#line 1185 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp4_ = _view_index;
#line 1185 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -7336,7 +7101,7 @@ GeeList* view_collection_get_selected_sources_of_type (ViewCollection* self, GTy
if (!(_tmp5_ < _tmp6_)) {
#line 1185 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
break;
-#line 7339 "ViewCollection.c"
+#line 7104 "ViewCollection.c"
}
#line 1185 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp7_ = _view_list;
@@ -7355,233 +7120,208 @@ GeeList* view_collection_get_selected_sources_of_type (ViewCollection* self, GTy
#line 1187 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp12_ = source;
#line 1187 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp13_ = G_TYPE_FROM_INSTANCE (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, G_TYPE_OBJECT, GObject));
-#line 1187 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp14_ = t;
-#line 1187 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp15_ = g_type_is_a (_tmp13_, _tmp14_);
-#line 1187 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- if (_tmp15_) {
-#line 7365 "ViewCollection.c"
- GeeList* _tmp16_;
- GeeList* _tmp18_;
- DataSource* _tmp19_;
+ if (g_type_is_a (G_TYPE_FROM_INSTANCE (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, G_TYPE_OBJECT, GObject)), t)) {
+#line 7124 "ViewCollection.c"
+ GeeList* _tmp13_;
+ GeeList* _tmp15_;
+ DataSource* _tmp16_;
#line 1188 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp16_ = sources;
+ _tmp13_ = sources;
#line 1188 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- if (_tmp16_ == NULL) {
-#line 7373 "ViewCollection.c"
- GeeArrayList* _tmp17_;
+ if (_tmp13_ == NULL) {
+#line 7132 "ViewCollection.c"
+ GeeArrayList* _tmp14_;
#line 1189 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp17_ = gee_array_list_new (TYPE_DATA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
+ _tmp14_ = gee_array_list_new (TYPE_DATA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
#line 1189 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (sources);
#line 1189 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- sources = G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, GEE_TYPE_LIST, GeeList);
-#line 7381 "ViewCollection.c"
+ sources = G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_LIST, GeeList);
+#line 7140 "ViewCollection.c"
}
#line 1191 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp18_ = sources;
+ _tmp15_ = sources;
#line 1191 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp19_ = source;
+ _tmp16_ = source;
#line 1191 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_COLLECTION, GeeCollection), _tmp19_);
-#line 7389 "ViewCollection.c"
+ gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GEE_TYPE_COLLECTION, GeeCollection), _tmp16_);
+#line 7148 "ViewCollection.c"
}
#line 1185 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (source);
#line 1185 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (view);
-#line 7395 "ViewCollection.c"
+#line 7154 "ViewCollection.c"
}
#line 1185 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (_view_list);
-#line 7399 "ViewCollection.c"
+#line 7158 "ViewCollection.c"
}
#line 1195 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
result = sources;
#line 1195 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return result;
-#line 7405 "ViewCollection.c"
+#line 7164 "ViewCollection.c"
}
-gint view_collection_index_of_source (ViewCollection* self, DataSource* source) {
+gint
+view_collection_index_of_source (ViewCollection* self,
+ DataSource* source)
+{
gint result = 0;
DataView* view = NULL;
- DataSource* _tmp0_;
- DataView* _tmp1_;
- gint _tmp2_ = 0;
- DataView* _tmp3_;
+ DataView* _tmp0_;
+ gint _tmp1_ = 0;
+ DataView* _tmp2_;
#line 1199 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_val_if_fail (IS_VIEW_COLLECTION (self), 0);
#line 1199 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_val_if_fail (IS_DATA_SOURCE (source), 0);
#line 1200 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp0_ = source;
+ _tmp0_ = view_collection_get_view_for_source (self, source);
#line 1200 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp1_ = view_collection_get_view_for_source (self, _tmp0_);
-#line 1200 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- view = _tmp1_;
-#line 1202 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp3_ = view;
+ view = _tmp0_;
#line 1202 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- if (_tmp3_ != NULL) {
-#line 7430 "ViewCollection.c"
- DataView* _tmp4_;
- gint _tmp5_;
+ _tmp2_ = view;
#line 1202 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp4_ = view;
+ if (_tmp2_ != NULL) {
+#line 7189 "ViewCollection.c"
+ DataView* _tmp3_;
#line 1202 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp5_ = data_collection_index_of (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_DATA_OBJECT, DataObject));
+ _tmp3_ = view;
#line 1202 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp2_ = _tmp5_;
-#line 7439 "ViewCollection.c"
+ _tmp1_ = data_collection_index_of (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_DATA_OBJECT, DataObject));
+#line 7195 "ViewCollection.c"
} else {
#line 1202 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp2_ = -1;
-#line 7443 "ViewCollection.c"
+ _tmp1_ = -1;
+#line 7199 "ViewCollection.c"
}
#line 1202 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- result = _tmp2_;
+ result = _tmp1_;
#line 1202 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (view);
#line 1202 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return result;
-#line 7451 "ViewCollection.c"
+#line 7207 "ViewCollection.c"
}
-void view_collection_internal_notify_view_altered (ViewCollection* self, DataView* view) {
- gboolean _tmp0_;
+void
+view_collection_internal_notify_view_altered (ViewCollection* self,
+ DataView* view)
+{
#line 1206 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_if_fail (IS_VIEW_COLLECTION (self));
#line 1206 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_if_fail (IS_DATA_VIEW (view));
#line 1207 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp0_ = data_collection_are_notifications_frozen (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection));
-#line 1207 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- if (!_tmp0_) {
-#line 7465 "ViewCollection.c"
- DataView* _tmp1_;
- DataView* _tmp2_;
- GeeCollection* _tmp3_;
- GeeCollection* _tmp4_;
-#line 1208 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp1_ = view;
+ if (!data_collection_are_notifications_frozen (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection))) {
+#line 7221 "ViewCollection.c"
+ GeeCollection* _tmp0_;
+ GeeCollection* _tmp1_;
#line 1208 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- view_collection_notify_item_view_altered (self, _tmp1_);
-#line 1209 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp2_ = view;
+ view_collection_notify_item_view_altered (self, view);
#line 1209 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp3_ = data_collection_get_singleton (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_DATA_OBJECT, DataObject));
+ _tmp0_ = data_collection_get_singleton (G_TYPE_CHECK_INSTANCE_CAST (view, TYPE_DATA_OBJECT, DataObject));
#line 1209 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection);
+ _tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection);
#line 1209 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- view_collection_notify_views_altered (self, _tmp4_);
+ view_collection_notify_views_altered (self, _tmp1_);
#line 1209 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _g_object_unref0 (_tmp4_);
-#line 7484 "ViewCollection.c"
+ _g_object_unref0 (_tmp1_);
+#line 7234 "ViewCollection.c"
} else {
- GeeHashSet* _tmp5_;
- GeeHashSet* _tmp7_;
- DataView* _tmp8_;
+ GeeHashSet* _tmp2_;
+ GeeHashSet* _tmp4_;
#line 1211 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp5_ = self->priv->frozen_views_altered;
+ _tmp2_ = self->priv->frozen_views_altered;
#line 1211 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- if (_tmp5_ == NULL) {
-#line 7493 "ViewCollection.c"
- GeeHashSet* _tmp6_;
+ if (_tmp2_ == NULL) {
+#line 7242 "ViewCollection.c"
+ GeeHashSet* _tmp3_;
#line 1212 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp6_ = gee_hash_set_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL);
+ _tmp3_ = gee_hash_set_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL);
#line 1212 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (self->priv->frozen_views_altered);
#line 1212 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- self->priv->frozen_views_altered = _tmp6_;
-#line 7501 "ViewCollection.c"
+ self->priv->frozen_views_altered = _tmp3_;
+#line 7250 "ViewCollection.c"
}
#line 1213 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp7_ = self->priv->frozen_views_altered;
+ _tmp4_ = self->priv->frozen_views_altered;
#line 1213 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp8_ = view;
-#line 1213 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp8_);
-#line 7509 "ViewCollection.c"
+ gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), view);
+#line 7256 "ViewCollection.c"
}
}
-void view_collection_internal_notify_geometry_altered (ViewCollection* self, DataView* view) {
- gboolean _tmp0_;
+void
+view_collection_internal_notify_geometry_altered (ViewCollection* self,
+ DataView* view)
+{
#line 1218 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_if_fail (IS_VIEW_COLLECTION (self));
#line 1218 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_if_fail (IS_DATA_VIEW (view));
#line 1219 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp0_ = data_collection_are_notifications_frozen (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection));
-#line 1219 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- if (!_tmp0_) {
-#line 7524 "ViewCollection.c"
- DataView* _tmp1_;
- DataView* _tmp2_;
- GeeCollection* _tmp3_;
- GeeCollection* _tmp4_;
-#line 1220 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp1_ = view;
+ if (!data_collection_are_notifications_frozen (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection))) {
+#line 7271 "ViewCollection.c"
+ GeeCollection* _tmp0_;
+ GeeCollection* _tmp1_;
#line 1220 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- view_collection_notify_item_geometry_altered (self, _tmp1_);
+ view_collection_notify_item_geometry_altered (self, view);
#line 1221 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp2_ = view;
-#line 1221 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp3_ = data_collection_get_singleton (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_DATA_OBJECT, DataObject));
+ _tmp0_ = data_collection_get_singleton (G_TYPE_CHECK_INSTANCE_CAST (view, TYPE_DATA_OBJECT, DataObject));
#line 1221 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection);
+ _tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection);
#line 1221 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- view_collection_notify_geometries_altered (self, _tmp4_);
+ view_collection_notify_geometries_altered (self, _tmp1_);
#line 1221 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _g_object_unref0 (_tmp4_);
-#line 7543 "ViewCollection.c"
+ _g_object_unref0 (_tmp1_);
+#line 7284 "ViewCollection.c"
} else {
- GeeHashSet* _tmp5_;
- GeeHashSet* _tmp7_;
- DataView* _tmp8_;
+ GeeHashSet* _tmp2_;
+ GeeHashSet* _tmp4_;
#line 1223 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp5_ = self->priv->frozen_geometries_altered;
+ _tmp2_ = self->priv->frozen_geometries_altered;
#line 1223 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- if (_tmp5_ == NULL) {
-#line 7552 "ViewCollection.c"
- GeeHashSet* _tmp6_;
+ if (_tmp2_ == NULL) {
+#line 7292 "ViewCollection.c"
+ GeeHashSet* _tmp3_;
#line 1224 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp6_ = gee_hash_set_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL);
+ _tmp3_ = gee_hash_set_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL);
#line 1224 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (self->priv->frozen_geometries_altered);
#line 1224 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- self->priv->frozen_geometries_altered = _tmp6_;
-#line 7560 "ViewCollection.c"
+ self->priv->frozen_geometries_altered = _tmp3_;
+#line 7300 "ViewCollection.c"
}
#line 1225 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp7_ = self->priv->frozen_geometries_altered;
+ _tmp4_ = self->priv->frozen_geometries_altered;
#line 1225 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp8_ = view;
-#line 1225 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp8_);
-#line 7568 "ViewCollection.c"
+ gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), view);
+#line 7306 "ViewCollection.c"
}
}
-static void view_collection_real_notify_thawed (DataCollection* base) {
+static void
+view_collection_real_notify_thawed (DataCollection* base)
+{
ViewCollection * self;
GeeHashSet* _tmp0_;
- GeeHashSet* _tmp9_;
+ GeeHashSet* _tmp8_;
#line 1229 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIEW_COLLECTION, ViewCollection);
#line 1230 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp0_ = self->priv->frozen_views_altered;
#line 1230 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (_tmp0_ != NULL) {
-#line 7583 "ViewCollection.c"
- GeeHashSet* _tmp8_;
+#line 7323 "ViewCollection.c"
+ GeeHashSet* _tmp7_;
{
GeeIterator* _view_it = NULL;
GeeHashSet* _tmp1_;
@@ -7594,220 +7334,252 @@ static void view_collection_real_notify_thawed (DataCollection* base) {
_view_it = _tmp2_;
#line 1231 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
while (TRUE) {
-#line 7597 "ViewCollection.c"
+#line 7337 "ViewCollection.c"
GeeIterator* _tmp3_;
- gboolean _tmp4_;
DataView* view = NULL;
- GeeIterator* _tmp5_;
- gpointer _tmp6_;
- DataView* _tmp7_;
+ GeeIterator* _tmp4_;
+ gpointer _tmp5_;
+ DataView* _tmp6_;
#line 1231 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp3_ = _view_it;
#line 1231 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp4_ = gee_iterator_next (_tmp3_);
-#line 1231 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- if (!_tmp4_) {
+ if (!gee_iterator_next (_tmp3_)) {
#line 1231 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
break;
-#line 7612 "ViewCollection.c"
+#line 7349 "ViewCollection.c"
}
#line 1231 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp5_ = _view_it;
+ _tmp4_ = _view_it;
#line 1231 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp6_ = gee_iterator_get (_tmp5_);
+ _tmp5_ = gee_iterator_get (_tmp4_);
#line 1231 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- view = (DataView*) _tmp6_;
+ view = (DataView*) _tmp5_;
#line 1232 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp7_ = view;
+ _tmp6_ = view;
#line 1232 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- view_collection_notify_item_view_altered (self, _tmp7_);
+ view_collection_notify_item_view_altered (self, _tmp6_);
#line 1231 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (view);
-#line 7626 "ViewCollection.c"
+#line 7363 "ViewCollection.c"
}
#line 1231 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (_view_it);
-#line 7630 "ViewCollection.c"
+#line 7367 "ViewCollection.c"
}
#line 1233 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp8_ = self->priv->frozen_views_altered;
+ _tmp7_ = self->priv->frozen_views_altered;
#line 1233 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- view_collection_notify_views_altered (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_COLLECTION, GeeCollection));
+ view_collection_notify_views_altered (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_COLLECTION, GeeCollection));
#line 1234 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (self->priv->frozen_views_altered);
#line 1234 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
self->priv->frozen_views_altered = NULL;
-#line 7640 "ViewCollection.c"
+#line 7377 "ViewCollection.c"
}
#line 1237 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp9_ = self->priv->frozen_geometries_altered;
+ _tmp8_ = self->priv->frozen_geometries_altered;
#line 1237 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- if (_tmp9_ != NULL) {
-#line 7646 "ViewCollection.c"
- GeeHashSet* _tmp17_;
+ if (_tmp8_ != NULL) {
+#line 7383 "ViewCollection.c"
+ GeeHashSet* _tmp15_;
{
GeeIterator* _view_it = NULL;
- GeeHashSet* _tmp10_;
- GeeIterator* _tmp11_;
+ GeeHashSet* _tmp9_;
+ GeeIterator* _tmp10_;
#line 1238 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp10_ = self->priv->frozen_geometries_altered;
+ _tmp9_ = self->priv->frozen_geometries_altered;
#line 1238 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp11_ = gee_abstract_collection_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
+ _tmp10_ = gee_abstract_collection_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
#line 1238 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _view_it = _tmp11_;
+ _view_it = _tmp10_;
#line 1238 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
while (TRUE) {
-#line 7660 "ViewCollection.c"
- GeeIterator* _tmp12_;
- gboolean _tmp13_;
+#line 7397 "ViewCollection.c"
+ GeeIterator* _tmp11_;
DataView* view = NULL;
- GeeIterator* _tmp14_;
- gpointer _tmp15_;
- DataView* _tmp16_;
-#line 1238 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp12_ = _view_it;
+ GeeIterator* _tmp12_;
+ gpointer _tmp13_;
+ DataView* _tmp14_;
#line 1238 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp13_ = gee_iterator_next (_tmp12_);
+ _tmp11_ = _view_it;
#line 1238 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- if (!_tmp13_) {
+ if (!gee_iterator_next (_tmp11_)) {
#line 1238 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
break;
-#line 7675 "ViewCollection.c"
+#line 7409 "ViewCollection.c"
}
#line 1238 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp14_ = _view_it;
+ _tmp12_ = _view_it;
#line 1238 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp15_ = gee_iterator_get (_tmp14_);
+ _tmp13_ = gee_iterator_get (_tmp12_);
#line 1238 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- view = (DataView*) _tmp15_;
+ view = (DataView*) _tmp13_;
#line 1239 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp16_ = view;
+ _tmp14_ = view;
#line 1239 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- view_collection_notify_item_geometry_altered (self, _tmp16_);
+ view_collection_notify_item_geometry_altered (self, _tmp14_);
#line 1238 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (view);
-#line 7689 "ViewCollection.c"
+#line 7423 "ViewCollection.c"
}
#line 1238 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (_view_it);
-#line 7693 "ViewCollection.c"
+#line 7427 "ViewCollection.c"
}
#line 1240 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp17_ = self->priv->frozen_geometries_altered;
+ _tmp15_ = self->priv->frozen_geometries_altered;
#line 1240 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- view_collection_notify_geometries_altered (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, GEE_TYPE_COLLECTION, GeeCollection));
+ view_collection_notify_geometries_altered (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GEE_TYPE_COLLECTION, GeeCollection));
#line 1241 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (self->priv->frozen_geometries_altered);
#line 1241 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
self->priv->frozen_geometries_altered = NULL;
-#line 7703 "ViewCollection.c"
+#line 7437 "ViewCollection.c"
}
#line 1244 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
DATA_COLLECTION_CLASS (view_collection_parent_class)->notify_thawed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection));
-#line 7707 "ViewCollection.c"
+#line 7441 "ViewCollection.c"
}
-gboolean view_collection_are_items_filtered_out (ViewCollection* self) {
+gboolean
+view_collection_are_items_filtered_out (ViewCollection* self)
+{
gboolean result = FALSE;
- gint _tmp0_;
- gint _tmp1_;
#line 1247 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_val_if_fail (IS_VIEW_COLLECTION (self), FALSE);
#line 1248 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp0_ = DATA_COLLECTION_CLASS (view_collection_parent_class)->get_count (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection));
-#line 1248 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp1_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection));
-#line 1248 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- result = _tmp0_ != _tmp1_;
+ result = DATA_COLLECTION_CLASS (view_collection_parent_class)->get_count (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection)) != data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection));
#line 1248 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return result;
-#line 7725 "ViewCollection.c"
+#line 7455 "ViewCollection.c"
}
-static void view_collection_real_items_selected (ViewCollection* self, GeeIterable* selected) {
+static void
+view_collection_real_items_selected (ViewCollection* self,
+ GeeIterable* selected)
+{
#line 75 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_if_fail (GEE_IS_ITERABLE (selected));
-#line 7732 "ViewCollection.c"
+#line 7465 "ViewCollection.c"
}
-static void view_collection_real_items_unselected (ViewCollection* self, GeeIterable* unselected) {
+static void
+view_collection_real_items_unselected (ViewCollection* self,
+ GeeIterable* unselected)
+{
#line 79 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_if_fail (GEE_IS_ITERABLE (unselected));
-#line 7739 "ViewCollection.c"
+#line 7475 "ViewCollection.c"
}
-static void view_collection_real_items_state_changed (ViewCollection* self, GeeIterable* changed) {
+static void
+view_collection_real_items_state_changed (ViewCollection* self,
+ GeeIterable* changed)
+{
#line 83 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_if_fail (GEE_IS_ITERABLE (changed));
-#line 7746 "ViewCollection.c"
+#line 7485 "ViewCollection.c"
}
-static void view_collection_real_selection_group_altered (ViewCollection* self) {
+static void
+view_collection_real_selection_group_altered (ViewCollection* self)
+{
}
-static void view_collection_real_items_shown (ViewCollection* self, GeeCollection* visible) {
+static void
+view_collection_real_items_shown (ViewCollection* self,
+ GeeCollection* visible)
+{
#line 94 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_if_fail (GEE_IS_COLLECTION (visible));
-#line 7757 "ViewCollection.c"
+#line 7501 "ViewCollection.c"
}
-static void view_collection_real_items_hidden (ViewCollection* self, GeeCollection* hidden) {
+static void
+view_collection_real_items_hidden (ViewCollection* self,
+ GeeCollection* hidden)
+{
#line 98 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_if_fail (GEE_IS_COLLECTION (hidden));
-#line 7764 "ViewCollection.c"
+#line 7511 "ViewCollection.c"
}
-static void view_collection_real_items_visibility_changed (ViewCollection* self, GeeCollection* changed) {
+static void
+view_collection_real_items_visibility_changed (ViewCollection* self,
+ GeeCollection* changed)
+{
#line 102 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_if_fail (GEE_IS_COLLECTION (changed));
-#line 7771 "ViewCollection.c"
+#line 7521 "ViewCollection.c"
}
-static void view_collection_real_item_view_altered (ViewCollection* self, DataView* view) {
+static void
+view_collection_real_item_view_altered (ViewCollection* self,
+ DataView* view)
+{
#line 106 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_if_fail (IS_DATA_VIEW (view));
-#line 7778 "ViewCollection.c"
+#line 7531 "ViewCollection.c"
}
-static void view_collection_real_item_geometry_altered (ViewCollection* self, DataView* view) {
+static void
+view_collection_real_item_geometry_altered (ViewCollection* self,
+ DataView* view)
+{
#line 110 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_if_fail (IS_DATA_VIEW (view));
-#line 7785 "ViewCollection.c"
+#line 7541 "ViewCollection.c"
}
-static void view_collection_real_views_altered (ViewCollection* self, GeeCollection* views) {
+static void
+view_collection_real_views_altered (ViewCollection* self,
+ GeeCollection* views)
+{
#line 113 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_if_fail (GEE_IS_COLLECTION (views));
-#line 7792 "ViewCollection.c"
+#line 7551 "ViewCollection.c"
}
-static void view_collection_real_geometries_altered (ViewCollection* self, GeeCollection* views) {
+static void
+view_collection_real_geometries_altered (ViewCollection* self,
+ GeeCollection* views)
+{
#line 116 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_if_fail (GEE_IS_COLLECTION (views));
-#line 7799 "ViewCollection.c"
+#line 7561 "ViewCollection.c"
}
-static void view_collection_real_view_filter_installed (ViewCollection* self, ViewFilter* filer) {
+static void
+view_collection_real_view_filter_installed (ViewCollection* self,
+ ViewFilter* filer)
+{
#line 119 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_if_fail (IS_VIEW_FILTER (filer));
-#line 7806 "ViewCollection.c"
+#line 7571 "ViewCollection.c"
}
-static void g_cclosure_user_marshal_VOID__VIEW_FILTER (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data) {
+static void
+g_cclosure_user_marshal_VOID__VIEW_FILTER (GClosure * closure,
+ GValue * return_value,
+ guint n_param_values,
+ const GValue * param_values,
+ gpointer invocation_hint,
+ gpointer marshal_data)
+{
typedef void (*GMarshalFunc_VOID__VIEW_FILTER) (gpointer data1, gpointer arg_1, gpointer data2);
register GMarshalFunc_VOID__VIEW_FILTER callback;
register GCClosure * cc;
@@ -7822,144 +7594,176 @@ static void g_cclosure_user_marshal_VOID__VIEW_FILTER (GClosure * closure, GValu
data1 = closure->data;
#line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
data2 = param_values->data[0].v_pointer;
-#line 7825 "ViewCollection.c"
+#line 7597 "ViewCollection.c"
} else {
#line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
data1 = param_values->data[0].v_pointer;
#line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
data2 = closure->data;
-#line 7831 "ViewCollection.c"
+#line 7603 "ViewCollection.c"
}
#line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
callback = (GMarshalFunc_VOID__VIEW_FILTER) (marshal_data ? marshal_data : cc->callback);
#line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
callback (data1, value_get_view_filter (param_values + 1), data2);
-#line 7837 "ViewCollection.c"
+#line 7609 "ViewCollection.c"
}
-static void view_collection_real_view_filter_removed (ViewCollection* self, ViewFilter* filer) {
+static void
+view_collection_real_view_filter_removed (ViewCollection* self,
+ ViewFilter* filer)
+{
#line 122 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_if_fail (IS_VIEW_FILTER (filer));
-#line 7844 "ViewCollection.c"
+#line 7619 "ViewCollection.c"
}
-ViewCollectionMonitor* view_collection_monitor_construct (GType object_type) {
+ViewCollectionMonitor*
+view_collection_monitor_construct (GType object_type)
+{
ViewCollectionMonitor* self = NULL;
#line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
self = (ViewCollectionMonitor*) g_type_create_instance (object_type);
#line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return self;
-#line 7854 "ViewCollection.c"
+#line 7631 "ViewCollection.c"
}
-ViewCollectionMonitor* view_collection_monitor_new (void) {
+ViewCollectionMonitor*
+view_collection_monitor_new (void)
+{
#line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return view_collection_monitor_construct (VIEW_COLLECTION_TYPE_MONITOR);
-#line 7861 "ViewCollection.c"
+#line 7640 "ViewCollection.c"
}
-static void view_collection_value_monitor_init (GValue* value) {
+static void
+view_collection_value_monitor_init (GValue* value)
+{
#line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
value->data[0].v_pointer = NULL;
-#line 7868 "ViewCollection.c"
+#line 7649 "ViewCollection.c"
}
-static void view_collection_value_monitor_free_value (GValue* value) {
+static void
+view_collection_value_monitor_free_value (GValue* value)
+{
#line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (value->data[0].v_pointer) {
#line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
view_collection_monitor_unref (value->data[0].v_pointer);
-#line 7877 "ViewCollection.c"
+#line 7660 "ViewCollection.c"
}
}
-static void view_collection_value_monitor_copy_value (const GValue* src_value, GValue* dest_value) {
+static void
+view_collection_value_monitor_copy_value (const GValue* src_value,
+ GValue* dest_value)
+{
#line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (src_value->data[0].v_pointer) {
#line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
dest_value->data[0].v_pointer = view_collection_monitor_ref (src_value->data[0].v_pointer);
-#line 7887 "ViewCollection.c"
+#line 7673 "ViewCollection.c"
} else {
#line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
dest_value->data[0].v_pointer = NULL;
-#line 7891 "ViewCollection.c"
+#line 7677 "ViewCollection.c"
}
}
-static gpointer view_collection_value_monitor_peek_pointer (const GValue* value) {
+static gpointer
+view_collection_value_monitor_peek_pointer (const GValue* value)
+{
#line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return value->data[0].v_pointer;
-#line 7899 "ViewCollection.c"
+#line 7687 "ViewCollection.c"
}
-static gchar* view_collection_value_monitor_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+static gchar*
+view_collection_value_monitor_collect_value (GValue* value,
+ guint n_collect_values,
+ GTypeCValue* collect_values,
+ guint collect_flags)
+{
#line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (collect_values[0].v_pointer) {
-#line 7906 "ViewCollection.c"
+#line 7699 "ViewCollection.c"
ViewCollectionMonitor * object;
object = collect_values[0].v_pointer;
#line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (object->parent_instance.g_class == NULL) {
#line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 7913 "ViewCollection.c"
+#line 7706 "ViewCollection.c"
} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
#line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 7917 "ViewCollection.c"
+#line 7710 "ViewCollection.c"
}
#line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
value->data[0].v_pointer = view_collection_monitor_ref (object);
-#line 7921 "ViewCollection.c"
+#line 7714 "ViewCollection.c"
} else {
#line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
value->data[0].v_pointer = NULL;
-#line 7925 "ViewCollection.c"
+#line 7718 "ViewCollection.c"
}
#line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return NULL;
-#line 7929 "ViewCollection.c"
+#line 7722 "ViewCollection.c"
}
-static gchar* view_collection_value_monitor_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+static gchar*
+view_collection_value_monitor_lcopy_value (const GValue* value,
+ guint n_collect_values,
+ GTypeCValue* collect_values,
+ guint collect_flags)
+{
ViewCollectionMonitor ** object_p;
object_p = collect_values[0].v_pointer;
#line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (!object_p) {
#line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 7940 "ViewCollection.c"
+#line 7738 "ViewCollection.c"
}
#line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (!value->data[0].v_pointer) {
#line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
*object_p = NULL;
-#line 7946 "ViewCollection.c"
+#line 7744 "ViewCollection.c"
} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
#line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
*object_p = value->data[0].v_pointer;
-#line 7950 "ViewCollection.c"
+#line 7748 "ViewCollection.c"
} else {
#line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
*object_p = view_collection_monitor_ref (value->data[0].v_pointer);
-#line 7954 "ViewCollection.c"
+#line 7752 "ViewCollection.c"
}
#line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return NULL;
-#line 7958 "ViewCollection.c"
+#line 7756 "ViewCollection.c"
}
-GParamSpec* view_collection_param_spec_monitor (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
+GParamSpec*
+view_collection_param_spec_monitor (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags)
+{
ViewCollectionParamSpecMonitor* spec;
#line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_val_if_fail (g_type_is_a (object_type, VIEW_COLLECTION_TYPE_MONITOR), NULL);
@@ -7969,20 +7773,25 @@ GParamSpec* view_collection_param_spec_monitor (const gchar* name, const gchar*
G_PARAM_SPEC (spec)->value_type = object_type;
#line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return G_PARAM_SPEC (spec);
-#line 7972 "ViewCollection.c"
+#line 7776 "ViewCollection.c"
}
-gpointer view_collection_value_get_monitor (const GValue* value) {
+gpointer
+view_collection_value_get_monitor (const GValue* value)
+{
#line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, VIEW_COLLECTION_TYPE_MONITOR), NULL);
#line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return value->data[0].v_pointer;
-#line 7981 "ViewCollection.c"
+#line 7787 "ViewCollection.c"
}
-void view_collection_value_set_monitor (GValue* value, gpointer v_object) {
+void
+view_collection_value_set_monitor (GValue* value,
+ gpointer v_object)
+{
ViewCollectionMonitor * old;
#line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, VIEW_COLLECTION_TYPE_MONITOR));
@@ -7998,22 +7807,25 @@ void view_collection_value_set_monitor (GValue* value, gpointer v_object) {
value->data[0].v_pointer = v_object;
#line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
view_collection_monitor_ref (value->data[0].v_pointer);
-#line 8001 "ViewCollection.c"
+#line 7810 "ViewCollection.c"
} else {
#line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
value->data[0].v_pointer = NULL;
-#line 8005 "ViewCollection.c"
+#line 7814 "ViewCollection.c"
}
#line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (old) {
#line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
view_collection_monitor_unref (old);
-#line 8011 "ViewCollection.c"
+#line 7820 "ViewCollection.c"
}
}
-void view_collection_value_take_monitor (GValue* value, gpointer v_object) {
+void
+view_collection_value_take_monitor (GValue* value,
+ gpointer v_object)
+{
ViewCollectionMonitor * old;
#line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, VIEW_COLLECTION_TYPE_MONITOR));
@@ -8027,48 +7839,56 @@ void view_collection_value_take_monitor (GValue* value, gpointer v_object) {
g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
#line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
value->data[0].v_pointer = v_object;
-#line 8030 "ViewCollection.c"
+#line 7842 "ViewCollection.c"
} else {
#line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
value->data[0].v_pointer = NULL;
-#line 8034 "ViewCollection.c"
+#line 7846 "ViewCollection.c"
}
#line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (old) {
#line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
view_collection_monitor_unref (old);
-#line 8040 "ViewCollection.c"
+#line 7852 "ViewCollection.c"
}
}
-static void view_collection_monitor_class_init (ViewCollectionMonitorClass * klass) {
+static void
+view_collection_monitor_class_init (ViewCollectionMonitorClass * klass)
+{
#line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
view_collection_monitor_parent_class = g_type_class_peek_parent (klass);
#line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
((ViewCollectionMonitorClass *) klass)->finalize = view_collection_monitor_finalize;
-#line 8050 "ViewCollection.c"
+#line 7864 "ViewCollection.c"
}
-static void view_collection_monitor_instance_init (ViewCollectionMonitor * self) {
+static void
+view_collection_monitor_instance_init (ViewCollectionMonitor * self)
+{
#line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
self->ref_count = 1;
-#line 8057 "ViewCollection.c"
+#line 7873 "ViewCollection.c"
}
-static void view_collection_monitor_finalize (ViewCollectionMonitor * obj) {
+static void
+view_collection_monitor_finalize (ViewCollectionMonitor * obj)
+{
ViewCollectionMonitor * self;
#line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, VIEW_COLLECTION_TYPE_MONITOR, ViewCollectionMonitor);
#line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_signal_handlers_destroy (self);
-#line 8067 "ViewCollection.c"
+#line 7885 "ViewCollection.c"
}
-GType view_collection_monitor_get_type (void) {
+GType
+view_collection_monitor_get_type (void)
+{
static volatile gsize view_collection_monitor_type_id__volatile = 0;
if (g_once_init_enter (&view_collection_monitor_type_id__volatile)) {
static const GTypeValueTable g_define_type_value_table = { view_collection_value_monitor_init, view_collection_value_monitor_free_value, view_collection_value_monitor_copy_value, view_collection_value_monitor_peek_pointer, "p", view_collection_value_monitor_collect_value, "p", view_collection_value_monitor_lcopy_value };
@@ -8082,18 +7902,22 @@ GType view_collection_monitor_get_type (void) {
}
-gpointer view_collection_monitor_ref (gpointer instance) {
+gpointer
+view_collection_monitor_ref (gpointer instance)
+{
ViewCollectionMonitor * self;
self = instance;
#line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_atomic_int_inc (&self->ref_count);
#line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return instance;
-#line 8092 "ViewCollection.c"
+#line 7914 "ViewCollection.c"
}
-void view_collection_monitor_unref (gpointer instance) {
+void
+view_collection_monitor_unref (gpointer instance)
+{
ViewCollectionMonitor * self;
self = instance;
#line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -8102,62 +7926,74 @@ void view_collection_monitor_unref (gpointer instance) {
VIEW_COLLECTION_MONITOR_GET_CLASS (self)->finalize (self);
#line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_type_free_instance ((GTypeInstance *) self);
-#line 8105 "ViewCollection.c"
+#line 7929 "ViewCollection.c"
}
}
-static void _view_collection_on_sources_added_data_collection_items_added (DataCollection* _sender, GeeIterable* added, gpointer self) {
+static void
+_view_collection_on_sources_added_data_collection_items_added (DataCollection* _sender,
+ GeeIterable* added,
+ gpointer self)
+{
#line 44 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
view_collection_on_sources_added ((ViewCollection*) self, _sender, added);
-#line 8113 "ViewCollection.c"
+#line 7941 "ViewCollection.c"
}
-static void _view_collection_on_sources_removed_data_collection_items_removed (DataCollection* _sender, GeeIterable* removed, gpointer self) {
+static void
+_view_collection_on_sources_removed_data_collection_items_removed (DataCollection* _sender,
+ GeeIterable* removed,
+ gpointer self)
+{
#line 45 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
view_collection_on_sources_removed ((ViewCollection*) self, removed);
-#line 8120 "ViewCollection.c"
+#line 7952 "ViewCollection.c"
}
-static void _view_collection_on_sources_altered_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self) {
+static void
+_view_collection_on_sources_altered_data_collection_items_altered (DataCollection* _sender,
+ GeeMap* items,
+ gpointer self)
+{
#line 46 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
view_collection_on_sources_altered ((ViewCollection*) self, _sender, items);
-#line 8127 "ViewCollection.c"
+#line 7963 "ViewCollection.c"
}
-static gpointer _view_manager_ref0 (gpointer self) {
+static gpointer
+_view_manager_ref0 (gpointer self)
+{
#line 35 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return self ? view_manager_ref (self) : NULL;
-#line 8134 "ViewCollection.c"
+#line 7972 "ViewCollection.c"
}
-static gpointer _alteration_ref0 (gpointer self) {
+static gpointer
+_alteration_ref0 (gpointer self)
+{
#line 36 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return self ? alteration_ref (self) : NULL;
-#line 8141 "ViewCollection.c"
+#line 7981 "ViewCollection.c"
}
-static ViewCollectionMonitorImpl* view_collection_monitor_impl_construct (GType object_type, ViewCollection* owner, SourceCollection* sources, ViewManager* manager, Alteration* prereq) {
+static ViewCollectionMonitorImpl*
+view_collection_monitor_impl_construct (GType object_type,
+ ViewCollection* owner,
+ SourceCollection* sources,
+ ViewManager* manager,
+ Alteration* prereq)
+{
ViewCollectionMonitorImpl* self = NULL;
ViewCollection* _tmp0_;
- ViewCollection* _tmp1_;
- SourceCollection* _tmp2_;
- SourceCollection* _tmp3_;
- ViewManager* _tmp4_;
- ViewManager* _tmp5_;
- Alteration* _tmp6_;
- Alteration* _tmp7_;
- SourceCollection* _tmp8_;
- ViewCollection* _tmp9_;
- SourceCollection* _tmp10_;
- ViewCollection* _tmp11_;
- SourceCollection* _tmp12_;
- ViewCollection* _tmp13_;
+ SourceCollection* _tmp1_;
+ ViewManager* _tmp2_;
+ Alteration* _tmp3_;
#line 31 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_val_if_fail (IS_VIEW_COLLECTION (owner), NULL);
#line 31 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -8169,82 +8005,73 @@ static ViewCollectionMonitorImpl* view_collection_monitor_impl_construct (GType
#line 31 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
self = (ViewCollectionMonitorImpl*) view_collection_monitor_construct (object_type);
#line 33 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp0_ = owner;
-#line 33 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp1_ = _data_collection_ref0 (_tmp0_);
+ _tmp0_ = _data_collection_ref0 (owner);
#line 33 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_data_collection_unref0 (self->owner);
#line 33 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- self->owner = _tmp1_;
-#line 34 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp2_ = sources;
+ self->owner = _tmp0_;
#line 34 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp3_ = _data_collection_ref0 (_tmp2_);
+ _tmp1_ = _data_collection_ref0 (sources);
#line 34 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_data_collection_unref0 (self->sources);
#line 34 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- self->sources = _tmp3_;
+ self->sources = _tmp1_;
#line 35 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp4_ = manager;
-#line 35 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp5_ = _view_manager_ref0 (_tmp4_);
+ _tmp2_ = _view_manager_ref0 (manager);
#line 35 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_view_manager_unref0 (self->manager);
#line 35 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- self->manager = _tmp5_;
-#line 36 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp6_ = prereq;
+ self->manager = _tmp2_;
#line 36 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp7_ = _alteration_ref0 (_tmp6_);
+ _tmp3_ = _alteration_ref0 (prereq);
#line 36 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_alteration_unref0 (self->prereq);
#line 36 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- self->prereq = _tmp7_;
+ self->prereq = _tmp3_;
#line 38 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp8_ = sources;
-#line 38 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp9_ = owner;
-#line 38 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_COLLECTION, DataCollection), "items-added", (GCallback) _view_collection_on_sources_added_data_collection_items_added, _tmp9_);
-#line 39 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp10_ = sources;
+ g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (sources, TYPE_DATA_COLLECTION, DataCollection), "items-added", (GCallback) _view_collection_on_sources_added_data_collection_items_added, owner);
#line 39 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp11_ = owner;
-#line 39 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_DATA_COLLECTION, DataCollection), "items-removed", (GCallback) _view_collection_on_sources_removed_data_collection_items_removed, _tmp11_);
-#line 40 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp12_ = sources;
+ g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (sources, TYPE_DATA_COLLECTION, DataCollection), "items-removed", (GCallback) _view_collection_on_sources_removed_data_collection_items_removed, owner);
#line 40 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp13_ = owner;
-#line 40 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_DATA_COLLECTION, DataCollection), "items-altered", (GCallback) _view_collection_on_sources_altered_data_collection_items_altered, _tmp13_);
+ g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (sources, TYPE_DATA_COLLECTION, DataCollection), "items-altered", (GCallback) _view_collection_on_sources_altered_data_collection_items_altered, owner);
#line 31 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return self;
-#line 8223 "ViewCollection.c"
+#line 8039 "ViewCollection.c"
}
-static ViewCollectionMonitorImpl* view_collection_monitor_impl_new (ViewCollection* owner, SourceCollection* sources, ViewManager* manager, Alteration* prereq) {
+static ViewCollectionMonitorImpl*
+view_collection_monitor_impl_new (ViewCollection* owner,
+ SourceCollection* sources,
+ ViewManager* manager,
+ Alteration* prereq)
+{
#line 31 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return view_collection_monitor_impl_construct (VIEW_COLLECTION_TYPE_MONITOR_IMPL, owner, sources, manager, prereq);
-#line 8230 "ViewCollection.c"
+#line 8051 "ViewCollection.c"
}
-static void view_collection_monitor_impl_class_init (ViewCollectionMonitorImplClass * klass) {
+static void
+view_collection_monitor_impl_class_init (ViewCollectionMonitorImplClass * klass)
+{
#line 25 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
view_collection_monitor_impl_parent_class = g_type_class_peek_parent (klass);
#line 25 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
((ViewCollectionMonitorClass *) klass)->finalize = view_collection_monitor_impl_finalize;
-#line 8239 "ViewCollection.c"
+#line 8062 "ViewCollection.c"
}
-static void view_collection_monitor_impl_instance_init (ViewCollectionMonitorImpl * self) {
+static void
+view_collection_monitor_impl_instance_init (ViewCollectionMonitorImpl * self)
+{
}
-static void view_collection_monitor_impl_finalize (ViewCollectionMonitor * obj) {
+static void
+view_collection_monitor_impl_finalize (ViewCollectionMonitor * obj)
+{
ViewCollectionMonitorImpl * self;
SourceCollection* _tmp0_;
ViewCollection* _tmp1_;
@@ -8291,11 +8118,13 @@ static void view_collection_monitor_impl_finalize (ViewCollectionMonitor * obj)
_alteration_unref0 (self->prereq);
#line 25 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
VIEW_COLLECTION_MONITOR_CLASS (view_collection_monitor_impl_parent_class)->finalize (obj);
-#line 8294 "ViewCollection.c"
+#line 8121 "ViewCollection.c"
}
-static GType view_collection_monitor_impl_get_type (void) {
+static GType
+view_collection_monitor_impl_get_type (void)
+{
static volatile gsize view_collection_monitor_impl_type_id__volatile = 0;
if (g_once_init_enter (&view_collection_monitor_impl_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (ViewCollectionMonitorImplClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) view_collection_monitor_impl_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (ViewCollectionMonitorImpl), 0, (GInstanceInitFunc) view_collection_monitor_impl_instance_init, NULL };
@@ -8307,33 +8136,41 @@ static GType view_collection_monitor_impl_get_type (void) {
}
-static ViewCollectionToggleLists* view_collection_toggle_lists_construct (GType object_type) {
+static ViewCollectionToggleLists*
+view_collection_toggle_lists_construct (GType object_type)
+{
ViewCollectionToggleLists * self = NULL;
#line 50 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
self = (ViewCollectionToggleLists*) g_object_new (object_type, NULL);
#line 50 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return self;
-#line 8316 "ViewCollection.c"
+#line 8147 "ViewCollection.c"
}
-static ViewCollectionToggleLists* view_collection_toggle_lists_new (void) {
+static ViewCollectionToggleLists*
+view_collection_toggle_lists_new (void)
+{
#line 50 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return view_collection_toggle_lists_construct (VIEW_COLLECTION_TYPE_TOGGLE_LISTS);
-#line 8323 "ViewCollection.c"
+#line 8156 "ViewCollection.c"
}
-static void view_collection_toggle_lists_class_init (ViewCollectionToggleListsClass * klass) {
+static void
+view_collection_toggle_lists_class_init (ViewCollectionToggleListsClass * klass)
+{
#line 50 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
view_collection_toggle_lists_parent_class = g_type_class_peek_parent (klass);
#line 50 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
G_OBJECT_CLASS (klass)->finalize = view_collection_toggle_lists_finalize;
-#line 8332 "ViewCollection.c"
+#line 8167 "ViewCollection.c"
}
-static void view_collection_toggle_lists_instance_init (ViewCollectionToggleLists * self) {
+static void
+view_collection_toggle_lists_instance_init (ViewCollectionToggleLists * self)
+{
GeeArrayList* _tmp0_;
GeeArrayList* _tmp1_;
#line 51 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -8344,11 +8181,13 @@ static void view_collection_toggle_lists_instance_init (ViewCollectionToggleList
_tmp1_ = gee_array_list_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
#line 52 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
self->unselected = _tmp1_;
-#line 8347 "ViewCollection.c"
+#line 8184 "ViewCollection.c"
}
-static void view_collection_toggle_lists_finalize (GObject * obj) {
+static void
+view_collection_toggle_lists_finalize (GObject * obj)
+{
ViewCollectionToggleLists * self;
#line 50 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, VIEW_COLLECTION_TYPE_TOGGLE_LISTS, ViewCollectionToggleLists);
@@ -8358,11 +8197,13 @@ static void view_collection_toggle_lists_finalize (GObject * obj) {
_g_object_unref0 (self->unselected);
#line 50 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
G_OBJECT_CLASS (view_collection_toggle_lists_parent_class)->finalize (obj);
-#line 8361 "ViewCollection.c"
+#line 8200 "ViewCollection.c"
}
-static GType view_collection_toggle_lists_get_type (void) {
+static GType
+view_collection_toggle_lists_get_type (void)
+{
static volatile gsize view_collection_toggle_lists_type_id__volatile = 0;
if (g_once_init_enter (&view_collection_toggle_lists_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (ViewCollectionToggleListsClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) view_collection_toggle_lists_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (ViewCollectionToggleLists), 0, (GInstanceInitFunc) view_collection_toggle_lists_instance_init, NULL };
@@ -8374,7 +8215,9 @@ static GType view_collection_toggle_lists_get_type (void) {
}
-static void view_collection_class_init (ViewCollectionClass * klass) {
+static void
+view_collection_class_init (ViewCollectionClass * klass)
+{
#line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
view_collection_parent_class = g_type_class_peek_parent (klass);
#line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -8497,11 +8340,13 @@ static void view_collection_class_init (ViewCollectionClass * klass) {
view_collection_signals[VIEW_COLLECTION_VIEW_FILTER_INSTALLED_SIGNAL] = g_signal_new ("view-filter-installed", TYPE_VIEW_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ViewCollectionClass, view_filter_installed), NULL, NULL, g_cclosure_user_marshal_VOID__VIEW_FILTER, G_TYPE_NONE, 1, TYPE_VIEW_FILTER);
#line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
view_collection_signals[VIEW_COLLECTION_VIEW_FILTER_REMOVED_SIGNAL] = g_signal_new ("view-filter-removed", TYPE_VIEW_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ViewCollectionClass, view_filter_removed), NULL, NULL, g_cclosure_user_marshal_VOID__VIEW_FILTER, G_TYPE_NONE, 1, TYPE_VIEW_FILTER);
-#line 8500 "ViewCollection.c"
+#line 8343 "ViewCollection.c"
}
-static void view_collection_instance_init (ViewCollection * self) {
+static void
+view_collection_instance_init (ViewCollection * self)
+{
GeeHashMultiMap* _tmp0_;
GeeHashSet* _tmp1_;
DataSet* _tmp2_;
@@ -8540,11 +8385,13 @@ static void view_collection_instance_init (ViewCollection * self) {
_tmp3_ = gee_hash_map_new (TYPE_DATA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
#line 72 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
self->priv->source_map = _tmp3_;
-#line 8543 "ViewCollection.c"
+#line 8388 "ViewCollection.c"
}
-static void view_collection_finalize (DataCollection * obj) {
+static void
+view_collection_finalize (DataCollection * obj)
+{
ViewCollection * self;
#line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_VIEW_COLLECTION, ViewCollection);
@@ -8566,11 +8413,13 @@ static void view_collection_finalize (DataCollection * obj) {
_g_object_unref0 (self->priv->source_map);
#line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
DATA_COLLECTION_CLASS (view_collection_parent_class)->finalize (obj);
-#line 8569 "ViewCollection.c"
+#line 8416 "ViewCollection.c"
}
-GType view_collection_get_type (void) {
+GType
+view_collection_get_type (void)
+{
static volatile gsize view_collection_type_id__volatile = 0;
if (g_once_init_enter (&view_collection_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (ViewCollectionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) view_collection_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (ViewCollection), 0, (GInstanceInitFunc) view_collection_instance_init, NULL };
@@ -8582,7 +8431,10 @@ GType view_collection_get_type (void) {
}
-static gboolean view_manager_real_include_in_view (ViewManager* self, DataSource* source) {
+static gboolean
+view_manager_real_include_in_view (ViewManager* self,
+ DataSource* source)
+{
gboolean result = FALSE;
#line 1258 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_val_if_fail (IS_DATA_SOURCE (source), FALSE);
@@ -8590,145 +8442,181 @@ static gboolean view_manager_real_include_in_view (ViewManager* self, DataSource
result = TRUE;
#line 1259 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return result;
-#line 8593 "ViewCollection.c"
+#line 8445 "ViewCollection.c"
}
-gboolean view_manager_include_in_view (ViewManager* self, DataSource* source) {
+gboolean
+view_manager_include_in_view (ViewManager* self,
+ DataSource* source)
+{
#line 1258 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_val_if_fail (IS_VIEW_MANAGER (self), FALSE);
#line 1258 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return VIEW_MANAGER_GET_CLASS (self)->include_in_view (self, source);
-#line 8602 "ViewCollection.c"
+#line 8457 "ViewCollection.c"
}
-static DataView* view_manager_real_create_view (ViewManager* self, DataSource* source) {
+static DataView*
+view_manager_real_create_view (ViewManager* self,
+ DataSource* source)
+{
#line 1264 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_critical ("Type `%s' does not implement abstract method `view_manager_create_view'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
#line 1264 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return NULL;
-#line 8611 "ViewCollection.c"
+#line 8469 "ViewCollection.c"
}
-DataView* view_manager_create_view (ViewManager* self, DataSource* source) {
+DataView*
+view_manager_create_view (ViewManager* self,
+ DataSource* source)
+{
#line 1264 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_val_if_fail (IS_VIEW_MANAGER (self), NULL);
#line 1264 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return VIEW_MANAGER_GET_CLASS (self)->create_view (self, source);
-#line 8620 "ViewCollection.c"
+#line 8481 "ViewCollection.c"
}
-ViewManager* view_manager_construct (GType object_type) {
+ViewManager*
+view_manager_construct (GType object_type)
+{
ViewManager* self = NULL;
#line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
self = (ViewManager*) g_type_create_instance (object_type);
#line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return self;
-#line 8630 "ViewCollection.c"
+#line 8493 "ViewCollection.c"
}
-static void value_view_manager_init (GValue* value) {
+static void
+value_view_manager_init (GValue* value)
+{
#line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
value->data[0].v_pointer = NULL;
-#line 8637 "ViewCollection.c"
+#line 8502 "ViewCollection.c"
}
-static void value_view_manager_free_value (GValue* value) {
+static void
+value_view_manager_free_value (GValue* value)
+{
#line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (value->data[0].v_pointer) {
#line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
view_manager_unref (value->data[0].v_pointer);
-#line 8646 "ViewCollection.c"
+#line 8513 "ViewCollection.c"
}
}
-static void value_view_manager_copy_value (const GValue* src_value, GValue* dest_value) {
+static void
+value_view_manager_copy_value (const GValue* src_value,
+ GValue* dest_value)
+{
#line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (src_value->data[0].v_pointer) {
#line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
dest_value->data[0].v_pointer = view_manager_ref (src_value->data[0].v_pointer);
-#line 8656 "ViewCollection.c"
+#line 8526 "ViewCollection.c"
} else {
#line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
dest_value->data[0].v_pointer = NULL;
-#line 8660 "ViewCollection.c"
+#line 8530 "ViewCollection.c"
}
}
-static gpointer value_view_manager_peek_pointer (const GValue* value) {
+static gpointer
+value_view_manager_peek_pointer (const GValue* value)
+{
#line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return value->data[0].v_pointer;
-#line 8668 "ViewCollection.c"
+#line 8540 "ViewCollection.c"
}
-static gchar* value_view_manager_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+static gchar*
+value_view_manager_collect_value (GValue* value,
+ guint n_collect_values,
+ GTypeCValue* collect_values,
+ guint collect_flags)
+{
#line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (collect_values[0].v_pointer) {
-#line 8675 "ViewCollection.c"
+#line 8552 "ViewCollection.c"
ViewManager * object;
object = collect_values[0].v_pointer;
#line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (object->parent_instance.g_class == NULL) {
#line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 8682 "ViewCollection.c"
+#line 8559 "ViewCollection.c"
} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
#line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 8686 "ViewCollection.c"
+#line 8563 "ViewCollection.c"
}
#line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
value->data[0].v_pointer = view_manager_ref (object);
-#line 8690 "ViewCollection.c"
+#line 8567 "ViewCollection.c"
} else {
#line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
value->data[0].v_pointer = NULL;
-#line 8694 "ViewCollection.c"
+#line 8571 "ViewCollection.c"
}
#line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return NULL;
-#line 8698 "ViewCollection.c"
+#line 8575 "ViewCollection.c"
}
-static gchar* value_view_manager_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+static gchar*
+value_view_manager_lcopy_value (const GValue* value,
+ guint n_collect_values,
+ GTypeCValue* collect_values,
+ guint collect_flags)
+{
ViewManager ** object_p;
object_p = collect_values[0].v_pointer;
#line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (!object_p) {
#line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 8709 "ViewCollection.c"
+#line 8591 "ViewCollection.c"
}
#line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (!value->data[0].v_pointer) {
#line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
*object_p = NULL;
-#line 8715 "ViewCollection.c"
+#line 8597 "ViewCollection.c"
} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
#line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
*object_p = value->data[0].v_pointer;
-#line 8719 "ViewCollection.c"
+#line 8601 "ViewCollection.c"
} else {
#line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
*object_p = view_manager_ref (value->data[0].v_pointer);
-#line 8723 "ViewCollection.c"
+#line 8605 "ViewCollection.c"
}
#line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return NULL;
-#line 8727 "ViewCollection.c"
+#line 8609 "ViewCollection.c"
}
-GParamSpec* param_spec_view_manager (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
+GParamSpec*
+param_spec_view_manager (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags)
+{
ParamSpecViewManager* spec;
#line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_val_if_fail (g_type_is_a (object_type, TYPE_VIEW_MANAGER), NULL);
@@ -8738,20 +8626,25 @@ GParamSpec* param_spec_view_manager (const gchar* name, const gchar* nick, const
G_PARAM_SPEC (spec)->value_type = object_type;
#line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return G_PARAM_SPEC (spec);
-#line 8741 "ViewCollection.c"
+#line 8629 "ViewCollection.c"
}
-gpointer value_get_view_manager (const GValue* value) {
+gpointer
+value_get_view_manager (const GValue* value)
+{
#line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_VIEW_MANAGER), NULL);
#line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return value->data[0].v_pointer;
-#line 8750 "ViewCollection.c"
+#line 8640 "ViewCollection.c"
}
-void value_set_view_manager (GValue* value, gpointer v_object) {
+void
+value_set_view_manager (GValue* value,
+ gpointer v_object)
+{
ViewManager * old;
#line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_VIEW_MANAGER));
@@ -8767,22 +8660,25 @@ void value_set_view_manager (GValue* value, gpointer v_object) {
value->data[0].v_pointer = v_object;
#line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
view_manager_ref (value->data[0].v_pointer);
-#line 8770 "ViewCollection.c"
+#line 8663 "ViewCollection.c"
} else {
#line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
value->data[0].v_pointer = NULL;
-#line 8774 "ViewCollection.c"
+#line 8667 "ViewCollection.c"
}
#line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (old) {
#line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
view_manager_unref (old);
-#line 8780 "ViewCollection.c"
+#line 8673 "ViewCollection.c"
}
}
-void value_take_view_manager (GValue* value, gpointer v_object) {
+void
+value_take_view_manager (GValue* value,
+ gpointer v_object)
+{
ViewManager * old;
#line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_VIEW_MANAGER));
@@ -8796,22 +8692,24 @@ void value_take_view_manager (GValue* value, gpointer v_object) {
g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
#line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
value->data[0].v_pointer = v_object;
-#line 8799 "ViewCollection.c"
+#line 8695 "ViewCollection.c"
} else {
#line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
value->data[0].v_pointer = NULL;
-#line 8803 "ViewCollection.c"
+#line 8699 "ViewCollection.c"
}
#line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (old) {
#line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
view_manager_unref (old);
-#line 8809 "ViewCollection.c"
+#line 8705 "ViewCollection.c"
}
}
-static void view_manager_class_init (ViewManagerClass * klass) {
+static void
+view_manager_class_init (ViewManagerClass * klass)
+{
#line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
view_manager_parent_class = g_type_class_peek_parent (klass);
#line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -8820,28 +8718,34 @@ static void view_manager_class_init (ViewManagerClass * klass) {
((ViewManagerClass *) klass)->include_in_view = (gboolean (*) (ViewManager *, DataSource*)) view_manager_real_include_in_view;
#line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
((ViewManagerClass *) klass)->create_view = (DataView* (*) (ViewManager *, DataSource*)) view_manager_real_create_view;
-#line 8823 "ViewCollection.c"
+#line 8721 "ViewCollection.c"
}
-static void view_manager_instance_init (ViewManager * self) {
+static void
+view_manager_instance_init (ViewManager * self)
+{
#line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
self->ref_count = 1;
-#line 8830 "ViewCollection.c"
+#line 8730 "ViewCollection.c"
}
-static void view_manager_finalize (ViewManager * obj) {
+static void
+view_manager_finalize (ViewManager * obj)
+{
ViewManager * self;
#line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_VIEW_MANAGER, ViewManager);
#line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_signal_handlers_destroy (self);
-#line 8840 "ViewCollection.c"
+#line 8742 "ViewCollection.c"
}
-GType view_manager_get_type (void) {
+GType
+view_manager_get_type (void)
+{
static volatile gsize view_manager_type_id__volatile = 0;
if (g_once_init_enter (&view_manager_type_id__volatile)) {
static const GTypeValueTable g_define_type_value_table = { value_view_manager_init, value_view_manager_free_value, value_view_manager_copy_value, value_view_manager_peek_pointer, "p", value_view_manager_collect_value, "p", value_view_manager_lcopy_value };
@@ -8855,18 +8759,22 @@ GType view_manager_get_type (void) {
}
-gpointer view_manager_ref (gpointer instance) {
+gpointer
+view_manager_ref (gpointer instance)
+{
ViewManager * self;
self = instance;
#line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_atomic_int_inc (&self->ref_count);
#line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return instance;
-#line 8865 "ViewCollection.c"
+#line 8771 "ViewCollection.c"
}
-void view_manager_unref (gpointer instance) {
+void
+view_manager_unref (gpointer instance)
+{
ViewManager * self;
self = instance;
#line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -8875,142 +8783,177 @@ void view_manager_unref (gpointer instance) {
VIEW_MANAGER_GET_CLASS (self)->finalize (self);
#line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_type_free_instance ((GTypeInstance *) self);
-#line 8878 "ViewCollection.c"
+#line 8786 "ViewCollection.c"
}
}
-static gboolean view_filter_real_predicate (ViewFilter* self, DataView* view) {
+static gboolean
+view_filter_real_predicate (ViewFilter* self,
+ DataView* view)
+{
gboolean _tmp0_ = FALSE;
#line 1286 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_critical ("Type `%s' does not implement abstract method `view_filter_predicate'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
#line 1286 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return _tmp0_;
-#line 8889 "ViewCollection.c"
+#line 8800 "ViewCollection.c"
}
-gboolean view_filter_predicate (ViewFilter* self, DataView* view) {
+gboolean
+view_filter_predicate (ViewFilter* self,
+ DataView* view)
+{
#line 1286 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_val_if_fail (IS_VIEW_FILTER (self), FALSE);
#line 1286 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return VIEW_FILTER_GET_CLASS (self)->predicate (self, view);
-#line 8898 "ViewCollection.c"
+#line 8812 "ViewCollection.c"
}
-ViewFilter* view_filter_construct (GType object_type) {
+ViewFilter*
+view_filter_construct (GType object_type)
+{
ViewFilter* self = NULL;
#line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
self = (ViewFilter*) g_type_create_instance (object_type);
#line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return self;
-#line 8908 "ViewCollection.c"
+#line 8824 "ViewCollection.c"
}
-static void view_filter_real_refresh (ViewFilter* self) {
+static void
+view_filter_real_refresh (ViewFilter* self)
+{
}
-static void value_view_filter_init (GValue* value) {
+static void
+value_view_filter_init (GValue* value)
+{
#line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
value->data[0].v_pointer = NULL;
-#line 8919 "ViewCollection.c"
+#line 8839 "ViewCollection.c"
}
-static void value_view_filter_free_value (GValue* value) {
+static void
+value_view_filter_free_value (GValue* value)
+{
#line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (value->data[0].v_pointer) {
#line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
view_filter_unref (value->data[0].v_pointer);
-#line 8928 "ViewCollection.c"
+#line 8850 "ViewCollection.c"
}
}
-static void value_view_filter_copy_value (const GValue* src_value, GValue* dest_value) {
+static void
+value_view_filter_copy_value (const GValue* src_value,
+ GValue* dest_value)
+{
#line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (src_value->data[0].v_pointer) {
#line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
dest_value->data[0].v_pointer = view_filter_ref (src_value->data[0].v_pointer);
-#line 8938 "ViewCollection.c"
+#line 8863 "ViewCollection.c"
} else {
#line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
dest_value->data[0].v_pointer = NULL;
-#line 8942 "ViewCollection.c"
+#line 8867 "ViewCollection.c"
}
}
-static gpointer value_view_filter_peek_pointer (const GValue* value) {
+static gpointer
+value_view_filter_peek_pointer (const GValue* value)
+{
#line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return value->data[0].v_pointer;
-#line 8950 "ViewCollection.c"
+#line 8877 "ViewCollection.c"
}
-static gchar* value_view_filter_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+static gchar*
+value_view_filter_collect_value (GValue* value,
+ guint n_collect_values,
+ GTypeCValue* collect_values,
+ guint collect_flags)
+{
#line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (collect_values[0].v_pointer) {
-#line 8957 "ViewCollection.c"
+#line 8889 "ViewCollection.c"
ViewFilter * object;
object = collect_values[0].v_pointer;
#line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (object->parent_instance.g_class == NULL) {
#line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 8964 "ViewCollection.c"
+#line 8896 "ViewCollection.c"
} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
#line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 8968 "ViewCollection.c"
+#line 8900 "ViewCollection.c"
}
#line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
value->data[0].v_pointer = view_filter_ref (object);
-#line 8972 "ViewCollection.c"
+#line 8904 "ViewCollection.c"
} else {
#line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
value->data[0].v_pointer = NULL;
-#line 8976 "ViewCollection.c"
+#line 8908 "ViewCollection.c"
}
#line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return NULL;
-#line 8980 "ViewCollection.c"
+#line 8912 "ViewCollection.c"
}
-static gchar* value_view_filter_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+static gchar*
+value_view_filter_lcopy_value (const GValue* value,
+ guint n_collect_values,
+ GTypeCValue* collect_values,
+ guint collect_flags)
+{
ViewFilter ** object_p;
object_p = collect_values[0].v_pointer;
#line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (!object_p) {
#line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 8991 "ViewCollection.c"
+#line 8928 "ViewCollection.c"
}
#line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (!value->data[0].v_pointer) {
#line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
*object_p = NULL;
-#line 8997 "ViewCollection.c"
+#line 8934 "ViewCollection.c"
} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
#line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
*object_p = value->data[0].v_pointer;
-#line 9001 "ViewCollection.c"
+#line 8938 "ViewCollection.c"
} else {
#line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
*object_p = view_filter_ref (value->data[0].v_pointer);
-#line 9005 "ViewCollection.c"
+#line 8942 "ViewCollection.c"
}
#line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return NULL;
-#line 9009 "ViewCollection.c"
+#line 8946 "ViewCollection.c"
}
-GParamSpec* param_spec_view_filter (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
+GParamSpec*
+param_spec_view_filter (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags)
+{
ParamSpecViewFilter* spec;
#line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_val_if_fail (g_type_is_a (object_type, TYPE_VIEW_FILTER), NULL);
@@ -9020,20 +8963,25 @@ GParamSpec* param_spec_view_filter (const gchar* name, const gchar* nick, const
G_PARAM_SPEC (spec)->value_type = object_type;
#line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return G_PARAM_SPEC (spec);
-#line 9023 "ViewCollection.c"
+#line 8966 "ViewCollection.c"
}
-gpointer value_get_view_filter (const GValue* value) {
+gpointer
+value_get_view_filter (const GValue* value)
+{
#line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_VIEW_FILTER), NULL);
#line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return value->data[0].v_pointer;
-#line 9032 "ViewCollection.c"
+#line 8977 "ViewCollection.c"
}
-void value_set_view_filter (GValue* value, gpointer v_object) {
+void
+value_set_view_filter (GValue* value,
+ gpointer v_object)
+{
ViewFilter * old;
#line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_VIEW_FILTER));
@@ -9049,22 +8997,25 @@ void value_set_view_filter (GValue* value, gpointer v_object) {
value->data[0].v_pointer = v_object;
#line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
view_filter_ref (value->data[0].v_pointer);
-#line 9052 "ViewCollection.c"
+#line 9000 "ViewCollection.c"
} else {
#line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
value->data[0].v_pointer = NULL;
-#line 9056 "ViewCollection.c"
+#line 9004 "ViewCollection.c"
}
#line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (old) {
#line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
view_filter_unref (old);
-#line 9062 "ViewCollection.c"
+#line 9010 "ViewCollection.c"
}
}
-void value_take_view_filter (GValue* value, gpointer v_object) {
+void
+value_take_view_filter (GValue* value,
+ gpointer v_object)
+{
ViewFilter * old;
#line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_VIEW_FILTER));
@@ -9078,22 +9029,24 @@ void value_take_view_filter (GValue* value, gpointer v_object) {
g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
#line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
value->data[0].v_pointer = v_object;
-#line 9081 "ViewCollection.c"
+#line 9032 "ViewCollection.c"
} else {
#line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
value->data[0].v_pointer = NULL;
-#line 9085 "ViewCollection.c"
+#line 9036 "ViewCollection.c"
}
#line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (old) {
#line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
view_filter_unref (old);
-#line 9091 "ViewCollection.c"
+#line 9042 "ViewCollection.c"
}
}
-static void view_filter_class_init (ViewFilterClass * klass) {
+static void
+view_filter_class_init (ViewFilterClass * klass)
+{
#line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
view_filter_parent_class = g_type_class_peek_parent (klass);
#line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -9104,28 +9057,34 @@ static void view_filter_class_init (ViewFilterClass * klass) {
((ViewFilterClass *) klass)->refresh = view_filter_real_refresh;
#line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
view_filter_signals[VIEW_FILTER_REFRESH_SIGNAL] = g_signal_new ("refresh", TYPE_VIEW_FILTER, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ViewFilterClass, refresh), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 9107 "ViewCollection.c"
+#line 9060 "ViewCollection.c"
}
-static void view_filter_instance_init (ViewFilter * self) {
+static void
+view_filter_instance_init (ViewFilter * self)
+{
#line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
self->ref_count = 1;
-#line 9114 "ViewCollection.c"
+#line 9069 "ViewCollection.c"
}
-static void view_filter_finalize (ViewFilter * obj) {
+static void
+view_filter_finalize (ViewFilter * obj)
+{
ViewFilter * self;
#line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_VIEW_FILTER, ViewFilter);
#line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_signal_handlers_destroy (self);
-#line 9124 "ViewCollection.c"
+#line 9081 "ViewCollection.c"
}
-GType view_filter_get_type (void) {
+GType
+view_filter_get_type (void)
+{
static volatile gsize view_filter_type_id__volatile = 0;
if (g_once_init_enter (&view_filter_type_id__volatile)) {
static const GTypeValueTable g_define_type_value_table = { value_view_filter_init, value_view_filter_free_value, value_view_filter_copy_value, value_view_filter_peek_pointer, "p", value_view_filter_collect_value, "p", value_view_filter_lcopy_value };
@@ -9139,18 +9098,22 @@ GType view_filter_get_type (void) {
}
-gpointer view_filter_ref (gpointer instance) {
+gpointer
+view_filter_ref (gpointer instance)
+{
ViewFilter * self;
self = instance;
#line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_atomic_int_inc (&self->ref_count);
#line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return instance;
-#line 9149 "ViewCollection.c"
+#line 9110 "ViewCollection.c"
}
-void view_filter_unref (gpointer instance) {
+void
+view_filter_unref (gpointer instance)
+{
ViewFilter * self;
self = instance;
#line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -9159,7 +9122,7 @@ void view_filter_unref (gpointer instance) {
VIEW_FILTER_GET_CLASS (self)->finalize (self);
#line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_type_free_instance ((GTypeInstance *) self);
-#line 9162 "ViewCollection.c"
+#line 9125 "ViewCollection.c"
}
}