diff options
Diffstat (limited to 'src/camera')
| -rw-r--r-- | src/camera/CameraTable.c | 3870 | ||||
| -rw-r--r-- | src/camera/CameraTable.vala | 105 |
2 files changed, 1648 insertions, 2327 deletions
diff --git a/src/camera/CameraTable.c b/src/camera/CameraTable.c index f0f37e6..d35655d 100644 --- a/src/camera/CameraTable.c +++ b/src/camera/CameraTable.c @@ -22,7 +22,6 @@ #include <gtk/gtk.h> #include <gphoto2/gphoto2-result.h> #include <gphoto2/gphoto2-port-result.h> -#include <stdio.h> #include <gphoto2/gphoto2-port-info-list.h> #include <gphoto2/gphoto2-list.h> #include <glib/gi18n-lib.h> @@ -99,8 +98,8 @@ typedef struct _LibraryWindow LibraryWindow; typedef struct _LibraryWindowClass LibraryWindowClass; #define _g_error_free0(var) ((var == NULL) ? NULL : (var = (g_error_free (var), NULL))) #define _camera_table_unref0(var) ((var == NULL) ? NULL : (var = (camera_table_unref (var), NULL))) -#define __g_list_free__g_object_unref0_0(var) ((var == NULL) ? NULL : (var = (_g_list_free__g_object_unref0_ (var), NULL))) #define _g_regex_unref0(var) ((var == NULL) ? NULL : (var = (g_regex_unref (var), NULL))) +#define __g_list_free__g_object_unref0_0(var) ((var == NULL) ? NULL : (var = (_g_list_free__g_object_unref0_ (var), NULL))) #define _gp_port_info_list_free0(var) ((var == NULL) ? NULL : (var = (gp_port_info_list_free (var), NULL))) #define _gp_list_unref0(var) ((var == NULL) ? NULL : (var = (gp_list_unref (var), NULL))) #define _discovered_camera_unref0(var) ((var == NULL) ? NULL : (var = (discovered_camera_unref (var), NULL))) @@ -269,27 +268,15 @@ 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_add69 (gchar** * array, - int* length, - int* size, - gchar* value); -static void _g_object_unref0_ (gpointer var); -static inline 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); 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 void _g_object_unref0_ (gpointer var); +static inline void _g_list_free__g_object_unref0_ (GList* self); static gchar* camera_table_get_icon_for_uuid (CameraTable* self, const gchar* uuid); -static void _vala_array_add70 (DiscoveredCamera** * array, +static void _vala_array_add69 (DiscoveredCamera** * array, int* length, int* size, DiscoveredCamera* value); @@ -317,7 +304,7 @@ _GPHOTO_REF_CAMERA0 (gpointer self) { #line 14 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" return self ? GPHOTO_REF_CAMERA (self) : NULL; -#line 321 "CameraTable.c" +#line 308 "CameraTable.c" } @@ -367,7 +354,7 @@ discovered_camera_construct (GType object_type, self->icon = _tmp3_; #line 13 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" return self; -#line 371 "CameraTable.c" +#line 358 "CameraTable.c" } @@ -379,7 +366,7 @@ discovered_camera_new (Camera* gcamera, { #line 13 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" return discovered_camera_construct (TYPE_DISCOVERED_CAMERA, gcamera, uri, display_name, icon); -#line 383 "CameraTable.c" +#line 370 "CameraTable.c" } @@ -388,7 +375,7 @@ value_discovered_camera_init (GValue* value) { #line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" value->data[0].v_pointer = NULL; -#line 392 "CameraTable.c" +#line 379 "CameraTable.c" } @@ -399,7 +386,7 @@ 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 403 "CameraTable.c" +#line 390 "CameraTable.c" } } @@ -412,11 +399,11 @@ value_discovered_camera_copy_value (const GValue* src_value, 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 416 "CameraTable.c" +#line 403 "CameraTable.c" } else { #line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" dest_value->data[0].v_pointer = NULL; -#line 420 "CameraTable.c" +#line 407 "CameraTable.c" } } @@ -426,7 +413,7 @@ 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 430 "CameraTable.c" +#line 417 "CameraTable.c" } @@ -438,30 +425,30 @@ value_discovered_camera_collect_value (GValue* value, { #line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" if (collect_values[0].v_pointer) { -#line 442 "CameraTable.c" +#line 429 "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 449 "CameraTable.c" +#line 436 "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 453 "CameraTable.c" +#line 440 "CameraTable.c" } #line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" value->data[0].v_pointer = discovered_camera_ref (object); -#line 457 "CameraTable.c" +#line 444 "CameraTable.c" } else { #line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" value->data[0].v_pointer = NULL; -#line 461 "CameraTable.c" +#line 448 "CameraTable.c" } #line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" return NULL; -#line 465 "CameraTable.c" +#line 452 "CameraTable.c" } @@ -477,25 +464,25 @@ value_discovered_camera_lcopy_value (const GValue* value, 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 481 "CameraTable.c" +#line 468 "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 487 "CameraTable.c" +#line 474 "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 491 "CameraTable.c" +#line 478 "CameraTable.c" } else { #line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" *object_p = discovered_camera_ref (value->data[0].v_pointer); -#line 495 "CameraTable.c" +#line 482 "CameraTable.c" } #line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" return NULL; -#line 499 "CameraTable.c" +#line 486 "CameraTable.c" } @@ -515,7 +502,7 @@ param_spec_discovered_camera (const gchar* name, G_PARAM_SPEC (spec)->value_type = object_type; #line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" return G_PARAM_SPEC (spec); -#line 519 "CameraTable.c" +#line 506 "CameraTable.c" } @@ -526,7 +513,7 @@ 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 530 "CameraTable.c" +#line 517 "CameraTable.c" } @@ -549,17 +536,17 @@ value_set_discovered_camera (GValue* value, 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 553 "CameraTable.c" +#line 540 "CameraTable.c" } else { #line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" value->data[0].v_pointer = NULL; -#line 557 "CameraTable.c" +#line 544 "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 563 "CameraTable.c" +#line 550 "CameraTable.c" } } @@ -581,17 +568,17 @@ value_take_discovered_camera (GValue* value, 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 585 "CameraTable.c" +#line 572 "CameraTable.c" } else { #line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" value->data[0].v_pointer = NULL; -#line 589 "CameraTable.c" +#line 576 "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 595 "CameraTable.c" +#line 582 "CameraTable.c" } } @@ -603,7 +590,7 @@ 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 607 "CameraTable.c" +#line 594 "CameraTable.c" } @@ -612,7 +599,7 @@ discovered_camera_instance_init (DiscoveredCamera * self) { #line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" self->ref_count = 1; -#line 616 "CameraTable.c" +#line 603 "CameraTable.c" } @@ -632,7 +619,7 @@ 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 636 "CameraTable.c" +#line 623 "CameraTable.c" } @@ -661,7 +648,7 @@ 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 665 "CameraTable.c" +#line 652 "CameraTable.c" } @@ -676,7 +663,7 @@ 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 680 "CameraTable.c" +#line 667 "CameraTable.c" } } @@ -686,7 +673,7 @@ _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 690 "CameraTable.c" +#line 677 "CameraTable.c" } @@ -698,7 +685,7 @@ _camera_table_on_udev_event_g_udev_client_uevent (GUdevClient* _sender, { #line 46 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" camera_table_on_udev_event ((CameraTable*) self, action, device); -#line 702 "CameraTable.c" +#line 689 "CameraTable.c" } @@ -709,7 +696,7 @@ _camera_table_on_volume_changed_g_volume_monitor_volume_changed (GVolumeMonitor* { #line 48 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" camera_table_on_volume_changed ((CameraTable*) self, volume); -#line 713 "CameraTable.c" +#line 700 "CameraTable.c" } @@ -720,7 +707,7 @@ _camera_table_on_volume_changed_g_volume_monitor_volume_added (GVolumeMonitor* _ { #line 49 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" camera_table_on_volume_changed ((CameraTable*) self, volume); -#line 724 "CameraTable.c" +#line 711 "CameraTable.c" } @@ -731,7 +718,7 @@ _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 735 "CameraTable.c" +#line 722 "CameraTable.c" } @@ -774,7 +761,7 @@ 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 778 "CameraTable.c" +#line 765 "CameraTable.c" } @@ -783,7 +770,7 @@ camera_table_new (void) { #line 41 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" return camera_table_construct (TYPE_CAMERA_TABLE); -#line 787 "CameraTable.c" +#line 774 "CameraTable.c" } @@ -806,17 +793,17 @@ 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 810 "CameraTable.c" +#line 797 "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 816 "CameraTable.c" +#line 803 "CameraTable.c" gboolean _tmp2_ = FALSE; #line 63 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" if (_inner_error_->domain == GPHOTO_ERROR) { -#line 820 "CameraTable.c" +#line 807 "CameraTable.c" goto __catch64_gphoto_error; } #line 63 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" @@ -825,7 +812,7 @@ camera_table_delayed_init (CameraTable* self) g_clear_error (&_inner_error_); #line 63 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" return _tmp2_; -#line 829 "CameraTable.c" +#line 816 "CameraTable.c" } } goto __finally64; @@ -850,12 +837,12 @@ camera_table_delayed_init (CameraTable* self) _g_error_free0 (err); #line 67 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" return result; -#line 854 "CameraTable.c" +#line 841 "CameraTable.c" } __finally64: #line 62 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 859 "CameraTable.c" +#line 846 "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); @@ -863,18 +850,18 @@ camera_table_delayed_init (CameraTable* self) g_clear_error (&_inner_error_); #line 62 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" return _tmp5_; -#line 867 "CameraTable.c" +#line 854 "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 874 "CameraTable.c" +#line 861 "CameraTable.c" gboolean _tmp6_ = FALSE; #line 71 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" if (_inner_error_->domain == GPHOTO_ERROR) { -#line 878 "CameraTable.c" +#line 865 "CameraTable.c" goto __catch65_gphoto_error; } #line 71 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" @@ -883,7 +870,7 @@ camera_table_delayed_init (CameraTable* self) g_clear_error (&_inner_error_); #line 71 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" return _tmp6_; -#line 887 "CameraTable.c" +#line 874 "CameraTable.c" } } goto __finally65; @@ -904,12 +891,12 @@ 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 908 "CameraTable.c" +#line 895 "CameraTable.c" } __finally65: #line 70 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 913 "CameraTable.c" +#line 900 "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); @@ -917,7 +904,7 @@ camera_table_delayed_init (CameraTable* self) g_clear_error (&_inner_error_); #line 70 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" return _tmp9_; -#line 921 "CameraTable.c" +#line 908 "CameraTable.c" } #line 78 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _tmp10_ = app_window_get_instance (); @@ -931,7 +918,7 @@ camera_table_delayed_init (CameraTable* self) result = FALSE; #line 79 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" return result; -#line 935 "CameraTable.c" +#line 922 "CameraTable.c" } @@ -940,7 +927,7 @@ _camera_table_ref0 (gpointer self) { #line 86 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" return self ? camera_table_ref (self) : NULL; -#line 944 "CameraTable.c" +#line 931 "CameraTable.c" } @@ -955,7 +942,7 @@ camera_table_get_instance (void) _tmp0_ = camera_table_instance; #line 83 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" if (_tmp0_ == NULL) { -#line 959 "CameraTable.c" +#line 946 "CameraTable.c" CameraTable* _tmp1_; #line 84 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _tmp1_ = camera_table_new (); @@ -963,7 +950,7 @@ 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 967 "CameraTable.c" +#line 954 "CameraTable.c" } #line 86 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _tmp2_ = camera_table_instance; @@ -973,7 +960,7 @@ camera_table_get_instance (void) result = _tmp3_; #line 86 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" return result; -#line 977 "CameraTable.c" +#line 964 "CameraTable.c" } @@ -996,7 +983,7 @@ 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 1000 "CameraTable.c" +#line 987 "CameraTable.c" } @@ -1019,7 +1006,7 @@ camera_table_get_count (CameraTable* self) result = _tmp2_; #line 94 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" return result; -#line 1023 "CameraTable.c" +#line 1010 "CameraTable.c" } @@ -1042,7 +1029,7 @@ camera_table_get_for_uri (CameraTable* self, result = (DiscoveredCamera*) _tmp1_; #line 98 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" return result; -#line 1046 "CameraTable.c" +#line 1033 "CameraTable.c" } @@ -1059,7 +1046,7 @@ camera_table_do_op (CameraTable* self, g_return_if_fail (op != NULL); #line 102 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" if (res != GP_OK) { -#line 1063 "CameraTable.c" +#line 1050 "CameraTable.c" const gchar* _tmp0_; GError* _tmp1_; #line 103 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" @@ -1074,7 +1061,7 @@ camera_table_do_op (CameraTable* self, g_propagate_error (error, _inner_error_); #line 103 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" return; -#line 1078 "CameraTable.c" +#line 1065 "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); @@ -1082,7 +1069,7 @@ camera_table_do_op (CameraTable* self, g_clear_error (&_inner_error_); #line 103 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" return; -#line 1086 "CameraTable.c" +#line 1073 "CameraTable.c" } } } @@ -1115,7 +1102,7 @@ camera_table_init_camera_table (CameraTable* self, g_propagate_error (error, _inner_error_); #line 107 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" return; -#line 1119 "CameraTable.c" +#line 1106 "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); @@ -1123,7 +1110,7 @@ camera_table_init_camera_table (CameraTable* self, g_clear_error (&_inner_error_); #line 107 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" return; -#line 1127 "CameraTable.c" +#line 1114 "CameraTable.c" } } #line 108 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" @@ -1140,7 +1127,7 @@ camera_table_init_camera_table (CameraTable* self, g_propagate_error (error, _inner_error_); #line 108 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" return; -#line 1144 "CameraTable.c" +#line 1131 "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); @@ -1148,490 +1135,26 @@ camera_table_init_camera_table (CameraTable* self, g_clear_error (&_inner_error_); #line 108 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" return; -#line 1152 "CameraTable.c" +#line 1139 "CameraTable.c" } } } -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 1163 "CameraTable.c" -} - - -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 1179 "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 1185 "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 1194 "CameraTable.c" -} - - -static inline void -_g_list_free__g_object_unref0_ (GList* self) -{ -#line 139 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - g_list_free_full (self, (GDestroyNotify) _g_object_unref0_); -#line 1203 "CameraTable.c" -} - - -static gchar** -camera_table_get_all_usb_cameras (CameraTable* self, - int* result_length1) -{ - gchar** result = NULL; - gchar** cameras = NULL; - gchar** _tmp0_; - gint cameras_length1; - gint _cameras_size_; - GList* device_list = NULL; - GUdevClient* _tmp1_; - GList* _tmp2_; - GList* _tmp3_; - gchar** _tmp22_; - gint _tmp22__length1; -#line 111 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - g_return_val_if_fail (IS_CAMERA_TABLE (self), NULL); -#line 112 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp0_ = g_new0 (gchar*, 0 + 1); -#line 112 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - cameras = _tmp0_; -#line 112 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - cameras_length1 = 0; -#line 112 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _cameras_size_ = cameras_length1; -#line 114 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp1_ = self->priv->client; -#line 114 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp2_ = g_udev_client_query_by_subsystem (_tmp1_, NULL); -#line 114 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - device_list = _tmp2_; -#line 115 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp3_ = device_list; -#line 1240 "CameraTable.c" - { - GList* device_collection = NULL; - GList* device_it = NULL; -#line 115 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - 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 1248 "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 1255 "CameraTable.c" - { - gchar* device_file = NULL; - GUdevDevice* _tmp5_; - const gchar* _tmp6_; - gchar* _tmp7_; - gboolean _tmp8_ = FALSE; - gboolean _tmp9_ = FALSE; - const gchar* _tmp10_; -#line 116 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp5_ = device; -#line 116 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp6_ = g_udev_device_get_device_file (_tmp5_); -#line 116 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp7_ = g_strdup (_tmp6_); -#line 116 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - device_file = _tmp7_; -#line 120 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp10_ = device_file; -#line 120 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - if (_tmp10_ != NULL) { -#line 1276 "CameraTable.c" - GUdevDevice* _tmp11_; -#line 121 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp11_ = device; -#line 121 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp9_ = g_udev_device_has_property (_tmp11_, "ID_GPHOTO2"); -#line 1282 "CameraTable.c" - } else { -#line 120 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp9_ = FALSE; -#line 1286 "CameraTable.c" - } -#line 120 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - if (_tmp9_) { -#line 1290 "CameraTable.c" - GUdevDevice* _tmp12_; -#line 122 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp12_ = device; -#line 122 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp8_ = g_udev_device_has_property (_tmp12_, "GPHOTO2_DRIVER"); -#line 1296 "CameraTable.c" - } else { -#line 120 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp8_ = FALSE; -#line 1300 "CameraTable.c" - } -#line 117 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - if (_tmp8_) { -#line 1304 "CameraTable.c" - gint camera_bus = 0; - gint camera_device = 0; - const gchar* _tmp13_; - gchar* camera = NULL; - gint _tmp15_; - gint _tmp16_; - gchar* _tmp17_; - const gchar* _tmp18_; - gchar** _tmp19_; - gint _tmp19__length1; - const gchar* _tmp20_; - gchar* _tmp21_; -#line 128 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp13_ = device_file; -#line 128 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - if (sscanf (_tmp13_, "/dev/bus/usb/%d/%d", &camera_bus, &camera_device) < 2) { -#line 1321 "CameraTable.c" - const gchar* _tmp14_; -#line 129 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp14_ = device_file; -#line 129 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - g_critical ("CameraTable.vala:129: get_all_usb_cameras: Failed to scanf device file" \ -" %s", _tmp14_); -#line 131 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _g_free0 (device_file); -#line 131 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _g_object_unref0 (device); -#line 131 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - continue; -#line 1333 "CameraTable.c" - } -#line 133 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp15_ = camera_bus; -#line 133 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp16_ = camera_device; -#line 133 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp17_ = g_strdup_printf ("usb:%.3d,%.3d", _tmp15_, _tmp16_); -#line 133 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - camera = _tmp17_; -#line 134 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp18_ = camera; -#line 134 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - g_debug ("CameraTable.vala:134: USB camera detected at %s", _tmp18_); -#line 135 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp19_ = cameras; -#line 135 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp19__length1 = cameras_length1; -#line 135 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp20_ = camera; -#line 135 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp21_ = g_strdup (_tmp20_); -#line 135 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _vala_array_add69 (&cameras, &cameras_length1, &_cameras_size_, _tmp21_); -#line 117 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _g_free0 (camera); -#line 1359 "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 1365 "CameraTable.c" - } - } - } -#line 139 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp22_ = cameras; -#line 139 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp22__length1 = cameras_length1; -#line 139 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - if (result_length1) { -#line 139 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - *result_length1 = _tmp22__length1; -#line 1377 "CameraTable.c" - } -#line 139 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - result = _tmp22_; -#line 139 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - __g_list_free__g_object_unref0_0 (device_list); -#line 139 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - return result; -#line 1385 "CameraTable.c" -} - - -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) -{ - gchar* _vala_full_port = NULL; - gboolean result = FALSE; - gboolean _tmp0_ = FALSE; - gint bus = 0; - gint device = 0; -#line 150 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - g_return_val_if_fail (IS_CAMERA_TABLE (self), FALSE); -#line 150 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - g_return_val_if_fail (port != NULL, FALSE); -#line 153 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _vala_assert (current_camera_count > 0, "current_camera_count > 0"); -#line 155 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - g_debug ("CameraTable.vala:155: USB ESP: current_camera_count=%d port=%s", current_camera_count, port); -#line 157 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _g_free0 (_vala_full_port); -#line 157 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _vala_full_port = NULL; -#line 160 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - if (current_camera_count == 1) { -#line 160 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp0_ = usb_cameras_length1 == 1; -#line 1418 "CameraTable.c" - } else { -#line 160 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp0_ = FALSE; -#line 1422 "CameraTable.c" - } -#line 160 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - if (_tmp0_) { -#line 1426 "CameraTable.c" - const gchar* _tmp1_; - gchar* _tmp2_; - const gchar* _tmp3_; -#line 161 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp1_ = usb_cameras[0]; -#line 161 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp2_ = g_strdup (_tmp1_); -#line 161 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _g_free0 (_vala_full_port); -#line 161 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _vala_full_port = _tmp2_; -#line 163 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp3_ = _vala_full_port; -#line 163 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - g_debug ("CameraTable.vala:163: USB ESP: port=%s full_port=%s", port, _tmp3_); -#line 165 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - result = TRUE; -#line 165 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - if (full_port) { -#line 165 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - *full_port = _vala_full_port; -#line 1448 "CameraTable.c" - } else { -#line 165 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _g_free0 (_vala_full_port); -#line 1452 "CameraTable.c" - } -#line 165 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - return result; -#line 1456 "CameraTable.c" - } -#line 169 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - if (g_strcmp0 (port, "usb:") == 0) { -#line 170 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - g_debug ("CameraTable.vala:170: USB ESP: Skipping %s", port); -#line 172 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - result = FALSE; -#line 172 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - if (full_port) { -#line 172 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - *full_port = _vala_full_port; -#line 1468 "CameraTable.c" - } else { -#line 172 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _g_free0 (_vala_full_port); -#line 1472 "CameraTable.c" - } -#line 172 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - return result; -#line 1476 "CameraTable.c" - } -#line 177 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - if (sscanf (port, "usb:%d,%d", &bus, &device) < 2) { -#line 178 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - g_critical ("CameraTable.vala:178: USB ESP: Failed to scanf %s", port); -#line 180 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - result = FALSE; -#line 180 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - if (full_port) { -#line 180 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - *full_port = _vala_full_port; -#line 1488 "CameraTable.c" - } else { -#line 180 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _g_free0 (_vala_full_port); -#line 1492 "CameraTable.c" - } -#line 180 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - return result; -#line 1496 "CameraTable.c" - } - { - gchar** usb_camera_collection = NULL; - gint usb_camera_collection_length1 = 0; - gint _usb_camera_collection_size_ = 0; - gint usb_camera_it = 0; -#line 183 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - usb_camera_collection = usb_cameras; -#line 183 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - usb_camera_collection_length1 = usb_cameras_length1; -#line 183 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - for (usb_camera_it = 0; usb_camera_it < usb_cameras_length1; usb_camera_it = usb_camera_it + 1) { -#line 1509 "CameraTable.c" - gchar* _tmp4_; - gchar* usb_camera = NULL; -#line 183 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp4_ = g_strdup (usb_camera_collection[usb_camera_it]); -#line 183 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - usb_camera = _tmp4_; -#line 1516 "CameraTable.c" - { - gint camera_bus = 0; - gint camera_device = 0; - const gchar* _tmp5_; - gboolean _tmp7_ = FALSE; - gint _tmp8_; - gint _tmp9_; -#line 185 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp5_ = usb_camera; -#line 185 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - if (sscanf (_tmp5_, "usb:%d,%d", &camera_bus, &camera_device) < 2) { -#line 1528 "CameraTable.c" - const gchar* _tmp6_; -#line 186 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp6_ = usb_camera; -#line 186 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - g_critical ("CameraTable.vala:186: USB ESP: Failed to scanf %s", _tmp6_); -#line 188 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _g_free0 (usb_camera); -#line 188 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - continue; -#line 1538 "CameraTable.c" - } -#line 191 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp8_ = bus; -#line 191 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp9_ = camera_bus; -#line 191 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - if (_tmp8_ == _tmp9_) { -#line 1546 "CameraTable.c" - gint _tmp10_; - gint _tmp11_; -#line 191 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp10_ = device; -#line 191 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp11_ = camera_device; -#line 191 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp7_ = _tmp10_ == _tmp11_; -#line 1555 "CameraTable.c" - } else { -#line 191 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp7_ = FALSE; -#line 1559 "CameraTable.c" - } -#line 191 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - if (_tmp7_) { -#line 1563 "CameraTable.c" - gchar* _tmp12_; - const gchar* _tmp13_; -#line 192 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp12_ = g_strdup (port); -#line 192 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _g_free0 (_vala_full_port); -#line 192 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _vala_full_port = _tmp12_; -#line 194 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp13_ = _vala_full_port; -#line 194 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - g_debug ("CameraTable.vala:194: USB ESP: port=%s full_port=%s", port, _tmp13_); -#line 196 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - result = TRUE; -#line 196 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _g_free0 (usb_camera); -#line 196 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - if (full_port) { -#line 196 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - *full_port = _vala_full_port; -#line 1584 "CameraTable.c" - } else { -#line 196 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _g_free0 (_vala_full_port); -#line 1588 "CameraTable.c" - } -#line 196 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - return result; -#line 1592 "CameraTable.c" - } -#line 183 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _g_free0 (usb_camera); -#line 1596 "CameraTable.c" - } - } - } -#line 200 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - g_debug ("CameraTable.vala:200: USB ESP: No matching bus/device found for port=%" \ -"s", port); -#line 202 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - result = FALSE; -#line 202 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - if (full_port) { -#line 202 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - *full_port = _vala_full_port; -#line 1608 "CameraTable.c" - } else { -#line 202 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _g_free0 (_vala_full_port); -#line 1612 "CameraTable.c" - } -#line 202 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - return result; -#line 1616 "CameraTable.c" -} - - gchar* camera_table_get_port_uri (const gchar* port) { gchar* result = NULL; gchar* _tmp0_; -#line 205 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 111 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" g_return_val_if_fail (port != NULL, NULL); -#line 206 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 112 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _tmp0_ = g_strdup_printf ("gphoto2://[%s]/", port); -#line 206 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 112 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" result = _tmp0_; -#line 206 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 112 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" return result; -#line 1633 "CameraTable.c" +#line 1158 "CameraTable.c" } @@ -1655,7 +1178,7 @@ string_strnlen (gchar* str, result = maxlen; #line 1338 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 1657 "CameraTable.c" +#line 1182 "CameraTable.c" } else { gchar* _tmp2_; #line 1340 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" @@ -1664,7 +1187,7 @@ string_strnlen (gchar* str, result = (glong) (_tmp2_ - str); #line 1340 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 1666 "CameraTable.c" +#line 1191 "CameraTable.c" } } @@ -1685,17 +1208,17 @@ string_substring (const gchar* self, if (offset >= ((glong) 0)) { #line 1349 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _tmp0_ = len >= ((glong) 0); -#line 1687 "CameraTable.c" +#line 1212 "CameraTable.c" } else { #line 1349 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _tmp0_ = FALSE; -#line 1691 "CameraTable.c" +#line 1216 "CameraTable.c" } #line 1349 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" if (_tmp0_) { #line 1351 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" string_length = string_strnlen ((gchar*) self, offset + len); -#line 1697 "CameraTable.c" +#line 1222 "CameraTable.c" } else { gint _tmp1_; gint _tmp2_; @@ -1705,11 +1228,11 @@ string_substring (const gchar* self, _tmp2_ = _tmp1_; #line 1353 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" string_length = (glong) _tmp2_; -#line 1707 "CameraTable.c" +#line 1232 "CameraTable.c" } #line 1356 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" if (offset < ((glong) 0)) { -#line 1711 "CameraTable.c" +#line 1236 "CameraTable.c" glong _tmp3_; #line 1357 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _tmp3_ = string_length; @@ -1717,24 +1240,24 @@ string_substring (const gchar* self, offset = _tmp3_ + offset; #line 1358 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_return_val_if_fail (offset >= ((glong) 0), NULL); -#line 1719 "CameraTable.c" +#line 1244 "CameraTable.c" } else { glong _tmp4_; #line 1360 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _tmp4_ = string_length; #line 1360 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_return_val_if_fail (offset <= _tmp4_, NULL); -#line 1726 "CameraTable.c" +#line 1251 "CameraTable.c" } #line 1362 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" if (len < ((glong) 0)) { -#line 1730 "CameraTable.c" +#line 1255 "CameraTable.c" glong _tmp5_; #line 1363 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _tmp5_ = string_length; #line 1363 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" len = _tmp5_ - offset; -#line 1736 "CameraTable.c" +#line 1261 "CameraTable.c" } #line 1365 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _tmp6_ = string_length; @@ -1746,7 +1269,7 @@ string_substring (const gchar* self, result = _tmp7_; #line 1366 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 1748 "CameraTable.c" +#line 1273 "CameraTable.c" } @@ -1769,25 +1292,25 @@ string_replace (const gchar* self, if ((*((gchar*) self)) == '\0') { #line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _tmp1_ = TRUE; -#line 1771 "CameraTable.c" +#line 1296 "CameraTable.c" } else { #line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _tmp1_ = (*((gchar*) old)) == '\0'; -#line 1775 "CameraTable.c" +#line 1300 "CameraTable.c" } #line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" if (_tmp1_) { #line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _tmp0_ = TRUE; -#line 1781 "CameraTable.c" +#line 1306 "CameraTable.c" } else { #line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _tmp0_ = g_strcmp0 (old, replacement) == 0; -#line 1785 "CameraTable.c" +#line 1310 "CameraTable.c" } #line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" if (_tmp0_) { -#line 1789 "CameraTable.c" +#line 1314 "CameraTable.c" gchar* _tmp2_; #line 1423 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _tmp2_ = g_strdup (self); @@ -1795,7 +1318,7 @@ string_replace (const gchar* self, result = _tmp2_; #line 1423 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 1797 "CameraTable.c" +#line 1322 "CameraTable.c" } { GRegex* regex = NULL; @@ -1823,7 +1346,7 @@ string_replace (const gchar* self, if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" if (_inner_error_->domain == G_REGEX_ERROR) { -#line 1825 "CameraTable.c" +#line 1350 "CameraTable.c" goto __catch66_g_regex_error; } #line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" @@ -1832,7 +1355,7 @@ string_replace (const gchar* self, g_clear_error (&_inner_error_); #line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return NULL; -#line 1834 "CameraTable.c" +#line 1359 "CameraTable.c" } #line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _tmp8_ = regex; @@ -1846,7 +1369,7 @@ string_replace (const gchar* self, _g_regex_unref0 (regex); #line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" if (_inner_error_->domain == G_REGEX_ERROR) { -#line 1848 "CameraTable.c" +#line 1373 "CameraTable.c" goto __catch66_g_regex_error; } #line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" @@ -1857,7 +1380,7 @@ string_replace (const gchar* self, g_clear_error (&_inner_error_); #line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return NULL; -#line 1859 "CameraTable.c" +#line 1384 "CameraTable.c" } #line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _tmp10_ = _tmp7_; @@ -1871,7 +1394,7 @@ string_replace (const gchar* self, _g_regex_unref0 (regex); #line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 1873 "CameraTable.c" +#line 1398 "CameraTable.c" } goto __finally66; __catch66_g_regex_error: @@ -1885,7 +1408,7 @@ string_replace (const gchar* self, g_assert_not_reached (); #line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _g_error_free0 (e); -#line 1887 "CameraTable.c" +#line 1412 "CameraTable.c" } __finally66: #line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" @@ -1896,7 +1419,7 @@ string_replace (const gchar* self, g_clear_error (&_inner_error_); #line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return NULL; -#line 1898 "CameraTable.c" +#line 1423 "CameraTable.c" } } @@ -1906,47 +1429,74 @@ camera_table_get_port_path (const gchar* port) { gchar* result = NULL; gchar* _tmp0_ = NULL; -#line 209 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 115 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" g_return_val_if_fail (port != NULL, NULL); -#line 211 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 117 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" if (g_str_has_prefix (port, "usb:")) { -#line 1912 "CameraTable.c" +#line 1437 "CameraTable.c" gchar* _tmp1_; gchar* _tmp2_; gchar* _tmp3_; gchar* _tmp4_; gchar* _tmp5_; -#line 212 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 118 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _tmp1_ = string_substring (port, (glong) 4, (glong) -1); -#line 212 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 118 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _tmp2_ = _tmp1_; -#line 212 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 118 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _tmp3_ = string_replace (_tmp2_, ",", "/"); -#line 212 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 118 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _tmp4_ = _tmp3_; -#line 212 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 118 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _tmp5_ = g_strdup_printf ("/dev/bus/usb/%s", _tmp4_); -#line 212 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 118 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (_tmp0_); -#line 212 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 118 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _tmp0_ = _tmp5_; -#line 212 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 118 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (_tmp4_); -#line 212 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 118 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (_tmp2_); -#line 1936 "CameraTable.c" +#line 1461 "CameraTable.c" } else { -#line 212 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 118 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (_tmp0_); -#line 212 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 118 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _tmp0_ = NULL; -#line 1942 "CameraTable.c" +#line 1467 "CameraTable.c" } -#line 211 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 117 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" result = _tmp0_; -#line 211 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 117 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" return result; -#line 1948 "CameraTable.c" +#line 1473 "CameraTable.c" +} + + +static gpointer +_g_object_ref0 (gpointer self) +{ +#line 122 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + return self ? g_object_ref (self) : NULL; +#line 1482 "CameraTable.c" +} + + +static void +_g_object_unref0_ (gpointer var) +{ +#line 124 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + (var == NULL) ? NULL : (var = (g_object_unref (var), NULL)); +#line 1491 "CameraTable.c" +} + + +static inline void +_g_list_free__g_object_unref0_ (GList* self) +{ +#line 124 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + g_list_free_full (self, (GDestroyNotify) _g_object_unref0_); +#line 1500 "CameraTable.c" } @@ -1957,78 +1507,78 @@ camera_table_get_name_for_uuid (CameraTable* self, gchar* result = NULL; GVolumeMonitor* _tmp0_; GList* _tmp1_; -#line 215 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 121 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" g_return_val_if_fail (IS_CAMERA_TABLE (self), NULL); -#line 215 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 121 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" g_return_val_if_fail (uuid != NULL, NULL); -#line 216 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 122 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _tmp0_ = self->priv->volume_monitor; -#line 216 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 122 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _tmp1_ = g_volume_monitor_get_volumes (_tmp0_); -#line 1967 "CameraTable.c" +#line 1519 "CameraTable.c" { GList* volume_collection = NULL; GList* volume_it = NULL; -#line 216 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 122 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" volume_collection = _tmp1_; -#line 216 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 122 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" for (volume_it = volume_collection; volume_it != NULL; volume_it = volume_it->next) { -#line 1975 "CameraTable.c" +#line 1527 "CameraTable.c" GVolume* _tmp2_; GVolume* volume = NULL; -#line 216 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 122 "/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" +#line 122 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" volume = _tmp2_; -#line 1982 "CameraTable.c" +#line 1534 "CameraTable.c" { GVolume* _tmp3_; gchar* _tmp4_; gchar* _tmp5_; gboolean _tmp6_; -#line 217 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 123 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _tmp3_ = volume; -#line 217 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 123 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _tmp4_ = g_volume_get_identifier (_tmp3_, G_VOLUME_IDENTIFIER_KIND_UUID); -#line 217 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 123 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _tmp5_ = _tmp4_; -#line 217 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 123 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _tmp6_ = g_strcmp0 (_tmp5_, uuid) == 0; -#line 217 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 123 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (_tmp5_); -#line 217 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 123 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" if (_tmp6_) { -#line 2000 "CameraTable.c" +#line 1552 "CameraTable.c" GVolume* _tmp7_; gchar* _tmp8_; -#line 218 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 124 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _tmp7_ = volume; -#line 218 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 124 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _tmp8_ = g_volume_get_name (_tmp7_); -#line 218 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 124 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" result = _tmp8_; -#line 218 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 124 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_object_unref0 (volume); -#line 218 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 124 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" __g_list_free__g_object_unref0_0 (volume_collection); -#line 218 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 124 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" return result; -#line 2015 "CameraTable.c" +#line 1567 "CameraTable.c" } -#line 216 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 122 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_object_unref0 (volume); -#line 2019 "CameraTable.c" +#line 1571 "CameraTable.c" } } -#line 216 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 122 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" __g_list_free__g_object_unref0_0 (volume_collection); -#line 2024 "CameraTable.c" +#line 1576 "CameraTable.c" } -#line 221 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 127 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" result = NULL; -#line 221 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 127 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" return result; -#line 2030 "CameraTable.c" +#line 1582 "CameraTable.c" } @@ -2039,120 +1589,120 @@ camera_table_get_icon_for_uuid (CameraTable* self, gchar* result = NULL; GVolumeMonitor* _tmp0_; GList* _tmp1_; -#line 224 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 130 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" g_return_val_if_fail (IS_CAMERA_TABLE (self), NULL); -#line 224 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 130 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" g_return_val_if_fail (uuid != NULL, NULL); -#line 225 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 131 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _tmp0_ = self->priv->volume_monitor; -#line 225 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 131 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _tmp1_ = g_volume_monitor_get_volumes (_tmp0_); -#line 2049 "CameraTable.c" +#line 1601 "CameraTable.c" { GList* volume_collection = NULL; GList* volume_it = NULL; -#line 225 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 131 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" volume_collection = _tmp1_; -#line 225 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 131 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" for (volume_it = volume_collection; volume_it != NULL; volume_it = volume_it->next) { -#line 2057 "CameraTable.c" +#line 1609 "CameraTable.c" GVolume* _tmp2_; GVolume* volume = NULL; -#line 225 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 131 "/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" +#line 131 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" volume = _tmp2_; -#line 2064 "CameraTable.c" +#line 1616 "CameraTable.c" { GVolume* _tmp3_; gchar* _tmp4_; gchar* _tmp5_; gboolean _tmp6_; -#line 226 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 132 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _tmp3_ = volume; -#line 226 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 132 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _tmp4_ = g_volume_get_identifier (_tmp3_, G_VOLUME_IDENTIFIER_KIND_UUID); -#line 226 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 132 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _tmp5_ = _tmp4_; -#line 226 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 132 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _tmp6_ = g_strcmp0 (_tmp5_, uuid) == 0; -#line 226 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 132 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (_tmp5_); -#line 226 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 132 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" if (_tmp6_) { -#line 2082 "CameraTable.c" +#line 1634 "CameraTable.c" GVolume* _tmp7_; GIcon* _tmp8_; GIcon* _tmp9_; gchar* _tmp10_; gchar* _tmp11_; -#line 227 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 133 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _tmp7_ = volume; -#line 227 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 133 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _tmp8_ = g_volume_get_icon (_tmp7_); -#line 227 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 133 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _tmp9_ = _tmp8_; -#line 227 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 133 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _tmp10_ = g_icon_to_string (_tmp9_); -#line 227 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 133 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _tmp11_ = _tmp10_; -#line 227 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 133 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_object_unref0 (_tmp9_); -#line 227 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 133 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" result = _tmp11_; -#line 227 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 133 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_object_unref0 (volume); -#line 227 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 133 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" __g_list_free__g_object_unref0_0 (volume_collection); -#line 227 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 133 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" return result; -#line 2108 "CameraTable.c" +#line 1660 "CameraTable.c" } -#line 225 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 131 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_object_unref0 (volume); -#line 2112 "CameraTable.c" +#line 1664 "CameraTable.c" } } -#line 225 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 131 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" __g_list_free__g_object_unref0_0 (volume_collection); -#line 2117 "CameraTable.c" +#line 1669 "CameraTable.c" } -#line 230 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 136 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" result = NULL; -#line 230 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 136 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" return result; -#line 2123 "CameraTable.c" +#line 1675 "CameraTable.c" } static gpointer _discovered_camera_ref0 (gpointer self) { -#line 292 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 187 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" return self ? discovered_camera_ref (self) : NULL; -#line 2132 "CameraTable.c" +#line 1684 "CameraTable.c" } static void -_vala_array_add70 (DiscoveredCamera** * array, +_vala_array_add69 (DiscoveredCamera** * array, int* length, int* size, DiscoveredCamera* value) { -#line 292 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 187 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" if ((*length) == (*size)) { -#line 292 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 187 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" *size = (*size) ? (2 * (*size)) : 4; -#line 292 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 187 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" *array = g_renew (DiscoveredCamera*, *array, (*size) + 1); -#line 2148 "CameraTable.c" +#line 1700 "CameraTable.c" } -#line 292 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 187 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" (*array)[(*length)++] = value; -#line 292 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 187 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" (*array)[*length] = NULL; -#line 2154 "CameraTable.c" +#line 1706 "CameraTable.c" } @@ -2173,2149 +1723,2025 @@ camera_table_update_camera_table (CameraTable* self, GPContext* _tmp8_; GeeHashMap* detected_map = NULL; GeeHashMap* _tmp9_; - gchar** usb_cameras = NULL; - gint _tmp10_; - gchar** _tmp11_; - gint usb_cameras_length1; - gint _usb_cameras_size_; DiscoveredCamera** missing = NULL; - DiscoveredCamera** _tmp41_; + DiscoveredCamera** _tmp31_; gint missing_length1; gint _missing_size_; - DiscoveredCamera** _tmp72_; - gint _tmp72__length1; + DiscoveredCamera** _tmp62_; + gint _tmp62__length1; GError * _inner_error_ = NULL; -#line 233 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 139 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" g_return_if_fail (IS_CAMERA_TABLE (self)); -#line 236 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 142 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _tmp1_ = gp_port_info_list_new (&_tmp0_); -#line 236 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 142 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _gp_port_info_list_free0 (port_info_list); -#line 236 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 142 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" port_info_list = _tmp0_; -#line 236 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 142 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" camera_table_do_op (self, _tmp1_, "create port list", &_inner_error_); -#line 236 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 142 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 236 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 142 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" if (_inner_error_->domain == GPHOTO_ERROR) { -#line 236 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 142 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" g_propagate_error (error, _inner_error_); -#line 236 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 142 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _gp_port_info_list_free0 (port_info_list); -#line 236 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 142 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" return; -#line 2207 "CameraTable.c" +#line 1754 "CameraTable.c" } else { -#line 236 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 142 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _gp_port_info_list_free0 (port_info_list); -#line 236 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 142 "/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 236 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 142 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" g_clear_error (&_inner_error_); -#line 236 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 142 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" return; -#line 2217 "CameraTable.c" +#line 1764 "CameraTable.c" } } -#line 237 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 143 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _tmp2_ = port_info_list; -#line 237 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 143 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" camera_table_do_op (self, gp_port_info_list_load (_tmp2_), "load port list", &_inner_error_); -#line 237 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 143 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 237 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 143 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" if (_inner_error_->domain == GPHOTO_ERROR) { -#line 237 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 143 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" g_propagate_error (error, _inner_error_); -#line 237 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 143 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _gp_port_info_list_free0 (port_info_list); -#line 237 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 143 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" return; -#line 2234 "CameraTable.c" +#line 1781 "CameraTable.c" } else { -#line 237 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 143 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _gp_port_info_list_free0 (port_info_list); -#line 237 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 143 "/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 237 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 143 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" g_clear_error (&_inner_error_); -#line 237 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 143 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" return; -#line 2244 "CameraTable.c" +#line 1791 "CameraTable.c" } } -#line 240 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 146 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _tmp4_ = gp_list_new (&_tmp3_); -#line 240 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 146 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _gp_list_unref0 (camera_list); -#line 240 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 146 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" camera_list = _tmp3_; -#line 240 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 146 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" camera_table_do_op (self, _tmp4_, "create camera list", &_inner_error_); -#line 240 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 146 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 240 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 146 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" if (_inner_error_->domain == GPHOTO_ERROR) { -#line 240 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 146 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" g_propagate_error (error, _inner_error_); -#line 240 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 146 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _gp_list_unref0 (camera_list); -#line 240 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 146 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _gp_port_info_list_free0 (port_info_list); -#line 240 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 146 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" return; -#line 2267 "CameraTable.c" +#line 1814 "CameraTable.c" } else { -#line 240 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 146 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _gp_list_unref0 (camera_list); -#line 240 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 146 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _gp_port_info_list_free0 (port_info_list); -#line 240 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 146 "/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 240 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 146 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" g_clear_error (&_inner_error_); -#line 240 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 146 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" return; -#line 2279 "CameraTable.c" +#line 1826 "CameraTable.c" } } -#line 241 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 147 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _tmp5_ = self->priv->abilities_list; -#line 241 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 147 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _tmp6_ = port_info_list; -#line 241 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 147 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _tmp7_ = camera_list; -#line 241 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 147 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _tmp8_ = self->priv->null_context; -#line 241 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 147 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" camera_table_do_op (self, gp_abilities_list_detect (_tmp5_, _tmp6_, _tmp7_, _tmp8_), "detect cameras", &_inner_error_); -#line 241 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 147 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 241 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 147 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" if (_inner_error_->domain == GPHOTO_ERROR) { -#line 241 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 147 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" g_propagate_error (error, _inner_error_); -#line 241 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 147 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _gp_list_unref0 (camera_list); -#line 241 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 147 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _gp_port_info_list_free0 (port_info_list); -#line 241 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 147 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" return; -#line 2304 "CameraTable.c" +#line 1851 "CameraTable.c" } else { -#line 241 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 147 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _gp_list_unref0 (camera_list); -#line 241 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 147 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _gp_port_info_list_free0 (port_info_list); -#line 241 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 147 "/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 241 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 147 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" g_clear_error (&_inner_error_); -#line 241 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 147 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" return; -#line 2316 "CameraTable.c" +#line 1863 "CameraTable.c" } } -#line 243 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 149 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _tmp9_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); -#line 243 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 149 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" detected_map = _tmp9_; -#line 246 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp11_ = camera_table_get_all_usb_cameras (self, &_tmp10_); -#line 246 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - usb_cameras = _tmp11_; -#line 246 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - usb_cameras_length1 = _tmp10_; -#line 246 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _usb_cameras_size_ = usb_cameras_length1; -#line 2331 "CameraTable.c" +#line 1870 "CameraTable.c" { gint ctr = 0; -#line 249 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 152 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" ctr = 0; -#line 2336 "CameraTable.c" +#line 1875 "CameraTable.c" { - gboolean _tmp12_ = FALSE; -#line 249 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp12_ = TRUE; -#line 249 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + gboolean _tmp10_ = FALSE; +#line 152 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _tmp10_ = TRUE; +#line 152 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" while (TRUE) { -#line 2343 "CameraTable.c" - gint _tmp14_; - CameraList* _tmp15_; +#line 1882 "CameraTable.c" + gint _tmp12_; + CameraList* _tmp13_; gchar* name = NULL; - CameraList* _tmp16_; - gint _tmp17_; - const gchar* _tmp18_ = NULL; - int _tmp19_; - gchar* _tmp20_; + CameraList* _tmp14_; + gint _tmp15_; + const gchar* _tmp16_ = NULL; + int _tmp17_; + gchar* _tmp18_; gchar* port = NULL; - CameraList* _tmp21_; - gint _tmp22_; - const gchar* _tmp23_ = NULL; - int _tmp24_; - gchar* _tmp25_; - gint _tmp26_; - CameraList* _tmp27_; - const gchar* _tmp28_; + CameraList* _tmp19_; + gint _tmp20_; + const gchar* _tmp21_ = NULL; + int _tmp22_; + gchar* _tmp23_; + gint _tmp24_; + CameraList* _tmp25_; + const gchar* _tmp26_; + const gchar* _tmp27_; + GeeHashMap* _tmp28_; const gchar* _tmp29_; const gchar* _tmp30_; - GeeHashMap* _tmp38_; - const gchar* _tmp39_; - const gchar* _tmp40_; -#line 249 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - if (!_tmp12_) { -#line 2368 "CameraTable.c" - gint _tmp13_; -#line 249 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp13_ = ctr; -#line 249 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - ctr = _tmp13_ + 1; -#line 2374 "CameraTable.c" +#line 152 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + if (!_tmp10_) { +#line 1906 "CameraTable.c" + gint _tmp11_; +#line 152 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _tmp11_ = ctr; +#line 152 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + ctr = _tmp11_ + 1; +#line 1912 "CameraTable.c" } -#line 249 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp12_ = FALSE; -#line 249 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp14_ = ctr; -#line 249 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp15_ = camera_list; -#line 249 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - if (!(_tmp14_ < gp_list_count (_tmp15_))) { -#line 249 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 152 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _tmp10_ = FALSE; +#line 152 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _tmp12_ = ctr; +#line 152 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _tmp13_ = camera_list; +#line 152 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + if (!(_tmp12_ < gp_list_count (_tmp13_))) { +#line 152 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" break; -#line 2386 "CameraTable.c" +#line 1924 "CameraTable.c" } -#line 251 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp16_ = camera_list; -#line 251 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp17_ = ctr; -#line 251 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp19_ = gp_list_get_name (_tmp16_, _tmp17_, &_tmp18_); -#line 251 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 154 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _tmp14_ = camera_list; +#line 154 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _tmp15_ = ctr; +#line 154 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _tmp17_ = gp_list_get_name (_tmp14_, _tmp15_, &_tmp16_); +#line 154 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (name); -#line 251 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp20_ = g_strdup (_tmp18_); -#line 251 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - name = _tmp20_; -#line 251 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - camera_table_do_op (self, _tmp19_, "get detected camera name", &_inner_error_); -#line 251 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 154 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _tmp18_ = g_strdup (_tmp16_); +#line 154 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + name = _tmp18_; +#line 154 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + camera_table_do_op (self, _tmp17_, "get detected camera name", &_inner_error_); +#line 154 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 251 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 154 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" if (_inner_error_->domain == GPHOTO_ERROR) { -#line 251 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 154 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" g_propagate_error (error, _inner_error_); -#line 251 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 154 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (name); -#line 251 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - usb_cameras = (_vala_array_free (usb_cameras, usb_cameras_length1, (GDestroyNotify) g_free), NULL); -#line 251 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 154 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_object_unref0 (detected_map); -#line 251 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 154 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _gp_list_unref0 (camera_list); -#line 251 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 154 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _gp_port_info_list_free0 (port_info_list); -#line 251 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 154 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" return; -#line 2420 "CameraTable.c" +#line 1956 "CameraTable.c" } else { -#line 251 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 154 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (name); -#line 251 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - usb_cameras = (_vala_array_free (usb_cameras, usb_cameras_length1, (GDestroyNotify) g_free), NULL); -#line 251 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 154 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_object_unref0 (detected_map); -#line 251 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 154 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _gp_list_unref0 (camera_list); -#line 251 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 154 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _gp_port_info_list_free0 (port_info_list); -#line 251 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 154 "/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 251 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 154 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" g_clear_error (&_inner_error_); -#line 251 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 154 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" return; -#line 2438 "CameraTable.c" +#line 1972 "CameraTable.c" } } -#line 254 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp21_ = camera_list; -#line 254 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp22_ = ctr; -#line 254 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp24_ = gp_list_get_value (_tmp21_, _tmp22_, &_tmp23_); -#line 254 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 157 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _tmp19_ = camera_list; +#line 157 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _tmp20_ = ctr; +#line 157 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _tmp22_ = gp_list_get_value (_tmp19_, _tmp20_, &_tmp21_); +#line 157 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (port); -#line 254 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp25_ = g_strdup (_tmp23_); -#line 254 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - port = _tmp25_; -#line 254 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - camera_table_do_op (self, _tmp24_, "get detected camera port", &_inner_error_); -#line 254 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 157 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _tmp23_ = g_strdup (_tmp21_); +#line 157 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + port = _tmp23_; +#line 157 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + camera_table_do_op (self, _tmp22_, "get detected camera port", &_inner_error_); +#line 157 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 254 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 157 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" if (_inner_error_->domain == GPHOTO_ERROR) { -#line 254 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 157 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" g_propagate_error (error, _inner_error_); -#line 254 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 157 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (port); -#line 254 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 157 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (name); -#line 254 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - usb_cameras = (_vala_array_free (usb_cameras, usb_cameras_length1, (GDestroyNotify) g_free), NULL); -#line 254 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 157 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_object_unref0 (detected_map); -#line 254 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 157 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _gp_list_unref0 (camera_list); -#line 254 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 157 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _gp_port_info_list_free0 (port_info_list); -#line 254 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 157 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" return; -#line 2475 "CameraTable.c" +#line 2007 "CameraTable.c" } else { -#line 254 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 157 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (port); -#line 254 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 157 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (name); -#line 254 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - usb_cameras = (_vala_array_free (usb_cameras, usb_cameras_length1, (GDestroyNotify) g_free), NULL); -#line 254 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 157 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_object_unref0 (detected_map); -#line 254 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 157 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _gp_list_unref0 (camera_list); -#line 254 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 157 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _gp_port_info_list_free0 (port_info_list); -#line 254 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 157 "/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 254 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 157 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" g_clear_error (&_inner_error_); -#line 254 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 157 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" return; -#line 2495 "CameraTable.c" +#line 2025 "CameraTable.c" } } -#line 256 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp26_ = ctr; -#line 256 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp27_ = camera_list; -#line 256 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp28_ = name; -#line 256 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 159 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _tmp24_ = ctr; +#line 159 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _tmp25_ = camera_list; +#line 159 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _tmp26_ = name; +#line 159 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _tmp27_ = port; +#line 159 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + g_debug ("CameraTable.vala:159: Detected %d/%d %s @ %s", _tmp24_ + 1, gp_list_count (_tmp25_), _tmp26_, _tmp27_); +#line 162 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _tmp28_ = detected_map; +#line 162 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _tmp29_ = port; -#line 256 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - g_debug ("CameraTable.vala:256: Detected %d/%d %s @ %s", _tmp26_ + 1, gp_list_count (_tmp27_), _tmp28_, _tmp29_); -#line 259 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp30_ = port; -#line 259 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - if (g_str_has_prefix (_tmp30_, "usb:")) { -#line 2512 "CameraTable.c" - gchar* full_port = NULL; - CameraList* _tmp31_; - gchar** _tmp32_; - gint _tmp32__length1; - const gchar* _tmp33_; - gchar* _tmp34_ = NULL; - gboolean _tmp35_; - const gchar* _tmp36_; - gchar* _tmp37_; -#line 261 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp31_ = camera_list; -#line 261 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp32_ = usb_cameras; -#line 261 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp32__length1 = usb_cameras_length1; -#line 261 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp33_ = port; -#line 261 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp35_ = camera_table_usb_esp (self, gp_list_count (_tmp31_), _tmp32_, _tmp32__length1, _tmp33_, &_tmp34_); -#line 261 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _g_free0 (full_port); -#line 261 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - full_port = _tmp34_; -#line 261 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - if (!_tmp35_) { -#line 262 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _g_free0 (full_port); -#line 262 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _g_free0 (port); -#line 262 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _g_free0 (name); -#line 262 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - continue; -#line 2546 "CameraTable.c" - } -#line 264 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp36_ = full_port; -#line 264 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp37_ = g_strdup (_tmp36_); -#line 264 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _g_free0 (port); -#line 264 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - port = _tmp37_; -#line 259 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _g_free0 (full_port); -#line 2558 "CameraTable.c" - } -#line 267 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp38_ = detected_map; -#line 267 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp39_ = port; -#line 267 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp40_ = name; -#line 267 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp39_, _tmp40_); -#line 249 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 162 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _tmp30_ = name; +#line 162 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp29_, _tmp30_); +#line 152 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (port); -#line 249 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 152 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (name); -#line 2572 "CameraTable.c" +#line 2050 "CameraTable.c" } } } -#line 271 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp41_ = g_new0 (DiscoveredCamera*, 0 + 1); -#line 271 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - missing = _tmp41_; -#line 271 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 166 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _tmp31_ = g_new0 (DiscoveredCamera*, 0 + 1); +#line 166 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + missing = _tmp31_; +#line 166 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" missing_length1 = 0; -#line 271 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 166 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _missing_size_ = missing_length1; -#line 2584 "CameraTable.c" +#line 2062 "CameraTable.c" { GeeIterator* _camera_it = NULL; - GeeHashMap* _tmp42_; - GeeCollection* _tmp43_; - GeeCollection* _tmp44_; - GeeCollection* _tmp45_; - GeeIterator* _tmp46_; - GeeIterator* _tmp47_; -#line 272 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp42_ = self->priv->camera_map; -#line 272 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp43_ = gee_abstract_map_get_values (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap)); -#line 272 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp44_ = _tmp43_; -#line 272 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp45_ = _tmp44_; -#line 272 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp46_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 272 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp47_ = _tmp46_; -#line 272 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _g_object_unref0 (_tmp45_); -#line 272 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _camera_it = _tmp47_; -#line 272 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + GeeHashMap* _tmp32_; + GeeCollection* _tmp33_; + GeeCollection* _tmp34_; + GeeCollection* _tmp35_; + GeeIterator* _tmp36_; + GeeIterator* _tmp37_; +#line 167 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _tmp32_ = self->priv->camera_map; +#line 167 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _tmp33_ = gee_abstract_map_get_values (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap)); +#line 167 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _tmp34_ = _tmp33_; +#line 167 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _tmp35_ = _tmp34_; +#line 167 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _tmp36_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, GEE_TYPE_ITERABLE, GeeIterable)); +#line 167 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _tmp37_ = _tmp36_; +#line 167 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _g_object_unref0 (_tmp35_); +#line 167 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _camera_it = _tmp37_; +#line 167 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" while (TRUE) { -#line 2611 "CameraTable.c" - GeeIterator* _tmp48_; +#line 2089 "CameraTable.c" + GeeIterator* _tmp38_; DiscoveredCamera* camera = NULL; - GeeIterator* _tmp49_; - gpointer _tmp50_; + GeeIterator* _tmp39_; + gpointer _tmp40_; GPPortInfo port_info = {0}; gchar* tmp_path = NULL; - DiscoveredCamera* _tmp51_; - Camera* _tmp52_; - GPPortInfo _tmp53_ = {0}; - int _tmp54_; - const gchar* _tmp55_ = NULL; - gchar* _tmp56_; + DiscoveredCamera* _tmp41_; + Camera* _tmp42_; + GPPortInfo _tmp43_ = {0}; + int _tmp44_; + const gchar* _tmp45_ = NULL; + gchar* _tmp46_; CameraAbilities abilities = {0}; - DiscoveredCamera* _tmp57_; - Camera* _tmp58_; - CameraAbilities _tmp59_ = {0}; - int _tmp60_; - GeeHashMap* _tmp61_; - const gchar* _tmp62_; - CameraAbilities _tmp66_; - const gchar* _tmp67_; - const gchar* _tmp68_; - DiscoveredCamera** _tmp69_; - gint _tmp69__length1; - DiscoveredCamera* _tmp70_; - DiscoveredCamera* _tmp71_; -#line 272 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp48_ = _camera_it; -#line 272 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - if (!gee_iterator_next (_tmp48_)) { -#line 272 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + DiscoveredCamera* _tmp47_; + Camera* _tmp48_; + CameraAbilities _tmp49_ = {0}; + int _tmp50_; + GeeHashMap* _tmp51_; + const gchar* _tmp52_; + CameraAbilities _tmp56_; + const gchar* _tmp57_; + const gchar* _tmp58_; + DiscoveredCamera** _tmp59_; + gint _tmp59__length1; + DiscoveredCamera* _tmp60_; + DiscoveredCamera* _tmp61_; +#line 167 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _tmp38_ = _camera_it; +#line 167 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + if (!gee_iterator_next (_tmp38_)) { +#line 167 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" break; -#line 2644 "CameraTable.c" +#line 2122 "CameraTable.c" } -#line 272 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp49_ = _camera_it; -#line 272 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp50_ = gee_iterator_get (_tmp49_); -#line 272 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - camera = (DiscoveredCamera*) _tmp50_; -#line 276 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp51_ = camera; -#line 276 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp52_ = _tmp51_->gcamera; -#line 276 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp54_ = gp_camera_get_port_info (_tmp52_, &_tmp53_); -#line 276 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 167 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _tmp39_ = _camera_it; +#line 167 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _tmp40_ = gee_iterator_get (_tmp39_); +#line 167 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + camera = (DiscoveredCamera*) _tmp40_; +#line 171 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _tmp41_ = camera; +#line 171 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _tmp42_ = _tmp41_->gcamera; +#line 171 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _tmp44_ = gp_camera_get_port_info (_tmp42_, &_tmp43_); +#line 171 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" (port_info); -#line 276 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - port_info = _tmp53_; -#line 276 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - camera_table_do_op (self, _tmp54_, "retrieve missing camera port information", &_inner_error_); -#line 276 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 171 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + port_info = _tmp43_; +#line 171 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + camera_table_do_op (self, _tmp44_, "retrieve missing camera port information", &_inner_error_); +#line 171 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 276 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 171 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" if (_inner_error_->domain == GPHOTO_ERROR) { -#line 276 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 171 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" g_propagate_error (error, _inner_error_); -#line 276 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 171 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (tmp_path); -#line 276 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 171 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" (port_info); -#line 276 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 171 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _discovered_camera_unref0 (camera); -#line 276 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 171 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_object_unref0 (_camera_it); -#line 276 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 171 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" missing = (_vala_array_free (missing, missing_length1, (GDestroyNotify) discovered_camera_unref), NULL); -#line 276 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - usb_cameras = (_vala_array_free (usb_cameras, usb_cameras_length1, (GDestroyNotify) g_free), NULL); -#line 276 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 171 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_object_unref0 (detected_map); -#line 276 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 171 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _gp_list_unref0 (camera_list); -#line 276 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 171 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _gp_port_info_list_free0 (port_info_list); -#line 276 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 171 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" return; -#line 2690 "CameraTable.c" +#line 2166 "CameraTable.c" } else { -#line 276 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 171 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (tmp_path); -#line 276 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 171 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" (port_info); -#line 276 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 171 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _discovered_camera_unref0 (camera); -#line 276 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 171 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_object_unref0 (_camera_it); -#line 276 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 171 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" missing = (_vala_array_free (missing, missing_length1, (GDestroyNotify) discovered_camera_unref), NULL); -#line 276 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - usb_cameras = (_vala_array_free (usb_cameras, usb_cameras_length1, (GDestroyNotify) g_free), NULL); -#line 276 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 171 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_object_unref0 (detected_map); -#line 276 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 171 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _gp_list_unref0 (camera_list); -#line 276 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 171 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _gp_port_info_list_free0 (port_info_list); -#line 276 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 171 "/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 276 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 171 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" g_clear_error (&_inner_error_); -#line 276 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 171 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" return; -#line 2716 "CameraTable.c" +#line 2190 "CameraTable.c" } } -#line 279 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - gp_port_info_get_path (port_info, &_tmp55_); -#line 279 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 174 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + gp_port_info_get_path (port_info, &_tmp45_); +#line 174 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (tmp_path); -#line 279 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp56_ = g_strdup (_tmp55_); -#line 279 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - tmp_path = _tmp56_; -#line 282 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp57_ = camera; -#line 282 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp58_ = _tmp57_->gcamera; -#line 282 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp60_ = gp_camera_get_abilities (_tmp58_, &_tmp59_); -#line 282 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 174 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _tmp46_ = g_strdup (_tmp45_); +#line 174 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + tmp_path = _tmp46_; +#line 177 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _tmp47_ = camera; +#line 177 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _tmp48_ = _tmp47_->gcamera; +#line 177 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _tmp50_ = gp_camera_get_abilities (_tmp48_, &_tmp49_); +#line 177 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" (abilities); -#line 282 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - abilities = _tmp59_; -#line 282 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - camera_table_do_op (self, _tmp60_, "retrieve camera abilities", &_inner_error_); -#line 282 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 177 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + abilities = _tmp49_; +#line 177 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + camera_table_do_op (self, _tmp50_, "retrieve camera abilities", &_inner_error_); +#line 177 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 282 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 177 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" if (_inner_error_->domain == GPHOTO_ERROR) { -#line 282 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 177 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" g_propagate_error (error, _inner_error_); -#line 282 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 177 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" (abilities); -#line 282 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 177 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (tmp_path); -#line 282 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 177 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" (port_info); -#line 282 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 177 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _discovered_camera_unref0 (camera); -#line 282 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 177 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_object_unref0 (_camera_it); -#line 282 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 177 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" missing = (_vala_array_free (missing, missing_length1, (GDestroyNotify) discovered_camera_unref), NULL); -#line 282 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - usb_cameras = (_vala_array_free (usb_cameras, usb_cameras_length1, (GDestroyNotify) g_free), NULL); -#line 282 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 177 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_object_unref0 (detected_map); -#line 282 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 177 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _gp_list_unref0 (camera_list); -#line 282 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 177 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _gp_port_info_list_free0 (port_info_list); -#line 282 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 177 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" return; -#line 2767 "CameraTable.c" +#line 2239 "CameraTable.c" } else { -#line 282 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 177 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" (abilities); -#line 282 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 177 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (tmp_path); -#line 282 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 177 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" (port_info); -#line 282 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 177 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _discovered_camera_unref0 (camera); -#line 282 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 177 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_object_unref0 (_camera_it); -#line 282 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 177 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" missing = (_vala_array_free (missing, missing_length1, (GDestroyNotify) discovered_camera_unref), NULL); -#line 282 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - usb_cameras = (_vala_array_free (usb_cameras, usb_cameras_length1, (GDestroyNotify) g_free), NULL); -#line 282 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 177 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_object_unref0 (detected_map); -#line 282 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 177 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _gp_list_unref0 (camera_list); -#line 282 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 177 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _gp_port_info_list_free0 (port_info_list); -#line 282 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 177 "/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 282 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 177 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" g_clear_error (&_inner_error_); -#line 282 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 177 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" return; -#line 2795 "CameraTable.c" +#line 2265 "CameraTable.c" } } -#line 284 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp61_ = detected_map; -#line 284 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp62_ = tmp_path; -#line 284 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - if (gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp61_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp62_)) { -#line 2804 "CameraTable.c" - CameraAbilities _tmp63_; - const gchar* _tmp64_; - const gchar* _tmp65_; -#line 285 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp63_ = abilities; -#line 285 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp64_ = _tmp63_.model; -#line 285 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp65_ = tmp_path; -#line 285 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - g_debug ("CameraTable.vala:285: Found camera for %s @ %s in detected map", _tmp64_, _tmp65_); -#line 287 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 179 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _tmp51_ = detected_map; +#line 179 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _tmp52_ = tmp_path; +#line 179 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + if (gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp51_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp52_)) { +#line 2274 "CameraTable.c" + CameraAbilities _tmp53_; + const gchar* _tmp54_; + const gchar* _tmp55_; +#line 180 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _tmp53_ = abilities; +#line 180 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _tmp54_ = _tmp53_.model; +#line 180 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _tmp55_ = tmp_path; +#line 180 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + g_debug ("CameraTable.vala:180: Found camera for %s @ %s in detected map", _tmp54_, _tmp55_); +#line 182 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" (abilities); -#line 287 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 182 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (tmp_path); -#line 287 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 182 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" (port_info); -#line 287 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 182 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _discovered_camera_unref0 (camera); -#line 287 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 182 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" continue; -#line 2826 "CameraTable.c" +#line 2296 "CameraTable.c" } -#line 290 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp66_ = abilities; -#line 290 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp67_ = _tmp66_.model; -#line 290 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp68_ = tmp_path; -#line 290 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - g_debug ("CameraTable.vala:290: %s @ %s missing", _tmp67_, _tmp68_); -#line 292 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp69_ = missing; -#line 292 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp69__length1 = missing_length1; -#line 292 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp70_ = camera; -#line 292 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp71_ = _discovered_camera_ref0 (_tmp70_); -#line 292 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _vala_array_add70 (&missing, &missing_length1, &_missing_size_, _tmp71_); -#line 272 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 185 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _tmp56_ = abilities; +#line 185 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _tmp57_ = _tmp56_.model; +#line 185 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _tmp58_ = tmp_path; +#line 185 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + g_debug ("CameraTable.vala:185: %s @ %s missing", _tmp57_, _tmp58_); +#line 187 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _tmp59_ = missing; +#line 187 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _tmp59__length1 = missing_length1; +#line 187 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _tmp60_ = camera; +#line 187 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _tmp61_ = _discovered_camera_ref0 (_tmp60_); +#line 187 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _vala_array_add69 (&missing, &missing_length1, &_missing_size_, _tmp61_); +#line 167 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" (abilities); -#line 272 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 167 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (tmp_path); -#line 272 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 167 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" (port_info); -#line 272 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 167 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _discovered_camera_unref0 (camera); -#line 2854 "CameraTable.c" +#line 2324 "CameraTable.c" } -#line 272 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 167 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_object_unref0 (_camera_it); -#line 2858 "CameraTable.c" +#line 2328 "CameraTable.c" } -#line 296 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp72_ = missing; -#line 296 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp72__length1 = missing_length1; -#line 2864 "CameraTable.c" +#line 191 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _tmp62_ = missing; +#line 191 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _tmp62__length1 = missing_length1; +#line 2334 "CameraTable.c" { DiscoveredCamera** camera_collection = NULL; gint camera_collection_length1 = 0; gint _camera_collection_size_ = 0; gint camera_it = 0; -#line 296 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - camera_collection = _tmp72_; -#line 296 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - camera_collection_length1 = _tmp72__length1; -#line 296 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - for (camera_it = 0; camera_it < _tmp72__length1; camera_it = camera_it + 1) { -#line 2876 "CameraTable.c" - DiscoveredCamera* _tmp73_; +#line 191 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + camera_collection = _tmp62_; +#line 191 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + camera_collection_length1 = _tmp62__length1; +#line 191 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + for (camera_it = 0; camera_it < _tmp62__length1; camera_it = camera_it + 1) { +#line 2346 "CameraTable.c" + DiscoveredCamera* _tmp63_; DiscoveredCamera* camera = NULL; -#line 296 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp73_ = _discovered_camera_ref0 (camera_collection[camera_it]); -#line 296 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - camera = _tmp73_; -#line 2883 "CameraTable.c" +#line 191 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _tmp63_ = _discovered_camera_ref0 (camera_collection[camera_it]); +#line 191 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + camera = _tmp63_; +#line 2353 "CameraTable.c" { GPPortInfo port_info = {0}; gchar* tmp_path = NULL; - DiscoveredCamera* _tmp74_; - Camera* _tmp75_; - GPPortInfo _tmp76_ = {0}; - int _tmp77_; - const gchar* _tmp78_ = NULL; - gchar* _tmp79_; + DiscoveredCamera* _tmp64_; + Camera* _tmp65_; + GPPortInfo _tmp66_ = {0}; + int _tmp67_; + const gchar* _tmp68_ = NULL; + gchar* _tmp69_; CameraAbilities abilities = {0}; - DiscoveredCamera* _tmp80_; - Camera* _tmp81_; - CameraAbilities _tmp82_ = {0}; - int _tmp83_; - CameraAbilities _tmp84_; - const gchar* _tmp85_; - const gchar* _tmp86_; - GeeHashMap* _tmp87_; - const gchar* _tmp88_; - gchar* _tmp89_; - gchar* _tmp90_; - DiscoveredCamera* _tmp91_; -#line 300 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp74_ = camera; -#line 300 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp75_ = _tmp74_->gcamera; -#line 300 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp77_ = gp_camera_get_port_info (_tmp75_, &_tmp76_); -#line 300 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + DiscoveredCamera* _tmp70_; + Camera* _tmp71_; + CameraAbilities _tmp72_ = {0}; + int _tmp73_; + CameraAbilities _tmp74_; + const gchar* _tmp75_; + const gchar* _tmp76_; + GeeHashMap* _tmp77_; + const gchar* _tmp78_; + gchar* _tmp79_; + gchar* _tmp80_; + DiscoveredCamera* _tmp81_; +#line 195 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _tmp64_ = camera; +#line 195 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _tmp65_ = _tmp64_->gcamera; +#line 195 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _tmp67_ = gp_camera_get_port_info (_tmp65_, &_tmp66_); +#line 195 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" (port_info); -#line 300 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - port_info = _tmp76_; -#line 300 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - camera_table_do_op (self, _tmp77_, "retrieve missing camera port information", &_inner_error_); -#line 300 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 195 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + port_info = _tmp66_; +#line 195 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + camera_table_do_op (self, _tmp67_, "retrieve missing camera port information", &_inner_error_); +#line 195 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 300 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 195 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" if (_inner_error_->domain == GPHOTO_ERROR) { -#line 300 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 195 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" g_propagate_error (error, _inner_error_); -#line 300 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 195 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (tmp_path); -#line 300 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 195 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" (port_info); -#line 300 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 195 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _discovered_camera_unref0 (camera); -#line 300 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 195 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" missing = (_vala_array_free (missing, missing_length1, (GDestroyNotify) discovered_camera_unref), NULL); -#line 300 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - usb_cameras = (_vala_array_free (usb_cameras, usb_cameras_length1, (GDestroyNotify) g_free), NULL); -#line 300 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 195 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_object_unref0 (detected_map); -#line 300 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 195 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _gp_list_unref0 (camera_list); -#line 300 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 195 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _gp_port_info_list_free0 (port_info_list); -#line 300 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 195 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" return; -#line 2942 "CameraTable.c" +#line 2410 "CameraTable.c" } else { -#line 300 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 195 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (tmp_path); -#line 300 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 195 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" (port_info); -#line 300 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 195 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _discovered_camera_unref0 (camera); -#line 300 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 195 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" missing = (_vala_array_free (missing, missing_length1, (GDestroyNotify) discovered_camera_unref), NULL); -#line 300 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - usb_cameras = (_vala_array_free (usb_cameras, usb_cameras_length1, (GDestroyNotify) g_free), NULL); -#line 300 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 195 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_object_unref0 (detected_map); -#line 300 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 195 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _gp_list_unref0 (camera_list); -#line 300 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 195 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _gp_port_info_list_free0 (port_info_list); -#line 300 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 195 "/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 300 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 195 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" g_clear_error (&_inner_error_); -#line 300 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 195 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" return; -#line 2966 "CameraTable.c" +#line 2432 "CameraTable.c" } } -#line 302 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - gp_port_info_get_path (port_info, &_tmp78_); -#line 302 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 197 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + gp_port_info_get_path (port_info, &_tmp68_); +#line 197 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (tmp_path); -#line 302 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp79_ = g_strdup (_tmp78_); -#line 302 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - tmp_path = _tmp79_; -#line 305 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp80_ = camera; -#line 305 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp81_ = _tmp80_->gcamera; -#line 305 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp83_ = gp_camera_get_abilities (_tmp81_, &_tmp82_); -#line 305 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 197 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _tmp69_ = g_strdup (_tmp68_); +#line 197 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + tmp_path = _tmp69_; +#line 200 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _tmp70_ = camera; +#line 200 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _tmp71_ = _tmp70_->gcamera; +#line 200 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _tmp73_ = gp_camera_get_abilities (_tmp71_, &_tmp72_); +#line 200 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" (abilities); -#line 305 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - abilities = _tmp82_; -#line 305 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - camera_table_do_op (self, _tmp83_, "retrieve missing camera abilities", &_inner_error_); -#line 305 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 200 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + abilities = _tmp72_; +#line 200 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + camera_table_do_op (self, _tmp73_, "retrieve missing camera abilities", &_inner_error_); +#line 200 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 305 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 200 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" if (_inner_error_->domain == GPHOTO_ERROR) { -#line 305 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 200 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" g_propagate_error (error, _inner_error_); -#line 305 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 200 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" (abilities); -#line 305 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 200 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (tmp_path); -#line 305 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 200 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" (port_info); -#line 305 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 200 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _discovered_camera_unref0 (camera); -#line 305 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 200 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" missing = (_vala_array_free (missing, missing_length1, (GDestroyNotify) discovered_camera_unref), NULL); -#line 305 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - usb_cameras = (_vala_array_free (usb_cameras, usb_cameras_length1, (GDestroyNotify) g_free), NULL); -#line 305 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 200 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_object_unref0 (detected_map); -#line 305 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 200 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _gp_list_unref0 (camera_list); -#line 305 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 200 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _gp_port_info_list_free0 (port_info_list); -#line 305 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 200 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" return; -#line 3015 "CameraTable.c" +#line 2479 "CameraTable.c" } else { -#line 305 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 200 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" (abilities); -#line 305 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 200 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (tmp_path); -#line 305 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 200 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" (port_info); -#line 305 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 200 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _discovered_camera_unref0 (camera); -#line 305 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 200 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" missing = (_vala_array_free (missing, missing_length1, (GDestroyNotify) discovered_camera_unref), NULL); -#line 305 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - usb_cameras = (_vala_array_free (usb_cameras, usb_cameras_length1, (GDestroyNotify) g_free), NULL); -#line 305 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 200 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_object_unref0 (detected_map); -#line 305 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 200 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _gp_list_unref0 (camera_list); -#line 305 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 200 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _gp_port_info_list_free0 (port_info_list); -#line 305 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 200 "/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 305 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 200 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" g_clear_error (&_inner_error_); -#line 305 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 200 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" return; -#line 3041 "CameraTable.c" +#line 2503 "CameraTable.c" } } -#line 307 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp84_ = abilities; -#line 307 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp85_ = _tmp84_.model; -#line 307 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp86_ = tmp_path; -#line 307 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - g_debug ("CameraTable.vala:307: Removing from camera table: %s @ %s", _tmp85_, _tmp86_); -#line 309 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp87_ = self->priv->camera_map; -#line 309 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp88_ = tmp_path; -#line 309 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp89_ = camera_table_get_port_uri (_tmp88_); -#line 309 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp90_ = _tmp89_; -#line 309 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp87_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp90_, NULL); -#line 309 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _g_free0 (_tmp90_); -#line 311 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp91_ = camera; -#line 311 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - g_signal_emit (self, camera_table_signals[CAMERA_TABLE_CAMERA_REMOVED_SIGNAL], 0, _tmp91_); -#line 296 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 202 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _tmp74_ = abilities; +#line 202 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _tmp75_ = _tmp74_.model; +#line 202 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _tmp76_ = tmp_path; +#line 202 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + g_debug ("CameraTable.vala:202: Removing from camera table: %s @ %s", _tmp75_, _tmp76_); +#line 204 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _tmp77_ = self->priv->camera_map; +#line 204 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _tmp78_ = tmp_path; +#line 204 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _tmp79_ = camera_table_get_port_uri (_tmp78_); +#line 204 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _tmp80_ = _tmp79_; +#line 204 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp77_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp80_, NULL); +#line 204 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _g_free0 (_tmp80_); +#line 206 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _tmp81_ = camera; +#line 206 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + g_signal_emit (self, camera_table_signals[CAMERA_TABLE_CAMERA_REMOVED_SIGNAL], 0, _tmp81_); +#line 191 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" (abilities); -#line 296 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 191 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (tmp_path); -#line 296 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 191 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" (port_info); -#line 296 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 191 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _discovered_camera_unref0 (camera); -#line 3076 "CameraTable.c" +#line 2538 "CameraTable.c" } } } { GeeIterator* _port_it = NULL; - GeeHashMap* _tmp92_; - GeeSet* _tmp93_; - GeeSet* _tmp94_; - GeeSet* _tmp95_; - GeeIterator* _tmp96_; - GeeIterator* _tmp97_; -#line 315 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp92_ = detected_map; -#line 315 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp93_ = gee_abstract_map_get_keys (G_TYPE_CHECK_INSTANCE_CAST (_tmp92_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap)); -#line 315 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp94_ = _tmp93_; -#line 315 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp95_ = _tmp94_; -#line 315 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp96_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp95_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 315 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp97_ = _tmp96_; -#line 315 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _g_object_unref0 (_tmp95_); -#line 315 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _port_it = _tmp97_; -#line 315 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + GeeHashMap* _tmp82_; + GeeSet* _tmp83_; + GeeSet* _tmp84_; + GeeSet* _tmp85_; + GeeIterator* _tmp86_; + GeeIterator* _tmp87_; +#line 210 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _tmp82_ = detected_map; +#line 210 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _tmp83_ = gee_abstract_map_get_keys (G_TYPE_CHECK_INSTANCE_CAST (_tmp82_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap)); +#line 210 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _tmp84_ = _tmp83_; +#line 210 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _tmp85_ = _tmp84_; +#line 210 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _tmp86_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp85_, GEE_TYPE_ITERABLE, GeeIterable)); +#line 210 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _tmp87_ = _tmp86_; +#line 210 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _g_object_unref0 (_tmp85_); +#line 210 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _port_it = _tmp87_; +#line 210 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" while (TRUE) { -#line 3106 "CameraTable.c" - GeeIterator* _tmp98_; +#line 2568 "CameraTable.c" + GeeIterator* _tmp88_; gchar* port = NULL; - GeeIterator* _tmp99_; - gpointer _tmp100_; + GeeIterator* _tmp89_; + gpointer _tmp90_; gchar* name = NULL; - GeeHashMap* _tmp101_; - const gchar* _tmp102_; - gpointer _tmp103_; + GeeHashMap* _tmp91_; + const gchar* _tmp92_; + gpointer _tmp93_; gchar* display_name = NULL; gchar* icon = NULL; gchar* uri = NULL; - const gchar* _tmp104_; - gchar* _tmp105_; - GeeHashMap* _tmp106_; - const gchar* _tmp107_; + const gchar* _tmp94_; + gchar* _tmp95_; + GeeHashMap* _tmp96_; + const gchar* _tmp97_; gchar* path = NULL; - const gchar* _tmp110_; - gchar* _tmp111_; - const gchar* _tmp112_; - const gchar* _tmp132_; - const gchar* _tmp151_; + const gchar* _tmp100_; + gchar* _tmp101_; + const gchar* _tmp102_; + const gchar* _tmp122_; + const gchar* _tmp141_; gint index = 0; - GPPortInfoList* _tmp154_; - const gchar* _tmp155_; - gint _tmp156_; + GPPortInfoList* _tmp144_; + const gchar* _tmp145_; + gint _tmp146_; GPPortInfo port_info = {0}; gchar* tmp_path = NULL; - GPPortInfoList* _tmp161_; - gint _tmp162_; - GPPortInfo _tmp163_ = {0}; - int _tmp164_; - const gchar* _tmp165_; - gchar* _tmp166_; - gchar* _tmp167_; - const gchar* _tmp168_ = NULL; - gchar* _tmp169_; - const gchar* _tmp170_; - const gchar* _tmp171_; - CameraAbilitiesList* _tmp172_; - const gchar* _tmp173_; - gint _tmp174_; + GPPortInfoList* _tmp151_; + gint _tmp152_; + GPPortInfo _tmp153_ = {0}; + int _tmp154_; + const gchar* _tmp155_; + gchar* _tmp156_; + gchar* _tmp157_; + const gchar* _tmp158_ = NULL; + gchar* _tmp159_; + const gchar* _tmp160_; + const gchar* _tmp161_; + CameraAbilitiesList* _tmp162_; + const gchar* _tmp163_; + gint _tmp164_; CameraAbilities camera_abilities = {0}; - CameraAbilitiesList* _tmp179_; - gint _tmp180_; - CameraAbilities _tmp181_ = {0}; - int _tmp182_; + CameraAbilitiesList* _tmp169_; + gint _tmp170_; + CameraAbilities _tmp171_ = {0}; + int _tmp172_; + const gchar* _tmp173_; + gchar* _tmp174_; + gchar* _tmp175_; + Camera* gcamera = NULL; + Camera* _tmp176_ = NULL; + int _tmp177_; + const gchar* _tmp178_; + gchar* _tmp179_; + gchar* _tmp180_; + Camera* _tmp181_; + CameraAbilities _tmp182_; const gchar* _tmp183_; gchar* _tmp184_; gchar* _tmp185_; - Camera* gcamera = NULL; - Camera* _tmp186_ = NULL; - int _tmp187_; + Camera* _tmp186_; + GPPortInfo _tmp187_; const gchar* _tmp188_; - gchar* _tmp189_; + const gchar* _tmp189_; gchar* _tmp190_; - Camera* _tmp191_; - CameraAbilities _tmp192_; + gchar* _tmp191_; + const gchar* _tmp192_; const gchar* _tmp193_; - gchar* _tmp194_; - gchar* _tmp195_; - Camera* _tmp196_; - GPPortInfo _tmp197_; - const gchar* _tmp198_; - const gchar* _tmp199_; - gchar* _tmp200_; - gchar* _tmp201_; - const gchar* _tmp202_; - const gchar* _tmp203_; DiscoveredCamera* camera = NULL; - Camera* _tmp204_; - const gchar* _tmp205_; - const gchar* _tmp206_; - const gchar* _tmp207_; - DiscoveredCamera* _tmp208_; - GeeHashMap* _tmp209_; - const gchar* _tmp210_; - DiscoveredCamera* _tmp211_; - DiscoveredCamera* _tmp212_; -#line 315 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp98_ = _port_it; -#line 315 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - if (!gee_iterator_next (_tmp98_)) { -#line 315 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + Camera* _tmp194_; + const gchar* _tmp195_; + const gchar* _tmp196_; + const gchar* _tmp197_; + DiscoveredCamera* _tmp198_; + GeeHashMap* _tmp199_; + const gchar* _tmp200_; + DiscoveredCamera* _tmp201_; + DiscoveredCamera* _tmp202_; +#line 210 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _tmp88_ = _port_it; +#line 210 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + if (!gee_iterator_next (_tmp88_)) { +#line 210 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" break; -#line 3191 "CameraTable.c" +#line 2653 "CameraTable.c" } -#line 315 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp99_ = _port_it; -#line 315 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp100_ = gee_iterator_get (_tmp99_); -#line 315 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - port = (gchar*) _tmp100_; -#line 316 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp101_ = detected_map; -#line 316 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp102_ = port; -#line 316 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp103_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp101_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp102_); -#line 316 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - name = (gchar*) _tmp103_; -#line 317 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 210 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _tmp89_ = _port_it; +#line 210 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _tmp90_ = gee_iterator_get (_tmp89_); +#line 210 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + port = (gchar*) _tmp90_; +#line 211 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _tmp91_ = detected_map; +#line 211 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _tmp92_ = port; +#line 211 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _tmp93_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp91_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp92_); +#line 211 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + name = (gchar*) _tmp93_; +#line 212 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" display_name = NULL; -#line 318 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 213 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" icon = NULL; -#line 319 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp104_ = port; -#line 319 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp105_ = camera_table_get_port_uri (_tmp104_); -#line 319 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - uri = _tmp105_; -#line 321 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp106_ = self->priv->camera_map; -#line 321 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp107_ = uri; -#line 321 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - if (gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp106_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp107_)) { -#line 3223 "CameraTable.c" - const gchar* _tmp108_; - const gchar* _tmp109_; -#line 323 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp108_ = name; -#line 323 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp109_ = port; -#line 323 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - g_debug ("CameraTable.vala:323: %s @ %s already registered, skipping", _tmp108_, _tmp109_); -#line 325 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 214 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _tmp94_ = port; +#line 214 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _tmp95_ = camera_table_get_port_uri (_tmp94_); +#line 214 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + uri = _tmp95_; +#line 216 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _tmp96_ = self->priv->camera_map; +#line 216 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _tmp97_ = uri; +#line 216 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + if (gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp96_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp97_)) { +#line 2685 "CameraTable.c" + const gchar* _tmp98_; + const gchar* _tmp99_; +#line 218 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _tmp98_ = name; +#line 218 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _tmp99_ = port; +#line 218 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + g_debug ("CameraTable.vala:218: %s @ %s already registered, skipping", _tmp98_, _tmp99_); +#line 220 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (uri); -#line 325 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 220 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (icon); -#line 325 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 220 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (display_name); -#line 325 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 220 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (name); -#line 325 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 220 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (port); -#line 325 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 220 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" continue; -#line 3244 "CameraTable.c" +#line 2706 "CameraTable.c" } -#line 329 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp110_ = port; -#line 329 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp111_ = camera_table_get_port_path (_tmp110_); -#line 329 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - path = _tmp111_; -#line 330 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp112_ = path; -#line 330 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - if (NULL != _tmp112_) { -#line 3256 "CameraTable.c" +#line 224 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _tmp100_ = port; +#line 224 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _tmp101_ = camera_table_get_port_path (_tmp100_); +#line 224 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + path = _tmp101_; +#line 225 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _tmp102_ = path; +#line 225 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + if (NULL != _tmp102_) { +#line 2718 "CameraTable.c" GUdevDevice* device = NULL; - GUdevClient* _tmp113_; - const gchar* _tmp114_; - GUdevDevice* _tmp115_; + GUdevClient* _tmp103_; + const gchar* _tmp104_; + GUdevDevice* _tmp105_; gchar* serial = NULL; - GUdevDevice* _tmp116_; - const gchar* _tmp117_; - gchar* _tmp118_; - const gchar* _tmp119_; - const gchar* _tmp124_; - const gchar* _tmp128_; -#line 331 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp113_ = self->priv->client; -#line 331 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp114_ = path; -#line 331 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp115_ = g_udev_client_query_by_device_file (_tmp113_, _tmp114_); -#line 331 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - device = _tmp115_; -#line 332 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp116_ = device; -#line 332 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp117_ = g_udev_device_get_property (_tmp116_, "ID_SERIAL_SHORT"); -#line 332 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp118_ = g_strdup (_tmp117_); -#line 332 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - serial = _tmp118_; -#line 333 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp119_ = serial; -#line 333 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - if (NULL != _tmp119_) { -#line 3288 "CameraTable.c" - const gchar* _tmp120_; - gchar* _tmp121_; - const gchar* _tmp122_; - gchar* _tmp123_; -#line 335 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp120_ = serial; -#line 335 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp121_ = camera_table_get_name_for_uuid (self, _tmp120_); -#line 335 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + GUdevDevice* _tmp106_; + const gchar* _tmp107_; + gchar* _tmp108_; + const gchar* _tmp109_; + const gchar* _tmp114_; + const gchar* _tmp118_; +#line 226 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _tmp103_ = self->priv->client; +#line 226 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _tmp104_ = path; +#line 226 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _tmp105_ = g_udev_client_query_by_device_file (_tmp103_, _tmp104_); +#line 226 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + device = _tmp105_; +#line 227 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _tmp106_ = device; +#line 227 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _tmp107_ = g_udev_device_get_property (_tmp106_, "ID_SERIAL_SHORT"); +#line 227 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _tmp108_ = g_strdup (_tmp107_); +#line 227 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + serial = _tmp108_; +#line 228 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _tmp109_ = serial; +#line 228 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + if (NULL != _tmp109_) { +#line 2750 "CameraTable.c" + const gchar* _tmp110_; + gchar* _tmp111_; + const gchar* _tmp112_; + gchar* _tmp113_; +#line 230 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _tmp110_ = serial; +#line 230 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _tmp111_ = camera_table_get_name_for_uuid (self, _tmp110_); +#line 230 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (display_name); -#line 335 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - display_name = _tmp121_; -#line 336 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp122_ = serial; -#line 336 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp123_ = camera_table_get_icon_for_uuid (self, _tmp122_); -#line 336 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 230 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + display_name = _tmp111_; +#line 231 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _tmp112_ = serial; +#line 231 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _tmp113_ = camera_table_get_icon_for_uuid (self, _tmp112_); +#line 231 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (icon); -#line 336 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - icon = _tmp123_; -#line 3309 "CameraTable.c" +#line 231 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + icon = _tmp113_; +#line 2771 "CameraTable.c" } -#line 338 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp124_ = display_name; -#line 338 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - if (NULL == _tmp124_) { -#line 3315 "CameraTable.c" - GUdevDevice* _tmp125_; - const gchar* _tmp126_; - gchar* _tmp127_; -#line 339 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp125_ = device; -#line 339 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp126_ = g_udev_device_get_sysfs_attr (_tmp125_, "product"); -#line 339 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp127_ = g_strdup (_tmp126_); -#line 339 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 233 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _tmp114_ = display_name; +#line 233 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + if (NULL == _tmp114_) { +#line 2777 "CameraTable.c" + GUdevDevice* _tmp115_; + const gchar* _tmp116_; + gchar* _tmp117_; +#line 234 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _tmp115_ = device; +#line 234 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _tmp116_ = g_udev_device_get_sysfs_attr (_tmp115_, "product"); +#line 234 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _tmp117_ = g_strdup (_tmp116_); +#line 234 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (display_name); -#line 339 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - display_name = _tmp127_; -#line 3329 "CameraTable.c" +#line 234 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + display_name = _tmp117_; +#line 2791 "CameraTable.c" } -#line 341 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp128_ = display_name; -#line 341 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - if (NULL == _tmp128_) { -#line 3335 "CameraTable.c" - GUdevDevice* _tmp129_; - const gchar* _tmp130_; - gchar* _tmp131_; -#line 342 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp129_ = device; -#line 342 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp130_ = g_udev_device_get_property (_tmp129_, "ID_MODEL"); -#line 342 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp131_ = g_strdup (_tmp130_); -#line 342 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 236 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _tmp118_ = display_name; +#line 236 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + if (NULL == _tmp118_) { +#line 2797 "CameraTable.c" + GUdevDevice* _tmp119_; + const gchar* _tmp120_; + gchar* _tmp121_; +#line 237 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _tmp119_ = device; +#line 237 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _tmp120_ = g_udev_device_get_property (_tmp119_, "ID_MODEL"); +#line 237 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _tmp121_ = g_strdup (_tmp120_); +#line 237 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (display_name); -#line 342 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - display_name = _tmp131_; -#line 3349 "CameraTable.c" +#line 237 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + display_name = _tmp121_; +#line 2811 "CameraTable.c" } -#line 330 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 225 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (serial); -#line 330 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 225 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_object_unref0 (device); -#line 3355 "CameraTable.c" +#line 2817 "CameraTable.c" } -#line 346 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp132_ = port; -#line 346 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - if (g_str_has_prefix (_tmp132_, "disk:")) { -#line 3361 "CameraTable.c" +#line 241 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _tmp122_ = port; +#line 241 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + if (g_str_has_prefix (_tmp122_, "disk:")) { +#line 2823 "CameraTable.c" { GMount* mount = NULL; - const gchar* _tmp133_; + const gchar* _tmp123_; + gchar* _tmp124_; + gchar* _tmp125_; + GFile* _tmp126_; + GFile* _tmp127_; + GMount* _tmp128_; + GMount* _tmp129_; + GVolume* volume = NULL; + GMount* _tmp130_; + GVolume* _tmp131_; + const gchar* _tmp132_; + GVolume* _tmp133_; gchar* _tmp134_; gchar* _tmp135_; - GFile* _tmp136_; - GFile* _tmp137_; - GMount* _tmp138_; - GMount* _tmp139_; - GVolume* volume = NULL; - GMount* _tmp140_; - GVolume* _tmp141_; - const gchar* _tmp142_; - GVolume* _tmp143_; - gchar* _tmp144_; - gchar* _tmp145_; - gchar* _tmp146_; - GVolume* _tmp147_; - GIcon* _tmp148_; - GIcon* _tmp149_; - gchar* _tmp150_; -#line 348 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp133_ = port; -#line 348 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp134_ = string_substring (_tmp133_, (glong) 5, (glong) -1); -#line 348 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp135_ = _tmp134_; -#line 348 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp136_ = g_file_new_for_path (_tmp135_); -#line 348 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp137_ = _tmp136_; -#line 348 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp138_ = g_file_find_enclosing_mount (_tmp137_, NULL, &_inner_error_); -#line 348 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp139_ = _tmp138_; -#line 348 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _g_object_unref0 (_tmp137_); -#line 348 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _g_free0 (_tmp135_); -#line 348 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - mount = _tmp139_; -#line 348 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + gchar* _tmp136_; + GVolume* _tmp137_; + GIcon* _tmp138_; + GIcon* _tmp139_; + gchar* _tmp140_; +#line 243 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _tmp123_ = port; +#line 243 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _tmp124_ = string_substring (_tmp123_, (glong) 5, (glong) -1); +#line 243 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _tmp125_ = _tmp124_; +#line 243 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _tmp126_ = g_file_new_for_path (_tmp125_); +#line 243 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _tmp127_ = _tmp126_; +#line 243 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _tmp128_ = g_file_find_enclosing_mount (_tmp127_, NULL, &_inner_error_); +#line 243 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _tmp129_ = _tmp128_; +#line 243 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _g_object_unref0 (_tmp127_); +#line 243 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _g_free0 (_tmp125_); +#line 243 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + mount = _tmp129_; +#line 243 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 3405 "CameraTable.c" +#line 2867 "CameraTable.c" goto __catch67_g_error; } -#line 349 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp140_ = mount; -#line 349 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp141_ = g_mount_get_volume (_tmp140_); -#line 349 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - volume = _tmp141_; -#line 351 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp142_ = name; -#line 351 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp143_ = volume; -#line 351 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp144_ = g_volume_get_name (_tmp143_); -#line 351 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp145_ = _tmp144_; -#line 351 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp146_ = g_strdup_printf (_ ("%s (%s)"), _tmp142_, _tmp145_); -#line 351 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 244 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _tmp130_ = mount; +#line 244 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _tmp131_ = g_mount_get_volume (_tmp130_); +#line 244 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + volume = _tmp131_; +#line 246 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _tmp132_ = name; +#line 246 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _tmp133_ = volume; +#line 246 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _tmp134_ = g_volume_get_name (_tmp133_); +#line 246 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _tmp135_ = _tmp134_; +#line 246 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _tmp136_ = g_strdup_printf (_ ("%s (%s)"), _tmp132_, _tmp135_); +#line 246 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (display_name); -#line 351 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - display_name = _tmp146_; -#line 351 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _g_free0 (_tmp145_); -#line 352 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp147_ = volume; -#line 352 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp148_ = g_volume_get_icon (_tmp147_); -#line 352 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp149_ = _tmp148_; -#line 352 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp150_ = g_icon_to_string (_tmp149_); -#line 352 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 246 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + display_name = _tmp136_; +#line 246 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _g_free0 (_tmp135_); +#line 247 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _tmp137_ = volume; +#line 247 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _tmp138_ = g_volume_get_icon (_tmp137_); +#line 247 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _tmp139_ = _tmp138_; +#line 247 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _tmp140_ = g_icon_to_string (_tmp139_); +#line 247 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (icon); -#line 352 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - icon = _tmp150_; -#line 352 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _g_object_unref0 (_tmp149_); -#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 247 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + icon = _tmp140_; +#line 247 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _g_object_unref0 (_tmp139_); +#line 242 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_object_unref0 (volume); -#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 242 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_object_unref0 (mount); -#line 3448 "CameraTable.c" +#line 2910 "CameraTable.c" } goto __finally67; __catch67_g_error: { GError* e = NULL; -#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 242 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" e = _inner_error_; -#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 242 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _inner_error_ = NULL; -#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 242 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_error_free0 (e); -#line 3460 "CameraTable.c" +#line 2922 "CameraTable.c" } __finally67: -#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 242 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 242 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" if (_inner_error_->domain == GPHOTO_ERROR) { -#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 242 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" g_propagate_error (error, _inner_error_); -#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 242 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (path); -#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 242 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (uri); -#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 242 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (icon); -#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 242 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (display_name); -#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 242 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (name); -#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 242 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (port); -#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 242 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_object_unref0 (_port_it); -#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 242 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" missing = (_vala_array_free (missing, missing_length1, (GDestroyNotify) discovered_camera_unref), NULL); -#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 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 242 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_object_unref0 (detected_map); -#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 242 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _gp_list_unref0 (camera_list); -#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 242 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _gp_port_info_list_free0 (port_info_list); -#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 242 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" return; -#line 3495 "CameraTable.c" +#line 2955 "CameraTable.c" } else { -#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 242 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (path); -#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 242 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (uri); -#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 242 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (icon); -#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 242 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (display_name); -#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 242 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (name); -#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 242 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (port); -#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 242 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_object_unref0 (_port_it); -#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 242 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" missing = (_vala_array_free (missing, missing_length1, (GDestroyNotify) discovered_camera_unref), NULL); -#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 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 242 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_object_unref0 (detected_map); -#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 242 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _gp_list_unref0 (camera_list); -#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 242 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _gp_port_info_list_free0 (port_info_list); -#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 242 "/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 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 242 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" g_clear_error (&_inner_error_); -#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 242 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" return; -#line 3527 "CameraTable.c" +#line 2985 "CameraTable.c" } } } -#line 356 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp151_ = display_name; -#line 356 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - if (NULL == _tmp151_) { -#line 3535 "CameraTable.c" - const gchar* _tmp152_; - gchar* _tmp153_; -#line 358 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp152_ = name; -#line 358 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp153_ = g_strdup (_tmp152_); -#line 358 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 251 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _tmp141_ = display_name; +#line 251 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + if (NULL == _tmp141_) { +#line 2993 "CameraTable.c" + const gchar* _tmp142_; + gchar* _tmp143_; +#line 253 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _tmp142_ = name; +#line 253 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _tmp143_ = g_strdup (_tmp142_); +#line 253 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (display_name); -#line 358 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - display_name = _tmp153_; -#line 3546 "CameraTable.c" +#line 253 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + display_name = _tmp143_; +#line 3004 "CameraTable.c" } -#line 360 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp154_ = port_info_list; -#line 360 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp155_ = port; -#line 360 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - index = gp_port_info_list_lookup_path (_tmp154_, _tmp155_); -#line 361 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp156_ = index; -#line 361 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - if (_tmp156_ < 0) { -#line 3558 "CameraTable.c" - gint _tmp157_; - const gchar* _tmp158_; - gchar* _tmp159_; - gchar* _tmp160_; -#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp157_ = index; -#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp158_ = port; -#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp159_ = g_strdup_printf ("lookup port %s", _tmp158_); -#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp160_ = _tmp159_; -#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - camera_table_do_op (self, (int) _tmp157_, _tmp160_, &_inner_error_); -#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _g_free0 (_tmp160_); -#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 255 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _tmp144_ = port_info_list; +#line 255 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _tmp145_ = port; +#line 255 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + index = gp_port_info_list_lookup_path (_tmp144_, _tmp145_); +#line 256 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _tmp146_ = index; +#line 256 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + if (_tmp146_ < 0) { +#line 3016 "CameraTable.c" + gint _tmp147_; + const gchar* _tmp148_; + gchar* _tmp149_; + gchar* _tmp150_; +#line 257 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _tmp147_ = index; +#line 257 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _tmp148_ = port; +#line 257 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _tmp149_ = g_strdup_printf ("lookup port %s", _tmp148_); +#line 257 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _tmp150_ = _tmp149_; +#line 257 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + camera_table_do_op (self, (int) _tmp147_, _tmp150_, &_inner_error_); +#line 257 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _g_free0 (_tmp150_); +#line 257 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 257 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" if (_inner_error_->domain == GPHOTO_ERROR) { -#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 257 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" g_propagate_error (error, _inner_error_); -#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 257 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (path); -#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 257 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (uri); -#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 257 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (icon); -#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 257 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (display_name); -#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 257 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (name); -#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 257 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (port); -#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 257 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_object_unref0 (_port_it); -#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 257 "/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" +#line 257 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_object_unref0 (detected_map); -#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 257 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _gp_list_unref0 (camera_list); -#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 257 "/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" +#line 257 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" return; -#line 3607 "CameraTable.c" +#line 3063 "CameraTable.c" } else { -#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 257 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (path); -#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 257 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (uri); -#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 257 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (icon); -#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 257 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (display_name); -#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 257 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (name); -#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 257 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (port); -#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 257 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_object_unref0 (_port_it); -#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 257 "/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" +#line 257 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_object_unref0 (detected_map); -#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 257 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _gp_list_unref0 (camera_list); -#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 257 "/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" +#line 257 "/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" +#line 257 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" g_clear_error (&_inner_error_); -#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 257 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" return; -#line 3639 "CameraTable.c" +#line 3093 "CameraTable.c" } } } -#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp161_ = port_info_list; -#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp162_ = index; -#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp164_ = gp_port_info_list_get_info (_tmp161_, _tmp162_, &_tmp163_); -#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 262 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _tmp151_ = port_info_list; +#line 262 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _tmp152_ = index; +#line 262 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _tmp154_ = gp_port_info_list_get_info (_tmp151_, _tmp152_, &_tmp153_); +#line 262 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" (port_info); -#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - port_info = _tmp163_; -#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp165_ = port; -#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp166_ = g_strdup_printf ("get port info for %s", _tmp165_); -#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp167_ = _tmp166_; -#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - camera_table_do_op (self, _tmp164_, _tmp167_, &_inner_error_); -#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _g_free0 (_tmp167_); -#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 262 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + port_info = _tmp153_; +#line 262 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _tmp155_ = port; +#line 262 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _tmp156_ = g_strdup_printf ("get port info for %s", _tmp155_); +#line 262 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _tmp157_ = _tmp156_; +#line 262 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + camera_table_do_op (self, _tmp154_, _tmp157_, &_inner_error_); +#line 262 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _g_free0 (_tmp157_); +#line 262 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 262 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" if (_inner_error_->domain == GPHOTO_ERROR) { -#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 262 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" g_propagate_error (error, _inner_error_); -#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 262 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (tmp_path); -#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 262 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" (port_info); -#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 262 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (path); -#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 262 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (uri); -#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 262 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (icon); -#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 262 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (display_name); -#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 262 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (name); -#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 262 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (port); -#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 262 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_object_unref0 (_port_it); -#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 262 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" missing = (_vala_array_free (missing, missing_length1, (GDestroyNotify) discovered_camera_unref), NULL); -#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 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 262 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_object_unref0 (detected_map); -#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 262 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _gp_list_unref0 (camera_list); -#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 262 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _gp_port_info_list_free0 (port_info_list); -#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 262 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" return; -#line 3699 "CameraTable.c" +#line 3151 "CameraTable.c" } else { -#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 262 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (tmp_path); -#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 262 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" (port_info); -#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 262 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (path); -#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 262 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (uri); -#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 262 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (icon); -#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 262 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (display_name); -#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 262 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (name); -#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 262 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (port); -#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 262 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_object_unref0 (_port_it); -#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 262 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" missing = (_vala_array_free (missing, missing_length1, (GDestroyNotify) discovered_camera_unref), NULL); -#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 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 262 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_object_unref0 (detected_map); -#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 262 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _gp_list_unref0 (camera_list); -#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 262 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _gp_port_info_list_free0 (port_info_list); -#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 262 "/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 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 262 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" g_clear_error (&_inner_error_); -#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 262 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" return; -#line 3735 "CameraTable.c" +#line 3185 "CameraTable.c" } } -#line 368 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - gp_port_info_get_path (port_info, &_tmp168_); -#line 368 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 263 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + gp_port_info_get_path (port_info, &_tmp158_); +#line 263 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (tmp_path); -#line 368 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp169_ = g_strdup (_tmp168_); -#line 368 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - tmp_path = _tmp169_; -#line 371 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp170_ = port; -#line 371 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp171_ = tmp_path; -#line 371 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _vala_assert (g_strcmp0 (_tmp170_, _tmp171_) == 0, "port == tmp_path"); -#line 373 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp172_ = self->priv->abilities_list; -#line 373 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp173_ = name; -#line 373 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - index = gp_abilities_list_lookup_model (_tmp172_, _tmp173_); -#line 374 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp174_ = index; -#line 374 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - if (_tmp174_ < 0) { -#line 3762 "CameraTable.c" - gint _tmp175_; - const gchar* _tmp176_; - gchar* _tmp177_; - gchar* _tmp178_; -#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp175_ = index; -#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp176_ = name; -#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp177_ = g_strdup_printf ("lookup camera model %s", _tmp176_); -#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp178_ = _tmp177_; -#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - camera_table_do_op (self, (int) _tmp175_, _tmp178_, &_inner_error_); -#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _g_free0 (_tmp178_); -#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 263 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _tmp159_ = g_strdup (_tmp158_); +#line 263 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + tmp_path = _tmp159_; +#line 266 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _tmp160_ = port; +#line 266 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _tmp161_ = tmp_path; +#line 266 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _vala_assert (g_strcmp0 (_tmp160_, _tmp161_) == 0, "port == tmp_path"); +#line 268 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _tmp162_ = self->priv->abilities_list; +#line 268 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _tmp163_ = name; +#line 268 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + index = gp_abilities_list_lookup_model (_tmp162_, _tmp163_); +#line 269 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _tmp164_ = index; +#line 269 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + if (_tmp164_ < 0) { +#line 3212 "CameraTable.c" + gint _tmp165_; + const gchar* _tmp166_; + gchar* _tmp167_; + gchar* _tmp168_; +#line 270 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _tmp165_ = index; +#line 270 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _tmp166_ = name; +#line 270 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _tmp167_ = g_strdup_printf ("lookup camera model %s", _tmp166_); +#line 270 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _tmp168_ = _tmp167_; +#line 270 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + camera_table_do_op (self, (int) _tmp165_, _tmp168_, &_inner_error_); +#line 270 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _g_free0 (_tmp168_); +#line 270 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 270 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" if (_inner_error_->domain == GPHOTO_ERROR) { -#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 270 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" g_propagate_error (error, _inner_error_); -#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 270 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (tmp_path); -#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 270 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" (port_info); -#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 270 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (path); -#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 270 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (uri); -#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 270 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (icon); -#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 270 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (display_name); -#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 270 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (name); -#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 270 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (port); -#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 270 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_object_unref0 (_port_it); -#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 270 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" missing = (_vala_array_free (missing, missing_length1, (GDestroyNotify) discovered_camera_unref), NULL); -#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 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 270 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_object_unref0 (detected_map); -#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 270 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _gp_list_unref0 (camera_list); -#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 270 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _gp_port_info_list_free0 (port_info_list); -#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 270 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" return; -#line 3815 "CameraTable.c" +#line 3263 "CameraTable.c" } else { -#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 270 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (tmp_path); -#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 270 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" (port_info); -#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 270 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (path); -#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 270 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (uri); -#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 270 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (icon); -#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 270 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (display_name); -#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 270 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (name); -#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 270 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (port); -#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 270 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_object_unref0 (_port_it); -#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 270 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" missing = (_vala_array_free (missing, missing_length1, (GDestroyNotify) discovered_camera_unref), NULL); -#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 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 270 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_object_unref0 (detected_map); -#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 270 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _gp_list_unref0 (camera_list); -#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 270 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _gp_port_info_list_free0 (port_info_list); -#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 270 "/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 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 270 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" g_clear_error (&_inner_error_); -#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 270 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" return; -#line 3851 "CameraTable.c" +#line 3297 "CameraTable.c" } } } -#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp179_ = self->priv->abilities_list; -#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp180_ = index; -#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp182_ = gp_abilities_list_get_abilities (_tmp179_, _tmp180_, &_tmp181_); -#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 273 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _tmp169_ = self->priv->abilities_list; +#line 273 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _tmp170_ = index; +#line 273 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _tmp172_ = gp_abilities_list_get_abilities (_tmp169_, _tmp170_, &_tmp171_); +#line 273 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" (camera_abilities); -#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - camera_abilities = _tmp181_; -#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp183_ = name; -#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp184_ = g_strdup_printf ("lookup camera abilities for %s", _tmp183_); -#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp185_ = _tmp184_; -#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - camera_table_do_op (self, _tmp182_, _tmp185_, &_inner_error_); -#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _g_free0 (_tmp185_); -#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 273 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + camera_abilities = _tmp171_; +#line 273 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _tmp173_ = name; +#line 273 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _tmp174_ = g_strdup_printf ("lookup camera abilities for %s", _tmp173_); +#line 273 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _tmp175_ = _tmp174_; +#line 273 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + camera_table_do_op (self, _tmp172_, _tmp175_, &_inner_error_); +#line 273 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _g_free0 (_tmp175_); +#line 273 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 273 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" if (_inner_error_->domain == GPHOTO_ERROR) { -#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 273 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" g_propagate_error (error, _inner_error_); -#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 273 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" (camera_abilities); -#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 273 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (tmp_path); -#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 273 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" (port_info); -#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 273 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (path); -#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 273 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (uri); -#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 273 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (icon); -#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 273 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (display_name); -#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 273 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (name); -#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 273 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (port); -#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 273 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_object_unref0 (_port_it); -#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 273 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" missing = (_vala_array_free (missing, missing_length1, (GDestroyNotify) discovered_camera_unref), NULL); -#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 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 273 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_object_unref0 (detected_map); -#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 273 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _gp_list_unref0 (camera_list); -#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 273 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _gp_port_info_list_free0 (port_info_list); -#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 273 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" return; -#line 3913 "CameraTable.c" +#line 3357 "CameraTable.c" } else { -#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 273 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" (camera_abilities); -#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 273 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (tmp_path); -#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 273 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" (port_info); -#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 273 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (path); -#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 273 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (uri); -#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 273 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (icon); -#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 273 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (display_name); -#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 273 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (name); -#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 273 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (port); -#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 273 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_object_unref0 (_port_it); -#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 273 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" missing = (_vala_array_free (missing, missing_length1, (GDestroyNotify) discovered_camera_unref), NULL); -#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 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 273 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_object_unref0 (detected_map); -#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 273 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _gp_list_unref0 (camera_list); -#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 273 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _gp_port_info_list_free0 (port_info_list); -#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 273 "/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 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 273 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" g_clear_error (&_inner_error_); -#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 273 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" return; -#line 3951 "CameraTable.c" +#line 3393 "CameraTable.c" } } -#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp187_ = gp_camera_new (&_tmp186_); -#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 277 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _tmp177_ = gp_camera_new (&_tmp176_); +#line 277 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _gp_camera_unref0 (gcamera); -#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - gcamera = _tmp186_; -#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp188_ = name; -#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp189_ = g_strdup_printf ("create camera object for %s", _tmp188_); -#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp190_ = _tmp189_; -#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - camera_table_do_op (self, _tmp187_, _tmp190_, &_inner_error_); -#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _g_free0 (_tmp190_); -#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 277 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + gcamera = _tmp176_; +#line 277 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _tmp178_ = name; +#line 277 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _tmp179_ = g_strdup_printf ("create camera object for %s", _tmp178_); +#line 277 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _tmp180_ = _tmp179_; +#line 277 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + camera_table_do_op (self, _tmp177_, _tmp180_, &_inner_error_); +#line 277 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _g_free0 (_tmp180_); +#line 277 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 277 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" if (_inner_error_->domain == GPHOTO_ERROR) { -#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 277 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" g_propagate_error (error, _inner_error_); -#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 277 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _gp_camera_unref0 (gcamera); -#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 277 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" (camera_abilities); -#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 277 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (tmp_path); -#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 277 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" (port_info); -#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 277 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (path); -#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 277 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (uri); -#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 277 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (icon); -#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 277 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (display_name); -#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 277 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (name); -#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 277 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (port); -#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 277 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_object_unref0 (_port_it); -#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 277 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" missing = (_vala_array_free (missing, missing_length1, (GDestroyNotify) discovered_camera_unref), NULL); -#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 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 277 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_object_unref0 (detected_map); -#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 277 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _gp_list_unref0 (camera_list); -#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 277 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _gp_port_info_list_free0 (port_info_list); -#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 277 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" return; -#line 4010 "CameraTable.c" +#line 3450 "CameraTable.c" } else { -#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 277 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _gp_camera_unref0 (gcamera); -#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 277 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" (camera_abilities); -#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 277 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (tmp_path); -#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 277 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" (port_info); -#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 277 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (path); -#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 277 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (uri); -#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 277 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (icon); -#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 277 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (display_name); -#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 277 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (name); -#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 277 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (port); -#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 277 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_object_unref0 (_port_it); -#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 277 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" missing = (_vala_array_free (missing, missing_length1, (GDestroyNotify) discovered_camera_unref), NULL); -#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 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 277 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_object_unref0 (detected_map); -#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 277 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _gp_list_unref0 (camera_list); -#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 277 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _gp_port_info_list_free0 (port_info_list); -#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 277 "/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 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 277 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" g_clear_error (&_inner_error_); -#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 277 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" return; -#line 4050 "CameraTable.c" +#line 3488 "CameraTable.c" } } -#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp191_ = gcamera; -#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp192_ = camera_abilities; -#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp193_ = name; -#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp194_ = g_strdup_printf ("set camera abilities for %s", _tmp193_); -#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp195_ = _tmp194_; -#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - camera_table_do_op (self, gp_camera_set_abilities (_tmp191_, _tmp192_), _tmp195_, &_inner_error_); -#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _g_free0 (_tmp195_); -#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 278 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _tmp181_ = gcamera; +#line 278 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _tmp182_ = camera_abilities; +#line 278 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _tmp183_ = name; +#line 278 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _tmp184_ = g_strdup_printf ("set camera abilities for %s", _tmp183_); +#line 278 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _tmp185_ = _tmp184_; +#line 278 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + camera_table_do_op (self, gp_camera_set_abilities (_tmp181_, _tmp182_), _tmp185_, &_inner_error_); +#line 278 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _g_free0 (_tmp185_); +#line 278 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 278 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" if (_inner_error_->domain == GPHOTO_ERROR) { -#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 278 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" g_propagate_error (error, _inner_error_); -#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 278 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _gp_camera_unref0 (gcamera); -#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 278 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" (camera_abilities); -#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 278 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (tmp_path); -#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 278 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" (port_info); -#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 278 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (path); -#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 278 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (uri); -#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 278 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (icon); -#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 278 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (display_name); -#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 278 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (name); -#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 278 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (port); -#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 278 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_object_unref0 (_port_it); -#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 278 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" missing = (_vala_array_free (missing, missing_length1, (GDestroyNotify) discovered_camera_unref), NULL); -#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 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 278 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_object_unref0 (detected_map); -#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 278 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _gp_list_unref0 (camera_list); -#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 278 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _gp_port_info_list_free0 (port_info_list); -#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 278 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" return; -#line 4107 "CameraTable.c" +#line 3543 "CameraTable.c" } else { -#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 278 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _gp_camera_unref0 (gcamera); -#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 278 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" (camera_abilities); -#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 278 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (tmp_path); -#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 278 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" (port_info); -#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 278 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (path); -#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 278 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (uri); -#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 278 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (icon); -#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 278 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (display_name); -#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 278 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (name); -#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 278 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (port); -#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 278 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_object_unref0 (_port_it); -#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 278 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" missing = (_vala_array_free (missing, missing_length1, (GDestroyNotify) discovered_camera_unref), NULL); -#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 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 278 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_object_unref0 (detected_map); -#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 278 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _gp_list_unref0 (camera_list); -#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 278 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _gp_port_info_list_free0 (port_info_list); -#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 278 "/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 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 278 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" g_clear_error (&_inner_error_); -#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 278 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" return; -#line 4147 "CameraTable.c" +#line 3581 "CameraTable.c" } } -#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp196_ = gcamera; -#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp197_ = port_info; -#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp198_ = name; -#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp199_ = port; -#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp200_ = g_strdup_printf ("set port info for %s on %s", _tmp198_, _tmp199_); -#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp201_ = _tmp200_; -#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - camera_table_do_op (self, gp_camera_set_port_info (_tmp196_, _tmp197_), _tmp201_, &_inner_error_); -#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _g_free0 (_tmp201_); -#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 279 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _tmp186_ = gcamera; +#line 279 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _tmp187_ = port_info; +#line 279 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _tmp188_ = name; +#line 279 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _tmp189_ = port; +#line 279 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _tmp190_ = g_strdup_printf ("set port info for %s on %s", _tmp188_, _tmp189_); +#line 279 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _tmp191_ = _tmp190_; +#line 279 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + camera_table_do_op (self, gp_camera_set_port_info (_tmp186_, _tmp187_), _tmp191_, &_inner_error_); +#line 279 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _g_free0 (_tmp191_); +#line 279 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 279 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" if (_inner_error_->domain == GPHOTO_ERROR) { -#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 279 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" g_propagate_error (error, _inner_error_); -#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 279 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _gp_camera_unref0 (gcamera); -#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 279 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" (camera_abilities); -#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 279 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (tmp_path); -#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 279 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" (port_info); -#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 279 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (path); -#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 279 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (uri); -#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 279 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (icon); -#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 279 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (display_name); -#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 279 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (name); -#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 279 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (port); -#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 279 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_object_unref0 (_port_it); -#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 279 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" missing = (_vala_array_free (missing, missing_length1, (GDestroyNotify) discovered_camera_unref), NULL); -#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 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 279 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_object_unref0 (detected_map); -#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 279 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _gp_list_unref0 (camera_list); -#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 279 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _gp_port_info_list_free0 (port_info_list); -#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 279 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" return; -#line 4206 "CameraTable.c" +#line 3638 "CameraTable.c" } else { -#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 279 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _gp_camera_unref0 (gcamera); -#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 279 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" (camera_abilities); -#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 279 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (tmp_path); -#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 279 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" (port_info); -#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 279 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (path); -#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 279 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (uri); -#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 279 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (icon); -#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 279 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (display_name); -#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 279 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (name); -#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 279 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (port); -#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 279 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_object_unref0 (_port_it); -#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 279 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" missing = (_vala_array_free (missing, missing_length1, (GDestroyNotify) discovered_camera_unref), NULL); -#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 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 279 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_object_unref0 (detected_map); -#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 279 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _gp_list_unref0 (camera_list); -#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 279 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _gp_port_info_list_free0 (port_info_list); -#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 279 "/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 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 279 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" g_clear_error (&_inner_error_); -#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 279 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" return; -#line 4246 "CameraTable.c" +#line 3676 "CameraTable.c" } } -#line 386 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp202_ = name; -#line 386 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp203_ = port; -#line 386 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - g_debug ("CameraTable.vala:386: Adding to camera table: %s @ %s", _tmp202_, _tmp203_); -#line 388 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp204_ = gcamera; -#line 388 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp205_ = uri; -#line 388 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp206_ = display_name; -#line 388 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp207_ = icon; -#line 388 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp208_ = discovered_camera_new (_tmp204_, _tmp205_, _tmp206_, _tmp207_); -#line 388 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - camera = _tmp208_; -#line 389 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp209_ = self->priv->camera_map; -#line 389 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp210_ = uri; -#line 389 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp211_ = camera; -#line 389 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp209_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp210_, _tmp211_); -#line 391 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - _tmp212_ = camera; -#line 391 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - g_signal_emit (self, camera_table_signals[CAMERA_TABLE_CAMERA_ADDED_SIGNAL], 0, _tmp212_); -#line 315 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 281 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _tmp192_ = name; +#line 281 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _tmp193_ = port; +#line 281 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + g_debug ("CameraTable.vala:281: Adding to camera table: %s @ %s", _tmp192_, _tmp193_); +#line 283 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _tmp194_ = gcamera; +#line 283 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _tmp195_ = uri; +#line 283 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _tmp196_ = display_name; +#line 283 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _tmp197_ = icon; +#line 283 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _tmp198_ = discovered_camera_new (_tmp194_, _tmp195_, _tmp196_, _tmp197_); +#line 283 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + camera = _tmp198_; +#line 284 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _tmp199_ = self->priv->camera_map; +#line 284 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _tmp200_ = uri; +#line 284 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _tmp201_ = camera; +#line 284 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp199_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp200_, _tmp201_); +#line 286 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + _tmp202_ = camera; +#line 286 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + g_signal_emit (self, camera_table_signals[CAMERA_TABLE_CAMERA_ADDED_SIGNAL], 0, _tmp202_); +#line 210 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _discovered_camera_unref0 (camera); -#line 315 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 210 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _gp_camera_unref0 (gcamera); -#line 315 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 210 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" (camera_abilities); -#line 315 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 210 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (tmp_path); -#line 315 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 210 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" (port_info); -#line 315 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 210 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (path); -#line 315 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 210 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (uri); -#line 315 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 210 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (icon); -#line 315 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 210 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (display_name); -#line 315 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 210 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (name); -#line 315 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 210 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_free0 (port); -#line 4301 "CameraTable.c" +#line 3731 "CameraTable.c" } -#line 315 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 210 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_object_unref0 (_port_it); -#line 4305 "CameraTable.c" +#line 3735 "CameraTable.c" } -#line 233 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 139 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" missing = (_vala_array_free (missing, missing_length1, (GDestroyNotify) discovered_camera_unref), NULL); -#line 233 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - usb_cameras = (_vala_array_free (usb_cameras, usb_cameras_length1, (GDestroyNotify) g_free), NULL); -#line 233 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 139 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_object_unref0 (detected_map); -#line 233 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 139 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _gp_list_unref0 (camera_list); -#line 233 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 139 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _gp_port_info_list_free0 (port_info_list); -#line 4317 "CameraTable.c" +#line 3745 "CameraTable.c" } @@ -4326,21 +3752,21 @@ camera_table_on_udev_event (CameraTable* self, { const gchar* _tmp0_; OneShotScheduler* _tmp1_; -#line 395 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 290 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" g_return_if_fail (IS_CAMERA_TABLE (self)); -#line 395 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 290 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" g_return_if_fail (action != NULL); -#line 395 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 290 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" g_return_if_fail (G_UDEV_IS_DEVICE (device)); -#line 396 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 291 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _tmp0_ = g_udev_device_get_name (device); -#line 396 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" - g_debug ("CameraTable.vala:396: udev event: %s on %s", action, _tmp0_); -#line 400 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 291 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + g_debug ("CameraTable.vala:291: udev event: %s on %s", action, _tmp0_); +#line 295 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _tmp1_ = self->priv->camera_update_scheduler; -#line 400 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 295 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" one_shot_scheduler_after_timeout (_tmp1_, (guint) CAMERA_TABLE_UPDATE_DELAY_MSEC, TRUE); -#line 4342 "CameraTable.c" +#line 3770 "CameraTable.c" } @@ -4349,15 +3775,15 @@ camera_table_on_volume_changed (CameraTable* self, GVolume* volume) { OneShotScheduler* _tmp0_; -#line 403 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 298 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" g_return_if_fail (IS_CAMERA_TABLE (self)); -#line 403 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 298 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" g_return_if_fail (G_IS_VOLUME (volume)); -#line 404 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 299 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _tmp0_ = self->priv->camera_update_scheduler; -#line 404 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 299 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" one_shot_scheduler_after_timeout (_tmp0_, (guint) CAMERA_TABLE_UPDATE_DELAY_MSEC, TRUE); -#line 4359 "CameraTable.c" +#line 3787 "CameraTable.c" } @@ -4365,34 +3791,34 @@ static void camera_table_on_update_cameras (CameraTable* self) { GError * _inner_error_ = NULL; -#line 407 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 302 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" g_return_if_fail (IS_CAMERA_TABLE (self)); -#line 4369 "CameraTable.c" +#line 3797 "CameraTable.c" { CameraTable* _tmp0_; CameraTable* _tmp1_; -#line 409 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 304 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _tmp0_ = camera_table_get_instance (); -#line 409 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 304 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _tmp1_ = _tmp0_; -#line 409 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 304 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" camera_table_update_camera_table (_tmp1_, &_inner_error_); -#line 409 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 304 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _camera_table_unref0 (_tmp1_); -#line 409 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 304 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 409 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 304 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" if (_inner_error_->domain == GPHOTO_ERROR) { -#line 4385 "CameraTable.c" +#line 3813 "CameraTable.c" goto __catch68_gphoto_error; } -#line 409 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 304 "/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 409 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 304 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" g_clear_error (&_inner_error_); -#line 409 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 304 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" return; -#line 4394 "CameraTable.c" +#line 3822 "CameraTable.c" } } goto __finally68; @@ -4401,30 +3827,30 @@ camera_table_on_update_cameras (CameraTable* self) GError* err = NULL; GError* _tmp2_; const gchar* _tmp3_; -#line 408 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 303 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" err = _inner_error_; -#line 408 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 303 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _inner_error_ = NULL; -#line 411 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 306 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _tmp2_ = err; -#line 411 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 306 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _tmp3_ = _tmp2_->message; -#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" +#line 306 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" + g_warning ("CameraTable.vala:306: Error updating camera table: %s", _tmp3_); +#line 303 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" _g_error_free0 (err); -#line 4415 "CameraTable.c" +#line 3843 "CameraTable.c" } __finally68: -#line 408 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 303 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 408 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 303 "/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 408 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 303 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" g_clear_error (&_inner_error_); -#line 408 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" +#line 303 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" return; -#line 4426 "CameraTable.c" +#line 3854 "CameraTable.c" } } @@ -4451,19 +3877,19 @@ 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 4453 "CameraTable.c" +#line 3881 "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 4459 "CameraTable.c" +#line 3887 "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 4465 "CameraTable.c" +#line 3893 "CameraTable.c" } @@ -4472,7 +3898,7 @@ value_camera_table_init (GValue* value) { #line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" value->data[0].v_pointer = NULL; -#line 4474 "CameraTable.c" +#line 3902 "CameraTable.c" } @@ -4483,7 +3909,7 @@ 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 4485 "CameraTable.c" +#line 3913 "CameraTable.c" } } @@ -4496,11 +3922,11 @@ value_camera_table_copy_value (const GValue* src_value, 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 4498 "CameraTable.c" +#line 3926 "CameraTable.c" } else { #line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" dest_value->data[0].v_pointer = NULL; -#line 4502 "CameraTable.c" +#line 3930 "CameraTable.c" } } @@ -4510,7 +3936,7 @@ 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 4512 "CameraTable.c" +#line 3940 "CameraTable.c" } @@ -4522,30 +3948,30 @@ value_camera_table_collect_value (GValue* value, { #line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" if (collect_values[0].v_pointer) { -#line 4524 "CameraTable.c" +#line 3952 "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 4531 "CameraTable.c" +#line 3959 "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 4535 "CameraTable.c" +#line 3963 "CameraTable.c" } #line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" value->data[0].v_pointer = camera_table_ref (object); -#line 4539 "CameraTable.c" +#line 3967 "CameraTable.c" } else { #line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" value->data[0].v_pointer = NULL; -#line 4543 "CameraTable.c" +#line 3971 "CameraTable.c" } #line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" return NULL; -#line 4547 "CameraTable.c" +#line 3975 "CameraTable.c" } @@ -4561,25 +3987,25 @@ value_camera_table_lcopy_value (const GValue* value, 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 4563 "CameraTable.c" +#line 3991 "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 4569 "CameraTable.c" +#line 3997 "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 4573 "CameraTable.c" +#line 4001 "CameraTable.c" } else { #line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" *object_p = camera_table_ref (value->data[0].v_pointer); -#line 4577 "CameraTable.c" +#line 4005 "CameraTable.c" } #line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" return NULL; -#line 4581 "CameraTable.c" +#line 4009 "CameraTable.c" } @@ -4599,7 +4025,7 @@ param_spec_camera_table (const gchar* name, G_PARAM_SPEC (spec)->value_type = object_type; #line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" return G_PARAM_SPEC (spec); -#line 4601 "CameraTable.c" +#line 4029 "CameraTable.c" } @@ -4610,7 +4036,7 @@ 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 4612 "CameraTable.c" +#line 4040 "CameraTable.c" } @@ -4633,17 +4059,17 @@ value_set_camera_table (GValue* value, 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 4635 "CameraTable.c" +#line 4063 "CameraTable.c" } else { #line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" value->data[0].v_pointer = NULL; -#line 4639 "CameraTable.c" +#line 4067 "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 4645 "CameraTable.c" +#line 4073 "CameraTable.c" } } @@ -4665,17 +4091,17 @@ value_take_camera_table (GValue* value, 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 4667 "CameraTable.c" +#line 4095 "CameraTable.c" } else { #line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala" value->data[0].v_pointer = NULL; -#line 4671 "CameraTable.c" +#line 4099 "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 4677 "CameraTable.c" +#line 4105 "CameraTable.c" } } @@ -4693,7 +4119,7 @@ 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 4695 "CameraTable.c" +#line 4123 "CameraTable.c" } @@ -4721,7 +4147,7 @@ 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 4723 "CameraTable.c" +#line 4151 "CameraTable.c" } @@ -4745,7 +4171,7 @@ 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 4747 "CameraTable.c" +#line 4175 "CameraTable.c" } @@ -4774,7 +4200,7 @@ 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 4776 "CameraTable.c" +#line 4204 "CameraTable.c" } @@ -4789,7 +4215,7 @@ 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 4791 "CameraTable.c" +#line 4219 "CameraTable.c" } } diff --git a/src/camera/CameraTable.vala b/src/camera/CameraTable.vala index 1636816..3df4ad6 100644 --- a/src/camera/CameraTable.vala +++ b/src/camera/CameraTable.vala @@ -108,100 +108,6 @@ public class CameraTable { do_op(abilities_list.load(null_context), "load camera abilities list"); } - private string[] get_all_usb_cameras() { - string[] cameras = new string[0]; - - GLib.List<GUdev.Device> device_list = client.query_by_subsystem(null); - foreach (GUdev.Device device in device_list) { - string device_file = device.get_device_file(); - if( - // only keep devices that have a non-null device file and that - // have both the ID_GPHOTO2 and GPHOTO2_DRIVER properties set - (device_file != null) && - (device.has_property("ID_GPHOTO2")) && - (device.has_property("GPHOTO2_DRIVER")) - ) { - int camera_bus, camera_device; - // extract the bus and device IDs from the device file string - // TODO: is it safe to parse the absolute path or should we be - // smarter and use a regex to only pick up the end of the path? - if (device_file.scanf("/dev/bus/usb/%d/%d", out camera_bus, out camera_device) < 2) { - critical("get_all_usb_cameras: Failed to scanf device file %s", device_file); - - continue; - } - string camera = "usb:%.3d,%.3d".printf(camera_bus, camera_device); - debug("USB camera detected at %s", camera); - cameras += camera; - } - } - - return cameras; - } - - // USB (or libusb) is a funny beast; if only one USB device is present (i.e. the camera), - // then a single camera is detected at port usb:. However, if multiple USB devices are - // present (including non-cameras), then the first attached camera will be listed twice, - // first at usb:, then at usb:xxx,yyy. If the usb: device is removed, another usb:xxx,yyy - // device will lose its full-path name and be referred to as usb: only. - // - // This function gleans the full port name of a particular port, even if it's the unadorned - // "usb:", by using GUdev. - private bool usb_esp(int current_camera_count, string[] usb_cameras, string port, - out string full_port) { - // sanity - assert(current_camera_count > 0); - - debug("USB ESP: current_camera_count=%d port=%s", current_camera_count, port); - - full_port = null; - - // if GPhoto detects one camera, and USB reports one camera, all is swell - if (current_camera_count == 1 && usb_cameras.length == 1) { - full_port = usb_cameras[0]; - - debug("USB ESP: port=%s full_port=%s", port, full_port); - - return true; - } - - // with more than one camera, skip the mirrored "usb:" port - if (port == "usb:") { - debug("USB ESP: Skipping %s", port); - - return false; - } - - // parse out the bus and device ID - int bus, device; - if (port.scanf("usb:%d,%d", out bus, out device) < 2) { - critical("USB ESP: Failed to scanf %s", port); - - return false; - } - - foreach (string usb_camera in usb_cameras) { - int camera_bus, camera_device; - if (usb_camera.scanf("usb:%d,%d", out camera_bus, out camera_device) < 2) { - critical("USB ESP: Failed to scanf %s", usb_camera); - - continue; - } - - if ((bus == camera_bus) && (device == camera_device)) { - full_port = port; - - debug("USB ESP: port=%s full_port=%s", port, full_port); - - return true; - } - } - - debug("USB ESP: No matching bus/device found for port=%s", port); - - return false; - } - public static string get_port_uri(string port) { return "gphoto2://[%s]/".printf(port); } @@ -242,9 +148,6 @@ public class CameraTable { Gee.HashMap<string, string> detected_map = new Gee.HashMap<string, string>(); - // walk the USB chain and find all PTP cameras; this is necessary for usb_esp - string[] usb_cameras = get_all_usb_cameras(); - // go through the detected camera list and glean their ports for (int ctr = 0; ctr < camera_list.count(); ctr++) { string name; @@ -255,14 +158,6 @@ public class CameraTable { debug("Detected %d/%d %s @ %s", ctr + 1, camera_list.count(), name, port); - // do some USB ESP, skipping ports that cannot be deduced - if (port.has_prefix("usb:")) { - string full_port; - if (!usb_esp(camera_list.count(), usb_cameras, port, out full_port)) - continue; - - port = full_port; - } detected_map.set(port, name); } |