summaryrefslogtreecommitdiff
path: root/src/Photo.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/Photo.c')
-rw-r--r--src/Photo.c120
1 files changed, 60 insertions, 60 deletions
diff --git a/src/Photo.c b/src/Photo.c
index 19c1911..776a63d 100644
--- a/src/Photo.c
+++ b/src/Photo.c
@@ -1,4 +1,4 @@
-/* Photo.c generated by valac 0.34.2, the Vala compiler
+/* Photo.c generated by valac 0.32.1, the Vala compiler
* generated from Photo.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -15171,7 +15171,7 @@ GeeCollection* photo_get_raw_developer_files (Photo* self) {
#line 15170 "Photo.c"
}
#line 1945 "/home/jens/Source/shotwell/src/Photo.vala"
- _tmp1_ = gee_array_list_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
+ _tmp1_ = gee_array_list_new (G_TYPE_FILE, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
#line 1945 "/home/jens/Source/shotwell/src/Photo.vala"
ret = _tmp1_;
#line 15176 "Photo.c"
@@ -34211,7 +34211,7 @@ static void photo_class_init (PhotoClass * klass) {
#line 161 "/home/jens/Source/shotwell/src/Photo.vala"
G_OBJECT_CLASS (klass)->finalize = photo_finalize;
#line 161 "/home/jens/Source/shotwell/src/Photo.vala"
- g_signal_new ("editable_replaced", TYPE_PHOTO, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (PhotoClass, editable_replaced), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT, G_TYPE_NONE, 2, g_file_get_type (), g_file_get_type ());
+ g_signal_new ("editable_replaced", TYPE_PHOTO, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (PhotoClass, editable_replaced), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT, G_TYPE_NONE, 2, G_TYPE_FILE, G_TYPE_FILE);
#line 161 "/home/jens/Source/shotwell/src/Photo.vala"
g_signal_new ("raw_development_modified", TYPE_PHOTO, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (PhotoClass, raw_development_modified), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
#line 161 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -36919,37 +36919,37 @@ static glong string_strnlen (gchar* str, glong maxlen) {
glong _tmp1_ = 0L;
gchar* _tmp2_ = NULL;
gchar* _tmp3_ = NULL;
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
_tmp0_ = str;
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
_tmp1_ = maxlen;
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
_tmp2_ = memchr (_tmp0_, 0, (gsize) _tmp1_);
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
end = _tmp2_;
-#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1296 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
_tmp3_ = end;
-#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1296 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
if (_tmp3_ == NULL) {
#line 36930 "Photo.c"
glong _tmp4_ = 0L;
-#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
_tmp4_ = maxlen;
-#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
result = _tmp4_;
-#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
return result;
#line 36938 "Photo.c"
} else {
gchar* _tmp5_ = NULL;
gchar* _tmp6_ = NULL;
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
_tmp5_ = end;
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
_tmp6_ = str;
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
result = (glong) (_tmp5_ - _tmp6_);
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
return result;
#line 36950 "Photo.c"
}
@@ -36969,112 +36969,112 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
glong _tmp20_ = 0L;
glong _tmp21_ = 0L;
gchar* _tmp22_ = NULL;
-#line 1306 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1306 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, NULL);
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
_tmp1_ = offset;
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
if (_tmp1_ >= ((glong) 0)) {
#line 36974 "Photo.c"
glong _tmp2_ = 0L;
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
_tmp2_ = len;
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
_tmp0_ = _tmp2_ >= ((glong) 0);
#line 36980 "Photo.c"
} else {
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
_tmp0_ = FALSE;
#line 36984 "Photo.c"
}
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
if (_tmp0_) {
#line 36988 "Photo.c"
glong _tmp3_ = 0L;
glong _tmp4_ = 0L;
glong _tmp5_ = 0L;
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
_tmp3_ = offset;
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
_tmp4_ = len;
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
_tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_);
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
string_length = _tmp5_;
#line 37000 "Photo.c"
} else {
gint _tmp6_ = 0;
gint _tmp7_ = 0;
-#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
_tmp6_ = strlen (self);
-#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
_tmp7_ = _tmp6_;
-#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
string_length = (glong) _tmp7_;
#line 37010 "Photo.c"
}
-#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1315 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
_tmp8_ = offset;
-#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1315 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
if (_tmp8_ < ((glong) 0)) {
#line 37016 "Photo.c"
glong _tmp9_ = 0L;
glong _tmp10_ = 0L;
glong _tmp11_ = 0L;
-#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
_tmp9_ = string_length;
-#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
_tmp10_ = offset;
-#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
offset = _tmp9_ + _tmp10_;
-#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1317 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
_tmp11_ = offset;
-#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1317 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL);
#line 37030 "Photo.c"
} else {
glong _tmp12_ = 0L;
glong _tmp13_ = 0L;
-#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
_tmp12_ = offset;
-#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
_tmp13_ = string_length;
-#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL);
#line 37040 "Photo.c"
}
-#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1321 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
_tmp14_ = len;
-#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1321 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
if (_tmp14_ < ((glong) 0)) {
#line 37046 "Photo.c"
glong _tmp15_ = 0L;
glong _tmp16_ = 0L;
-#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
_tmp15_ = string_length;
-#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
_tmp16_ = offset;
-#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
len = _tmp15_ - _tmp16_;
#line 37055 "Photo.c"
}
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
_tmp17_ = offset;
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
_tmp18_ = len;
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
_tmp19_ = string_length;
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
g_return_val_if_fail ((_tmp17_ + _tmp18_) <= _tmp19_, NULL);
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
_tmp20_ = offset;
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
_tmp21_ = len;
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
_tmp22_ = g_strndup (((gchar*) self) + _tmp20_, (gsize) _tmp21_);
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
result = _tmp22_;
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
return result;
#line 37075 "Photo.c"
}
@@ -38400,11 +38400,11 @@ static void library_photo_source_collection_instance_init (LibraryPhotoSourceCol
#line 4461 "/home/jens/Source/shotwell/src/Photo.vala"
self->priv->_transaction_controller = NULL;
#line 4462 "/home/jens/Source/shotwell/src/Photo.vala"
- _tmp0_ = gee_hash_map_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL, NULL, NULL, NULL);
+ _tmp0_ = gee_hash_map_new (G_TYPE_FILE, (GBoxedCopyFunc) g_object_ref, g_object_unref, TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL, NULL, NULL, NULL);
#line 4462 "/home/jens/Source/shotwell/src/Photo.vala"
self->priv->by_editable_file = _tmp0_;
#line 4464 "/home/jens/Source/shotwell/src/Photo.vala"
- _tmp1_ = gee_hash_map_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL, NULL, NULL, NULL);
+ _tmp1_ = gee_hash_map_new (G_TYPE_FILE, (GBoxedCopyFunc) g_object_ref, g_object_unref, TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL, NULL, NULL, NULL);
#line 4464 "/home/jens/Source/shotwell/src/Photo.vala"
self->priv->by_raw_development_file = _tmp1_;
#line 4466 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -42137,19 +42137,19 @@ static void library_photo_source_holding_tank_instance_init (LibraryPhotoSourceH
#line 5383 "/home/jens/Source/shotwell/src/Photo.vala"
self->priv = LIBRARY_PHOTO_SOURCE_HOLDING_TANK_GET_PRIVATE (self);
#line 5384 "/home/jens/Source/shotwell/src/Photo.vala"
- _tmp0_ = gee_hash_map_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL, NULL, NULL, NULL);
+ _tmp0_ = gee_hash_map_new (G_TYPE_FILE, (GBoxedCopyFunc) g_object_ref, g_object_unref, TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL, NULL, NULL, NULL);
#line 5384 "/home/jens/Source/shotwell/src/Photo.vala"
self->priv->editable_file_map = _tmp0_;
#line 5386 "/home/jens/Source/shotwell/src/Photo.vala"
- _tmp1_ = gee_hash_map_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL, NULL, NULL, NULL);
+ _tmp1_ = gee_hash_map_new (G_TYPE_FILE, (GBoxedCopyFunc) g_object_ref, g_object_unref, TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL, NULL, NULL, NULL);
#line 5386 "/home/jens/Source/shotwell/src/Photo.vala"
self->priv->development_file_map = _tmp1_;
#line 5388 "/home/jens/Source/shotwell/src/Photo.vala"
- _tmp2_ = gee_hash_multi_map_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, g_file_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL);
+ _tmp2_ = gee_hash_multi_map_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, G_TYPE_FILE, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL);
#line 5388 "/home/jens/Source/shotwell/src/Photo.vala"
self->priv->reverse_editable_file_map = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_MULTI_MAP, GeeMultiMap);
#line 5390 "/home/jens/Source/shotwell/src/Photo.vala"
- _tmp3_ = gee_hash_multi_map_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, g_file_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL);
+ _tmp3_ = gee_hash_multi_map_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, G_TYPE_FILE, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL);
#line 5390 "/home/jens/Source/shotwell/src/Photo.vala"
self->priv->reverse_development_file_map = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_MULTI_MAP, GeeMultiMap);
#line 42151 "Photo.c"
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-13 09:57:47 +0000