New upstream version 0.26.1upstream/0.26.1

1 files changed, 203 insertions, 202 deletions

diff --git a/src/searches/SavedSearchDialog.c b/src/searches/SavedSearchDialog.c
index 91d066e..5050916 100644
--- a/src/searches/SavedSearchDialog.c
+++ b/src/searches/SavedSearchDialog.c
@@ -1,4 +1,4 @@
-/* SavedSearchDialog.c generated by valac 0.34.4, the Vala compiler
+/* SavedSearchDialog.c generated by valac 0.34.7, the Vala compiler
  * generated from SavedSearchDialog.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -1038,7 +1038,7 @@ SavedSearchDialog* saved_search_dialog_construct_edit_existing (GType object_typ
 #line 677 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp24_ = self->priv->row_list;
 #line 677 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp25_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GEE_TYPE_COLLECTION, GeeCollection));
+	_tmp25_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 677 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp26_ = _tmp25_;
 #line 677 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
@@ -1361,7 +1361,7 @@ static void saved_search_dialog_add_row (SavedSearchDialog* self, SavedSearchDia
 #line 741 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = self->priv->row_list;
 #line 741 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp1_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection));
+	_tmp1_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 741 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp2_ = _tmp1_;
 #line 741 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
@@ -1469,7 +1469,7 @@ static void saved_search_dialog_on_remove_row (SavedSearchDialog* self, SavedSea
 #line 756 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp10_ = self->priv->row_list;
 #line 756 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp11_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_COLLECTION, GeeCollection));
+	_tmp11_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 756 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp12_ = _tmp11_;
 #line 756 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
@@ -1627,7 +1627,7 @@ static void saved_search_dialog_on_response (SavedSearchDialog* self, gint respo
 #line 1628 "SavedSearchDialog.c"
 		}
 #line 775 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-		_tmp23_ = gee_array_list_new (TYPE_SEARCH_CONDITION, (GBoxedCopyFunc) search_condition_ref, search_condition_unref, NULL, NULL, NULL);
+		_tmp23_ = gee_array_list_new (TYPE_SEARCH_CONDITION, (GBoxedCopyFunc) search_condition_ref, (GDestroyNotify) search_condition_unref, NULL, NULL, NULL);
 #line 775 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		conditions = _tmp23_;
 #line 1634 "SavedSearchDialog.c"
@@ -1649,7 +1649,7 @@ static void saved_search_dialog_on_response (SavedSearchDialog* self, gint respo
 #line 776 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_tmp26_ = _c_list;
 #line 776 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-			_tmp27_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, GEE_TYPE_COLLECTION, GeeCollection));
+			_tmp27_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 776 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_tmp28_ = _tmp27_;
 #line 776 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
@@ -1972,7 +1972,7 @@ static void saved_search_dialog_set_valid (SavedSearchDialog* self, gboolean v)
 #line 813 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 					_tmp6_ = _c_list;
 #line 813 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-					_tmp7_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_COLLECTION, GeeCollection));
+					_tmp7_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 813 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 					_tmp8_ = _tmp7_;
 #line 813 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
@@ -2040,7 +2040,7 @@ static void saved_search_dialog_set_valid (SavedSearchDialog* self, gboolean v)
 #line 817 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 				_tmp19_ = self->priv->row_list;
 #line 817 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-				_tmp20_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GEE_TYPE_COLLECTION, GeeCollection));
+				_tmp20_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 817 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 				_tmp21_ = _tmp20_;
 #line 817 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
@@ -2984,11 +2984,12 @@ void saved_search_dialog_search_row_populate (SavedSearchDialogSearchRow* self,
 
 
 static gboolean saved_search_dialog_search_row_real_is_complete (SavedSearchDialogSearchRow* self) {
+	gboolean _tmp0_ = FALSE;
 #line 147 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_critical ("Type `%s' does not implement abstract method `saved_search_dialog_search_row_is_complete'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 147 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	return FALSE;
-#line 2992 "SavedSearchDialog.c"
+	return _tmp0_;
+#line 2993 "SavedSearchDialog.c"
 }
 
 
@@ -2997,7 +2998,7 @@ gboolean saved_search_dialog_search_row_is_complete (SavedSearchDialogSearchRow*
 	g_return_val_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW (self), FALSE);
 #line 147 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return SAVED_SEARCH_DIALOG_SEARCH_ROW_GET_CLASS (self)->is_complete (self);
-#line 3001 "SavedSearchDialog.c"
+#line 3002 "SavedSearchDialog.c"
 }
 
 
@@ -3007,14 +3008,14 @@ static SavedSearchDialogSearchRow* saved_search_dialog_search_row_construct (GTy
 	self = (SavedSearchDialogSearchRow*) g_type_create_instance (object_type);
 #line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return self;
-#line 3011 "SavedSearchDialog.c"
+#line 3012 "SavedSearchDialog.c"
 }
 
 
 static void saved_search_dialog_value_search_row_init (GValue* value) {
 #line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	value->data[0].v_pointer = NULL;
-#line 3018 "SavedSearchDialog.c"
+#line 3019 "SavedSearchDialog.c"
 }
 
 
@@ -3023,7 +3024,7 @@ static void saved_search_dialog_value_search_row_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		saved_search_dialog_search_row_unref (value->data[0].v_pointer);
-#line 3027 "SavedSearchDialog.c"
+#line 3028 "SavedSearchDialog.c"
 	}
 }
 
@@ -3033,11 +3034,11 @@ static void saved_search_dialog_value_search_row_copy_value (const GValue* src_v
 	if (src_value->data[0].v_pointer) {
 #line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		dest_value->data[0].v_pointer = saved_search_dialog_search_row_ref (src_value->data[0].v_pointer);
-#line 3037 "SavedSearchDialog.c"
+#line 3038 "SavedSearchDialog.c"
 	} else {
 #line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 3041 "SavedSearchDialog.c"
+#line 3042 "SavedSearchDialog.c"
 	}
 }
 
@@ -3045,37 +3046,37 @@ static void saved_search_dialog_value_search_row_copy_value (const GValue* src_v
 static gpointer saved_search_dialog_value_search_row_peek_pointer (const GValue* value) {
 #line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return value->data[0].v_pointer;
-#line 3049 "SavedSearchDialog.c"
+#line 3050 "SavedSearchDialog.c"
 }
 
 
 static gchar* saved_search_dialog_value_search_row_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	if (collect_values[0].v_pointer) {
-#line 3056 "SavedSearchDialog.c"
+#line 3057 "SavedSearchDialog.c"
 		SavedSearchDialogSearchRow* object;
 		object = collect_values[0].v_pointer;
 #line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 3063 "SavedSearchDialog.c"
+#line 3064 "SavedSearchDialog.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.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 3067 "SavedSearchDialog.c"
+#line 3068 "SavedSearchDialog.c"
 		}
 #line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		value->data[0].v_pointer = saved_search_dialog_search_row_ref (object);
-#line 3071 "SavedSearchDialog.c"
+#line 3072 "SavedSearchDialog.c"
 	} else {
 #line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		value->data[0].v_pointer = NULL;
-#line 3075 "SavedSearchDialog.c"
+#line 3076 "SavedSearchDialog.c"
 	}
 #line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return NULL;
-#line 3079 "SavedSearchDialog.c"
+#line 3080 "SavedSearchDialog.c"
 }
 
 
@@ -3086,25 +3087,25 @@ static gchar* saved_search_dialog_value_search_row_lcopy_value (const GValue* va
 	if (!object_p) {
 #line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 3090 "SavedSearchDialog.c"
+#line 3091 "SavedSearchDialog.c"
 	}
 #line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	if (!value->data[0].v_pointer) {
 #line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		*object_p = NULL;
-#line 3096 "SavedSearchDialog.c"
+#line 3097 "SavedSearchDialog.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		*object_p = value->data[0].v_pointer;
-#line 3100 "SavedSearchDialog.c"
+#line 3101 "SavedSearchDialog.c"
 	} else {
 #line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		*object_p = saved_search_dialog_search_row_ref (value->data[0].v_pointer);
-#line 3104 "SavedSearchDialog.c"
+#line 3105 "SavedSearchDialog.c"
 	}
 #line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return NULL;
-#line 3108 "SavedSearchDialog.c"
+#line 3109 "SavedSearchDialog.c"
 }
 
 
@@ -3118,7 +3119,7 @@ static GParamSpec* saved_search_dialog_param_spec_search_row (const gchar* name,
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return G_PARAM_SPEC (spec);
-#line 3122 "SavedSearchDialog.c"
+#line 3123 "SavedSearchDialog.c"
 }
 
 
@@ -3127,7 +3128,7 @@ static gpointer saved_search_dialog_value_get_search_row (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW), NULL);
 #line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return value->data[0].v_pointer;
-#line 3131 "SavedSearchDialog.c"
+#line 3132 "SavedSearchDialog.c"
 }
 
 
@@ -3147,17 +3148,17 @@ static void saved_search_dialog_value_set_search_row (GValue* value, gpointer v_
 		value->data[0].v_pointer = v_object;
 #line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		saved_search_dialog_search_row_ref (value->data[0].v_pointer);
-#line 3151 "SavedSearchDialog.c"
+#line 3152 "SavedSearchDialog.c"
 	} else {
 #line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		value->data[0].v_pointer = NULL;
-#line 3155 "SavedSearchDialog.c"
+#line 3156 "SavedSearchDialog.c"
 	}
 #line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	if (old) {
 #line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		saved_search_dialog_search_row_unref (old);
-#line 3161 "SavedSearchDialog.c"
+#line 3162 "SavedSearchDialog.c"
 	}
 }
 
@@ -3176,17 +3177,17 @@ static void saved_search_dialog_value_take_search_row (GValue* value, gpointer v
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		value->data[0].v_pointer = v_object;
-#line 3180 "SavedSearchDialog.c"
+#line 3181 "SavedSearchDialog.c"
 	} else {
 #line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		value->data[0].v_pointer = NULL;
-#line 3184 "SavedSearchDialog.c"
+#line 3185 "SavedSearchDialog.c"
 	}
 #line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	if (old) {
 #line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		saved_search_dialog_search_row_unref (old);
-#line 3190 "SavedSearchDialog.c"
+#line 3191 "SavedSearchDialog.c"
 	}
 }
 
@@ -3197,21 +3198,21 @@ static void saved_search_dialog_search_row_class_init (SavedSearchDialogSearchRo
 #line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	((SavedSearchDialogSearchRowClass *) klass)->finalize = saved_search_dialog_search_row_finalize;
 #line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	((SavedSearchDialogSearchRowClass *) klass)->get_widget = saved_search_dialog_search_row_real_get_widget;
+	((SavedSearchDialogSearchRowClass *) klass)->get_widget = (GtkWidget* (*)(SavedSearchDialogSearchRow*)) saved_search_dialog_search_row_real_get_widget;
 #line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	((SavedSearchDialogSearchRowClass *) klass)->get_search_condition = saved_search_dialog_search_row_real_get_search_condition;
+	((SavedSearchDialogSearchRowClass *) klass)->get_search_condition = (SearchCondition* (*)(SavedSearchDialogSearchRow*)) saved_search_dialog_search_row_real_get_search_condition;
 #line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	((SavedSearchDialogSearchRowClass *) klass)->populate = saved_search_dialog_search_row_real_populate;
+	((SavedSearchDialogSearchRowClass *) klass)->populate = (void (*)(SavedSearchDialogSearchRow*, SearchCondition*)) saved_search_dialog_search_row_real_populate;
 #line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	((SavedSearchDialogSearchRowClass *) klass)->is_complete = saved_search_dialog_search_row_real_is_complete;
-#line 3208 "SavedSearchDialog.c"
+	((SavedSearchDialogSearchRowClass *) klass)->is_complete = (gboolean (*)(SavedSearchDialogSearchRow*)) saved_search_dialog_search_row_real_is_complete;
+#line 3209 "SavedSearchDialog.c"
 }
 
 
 static void saved_search_dialog_search_row_instance_init (SavedSearchDialogSearchRow * self) {
 #line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self->ref_count = 1;
-#line 3215 "SavedSearchDialog.c"
+#line 3216 "SavedSearchDialog.c"
 }
 
 
@@ -3221,7 +3222,7 @@ static void saved_search_dialog_search_row_finalize (SavedSearchDialogSearchRow*
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW, SavedSearchDialogSearchRow);
 #line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_signal_handlers_destroy (self);
-#line 3225 "SavedSearchDialog.c"
+#line 3226 "SavedSearchDialog.c"
 }
 
 
@@ -3246,7 +3247,7 @@ static gpointer saved_search_dialog_search_row_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return instance;
-#line 3250 "SavedSearchDialog.c"
+#line 3251 "SavedSearchDialog.c"
 }
 
 
@@ -3259,7 +3260,7 @@ static void saved_search_dialog_search_row_unref (gpointer instance) {
 		SAVED_SEARCH_DIALOG_SEARCH_ROW_GET_CLASS (self)->finalize (self);
 #line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 3263 "SavedSearchDialog.c"
+#line 3264 "SavedSearchDialog.c"
 	}
 }
 
@@ -3267,21 +3268,21 @@ static void saved_search_dialog_search_row_unref (gpointer instance) {
 static void _saved_search_dialog_search_row_text_on_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
 #line 184 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_search_row_text_on_changed ((SavedSearchDialogSearchRowText*) self);
-#line 3271 "SavedSearchDialog.c"
+#line 3272 "SavedSearchDialog.c"
 }
 
 
 static void _saved_search_dialog_search_row_text_on_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self) {
 #line 185 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_search_row_text_on_changed ((SavedSearchDialogSearchRowText*) self);
-#line 3278 "SavedSearchDialog.c"
+#line 3279 "SavedSearchDialog.c"
 }
 
 
 static gpointer _saved_search_dialog_search_row_container_ref0 (gpointer self) {
 #line 158 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return self ? saved_search_dialog_search_row_container_ref (self) : NULL;
-#line 3285 "SavedSearchDialog.c"
+#line 3286 "SavedSearchDialog.c"
 }
 
 
@@ -3432,14 +3433,14 @@ static SavedSearchDialogSearchRowText* saved_search_dialog_search_row_text_const
 	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, gtk_widget_get_type (), GtkWidget));
 #line 157 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return self;
-#line 3436 "SavedSearchDialog.c"
+#line 3437 "SavedSearchDialog.c"
 }
 
 
 static SavedSearchDialogSearchRowText* saved_search_dialog_search_row_text_new (SavedSearchDialogSearchRowContainer* parent) {
 #line 157 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return saved_search_dialog_search_row_text_construct (SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_TEXT, parent);
-#line 3443 "SavedSearchDialog.c"
+#line 3444 "SavedSearchDialog.c"
 }
 
 
@@ -3458,7 +3459,7 @@ static GtkWidget* saved_search_dialog_search_row_text_real_get_widget (SavedSear
 	result = _tmp1_;
 #line 189 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return result;
-#line 3462 "SavedSearchDialog.c"
+#line 3463 "SavedSearchDialog.c"
 }
 
 
@@ -3506,14 +3507,14 @@ static SearchCondition* saved_search_dialog_search_row_text_real_get_search_cond
 	_g_free0 (text);
 #line 197 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return result;
-#line 3510 "SavedSearchDialog.c"
+#line 3511 "SavedSearchDialog.c"
 }
 
 
 static gpointer _search_condition_ref0 (gpointer self) {
 #line 201 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return self ? search_condition_ref (self) : NULL;
-#line 3517 "SavedSearchDialog.c"
+#line 3518 "SavedSearchDialog.c"
 }
 
 
@@ -3560,7 +3561,7 @@ static void saved_search_dialog_search_row_text_real_populate (SavedSearchDialog
 	saved_search_dialog_search_row_text_on_changed (self);
 #line 200 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_search_condition_unref0 (text);
-#line 3564 "SavedSearchDialog.c"
+#line 3565 "SavedSearchDialog.c"
 }
 
 
@@ -3595,33 +3596,33 @@ static gboolean saved_search_dialog_search_row_text_real_is_complete (SavedSearc
 	if (_tmp7_) {
 #line 209 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp1_ = TRUE;
-#line 3599 "SavedSearchDialog.c"
+#line 3600 "SavedSearchDialog.c"
 	} else {
 		SearchConditionTextContext _tmp8_ = 0;
 #line 210 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp8_ = saved_search_dialog_search_row_text_get_text_context (self);
 #line 210 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp1_ = _tmp8_ == SEARCH_CONDITION_TEXT_CONTEXT_IS_NOT_SET;
-#line 3606 "SavedSearchDialog.c"
+#line 3607 "SavedSearchDialog.c"
 	}
 #line 209 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	if (_tmp1_) {
 #line 209 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp0_ = TRUE;
-#line 3612 "SavedSearchDialog.c"
+#line 3613 "SavedSearchDialog.c"
 	} else {
 		SearchConditionTextContext _tmp9_ = 0;
 #line 211 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp9_ = saved_search_dialog_search_row_text_get_text_context (self);
 #line 211 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp0_ = _tmp9_ == SEARCH_CONDITION_TEXT_CONTEXT_IS_SET;
-#line 3619 "SavedSearchDialog.c"
+#line 3620 "SavedSearchDialog.c"
 	}
 #line 209 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	result = _tmp0_;
 #line 209 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return result;
-#line 3625 "SavedSearchDialog.c"
+#line 3626 "SavedSearchDialog.c"
 }
 
 
@@ -3639,7 +3640,7 @@ static SearchConditionTextContext saved_search_dialog_search_row_text_get_text_c
 	result = (SearchConditionTextContext) _tmp1_;
 #line 215 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return result;
-#line 3643 "SavedSearchDialog.c"
+#line 3644 "SavedSearchDialog.c"
 }
 
 
@@ -3656,31 +3657,31 @@ static void saved_search_dialog_search_row_text_on_changed (SavedSearchDialogSea
 	if (_tmp1_ == SEARCH_CONDITION_TEXT_CONTEXT_IS_NOT_SET) {
 #line 219 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp0_ = TRUE;
-#line 3660 "SavedSearchDialog.c"
+#line 3661 "SavedSearchDialog.c"
 	} else {
 		SearchConditionTextContext _tmp2_ = 0;
 #line 220 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp2_ = saved_search_dialog_search_row_text_get_text_context (self);
 #line 220 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp0_ = _tmp2_ == SEARCH_CONDITION_TEXT_CONTEXT_IS_SET;
-#line 3667 "SavedSearchDialog.c"
+#line 3668 "SavedSearchDialog.c"
 	}
 #line 219 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	if (_tmp0_) {
-#line 3671 "SavedSearchDialog.c"
+#line 3672 "SavedSearchDialog.c"
 		GtkEntry* _tmp3_ = NULL;
 #line 221 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp3_ = self->priv->entry;
 #line 221 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget));
-#line 3677 "SavedSearchDialog.c"
+#line 3678 "SavedSearchDialog.c"
 	} else {
 		GtkEntry* _tmp4_ = NULL;
 #line 223 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp4_ = self->priv->entry;
 #line 223 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		gtk_widget_show (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_widget_get_type (), GtkWidget));
-#line 3684 "SavedSearchDialog.c"
+#line 3685 "SavedSearchDialog.c"
 	}
 #line 226 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp5_ = self->priv->parent;
@@ -3688,7 +3689,7 @@ static void saved_search_dialog_search_row_text_on_changed (SavedSearchDialogSea
 	_tmp6_ = self->priv->parent;
 #line 226 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_signal_emit_by_name (_tmp5_, "changed", _tmp6_);
-#line 3692 "SavedSearchDialog.c"
+#line 3693 "SavedSearchDialog.c"
 }
 
 
@@ -3700,21 +3701,21 @@ static void saved_search_dialog_search_row_text_class_init (SavedSearchDialogSea
 #line 150 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_type_class_add_private (klass, sizeof (SavedSearchDialogSearchRowTextPrivate));
 #line 150 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	((SavedSearchDialogSearchRowClass *) klass)->get_widget = saved_search_dialog_search_row_text_real_get_widget;
+	((SavedSearchDialogSearchRowClass *) klass)->get_widget = (GtkWidget* (*)(SavedSearchDialogSearchRow*)) saved_search_dialog_search_row_text_real_get_widget;
 #line 150 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	((SavedSearchDialogSearchRowClass *) klass)->get_search_condition = saved_search_dialog_search_row_text_real_get_search_condition;
+	((SavedSearchDialogSearchRowClass *) klass)->get_search_condition = (SearchCondition* (*)(SavedSearchDialogSearchRow*)) saved_search_dialog_search_row_text_real_get_search_condition;
 #line 150 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	((SavedSearchDialogSearchRowClass *) klass)->populate = saved_search_dialog_search_row_text_real_populate;
+	((SavedSearchDialogSearchRowClass *) klass)->populate = (void (*)(SavedSearchDialogSearchRow*, SearchCondition*)) saved_search_dialog_search_row_text_real_populate;
 #line 150 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	((SavedSearchDialogSearchRowClass *) klass)->is_complete = saved_search_dialog_search_row_text_real_is_complete;
-#line 3711 "SavedSearchDialog.c"
+	((SavedSearchDialogSearchRowClass *) klass)->is_complete = (gboolean (*)(SavedSearchDialogSearchRow*)) saved_search_dialog_search_row_text_real_is_complete;
+#line 3712 "SavedSearchDialog.c"
 }
 
 
 static void saved_search_dialog_search_row_text_instance_init (SavedSearchDialogSearchRowText * self) {
 #line 150 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self->priv = SAVED_SEARCH_DIALOG_SEARCH_ROW_TEXT_GET_PRIVATE (self);
-#line 3718 "SavedSearchDialog.c"
+#line 3719 "SavedSearchDialog.c"
 }
 
 
@@ -3748,7 +3749,7 @@ static void saved_search_dialog_search_row_text_finalize (SavedSearchDialogSearc
 	_saved_search_dialog_search_row_container_unref0 (self->priv->parent);
 #line 150 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	SAVED_SEARCH_DIALOG_SEARCH_ROW_CLASS (saved_search_dialog_search_row_text_parent_class)->finalize (obj);
-#line 3752 "SavedSearchDialog.c"
+#line 3753 "SavedSearchDialog.c"
 }
 
 
@@ -3767,7 +3768,7 @@ static GType saved_search_dialog_search_row_text_get_type (void) {
 static void _saved_search_dialog_search_row_media_type_on_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
 #line 262 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_search_row_media_type_on_changed ((SavedSearchDialogSearchRowMediaType*) self);
-#line 3771 "SavedSearchDialog.c"
+#line 3772 "SavedSearchDialog.c"
 }
 
 
@@ -3897,14 +3898,14 @@ static SavedSearchDialogSearchRowMediaType* saved_search_dialog_search_row_media
 	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, gtk_widget_get_type (), GtkWidget));
 #line 237 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return self;
-#line 3901 "SavedSearchDialog.c"
+#line 3902 "SavedSearchDialog.c"
 }
 
 
 static SavedSearchDialogSearchRowMediaType* saved_search_dialog_search_row_media_type_new (SavedSearchDialogSearchRowContainer* parent) {
 #line 237 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return saved_search_dialog_search_row_media_type_construct (SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_MEDIA_TYPE, parent);
-#line 3908 "SavedSearchDialog.c"
+#line 3909 "SavedSearchDialog.c"
 }
 
 
@@ -3923,7 +3924,7 @@ static GtkWidget* saved_search_dialog_search_row_media_type_real_get_widget (Sav
 	result = _tmp1_;
 #line 267 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return result;
-#line 3927 "SavedSearchDialog.c"
+#line 3928 "SavedSearchDialog.c"
 }
 
 
@@ -3969,7 +3970,7 @@ static SearchCondition* saved_search_dialog_search_row_media_type_real_get_searc
 	result = G_TYPE_CHECK_INSTANCE_CAST (c, TYPE_SEARCH_CONDITION, SearchCondition);
 #line 275 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return result;
-#line 3973 "SavedSearchDialog.c"
+#line 3974 "SavedSearchDialog.c"
 }
 
 
@@ -4014,7 +4015,7 @@ static void saved_search_dialog_search_row_media_type_real_populate (SavedSearch
 	gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_combo_box_get_type (), GtkComboBox), (gint) _tmp7_);
 #line 278 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_search_condition_unref0 (media);
-#line 4018 "SavedSearchDialog.c"
+#line 4019 "SavedSearchDialog.c"
 }
 
 
@@ -4027,7 +4028,7 @@ static gboolean saved_search_dialog_search_row_media_type_real_is_complete (Save
 	result = TRUE;
 #line 286 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return result;
-#line 4031 "SavedSearchDialog.c"
+#line 4032 "SavedSearchDialog.c"
 }
 
 
@@ -4042,7 +4043,7 @@ static void saved_search_dialog_search_row_media_type_on_changed (SavedSearchDia
 	_tmp1_ = self->priv->parent;
 #line 290 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_signal_emit_by_name (_tmp0_, "changed", _tmp1_);
-#line 4046 "SavedSearchDialog.c"
+#line 4047 "SavedSearchDialog.c"
 }
 
 
@@ -4054,21 +4055,21 @@ static void saved_search_dialog_search_row_media_type_class_init (SavedSearchDia
 #line 230 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_type_class_add_private (klass, sizeof (SavedSearchDialogSearchRowMediaTypePrivate));
 #line 230 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	((SavedSearchDialogSearchRowClass *) klass)->get_widget = saved_search_dialog_search_row_media_type_real_get_widget;
+	((SavedSearchDialogSearchRowClass *) klass)->get_widget = (GtkWidget* (*)(SavedSearchDialogSearchRow*)) saved_search_dialog_search_row_media_type_real_get_widget;
 #line 230 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	((SavedSearchDialogSearchRowClass *) klass)->get_search_condition = saved_search_dialog_search_row_media_type_real_get_search_condition;
+	((SavedSearchDialogSearchRowClass *) klass)->get_search_condition = (SearchCondition* (*)(SavedSearchDialogSearchRow*)) saved_search_dialog_search_row_media_type_real_get_search_condition;
 #line 230 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	((SavedSearchDialogSearchRowClass *) klass)->populate = saved_search_dialog_search_row_media_type_real_populate;
+	((SavedSearchDialogSearchRowClass *) klass)->populate = (void (*)(SavedSearchDialogSearchRow*, SearchCondition*)) saved_search_dialog_search_row_media_type_real_populate;
 #line 230 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	((SavedSearchDialogSearchRowClass *) klass)->is_complete = saved_search_dialog_search_row_media_type_real_is_complete;
-#line 4065 "SavedSearchDialog.c"
+	((SavedSearchDialogSearchRowClass *) klass)->is_complete = (gboolean (*)(SavedSearchDialogSearchRow*)) saved_search_dialog_search_row_media_type_real_is_complete;
+#line 4066 "SavedSearchDialog.c"
 }
 
 
 static void saved_search_dialog_search_row_media_type_instance_init (SavedSearchDialogSearchRowMediaType * self) {
 #line 230 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self->priv = SAVED_SEARCH_DIALOG_SEARCH_ROW_MEDIA_TYPE_GET_PRIVATE (self);
-#line 4072 "SavedSearchDialog.c"
+#line 4073 "SavedSearchDialog.c"
 }
 
 
@@ -4102,7 +4103,7 @@ static void saved_search_dialog_search_row_media_type_finalize (SavedSearchDialo
 	_saved_search_dialog_search_row_container_unref0 (self->priv->parent);
 #line 230 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	SAVED_SEARCH_DIALOG_SEARCH_ROW_CLASS (saved_search_dialog_search_row_media_type_parent_class)->finalize (obj);
-#line 4106 "SavedSearchDialog.c"
+#line 4107 "SavedSearchDialog.c"
 }
 
 
@@ -4121,7 +4122,7 @@ static GType saved_search_dialog_search_row_media_type_get_type (void) {
 static void _saved_search_dialog_search_row_modified_on_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
 #line 324 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_search_row_modified_on_changed ((SavedSearchDialogSearchRowModified*) self);
-#line 4125 "SavedSearchDialog.c"
+#line 4126 "SavedSearchDialog.c"
 }
 
 
@@ -4251,14 +4252,14 @@ static SavedSearchDialogSearchRowModified* saved_search_dialog_search_row_modifi
 	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, gtk_widget_get_type (), GtkWidget));
 #line 301 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return self;
-#line 4255 "SavedSearchDialog.c"
+#line 4256 "SavedSearchDialog.c"
 }
 
 
 static SavedSearchDialogSearchRowModified* saved_search_dialog_search_row_modified_new (SavedSearchDialogSearchRowContainer* parent) {
 #line 301 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return saved_search_dialog_search_row_modified_construct (SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_MODIFIED, parent);
-#line 4262 "SavedSearchDialog.c"
+#line 4263 "SavedSearchDialog.c"
 }
 
 
@@ -4277,7 +4278,7 @@ static GtkWidget* saved_search_dialog_search_row_modified_real_get_widget (Saved
 	result = _tmp1_;
 #line 329 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return result;
-#line 4281 "SavedSearchDialog.c"
+#line 4282 "SavedSearchDialog.c"
 }
 
 
@@ -4323,7 +4324,7 @@ static SearchCondition* saved_search_dialog_search_row_modified_real_get_search_
 	result = G_TYPE_CHECK_INSTANCE_CAST (c, TYPE_SEARCH_CONDITION, SearchCondition);
 #line 337 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return result;
-#line 4327 "SavedSearchDialog.c"
+#line 4328 "SavedSearchDialog.c"
 }
 
 
@@ -4368,7 +4369,7 @@ static void saved_search_dialog_search_row_modified_real_populate (SavedSearchDi
 	gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_combo_box_get_type (), GtkComboBox), (gint) _tmp7_);
 #line 340 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_search_condition_unref0 (scm);
-#line 4372 "SavedSearchDialog.c"
+#line 4373 "SavedSearchDialog.c"
 }
 
 
@@ -4381,7 +4382,7 @@ static gboolean saved_search_dialog_search_row_modified_real_is_complete (SavedS
 	result = TRUE;
 #line 348 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return result;
-#line 4385 "SavedSearchDialog.c"
+#line 4386 "SavedSearchDialog.c"
 }
 
 
@@ -4396,7 +4397,7 @@ static void saved_search_dialog_search_row_modified_on_changed (SavedSearchDialo
 	_tmp1_ = self->priv->parent;
 #line 352 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_signal_emit_by_name (_tmp0_, "changed", _tmp1_);
-#line 4400 "SavedSearchDialog.c"
+#line 4401 "SavedSearchDialog.c"
 }
 
 
@@ -4408,21 +4409,21 @@ static void saved_search_dialog_search_row_modified_class_init (SavedSearchDialo
 #line 294 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_type_class_add_private (klass, sizeof (SavedSearchDialogSearchRowModifiedPrivate));
 #line 294 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	((SavedSearchDialogSearchRowClass *) klass)->get_widget = saved_search_dialog_search_row_modified_real_get_widget;
+	((SavedSearchDialogSearchRowClass *) klass)->get_widget = (GtkWidget* (*)(SavedSearchDialogSearchRow*)) saved_search_dialog_search_row_modified_real_get_widget;
 #line 294 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	((SavedSearchDialogSearchRowClass *) klass)->get_search_condition = saved_search_dialog_search_row_modified_real_get_search_condition;
+	((SavedSearchDialogSearchRowClass *) klass)->get_search_condition = (SearchCondition* (*)(SavedSearchDialogSearchRow*)) saved_search_dialog_search_row_modified_real_get_search_condition;
 #line 294 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	((SavedSearchDialogSearchRowClass *) klass)->populate = saved_search_dialog_search_row_modified_real_populate;
+	((SavedSearchDialogSearchRowClass *) klass)->populate = (void (*)(SavedSearchDialogSearchRow*, SearchCondition*)) saved_search_dialog_search_row_modified_real_populate;
 #line 294 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	((SavedSearchDialogSearchRowClass *) klass)->is_complete = saved_search_dialog_search_row_modified_real_is_complete;
-#line 4419 "SavedSearchDialog.c"
+	((SavedSearchDialogSearchRowClass *) klass)->is_complete = (gboolean (*)(SavedSearchDialogSearchRow*)) saved_search_dialog_search_row_modified_real_is_complete;
+#line 4420 "SavedSearchDialog.c"
 }
 
 
 static void saved_search_dialog_search_row_modified_instance_init (SavedSearchDialogSearchRowModified * self) {
 #line 294 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self->priv = SAVED_SEARCH_DIALOG_SEARCH_ROW_MODIFIED_GET_PRIVATE (self);
-#line 4426 "SavedSearchDialog.c"
+#line 4427 "SavedSearchDialog.c"
 }
 
 
@@ -4456,7 +4457,7 @@ static void saved_search_dialog_search_row_modified_finalize (SavedSearchDialogS
 	_saved_search_dialog_search_row_container_unref0 (self->priv->parent);
 #line 294 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	SAVED_SEARCH_DIALOG_SEARCH_ROW_CLASS (saved_search_dialog_search_row_modified_parent_class)->finalize (obj);
-#line 4460 "SavedSearchDialog.c"
+#line 4461 "SavedSearchDialog.c"
 }
 
 
@@ -4475,7 +4476,7 @@ static GType saved_search_dialog_search_row_modified_get_type (void) {
 static void _saved_search_dialog_search_row_flagged_on_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
 #line 379 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_search_row_flagged_on_changed ((SavedSearchDialogSearchRowFlagged*) self);
-#line 4479 "SavedSearchDialog.c"
+#line 4480 "SavedSearchDialog.c"
 }
 
 
@@ -4572,14 +4573,14 @@ static SavedSearchDialogSearchRowFlagged* saved_search_dialog_search_row_flagged
 	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, gtk_widget_get_type (), GtkWidget));
 #line 362 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return self;
-#line 4576 "SavedSearchDialog.c"
+#line 4577 "SavedSearchDialog.c"
 }
 
 
 static SavedSearchDialogSearchRowFlagged* saved_search_dialog_search_row_flagged_new (SavedSearchDialogSearchRowContainer* parent) {
 #line 362 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return saved_search_dialog_search_row_flagged_construct (SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_FLAGGED, parent);
-#line 4583 "SavedSearchDialog.c"
+#line 4584 "SavedSearchDialog.c"
 }
 
 
@@ -4598,7 +4599,7 @@ static GtkWidget* saved_search_dialog_search_row_flagged_real_get_widget (SavedS
 	result = _tmp1_;
 #line 383 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return result;
-#line 4602 "SavedSearchDialog.c"
+#line 4603 "SavedSearchDialog.c"
 }
 
 
@@ -4635,7 +4636,7 @@ static SearchCondition* saved_search_dialog_search_row_flagged_real_get_search_c
 	result = G_TYPE_CHECK_INSTANCE_CAST (c, TYPE_SEARCH_CONDITION, SearchCondition);
 #line 390 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return result;
-#line 4639 "SavedSearchDialog.c"
+#line 4640 "SavedSearchDialog.c"
 }
 
 
@@ -4669,7 +4670,7 @@ static void saved_search_dialog_search_row_flagged_real_populate (SavedSearchDia
 	gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_combo_box_get_type (), GtkComboBox), (gint) _tmp4_);
 #line 393 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_search_condition_unref0 (f);
-#line 4673 "SavedSearchDialog.c"
+#line 4674 "SavedSearchDialog.c"
 }
 
 
@@ -4682,7 +4683,7 @@ static gboolean saved_search_dialog_search_row_flagged_real_is_complete (SavedSe
 	result = TRUE;
 #line 400 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return result;
-#line 4686 "SavedSearchDialog.c"
+#line 4687 "SavedSearchDialog.c"
 }
 
 
@@ -4697,7 +4698,7 @@ static void saved_search_dialog_search_row_flagged_on_changed (SavedSearchDialog
 	_tmp1_ = self->priv->parent;
 #line 404 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_signal_emit_by_name (_tmp0_, "changed", _tmp1_);
-#line 4701 "SavedSearchDialog.c"
+#line 4702 "SavedSearchDialog.c"
 }
 
 
@@ -4709,21 +4710,21 @@ static void saved_search_dialog_search_row_flagged_class_init (SavedSearchDialog
 #line 356 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_type_class_add_private (klass, sizeof (SavedSearchDialogSearchRowFlaggedPrivate));
 #line 356 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	((SavedSearchDialogSearchRowClass *) klass)->get_widget = saved_search_dialog_search_row_flagged_real_get_widget;
+	((SavedSearchDialogSearchRowClass *) klass)->get_widget = (GtkWidget* (*)(SavedSearchDialogSearchRow*)) saved_search_dialog_search_row_flagged_real_get_widget;
 #line 356 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	((SavedSearchDialogSearchRowClass *) klass)->get_search_condition = saved_search_dialog_search_row_flagged_real_get_search_condition;
+	((SavedSearchDialogSearchRowClass *) klass)->get_search_condition = (SearchCondition* (*)(SavedSearchDialogSearchRow*)) saved_search_dialog_search_row_flagged_real_get_search_condition;
 #line 356 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	((SavedSearchDialogSearchRowClass *) klass)->populate = saved_search_dialog_search_row_flagged_real_populate;
+	((SavedSearchDialogSearchRowClass *) klass)->populate = (void (*)(SavedSearchDialogSearchRow*, SearchCondition*)) saved_search_dialog_search_row_flagged_real_populate;
 #line 356 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	((SavedSearchDialogSearchRowClass *) klass)->is_complete = saved_search_dialog_search_row_flagged_real_is_complete;
-#line 4720 "SavedSearchDialog.c"
+	((SavedSearchDialogSearchRowClass *) klass)->is_complete = (gboolean (*)(SavedSearchDialogSearchRow*)) saved_search_dialog_search_row_flagged_real_is_complete;
+#line 4721 "SavedSearchDialog.c"
 }
 
 
 static void saved_search_dialog_search_row_flagged_instance_init (SavedSearchDialogSearchRowFlagged * self) {
 #line 356 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self->priv = SAVED_SEARCH_DIALOG_SEARCH_ROW_FLAGGED_GET_PRIVATE (self);
-#line 4727 "SavedSearchDialog.c"
+#line 4728 "SavedSearchDialog.c"
 }
 
 
@@ -4747,7 +4748,7 @@ static void saved_search_dialog_search_row_flagged_finalize (SavedSearchDialogSe
 	_saved_search_dialog_search_row_container_unref0 (self->priv->parent);
 #line 356 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	SAVED_SEARCH_DIALOG_SEARCH_ROW_CLASS (saved_search_dialog_search_row_flagged_parent_class)->finalize (obj);
-#line 4751 "SavedSearchDialog.c"
+#line 4752 "SavedSearchDialog.c"
 }
 
 
@@ -4766,7 +4767,7 @@ static GType saved_search_dialog_search_row_flagged_get_type (void) {
 static void _saved_search_dialog_search_row_rating_on_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
 #line 445 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_search_row_rating_on_changed ((SavedSearchDialogSearchRowRating*) self);
-#line 4770 "SavedSearchDialog.c"
+#line 4771 "SavedSearchDialog.c"
 }
 
 
@@ -4954,14 +4955,14 @@ static SavedSearchDialogSearchRowRating* saved_search_dialog_search_row_rating_c
 	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, gtk_widget_get_type (), GtkWidget));
 #line 415 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return self;
-#line 4958 "SavedSearchDialog.c"
+#line 4959 "SavedSearchDialog.c"
 }
 
 
 static SavedSearchDialogSearchRowRating* saved_search_dialog_search_row_rating_new (SavedSearchDialogSearchRowContainer* parent) {
 #line 415 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return saved_search_dialog_search_row_rating_construct (SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_RATING, parent);
-#line 4965 "SavedSearchDialog.c"
+#line 4966 "SavedSearchDialog.c"
 }
 
 
@@ -4980,7 +4981,7 @@ static GtkWidget* saved_search_dialog_search_row_rating_real_get_widget (SavedSe
 	result = _tmp1_;
 #line 450 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return result;
-#line 4984 "SavedSearchDialog.c"
+#line 4985 "SavedSearchDialog.c"
 }
 
 
@@ -5026,7 +5027,7 @@ static SearchCondition* saved_search_dialog_search_row_rating_real_get_search_co
 	result = G_TYPE_CHECK_INSTANCE_CAST (c, TYPE_SEARCH_CONDITION, SearchCondition);
 #line 458 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return result;
-#line 5030 "SavedSearchDialog.c"
+#line 5031 "SavedSearchDialog.c"
 }
 
 
@@ -5071,7 +5072,7 @@ static void saved_search_dialog_search_row_rating_real_populate (SavedSearchDial
 	gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_combo_box_get_type (), GtkComboBox), (gint) (_tmp7_ - RATING_REJECTED));
 #line 461 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_search_condition_unref0 (r);
-#line 5075 "SavedSearchDialog.c"
+#line 5076 "SavedSearchDialog.c"
 }
 
 
@@ -5084,7 +5085,7 @@ static gboolean saved_search_dialog_search_row_rating_real_is_complete (SavedSea
 	result = TRUE;
 #line 469 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return result;
-#line 5088 "SavedSearchDialog.c"
+#line 5089 "SavedSearchDialog.c"
 }
 
 
@@ -5099,7 +5100,7 @@ static void saved_search_dialog_search_row_rating_on_changed (SavedSearchDialogS
 	_tmp1_ = self->priv->parent;
 #line 473 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_signal_emit_by_name (_tmp0_, "changed", _tmp1_);
-#line 5103 "SavedSearchDialog.c"
+#line 5104 "SavedSearchDialog.c"
 }
 
 
@@ -5111,21 +5112,21 @@ static void saved_search_dialog_search_row_rating_class_init (SavedSearchDialogS
 #line 408 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_type_class_add_private (klass, sizeof (SavedSearchDialogSearchRowRatingPrivate));
 #line 408 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	((SavedSearchDialogSearchRowClass *) klass)->get_widget = saved_search_dialog_search_row_rating_real_get_widget;
+	((SavedSearchDialogSearchRowClass *) klass)->get_widget = (GtkWidget* (*)(SavedSearchDialogSearchRow*)) saved_search_dialog_search_row_rating_real_get_widget;
 #line 408 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	((SavedSearchDialogSearchRowClass *) klass)->get_search_condition = saved_search_dialog_search_row_rating_real_get_search_condition;
+	((SavedSearchDialogSearchRowClass *) klass)->get_search_condition = (SearchCondition* (*)(SavedSearchDialogSearchRow*)) saved_search_dialog_search_row_rating_real_get_search_condition;
 #line 408 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	((SavedSearchDialogSearchRowClass *) klass)->populate = saved_search_dialog_search_row_rating_real_populate;
+	((SavedSearchDialogSearchRowClass *) klass)->populate = (void (*)(SavedSearchDialogSearchRow*, SearchCondition*)) saved_search_dialog_search_row_rating_real_populate;
 #line 408 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	((SavedSearchDialogSearchRowClass *) klass)->is_complete = saved_search_dialog_search_row_rating_real_is_complete;
-#line 5122 "SavedSearchDialog.c"
+	((SavedSearchDialogSearchRowClass *) klass)->is_complete = (gboolean (*)(SavedSearchDialogSearchRow*)) saved_search_dialog_search_row_rating_real_is_complete;
+#line 5123 "SavedSearchDialog.c"
 }
 
 
 static void saved_search_dialog_search_row_rating_instance_init (SavedSearchDialogSearchRowRating * self) {
 #line 408 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self->priv = SAVED_SEARCH_DIALOG_SEARCH_ROW_RATING_GET_PRIVATE (self);
-#line 5129 "SavedSearchDialog.c"
+#line 5130 "SavedSearchDialog.c"
 }
 
 
@@ -5159,7 +5160,7 @@ static void saved_search_dialog_search_row_rating_finalize (SavedSearchDialogSea
 	_saved_search_dialog_search_row_container_unref0 (self->priv->parent);
 #line 408 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	SAVED_SEARCH_DIALOG_SEARCH_ROW_CLASS (saved_search_dialog_search_row_rating_parent_class)->finalize (obj);
-#line 5163 "SavedSearchDialog.c"
+#line 5164 "SavedSearchDialog.c"
 }
 
 
@@ -5178,21 +5179,21 @@ static GType saved_search_dialog_search_row_rating_get_type (void) {
 static void _saved_search_dialog_search_row_date_on_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
 #line 523 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_search_row_date_on_changed ((SavedSearchDialogSearchRowDate*) self);
-#line 5182 "SavedSearchDialog.c"
+#line 5183 "SavedSearchDialog.c"
 }
 
 
 static void _saved_search_dialog_search_row_date_on_one_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
 #line 506 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_search_row_date_on_one_clicked ((SavedSearchDialogSearchRowDate*) self);
-#line 5189 "SavedSearchDialog.c"
+#line 5190 "SavedSearchDialog.c"
 }
 
 
 static void _saved_search_dialog_search_row_date_on_two_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
 #line 508 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_search_row_date_on_two_clicked ((SavedSearchDialogSearchRowDate*) self);
-#line 5196 "SavedSearchDialog.c"
+#line 5197 "SavedSearchDialog.c"
 }
 
 
@@ -5379,14 +5380,14 @@ static SavedSearchDialogSearchRowDate* saved_search_dialog_search_row_date_const
 	saved_search_dialog_search_row_date_update_date_labels (self);
 #line 489 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return self;
-#line 5383 "SavedSearchDialog.c"
+#line 5384 "SavedSearchDialog.c"
 }
 
 
 static SavedSearchDialogSearchRowDate* saved_search_dialog_search_row_date_new (SavedSearchDialogSearchRowContainer* parent) {
 #line 489 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return saved_search_dialog_search_row_date_construct (SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_DATE, parent);
-#line 5390 "SavedSearchDialog.c"
+#line 5391 "SavedSearchDialog.c"
 }
 
 
@@ -5417,7 +5418,7 @@ static void saved_search_dialog_search_row_date_update_date_labels (SavedSearchD
 	_tmp2_ = c;
 #line 530 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	if (_tmp2_ == SEARCH_CONDITION_DATE_CONTEXT_BETWEEN) {
-#line 5421 "SavedSearchDialog.c"
+#line 5422 "SavedSearchDialog.c"
 		GtkButton* _tmp3_ = NULL;
 		GtkLabel* _tmp4_ = NULL;
 		GtkButton* _tmp5_ = NULL;
@@ -5433,14 +5434,14 @@ static void saved_search_dialog_search_row_date_update_date_labels (SavedSearchD
 		_tmp5_ = self->priv->label_two;
 #line 533 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		gtk_widget_show (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_widget_get_type (), GtkWidget));
-#line 5437 "SavedSearchDialog.c"
+#line 5438 "SavedSearchDialog.c"
 	} else {
 		SearchConditionDateContext _tmp6_ = 0;
 #line 534 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp6_ = c;
 #line 534 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		if (_tmp6_ == SEARCH_CONDITION_DATE_CONTEXT_IS_NOT_SET) {
-#line 5444 "SavedSearchDialog.c"
+#line 5445 "SavedSearchDialog.c"
 			GtkButton* _tmp7_ = NULL;
 			GtkLabel* _tmp8_ = NULL;
 			GtkButton* _tmp9_ = NULL;
@@ -5456,7 +5457,7 @@ static void saved_search_dialog_search_row_date_update_date_labels (SavedSearchD
 			_tmp9_ = self->priv->label_two;
 #line 537 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_widget_get_type (), GtkWidget));
-#line 5460 "SavedSearchDialog.c"
+#line 5461 "SavedSearchDialog.c"
 		} else {
 			GtkButton* _tmp10_ = NULL;
 			GtkLabel* _tmp11_ = NULL;
@@ -5473,7 +5474,7 @@ static void saved_search_dialog_search_row_date_update_date_labels (SavedSearchD
 			_tmp12_ = self->priv->label_two;
 #line 541 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_widget_get_type (), GtkWidget));
-#line 5477 "SavedSearchDialog.c"
+#line 5478 "SavedSearchDialog.c"
 		}
 	}
 #line 545 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
@@ -5508,7 +5509,7 @@ static void saved_search_dialog_search_row_date_update_date_labels (SavedSearchD
 	_g_free0 (_tmp22_);
 #line 546 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_date_time_unref0 (_tmp20_);
-#line 5512 "SavedSearchDialog.c"
+#line 5513 "SavedSearchDialog.c"
 }
 
 
@@ -5527,7 +5528,7 @@ static GtkWidget* saved_search_dialog_search_row_date_real_get_widget (SavedSear
 	result = _tmp1_;
 #line 550 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return result;
-#line 5531 "SavedSearchDialog.c"
+#line 5532 "SavedSearchDialog.c"
 }
 
 
@@ -5569,7 +5570,7 @@ static GDateTime* saved_search_dialog_search_row_date_get_date_one (SavedSearchD
 	result = _tmp9_;
 #line 554 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return result;
-#line 5573 "SavedSearchDialog.c"
+#line 5574 "SavedSearchDialog.c"
 }
 
 
@@ -5611,7 +5612,7 @@ static GDateTime* saved_search_dialog_search_row_date_get_date_two (SavedSearchD
 	result = _tmp9_;
 #line 558 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return result;
-#line 5615 "SavedSearchDialog.c"
+#line 5616 "SavedSearchDialog.c"
 }
 
 
@@ -5653,7 +5654,7 @@ static void saved_search_dialog_search_row_date_set_date_one (SavedSearchDialogS
 	_tmp8_ = g_date_time_get_year (_tmp7_);
 #line 564 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_object_set (_tmp6_, "year", _tmp8_, NULL);
-#line 5657 "SavedSearchDialog.c"
+#line 5658 "SavedSearchDialog.c"
 }
 
 
@@ -5695,7 +5696,7 @@ static void saved_search_dialog_search_row_date_set_date_two (SavedSearchDialogS
 	_tmp8_ = g_date_time_get_year (_tmp7_);
 #line 570 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_object_set (_tmp6_, "year", _tmp8_, NULL);
-#line 5699 "SavedSearchDialog.c"
+#line 5700 "SavedSearchDialog.c"
 }
 
 
@@ -5751,7 +5752,7 @@ static SearchCondition* saved_search_dialog_search_row_date_real_get_search_cond
 	result = G_TYPE_CHECK_INSTANCE_CAST (c, TYPE_SEARCH_CONDITION, SearchCondition);
 #line 578 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return result;
-#line 5755 "SavedSearchDialog.c"
+#line 5756 "SavedSearchDialog.c"
 }
 
 
@@ -5803,7 +5804,7 @@ static void saved_search_dialog_search_row_date_real_populate (SavedSearchDialog
 	saved_search_dialog_search_row_date_update_date_labels (self);
 #line 581 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_search_condition_unref0 (cond);
-#line 5807 "SavedSearchDialog.c"
+#line 5808 "SavedSearchDialog.c"
 }
 
 
@@ -5816,7 +5817,7 @@ static gboolean saved_search_dialog_search_row_date_real_is_complete (SavedSearc
 	result = TRUE;
 #line 591 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return result;
-#line 5820 "SavedSearchDialog.c"
+#line 5821 "SavedSearchDialog.c"
 }
 
 
@@ -5833,7 +5834,7 @@ static void saved_search_dialog_search_row_date_on_changed (SavedSearchDialogSea
 	g_signal_emit_by_name (_tmp0_, "changed", _tmp1_);
 #line 596 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_search_row_date_update_date_labels (self);
-#line 5837 "SavedSearchDialog.c"
+#line 5838 "SavedSearchDialog.c"
 }
 
 
@@ -5842,7 +5843,7 @@ static Block9Data* block9_data_ref (Block9Data* _data9_) {
 	g_atomic_int_inc (&_data9_->_ref_count_);
 #line 599 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return _data9_;
-#line 5846 "SavedSearchDialog.c"
+#line 5847 "SavedSearchDialog.c"
 }
 
 
@@ -5851,7 +5852,7 @@ static void block9_data_unref (void * _userdata_) {
 	_data9_ = (Block9Data*) _userdata_;
 #line 599 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	if (g_atomic_int_dec_and_test (&_data9_->_ref_count_)) {
-#line 5855 "SavedSearchDialog.c"
+#line 5856 "SavedSearchDialog.c"
 		SavedSearchDialogSearchRowDate* self;
 #line 599 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		self = _data9_->self;
@@ -5861,7 +5862,7 @@ static void block9_data_unref (void * _userdata_) {
 		_saved_search_dialog_search_row_unref0 (self);
 #line 599 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		g_slice_free (Block9Data, _data9_);
-#line 5865 "SavedSearchDialog.c"
+#line 5866 "SavedSearchDialog.c"
 	}
 }
 
@@ -5869,14 +5870,14 @@ static void block9_data_unref (void * _userdata_) {
 static void __lambda12_ (SavedSearchDialogSearchRowDate* self) {
 #line 610 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_search_row_date_update_date_labels (self);
-#line 5873 "SavedSearchDialog.c"
+#line 5874 "SavedSearchDialog.c"
 }
 
 
 static void ___lambda12__gtk_calendar_day_selected (GtkCalendar* _sender, gpointer self) {
 #line 610 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	__lambda12_ ((SavedSearchDialogSearchRowDate*) self);
-#line 5880 "SavedSearchDialog.c"
+#line 5881 "SavedSearchDialog.c"
 }
 
 
@@ -5889,14 +5890,14 @@ static void __lambda13_ (Block9Data* _data9_) {
 	_tmp0_ = _data9_->d;
 #line 612 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_dialog_response (_tmp0_, (gint) GTK_RESPONSE_ACCEPT);
-#line 5893 "SavedSearchDialog.c"
+#line 5894 "SavedSearchDialog.c"
 }
 
 
 static void ___lambda13__gtk_calendar_day_selected_double_click (GtkCalendar* _sender, gpointer self) {
 #line 611 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	__lambda13_ (self);
-#line 5900 "SavedSearchDialog.c"
+#line 5901 "SavedSearchDialog.c"
 }
 
 
@@ -6023,7 +6024,7 @@ static void saved_search_dialog_search_row_date_popup_calendar (SavedSearchDialo
 	_tmp23_ = res;
 #line 616 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	if (_tmp23_ != ((gint) GTK_RESPONSE_ACCEPT)) {
-#line 6027 "SavedSearchDialog.c"
+#line 6028 "SavedSearchDialog.c"
 		GtkCalendar* _tmp24_ = NULL;
 		gint _tmp25_ = 0;
 		GtkCalendar* _tmp26_ = NULL;
@@ -6048,7 +6049,7 @@ static void saved_search_dialog_search_row_date_popup_calendar (SavedSearchDialo
 		_tmp29_ = orig_year;
 #line 620 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		g_object_set (_tmp28_, "year", _tmp29_, NULL);
-#line 6052 "SavedSearchDialog.c"
+#line 6053 "SavedSearchDialog.c"
 	}
 #line 622 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp30_ = cal;
@@ -6072,7 +6073,7 @@ static void saved_search_dialog_search_row_date_popup_calendar (SavedSearchDialo
 	block9_data_unref (_data9_);
 #line 599 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_data9_ = NULL;
-#line 6076 "SavedSearchDialog.c"
+#line 6077 "SavedSearchDialog.c"
 }
 
 
@@ -6084,7 +6085,7 @@ static void saved_search_dialog_search_row_date_on_one_clicked (SavedSearchDialo
 	_tmp0_ = self->priv->cal_one;
 #line 629 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_search_row_date_popup_calendar (self, _tmp0_);
-#line 6088 "SavedSearchDialog.c"
+#line 6089 "SavedSearchDialog.c"
 }
 
 
@@ -6096,7 +6097,7 @@ static void saved_search_dialog_search_row_date_on_two_clicked (SavedSearchDialo
 	_tmp0_ = self->priv->cal_two;
 #line 633 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_search_row_date_popup_calendar (self, _tmp0_);
-#line 6100 "SavedSearchDialog.c"
+#line 6101 "SavedSearchDialog.c"
 }
 
 
@@ -6108,21 +6109,21 @@ static void saved_search_dialog_search_row_date_class_init (SavedSearchDialogSea
 #line 477 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_type_class_add_private (klass, sizeof (SavedSearchDialogSearchRowDatePrivate));
 #line 477 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	((SavedSearchDialogSearchRowClass *) klass)->get_widget = saved_search_dialog_search_row_date_real_get_widget;
+	((SavedSearchDialogSearchRowClass *) klass)->get_widget = (GtkWidget* (*)(SavedSearchDialogSearchRow*)) saved_search_dialog_search_row_date_real_get_widget;
 #line 477 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	((SavedSearchDialogSearchRowClass *) klass)->get_search_condition = saved_search_dialog_search_row_date_real_get_search_condition;
+	((SavedSearchDialogSearchRowClass *) klass)->get_search_condition = (SearchCondition* (*)(SavedSearchDialogSearchRow*)) saved_search_dialog_search_row_date_real_get_search_condition;
 #line 477 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	((SavedSearchDialogSearchRowClass *) klass)->populate = saved_search_dialog_search_row_date_real_populate;
+	((SavedSearchDialogSearchRowClass *) klass)->populate = (void (*)(SavedSearchDialogSearchRow*, SearchCondition*)) saved_search_dialog_search_row_date_real_populate;
 #line 477 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	((SavedSearchDialogSearchRowClass *) klass)->is_complete = saved_search_dialog_search_row_date_real_is_complete;
-#line 6119 "SavedSearchDialog.c"
+	((SavedSearchDialogSearchRowClass *) klass)->is_complete = (gboolean (*)(SavedSearchDialogSearchRow*)) saved_search_dialog_search_row_date_real_is_complete;
+#line 6120 "SavedSearchDialog.c"
 }
 
 
 static void saved_search_dialog_search_row_date_instance_init (SavedSearchDialogSearchRowDate * self) {
 #line 477 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self->priv = SAVED_SEARCH_DIALOG_SEARCH_ROW_DATE_GET_PRIVATE (self);
-#line 6126 "SavedSearchDialog.c"
+#line 6127 "SavedSearchDialog.c"
 }
 
 
@@ -6156,7 +6157,7 @@ static void saved_search_dialog_search_row_date_finalize (SavedSearchDialogSearc
 	_saved_search_dialog_search_row_container_unref0 (self->priv->parent);
 #line 477 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	SAVED_SEARCH_DIALOG_SEARCH_ROW_CLASS (saved_search_dialog_search_row_date_parent_class)->finalize (obj);
-#line 6160 "SavedSearchDialog.c"
+#line 6161 "SavedSearchDialog.c"
 }
 
 
@@ -6175,7 +6176,7 @@ static GType saved_search_dialog_search_row_date_get_type (void) {
 static void value_saved_search_dialog_init (GValue* value) {
 #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	value->data[0].v_pointer = NULL;
-#line 6179 "SavedSearchDialog.c"
+#line 6180 "SavedSearchDialog.c"
 }
 
 
@@ -6184,7 +6185,7 @@ static void value_saved_search_dialog_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		saved_search_dialog_unref (value->data[0].v_pointer);
-#line 6188 "SavedSearchDialog.c"
+#line 6189 "SavedSearchDialog.c"
 	}
 }
 
@@ -6194,11 +6195,11 @@ static void value_saved_search_dialog_copy_value (const GValue* src_value, GValu
 	if (src_value->data[0].v_pointer) {
 #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		dest_value->data[0].v_pointer = saved_search_dialog_ref (src_value->data[0].v_pointer);
-#line 6198 "SavedSearchDialog.c"
+#line 6199 "SavedSearchDialog.c"
 	} else {
 #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 6202 "SavedSearchDialog.c"
+#line 6203 "SavedSearchDialog.c"
 	}
 }
 
@@ -6206,37 +6207,37 @@ static void value_saved_search_dialog_copy_value (const GValue* src_value, GValu
 static gpointer value_saved_search_dialog_peek_pointer (const GValue* value) {
 #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return value->data[0].v_pointer;
-#line 6210 "SavedSearchDialog.c"
+#line 6211 "SavedSearchDialog.c"
 }
 
 
 static gchar* value_saved_search_dialog_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	if (collect_values[0].v_pointer) {
-#line 6217 "SavedSearchDialog.c"
+#line 6218 "SavedSearchDialog.c"
 		SavedSearchDialog* object;
 		object = collect_values[0].v_pointer;
 #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 6224 "SavedSearchDialog.c"
+#line 6225 "SavedSearchDialog.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.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 6228 "SavedSearchDialog.c"
+#line 6229 "SavedSearchDialog.c"
 		}
 #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		value->data[0].v_pointer = saved_search_dialog_ref (object);
-#line 6232 "SavedSearchDialog.c"
+#line 6233 "SavedSearchDialog.c"
 	} else {
 #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		value->data[0].v_pointer = NULL;
-#line 6236 "SavedSearchDialog.c"
+#line 6237 "SavedSearchDialog.c"
 	}
 #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return NULL;
-#line 6240 "SavedSearchDialog.c"
+#line 6241 "SavedSearchDialog.c"
 }
 
 
@@ -6247,25 +6248,25 @@ static gchar* value_saved_search_dialog_lcopy_value (const GValue* value, guint
 	if (!object_p) {
 #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 6251 "SavedSearchDialog.c"
+#line 6252 "SavedSearchDialog.c"
 	}
 #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	if (!value->data[0].v_pointer) {
 #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		*object_p = NULL;
-#line 6257 "SavedSearchDialog.c"
+#line 6258 "SavedSearchDialog.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		*object_p = value->data[0].v_pointer;
-#line 6261 "SavedSearchDialog.c"
+#line 6262 "SavedSearchDialog.c"
 	} else {
 #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		*object_p = saved_search_dialog_ref (value->data[0].v_pointer);
-#line 6265 "SavedSearchDialog.c"
+#line 6266 "SavedSearchDialog.c"
 	}
 #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return NULL;
-#line 6269 "SavedSearchDialog.c"
+#line 6270 "SavedSearchDialog.c"
 }
 
 
@@ -6279,7 +6280,7 @@ GParamSpec* param_spec_saved_search_dialog (const gchar* name, const gchar* nick
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return G_PARAM_SPEC (spec);
-#line 6283 "SavedSearchDialog.c"
+#line 6284 "SavedSearchDialog.c"
 }
 
 
@@ -6288,7 +6289,7 @@ gpointer value_get_saved_search_dialog (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SAVED_SEARCH_DIALOG), NULL);
 #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return value->data[0].v_pointer;
-#line 6292 "SavedSearchDialog.c"
+#line 6293 "SavedSearchDialog.c"
 }
 
 
@@ -6308,17 +6309,17 @@ void value_set_saved_search_dialog (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		saved_search_dialog_ref (value->data[0].v_pointer);
-#line 6312 "SavedSearchDialog.c"
+#line 6313 "SavedSearchDialog.c"
 	} else {
 #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		value->data[0].v_pointer = NULL;
-#line 6316 "SavedSearchDialog.c"
+#line 6317 "SavedSearchDialog.c"
 	}
 #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	if (old) {
 #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		saved_search_dialog_unref (old);
-#line 6322 "SavedSearchDialog.c"
+#line 6323 "SavedSearchDialog.c"
 	}
 }
 
@@ -6337,17 +6338,17 @@ void value_take_saved_search_dialog (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		value->data[0].v_pointer = v_object;
-#line 6341 "SavedSearchDialog.c"
+#line 6342 "SavedSearchDialog.c"
 	} else {
 #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		value->data[0].v_pointer = NULL;
-#line 6345 "SavedSearchDialog.c"
+#line 6346 "SavedSearchDialog.c"
 	}
 #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	if (old) {
 #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		saved_search_dialog_unref (old);
-#line 6351 "SavedSearchDialog.c"
+#line 6352 "SavedSearchDialog.c"
 	}
 }
 
@@ -6359,7 +6360,7 @@ static void saved_search_dialog_class_init (SavedSearchDialogClass * klass) {
 	((SavedSearchDialogClass *) klass)->finalize = saved_search_dialog_finalize;
 #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_type_class_add_private (klass, sizeof (SavedSearchDialogPrivate));
-#line 6363 "SavedSearchDialog.c"
+#line 6364 "SavedSearchDialog.c"
 }
 
 
@@ -6368,7 +6369,7 @@ static void saved_search_dialog_instance_init (SavedSearchDialog * self) {
 #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self->priv = SAVED_SEARCH_DIALOG_GET_PRIVATE (self);
 #line 643 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp0_ = gee_array_list_new (SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_CONTAINER, (GBoxedCopyFunc) saved_search_dialog_search_row_container_ref, saved_search_dialog_search_row_container_unref, NULL, NULL, NULL);
+	_tmp0_ = gee_array_list_new (SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_CONTAINER, (GBoxedCopyFunc) saved_search_dialog_search_row_container_ref, (GDestroyNotify) saved_search_dialog_search_row_container_unref, NULL, NULL, NULL);
 #line 643 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self->priv->row_list = _tmp0_;
 #line 644 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
@@ -6379,7 +6380,7 @@ static void saved_search_dialog_instance_init (SavedSearchDialog * self) {
 	self->priv->valid = FALSE;
 #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self->ref_count = 1;
-#line 6383 "SavedSearchDialog.c"
+#line 6384 "SavedSearchDialog.c"
 }
 
 
@@ -6413,7 +6414,7 @@ static void saved_search_dialog_finalize (SavedSearchDialog* obj) {
 	_g_object_unref0 (self->priv->row_list);
 #line 645 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->previous_search);
-#line 6417 "SavedSearchDialog.c"
+#line 6418 "SavedSearchDialog.c"
 }
 
 
@@ -6438,7 +6439,7 @@ gpointer saved_search_dialog_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return instance;
-#line 6442 "SavedSearchDialog.c"
+#line 6443 "SavedSearchDialog.c"
 }
 
 
@@ -6451,7 +6452,7 @@ void saved_search_dialog_unref (gpointer instance) {
 		SAVED_SEARCH_DIALOG_GET_CLASS (self)->finalize (self);
 #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 6455 "SavedSearchDialog.c"
+#line 6456 "SavedSearchDialog.c"
 	}
 }