summaryrefslogtreecommitdiff
path: root/src/core/ViewCollection.c
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2017-11-12 15:53:58 +0100
committerJörg Frings-Fürst <debian@jff-webhosting.net>2017-11-12 15:53:58 +0100
commit2492891f112caac6076ce49721d9d5d78a152c3a (patch)
tree36dd11a60bd963e6bd44e2e312b6e4b57d1849ea /src/core/ViewCollection.c
parent3c829c50a8f705402bdc759946d49ae7caebd003 (diff)
New upstream version 0.26.4upstream/0.26.4
Diffstat (limited to 'src/core/ViewCollection.c')
-rw-r--r--src/core/ViewCollection.c3634
1 files changed, 1830 insertions, 1804 deletions
diff --git a/src/core/ViewCollection.c b/src/core/ViewCollection.c
index 505093d..f1dc3ad 100644
--- a/src/core/ViewCollection.c
+++ b/src/core/ViewCollection.c
@@ -1,4 +1,4 @@
-/* ViewCollection.c generated by valac 0.34.7, the Vala compiler
+/* ViewCollection.c generated by valac 0.36.6, the Vala compiler
* generated from ViewCollection.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -202,10 +202,32 @@ typedef struct _ViewCollectionToggleListsClass ViewCollectionToggleListsClass;
typedef struct _ViewCollectionToggleListsPrivate ViewCollectionToggleListsPrivate;
typedef struct _ViewCollectionParamSpecMonitor ViewCollectionParamSpecMonitor;
#define _view_manager_unref0(var) ((var == NULL) ? NULL : (var = (view_manager_unref (var), NULL)))
+enum {
+ VIEW_COLLECTION_ITEMS_SELECTED_SIGNAL,
+ VIEW_COLLECTION_ITEMS_UNSELECTED_SIGNAL,
+ VIEW_COLLECTION_ITEMS_STATE_CHANGED_SIGNAL,
+ VIEW_COLLECTION_SELECTION_GROUP_ALTERED_SIGNAL,
+ VIEW_COLLECTION_ITEMS_SHOWN_SIGNAL,
+ VIEW_COLLECTION_ITEMS_HIDDEN_SIGNAL,
+ VIEW_COLLECTION_ITEMS_VISIBILITY_CHANGED_SIGNAL,
+ VIEW_COLLECTION_ITEM_VIEW_ALTERED_SIGNAL,
+ VIEW_COLLECTION_ITEM_GEOMETRY_ALTERED_SIGNAL,
+ VIEW_COLLECTION_VIEWS_ALTERED_SIGNAL,
+ VIEW_COLLECTION_GEOMETRIES_ALTERED_SIGNAL,
+ VIEW_COLLECTION_VIEW_FILTER_INSTALLED_SIGNAL,
+ VIEW_COLLECTION_VIEW_FILTER_REMOVED_SIGNAL,
+ VIEW_COLLECTION_LAST_SIGNAL
+};
+static guint view_collection_signals[VIEW_COLLECTION_LAST_SIGNAL] = {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
+};
+static guint view_filter_signals[VIEW_FILTER_LAST_SIGNAL] = {0};
#define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg);
#define _vala_return_if_fail(expr, msg) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return; }
#define _vala_return_val_if_fail(expr, msg, val) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return val; }
@@ -602,7 +624,7 @@ 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);
+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);
@@ -667,38 +689,38 @@ enum {
};
ViewCollectionMonitor* view_collection_monitor_new (void);
ViewCollectionMonitor* view_collection_monitor_construct (GType object_type);
-static void view_collection_monitor_finalize (ViewCollectionMonitor* obj);
+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_monitor_impl_finalize (ViewCollectionMonitor* obj);
+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);
+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);
ViewManager* view_manager_construct (GType object_type);
-static void view_manager_finalize (ViewManager* obj);
+static void view_manager_finalize (ViewManager * obj);
enum {
VIEW_FILTER_DUMMY_PROPERTY
};
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);
+static void view_filter_finalize (ViewFilter * obj);
ViewCollection* view_collection_construct (GType object_type, const gchar* name) {
ViewCollection* self = NULL;
- const gchar* _tmp0_ = 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"
@@ -707,37 +729,37 @@ ViewCollection* view_collection_construct (GType object_type, const gchar* name)
self = (ViewCollection*) data_collection_construct (object_type, _tmp0_);
#line 125 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return self;
-#line 711 "ViewCollection.c"
+#line 733 "ViewCollection.c"
}
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 718 "ViewCollection.c"
+#line 740 "ViewCollection.c"
}
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 725 "ViewCollection.c"
+#line 747 "ViewCollection.c"
}
static void view_collection_real_notify_items_selected_unselected (ViewCollection* self, GeeCollection* selected, GeeCollection* unselected) {
gboolean _tmp0_ = FALSE;
- GeeCollection* _tmp1_ = NULL;
+ GeeCollection* _tmp1_;
gboolean has_selected = FALSE;
gboolean _tmp5_ = FALSE;
- GeeCollection* _tmp6_ = NULL;
+ GeeCollection* _tmp6_;
gboolean has_unselected = FALSE;
- gboolean _tmp10_ = FALSE;
- gboolean _tmp12_ = FALSE;
+ gboolean _tmp10_;
+ gboolean _tmp12_;
GeeCollection* sum = NULL;
gboolean _tmp14_ = FALSE;
- gboolean _tmp15_ = FALSE;
- GeeCollection* _tmp32_ = NULL;
+ gboolean _tmp15_;
+ GeeCollection* _tmp32_;
#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"
@@ -746,10 +768,10 @@ static void view_collection_real_notify_items_selected_unselected (ViewCollectio
_tmp1_ = selected;
#line 131 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (_tmp1_ != NULL) {
-#line 750 "ViewCollection.c"
- GeeCollection* _tmp2_ = NULL;
- gint _tmp3_ = 0;
- gint _tmp4_ = 0;
+#line 772 "ViewCollection.c"
+ GeeCollection* _tmp2_;
+ gint _tmp3_;
+ gint _tmp4_;
#line 131 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp2_ = selected;
#line 131 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -758,11 +780,11 @@ static void view_collection_real_notify_items_selected_unselected (ViewCollectio
_tmp4_ = _tmp3_;
#line 131 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp0_ = _tmp4_ > 0;
-#line 762 "ViewCollection.c"
+#line 784 "ViewCollection.c"
} else {
#line 131 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp0_ = FALSE;
-#line 766 "ViewCollection.c"
+#line 788 "ViewCollection.c"
}
#line 131 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
has_selected = _tmp0_;
@@ -770,10 +792,10 @@ static void view_collection_real_notify_items_selected_unselected (ViewCollectio
_tmp6_ = unselected;
#line 132 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (_tmp6_ != NULL) {
-#line 774 "ViewCollection.c"
- GeeCollection* _tmp7_ = NULL;
- gint _tmp8_ = 0;
- gint _tmp9_ = 0;
+#line 796 "ViewCollection.c"
+ GeeCollection* _tmp7_;
+ gint _tmp8_;
+ gint _tmp9_;
#line 132 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp7_ = unselected;
#line 132 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -782,11 +804,11 @@ static void view_collection_real_notify_items_selected_unselected (ViewCollectio
_tmp9_ = _tmp8_;
#line 132 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp5_ = _tmp9_ > 0;
-#line 786 "ViewCollection.c"
+#line 808 "ViewCollection.c"
} else {
#line 132 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp5_ = FALSE;
-#line 790 "ViewCollection.c"
+#line 812 "ViewCollection.c"
}
#line 132 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
has_unselected = _tmp5_;
@@ -794,47 +816,47 @@ static void view_collection_real_notify_items_selected_unselected (ViewCollectio
_tmp10_ = has_selected;
#line 134 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (_tmp10_) {
-#line 798 "ViewCollection.c"
- GeeCollection* _tmp11_ = NULL;
+#line 820 "ViewCollection.c"
+ GeeCollection* _tmp11_;
#line 135 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp11_ = selected;
#line 135 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- g_signal_emit_by_name (self, "items-selected", G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 804 "ViewCollection.c"
+ 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"
}
#line 137 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp12_ = has_unselected;
#line 137 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (_tmp12_) {
-#line 810 "ViewCollection.c"
- GeeCollection* _tmp13_ = NULL;
+#line 832 "ViewCollection.c"
+ GeeCollection* _tmp13_;
#line 138 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp13_ = unselected;
#line 138 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- g_signal_emit_by_name (self, "items-unselected", G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 816 "ViewCollection.c"
+ 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"
}
#line 141 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp15_ = has_selected;
#line 141 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (_tmp15_) {
-#line 822 "ViewCollection.c"
- gboolean _tmp16_ = FALSE;
+#line 844 "ViewCollection.c"
+ gboolean _tmp16_;
#line 141 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp16_ = has_unselected;
#line 141 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp14_ = !_tmp16_;
-#line 828 "ViewCollection.c"
+#line 850 "ViewCollection.c"
} else {
#line 141 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp14_ = FALSE;
-#line 832 "ViewCollection.c"
+#line 854 "ViewCollection.c"
}
#line 141 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (_tmp14_) {
-#line 836 "ViewCollection.c"
- GeeCollection* _tmp17_ = NULL;
- GeeCollection* _tmp18_ = NULL;
+#line 858 "ViewCollection.c"
+ GeeCollection* _tmp17_;
+ GeeCollection* _tmp18_;
#line 142 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp17_ = selected;
#line 142 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -843,31 +865,31 @@ static void view_collection_real_notify_items_selected_unselected (ViewCollectio
_g_object_unref0 (sum);
#line 142 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
sum = _tmp18_;
-#line 847 "ViewCollection.c"
+#line 869 "ViewCollection.c"
} else {
gboolean _tmp19_ = FALSE;
- gboolean _tmp20_ = FALSE;
+ gboolean _tmp20_;
#line 143 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp20_ = has_selected;
#line 143 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (!_tmp20_) {
-#line 855 "ViewCollection.c"
- gboolean _tmp21_ = FALSE;
+#line 877 "ViewCollection.c"
+ gboolean _tmp21_;
#line 143 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp21_ = has_unselected;
#line 143 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp19_ = _tmp21_;
-#line 861 "ViewCollection.c"
+#line 883 "ViewCollection.c"
} else {
#line 143 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp19_ = FALSE;
-#line 865 "ViewCollection.c"
+#line 887 "ViewCollection.c"
}
#line 143 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (_tmp19_) {
-#line 869 "ViewCollection.c"
- GeeCollection* _tmp22_ = NULL;
- GeeCollection* _tmp23_ = NULL;
+#line 891 "ViewCollection.c"
+ GeeCollection* _tmp22_;
+ GeeCollection* _tmp23_;
#line 144 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp22_ = unselected;
#line 144 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -876,25 +898,25 @@ static void view_collection_real_notify_items_selected_unselected (ViewCollectio
_g_object_unref0 (sum);
#line 144 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
sum = _tmp23_;
-#line 880 "ViewCollection.c"
+#line 902 "ViewCollection.c"
} else {
gboolean _tmp24_ = FALSE;
- gboolean _tmp25_ = FALSE;
+ gboolean _tmp25_;
#line 145 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp25_ = has_selected;
#line 145 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (!_tmp25_) {
-#line 888 "ViewCollection.c"
- gboolean _tmp26_ = FALSE;
+#line 910 "ViewCollection.c"
+ gboolean _tmp26_;
#line 145 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp26_ = has_unselected;
#line 145 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp24_ = !_tmp26_;
-#line 894 "ViewCollection.c"
+#line 916 "ViewCollection.c"
} else {
#line 145 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp24_ = FALSE;
-#line 898 "ViewCollection.c"
+#line 920 "ViewCollection.c"
}
#line 145 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (_tmp24_) {
@@ -902,13 +924,13 @@ static void view_collection_real_notify_items_selected_unselected (ViewCollectio
_g_object_unref0 (sum);
#line 146 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
sum = NULL;
-#line 906 "ViewCollection.c"
+#line 928 "ViewCollection.c"
} else {
- GeeHashSet* _tmp27_ = NULL;
- GeeCollection* _tmp28_ = NULL;
- GeeCollection* _tmp29_ = NULL;
- GeeCollection* _tmp30_ = NULL;
- GeeCollection* _tmp31_ = NULL;
+ GeeHashSet* _tmp27_;
+ GeeCollection* _tmp28_;
+ GeeCollection* _tmp29_;
+ GeeCollection* _tmp30_;
+ GeeCollection* _tmp31_;
#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);
#line 148 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -927,7 +949,7 @@ static void view_collection_real_notify_items_selected_unselected (ViewCollectio
_tmp31_ = unselected;
#line 150 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
gee_collection_add_all (_tmp30_, _tmp31_);
-#line 931 "ViewCollection.c"
+#line 953 "ViewCollection.c"
}
}
}
@@ -935,19 +957,19 @@ static void view_collection_real_notify_items_selected_unselected (ViewCollectio
_tmp32_ = sum;
#line 153 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (_tmp32_ != NULL) {
-#line 939 "ViewCollection.c"
- GeeCollection* _tmp33_ = NULL;
+#line 961 "ViewCollection.c"
+ GeeCollection* _tmp33_;
#line 154 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp33_ = sum;
#line 154 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- g_signal_emit_by_name (self, "items-state-changed", 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 (_tmp33_, GEE_TYPE_ITERABLE, GeeIterable));
#line 155 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
view_collection_notify_selection_group_altered (self);
-#line 947 "ViewCollection.c"
+#line 969 "ViewCollection.c"
}
#line 129 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (sum);
-#line 951 "ViewCollection.c"
+#line 973 "ViewCollection.c"
}
@@ -956,14 +978,14 @@ void view_collection_notify_items_selected_unselected (ViewCollection* self, Gee
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 960 "ViewCollection.c"
+#line 982 "ViewCollection.c"
}
static void view_collection_real_notify_selection_group_altered (ViewCollection* self) {
#line 160 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- g_signal_emit_by_name (self, "selection-group-altered");
-#line 967 "ViewCollection.c"
+ g_signal_emit (self, view_collection_signals[VIEW_COLLECTION_SELECTION_GROUP_ALTERED_SIGNAL], 0);
+#line 989 "ViewCollection.c"
}
@@ -972,19 +994,19 @@ void view_collection_notify_selection_group_altered (ViewCollection* self) {
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 976 "ViewCollection.c"
+#line 998 "ViewCollection.c"
}
static void view_collection_real_notify_item_view_altered (ViewCollection* self, DataView* view) {
- DataView* _tmp0_ = NULL;
+ DataView* _tmp0_;
#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_by_name (self, "item-view-altered", _tmp0_);
-#line 988 "ViewCollection.c"
+ g_signal_emit (self, view_collection_signals[VIEW_COLLECTION_ITEM_VIEW_ALTERED_SIGNAL], 0, _tmp0_);
+#line 1010 "ViewCollection.c"
}
@@ -993,19 +1015,19 @@ void view_collection_notify_item_view_altered (ViewCollection* self, DataView* v
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 997 "ViewCollection.c"
+#line 1019 "ViewCollection.c"
}
static void view_collection_real_notify_views_altered (ViewCollection* self, GeeCollection* views) {
- GeeCollection* _tmp0_ = NULL;
+ GeeCollection* _tmp0_;
#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_by_name (self, "views-altered", _tmp0_);
-#line 1009 "ViewCollection.c"
+ g_signal_emit (self, view_collection_signals[VIEW_COLLECTION_VIEWS_ALTERED_SIGNAL], 0, _tmp0_);
+#line 1031 "ViewCollection.c"
}
@@ -1014,19 +1036,19 @@ void view_collection_notify_views_altered (ViewCollection* self, GeeCollection*
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 1018 "ViewCollection.c"
+#line 1040 "ViewCollection.c"
}
static void view_collection_real_notify_item_geometry_altered (ViewCollection* self, DataView* view) {
- DataView* _tmp0_ = NULL;
+ DataView* _tmp0_;
#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_by_name (self, "item-geometry-altered", _tmp0_);
-#line 1030 "ViewCollection.c"
+ g_signal_emit (self, view_collection_signals[VIEW_COLLECTION_ITEM_GEOMETRY_ALTERED_SIGNAL], 0, _tmp0_);
+#line 1052 "ViewCollection.c"
}
@@ -1035,19 +1057,19 @@ void view_collection_notify_item_geometry_altered (ViewCollection* self, DataVie
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 1039 "ViewCollection.c"
+#line 1061 "ViewCollection.c"
}
static void view_collection_real_notify_geometries_altered (ViewCollection* self, GeeCollection* views) {
- GeeCollection* _tmp0_ = NULL;
+ GeeCollection* _tmp0_;
#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_by_name (self, "geometries-altered", _tmp0_);
-#line 1051 "ViewCollection.c"
+ g_signal_emit (self, view_collection_signals[VIEW_COLLECTION_GEOMETRIES_ALTERED_SIGNAL], 0, _tmp0_);
+#line 1073 "ViewCollection.c"
}
@@ -1056,19 +1078,19 @@ void view_collection_notify_geometries_altered (ViewCollection* self, GeeCollect
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 1060 "ViewCollection.c"
+#line 1082 "ViewCollection.c"
}
static void view_collection_real_notify_items_shown (ViewCollection* self, GeeCollection* shown) {
- GeeCollection* _tmp0_ = NULL;
+ GeeCollection* _tmp0_;
#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_by_name (self, "items-shown", _tmp0_);
-#line 1072 "ViewCollection.c"
+ g_signal_emit (self, view_collection_signals[VIEW_COLLECTION_ITEMS_SHOWN_SIGNAL], 0, _tmp0_);
+#line 1094 "ViewCollection.c"
}
@@ -1077,19 +1099,19 @@ void view_collection_notify_items_shown (ViewCollection* self, GeeCollection* sh
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 1081 "ViewCollection.c"
+#line 1103 "ViewCollection.c"
}
static void view_collection_real_notify_items_hidden (ViewCollection* self, GeeCollection* hidden) {
- GeeCollection* _tmp0_ = NULL;
+ GeeCollection* _tmp0_;
#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_by_name (self, "items-hidden", _tmp0_);
-#line 1093 "ViewCollection.c"
+ g_signal_emit (self, view_collection_signals[VIEW_COLLECTION_ITEMS_HIDDEN_SIGNAL], 0, _tmp0_);
+#line 1115 "ViewCollection.c"
}
@@ -1098,19 +1120,19 @@ void view_collection_notify_items_hidden (ViewCollection* self, GeeCollection* h
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 1102 "ViewCollection.c"
+#line 1124 "ViewCollection.c"
}
static void view_collection_real_notify_items_visibility_changed (ViewCollection* self, GeeCollection* changed) {
- GeeCollection* _tmp0_ = NULL;
+ GeeCollection* _tmp0_;
#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_by_name (self, "items-visibility-changed", _tmp0_);
-#line 1114 "ViewCollection.c"
+ g_signal_emit (self, view_collection_signals[VIEW_COLLECTION_ITEMS_VISIBILITY_CHANGED_SIGNAL], 0, _tmp0_);
+#line 1136 "ViewCollection.c"
}
@@ -1119,19 +1141,19 @@ void view_collection_notify_items_visibility_changed (ViewCollection* self, GeeC
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 1123 "ViewCollection.c"
+#line 1145 "ViewCollection.c"
}
static void view_collection_real_notify_view_filter_installed (ViewCollection* self, ViewFilter* filter) {
- ViewFilter* _tmp0_ = NULL;
+ ViewFilter* _tmp0_;
#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_by_name (self, "view-filter-installed", _tmp0_);
-#line 1135 "ViewCollection.c"
+ g_signal_emit (self, view_collection_signals[VIEW_COLLECTION_VIEW_FILTER_INSTALLED_SIGNAL], 0, _tmp0_);
+#line 1157 "ViewCollection.c"
}
@@ -1140,19 +1162,19 @@ void view_collection_notify_view_filter_installed (ViewCollection* self, ViewFil
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 1144 "ViewCollection.c"
+#line 1166 "ViewCollection.c"
}
static void view_collection_real_notify_view_filter_removed (ViewCollection* self, ViewFilter* filter) {
- ViewFilter* _tmp0_ = NULL;
+ ViewFilter* _tmp0_;
#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_by_name (self, "view-filter-removed", _tmp0_);
-#line 1156 "ViewCollection.c"
+ g_signal_emit (self, view_collection_signals[VIEW_COLLECTION_VIEW_FILTER_REMOVED_SIGNAL], 0, _tmp0_);
+#line 1178 "ViewCollection.c"
}
@@ -1161,16 +1183,16 @@ void view_collection_notify_view_filter_removed (ViewCollection* self, ViewFilte
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 1165 "ViewCollection.c"
+#line 1187 "ViewCollection.c"
}
static void view_collection_real_clear (DataCollection* base) {
ViewCollection * self;
gboolean _tmp0_ = FALSE;
- GeeHashMultiMap* _tmp1_ = NULL;
- gint _tmp2_ = 0;
- gint _tmp3_ = 0;
+ GeeHashMultiMap* _tmp1_;
+ gint _tmp2_;
+ gint _tmp3_;
#line 199 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIEW_COLLECTION, ViewCollection);
#line 202 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -1183,20 +1205,20 @@ static void view_collection_real_clear (DataCollection* base) {
if (_tmp3_ > 0) {
#line 202 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp0_ = TRUE;
-#line 1187 "ViewCollection.c"
+#line 1209 "ViewCollection.c"
} else {
- ViewCollection* _tmp4_ = NULL;
+ 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 1194 "ViewCollection.c"
+#line 1216 "ViewCollection.c"
}
#line 202 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (_tmp0_) {
-#line 1198 "ViewCollection.c"
- gchar* _tmp5_ = NULL;
- gchar* _tmp6_ = NULL;
+#line 1220 "ViewCollection.c"
+ gchar* _tmp5_;
+ gchar* _tmp6_;
#line 203 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp5_ = data_collection_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection));
#line 203 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -1208,35 +1230,35 @@ static void view_collection_real_clear (DataCollection* base) {
_g_free0 (_tmp6_);
#line 205 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return;
-#line 1211 "ViewCollection.c"
+#line 1233 "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 1215 "ViewCollection.c"
+#line 1237 "ViewCollection.c"
}
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 1222 "ViewCollection.c"
+#line 1244 "ViewCollection.c"
}
static void view_collection_real_close (DataCollection* base) {
ViewCollection * self;
- GeeSet* _tmp8_ = NULL;
+ GeeSet* _tmp8_;
#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 1235 "ViewCollection.c"
+#line 1257 "ViewCollection.c"
{
GeeIterator* _f_it = NULL;
- GeeSet* _tmp0_ = NULL;
- GeeIterator* _tmp1_ = NULL;
+ GeeSet* _tmp0_;
+ GeeIterator* _tmp1_;
#line 214 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp0_ = self->priv->filters;
#line 214 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -1245,14 +1267,14 @@ static void view_collection_real_close (DataCollection* base) {
_f_it = _tmp1_;
#line 214 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
while (TRUE) {
-#line 1248 "ViewCollection.c"
- GeeIterator* _tmp2_ = NULL;
- gboolean _tmp3_ = FALSE;
+#line 1270 "ViewCollection.c"
+ GeeIterator* _tmp2_;
+ gboolean _tmp3_;
ViewFilter* f = NULL;
- GeeIterator* _tmp4_ = NULL;
- gpointer _tmp5_ = NULL;
- ViewFilter* _tmp6_ = NULL;
- guint _tmp7_ = 0U;
+ GeeIterator* _tmp4_;
+ gpointer _tmp5_;
+ ViewFilter* _tmp6_;
+ guint _tmp7_;
#line 214 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp2_ = _f_it;
#line 214 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -1261,7 +1283,7 @@ static void view_collection_real_close (DataCollection* base) {
if (!_tmp3_) {
#line 214 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
break;
-#line 1264 "ViewCollection.c"
+#line 1286 "ViewCollection.c"
}
#line 214 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp4_ = _f_it;
@@ -1277,11 +1299,11 @@ static void view_collection_real_close (DataCollection* base) {
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);
#line 214 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_view_filter_unref0 (f);
-#line 1280 "ViewCollection.c"
+#line 1302 "ViewCollection.c"
}
#line 214 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (_f_it);
-#line 1284 "ViewCollection.c"
+#line 1306 "ViewCollection.c"
}
#line 216 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp8_ = self->priv->filters;
@@ -1289,22 +1311,22 @@ static void view_collection_real_close (DataCollection* base) {
gee_collection_clear (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, 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 1292 "ViewCollection.c"
+#line 1314 "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* result = NULL;
ViewCollectionMonitorImpl* monitor = NULL;
- SourceCollection* _tmp0_ = NULL;
- ViewManager* _tmp1_ = NULL;
- Alteration* _tmp2_ = NULL;
- ViewCollectionMonitorImpl* _tmp3_ = NULL;
- GeeHashMultiMap* _tmp4_ = NULL;
- SourceCollection* _tmp5_ = NULL;
- ViewCollectionMonitorImpl* _tmp6_ = NULL;
+ SourceCollection* _tmp0_;
+ ViewManager* _tmp1_;
+ Alteration* _tmp2_;
+ ViewCollectionMonitorImpl* _tmp3_;
+ GeeHashMultiMap* _tmp4_;
+ SourceCollection* _tmp5_;
+ ViewCollectionMonitorImpl* _tmp6_;
gboolean _tmp7_ = FALSE;
- GeeCollection* _tmp8_ = NULL;
+ GeeCollection* _tmp8_;
#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"
@@ -1341,10 +1363,10 @@ ViewCollectionMonitor* view_collection_monitor_source_collection (ViewCollection
_tmp8_ = initial;
#line 233 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (_tmp8_ != NULL) {
-#line 1344 "ViewCollection.c"
- GeeCollection* _tmp9_ = NULL;
- gint _tmp10_ = 0;
- gint _tmp11_ = 0;
+#line 1366 "ViewCollection.c"
+ GeeCollection* _tmp9_;
+ gint _tmp10_;
+ gint _tmp11_;
#line 233 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp9_ = initial;
#line 233 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -1353,31 +1375,31 @@ ViewCollectionMonitor* view_collection_monitor_source_collection (ViewCollection
_tmp11_ = _tmp10_;
#line 233 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp7_ = _tmp11_ > 0;
-#line 1356 "ViewCollection.c"
+#line 1378 "ViewCollection.c"
} else {
#line 233 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp7_ = FALSE;
-#line 1360 "ViewCollection.c"
+#line 1382 "ViewCollection.c"
}
#line 233 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (_tmp7_) {
-#line 1364 "ViewCollection.c"
+#line 1386 "ViewCollection.c"
GeeArrayList* created_views = NULL;
- GeeArrayList* _tmp12_ = NULL;
- GeeArrayList* _tmp24_ = NULL;
- ProgressMonitor _tmp25_ = NULL;
- void* _tmp25__target = NULL;
- GeeCollection* _tmp26_ = NULL;
- GeeCollection* _tmp27_ = NULL;
+ GeeArrayList* _tmp12_;
+ GeeArrayList* _tmp24_;
+ ProgressMonitor _tmp25_;
+ void* _tmp25__target;
+ GeeCollection* _tmp26_;
+ GeeCollection* _tmp27_;
#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);
#line 235 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
created_views = _tmp12_;
-#line 1376 "ViewCollection.c"
+#line 1398 "ViewCollection.c"
{
GeeIterator* _source_it = NULL;
- GeeCollection* _tmp13_ = NULL;
- GeeIterator* _tmp14_ = NULL;
+ GeeCollection* _tmp13_;
+ GeeIterator* _tmp14_;
#line 236 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp13_ = initial;
#line 236 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -1386,17 +1408,17 @@ ViewCollectionMonitor* view_collection_monitor_source_collection (ViewCollection
_source_it = _tmp14_;
#line 236 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
while (TRUE) {
-#line 1389 "ViewCollection.c"
- GeeIterator* _tmp15_ = NULL;
- gboolean _tmp16_ = FALSE;
+#line 1411 "ViewCollection.c"
+ GeeIterator* _tmp15_;
+ gboolean _tmp16_;
DataSource* source = NULL;
- GeeIterator* _tmp17_ = NULL;
- gpointer _tmp18_ = NULL;
- GeeArrayList* _tmp19_ = NULL;
- ViewManager* _tmp20_ = NULL;
- DataSource* _tmp21_ = NULL;
- DataView* _tmp22_ = NULL;
- DataView* _tmp23_ = 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;
#line 236 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -1405,7 +1427,7 @@ ViewCollectionMonitor* view_collection_monitor_source_collection (ViewCollection
if (!_tmp16_) {
#line 236 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
break;
-#line 1408 "ViewCollection.c"
+#line 1430 "ViewCollection.c"
}
#line 236 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp17_ = _source_it;
@@ -1429,11 +1451,11 @@ ViewCollectionMonitor* view_collection_monitor_source_collection (ViewCollection
_g_object_unref0 (_tmp23_);
#line 236 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (source);
-#line 1432 "ViewCollection.c"
+#line 1454 "ViewCollection.c"
}
#line 236 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (_source_it);
-#line 1436 "ViewCollection.c"
+#line 1458 "ViewCollection.c"
}
#line 239 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp24_ = created_views;
@@ -1449,14 +1471,14 @@ ViewCollectionMonitor* view_collection_monitor_source_collection (ViewCollection
_g_object_unref0 (_tmp27_);
#line 233 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (created_views);
-#line 1452 "ViewCollection.c"
+#line 1474 "ViewCollection.c"
} else {
- SourceCollection* _tmp28_ = NULL;
- SourceCollection* _tmp29_ = NULL;
- GeeCollection* _tmp30_ = NULL;
- GeeIterable* _tmp31_ = NULL;
- ProgressMonitor _tmp32_ = NULL;
- void* _tmp32__target = NULL;
+ 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"
@@ -1473,7 +1495,7 @@ ViewCollectionMonitor* view_collection_monitor_source_collection (ViewCollection
view_collection_add_sources (self, _tmp28_, _tmp31_, _tmp32_, _tmp32__target);
#line 242 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (_tmp31_);
-#line 1476 "ViewCollection.c"
+#line 1498 "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));
@@ -1481,25 +1503,25 @@ 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 1484 "ViewCollection.c"
+#line 1506 "ViewCollection.c"
}
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 1491 "ViewCollection.c"
+#line 1513 "ViewCollection.c"
}
void view_collection_halt_monitoring (ViewCollection* self, ViewCollectionMonitor* m) {
ViewCollectionMonitorImpl* monitor = NULL;
- ViewCollectionMonitor* _tmp0_ = NULL;
- ViewCollectionMonitorImpl* _tmp1_ = NULL;
+ ViewCollectionMonitor* _tmp0_;
+ ViewCollectionMonitorImpl* _tmp1_;
gboolean removed = FALSE;
- GeeHashMultiMap* _tmp2_ = NULL;
- SourceCollection* _tmp3_ = NULL;
- gboolean _tmp4_ = FALSE;
+ GeeHashMultiMap* _tmp2_;
+ SourceCollection* _tmp3_;
+ gboolean _tmp4_;
#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"
@@ -1522,61 +1544,61 @@ void view_collection_halt_monitoring (ViewCollection* self, ViewCollectionMonito
_vala_assert (removed, "removed");
#line 250 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_view_collection_monitor_unref0 (monitor);
-#line 1525 "ViewCollection.c"
+#line 1547 "ViewCollection.c"
}
void view_collection_halt_all_monitoring (ViewCollection* self) {
- GeeHashMultiMap* _tmp0_ = NULL;
+ GeeHashMultiMap* _tmp0_;
#line 257 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_if_fail (IS_VIEW_COLLECTION (self));
#line 258 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_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 1537 "ViewCollection.c"
+#line 1559 "ViewCollection.c"
}
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 1544 "ViewCollection.c"
+#line 1566 "ViewCollection.c"
}
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 1551 "ViewCollection.c"
+#line 1573 "ViewCollection.c"
}
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 1558 "ViewCollection.c"
+#line 1580 "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) {
- ViewCollection* _tmp0_ = NULL;
- ViewCollection* _tmp1_ = NULL;
- CreateView _tmp2_ = NULL;
- void* _tmp2__target = NULL;
- CreateViewPredicate _tmp3_ = NULL;
- void* _tmp3__target = NULL;
- ViewCollection* _tmp4_ = NULL;
- void* _tmp5_ = NULL;
- Comparator _tmp6_ = NULL;
- ViewCollection* _tmp7_ = NULL;
- void* _tmp8_ = NULL;
- ComparatorPredicate _tmp9_ = NULL;
- ViewCollection* _tmp10_ = NULL;
- GeeCollection* _tmp11_ = NULL;
- GeeCollection* _tmp12_ = NULL;
- ViewCollection* _tmp13_ = NULL;
- ViewCollection* _tmp14_ = NULL;
+ 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_;
#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"
@@ -1639,23 +1661,23 @@ void view_collection_mirror (ViewCollection* self, ViewCollection* to_mirror, Cr
_tmp14_ = 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 1642 "ViewCollection.c"
+#line 1664 "ViewCollection.c"
}
void view_collection_halt_mirroring (ViewCollection* self) {
- ViewCollection* _tmp0_ = NULL;
+ ViewCollection* _tmp0_;
#line 279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_if_fail (IS_VIEW_COLLECTION (self));
#line 280 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp0_ = self->priv->mirroring;
#line 280 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (_tmp0_ != NULL) {
-#line 1654 "ViewCollection.c"
- ViewCollection* _tmp1_ = NULL;
- guint _tmp2_ = 0U;
- ViewCollection* _tmp3_ = NULL;
- guint _tmp4_ = 0U;
+#line 1676 "ViewCollection.c"
+ ViewCollection* _tmp1_;
+ guint _tmp2_;
+ ViewCollection* _tmp3_;
+ guint _tmp4_;
#line 281 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp1_ = self->priv->mirroring;
#line 281 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -1668,22 +1690,22 @@ 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 1671 "ViewCollection.c"
+#line 1693 "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 1677 "ViewCollection.c"
+#line 1699 "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) {
GeeArrayList* copy_view = NULL;
- GeeArrayList* _tmp0_ = NULL;
- GeeArrayList* _tmp25_ = NULL;
- GeeCollection* _tmp26_ = NULL;
- GeeCollection* _tmp27_ = NULL;
+ GeeArrayList* _tmp0_;
+ GeeArrayList* _tmp25_;
+ GeeCollection* _tmp26_;
+ GeeCollection* _tmp27_;
#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"
@@ -1692,14 +1714,14 @@ 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 1695 "ViewCollection.c"
+#line 1717 "ViewCollection.c"
{
GeeIterator* _object_it = NULL;
- ViewCollection* _tmp1_ = NULL;
- GeeCollection* _tmp2_ = NULL;
- GeeCollection* _tmp3_ = NULL;
- GeeIterator* _tmp4_ = NULL;
- GeeIterator* _tmp5_ = NULL;
+ ViewCollection* _tmp1_;
+ GeeCollection* _tmp2_;
+ GeeCollection* _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"
@@ -1716,22 +1738,22 @@ void view_collection_copy_into (ViewCollection* self, ViewCollection* to_copy, C
_object_it = _tmp5_;
#line 292 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
while (TRUE) {
-#line 1719 "ViewCollection.c"
- GeeIterator* _tmp6_ = NULL;
- gboolean _tmp7_ = FALSE;
+#line 1741 "ViewCollection.c"
+ GeeIterator* _tmp6_;
+ gboolean _tmp7_;
DataObject* object = NULL;
- GeeIterator* _tmp8_ = NULL;
- gpointer _tmp9_ = NULL;
+ GeeIterator* _tmp8_;
+ gpointer _tmp9_;
DataView* view = NULL;
- DataObject* _tmp10_ = NULL;
- DataView* _tmp11_ = NULL;
- CreateViewPredicate _tmp12_ = NULL;
- void* _tmp12__target = NULL;
- DataView* _tmp13_ = NULL;
- DataSource* _tmp14_ = NULL;
- DataSource* _tmp15_ = NULL;
- gboolean _tmp16_ = FALSE;
- gboolean _tmp17_ = FALSE;
+ 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;
#line 292 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -1740,7 +1762,7 @@ void view_collection_copy_into (ViewCollection* self, ViewCollection* to_copy, C
if (!_tmp7_) {
#line 292 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
break;
-#line 1743 "ViewCollection.c"
+#line 1765 "ViewCollection.c"
}
#line 292 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp8_ = _object_it;
@@ -1772,15 +1794,15 @@ void view_collection_copy_into (ViewCollection* self, ViewCollection* to_copy, C
_g_object_unref0 (_tmp15_);
#line 294 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (_tmp17_) {
-#line 1775 "ViewCollection.c"
- GeeArrayList* _tmp18_ = NULL;
- CreateView _tmp19_ = NULL;
- void* _tmp19__target = NULL;
- DataView* _tmp20_ = NULL;
- DataSource* _tmp21_ = NULL;
- DataSource* _tmp22_ = NULL;
- DataView* _tmp23_ = NULL;
- DataView* _tmp24_ = NULL;
+#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"
@@ -1803,17 +1825,17 @@ void view_collection_copy_into (ViewCollection* self, ViewCollection* to_copy, C
_g_object_unref0 (_tmp24_);
#line 295 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (_tmp22_);
-#line 1806 "ViewCollection.c"
+#line 1828 "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 1812 "ViewCollection.c"
+#line 1834 "ViewCollection.c"
}
#line 292 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (_object_it);
-#line 1816 "ViewCollection.c"
+#line 1838 "ViewCollection.c"
}
#line 298 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp25_ = copy_view;
@@ -1825,15 +1847,15 @@ void view_collection_copy_into (ViewCollection* self, ViewCollection* to_copy, C
_g_object_unref0 (_tmp27_);
#line 288 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (copy_view);
-#line 1828 "ViewCollection.c"
+#line 1850 "ViewCollection.c"
}
gboolean view_collection_is_view_filter_installed (ViewCollection* self, ViewFilter* f) {
gboolean result = FALSE;
- GeeSet* _tmp0_ = NULL;
- ViewFilter* _tmp1_ = NULL;
- gboolean _tmp2_ = 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"
@@ -1848,17 +1870,17 @@ gboolean view_collection_is_view_filter_installed (ViewCollection* self, ViewFil
result = _tmp2_;
#line 302 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return result;
-#line 1851 "ViewCollection.c"
+#line 1873 "ViewCollection.c"
}
void view_collection_install_view_filter (ViewCollection* self, ViewFilter* f) {
- ViewFilter* _tmp0_ = NULL;
- gboolean _tmp1_ = FALSE;
- GeeSet* _tmp2_ = NULL;
- ViewFilter* _tmp3_ = NULL;
- ViewFilter* _tmp4_ = NULL;
- ViewFilter* _tmp5_ = NULL;
+ ViewFilter* _tmp0_;
+ gboolean _tmp1_;
+ GeeSet* _tmp2_;
+ ViewFilter* _tmp3_;
+ ViewFilter* _tmp4_;
+ ViewFilter* _tmp5_;
#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"
@@ -1871,7 +1893,7 @@ void view_collection_install_view_filter (ViewCollection* self, ViewFilter* f) {
if (_tmp1_) {
#line 307 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return;
-#line 1874 "ViewCollection.c"
+#line 1896 "ViewCollection.c"
}
#line 309 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp2_ = self->priv->filters;
@@ -1889,18 +1911,18 @@ void view_collection_install_view_filter (ViewCollection* self, ViewFilter* f) {
_tmp5_ = f;
#line 316 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
view_collection_notify_view_filter_installed (self, _tmp5_);
-#line 1892 "ViewCollection.c"
+#line 1914 "ViewCollection.c"
}
void view_collection_remove_view_filter (ViewCollection* self, ViewFilter* f) {
- ViewFilter* _tmp0_ = NULL;
- gboolean _tmp1_ = FALSE;
- GeeSet* _tmp2_ = NULL;
- ViewFilter* _tmp3_ = NULL;
- ViewFilter* _tmp4_ = NULL;
- guint _tmp5_ = 0U;
- ViewFilter* _tmp6_ = NULL;
+ ViewFilter* _tmp0_;
+ gboolean _tmp1_;
+ GeeSet* _tmp2_;
+ ViewFilter* _tmp3_;
+ ViewFilter* _tmp4_;
+ guint _tmp5_;
+ ViewFilter* _tmp6_;
#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"
@@ -1913,7 +1935,7 @@ void view_collection_remove_view_filter (ViewCollection* self, ViewFilter* f) {
if (!_tmp1_) {
#line 321 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return;
-#line 1916 "ViewCollection.c"
+#line 1938 "ViewCollection.c"
}
#line 323 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp2_ = self->priv->filters;
@@ -1933,13 +1955,13 @@ void view_collection_remove_view_filter (ViewCollection* self, ViewFilter* f) {
_tmp6_ = f;
#line 330 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
view_collection_notify_view_filter_removed (self, _tmp6_);
-#line 1936 "ViewCollection.c"
+#line 1958 "ViewCollection.c"
}
static void view_collection_on_view_filter_refresh (ViewCollection* self) {
- GeeCollection* _tmp0_ = NULL;
- GeeCollection* _tmp1_ = NULL;
+ GeeCollection* _tmp0_;
+ GeeCollection* _tmp1_;
#line 333 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_if_fail (IS_VIEW_COLLECTION (self));
#line 334 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -1950,7 +1972,7 @@ 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 1953 "ViewCollection.c"
+#line 1975 "ViewCollection.c"
}
@@ -1960,11 +1982,11 @@ static gboolean view_collection_is_in_filter (ViewCollection* self, DataView* vi
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 1963 "ViewCollection.c"
+#line 1985 "ViewCollection.c"
{
GeeIterator* _f_it = NULL;
- GeeSet* _tmp0_ = NULL;
- GeeIterator* _tmp1_ = NULL;
+ GeeSet* _tmp0_;
+ GeeIterator* _tmp1_;
#line 339 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp0_ = self->priv->filters;
#line 339 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -1973,15 +1995,15 @@ 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 1976 "ViewCollection.c"
- GeeIterator* _tmp2_ = NULL;
- gboolean _tmp3_ = FALSE;
+#line 1998 "ViewCollection.c"
+ GeeIterator* _tmp2_;
+ gboolean _tmp3_;
ViewFilter* f = NULL;
- GeeIterator* _tmp4_ = NULL;
- gpointer _tmp5_ = NULL;
- ViewFilter* _tmp6_ = NULL;
- DataView* _tmp7_ = NULL;
- gboolean _tmp8_ = FALSE;
+ GeeIterator* _tmp4_;
+ gpointer _tmp5_;
+ ViewFilter* _tmp6_;
+ DataView* _tmp7_;
+ gboolean _tmp8_;
#line 339 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp2_ = _f_it;
#line 339 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -1990,7 +2012,7 @@ static gboolean view_collection_is_in_filter (ViewCollection* self, DataView* vi
if (!_tmp3_) {
#line 339 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
break;
-#line 1993 "ViewCollection.c"
+#line 2015 "ViewCollection.c"
}
#line 339 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp4_ = _f_it;
@@ -2014,28 +2036,28 @@ 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 2017 "ViewCollection.c"
+#line 2039 "ViewCollection.c"
}
#line 339 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_view_filter_unref0 (f);
-#line 2021 "ViewCollection.c"
+#line 2043 "ViewCollection.c"
}
#line 339 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (_f_it);
-#line 2025 "ViewCollection.c"
+#line 2047 "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 2031 "ViewCollection.c"
+#line 2053 "ViewCollection.c"
}
static gboolean view_collection_real_valid_type (DataCollection* base, DataObject* object) {
ViewCollection * self;
gboolean result = FALSE;
- DataObject* _tmp0_ = NULL;
+ 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"
@@ -2046,13 +2068,13 @@ static gboolean view_collection_real_valid_type (DataCollection* base, DataObjec
result = G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_DATA_VIEW);
#line 347 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return result;
-#line 2049 "ViewCollection.c"
+#line 2071 "ViewCollection.c"
}
static void view_collection_on_sources_added (ViewCollection* self, DataCollection* sources, GeeIterable* added) {
- DataCollection* _tmp0_ = NULL;
- GeeIterable* _tmp1_ = NULL;
+ DataCollection* _tmp0_;
+ GeeIterable* _tmp1_;
#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"
@@ -2065,7 +2087,7 @@ static void view_collection_on_sources_added (ViewCollection* self, DataCollecti
_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 2068 "ViewCollection.c"
+#line 2090 "ViewCollection.c"
}
@@ -2074,14 +2096,14 @@ static DataView* _view_manager_create_view_create_view (DataSource* source, gpoi
result = view_manager_create_view ((ViewManager*) self, source);
#line 364 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return result;
-#line 2077 "ViewCollection.c"
+#line 2099 "ViewCollection.c"
}
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_ = NULL;
+ DataView* _tmp37_;
#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"
@@ -2092,11 +2114,11 @@ 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 2095 "ViewCollection.c"
+#line 2117 "ViewCollection.c"
{
GeeIterator* _source_it = NULL;
- GeeIterable* _tmp0_ = NULL;
- GeeIterator* _tmp1_ = NULL;
+ GeeIterable* _tmp0_;
+ GeeIterator* _tmp1_;
#line 360 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp0_ = added;
#line 360 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -2105,17 +2127,17 @@ static void view_collection_add_sources (ViewCollection* self, SourceCollection*
_source_it = _tmp1_;
#line 360 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
while (TRUE) {
-#line 2108 "ViewCollection.c"
- GeeIterator* _tmp2_ = NULL;
- gboolean _tmp3_ = FALSE;
+#line 2130 "ViewCollection.c"
+ GeeIterator* _tmp2_;
+ gboolean _tmp3_;
DataSource* source = NULL;
- GeeIterator* _tmp4_ = NULL;
- gpointer _tmp5_ = NULL;
+ GeeIterator* _tmp4_;
+ gpointer _tmp5_;
CreateView factory = NULL;
- void* factory_target = NULL;
- GDestroyNotify factory_target_destroy_notify = NULL;
- CreateView _tmp22_ = NULL;
- void* _tmp22__target = 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;
#line 360 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -2124,7 +2146,7 @@ static void view_collection_add_sources (ViewCollection* self, SourceCollection*
if (!_tmp3_) {
#line 360 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
break;
-#line 2127 "ViewCollection.c"
+#line 2149 "ViewCollection.c"
}
#line 360 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp4_ = _source_it;
@@ -2138,15 +2160,15 @@ static void view_collection_add_sources (ViewCollection* self, SourceCollection*
factory_target = NULL;
#line 361 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
factory_target_destroy_notify = NULL;
-#line 2141 "ViewCollection.c"
+#line 2163 "ViewCollection.c"
{
GeeIterator* _monitor_it = NULL;
- GeeHashMultiMap* _tmp6_ = NULL;
- SourceCollection* _tmp7_ = NULL;
- GeeCollection* _tmp8_ = NULL;
- GeeCollection* _tmp9_ = NULL;
- GeeIterator* _tmp10_ = NULL;
- GeeIterator* _tmp11_ = 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;
#line 362 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -2165,16 +2187,16 @@ static void view_collection_add_sources (ViewCollection* self, SourceCollection*
_monitor_it = _tmp11_;
#line 362 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
while (TRUE) {
-#line 2168 "ViewCollection.c"
- GeeIterator* _tmp12_ = NULL;
- gboolean _tmp13_ = FALSE;
+#line 2190 "ViewCollection.c"
+ GeeIterator* _tmp12_;
+ gboolean _tmp13_;
ViewCollectionMonitorImpl* monitor = NULL;
- GeeIterator* _tmp14_ = NULL;
- gpointer _tmp15_ = NULL;
- ViewCollectionMonitorImpl* _tmp16_ = NULL;
- ViewManager* _tmp17_ = NULL;
- DataSource* _tmp18_ = NULL;
- gboolean _tmp19_ = FALSE;
+ GeeIterator* _tmp14_;
+ gpointer _tmp15_;
+ ViewCollectionMonitorImpl* _tmp16_;
+ ViewManager* _tmp17_;
+ DataSource* _tmp18_;
+ gboolean _tmp19_;
#line 362 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp12_ = _monitor_it;
#line 362 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -2183,7 +2205,7 @@ static void view_collection_add_sources (ViewCollection* self, SourceCollection*
if (!_tmp13_) {
#line 362 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
break;
-#line 2186 "ViewCollection.c"
+#line 2208 "ViewCollection.c"
}
#line 362 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp14_ = _monitor_it;
@@ -2201,9 +2223,9 @@ static void view_collection_add_sources (ViewCollection* self, SourceCollection*
_tmp19_ = view_manager_include_in_view (_tmp17_, _tmp18_);
#line 363 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (_tmp19_) {
-#line 2204 "ViewCollection.c"
- ViewCollectionMonitorImpl* _tmp20_ = NULL;
- ViewManager* _tmp21_ = NULL;
+#line 2226 "ViewCollection.c"
+ ViewCollectionMonitorImpl* _tmp20_;
+ ViewManager* _tmp21_;
#line 364 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp20_ = monitor;
#line 364 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -2226,15 +2248,15 @@ static void view_collection_add_sources (ViewCollection* self, SourceCollection*
_view_collection_monitor_unref0 (monitor);
#line 366 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
break;
-#line 2229 "ViewCollection.c"
+#line 2251 "ViewCollection.c"
}
#line 362 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_view_collection_monitor_unref0 (monitor);
-#line 2233 "ViewCollection.c"
+#line 2255 "ViewCollection.c"
}
#line 362 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (_monitor_it);
-#line 2237 "ViewCollection.c"
+#line 2259 "ViewCollection.c"
}
#line 370 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp22_ = factory;
@@ -2242,13 +2264,13 @@ static void view_collection_add_sources (ViewCollection* self, SourceCollection*
_tmp22__target = factory_target;
#line 370 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (_tmp22_ != NULL) {
-#line 2245 "ViewCollection.c"
+#line 2267 "ViewCollection.c"
DataView* new_view = NULL;
- CreateView _tmp23_ = NULL;
- void* _tmp23__target = NULL;
- DataSource* _tmp24_ = NULL;
- DataView* _tmp25_ = NULL;
- GeeArrayList* _tmp26_ = NULL;
+ CreateView _tmp23_;
+ void* _tmp23__target;
+ DataSource* _tmp24_;
+ DataView* _tmp25_;
+ GeeArrayList* _tmp26_;
#line 371 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp23_ = factory;
#line 371 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -2263,25 +2285,25 @@ static void view_collection_add_sources (ViewCollection* self, SourceCollection*
_tmp26_ = created_views;
#line 375 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (_tmp26_ != NULL) {
-#line 2266 "ViewCollection.c"
- GeeArrayList* _tmp27_ = NULL;
- DataView* _tmp28_ = NULL;
+#line 2288 "ViewCollection.c"
+ GeeArrayList* _tmp27_;
+ DataView* _tmp28_;
#line 376 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp27_ = created_views;
#line 376 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp28_ = 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 2275 "ViewCollection.c"
+#line 2297 "ViewCollection.c"
} else {
- DataView* _tmp29_ = NULL;
+ DataView* _tmp29_;
#line 377 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp29_ = created_view;
#line 377 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (_tmp29_ == NULL) {
-#line 2282 "ViewCollection.c"
- DataView* _tmp30_ = NULL;
- DataView* _tmp31_ = NULL;
+#line 2304 "ViewCollection.c"
+ DataView* _tmp30_;
+ DataView* _tmp31_;
#line 378 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp30_ = new_view;
#line 378 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -2290,13 +2312,13 @@ static void view_collection_add_sources (ViewCollection* self, SourceCollection*
_g_object_unref0 (created_view);
#line 378 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
created_view = _tmp31_;
-#line 2293 "ViewCollection.c"
+#line 2315 "ViewCollection.c"
} else {
- GeeArrayList* _tmp32_ = NULL;
- GeeArrayList* _tmp33_ = NULL;
- DataView* _tmp34_ = NULL;
- GeeArrayList* _tmp35_ = NULL;
- DataView* _tmp36_ = NULL;
+ GeeArrayList* _tmp32_;
+ GeeArrayList* _tmp33_;
+ DataView* _tmp34_;
+ GeeArrayList* _tmp35_;
+ DataView* _tmp36_;
#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);
#line 380 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -2319,12 +2341,12 @@ static void view_collection_add_sources (ViewCollection* self, SourceCollection*
_tmp36_ = 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 2322 "ViewCollection.c"
+#line 2344 "ViewCollection.c"
}
}
#line 370 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (new_view);
-#line 2327 "ViewCollection.c"
+#line 2349 "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);
@@ -2336,34 +2358,34 @@ 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 2339 "ViewCollection.c"
+#line 2361 "ViewCollection.c"
}
#line 360 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (_source_it);
-#line 2343 "ViewCollection.c"
+#line 2365 "ViewCollection.c"
}
#line 388 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp37_ = created_view;
#line 388 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (_tmp37_ != NULL) {
-#line 2349 "ViewCollection.c"
- DataView* _tmp38_ = NULL;
+#line 2371 "ViewCollection.c"
+ DataView* _tmp38_;
#line 389 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp38_ = 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 2355 "ViewCollection.c"
+#line 2377 "ViewCollection.c"
} else {
gboolean _tmp39_ = FALSE;
- GeeArrayList* _tmp40_ = NULL;
+ GeeArrayList* _tmp40_;
#line 390 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp40_ = created_views;
#line 390 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (_tmp40_ != NULL) {
-#line 2363 "ViewCollection.c"
- GeeArrayList* _tmp41_ = NULL;
- gint _tmp42_ = 0;
- gint _tmp43_ = 0;
+#line 2385 "ViewCollection.c"
+ GeeArrayList* _tmp41_;
+ gint _tmp42_;
+ gint _tmp43_;
#line 390 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp41_ = created_views;
#line 390 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -2372,20 +2394,20 @@ static void view_collection_add_sources (ViewCollection* self, SourceCollection*
_tmp43_ = _tmp42_;
#line 390 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp39_ = _tmp43_ > 0;
-#line 2375 "ViewCollection.c"
+#line 2397 "ViewCollection.c"
} else {
#line 390 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp39_ = FALSE;
-#line 2379 "ViewCollection.c"
+#line 2401 "ViewCollection.c"
}
#line 390 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (_tmp39_) {
-#line 2383 "ViewCollection.c"
- GeeArrayList* _tmp44_ = NULL;
- ProgressMonitor _tmp45_ = NULL;
- void* _tmp45__target = NULL;
- GeeCollection* _tmp46_ = NULL;
- GeeCollection* _tmp47_ = NULL;
+#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;
#line 391 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -2398,26 +2420,26 @@ static void view_collection_add_sources (ViewCollection* self, SourceCollection*
_tmp47_ = _tmp46_;
#line 391 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (_tmp47_);
-#line 2401 "ViewCollection.c"
+#line 2423 "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 2408 "ViewCollection.c"
+#line 2430 "ViewCollection.c"
}
static gboolean view_collection_real_add (DataCollection* base, DataObject* object) {
ViewCollection * self;
gboolean result = FALSE;
- DataObject* _tmp0_ = NULL;
- DataObject* _tmp1_ = NULL;
- gboolean _tmp2_ = FALSE;
- DataObject* _tmp3_ = NULL;
- GeeCollection* _tmp4_ = NULL;
- GeeCollection* _tmp5_ = NULL;
+ DataObject* _tmp0_;
+ DataObject* _tmp1_;
+ gboolean _tmp2_;
+ DataObject* _tmp3_;
+ GeeCollection* _tmp4_;
+ GeeCollection* _tmp5_;
#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"
@@ -2436,7 +2458,7 @@ static gboolean view_collection_real_add (DataCollection* base, DataObject* obje
result = FALSE;
#line 398 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return result;
-#line 2439 "ViewCollection.c"
+#line 2461 "ViewCollection.c"
}
#line 400 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp3_ = object;
@@ -2452,7 +2474,7 @@ static gboolean view_collection_real_add (DataCollection* base, DataObject* obje
result = TRUE;
#line 402 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return result;
-#line 2455 "ViewCollection.c"
+#line 2477 "ViewCollection.c"
}
@@ -2460,19 +2482,19 @@ static GeeCollection* view_collection_real_add_many (DataCollection* base, GeeCo
ViewCollection * self;
GeeCollection* result = NULL;
GeeCollection* return_list = NULL;
- GeeCollection* _tmp7_ = NULL;
- ProgressMonitor _tmp8_ = NULL;
- void* _tmp8__target = NULL;
- GeeCollection* _tmp9_ = NULL;
+ GeeCollection* _tmp7_;
+ ProgressMonitor _tmp8_;
+ void* _tmp8__target;
+ GeeCollection* _tmp9_;
#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 2471 "ViewCollection.c"
+#line 2493 "ViewCollection.c"
{
GeeIterator* _object_it = NULL;
- GeeCollection* _tmp0_ = NULL;
- GeeIterator* _tmp1_ = NULL;
+ GeeCollection* _tmp0_;
+ GeeIterator* _tmp1_;
#line 407 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp0_ = objects;
#line 407 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -2481,13 +2503,13 @@ static GeeCollection* view_collection_real_add_many (DataCollection* base, GeeCo
_object_it = _tmp1_;
#line 407 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
while (TRUE) {
-#line 2484 "ViewCollection.c"
- GeeIterator* _tmp2_ = NULL;
- gboolean _tmp3_ = FALSE;
+#line 2506 "ViewCollection.c"
+ GeeIterator* _tmp2_;
+ gboolean _tmp3_;
DataObject* object = NULL;
- GeeIterator* _tmp4_ = NULL;
- gpointer _tmp5_ = NULL;
- DataObject* _tmp6_ = NULL;
+ GeeIterator* _tmp4_;
+ gpointer _tmp5_;
+ DataObject* _tmp6_;
#line 407 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp2_ = _object_it;
#line 407 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -2496,7 +2518,7 @@ static GeeCollection* view_collection_real_add_many (DataCollection* base, GeeCo
if (!_tmp3_) {
#line 407 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
break;
-#line 2499 "ViewCollection.c"
+#line 2521 "ViewCollection.c"
}
#line 407 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp4_ = _object_it;
@@ -2510,11 +2532,11 @@ static GeeCollection* view_collection_real_add_many (DataCollection* base, GeeCo
data_view_internal_set_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_DATA_VIEW, DataView), TRUE);
#line 407 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (object);
-#line 2513 "ViewCollection.c"
+#line 2535 "ViewCollection.c"
}
#line 407 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (_object_it);
-#line 2517 "ViewCollection.c"
+#line 2539 "ViewCollection.c"
}
#line 410 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp7_ = objects;
@@ -2532,25 +2554,25 @@ static GeeCollection* view_collection_real_add_many (DataCollection* base, GeeCo
result = return_list;
#line 414 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return result;
-#line 2535 "ViewCollection.c"
+#line 2557 "ViewCollection.c"
}
static void view_collection_on_sources_removed (ViewCollection* self, GeeIterable* removed) {
Marker* marker = NULL;
gboolean _tmp14_ = FALSE;
- Marker* _tmp15_ = NULL;
+ Marker* _tmp15_;
#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 2549 "ViewCollection.c"
+#line 2571 "ViewCollection.c"
{
GeeIterator* _source_it = NULL;
- GeeIterable* _tmp0_ = NULL;
- GeeIterator* _tmp1_ = NULL;
+ GeeIterable* _tmp0_;
+ GeeIterator* _tmp1_;
#line 420 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp0_ = removed;
#line 420 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -2559,17 +2581,17 @@ static void view_collection_on_sources_removed (ViewCollection* self, GeeIterabl
_source_it = _tmp1_;
#line 420 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
while (TRUE) {
-#line 2562 "ViewCollection.c"
- GeeIterator* _tmp2_ = NULL;
- gboolean _tmp3_ = FALSE;
+#line 2584 "ViewCollection.c"
+ GeeIterator* _tmp2_;
+ gboolean _tmp3_;
DataSource* source = NULL;
- GeeIterator* _tmp4_ = NULL;
- gpointer _tmp5_ = NULL;
+ GeeIterator* _tmp4_;
+ gpointer _tmp5_;
DataView* view = NULL;
- GeeHashMap* _tmp6_ = NULL;
- DataSource* _tmp7_ = NULL;
- gpointer _tmp8_ = NULL;
- DataView* _tmp9_ = NULL;
+ GeeHashMap* _tmp6_;
+ DataSource* _tmp7_;
+ gpointer _tmp8_;
+ DataView* _tmp9_;
#line 420 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp2_ = _source_it;
#line 420 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -2578,7 +2600,7 @@ static void view_collection_on_sources_removed (ViewCollection* self, GeeIterabl
if (!_tmp3_) {
#line 420 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
break;
-#line 2581 "ViewCollection.c"
+#line 2603 "ViewCollection.c"
}
#line 420 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp4_ = _source_it;
@@ -2598,23 +2620,23 @@ static void view_collection_on_sources_removed (ViewCollection* self, GeeIterabl
_tmp9_ = view;
#line 424 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (_tmp9_ != NULL) {
-#line 2601 "ViewCollection.c"
- Marker* _tmp10_ = NULL;
- Marker* _tmp12_ = NULL;
- DataView* _tmp13_ = NULL;
+#line 2623 "ViewCollection.c"
+ Marker* _tmp10_;
+ Marker* _tmp12_;
+ DataView* _tmp13_;
#line 425 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp10_ = marker;
#line 425 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (_tmp10_ == NULL) {
-#line 2609 "ViewCollection.c"
- Marker* _tmp11_ = NULL;
+#line 2631 "ViewCollection.c"
+ Marker* _tmp11_;
#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));
#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 2617 "ViewCollection.c"
+#line 2639 "ViewCollection.c"
}
#line 428 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp12_ = marker;
@@ -2622,50 +2644,50 @@ static void view_collection_on_sources_removed (ViewCollection* self, GeeIterabl
_tmp13_ = 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 2625 "ViewCollection.c"
+#line 2647 "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 2631 "ViewCollection.c"
+#line 2653 "ViewCollection.c"
}
#line 420 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (_source_it);
-#line 2635 "ViewCollection.c"
+#line 2657 "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 2641 "ViewCollection.c"
- Marker* _tmp16_ = NULL;
- gint _tmp17_ = 0;
+#line 2663 "ViewCollection.c"
+ Marker* _tmp16_;
+ gint _tmp17_;
#line 432 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp16_ = marker;
#line 432 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp17_ = marker_get_count (_tmp16_);
#line 432 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp14_ = _tmp17_ != 0;
-#line 2650 "ViewCollection.c"
+#line 2672 "ViewCollection.c"
} else {
#line 432 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp14_ = FALSE;
-#line 2654 "ViewCollection.c"
+#line 2676 "ViewCollection.c"
}
#line 432 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (_tmp14_) {
-#line 2658 "ViewCollection.c"
- Marker* _tmp18_ = NULL;
+#line 2680 "ViewCollection.c"
+ Marker* _tmp18_;
#line 433 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp18_ = 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 2664 "ViewCollection.c"
+#line 2686 "ViewCollection.c"
}
#line 417 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (marker);
-#line 2668 "ViewCollection.c"
+#line 2690 "ViewCollection.c"
}
@@ -2673,9 +2695,9 @@ static void view_collection_on_sources_altered (ViewCollection* self, DataCollec
GeeArrayList* to_add = NULL;
GeeArrayList* to_remove = NULL;
gboolean ordering_changed = FALSE;
- GeeArrayList* _tmp82_ = NULL;
- GeeArrayList* _tmp86_ = NULL;
- gboolean _tmp90_ = FALSE;
+ GeeArrayList* _tmp82_;
+ GeeArrayList* _tmp86_;
+ gboolean _tmp90_;
#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"
@@ -2688,15 +2710,15 @@ 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 2691 "ViewCollection.c"
+#line 2713 "ViewCollection.c"
{
GeeIterator* _object_it = NULL;
- GeeMap* _tmp0_ = NULL;
- GeeSet* _tmp1_ = NULL;
- GeeSet* _tmp2_ = NULL;
- GeeSet* _tmp3_ = NULL;
- GeeIterator* _tmp4_ = NULL;
- GeeIterator* _tmp5_ = NULL;
+ GeeMap* _tmp0_;
+ GeeSet* _tmp1_;
+ GeeSet* _tmp2_;
+ GeeSet* _tmp3_;
+ GeeIterator* _tmp4_;
+ GeeIterator* _tmp5_;
#line 442 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp0_ = items;
#line 442 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -2715,24 +2737,24 @@ static void view_collection_on_sources_altered (ViewCollection* self, DataCollec
_object_it = _tmp5_;
#line 442 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
while (TRUE) {
-#line 2718 "ViewCollection.c"
- GeeIterator* _tmp6_ = NULL;
- gboolean _tmp7_ = FALSE;
+#line 2740 "ViewCollection.c"
+ GeeIterator* _tmp6_;
+ gboolean _tmp7_;
DataObject* object = NULL;
- GeeIterator* _tmp8_ = NULL;
- gpointer _tmp9_ = NULL;
+ GeeIterator* _tmp8_;
+ gpointer _tmp9_;
Alteration* alteration = NULL;
- GeeMap* _tmp10_ = NULL;
- DataObject* _tmp11_ = NULL;
- gpointer _tmp12_ = NULL;
+ GeeMap* _tmp10_;
+ DataObject* _tmp11_;
+ gpointer _tmp12_;
DataSource* source = NULL;
- DataObject* _tmp13_ = NULL;
- DataSource* _tmp14_ = NULL;
+ DataObject* _tmp13_;
+ DataSource* _tmp14_;
ViewCollectionMonitorImpl* monitor = NULL;
gboolean ignored = FALSE;
- gboolean _tmp38_ = FALSE;
+ gboolean _tmp38_;
gboolean _tmp40_ = FALSE;
- ViewCollectionMonitorImpl* _tmp41_ = NULL;
+ ViewCollectionMonitorImpl* _tmp41_;
#line 442 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp6_ = _object_it;
#line 442 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -2741,7 +2763,7 @@ static void view_collection_on_sources_altered (ViewCollection* self, DataCollec
if (!_tmp7_) {
#line 442 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
break;
-#line 2744 "ViewCollection.c"
+#line 2766 "ViewCollection.c"
}
#line 442 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp8_ = _object_it;
@@ -2767,15 +2789,15 @@ static void view_collection_on_sources_altered (ViewCollection* self, DataCollec
monitor = NULL;
#line 447 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
ignored = TRUE;
-#line 2770 "ViewCollection.c"
+#line 2792 "ViewCollection.c"
{
GeeIterator* _monitor_impl_it = NULL;
- GeeHashMultiMap* _tmp15_ = NULL;
- DataCollection* _tmp16_ = NULL;
- GeeCollection* _tmp17_ = NULL;
- GeeCollection* _tmp18_ = NULL;
- GeeIterator* _tmp19_ = NULL;
- GeeIterator* _tmp20_ = 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;
#line 448 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -2794,19 +2816,19 @@ static void view_collection_on_sources_altered (ViewCollection* self, DataCollec
_monitor_impl_it = _tmp20_;
#line 448 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
while (TRUE) {
-#line 2797 "ViewCollection.c"
- GeeIterator* _tmp21_ = NULL;
- gboolean _tmp22_ = FALSE;
+#line 2819 "ViewCollection.c"
+ GeeIterator* _tmp21_;
+ gboolean _tmp22_;
ViewCollectionMonitorImpl* monitor_impl = NULL;
- GeeIterator* _tmp23_ = NULL;
- gpointer _tmp24_ = NULL;
+ GeeIterator* _tmp23_;
+ gpointer _tmp24_;
gboolean _tmp25_ = FALSE;
- ViewCollectionMonitorImpl* _tmp26_ = NULL;
- Alteration* _tmp27_ = NULL;
- ViewCollectionMonitorImpl* _tmp32_ = NULL;
- ViewManager* _tmp33_ = NULL;
- DataSource* _tmp34_ = NULL;
- gboolean _tmp35_ = FALSE;
+ ViewCollectionMonitorImpl* _tmp26_;
+ Alteration* _tmp27_;
+ ViewCollectionMonitorImpl* _tmp32_;
+ ViewManager* _tmp33_;
+ DataSource* _tmp34_;
+ gboolean _tmp35_;
#line 448 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp21_ = _monitor_impl_it;
#line 448 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -2815,7 +2837,7 @@ static void view_collection_on_sources_altered (ViewCollection* self, DataCollec
if (!_tmp22_) {
#line 448 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
break;
-#line 2818 "ViewCollection.c"
+#line 2840 "ViewCollection.c"
}
#line 448 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp23_ = _monitor_impl_it;
@@ -2829,11 +2851,11 @@ static void view_collection_on_sources_altered (ViewCollection* self, DataCollec
_tmp27_ = _tmp26_->prereq;
#line 449 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (_tmp27_ != NULL) {
-#line 2832 "ViewCollection.c"
- Alteration* _tmp28_ = NULL;
- ViewCollectionMonitorImpl* _tmp29_ = NULL;
- Alteration* _tmp30_ = NULL;
- gboolean _tmp31_ = FALSE;
+#line 2854 "ViewCollection.c"
+ Alteration* _tmp28_;
+ ViewCollectionMonitorImpl* _tmp29_;
+ Alteration* _tmp30_;
+ gboolean _tmp31_;
#line 449 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp28_ = alteration;
#line 449 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -2844,11 +2866,11 @@ static void view_collection_on_sources_altered (ViewCollection* self, DataCollec
_tmp31_ = alteration_contains_any (_tmp28_, _tmp30_);
#line 449 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp25_ = !_tmp31_;
-#line 2847 "ViewCollection.c"
+#line 2869 "ViewCollection.c"
} else {
#line 449 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp25_ = FALSE;
-#line 2851 "ViewCollection.c"
+#line 2873 "ViewCollection.c"
}
#line 449 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (_tmp25_) {
@@ -2856,7 +2878,7 @@ static void view_collection_on_sources_altered (ViewCollection* self, DataCollec
_view_collection_monitor_unref0 (monitor_impl);
#line 450 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
continue;
-#line 2859 "ViewCollection.c"
+#line 2881 "ViewCollection.c"
}
#line 452 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
ignored = FALSE;
@@ -2870,9 +2892,9 @@ static void view_collection_on_sources_altered (ViewCollection* self, DataCollec
_tmp35_ = view_manager_include_in_view (_tmp33_, _tmp34_);
#line 454 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (_tmp35_) {
-#line 2873 "ViewCollection.c"
- ViewCollectionMonitorImpl* _tmp36_ = NULL;
- ViewCollectionMonitorImpl* _tmp37_ = NULL;
+#line 2895 "ViewCollection.c"
+ ViewCollectionMonitorImpl* _tmp36_;
+ ViewCollectionMonitorImpl* _tmp37_;
#line 455 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp36_ = monitor_impl;
#line 455 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -2885,22 +2907,22 @@ static void view_collection_on_sources_altered (ViewCollection* self, DataCollec
_view_collection_monitor_unref0 (monitor_impl);
#line 457 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
break;
-#line 2888 "ViewCollection.c"
+#line 2910 "ViewCollection.c"
}
#line 448 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_view_collection_monitor_unref0 (monitor_impl);
-#line 2892 "ViewCollection.c"
+#line 2914 "ViewCollection.c"
}
#line 448 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (_monitor_impl_it);
-#line 2896 "ViewCollection.c"
+#line 2918 "ViewCollection.c"
}
#line 461 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp38_ = ignored;
#line 461 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (_tmp38_) {
-#line 2902 "ViewCollection.c"
- ViewCollectionMonitorImpl* _tmp39_ = NULL;
+#line 2924 "ViewCollection.c"
+ ViewCollectionMonitorImpl* _tmp39_;
#line 462 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp39_ = monitor;
#line 462 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -2915,50 +2937,50 @@ 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 2918 "ViewCollection.c"
+#line 2940 "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 2924 "ViewCollection.c"
- DataSource* _tmp42_ = NULL;
- gboolean _tmp43_ = FALSE;
+#line 2946 "ViewCollection.c"
+ DataSource* _tmp42_;
+ gboolean _tmp43_;
#line 467 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp42_ = source;
#line 467 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp43_ = view_collection_has_view_for_source (self, _tmp42_);
#line 467 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp40_ = !_tmp43_;
-#line 2933 "ViewCollection.c"
+#line 2955 "ViewCollection.c"
} else {
#line 467 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp40_ = FALSE;
-#line 2937 "ViewCollection.c"
+#line 2959 "ViewCollection.c"
}
#line 467 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (_tmp40_) {
-#line 2941 "ViewCollection.c"
- GeeArrayList* _tmp44_ = NULL;
- GeeArrayList* _tmp46_ = NULL;
- ViewCollectionMonitorImpl* _tmp47_ = NULL;
- ViewManager* _tmp48_ = NULL;
- DataSource* _tmp49_ = NULL;
- DataView* _tmp50_ = NULL;
- DataView* _tmp51_ = NULL;
+#line 2963 "ViewCollection.c"
+ GeeArrayList* _tmp44_;
+ GeeArrayList* _tmp46_;
+ ViewCollectionMonitorImpl* _tmp47_;
+ ViewManager* _tmp48_;
+ DataSource* _tmp49_;
+ DataView* _tmp50_;
+ DataView* _tmp51_;
#line 468 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp44_ = to_add;
#line 468 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (_tmp44_ == NULL) {
-#line 2953 "ViewCollection.c"
- GeeArrayList* _tmp45_ = NULL;
+#line 2975 "ViewCollection.c"
+ GeeArrayList* _tmp45_;
#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);
#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 2961 "ViewCollection.c"
+#line 2983 "ViewCollection.c"
}
#line 471 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp46_ = to_add;
@@ -2976,50 +2998,50 @@ static void view_collection_on_sources_altered (ViewCollection* self, DataCollec
gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp51_);
#line 471 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (_tmp51_);
-#line 2979 "ViewCollection.c"
+#line 3001 "ViewCollection.c"
} else {
gboolean _tmp52_ = FALSE;
- ViewCollectionMonitorImpl* _tmp53_ = NULL;
+ ViewCollectionMonitorImpl* _tmp53_;
#line 472 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp53_ = monitor;
#line 472 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (_tmp53_ == NULL) {
-#line 2987 "ViewCollection.c"
- DataSource* _tmp54_ = NULL;
- gboolean _tmp55_ = FALSE;
+#line 3009 "ViewCollection.c"
+ DataSource* _tmp54_;
+ gboolean _tmp55_;
#line 472 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp54_ = 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 2996 "ViewCollection.c"
+#line 3018 "ViewCollection.c"
} else {
#line 472 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp52_ = FALSE;
-#line 3000 "ViewCollection.c"
+#line 3022 "ViewCollection.c"
}
#line 472 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (_tmp52_) {
-#line 3004 "ViewCollection.c"
- GeeArrayList* _tmp56_ = NULL;
- GeeArrayList* _tmp58_ = NULL;
- DataSource* _tmp59_ = NULL;
- DataView* _tmp60_ = NULL;
- DataView* _tmp61_ = NULL;
+#line 3026 "ViewCollection.c"
+ GeeArrayList* _tmp56_;
+ GeeArrayList* _tmp58_;
+ DataSource* _tmp59_;
+ DataView* _tmp60_;
+ DataView* _tmp61_;
#line 473 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp56_ = to_remove;
#line 473 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (_tmp56_ == NULL) {
-#line 3014 "ViewCollection.c"
- GeeArrayList* _tmp57_ = NULL;
+#line 3036 "ViewCollection.c"
+ GeeArrayList* _tmp57_;
#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);
#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 3022 "ViewCollection.c"
+#line 3044 "ViewCollection.c"
}
#line 476 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp58_ = to_remove;
@@ -3033,40 +3055,40 @@ static void view_collection_on_sources_altered (ViewCollection* self, DataCollec
gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp58_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp61_);
#line 476 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (_tmp61_);
-#line 3036 "ViewCollection.c"
+#line 3058 "ViewCollection.c"
} else {
gboolean _tmp62_ = FALSE;
- ViewCollectionMonitorImpl* _tmp63_ = NULL;
+ ViewCollectionMonitorImpl* _tmp63_;
#line 477 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp63_ = monitor;
#line 477 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (_tmp63_ != NULL) {
-#line 3044 "ViewCollection.c"
- DataSource* _tmp64_ = NULL;
- gboolean _tmp65_ = FALSE;
+#line 3066 "ViewCollection.c"
+ DataSource* _tmp64_;
+ gboolean _tmp65_;
#line 477 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp64_ = source;
#line 477 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp65_ = view_collection_has_view_for_source (self, _tmp64_);
#line 477 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp62_ = _tmp65_;
-#line 3053 "ViewCollection.c"
+#line 3075 "ViewCollection.c"
} else {
#line 477 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp62_ = FALSE;
-#line 3057 "ViewCollection.c"
+#line 3079 "ViewCollection.c"
}
#line 477 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (_tmp62_) {
-#line 3061 "ViewCollection.c"
+#line 3083 "ViewCollection.c"
DataView* view = NULL;
- DataSource* _tmp66_ = NULL;
- DataView* _tmp67_ = NULL;
- DataSet* _tmp68_ = NULL;
- DataView* _tmp69_ = NULL;
- gboolean _tmp70_ = FALSE;
+ DataSource* _tmp66_;
+ DataView* _tmp67_;
+ DataSet* _tmp68_;
+ DataView* _tmp69_;
+ gboolean _tmp70_;
gboolean _tmp74_ = FALSE;
- DataSet* _tmp75_ = NULL;
+ DataSet* _tmp75_;
#line 478 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp66_ = source;
#line 478 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -3081,10 +3103,10 @@ static void view_collection_on_sources_altered (ViewCollection* self, DataCollec
_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 3084 "ViewCollection.c"
- DataSet* _tmp71_ = NULL;
- DataView* _tmp72_ = NULL;
- Alteration* _tmp73_ = NULL;
+#line 3106 "ViewCollection.c"
+ DataSet* _tmp71_;
+ DataView* _tmp72_;
+ Alteration* _tmp73_;
#line 481 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp71_ = self->priv->selected;
#line 481 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -3093,34 +3115,34 @@ static void view_collection_on_sources_altered (ViewCollection* self, DataCollec
_tmp73_ = 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 3096 "ViewCollection.c"
+#line 3118 "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 3102 "ViewCollection.c"
- DataView* _tmp76_ = NULL;
- gboolean _tmp77_ = FALSE;
+#line 3124 "ViewCollection.c"
+ DataView* _tmp76_;
+ gboolean _tmp77_;
#line 483 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp76_ = view;
#line 483 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp77_ = view_collection_is_visible (self, _tmp76_);
#line 483 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp74_ = _tmp77_;
-#line 3111 "ViewCollection.c"
+#line 3133 "ViewCollection.c"
} else {
#line 483 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp74_ = FALSE;
-#line 3115 "ViewCollection.c"
+#line 3137 "ViewCollection.c"
}
#line 483 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (_tmp74_) {
-#line 3119 "ViewCollection.c"
- DataSet* _tmp78_ = NULL;
- DataView* _tmp79_ = NULL;
- Alteration* _tmp80_ = NULL;
- gboolean _tmp81_ = FALSE;
+#line 3141 "ViewCollection.c"
+ DataSet* _tmp78_;
+ DataView* _tmp79_;
+ Alteration* _tmp80_;
+ gboolean _tmp81_;
#line 484 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp78_ = self->priv->visible;
#line 484 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -3133,12 +3155,12 @@ static void view_collection_on_sources_altered (ViewCollection* self, DataCollec
if (_tmp81_) {
#line 485 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
ordering_changed = TRUE;
-#line 3136 "ViewCollection.c"
+#line 3158 "ViewCollection.c"
}
}
#line 477 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (view);
-#line 3141 "ViewCollection.c"
+#line 3163 "ViewCollection.c"
}
}
}
@@ -3150,20 +3172,20 @@ 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 3153 "ViewCollection.c"
+#line 3175 "ViewCollection.c"
}
#line 442 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (_object_it);
-#line 3157 "ViewCollection.c"
+#line 3179 "ViewCollection.c"
}
#line 490 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp82_ = to_add;
#line 490 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (_tmp82_ != NULL) {
-#line 3163 "ViewCollection.c"
- GeeArrayList* _tmp83_ = NULL;
- GeeCollection* _tmp84_ = NULL;
- GeeCollection* _tmp85_ = NULL;
+#line 3185 "ViewCollection.c"
+ GeeArrayList* _tmp83_;
+ GeeCollection* _tmp84_;
+ GeeCollection* _tmp85_;
#line 491 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp83_ = to_add;
#line 491 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -3172,16 +3194,16 @@ static void view_collection_on_sources_altered (ViewCollection* self, DataCollec
_tmp85_ = _tmp84_;
#line 491 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (_tmp85_);
-#line 3175 "ViewCollection.c"
+#line 3197 "ViewCollection.c"
}
#line 493 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp86_ = to_remove;
#line 493 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (_tmp86_ != NULL) {
-#line 3181 "ViewCollection.c"
- GeeArrayList* _tmp87_ = NULL;
- Marker* _tmp88_ = NULL;
- Marker* _tmp89_ = NULL;
+#line 3203 "ViewCollection.c"
+ GeeArrayList* _tmp87_;
+ Marker* _tmp88_;
+ Marker* _tmp89_;
#line 494 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp87_ = to_remove;
#line 494 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -3192,7 +3214,7 @@ static void view_collection_on_sources_altered (ViewCollection* self, DataCollec
data_collection_remove_marked (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), _tmp89_);
#line 494 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (_tmp89_);
-#line 3195 "ViewCollection.c"
+#line 3217 "ViewCollection.c"
}
#line 496 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp90_ = ordering_changed;
@@ -3200,22 +3222,22 @@ static void view_collection_on_sources_altered (ViewCollection* self, DataCollec
if (_tmp90_) {
#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 3203 "ViewCollection.c"
+#line 3225 "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 3209 "ViewCollection.c"
+#line 3231 "ViewCollection.c"
}
static void view_collection_on_mirror_contents_added (ViewCollection* self, GeeIterable* added) {
GeeArrayList* to_add = NULL;
- GeeArrayList* _tmp0_ = NULL;
- GeeArrayList* _tmp19_ = NULL;
- gint _tmp20_ = 0;
- gint _tmp21_ = 0;
+ GeeArrayList* _tmp0_;
+ GeeArrayList* _tmp19_;
+ gint _tmp20_;
+ gint _tmp21_;
#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"
@@ -3224,11 +3246,11 @@ 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 3227 "ViewCollection.c"
+#line 3249 "ViewCollection.c"
{
GeeIterator* _object_it = NULL;
- GeeIterable* _tmp1_ = NULL;
- GeeIterator* _tmp2_ = NULL;
+ GeeIterable* _tmp1_;
+ GeeIterator* _tmp2_;
#line 502 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp1_ = added;
#line 502 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -3237,18 +3259,18 @@ static void view_collection_on_mirror_contents_added (ViewCollection* self, GeeI
_object_it = _tmp2_;
#line 502 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
while (TRUE) {
-#line 3240 "ViewCollection.c"
- GeeIterator* _tmp3_ = NULL;
- gboolean _tmp4_ = FALSE;
+#line 3262 "ViewCollection.c"
+ GeeIterator* _tmp3_;
+ gboolean _tmp4_;
DataObject* object = NULL;
- GeeIterator* _tmp5_ = NULL;
- gpointer _tmp6_ = NULL;
+ GeeIterator* _tmp5_;
+ gpointer _tmp6_;
DataSource* source = NULL;
- DataObject* _tmp7_ = NULL;
- DataSource* _tmp8_ = NULL;
+ DataObject* _tmp7_;
+ DataSource* _tmp8_;
gboolean _tmp9_ = FALSE;
- CreateViewPredicate _tmp10_ = NULL;
- void* _tmp10__target = NULL;
+ CreateViewPredicate _tmp10_;
+ void* _tmp10__target;
#line 502 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp3_ = _object_it;
#line 502 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -3257,7 +3279,7 @@ static void view_collection_on_mirror_contents_added (ViewCollection* self, GeeI
if (!_tmp4_) {
#line 502 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
break;
-#line 3260 "ViewCollection.c"
+#line 3282 "ViewCollection.c"
}
#line 502 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp5_ = _object_it;
@@ -3279,12 +3301,12 @@ static void view_collection_on_mirror_contents_added (ViewCollection* self, GeeI
if (_tmp10_ == NULL) {
#line 505 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp9_ = TRUE;
-#line 3282 "ViewCollection.c"
+#line 3304 "ViewCollection.c"
} else {
- CreateViewPredicate _tmp11_ = NULL;
- void* _tmp11__target = NULL;
- DataSource* _tmp12_ = NULL;
- gboolean _tmp13_ = FALSE;
+ CreateViewPredicate _tmp11_;
+ void* _tmp11__target;
+ DataSource* _tmp12_;
+ gboolean _tmp13_;
#line 505 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp11_ = self->priv->should_mirror;
#line 505 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -3295,17 +3317,17 @@ static void view_collection_on_mirror_contents_added (ViewCollection* self, GeeI
_tmp13_ = _tmp11_ (_tmp12_, _tmp11__target);
#line 505 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp9_ = _tmp13_;
-#line 3298 "ViewCollection.c"
+#line 3320 "ViewCollection.c"
}
#line 505 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (_tmp9_) {
-#line 3302 "ViewCollection.c"
- GeeArrayList* _tmp14_ = NULL;
- CreateView _tmp15_ = NULL;
- void* _tmp15__target = NULL;
- DataSource* _tmp16_ = NULL;
- DataView* _tmp17_ = NULL;
- DataView* _tmp18_ = NULL;
+#line 3324 "ViewCollection.c"
+ GeeArrayList* _tmp14_;
+ CreateView _tmp15_;
+ void* _tmp15__target;
+ DataSource* _tmp16_;
+ DataView* _tmp17_;
+ DataView* _tmp18_;
#line 506 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp14_ = to_add;
#line 506 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -3322,17 +3344,17 @@ static void view_collection_on_mirror_contents_added (ViewCollection* self, GeeI
gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp18_);
#line 506 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (_tmp18_);
-#line 3325 "ViewCollection.c"
+#line 3347 "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 3331 "ViewCollection.c"
+#line 3353 "ViewCollection.c"
}
#line 502 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (_object_it);
-#line 3335 "ViewCollection.c"
+#line 3357 "ViewCollection.c"
}
#line 509 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp19_ = to_add;
@@ -3342,10 +3364,10 @@ static void view_collection_on_mirror_contents_added (ViewCollection* self, GeeI
_tmp21_ = _tmp20_;
#line 509 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (_tmp21_ > 0) {
-#line 3345 "ViewCollection.c"
- GeeArrayList* _tmp22_ = NULL;
- GeeCollection* _tmp23_ = NULL;
- GeeCollection* _tmp24_ = NULL;
+#line 3367 "ViewCollection.c"
+ GeeArrayList* _tmp22_;
+ GeeCollection* _tmp23_;
+ GeeCollection* _tmp24_;
#line 510 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp22_ = to_add;
#line 510 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -3354,18 +3376,18 @@ static void view_collection_on_mirror_contents_added (ViewCollection* self, GeeI
_tmp24_ = _tmp23_;
#line 510 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (_tmp24_);
-#line 3357 "ViewCollection.c"
+#line 3379 "ViewCollection.c"
}
#line 500 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (to_add);
-#line 3361 "ViewCollection.c"
+#line 3383 "ViewCollection.c"
}
static void view_collection_on_mirror_contents_removed (ViewCollection* self, GeeIterable* removed) {
Marker* marker = NULL;
- Marker* _tmp0_ = NULL;
- Marker* _tmp17_ = NULL;
+ Marker* _tmp0_;
+ Marker* _tmp17_;
#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"
@@ -3374,11 +3396,11 @@ 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 3377 "ViewCollection.c"
+#line 3399 "ViewCollection.c"
{
GeeIterator* _object_it = NULL;
- GeeIterable* _tmp1_ = NULL;
- GeeIterator* _tmp2_ = NULL;
+ GeeIterable* _tmp1_;
+ GeeIterator* _tmp2_;
#line 515 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp1_ = removed;
#line 515 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -3387,24 +3409,24 @@ static void view_collection_on_mirror_contents_removed (ViewCollection* self, Ge
_object_it = _tmp2_;
#line 515 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
while (TRUE) {
-#line 3390 "ViewCollection.c"
- GeeIterator* _tmp3_ = NULL;
- gboolean _tmp4_ = FALSE;
+#line 3412 "ViewCollection.c"
+ GeeIterator* _tmp3_;
+ gboolean _tmp4_;
DataObject* object = NULL;
- GeeIterator* _tmp5_ = NULL;
- gpointer _tmp6_ = NULL;
+ GeeIterator* _tmp5_;
+ gpointer _tmp6_;
DataView* view = NULL;
- DataObject* _tmp7_ = NULL;
- DataView* _tmp8_ = NULL;
+ DataObject* _tmp7_;
+ DataView* _tmp8_;
DataView* our_view = NULL;
- DataView* _tmp9_ = NULL;
- DataSource* _tmp10_ = NULL;
- DataSource* _tmp11_ = NULL;
- DataView* _tmp12_ = NULL;
- DataView* _tmp13_ = NULL;
- DataView* _tmp14_ = NULL;
- Marker* _tmp15_ = NULL;
- DataView* _tmp16_ = NULL;
+ DataView* _tmp9_;
+ DataSource* _tmp10_;
+ DataSource* _tmp11_;
+ DataView* _tmp12_;
+ DataView* _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"
@@ -3413,7 +3435,7 @@ static void view_collection_on_mirror_contents_removed (ViewCollection* self, Ge
if (!_tmp4_) {
#line 515 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
break;
-#line 3416 "ViewCollection.c"
+#line 3438 "ViewCollection.c"
}
#line 515 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp5_ = _object_it;
@@ -3457,11 +3479,11 @@ static void view_collection_on_mirror_contents_removed (ViewCollection* self, Ge
_g_object_unref0 (view);
#line 515 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (object);
-#line 3460 "ViewCollection.c"
+#line 3482 "ViewCollection.c"
}
#line 515 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (_object_it);
-#line 3464 "ViewCollection.c"
+#line 3486 "ViewCollection.c"
}
#line 524 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp17_ = marker;
@@ -3469,7 +3491,7 @@ static void view_collection_on_mirror_contents_removed (ViewCollection* self, Ge
data_collection_remove_marked (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), _tmp17_);
#line 513 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (marker);
-#line 3472 "ViewCollection.c"
+#line 3494 "ViewCollection.c"
}
@@ -3477,9 +3499,9 @@ static void view_collection_real_notify_items_added (DataCollection* base, GeeIt
ViewCollection * self;
GeeArrayList* added_visible = NULL;
GeeArrayList* added_selected = NULL;
- GeeArrayList* _tmp30_ = NULL;
- GeeArrayList* _tmp34_ = NULL;
- GeeIterable* _tmp37_ = NULL;
+ GeeArrayList* _tmp30_;
+ GeeArrayList* _tmp34_;
+ GeeIterable* _tmp37_;
#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"
@@ -3488,11 +3510,11 @@ 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 3491 "ViewCollection.c"
+#line 3513 "ViewCollection.c"
{
GeeIterator* _object_it = NULL;
- GeeIterable* _tmp0_ = NULL;
- GeeIterator* _tmp1_ = NULL;
+ GeeIterable* _tmp0_;
+ GeeIterator* _tmp1_;
#line 532 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp0_ = added;
#line 532 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -3501,26 +3523,26 @@ static void view_collection_real_notify_items_added (DataCollection* base, GeeIt
_object_it = _tmp1_;
#line 532 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
while (TRUE) {
-#line 3504 "ViewCollection.c"
- GeeIterator* _tmp2_ = NULL;
- gboolean _tmp3_ = FALSE;
+#line 3526 "ViewCollection.c"
+ GeeIterator* _tmp2_;
+ gboolean _tmp3_;
DataObject* object = NULL;
- GeeIterator* _tmp4_ = NULL;
- gpointer _tmp5_ = NULL;
+ GeeIterator* _tmp4_;
+ gpointer _tmp5_;
DataView* view = NULL;
- DataObject* _tmp6_ = NULL;
- DataView* _tmp7_ = NULL;
- GeeHashMap* _tmp8_ = NULL;
- DataView* _tmp9_ = NULL;
- DataSource* _tmp10_ = NULL;
- DataSource* _tmp11_ = NULL;
- DataView* _tmp12_ = NULL;
+ DataObject* _tmp6_;
+ DataView* _tmp7_;
+ GeeHashMap* _tmp8_;
+ DataView* _tmp9_;
+ DataSource* _tmp10_;
+ DataSource* _tmp11_;
+ DataView* _tmp12_;
gboolean _tmp13_ = FALSE;
- DataView* _tmp14_ = NULL;
- gboolean _tmp15_ = FALSE;
+ DataView* _tmp14_;
+ gboolean _tmp15_;
gboolean _tmp22_ = FALSE;
- DataView* _tmp23_ = NULL;
- gboolean _tmp24_ = FALSE;
+ DataView* _tmp23_;
+ gboolean _tmp24_;
#line 532 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp2_ = _object_it;
#line 532 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -3529,7 +3551,7 @@ static void view_collection_real_notify_items_added (DataCollection* base, GeeIt
if (!_tmp3_) {
#line 532 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
break;
-#line 3532 "ViewCollection.c"
+#line 3554 "ViewCollection.c"
}
#line 532 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp4_ = _object_it;
@@ -3563,40 +3585,40 @@ static void view_collection_real_notify_items_added (DataCollection* base, GeeIt
_tmp15_ = data_view_is_selected (_tmp14_);
#line 536 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (_tmp15_) {
-#line 3566 "ViewCollection.c"
- DataView* _tmp16_ = NULL;
- gboolean _tmp17_ = FALSE;
+#line 3588 "ViewCollection.c"
+ DataView* _tmp16_;
+ gboolean _tmp17_;
#line 536 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp16_ = view;
#line 536 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp17_ = data_view_is_visible (_tmp16_);
#line 536 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp13_ = _tmp17_;
-#line 3575 "ViewCollection.c"
+#line 3597 "ViewCollection.c"
} else {
#line 536 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp13_ = FALSE;
-#line 3579 "ViewCollection.c"
+#line 3601 "ViewCollection.c"
}
#line 536 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (_tmp13_) {
-#line 3583 "ViewCollection.c"
- GeeArrayList* _tmp18_ = NULL;
- GeeArrayList* _tmp20_ = NULL;
- DataView* _tmp21_ = NULL;
+#line 3605 "ViewCollection.c"
+ GeeArrayList* _tmp18_;
+ GeeArrayList* _tmp20_;
+ DataView* _tmp21_;
#line 537 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp18_ = added_selected;
#line 537 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (_tmp18_ == NULL) {
-#line 3591 "ViewCollection.c"
- GeeArrayList* _tmp19_ = NULL;
+#line 3613 "ViewCollection.c"
+ GeeArrayList* _tmp19_;
#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);
#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 3599 "ViewCollection.c"
+#line 3621 "ViewCollection.c"
}
#line 540 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp20_ = added_selected;
@@ -3604,7 +3626,7 @@ static void view_collection_real_notify_items_added (DataCollection* base, GeeIt
_tmp21_ = 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 3607 "ViewCollection.c"
+#line 3629 "ViewCollection.c"
}
#line 544 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp23_ = view;
@@ -3612,37 +3634,37 @@ static void view_collection_real_notify_items_added (DataCollection* base, GeeIt
_tmp24_ = data_view_is_visible (_tmp23_);
#line 544 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (_tmp24_) {
-#line 3615 "ViewCollection.c"
- DataSet* _tmp25_ = NULL;
+#line 3637 "ViewCollection.c"
+ DataSet* _tmp25_;
#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 3621 "ViewCollection.c"
+#line 3643 "ViewCollection.c"
} else {
#line 544 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp22_ = FALSE;
-#line 3625 "ViewCollection.c"
+#line 3647 "ViewCollection.c"
}
#line 544 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (_tmp22_) {
-#line 3629 "ViewCollection.c"
- GeeArrayList* _tmp26_ = NULL;
- GeeArrayList* _tmp28_ = NULL;
- DataView* _tmp29_ = NULL;
+#line 3651 "ViewCollection.c"
+ GeeArrayList* _tmp26_;
+ GeeArrayList* _tmp28_;
+ DataView* _tmp29_;
#line 545 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp26_ = added_visible;
#line 545 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (_tmp26_ == NULL) {
-#line 3637 "ViewCollection.c"
- GeeArrayList* _tmp27_ = NULL;
+#line 3659 "ViewCollection.c"
+ GeeArrayList* _tmp27_;
#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);
#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 3645 "ViewCollection.c"
+#line 3667 "ViewCollection.c"
}
#line 548 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp28_ = added_visible;
@@ -3650,27 +3672,27 @@ static void view_collection_real_notify_items_added (DataCollection* base, GeeIt
_tmp29_ = 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 3653 "ViewCollection.c"
+#line 3675 "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 3659 "ViewCollection.c"
+#line 3681 "ViewCollection.c"
}
#line 532 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (_object_it);
-#line 3663 "ViewCollection.c"
+#line 3685 "ViewCollection.c"
}
#line 552 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp30_ = added_visible;
#line 552 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (_tmp30_ != NULL) {
-#line 3669 "ViewCollection.c"
+#line 3691 "ViewCollection.c"
gboolean is_added = FALSE;
- GeeArrayList* _tmp31_ = NULL;
- gboolean _tmp32_ = FALSE;
- gboolean _tmp33_ = FALSE;
+ GeeArrayList* _tmp31_;
+ gboolean _tmp32_;
+ gboolean _tmp33_;
#line 553 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp31_ = added_visible;
#line 553 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -3681,15 +3703,15 @@ static void view_collection_real_notify_items_added (DataCollection* base, GeeIt
_tmp33_ = is_added;
#line 554 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_vala_assert (_tmp33_, "is_added");
-#line 3684 "ViewCollection.c"
+#line 3706 "ViewCollection.c"
}
#line 557 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp34_ = added_selected;
#line 557 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (_tmp34_ != NULL) {
-#line 3690 "ViewCollection.c"
- GeeArrayList* _tmp35_ = NULL;
- GeeArrayList* _tmp36_ = NULL;
+#line 3712 "ViewCollection.c"
+ GeeArrayList* _tmp35_;
+ GeeArrayList* _tmp36_;
#line 558 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp35_ = added_selected;
#line 558 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -3698,7 +3720,7 @@ static void view_collection_real_notify_items_added (DataCollection* base, GeeIt
_tmp36_ = 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 3701 "ViewCollection.c"
+#line 3723 "ViewCollection.c"
}
#line 562 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp37_ = added;
@@ -3708,26 +3730,26 @@ static void view_collection_real_notify_items_added (DataCollection* base, GeeIt
_g_object_unref0 (added_selected);
#line 528 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (added_visible);
-#line 3711 "ViewCollection.c"
+#line 3733 "ViewCollection.c"
}
static void view_collection_real_notify_items_removed (DataCollection* base, GeeIterable* removed) {
ViewCollection * self;
GeeArrayList* selected_removed = NULL;
- GeeArrayList* _tmp42_ = NULL;
- GeeIterable* _tmp44_ = NULL;
+ GeeArrayList* _tmp42_;
+ GeeIterable* _tmp44_;
#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 3726 "ViewCollection.c"
+#line 3748 "ViewCollection.c"
{
GeeIterator* _object_it = NULL;
- GeeIterable* _tmp0_ = NULL;
- GeeIterator* _tmp1_ = NULL;
+ GeeIterable* _tmp0_;
+ GeeIterator* _tmp1_;
#line 568 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp0_ = removed;
#line 568 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -3736,21 +3758,21 @@ static void view_collection_real_notify_items_removed (DataCollection* base, Gee
_object_it = _tmp1_;
#line 568 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
while (TRUE) {
-#line 3739 "ViewCollection.c"
- GeeIterator* _tmp2_ = NULL;
- gboolean _tmp3_ = FALSE;
+#line 3761 "ViewCollection.c"
+ GeeIterator* _tmp2_;
+ gboolean _tmp3_;
DataObject* object = NULL;
- GeeIterator* _tmp4_ = NULL;
- gpointer _tmp5_ = NULL;
+ GeeIterator* _tmp4_;
+ gpointer _tmp5_;
DataView* view = NULL;
- DataObject* _tmp6_ = NULL;
- DataView* _tmp7_ = NULL;
- GeeHashMap* _tmp8_ = NULL;
- DataView* _tmp9_ = NULL;
- DataSource* _tmp10_ = NULL;
- DataSource* _tmp11_ = NULL;
- gboolean _tmp12_ = FALSE;
- gboolean _tmp13_ = FALSE;
+ DataObject* _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;
#line 568 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -3759,7 +3781,7 @@ static void view_collection_real_notify_items_removed (DataCollection* base, Gee
if (!_tmp3_) {
#line 568 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
break;
-#line 3762 "ViewCollection.c"
+#line 3784 "ViewCollection.c"
}
#line 568 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp4_ = _object_it;
@@ -3789,20 +3811,20 @@ static void view_collection_real_notify_items_removed (DataCollection* base, Gee
_g_object_unref0 (_tmp11_);
#line 575 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (_tmp13_) {
-#line 3792 "ViewCollection.c"
+#line 3814 "ViewCollection.c"
gboolean is_removed = FALSE;
- GeeHashMap* _tmp14_ = NULL;
- DataView* _tmp15_ = NULL;
- DataSource* _tmp16_ = NULL;
- DataSource* _tmp17_ = NULL;
- gboolean _tmp18_ = FALSE;
- gboolean _tmp19_ = FALSE;
- gboolean _tmp20_ = FALSE;
- DataView* _tmp21_ = NULL;
- gboolean _tmp22_ = FALSE;
+ GeeHashMap* _tmp14_;
+ DataView* _tmp15_;
+ DataSource* _tmp16_;
+ DataSource* _tmp17_;
+ gboolean _tmp18_;
+ gboolean _tmp19_;
+ gboolean _tmp20_;
+ DataView* _tmp21_;
+ gboolean _tmp22_;
gboolean _tmp34_ = FALSE;
- DataView* _tmp35_ = NULL;
- gboolean _tmp36_ = FALSE;
+ DataView* _tmp35_;
+ gboolean _tmp36_;
#line 576 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp14_ = self->priv->source_map;
#line 576 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -3829,14 +3851,14 @@ static void view_collection_real_notify_items_removed (DataCollection* base, Gee
_tmp22_ = data_view_is_selected (_tmp21_);
#line 579 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (_tmp22_) {
-#line 3832 "ViewCollection.c"
- DataSet* _tmp23_ = NULL;
- DataView* _tmp24_ = NULL;
- gboolean _tmp25_ = FALSE;
- DataView* _tmp26_ = NULL;
- gboolean _tmp27_ = FALSE;
- DataView* _tmp28_ = NULL;
- gboolean _tmp29_ = FALSE;
+#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"
@@ -3855,23 +3877,23 @@ static void view_collection_real_notify_items_removed (DataCollection* base, Gee
_tmp29_ = data_view_is_visible (_tmp28_);
#line 583 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (_tmp29_) {
-#line 3858 "ViewCollection.c"
- GeeArrayList* _tmp30_ = NULL;
- GeeArrayList* _tmp32_ = NULL;
- DataView* _tmp33_ = NULL;
+#line 3880 "ViewCollection.c"
+ GeeArrayList* _tmp30_;
+ GeeArrayList* _tmp32_;
+ DataView* _tmp33_;
#line 584 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp30_ = selected_removed;
#line 584 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (_tmp30_ == NULL) {
-#line 3866 "ViewCollection.c"
- GeeArrayList* _tmp31_ = NULL;
+#line 3888 "ViewCollection.c"
+ GeeArrayList* _tmp31_;
#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);
#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 3874 "ViewCollection.c"
+#line 3896 "ViewCollection.c"
}
#line 587 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp32_ = selected_removed;
@@ -3879,7 +3901,7 @@ static void view_collection_real_notify_items_removed (DataCollection* base, Gee
_tmp33_ = 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 3882 "ViewCollection.c"
+#line 3904 "ViewCollection.c"
}
}
#line 591 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -3888,25 +3910,25 @@ static void view_collection_real_notify_items_removed (DataCollection* base, Gee
_tmp36_ = data_view_is_visible (_tmp35_);
#line 591 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (_tmp36_) {
-#line 3891 "ViewCollection.c"
- DataSet* _tmp37_ = NULL;
+#line 3913 "ViewCollection.c"
+ DataSet* _tmp37_;
#line 591 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp37_ = self->priv->visible;
#line 591 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp34_ = _tmp37_ != NULL;
-#line 3897 "ViewCollection.c"
+#line 3919 "ViewCollection.c"
} else {
#line 591 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp34_ = FALSE;
-#line 3901 "ViewCollection.c"
+#line 3923 "ViewCollection.c"
}
#line 591 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (_tmp34_) {
-#line 3905 "ViewCollection.c"
- DataSet* _tmp38_ = NULL;
- DataView* _tmp39_ = NULL;
- gboolean _tmp40_ = FALSE;
- gboolean _tmp41_ = FALSE;
+#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;
#line 592 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -3919,32 +3941,32 @@ static void view_collection_real_notify_items_removed (DataCollection* base, Gee
_tmp41_ = is_removed;
#line 593 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_vala_assert (_tmp41_, "is_removed");
-#line 3922 "ViewCollection.c"
+#line 3944 "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 3929 "ViewCollection.c"
+#line 3951 "ViewCollection.c"
}
#line 568 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (_object_it);
-#line 3933 "ViewCollection.c"
+#line 3955 "ViewCollection.c"
}
#line 598 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp42_ = selected_removed;
#line 598 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (_tmp42_ != NULL) {
-#line 3939 "ViewCollection.c"
- GeeArrayList* _tmp43_ = NULL;
+#line 3961 "ViewCollection.c"
+ GeeArrayList* _tmp43_;
#line 599 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp43_ = 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));
#line 604 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
view_collection_notify_selection_group_altered (self);
-#line 3947 "ViewCollection.c"
+#line 3969 "ViewCollection.c"
}
#line 607 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp44_ = removed;
@@ -3952,15 +3974,15 @@ static void view_collection_real_notify_items_removed (DataCollection* base, Gee
DATA_COLLECTION_CLASS (view_collection_parent_class)->notify_items_removed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), _tmp44_);
#line 566 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (selected_removed);
-#line 3955 "ViewCollection.c"
+#line 3977 "ViewCollection.c"
}
static void view_collection_filter_altered_items (ViewCollection* self, GeeCollection* views) {
GeeArrayList* to_show = NULL;
GeeArrayList* to_hide = NULL;
- GeeArrayList* _tmp20_ = NULL;
- GeeArrayList* _tmp22_ = NULL;
+ GeeArrayList* _tmp20_;
+ GeeArrayList* _tmp22_;
#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"
@@ -3969,11 +3991,11 @@ 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 3972 "ViewCollection.c"
+#line 3994 "ViewCollection.c"
{
GeeIterator* _view_it = NULL;
- GeeCollection* _tmp0_ = NULL;
- GeeIterator* _tmp1_ = NULL;
+ GeeCollection* _tmp0_;
+ GeeIterator* _tmp1_;
#line 619 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp0_ = views;
#line 619 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -3982,14 +4004,14 @@ static void view_collection_filter_altered_items (ViewCollection* self, GeeColle
_view_it = _tmp1_;
#line 619 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
while (TRUE) {
-#line 3985 "ViewCollection.c"
- GeeIterator* _tmp2_ = NULL;
- gboolean _tmp3_ = FALSE;
+#line 4007 "ViewCollection.c"
+ GeeIterator* _tmp2_;
+ gboolean _tmp3_;
DataView* view = NULL;
- GeeIterator* _tmp4_ = NULL;
- gpointer _tmp5_ = NULL;
- DataView* _tmp6_ = NULL;
- gboolean _tmp7_ = FALSE;
+ GeeIterator* _tmp4_;
+ gpointer _tmp5_;
+ DataView* _tmp6_;
+ gboolean _tmp7_;
#line 619 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp2_ = _view_it;
#line 619 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -3998,7 +4020,7 @@ static void view_collection_filter_altered_items (ViewCollection* self, GeeColle
if (!_tmp3_) {
#line 619 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
break;
-#line 4001 "ViewCollection.c"
+#line 4023 "ViewCollection.c"
}
#line 619 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp4_ = _view_it;
@@ -4012,32 +4034,32 @@ static void view_collection_filter_altered_items (ViewCollection* self, GeeColle
_tmp7_ = view_collection_is_in_filter (self, _tmp6_);
#line 620 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (_tmp7_) {
-#line 4015 "ViewCollection.c"
- DataView* _tmp8_ = NULL;
- gboolean _tmp9_ = FALSE;
+#line 4037 "ViewCollection.c"
+ DataView* _tmp8_;
+ gboolean _tmp9_;
#line 621 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp8_ = view;
#line 621 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp9_ = data_view_is_visible (_tmp8_);
#line 621 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (!_tmp9_) {
-#line 4024 "ViewCollection.c"
- GeeArrayList* _tmp10_ = NULL;
- GeeArrayList* _tmp12_ = NULL;
- DataView* _tmp13_ = NULL;
+#line 4046 "ViewCollection.c"
+ GeeArrayList* _tmp10_;
+ GeeArrayList* _tmp12_;
+ DataView* _tmp13_;
#line 622 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp10_ = to_show;
#line 622 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (_tmp10_ == NULL) {
-#line 4032 "ViewCollection.c"
- GeeArrayList* _tmp11_ = NULL;
+#line 4054 "ViewCollection.c"
+ GeeArrayList* _tmp11_;
#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);
#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 4040 "ViewCollection.c"
+#line 4062 "ViewCollection.c"
}
#line 625 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp12_ = to_show;
@@ -4045,34 +4067,34 @@ static void view_collection_filter_altered_items (ViewCollection* self, GeeColle
_tmp13_ = 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 4048 "ViewCollection.c"
+#line 4070 "ViewCollection.c"
}
} else {
- DataView* _tmp14_ = NULL;
- gboolean _tmp15_ = FALSE;
+ DataView* _tmp14_;
+ gboolean _tmp15_;
#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_);
#line 628 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (_tmp15_) {
-#line 4059 "ViewCollection.c"
- GeeArrayList* _tmp16_ = NULL;
- GeeArrayList* _tmp18_ = NULL;
- DataView* _tmp19_ = NULL;
+#line 4081 "ViewCollection.c"
+ GeeArrayList* _tmp16_;
+ GeeArrayList* _tmp18_;
+ DataView* _tmp19_;
#line 629 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp16_ = to_hide;
#line 629 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (_tmp16_ == NULL) {
-#line 4067 "ViewCollection.c"
- GeeArrayList* _tmp17_ = NULL;
+#line 4089 "ViewCollection.c"
+ GeeArrayList* _tmp17_;
#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);
#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 4075 "ViewCollection.c"
+#line 4097 "ViewCollection.c"
}
#line 632 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp18_ = to_hide;
@@ -4080,56 +4102,56 @@ static void view_collection_filter_altered_items (ViewCollection* self, GeeColle
_tmp19_ = 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 4083 "ViewCollection.c"
+#line 4105 "ViewCollection.c"
}
}
#line 619 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (view);
-#line 4088 "ViewCollection.c"
+#line 4110 "ViewCollection.c"
}
#line 619 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (_view_it);
-#line 4092 "ViewCollection.c"
+#line 4114 "ViewCollection.c"
}
#line 641 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp20_ = to_show;
#line 641 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (_tmp20_ != NULL) {
-#line 4098 "ViewCollection.c"
- GeeArrayList* _tmp21_ = NULL;
+#line 4120 "ViewCollection.c"
+ GeeArrayList* _tmp21_;
#line 642 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp21_ = 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 4104 "ViewCollection.c"
+#line 4126 "ViewCollection.c"
}
#line 644 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp22_ = to_hide;
#line 644 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (_tmp22_ != NULL) {
-#line 4110 "ViewCollection.c"
- GeeArrayList* _tmp23_ = NULL;
+#line 4132 "ViewCollection.c"
+ GeeArrayList* _tmp23_;
#line 645 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp23_ = 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 4116 "ViewCollection.c"
+#line 4138 "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 4122 "ViewCollection.c"
+#line 4144 "ViewCollection.c"
}
static void view_collection_real_items_altered (DataCollection* base, GeeMap* map) {
ViewCollection * self;
- GeeMap* _tmp0_ = NULL;
- GeeSet* _tmp1_ = NULL;
- GeeSet* _tmp2_ = NULL;
- GeeCollection* _tmp3_ = NULL;
- GeeMap* _tmp4_ = NULL;
+ GeeMap* _tmp0_;
+ GeeSet* _tmp1_;
+ GeeSet* _tmp2_;
+ GeeCollection* _tmp3_;
+ GeeMap* _tmp4_;
#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"
@@ -4150,22 +4172,22 @@ static void view_collection_real_items_altered (DataCollection* base, GeeMap* ma
_tmp4_ = map;
#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 4153 "ViewCollection.c"
+#line 4175 "ViewCollection.c"
}
static void view_collection_real_set_comparator (DataCollection* base, Comparator comparator, void* comparator_target, ComparatorPredicate predicate, void* predicate_target) {
ViewCollection * self;
- DataSet* _tmp0_ = NULL;
- Comparator _tmp1_ = NULL;
- void* _tmp1__target = NULL;
- ComparatorPredicate _tmp2_ = NULL;
- void* _tmp2__target = NULL;
- DataSet* _tmp3_ = NULL;
- Comparator _tmp7_ = NULL;
- void* _tmp7__target = NULL;
- ComparatorPredicate _tmp8_ = NULL;
- void* _tmp8__target = NULL;
+ DataSet* _tmp0_;
+ Comparator _tmp1_;
+ void* _tmp1__target;
+ ComparatorPredicate _tmp2_;
+ void* _tmp2__target;
+ DataSet* _tmp3_;
+ Comparator _tmp7_;
+ void* _tmp7__target;
+ ComparatorPredicate _tmp8_;
+ void* _tmp8__target;
#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"
@@ -4184,12 +4206,12 @@ static void view_collection_real_set_comparator (DataCollection* base, Comparato
_tmp3_ = self->priv->visible;
#line 657 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (_tmp3_ != NULL) {
-#line 4187 "ViewCollection.c"
- DataSet* _tmp4_ = NULL;
- Comparator _tmp5_ = NULL;
- void* _tmp5__target = NULL;
- ComparatorPredicate _tmp6_ = NULL;
- void* _tmp6__target = 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"
@@ -4202,7 +4224,7 @@ static void view_collection_real_set_comparator (DataCollection* base, Comparato
_tmp6__target = predicate_target;
#line 658 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
data_set_set_comparator (_tmp4_, _tmp5_, _tmp5__target, _tmp6_, _tmp6__target);
-#line 4205 "ViewCollection.c"
+#line 4227 "ViewCollection.c"
}
#line 660 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp7_ = comparator;
@@ -4214,14 +4236,14 @@ static void view_collection_real_set_comparator (DataCollection* base, Comparato
_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 4217 "ViewCollection.c"
+#line 4239 "ViewCollection.c"
}
static void view_collection_real_reset_comparator (DataCollection* base) {
ViewCollection * self;
- DataSet* _tmp0_ = NULL;
- DataSet* _tmp1_ = NULL;
+ DataSet* _tmp0_;
+ DataSet* _tmp1_;
#line 663 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIEW_COLLECTION, ViewCollection);
#line 664 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -4232,17 +4254,17 @@ 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 4235 "ViewCollection.c"
- DataSet* _tmp2_ = NULL;
+#line 4257 "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 4241 "ViewCollection.c"
+#line 4263 "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 4245 "ViewCollection.c"
+#line 4267 "ViewCollection.c"
}
@@ -4250,16 +4272,16 @@ static GeeCollection* view_collection_real_get_all (DataCollection* base) {
ViewCollection * self;
GeeCollection* result = NULL;
GeeCollection* _tmp0_ = NULL;
- DataSet* _tmp1_ = NULL;
+ DataSet* _tmp1_;
#line 671 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIEW_COLLECTION, ViewCollection);
#line 672 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp1_ = self->priv->visible;
#line 672 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (_tmp1_ != NULL) {
-#line 4260 "ViewCollection.c"
- DataSet* _tmp2_ = NULL;
- GeeList* _tmp3_ = NULL;
+#line 4282 "ViewCollection.c"
+ DataSet* _tmp2_;
+ GeeList* _tmp3_;
#line 672 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp2_ = self->priv->visible;
#line 672 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -4268,28 +4290,28 @@ 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 4271 "ViewCollection.c"
+#line 4293 "ViewCollection.c"
} else {
- GeeCollection* _tmp4_ = NULL;
+ GeeCollection* _tmp4_;
#line 672 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp4_ = DATA_COLLECTION_CLASS (view_collection_parent_class)->get_all (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection));
#line 672 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (_tmp0_);
#line 672 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp0_ = _tmp4_;
-#line 4280 "ViewCollection.c"
+#line 4302 "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 4286 "ViewCollection.c"
+#line 4308 "ViewCollection.c"
}
GeeCollection* view_collection_get_all_unfiltered (ViewCollection* self) {
GeeCollection* result = NULL;
- GeeCollection* _tmp0_ = NULL;
+ GeeCollection* _tmp0_;
#line 675 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_val_if_fail (IS_VIEW_COLLECTION (self), NULL);
#line 676 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -4298,7 +4320,7 @@ GeeCollection* view_collection_get_all_unfiltered (ViewCollection* self) {
result = _tmp0_;
#line 676 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return result;
-#line 4301 "ViewCollection.c"
+#line 4323 "ViewCollection.c"
}
@@ -4306,42 +4328,42 @@ static gint view_collection_real_get_count (DataCollection* base) {
ViewCollection * self;
gint result = 0;
gint _tmp0_ = 0;
- DataSet* _tmp1_ = NULL;
+ DataSet* _tmp1_;
#line 679 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIEW_COLLECTION, ViewCollection);
#line 680 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp1_ = self->priv->visible;
#line 680 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (_tmp1_ != NULL) {
-#line 4316 "ViewCollection.c"
- DataSet* _tmp2_ = NULL;
- gint _tmp3_ = 0;
+#line 4338 "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 4325 "ViewCollection.c"
+#line 4347 "ViewCollection.c"
} else {
- gint _tmp4_ = 0;
+ 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 4332 "ViewCollection.c"
+#line 4354 "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 4338 "ViewCollection.c"
+#line 4360 "ViewCollection.c"
}
gint view_collection_get_unfiltered_count (ViewCollection* self) {
gint result = 0;
- gint _tmp0_ = 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"
@@ -4350,7 +4372,7 @@ gint view_collection_get_unfiltered_count (ViewCollection* self) {
result = _tmp0_;
#line 684 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return result;
-#line 4353 "ViewCollection.c"
+#line 4375 "ViewCollection.c"
}
@@ -4358,17 +4380,17 @@ static DataObject* view_collection_real_get_at (DataCollection* base, gint index
ViewCollection * self;
DataObject* result = NULL;
DataObject* _tmp0_ = NULL;
- DataSet* _tmp1_ = NULL;
+ DataSet* _tmp1_;
#line 687 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIEW_COLLECTION, ViewCollection);
#line 688 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp1_ = self->priv->visible;
#line 688 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (_tmp1_ != NULL) {
-#line 4368 "ViewCollection.c"
- DataSet* _tmp2_ = NULL;
- gint _tmp3_ = 0;
- DataObject* _tmp4_ = NULL;
+#line 4390 "ViewCollection.c"
+ DataSet* _tmp2_;
+ gint _tmp3_;
+ DataObject* _tmp4_;
#line 688 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp2_ = self->priv->visible;
#line 688 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -4379,10 +4401,10 @@ static DataObject* view_collection_real_get_at (DataCollection* base, gint index
_g_object_unref0 (_tmp0_);
#line 688 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp0_ = _tmp4_;
-#line 4382 "ViewCollection.c"
+#line 4404 "ViewCollection.c"
} else {
- gint _tmp5_ = 0;
- DataObject* _tmp6_ = NULL;
+ gint _tmp5_;
+ DataObject* _tmp6_;
#line 688 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp5_ = index;
#line 688 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -4391,13 +4413,13 @@ static DataObject* view_collection_real_get_at (DataCollection* base, gint index
_g_object_unref0 (_tmp0_);
#line 688 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp0_ = _tmp6_;
-#line 4394 "ViewCollection.c"
+#line 4416 "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 4400 "ViewCollection.c"
+#line 4422 "ViewCollection.c"
}
@@ -4405,7 +4427,7 @@ static gint view_collection_real_index_of (DataCollection* base, DataObject* obj
ViewCollection * self;
gint result = 0;
gint _tmp0_ = 0;
- DataSet* _tmp1_ = NULL;
+ DataSet* _tmp1_;
#line 691 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIEW_COLLECTION, ViewCollection);
#line 691 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -4414,10 +4436,10 @@ 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 4417 "ViewCollection.c"
- DataSet* _tmp2_ = NULL;
- DataObject* _tmp3_ = NULL;
- gint _tmp4_ = 0;
+#line 4439 "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"
@@ -4426,33 +4448,33 @@ static gint view_collection_real_index_of (DataCollection* base, DataObject* obj
_tmp4_ = data_set_index_of (_tmp2_, _tmp3_);
#line 692 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp0_ = _tmp4_;
-#line 4429 "ViewCollection.c"
+#line 4451 "ViewCollection.c"
} else {
- DataObject* _tmp5_ = NULL;
- gint _tmp6_ = 0;
+ 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 4439 "ViewCollection.c"
+#line 4461 "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 4445 "ViewCollection.c"
+#line 4467 "ViewCollection.c"
}
static gboolean view_collection_real_contains (DataCollection* base, DataObject* object) {
ViewCollection * self;
gboolean result = FALSE;
- DataObject* _tmp0_ = NULL;
- gboolean _tmp1_ = FALSE;
- DataObject* _tmp2_ = NULL;
- gboolean _tmp3_ = 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"
@@ -4467,7 +4489,7 @@ static gboolean view_collection_real_contains (DataCollection* base, DataObject*
result = FALSE;
#line 699 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return result;
-#line 4470 "ViewCollection.c"
+#line 4492 "ViewCollection.c"
}
#line 702 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp2_ = object;
@@ -4477,39 +4499,39 @@ static gboolean view_collection_real_contains (DataCollection* base, DataObject*
result = _tmp3_;
#line 702 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return result;
-#line 4480 "ViewCollection.c"
+#line 4502 "ViewCollection.c"
}
static DataView* view_collection_real_get_first (ViewCollection* self) {
DataView* result = NULL;
DataView* _tmp0_ = NULL;
- gint _tmp1_ = 0;
+ 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));
#line 706 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (_tmp1_ > 0) {
-#line 4492 "ViewCollection.c"
- DataObject* _tmp2_ = NULL;
+#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);
#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 4500 "ViewCollection.c"
+#line 4522 "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 4506 "ViewCollection.c"
+#line 4528 "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 4512 "ViewCollection.c"
+#line 4534 "ViewCollection.c"
}
@@ -4518,7 +4540,7 @@ DataView* view_collection_get_first (ViewCollection* self) {
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 4521 "ViewCollection.c"
+#line 4543 "ViewCollection.c"
}
@@ -4534,12 +4556,12 @@ DataView* view_collection_get_first (ViewCollection* self) {
*/
static DataView* view_collection_real_get_first_unrejected (ViewCollection* self) {
DataView* result = NULL;
- gint _tmp0_ = 0;
+ gint _tmp0_;
DataView* dv = NULL;
- DataView* _tmp1_ = NULL;
+ DataView* _tmp1_;
gint num_views = 0;
- gint _tmp2_ = 0;
- DataView* _tmp17_ = NULL;
+ 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));
#line 721 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -4548,7 +4570,7 @@ static DataView* view_collection_real_get_first_unrejected (ViewCollection* self
result = NULL;
#line 722 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return result;
-#line 4551 "ViewCollection.c"
+#line 4573 "ViewCollection.c"
}
#line 725 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp1_ = view_collection_get_first (self);
@@ -4560,23 +4582,23 @@ static DataView* view_collection_real_get_first_unrejected (ViewCollection* self
num_views = _tmp2_;
#line 728 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
while (TRUE) {
-#line 4563 "ViewCollection.c"
+#line 4585 "ViewCollection.c"
gboolean _tmp3_ = FALSE;
- DataView* _tmp4_ = NULL;
+ DataView* _tmp4_;
MediaSource* tmp = NULL;
- DataView* _tmp8_ = NULL;
- DataSource* _tmp9_ = NULL;
- MediaSource* _tmp10_ = NULL;
+ DataView* _tmp8_;
+ DataSource* _tmp9_;
+ MediaSource* _tmp10_;
gboolean _tmp11_ = FALSE;
- MediaSource* _tmp12_ = NULL;
+ MediaSource* _tmp12_;
#line 728 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp4_ = dv;
#line 728 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (_tmp4_ != NULL) {
-#line 4576 "ViewCollection.c"
- DataView* _tmp5_ = NULL;
- gint _tmp6_ = 0;
- gint _tmp7_ = 0;
+#line 4598 "ViewCollection.c"
+ DataView* _tmp5_;
+ gint _tmp6_;
+ gint _tmp7_;
#line 728 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp5_ = dv;
#line 728 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -4585,17 +4607,17 @@ static DataView* view_collection_real_get_first_unrejected (ViewCollection* self
_tmp7_ = num_views;
#line 728 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp3_ = _tmp6_ < (_tmp7_ - 1);
-#line 4588 "ViewCollection.c"
+#line 4610 "ViewCollection.c"
} else {
#line 728 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp3_ = FALSE;
-#line 4592 "ViewCollection.c"
+#line 4614 "ViewCollection.c"
}
#line 728 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (!_tmp3_) {
#line 728 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
break;
-#line 4598 "ViewCollection.c"
+#line 4620 "ViewCollection.c"
}
#line 729 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp8_ = dv;
@@ -4607,7 +4629,7 @@ static DataView* view_collection_real_get_first_unrejected (ViewCollection* self
if (_tmp10_ == NULL) {
#line 729 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (_tmp9_);
-#line 4610 "ViewCollection.c"
+#line 4632 "ViewCollection.c"
}
#line 729 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
tmp = _tmp10_;
@@ -4615,20 +4637,20 @@ static DataView* view_collection_real_get_first_unrejected (ViewCollection* self
_tmp12_ = tmp;
#line 731 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (_tmp12_ != NULL) {
-#line 4618 "ViewCollection.c"
- MediaSource* _tmp13_ = NULL;
- Rating _tmp14_ = 0;
+#line 4640 "ViewCollection.c"
+ MediaSource* _tmp13_;
+ Rating _tmp14_;
#line 731 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp13_ = tmp;
#line 731 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp14_ = media_source_get_rating (_tmp13_);
#line 731 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp11_ = _tmp14_ != RATING_REJECTED;
-#line 4627 "ViewCollection.c"
+#line 4649 "ViewCollection.c"
} else {
#line 731 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp11_ = FALSE;
-#line 4631 "ViewCollection.c"
+#line 4653 "ViewCollection.c"
}
#line 731 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (_tmp11_) {
@@ -4638,10 +4660,10 @@ static DataView* view_collection_real_get_first_unrejected (ViewCollection* self
_g_object_unref0 (tmp);
#line 733 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return result;
-#line 4641 "ViewCollection.c"
+#line 4663 "ViewCollection.c"
} else {
- DataView* _tmp15_ = NULL;
- DataView* _tmp16_ = NULL;
+ DataView* _tmp15_;
+ DataView* _tmp16_;
#line 735 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp15_ = dv;
#line 735 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -4650,11 +4672,11 @@ static DataView* view_collection_real_get_first_unrejected (ViewCollection* self
_g_object_unref0 (dv);
#line 735 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
dv = _tmp16_;
-#line 4653 "ViewCollection.c"
+#line 4675 "ViewCollection.c"
}
#line 728 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (tmp);
-#line 4657 "ViewCollection.c"
+#line 4679 "ViewCollection.c"
}
#line 741 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp17_ = view_collection_get_first (self);
@@ -4664,7 +4686,7 @@ static DataView* view_collection_real_get_first_unrejected (ViewCollection* self
_g_object_unref0 (dv);
#line 741 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return result;
-#line 4667 "ViewCollection.c"
+#line 4689 "ViewCollection.c"
}
@@ -4673,21 +4695,21 @@ DataView* view_collection_get_first_unrejected (ViewCollection* self) {
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 4676 "ViewCollection.c"
+#line 4698 "ViewCollection.c"
}
static DataView* view_collection_real_get_last (ViewCollection* self) {
DataView* result = NULL;
DataView* _tmp0_ = NULL;
- gint _tmp1_ = 0;
+ 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 4688 "ViewCollection.c"
- gint _tmp2_ = 0;
- DataObject* _tmp3_ = NULL;
+#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));
#line 745 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -4696,19 +4718,19 @@ static DataView* view_collection_real_get_last (ViewCollection* self) {
_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 4699 "ViewCollection.c"
+#line 4721 "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 4705 "ViewCollection.c"
+#line 4727 "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 4711 "ViewCollection.c"
+#line 4733 "ViewCollection.c"
}
@@ -4717,22 +4739,22 @@ DataView* view_collection_get_last (ViewCollection* self) {
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 4720 "ViewCollection.c"
+#line 4742 "ViewCollection.c"
}
static DataView* view_collection_real_get_next (ViewCollection* self, DataView* view) {
DataView* result = NULL;
- gint _tmp0_ = 0;
+ gint _tmp0_;
gint index = 0;
- DataView* _tmp1_ = NULL;
- gint _tmp2_ = 0;
- gint _tmp3_ = 0;
- gint _tmp4_ = 0;
- gint _tmp5_ = 0;
- gint _tmp6_ = 0;
- gint _tmp7_ = 0;
- DataObject* _tmp8_ = NULL;
+ DataView* _tmp1_;
+ gint _tmp2_;
+ gint _tmp3_;
+ gint _tmp4_;
+ gint _tmp5_;
+ gint _tmp6_;
+ gint _tmp7_;
+ DataObject* _tmp8_;
#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"
@@ -4743,7 +4765,7 @@ static DataView* view_collection_real_get_next (ViewCollection* self, DataView*
result = NULL;
#line 750 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return result;
-#line 4746 "ViewCollection.c"
+#line 4768 "ViewCollection.c"
}
#line 752 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp1_ = view;
@@ -4759,7 +4781,7 @@ static DataView* view_collection_real_get_next (ViewCollection* self, DataView*
result = NULL;
#line 754 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return result;
-#line 4762 "ViewCollection.c"
+#line 4784 "ViewCollection.c"
}
#line 756 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp4_ = index;
@@ -4773,7 +4795,7 @@ static DataView* view_collection_real_get_next (ViewCollection* self, DataView*
if (_tmp5_ >= _tmp6_) {
#line 758 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
index = 0;
-#line 4776 "ViewCollection.c"
+#line 4798 "ViewCollection.c"
}
#line 760 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp7_ = index;
@@ -4783,7 +4805,7 @@ static DataView* view_collection_real_get_next (ViewCollection* self, DataView*
result = G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_VIEW, DataView);
#line 760 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return result;
-#line 4786 "ViewCollection.c"
+#line 4808 "ViewCollection.c"
}
@@ -4792,21 +4814,21 @@ DataView* view_collection_get_next (ViewCollection* self, DataView* view) {
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 4795 "ViewCollection.c"
+#line 4817 "ViewCollection.c"
}
static DataView* view_collection_real_get_previous (ViewCollection* self, DataView* view) {
DataView* result = NULL;
- gint _tmp0_ = 0;
+ gint _tmp0_;
gint index = 0;
- DataView* _tmp1_ = NULL;
- gint _tmp2_ = 0;
- gint _tmp3_ = 0;
- gint _tmp4_ = 0;
- gint _tmp5_ = 0;
- gint _tmp7_ = 0;
- DataObject* _tmp8_ = NULL;
+ DataView* _tmp1_;
+ gint _tmp2_;
+ gint _tmp3_;
+ gint _tmp4_;
+ gint _tmp5_;
+ gint _tmp7_;
+ DataObject* _tmp8_;
#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"
@@ -4817,7 +4839,7 @@ static DataView* view_collection_real_get_previous (ViewCollection* self, DataVi
result = NULL;
#line 765 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return result;
-#line 4820 "ViewCollection.c"
+#line 4842 "ViewCollection.c"
}
#line 767 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp1_ = view;
@@ -4833,7 +4855,7 @@ static DataView* view_collection_real_get_previous (ViewCollection* self, DataVi
result = NULL;
#line 769 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return result;
-#line 4836 "ViewCollection.c"
+#line 4858 "ViewCollection.c"
}
#line 771 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp4_ = index;
@@ -4843,13 +4865,13 @@ static DataView* view_collection_real_get_previous (ViewCollection* self, DataVi
_tmp5_ = index;
#line 772 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (_tmp5_ < 0) {
-#line 4846 "ViewCollection.c"
- gint _tmp6_ = 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));
#line 773 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
index = _tmp6_ - 1;
-#line 4852 "ViewCollection.c"
+#line 4874 "ViewCollection.c"
}
#line 775 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp7_ = index;
@@ -4859,7 +4881,7 @@ static DataView* view_collection_real_get_previous (ViewCollection* self, DataVi
result = G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_VIEW, DataView);
#line 775 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return result;
-#line 4862 "ViewCollection.c"
+#line 4884 "ViewCollection.c"
}
@@ -4868,24 +4890,24 @@ DataView* view_collection_get_previous (ViewCollection* self, DataView* view) {
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 4871 "ViewCollection.c"
+#line 4893 "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_ = NULL;
- DataView* _tmp1_ = NULL;
- DataView* _tmp2_ = NULL;
+ DataSource* _tmp0_;
+ DataView* _tmp1_;
+ DataView* _tmp2_;
DataView* next_view = NULL;
- DataView* _tmp3_ = NULL;
- DataView* _tmp4_ = NULL;
+ DataView* _tmp3_;
+ DataView* _tmp4_;
DataView* prev_view = NULL;
- DataView* _tmp19_ = NULL;
- DataView* _tmp20_ = NULL;
+ DataView* _tmp19_;
+ DataView* _tmp20_;
#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"
@@ -4916,25 +4938,25 @@ 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 4919 "ViewCollection.c"
+#line 4941 "ViewCollection.c"
} else {
#line 785 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (_vala_next);
-#line 4923 "ViewCollection.c"
+#line 4945 "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 4929 "ViewCollection.c"
+#line 4951 "ViewCollection.c"
} else {
#line 785 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (_vala_prev);
-#line 4933 "ViewCollection.c"
+#line 4955 "ViewCollection.c"
}
#line 785 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return result;
-#line 4937 "ViewCollection.c"
+#line 4959 "ViewCollection.c"
}
#line 787 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp3_ = home_view;
@@ -4944,13 +4966,13 @@ gboolean view_collection_get_immediate_neighbors (ViewCollection* self, DataSour
next_view = _tmp4_;
#line 788 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
while (TRUE) {
-#line 4947 "ViewCollection.c"
- DataView* _tmp5_ = NULL;
- DataView* _tmp6_ = NULL;
+#line 4969 "ViewCollection.c"
+ DataView* _tmp5_;
+ DataView* _tmp6_;
gboolean _tmp7_ = FALSE;
- const gchar* _tmp8_ = NULL;
- DataView* _tmp17_ = NULL;
- DataView* _tmp18_ = NULL;
+ const gchar* _tmp8_;
+ DataView* _tmp17_;
+ DataView* _tmp18_;
#line 788 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp5_ = next_view;
#line 788 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -4959,7 +4981,7 @@ gboolean view_collection_get_immediate_neighbors (ViewCollection* self, DataSour
if (!(_tmp5_ != _tmp6_)) {
#line 788 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
break;
-#line 4962 "ViewCollection.c"
+#line 4984 "ViewCollection.c"
}
#line 789 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp8_ = type_selector;
@@ -4967,14 +4989,14 @@ gboolean view_collection_get_immediate_neighbors (ViewCollection* self, DataSour
if (_tmp8_ == NULL) {
#line 789 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp7_ = TRUE;
-#line 4970 "ViewCollection.c"
+#line 4992 "ViewCollection.c"
} else {
- DataView* _tmp9_ = NULL;
- DataSource* _tmp10_ = NULL;
- DataSource* _tmp11_ = NULL;
- gchar* _tmp12_ = NULL;
- gchar* _tmp13_ = NULL;
- const gchar* _tmp14_ = NULL;
+ DataView* _tmp9_;
+ DataSource* _tmp10_;
+ DataSource* _tmp11_;
+ gchar* _tmp12_;
+ gchar* _tmp13_;
+ const gchar* _tmp14_;
#line 789 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp9_ = next_view;
#line 789 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -4993,13 +5015,13 @@ gboolean view_collection_get_immediate_neighbors (ViewCollection* self, DataSour
_g_free0 (_tmp13_);
#line 789 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (_tmp11_);
-#line 4996 "ViewCollection.c"
+#line 5018 "ViewCollection.c"
}
#line 789 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (_tmp7_) {
-#line 5000 "ViewCollection.c"
- DataView* _tmp15_ = NULL;
- DataSource* _tmp16_ = NULL;
+#line 5022 "ViewCollection.c"
+ DataView* _tmp15_;
+ DataSource* _tmp16_;
#line 790 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp15_ = next_view;
#line 790 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -5010,7 +5032,7 @@ gboolean view_collection_get_immediate_neighbors (ViewCollection* self, DataSour
_vala_next = _tmp16_;
#line 791 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
break;
-#line 5013 "ViewCollection.c"
+#line 5035 "ViewCollection.c"
}
#line 793 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp17_ = next_view;
@@ -5020,7 +5042,7 @@ gboolean view_collection_get_immediate_neighbors (ViewCollection* self, DataSour
_g_object_unref0 (next_view);
#line 793 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
next_view = _tmp18_;
-#line 5023 "ViewCollection.c"
+#line 5045 "ViewCollection.c"
}
#line 796 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp19_ = home_view;
@@ -5030,13 +5052,13 @@ gboolean view_collection_get_immediate_neighbors (ViewCollection* self, DataSour
prev_view = _tmp20_;
#line 797 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
while (TRUE) {
-#line 5033 "ViewCollection.c"
- DataView* _tmp21_ = NULL;
- DataView* _tmp22_ = NULL;
+#line 5055 "ViewCollection.c"
+ DataView* _tmp21_;
+ DataView* _tmp22_;
gboolean _tmp23_ = FALSE;
- const gchar* _tmp24_ = NULL;
- DataView* _tmp33_ = NULL;
- DataView* _tmp34_ = NULL;
+ const gchar* _tmp24_;
+ DataView* _tmp33_;
+ DataView* _tmp34_;
#line 797 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp21_ = prev_view;
#line 797 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -5045,7 +5067,7 @@ gboolean view_collection_get_immediate_neighbors (ViewCollection* self, DataSour
if (!(_tmp21_ != _tmp22_)) {
#line 797 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
break;
-#line 5048 "ViewCollection.c"
+#line 5070 "ViewCollection.c"
}
#line 798 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp24_ = type_selector;
@@ -5053,14 +5075,14 @@ gboolean view_collection_get_immediate_neighbors (ViewCollection* self, DataSour
if (_tmp24_ == NULL) {
#line 798 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp23_ = TRUE;
-#line 5056 "ViewCollection.c"
+#line 5078 "ViewCollection.c"
} else {
- DataView* _tmp25_ = NULL;
- DataSource* _tmp26_ = NULL;
- DataSource* _tmp27_ = NULL;
- gchar* _tmp28_ = NULL;
- gchar* _tmp29_ = NULL;
- const gchar* _tmp30_ = NULL;
+ DataView* _tmp25_;
+ DataSource* _tmp26_;
+ DataSource* _tmp27_;
+ gchar* _tmp28_;
+ gchar* _tmp29_;
+ const gchar* _tmp30_;
#line 798 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp25_ = prev_view;
#line 798 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -5079,13 +5101,13 @@ gboolean view_collection_get_immediate_neighbors (ViewCollection* self, DataSour
_g_free0 (_tmp29_);
#line 798 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (_tmp27_);
-#line 5082 "ViewCollection.c"
+#line 5104 "ViewCollection.c"
}
#line 798 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (_tmp23_) {
-#line 5086 "ViewCollection.c"
- DataView* _tmp31_ = NULL;
- DataSource* _tmp32_ = NULL;
+#line 5108 "ViewCollection.c"
+ DataView* _tmp31_;
+ DataSource* _tmp32_;
#line 799 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp31_ = prev_view;
#line 799 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -5096,7 +5118,7 @@ gboolean view_collection_get_immediate_neighbors (ViewCollection* self, DataSour
_vala_prev = _tmp32_;
#line 800 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
break;
-#line 5099 "ViewCollection.c"
+#line 5121 "ViewCollection.c"
}
#line 802 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp33_ = prev_view;
@@ -5106,7 +5128,7 @@ gboolean view_collection_get_immediate_neighbors (ViewCollection* self, DataSour
_g_object_unref0 (prev_view);
#line 802 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
prev_view = _tmp34_;
-#line 5109 "ViewCollection.c"
+#line 5131 "ViewCollection.c"
}
#line 805 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
result = TRUE;
@@ -5120,43 +5142,43 @@ 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 5123 "ViewCollection.c"
+#line 5145 "ViewCollection.c"
} else {
#line 805 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (_vala_next);
-#line 5127 "ViewCollection.c"
+#line 5149 "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 5133 "ViewCollection.c"
+#line 5155 "ViewCollection.c"
} else {
#line 805 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (_vala_prev);
-#line 5137 "ViewCollection.c"
+#line 5159 "ViewCollection.c"
}
#line 805 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return result;
-#line 5141 "ViewCollection.c"
+#line 5163 "ViewCollection.c"
}
GeeSet* view_collection_get_extended_neighbors (ViewCollection* self, DataSource* home, const gchar* typename) {
GeeSet* result = NULL;
GeeSet* neighbors = NULL;
- GeeHashSet* _tmp0_ = NULL;
+ GeeHashSet* _tmp0_;
DataSource* next = NULL;
DataSource* prev = NULL;
- DataSource* _tmp1_ = NULL;
- const gchar* _tmp2_ = NULL;
+ DataSource* _tmp1_;
+ const gchar* _tmp2_;
DataSource* _tmp3_ = NULL;
DataSource* _tmp4_ = NULL;
- gboolean _tmp5_ = FALSE;
- DataSource* _tmp6_ = NULL;
- DataSource* _tmp16_ = NULL;
- GeeSet* _tmp26_ = NULL;
- DataSource* _tmp27_ = NULL;
+ gboolean _tmp5_;
+ DataSource* _tmp6_;
+ DataSource* _tmp16_;
+ GeeSet* _tmp26_;
+ DataSource* _tmp27_;
#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"
@@ -5189,22 +5211,22 @@ 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 5192 "ViewCollection.c"
+#line 5214 "ViewCollection.c"
}
#line 819 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp6_ = next;
#line 819 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (_tmp6_ != NULL) {
-#line 5198 "ViewCollection.c"
- GeeSet* _tmp7_ = NULL;
- DataSource* _tmp8_ = NULL;
+#line 5220 "ViewCollection.c"
+ GeeSet* _tmp7_;
+ DataSource* _tmp8_;
DataSource* next_next = NULL;
DataSource* next_prev = NULL;
- DataSource* _tmp9_ = NULL;
- const gchar* _tmp10_ = NULL;
+ DataSource* _tmp9_;
+ const gchar* _tmp10_;
DataSource* _tmp11_ = NULL;
DataSource* _tmp12_ = NULL;
- DataSource* _tmp13_ = NULL;
+ DataSource* _tmp13_;
#line 820 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp7_ = neighbors;
#line 820 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -5229,37 +5251,37 @@ GeeSet* view_collection_get_extended_neighbors (ViewCollection* self, DataSource
_tmp13_ = next_next;
#line 826 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (_tmp13_ != NULL) {
-#line 5232 "ViewCollection.c"
- GeeSet* _tmp14_ = NULL;
- DataSource* _tmp15_ = NULL;
+#line 5254 "ViewCollection.c"
+ GeeSet* _tmp14_;
+ DataSource* _tmp15_;
#line 827 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp14_ = neighbors;
#line 827 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp15_ = 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 5241 "ViewCollection.c"
+#line 5263 "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 5247 "ViewCollection.c"
+#line 5269 "ViewCollection.c"
}
#line 831 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp16_ = prev;
#line 831 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (_tmp16_ != NULL) {
-#line 5253 "ViewCollection.c"
- GeeSet* _tmp17_ = NULL;
- DataSource* _tmp18_ = NULL;
+#line 5275 "ViewCollection.c"
+ GeeSet* _tmp17_;
+ DataSource* _tmp18_;
DataSource* next_prev = NULL;
DataSource* prev_prev = NULL;
- DataSource* _tmp19_ = NULL;
- const gchar* _tmp20_ = NULL;
+ DataSource* _tmp19_;
+ const gchar* _tmp20_;
DataSource* _tmp21_ = NULL;
DataSource* _tmp22_ = NULL;
- DataSource* _tmp23_ = NULL;
+ DataSource* _tmp23_;
#line 832 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp17_ = neighbors;
#line 832 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -5284,22 +5306,22 @@ GeeSet* view_collection_get_extended_neighbors (ViewCollection* self, DataSource
_tmp23_ = prev_prev;
#line 838 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (_tmp23_ != NULL) {
-#line 5287 "ViewCollection.c"
- GeeSet* _tmp24_ = NULL;
- DataSource* _tmp25_ = NULL;
+#line 5309 "ViewCollection.c"
+ GeeSet* _tmp24_;
+ DataSource* _tmp25_;
#line 839 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp24_ = neighbors;
#line 839 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp25_ = 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 5296 "ViewCollection.c"
+#line 5318 "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 5302 "ViewCollection.c"
+#line 5324 "ViewCollection.c"
}
#line 843 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp26_ = neighbors;
@@ -5315,19 +5337,19 @@ 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 5318 "ViewCollection.c"
+#line 5340 "ViewCollection.c"
}
static void view_collection_add_many_selected (ViewCollection* self, GeeCollection* views) {
- GeeCollection* _tmp0_ = NULL;
- gint _tmp1_ = 0;
- gint _tmp2_ = 0;
+ GeeCollection* _tmp0_;
+ gint _tmp1_;
+ gint _tmp2_;
gboolean added = FALSE;
- DataSet* _tmp11_ = NULL;
- GeeCollection* _tmp12_ = NULL;
- gboolean _tmp13_ = FALSE;
- gboolean _tmp14_ = FALSE;
+ DataSet* _tmp11_;
+ GeeCollection* _tmp12_;
+ gboolean _tmp13_;
+ gboolean _tmp14_;
#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"
@@ -5342,12 +5364,12 @@ static void view_collection_add_many_selected (ViewCollection* self, GeeCollecti
if (_tmp2_ == 0) {
#line 852 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return;
-#line 5345 "ViewCollection.c"
+#line 5367 "ViewCollection.c"
}
{
GeeIterator* _view_it = NULL;
- GeeCollection* _tmp3_ = NULL;
- GeeIterator* _tmp4_ = NULL;
+ GeeCollection* _tmp3_;
+ GeeIterator* _tmp4_;
#line 854 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp3_ = views;
#line 854 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -5356,14 +5378,14 @@ static void view_collection_add_many_selected (ViewCollection* self, GeeCollecti
_view_it = _tmp4_;
#line 854 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
while (TRUE) {
-#line 5359 "ViewCollection.c"
- GeeIterator* _tmp5_ = NULL;
- gboolean _tmp6_ = FALSE;
+#line 5381 "ViewCollection.c"
+ GeeIterator* _tmp5_;
+ gboolean _tmp6_;
DataView* view = NULL;
- GeeIterator* _tmp7_ = NULL;
- gpointer _tmp8_ = NULL;
- DataView* _tmp9_ = NULL;
- gboolean _tmp10_ = FALSE;
+ GeeIterator* _tmp7_;
+ gpointer _tmp8_;
+ DataView* _tmp9_;
+ gboolean _tmp10_;
#line 854 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp5_ = _view_it;
#line 854 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -5372,7 +5394,7 @@ static void view_collection_add_many_selected (ViewCollection* self, GeeCollecti
if (!_tmp6_) {
#line 854 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
break;
-#line 5375 "ViewCollection.c"
+#line 5397 "ViewCollection.c"
}
#line 854 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp7_ = _view_it;
@@ -5388,11 +5410,11 @@ static void view_collection_add_many_selected (ViewCollection* self, GeeCollecti
_vala_assert (_tmp10_, "view.is_visible()");
#line 854 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (view);
-#line 5391 "ViewCollection.c"
+#line 5413 "ViewCollection.c"
}
#line 854 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (_view_it);
-#line 5395 "ViewCollection.c"
+#line 5417 "ViewCollection.c"
}
#line 857 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp11_ = self->priv->selected;
@@ -5406,19 +5428,19 @@ static void view_collection_add_many_selected (ViewCollection* self, GeeCollecti
_tmp14_ = added;
#line 858 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_vala_assert (_tmp14_, "added");
-#line 5409 "ViewCollection.c"
+#line 5431 "ViewCollection.c"
}
static void view_collection_remove_many_selected (ViewCollection* self, GeeCollection* views) {
- GeeCollection* _tmp0_ = NULL;
- gint _tmp1_ = 0;
- gint _tmp2_ = 0;
+ GeeCollection* _tmp0_;
+ gint _tmp1_;
+ gint _tmp2_;
gboolean removed = FALSE;
- DataSet* _tmp3_ = NULL;
- GeeCollection* _tmp4_ = NULL;
- gboolean _tmp5_ = FALSE;
- gboolean _tmp6_ = FALSE;
+ DataSet* _tmp3_;
+ GeeCollection* _tmp4_;
+ gboolean _tmp5_;
+ gboolean _tmp6_;
#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"
@@ -5433,7 +5455,7 @@ static void view_collection_remove_many_selected (ViewCollection* self, GeeColle
if (_tmp2_ == 0) {
#line 863 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return;
-#line 5436 "ViewCollection.c"
+#line 5458 "ViewCollection.c"
}
#line 865 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp3_ = self->priv->selected;
@@ -5447,7 +5469,7 @@ static void view_collection_remove_many_selected (ViewCollection* self, GeeColle
_tmp6_ = removed;
#line 866 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_vala_assert (_tmp6_, "removed");
-#line 5450 "ViewCollection.c"
+#line 5472 "ViewCollection.c"
}
@@ -5456,18 +5478,18 @@ static gboolean _view_collection_select_item_marked_action (DataObject* object,
result = view_collection_select_item ((ViewCollection*) self, object, user);
#line 872 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return result;
-#line 5459 "ViewCollection.c"
+#line 5481 "ViewCollection.c"
}
void view_collection_select_marked (ViewCollection* self, Marker* marker) {
GeeArrayList* selected = NULL;
- GeeArrayList* _tmp0_ = NULL;
- Marker* _tmp1_ = NULL;
- GeeArrayList* _tmp2_ = NULL;
- GeeArrayList* _tmp3_ = NULL;
- gint _tmp4_ = 0;
- gint _tmp5_ = 0;
+ GeeArrayList* _tmp0_;
+ Marker* _tmp1_;
+ GeeArrayList* _tmp2_;
+ GeeArrayList* _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"
@@ -5490,9 +5512,9 @@ void view_collection_select_marked (ViewCollection* self, Marker* marker) {
_tmp5_ = _tmp4_;
#line 874 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (_tmp5_ > 0) {
-#line 5493 "ViewCollection.c"
- GeeArrayList* _tmp6_ = NULL;
- GeeArrayList* _tmp7_ = NULL;
+#line 5515 "ViewCollection.c"
+ GeeArrayList* _tmp6_;
+ GeeArrayList* _tmp7_;
#line 875 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp6_ = selected;
#line 875 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -5501,17 +5523,17 @@ void view_collection_select_marked (ViewCollection* self, Marker* marker) {
_tmp7_ = 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 5504 "ViewCollection.c"
+#line 5526 "ViewCollection.c"
}
#line 870 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (selected);
-#line 5508 "ViewCollection.c"
+#line 5530 "ViewCollection.c"
}
void view_collection_select_all (ViewCollection* self) {
Marker* marker = NULL;
- Marker* _tmp0_ = NULL;
+ Marker* _tmp0_;
#line 881 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_if_fail (IS_VIEW_COLLECTION (self));
#line 882 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -5524,20 +5546,20 @@ 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 5527 "ViewCollection.c"
+#line 5549 "ViewCollection.c"
}
static gboolean view_collection_select_item (ViewCollection* self, DataObject* object, GObject* user) {
gboolean result = FALSE;
DataView* view = NULL;
- DataObject* _tmp0_ = NULL;
- DataView* _tmp1_ = NULL;
- DataView* _tmp2_ = NULL;
- gboolean _tmp3_ = FALSE;
- DataView* _tmp9_ = NULL;
- DataView* _tmp10_ = NULL;
- gboolean _tmp11_ = FALSE;
+ DataObject* _tmp0_;
+ DataView* _tmp1_;
+ DataView* _tmp2_;
+ gboolean _tmp3_;
+ DataView* _tmp9_;
+ DataView* _tmp10_;
+ gboolean _tmp11_;
#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"
@@ -5556,19 +5578,19 @@ static gboolean view_collection_select_item (ViewCollection* self, DataObject* o
_tmp3_ = data_view_is_selected (_tmp2_);
#line 889 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (_tmp3_) {
-#line 5559 "ViewCollection.c"
- DataView* _tmp4_ = NULL;
- gboolean _tmp5_ = FALSE;
+#line 5581 "ViewCollection.c"
+ DataView* _tmp4_;
+ gboolean _tmp5_;
#line 890 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp4_ = view;
#line 890 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp5_ = data_view_is_visible (_tmp4_);
#line 890 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (_tmp5_) {
-#line 5568 "ViewCollection.c"
- DataSet* _tmp6_ = NULL;
- DataView* _tmp7_ = NULL;
- gboolean _tmp8_ = FALSE;
+#line 5590 "ViewCollection.c"
+ DataSet* _tmp6_;
+ DataView* _tmp7_;
+ gboolean _tmp8_;
#line 891 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp6_ = self->priv->selected;
#line 891 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -5577,7 +5599,7 @@ static gboolean view_collection_select_item (ViewCollection* self, DataObject* o
_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 5580 "ViewCollection.c"
+#line 5602 "ViewCollection.c"
}
#line 893 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
result = TRUE;
@@ -5585,7 +5607,7 @@ 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 5588 "ViewCollection.c"
+#line 5610 "ViewCollection.c"
}
#line 896 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp9_ = view;
@@ -5597,16 +5619,16 @@ static gboolean view_collection_select_item (ViewCollection* self, DataObject* o
_tmp11_ = data_view_is_visible (_tmp10_);
#line 900 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (_tmp11_) {
-#line 5600 "ViewCollection.c"
- GObject* _tmp12_ = NULL;
- DataView* _tmp13_ = NULL;
+#line 5622 "ViewCollection.c"
+ GObject* _tmp12_;
+ DataView* _tmp13_;
#line 901 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp12_ = user;
#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 5609 "ViewCollection.c"
+#line 5631 "ViewCollection.c"
}
#line 903 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
result = TRUE;
@@ -5614,7 +5636,7 @@ 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 5617 "ViewCollection.c"
+#line 5639 "ViewCollection.c"
}
@@ -5623,18 +5645,18 @@ static gboolean _view_collection_unselect_item_marked_action (DataObject* object
result = view_collection_unselect_item ((ViewCollection*) self, object, user);
#line 909 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return result;
-#line 5626 "ViewCollection.c"
+#line 5648 "ViewCollection.c"
}
void view_collection_unselect_marked (ViewCollection* self, Marker* marker) {
GeeArrayList* unselected = NULL;
- GeeArrayList* _tmp0_ = NULL;
- Marker* _tmp1_ = NULL;
- GeeArrayList* _tmp2_ = NULL;
- GeeArrayList* _tmp3_ = NULL;
- gint _tmp4_ = 0;
- gint _tmp5_ = 0;
+ GeeArrayList* _tmp0_;
+ Marker* _tmp1_;
+ GeeArrayList* _tmp2_;
+ GeeArrayList* _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"
@@ -5657,9 +5679,9 @@ void view_collection_unselect_marked (ViewCollection* self, Marker* marker) {
_tmp5_ = _tmp4_;
#line 911 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (_tmp5_ > 0) {
-#line 5660 "ViewCollection.c"
- GeeArrayList* _tmp6_ = NULL;
- GeeArrayList* _tmp7_ = NULL;
+#line 5682 "ViewCollection.c"
+ GeeArrayList* _tmp6_;
+ GeeArrayList* _tmp7_;
#line 912 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp6_ = unselected;
#line 912 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -5668,23 +5690,23 @@ void view_collection_unselect_marked (ViewCollection* self, Marker* marker) {
_tmp7_ = 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 5671 "ViewCollection.c"
+#line 5693 "ViewCollection.c"
}
#line 907 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (unselected);
-#line 5675 "ViewCollection.c"
+#line 5697 "ViewCollection.c"
}
void view_collection_unselect_all (ViewCollection* self) {
- DataSet* _tmp0_ = NULL;
- gint _tmp1_ = 0;
+ DataSet* _tmp0_;
+ gint _tmp1_;
Marker* marker = NULL;
- Marker* _tmp2_ = NULL;
- Marker* _tmp3_ = NULL;
- GeeList* _tmp4_ = NULL;
- GeeList* _tmp5_ = NULL;
- Marker* _tmp6_ = NULL;
+ Marker* _tmp2_;
+ Marker* _tmp3_;
+ GeeList* _tmp4_;
+ GeeList* _tmp5_;
+ Marker* _tmp6_;
#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"
@@ -5695,7 +5717,7 @@ void view_collection_unselect_all (ViewCollection* self) {
if (_tmp1_ == 0) {
#line 920 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return;
-#line 5698 "ViewCollection.c"
+#line 5720 "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));
@@ -5717,14 +5739,14 @@ void view_collection_unselect_all (ViewCollection* self) {
view_collection_unselect_marked (self, _tmp6_);
#line 918 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (marker);
-#line 5720 "ViewCollection.c"
+#line 5742 "ViewCollection.c"
}
void view_collection_unselect_all_but (ViewCollection* self, DataView* exception) {
Marker* marker = NULL;
- Marker* _tmp0_ = NULL;
- Marker* _tmp15_ = NULL;
+ Marker* _tmp0_;
+ Marker* _tmp15_;
#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"
@@ -5733,13 +5755,13 @@ 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 5736 "ViewCollection.c"
+#line 5758 "ViewCollection.c"
{
GeeIterator* _object_it = NULL;
- GeeCollection* _tmp1_ = NULL;
- GeeCollection* _tmp2_ = NULL;
- GeeIterator* _tmp3_ = NULL;
- GeeIterator* _tmp4_ = NULL;
+ GeeCollection* _tmp1_;
+ GeeCollection* _tmp2_;
+ GeeIterator* _tmp3_;
+ GeeIterator* _tmp4_;
#line 931 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp1_ = data_collection_get_all (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection));
#line 931 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -5754,17 +5776,17 @@ 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 5757 "ViewCollection.c"
- GeeIterator* _tmp5_ = NULL;
- gboolean _tmp6_ = FALSE;
+#line 5779 "ViewCollection.c"
+ GeeIterator* _tmp5_;
+ gboolean _tmp6_;
DataObject* object = NULL;
- GeeIterator* _tmp7_ = NULL;
- gpointer _tmp8_ = NULL;
+ GeeIterator* _tmp7_;
+ gpointer _tmp8_;
DataView* view = NULL;
- DataObject* _tmp9_ = NULL;
- DataView* _tmp10_ = NULL;
- DataView* _tmp11_ = NULL;
- DataView* _tmp12_ = NULL;
+ DataObject* _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"
@@ -5773,7 +5795,7 @@ void view_collection_unselect_all_but (ViewCollection* self, DataView* exception
if (!_tmp6_) {
#line 931 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
break;
-#line 5776 "ViewCollection.c"
+#line 5798 "ViewCollection.c"
}
#line 931 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp7_ = _object_it;
@@ -5793,26 +5815,26 @@ void view_collection_unselect_all_but (ViewCollection* self, DataView* exception
_tmp12_ = exception;
#line 933 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (_tmp11_ != _tmp12_) {
-#line 5796 "ViewCollection.c"
- Marker* _tmp13_ = NULL;
- DataView* _tmp14_ = NULL;
+#line 5818 "ViewCollection.c"
+ Marker* _tmp13_;
+ DataView* _tmp14_;
#line 934 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp13_ = marker;
#line 934 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp14_ = 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 5805 "ViewCollection.c"
+#line 5827 "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 5811 "ViewCollection.c"
+#line 5833 "ViewCollection.c"
}
#line 931 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (_object_it);
-#line 5815 "ViewCollection.c"
+#line 5837 "ViewCollection.c"
}
#line 937 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp15_ = marker;
@@ -5820,20 +5842,20 @@ void view_collection_unselect_all_but (ViewCollection* self, DataView* exception
view_collection_unselect_marked (self, _tmp15_);
#line 929 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (marker);
-#line 5823 "ViewCollection.c"
+#line 5845 "ViewCollection.c"
}
static gboolean view_collection_unselect_item (ViewCollection* self, DataObject* object, GObject* user) {
gboolean result = FALSE;
DataView* view = NULL;
- DataObject* _tmp0_ = NULL;
- DataView* _tmp1_ = NULL;
- DataView* _tmp2_ = NULL;
- gboolean _tmp3_ = FALSE;
- DataView* _tmp7_ = NULL;
- GObject* _tmp8_ = NULL;
- DataView* _tmp9_ = NULL;
+ DataObject* _tmp0_;
+ DataView* _tmp1_;
+ DataView* _tmp2_;
+ gboolean _tmp3_;
+ DataView* _tmp7_;
+ GObject* _tmp8_;
+ DataView* _tmp9_;
#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"
@@ -5852,10 +5874,10 @@ static gboolean view_collection_unselect_item (ViewCollection* self, DataObject*
_tmp3_ = data_view_is_selected (_tmp2_);
#line 942 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (!_tmp3_) {
-#line 5855 "ViewCollection.c"
- DataSet* _tmp4_ = NULL;
- DataView* _tmp5_ = NULL;
- gboolean _tmp6_ = FALSE;
+#line 5877 "ViewCollection.c"
+ DataSet* _tmp4_;
+ DataView* _tmp5_;
+ gboolean _tmp6_;
#line 943 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp4_ = self->priv->selected;
#line 943 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -5870,7 +5892,7 @@ static gboolean view_collection_unselect_item (ViewCollection* self, DataObject*
_g_object_unref0 (view);
#line 945 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return result;
-#line 5873 "ViewCollection.c"
+#line 5895 "ViewCollection.c"
}
#line 948 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp7_ = view;
@@ -5888,17 +5910,17 @@ static gboolean view_collection_unselect_item (ViewCollection* self, DataObject*
_g_object_unref0 (view);
#line 951 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return result;
-#line 5891 "ViewCollection.c"
+#line 5913 "ViewCollection.c"
}
void view_collection_unselect_and_select_marked (ViewCollection* self, Marker* unselect, Marker* select) {
GeeArrayList* unselected = NULL;
- GeeArrayList* _tmp0_ = NULL;
- Marker* _tmp1_ = NULL;
+ GeeArrayList* _tmp0_;
+ Marker* _tmp1_;
GeeArrayList* selected = NULL;
- GeeArrayList* _tmp2_ = NULL;
- Marker* _tmp3_ = NULL;
+ GeeArrayList* _tmp2_;
+ Marker* _tmp3_;
#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"
@@ -5931,7 +5953,7 @@ 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 5934 "ViewCollection.c"
+#line 5956 "ViewCollection.c"
}
@@ -5940,18 +5962,18 @@ static gboolean _view_collection_toggle_item_marked_action (DataObject* object,
result = view_collection_toggle_item ((ViewCollection*) self, object, user);
#line 973 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return result;
-#line 5943 "ViewCollection.c"
+#line 5965 "ViewCollection.c"
}
void view_collection_toggle_marked (ViewCollection* self, Marker* marker) {
ViewCollectionToggleLists* lists = NULL;
- ViewCollectionToggleLists* _tmp0_ = NULL;
- Marker* _tmp1_ = NULL;
- GeeArrayList* _tmp2_ = NULL;
- GeeArrayList* _tmp3_ = NULL;
- GeeArrayList* _tmp4_ = NULL;
- GeeArrayList* _tmp5_ = NULL;
+ ViewCollectionToggleLists* _tmp0_;
+ Marker* _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"
@@ -5980,20 +6002,20 @@ void view_collection_toggle_marked (ViewCollection* self, Marker* marker) {
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));
#line 971 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (lists);
-#line 5983 "ViewCollection.c"
+#line 6005 "ViewCollection.c"
}
static gboolean view_collection_toggle_item (ViewCollection* self, DataObject* object, GObject* user) {
gboolean result = FALSE;
DataView* view = NULL;
- DataObject* _tmp0_ = NULL;
- DataView* _tmp1_ = NULL;
+ DataObject* _tmp0_;
+ DataView* _tmp1_;
ViewCollectionToggleLists* lists = NULL;
- GObject* _tmp2_ = NULL;
- ViewCollectionToggleLists* _tmp3_ = NULL;
- DataView* _tmp4_ = NULL;
- gboolean _tmp5_ = FALSE;
+ GObject* _tmp2_;
+ ViewCollectionToggleLists* _tmp3_;
+ DataView* _tmp4_;
+ gboolean _tmp5_;
#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"
@@ -6018,19 +6040,19 @@ static gboolean view_collection_toggle_item (ViewCollection* self, DataObject* o
_tmp5_ = data_view_internal_toggle (_tmp4_);
#line 990 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (_tmp5_) {
-#line 6021 "ViewCollection.c"
- DataView* _tmp6_ = NULL;
- gboolean _tmp7_ = FALSE;
+#line 6043 "ViewCollection.c"
+ DataView* _tmp6_;
+ gboolean _tmp7_;
#line 991 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp6_ = view;
#line 991 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp7_ = data_view_is_visible (_tmp6_);
#line 991 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (_tmp7_) {
-#line 6030 "ViewCollection.c"
- ViewCollectionToggleLists* _tmp8_ = NULL;
- GeeArrayList* _tmp9_ = NULL;
- DataView* _tmp10_ = NULL;
+#line 6052 "ViewCollection.c"
+ ViewCollectionToggleLists* _tmp8_;
+ GeeArrayList* _tmp9_;
+ DataView* _tmp10_;
#line 992 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp8_ = lists;
#line 992 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -6039,12 +6061,12 @@ static gboolean view_collection_toggle_item (ViewCollection* self, DataObject* o
_tmp10_ = 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 6042 "ViewCollection.c"
+#line 6064 "ViewCollection.c"
}
} else {
- ViewCollectionToggleLists* _tmp11_ = NULL;
- GeeArrayList* _tmp12_ = NULL;
- DataView* _tmp13_ = NULL;
+ ViewCollectionToggleLists* _tmp11_;
+ GeeArrayList* _tmp12_;
+ DataView* _tmp13_;
#line 994 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp11_ = lists;
#line 994 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -6053,7 +6075,7 @@ static gboolean view_collection_toggle_item (ViewCollection* self, DataObject* o
_tmp13_ = 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 6056 "ViewCollection.c"
+#line 6078 "ViewCollection.c"
}
#line 997 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
result = TRUE;
@@ -6063,14 +6085,14 @@ 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 6066 "ViewCollection.c"
+#line 6088 "ViewCollection.c"
}
gint view_collection_get_selected_count (ViewCollection* self) {
gint result = 0;
- DataSet* _tmp0_ = NULL;
- gint _tmp1_ = 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"
@@ -6081,14 +6103,14 @@ gint view_collection_get_selected_count (ViewCollection* self) {
result = _tmp1_;
#line 1001 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return result;
-#line 6084 "ViewCollection.c"
+#line 6106 "ViewCollection.c"
}
GeeList* view_collection_get_selected (ViewCollection* self) {
GeeList* result = NULL;
- DataSet* _tmp0_ = NULL;
- GeeList* _tmp1_ = NULL;
+ DataSet* _tmp0_;
+ GeeList* _tmp1_;
#line 1004 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_val_if_fail (IS_VIEW_COLLECTION (self), NULL);
#line 1005 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -6099,15 +6121,15 @@ 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 6102 "ViewCollection.c"
+#line 6124 "ViewCollection.c"
}
DataView* view_collection_get_selected_at (ViewCollection* self, gint index) {
DataView* result = NULL;
- DataSet* _tmp0_ = NULL;
- gint _tmp1_ = 0;
- DataObject* _tmp2_ = NULL;
+ DataSet* _tmp0_;
+ gint _tmp1_;
+ DataObject* _tmp2_;
#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"
@@ -6120,14 +6142,14 @@ DataView* view_collection_get_selected_at (ViewCollection* self, gint index) {
result = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_DATA_VIEW, DataView);
#line 1009 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return result;
-#line 6123 "ViewCollection.c"
+#line 6145 "ViewCollection.c"
}
static gboolean view_collection_is_visible (ViewCollection* self, DataView* view) {
gboolean result = FALSE;
gboolean _tmp0_ = FALSE;
- DataSet* _tmp1_ = NULL;
+ DataSet* _tmp1_;
#line 1012 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_val_if_fail (IS_VIEW_COLLECTION (self), FALSE);
#line 1012 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -6136,10 +6158,10 @@ 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 6139 "ViewCollection.c"
- DataSet* _tmp2_ = NULL;
- DataView* _tmp3_ = NULL;
- gboolean _tmp4_ = FALSE;
+#line 6161 "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"
@@ -6148,29 +6170,29 @@ static gboolean view_collection_is_visible (ViewCollection* self, DataView* view
_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 6151 "ViewCollection.c"
+#line 6173 "ViewCollection.c"
} else {
#line 1013 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp0_ = TRUE;
-#line 6155 "ViewCollection.c"
+#line 6177 "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 6161 "ViewCollection.c"
+#line 6183 "ViewCollection.c"
}
static gboolean view_collection_add_many_visible (ViewCollection* self, GeeCollection* many) {
gboolean result = FALSE;
- DataSet* _tmp0_ = NULL;
- DataSet* _tmp1_ = NULL;
- GeeCollection* _tmp2_ = NULL;
- gboolean _tmp3_ = FALSE;
- DataSet* _tmp4_ = NULL;
- gint _tmp5_ = 0;
- gint _tmp6_ = 0;
+ DataSet* _tmp0_;
+ DataSet* _tmp1_;
+ GeeCollection* _tmp2_;
+ gboolean _tmp3_;
+ DataSet* _tmp4_;
+ gint _tmp5_;
+ gint _tmp6_;
#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"
@@ -6183,7 +6205,7 @@ 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 6186 "ViewCollection.c"
+#line 6208 "ViewCollection.c"
}
#line 1020 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp1_ = self->priv->visible;
@@ -6197,7 +6219,7 @@ static gboolean view_collection_add_many_visible (ViewCollection* self, GeeColle
result = FALSE;
#line 1021 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return result;
-#line 6200 "ViewCollection.c"
+#line 6222 "ViewCollection.c"
}
#line 1024 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp4_ = self->priv->visible;
@@ -6211,36 +6233,36 @@ static gboolean view_collection_add_many_visible (ViewCollection* self, GeeColle
_data_set_unref0 (self->priv->visible);
#line 1025 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
self->priv->visible = NULL;
-#line 6214 "ViewCollection.c"
+#line 6236 "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 6220 "ViewCollection.c"
+#line 6242 "ViewCollection.c"
}
static void view_collection_hide_items (ViewCollection* self, GeeList* to_hide) {
GeeArrayList* unselected = NULL;
- GeeArrayList* _tmp0_ = NULL;
+ GeeArrayList* _tmp0_;
gint count = 0;
- GeeList* _tmp1_ = NULL;
- gint _tmp2_ = 0;
- gint _tmp3_ = 0;
- DataSet* _tmp22_ = NULL;
+ GeeList* _tmp1_;
+ gint _tmp2_;
+ gint _tmp3_;
+ DataSet* _tmp22_;
gboolean removed = FALSE;
- DataSet* _tmp24_ = NULL;
- GeeList* _tmp25_ = NULL;
- gboolean _tmp26_ = FALSE;
- gboolean _tmp27_ = FALSE;
- GeeArrayList* _tmp28_ = NULL;
- GeeArrayList* _tmp29_ = NULL;
- gint _tmp30_ = 0;
- gint _tmp31_ = 0;
- GeeList* _tmp33_ = NULL;
- gint _tmp34_ = 0;
- gint _tmp35_ = 0;
+ DataSet* _tmp24_;
+ GeeList* _tmp25_;
+ gboolean _tmp26_;
+ gboolean _tmp27_;
+ GeeArrayList* _tmp28_;
+ GeeArrayList* _tmp29_;
+ gint _tmp30_;
+ gint _tmp31_;
+ GeeList* _tmp33_;
+ gint _tmp34_;
+ gint _tmp35_;
#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"
@@ -6257,39 +6279,39 @@ static void view_collection_hide_items (ViewCollection* self, GeeList* to_hide)
_tmp3_ = _tmp2_;
#line 1034 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
count = _tmp3_;
-#line 6260 "ViewCollection.c"
+#line 6282 "ViewCollection.c"
{
gint ctr = 0;
#line 1035 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
ctr = 0;
-#line 6265 "ViewCollection.c"
+#line 6287 "ViewCollection.c"
{
gboolean _tmp4_ = FALSE;
#line 1035 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp4_ = TRUE;
#line 1035 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
while (TRUE) {
-#line 6272 "ViewCollection.c"
- gint _tmp6_ = 0;
- gint _tmp7_ = 0;
+#line 6294 "ViewCollection.c"
+ gint _tmp6_;
+ gint _tmp7_;
DataView* view = NULL;
- GeeList* _tmp8_ = NULL;
- gint _tmp9_ = 0;
- gpointer _tmp10_ = NULL;
- DataView* _tmp11_ = NULL;
- gboolean _tmp12_ = FALSE;
- DataView* _tmp13_ = NULL;
- gboolean _tmp14_ = FALSE;
- DataView* _tmp21_ = NULL;
+ GeeList* _tmp8_;
+ gint _tmp9_;
+ gpointer _tmp10_;
+ DataView* _tmp11_;
+ gboolean _tmp12_;
+ DataView* _tmp13_;
+ gboolean _tmp14_;
+ DataView* _tmp21_;
#line 1035 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (!_tmp4_) {
-#line 6286 "ViewCollection.c"
- gint _tmp5_ = 0;
+#line 6308 "ViewCollection.c"
+ gint _tmp5_;
#line 1035 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp5_ = ctr;
#line 1035 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
ctr = _tmp5_ + 1;
-#line 6292 "ViewCollection.c"
+#line 6314 "ViewCollection.c"
}
#line 1035 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp4_ = FALSE;
@@ -6301,7 +6323,7 @@ static void view_collection_hide_items (ViewCollection* self, GeeList* to_hide)
if (!(_tmp6_ < _tmp7_)) {
#line 1035 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
break;
-#line 6304 "ViewCollection.c"
+#line 6326 "ViewCollection.c"
}
#line 1036 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp8_ = to_hide;
@@ -6323,10 +6345,10 @@ static void view_collection_hide_items (ViewCollection* self, GeeList* to_hide)
_tmp14_ = data_view_is_selected (_tmp13_);
#line 1039 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (_tmp14_) {
-#line 6326 "ViewCollection.c"
- DataView* _tmp15_ = NULL;
- GeeArrayList* _tmp16_ = NULL;
- DataView* _tmp17_ = NULL;
+#line 6348 "ViewCollection.c"
+ DataView* _tmp15_;
+ GeeArrayList* _tmp16_;
+ DataView* _tmp17_;
#line 1040 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp15_ = view;
#line 1040 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -6337,11 +6359,11 @@ static void view_collection_hide_items (ViewCollection* self, GeeList* to_hide)
_tmp17_ = 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 6340 "ViewCollection.c"
+#line 6362 "ViewCollection.c"
} else {
- DataSet* _tmp18_ = NULL;
- DataView* _tmp19_ = NULL;
- gboolean _tmp20_ = FALSE;
+ DataSet* _tmp18_;
+ DataView* _tmp19_;
+ gboolean _tmp20_;
#line 1043 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp18_ = self->priv->selected;
#line 1043 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -6350,7 +6372,7 @@ static void view_collection_hide_items (ViewCollection* self, GeeList* to_hide)
_tmp20_ = data_set_contains (_tmp18_, G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, TYPE_DATA_OBJECT, DataObject));
#line 1043 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_vala_assert (!_tmp20_, "!selected.contains(view)");
-#line 6353 "ViewCollection.c"
+#line 6375 "ViewCollection.c"
}
#line 1046 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp21_ = view;
@@ -6358,7 +6380,7 @@ static void view_collection_hide_items (ViewCollection* self, GeeList* to_hide)
data_view_internal_set_visible (_tmp21_, FALSE);
#line 1035 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (view);
-#line 6361 "ViewCollection.c"
+#line 6383 "ViewCollection.c"
}
}
}
@@ -6366,15 +6388,15 @@ static void view_collection_hide_items (ViewCollection* self, GeeList* to_hide)
_tmp22_ = self->priv->visible;
#line 1049 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (_tmp22_ == NULL) {
-#line 6369 "ViewCollection.c"
- DataSet* _tmp23_ = NULL;
+#line 6391 "ViewCollection.c"
+ DataSet* _tmp23_;
#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));
#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 6377 "ViewCollection.c"
+#line 6399 "ViewCollection.c"
}
#line 1054 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp24_ = self->priv->visible;
@@ -6400,13 +6422,13 @@ static void view_collection_hide_items (ViewCollection* self, GeeList* to_hide)
_tmp31_ = _tmp30_;
#line 1059 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (_tmp31_ > 0) {
-#line 6403 "ViewCollection.c"
- GeeArrayList* _tmp32_ = NULL;
+#line 6425 "ViewCollection.c"
+ GeeArrayList* _tmp32_;
#line 1060 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp32_ = 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 6409 "ViewCollection.c"
+#line 6431 "ViewCollection.c"
}
#line 1062 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp33_ = to_hide;
@@ -6416,9 +6438,9 @@ static void view_collection_hide_items (ViewCollection* self, GeeList* to_hide)
_tmp35_ = _tmp34_;
#line 1062 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (_tmp35_ > 0) {
-#line 6419 "ViewCollection.c"
- GeeList* _tmp36_ = NULL;
- GeeList* _tmp37_ = NULL;
+#line 6441 "ViewCollection.c"
+ GeeList* _tmp36_;
+ GeeList* _tmp37_;
#line 1063 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp36_ = to_hide;
#line 1063 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -6427,29 +6449,29 @@ static void view_collection_hide_items (ViewCollection* self, GeeList* to_hide)
_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 6430 "ViewCollection.c"
+#line 6452 "ViewCollection.c"
}
#line 1031 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (unselected);
-#line 6434 "ViewCollection.c"
+#line 6456 "ViewCollection.c"
}
static void view_collection_show_items (ViewCollection* self, GeeList* to_show) {
GeeArrayList* added_selected = NULL;
- GeeArrayList* _tmp0_ = NULL;
+ GeeArrayList* _tmp0_;
gint count = 0;
- GeeList* _tmp1_ = NULL;
- gint _tmp2_ = 0;
- gint _tmp3_ = 0;
+ GeeList* _tmp1_;
+ gint _tmp2_;
+ gint _tmp3_;
gboolean added = FALSE;
- GeeList* _tmp21_ = NULL;
- gboolean _tmp22_ = FALSE;
- gboolean _tmp23_ = FALSE;
- GeeArrayList* _tmp24_ = NULL;
- GeeList* _tmp25_ = NULL;
- gint _tmp26_ = 0;
- gint _tmp27_ = 0;
+ GeeList* _tmp21_;
+ gboolean _tmp22_;
+ gboolean _tmp23_;
+ GeeArrayList* _tmp24_;
+ GeeList* _tmp25_;
+ gint _tmp26_;
+ gint _tmp27_;
#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"
@@ -6466,39 +6488,39 @@ static void view_collection_show_items (ViewCollection* self, GeeList* to_show)
_tmp3_ = _tmp2_;
#line 1072 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
count = _tmp3_;
-#line 6469 "ViewCollection.c"
+#line 6491 "ViewCollection.c"
{
gint ctr = 0;
#line 1073 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
ctr = 0;
-#line 6474 "ViewCollection.c"
+#line 6496 "ViewCollection.c"
{
gboolean _tmp4_ = FALSE;
#line 1073 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp4_ = TRUE;
#line 1073 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
while (TRUE) {
-#line 6481 "ViewCollection.c"
- gint _tmp6_ = 0;
- gint _tmp7_ = 0;
+#line 6503 "ViewCollection.c"
+ gint _tmp6_;
+ gint _tmp7_;
DataView* view = NULL;
- GeeList* _tmp8_ = NULL;
- gint _tmp9_ = 0;
- gpointer _tmp10_ = NULL;
- DataView* _tmp11_ = NULL;
- gboolean _tmp12_ = FALSE;
- DataView* _tmp13_ = NULL;
- DataView* _tmp14_ = NULL;
- gboolean _tmp15_ = FALSE;
+ GeeList* _tmp8_;
+ gint _tmp9_;
+ gpointer _tmp10_;
+ DataView* _tmp11_;
+ gboolean _tmp12_;
+ DataView* _tmp13_;
+ DataView* _tmp14_;
+ gboolean _tmp15_;
#line 1073 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (!_tmp4_) {
-#line 6495 "ViewCollection.c"
- gint _tmp5_ = 0;
+#line 6517 "ViewCollection.c"
+ gint _tmp5_;
#line 1073 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp5_ = ctr;
#line 1073 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
ctr = _tmp5_ + 1;
-#line 6501 "ViewCollection.c"
+#line 6523 "ViewCollection.c"
}
#line 1073 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp4_ = FALSE;
@@ -6510,7 +6532,7 @@ static void view_collection_show_items (ViewCollection* self, GeeList* to_show)
if (!(_tmp6_ < _tmp7_)) {
#line 1073 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
break;
-#line 6513 "ViewCollection.c"
+#line 6535 "ViewCollection.c"
}
#line 1074 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp8_ = to_show;
@@ -6536,12 +6558,12 @@ static void view_collection_show_items (ViewCollection* self, GeeList* to_show)
_tmp15_ = data_view_is_selected (_tmp14_);
#line 1080 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (_tmp15_) {
-#line 6539 "ViewCollection.c"
- DataSet* _tmp16_ = NULL;
- DataView* _tmp17_ = NULL;
- gboolean _tmp18_ = FALSE;
- GeeArrayList* _tmp19_ = NULL;
- DataView* _tmp20_ = NULL;
+#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;
#line 1081 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -6556,11 +6578,11 @@ static void view_collection_show_items (ViewCollection* self, GeeList* to_show)
_tmp20_ = 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 6559 "ViewCollection.c"
+#line 6581 "ViewCollection.c"
}
#line 1073 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (view);
-#line 6563 "ViewCollection.c"
+#line 6585 "ViewCollection.c"
}
}
}
@@ -6586,9 +6608,9 @@ static void view_collection_show_items (ViewCollection* self, GeeList* to_show)
_tmp27_ = _tmp26_;
#line 1091 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (_tmp27_ > 0) {
-#line 6589 "ViewCollection.c"
- GeeList* _tmp28_ = NULL;
- GeeList* _tmp29_ = NULL;
+#line 6611 "ViewCollection.c"
+ GeeList* _tmp28_;
+ GeeList* _tmp29_;
#line 1092 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp28_ = to_show;
#line 1092 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -6597,20 +6619,20 @@ static void view_collection_show_items (ViewCollection* self, GeeList* to_show)
_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 6600 "ViewCollection.c"
+#line 6622 "ViewCollection.c"
}
#line 1069 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (added_selected);
-#line 6604 "ViewCollection.c"
+#line 6626 "ViewCollection.c"
}
gboolean view_collection_has_view_for_source (ViewCollection* self, DataSource* source) {
gboolean result = FALSE;
- DataSource* _tmp0_ = NULL;
- DataView* _tmp1_ = NULL;
- DataView* _tmp2_ = NULL;
- gboolean _tmp3_ = FALSE;
+ DataSource* _tmp0_;
+ DataView* _tmp1_;
+ DataView* _tmp2_;
+ gboolean _tmp3_;
#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"
@@ -6629,15 +6651,15 @@ gboolean view_collection_has_view_for_source (ViewCollection* self, DataSource*
result = _tmp3_;
#line 1099 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return result;
-#line 6632 "ViewCollection.c"
+#line 6654 "ViewCollection.c"
}
DataView* view_collection_get_view_for_source (ViewCollection* self, DataSource* source) {
DataView* result = NULL;
- GeeHashMap* _tmp0_ = NULL;
- DataSource* _tmp1_ = NULL;
- gpointer _tmp2_ = NULL;
+ GeeHashMap* _tmp0_;
+ DataSource* _tmp1_;
+ gpointer _tmp2_;
#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"
@@ -6652,16 +6674,16 @@ DataView* view_collection_get_view_for_source (ViewCollection* self, DataSource*
result = (DataView*) _tmp2_;
#line 1104 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return result;
-#line 6655 "ViewCollection.c"
+#line 6677 "ViewCollection.c"
}
gboolean view_collection_has_view_for_source_with_filtered (ViewCollection* self, DataSource* source) {
gboolean result = FALSE;
- DataSource* _tmp0_ = NULL;
- DataView* _tmp1_ = NULL;
- DataView* _tmp2_ = NULL;
- gboolean _tmp3_ = FALSE;
+ DataSource* _tmp0_;
+ DataView* _tmp1_;
+ DataView* _tmp2_;
+ gboolean _tmp3_;
#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"
@@ -6680,18 +6702,18 @@ gboolean view_collection_has_view_for_source_with_filtered (ViewCollection* self
result = _tmp3_;
#line 1109 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return result;
-#line 6683 "ViewCollection.c"
+#line 6705 "ViewCollection.c"
}
DataView* view_collection_get_view_for_source_filtered (ViewCollection* self, DataSource* source) {
DataView* result = NULL;
DataView* view = NULL;
- GeeHashMap* _tmp0_ = NULL;
- DataSource* _tmp1_ = NULL;
- gpointer _tmp2_ = NULL;
+ GeeHashMap* _tmp0_;
+ DataSource* _tmp1_;
+ gpointer _tmp2_;
gboolean _tmp3_ = FALSE;
- DataView* _tmp4_ = NULL;
+ DataView* _tmp4_;
#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"
@@ -6708,20 +6730,20 @@ DataView* view_collection_get_view_for_source_filtered (ViewCollection* self, Da
_tmp4_ = view;
#line 1116 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (_tmp4_ != NULL) {
-#line 6711 "ViewCollection.c"
- DataView* _tmp5_ = NULL;
- gboolean _tmp6_ = FALSE;
+#line 6733 "ViewCollection.c"
+ DataView* _tmp5_;
+ gboolean _tmp6_;
#line 1116 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp5_ = view;
#line 1116 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp6_ = view_collection_is_in_filter (self, _tmp5_);
#line 1116 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp3_ = !_tmp6_;
-#line 6720 "ViewCollection.c"
+#line 6742 "ViewCollection.c"
} else {
#line 1116 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp3_ = FALSE;
-#line 6724 "ViewCollection.c"
+#line 6746 "ViewCollection.c"
}
#line 1116 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (_tmp3_) {
@@ -6731,25 +6753,25 @@ DataView* view_collection_get_view_for_source_filtered (ViewCollection* self, Da
_g_object_unref0 (view);
#line 1117 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return result;
-#line 6734 "ViewCollection.c"
+#line 6756 "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 6740 "ViewCollection.c"
+#line 6762 "ViewCollection.c"
}
GeeCollection* view_collection_get_sources (ViewCollection* self) {
GeeCollection* result = NULL;
- GeeHashMap* _tmp0_ = NULL;
- GeeSet* _tmp1_ = NULL;
- GeeSet* _tmp2_ = NULL;
- GeeSet* _tmp3_ = NULL;
- GeeSet* _tmp4_ = NULL;
- GeeSet* _tmp5_ = NULL;
- GeeCollection* _tmp6_ = NULL;
+ GeeHashMap* _tmp0_;
+ GeeSet* _tmp1_;
+ GeeSet* _tmp2_;
+ GeeSet* _tmp3_;
+ GeeSet* _tmp4_;
+ GeeSet* _tmp5_;
+ GeeCollection* _tmp6_;
#line 1122 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_val_if_fail (IS_VIEW_COLLECTION (self), NULL);
#line 1123 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -6772,14 +6794,14 @@ GeeCollection* view_collection_get_sources (ViewCollection* self) {
result = _tmp6_;
#line 1123 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return result;
-#line 6775 "ViewCollection.c"
+#line 6797 "ViewCollection.c"
}
gboolean view_collection_has_source_of_type (ViewCollection* self, GType t) {
gboolean result = FALSE;
- GType _tmp0_ = 0UL;
- gboolean _tmp1_ = 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"
@@ -6788,15 +6810,15 @@ gboolean view_collection_has_source_of_type (ViewCollection* self, GType t) {
_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 6791 "ViewCollection.c"
+#line 6813 "ViewCollection.c"
{
GeeIterator* _source_it = NULL;
- GeeHashMap* _tmp2_ = NULL;
- GeeSet* _tmp3_ = NULL;
- GeeSet* _tmp4_ = NULL;
- GeeSet* _tmp5_ = NULL;
- GeeIterator* _tmp6_ = NULL;
- GeeIterator* _tmp7_ = NULL;
+ GeeHashMap* _tmp2_;
+ GeeSet* _tmp3_;
+ GeeSet* _tmp4_;
+ GeeSet* _tmp5_;
+ GeeIterator* _tmp6_;
+ GeeIterator* _tmp7_;
#line 1130 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp2_ = self->priv->source_map;
#line 1130 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -6815,16 +6837,16 @@ gboolean view_collection_has_source_of_type (ViewCollection* self, GType t) {
_source_it = _tmp7_;
#line 1130 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
while (TRUE) {
-#line 6818 "ViewCollection.c"
- GeeIterator* _tmp8_ = NULL;
- gboolean _tmp9_ = FALSE;
+#line 6840 "ViewCollection.c"
+ GeeIterator* _tmp8_;
+ gboolean _tmp9_;
DataSource* source = NULL;
- GeeIterator* _tmp10_ = NULL;
- gpointer _tmp11_ = NULL;
- DataSource* _tmp12_ = NULL;
- GType _tmp13_ = 0UL;
- GType _tmp14_ = 0UL;
- gboolean _tmp15_ = FALSE;
+ 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;
#line 1130 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -6833,7 +6855,7 @@ gboolean view_collection_has_source_of_type (ViewCollection* self, GType t) {
if (!_tmp9_) {
#line 1130 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
break;
-#line 6836 "ViewCollection.c"
+#line 6858 "ViewCollection.c"
}
#line 1130 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp10_ = _source_it;
@@ -6859,28 +6881,28 @@ 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 6862 "ViewCollection.c"
+#line 6884 "ViewCollection.c"
}
#line 1130 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (source);
-#line 6866 "ViewCollection.c"
+#line 6888 "ViewCollection.c"
}
#line 1130 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (_source_it);
-#line 6870 "ViewCollection.c"
+#line 6892 "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 6876 "ViewCollection.c"
+#line 6898 "ViewCollection.c"
}
gint view_collection_get_sources_of_type_count (ViewCollection* self, GType t) {
gint result = 0;
- GType _tmp0_ = 0UL;
- gboolean _tmp1_ = FALSE;
+ 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);
@@ -6892,13 +6914,13 @@ gint view_collection_get_sources_of_type_count (ViewCollection* self, GType t) {
_vala_assert (_tmp1_, "t.is_a(typeof(DataSource))");
#line 1141 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
count = 0;
-#line 6895 "ViewCollection.c"
+#line 6917 "ViewCollection.c"
{
GeeIterator* _object_it = NULL;
- GeeCollection* _tmp2_ = NULL;
- GeeCollection* _tmp3_ = NULL;
- GeeIterator* _tmp4_ = NULL;
- GeeIterator* _tmp5_ = NULL;
+ GeeCollection* _tmp2_;
+ GeeCollection* _tmp3_;
+ GeeIterator* _tmp4_;
+ GeeIterator* _tmp5_;
#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));
#line 1142 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -6913,19 +6935,19 @@ gint view_collection_get_sources_of_type_count (ViewCollection* self, GType t) {
_object_it = _tmp5_;
#line 1142 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
while (TRUE) {
-#line 6916 "ViewCollection.c"
- GeeIterator* _tmp6_ = NULL;
- gboolean _tmp7_ = FALSE;
+#line 6938 "ViewCollection.c"
+ GeeIterator* _tmp6_;
+ gboolean _tmp7_;
DataObject* object = NULL;
- GeeIterator* _tmp8_ = NULL;
- gpointer _tmp9_ = NULL;
- DataObject* _tmp10_ = NULL;
- DataSource* _tmp11_ = NULL;
- DataSource* _tmp12_ = NULL;
- GType _tmp13_ = 0UL;
- GType _tmp14_ = 0UL;
- gboolean _tmp15_ = FALSE;
- gboolean _tmp16_ = FALSE;
+ 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;
#line 1142 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -6934,7 +6956,7 @@ gint view_collection_get_sources_of_type_count (ViewCollection* self, GType t) {
if (!_tmp7_) {
#line 1142 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
break;
-#line 6937 "ViewCollection.c"
+#line 6959 "ViewCollection.c"
}
#line 1142 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp8_ = _object_it;
@@ -6960,34 +6982,34 @@ gint view_collection_get_sources_of_type_count (ViewCollection* self, GType t) {
_g_object_unref0 (_tmp12_);
#line 1143 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (_tmp16_) {
-#line 6963 "ViewCollection.c"
- gint _tmp17_ = 0;
+#line 6985 "ViewCollection.c"
+ gint _tmp17_;
#line 1144 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp17_ = count;
#line 1144 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
count = _tmp17_ + 1;
-#line 6969 "ViewCollection.c"
+#line 6991 "ViewCollection.c"
}
#line 1142 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (object);
-#line 6973 "ViewCollection.c"
+#line 6995 "ViewCollection.c"
}
#line 1142 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (_object_it);
-#line 6977 "ViewCollection.c"
+#line 6999 "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 6983 "ViewCollection.c"
+#line 7005 "ViewCollection.c"
}
GeeList* view_collection_get_sources_of_type (ViewCollection* self, GType t) {
GeeList* result = NULL;
- GType _tmp0_ = 0UL;
- gboolean _tmp1_ = FALSE;
+ 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);
@@ -6999,13 +7021,13 @@ GeeList* view_collection_get_sources_of_type (ViewCollection* self, GType t) {
_vala_assert (_tmp1_, "t.is_a(typeof(DataSource))");
#line 1153 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
sources = NULL;
-#line 7002 "ViewCollection.c"
+#line 7024 "ViewCollection.c"
{
GeeIterator* _object_it = NULL;
- GeeCollection* _tmp2_ = NULL;
- GeeCollection* _tmp3_ = NULL;
- GeeIterator* _tmp4_ = NULL;
- GeeIterator* _tmp5_ = NULL;
+ GeeCollection* _tmp2_;
+ GeeCollection* _tmp3_;
+ GeeIterator* _tmp4_;
+ GeeIterator* _tmp5_;
#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));
#line 1154 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -7020,19 +7042,19 @@ GeeList* view_collection_get_sources_of_type (ViewCollection* self, GType t) {
_object_it = _tmp5_;
#line 1154 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
while (TRUE) {
-#line 7023 "ViewCollection.c"
- GeeIterator* _tmp6_ = NULL;
- gboolean _tmp7_ = FALSE;
+#line 7045 "ViewCollection.c"
+ GeeIterator* _tmp6_;
+ gboolean _tmp7_;
DataObject* object = NULL;
- GeeIterator* _tmp8_ = NULL;
- gpointer _tmp9_ = NULL;
+ GeeIterator* _tmp8_;
+ gpointer _tmp9_;
DataSource* source = NULL;
- DataObject* _tmp10_ = NULL;
- DataSource* _tmp11_ = NULL;
- DataSource* _tmp12_ = NULL;
- GType _tmp13_ = 0UL;
- GType _tmp14_ = 0UL;
- gboolean _tmp15_ = FALSE;
+ 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;
#line 1154 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -7041,7 +7063,7 @@ GeeList* view_collection_get_sources_of_type (ViewCollection* self, GType t) {
if (!_tmp7_) {
#line 1154 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
break;
-#line 7044 "ViewCollection.c"
+#line 7066 "ViewCollection.c"
}
#line 1154 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp8_ = _object_it;
@@ -7065,23 +7087,23 @@ GeeList* view_collection_get_sources_of_type (ViewCollection* self, GType t) {
_tmp15_ = g_type_is_a (_tmp13_, _tmp14_);
#line 1156 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (_tmp15_) {
-#line 7068 "ViewCollection.c"
- GeeList* _tmp16_ = NULL;
- GeeList* _tmp18_ = NULL;
- DataSource* _tmp19_ = NULL;
+#line 7090 "ViewCollection.c"
+ GeeList* _tmp16_;
+ GeeList* _tmp18_;
+ DataSource* _tmp19_;
#line 1157 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp16_ = sources;
#line 1157 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (_tmp16_ == NULL) {
-#line 7076 "ViewCollection.c"
- GeeArrayList* _tmp17_ = NULL;
+#line 7098 "ViewCollection.c"
+ GeeArrayList* _tmp17_;
#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);
#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 7084 "ViewCollection.c"
+#line 7106 "ViewCollection.c"
}
#line 1160 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp18_ = sources;
@@ -7089,33 +7111,33 @@ GeeList* view_collection_get_sources_of_type (ViewCollection* self, GType t) {
_tmp19_ = 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 7092 "ViewCollection.c"
+#line 7114 "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 7098 "ViewCollection.c"
+#line 7120 "ViewCollection.c"
}
#line 1154 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (_object_it);
-#line 7102 "ViewCollection.c"
+#line 7124 "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 7108 "ViewCollection.c"
+#line 7130 "ViewCollection.c"
}
GeeList* view_collection_get_selected_sources (ViewCollection* self) {
GeeList* result = NULL;
GeeList* sources = NULL;
- GeeArrayList* _tmp0_ = NULL;
+ GeeArrayList* _tmp0_;
gint count = 0;
- DataSet* _tmp1_ = NULL;
- gint _tmp2_ = 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"
@@ -7128,37 +7150,37 @@ GeeList* view_collection_get_selected_sources (ViewCollection* self) {
_tmp2_ = data_set_get_count (_tmp1_);
#line 1170 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
count = _tmp2_;
-#line 7131 "ViewCollection.c"
+#line 7153 "ViewCollection.c"
{
gint ctr = 0;
#line 1171 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
ctr = 0;
-#line 7136 "ViewCollection.c"
+#line 7158 "ViewCollection.c"
{
gboolean _tmp3_ = FALSE;
#line 1171 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp3_ = TRUE;
#line 1171 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
while (TRUE) {
-#line 7143 "ViewCollection.c"
- gint _tmp5_ = 0;
- gint _tmp6_ = 0;
- GeeList* _tmp7_ = NULL;
- DataSet* _tmp8_ = NULL;
- gint _tmp9_ = 0;
- DataObject* _tmp10_ = NULL;
- DataView* _tmp11_ = NULL;
- DataSource* _tmp12_ = NULL;
- DataSource* _tmp13_ = NULL;
+#line 7165 "ViewCollection.c"
+ gint _tmp5_;
+ gint _tmp6_;
+ GeeList* _tmp7_;
+ DataSet* _tmp8_;
+ gint _tmp9_;
+ DataObject* _tmp10_;
+ DataView* _tmp11_;
+ DataSource* _tmp12_;
+ DataSource* _tmp13_;
#line 1171 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (!_tmp3_) {
-#line 7155 "ViewCollection.c"
- gint _tmp4_ = 0;
+#line 7177 "ViewCollection.c"
+ gint _tmp4_;
#line 1171 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp4_ = ctr;
#line 1171 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
ctr = _tmp4_ + 1;
-#line 7161 "ViewCollection.c"
+#line 7183 "ViewCollection.c"
}
#line 1171 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp3_ = FALSE;
@@ -7170,7 +7192,7 @@ GeeList* view_collection_get_selected_sources (ViewCollection* self) {
if (!(_tmp5_ < _tmp6_)) {
#line 1171 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
break;
-#line 7173 "ViewCollection.c"
+#line 7195 "ViewCollection.c"
}
#line 1172 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp7_ = sources;
@@ -7192,7 +7214,7 @@ GeeList* view_collection_get_selected_sources (ViewCollection* self) {
_g_object_unref0 (_tmp13_);
#line 1172 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (_tmp11_);
-#line 7195 "ViewCollection.c"
+#line 7217 "ViewCollection.c"
}
}
}
@@ -7200,18 +7222,18 @@ GeeList* view_collection_get_selected_sources (ViewCollection* self) {
result = sources;
#line 1174 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return result;
-#line 7203 "ViewCollection.c"
+#line 7225 "ViewCollection.c"
}
DataSource* view_collection_get_selected_source_at (ViewCollection* self, gint index) {
DataSource* result = NULL;
DataObject* object = NULL;
- DataSet* _tmp0_ = NULL;
- gint _tmp1_ = 0;
- DataObject* _tmp2_ = NULL;
+ DataSet* _tmp0_;
+ gint _tmp1_;
+ DataObject* _tmp2_;
DataSource* _tmp3_ = NULL;
- DataObject* _tmp4_ = NULL;
+ DataObject* _tmp4_;
#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"
@@ -7226,9 +7248,9 @@ DataSource* view_collection_get_selected_source_at (ViewCollection* self, gint i
_tmp4_ = object;
#line 1180 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (_tmp4_ != NULL) {
-#line 7229 "ViewCollection.c"
- DataObject* _tmp5_ = NULL;
- DataSource* _tmp6_ = NULL;
+#line 7251 "ViewCollection.c"
+ DataObject* _tmp5_;
+ DataSource* _tmp6_;
#line 1180 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp5_ = object;
#line 1180 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -7237,13 +7259,13 @@ DataSource* view_collection_get_selected_source_at (ViewCollection* self, gint i
_g_object_unref0 (_tmp3_);
#line 1180 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp3_ = _tmp6_;
-#line 7240 "ViewCollection.c"
+#line 7262 "ViewCollection.c"
} else {
#line 1180 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (_tmp3_);
#line 1180 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp3_ = NULL;
-#line 7246 "ViewCollection.c"
+#line 7268 "ViewCollection.c"
}
#line 1180 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
result = _tmp3_;
@@ -7251,7 +7273,7 @@ DataSource* view_collection_get_selected_source_at (ViewCollection* self, gint i
_g_object_unref0 (object);
#line 1180 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return result;
-#line 7254 "ViewCollection.c"
+#line 7276 "ViewCollection.c"
}
@@ -7262,14 +7284,14 @@ GeeList* view_collection_get_selected_sources_of_type (ViewCollection* self, GTy
g_return_val_if_fail (IS_VIEW_COLLECTION (self), NULL);
#line 1184 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
sources = NULL;
-#line 7265 "ViewCollection.c"
+#line 7287 "ViewCollection.c"
{
GeeList* _view_list = NULL;
- GeeList* _tmp0_ = NULL;
+ GeeList* _tmp0_;
gint _view_size = 0;
- GeeList* _tmp1_ = NULL;
- gint _tmp2_ = 0;
- gint _tmp3_ = 0;
+ GeeList* _tmp1_;
+ gint _tmp2_;
+ gint _tmp3_;
gint _view_index = 0;
#line 1185 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp0_ = view_collection_get_selected (self);
@@ -7287,21 +7309,21 @@ 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 7290 "ViewCollection.c"
- gint _tmp4_ = 0;
- gint _tmp5_ = 0;
- gint _tmp6_ = 0;
+#line 7312 "ViewCollection.c"
+ gint _tmp4_;
+ gint _tmp5_;
+ gint _tmp6_;
DataView* view = NULL;
- GeeList* _tmp7_ = NULL;
- gint _tmp8_ = 0;
- gpointer _tmp9_ = NULL;
+ GeeList* _tmp7_;
+ gint _tmp8_;
+ gpointer _tmp9_;
DataSource* source = NULL;
- DataView* _tmp10_ = NULL;
- DataSource* _tmp11_ = NULL;
- DataSource* _tmp12_ = NULL;
- GType _tmp13_ = 0UL;
- GType _tmp14_ = 0UL;
- gboolean _tmp15_ = FALSE;
+ 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"
@@ -7314,7 +7336,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 7317 "ViewCollection.c"
+#line 7339 "ViewCollection.c"
}
#line 1185 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp7_ = _view_list;
@@ -7340,23 +7362,23 @@ GeeList* view_collection_get_selected_sources_of_type (ViewCollection* self, GTy
_tmp15_ = g_type_is_a (_tmp13_, _tmp14_);
#line 1187 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (_tmp15_) {
-#line 7343 "ViewCollection.c"
- GeeList* _tmp16_ = NULL;
- GeeList* _tmp18_ = NULL;
- DataSource* _tmp19_ = NULL;
+#line 7365 "ViewCollection.c"
+ GeeList* _tmp16_;
+ GeeList* _tmp18_;
+ DataSource* _tmp19_;
#line 1188 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp16_ = sources;
#line 1188 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (_tmp16_ == NULL) {
-#line 7351 "ViewCollection.c"
- GeeArrayList* _tmp17_ = NULL;
+#line 7373 "ViewCollection.c"
+ GeeArrayList* _tmp17_;
#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);
#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 7359 "ViewCollection.c"
+#line 7381 "ViewCollection.c"
}
#line 1191 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp18_ = sources;
@@ -7364,33 +7386,33 @@ GeeList* view_collection_get_selected_sources_of_type (ViewCollection* self, GTy
_tmp19_ = 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 7367 "ViewCollection.c"
+#line 7389 "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 7373 "ViewCollection.c"
+#line 7395 "ViewCollection.c"
}
#line 1185 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (_view_list);
-#line 7377 "ViewCollection.c"
+#line 7399 "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 7383 "ViewCollection.c"
+#line 7405 "ViewCollection.c"
}
gint view_collection_index_of_source (ViewCollection* self, DataSource* source) {
gint result = 0;
DataView* view = NULL;
- DataSource* _tmp0_ = NULL;
- DataView* _tmp1_ = NULL;
+ DataSource* _tmp0_;
+ DataView* _tmp1_;
gint _tmp2_ = 0;
- DataView* _tmp3_ = NULL;
+ DataView* _tmp3_;
#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"
@@ -7405,20 +7427,20 @@ gint view_collection_index_of_source (ViewCollection* self, DataSource* source)
_tmp3_ = view;
#line 1202 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (_tmp3_ != NULL) {
-#line 7408 "ViewCollection.c"
- DataView* _tmp4_ = NULL;
- gint _tmp5_ = 0;
+#line 7430 "ViewCollection.c"
+ DataView* _tmp4_;
+ gint _tmp5_;
#line 1202 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp4_ = view;
#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));
#line 1202 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp2_ = _tmp5_;
-#line 7417 "ViewCollection.c"
+#line 7439 "ViewCollection.c"
} else {
#line 1202 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp2_ = -1;
-#line 7421 "ViewCollection.c"
+#line 7443 "ViewCollection.c"
}
#line 1202 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
result = _tmp2_;
@@ -7426,12 +7448,12 @@ gint view_collection_index_of_source (ViewCollection* self, DataSource* source)
_g_object_unref0 (view);
#line 1202 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return result;
-#line 7429 "ViewCollection.c"
+#line 7451 "ViewCollection.c"
}
void view_collection_internal_notify_view_altered (ViewCollection* self, DataView* view) {
- gboolean _tmp0_ = FALSE;
+ gboolean _tmp0_;
#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"
@@ -7440,11 +7462,11 @@ void view_collection_internal_notify_view_altered (ViewCollection* self, DataVie
_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 7443 "ViewCollection.c"
- DataView* _tmp1_ = NULL;
- DataView* _tmp2_ = NULL;
- GeeCollection* _tmp3_ = NULL;
- GeeCollection* _tmp4_ = NULL;
+#line 7465 "ViewCollection.c"
+ DataView* _tmp1_;
+ DataView* _tmp2_;
+ GeeCollection* _tmp3_;
+ GeeCollection* _tmp4_;
#line 1208 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp1_ = view;
#line 1208 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -7459,24 +7481,24 @@ void view_collection_internal_notify_view_altered (ViewCollection* self, DataVie
view_collection_notify_views_altered (self, _tmp4_);
#line 1209 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (_tmp4_);
-#line 7462 "ViewCollection.c"
+#line 7484 "ViewCollection.c"
} else {
- GeeHashSet* _tmp5_ = NULL;
- GeeHashSet* _tmp7_ = NULL;
- DataView* _tmp8_ = NULL;
+ GeeHashSet* _tmp5_;
+ GeeHashSet* _tmp7_;
+ DataView* _tmp8_;
#line 1211 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp5_ = self->priv->frozen_views_altered;
#line 1211 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (_tmp5_ == NULL) {
-#line 7471 "ViewCollection.c"
- GeeHashSet* _tmp6_ = NULL;
+#line 7493 "ViewCollection.c"
+ GeeHashSet* _tmp6_;
#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);
#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 7479 "ViewCollection.c"
+#line 7501 "ViewCollection.c"
}
#line 1213 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp7_ = self->priv->frozen_views_altered;
@@ -7484,13 +7506,13 @@ void view_collection_internal_notify_view_altered (ViewCollection* self, DataVie
_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 7487 "ViewCollection.c"
+#line 7509 "ViewCollection.c"
}
}
void view_collection_internal_notify_geometry_altered (ViewCollection* self, DataView* view) {
- gboolean _tmp0_ = FALSE;
+ gboolean _tmp0_;
#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"
@@ -7499,11 +7521,11 @@ void view_collection_internal_notify_geometry_altered (ViewCollection* self, Dat
_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 7502 "ViewCollection.c"
- DataView* _tmp1_ = NULL;
- DataView* _tmp2_ = NULL;
- GeeCollection* _tmp3_ = NULL;
- GeeCollection* _tmp4_ = NULL;
+#line 7524 "ViewCollection.c"
+ DataView* _tmp1_;
+ DataView* _tmp2_;
+ GeeCollection* _tmp3_;
+ GeeCollection* _tmp4_;
#line 1220 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp1_ = view;
#line 1220 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -7518,24 +7540,24 @@ void view_collection_internal_notify_geometry_altered (ViewCollection* self, Dat
view_collection_notify_geometries_altered (self, _tmp4_);
#line 1221 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (_tmp4_);
-#line 7521 "ViewCollection.c"
+#line 7543 "ViewCollection.c"
} else {
- GeeHashSet* _tmp5_ = NULL;
- GeeHashSet* _tmp7_ = NULL;
- DataView* _tmp8_ = NULL;
+ GeeHashSet* _tmp5_;
+ GeeHashSet* _tmp7_;
+ DataView* _tmp8_;
#line 1223 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp5_ = self->priv->frozen_geometries_altered;
#line 1223 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (_tmp5_ == NULL) {
-#line 7530 "ViewCollection.c"
- GeeHashSet* _tmp6_ = NULL;
+#line 7552 "ViewCollection.c"
+ GeeHashSet* _tmp6_;
#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);
#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 7538 "ViewCollection.c"
+#line 7560 "ViewCollection.c"
}
#line 1225 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp7_ = self->priv->frozen_geometries_altered;
@@ -7543,27 +7565,27 @@ void view_collection_internal_notify_geometry_altered (ViewCollection* self, Dat
_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 7546 "ViewCollection.c"
+#line 7568 "ViewCollection.c"
}
}
static void view_collection_real_notify_thawed (DataCollection* base) {
ViewCollection * self;
- GeeHashSet* _tmp0_ = NULL;
- GeeHashSet* _tmp9_ = NULL;
+ GeeHashSet* _tmp0_;
+ GeeHashSet* _tmp9_;
#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 7561 "ViewCollection.c"
- GeeHashSet* _tmp8_ = NULL;
+#line 7583 "ViewCollection.c"
+ GeeHashSet* _tmp8_;
{
GeeIterator* _view_it = NULL;
- GeeHashSet* _tmp1_ = NULL;
- GeeIterator* _tmp2_ = NULL;
+ GeeHashSet* _tmp1_;
+ GeeIterator* _tmp2_;
#line 1231 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp1_ = self->priv->frozen_views_altered;
#line 1231 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -7572,13 +7594,13 @@ 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 7575 "ViewCollection.c"
- GeeIterator* _tmp3_ = NULL;
- gboolean _tmp4_ = FALSE;
+#line 7597 "ViewCollection.c"
+ GeeIterator* _tmp3_;
+ gboolean _tmp4_;
DataView* view = NULL;
- GeeIterator* _tmp5_ = NULL;
- gpointer _tmp6_ = NULL;
- DataView* _tmp7_ = NULL;
+ GeeIterator* _tmp5_;
+ gpointer _tmp6_;
+ DataView* _tmp7_;
#line 1231 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp3_ = _view_it;
#line 1231 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -7587,7 +7609,7 @@ static void view_collection_real_notify_thawed (DataCollection* base) {
if (!_tmp4_) {
#line 1231 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
break;
-#line 7590 "ViewCollection.c"
+#line 7612 "ViewCollection.c"
}
#line 1231 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp5_ = _view_it;
@@ -7601,11 +7623,11 @@ static void view_collection_real_notify_thawed (DataCollection* base) {
view_collection_notify_item_view_altered (self, _tmp7_);
#line 1231 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (view);
-#line 7604 "ViewCollection.c"
+#line 7626 "ViewCollection.c"
}
#line 1231 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (_view_it);
-#line 7608 "ViewCollection.c"
+#line 7630 "ViewCollection.c"
}
#line 1233 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp8_ = self->priv->frozen_views_altered;
@@ -7615,18 +7637,18 @@ static void view_collection_real_notify_thawed (DataCollection* base) {
_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 7618 "ViewCollection.c"
+#line 7640 "ViewCollection.c"
}
#line 1237 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp9_ = self->priv->frozen_geometries_altered;
#line 1237 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (_tmp9_ != NULL) {
-#line 7624 "ViewCollection.c"
- GeeHashSet* _tmp17_ = NULL;
+#line 7646 "ViewCollection.c"
+ GeeHashSet* _tmp17_;
{
GeeIterator* _view_it = NULL;
- GeeHashSet* _tmp10_ = NULL;
- GeeIterator* _tmp11_ = NULL;
+ GeeHashSet* _tmp10_;
+ GeeIterator* _tmp11_;
#line 1238 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp10_ = self->priv->frozen_geometries_altered;
#line 1238 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -7635,13 +7657,13 @@ static void view_collection_real_notify_thawed (DataCollection* base) {
_view_it = _tmp11_;
#line 1238 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
while (TRUE) {
-#line 7638 "ViewCollection.c"
- GeeIterator* _tmp12_ = NULL;
- gboolean _tmp13_ = FALSE;
+#line 7660 "ViewCollection.c"
+ GeeIterator* _tmp12_;
+ gboolean _tmp13_;
DataView* view = NULL;
- GeeIterator* _tmp14_ = NULL;
- gpointer _tmp15_ = NULL;
- DataView* _tmp16_ = NULL;
+ GeeIterator* _tmp14_;
+ gpointer _tmp15_;
+ DataView* _tmp16_;
#line 1238 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp12_ = _view_it;
#line 1238 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -7650,7 +7672,7 @@ static void view_collection_real_notify_thawed (DataCollection* base) {
if (!_tmp13_) {
#line 1238 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
break;
-#line 7653 "ViewCollection.c"
+#line 7675 "ViewCollection.c"
}
#line 1238 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp14_ = _view_it;
@@ -7664,11 +7686,11 @@ static void view_collection_real_notify_thawed (DataCollection* base) {
view_collection_notify_item_geometry_altered (self, _tmp16_);
#line 1238 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (view);
-#line 7667 "ViewCollection.c"
+#line 7689 "ViewCollection.c"
}
#line 1238 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (_view_it);
-#line 7671 "ViewCollection.c"
+#line 7693 "ViewCollection.c"
}
#line 1240 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp17_ = self->priv->frozen_geometries_altered;
@@ -7678,18 +7700,18 @@ static void view_collection_real_notify_thawed (DataCollection* base) {
_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 7681 "ViewCollection.c"
+#line 7703 "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 7685 "ViewCollection.c"
+#line 7707 "ViewCollection.c"
}
gboolean view_collection_are_items_filtered_out (ViewCollection* self) {
gboolean result = FALSE;
- gint _tmp0_ = 0;
- gint _tmp1_ = 0;
+ 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"
@@ -7700,28 +7722,28 @@ gboolean view_collection_are_items_filtered_out (ViewCollection* self) {
result = _tmp0_ != _tmp1_;
#line 1248 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return result;
-#line 7703 "ViewCollection.c"
+#line 7725 "ViewCollection.c"
}
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 7710 "ViewCollection.c"
+#line 7732 "ViewCollection.c"
}
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 7717 "ViewCollection.c"
+#line 7739 "ViewCollection.c"
}
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 7724 "ViewCollection.c"
+#line 7746 "ViewCollection.c"
}
@@ -7732,56 +7754,56 @@ static void view_collection_real_selection_group_altered (ViewCollection* self)
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 7735 "ViewCollection.c"
+#line 7757 "ViewCollection.c"
}
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 7742 "ViewCollection.c"
+#line 7764 "ViewCollection.c"
}
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 7749 "ViewCollection.c"
+#line 7771 "ViewCollection.c"
}
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 7756 "ViewCollection.c"
+#line 7778 "ViewCollection.c"
}
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 7763 "ViewCollection.c"
+#line 7785 "ViewCollection.c"
}
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 7770 "ViewCollection.c"
+#line 7792 "ViewCollection.c"
}
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 7777 "ViewCollection.c"
+#line 7799 "ViewCollection.c"
}
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 7784 "ViewCollection.c"
+#line 7806 "ViewCollection.c"
}
@@ -7800,26 +7822,26 @@ 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 7803 "ViewCollection.c"
+#line 7825 "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 7809 "ViewCollection.c"
+#line 7831 "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 7815 "ViewCollection.c"
+#line 7837 "ViewCollection.c"
}
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 7822 "ViewCollection.c"
+#line 7844 "ViewCollection.c"
}
@@ -7829,21 +7851,21 @@ ViewCollectionMonitor* view_collection_monitor_construct (GType object_type) {
self = (ViewCollectionMonitor*) g_type_create_instance (object_type);
#line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return self;
-#line 7832 "ViewCollection.c"
+#line 7854 "ViewCollection.c"
}
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 7839 "ViewCollection.c"
+#line 7861 "ViewCollection.c"
}
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 7846 "ViewCollection.c"
+#line 7868 "ViewCollection.c"
}
@@ -7852,7 +7874,7 @@ static void view_collection_value_monitor_free_value (GValue* value) {
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 7855 "ViewCollection.c"
+#line 7877 "ViewCollection.c"
}
}
@@ -7862,11 +7884,11 @@ static void view_collection_value_monitor_copy_value (const GValue* src_value, G
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 7865 "ViewCollection.c"
+#line 7887 "ViewCollection.c"
} else {
#line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
dest_value->data[0].v_pointer = NULL;
-#line 7869 "ViewCollection.c"
+#line 7891 "ViewCollection.c"
}
}
@@ -7874,66 +7896,66 @@ static void view_collection_value_monitor_copy_value (const GValue* src_value, G
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 7877 "ViewCollection.c"
+#line 7899 "ViewCollection.c"
}
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 7884 "ViewCollection.c"
- ViewCollectionMonitor* object;
+#line 7906 "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 7891 "ViewCollection.c"
+#line 7913 "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 7895 "ViewCollection.c"
+#line 7917 "ViewCollection.c"
}
#line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
value->data[0].v_pointer = view_collection_monitor_ref (object);
-#line 7899 "ViewCollection.c"
+#line 7921 "ViewCollection.c"
} else {
#line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
value->data[0].v_pointer = NULL;
-#line 7903 "ViewCollection.c"
+#line 7925 "ViewCollection.c"
}
#line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return NULL;
-#line 7907 "ViewCollection.c"
+#line 7929 "ViewCollection.c"
}
static gchar* view_collection_value_monitor_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
- ViewCollectionMonitor** object_p;
+ 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 7918 "ViewCollection.c"
+#line 7940 "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 7924 "ViewCollection.c"
+#line 7946 "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 7928 "ViewCollection.c"
+#line 7950 "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 7932 "ViewCollection.c"
+#line 7954 "ViewCollection.c"
}
#line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return NULL;
-#line 7936 "ViewCollection.c"
+#line 7958 "ViewCollection.c"
}
@@ -7947,7 +7969,7 @@ 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 7950 "ViewCollection.c"
+#line 7972 "ViewCollection.c"
}
@@ -7956,12 +7978,12 @@ gpointer view_collection_value_get_monitor (const GValue* value) {
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 7959 "ViewCollection.c"
+#line 7981 "ViewCollection.c"
}
void view_collection_value_set_monitor (GValue* value, gpointer v_object) {
- ViewCollectionMonitor* old;
+ 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));
#line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -7976,23 +7998,23 @@ 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 7979 "ViewCollection.c"
+#line 8001 "ViewCollection.c"
} else {
#line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
value->data[0].v_pointer = NULL;
-#line 7983 "ViewCollection.c"
+#line 8005 "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 7989 "ViewCollection.c"
+#line 8011 "ViewCollection.c"
}
}
void view_collection_value_take_monitor (GValue* value, gpointer v_object) {
- ViewCollectionMonitor* old;
+ 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));
#line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -8005,17 +8027,17 @@ 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 8008 "ViewCollection.c"
+#line 8030 "ViewCollection.c"
} else {
#line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
value->data[0].v_pointer = NULL;
-#line 8012 "ViewCollection.c"
+#line 8034 "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 8018 "ViewCollection.c"
+#line 8040 "ViewCollection.c"
}
}
@@ -8025,24 +8047,24 @@ static void view_collection_monitor_class_init (ViewCollectionMonitorClass * kla
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 8028 "ViewCollection.c"
+#line 8050 "ViewCollection.c"
}
static void view_collection_monitor_instance_init (ViewCollectionMonitor * self) {
#line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
self->ref_count = 1;
-#line 8035 "ViewCollection.c"
+#line 8057 "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 8045 "ViewCollection.c"
+#line 8067 "ViewCollection.c"
}
@@ -8061,18 +8083,18 @@ GType view_collection_monitor_get_type (void) {
gpointer view_collection_monitor_ref (gpointer instance) {
- ViewCollectionMonitor* self;
+ 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 8070 "ViewCollection.c"
+#line 8092 "ViewCollection.c"
}
void view_collection_monitor_unref (gpointer instance) {
- ViewCollectionMonitor* self;
+ ViewCollectionMonitor * self;
self = instance;
#line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -8080,7 +8102,7 @@ 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 8083 "ViewCollection.c"
+#line 8105 "ViewCollection.c"
}
}
@@ -8088,54 +8110,54 @@ void view_collection_monitor_unref (gpointer instance) {
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 8091 "ViewCollection.c"
+#line 8113 "ViewCollection.c"
}
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 8098 "ViewCollection.c"
+#line 8120 "ViewCollection.c"
}
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 8105 "ViewCollection.c"
+#line 8127 "ViewCollection.c"
}
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 8112 "ViewCollection.c"
+#line 8134 "ViewCollection.c"
}
static gpointer _alteration_ref0 (gpointer self) {
#line 36 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return self ? alteration_ref (self) : NULL;
-#line 8119 "ViewCollection.c"
+#line 8141 "ViewCollection.c"
}
static ViewCollectionMonitorImpl* view_collection_monitor_impl_construct (GType object_type, ViewCollection* owner, SourceCollection* sources, ViewManager* manager, Alteration* prereq) {
ViewCollectionMonitorImpl* self = NULL;
- ViewCollection* _tmp0_ = NULL;
- ViewCollection* _tmp1_ = NULL;
- SourceCollection* _tmp2_ = NULL;
- SourceCollection* _tmp3_ = NULL;
- ViewManager* _tmp4_ = NULL;
- ViewManager* _tmp5_ = NULL;
- Alteration* _tmp6_ = NULL;
- Alteration* _tmp7_ = NULL;
- SourceCollection* _tmp8_ = NULL;
- ViewCollection* _tmp9_ = NULL;
- SourceCollection* _tmp10_ = NULL;
- ViewCollection* _tmp11_ = NULL;
- SourceCollection* _tmp12_ = NULL;
- ViewCollection* _tmp13_ = 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_;
#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"
@@ -8198,14 +8220,14 @@ static ViewCollectionMonitorImpl* view_collection_monitor_impl_construct (GType
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_);
#line 31 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return self;
-#line 8201 "ViewCollection.c"
+#line 8223 "ViewCollection.c"
}
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 8208 "ViewCollection.c"
+#line 8230 "ViewCollection.c"
}
@@ -8214,7 +8236,7 @@ static void view_collection_monitor_impl_class_init (ViewCollectionMonitorImplCl
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 8217 "ViewCollection.c"
+#line 8239 "ViewCollection.c"
}
@@ -8222,17 +8244,17 @@ static void view_collection_monitor_impl_instance_init (ViewCollectionMonitorImp
}
-static void view_collection_monitor_impl_finalize (ViewCollectionMonitor* obj) {
+static void view_collection_monitor_impl_finalize (ViewCollectionMonitor * obj) {
ViewCollectionMonitorImpl * self;
- SourceCollection* _tmp0_ = NULL;
- ViewCollection* _tmp1_ = NULL;
- guint _tmp2_ = 0U;
- SourceCollection* _tmp3_ = NULL;
- ViewCollection* _tmp4_ = NULL;
- guint _tmp5_ = 0U;
- SourceCollection* _tmp6_ = NULL;
- ViewCollection* _tmp7_ = NULL;
- guint _tmp8_ = 0U;
+ SourceCollection* _tmp0_;
+ ViewCollection* _tmp1_;
+ guint _tmp2_;
+ SourceCollection* _tmp3_;
+ ViewCollection* _tmp4_;
+ guint _tmp5_;
+ SourceCollection* _tmp6_;
+ ViewCollection* _tmp7_;
+ guint _tmp8_;
#line 25 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, VIEW_COLLECTION_TYPE_MONITOR_IMPL, ViewCollectionMonitorImpl);
#line 44 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -8269,7 +8291,7 @@ 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 8272 "ViewCollection.c"
+#line 8294 "ViewCollection.c"
}
@@ -8291,14 +8313,14 @@ static ViewCollectionToggleLists* view_collection_toggle_lists_construct (GType
self = (ViewCollectionToggleLists*) g_object_new (object_type, NULL);
#line 50 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return self;
-#line 8294 "ViewCollection.c"
+#line 8316 "ViewCollection.c"
}
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 8301 "ViewCollection.c"
+#line 8323 "ViewCollection.c"
}
@@ -8307,13 +8329,13 @@ static void view_collection_toggle_lists_class_init (ViewCollectionToggleListsCl
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 8310 "ViewCollection.c"
+#line 8332 "ViewCollection.c"
}
static void view_collection_toggle_lists_instance_init (ViewCollectionToggleLists * self) {
- GeeArrayList* _tmp0_ = NULL;
- GeeArrayList* _tmp1_ = NULL;
+ GeeArrayList* _tmp0_;
+ GeeArrayList* _tmp1_;
#line 51 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp0_ = gee_array_list_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
#line 51 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -8322,11 +8344,11 @@ 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 8325 "ViewCollection.c"
+#line 8347 "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);
@@ -8336,7 +8358,7 @@ 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 8339 "ViewCollection.c"
+#line 8361 "ViewCollection.c"
}
@@ -8360,69 +8382,69 @@ static void view_collection_class_init (ViewCollectionClass * klass) {
#line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_type_class_add_private (klass, sizeof (ViewCollectionPrivate));
#line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- ((ViewCollectionClass *) klass)->notify_items_selected_unselected = (void (*)(ViewCollection*, GeeCollection*, GeeCollection*)) view_collection_real_notify_items_selected_unselected;
+ ((ViewCollectionClass *) klass)->notify_items_selected_unselected = (void (*) (ViewCollection *, GeeCollection*, GeeCollection*)) view_collection_real_notify_items_selected_unselected;
#line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- ((ViewCollectionClass *) klass)->notify_selection_group_altered = (void (*)(ViewCollection*)) view_collection_real_notify_selection_group_altered;
+ ((ViewCollectionClass *) klass)->notify_selection_group_altered = (void (*) (ViewCollection *)) view_collection_real_notify_selection_group_altered;
#line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- ((ViewCollectionClass *) klass)->notify_item_view_altered = (void (*)(ViewCollection*, DataView*)) view_collection_real_notify_item_view_altered;
+ ((ViewCollectionClass *) klass)->notify_item_view_altered = (void (*) (ViewCollection *, DataView*)) view_collection_real_notify_item_view_altered;
#line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- ((ViewCollectionClass *) klass)->notify_views_altered = (void (*)(ViewCollection*, GeeCollection*)) view_collection_real_notify_views_altered;
+ ((ViewCollectionClass *) klass)->notify_views_altered = (void (*) (ViewCollection *, GeeCollection*)) view_collection_real_notify_views_altered;
#line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- ((ViewCollectionClass *) klass)->notify_item_geometry_altered = (void (*)(ViewCollection*, DataView*)) view_collection_real_notify_item_geometry_altered;
+ ((ViewCollectionClass *) klass)->notify_item_geometry_altered = (void (*) (ViewCollection *, DataView*)) view_collection_real_notify_item_geometry_altered;
#line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- ((ViewCollectionClass *) klass)->notify_geometries_altered = (void (*)(ViewCollection*, GeeCollection*)) view_collection_real_notify_geometries_altered;
+ ((ViewCollectionClass *) klass)->notify_geometries_altered = (void (*) (ViewCollection *, GeeCollection*)) view_collection_real_notify_geometries_altered;
#line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- ((ViewCollectionClass *) klass)->notify_items_shown = (void (*)(ViewCollection*, GeeCollection*)) view_collection_real_notify_items_shown;
+ ((ViewCollectionClass *) klass)->notify_items_shown = (void (*) (ViewCollection *, GeeCollection*)) view_collection_real_notify_items_shown;
#line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- ((ViewCollectionClass *) klass)->notify_items_hidden = (void (*)(ViewCollection*, GeeCollection*)) view_collection_real_notify_items_hidden;
+ ((ViewCollectionClass *) klass)->notify_items_hidden = (void (*) (ViewCollection *, GeeCollection*)) view_collection_real_notify_items_hidden;
#line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- ((ViewCollectionClass *) klass)->notify_items_visibility_changed = (void (*)(ViewCollection*, GeeCollection*)) view_collection_real_notify_items_visibility_changed;
+ ((ViewCollectionClass *) klass)->notify_items_visibility_changed = (void (*) (ViewCollection *, GeeCollection*)) view_collection_real_notify_items_visibility_changed;
#line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- ((ViewCollectionClass *) klass)->notify_view_filter_installed = (void (*)(ViewCollection*, ViewFilter*)) view_collection_real_notify_view_filter_installed;
+ ((ViewCollectionClass *) klass)->notify_view_filter_installed = (void (*) (ViewCollection *, ViewFilter*)) view_collection_real_notify_view_filter_installed;
#line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- ((ViewCollectionClass *) klass)->notify_view_filter_removed = (void (*)(ViewCollection*, ViewFilter*)) view_collection_real_notify_view_filter_removed;
+ ((ViewCollectionClass *) klass)->notify_view_filter_removed = (void (*) (ViewCollection *, ViewFilter*)) view_collection_real_notify_view_filter_removed;
#line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- ((DataCollectionClass *) klass)->clear = (void (*)(DataCollection*)) view_collection_real_clear;
+ ((DataCollectionClass *) klass)->clear = (void (*) (DataCollection *)) view_collection_real_clear;
#line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- ((DataCollectionClass *) klass)->close = (void (*)(DataCollection*)) view_collection_real_close;
+ ((DataCollectionClass *) klass)->close = (void (*) (DataCollection *)) view_collection_real_close;
#line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- ((DataCollectionClass *) klass)->valid_type = (gboolean (*)(DataCollection*, DataObject*)) view_collection_real_valid_type;
+ ((DataCollectionClass *) klass)->valid_type = (gboolean (*) (DataCollection *, DataObject*)) view_collection_real_valid_type;
#line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- ((DataCollectionClass *) klass)->add = (gboolean (*)(DataCollection*, DataObject*)) view_collection_real_add;
+ ((DataCollectionClass *) klass)->add = (gboolean (*) (DataCollection *, DataObject*)) view_collection_real_add;
#line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- ((DataCollectionClass *) klass)->add_many = (GeeCollection* (*)(DataCollection*, GeeCollection*, ProgressMonitor, void*)) view_collection_real_add_many;
+ ((DataCollectionClass *) klass)->add_many = (GeeCollection* (*) (DataCollection *, GeeCollection*, ProgressMonitor, void*)) view_collection_real_add_many;
#line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- ((DataCollectionClass *) klass)->notify_items_added = (void (*)(DataCollection*, GeeIterable*)) view_collection_real_notify_items_added;
+ ((DataCollectionClass *) klass)->notify_items_added = (void (*) (DataCollection *, GeeIterable*)) view_collection_real_notify_items_added;
#line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- ((DataCollectionClass *) klass)->notify_items_removed = (void (*)(DataCollection*, GeeIterable*)) view_collection_real_notify_items_removed;
+ ((DataCollectionClass *) klass)->notify_items_removed = (void (*) (DataCollection *, GeeIterable*)) view_collection_real_notify_items_removed;
#line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- ((DataCollectionClass *) klass)->items_altered = (void (*)(DataCollection*, GeeMap*)) view_collection_real_items_altered;
+ ((DataCollectionClass *) klass)->items_altered = (void (*) (DataCollection *, GeeMap*)) view_collection_real_items_altered;
#line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- ((DataCollectionClass *) klass)->set_comparator = (void (*)(DataCollection*, Comparator, void*, ComparatorPredicate, void*)) view_collection_real_set_comparator;
+ ((DataCollectionClass *) klass)->set_comparator = (void (*) (DataCollection *, Comparator, void*, ComparatorPredicate, void*)) view_collection_real_set_comparator;
#line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- ((DataCollectionClass *) klass)->reset_comparator = (void (*)(DataCollection*)) view_collection_real_reset_comparator;
+ ((DataCollectionClass *) klass)->reset_comparator = (void (*) (DataCollection *)) view_collection_real_reset_comparator;
#line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- ((DataCollectionClass *) klass)->get_all = (GeeCollection* (*)(DataCollection*)) view_collection_real_get_all;
+ ((DataCollectionClass *) klass)->get_all = (GeeCollection* (*) (DataCollection *)) view_collection_real_get_all;
#line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- ((DataCollectionClass *) klass)->get_count = (gint (*)(DataCollection*)) view_collection_real_get_count;
+ ((DataCollectionClass *) klass)->get_count = (gint (*) (DataCollection *)) view_collection_real_get_count;
#line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- ((DataCollectionClass *) klass)->get_at = (DataObject* (*)(DataCollection*, gint)) view_collection_real_get_at;
+ ((DataCollectionClass *) klass)->get_at = (DataObject* (*) (DataCollection *, gint)) view_collection_real_get_at;
#line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- ((DataCollectionClass *) klass)->index_of = (gint (*)(DataCollection*, DataObject*)) view_collection_real_index_of;
+ ((DataCollectionClass *) klass)->index_of = (gint (*) (DataCollection *, DataObject*)) view_collection_real_index_of;
#line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- ((DataCollectionClass *) klass)->contains = (gboolean (*)(DataCollection*, DataObject*)) view_collection_real_contains;
+ ((DataCollectionClass *) klass)->contains = (gboolean (*) (DataCollection *, DataObject*)) view_collection_real_contains;
#line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- ((ViewCollectionClass *) klass)->get_first = (DataView* (*)(ViewCollection*)) view_collection_real_get_first;
+ ((ViewCollectionClass *) klass)->get_first = (DataView* (*) (ViewCollection *)) view_collection_real_get_first;
#line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- ((ViewCollectionClass *) klass)->get_first_unrejected = (DataView* (*)(ViewCollection*)) view_collection_real_get_first_unrejected;
+ ((ViewCollectionClass *) klass)->get_first_unrejected = (DataView* (*) (ViewCollection *)) view_collection_real_get_first_unrejected;
#line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- ((ViewCollectionClass *) klass)->get_last = (DataView* (*)(ViewCollection*)) view_collection_real_get_last;
+ ((ViewCollectionClass *) klass)->get_last = (DataView* (*) (ViewCollection *)) view_collection_real_get_last;
#line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- ((ViewCollectionClass *) klass)->get_next = (DataView* (*)(ViewCollection*, DataView*)) view_collection_real_get_next;
+ ((ViewCollectionClass *) klass)->get_next = (DataView* (*) (ViewCollection *, DataView*)) view_collection_real_get_next;
#line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- ((ViewCollectionClass *) klass)->get_previous = (DataView* (*)(ViewCollection*, DataView*)) view_collection_real_get_previous;
+ ((ViewCollectionClass *) klass)->get_previous = (DataView* (*) (ViewCollection *, DataView*)) view_collection_real_get_previous;
#line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- ((DataCollectionClass *) klass)->notify_thawed = (void (*)(DataCollection*)) view_collection_real_notify_thawed;
+ ((DataCollectionClass *) klass)->notify_thawed = (void (*) (DataCollection *)) view_collection_real_notify_thawed;
#line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
((ViewCollectionClass *) klass)->items_selected = view_collection_real_items_selected;
#line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -8450,40 +8472,40 @@ static void view_collection_class_init (ViewCollectionClass * klass) {
#line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
((ViewCollectionClass *) klass)->view_filter_removed = view_collection_real_view_filter_removed;
#line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- g_signal_new ("items_selected", TYPE_VIEW_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ViewCollectionClass, items_selected), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, GEE_TYPE_ITERABLE);
+ view_collection_signals[VIEW_COLLECTION_ITEMS_SELECTED_SIGNAL] = g_signal_new ("items-selected", TYPE_VIEW_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ViewCollectionClass, items_selected), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, GEE_TYPE_ITERABLE);
#line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- g_signal_new ("items_unselected", TYPE_VIEW_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ViewCollectionClass, items_unselected), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, GEE_TYPE_ITERABLE);
+ view_collection_signals[VIEW_COLLECTION_ITEMS_UNSELECTED_SIGNAL] = g_signal_new ("items-unselected", TYPE_VIEW_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ViewCollectionClass, items_unselected), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, GEE_TYPE_ITERABLE);
#line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- g_signal_new ("items_state_changed", TYPE_VIEW_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ViewCollectionClass, items_state_changed), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, GEE_TYPE_ITERABLE);
+ view_collection_signals[VIEW_COLLECTION_ITEMS_STATE_CHANGED_SIGNAL] = g_signal_new ("items-state-changed", TYPE_VIEW_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ViewCollectionClass, items_state_changed), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, GEE_TYPE_ITERABLE);
#line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- g_signal_new ("selection_group_altered", TYPE_VIEW_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ViewCollectionClass, selection_group_altered), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
+ view_collection_signals[VIEW_COLLECTION_SELECTION_GROUP_ALTERED_SIGNAL] = g_signal_new ("selection-group-altered", TYPE_VIEW_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ViewCollectionClass, selection_group_altered), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
#line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- g_signal_new ("items_shown", TYPE_VIEW_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ViewCollectionClass, items_shown), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, GEE_TYPE_COLLECTION);
+ view_collection_signals[VIEW_COLLECTION_ITEMS_SHOWN_SIGNAL] = g_signal_new ("items-shown", TYPE_VIEW_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ViewCollectionClass, items_shown), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, GEE_TYPE_COLLECTION);
#line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- g_signal_new ("items_hidden", TYPE_VIEW_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ViewCollectionClass, items_hidden), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, GEE_TYPE_COLLECTION);
+ view_collection_signals[VIEW_COLLECTION_ITEMS_HIDDEN_SIGNAL] = g_signal_new ("items-hidden", TYPE_VIEW_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ViewCollectionClass, items_hidden), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, GEE_TYPE_COLLECTION);
#line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- g_signal_new ("items_visibility_changed", TYPE_VIEW_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ViewCollectionClass, items_visibility_changed), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, GEE_TYPE_COLLECTION);
+ view_collection_signals[VIEW_COLLECTION_ITEMS_VISIBILITY_CHANGED_SIGNAL] = g_signal_new ("items-visibility-changed", TYPE_VIEW_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ViewCollectionClass, items_visibility_changed), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, GEE_TYPE_COLLECTION);
#line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- g_signal_new ("item_view_altered", TYPE_VIEW_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ViewCollectionClass, item_view_altered), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, TYPE_DATA_VIEW);
+ view_collection_signals[VIEW_COLLECTION_ITEM_VIEW_ALTERED_SIGNAL] = g_signal_new ("item-view-altered", TYPE_VIEW_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ViewCollectionClass, item_view_altered), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, TYPE_DATA_VIEW);
#line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- g_signal_new ("item_geometry_altered", TYPE_VIEW_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ViewCollectionClass, item_geometry_altered), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, TYPE_DATA_VIEW);
+ view_collection_signals[VIEW_COLLECTION_ITEM_GEOMETRY_ALTERED_SIGNAL] = g_signal_new ("item-geometry-altered", TYPE_VIEW_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ViewCollectionClass, item_geometry_altered), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, TYPE_DATA_VIEW);
#line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- g_signal_new ("views_altered", TYPE_VIEW_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ViewCollectionClass, views_altered), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, GEE_TYPE_COLLECTION);
+ view_collection_signals[VIEW_COLLECTION_VIEWS_ALTERED_SIGNAL] = g_signal_new ("views-altered", TYPE_VIEW_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ViewCollectionClass, views_altered), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, GEE_TYPE_COLLECTION);
#line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- g_signal_new ("geometries_altered", TYPE_VIEW_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ViewCollectionClass, geometries_altered), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, GEE_TYPE_COLLECTION);
+ view_collection_signals[VIEW_COLLECTION_GEOMETRIES_ALTERED_SIGNAL] = g_signal_new ("geometries-altered", TYPE_VIEW_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ViewCollectionClass, geometries_altered), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, GEE_TYPE_COLLECTION);
#line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- 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);
+ 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"
- 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 8478 "ViewCollection.c"
+ 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"
}
static void view_collection_instance_init (ViewCollection * self) {
- GeeHashMultiMap* _tmp0_ = NULL;
- GeeHashSet* _tmp1_ = NULL;
- DataSet* _tmp2_ = NULL;
- GeeHashMap* _tmp3_ = NULL;
+ GeeHashMultiMap* _tmp0_;
+ GeeHashSet* _tmp1_;
+ DataSet* _tmp2_;
+ GeeHashMap* _tmp3_;
#line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
self->priv = VIEW_COLLECTION_GET_PRIVATE (self);
#line 59 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -8494,8 +8516,12 @@ static void view_collection_instance_init (ViewCollection * self) {
self->priv->mirroring = NULL;
#line 62 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
self->priv->mirroring_ctor = NULL;
+#line 62 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+ self->priv->mirroring_ctor_target = self;
#line 63 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
self->priv->should_mirror = NULL;
+#line 63 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+ self->priv->should_mirror_target = self;
#line 64 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp1_ = gee_hash_set_new (TYPE_VIEW_FILTER, (GBoxedCopyFunc) view_filter_ref, (GDestroyNotify) view_filter_unref, NULL, NULL, NULL, NULL, NULL, NULL);
#line 64 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -8514,11 +8540,11 @@ 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 8517 "ViewCollection.c"
+#line 8543 "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);
@@ -8540,7 +8566,7 @@ 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 8543 "ViewCollection.c"
+#line 8569 "ViewCollection.c"
}
@@ -8564,7 +8590,7 @@ 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 8567 "ViewCollection.c"
+#line 8593 "ViewCollection.c"
}
@@ -8573,7 +8599,7 @@ gboolean view_manager_include_in_view (ViewManager* self, DataSource* source) {
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 8576 "ViewCollection.c"
+#line 8602 "ViewCollection.c"
}
@@ -8582,7 +8608,7 @@ static DataView* view_manager_real_create_view (ViewManager* self, DataSource* s
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 8585 "ViewCollection.c"
+#line 8611 "ViewCollection.c"
}
@@ -8591,7 +8617,7 @@ DataView* view_manager_create_view (ViewManager* self, DataSource* source) {
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 8594 "ViewCollection.c"
+#line 8620 "ViewCollection.c"
}
@@ -8601,14 +8627,14 @@ ViewManager* view_manager_construct (GType object_type) {
self = (ViewManager*) g_type_create_instance (object_type);
#line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return self;
-#line 8604 "ViewCollection.c"
+#line 8630 "ViewCollection.c"
}
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 8611 "ViewCollection.c"
+#line 8637 "ViewCollection.c"
}
@@ -8617,7 +8643,7 @@ static void value_view_manager_free_value (GValue* value) {
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 8620 "ViewCollection.c"
+#line 8646 "ViewCollection.c"
}
}
@@ -8627,11 +8653,11 @@ static void value_view_manager_copy_value (const GValue* src_value, GValue* dest
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 8630 "ViewCollection.c"
+#line 8656 "ViewCollection.c"
} else {
#line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
dest_value->data[0].v_pointer = NULL;
-#line 8634 "ViewCollection.c"
+#line 8660 "ViewCollection.c"
}
}
@@ -8639,66 +8665,66 @@ static void value_view_manager_copy_value (const GValue* src_value, GValue* dest
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 8642 "ViewCollection.c"
+#line 8668 "ViewCollection.c"
}
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 8649 "ViewCollection.c"
- ViewManager* object;
+#line 8675 "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 8656 "ViewCollection.c"
+#line 8682 "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 8660 "ViewCollection.c"
+#line 8686 "ViewCollection.c"
}
#line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
value->data[0].v_pointer = view_manager_ref (object);
-#line 8664 "ViewCollection.c"
+#line 8690 "ViewCollection.c"
} else {
#line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
value->data[0].v_pointer = NULL;
-#line 8668 "ViewCollection.c"
+#line 8694 "ViewCollection.c"
}
#line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return NULL;
-#line 8672 "ViewCollection.c"
+#line 8698 "ViewCollection.c"
}
static gchar* value_view_manager_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
- ViewManager** object_p;
+ 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 8683 "ViewCollection.c"
+#line 8709 "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 8689 "ViewCollection.c"
+#line 8715 "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 8693 "ViewCollection.c"
+#line 8719 "ViewCollection.c"
} else {
#line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
*object_p = view_manager_ref (value->data[0].v_pointer);
-#line 8697 "ViewCollection.c"
+#line 8723 "ViewCollection.c"
}
#line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return NULL;
-#line 8701 "ViewCollection.c"
+#line 8727 "ViewCollection.c"
}
@@ -8712,7 +8738,7 @@ 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 8715 "ViewCollection.c"
+#line 8741 "ViewCollection.c"
}
@@ -8721,12 +8747,12 @@ gpointer value_get_view_manager (const GValue* value) {
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 8724 "ViewCollection.c"
+#line 8750 "ViewCollection.c"
}
void value_set_view_manager (GValue* value, gpointer v_object) {
- ViewManager* old;
+ 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));
#line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -8741,23 +8767,23 @@ 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 8744 "ViewCollection.c"
+#line 8770 "ViewCollection.c"
} else {
#line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
value->data[0].v_pointer = NULL;
-#line 8748 "ViewCollection.c"
+#line 8774 "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 8754 "ViewCollection.c"
+#line 8780 "ViewCollection.c"
}
}
void value_take_view_manager (GValue* value, gpointer v_object) {
- ViewManager* old;
+ 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));
#line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -8770,17 +8796,17 @@ 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 8773 "ViewCollection.c"
+#line 8799 "ViewCollection.c"
} else {
#line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
value->data[0].v_pointer = NULL;
-#line 8777 "ViewCollection.c"
+#line 8803 "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 8783 "ViewCollection.c"
+#line 8809 "ViewCollection.c"
}
}
@@ -8791,27 +8817,27 @@ static void view_manager_class_init (ViewManagerClass * klass) {
#line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
((ViewManagerClass *) klass)->finalize = view_manager_finalize;
#line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- ((ViewManagerClass *) klass)->include_in_view = (gboolean (*)(ViewManager*, DataSource*)) view_manager_real_include_in_view;
+ ((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 8797 "ViewCollection.c"
+ ((ViewManagerClass *) klass)->create_view = (DataView* (*) (ViewManager *, DataSource*)) view_manager_real_create_view;
+#line 8823 "ViewCollection.c"
}
static void view_manager_instance_init (ViewManager * self) {
#line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
self->ref_count = 1;
-#line 8804 "ViewCollection.c"
+#line 8830 "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 8814 "ViewCollection.c"
+#line 8840 "ViewCollection.c"
}
@@ -8830,18 +8856,18 @@ GType view_manager_get_type (void) {
gpointer view_manager_ref (gpointer instance) {
- ViewManager* self;
+ 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 8839 "ViewCollection.c"
+#line 8865 "ViewCollection.c"
}
void view_manager_unref (gpointer instance) {
- ViewManager* self;
+ ViewManager * self;
self = instance;
#line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -8849,7 +8875,7 @@ 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 8852 "ViewCollection.c"
+#line 8878 "ViewCollection.c"
}
}
@@ -8860,7 +8886,7 @@ static gboolean view_filter_real_predicate (ViewFilter* self, DataView* view) {
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 8863 "ViewCollection.c"
+#line 8889 "ViewCollection.c"
}
@@ -8869,7 +8895,7 @@ gboolean view_filter_predicate (ViewFilter* self, DataView* view) {
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 8872 "ViewCollection.c"
+#line 8898 "ViewCollection.c"
}
@@ -8879,7 +8905,7 @@ ViewFilter* view_filter_construct (GType object_type) {
self = (ViewFilter*) g_type_create_instance (object_type);
#line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return self;
-#line 8882 "ViewCollection.c"
+#line 8908 "ViewCollection.c"
}
@@ -8890,7 +8916,7 @@ static void view_filter_real_refresh (ViewFilter* self) {
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 8893 "ViewCollection.c"
+#line 8919 "ViewCollection.c"
}
@@ -8899,7 +8925,7 @@ static void value_view_filter_free_value (GValue* value) {
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 8902 "ViewCollection.c"
+#line 8928 "ViewCollection.c"
}
}
@@ -8909,11 +8935,11 @@ static void value_view_filter_copy_value (const GValue* src_value, GValue* dest_
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 8912 "ViewCollection.c"
+#line 8938 "ViewCollection.c"
} else {
#line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
dest_value->data[0].v_pointer = NULL;
-#line 8916 "ViewCollection.c"
+#line 8942 "ViewCollection.c"
}
}
@@ -8921,66 +8947,66 @@ static void value_view_filter_copy_value (const GValue* src_value, GValue* dest_
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 8924 "ViewCollection.c"
+#line 8950 "ViewCollection.c"
}
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 8931 "ViewCollection.c"
- ViewFilter* object;
+#line 8957 "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 8938 "ViewCollection.c"
+#line 8964 "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 8942 "ViewCollection.c"
+#line 8968 "ViewCollection.c"
}
#line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
value->data[0].v_pointer = view_filter_ref (object);
-#line 8946 "ViewCollection.c"
+#line 8972 "ViewCollection.c"
} else {
#line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
value->data[0].v_pointer = NULL;
-#line 8950 "ViewCollection.c"
+#line 8976 "ViewCollection.c"
}
#line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return NULL;
-#line 8954 "ViewCollection.c"
+#line 8980 "ViewCollection.c"
}
static gchar* value_view_filter_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
- ViewFilter** object_p;
+ 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 8965 "ViewCollection.c"
+#line 8991 "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 8971 "ViewCollection.c"
+#line 8997 "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 8975 "ViewCollection.c"
+#line 9001 "ViewCollection.c"
} else {
#line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
*object_p = view_filter_ref (value->data[0].v_pointer);
-#line 8979 "ViewCollection.c"
+#line 9005 "ViewCollection.c"
}
#line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return NULL;
-#line 8983 "ViewCollection.c"
+#line 9009 "ViewCollection.c"
}
@@ -8994,7 +9020,7 @@ 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 8997 "ViewCollection.c"
+#line 9023 "ViewCollection.c"
}
@@ -9003,12 +9029,12 @@ gpointer value_get_view_filter (const GValue* value) {
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 9006 "ViewCollection.c"
+#line 9032 "ViewCollection.c"
}
void value_set_view_filter (GValue* value, gpointer v_object) {
- ViewFilter* old;
+ 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));
#line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -9023,23 +9049,23 @@ 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 9026 "ViewCollection.c"
+#line 9052 "ViewCollection.c"
} else {
#line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
value->data[0].v_pointer = NULL;
-#line 9030 "ViewCollection.c"
+#line 9056 "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 9036 "ViewCollection.c"
+#line 9062 "ViewCollection.c"
}
}
void value_take_view_filter (GValue* value, gpointer v_object) {
- ViewFilter* old;
+ 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));
#line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -9052,17 +9078,17 @@ 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 9055 "ViewCollection.c"
+#line 9081 "ViewCollection.c"
} else {
#line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
value->data[0].v_pointer = NULL;
-#line 9059 "ViewCollection.c"
+#line 9085 "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 9065 "ViewCollection.c"
+#line 9091 "ViewCollection.c"
}
}
@@ -9073,29 +9099,29 @@ static void view_filter_class_init (ViewFilterClass * klass) {
#line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
((ViewFilterClass *) klass)->finalize = view_filter_finalize;
#line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- ((ViewFilterClass *) klass)->predicate = (gboolean (*)(ViewFilter*, DataView*)) view_filter_real_predicate;
+ ((ViewFilterClass *) klass)->predicate = (gboolean (*) (ViewFilter *, DataView*)) view_filter_real_predicate;
#line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
((ViewFilterClass *) klass)->refresh = view_filter_real_refresh;
#line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- 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 9081 "ViewCollection.c"
+ 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"
}
static void view_filter_instance_init (ViewFilter * self) {
#line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
self->ref_count = 1;
-#line 9088 "ViewCollection.c"
+#line 9114 "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 9098 "ViewCollection.c"
+#line 9124 "ViewCollection.c"
}
@@ -9114,18 +9140,18 @@ GType view_filter_get_type (void) {
gpointer view_filter_ref (gpointer instance) {
- ViewFilter* self;
+ 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 9123 "ViewCollection.c"
+#line 9149 "ViewCollection.c"
}
void view_filter_unref (gpointer instance) {
- ViewFilter* self;
+ ViewFilter * self;
self = instance;
#line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -9133,7 +9159,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 9136 "ViewCollection.c"
+#line 9162 "ViewCollection.c"
}
}