summaryrefslogtreecommitdiff
path: root/src/camera/CameraTable.c
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2018-05-01 14:43:08 +0200
committerJörg Frings-Fürst <debian@jff-webhosting.net>2018-05-01 14:43:08 +0200
commit2b3f22361da0c1d8e6ce70d71352821758186db7 (patch)
tree5d10633b47369b3aa52a05bf889ede0dbe5ee108 /src/camera/CameraTable.c
parent211da5fc3048ca2b6ccee2166b0aaaade55cb84f (diff)
parentdc6c76eb04dfe3d4262a1806808f0bc0bf523238 (diff)
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'src/camera/CameraTable.c')
-rw-r--r--src/camera/CameraTable.c1867
1 files changed, 1023 insertions, 844 deletions
diff --git a/src/camera/CameraTable.c b/src/camera/CameraTable.c
index 864a4e8..5c3c502 100644
--- a/src/camera/CameraTable.c
+++ b/src/camera/CameraTable.c
@@ -24,6 +24,7 @@
#include <stdio.h>
#include <gphoto2/gphoto2-port-info-list.h>
#include <gphoto2/gphoto2-list.h>
+#include <glib/gi18n-lib.h>
#include <gobject/gvaluecollector.h>
@@ -227,7 +228,7 @@ gint camera_table_get_count (CameraTable* self);
DiscoveredCamera* camera_table_get_for_uri (CameraTable* self, const gchar* uri);
static void camera_table_do_op (CameraTable* self, int res, const gchar* op, GError** error);
static gchar** camera_table_get_all_usb_cameras (CameraTable* self, int* result_length1);
-static void _vala_array_add66 (gchar** * array, int* length, int* size, gchar* value);
+static void _vala_array_add69 (gchar** * array, int* length, int* size, gchar* value);
static void _g_object_unref0_ (gpointer var);
static void _g_list_free__g_object_unref0_ (GList* self);
static gboolean camera_table_usb_esp (CameraTable* self, gint current_camera_count, gchar** usb_cameras, int usb_cameras_length1, const gchar* port, gchar* * full_port);
@@ -235,7 +236,7 @@ gchar* camera_table_get_port_uri (const gchar* port);
gchar* camera_table_get_port_path (const gchar* port);
static gchar* camera_table_get_name_for_uuid (CameraTable* self, const gchar* uuid);
static gchar* camera_table_get_icon_for_uuid (CameraTable* self, const gchar* uuid);
-static void _vala_array_add67 (DiscoveredCamera** * array, int* length, int* size, DiscoveredCamera* value);
+static void _vala_array_add70 (DiscoveredCamera** * array, int* length, int* size, DiscoveredCamera* value);
void one_shot_scheduler_after_timeout (OneShotScheduler* self, guint msec, gboolean reschedule);
static void g_cclosure_user_marshal_VOID__DISCOVERED_CAMERA (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data);
static void camera_table_finalize (CameraTable * obj);
@@ -247,7 +248,7 @@ static const gchar* CAMERA_TABLE_SUBSYSTEMS[3] = {"usb", "block", NULL};
static gpointer _GPHOTO_REF_CAMERA0 (gpointer self) {
#line 14 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return self ? GPHOTO_REF_CAMERA (self) : NULL;
-#line 251 "CameraTable.c"
+#line 252 "CameraTable.c"
}
@@ -303,21 +304,21 @@ DiscoveredCamera* discovered_camera_construct (GType object_type, Camera* gcamer
self->icon = _tmp7_;
#line 13 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return self;
-#line 307 "CameraTable.c"
+#line 308 "CameraTable.c"
}
DiscoveredCamera* discovered_camera_new (Camera* gcamera, const gchar* uri, const gchar* display_name, const gchar* icon) {
#line 13 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return discovered_camera_construct (TYPE_DISCOVERED_CAMERA, gcamera, uri, display_name, icon);
-#line 314 "CameraTable.c"
+#line 315 "CameraTable.c"
}
static void value_discovered_camera_init (GValue* value) {
#line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
value->data[0].v_pointer = NULL;
-#line 321 "CameraTable.c"
+#line 322 "CameraTable.c"
}
@@ -326,7 +327,7 @@ static void value_discovered_camera_free_value (GValue* value) {
if (value->data[0].v_pointer) {
#line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
discovered_camera_unref (value->data[0].v_pointer);
-#line 330 "CameraTable.c"
+#line 331 "CameraTable.c"
}
}
@@ -336,11 +337,11 @@ static void value_discovered_camera_copy_value (const GValue* src_value, GValue*
if (src_value->data[0].v_pointer) {
#line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
dest_value->data[0].v_pointer = discovered_camera_ref (src_value->data[0].v_pointer);
-#line 340 "CameraTable.c"
+#line 341 "CameraTable.c"
} else {
#line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
dest_value->data[0].v_pointer = NULL;
-#line 344 "CameraTable.c"
+#line 345 "CameraTable.c"
}
}
@@ -348,37 +349,37 @@ static void value_discovered_camera_copy_value (const GValue* src_value, GValue*
static gpointer value_discovered_camera_peek_pointer (const GValue* value) {
#line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return value->data[0].v_pointer;
-#line 352 "CameraTable.c"
+#line 353 "CameraTable.c"
}
static gchar* value_discovered_camera_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
#line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (collect_values[0].v_pointer) {
-#line 359 "CameraTable.c"
+#line 360 "CameraTable.c"
DiscoveredCamera * object;
object = collect_values[0].v_pointer;
#line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (object->parent_instance.g_class == NULL) {
#line 7 "/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 366 "CameraTable.c"
+#line 367 "CameraTable.c"
} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
#line 7 "/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 370 "CameraTable.c"
+#line 371 "CameraTable.c"
}
#line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
value->data[0].v_pointer = discovered_camera_ref (object);
-#line 374 "CameraTable.c"
+#line 375 "CameraTable.c"
} else {
#line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
value->data[0].v_pointer = NULL;
-#line 378 "CameraTable.c"
+#line 379 "CameraTable.c"
}
#line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return NULL;
-#line 382 "CameraTable.c"
+#line 383 "CameraTable.c"
}
@@ -389,25 +390,25 @@ static gchar* value_discovered_camera_lcopy_value (const GValue* value, guint n_
if (!object_p) {
#line 7 "/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 393 "CameraTable.c"
+#line 394 "CameraTable.c"
}
#line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (!value->data[0].v_pointer) {
#line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
*object_p = NULL;
-#line 399 "CameraTable.c"
+#line 400 "CameraTable.c"
} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
#line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
*object_p = value->data[0].v_pointer;
-#line 403 "CameraTable.c"
+#line 404 "CameraTable.c"
} else {
#line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
*object_p = discovered_camera_ref (value->data[0].v_pointer);
-#line 407 "CameraTable.c"
+#line 408 "CameraTable.c"
}
#line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return NULL;
-#line 411 "CameraTable.c"
+#line 412 "CameraTable.c"
}
@@ -421,7 +422,7 @@ GParamSpec* param_spec_discovered_camera (const gchar* name, const gchar* nick,
G_PARAM_SPEC (spec)->value_type = object_type;
#line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return G_PARAM_SPEC (spec);
-#line 425 "CameraTable.c"
+#line 426 "CameraTable.c"
}
@@ -430,7 +431,7 @@ gpointer value_get_discovered_camera (const GValue* value) {
g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_DISCOVERED_CAMERA), NULL);
#line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return value->data[0].v_pointer;
-#line 434 "CameraTable.c"
+#line 435 "CameraTable.c"
}
@@ -450,17 +451,17 @@ void value_set_discovered_camera (GValue* value, gpointer v_object) {
value->data[0].v_pointer = v_object;
#line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
discovered_camera_ref (value->data[0].v_pointer);
-#line 454 "CameraTable.c"
+#line 455 "CameraTable.c"
} else {
#line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
value->data[0].v_pointer = NULL;
-#line 458 "CameraTable.c"
+#line 459 "CameraTable.c"
}
#line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (old) {
#line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
discovered_camera_unref (old);
-#line 464 "CameraTable.c"
+#line 465 "CameraTable.c"
}
}
@@ -479,17 +480,17 @@ void value_take_discovered_camera (GValue* value, gpointer v_object) {
g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
#line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
value->data[0].v_pointer = v_object;
-#line 483 "CameraTable.c"
+#line 484 "CameraTable.c"
} else {
#line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
value->data[0].v_pointer = NULL;
-#line 487 "CameraTable.c"
+#line 488 "CameraTable.c"
}
#line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (old) {
#line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
discovered_camera_unref (old);
-#line 493 "CameraTable.c"
+#line 494 "CameraTable.c"
}
}
@@ -499,14 +500,14 @@ static void discovered_camera_class_init (DiscoveredCameraClass * klass) {
discovered_camera_parent_class = g_type_class_peek_parent (klass);
#line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
((DiscoveredCameraClass *) klass)->finalize = discovered_camera_finalize;
-#line 503 "CameraTable.c"
+#line 504 "CameraTable.c"
}
static void discovered_camera_instance_init (DiscoveredCamera * self) {
#line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
self->ref_count = 1;
-#line 510 "CameraTable.c"
+#line 511 "CameraTable.c"
}
@@ -524,7 +525,7 @@ static void discovered_camera_finalize (DiscoveredCamera * obj) {
_g_free0 (self->display_name);
#line 11 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (self->icon);
-#line 528 "CameraTable.c"
+#line 529 "CameraTable.c"
}
@@ -549,7 +550,7 @@ gpointer discovered_camera_ref (gpointer instance) {
g_atomic_int_inc (&self->ref_count);
#line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return instance;
-#line 553 "CameraTable.c"
+#line 554 "CameraTable.c"
}
@@ -562,7 +563,7 @@ void discovered_camera_unref (gpointer instance) {
DISCOVERED_CAMERA_GET_CLASS (self)->finalize (self);
#line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
g_type_free_instance ((GTypeInstance *) self);
-#line 566 "CameraTable.c"
+#line 567 "CameraTable.c"
}
}
@@ -570,28 +571,28 @@ void discovered_camera_unref (gpointer instance) {
static void _camera_table_on_update_cameras_one_shot_callback (gpointer self) {
#line 42 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
camera_table_on_update_cameras ((CameraTable*) self);
-#line 574 "CameraTable.c"
+#line 575 "CameraTable.c"
}
static void _camera_table_on_udev_event_g_udev_client_uevent (GUdevClient* _sender, const gchar* action, GUdevDevice* device, gpointer self) {
#line 46 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
camera_table_on_udev_event ((CameraTable*) self, action, device);
-#line 581 "CameraTable.c"
+#line 582 "CameraTable.c"
}
static void _camera_table_on_volume_changed_g_volume_monitor_volume_changed (GVolumeMonitor* _sender, GVolume* volume, gpointer self) {
#line 48 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
camera_table_on_volume_changed ((CameraTable*) self, volume);
-#line 588 "CameraTable.c"
+#line 589 "CameraTable.c"
}
static void _camera_table_on_volume_changed_g_volume_monitor_volume_added (GVolumeMonitor* _sender, GVolume* volume, gpointer self) {
#line 49 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
camera_table_on_volume_changed ((CameraTable*) self, volume);
-#line 595 "CameraTable.c"
+#line 596 "CameraTable.c"
}
@@ -600,7 +601,7 @@ static gboolean _camera_table_delayed_init_gsource_func (gpointer self) {
result = camera_table_delayed_init ((CameraTable*) self);
#line 54 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return result;
-#line 604 "CameraTable.c"
+#line 605 "CameraTable.c"
}
@@ -641,14 +642,14 @@ static CameraTable* camera_table_construct (GType object_type) {
g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) 500, _camera_table_delayed_init_gsource_func, camera_table_ref (self), camera_table_unref);
#line 41 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return self;
-#line 645 "CameraTable.c"
+#line 646 "CameraTable.c"
}
static CameraTable* camera_table_new (void) {
#line 41 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return camera_table_construct (TYPE_CAMERA_TABLE);
-#line 652 "CameraTable.c"
+#line 653 "CameraTable.c"
}
@@ -669,18 +670,18 @@ static gboolean camera_table_delayed_init (CameraTable* self) {
library_window_set_page_switching_enabled (_tmp1_, FALSE);
#line 60 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_object_unref0 (_tmp1_);
-#line 673 "CameraTable.c"
+#line 674 "CameraTable.c"
{
#line 63 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
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 679 "CameraTable.c"
+#line 680 "CameraTable.c"
gboolean _tmp2_ = FALSE;
#line 63 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (_inner_error_->domain == GPHOTO_ERROR) {
-#line 683 "CameraTable.c"
- goto __catch58_gphoto_error;
+#line 684 "CameraTable.c"
+ goto __catch64_gphoto_error;
}
#line 63 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -688,11 +689,11 @@ static gboolean camera_table_delayed_init (CameraTable* self) {
g_clear_error (&_inner_error_);
#line 63 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return _tmp2_;
-#line 692 "CameraTable.c"
+#line 693 "CameraTable.c"
}
}
- goto __finally58;
- __catch58_gphoto_error:
+ goto __finally64;
+ __catch64_gphoto_error:
{
GError* err = NULL;
GError* _tmp3_;
@@ -713,12 +714,12 @@ static gboolean camera_table_delayed_init (CameraTable* self) {
_g_error_free0 (err);
#line 67 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return result;
-#line 717 "CameraTable.c"
+#line 718 "CameraTable.c"
}
- __finally58:
+ __finally64:
#line 62 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 722 "CameraTable.c"
+#line 723 "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);
@@ -726,19 +727,19 @@ static gboolean camera_table_delayed_init (CameraTable* self) {
g_clear_error (&_inner_error_);
#line 62 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return _tmp5_;
-#line 730 "CameraTable.c"
+#line 731 "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 737 "CameraTable.c"
+#line 738 "CameraTable.c"
gboolean _tmp6_ = FALSE;
#line 71 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (_inner_error_->domain == GPHOTO_ERROR) {
-#line 741 "CameraTable.c"
- goto __catch59_gphoto_error;
+#line 742 "CameraTable.c"
+ goto __catch65_gphoto_error;
}
#line 71 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -746,11 +747,11 @@ static gboolean camera_table_delayed_init (CameraTable* self) {
g_clear_error (&_inner_error_);
#line 71 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return _tmp6_;
-#line 750 "CameraTable.c"
+#line 751 "CameraTable.c"
}
}
- goto __finally59;
- __catch59_gphoto_error:
+ goto __finally65;
+ __catch65_gphoto_error:
{
GError* err = NULL;
GError* _tmp7_;
@@ -767,12 +768,12 @@ static gboolean camera_table_delayed_init (CameraTable* self) {
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 771 "CameraTable.c"
+#line 772 "CameraTable.c"
}
- __finally59:
+ __finally65:
#line 70 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 776 "CameraTable.c"
+#line 777 "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);
@@ -780,7 +781,7 @@ static gboolean camera_table_delayed_init (CameraTable* self) {
g_clear_error (&_inner_error_);
#line 70 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return _tmp9_;
-#line 784 "CameraTable.c"
+#line 785 "CameraTable.c"
}
#line 78 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp10_ = app_window_get_instance ();
@@ -794,14 +795,14 @@ static gboolean camera_table_delayed_init (CameraTable* self) {
result = FALSE;
#line 79 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return result;
-#line 798 "CameraTable.c"
+#line 799 "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 805 "CameraTable.c"
+#line 806 "CameraTable.c"
}
@@ -814,7 +815,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 818 "CameraTable.c"
+#line 819 "CameraTable.c"
CameraTable* _tmp1_;
#line 84 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp1_ = camera_table_new ();
@@ -822,7 +823,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 826 "CameraTable.c"
+#line 827 "CameraTable.c"
}
#line 86 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp2_ = camera_table_instance;
@@ -832,7 +833,7 @@ CameraTable* camera_table_get_instance (void) {
result = _tmp3_;
#line 86 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return result;
-#line 836 "CameraTable.c"
+#line 837 "CameraTable.c"
}
@@ -853,7 +854,7 @@ GeeIterable* camera_table_get_cameras (CameraTable* self) {
result = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ITERABLE, GeeIterable);
#line 90 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return result;
-#line 857 "CameraTable.c"
+#line 858 "CameraTable.c"
}
@@ -874,7 +875,7 @@ gint camera_table_get_count (CameraTable* self) {
result = _tmp2_;
#line 94 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return result;
-#line 878 "CameraTable.c"
+#line 879 "CameraTable.c"
}
@@ -897,7 +898,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 901 "CameraTable.c"
+#line 902 "CameraTable.c"
}
@@ -912,7 +913,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 916 "CameraTable.c"
+#line 917 "CameraTable.c"
int _tmp1_;
const gchar* _tmp2_;
int _tmp3_;
@@ -936,7 +937,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 940 "CameraTable.c"
+#line 941 "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);
@@ -944,7 +945,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 948 "CameraTable.c"
+#line 949 "CameraTable.c"
}
}
}
@@ -975,7 +976,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 979 "CameraTable.c"
+#line 980 "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);
@@ -983,7 +984,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 987 "CameraTable.c"
+#line 988 "CameraTable.c"
}
}
#line 108 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -1002,7 +1003,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 1006 "CameraTable.c"
+#line 1007 "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);
@@ -1010,7 +1011,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 1014 "CameraTable.c"
+#line 1015 "CameraTable.c"
}
}
}
@@ -1019,31 +1020,31 @@ 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 1023 "CameraTable.c"
+#line 1024 "CameraTable.c"
}
-static void _vala_array_add66 (gchar** * array, int* length, int* size, gchar* value) {
+static void _vala_array_add69 (gchar** * array, int* length, int* size, gchar* value) {
#line 135 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if ((*length) == (*size)) {
#line 135 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
*size = (*size) ? (2 * (*size)) : 4;
#line 135 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
*array = g_renew (gchar*, *array, (*size) + 1);
-#line 1034 "CameraTable.c"
+#line 1035 "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 1040 "CameraTable.c"
+#line 1041 "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 1047 "CameraTable.c"
+#line 1048 "CameraTable.c"
}
@@ -1052,7 +1053,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 1056 "CameraTable.c"
+#line 1057 "CameraTable.c"
}
@@ -1086,7 +1087,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 1090 "CameraTable.c"
+#line 1091 "CameraTable.c"
{
GList* device_collection = NULL;
GList* device_it = NULL;
@@ -1094,14 +1095,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 1098 "CameraTable.c"
+#line 1099 "CameraTable.c"
GUdevDevice* _tmp4_;
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 1105 "CameraTable.c"
+#line 1106 "CameraTable.c"
{
gchar* device_file = NULL;
GUdevDevice* _tmp5_;
@@ -1122,7 +1123,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 1126 "CameraTable.c"
+#line 1127 "CameraTable.c"
GUdevDevice* _tmp11_;
gboolean _tmp12_;
#line 121 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -1131,15 +1132,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 1135 "CameraTable.c"
+#line 1136 "CameraTable.c"
} else {
#line 120 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp9_ = FALSE;
-#line 1139 "CameraTable.c"
+#line 1140 "CameraTable.c"
}
#line 120 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (_tmp9_) {
-#line 1143 "CameraTable.c"
+#line 1144 "CameraTable.c"
GUdevDevice* _tmp13_;
gboolean _tmp14_;
#line 122 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -1148,15 +1149,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 1152 "CameraTable.c"
+#line 1153 "CameraTable.c"
} else {
#line 120 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp8_ = FALSE;
-#line 1156 "CameraTable.c"
+#line 1157 "CameraTable.c"
}
#line 117 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (_tmp8_) {
-#line 1160 "CameraTable.c"
+#line 1161 "CameraTable.c"
gint camera_bus = 0;
gint camera_device = 0;
const gchar* _tmp15_;
@@ -1176,7 +1177,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 1180 "CameraTable.c"
+#line 1181 "CameraTable.c"
const gchar* _tmp17_;
#line 129 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp17_ = device_file;
@@ -1189,7 +1190,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 1192 "CameraTable.c"
+#line 1193 "CameraTable.c"
}
#line 133 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp18_ = camera_bus;
@@ -1212,16 +1213,16 @@ static gchar** camera_table_get_all_usb_cameras (CameraTable* self, int* result_
#line 135 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp24_ = g_strdup (_tmp23_);
#line 135 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _vala_array_add66 (&cameras, &cameras_length1, &_cameras_size_, _tmp24_);
+ _vala_array_add69 (&cameras, &cameras_length1, &_cameras_size_, _tmp24_);
#line 117 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (camera);
-#line 1218 "CameraTable.c"
+#line 1219 "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 1224 "CameraTable.c"
+#line 1225 "CameraTable.c"
}
}
}
@@ -1233,7 +1234,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 1236 "CameraTable.c"
+#line 1237 "CameraTable.c"
}
#line 139 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
result = _tmp25_;
@@ -1241,7 +1242,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 1244 "CameraTable.c"
+#line 1245 "CameraTable.c"
}
@@ -1283,7 +1284,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 1286 "CameraTable.c"
+#line 1287 "CameraTable.c"
gchar** _tmp5_;
gint _tmp5__length1;
#line 160 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -1292,15 +1293,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 1295 "CameraTable.c"
+#line 1296 "CameraTable.c"
} else {
#line 160 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp3_ = FALSE;
-#line 1299 "CameraTable.c"
+#line 1300 "CameraTable.c"
}
#line 160 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (_tmp3_) {
-#line 1303 "CameraTable.c"
+#line 1304 "CameraTable.c"
gchar** _tmp6_;
gint _tmp6__length1;
const gchar* _tmp7_;
@@ -1331,21 +1332,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 1334 "CameraTable.c"
+#line 1335 "CameraTable.c"
} else {
#line 165 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (_vala_full_port);
-#line 1338 "CameraTable.c"
+#line 1339 "CameraTable.c"
}
#line 165 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return result;
-#line 1342 "CameraTable.c"
+#line 1343 "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 1348 "CameraTable.c"
+#line 1349 "CameraTable.c"
const gchar* _tmp12_;
#line 170 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp12_ = port;
@@ -1357,15 +1358,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 1360 "CameraTable.c"
+#line 1361 "CameraTable.c"
} else {
#line 172 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (_vala_full_port);
-#line 1364 "CameraTable.c"
+#line 1365 "CameraTable.c"
}
#line 172 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return result;
-#line 1368 "CameraTable.c"
+#line 1369 "CameraTable.c"
}
#line 177 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp13_ = port;
@@ -1373,7 +1374,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 1376 "CameraTable.c"
+#line 1377 "CameraTable.c"
const gchar* _tmp15_;
#line 178 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp15_ = port;
@@ -1385,21 +1386,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 1388 "CameraTable.c"
+#line 1389 "CameraTable.c"
} else {
#line 180 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (_vala_full_port);
-#line 1392 "CameraTable.c"
+#line 1393 "CameraTable.c"
}
#line 180 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return result;
-#line 1396 "CameraTable.c"
+#line 1397 "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 1402 "CameraTable.c"
+#line 1403 "CameraTable.c"
{
gchar** usb_camera_collection = NULL;
gint usb_camera_collection_length1 = 0;
@@ -1411,14 +1412,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 1414 "CameraTable.c"
+#line 1415 "CameraTable.c"
gchar* _tmp17_;
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 1421 "CameraTable.c"
+#line 1422 "CameraTable.c"
{
gint camera_bus = 0;
gint camera_device = 0;
@@ -1433,7 +1434,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 1436 "CameraTable.c"
+#line 1437 "CameraTable.c"
const gchar* _tmp20_;
#line 186 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp20_ = usb_camera;
@@ -1443,7 +1444,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 1446 "CameraTable.c"
+#line 1447 "CameraTable.c"
}
#line 191 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp22_ = bus;
@@ -1451,7 +1452,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 1454 "CameraTable.c"
+#line 1455 "CameraTable.c"
gint _tmp24_;
gint _tmp25_;
#line 191 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -1460,15 +1461,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 1463 "CameraTable.c"
+#line 1464 "CameraTable.c"
} else {
#line 191 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp21_ = FALSE;
-#line 1467 "CameraTable.c"
+#line 1468 "CameraTable.c"
}
#line 191 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (_tmp21_) {
-#line 1471 "CameraTable.c"
+#line 1472 "CameraTable.c"
const gchar* _tmp26_;
gchar* _tmp27_;
const gchar* _tmp28_;
@@ -1495,19 +1496,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 1498 "CameraTable.c"
+#line 1499 "CameraTable.c"
} else {
#line 196 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (_vala_full_port);
-#line 1502 "CameraTable.c"
+#line 1503 "CameraTable.c"
}
#line 196 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return result;
-#line 1506 "CameraTable.c"
+#line 1507 "CameraTable.c"
}
#line 183 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (usb_camera);
-#line 1510 "CameraTable.c"
+#line 1511 "CameraTable.c"
}
}
}
@@ -1522,15 +1523,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 1524 "CameraTable.c"
+#line 1525 "CameraTable.c"
} else {
#line 202 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (_vala_full_port);
-#line 1528 "CameraTable.c"
+#line 1529 "CameraTable.c"
}
#line 202 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return result;
-#line 1532 "CameraTable.c"
+#line 1533 "CameraTable.c"
}
@@ -1548,7 +1549,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 1550 "CameraTable.c"
+#line 1551 "CameraTable.c"
}
@@ -1571,7 +1572,7 @@ static glong string_strnlen (gchar* str, glong maxlen) {
_tmp3_ = end;
#line 1323 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
if (_tmp3_ == NULL) {
-#line 1573 "CameraTable.c"
+#line 1574 "CameraTable.c"
glong _tmp4_;
#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp4_ = maxlen;
@@ -1579,7 +1580,7 @@ static glong string_strnlen (gchar* str, glong maxlen) {
result = _tmp4_;
#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
return result;
-#line 1581 "CameraTable.c"
+#line 1582 "CameraTable.c"
} else {
gchar* _tmp5_;
gchar* _tmp6_;
@@ -1591,7 +1592,7 @@ static glong string_strnlen (gchar* str, glong maxlen) {
result = (glong) (_tmp5_ - _tmp6_);
#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
return result;
-#line 1593 "CameraTable.c"
+#line 1594 "CameraTable.c"
}
}
@@ -1615,21 +1616,21 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
_tmp1_ = offset;
#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
if (_tmp1_ >= ((glong) 0)) {
-#line 1617 "CameraTable.c"
+#line 1618 "CameraTable.c"
glong _tmp2_;
#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp2_ = len;
#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp0_ = _tmp2_ >= ((glong) 0);
-#line 1623 "CameraTable.c"
+#line 1624 "CameraTable.c"
} else {
#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp0_ = FALSE;
-#line 1627 "CameraTable.c"
+#line 1628 "CameraTable.c"
}
#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
if (_tmp0_) {
-#line 1631 "CameraTable.c"
+#line 1632 "CameraTable.c"
glong _tmp3_;
glong _tmp4_;
glong _tmp5_;
@@ -1641,7 +1642,7 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
_tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_);
#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
string_length = _tmp5_;
-#line 1643 "CameraTable.c"
+#line 1644 "CameraTable.c"
} else {
gint _tmp6_;
gint _tmp7_;
@@ -1651,13 +1652,13 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
_tmp7_ = _tmp6_;
#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
string_length = (glong) _tmp7_;
-#line 1653 "CameraTable.c"
+#line 1654 "CameraTable.c"
}
#line 1342 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp8_ = offset;
#line 1342 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
if (_tmp8_ < ((glong) 0)) {
-#line 1659 "CameraTable.c"
+#line 1660 "CameraTable.c"
glong _tmp9_;
glong _tmp10_;
glong _tmp11_;
@@ -1671,7 +1672,7 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
_tmp11_ = offset;
#line 1344 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL);
-#line 1673 "CameraTable.c"
+#line 1674 "CameraTable.c"
} else {
glong _tmp12_;
glong _tmp13_;
@@ -1681,13 +1682,13 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
_tmp13_ = string_length;
#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL);
-#line 1683 "CameraTable.c"
+#line 1684 "CameraTable.c"
}
#line 1348 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp14_ = len;
#line 1348 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
if (_tmp14_ < ((glong) 0)) {
-#line 1689 "CameraTable.c"
+#line 1690 "CameraTable.c"
glong _tmp15_;
glong _tmp16_;
#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
@@ -1696,7 +1697,7 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
_tmp16_ = offset;
#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
len = _tmp15_ - _tmp16_;
-#line 1698 "CameraTable.c"
+#line 1699 "CameraTable.c"
}
#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp17_ = offset;
@@ -1716,7 +1717,7 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
result = _tmp22_;
#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
return result;
-#line 1718 "CameraTable.c"
+#line 1719 "CameraTable.c"
}
@@ -1735,20 +1736,20 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
if ((*((gchar*) self)) == '\0') {
#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp1_ = TRUE;
-#line 1737 "CameraTable.c"
+#line 1738 "CameraTable.c"
} else {
const gchar* _tmp2_;
#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp2_ = old;
#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp1_ = (*((gchar*) _tmp2_)) == '\0';
-#line 1744 "CameraTable.c"
+#line 1745 "CameraTable.c"
}
#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
if (_tmp1_) {
#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp0_ = TRUE;
-#line 1750 "CameraTable.c"
+#line 1751 "CameraTable.c"
} else {
const gchar* _tmp3_;
const gchar* _tmp4_;
@@ -1758,11 +1759,11 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
_tmp4_ = replacement;
#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp0_ = g_strcmp0 (_tmp3_, _tmp4_) == 0;
-#line 1760 "CameraTable.c"
+#line 1761 "CameraTable.c"
}
#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
if (_tmp0_) {
-#line 1764 "CameraTable.c"
+#line 1765 "CameraTable.c"
gchar* _tmp5_;
#line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp5_ = g_strdup (self);
@@ -1770,7 +1771,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
result = _tmp5_;
#line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
return result;
-#line 1772 "CameraTable.c"
+#line 1773 "CameraTable.c"
}
{
GRegex* regex = NULL;
@@ -1802,8 +1803,8 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
if (_inner_error_->domain == G_REGEX_ERROR) {
-#line 1804 "CameraTable.c"
- goto __catch60_g_regex_error;
+#line 1805 "CameraTable.c"
+ goto __catch66_g_regex_error;
}
#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -1811,7 +1812,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
g_clear_error (&_inner_error_);
#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
return NULL;
-#line 1813 "CameraTable.c"
+#line 1814 "CameraTable.c"
}
#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp12_ = regex;
@@ -1827,8 +1828,8 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
_g_regex_unref0 (regex);
#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
if (_inner_error_->domain == G_REGEX_ERROR) {
-#line 1829 "CameraTable.c"
- goto __catch60_g_regex_error;
+#line 1830 "CameraTable.c"
+ goto __catch66_g_regex_error;
}
#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_g_regex_unref0 (regex);
@@ -1838,7 +1839,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
g_clear_error (&_inner_error_);
#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
return NULL;
-#line 1840 "CameraTable.c"
+#line 1841 "CameraTable.c"
}
#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp15_ = _tmp11_;
@@ -1852,10 +1853,10 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
_g_regex_unref0 (regex);
#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
return result;
-#line 1854 "CameraTable.c"
+#line 1855 "CameraTable.c"
}
- goto __finally60;
- __catch60_g_regex_error:
+ goto __finally66;
+ __catch66_g_regex_error:
{
GError* e = NULL;
#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
@@ -1866,9 +1867,9 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
g_assert_not_reached ();
#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_g_error_free0 (e);
-#line 1868 "CameraTable.c"
+#line 1869 "CameraTable.c"
}
- __finally60:
+ __finally66:
#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
@@ -1877,7 +1878,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
g_clear_error (&_inner_error_);
#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
return NULL;
-#line 1879 "CameraTable.c"
+#line 1880 "CameraTable.c"
}
}
@@ -1895,7 +1896,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 1897 "CameraTable.c"
+#line 1898 "CameraTable.c"
const gchar* _tmp3_;
gchar* _tmp4_;
gchar* _tmp5_;
@@ -1922,19 +1923,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 1924 "CameraTable.c"
+#line 1925 "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 1930 "CameraTable.c"
+#line 1931 "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 1936 "CameraTable.c"
+#line 1937 "CameraTable.c"
}
@@ -1950,7 +1951,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 1952 "CameraTable.c"
+#line 1953 "CameraTable.c"
{
GList* volume_collection = NULL;
GList* volume_it = NULL;
@@ -1958,14 +1959,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 1960 "CameraTable.c"
+#line 1961 "CameraTable.c"
GVolume* _tmp2_;
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 1967 "CameraTable.c"
+#line 1968 "CameraTable.c"
{
GVolume* _tmp3_;
gchar* _tmp4_;
@@ -1986,7 +1987,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 1988 "CameraTable.c"
+#line 1989 "CameraTable.c"
GVolume* _tmp8_;
gchar* _tmp9_;
#line 218 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -2001,22 +2002,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 2003 "CameraTable.c"
+#line 2004 "CameraTable.c"
}
#line 216 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_object_unref0 (volume);
-#line 2007 "CameraTable.c"
+#line 2008 "CameraTable.c"
}
}
#line 216 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
__g_list_free__g_object_unref0_0 (volume_collection);
-#line 2012 "CameraTable.c"
+#line 2013 "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 2018 "CameraTable.c"
+#line 2019 "CameraTable.c"
}
@@ -2032,7 +2033,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 2034 "CameraTable.c"
+#line 2035 "CameraTable.c"
{
GList* volume_collection = NULL;
GList* volume_it = NULL;
@@ -2040,14 +2041,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 2042 "CameraTable.c"
+#line 2043 "CameraTable.c"
GVolume* _tmp2_;
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 2049 "CameraTable.c"
+#line 2050 "CameraTable.c"
{
GVolume* _tmp3_;
gchar* _tmp4_;
@@ -2068,7 +2069,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 2070 "CameraTable.c"
+#line 2071 "CameraTable.c"
GVolume* _tmp8_;
GIcon* _tmp9_;
GIcon* _tmp10_;
@@ -2094,46 +2095,46 @@ 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 2096 "CameraTable.c"
+#line 2097 "CameraTable.c"
}
#line 225 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_object_unref0 (volume);
-#line 2100 "CameraTable.c"
+#line 2101 "CameraTable.c"
}
}
#line 225 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
__g_list_free__g_object_unref0_0 (volume_collection);
-#line 2105 "CameraTable.c"
+#line 2106 "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 2111 "CameraTable.c"
+#line 2112 "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 2118 "CameraTable.c"
+#line 2119 "CameraTable.c"
}
-static void _vala_array_add67 (DiscoveredCamera** * array, int* length, int* size, DiscoveredCamera* value) {
+static void _vala_array_add70 (DiscoveredCamera** * array, int* length, int* size, DiscoveredCamera* value) {
#line 292 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if ((*length) == (*size)) {
#line 292 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
*size = (*size) ? (2 * (*size)) : 4;
#line 292 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
*array = g_renew (DiscoveredCamera*, *array, (*size) + 1);
-#line 2129 "CameraTable.c"
+#line 2130 "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 2135 "CameraTable.c"
+#line 2136 "CameraTable.c"
}
@@ -2185,7 +2186,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 2187 "CameraTable.c"
+#line 2188 "CameraTable.c"
} else {
#line 236 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_gp_port_info_list_free0 (port_info_list);
@@ -2195,7 +2196,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 2197 "CameraTable.c"
+#line 2198 "CameraTable.c"
}
}
#line 237 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -2214,7 +2215,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 2216 "CameraTable.c"
+#line 2217 "CameraTable.c"
} else {
#line 237 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_gp_port_info_list_free0 (port_info_list);
@@ -2224,7 +2225,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 2226 "CameraTable.c"
+#line 2227 "CameraTable.c"
}
}
#line 240 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -2247,7 +2248,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 2249 "CameraTable.c"
+#line 2250 "CameraTable.c"
} else {
#line 240 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_gp_list_unref0 (camera_list);
@@ -2259,7 +2260,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 2261 "CameraTable.c"
+#line 2262 "CameraTable.c"
}
}
#line 241 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -2286,7 +2287,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 2288 "CameraTable.c"
+#line 2289 "CameraTable.c"
} else {
#line 241 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_gp_list_unref0 (camera_list);
@@ -2298,7 +2299,7 @@ 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 2300 "CameraTable.c"
+#line 2301 "CameraTable.c"
}
}
#line 243 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -2313,19 +2314,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 2315 "CameraTable.c"
+#line 2316 "CameraTable.c"
{
gint ctr = 0;
#line 249 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
ctr = 0;
-#line 2320 "CameraTable.c"
+#line 2321 "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 2327 "CameraTable.c"
+#line 2328 "CameraTable.c"
gint _tmp16_;
CameraList* _tmp17_;
gint _tmp18_;
@@ -2353,13 +2354,13 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
const gchar* _tmp46_;
#line 249 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (!_tmp14_) {
-#line 2355 "CameraTable.c"
+#line 2356 "CameraTable.c"
gint _tmp15_;
#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 2361 "CameraTable.c"
+#line 2362 "CameraTable.c"
}
#line 249 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp14_ = FALSE;
@@ -2373,7 +2374,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 2375 "CameraTable.c"
+#line 2376 "CameraTable.c"
}
#line 251 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp19_ = camera_list;
@@ -2407,7 +2408,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 2409 "CameraTable.c"
+#line 2410 "CameraTable.c"
} else {
#line 251 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (name);
@@ -2425,7 +2426,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 2427 "CameraTable.c"
+#line 2428 "CameraTable.c"
}
}
#line 254 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -2462,7 +2463,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 2464 "CameraTable.c"
+#line 2465 "CameraTable.c"
} else {
#line 254 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (port);
@@ -2482,7 +2483,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 2484 "CameraTable.c"
+#line 2485 "CameraTable.c"
}
}
#line 256 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -2503,7 +2504,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 2505 "CameraTable.c"
+#line 2506 "CameraTable.c"
gchar* full_port = NULL;
CameraList* _tmp36_;
gint _tmp37_;
@@ -2540,7 +2541,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 2542 "CameraTable.c"
+#line 2543 "CameraTable.c"
}
#line 264 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp42_ = full_port;
@@ -2552,7 +2553,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 2554 "CameraTable.c"
+#line 2555 "CameraTable.c"
}
#line 267 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp44_ = detected_map;
@@ -2566,7 +2567,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 2568 "CameraTable.c"
+#line 2569 "CameraTable.c"
}
}
}
@@ -2578,7 +2579,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 2580 "CameraTable.c"
+#line 2581 "CameraTable.c"
{
GeeIterator* _camera_it = NULL;
GeeHashMap* _tmp48_;
@@ -2605,7 +2606,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 2607 "CameraTable.c"
+#line 2608 "CameraTable.c"
GeeIterator* _tmp54_;
gboolean _tmp55_;
DiscoveredCamera* camera = NULL;
@@ -2642,7 +2643,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 2644 "CameraTable.c"
+#line 2645 "CameraTable.c"
}
#line 272 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp56_ = _camera_it;
@@ -2688,7 +2689,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 2690 "CameraTable.c"
+#line 2691 "CameraTable.c"
} else {
#line 276 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (tmp_path);
@@ -2714,7 +2715,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 2716 "CameraTable.c"
+#line 2717 "CameraTable.c"
}
}
#line 279 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -2765,7 +2766,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 2767 "CameraTable.c"
+#line 2768 "CameraTable.c"
} else {
#line 282 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
(abilities);
@@ -2793,7 +2794,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 2795 "CameraTable.c"
+#line 2796 "CameraTable.c"
}
}
#line 284 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -2804,7 +2805,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 2806 "CameraTable.c"
+#line 2807 "CameraTable.c"
CameraAbilities _tmp71_;
const gchar* _tmp72_;
const gchar* _tmp73_;
@@ -2826,7 +2827,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 2828 "CameraTable.c"
+#line 2829 "CameraTable.c"
}
#line 290 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp74_ = abilities;
@@ -2845,7 +2846,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
#line 292 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp79_ = _discovered_camera_ref0 (_tmp78_);
#line 292 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _vala_array_add67 (&missing, &missing_length1, &_missing_size_, _tmp79_);
+ _vala_array_add70 (&missing, &missing_length1, &_missing_size_, _tmp79_);
#line 272 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
(abilities);
#line 272 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -2854,17 +2855,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 2856 "CameraTable.c"
+#line 2857 "CameraTable.c"
}
#line 272 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_object_unref0 (_camera_it);
-#line 2860 "CameraTable.c"
+#line 2861 "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 2866 "CameraTable.c"
+#line 2867 "CameraTable.c"
{
DiscoveredCamera** camera_collection = NULL;
gint camera_collection_length1 = 0;
@@ -2876,14 +2877,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 2878 "CameraTable.c"
+#line 2879 "CameraTable.c"
DiscoveredCamera* _tmp81_;
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 2885 "CameraTable.c"
+#line 2886 "CameraTable.c"
{
GPPortInfo port_info = {0};
gchar* tmp_path = NULL;
@@ -2942,7 +2943,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 2944 "CameraTable.c"
+#line 2945 "CameraTable.c"
} else {
#line 300 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (tmp_path);
@@ -2966,7 +2967,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 2968 "CameraTable.c"
+#line 2969 "CameraTable.c"
}
}
#line 302 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -3015,7 +3016,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 3017 "CameraTable.c"
+#line 3018 "CameraTable.c"
} else {
#line 305 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
(abilities);
@@ -3041,7 +3042,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 3043 "CameraTable.c"
+#line 3044 "CameraTable.c"
}
}
#line 307 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -3076,7 +3077,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 3078 "CameraTable.c"
+#line 3079 "CameraTable.c"
}
}
}
@@ -3106,7 +3107,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 3108 "CameraTable.c"
+#line 3109 "CameraTable.c"
GeeIterator* _tmp106_;
gboolean _tmp107_;
gchar* port = NULL;
@@ -3129,67 +3130,69 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
gchar* _tmp121_;
const gchar* _tmp122_;
const gchar* _tmp142_;
+ gboolean _tmp143_;
+ const gchar* _tmp162_;
gint index = 0;
- GPPortInfoList* _tmp145_;
- const gchar* _tmp146_;
- gint _tmp147_;
- gint _tmp148_;
+ GPPortInfoList* _tmp165_;
+ const gchar* _tmp166_;
+ gint _tmp167_;
+ gint _tmp168_;
GPPortInfo port_info = {0};
gchar* tmp_path = NULL;
- GPPortInfoList* _tmp153_;
- gint _tmp154_;
- GPPortInfo _tmp155_ = {0};
- int _tmp156_;
- const gchar* _tmp157_;
- gchar* _tmp158_;
- gchar* _tmp159_;
- const gchar* _tmp160_ = NULL;
- gchar* _tmp161_;
- const gchar* _tmp162_;
- const gchar* _tmp163_;
- CameraAbilitiesList* _tmp164_;
- const gchar* _tmp165_;
- gint _tmp166_;
- gint _tmp167_;
- CameraAbilities camera_abilities = {0};
- CameraAbilitiesList* _tmp172_;
- gint _tmp173_;
- CameraAbilities _tmp174_ = {0};
- int _tmp175_;
- const gchar* _tmp176_;
- gchar* _tmp177_;
+ GPPortInfoList* _tmp173_;
+ gint _tmp174_;
+ GPPortInfo _tmp175_ = {0};
+ int _tmp176_;
+ const gchar* _tmp177_;
gchar* _tmp178_;
+ gchar* _tmp179_;
+ const gchar* _tmp180_ = NULL;
+ gchar* _tmp181_;
+ const gchar* _tmp182_;
+ const gchar* _tmp183_;
+ CameraAbilitiesList* _tmp184_;
+ const gchar* _tmp185_;
+ gint _tmp186_;
+ gint _tmp187_;
+ CameraAbilities camera_abilities = {0};
+ CameraAbilitiesList* _tmp192_;
+ gint _tmp193_;
+ CameraAbilities _tmp194_ = {0};
+ int _tmp195_;
+ const gchar* _tmp196_;
+ gchar* _tmp197_;
+ gchar* _tmp198_;
Camera* gcamera = NULL;
- Camera* _tmp179_ = NULL;
- int _tmp180_;
- const gchar* _tmp181_;
- gchar* _tmp182_;
- gchar* _tmp183_;
- Camera* _tmp184_;
- CameraAbilities _tmp185_;
- int _tmp186_;
- const gchar* _tmp187_;
- gchar* _tmp188_;
- gchar* _tmp189_;
- Camera* _tmp190_;
- GPPortInfo _tmp191_;
- int _tmp192_;
- const gchar* _tmp193_;
- const gchar* _tmp194_;
- gchar* _tmp195_;
- gchar* _tmp196_;
- const gchar* _tmp197_;
- const gchar* _tmp198_;
- DiscoveredCamera* camera = NULL;
- Camera* _tmp199_;
- const gchar* _tmp200_;
+ Camera* _tmp199_ = NULL;
+ int _tmp200_;
const gchar* _tmp201_;
- const gchar* _tmp202_;
- DiscoveredCamera* _tmp203_;
- GeeHashMap* _tmp204_;
- const gchar* _tmp205_;
- DiscoveredCamera* _tmp206_;
- DiscoveredCamera* _tmp207_;
+ gchar* _tmp202_;
+ gchar* _tmp203_;
+ Camera* _tmp204_;
+ CameraAbilities _tmp205_;
+ int _tmp206_;
+ const gchar* _tmp207_;
+ gchar* _tmp208_;
+ gchar* _tmp209_;
+ Camera* _tmp210_;
+ GPPortInfo _tmp211_;
+ int _tmp212_;
+ const gchar* _tmp213_;
+ const gchar* _tmp214_;
+ gchar* _tmp215_;
+ gchar* _tmp216_;
+ const gchar* _tmp217_;
+ const gchar* _tmp218_;
+ DiscoveredCamera* camera = NULL;
+ Camera* _tmp219_;
+ const gchar* _tmp220_;
+ const gchar* _tmp221_;
+ const gchar* _tmp222_;
+ DiscoveredCamera* _tmp223_;
+ GeeHashMap* _tmp224_;
+ const gchar* _tmp225_;
+ DiscoveredCamera* _tmp226_;
+ DiscoveredCamera* _tmp227_;
#line 315 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp106_ = _port_it;
#line 315 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -3198,7 +3201,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 3200 "CameraTable.c"
+#line 3203 "CameraTable.c"
}
#line 315 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp108_ = _port_it;
@@ -3232,7 +3235,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 3234 "CameraTable.c"
+#line 3237 "CameraTable.c"
const gchar* _tmp118_;
const gchar* _tmp119_;
#line 323 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -3253,7 +3256,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 3255 "CameraTable.c"
+#line 3258 "CameraTable.c"
}
#line 329 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp120_ = port;
@@ -3265,7 +3268,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 3267 "CameraTable.c"
+#line 3270 "CameraTable.c"
GUdevDevice* device = NULL;
GUdevClient* _tmp123_;
const gchar* _tmp124_;
@@ -3297,7 +3300,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 3299 "CameraTable.c"
+#line 3302 "CameraTable.c"
const gchar* _tmp130_;
gchar* _tmp131_;
const gchar* _tmp132_;
@@ -3318,13 +3321,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 3320 "CameraTable.c"
+#line 3323 "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 3326 "CameraTable.c"
+#line 3329 "CameraTable.c"
GUdevDevice* _tmp135_;
const gchar* _tmp136_;
gchar* _tmp137_;
@@ -3338,13 +3341,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 3340 "CameraTable.c"
+#line 3343 "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 3346 "CameraTable.c"
+#line 3349 "CameraTable.c"
GUdevDevice* _tmp139_;
const gchar* _tmp140_;
gchar* _tmp141_;
@@ -3358,770 +3361,946 @@ 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 3360 "CameraTable.c"
+#line 3363 "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 3366 "CameraTable.c"
+#line 3369 "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 3372 "CameraTable.c"
- const gchar* _tmp143_;
- gchar* _tmp144_;
-#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp143_ = name;
-#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp144_ = g_strdup (_tmp143_);
-#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _g_free0 (display_name);
-#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- display_name = _tmp144_;
-#line 3383 "CameraTable.c"
- }
-#line 350 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp145_ = port_info_list;
-#line 350 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp146_ = port;
-#line 350 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp147_ = gp_port_info_list_lookup_path (_tmp145_, _tmp146_);
-#line 350 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- index = _tmp147_;
+#line 346 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _tmp142_ = port;
+#line 346 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _tmp143_ = g_str_has_prefix (_tmp142_, "disk:");
+#line 346 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ if (_tmp143_) {
+#line 3377 "CameraTable.c"
+ {
+ GMount* mount = NULL;
+ const gchar* _tmp144_;
+ gchar* _tmp145_;
+ gchar* _tmp146_;
+ GFile* _tmp147_;
+ GFile* _tmp148_;
+ GMount* _tmp149_;
+ GMount* _tmp150_;
+ GVolume* volume = NULL;
+ GMount* _tmp151_;
+ GVolume* _tmp152_;
+ const gchar* _tmp153_;
+ GVolume* _tmp154_;
+ gchar* _tmp155_;
+ gchar* _tmp156_;
+ gchar* _tmp157_;
+ GVolume* _tmp158_;
+ GIcon* _tmp159_;
+ GIcon* _tmp160_;
+ gchar* _tmp161_;
+#line 348 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _tmp144_ = port;
+#line 348 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _tmp145_ = string_substring (_tmp144_, (glong) 5, (glong) -1);
+#line 348 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _tmp146_ = _tmp145_;
+#line 348 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _tmp147_ = g_file_new_for_path (_tmp146_);
+#line 348 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _tmp148_ = _tmp147_;
+#line 348 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _tmp149_ = g_file_find_enclosing_mount (_tmp148_, NULL, &_inner_error_);
+#line 348 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _tmp150_ = _tmp149_;
+#line 348 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _g_object_unref0 (_tmp148_);
+#line 348 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _g_free0 (_tmp146_);
+#line 348 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ mount = _tmp150_;
+#line 348 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 3421 "CameraTable.c"
+ goto __catch67_g_error;
+ }
+#line 349 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _tmp151_ = mount;
+#line 349 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _tmp152_ = g_mount_get_volume (_tmp151_);
+#line 349 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ volume = _tmp152_;
+#line 351 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _tmp153_ = name;
+#line 351 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _tmp154_ = volume;
+#line 351 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _tmp155_ = g_volume_get_name (_tmp154_);
#line 351 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp148_ = index;
+ _tmp156_ = _tmp155_;
#line 351 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- if (_tmp148_ < 0) {
-#line 3397 "CameraTable.c"
- gint _tmp149_;
- const gchar* _tmp150_;
- gchar* _tmp151_;
- gchar* _tmp152_;
+ _tmp157_ = g_strdup_printf (_ ("%s (%s)"), _tmp153_, _tmp156_);
+#line 351 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _g_free0 (display_name);
+#line 351 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ display_name = _tmp157_;
+#line 351 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _g_free0 (_tmp156_);
#line 352 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp149_ = index;
+ _tmp158_ = volume;
#line 352 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp150_ = port;
+ _tmp159_ = g_volume_get_icon (_tmp158_);
#line 352 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp151_ = g_strdup_printf ("lookup port %s", _tmp150_);
+ _tmp160_ = _tmp159_;
#line 352 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp152_ = _tmp151_;
+ _tmp161_ = g_icon_to_string (_tmp160_);
#line 352 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- camera_table_do_op (self, (int) _tmp149_, _tmp152_, &_inner_error_);
+ _g_free0 (icon);
#line 352 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _g_free0 (_tmp152_);
+ icon = _tmp161_;
#line 352 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _g_object_unref0 (_tmp160_);
+#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _g_object_unref0 (volume);
+#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _g_object_unref0 (mount);
+#line 3464 "CameraTable.c"
+ }
+ goto __finally67;
+ __catch67_g_error:
+ {
+ GError* e = NULL;
+#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ e = _inner_error_;
+#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _inner_error_ = NULL;
+#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _g_error_free0 (e);
+#line 3476 "CameraTable.c"
+ }
+ __finally67:
+#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 352 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (_inner_error_->domain == GPHOTO_ERROR) {
-#line 352 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
g_propagate_error (error, _inner_error_);
-#line 352 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (path);
-#line 352 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (uri);
-#line 352 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (icon);
-#line 352 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (display_name);
-#line 352 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (name);
-#line 352 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (port);
-#line 352 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_object_unref0 (_port_it);
-#line 352 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
missing = (_vala_array_free (missing, missing_length1, (GDestroyNotify) discovered_camera_unref), NULL);
-#line 352 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
usb_cameras = (_vala_array_free (usb_cameras, usb_cameras_length1, (GDestroyNotify) g_free), NULL);
-#line 352 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_object_unref0 (detected_map);
-#line 352 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_gp_list_unref0 (camera_list);
-#line 352 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_gp_port_info_list_free0 (port_info_list);
-#line 352 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return;
-#line 3446 "CameraTable.c"
+#line 3511 "CameraTable.c"
} else {
-#line 352 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (path);
-#line 352 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (uri);
-#line 352 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (icon);
-#line 352 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (display_name);
-#line 352 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (name);
-#line 352 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (port);
-#line 352 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_object_unref0 (_port_it);
-#line 352 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
missing = (_vala_array_free (missing, missing_length1, (GDestroyNotify) discovered_camera_unref), NULL);
-#line 352 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
usb_cameras = (_vala_array_free (usb_cameras, usb_cameras_length1, (GDestroyNotify) g_free), NULL);
-#line 352 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_object_unref0 (detected_map);
-#line 352 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_gp_list_unref0 (camera_list);
-#line 352 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_gp_port_info_list_free0 (port_info_list);
-#line 352 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 347 "/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 352 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
g_clear_error (&_inner_error_);
-#line 352 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return;
-#line 3478 "CameraTable.c"
+#line 3543 "CameraTable.c"
}
}
}
-#line 357 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp153_ = port_info_list;
-#line 357 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp154_ = index;
-#line 357 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp156_ = gp_port_info_list_get_info (_tmp153_, _tmp154_, &_tmp155_);
-#line 357 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 356 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _tmp162_ = display_name;
+#line 356 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ if (NULL == _tmp162_) {
+#line 3551 "CameraTable.c"
+ const gchar* _tmp163_;
+ gchar* _tmp164_;
+#line 358 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _tmp163_ = name;
+#line 358 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _tmp164_ = g_strdup (_tmp163_);
+#line 358 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _g_free0 (display_name);
+#line 358 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ display_name = _tmp164_;
+#line 3562 "CameraTable.c"
+ }
+#line 360 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _tmp165_ = port_info_list;
+#line 360 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _tmp166_ = port;
+#line 360 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _tmp167_ = gp_port_info_list_lookup_path (_tmp165_, _tmp166_);
+#line 360 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ index = _tmp167_;
+#line 361 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _tmp168_ = index;
+#line 361 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ if (_tmp168_ < 0) {
+#line 3576 "CameraTable.c"
+ gint _tmp169_;
+ const gchar* _tmp170_;
+ gchar* _tmp171_;
+ gchar* _tmp172_;
+#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _tmp169_ = index;
+#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _tmp170_ = port;
+#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _tmp171_ = g_strdup_printf ("lookup port %s", _tmp170_);
+#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _tmp172_ = _tmp171_;
+#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ camera_table_do_op (self, (int) _tmp169_, _tmp172_, &_inner_error_);
+#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _g_free0 (_tmp172_);
+#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ if (_inner_error_->domain == GPHOTO_ERROR) {
+#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ g_propagate_error (error, _inner_error_);
+#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _g_free0 (path);
+#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _g_free0 (uri);
+#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _g_free0 (icon);
+#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _g_free0 (display_name);
+#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _g_free0 (name);
+#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _g_free0 (port);
+#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _g_object_unref0 (_port_it);
+#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ missing = (_vala_array_free (missing, missing_length1, (GDestroyNotify) discovered_camera_unref), NULL);
+#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ usb_cameras = (_vala_array_free (usb_cameras, usb_cameras_length1, (GDestroyNotify) g_free), NULL);
+#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _g_object_unref0 (detected_map);
+#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _gp_list_unref0 (camera_list);
+#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _gp_port_info_list_free0 (port_info_list);
+#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ return;
+#line 3625 "CameraTable.c"
+ } else {
+#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _g_free0 (path);
+#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _g_free0 (uri);
+#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _g_free0 (icon);
+#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _g_free0 (display_name);
+#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _g_free0 (name);
+#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _g_free0 (port);
+#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _g_object_unref0 (_port_it);
+#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ missing = (_vala_array_free (missing, missing_length1, (GDestroyNotify) discovered_camera_unref), NULL);
+#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ usb_cameras = (_vala_array_free (usb_cameras, usb_cameras_length1, (GDestroyNotify) g_free), NULL);
+#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _g_object_unref0 (detected_map);
+#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _gp_list_unref0 (camera_list);
+#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _gp_port_info_list_free0 (port_info_list);
+#line 362 "/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 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ g_clear_error (&_inner_error_);
+#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ return;
+#line 3657 "CameraTable.c"
+ }
+ }
+ }
+#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _tmp173_ = port_info_list;
+#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _tmp174_ = index;
+#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _tmp176_ = gp_port_info_list_get_info (_tmp173_, _tmp174_, &_tmp175_);
+#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
(port_info);
-#line 357 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- port_info = _tmp155_;
-#line 357 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp157_ = port;
-#line 357 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp158_ = g_strdup_printf ("get port info for %s", _tmp157_);
-#line 357 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp159_ = _tmp158_;
-#line 357 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- camera_table_do_op (self, _tmp156_, _tmp159_, &_inner_error_);
-#line 357 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _g_free0 (_tmp159_);
-#line 357 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ port_info = _tmp175_;
+#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _tmp177_ = port;
+#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _tmp178_ = g_strdup_printf ("get port info for %s", _tmp177_);
+#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _tmp179_ = _tmp178_;
+#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ camera_table_do_op (self, _tmp176_, _tmp179_, &_inner_error_);
+#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _g_free0 (_tmp179_);
+#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 357 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (_inner_error_->domain == GPHOTO_ERROR) {
-#line 357 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
g_propagate_error (error, _inner_error_);
-#line 357 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (tmp_path);
-#line 357 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
(port_info);
-#line 357 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (path);
-#line 357 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (uri);
-#line 357 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (icon);
-#line 357 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (display_name);
-#line 357 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (name);
-#line 357 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (port);
-#line 357 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_object_unref0 (_port_it);
-#line 357 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
missing = (_vala_array_free (missing, missing_length1, (GDestroyNotify) discovered_camera_unref), NULL);
-#line 357 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
usb_cameras = (_vala_array_free (usb_cameras, usb_cameras_length1, (GDestroyNotify) g_free), NULL);
-#line 357 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_object_unref0 (detected_map);
-#line 357 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_gp_list_unref0 (camera_list);
-#line 357 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_gp_port_info_list_free0 (port_info_list);
-#line 357 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return;
-#line 3538 "CameraTable.c"
+#line 3717 "CameraTable.c"
} else {
-#line 357 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (tmp_path);
-#line 357 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
(port_info);
-#line 357 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (path);
-#line 357 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (uri);
-#line 357 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (icon);
-#line 357 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (display_name);
-#line 357 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (name);
-#line 357 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (port);
-#line 357 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_object_unref0 (_port_it);
-#line 357 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
missing = (_vala_array_free (missing, missing_length1, (GDestroyNotify) discovered_camera_unref), NULL);
-#line 357 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
usb_cameras = (_vala_array_free (usb_cameras, usb_cameras_length1, (GDestroyNotify) g_free), NULL);
-#line 357 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_object_unref0 (detected_map);
-#line 357 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_gp_list_unref0 (camera_list);
-#line 357 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_gp_port_info_list_free0 (port_info_list);
-#line 357 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 367 "/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 357 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
g_clear_error (&_inner_error_);
-#line 357 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return;
-#line 3574 "CameraTable.c"
+#line 3753 "CameraTable.c"
}
}
-#line 358 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- gp_port_info_get_path (port_info, &_tmp160_);
-#line 358 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 368 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ gp_port_info_get_path (port_info, &_tmp180_);
+#line 368 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (tmp_path);
-#line 358 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp161_ = g_strdup (_tmp160_);
-#line 358 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- tmp_path = _tmp161_;
-#line 361 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp162_ = port;
-#line 361 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp163_ = tmp_path;
-#line 361 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _vala_assert (g_strcmp0 (_tmp162_, _tmp163_) == 0, "port == tmp_path");
-#line 363 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp164_ = self->priv->abilities_list;
-#line 363 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp165_ = name;
-#line 363 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp166_ = gp_abilities_list_lookup_model (_tmp164_, _tmp165_);
-#line 363 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- index = _tmp166_;
-#line 364 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp167_ = index;
-#line 364 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- if (_tmp167_ < 0) {
-#line 3603 "CameraTable.c"
- gint _tmp168_;
- const gchar* _tmp169_;
- gchar* _tmp170_;
- gchar* _tmp171_;
-#line 365 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp168_ = index;
-#line 365 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp169_ = name;
-#line 365 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp170_ = g_strdup_printf ("lookup camera model %s", _tmp169_);
-#line 365 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp171_ = _tmp170_;
-#line 365 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- camera_table_do_op (self, (int) _tmp168_, _tmp171_, &_inner_error_);
-#line 365 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _g_free0 (_tmp171_);
-#line 365 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 368 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _tmp181_ = g_strdup (_tmp180_);
+#line 368 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ tmp_path = _tmp181_;
+#line 371 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _tmp182_ = port;
+#line 371 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _tmp183_ = tmp_path;
+#line 371 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _vala_assert (g_strcmp0 (_tmp182_, _tmp183_) == 0, "port == tmp_path");
+#line 373 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _tmp184_ = self->priv->abilities_list;
+#line 373 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _tmp185_ = name;
+#line 373 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _tmp186_ = gp_abilities_list_lookup_model (_tmp184_, _tmp185_);
+#line 373 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ index = _tmp186_;
+#line 374 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _tmp187_ = index;
+#line 374 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ if (_tmp187_ < 0) {
+#line 3782 "CameraTable.c"
+ gint _tmp188_;
+ const gchar* _tmp189_;
+ gchar* _tmp190_;
+ gchar* _tmp191_;
+#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _tmp188_ = index;
+#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _tmp189_ = name;
+#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _tmp190_ = g_strdup_printf ("lookup camera model %s", _tmp189_);
+#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _tmp191_ = _tmp190_;
+#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ camera_table_do_op (self, (int) _tmp188_, _tmp191_, &_inner_error_);
+#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _g_free0 (_tmp191_);
+#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 365 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (_inner_error_->domain == GPHOTO_ERROR) {
-#line 365 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
g_propagate_error (error, _inner_error_);
-#line 365 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (tmp_path);
-#line 365 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
(port_info);
-#line 365 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (path);
-#line 365 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (uri);
-#line 365 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (icon);
-#line 365 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (display_name);
-#line 365 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (name);
-#line 365 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (port);
-#line 365 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_object_unref0 (_port_it);
-#line 365 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
missing = (_vala_array_free (missing, missing_length1, (GDestroyNotify) discovered_camera_unref), NULL);
-#line 365 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
usb_cameras = (_vala_array_free (usb_cameras, usb_cameras_length1, (GDestroyNotify) g_free), NULL);
-#line 365 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_object_unref0 (detected_map);
-#line 365 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_gp_list_unref0 (camera_list);
-#line 365 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_gp_port_info_list_free0 (port_info_list);
-#line 365 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return;
-#line 3656 "CameraTable.c"
+#line 3835 "CameraTable.c"
} else {
-#line 365 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (tmp_path);
-#line 365 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
(port_info);
-#line 365 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (path);
-#line 365 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (uri);
-#line 365 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (icon);
-#line 365 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (display_name);
-#line 365 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (name);
-#line 365 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (port);
-#line 365 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_object_unref0 (_port_it);
-#line 365 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
missing = (_vala_array_free (missing, missing_length1, (GDestroyNotify) discovered_camera_unref), NULL);
-#line 365 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
usb_cameras = (_vala_array_free (usb_cameras, usb_cameras_length1, (GDestroyNotify) g_free), NULL);
-#line 365 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_object_unref0 (detected_map);
-#line 365 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_gp_list_unref0 (camera_list);
-#line 365 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_gp_port_info_list_free0 (port_info_list);
-#line 365 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 375 "/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 365 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
g_clear_error (&_inner_error_);
-#line 365 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return;
-#line 3692 "CameraTable.c"
+#line 3871 "CameraTable.c"
}
}
}
-#line 368 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp172_ = self->priv->abilities_list;
-#line 368 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp173_ = index;
-#line 368 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp175_ = gp_abilities_list_get_abilities (_tmp172_, _tmp173_, &_tmp174_);
-#line 368 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _tmp192_ = self->priv->abilities_list;
+#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _tmp193_ = index;
+#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _tmp195_ = gp_abilities_list_get_abilities (_tmp192_, _tmp193_, &_tmp194_);
+#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
(camera_abilities);
-#line 368 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- camera_abilities = _tmp174_;
-#line 368 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp176_ = name;
-#line 368 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp177_ = g_strdup_printf ("lookup camera abilities for %s", _tmp176_);
-#line 368 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp178_ = _tmp177_;
-#line 368 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- camera_table_do_op (self, _tmp175_, _tmp178_, &_inner_error_);
-#line 368 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _g_free0 (_tmp178_);
-#line 368 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ camera_abilities = _tmp194_;
+#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _tmp196_ = name;
+#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _tmp197_ = g_strdup_printf ("lookup camera abilities for %s", _tmp196_);
+#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _tmp198_ = _tmp197_;
+#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ camera_table_do_op (self, _tmp195_, _tmp198_, &_inner_error_);
+#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _g_free0 (_tmp198_);
+#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 368 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (_inner_error_->domain == GPHOTO_ERROR) {
-#line 368 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
g_propagate_error (error, _inner_error_);
-#line 368 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
(camera_abilities);
-#line 368 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (tmp_path);
-#line 368 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
(port_info);
-#line 368 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (path);
-#line 368 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (uri);
-#line 368 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (icon);
-#line 368 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (display_name);
-#line 368 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (name);
-#line 368 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (port);
-#line 368 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_object_unref0 (_port_it);
-#line 368 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
missing = (_vala_array_free (missing, missing_length1, (GDestroyNotify) discovered_camera_unref), NULL);
-#line 368 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
usb_cameras = (_vala_array_free (usb_cameras, usb_cameras_length1, (GDestroyNotify) g_free), NULL);
-#line 368 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_object_unref0 (detected_map);
-#line 368 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_gp_list_unref0 (camera_list);
-#line 368 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_gp_port_info_list_free0 (port_info_list);
-#line 368 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return;
-#line 3754 "CameraTable.c"
+#line 3933 "CameraTable.c"
} else {
-#line 368 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
(camera_abilities);
-#line 368 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (tmp_path);
-#line 368 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
(port_info);
-#line 368 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (path);
-#line 368 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (uri);
-#line 368 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (icon);
-#line 368 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (display_name);
-#line 368 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (name);
-#line 368 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (port);
-#line 368 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_object_unref0 (_port_it);
-#line 368 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
missing = (_vala_array_free (missing, missing_length1, (GDestroyNotify) discovered_camera_unref), NULL);
-#line 368 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
usb_cameras = (_vala_array_free (usb_cameras, usb_cameras_length1, (GDestroyNotify) g_free), NULL);
-#line 368 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_object_unref0 (detected_map);
-#line 368 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_gp_list_unref0 (camera_list);
-#line 368 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_gp_port_info_list_free0 (port_info_list);
-#line 368 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 378 "/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 368 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
g_clear_error (&_inner_error_);
-#line 368 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return;
-#line 3792 "CameraTable.c"
+#line 3971 "CameraTable.c"
}
}
-#line 372 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp180_ = gp_camera_new (&_tmp179_);
-#line 372 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _tmp200_ = gp_camera_new (&_tmp199_);
+#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_gp_camera_unref0 (gcamera);
-#line 372 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- gcamera = _tmp179_;
-#line 372 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp181_ = name;
-#line 372 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp182_ = g_strdup_printf ("create camera object for %s", _tmp181_);
-#line 372 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp183_ = _tmp182_;
-#line 372 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- camera_table_do_op (self, _tmp180_, _tmp183_, &_inner_error_);
-#line 372 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _g_free0 (_tmp183_);
-#line 372 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ gcamera = _tmp199_;
+#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _tmp201_ = name;
+#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _tmp202_ = g_strdup_printf ("create camera object for %s", _tmp201_);
+#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _tmp203_ = _tmp202_;
+#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ camera_table_do_op (self, _tmp200_, _tmp203_, &_inner_error_);
+#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _g_free0 (_tmp203_);
+#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 372 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (_inner_error_->domain == GPHOTO_ERROR) {
-#line 372 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
g_propagate_error (error, _inner_error_);
-#line 372 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_gp_camera_unref0 (gcamera);
-#line 372 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
(camera_abilities);
-#line 372 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (tmp_path);
-#line 372 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
(port_info);
-#line 372 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (path);
-#line 372 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (uri);
-#line 372 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (icon);
-#line 372 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (display_name);
-#line 372 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (name);
-#line 372 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (port);
-#line 372 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_object_unref0 (_port_it);
-#line 372 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
missing = (_vala_array_free (missing, missing_length1, (GDestroyNotify) discovered_camera_unref), NULL);
-#line 372 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
usb_cameras = (_vala_array_free (usb_cameras, usb_cameras_length1, (GDestroyNotify) g_free), NULL);
-#line 372 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_object_unref0 (detected_map);
-#line 372 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_gp_list_unref0 (camera_list);
-#line 372 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_gp_port_info_list_free0 (port_info_list);
-#line 372 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return;
-#line 3851 "CameraTable.c"
+#line 4030 "CameraTable.c"
} else {
-#line 372 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_gp_camera_unref0 (gcamera);
-#line 372 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
(camera_abilities);
-#line 372 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (tmp_path);
-#line 372 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
(port_info);
-#line 372 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (path);
-#line 372 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (uri);
-#line 372 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (icon);
-#line 372 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (display_name);
-#line 372 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (name);
-#line 372 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (port);
-#line 372 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_object_unref0 (_port_it);
-#line 372 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
missing = (_vala_array_free (missing, missing_length1, (GDestroyNotify) discovered_camera_unref), NULL);
-#line 372 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
usb_cameras = (_vala_array_free (usb_cameras, usb_cameras_length1, (GDestroyNotify) g_free), NULL);
-#line 372 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_object_unref0 (detected_map);
-#line 372 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_gp_list_unref0 (camera_list);
-#line 372 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_gp_port_info_list_free0 (port_info_list);
-#line 372 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 382 "/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 372 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
g_clear_error (&_inner_error_);
-#line 372 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return;
-#line 3891 "CameraTable.c"
+#line 4070 "CameraTable.c"
}
}
-#line 373 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp184_ = gcamera;
-#line 373 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp185_ = camera_abilities;
-#line 373 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp186_ = gp_camera_set_abilities (_tmp184_, _tmp185_);
-#line 373 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp187_ = name;
-#line 373 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp188_ = g_strdup_printf ("set camera abilities for %s", _tmp187_);
-#line 373 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp189_ = _tmp188_;
-#line 373 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- camera_table_do_op (self, _tmp186_, _tmp189_, &_inner_error_);
-#line 373 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _g_free0 (_tmp189_);
-#line 373 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _tmp204_ = gcamera;
+#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _tmp205_ = camera_abilities;
+#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _tmp206_ = gp_camera_set_abilities (_tmp204_, _tmp205_);
+#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _tmp207_ = name;
+#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _tmp208_ = g_strdup_printf ("set camera abilities for %s", _tmp207_);
+#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _tmp209_ = _tmp208_;
+#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ camera_table_do_op (self, _tmp206_, _tmp209_, &_inner_error_);
+#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _g_free0 (_tmp209_);
+#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 373 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (_inner_error_->domain == GPHOTO_ERROR) {
-#line 373 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
g_propagate_error (error, _inner_error_);
-#line 373 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_gp_camera_unref0 (gcamera);
-#line 373 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
(camera_abilities);
-#line 373 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (tmp_path);
-#line 373 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
(port_info);
-#line 373 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (path);
-#line 373 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (uri);
-#line 373 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (icon);
-#line 373 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (display_name);
-#line 373 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (name);
-#line 373 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (port);
-#line 373 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_object_unref0 (_port_it);
-#line 373 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
missing = (_vala_array_free (missing, missing_length1, (GDestroyNotify) discovered_camera_unref), NULL);
-#line 373 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
usb_cameras = (_vala_array_free (usb_cameras, usb_cameras_length1, (GDestroyNotify) g_free), NULL);
-#line 373 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_object_unref0 (detected_map);
-#line 373 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_gp_list_unref0 (camera_list);
-#line 373 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_gp_port_info_list_free0 (port_info_list);
-#line 373 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return;
-#line 3950 "CameraTable.c"
+#line 4129 "CameraTable.c"
} else {
-#line 373 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_gp_camera_unref0 (gcamera);
-#line 373 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
(camera_abilities);
-#line 373 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (tmp_path);
-#line 373 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
(port_info);
-#line 373 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (path);
-#line 373 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (uri);
-#line 373 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (icon);
-#line 373 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (display_name);
-#line 373 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (name);
-#line 373 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (port);
-#line 373 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_object_unref0 (_port_it);
-#line 373 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
missing = (_vala_array_free (missing, missing_length1, (GDestroyNotify) discovered_camera_unref), NULL);
-#line 373 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
usb_cameras = (_vala_array_free (usb_cameras, usb_cameras_length1, (GDestroyNotify) g_free), NULL);
-#line 373 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_object_unref0 (detected_map);
-#line 373 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_gp_list_unref0 (camera_list);
-#line 373 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_gp_port_info_list_free0 (port_info_list);
-#line 373 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 383 "/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 373 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
g_clear_error (&_inner_error_);
-#line 373 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return;
-#line 3990 "CameraTable.c"
+#line 4169 "CameraTable.c"
}
}
-#line 374 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp190_ = gcamera;
-#line 374 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp191_ = port_info;
-#line 374 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp192_ = gp_camera_set_port_info (_tmp190_, _tmp191_);
-#line 374 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp193_ = name;
-#line 374 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp194_ = port;
-#line 374 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp195_ = g_strdup_printf ("set port info for %s on %s", _tmp193_, _tmp194_);
-#line 374 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp196_ = _tmp195_;
-#line 374 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- camera_table_do_op (self, _tmp192_, _tmp196_, &_inner_error_);
-#line 374 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _g_free0 (_tmp196_);
-#line 374 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _tmp210_ = gcamera;
+#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _tmp211_ = port_info;
+#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _tmp212_ = gp_camera_set_port_info (_tmp210_, _tmp211_);
+#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _tmp213_ = name;
+#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _tmp214_ = port;
+#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _tmp215_ = g_strdup_printf ("set port info for %s on %s", _tmp213_, _tmp214_);
+#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _tmp216_ = _tmp215_;
+#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ camera_table_do_op (self, _tmp212_, _tmp216_, &_inner_error_);
+#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _g_free0 (_tmp216_);
+#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 374 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (_inner_error_->domain == GPHOTO_ERROR) {
-#line 374 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
g_propagate_error (error, _inner_error_);
-#line 374 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_gp_camera_unref0 (gcamera);
-#line 374 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
(camera_abilities);
-#line 374 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (tmp_path);
-#line 374 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
(port_info);
-#line 374 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (path);
-#line 374 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (uri);
-#line 374 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (icon);
-#line 374 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (display_name);
-#line 374 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (name);
-#line 374 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (port);
-#line 374 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_object_unref0 (_port_it);
-#line 374 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
missing = (_vala_array_free (missing, missing_length1, (GDestroyNotify) discovered_camera_unref), NULL);
-#line 374 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
usb_cameras = (_vala_array_free (usb_cameras, usb_cameras_length1, (GDestroyNotify) g_free), NULL);
-#line 374 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_object_unref0 (detected_map);
-#line 374 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_gp_list_unref0 (camera_list);
-#line 374 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_gp_port_info_list_free0 (port_info_list);
-#line 374 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return;
-#line 4051 "CameraTable.c"
+#line 4230 "CameraTable.c"
} else {
-#line 374 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_gp_camera_unref0 (gcamera);
-#line 374 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
(camera_abilities);
-#line 374 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (tmp_path);
-#line 374 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
(port_info);
-#line 374 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (path);
-#line 374 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (uri);
-#line 374 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (icon);
-#line 374 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (display_name);
-#line 374 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (name);
-#line 374 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (port);
-#line 374 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_object_unref0 (_port_it);
-#line 374 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
missing = (_vala_array_free (missing, missing_length1, (GDestroyNotify) discovered_camera_unref), NULL);
-#line 374 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
usb_cameras = (_vala_array_free (usb_cameras, usb_cameras_length1, (GDestroyNotify) g_free), NULL);
-#line 374 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_object_unref0 (detected_map);
-#line 374 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_gp_list_unref0 (camera_list);
-#line 374 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_gp_port_info_list_free0 (port_info_list);
-#line 374 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 384 "/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 374 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
g_clear_error (&_inner_error_);
-#line 374 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return;
-#line 4091 "CameraTable.c"
+#line 4270 "CameraTable.c"
}
}
-#line 376 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp197_ = name;
-#line 376 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp198_ = port;
-#line 376 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- g_debug ("CameraTable.vala:376: Adding to camera table: %s @ %s", _tmp197_, _tmp198_);
-#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp199_ = gcamera;
-#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp200_ = uri;
-#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp201_ = display_name;
-#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp202_ = icon;
-#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp203_ = discovered_camera_new (_tmp199_, _tmp200_, _tmp201_, _tmp202_);
-#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- camera = _tmp203_;
-#line 379 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp204_ = self->priv->camera_map;
-#line 379 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp205_ = uri;
-#line 379 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp206_ = camera;
-#line 379 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp204_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp205_, _tmp206_);
-#line 381 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp207_ = camera;
-#line 381 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- g_signal_emit (self, camera_table_signals[CAMERA_TABLE_CAMERA_ADDED_SIGNAL], 0, _tmp207_);
+#line 386 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _tmp217_ = name;
+#line 386 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _tmp218_ = port;
+#line 386 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ g_debug ("CameraTable.vala:386: Adding to camera table: %s @ %s", _tmp217_, _tmp218_);
+#line 388 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _tmp219_ = gcamera;
+#line 388 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _tmp220_ = uri;
+#line 388 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _tmp221_ = display_name;
+#line 388 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _tmp222_ = icon;
+#line 388 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _tmp223_ = discovered_camera_new (_tmp219_, _tmp220_, _tmp221_, _tmp222_);
+#line 388 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ camera = _tmp223_;
+#line 389 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _tmp224_ = self->priv->camera_map;
+#line 389 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _tmp225_ = uri;
+#line 389 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _tmp226_ = camera;
+#line 389 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp224_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp225_, _tmp226_);
+#line 391 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _tmp227_ = camera;
+#line 391 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ g_signal_emit (self, camera_table_signals[CAMERA_TABLE_CAMERA_ADDED_SIGNAL], 0, _tmp227_);
#line 315 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_discovered_camera_unref0 (camera);
#line 315 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -4144,11 +4323,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 4146 "CameraTable.c"
+#line 4325 "CameraTable.c"
}
#line 315 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_object_unref0 (_port_it);
-#line 4150 "CameraTable.c"
+#line 4329 "CameraTable.c"
}
#line 233 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
missing = (_vala_array_free (missing, missing_length1, (GDestroyNotify) discovered_camera_unref), NULL);
@@ -4160,7 +4339,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 4162 "CameraTable.c"
+#line 4341 "CameraTable.c"
}
@@ -4169,104 +4348,104 @@ static void camera_table_on_udev_event (CameraTable* self, const gchar* action,
GUdevDevice* _tmp1_;
const gchar* _tmp2_;
OneShotScheduler* _tmp3_;
-#line 385 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 395 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
g_return_if_fail (IS_CAMERA_TABLE (self));
-#line 385 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 395 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
g_return_if_fail (action != NULL);
-#line 385 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 395 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
g_return_if_fail (G_UDEV_IS_DEVICE (device));
-#line 386 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 396 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp0_ = action;
-#line 386 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 396 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp1_ = device;
-#line 386 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 396 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp2_ = g_udev_device_get_name (_tmp1_);
-#line 386 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- g_debug ("CameraTable.vala:386: udev event: %s on %s", _tmp0_, _tmp2_);
-#line 390 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 396 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ g_debug ("CameraTable.vala:396: udev event: %s on %s", _tmp0_, _tmp2_);
+#line 400 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp3_ = self->priv->camera_update_scheduler;
-#line 390 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 400 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
one_shot_scheduler_after_timeout (_tmp3_, (guint) CAMERA_TABLE_UPDATE_DELAY_MSEC, TRUE);
-#line 4189 "CameraTable.c"
+#line 4368 "CameraTable.c"
}
void camera_table_on_volume_changed (CameraTable* self, GVolume* volume) {
OneShotScheduler* _tmp0_;
-#line 393 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 403 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
g_return_if_fail (IS_CAMERA_TABLE (self));
-#line 393 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 403 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
g_return_if_fail (G_IS_VOLUME (volume));
-#line 394 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 404 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp0_ = self->priv->camera_update_scheduler;
-#line 394 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 404 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
one_shot_scheduler_after_timeout (_tmp0_, (guint) CAMERA_TABLE_UPDATE_DELAY_MSEC, TRUE);
-#line 4203 "CameraTable.c"
+#line 4382 "CameraTable.c"
}
static void camera_table_on_update_cameras (CameraTable* self) {
GError * _inner_error_ = NULL;
-#line 397 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 407 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
g_return_if_fail (IS_CAMERA_TABLE (self));
-#line 4211 "CameraTable.c"
+#line 4390 "CameraTable.c"
{
CameraTable* _tmp0_;
CameraTable* _tmp1_;
-#line 399 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 409 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp0_ = camera_table_get_instance ();
-#line 399 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 409 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp1_ = _tmp0_;
-#line 399 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 409 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
camera_table_update_camera_table (_tmp1_, &_inner_error_);
-#line 399 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 409 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_camera_table_unref0 (_tmp1_);
-#line 399 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 409 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 399 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 409 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (_inner_error_->domain == GPHOTO_ERROR) {
-#line 4227 "CameraTable.c"
- goto __catch61_gphoto_error;
+#line 4406 "CameraTable.c"
+ goto __catch68_gphoto_error;
}
-#line 399 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 409 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 399 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 409 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
g_clear_error (&_inner_error_);
-#line 399 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 409 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return;
-#line 4236 "CameraTable.c"
+#line 4415 "CameraTable.c"
}
}
- goto __finally61;
- __catch61_gphoto_error:
+ goto __finally68;
+ __catch68_gphoto_error:
{
GError* err = NULL;
GError* _tmp2_;
const gchar* _tmp3_;
-#line 398 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 408 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
err = _inner_error_;
-#line 398 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 408 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_inner_error_ = NULL;
-#line 401 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 411 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp2_ = err;
-#line 401 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 411 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp3_ = _tmp2_->message;
-#line 401 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- g_warning ("CameraTable.vala:401: Error updating camera table: %s", _tmp3_);
-#line 398 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 411 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ g_warning ("CameraTable.vala:411: Error updating camera table: %s", _tmp3_);
+#line 408 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_error_free0 (err);
-#line 4257 "CameraTable.c"
+#line 4436 "CameraTable.c"
}
- __finally61:
-#line 398 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ __finally68:
+#line 408 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 398 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 408 "/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 398 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 408 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
g_clear_error (&_inner_error_);
-#line 398 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 408 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return;
-#line 4268 "CameraTable.c"
+#line 4447 "CameraTable.c"
}
}
@@ -4286,26 +4465,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 4288 "CameraTable.c"
+#line 4467 "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 4294 "CameraTable.c"
+#line 4473 "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 4300 "CameraTable.c"
+#line 4479 "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 4307 "CameraTable.c"
+#line 4486 "CameraTable.c"
}
@@ -4314,7 +4493,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 4316 "CameraTable.c"
+#line 4495 "CameraTable.c"
}
}
@@ -4324,11 +4503,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 4326 "CameraTable.c"
+#line 4505 "CameraTable.c"
} else {
#line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
dest_value->data[0].v_pointer = NULL;
-#line 4330 "CameraTable.c"
+#line 4509 "CameraTable.c"
}
}
@@ -4336,37 +4515,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 4338 "CameraTable.c"
+#line 4517 "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 4345 "CameraTable.c"
+#line 4524 "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 4352 "CameraTable.c"
+#line 4531 "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 4356 "CameraTable.c"
+#line 4535 "CameraTable.c"
}
#line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
value->data[0].v_pointer = camera_table_ref (object);
-#line 4360 "CameraTable.c"
+#line 4539 "CameraTable.c"
} else {
#line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
value->data[0].v_pointer = NULL;
-#line 4364 "CameraTable.c"
+#line 4543 "CameraTable.c"
}
#line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return NULL;
-#line 4368 "CameraTable.c"
+#line 4547 "CameraTable.c"
}
@@ -4377,25 +4556,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 4379 "CameraTable.c"
+#line 4558 "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 4385 "CameraTable.c"
+#line 4564 "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 4389 "CameraTable.c"
+#line 4568 "CameraTable.c"
} else {
#line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
*object_p = camera_table_ref (value->data[0].v_pointer);
-#line 4393 "CameraTable.c"
+#line 4572 "CameraTable.c"
}
#line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return NULL;
-#line 4397 "CameraTable.c"
+#line 4576 "CameraTable.c"
}
@@ -4409,7 +4588,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 4411 "CameraTable.c"
+#line 4590 "CameraTable.c"
}
@@ -4418,7 +4597,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 4420 "CameraTable.c"
+#line 4599 "CameraTable.c"
}
@@ -4438,17 +4617,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 4440 "CameraTable.c"
+#line 4619 "CameraTable.c"
} else {
#line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
value->data[0].v_pointer = NULL;
-#line 4444 "CameraTable.c"
+#line 4623 "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 4450 "CameraTable.c"
+#line 4629 "CameraTable.c"
}
}
@@ -4467,17 +4646,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 4469 "CameraTable.c"
+#line 4648 "CameraTable.c"
} else {
#line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
value->data[0].v_pointer = NULL;
-#line 4473 "CameraTable.c"
+#line 4652 "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 4479 "CameraTable.c"
+#line 4658 "CameraTable.c"
}
}
@@ -4493,7 +4672,7 @@ static void camera_table_class_init (CameraTableClass * klass) {
camera_table_signals[CAMERA_TABLE_CAMERA_ADDED_SIGNAL] = 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"
camera_table_signals[CAMERA_TABLE_CAMERA_REMOVED_SIGNAL] = 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 4495 "CameraTable.c"
+#line 4674 "CameraTable.c"
}
@@ -4519,7 +4698,7 @@ static void camera_table_instance_init (CameraTable * self) {
self->priv->camera_map = _tmp2_;
#line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
self->ref_count = 1;
-#line 4521 "CameraTable.c"
+#line 4700 "CameraTable.c"
}
@@ -4541,7 +4720,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 4543 "CameraTable.c"
+#line 4722 "CameraTable.c"
}
@@ -4566,7 +4745,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 4568 "CameraTable.c"
+#line 4747 "CameraTable.c"
}
@@ -4579,7 +4758,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 4581 "CameraTable.c"
+#line 4760 "CameraTable.c"
}
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-01 22:24:49 +0000