summaryrefslogtreecommitdiff
path: root/src/camera/CameraTable.c
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2017-04-14 18:53:12 +0200
committerJörg Frings-Fürst <debian@jff-webhosting.net>2017-04-14 18:53:12 +0200
commitdfdb61e578cccb4b7ec2e9ccfa16a66ec481fab5 (patch)
treedee893916166ac1c8b479b74e7f341429945260e /src/camera/CameraTable.c
parenta5ea701acc282ade4ccb9b08a8613a8d66ca82a5 (diff)
parent9e7cd144725a270e0460b21747619f447ca87684 (diff)
Merge tag 'upstream/0.26.1'
Upstream version 0.26.1
Diffstat (limited to 'src/camera/CameraTable.c')
-rw-r--r--src/camera/CameraTable.c532
1 files changed, 270 insertions, 262 deletions
diff --git a/src/camera/CameraTable.c b/src/camera/CameraTable.c
index 33dc872..bbf944b 100644
--- a/src/camera/CameraTable.c
+++ b/src/camera/CameraTable.c
@@ -1,4 +1,4 @@
-/* CameraTable.c generated by valac 0.34.4, the Vala compiler
+/* CameraTable.c generated by valac 0.34.7, the Vala compiler
* generated from CameraTable.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -650,8 +650,8 @@ static gboolean camera_table_delayed_init (CameraTable* self) {
gboolean result = FALSE;
AppWindow* _tmp0_ = NULL;
LibraryWindow* _tmp1_ = NULL;
- AppWindow* _tmp6_ = NULL;
- LibraryWindow* _tmp7_ = NULL;
+ AppWindow* _tmp10_ = NULL;
+ LibraryWindow* _tmp11_ = NULL;
GError * _inner_error_ = NULL;
#line 57 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
g_return_val_if_fail (IS_CAMERA_TABLE (self), FALSE);
@@ -669,9 +669,11 @@ static gboolean camera_table_delayed_init (CameraTable* self) {
camera_table_init_camera_table (self, &_inner_error_);
#line 63 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 673 "CameraTable.c"
+ gboolean _tmp2_ = FALSE;
#line 63 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (_inner_error_->domain == GPHOTO_ERROR) {
-#line 675 "CameraTable.c"
+#line 677 "CameraTable.c"
goto __catch57_gphoto_error;
}
#line 63 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -679,53 +681,57 @@ static gboolean camera_table_delayed_init (CameraTable* self) {
#line 63 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
g_clear_error (&_inner_error_);
#line 63 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- return FALSE;
-#line 684 "CameraTable.c"
+ return _tmp2_;
+#line 686 "CameraTable.c"
}
}
goto __finally57;
__catch57_gphoto_error:
{
GError* err = NULL;
- GError* _tmp2_ = NULL;
- const gchar* _tmp3_ = NULL;
+ GError* _tmp3_ = NULL;
+ const gchar* _tmp4_ = NULL;
#line 62 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
err = _inner_error_;
#line 62 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_inner_error_ = NULL;
#line 65 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp2_ = err;
+ _tmp3_ = err;
#line 65 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp3_ = _tmp2_->message;
+ _tmp4_ = _tmp3_->message;
#line 65 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- g_warning ("CameraTable.vala:65: Unable to initialize camera table: %s", _tmp3_);
+ g_warning ("CameraTable.vala:65: Unable to initialize camera table: %s", _tmp4_);
#line 67 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
result = FALSE;
#line 67 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_error_free0 (err);
#line 67 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return result;
-#line 709 "CameraTable.c"
+#line 711 "CameraTable.c"
}
__finally57:
#line 62 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 716 "CameraTable.c"
+ gboolean _tmp5_ = FALSE;
#line 62 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
#line 62 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
g_clear_error (&_inner_error_);
#line 62 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- return FALSE;
-#line 720 "CameraTable.c"
+ return _tmp5_;
+#line 724 "CameraTable.c"
}
{
#line 71 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
camera_table_update_camera_table (self, &_inner_error_);
#line 71 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 731 "CameraTable.c"
+ gboolean _tmp6_ = FALSE;
#line 71 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (_inner_error_->domain == GPHOTO_ERROR) {
-#line 729 "CameraTable.c"
+#line 735 "CameraTable.c"
goto __catch58_gphoto_error;
}
#line 71 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -733,61 +739,63 @@ static gboolean camera_table_delayed_init (CameraTable* self) {
#line 71 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
g_clear_error (&_inner_error_);
#line 71 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- return FALSE;
-#line 738 "CameraTable.c"
+ return _tmp6_;
+#line 744 "CameraTable.c"
}
}
goto __finally58;
__catch58_gphoto_error:
{
GError* err = NULL;
- GError* _tmp4_ = NULL;
- const gchar* _tmp5_ = NULL;
+ GError* _tmp7_ = NULL;
+ const gchar* _tmp8_ = NULL;
#line 70 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
err = _inner_error_;
#line 70 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_inner_error_ = NULL;
#line 73 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp4_ = err;
+ _tmp7_ = err;
#line 73 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp5_ = _tmp4_->message;
+ _tmp8_ = _tmp7_->message;
#line 73 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- g_warning ("CameraTable.vala:73: Unable to update camera table: %s", _tmp5_);
+ g_warning ("CameraTable.vala:73: Unable to update camera table: %s", _tmp8_);
#line 70 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_error_free0 (err);
-#line 759 "CameraTable.c"
+#line 765 "CameraTable.c"
}
__finally58:
#line 70 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 770 "CameraTable.c"
+ gboolean _tmp9_ = FALSE;
#line 70 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
#line 70 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
g_clear_error (&_inner_error_);
#line 70 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- return FALSE;
-#line 770 "CameraTable.c"
+ return _tmp9_;
+#line 778 "CameraTable.c"
}
#line 78 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp6_ = app_window_get_instance ();
+ _tmp10_ = app_window_get_instance ();
#line 78 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp7_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_LIBRARY_WINDOW, LibraryWindow);
+ _tmp11_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_LIBRARY_WINDOW, LibraryWindow);
#line 78 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- library_window_set_page_switching_enabled (_tmp7_, TRUE);
+ library_window_set_page_switching_enabled (_tmp11_, TRUE);
#line 78 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _g_object_unref0 (_tmp7_);
+ _g_object_unref0 (_tmp11_);
#line 79 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
result = FALSE;
#line 79 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return result;
-#line 784 "CameraTable.c"
+#line 792 "CameraTable.c"
}
static gpointer _camera_table_ref0 (gpointer self) {
#line 86 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return self ? camera_table_ref (self) : NULL;
-#line 791 "CameraTable.c"
+#line 799 "CameraTable.c"
}
@@ -800,7 +808,7 @@ CameraTable* camera_table_get_instance (void) {
_tmp0_ = camera_table_instance;
#line 83 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (_tmp0_ == NULL) {
-#line 804 "CameraTable.c"
+#line 812 "CameraTable.c"
CameraTable* _tmp1_ = NULL;
#line 84 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp1_ = camera_table_new ();
@@ -808,7 +816,7 @@ CameraTable* camera_table_get_instance (void) {
_camera_table_unref0 (camera_table_instance);
#line 84 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
camera_table_instance = _tmp1_;
-#line 812 "CameraTable.c"
+#line 820 "CameraTable.c"
}
#line 86 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp2_ = camera_table_instance;
@@ -818,7 +826,7 @@ CameraTable* camera_table_get_instance (void) {
result = _tmp3_;
#line 86 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return result;
-#line 822 "CameraTable.c"
+#line 830 "CameraTable.c"
}
@@ -832,14 +840,14 @@ GeeIterable* camera_table_get_cameras (CameraTable* self) {
#line 90 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp0_ = self->priv->camera_map;
#line 90 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp1_ = gee_abstract_map_get_values (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_MAP, GeeMap));
+ _tmp1_ = gee_abstract_map_get_values (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap));
#line 90 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp2_ = _tmp1_;
#line 90 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
result = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ITERABLE, GeeIterable);
#line 90 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return result;
-#line 843 "CameraTable.c"
+#line 851 "CameraTable.c"
}
@@ -853,14 +861,14 @@ gint camera_table_get_count (CameraTable* self) {
#line 94 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp0_ = self->priv->camera_map;
#line 94 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp1_ = gee_abstract_map_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_MAP, GeeMap));
+ _tmp1_ = gee_abstract_map_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap));
#line 94 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp2_ = _tmp1_;
#line 94 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
result = _tmp2_;
#line 94 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return result;
-#line 864 "CameraTable.c"
+#line 872 "CameraTable.c"
}
@@ -883,7 +891,7 @@ DiscoveredCamera* camera_table_get_for_uri (CameraTable* self, const gchar* uri)
result = (DiscoveredCamera*) _tmp2_;
#line 98 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return result;
-#line 887 "CameraTable.c"
+#line 895 "CameraTable.c"
}
@@ -898,7 +906,7 @@ static void camera_table_do_op (CameraTable* self, int res, const gchar* op, GEr
_tmp0_ = res;
#line 102 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (_tmp0_ != GP_OK) {
-#line 902 "CameraTable.c"
+#line 910 "CameraTable.c"
int _tmp1_ = 0;
const gchar* _tmp2_ = NULL;
int _tmp3_ = 0;
@@ -922,7 +930,7 @@ static void camera_table_do_op (CameraTable* self, int res, const gchar* op, GEr
g_propagate_error (error, _inner_error_);
#line 103 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return;
-#line 926 "CameraTable.c"
+#line 934 "CameraTable.c"
} else {
#line 103 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -930,7 +938,7 @@ static void camera_table_do_op (CameraTable* self, int res, const gchar* op, GEr
g_clear_error (&_inner_error_);
#line 103 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return;
-#line 934 "CameraTable.c"
+#line 942 "CameraTable.c"
}
}
}
@@ -961,7 +969,7 @@ static void camera_table_init_camera_table (CameraTable* self, GError** error) {
g_propagate_error (error, _inner_error_);
#line 107 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return;
-#line 965 "CameraTable.c"
+#line 973 "CameraTable.c"
} else {
#line 107 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -969,7 +977,7 @@ static void camera_table_init_camera_table (CameraTable* self, GError** error) {
g_clear_error (&_inner_error_);
#line 107 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return;
-#line 973 "CameraTable.c"
+#line 981 "CameraTable.c"
}
}
#line 108 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -988,7 +996,7 @@ static void camera_table_init_camera_table (CameraTable* self, GError** error) {
g_propagate_error (error, _inner_error_);
#line 108 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return;
-#line 992 "CameraTable.c"
+#line 1000 "CameraTable.c"
} else {
#line 108 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -996,7 +1004,7 @@ static void camera_table_init_camera_table (CameraTable* self, GError** error) {
g_clear_error (&_inner_error_);
#line 108 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return;
-#line 1000 "CameraTable.c"
+#line 1008 "CameraTable.c"
}
}
}
@@ -1005,7 +1013,7 @@ static void camera_table_init_camera_table (CameraTable* self, GError** error) {
static gpointer _g_object_ref0 (gpointer self) {
#line 115 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return self ? g_object_ref (self) : NULL;
-#line 1009 "CameraTable.c"
+#line 1017 "CameraTable.c"
}
@@ -1016,20 +1024,20 @@ static void _vala_array_add66 (gchar*** array, int* length, int* size, gchar* va
*size = (*size) ? (2 * (*size)) : 4;
#line 135 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
*array = g_renew (gchar*, *array, (*size) + 1);
-#line 1020 "CameraTable.c"
+#line 1028 "CameraTable.c"
}
#line 135 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
(*array)[(*length)++] = value;
#line 135 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
(*array)[*length] = NULL;
-#line 1026 "CameraTable.c"
+#line 1034 "CameraTable.c"
}
static void _g_object_unref0_ (gpointer var) {
#line 139 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
(var == NULL) ? NULL : (var = (g_object_unref (var), NULL));
-#line 1033 "CameraTable.c"
+#line 1041 "CameraTable.c"
}
@@ -1038,7 +1046,7 @@ static void _g_list_free__g_object_unref0_ (GList* self) {
g_list_foreach (self, (GFunc) _g_object_unref0_, NULL);
#line 139 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
g_list_free (self);
-#line 1042 "CameraTable.c"
+#line 1050 "CameraTable.c"
}
@@ -1072,7 +1080,7 @@ static gchar** camera_table_get_all_usb_cameras (CameraTable* self, int* result_
device_list = _tmp2_;
#line 115 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp3_ = device_list;
-#line 1076 "CameraTable.c"
+#line 1084 "CameraTable.c"
{
GList* device_collection = NULL;
GList* device_it = NULL;
@@ -1080,14 +1088,14 @@ static gchar** camera_table_get_all_usb_cameras (CameraTable* self, int* result_
device_collection = _tmp3_;
#line 115 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
for (device_it = device_collection; device_it != NULL; device_it = device_it->next) {
-#line 1084 "CameraTable.c"
+#line 1092 "CameraTable.c"
GUdevDevice* _tmp4_ = NULL;
GUdevDevice* device = NULL;
#line 115 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp4_ = _g_object_ref0 ((GUdevDevice*) device_it->data);
#line 115 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
device = _tmp4_;
-#line 1091 "CameraTable.c"
+#line 1099 "CameraTable.c"
{
gchar* device_file = NULL;
GUdevDevice* _tmp5_ = NULL;
@@ -1108,7 +1116,7 @@ static gchar** camera_table_get_all_usb_cameras (CameraTable* self, int* result_
_tmp10_ = device_file;
#line 120 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (_tmp10_ != NULL) {
-#line 1112 "CameraTable.c"
+#line 1120 "CameraTable.c"
GUdevDevice* _tmp11_ = NULL;
gboolean _tmp12_ = FALSE;
#line 121 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -1117,15 +1125,15 @@ static gchar** camera_table_get_all_usb_cameras (CameraTable* self, int* result_
_tmp12_ = g_udev_device_has_property (_tmp11_, "ID_GPHOTO2");
#line 121 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp9_ = _tmp12_;
-#line 1121 "CameraTable.c"
+#line 1129 "CameraTable.c"
} else {
#line 120 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp9_ = FALSE;
-#line 1125 "CameraTable.c"
+#line 1133 "CameraTable.c"
}
#line 120 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (_tmp9_) {
-#line 1129 "CameraTable.c"
+#line 1137 "CameraTable.c"
GUdevDevice* _tmp13_ = NULL;
gboolean _tmp14_ = FALSE;
#line 122 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -1134,15 +1142,15 @@ static gchar** camera_table_get_all_usb_cameras (CameraTable* self, int* result_
_tmp14_ = g_udev_device_has_property (_tmp13_, "GPHOTO2_DRIVER");
#line 122 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp8_ = _tmp14_;
-#line 1138 "CameraTable.c"
+#line 1146 "CameraTable.c"
} else {
#line 120 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp8_ = FALSE;
-#line 1142 "CameraTable.c"
+#line 1150 "CameraTable.c"
}
#line 117 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (_tmp8_) {
-#line 1146 "CameraTable.c"
+#line 1154 "CameraTable.c"
gint camera_bus = 0;
gint camera_device = 0;
const gchar* _tmp15_ = NULL;
@@ -1162,7 +1170,7 @@ static gchar** camera_table_get_all_usb_cameras (CameraTable* self, int* result_
_tmp16_ = sscanf (_tmp15_, "/dev/bus/usb/%d/%d", &camera_bus, &camera_device);
#line 128 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (_tmp16_ < 2) {
-#line 1166 "CameraTable.c"
+#line 1174 "CameraTable.c"
const gchar* _tmp17_ = NULL;
#line 129 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp17_ = device_file;
@@ -1175,7 +1183,7 @@ static gchar** camera_table_get_all_usb_cameras (CameraTable* self, int* result_
_g_object_unref0 (device);
#line 131 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
continue;
-#line 1178 "CameraTable.c"
+#line 1186 "CameraTable.c"
}
#line 133 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp18_ = camera_bus;
@@ -1201,13 +1209,13 @@ static gchar** camera_table_get_all_usb_cameras (CameraTable* self, int* result_
_vala_array_add66 (&cameras, &cameras_length1, &_cameras_size_, _tmp24_);
#line 117 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (camera);
-#line 1204 "CameraTable.c"
+#line 1212 "CameraTable.c"
}
#line 115 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (device_file);
#line 115 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_object_unref0 (device);
-#line 1210 "CameraTable.c"
+#line 1218 "CameraTable.c"
}
}
}
@@ -1219,7 +1227,7 @@ static gchar** camera_table_get_all_usb_cameras (CameraTable* self, int* result_
if (result_length1) {
#line 139 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
*result_length1 = _tmp25__length1;
-#line 1222 "CameraTable.c"
+#line 1230 "CameraTable.c"
}
#line 139 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
result = _tmp25_;
@@ -1227,7 +1235,7 @@ static gchar** camera_table_get_all_usb_cameras (CameraTable* self, int* result_
__g_list_free__g_object_unref0_0 (device_list);
#line 139 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return result;
-#line 1230 "CameraTable.c"
+#line 1238 "CameraTable.c"
}
@@ -1269,7 +1277,7 @@ static gboolean camera_table_usb_esp (CameraTable* self, gint current_camera_cou
_tmp4_ = current_camera_count;
#line 160 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (_tmp4_ == 1) {
-#line 1272 "CameraTable.c"
+#line 1280 "CameraTable.c"
gchar** _tmp5_ = NULL;
gint _tmp5__length1 = 0;
#line 160 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -1278,15 +1286,15 @@ static gboolean camera_table_usb_esp (CameraTable* self, gint current_camera_cou
_tmp5__length1 = usb_cameras_length1;
#line 160 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp3_ = _tmp5__length1 == 1;
-#line 1281 "CameraTable.c"
+#line 1289 "CameraTable.c"
} else {
#line 160 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp3_ = FALSE;
-#line 1285 "CameraTable.c"
+#line 1293 "CameraTable.c"
}
#line 160 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (_tmp3_) {
-#line 1289 "CameraTable.c"
+#line 1297 "CameraTable.c"
gchar** _tmp6_ = NULL;
gint _tmp6__length1 = 0;
const gchar* _tmp7_ = NULL;
@@ -1317,21 +1325,21 @@ static gboolean camera_table_usb_esp (CameraTable* self, gint current_camera_cou
if (full_port) {
#line 165 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
*full_port = _vala_full_port;
-#line 1320 "CameraTable.c"
+#line 1328 "CameraTable.c"
} else {
#line 165 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (_vala_full_port);
-#line 1324 "CameraTable.c"
+#line 1332 "CameraTable.c"
}
#line 165 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return result;
-#line 1328 "CameraTable.c"
+#line 1336 "CameraTable.c"
}
#line 169 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp11_ = port;
#line 169 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (g_strcmp0 (_tmp11_, "usb:") == 0) {
-#line 1334 "CameraTable.c"
+#line 1342 "CameraTable.c"
const gchar* _tmp12_ = NULL;
#line 170 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp12_ = port;
@@ -1343,15 +1351,15 @@ static gboolean camera_table_usb_esp (CameraTable* self, gint current_camera_cou
if (full_port) {
#line 172 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
*full_port = _vala_full_port;
-#line 1346 "CameraTable.c"
+#line 1354 "CameraTable.c"
} else {
#line 172 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (_vala_full_port);
-#line 1350 "CameraTable.c"
+#line 1358 "CameraTable.c"
}
#line 172 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return result;
-#line 1354 "CameraTable.c"
+#line 1362 "CameraTable.c"
}
#line 177 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp13_ = port;
@@ -1359,7 +1367,7 @@ static gboolean camera_table_usb_esp (CameraTable* self, gint current_camera_cou
_tmp14_ = sscanf (_tmp13_, "usb:%d,%d", &bus, &device);
#line 177 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (_tmp14_ < 2) {
-#line 1362 "CameraTable.c"
+#line 1370 "CameraTable.c"
const gchar* _tmp15_ = NULL;
#line 178 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp15_ = port;
@@ -1371,21 +1379,21 @@ static gboolean camera_table_usb_esp (CameraTable* self, gint current_camera_cou
if (full_port) {
#line 180 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
*full_port = _vala_full_port;
-#line 1374 "CameraTable.c"
+#line 1382 "CameraTable.c"
} else {
#line 180 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (_vala_full_port);
-#line 1378 "CameraTable.c"
+#line 1386 "CameraTable.c"
}
#line 180 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return result;
-#line 1382 "CameraTable.c"
+#line 1390 "CameraTable.c"
}
#line 183 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp16_ = usb_cameras;
#line 183 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp16__length1 = usb_cameras_length1;
-#line 1388 "CameraTable.c"
+#line 1396 "CameraTable.c"
{
gchar** usb_camera_collection = NULL;
gint usb_camera_collection_length1 = 0;
@@ -1397,14 +1405,14 @@ static gboolean camera_table_usb_esp (CameraTable* self, gint current_camera_cou
usb_camera_collection_length1 = _tmp16__length1;
#line 183 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
for (usb_camera_it = 0; usb_camera_it < _tmp16__length1; usb_camera_it = usb_camera_it + 1) {
-#line 1400 "CameraTable.c"
+#line 1408 "CameraTable.c"
gchar* _tmp17_ = NULL;
gchar* usb_camera = NULL;
#line 183 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp17_ = g_strdup (usb_camera_collection[usb_camera_it]);
#line 183 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
usb_camera = _tmp17_;
-#line 1407 "CameraTable.c"
+#line 1415 "CameraTable.c"
{
gint camera_bus = 0;
gint camera_device = 0;
@@ -1419,7 +1427,7 @@ static gboolean camera_table_usb_esp (CameraTable* self, gint current_camera_cou
_tmp19_ = sscanf (_tmp18_, "usb:%d,%d", &camera_bus, &camera_device);
#line 185 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (_tmp19_ < 2) {
-#line 1422 "CameraTable.c"
+#line 1430 "CameraTable.c"
const gchar* _tmp20_ = NULL;
#line 186 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp20_ = usb_camera;
@@ -1429,7 +1437,7 @@ static gboolean camera_table_usb_esp (CameraTable* self, gint current_camera_cou
_g_free0 (usb_camera);
#line 188 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
continue;
-#line 1432 "CameraTable.c"
+#line 1440 "CameraTable.c"
}
#line 191 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp22_ = bus;
@@ -1437,7 +1445,7 @@ static gboolean camera_table_usb_esp (CameraTable* self, gint current_camera_cou
_tmp23_ = camera_bus;
#line 191 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (_tmp22_ == _tmp23_) {
-#line 1440 "CameraTable.c"
+#line 1448 "CameraTable.c"
gint _tmp24_ = 0;
gint _tmp25_ = 0;
#line 191 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -1446,15 +1454,15 @@ static gboolean camera_table_usb_esp (CameraTable* self, gint current_camera_cou
_tmp25_ = camera_device;
#line 191 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp21_ = _tmp24_ == _tmp25_;
-#line 1449 "CameraTable.c"
+#line 1457 "CameraTable.c"
} else {
#line 191 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp21_ = FALSE;
-#line 1453 "CameraTable.c"
+#line 1461 "CameraTable.c"
}
#line 191 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (_tmp21_) {
-#line 1457 "CameraTable.c"
+#line 1465 "CameraTable.c"
const gchar* _tmp26_ = NULL;
gchar* _tmp27_ = NULL;
const gchar* _tmp28_ = NULL;
@@ -1481,19 +1489,19 @@ static gboolean camera_table_usb_esp (CameraTable* self, gint current_camera_cou
if (full_port) {
#line 196 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
*full_port = _vala_full_port;
-#line 1484 "CameraTable.c"
+#line 1492 "CameraTable.c"
} else {
#line 196 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (_vala_full_port);
-#line 1488 "CameraTable.c"
+#line 1496 "CameraTable.c"
}
#line 196 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return result;
-#line 1492 "CameraTable.c"
+#line 1500 "CameraTable.c"
}
#line 183 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (usb_camera);
-#line 1496 "CameraTable.c"
+#line 1504 "CameraTable.c"
}
}
}
@@ -1508,15 +1516,15 @@ static gboolean camera_table_usb_esp (CameraTable* self, gint current_camera_cou
if (full_port) {
#line 202 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
*full_port = _vala_full_port;
-#line 1510 "CameraTable.c"
+#line 1518 "CameraTable.c"
} else {
#line 202 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (_vala_full_port);
-#line 1514 "CameraTable.c"
+#line 1522 "CameraTable.c"
}
#line 202 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return result;
-#line 1518 "CameraTable.c"
+#line 1526 "CameraTable.c"
}
@@ -1534,7 +1542,7 @@ gchar* camera_table_get_port_uri (const gchar* port) {
result = _tmp1_;
#line 206 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return result;
-#line 1536 "CameraTable.c"
+#line 1544 "CameraTable.c"
}
@@ -1557,7 +1565,7 @@ static glong string_strnlen (gchar* str, glong maxlen) {
_tmp3_ = end;
#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_tmp3_ == NULL) {
-#line 1559 "CameraTable.c"
+#line 1567 "CameraTable.c"
glong _tmp4_ = 0L;
#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp4_ = maxlen;
@@ -1565,7 +1573,7 @@ static glong string_strnlen (gchar* str, glong maxlen) {
result = _tmp4_;
#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
-#line 1567 "CameraTable.c"
+#line 1575 "CameraTable.c"
} else {
gchar* _tmp5_ = NULL;
gchar* _tmp6_ = NULL;
@@ -1577,7 +1585,7 @@ static glong string_strnlen (gchar* str, glong maxlen) {
result = (glong) (_tmp5_ - _tmp6_);
#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
-#line 1579 "CameraTable.c"
+#line 1587 "CameraTable.c"
}
}
@@ -1601,21 +1609,21 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
_tmp1_ = offset;
#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_tmp1_ >= ((glong) 0)) {
-#line 1603 "CameraTable.c"
+#line 1611 "CameraTable.c"
glong _tmp2_ = 0L;
#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp2_ = len;
#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp0_ = _tmp2_ >= ((glong) 0);
-#line 1609 "CameraTable.c"
+#line 1617 "CameraTable.c"
} else {
#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp0_ = FALSE;
-#line 1613 "CameraTable.c"
+#line 1621 "CameraTable.c"
}
#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_tmp0_) {
-#line 1617 "CameraTable.c"
+#line 1625 "CameraTable.c"
glong _tmp3_ = 0L;
glong _tmp4_ = 0L;
glong _tmp5_ = 0L;
@@ -1627,7 +1635,7 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
_tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_);
#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
string_length = _tmp5_;
-#line 1629 "CameraTable.c"
+#line 1637 "CameraTable.c"
} else {
gint _tmp6_ = 0;
gint _tmp7_ = 0;
@@ -1637,13 +1645,13 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
_tmp7_ = _tmp6_;
#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
string_length = (glong) _tmp7_;
-#line 1639 "CameraTable.c"
+#line 1647 "CameraTable.c"
}
#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp8_ = offset;
#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_tmp8_ < ((glong) 0)) {
-#line 1645 "CameraTable.c"
+#line 1653 "CameraTable.c"
glong _tmp9_ = 0L;
glong _tmp10_ = 0L;
glong _tmp11_ = 0L;
@@ -1657,7 +1665,7 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
_tmp11_ = offset;
#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL);
-#line 1659 "CameraTable.c"
+#line 1667 "CameraTable.c"
} else {
glong _tmp12_ = 0L;
glong _tmp13_ = 0L;
@@ -1667,13 +1675,13 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
_tmp13_ = string_length;
#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL);
-#line 1669 "CameraTable.c"
+#line 1677 "CameraTable.c"
}
#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp14_ = len;
#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_tmp14_ < ((glong) 0)) {
-#line 1675 "CameraTable.c"
+#line 1683 "CameraTable.c"
glong _tmp15_ = 0L;
glong _tmp16_ = 0L;
#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -1682,7 +1690,7 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
_tmp16_ = offset;
#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
len = _tmp15_ - _tmp16_;
-#line 1684 "CameraTable.c"
+#line 1692 "CameraTable.c"
}
#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp17_ = offset;
@@ -1702,7 +1710,7 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
result = _tmp22_;
#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
-#line 1704 "CameraTable.c"
+#line 1712 "CameraTable.c"
}
@@ -1715,7 +1723,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
g_return_val_if_fail (old != NULL, NULL);
#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (replacement != NULL, NULL);
-#line 1717 "CameraTable.c"
+#line 1725 "CameraTable.c"
{
GRegex* regex = NULL;
const gchar* _tmp0_ = NULL;
@@ -1746,7 +1754,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_inner_error_->domain == G_REGEX_ERROR) {
-#line 1748 "CameraTable.c"
+#line 1756 "CameraTable.c"
goto __catch59_g_regex_error;
}
#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -1755,7 +1763,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
g_clear_error (&_inner_error_);
#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return NULL;
-#line 1757 "CameraTable.c"
+#line 1765 "CameraTable.c"
}
#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp6_ = regex;
@@ -1771,7 +1779,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
_g_regex_unref0 (regex);
#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_inner_error_->domain == G_REGEX_ERROR) {
-#line 1773 "CameraTable.c"
+#line 1781 "CameraTable.c"
goto __catch59_g_regex_error;
}
#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -1782,7 +1790,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
g_clear_error (&_inner_error_);
#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return NULL;
-#line 1784 "CameraTable.c"
+#line 1792 "CameraTable.c"
}
#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp9_ = _tmp5_;
@@ -1796,7 +1804,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
_g_regex_unref0 (regex);
#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
-#line 1798 "CameraTable.c"
+#line 1806 "CameraTable.c"
}
goto __finally59;
__catch59_g_regex_error:
@@ -1810,7 +1818,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
g_assert_not_reached ();
#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_g_error_free0 (e);
-#line 1812 "CameraTable.c"
+#line 1820 "CameraTable.c"
}
__finally59:
#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -1821,7 +1829,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
g_clear_error (&_inner_error_);
#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return NULL;
-#line 1823 "CameraTable.c"
+#line 1831 "CameraTable.c"
}
}
@@ -1839,7 +1847,7 @@ gchar* camera_table_get_port_path (const gchar* port) {
_tmp2_ = g_str_has_prefix (_tmp1_, "usb:");
#line 211 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (_tmp2_) {
-#line 1841 "CameraTable.c"
+#line 1849 "CameraTable.c"
const gchar* _tmp3_ = NULL;
gchar* _tmp4_ = NULL;
gchar* _tmp5_ = NULL;
@@ -1866,19 +1874,19 @@ gchar* camera_table_get_port_path (const gchar* port) {
_g_free0 (_tmp7_);
#line 212 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (_tmp5_);
-#line 1868 "CameraTable.c"
+#line 1876 "CameraTable.c"
} else {
#line 212 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (_tmp0_);
#line 212 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp0_ = NULL;
-#line 1874 "CameraTable.c"
+#line 1882 "CameraTable.c"
}
#line 211 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
result = _tmp0_;
#line 211 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return result;
-#line 1880 "CameraTable.c"
+#line 1888 "CameraTable.c"
}
@@ -1894,7 +1902,7 @@ static gchar* camera_table_get_name_for_uuid (CameraTable* self, const gchar* uu
_tmp0_ = self->priv->volume_monitor;
#line 216 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp1_ = g_volume_monitor_get_volumes (_tmp0_);
-#line 1896 "CameraTable.c"
+#line 1904 "CameraTable.c"
{
GList* volume_collection = NULL;
GList* volume_it = NULL;
@@ -1902,14 +1910,14 @@ static gchar* camera_table_get_name_for_uuid (CameraTable* self, const gchar* uu
volume_collection = _tmp1_;
#line 216 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
for (volume_it = volume_collection; volume_it != NULL; volume_it = volume_it->next) {
-#line 1904 "CameraTable.c"
+#line 1912 "CameraTable.c"
GVolume* _tmp2_ = NULL;
GVolume* volume = NULL;
#line 216 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp2_ = _g_object_ref0 ((GVolume*) volume_it->data);
#line 216 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
volume = _tmp2_;
-#line 1911 "CameraTable.c"
+#line 1919 "CameraTable.c"
{
GVolume* _tmp3_ = NULL;
gchar* _tmp4_ = NULL;
@@ -1930,7 +1938,7 @@ static gchar* camera_table_get_name_for_uuid (CameraTable* self, const gchar* uu
_g_free0 (_tmp5_);
#line 217 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (_tmp7_) {
-#line 1932 "CameraTable.c"
+#line 1940 "CameraTable.c"
GVolume* _tmp8_ = NULL;
gchar* _tmp9_ = NULL;
#line 218 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -1945,22 +1953,22 @@ static gchar* camera_table_get_name_for_uuid (CameraTable* self, const gchar* uu
__g_list_free__g_object_unref0_0 (volume_collection);
#line 218 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return result;
-#line 1947 "CameraTable.c"
+#line 1955 "CameraTable.c"
}
#line 216 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_object_unref0 (volume);
-#line 1951 "CameraTable.c"
+#line 1959 "CameraTable.c"
}
}
#line 216 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
__g_list_free__g_object_unref0_0 (volume_collection);
-#line 1956 "CameraTable.c"
+#line 1964 "CameraTable.c"
}
#line 221 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
result = NULL;
#line 221 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return result;
-#line 1962 "CameraTable.c"
+#line 1970 "CameraTable.c"
}
@@ -1976,7 +1984,7 @@ static gchar* camera_table_get_icon_for_uuid (CameraTable* self, const gchar* uu
_tmp0_ = self->priv->volume_monitor;
#line 225 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp1_ = g_volume_monitor_get_volumes (_tmp0_);
-#line 1978 "CameraTable.c"
+#line 1986 "CameraTable.c"
{
GList* volume_collection = NULL;
GList* volume_it = NULL;
@@ -1984,14 +1992,14 @@ static gchar* camera_table_get_icon_for_uuid (CameraTable* self, const gchar* uu
volume_collection = _tmp1_;
#line 225 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
for (volume_it = volume_collection; volume_it != NULL; volume_it = volume_it->next) {
-#line 1986 "CameraTable.c"
+#line 1994 "CameraTable.c"
GVolume* _tmp2_ = NULL;
GVolume* volume = NULL;
#line 225 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp2_ = _g_object_ref0 ((GVolume*) volume_it->data);
#line 225 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
volume = _tmp2_;
-#line 1993 "CameraTable.c"
+#line 2001 "CameraTable.c"
{
GVolume* _tmp3_ = NULL;
gchar* _tmp4_ = NULL;
@@ -2012,7 +2020,7 @@ static gchar* camera_table_get_icon_for_uuid (CameraTable* self, const gchar* uu
_g_free0 (_tmp5_);
#line 226 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (_tmp7_) {
-#line 2014 "CameraTable.c"
+#line 2022 "CameraTable.c"
GVolume* _tmp8_ = NULL;
GIcon* _tmp9_ = NULL;
GIcon* _tmp10_ = NULL;
@@ -2038,29 +2046,29 @@ static gchar* camera_table_get_icon_for_uuid (CameraTable* self, const gchar* uu
__g_list_free__g_object_unref0_0 (volume_collection);
#line 227 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return result;
-#line 2040 "CameraTable.c"
+#line 2048 "CameraTable.c"
}
#line 225 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_object_unref0 (volume);
-#line 2044 "CameraTable.c"
+#line 2052 "CameraTable.c"
}
}
#line 225 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
__g_list_free__g_object_unref0_0 (volume_collection);
-#line 2049 "CameraTable.c"
+#line 2057 "CameraTable.c"
}
#line 230 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
result = NULL;
#line 230 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return result;
-#line 2055 "CameraTable.c"
+#line 2063 "CameraTable.c"
}
static gpointer _discovered_camera_ref0 (gpointer self) {
#line 292 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return self ? discovered_camera_ref (self) : NULL;
-#line 2062 "CameraTable.c"
+#line 2070 "CameraTable.c"
}
@@ -2071,13 +2079,13 @@ static void _vala_array_add67 (DiscoveredCamera*** array, int* length, int* size
*size = (*size) ? (2 * (*size)) : 4;
#line 292 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
*array = g_renew (DiscoveredCamera*, *array, (*size) + 1);
-#line 2073 "CameraTable.c"
+#line 2081 "CameraTable.c"
}
#line 292 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
(*array)[(*length)++] = value;
#line 292 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
(*array)[*length] = NULL;
-#line 2079 "CameraTable.c"
+#line 2087 "CameraTable.c"
}
@@ -2129,7 +2137,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
_gp_port_info_list_free0 (port_info_list);
#line 236 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return;
-#line 2131 "CameraTable.c"
+#line 2139 "CameraTable.c"
} else {
#line 236 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_gp_port_info_list_free0 (port_info_list);
@@ -2139,7 +2147,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
g_clear_error (&_inner_error_);
#line 236 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return;
-#line 2141 "CameraTable.c"
+#line 2149 "CameraTable.c"
}
}
#line 237 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -2158,7 +2166,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
_gp_port_info_list_free0 (port_info_list);
#line 237 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return;
-#line 2160 "CameraTable.c"
+#line 2168 "CameraTable.c"
} else {
#line 237 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_gp_port_info_list_free0 (port_info_list);
@@ -2168,7 +2176,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
g_clear_error (&_inner_error_);
#line 237 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return;
-#line 2170 "CameraTable.c"
+#line 2178 "CameraTable.c"
}
}
#line 240 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -2191,7 +2199,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
_gp_port_info_list_free0 (port_info_list);
#line 240 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return;
-#line 2193 "CameraTable.c"
+#line 2201 "CameraTable.c"
} else {
#line 240 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_gp_list_unref0 (camera_list);
@@ -2203,7 +2211,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
g_clear_error (&_inner_error_);
#line 240 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return;
-#line 2205 "CameraTable.c"
+#line 2213 "CameraTable.c"
}
}
#line 241 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -2230,7 +2238,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
_gp_port_info_list_free0 (port_info_list);
#line 241 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return;
-#line 2232 "CameraTable.c"
+#line 2240 "CameraTable.c"
} else {
#line 241 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_gp_list_unref0 (camera_list);
@@ -2242,11 +2250,11 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
g_clear_error (&_inner_error_);
#line 241 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return;
-#line 2244 "CameraTable.c"
+#line 2252 "CameraTable.c"
}
}
#line 243 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp11_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+ _tmp11_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
#line 243 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
detected_map = _tmp11_;
#line 246 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -2257,19 +2265,19 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
usb_cameras_length1 = _tmp12_;
#line 246 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_usb_cameras_size_ = usb_cameras_length1;
-#line 2259 "CameraTable.c"
+#line 2267 "CameraTable.c"
{
gint ctr = 0;
#line 249 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
ctr = 0;
-#line 2264 "CameraTable.c"
+#line 2272 "CameraTable.c"
{
gboolean _tmp14_ = FALSE;
#line 249 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp14_ = TRUE;
#line 249 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
while (TRUE) {
-#line 2271 "CameraTable.c"
+#line 2279 "CameraTable.c"
gint _tmp16_ = 0;
CameraList* _tmp17_ = NULL;
gint _tmp18_ = 0;
@@ -2297,13 +2305,13 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
const gchar* _tmp46_ = NULL;
#line 249 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (!_tmp14_) {
-#line 2299 "CameraTable.c"
+#line 2307 "CameraTable.c"
gint _tmp15_ = 0;
#line 249 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp15_ = ctr;
#line 249 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
ctr = _tmp15_ + 1;
-#line 2305 "CameraTable.c"
+#line 2313 "CameraTable.c"
}
#line 249 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp14_ = FALSE;
@@ -2317,7 +2325,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
if (!(_tmp16_ < _tmp18_)) {
#line 249 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
break;
-#line 2319 "CameraTable.c"
+#line 2327 "CameraTable.c"
}
#line 251 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp19_ = camera_list;
@@ -2351,7 +2359,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
_gp_port_info_list_free0 (port_info_list);
#line 251 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return;
-#line 2353 "CameraTable.c"
+#line 2361 "CameraTable.c"
} else {
#line 251 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (name);
@@ -2369,7 +2377,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
g_clear_error (&_inner_error_);
#line 251 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return;
-#line 2371 "CameraTable.c"
+#line 2379 "CameraTable.c"
}
}
#line 254 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -2406,7 +2414,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
_gp_port_info_list_free0 (port_info_list);
#line 254 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return;
-#line 2408 "CameraTable.c"
+#line 2416 "CameraTable.c"
} else {
#line 254 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (port);
@@ -2426,7 +2434,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
g_clear_error (&_inner_error_);
#line 254 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return;
-#line 2428 "CameraTable.c"
+#line 2436 "CameraTable.c"
}
}
#line 256 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -2447,7 +2455,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
_tmp35_ = g_str_has_prefix (_tmp34_, "usb:");
#line 259 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (_tmp35_) {
-#line 2449 "CameraTable.c"
+#line 2457 "CameraTable.c"
gchar* full_port = NULL;
CameraList* _tmp36_ = NULL;
gint _tmp37_ = 0;
@@ -2484,7 +2492,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
_g_free0 (name);
#line 262 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
continue;
-#line 2486 "CameraTable.c"
+#line 2494 "CameraTable.c"
}
#line 264 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp42_ = full_port;
@@ -2496,7 +2504,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
port = _tmp43_;
#line 259 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (full_port);
-#line 2498 "CameraTable.c"
+#line 2506 "CameraTable.c"
}
#line 267 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp44_ = detected_map;
@@ -2510,7 +2518,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
_g_free0 (port);
#line 249 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (name);
-#line 2512 "CameraTable.c"
+#line 2520 "CameraTable.c"
}
}
}
@@ -2522,7 +2530,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
missing_length1 = 0;
#line 271 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_missing_size_ = missing_length1;
-#line 2524 "CameraTable.c"
+#line 2532 "CameraTable.c"
{
GeeIterator* _camera_it = NULL;
GeeHashMap* _tmp48_ = NULL;
@@ -2534,7 +2542,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
#line 272 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp48_ = self->priv->camera_map;
#line 272 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp49_ = gee_abstract_map_get_values (G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, GEE_TYPE_MAP, GeeMap));
+ _tmp49_ = gee_abstract_map_get_values (G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap));
#line 272 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp50_ = _tmp49_;
#line 272 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -2549,7 +2557,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
_camera_it = _tmp53_;
#line 272 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
while (TRUE) {
-#line 2551 "CameraTable.c"
+#line 2559 "CameraTable.c"
GeeIterator* _tmp54_ = NULL;
gboolean _tmp55_ = FALSE;
DiscoveredCamera* camera = NULL;
@@ -2586,7 +2594,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
if (!_tmp55_) {
#line 272 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
break;
-#line 2588 "CameraTable.c"
+#line 2596 "CameraTable.c"
}
#line 272 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp56_ = _camera_it;
@@ -2632,7 +2640,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
_gp_port_info_list_free0 (port_info_list);
#line 276 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return;
-#line 2634 "CameraTable.c"
+#line 2642 "CameraTable.c"
} else {
#line 276 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (tmp_path);
@@ -2658,7 +2666,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
g_clear_error (&_inner_error_);
#line 276 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return;
-#line 2660 "CameraTable.c"
+#line 2668 "CameraTable.c"
}
}
#line 279 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -2709,7 +2717,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
_gp_port_info_list_free0 (port_info_list);
#line 282 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return;
-#line 2711 "CameraTable.c"
+#line 2719 "CameraTable.c"
} else {
#line 282 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
(abilities);
@@ -2737,7 +2745,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
g_clear_error (&_inner_error_);
#line 282 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return;
-#line 2739 "CameraTable.c"
+#line 2747 "CameraTable.c"
}
}
#line 284 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -2748,7 +2756,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
_tmp70_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp68_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp69_);
#line 284 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (_tmp70_) {
-#line 2750 "CameraTable.c"
+#line 2758 "CameraTable.c"
CameraAbilities _tmp71_ = {0};
const gchar* _tmp72_ = NULL;
const gchar* _tmp73_ = NULL;
@@ -2770,7 +2778,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
_discovered_camera_unref0 (camera);
#line 287 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
continue;
-#line 2772 "CameraTable.c"
+#line 2780 "CameraTable.c"
}
#line 290 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp74_ = abilities;
@@ -2798,17 +2806,17 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
(port_info);
#line 272 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_discovered_camera_unref0 (camera);
-#line 2800 "CameraTable.c"
+#line 2808 "CameraTable.c"
}
#line 272 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_object_unref0 (_camera_it);
-#line 2804 "CameraTable.c"
+#line 2812 "CameraTable.c"
}
#line 296 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp80_ = missing;
#line 296 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp80__length1 = missing_length1;
-#line 2810 "CameraTable.c"
+#line 2818 "CameraTable.c"
{
DiscoveredCamera** camera_collection = NULL;
gint camera_collection_length1 = 0;
@@ -2820,14 +2828,14 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
camera_collection_length1 = _tmp80__length1;
#line 296 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
for (camera_it = 0; camera_it < _tmp80__length1; camera_it = camera_it + 1) {
-#line 2822 "CameraTable.c"
+#line 2830 "CameraTable.c"
DiscoveredCamera* _tmp81_ = NULL;
DiscoveredCamera* camera = NULL;
#line 296 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp81_ = _discovered_camera_ref0 (camera_collection[camera_it]);
#line 296 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
camera = _tmp81_;
-#line 2829 "CameraTable.c"
+#line 2837 "CameraTable.c"
{
GPPortInfo port_info = {0};
gchar* tmp_path = NULL;
@@ -2886,7 +2894,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
_gp_port_info_list_free0 (port_info_list);
#line 300 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return;
-#line 2888 "CameraTable.c"
+#line 2896 "CameraTable.c"
} else {
#line 300 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (tmp_path);
@@ -2910,7 +2918,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
g_clear_error (&_inner_error_);
#line 300 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return;
-#line 2912 "CameraTable.c"
+#line 2920 "CameraTable.c"
}
}
#line 302 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -2959,7 +2967,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
_gp_port_info_list_free0 (port_info_list);
#line 305 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return;
-#line 2961 "CameraTable.c"
+#line 2969 "CameraTable.c"
} else {
#line 305 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
(abilities);
@@ -2985,7 +2993,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
g_clear_error (&_inner_error_);
#line 305 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return;
-#line 2987 "CameraTable.c"
+#line 2995 "CameraTable.c"
}
}
#line 307 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -3020,7 +3028,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
(port_info);
#line 296 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_discovered_camera_unref0 (camera);
-#line 3022 "CameraTable.c"
+#line 3030 "CameraTable.c"
}
}
}
@@ -3035,7 +3043,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
#line 315 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp100_ = detected_map;
#line 315 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp101_ = gee_abstract_map_get_keys (G_TYPE_CHECK_INSTANCE_CAST (_tmp100_, GEE_TYPE_MAP, GeeMap));
+ _tmp101_ = gee_abstract_map_get_keys (G_TYPE_CHECK_INSTANCE_CAST (_tmp100_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap));
#line 315 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp102_ = _tmp101_;
#line 315 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -3050,7 +3058,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
_port_it = _tmp105_;
#line 315 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
while (TRUE) {
-#line 3052 "CameraTable.c"
+#line 3060 "CameraTable.c"
GeeIterator* _tmp106_ = NULL;
gboolean _tmp107_ = FALSE;
gchar* port = NULL;
@@ -3142,7 +3150,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
if (!_tmp107_) {
#line 315 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
break;
-#line 3144 "CameraTable.c"
+#line 3152 "CameraTable.c"
}
#line 315 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp108_ = _port_it;
@@ -3176,7 +3184,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
_tmp117_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp115_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp116_);
#line 321 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (_tmp117_) {
-#line 3178 "CameraTable.c"
+#line 3186 "CameraTable.c"
const gchar* _tmp118_ = NULL;
const gchar* _tmp119_ = NULL;
#line 323 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -3197,7 +3205,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
_g_free0 (port);
#line 325 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
continue;
-#line 3199 "CameraTable.c"
+#line 3207 "CameraTable.c"
}
#line 329 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp120_ = port;
@@ -3209,7 +3217,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
_tmp122_ = path;
#line 330 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (NULL != _tmp122_) {
-#line 3211 "CameraTable.c"
+#line 3219 "CameraTable.c"
GUdevDevice* device = NULL;
GUdevClient* _tmp123_ = NULL;
const gchar* _tmp124_ = NULL;
@@ -3241,7 +3249,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
_tmp129_ = serial;
#line 333 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (NULL != _tmp129_) {
-#line 3243 "CameraTable.c"
+#line 3251 "CameraTable.c"
const gchar* _tmp130_ = NULL;
gchar* _tmp131_ = NULL;
const gchar* _tmp132_ = NULL;
@@ -3262,13 +3270,13 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
_g_free0 (icon);
#line 336 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
icon = _tmp133_;
-#line 3264 "CameraTable.c"
+#line 3272 "CameraTable.c"
}
#line 338 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp134_ = display_name;
#line 338 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (NULL == _tmp134_) {
-#line 3270 "CameraTable.c"
+#line 3278 "CameraTable.c"
GUdevDevice* _tmp135_ = NULL;
const gchar* _tmp136_ = NULL;
gchar* _tmp137_ = NULL;
@@ -3282,13 +3290,13 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
_g_free0 (display_name);
#line 339 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
display_name = _tmp137_;
-#line 3284 "CameraTable.c"
+#line 3292 "CameraTable.c"
}
#line 341 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp138_ = display_name;
#line 341 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (NULL == _tmp138_) {
-#line 3290 "CameraTable.c"
+#line 3298 "CameraTable.c"
GUdevDevice* _tmp139_ = NULL;
const gchar* _tmp140_ = NULL;
gchar* _tmp141_ = NULL;
@@ -3302,19 +3310,19 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
_g_free0 (display_name);
#line 342 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
display_name = _tmp141_;
-#line 3304 "CameraTable.c"
+#line 3312 "CameraTable.c"
}
#line 330 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (serial);
#line 330 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_object_unref0 (device);
-#line 3310 "CameraTable.c"
+#line 3318 "CameraTable.c"
}
#line 345 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp142_ = display_name;
#line 345 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (NULL == _tmp142_) {
-#line 3316 "CameraTable.c"
+#line 3324 "CameraTable.c"
const gchar* _tmp143_ = NULL;
gchar* _tmp144_ = NULL;
#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -3325,7 +3333,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
_g_free0 (display_name);
#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
display_name = _tmp144_;
-#line 3327 "CameraTable.c"
+#line 3335 "CameraTable.c"
}
#line 350 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp145_ = port_info_list;
@@ -3339,7 +3347,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
_tmp148_ = index;
#line 351 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (_tmp148_ < 0) {
-#line 3341 "CameraTable.c"
+#line 3349 "CameraTable.c"
gint _tmp149_ = 0;
const gchar* _tmp150_ = NULL;
gchar* _tmp151_ = NULL;
@@ -3388,7 +3396,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
_gp_port_info_list_free0 (port_info_list);
#line 352 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return;
-#line 3390 "CameraTable.c"
+#line 3398 "CameraTable.c"
} else {
#line 352 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (path);
@@ -3420,7 +3428,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
g_clear_error (&_inner_error_);
#line 352 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return;
-#line 3422 "CameraTable.c"
+#line 3430 "CameraTable.c"
}
}
}
@@ -3480,7 +3488,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
_gp_port_info_list_free0 (port_info_list);
#line 357 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return;
-#line 3482 "CameraTable.c"
+#line 3490 "CameraTable.c"
} else {
#line 357 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (tmp_path);
@@ -3516,7 +3524,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
g_clear_error (&_inner_error_);
#line 357 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return;
-#line 3518 "CameraTable.c"
+#line 3526 "CameraTable.c"
}
}
#line 358 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -3545,7 +3553,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
_tmp167_ = index;
#line 364 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (_tmp167_ < 0) {
-#line 3547 "CameraTable.c"
+#line 3555 "CameraTable.c"
gint _tmp168_ = 0;
const gchar* _tmp169_ = NULL;
gchar* _tmp170_ = NULL;
@@ -3598,7 +3606,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
_gp_port_info_list_free0 (port_info_list);
#line 365 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return;
-#line 3600 "CameraTable.c"
+#line 3608 "CameraTable.c"
} else {
#line 365 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (tmp_path);
@@ -3634,7 +3642,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
g_clear_error (&_inner_error_);
#line 365 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return;
-#line 3636 "CameraTable.c"
+#line 3644 "CameraTable.c"
}
}
}
@@ -3696,7 +3704,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
_gp_port_info_list_free0 (port_info_list);
#line 368 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return;
-#line 3698 "CameraTable.c"
+#line 3706 "CameraTable.c"
} else {
#line 368 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
(camera_abilities);
@@ -3734,7 +3742,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
g_clear_error (&_inner_error_);
#line 368 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return;
-#line 3736 "CameraTable.c"
+#line 3744 "CameraTable.c"
}
}
#line 372 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -3793,7 +3801,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
_gp_port_info_list_free0 (port_info_list);
#line 372 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return;
-#line 3795 "CameraTable.c"
+#line 3803 "CameraTable.c"
} else {
#line 372 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_gp_camera_unref0 (gcamera);
@@ -3833,7 +3841,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
g_clear_error (&_inner_error_);
#line 372 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return;
-#line 3835 "CameraTable.c"
+#line 3843 "CameraTable.c"
}
}
#line 373 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -3892,7 +3900,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
_gp_port_info_list_free0 (port_info_list);
#line 373 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return;
-#line 3894 "CameraTable.c"
+#line 3902 "CameraTable.c"
} else {
#line 373 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_gp_camera_unref0 (gcamera);
@@ -3932,7 +3940,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
g_clear_error (&_inner_error_);
#line 373 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return;
-#line 3934 "CameraTable.c"
+#line 3942 "CameraTable.c"
}
}
#line 374 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -3993,7 +4001,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
_gp_port_info_list_free0 (port_info_list);
#line 374 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return;
-#line 3995 "CameraTable.c"
+#line 4003 "CameraTable.c"
} else {
#line 374 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_gp_camera_unref0 (gcamera);
@@ -4033,7 +4041,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
g_clear_error (&_inner_error_);
#line 374 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return;
-#line 4035 "CameraTable.c"
+#line 4043 "CameraTable.c"
}
}
#line 376 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -4088,11 +4096,11 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
_g_free0 (name);
#line 315 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (port);
-#line 4090 "CameraTable.c"
+#line 4098 "CameraTable.c"
}
#line 315 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_object_unref0 (_port_it);
-#line 4094 "CameraTable.c"
+#line 4102 "CameraTable.c"
}
#line 233 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
missing = (_vala_array_free (missing, missing_length1, (GDestroyNotify) discovered_camera_unref), NULL);
@@ -4104,7 +4112,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
_gp_list_unref0 (camera_list);
#line 233 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_gp_port_info_list_free0 (port_info_list);
-#line 4106 "CameraTable.c"
+#line 4114 "CameraTable.c"
}
@@ -4131,7 +4139,7 @@ static void camera_table_on_udev_event (CameraTable* self, const gchar* action,
_tmp3_ = self->priv->camera_update_scheduler;
#line 390 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
one_shot_scheduler_after_timeout (_tmp3_, (guint) CAMERA_TABLE_UPDATE_DELAY_MSEC, TRUE);
-#line 4133 "CameraTable.c"
+#line 4141 "CameraTable.c"
}
@@ -4145,7 +4153,7 @@ void camera_table_on_volume_changed (CameraTable* self, GVolume* volume) {
_tmp0_ = self->priv->camera_update_scheduler;
#line 394 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
one_shot_scheduler_after_timeout (_tmp0_, (guint) CAMERA_TABLE_UPDATE_DELAY_MSEC, TRUE);
-#line 4147 "CameraTable.c"
+#line 4155 "CameraTable.c"
}
@@ -4153,7 +4161,7 @@ static void camera_table_on_update_cameras (CameraTable* self) {
GError * _inner_error_ = NULL;
#line 397 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
g_return_if_fail (IS_CAMERA_TABLE (self));
-#line 4155 "CameraTable.c"
+#line 4163 "CameraTable.c"
{
CameraTable* _tmp0_ = NULL;
CameraTable* _tmp1_ = NULL;
@@ -4169,7 +4177,7 @@ static void camera_table_on_update_cameras (CameraTable* self) {
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 399 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (_inner_error_->domain == GPHOTO_ERROR) {
-#line 4171 "CameraTable.c"
+#line 4179 "CameraTable.c"
goto __catch60_gphoto_error;
}
#line 399 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -4178,7 +4186,7 @@ static void camera_table_on_update_cameras (CameraTable* self) {
g_clear_error (&_inner_error_);
#line 399 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return;
-#line 4180 "CameraTable.c"
+#line 4188 "CameraTable.c"
}
}
goto __finally60;
@@ -4199,7 +4207,7 @@ static void camera_table_on_update_cameras (CameraTable* self) {
g_warning ("CameraTable.vala:401: Error updating camera table: %s", _tmp3_);
#line 398 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_error_free0 (err);
-#line 4201 "CameraTable.c"
+#line 4209 "CameraTable.c"
}
__finally60:
#line 398 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -4210,7 +4218,7 @@ static void camera_table_on_update_cameras (CameraTable* self) {
g_clear_error (&_inner_error_);
#line 398 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return;
-#line 4212 "CameraTable.c"
+#line 4220 "CameraTable.c"
}
}
@@ -4230,26 +4238,26 @@ static void g_cclosure_user_marshal_VOID__DISCOVERED_CAMERA (GClosure * closure,
data1 = closure->data;
#line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
data2 = param_values->data[0].v_pointer;
-#line 4232 "CameraTable.c"
+#line 4240 "CameraTable.c"
} else {
#line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
data1 = param_values->data[0].v_pointer;
#line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
data2 = closure->data;
-#line 4238 "CameraTable.c"
+#line 4246 "CameraTable.c"
}
#line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
callback = (GMarshalFunc_VOID__DISCOVERED_CAMERA) (marshal_data ? marshal_data : cc->callback);
#line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
callback (data1, value_get_discovered_camera (param_values + 1), data2);
-#line 4244 "CameraTable.c"
+#line 4252 "CameraTable.c"
}
static void value_camera_table_init (GValue* value) {
#line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
value->data[0].v_pointer = NULL;
-#line 4251 "CameraTable.c"
+#line 4259 "CameraTable.c"
}
@@ -4258,7 +4266,7 @@ static void value_camera_table_free_value (GValue* value) {
if (value->data[0].v_pointer) {
#line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
camera_table_unref (value->data[0].v_pointer);
-#line 4260 "CameraTable.c"
+#line 4268 "CameraTable.c"
}
}
@@ -4268,11 +4276,11 @@ static void value_camera_table_copy_value (const GValue* src_value, GValue* dest
if (src_value->data[0].v_pointer) {
#line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
dest_value->data[0].v_pointer = camera_table_ref (src_value->data[0].v_pointer);
-#line 4270 "CameraTable.c"
+#line 4278 "CameraTable.c"
} else {
#line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
dest_value->data[0].v_pointer = NULL;
-#line 4274 "CameraTable.c"
+#line 4282 "CameraTable.c"
}
}
@@ -4280,37 +4288,37 @@ static void value_camera_table_copy_value (const GValue* src_value, GValue* dest
static gpointer value_camera_table_peek_pointer (const GValue* value) {
#line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return value->data[0].v_pointer;
-#line 4282 "CameraTable.c"
+#line 4290 "CameraTable.c"
}
static gchar* value_camera_table_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
#line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (collect_values[0].v_pointer) {
-#line 4289 "CameraTable.c"
+#line 4297 "CameraTable.c"
CameraTable* object;
object = collect_values[0].v_pointer;
#line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (object->parent_instance.g_class == NULL) {
#line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 4296 "CameraTable.c"
+#line 4304 "CameraTable.c"
} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
#line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.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 4300 "CameraTable.c"
+#line 4308 "CameraTable.c"
}
#line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
value->data[0].v_pointer = camera_table_ref (object);
-#line 4304 "CameraTable.c"
+#line 4312 "CameraTable.c"
} else {
#line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
value->data[0].v_pointer = NULL;
-#line 4308 "CameraTable.c"
+#line 4316 "CameraTable.c"
}
#line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return NULL;
-#line 4312 "CameraTable.c"
+#line 4320 "CameraTable.c"
}
@@ -4321,25 +4329,25 @@ static gchar* value_camera_table_lcopy_value (const GValue* value, guint n_colle
if (!object_p) {
#line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 4323 "CameraTable.c"
+#line 4331 "CameraTable.c"
}
#line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (!value->data[0].v_pointer) {
#line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
*object_p = NULL;
-#line 4329 "CameraTable.c"
+#line 4337 "CameraTable.c"
} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
#line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
*object_p = value->data[0].v_pointer;
-#line 4333 "CameraTable.c"
+#line 4341 "CameraTable.c"
} else {
#line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
*object_p = camera_table_ref (value->data[0].v_pointer);
-#line 4337 "CameraTable.c"
+#line 4345 "CameraTable.c"
}
#line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return NULL;
-#line 4341 "CameraTable.c"
+#line 4349 "CameraTable.c"
}
@@ -4353,7 +4361,7 @@ GParamSpec* param_spec_camera_table (const gchar* name, const gchar* nick, const
G_PARAM_SPEC (spec)->value_type = object_type;
#line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return G_PARAM_SPEC (spec);
-#line 4355 "CameraTable.c"
+#line 4363 "CameraTable.c"
}
@@ -4362,7 +4370,7 @@ gpointer value_get_camera_table (const GValue* value) {
g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_CAMERA_TABLE), NULL);
#line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return value->data[0].v_pointer;
-#line 4364 "CameraTable.c"
+#line 4372 "CameraTable.c"
}
@@ -4382,17 +4390,17 @@ void value_set_camera_table (GValue* value, gpointer v_object) {
value->data[0].v_pointer = v_object;
#line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
camera_table_ref (value->data[0].v_pointer);
-#line 4384 "CameraTable.c"
+#line 4392 "CameraTable.c"
} else {
#line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
value->data[0].v_pointer = NULL;
-#line 4388 "CameraTable.c"
+#line 4396 "CameraTable.c"
}
#line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (old) {
#line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
camera_table_unref (old);
-#line 4394 "CameraTable.c"
+#line 4402 "CameraTable.c"
}
}
@@ -4411,17 +4419,17 @@ void value_take_camera_table (GValue* value, gpointer v_object) {
g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
#line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
value->data[0].v_pointer = v_object;
-#line 4413 "CameraTable.c"
+#line 4421 "CameraTable.c"
} else {
#line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
value->data[0].v_pointer = NULL;
-#line 4417 "CameraTable.c"
+#line 4425 "CameraTable.c"
}
#line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (old) {
#line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
camera_table_unref (old);
-#line 4423 "CameraTable.c"
+#line 4431 "CameraTable.c"
}
}
@@ -4437,7 +4445,7 @@ static void camera_table_class_init (CameraTableClass * klass) {
g_signal_new ("camera_added", TYPE_CAMERA_TABLE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__DISCOVERED_CAMERA, G_TYPE_NONE, 1, TYPE_DISCOVERED_CAMERA);
#line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
g_signal_new ("camera_removed", TYPE_CAMERA_TABLE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__DISCOVERED_CAMERA, G_TYPE_NONE, 1, TYPE_DISCOVERED_CAMERA);
-#line 4439 "CameraTable.c"
+#line 4447 "CameraTable.c"
}
@@ -4458,12 +4466,12 @@ static void camera_table_instance_init (CameraTable * self) {
#line 31 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
self->priv->null_context = _tmp1_;
#line 35 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp2_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, TYPE_DISCOVERED_CAMERA, (GBoxedCopyFunc) discovered_camera_ref, discovered_camera_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+ _tmp2_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, TYPE_DISCOVERED_CAMERA, (GBoxedCopyFunc) discovered_camera_ref, (GDestroyNotify) discovered_camera_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
#line 35 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
self->priv->camera_map = _tmp2_;
#line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
self->ref_count = 1;
-#line 4465 "CameraTable.c"
+#line 4473 "CameraTable.c"
}
@@ -4485,7 +4493,7 @@ static void camera_table_finalize (CameraTable* obj) {
_g_object_unref0 (self->priv->volume_monitor);
#line 35 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_object_unref0 (self->priv->camera_map);
-#line 4487 "CameraTable.c"
+#line 4495 "CameraTable.c"
}
@@ -4510,7 +4518,7 @@ gpointer camera_table_ref (gpointer instance) {
g_atomic_int_inc (&self->ref_count);
#line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return instance;
-#line 4512 "CameraTable.c"
+#line 4520 "CameraTable.c"
}
@@ -4523,7 +4531,7 @@ void camera_table_unref (gpointer instance) {
CAMERA_TABLE_GET_CLASS (self)->finalize (self);
#line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
g_type_free_instance ((GTypeInstance *) self);
-#line 4525 "CameraTable.c"
+#line 4533 "CameraTable.c"
}
}