summaryrefslogtreecommitdiff
path: root/src/camera/CameraTable.c
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2018-06-25 21:12:13 +0200
committerJörg Frings-Fürst <debian@jff-webhosting.net>2018-06-25 21:12:13 +0200
commit059a62ee3c820a42fbce980c3256049adecc9100 (patch)
treee51eab94fd7d65459640ca227fb2257bb41d2acb /src/camera/CameraTable.c
parent55778740c211992cc86ea87588ab62c6750f36d1 (diff)
parente8f4d7a9cdd37c5a9fb3b6991a4e9173829808da (diff)
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'src/camera/CameraTable.c')
-rw-r--r--src/camera/CameraTable.c2931
1 files changed, 1485 insertions, 1446 deletions
diff --git a/src/camera/CameraTable.c b/src/camera/CameraTable.c
index 5c3c502..f0f37e6 100644
--- a/src/camera/CameraTable.c
+++ b/src/camera/CameraTable.c
@@ -1,4 +1,4 @@
-/* CameraTable.c generated by valac 0.36.6, the Vala compiler
+/* CameraTable.c generated by valac 0.40.4, the Vala compiler
* generated from CameraTable.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -7,6 +7,7 @@
* (version 2.1 or later). See the COPYING file in this distribution.
*/
+
#include <glib.h>
#include <glib-object.h>
#include <gphoto2/gphoto2-camera.h>
@@ -107,9 +108,9 @@ typedef struct _ParamSpecCameraTable ParamSpecCameraTable;
enum {
CAMERA_TABLE_CAMERA_ADDED_SIGNAL,
CAMERA_TABLE_CAMERA_REMOVED_SIGNAL,
- CAMERA_TABLE_LAST_SIGNAL
+ CAMERA_TABLE_NUM_SIGNALS
};
-static guint camera_table_signals[CAMERA_TABLE_LAST_SIGNAL] = {0};
+static guint camera_table_signals[CAMERA_TABLE_NUM_SIGNALS] = {0};
#define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg);
#define _vala_return_if_fail(expr, msg) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return; }
#define _vala_return_val_if_fail(expr, msg, val) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return val; }
@@ -171,97 +172,167 @@ static CameraTable* camera_table_instance = NULL;
gpointer discovered_camera_ref (gpointer instance);
void discovered_camera_unref (gpointer instance);
-GParamSpec* param_spec_discovered_camera (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_discovered_camera (GValue* value, gpointer v_object);
-void value_take_discovered_camera (GValue* value, gpointer v_object);
+GParamSpec* param_spec_discovered_camera (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags);
+void value_set_discovered_camera (GValue* value,
+ gpointer v_object);
+void value_take_discovered_camera (GValue* value,
+ gpointer v_object);
gpointer value_get_discovered_camera (const GValue* value);
GType discovered_camera_get_type (void) G_GNUC_CONST;
-enum {
- DISCOVERED_CAMERA_DUMMY_PROPERTY
-};
-DiscoveredCamera* discovered_camera_new (Camera* gcamera, const gchar* uri, const gchar* display_name, const gchar* icon);
-DiscoveredCamera* discovered_camera_construct (GType object_type, Camera* gcamera, const gchar* uri, const gchar* display_name, const gchar* icon);
+DiscoveredCamera* discovered_camera_new (Camera* gcamera,
+ const gchar* uri,
+ const gchar* display_name,
+ const gchar* icon);
+DiscoveredCamera* discovered_camera_construct (GType object_type,
+ Camera* gcamera,
+ const gchar* uri,
+ const gchar* display_name,
+ const gchar* icon);
static void discovered_camera_finalize (DiscoveredCamera * obj);
gpointer camera_table_ref (gpointer instance);
void camera_table_unref (gpointer instance);
-GParamSpec* param_spec_camera_table (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_camera_table (GValue* value, gpointer v_object);
-void value_take_camera_table (GValue* value, gpointer v_object);
+GParamSpec* param_spec_camera_table (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags);
+void value_set_camera_table (GValue* value,
+ gpointer v_object);
+void value_take_camera_table (GValue* value,
+ gpointer v_object);
gpointer value_get_camera_table (const GValue* value);
GType camera_table_get_type (void) G_GNUC_CONST;
gpointer one_shot_scheduler_ref (gpointer instance);
void one_shot_scheduler_unref (gpointer instance);
-GParamSpec* param_spec_one_shot_scheduler (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_one_shot_scheduler (GValue* value, gpointer v_object);
-void value_take_one_shot_scheduler (GValue* value, gpointer v_object);
+GParamSpec* param_spec_one_shot_scheduler (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags);
+void value_set_one_shot_scheduler (GValue* value,
+ gpointer v_object);
+void value_take_one_shot_scheduler (GValue* value,
+ gpointer v_object);
gpointer value_get_one_shot_scheduler (const GValue* value);
GType one_shot_scheduler_get_type (void) G_GNUC_CONST;
#define CAMERA_TABLE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_CAMERA_TABLE, CameraTablePrivate))
-enum {
- CAMERA_TABLE_DUMMY_PROPERTY
-};
#define CAMERA_TABLE_UPDATE_DELAY_MSEC 1000
static CameraTable* camera_table_new (void);
static CameraTable* camera_table_construct (GType object_type);
static void camera_table_on_update_cameras (CameraTable* self);
static void _camera_table_on_update_cameras_one_shot_callback (gpointer self);
-OneShotScheduler* one_shot_scheduler_new (const gchar* name, OneShotCallback callback, void* callback_target);
-OneShotScheduler* one_shot_scheduler_construct (GType object_type, const gchar* name, OneShotCallback callback, void* callback_target);
-static void camera_table_on_udev_event (CameraTable* self, const gchar* action, GUdevDevice* device);
-static void _camera_table_on_udev_event_g_udev_client_uevent (GUdevClient* _sender, const gchar* action, GUdevDevice* device, gpointer self);
-void camera_table_on_volume_changed (CameraTable* self, GVolume* volume);
-static void _camera_table_on_volume_changed_g_volume_monitor_volume_changed (GVolumeMonitor* _sender, GVolume* volume, gpointer self);
-static void _camera_table_on_volume_changed_g_volume_monitor_volume_added (GVolumeMonitor* _sender, GVolume* volume, gpointer self);
+OneShotScheduler* one_shot_scheduler_new (const gchar* name,
+ OneShotCallback callback,
+ void* callback_target);
+OneShotScheduler* one_shot_scheduler_construct (GType object_type,
+ const gchar* name,
+ OneShotCallback callback,
+ void* callback_target);
+static void camera_table_on_udev_event (CameraTable* self,
+ const gchar* action,
+ GUdevDevice* device);
+static void _camera_table_on_udev_event_g_udev_client_uevent (GUdevClient* _sender,
+ const gchar* action,
+ GUdevDevice* device,
+ gpointer self);
+void camera_table_on_volume_changed (CameraTable* self,
+ GVolume* volume);
+static void _camera_table_on_volume_changed_g_volume_monitor_volume_changed (GVolumeMonitor* _sender,
+ GVolume* volume,
+ gpointer self);
+static void _camera_table_on_volume_changed_g_volume_monitor_volume_added (GVolumeMonitor* _sender,
+ GVolume* volume,
+ gpointer self);
static gboolean camera_table_delayed_init (CameraTable* self);
static gboolean _camera_table_delayed_init_gsource_func (gpointer self);
GType page_window_get_type (void) G_GNUC_CONST;
GType app_window_get_type (void) G_GNUC_CONST;
AppWindow* app_window_get_instance (void);
GType library_window_get_type (void) G_GNUC_CONST;
-void library_window_set_page_switching_enabled (LibraryWindow* self, gboolean should_enable);
+void library_window_set_page_switching_enabled (LibraryWindow* self,
+ gboolean should_enable);
GQuark gphoto_error_quark (void);
-static void camera_table_init_camera_table (CameraTable* self, GError** error);
-static void camera_table_update_camera_table (CameraTable* self, GError** error);
+static void camera_table_init_camera_table (CameraTable* self,
+ GError** error);
+static void camera_table_update_camera_table (CameraTable* self,
+ GError** error);
CameraTable* camera_table_get_instance (void);
GeeIterable* camera_table_get_cameras (CameraTable* self);
gint camera_table_get_count (CameraTable* self);
-DiscoveredCamera* camera_table_get_for_uri (CameraTable* self, const gchar* uri);
-static void camera_table_do_op (CameraTable* self, int res, const gchar* op, GError** error);
-static gchar** camera_table_get_all_usb_cameras (CameraTable* self, int* result_length1);
-static void _vala_array_add69 (gchar** * array, int* length, int* size, gchar* value);
+DiscoveredCamera* camera_table_get_for_uri (CameraTable* self,
+ const gchar* uri);
+static void camera_table_do_op (CameraTable* self,
+ int res,
+ const gchar* op,
+ GError** error);
+static gchar** camera_table_get_all_usb_cameras (CameraTable* self,
+ int* result_length1);
+static void _vala_array_add69 (gchar** * array,
+ int* length,
+ int* size,
+ gchar* value);
static void _g_object_unref0_ (gpointer var);
-static void _g_list_free__g_object_unref0_ (GList* self);
-static gboolean camera_table_usb_esp (CameraTable* self, gint current_camera_count, gchar** usb_cameras, int usb_cameras_length1, const gchar* port, gchar* * full_port);
+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 gchar* camera_table_get_icon_for_uuid (CameraTable* self, const gchar* uuid);
-static void _vala_array_add70 (DiscoveredCamera** * array, int* length, int* size, DiscoveredCamera* value);
-void one_shot_scheduler_after_timeout (OneShotScheduler* self, guint msec, gboolean reschedule);
-static void g_cclosure_user_marshal_VOID__DISCOVERED_CAMERA (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data);
+static gchar* camera_table_get_name_for_uuid (CameraTable* self,
+ const gchar* uuid);
+static gchar* camera_table_get_icon_for_uuid (CameraTable* self,
+ const gchar* uuid);
+static void _vala_array_add70 (DiscoveredCamera** * array,
+ int* length,
+ int* size,
+ DiscoveredCamera* value);
+void one_shot_scheduler_after_timeout (OneShotScheduler* self,
+ guint msec,
+ gboolean reschedule);
+static void g_cclosure_user_marshal_VOID__DISCOVERED_CAMERA (GClosure * closure,
+ GValue * return_value,
+ guint n_param_values,
+ const GValue * param_values,
+ gpointer invocation_hint,
+ gpointer marshal_data);
static void camera_table_finalize (CameraTable * obj);
-static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func);
-static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func);
+static void _vala_array_destroy (gpointer array,
+ gint array_length,
+ GDestroyNotify destroy_func);
+static void _vala_array_free (gpointer array,
+ gint array_length,
+ GDestroyNotify destroy_func);
static const gchar* CAMERA_TABLE_SUBSYSTEMS[3] = {"usb", "block", NULL};
-static gpointer _GPHOTO_REF_CAMERA0 (gpointer self) {
+static gpointer
+_GPHOTO_REF_CAMERA0 (gpointer self)
+{
#line 14 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return self ? GPHOTO_REF_CAMERA (self) : NULL;
-#line 252 "CameraTable.c"
+#line 321 "CameraTable.c"
}
-DiscoveredCamera* discovered_camera_construct (GType object_type, Camera* gcamera, const gchar* uri, const gchar* display_name, const gchar* icon) {
+DiscoveredCamera*
+discovered_camera_construct (GType object_type,
+ Camera* gcamera,
+ const gchar* uri,
+ const gchar* display_name,
+ const gchar* icon)
+{
DiscoveredCamera* self = NULL;
Camera* _tmp0_;
- Camera* _tmp1_;
- const gchar* _tmp2_;
+ gchar* _tmp1_;
+ gchar* _tmp2_;
gchar* _tmp3_;
- const gchar* _tmp4_;
- gchar* _tmp5_;
- const gchar* _tmp6_;
- gchar* _tmp7_;
#line 13 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
g_return_val_if_fail (gcamera != NULL, NULL);
#line 13 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -271,148 +342,170 @@ DiscoveredCamera* discovered_camera_construct (GType object_type, Camera* gcamer
#line 13 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
self = (DiscoveredCamera*) g_type_create_instance (object_type);
#line 14 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp0_ = gcamera;
-#line 14 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp1_ = _GPHOTO_REF_CAMERA0 (_tmp0_);
+ _tmp0_ = _GPHOTO_REF_CAMERA0 (gcamera);
#line 14 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_gp_camera_unref0 (self->gcamera);
#line 14 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- self->gcamera = _tmp1_;
+ self->gcamera = _tmp0_;
#line 15 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp2_ = uri;
-#line 15 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp3_ = g_strdup (_tmp2_);
+ _tmp1_ = g_strdup (uri);
#line 15 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (self->uri);
#line 15 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- self->uri = _tmp3_;
-#line 16 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp4_ = display_name;
+ self->uri = _tmp1_;
#line 16 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp5_ = g_strdup (_tmp4_);
+ _tmp2_ = g_strdup (display_name);
#line 16 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (self->display_name);
#line 16 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- self->display_name = _tmp5_;
-#line 17 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp6_ = icon;
+ self->display_name = _tmp2_;
#line 17 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp7_ = g_strdup (_tmp6_);
+ _tmp3_ = g_strdup (icon);
#line 17 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (self->icon);
#line 17 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- self->icon = _tmp7_;
+ self->icon = _tmp3_;
#line 13 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return self;
-#line 308 "CameraTable.c"
+#line 371 "CameraTable.c"
}
-DiscoveredCamera* discovered_camera_new (Camera* gcamera, const gchar* uri, const gchar* display_name, const gchar* icon) {
+DiscoveredCamera*
+discovered_camera_new (Camera* gcamera,
+ const gchar* uri,
+ const gchar* display_name,
+ const gchar* icon)
+{
#line 13 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return discovered_camera_construct (TYPE_DISCOVERED_CAMERA, gcamera, uri, display_name, icon);
-#line 315 "CameraTable.c"
+#line 383 "CameraTable.c"
}
-static void value_discovered_camera_init (GValue* value) {
+static void
+value_discovered_camera_init (GValue* value)
+{
#line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
value->data[0].v_pointer = NULL;
-#line 322 "CameraTable.c"
+#line 392 "CameraTable.c"
}
-static void value_discovered_camera_free_value (GValue* value) {
+static void
+value_discovered_camera_free_value (GValue* value)
+{
#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"
discovered_camera_unref (value->data[0].v_pointer);
-#line 331 "CameraTable.c"
+#line 403 "CameraTable.c"
}
}
-static void value_discovered_camera_copy_value (const GValue* src_value, GValue* dest_value) {
+static void
+value_discovered_camera_copy_value (const GValue* src_value,
+ GValue* dest_value)
+{
#line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
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 341 "CameraTable.c"
+#line 416 "CameraTable.c"
} else {
#line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
dest_value->data[0].v_pointer = NULL;
-#line 345 "CameraTable.c"
+#line 420 "CameraTable.c"
}
}
-static gpointer value_discovered_camera_peek_pointer (const GValue* value) {
+static gpointer
+value_discovered_camera_peek_pointer (const GValue* value)
+{
#line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return value->data[0].v_pointer;
-#line 353 "CameraTable.c"
+#line 430 "CameraTable.c"
}
-static gchar* value_discovered_camera_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+static gchar*
+value_discovered_camera_collect_value (GValue* value,
+ guint n_collect_values,
+ GTypeCValue* collect_values,
+ guint collect_flags)
+{
#line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (collect_values[0].v_pointer) {
-#line 360 "CameraTable.c"
+#line 442 "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 367 "CameraTable.c"
+#line 449 "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 371 "CameraTable.c"
+#line 453 "CameraTable.c"
}
#line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
value->data[0].v_pointer = discovered_camera_ref (object);
-#line 375 "CameraTable.c"
+#line 457 "CameraTable.c"
} else {
#line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
value->data[0].v_pointer = NULL;
-#line 379 "CameraTable.c"
+#line 461 "CameraTable.c"
}
#line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return NULL;
-#line 383 "CameraTable.c"
+#line 465 "CameraTable.c"
}
-static gchar* value_discovered_camera_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+static gchar*
+value_discovered_camera_lcopy_value (const GValue* value,
+ guint n_collect_values,
+ GTypeCValue* collect_values,
+ guint collect_flags)
+{
DiscoveredCamera ** object_p;
object_p = collect_values[0].v_pointer;
#line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
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 394 "CameraTable.c"
+#line 481 "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 400 "CameraTable.c"
+#line 487 "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 404 "CameraTable.c"
+#line 491 "CameraTable.c"
} else {
#line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
*object_p = discovered_camera_ref (value->data[0].v_pointer);
-#line 408 "CameraTable.c"
+#line 495 "CameraTable.c"
}
#line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return NULL;
-#line 412 "CameraTable.c"
+#line 499 "CameraTable.c"
}
-GParamSpec* param_spec_discovered_camera (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
+GParamSpec*
+param_spec_discovered_camera (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags)
+{
ParamSpecDiscoveredCamera* spec;
#line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
g_return_val_if_fail (g_type_is_a (object_type, TYPE_DISCOVERED_CAMERA), NULL);
@@ -422,20 +515,25 @@ GParamSpec* param_spec_discovered_camera (const gchar* name, const gchar* nick,
G_PARAM_SPEC (spec)->value_type = object_type;
#line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return G_PARAM_SPEC (spec);
-#line 426 "CameraTable.c"
+#line 519 "CameraTable.c"
}
-gpointer value_get_discovered_camera (const GValue* value) {
+gpointer
+value_get_discovered_camera (const GValue* value)
+{
#line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
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 435 "CameraTable.c"
+#line 530 "CameraTable.c"
}
-void value_set_discovered_camera (GValue* value, gpointer v_object) {
+void
+value_set_discovered_camera (GValue* value,
+ gpointer v_object)
+{
DiscoveredCamera * old;
#line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_DISCOVERED_CAMERA));
@@ -451,22 +549,25 @@ void value_set_discovered_camera (GValue* value, gpointer v_object) {
value->data[0].v_pointer = v_object;
#line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
discovered_camera_ref (value->data[0].v_pointer);
-#line 455 "CameraTable.c"
+#line 553 "CameraTable.c"
} else {
#line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
value->data[0].v_pointer = NULL;
-#line 459 "CameraTable.c"
+#line 557 "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 465 "CameraTable.c"
+#line 563 "CameraTable.c"
}
}
-void value_take_discovered_camera (GValue* value, gpointer v_object) {
+void
+value_take_discovered_camera (GValue* value,
+ gpointer v_object)
+{
DiscoveredCamera * old;
#line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_DISCOVERED_CAMERA));
@@ -480,38 +581,44 @@ void value_take_discovered_camera (GValue* value, gpointer v_object) {
g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
#line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
value->data[0].v_pointer = v_object;
-#line 484 "CameraTable.c"
+#line 585 "CameraTable.c"
} else {
#line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
value->data[0].v_pointer = NULL;
-#line 488 "CameraTable.c"
+#line 589 "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 494 "CameraTable.c"
+#line 595 "CameraTable.c"
}
}
-static void discovered_camera_class_init (DiscoveredCameraClass * klass) {
+static void
+discovered_camera_class_init (DiscoveredCameraClass * klass)
+{
#line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
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 504 "CameraTable.c"
+#line 607 "CameraTable.c"
}
-static void discovered_camera_instance_init (DiscoveredCamera * self) {
+static void
+discovered_camera_instance_init (DiscoveredCamera * self)
+{
#line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
self->ref_count = 1;
-#line 511 "CameraTable.c"
+#line 616 "CameraTable.c"
}
-static void discovered_camera_finalize (DiscoveredCamera * obj) {
+static void
+discovered_camera_finalize (DiscoveredCamera * obj)
+{
DiscoveredCamera * self;
#line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_DISCOVERED_CAMERA, DiscoveredCamera);
@@ -525,11 +632,13 @@ static void discovered_camera_finalize (DiscoveredCamera * obj) {
_g_free0 (self->display_name);
#line 11 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (self->icon);
-#line 529 "CameraTable.c"
+#line 636 "CameraTable.c"
}
-GType discovered_camera_get_type (void) {
+GType
+discovered_camera_get_type (void)
+{
static volatile gsize discovered_camera_type_id__volatile = 0;
if (g_once_init_enter (&discovered_camera_type_id__volatile)) {
static const GTypeValueTable g_define_type_value_table = { value_discovered_camera_init, value_discovered_camera_free_value, value_discovered_camera_copy_value, value_discovered_camera_peek_pointer, "p", value_discovered_camera_collect_value, "p", value_discovered_camera_lcopy_value };
@@ -543,18 +652,22 @@ GType discovered_camera_get_type (void) {
}
-gpointer discovered_camera_ref (gpointer instance) {
+gpointer
+discovered_camera_ref (gpointer instance)
+{
DiscoveredCamera * self;
self = instance;
#line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
g_atomic_int_inc (&self->ref_count);
#line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return instance;
-#line 554 "CameraTable.c"
+#line 665 "CameraTable.c"
}
-void discovered_camera_unref (gpointer instance) {
+void
+discovered_camera_unref (gpointer instance)
+{
DiscoveredCamera * self;
self = instance;
#line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -563,49 +676,68 @@ void discovered_camera_unref (gpointer instance) {
DISCOVERED_CAMERA_GET_CLASS (self)->finalize (self);
#line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
g_type_free_instance ((GTypeInstance *) self);
-#line 567 "CameraTable.c"
+#line 680 "CameraTable.c"
}
}
-static void _camera_table_on_update_cameras_one_shot_callback (gpointer self) {
+static void
+_camera_table_on_update_cameras_one_shot_callback (gpointer self)
+{
#line 42 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
camera_table_on_update_cameras ((CameraTable*) self);
-#line 575 "CameraTable.c"
+#line 690 "CameraTable.c"
}
-static void _camera_table_on_udev_event_g_udev_client_uevent (GUdevClient* _sender, const gchar* action, GUdevDevice* device, gpointer self) {
+static void
+_camera_table_on_udev_event_g_udev_client_uevent (GUdevClient* _sender,
+ const gchar* action,
+ GUdevDevice* device,
+ gpointer self)
+{
#line 46 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
camera_table_on_udev_event ((CameraTable*) self, action, device);
-#line 582 "CameraTable.c"
+#line 702 "CameraTable.c"
}
-static void _camera_table_on_volume_changed_g_volume_monitor_volume_changed (GVolumeMonitor* _sender, GVolume* volume, gpointer self) {
+static void
+_camera_table_on_volume_changed_g_volume_monitor_volume_changed (GVolumeMonitor* _sender,
+ GVolume* volume,
+ gpointer self)
+{
#line 48 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
camera_table_on_volume_changed ((CameraTable*) self, volume);
-#line 589 "CameraTable.c"
+#line 713 "CameraTable.c"
}
-static void _camera_table_on_volume_changed_g_volume_monitor_volume_added (GVolumeMonitor* _sender, GVolume* volume, gpointer self) {
+static void
+_camera_table_on_volume_changed_g_volume_monitor_volume_added (GVolumeMonitor* _sender,
+ GVolume* volume,
+ gpointer self)
+{
#line 49 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
camera_table_on_volume_changed ((CameraTable*) self, volume);
-#line 596 "CameraTable.c"
+#line 724 "CameraTable.c"
}
-static gboolean _camera_table_delayed_init_gsource_func (gpointer self) {
+static gboolean
+_camera_table_delayed_init_gsource_func (gpointer self)
+{
gboolean result;
result = camera_table_delayed_init ((CameraTable*) self);
#line 54 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return result;
-#line 605 "CameraTable.c"
+#line 735 "CameraTable.c"
}
-static CameraTable* camera_table_construct (GType object_type) {
+static CameraTable*
+camera_table_construct (GType object_type)
+{
CameraTable* self = NULL;
OneShotScheduler* _tmp0_;
GUdevClient* _tmp1_;
@@ -642,18 +774,22 @@ static CameraTable* camera_table_construct (GType object_type) {
g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) 500, _camera_table_delayed_init_gsource_func, camera_table_ref (self), camera_table_unref);
#line 41 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return self;
-#line 646 "CameraTable.c"
+#line 778 "CameraTable.c"
}
-static CameraTable* camera_table_new (void) {
+static CameraTable*
+camera_table_new (void)
+{
#line 41 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return camera_table_construct (TYPE_CAMERA_TABLE);
-#line 653 "CameraTable.c"
+#line 787 "CameraTable.c"
}
-static gboolean camera_table_delayed_init (CameraTable* self) {
+static gboolean
+camera_table_delayed_init (CameraTable* self)
+{
gboolean result = FALSE;
AppWindow* _tmp0_;
LibraryWindow* _tmp1_;
@@ -670,17 +806,17 @@ static gboolean camera_table_delayed_init (CameraTable* self) {
library_window_set_page_switching_enabled (_tmp1_, FALSE);
#line 60 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_object_unref0 (_tmp1_);
-#line 674 "CameraTable.c"
+#line 810 "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 680 "CameraTable.c"
+#line 816 "CameraTable.c"
gboolean _tmp2_ = FALSE;
#line 63 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (_inner_error_->domain == GPHOTO_ERROR) {
-#line 684 "CameraTable.c"
+#line 820 "CameraTable.c"
goto __catch64_gphoto_error;
}
#line 63 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -689,7 +825,7 @@ static gboolean camera_table_delayed_init (CameraTable* self) {
g_clear_error (&_inner_error_);
#line 63 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return _tmp2_;
-#line 693 "CameraTable.c"
+#line 829 "CameraTable.c"
}
}
goto __finally64;
@@ -714,12 +850,12 @@ static gboolean camera_table_delayed_init (CameraTable* self) {
_g_error_free0 (err);
#line 67 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return result;
-#line 718 "CameraTable.c"
+#line 854 "CameraTable.c"
}
__finally64:
#line 62 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 723 "CameraTable.c"
+#line 859 "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);
@@ -727,18 +863,18 @@ static gboolean camera_table_delayed_init (CameraTable* self) {
g_clear_error (&_inner_error_);
#line 62 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return _tmp5_;
-#line 731 "CameraTable.c"
+#line 867 "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 738 "CameraTable.c"
+#line 874 "CameraTable.c"
gboolean _tmp6_ = FALSE;
#line 71 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (_inner_error_->domain == GPHOTO_ERROR) {
-#line 742 "CameraTable.c"
+#line 878 "CameraTable.c"
goto __catch65_gphoto_error;
}
#line 71 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -747,7 +883,7 @@ static gboolean camera_table_delayed_init (CameraTable* self) {
g_clear_error (&_inner_error_);
#line 71 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return _tmp6_;
-#line 751 "CameraTable.c"
+#line 887 "CameraTable.c"
}
}
goto __finally65;
@@ -768,12 +904,12 @@ static gboolean camera_table_delayed_init (CameraTable* self) {
g_warning ("CameraTable.vala:73: Unable to update camera table: %s", _tmp8_);
#line 70 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_error_free0 (err);
-#line 772 "CameraTable.c"
+#line 908 "CameraTable.c"
}
__finally65:
#line 70 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 777 "CameraTable.c"
+#line 913 "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);
@@ -781,7 +917,7 @@ static gboolean camera_table_delayed_init (CameraTable* self) {
g_clear_error (&_inner_error_);
#line 70 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return _tmp9_;
-#line 785 "CameraTable.c"
+#line 921 "CameraTable.c"
}
#line 78 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp10_ = app_window_get_instance ();
@@ -795,18 +931,22 @@ static gboolean camera_table_delayed_init (CameraTable* self) {
result = FALSE;
#line 79 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return result;
-#line 799 "CameraTable.c"
+#line 935 "CameraTable.c"
}
-static gpointer _camera_table_ref0 (gpointer self) {
+static gpointer
+_camera_table_ref0 (gpointer self)
+{
#line 86 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return self ? camera_table_ref (self) : NULL;
-#line 806 "CameraTable.c"
+#line 944 "CameraTable.c"
}
-CameraTable* camera_table_get_instance (void) {
+CameraTable*
+camera_table_get_instance (void)
+{
CameraTable* result = NULL;
CameraTable* _tmp0_;
CameraTable* _tmp2_;
@@ -815,7 +955,7 @@ CameraTable* camera_table_get_instance (void) {
_tmp0_ = camera_table_instance;
#line 83 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (_tmp0_ == NULL) {
-#line 819 "CameraTable.c"
+#line 959 "CameraTable.c"
CameraTable* _tmp1_;
#line 84 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp1_ = camera_table_new ();
@@ -823,7 +963,7 @@ CameraTable* camera_table_get_instance (void) {
_camera_table_unref0 (camera_table_instance);
#line 84 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
camera_table_instance = _tmp1_;
-#line 827 "CameraTable.c"
+#line 967 "CameraTable.c"
}
#line 86 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp2_ = camera_table_instance;
@@ -833,11 +973,13 @@ CameraTable* camera_table_get_instance (void) {
result = _tmp3_;
#line 86 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return result;
-#line 837 "CameraTable.c"
+#line 977 "CameraTable.c"
}
-GeeIterable* camera_table_get_cameras (CameraTable* self) {
+GeeIterable*
+camera_table_get_cameras (CameraTable* self)
+{
GeeIterable* result = NULL;
GeeHashMap* _tmp0_;
GeeCollection* _tmp1_;
@@ -854,11 +996,13 @@ GeeIterable* camera_table_get_cameras (CameraTable* self) {
result = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ITERABLE, GeeIterable);
#line 90 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return result;
-#line 858 "CameraTable.c"
+#line 1000 "CameraTable.c"
}
-gint camera_table_get_count (CameraTable* self) {
+gint
+camera_table_get_count (CameraTable* self)
+{
gint result = 0;
GeeHashMap* _tmp0_;
gint _tmp1_;
@@ -875,15 +1019,17 @@ gint camera_table_get_count (CameraTable* self) {
result = _tmp2_;
#line 94 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return result;
-#line 879 "CameraTable.c"
+#line 1023 "CameraTable.c"
}
-DiscoveredCamera* camera_table_get_for_uri (CameraTable* self, const gchar* uri) {
+DiscoveredCamera*
+camera_table_get_for_uri (CameraTable* self,
+ const gchar* uri)
+{
DiscoveredCamera* result = NULL;
GeeHashMap* _tmp0_;
- const gchar* _tmp1_;
- gpointer _tmp2_;
+ gpointer _tmp1_;
#line 97 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
g_return_val_if_fail (IS_CAMERA_TABLE (self), NULL);
#line 97 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -891,53 +1037,44 @@ DiscoveredCamera* camera_table_get_for_uri (CameraTable* self, const gchar* uri)
#line 98 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp0_ = self->priv->camera_map;
#line 98 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp1_ = uri;
-#line 98 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp2_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_);
+ _tmp1_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), uri);
#line 98 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- result = (DiscoveredCamera*) _tmp2_;
+ result = (DiscoveredCamera*) _tmp1_;
#line 98 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return result;
-#line 902 "CameraTable.c"
+#line 1046 "CameraTable.c"
}
-static void camera_table_do_op (CameraTable* self, int res, const gchar* op, GError** error) {
- int _tmp0_;
+static void
+camera_table_do_op (CameraTable* self,
+ int res,
+ const gchar* op,
+ GError** error)
+{
GError * _inner_error_ = NULL;
#line 101 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
g_return_if_fail (IS_CAMERA_TABLE (self));
#line 101 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
g_return_if_fail (op != NULL);
#line 102 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp0_ = res;
-#line 102 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- if (_tmp0_ != GP_OK) {
-#line 917 "CameraTable.c"
- int _tmp1_;
- const gchar* _tmp2_;
- int _tmp3_;
- const gchar* _tmp4_;
- GError* _tmp5_;
-#line 103 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp1_ = res;
+ if (res != GP_OK) {
+#line 1063 "CameraTable.c"
+ const gchar* _tmp0_;
+ GError* _tmp1_;
#line 103 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp2_ = op;
+ _tmp0_ = gp_port_result_as_string (res);
#line 103 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp3_ = res;
+ _tmp1_ = g_error_new (GPHOTO_ERROR, GPHOTO_ERROR_LIBRARY, "[%d] Unable to %s: %s", (gint) res, op, _tmp0_);
#line 103 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp4_ = gp_port_result_as_string (_tmp3_);
-#line 103 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp5_ = g_error_new (GPHOTO_ERROR, GPHOTO_ERROR_LIBRARY, "[%d] Unable to %s: %s", (gint) _tmp1_, _tmp2_, _tmp4_);
-#line 103 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _inner_error_ = _tmp5_;
+ _inner_error_ = _tmp1_;
#line 103 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (_inner_error_->domain == GPHOTO_ERROR) {
#line 103 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
g_propagate_error (error, _inner_error_);
#line 103 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return;
-#line 941 "CameraTable.c"
+#line 1078 "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);
@@ -945,18 +1082,20 @@ static void camera_table_do_op (CameraTable* self, int res, const gchar* op, GEr
g_clear_error (&_inner_error_);
#line 103 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return;
-#line 949 "CameraTable.c"
+#line 1086 "CameraTable.c"
}
}
}
-static void camera_table_init_camera_table (CameraTable* self, GError** error) {
+static void
+camera_table_init_camera_table (CameraTable* self,
+ GError** error)
+{
CameraAbilitiesList* _tmp0_ = NULL;
int _tmp1_;
CameraAbilitiesList* _tmp2_;
GPContext* _tmp3_;
- int _tmp4_;
GError * _inner_error_ = NULL;
#line 106 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
g_return_if_fail (IS_CAMERA_TABLE (self));
@@ -976,7 +1115,7 @@ static void camera_table_init_camera_table (CameraTable* self, GError** error) {
g_propagate_error (error, _inner_error_);
#line 107 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return;
-#line 980 "CameraTable.c"
+#line 1119 "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);
@@ -984,7 +1123,7 @@ static void camera_table_init_camera_table (CameraTable* self, GError** error) {
g_clear_error (&_inner_error_);
#line 107 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return;
-#line 988 "CameraTable.c"
+#line 1127 "CameraTable.c"
}
}
#line 108 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -992,9 +1131,7 @@ static void camera_table_init_camera_table (CameraTable* self, GError** error) {
#line 108 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp3_ = self->priv->null_context;
#line 108 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp4_ = gp_abilities_list_load (_tmp2_, _tmp3_);
-#line 108 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- camera_table_do_op (self, _tmp4_, "load camera abilities list", &_inner_error_);
+ camera_table_do_op (self, gp_abilities_list_load (_tmp2_, _tmp3_), "load camera abilities list", &_inner_error_);
#line 108 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 108 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -1003,7 +1140,7 @@ static void camera_table_init_camera_table (CameraTable* self, GError** error) {
g_propagate_error (error, _inner_error_);
#line 108 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return;
-#line 1007 "CameraTable.c"
+#line 1144 "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);
@@ -1011,53 +1148,65 @@ static void camera_table_init_camera_table (CameraTable* self, GError** error) {
g_clear_error (&_inner_error_);
#line 108 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return;
-#line 1015 "CameraTable.c"
+#line 1152 "CameraTable.c"
}
}
}
-static gpointer _g_object_ref0 (gpointer self) {
+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 1024 "CameraTable.c"
+#line 1163 "CameraTable.c"
}
-static void _vala_array_add69 (gchar** * array, int* length, int* size, gchar* value) {
+static void
+_vala_array_add69 (gchar** * array,
+ int* length,
+ int* size,
+ gchar* value)
+{
#line 135 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if ((*length) == (*size)) {
#line 135 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
*size = (*size) ? (2 * (*size)) : 4;
#line 135 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
*array = g_renew (gchar*, *array, (*size) + 1);
-#line 1035 "CameraTable.c"
+#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 1041 "CameraTable.c"
+#line 1185 "CameraTable.c"
}
-static void _g_object_unref0_ (gpointer var) {
+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 1048 "CameraTable.c"
+#line 1194 "CameraTable.c"
}
-static void _g_list_free__g_object_unref0_ (GList* self) {
+static inline void
+_g_list_free__g_object_unref0_ (GList* self)
+{
#line 139 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- g_list_foreach (self, (GFunc) _g_object_unref0_, NULL);
-#line 139 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- g_list_free (self);
-#line 1057 "CameraTable.c"
+ 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) {
+static gchar**
+camera_table_get_all_usb_cameras (CameraTable* self,
+ int* result_length1)
+{
gchar** result = NULL;
gchar** cameras = NULL;
gchar** _tmp0_;
@@ -1067,8 +1216,8 @@ static gchar** camera_table_get_all_usb_cameras (CameraTable* self, int* result_
GUdevClient* _tmp1_;
GList* _tmp2_;
GList* _tmp3_;
- gchar** _tmp25_;
- gint _tmp25__length1;
+ 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"
@@ -1087,7 +1236,7 @@ static gchar** camera_table_get_all_usb_cameras (CameraTable* self, int* result_
device_list = _tmp2_;
#line 115 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp3_ = device_list;
-#line 1091 "CameraTable.c"
+#line 1240 "CameraTable.c"
{
GList* device_collection = NULL;
GList* device_it = NULL;
@@ -1095,14 +1244,14 @@ static gchar** camera_table_get_all_usb_cameras (CameraTable* self, int* result_
device_collection = _tmp3_;
#line 115 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
for (device_it = device_collection; device_it != NULL; device_it = device_it->next) {
-#line 1099 "CameraTable.c"
+#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 1106 "CameraTable.c"
+#line 1255 "CameraTable.c"
{
gchar* device_file = NULL;
GUdevDevice* _tmp5_;
@@ -1123,371 +1272,307 @@ static gchar** camera_table_get_all_usb_cameras (CameraTable* self, int* result_
_tmp10_ = device_file;
#line 120 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (_tmp10_ != NULL) {
-#line 1127 "CameraTable.c"
+#line 1276 "CameraTable.c"
GUdevDevice* _tmp11_;
- gboolean _tmp12_;
#line 121 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp11_ = device;
#line 121 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp12_ = g_udev_device_has_property (_tmp11_, "ID_GPHOTO2");
-#line 121 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp9_ = _tmp12_;
-#line 1136 "CameraTable.c"
+ _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 1140 "CameraTable.c"
+#line 1286 "CameraTable.c"
}
#line 120 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (_tmp9_) {
-#line 1144 "CameraTable.c"
- GUdevDevice* _tmp13_;
- gboolean _tmp14_;
-#line 122 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp13_ = device;
+#line 1290 "CameraTable.c"
+ GUdevDevice* _tmp12_;
#line 122 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp14_ = g_udev_device_has_property (_tmp13_, "GPHOTO2_DRIVER");
+ _tmp12_ = device;
#line 122 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp8_ = _tmp14_;
-#line 1153 "CameraTable.c"
+ _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 1157 "CameraTable.c"
+#line 1300 "CameraTable.c"
}
#line 117 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (_tmp8_) {
-#line 1161 "CameraTable.c"
+#line 1304 "CameraTable.c"
gint camera_bus = 0;
gint camera_device = 0;
- const gchar* _tmp15_;
- gint _tmp16_;
+ const gchar* _tmp13_;
gchar* camera = NULL;
- gint _tmp18_;
- gint _tmp19_;
- gchar* _tmp20_;
- const gchar* _tmp21_;
- gchar** _tmp22_;
- gint _tmp22__length1;
- const gchar* _tmp23_;
- gchar* _tmp24_;
-#line 128 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp15_ = device_file;
+ 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"
- _tmp16_ = sscanf (_tmp15_, "/dev/bus/usb/%d/%d", &camera_bus, &camera_device);
+ _tmp13_ = device_file;
#line 128 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- if (_tmp16_ < 2) {
-#line 1181 "CameraTable.c"
- const gchar* _tmp17_;
+ 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"
- _tmp17_ = device_file;
+ _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", _tmp17_);
+" %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 1193 "CameraTable.c"
+#line 1333 "CameraTable.c"
}
#line 133 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp18_ = camera_bus;
+ _tmp15_ = camera_bus;
#line 133 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp19_ = camera_device;
+ _tmp16_ = camera_device;
#line 133 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp20_ = g_strdup_printf ("usb:%.3d,%.3d", _tmp18_, _tmp19_);
+ _tmp17_ = g_strdup_printf ("usb:%.3d,%.3d", _tmp15_, _tmp16_);
#line 133 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- camera = _tmp20_;
+ camera = _tmp17_;
#line 134 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp21_ = camera;
+ _tmp18_ = camera;
#line 134 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- g_debug ("CameraTable.vala:134: USB camera detected at %s", _tmp21_);
+ g_debug ("CameraTable.vala:134: USB camera detected at %s", _tmp18_);
#line 135 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp22_ = cameras;
+ _tmp19_ = cameras;
#line 135 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp22__length1 = cameras_length1;
+ _tmp19__length1 = cameras_length1;
#line 135 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp23_ = camera;
+ _tmp20_ = camera;
#line 135 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp24_ = g_strdup (_tmp23_);
+ _tmp21_ = g_strdup (_tmp20_);
#line 135 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _vala_array_add69 (&cameras, &cameras_length1, &_cameras_size_, _tmp24_);
+ _vala_array_add69 (&cameras, &cameras_length1, &_cameras_size_, _tmp21_);
#line 117 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (camera);
-#line 1219 "CameraTable.c"
+#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 1225 "CameraTable.c"
+#line 1365 "CameraTable.c"
}
}
}
#line 139 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp25_ = cameras;
+ _tmp22_ = cameras;
#line 139 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp25__length1 = cameras_length1;
+ _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 = _tmp25__length1;
-#line 1237 "CameraTable.c"
+ *result_length1 = _tmp22__length1;
+#line 1377 "CameraTable.c"
}
#line 139 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- result = _tmp25_;
+ 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 1245 "CameraTable.c"
+#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) {
+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;
- gint _tmp0_;
- gint _tmp1_;
- const gchar* _tmp2_;
- gboolean _tmp3_ = FALSE;
- gint _tmp4_;
- const gchar* _tmp11_;
+ gboolean _tmp0_ = FALSE;
gint bus = 0;
gint device = 0;
- const gchar* _tmp13_;
- gint _tmp14_;
- gchar** _tmp16_;
- gint _tmp16__length1;
- const gchar* _tmp30_;
#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"
- _tmp0_ = current_camera_count;
-#line 153 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _vala_assert (_tmp0_ > 0, "current_camera_count > 0");
-#line 155 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp1_ = current_camera_count;
+ _vala_assert (current_camera_count > 0, "current_camera_count > 0");
#line 155 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp2_ = port;
-#line 155 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- g_debug ("CameraTable.vala:155: USB ESP: current_camera_count=%d port=%s", _tmp1_, _tmp2_);
+ 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"
- _tmp4_ = current_camera_count;
-#line 160 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- if (_tmp4_ == 1) {
-#line 1287 "CameraTable.c"
- gchar** _tmp5_;
- gint _tmp5__length1;
-#line 160 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp5_ = usb_cameras;
+ if (current_camera_count == 1) {
#line 160 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp5__length1 = usb_cameras_length1;
-#line 160 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp3_ = _tmp5__length1 == 1;
-#line 1296 "CameraTable.c"
+ _tmp0_ = usb_cameras_length1 == 1;
+#line 1418 "CameraTable.c"
} else {
#line 160 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp3_ = FALSE;
-#line 1300 "CameraTable.c"
+ _tmp0_ = FALSE;
+#line 1422 "CameraTable.c"
}
#line 160 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- if (_tmp3_) {
-#line 1304 "CameraTable.c"
- gchar** _tmp6_;
- gint _tmp6__length1;
- const gchar* _tmp7_;
- gchar* _tmp8_;
- const gchar* _tmp9_;
- const gchar* _tmp10_;
-#line 161 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp6_ = usb_cameras;
-#line 161 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp6__length1 = usb_cameras_length1;
+ if (_tmp0_) {
+#line 1426 "CameraTable.c"
+ const gchar* _tmp1_;
+ gchar* _tmp2_;
+ const gchar* _tmp3_;
#line 161 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp7_ = _tmp6_[0];
+ _tmp1_ = usb_cameras[0];
#line 161 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp8_ = g_strdup (_tmp7_);
+ _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 = _tmp8_;
-#line 163 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp9_ = port;
+ _vala_full_port = _tmp2_;
#line 163 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp10_ = _vala_full_port;
+ _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", _tmp9_, _tmp10_);
+ 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 1335 "CameraTable.c"
+#line 1448 "CameraTable.c"
} else {
#line 165 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (_vala_full_port);
-#line 1339 "CameraTable.c"
+#line 1452 "CameraTable.c"
}
#line 165 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return result;
-#line 1343 "CameraTable.c"
+#line 1456 "CameraTable.c"
}
#line 169 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp11_ = port;
-#line 169 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- if (g_strcmp0 (_tmp11_, "usb:") == 0) {
-#line 1349 "CameraTable.c"
- const gchar* _tmp12_;
+ if (g_strcmp0 (port, "usb:") == 0) {
#line 170 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp12_ = port;
-#line 170 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- g_debug ("CameraTable.vala:170: USB ESP: Skipping %s", _tmp12_);
+ 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 1361 "CameraTable.c"
+#line 1468 "CameraTable.c"
} else {
#line 172 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (_vala_full_port);
-#line 1365 "CameraTable.c"
+#line 1472 "CameraTable.c"
}
#line 172 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return result;
-#line 1369 "CameraTable.c"
+#line 1476 "CameraTable.c"
}
#line 177 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp13_ = port;
-#line 177 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp14_ = sscanf (_tmp13_, "usb:%d,%d", &bus, &device);
-#line 177 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- if (_tmp14_ < 2) {
-#line 1377 "CameraTable.c"
- const gchar* _tmp15_;
-#line 178 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp15_ = port;
+ 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", _tmp15_);
+ 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 1389 "CameraTable.c"
+#line 1488 "CameraTable.c"
} else {
#line 180 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (_vala_full_port);
-#line 1393 "CameraTable.c"
+#line 1492 "CameraTable.c"
}
#line 180 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return result;
-#line 1397 "CameraTable.c"
+#line 1496 "CameraTable.c"
}
-#line 183 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp16_ = usb_cameras;
-#line 183 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp16__length1 = usb_cameras_length1;
-#line 1403 "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 = _tmp16_;
+ usb_camera_collection = usb_cameras;
#line 183 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- usb_camera_collection_length1 = _tmp16__length1;
+ 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 < _tmp16__length1; usb_camera_it = usb_camera_it + 1) {
-#line 1415 "CameraTable.c"
- gchar* _tmp17_;
+ 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"
- _tmp17_ = g_strdup (usb_camera_collection[usb_camera_it]);
+ _tmp4_ = g_strdup (usb_camera_collection[usb_camera_it]);
#line 183 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- usb_camera = _tmp17_;
-#line 1422 "CameraTable.c"
+ usb_camera = _tmp4_;
+#line 1516 "CameraTable.c"
{
gint camera_bus = 0;
gint camera_device = 0;
- const gchar* _tmp18_;
- gint _tmp19_;
- gboolean _tmp21_ = FALSE;
- gint _tmp22_;
- gint _tmp23_;
-#line 185 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp18_ = usb_camera;
+ const gchar* _tmp5_;
+ gboolean _tmp7_ = FALSE;
+ gint _tmp8_;
+ gint _tmp9_;
#line 185 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp19_ = sscanf (_tmp18_, "usb:%d,%d", &camera_bus, &camera_device);
+ _tmp5_ = usb_camera;
#line 185 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- if (_tmp19_ < 2) {
-#line 1437 "CameraTable.c"
- const gchar* _tmp20_;
+ 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"
- _tmp20_ = usb_camera;
+ _tmp6_ = usb_camera;
#line 186 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- g_critical ("CameraTable.vala:186: USB ESP: Failed to scanf %s", _tmp20_);
+ 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 1447 "CameraTable.c"
+#line 1538 "CameraTable.c"
}
#line 191 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp22_ = bus;
+ _tmp8_ = bus;
#line 191 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp23_ = camera_bus;
+ _tmp9_ = camera_bus;
#line 191 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- if (_tmp22_ == _tmp23_) {
-#line 1455 "CameraTable.c"
- gint _tmp24_;
- gint _tmp25_;
+ if (_tmp8_ == _tmp9_) {
+#line 1546 "CameraTable.c"
+ gint _tmp10_;
+ gint _tmp11_;
#line 191 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp24_ = device;
+ _tmp10_ = device;
#line 191 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp25_ = camera_device;
+ _tmp11_ = camera_device;
#line 191 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp21_ = _tmp24_ == _tmp25_;
-#line 1464 "CameraTable.c"
+ _tmp7_ = _tmp10_ == _tmp11_;
+#line 1555 "CameraTable.c"
} else {
#line 191 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp21_ = FALSE;
-#line 1468 "CameraTable.c"
+ _tmp7_ = FALSE;
+#line 1559 "CameraTable.c"
}
#line 191 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- if (_tmp21_) {
-#line 1472 "CameraTable.c"
- const gchar* _tmp26_;
- gchar* _tmp27_;
- const gchar* _tmp28_;
- const gchar* _tmp29_;
-#line 192 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp26_ = port;
+ if (_tmp7_) {
+#line 1563 "CameraTable.c"
+ gchar* _tmp12_;
+ const gchar* _tmp13_;
#line 192 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp27_ = g_strdup (_tmp26_);
+ _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 = _tmp27_;
-#line 194 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp28_ = port;
+ _vala_full_port = _tmp12_;
#line 194 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp29_ = _vala_full_port;
+ _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", _tmp28_, _tmp29_);
+ 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"
@@ -1496,450 +1581,379 @@ static gboolean camera_table_usb_esp (CameraTable* self, gint current_camera_cou
if (full_port) {
#line 196 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
*full_port = _vala_full_port;
-#line 1499 "CameraTable.c"
+#line 1584 "CameraTable.c"
} else {
#line 196 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (_vala_full_port);
-#line 1503 "CameraTable.c"
+#line 1588 "CameraTable.c"
}
#line 196 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return result;
-#line 1507 "CameraTable.c"
+#line 1592 "CameraTable.c"
}
#line 183 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (usb_camera);
-#line 1511 "CameraTable.c"
+#line 1596 "CameraTable.c"
}
}
}
#line 200 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp30_ = port;
-#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", _tmp30_);
+"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 1525 "CameraTable.c"
+#line 1608 "CameraTable.c"
} else {
#line 202 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (_vala_full_port);
-#line 1529 "CameraTable.c"
+#line 1612 "CameraTable.c"
}
#line 202 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return result;
-#line 1533 "CameraTable.c"
+#line 1616 "CameraTable.c"
}
-gchar* camera_table_get_port_uri (const gchar* port) {
+gchar*
+camera_table_get_port_uri (const gchar* port)
+{
gchar* result = NULL;
- const gchar* _tmp0_;
- gchar* _tmp1_;
+ gchar* _tmp0_;
#line 205 "/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"
- _tmp0_ = port;
-#line 206 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp1_ = g_strdup_printf ("gphoto2://[%s]/", _tmp0_);
+ _tmp0_ = g_strdup_printf ("gphoto2://[%s]/", port);
#line 206 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- result = _tmp1_;
+ result = _tmp0_;
#line 206 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return result;
-#line 1551 "CameraTable.c"
+#line 1633 "CameraTable.c"
}
-static glong string_strnlen (gchar* str, glong maxlen) {
+static glong
+string_strnlen (gchar* str,
+ glong maxlen)
+{
glong result = 0L;
gchar* end = NULL;
gchar* _tmp0_;
- glong _tmp1_;
- gchar* _tmp2_;
- gchar* _tmp3_;
-#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp0_ = str;
-#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp1_ = maxlen;
-#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp2_ = memchr (_tmp0_, 0, (gsize) _tmp1_);
-#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- end = _tmp2_;
-#line 1323 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp3_ = end;
-#line 1323 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- if (_tmp3_ == NULL) {
-#line 1574 "CameraTable.c"
- glong _tmp4_;
-#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp4_ = maxlen;
-#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- result = _tmp4_;
-#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ gchar* _tmp1_;
+#line 1336 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp0_ = memchr (str, 0, (gsize) maxlen);
+#line 1336 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ end = _tmp0_;
+#line 1337 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp1_ = end;
+#line 1337 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ if (_tmp1_ == NULL) {
+#line 1338 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ result = maxlen;
+#line 1338 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
return result;
-#line 1582 "CameraTable.c"
+#line 1657 "CameraTable.c"
} else {
- gchar* _tmp5_;
- gchar* _tmp6_;
-#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp5_ = end;
-#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp6_ = str;
-#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- result = (glong) (_tmp5_ - _tmp6_);
-#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ gchar* _tmp2_;
+#line 1340 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp2_ = end;
+#line 1340 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ result = (glong) (_tmp2_ - str);
+#line 1340 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
return result;
-#line 1594 "CameraTable.c"
+#line 1666 "CameraTable.c"
}
}
-static gchar* string_substring (const gchar* self, glong offset, glong len) {
+static gchar*
+string_substring (const gchar* self,
+ glong offset,
+ glong len)
+{
gchar* result = NULL;
glong string_length = 0L;
gboolean _tmp0_ = FALSE;
- glong _tmp1_;
- glong _tmp8_;
- glong _tmp14_;
- glong _tmp17_;
- glong _tmp18_;
- glong _tmp19_;
- glong _tmp20_;
- glong _tmp21_;
- gchar* _tmp22_;
-#line 1333 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ glong _tmp6_;
+ gchar* _tmp7_;
+#line 1347 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, NULL);
-#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp1_ = offset;
-#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- if (_tmp1_ >= ((glong) 0)) {
-#line 1618 "CameraTable.c"
- glong _tmp2_;
-#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp2_ = len;
-#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp0_ = _tmp2_ >= ((glong) 0);
-#line 1624 "CameraTable.c"
+#line 1349 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ if (offset >= ((glong) 0)) {
+#line 1349 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp0_ = len >= ((glong) 0);
+#line 1687 "CameraTable.c"
} else {
-#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1349 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
_tmp0_ = FALSE;
-#line 1628 "CameraTable.c"
+#line 1691 "CameraTable.c"
}
-#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1349 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
if (_tmp0_) {
-#line 1632 "CameraTable.c"
- glong _tmp3_;
- glong _tmp4_;
- glong _tmp5_;
-#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp3_ = offset;
-#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp4_ = len;
-#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_);
-#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- string_length = _tmp5_;
-#line 1644 "CameraTable.c"
+#line 1351 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ string_length = string_strnlen ((gchar*) self, offset + len);
+#line 1697 "CameraTable.c"
} else {
- gint _tmp6_;
- gint _tmp7_;
-#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp6_ = strlen (self);
-#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp7_ = _tmp6_;
-#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- string_length = (glong) _tmp7_;
-#line 1654 "CameraTable.c"
+ gint _tmp1_;
+ gint _tmp2_;
+#line 1353 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp1_ = strlen (self);
+#line 1353 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp2_ = _tmp1_;
+#line 1353 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ string_length = (glong) _tmp2_;
+#line 1707 "CameraTable.c"
}
-#line 1342 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp8_ = offset;
-#line 1342 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- if (_tmp8_ < ((glong) 0)) {
-#line 1660 "CameraTable.c"
- glong _tmp9_;
- glong _tmp10_;
- glong _tmp11_;
-#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp9_ = string_length;
-#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp10_ = offset;
-#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- offset = _tmp9_ + _tmp10_;
-#line 1344 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp11_ = offset;
-#line 1344 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL);
-#line 1674 "CameraTable.c"
+#line 1356 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ if (offset < ((glong) 0)) {
+#line 1711 "CameraTable.c"
+ glong _tmp3_;
+#line 1357 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp3_ = string_length;
+#line 1357 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ 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"
} else {
- glong _tmp12_;
- glong _tmp13_;
-#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp12_ = offset;
-#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp13_ = string_length;
-#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL);
-#line 1684 "CameraTable.c"
+ 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 1348 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp14_ = len;
-#line 1348 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- if (_tmp14_ < ((glong) 0)) {
-#line 1690 "CameraTable.c"
- glong _tmp15_;
- glong _tmp16_;
-#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp15_ = string_length;
-#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp16_ = offset;
-#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- len = _tmp15_ - _tmp16_;
-#line 1699 "CameraTable.c"
+#line 1362 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ if (len < ((glong) 0)) {
+#line 1730 "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 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp17_ = offset;
-#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp18_ = len;
-#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp19_ = string_length;
-#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- g_return_val_if_fail ((_tmp17_ + _tmp18_) <= _tmp19_, NULL);
-#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp20_ = offset;
-#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp21_ = len;
-#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp22_ = g_strndup (((gchar*) self) + _tmp20_, (gsize) _tmp21_);
-#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- result = _tmp22_;
-#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1365 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp6_ = string_length;
+#line 1365 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ g_return_val_if_fail ((offset + len) <= _tmp6_, NULL);
+#line 1366 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp7_ = g_strndup (((gchar*) self) + offset, (gsize) len);
+#line 1366 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ result = _tmp7_;
+#line 1366 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
return result;
-#line 1719 "CameraTable.c"
+#line 1748 "CameraTable.c"
}
-static gchar* string_replace (const gchar* self, const gchar* old, const gchar* replacement) {
+static gchar*
+string_replace (const gchar* self,
+ const gchar* old,
+ const gchar* replacement)
+{
gchar* result = NULL;
gboolean _tmp0_ = FALSE;
gboolean _tmp1_ = FALSE;
GError * _inner_error_ = NULL;
-#line 1407 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1421 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, NULL);
-#line 1407 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1421 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
g_return_val_if_fail (old != NULL, NULL);
-#line 1407 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1421 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
g_return_val_if_fail (replacement != NULL, NULL);
-#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
if ((*((gchar*) self)) == '\0') {
-#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
_tmp1_ = TRUE;
-#line 1738 "CameraTable.c"
+#line 1771 "CameraTable.c"
} else {
- const gchar* _tmp2_;
-#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp2_ = old;
-#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp1_ = (*((gchar*) _tmp2_)) == '\0';
-#line 1745 "CameraTable.c"
+#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp1_ = (*((gchar*) old)) == '\0';
+#line 1775 "CameraTable.c"
}
-#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
if (_tmp1_) {
-#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
_tmp0_ = TRUE;
-#line 1751 "CameraTable.c"
+#line 1781 "CameraTable.c"
} else {
- const gchar* _tmp3_;
- const gchar* _tmp4_;
-#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp3_ = old;
-#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp4_ = replacement;
-#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp0_ = g_strcmp0 (_tmp3_, _tmp4_) == 0;
-#line 1761 "CameraTable.c"
+#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp0_ = g_strcmp0 (old, replacement) == 0;
+#line 1785 "CameraTable.c"
}
-#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
if (_tmp0_) {
-#line 1765 "CameraTable.c"
- gchar* _tmp5_;
-#line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp5_ = g_strdup (self);
-#line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- result = _tmp5_;
-#line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1789 "CameraTable.c"
+ gchar* _tmp2_;
+#line 1423 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp2_ = g_strdup (self);
+#line 1423 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ result = _tmp2_;
+#line 1423 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
return result;
-#line 1773 "CameraTable.c"
+#line 1797 "CameraTable.c"
}
{
GRegex* regex = NULL;
- const gchar* _tmp6_;
- gchar* _tmp7_;
- gchar* _tmp8_;
- GRegex* _tmp9_;
- GRegex* _tmp10_;
- gchar* _tmp11_ = NULL;
- GRegex* _tmp12_;
- const gchar* _tmp13_;
- gchar* _tmp14_;
- gchar* _tmp15_;
-#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp6_ = old;
-#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp7_ = g_regex_escape_string (_tmp6_, -1);
-#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp8_ = _tmp7_;
-#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp9_ = g_regex_new (_tmp8_, 0, 0, &_inner_error_);
-#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp10_ = _tmp9_;
-#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _g_free0 (_tmp8_);
-#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- regex = _tmp10_;
-#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ gchar* _tmp3_;
+ gchar* _tmp4_;
+ GRegex* _tmp5_;
+ GRegex* _tmp6_;
+ gchar* _tmp7_ = NULL;
+ GRegex* _tmp8_;
+ gchar* _tmp9_;
+ gchar* _tmp10_;
+#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp3_ = g_regex_escape_string (old, -1);
+#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp4_ = _tmp3_;
+#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp5_ = g_regex_new (_tmp4_, 0, 0, &_inner_error_);
+#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp6_ = _tmp5_;
+#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _g_free0 (_tmp4_);
+#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ regex = _tmp6_;
+#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
if (_inner_error_->domain == G_REGEX_ERROR) {
-#line 1805 "CameraTable.c"
+#line 1825 "CameraTable.c"
goto __catch66_g_regex_error;
}
-#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
g_clear_error (&_inner_error_);
-#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
return NULL;
-#line 1814 "CameraTable.c"
+#line 1834 "CameraTable.c"
}
-#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp12_ = regex;
-#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp13_ = replacement;
-#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp14_ = g_regex_replace_literal (_tmp12_, self, (gssize) -1, 0, _tmp13_, 0, &_inner_error_);
-#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp11_ = _tmp14_;
-#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp8_ = regex;
+#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp9_ = g_regex_replace_literal (_tmp8_, self, (gssize) -1, 0, replacement, 0, &_inner_error_);
+#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp7_ = _tmp9_;
+#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
_g_regex_unref0 (regex);
-#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
if (_inner_error_->domain == G_REGEX_ERROR) {
-#line 1830 "CameraTable.c"
+#line 1848 "CameraTable.c"
goto __catch66_g_regex_error;
}
-#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
_g_regex_unref0 (regex);
-#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
g_clear_error (&_inner_error_);
-#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
return NULL;
-#line 1841 "CameraTable.c"
+#line 1859 "CameraTable.c"
}
-#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp15_ = _tmp11_;
-#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp11_ = NULL;
-#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- result = _tmp15_;
-#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _g_free0 (_tmp11_);
-#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp10_ = _tmp7_;
+#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp7_ = NULL;
+#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ result = _tmp10_;
+#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _g_free0 (_tmp7_);
+#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
_g_regex_unref0 (regex);
-#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
return result;
-#line 1855 "CameraTable.c"
+#line 1873 "CameraTable.c"
}
goto __finally66;
__catch66_g_regex_error:
{
GError* e = NULL;
-#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
e = _inner_error_;
-#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
_inner_error_ = NULL;
-#line 1415 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1429 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
g_assert_not_reached ();
-#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
_g_error_free0 (e);
-#line 1869 "CameraTable.c"
+#line 1887 "CameraTable.c"
}
__finally66:
-#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
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 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
g_clear_error (&_inner_error_);
-#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
return NULL;
-#line 1880 "CameraTable.c"
+#line 1898 "CameraTable.c"
}
}
-gchar* camera_table_get_port_path (const gchar* port) {
+gchar*
+camera_table_get_port_path (const gchar* port)
+{
gchar* result = NULL;
gchar* _tmp0_ = NULL;
- const gchar* _tmp1_;
- gboolean _tmp2_;
#line 209 "/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"
- _tmp1_ = port;
-#line 211 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp2_ = g_str_has_prefix (_tmp1_, "usb:");
-#line 211 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- if (_tmp2_) {
-#line 1898 "CameraTable.c"
- const gchar* _tmp3_;
+ if (g_str_has_prefix (port, "usb:")) {
+#line 1912 "CameraTable.c"
+ gchar* _tmp1_;
+ gchar* _tmp2_;
+ gchar* _tmp3_;
gchar* _tmp4_;
gchar* _tmp5_;
- gchar* _tmp6_;
- gchar* _tmp7_;
- gchar* _tmp8_;
#line 212 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp3_ = port;
+ _tmp1_ = string_substring (port, (glong) 4, (glong) -1);
#line 212 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp4_ = string_substring (_tmp3_, (glong) 4, (glong) -1);
+ _tmp2_ = _tmp1_;
#line 212 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp5_ = _tmp4_;
+ _tmp3_ = string_replace (_tmp2_, ",", "/");
#line 212 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp6_ = string_replace (_tmp5_, ",", "/");
+ _tmp4_ = _tmp3_;
#line 212 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp7_ = _tmp6_;
-#line 212 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp8_ = g_strdup_printf ("/dev/bus/usb/%s", _tmp7_);
+ _tmp5_ = g_strdup_printf ("/dev/bus/usb/%s", _tmp4_);
#line 212 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (_tmp0_);
#line 212 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp0_ = _tmp8_;
+ _tmp0_ = _tmp5_;
#line 212 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _g_free0 (_tmp7_);
+ _g_free0 (_tmp4_);
#line 212 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _g_free0 (_tmp5_);
-#line 1925 "CameraTable.c"
+ _g_free0 (_tmp2_);
+#line 1936 "CameraTable.c"
} else {
#line 212 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (_tmp0_);
#line 212 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp0_ = NULL;
-#line 1931 "CameraTable.c"
+#line 1942 "CameraTable.c"
}
#line 211 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
result = _tmp0_;
#line 211 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return result;
-#line 1937 "CameraTable.c"
+#line 1948 "CameraTable.c"
}
-static gchar* camera_table_get_name_for_uuid (CameraTable* self, const gchar* uuid) {
+static gchar*
+camera_table_get_name_for_uuid (CameraTable* self,
+ const gchar* uuid)
+{
gchar* result = NULL;
GVolumeMonitor* _tmp0_;
GList* _tmp1_;
@@ -1951,7 +1965,7 @@ static gchar* camera_table_get_name_for_uuid (CameraTable* self, const gchar* uu
_tmp0_ = self->priv->volume_monitor;
#line 216 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp1_ = g_volume_monitor_get_volumes (_tmp0_);
-#line 1953 "CameraTable.c"
+#line 1967 "CameraTable.c"
{
GList* volume_collection = NULL;
GList* volume_it = NULL;
@@ -1959,20 +1973,19 @@ static gchar* camera_table_get_name_for_uuid (CameraTable* self, const gchar* uu
volume_collection = _tmp1_;
#line 216 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
for (volume_it = volume_collection; volume_it != NULL; volume_it = volume_it->next) {
-#line 1961 "CameraTable.c"
+#line 1975 "CameraTable.c"
GVolume* _tmp2_;
GVolume* volume = NULL;
#line 216 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp2_ = _g_object_ref0 ((GVolume*) volume_it->data);
#line 216 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
volume = _tmp2_;
-#line 1968 "CameraTable.c"
+#line 1982 "CameraTable.c"
{
GVolume* _tmp3_;
gchar* _tmp4_;
gchar* _tmp5_;
- const gchar* _tmp6_;
- gboolean _tmp7_;
+ gboolean _tmp6_;
#line 217 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp3_ = volume;
#line 217 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -1980,48 +1993,49 @@ static gchar* camera_table_get_name_for_uuid (CameraTable* self, const gchar* uu
#line 217 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp5_ = _tmp4_;
#line 217 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp6_ = uuid;
-#line 217 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp7_ = g_strcmp0 (_tmp5_, _tmp6_) == 0;
+ _tmp6_ = g_strcmp0 (_tmp5_, uuid) == 0;
#line 217 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (_tmp5_);
#line 217 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- if (_tmp7_) {
-#line 1989 "CameraTable.c"
- GVolume* _tmp8_;
- gchar* _tmp9_;
+ if (_tmp6_) {
+#line 2000 "CameraTable.c"
+ GVolume* _tmp7_;
+ gchar* _tmp8_;
#line 218 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp8_ = volume;
+ _tmp7_ = volume;
#line 218 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp9_ = g_volume_get_name (_tmp8_);
+ _tmp8_ = g_volume_get_name (_tmp7_);
#line 218 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- result = _tmp9_;
+ result = _tmp8_;
#line 218 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_object_unref0 (volume);
#line 218 "/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"
return result;
-#line 2004 "CameraTable.c"
+#line 2015 "CameraTable.c"
}
#line 216 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_object_unref0 (volume);
-#line 2008 "CameraTable.c"
+#line 2019 "CameraTable.c"
}
}
#line 216 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
__g_list_free__g_object_unref0_0 (volume_collection);
-#line 2013 "CameraTable.c"
+#line 2024 "CameraTable.c"
}
#line 221 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
result = NULL;
#line 221 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return result;
-#line 2019 "CameraTable.c"
+#line 2030 "CameraTable.c"
}
-static gchar* camera_table_get_icon_for_uuid (CameraTable* self, const gchar* uuid) {
+static gchar*
+camera_table_get_icon_for_uuid (CameraTable* self,
+ const gchar* uuid)
+{
gchar* result = NULL;
GVolumeMonitor* _tmp0_;
GList* _tmp1_;
@@ -2033,7 +2047,7 @@ static gchar* camera_table_get_icon_for_uuid (CameraTable* self, const gchar* uu
_tmp0_ = self->priv->volume_monitor;
#line 225 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp1_ = g_volume_monitor_get_volumes (_tmp0_);
-#line 2035 "CameraTable.c"
+#line 2049 "CameraTable.c"
{
GList* volume_collection = NULL;
GList* volume_it = NULL;
@@ -2041,20 +2055,19 @@ static gchar* camera_table_get_icon_for_uuid (CameraTable* self, const gchar* uu
volume_collection = _tmp1_;
#line 225 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
for (volume_it = volume_collection; volume_it != NULL; volume_it = volume_it->next) {
-#line 2043 "CameraTable.c"
+#line 2057 "CameraTable.c"
GVolume* _tmp2_;
GVolume* volume = NULL;
#line 225 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp2_ = _g_object_ref0 ((GVolume*) volume_it->data);
#line 225 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
volume = _tmp2_;
-#line 2050 "CameraTable.c"
+#line 2064 "CameraTable.c"
{
GVolume* _tmp3_;
gchar* _tmp4_;
gchar* _tmp5_;
- const gchar* _tmp6_;
- gboolean _tmp7_;
+ gboolean _tmp6_;
#line 226 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp3_ = volume;
#line 226 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -2062,109 +2075,115 @@ static gchar* camera_table_get_icon_for_uuid (CameraTable* self, const gchar* uu
#line 226 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp5_ = _tmp4_;
#line 226 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp6_ = uuid;
-#line 226 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp7_ = g_strcmp0 (_tmp5_, _tmp6_) == 0;
+ _tmp6_ = g_strcmp0 (_tmp5_, uuid) == 0;
#line 226 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (_tmp5_);
#line 226 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- if (_tmp7_) {
-#line 2071 "CameraTable.c"
- GVolume* _tmp8_;
+ if (_tmp6_) {
+#line 2082 "CameraTable.c"
+ GVolume* _tmp7_;
+ GIcon* _tmp8_;
GIcon* _tmp9_;
- GIcon* _tmp10_;
+ gchar* _tmp10_;
gchar* _tmp11_;
- gchar* _tmp12_;
#line 227 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp8_ = volume;
+ _tmp7_ = volume;
#line 227 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp9_ = g_volume_get_icon (_tmp8_);
+ _tmp8_ = g_volume_get_icon (_tmp7_);
#line 227 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp10_ = _tmp9_;
+ _tmp9_ = _tmp8_;
#line 227 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp11_ = g_icon_to_string (_tmp10_);
+ _tmp10_ = g_icon_to_string (_tmp9_);
#line 227 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp12_ = _tmp11_;
+ _tmp11_ = _tmp10_;
#line 227 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _g_object_unref0 (_tmp10_);
+ _g_object_unref0 (_tmp9_);
#line 227 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- result = _tmp12_;
+ result = _tmp11_;
#line 227 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_object_unref0 (volume);
#line 227 "/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"
return result;
-#line 2097 "CameraTable.c"
+#line 2108 "CameraTable.c"
}
#line 225 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_object_unref0 (volume);
-#line 2101 "CameraTable.c"
+#line 2112 "CameraTable.c"
}
}
#line 225 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
__g_list_free__g_object_unref0_0 (volume_collection);
-#line 2106 "CameraTable.c"
+#line 2117 "CameraTable.c"
}
#line 230 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
result = NULL;
#line 230 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return result;
-#line 2112 "CameraTable.c"
+#line 2123 "CameraTable.c"
}
-static gpointer _discovered_camera_ref0 (gpointer self) {
+static gpointer
+_discovered_camera_ref0 (gpointer self)
+{
#line 292 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return self ? discovered_camera_ref (self) : NULL;
-#line 2119 "CameraTable.c"
+#line 2132 "CameraTable.c"
}
-static void _vala_array_add70 (DiscoveredCamera** * array, int* length, int* size, DiscoveredCamera* value) {
+static void
+_vala_array_add70 (DiscoveredCamera** * array,
+ int* length,
+ int* size,
+ DiscoveredCamera* value)
+{
#line 292 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if ((*length) == (*size)) {
#line 292 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
*size = (*size) ? (2 * (*size)) : 4;
#line 292 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
*array = g_renew (DiscoveredCamera*, *array, (*size) + 1);
-#line 2130 "CameraTable.c"
+#line 2148 "CameraTable.c"
}
#line 292 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
(*array)[(*length)++] = value;
#line 292 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
(*array)[*length] = NULL;
-#line 2136 "CameraTable.c"
+#line 2154 "CameraTable.c"
}
-static void camera_table_update_camera_table (CameraTable* self, GError** error) {
+static void
+camera_table_update_camera_table (CameraTable* self,
+ GError** error)
+{
GPPortInfoList* port_info_list = NULL;
GPPortInfoList* _tmp0_ = NULL;
int _tmp1_;
GPPortInfoList* _tmp2_;
- int _tmp3_;
CameraList* camera_list = NULL;
- CameraList* _tmp4_ = NULL;
- int _tmp5_;
- CameraAbilitiesList* _tmp6_;
- GPPortInfoList* _tmp7_;
- CameraList* _tmp8_;
- GPContext* _tmp9_;
- int _tmp10_;
+ CameraList* _tmp3_ = NULL;
+ int _tmp4_;
+ CameraAbilitiesList* _tmp5_;
+ GPPortInfoList* _tmp6_;
+ CameraList* _tmp7_;
+ GPContext* _tmp8_;
GeeHashMap* detected_map = NULL;
- GeeHashMap* _tmp11_;
+ GeeHashMap* _tmp9_;
gchar** usb_cameras = NULL;
- gint _tmp12_;
- gchar** _tmp13_;
+ gint _tmp10_;
+ gchar** _tmp11_;
gint usb_cameras_length1;
gint _usb_cameras_size_;
DiscoveredCamera** missing = NULL;
- DiscoveredCamera** _tmp47_;
+ DiscoveredCamera** _tmp41_;
gint missing_length1;
gint _missing_size_;
- DiscoveredCamera** _tmp80_;
- gint _tmp80__length1;
+ DiscoveredCamera** _tmp72_;
+ gint _tmp72__length1;
GError * _inner_error_ = NULL;
#line 233 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
g_return_if_fail (IS_CAMERA_TABLE (self));
@@ -2186,7 +2205,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
_gp_port_info_list_free0 (port_info_list);
#line 236 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return;
-#line 2188 "CameraTable.c"
+#line 2207 "CameraTable.c"
} else {
#line 236 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_gp_port_info_list_free0 (port_info_list);
@@ -2196,15 +2215,13 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
g_clear_error (&_inner_error_);
#line 236 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return;
-#line 2198 "CameraTable.c"
+#line 2217 "CameraTable.c"
}
}
#line 237 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp2_ = port_info_list;
#line 237 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp3_ = gp_port_info_list_load (_tmp2_);
-#line 237 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- camera_table_do_op (self, _tmp3_, "load port list", &_inner_error_);
+ 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"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 237 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -2215,7 +2232,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
_gp_port_info_list_free0 (port_info_list);
#line 237 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return;
-#line 2217 "CameraTable.c"
+#line 2234 "CameraTable.c"
} else {
#line 237 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_gp_port_info_list_free0 (port_info_list);
@@ -2225,17 +2242,17 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
g_clear_error (&_inner_error_);
#line 237 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return;
-#line 2227 "CameraTable.c"
+#line 2244 "CameraTable.c"
}
}
#line 240 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp5_ = gp_list_new (&_tmp4_);
+ _tmp4_ = gp_list_new (&_tmp3_);
#line 240 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_gp_list_unref0 (camera_list);
#line 240 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- camera_list = _tmp4_;
+ camera_list = _tmp3_;
#line 240 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- camera_table_do_op (self, _tmp5_, "create camera list", &_inner_error_);
+ camera_table_do_op (self, _tmp4_, "create camera list", &_inner_error_);
#line 240 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 240 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -2248,7 +2265,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
_gp_port_info_list_free0 (port_info_list);
#line 240 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return;
-#line 2250 "CameraTable.c"
+#line 2267 "CameraTable.c"
} else {
#line 240 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_gp_list_unref0 (camera_list);
@@ -2260,21 +2277,19 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
g_clear_error (&_inner_error_);
#line 240 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return;
-#line 2262 "CameraTable.c"
+#line 2279 "CameraTable.c"
}
}
#line 241 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp6_ = self->priv->abilities_list;
-#line 241 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp7_ = port_info_list;
+ _tmp5_ = self->priv->abilities_list;
#line 241 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp8_ = camera_list;
+ _tmp6_ = port_info_list;
#line 241 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp9_ = self->priv->null_context;
+ _tmp7_ = camera_list;
#line 241 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp10_ = gp_abilities_list_detect (_tmp6_, _tmp7_, _tmp8_, _tmp9_);
+ _tmp8_ = self->priv->null_context;
#line 241 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- camera_table_do_op (self, _tmp10_, "detect cameras", &_inner_error_);
+ 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"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 241 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -2287,7 +2302,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
_gp_port_info_list_free0 (port_info_list);
#line 241 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return;
-#line 2289 "CameraTable.c"
+#line 2304 "CameraTable.c"
} else {
#line 241 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_gp_list_unref0 (camera_list);
@@ -2299,97 +2314,92 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
g_clear_error (&_inner_error_);
#line 241 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return;
-#line 2301 "CameraTable.c"
+#line 2316 "CameraTable.c"
}
}
#line 243 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp11_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+ _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"
- detected_map = _tmp11_;
+ detected_map = _tmp9_;
#line 246 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp13_ = camera_table_get_all_usb_cameras (self, &_tmp12_);
+ _tmp11_ = camera_table_get_all_usb_cameras (self, &_tmp10_);
#line 246 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- usb_cameras = _tmp13_;
+ usb_cameras = _tmp11_;
#line 246 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- usb_cameras_length1 = _tmp12_;
+ usb_cameras_length1 = _tmp10_;
#line 246 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_usb_cameras_size_ = usb_cameras_length1;
-#line 2316 "CameraTable.c"
+#line 2331 "CameraTable.c"
{
gint ctr = 0;
#line 249 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
ctr = 0;
-#line 2321 "CameraTable.c"
+#line 2336 "CameraTable.c"
{
- gboolean _tmp14_ = FALSE;
+ gboolean _tmp12_ = FALSE;
#line 249 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp14_ = TRUE;
+ _tmp12_ = TRUE;
#line 249 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
while (TRUE) {
-#line 2328 "CameraTable.c"
- gint _tmp16_;
- CameraList* _tmp17_;
- gint _tmp18_;
+#line 2343 "CameraTable.c"
+ gint _tmp14_;
+ CameraList* _tmp15_;
gchar* name = NULL;
- CameraList* _tmp19_;
- gint _tmp20_;
- const gchar* _tmp21_ = NULL;
- int _tmp22_;
- gchar* _tmp23_;
+ CameraList* _tmp16_;
+ gint _tmp17_;
+ const gchar* _tmp18_ = NULL;
+ int _tmp19_;
+ gchar* _tmp20_;
gchar* port = NULL;
- CameraList* _tmp24_;
- gint _tmp25_;
- const gchar* _tmp26_ = NULL;
- int _tmp27_;
- gchar* _tmp28_;
- gint _tmp29_;
- CameraList* _tmp30_;
- gint _tmp31_;
- const gchar* _tmp32_;
- const gchar* _tmp33_;
- const gchar* _tmp34_;
- gboolean _tmp35_;
- GeeHashMap* _tmp44_;
- const gchar* _tmp45_;
- const gchar* _tmp46_;
+ CameraList* _tmp21_;
+ gint _tmp22_;
+ const gchar* _tmp23_ = NULL;
+ int _tmp24_;
+ gchar* _tmp25_;
+ gint _tmp26_;
+ CameraList* _tmp27_;
+ const gchar* _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 (!_tmp14_) {
-#line 2356 "CameraTable.c"
- gint _tmp15_;
+ if (!_tmp12_) {
+#line 2368 "CameraTable.c"
+ gint _tmp13_;
#line 249 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp15_ = ctr;
+ _tmp13_ = ctr;
#line 249 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- ctr = _tmp15_ + 1;
-#line 2362 "CameraTable.c"
+ ctr = _tmp13_ + 1;
+#line 2374 "CameraTable.c"
}
#line 249 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp14_ = FALSE;
-#line 249 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp16_ = ctr;
+ _tmp12_ = FALSE;
#line 249 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp17_ = camera_list;
+ _tmp14_ = ctr;
#line 249 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp18_ = gp_list_count (_tmp17_);
+ _tmp15_ = camera_list;
#line 249 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- if (!(_tmp16_ < _tmp18_)) {
+ if (!(_tmp14_ < gp_list_count (_tmp15_))) {
#line 249 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
break;
-#line 2376 "CameraTable.c"
+#line 2386 "CameraTable.c"
}
#line 251 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp19_ = camera_list;
+ _tmp16_ = camera_list;
#line 251 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp20_ = ctr;
+ _tmp17_ = ctr;
#line 251 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp22_ = gp_list_get_name (_tmp19_, _tmp20_, &_tmp21_);
+ _tmp19_ = gp_list_get_name (_tmp16_, _tmp17_, &_tmp18_);
#line 251 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (name);
#line 251 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp23_ = g_strdup (_tmp21_);
+ _tmp20_ = g_strdup (_tmp18_);
#line 251 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- name = _tmp23_;
+ name = _tmp20_;
#line 251 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- camera_table_do_op (self, _tmp22_, "get detected camera name", &_inner_error_);
+ camera_table_do_op (self, _tmp19_, "get detected camera name", &_inner_error_);
#line 251 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 251 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -2408,7 +2418,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
_gp_port_info_list_free0 (port_info_list);
#line 251 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return;
-#line 2410 "CameraTable.c"
+#line 2420 "CameraTable.c"
} else {
#line 251 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (name);
@@ -2426,23 +2436,23 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
g_clear_error (&_inner_error_);
#line 251 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return;
-#line 2428 "CameraTable.c"
+#line 2438 "CameraTable.c"
}
}
#line 254 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp24_ = camera_list;
+ _tmp21_ = camera_list;
#line 254 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp25_ = ctr;
+ _tmp22_ = ctr;
#line 254 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp27_ = gp_list_get_value (_tmp24_, _tmp25_, &_tmp26_);
+ _tmp24_ = gp_list_get_value (_tmp21_, _tmp22_, &_tmp23_);
#line 254 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (port);
#line 254 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp28_ = g_strdup (_tmp26_);
+ _tmp25_ = g_strdup (_tmp23_);
#line 254 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- port = _tmp28_;
+ port = _tmp25_;
#line 254 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- camera_table_do_op (self, _tmp27_, "get detected camera port", &_inner_error_);
+ camera_table_do_op (self, _tmp24_, "get detected camera port", &_inner_error_);
#line 254 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 254 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -2463,7 +2473,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
_gp_port_info_list_free0 (port_info_list);
#line 254 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return;
-#line 2465 "CameraTable.c"
+#line 2475 "CameraTable.c"
} else {
#line 254 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (port);
@@ -2483,56 +2493,49 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
g_clear_error (&_inner_error_);
#line 254 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return;
-#line 2485 "CameraTable.c"
+#line 2495 "CameraTable.c"
}
}
#line 256 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp29_ = ctr;
+ _tmp26_ = ctr;
#line 256 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp30_ = camera_list;
+ _tmp27_ = camera_list;
#line 256 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp31_ = gp_list_count (_tmp30_);
+ _tmp28_ = name;
#line 256 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp32_ = name;
+ _tmp29_ = port;
#line 256 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp33_ = port;
-#line 256 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- g_debug ("CameraTable.vala:256: Detected %d/%d %s @ %s", _tmp29_ + 1, _tmp31_, _tmp32_, _tmp33_);
-#line 259 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp34_ = port;
+ 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"
- _tmp35_ = g_str_has_prefix (_tmp34_, "usb:");
+ _tmp30_ = port;
#line 259 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- if (_tmp35_) {
-#line 2506 "CameraTable.c"
+ if (g_str_has_prefix (_tmp30_, "usb:")) {
+#line 2512 "CameraTable.c"
gchar* full_port = NULL;
- CameraList* _tmp36_;
- gint _tmp37_;
- gchar** _tmp38_;
- gint _tmp38__length1;
- const gchar* _tmp39_;
- gchar* _tmp40_ = NULL;
- gboolean _tmp41_;
- const gchar* _tmp42_;
- gchar* _tmp43_;
-#line 261 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp36_ = camera_list;
+ 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"
- _tmp37_ = gp_list_count (_tmp36_);
+ _tmp31_ = camera_list;
#line 261 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp38_ = usb_cameras;
+ _tmp32_ = usb_cameras;
#line 261 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp38__length1 = usb_cameras_length1;
+ _tmp32__length1 = usb_cameras_length1;
#line 261 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp39_ = port;
+ _tmp33_ = port;
#line 261 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp41_ = camera_table_usb_esp (self, _tmp37_, _tmp38_, _tmp38__length1, _tmp39_, &_tmp40_);
+ _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 = _tmp40_;
+ full_port = _tmp34_;
#line 261 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- if (!_tmp41_) {
+ 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"
@@ -2541,128 +2544,124 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
_g_free0 (name);
#line 262 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
continue;
-#line 2543 "CameraTable.c"
+#line 2546 "CameraTable.c"
}
#line 264 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp42_ = full_port;
+ _tmp36_ = full_port;
#line 264 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp43_ = g_strdup (_tmp42_);
+ _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 = _tmp43_;
+ port = _tmp37_;
#line 259 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (full_port);
-#line 2555 "CameraTable.c"
+#line 2558 "CameraTable.c"
}
#line 267 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp44_ = detected_map;
+ _tmp38_ = detected_map;
#line 267 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp45_ = port;
+ _tmp39_ = port;
#line 267 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp46_ = name;
+ _tmp40_ = name;
#line 267 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp45_, _tmp46_);
+ 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"
_g_free0 (port);
#line 249 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (name);
-#line 2569 "CameraTable.c"
+#line 2572 "CameraTable.c"
}
}
}
#line 271 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp47_ = g_new0 (DiscoveredCamera*, 0 + 1);
+ _tmp41_ = g_new0 (DiscoveredCamera*, 0 + 1);
#line 271 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- missing = _tmp47_;
+ missing = _tmp41_;
#line 271 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
missing_length1 = 0;
#line 271 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_missing_size_ = missing_length1;
-#line 2581 "CameraTable.c"
+#line 2584 "CameraTable.c"
{
GeeIterator* _camera_it = NULL;
- GeeHashMap* _tmp48_;
- GeeCollection* _tmp49_;
- GeeCollection* _tmp50_;
- GeeCollection* _tmp51_;
- GeeIterator* _tmp52_;
- GeeIterator* _tmp53_;
+ GeeHashMap* _tmp42_;
+ GeeCollection* _tmp43_;
+ GeeCollection* _tmp44_;
+ GeeCollection* _tmp45_;
+ GeeIterator* _tmp46_;
+ GeeIterator* _tmp47_;
#line 272 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp48_ = self->priv->camera_map;
+ _tmp42_ = self->priv->camera_map;
#line 272 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp49_ = gee_abstract_map_get_values (G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap));
+ _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"
- _tmp50_ = _tmp49_;
+ _tmp44_ = _tmp43_;
#line 272 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp51_ = _tmp50_;
+ _tmp45_ = _tmp44_;
#line 272 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp52_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp51_, GEE_TYPE_ITERABLE, GeeIterable));
+ _tmp46_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, GEE_TYPE_ITERABLE, GeeIterable));
#line 272 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp53_ = _tmp52_;
+ _tmp47_ = _tmp46_;
#line 272 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _g_object_unref0 (_tmp51_);
+ _g_object_unref0 (_tmp45_);
#line 272 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _camera_it = _tmp53_;
+ _camera_it = _tmp47_;
#line 272 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
while (TRUE) {
-#line 2608 "CameraTable.c"
- GeeIterator* _tmp54_;
- gboolean _tmp55_;
+#line 2611 "CameraTable.c"
+ GeeIterator* _tmp48_;
DiscoveredCamera* camera = NULL;
- GeeIterator* _tmp56_;
- gpointer _tmp57_;
+ GeeIterator* _tmp49_;
+ gpointer _tmp50_;
GPPortInfo port_info = {0};
gchar* tmp_path = NULL;
- DiscoveredCamera* _tmp58_;
- Camera* _tmp59_;
- GPPortInfo _tmp60_ = {0};
- int _tmp61_;
- const gchar* _tmp62_ = NULL;
- gchar* _tmp63_;
+ DiscoveredCamera* _tmp51_;
+ Camera* _tmp52_;
+ GPPortInfo _tmp53_ = {0};
+ int _tmp54_;
+ const gchar* _tmp55_ = NULL;
+ gchar* _tmp56_;
CameraAbilities abilities = {0};
- DiscoveredCamera* _tmp64_;
- Camera* _tmp65_;
- CameraAbilities _tmp66_ = {0};
- int _tmp67_;
- GeeHashMap* _tmp68_;
- const gchar* _tmp69_;
- gboolean _tmp70_;
- CameraAbilities _tmp74_;
- const gchar* _tmp75_;
- const gchar* _tmp76_;
- DiscoveredCamera** _tmp77_;
- gint _tmp77__length1;
- DiscoveredCamera* _tmp78_;
- DiscoveredCamera* _tmp79_;
+ 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"
- _tmp54_ = _camera_it;
+ _tmp48_ = _camera_it;
#line 272 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp55_ = gee_iterator_next (_tmp54_);
-#line 272 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- if (!_tmp55_) {
+ if (!gee_iterator_next (_tmp48_)) {
#line 272 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
break;
-#line 2645 "CameraTable.c"
+#line 2644 "CameraTable.c"
}
#line 272 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp56_ = _camera_it;
+ _tmp49_ = _camera_it;
#line 272 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp57_ = gee_iterator_get (_tmp56_);
+ _tmp50_ = gee_iterator_get (_tmp49_);
#line 272 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- camera = (DiscoveredCamera*) _tmp57_;
+ camera = (DiscoveredCamera*) _tmp50_;
#line 276 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp58_ = camera;
+ _tmp51_ = camera;
#line 276 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp59_ = _tmp58_->gcamera;
+ _tmp52_ = _tmp51_->gcamera;
#line 276 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp61_ = gp_camera_get_port_info (_tmp59_, &_tmp60_);
+ _tmp54_ = gp_camera_get_port_info (_tmp52_, &_tmp53_);
#line 276 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
(port_info);
#line 276 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- port_info = _tmp60_;
+ port_info = _tmp53_;
#line 276 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- camera_table_do_op (self, _tmp61_, "retrieve missing camera port information", &_inner_error_);
+ camera_table_do_op (self, _tmp54_, "retrieve missing camera port information", &_inner_error_);
#line 276 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 276 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -2689,7 +2688,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
_gp_port_info_list_free0 (port_info_list);
#line 276 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return;
-#line 2691 "CameraTable.c"
+#line 2690 "CameraTable.c"
} else {
#line 276 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (tmp_path);
@@ -2715,29 +2714,29 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
g_clear_error (&_inner_error_);
#line 276 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return;
-#line 2717 "CameraTable.c"
+#line 2716 "CameraTable.c"
}
}
#line 279 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- gp_port_info_get_path (port_info, &_tmp62_);
+ gp_port_info_get_path (port_info, &_tmp55_);
#line 279 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (tmp_path);
#line 279 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp63_ = g_strdup (_tmp62_);
+ _tmp56_ = g_strdup (_tmp55_);
#line 279 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- tmp_path = _tmp63_;
+ tmp_path = _tmp56_;
#line 282 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp64_ = camera;
+ _tmp57_ = camera;
#line 282 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp65_ = _tmp64_->gcamera;
+ _tmp58_ = _tmp57_->gcamera;
#line 282 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp67_ = gp_camera_get_abilities (_tmp65_, &_tmp66_);
+ _tmp60_ = gp_camera_get_abilities (_tmp58_, &_tmp59_);
#line 282 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
(abilities);
#line 282 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- abilities = _tmp66_;
+ abilities = _tmp59_;
#line 282 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- camera_table_do_op (self, _tmp67_, "retrieve camera abilities", &_inner_error_);
+ camera_table_do_op (self, _tmp60_, "retrieve camera abilities", &_inner_error_);
#line 282 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 282 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -2766,7 +2765,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
_gp_port_info_list_free0 (port_info_list);
#line 282 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return;
-#line 2768 "CameraTable.c"
+#line 2767 "CameraTable.c"
} else {
#line 282 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
(abilities);
@@ -2794,29 +2793,27 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
g_clear_error (&_inner_error_);
#line 282 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return;
-#line 2796 "CameraTable.c"
+#line 2795 "CameraTable.c"
}
}
#line 284 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp68_ = detected_map;
-#line 284 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp69_ = tmp_path;
+ _tmp61_ = detected_map;
#line 284 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp70_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp68_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp69_);
+ _tmp62_ = tmp_path;
#line 284 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- if (_tmp70_) {
-#line 2807 "CameraTable.c"
- CameraAbilities _tmp71_;
- const gchar* _tmp72_;
- const gchar* _tmp73_;
+ 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"
- _tmp71_ = abilities;
+ _tmp63_ = abilities;
#line 285 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp72_ = _tmp71_.model;
+ _tmp64_ = _tmp63_.model;
#line 285 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp73_ = tmp_path;
+ _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", _tmp72_, _tmp73_);
+ 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"
(abilities);
#line 287 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -2827,26 +2824,26 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
_discovered_camera_unref0 (camera);
#line 287 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
continue;
-#line 2829 "CameraTable.c"
+#line 2826 "CameraTable.c"
}
#line 290 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp74_ = abilities;
+ _tmp66_ = abilities;
#line 290 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp75_ = _tmp74_.model;
+ _tmp67_ = _tmp66_.model;
#line 290 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp76_ = tmp_path;
+ _tmp68_ = tmp_path;
#line 290 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- g_debug ("CameraTable.vala:290: %s @ %s missing", _tmp75_, _tmp76_);
+ g_debug ("CameraTable.vala:290: %s @ %s missing", _tmp67_, _tmp68_);
#line 292 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp77_ = missing;
+ _tmp69_ = missing;
#line 292 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp77__length1 = missing_length1;
+ _tmp69__length1 = missing_length1;
#line 292 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp78_ = camera;
+ _tmp70_ = camera;
#line 292 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp79_ = _discovered_camera_ref0 (_tmp78_);
+ _tmp71_ = _discovered_camera_ref0 (_tmp70_);
#line 292 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _vala_array_add70 (&missing, &missing_length1, &_missing_size_, _tmp79_);
+ _vala_array_add70 (&missing, &missing_length1, &_missing_size_, _tmp71_);
#line 272 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
(abilities);
#line 272 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -2855,70 +2852,70 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
(port_info);
#line 272 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_discovered_camera_unref0 (camera);
-#line 2857 "CameraTable.c"
+#line 2854 "CameraTable.c"
}
#line 272 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_object_unref0 (_camera_it);
-#line 2861 "CameraTable.c"
+#line 2858 "CameraTable.c"
}
#line 296 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp80_ = missing;
+ _tmp72_ = missing;
#line 296 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp80__length1 = missing_length1;
-#line 2867 "CameraTable.c"
+ _tmp72__length1 = missing_length1;
+#line 2864 "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 = _tmp80_;
+ camera_collection = _tmp72_;
#line 296 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- camera_collection_length1 = _tmp80__length1;
+ camera_collection_length1 = _tmp72__length1;
#line 296 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- for (camera_it = 0; camera_it < _tmp80__length1; camera_it = camera_it + 1) {
-#line 2879 "CameraTable.c"
- DiscoveredCamera* _tmp81_;
+ for (camera_it = 0; camera_it < _tmp72__length1; camera_it = camera_it + 1) {
+#line 2876 "CameraTable.c"
+ DiscoveredCamera* _tmp73_;
DiscoveredCamera* camera = NULL;
#line 296 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp81_ = _discovered_camera_ref0 (camera_collection[camera_it]);
+ _tmp73_ = _discovered_camera_ref0 (camera_collection[camera_it]);
#line 296 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- camera = _tmp81_;
-#line 2886 "CameraTable.c"
+ camera = _tmp73_;
+#line 2883 "CameraTable.c"
{
GPPortInfo port_info = {0};
gchar* tmp_path = NULL;
- DiscoveredCamera* _tmp82_;
- Camera* _tmp83_;
- GPPortInfo _tmp84_ = {0};
- int _tmp85_;
- const gchar* _tmp86_ = NULL;
- gchar* _tmp87_;
+ DiscoveredCamera* _tmp74_;
+ Camera* _tmp75_;
+ GPPortInfo _tmp76_ = {0};
+ int _tmp77_;
+ const gchar* _tmp78_ = NULL;
+ gchar* _tmp79_;
CameraAbilities abilities = {0};
- DiscoveredCamera* _tmp88_;
- Camera* _tmp89_;
- CameraAbilities _tmp90_ = {0};
- int _tmp91_;
- CameraAbilities _tmp92_;
- const gchar* _tmp93_;
- const gchar* _tmp94_;
- GeeHashMap* _tmp95_;
- const gchar* _tmp96_;
- gchar* _tmp97_;
- gchar* _tmp98_;
- DiscoveredCamera* _tmp99_;
+ 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"
- _tmp82_ = camera;
+ _tmp74_ = camera;
#line 300 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp83_ = _tmp82_->gcamera;
+ _tmp75_ = _tmp74_->gcamera;
#line 300 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp85_ = gp_camera_get_port_info (_tmp83_, &_tmp84_);
+ _tmp77_ = gp_camera_get_port_info (_tmp75_, &_tmp76_);
#line 300 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
(port_info);
#line 300 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- port_info = _tmp84_;
+ port_info = _tmp76_;
#line 300 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- camera_table_do_op (self, _tmp85_, "retrieve missing camera port information", &_inner_error_);
+ camera_table_do_op (self, _tmp77_, "retrieve missing camera port information", &_inner_error_);
#line 300 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 300 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -2943,7 +2940,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
_gp_port_info_list_free0 (port_info_list);
#line 300 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return;
-#line 2945 "CameraTable.c"
+#line 2942 "CameraTable.c"
} else {
#line 300 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (tmp_path);
@@ -2967,29 +2964,29 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
g_clear_error (&_inner_error_);
#line 300 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return;
-#line 2969 "CameraTable.c"
+#line 2966 "CameraTable.c"
}
}
#line 302 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- gp_port_info_get_path (port_info, &_tmp86_);
+ gp_port_info_get_path (port_info, &_tmp78_);
#line 302 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (tmp_path);
#line 302 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp87_ = g_strdup (_tmp86_);
+ _tmp79_ = g_strdup (_tmp78_);
#line 302 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- tmp_path = _tmp87_;
+ tmp_path = _tmp79_;
#line 305 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp88_ = camera;
+ _tmp80_ = camera;
#line 305 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp89_ = _tmp88_->gcamera;
+ _tmp81_ = _tmp80_->gcamera;
#line 305 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp91_ = gp_camera_get_abilities (_tmp89_, &_tmp90_);
+ _tmp83_ = gp_camera_get_abilities (_tmp81_, &_tmp82_);
#line 305 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
(abilities);
#line 305 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- abilities = _tmp90_;
+ abilities = _tmp82_;
#line 305 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- camera_table_do_op (self, _tmp91_, "retrieve missing camera abilities", &_inner_error_);
+ camera_table_do_op (self, _tmp83_, "retrieve missing camera abilities", &_inner_error_);
#line 305 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 305 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -3016,7 +3013,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
_gp_port_info_list_free0 (port_info_list);
#line 305 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return;
-#line 3018 "CameraTable.c"
+#line 3015 "CameraTable.c"
} else {
#line 305 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
(abilities);
@@ -3042,33 +3039,33 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
g_clear_error (&_inner_error_);
#line 305 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return;
-#line 3044 "CameraTable.c"
+#line 3041 "CameraTable.c"
}
}
#line 307 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp92_ = abilities;
+ _tmp84_ = abilities;
#line 307 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp93_ = _tmp92_.model;
+ _tmp85_ = _tmp84_.model;
#line 307 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp94_ = tmp_path;
+ _tmp86_ = tmp_path;
#line 307 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- g_debug ("CameraTable.vala:307: Removing from camera table: %s @ %s", _tmp93_, _tmp94_);
+ g_debug ("CameraTable.vala:307: Removing from camera table: %s @ %s", _tmp85_, _tmp86_);
#line 309 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp95_ = self->priv->camera_map;
+ _tmp87_ = self->priv->camera_map;
#line 309 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp96_ = tmp_path;
+ _tmp88_ = tmp_path;
#line 309 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp97_ = camera_table_get_port_uri (_tmp96_);
+ _tmp89_ = camera_table_get_port_uri (_tmp88_);
#line 309 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp98_ = _tmp97_;
+ _tmp90_ = _tmp89_;
#line 309 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp95_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp98_, NULL);
+ 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 (_tmp98_);
+ _g_free0 (_tmp90_);
#line 311 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp99_ = camera;
+ _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, _tmp99_);
+ g_signal_emit (self, camera_table_signals[CAMERA_TABLE_CAMERA_REMOVED_SIGNAL], 0, _tmp91_);
#line 296 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
(abilities);
#line 296 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -3077,173 +3074,162 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
(port_info);
#line 296 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_discovered_camera_unref0 (camera);
-#line 3079 "CameraTable.c"
+#line 3076 "CameraTable.c"
}
}
}
{
GeeIterator* _port_it = NULL;
- GeeHashMap* _tmp100_;
- GeeSet* _tmp101_;
- GeeSet* _tmp102_;
- GeeSet* _tmp103_;
- GeeIterator* _tmp104_;
- GeeIterator* _tmp105_;
+ GeeHashMap* _tmp92_;
+ GeeSet* _tmp93_;
+ GeeSet* _tmp94_;
+ GeeSet* _tmp95_;
+ GeeIterator* _tmp96_;
+ GeeIterator* _tmp97_;
#line 315 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp100_ = detected_map;
+ _tmp92_ = detected_map;
#line 315 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp101_ = gee_abstract_map_get_keys (G_TYPE_CHECK_INSTANCE_CAST (_tmp100_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap));
+ _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"
- _tmp102_ = _tmp101_;
+ _tmp94_ = _tmp93_;
#line 315 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp103_ = _tmp102_;
+ _tmp95_ = _tmp94_;
#line 315 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp104_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp103_, GEE_TYPE_ITERABLE, GeeIterable));
+ _tmp96_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp95_, GEE_TYPE_ITERABLE, GeeIterable));
#line 315 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp105_ = _tmp104_;
+ _tmp97_ = _tmp96_;
#line 315 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _g_object_unref0 (_tmp103_);
+ _g_object_unref0 (_tmp95_);
#line 315 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _port_it = _tmp105_;
+ _port_it = _tmp97_;
#line 315 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
while (TRUE) {
-#line 3109 "CameraTable.c"
- GeeIterator* _tmp106_;
- gboolean _tmp107_;
+#line 3106 "CameraTable.c"
+ GeeIterator* _tmp98_;
gchar* port = NULL;
- GeeIterator* _tmp108_;
- gpointer _tmp109_;
+ GeeIterator* _tmp99_;
+ gpointer _tmp100_;
gchar* name = NULL;
- GeeHashMap* _tmp110_;
- const gchar* _tmp111_;
- gpointer _tmp112_;
+ GeeHashMap* _tmp101_;
+ const gchar* _tmp102_;
+ gpointer _tmp103_;
gchar* display_name = NULL;
gchar* icon = NULL;
gchar* uri = NULL;
- const gchar* _tmp113_;
- gchar* _tmp114_;
- GeeHashMap* _tmp115_;
- const gchar* _tmp116_;
- gboolean _tmp117_;
+ const gchar* _tmp104_;
+ gchar* _tmp105_;
+ GeeHashMap* _tmp106_;
+ const gchar* _tmp107_;
gchar* path = NULL;
- const gchar* _tmp120_;
- gchar* _tmp121_;
- const gchar* _tmp122_;
- const gchar* _tmp142_;
- gboolean _tmp143_;
- const gchar* _tmp162_;
+ const gchar* _tmp110_;
+ gchar* _tmp111_;
+ const gchar* _tmp112_;
+ const gchar* _tmp132_;
+ const gchar* _tmp151_;
gint index = 0;
- GPPortInfoList* _tmp165_;
- const gchar* _tmp166_;
- gint _tmp167_;
- gint _tmp168_;
+ GPPortInfoList* _tmp154_;
+ const gchar* _tmp155_;
+ gint _tmp156_;
GPPortInfo port_info = {0};
gchar* tmp_path = NULL;
- GPPortInfoList* _tmp173_;
+ 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_;
- GPPortInfo _tmp175_ = {0};
- int _tmp176_;
- const gchar* _tmp177_;
- gchar* _tmp178_;
- gchar* _tmp179_;
- const gchar* _tmp180_ = NULL;
- gchar* _tmp181_;
- const gchar* _tmp182_;
- const gchar* _tmp183_;
- CameraAbilitiesList* _tmp184_;
- const gchar* _tmp185_;
- gint _tmp186_;
- gint _tmp187_;
CameraAbilities camera_abilities = {0};
- CameraAbilitiesList* _tmp192_;
- gint _tmp193_;
- CameraAbilities _tmp194_ = {0};
- int _tmp195_;
- const gchar* _tmp196_;
- gchar* _tmp197_;
- gchar* _tmp198_;
+ CameraAbilitiesList* _tmp179_;
+ gint _tmp180_;
+ CameraAbilities _tmp181_ = {0};
+ int _tmp182_;
+ const gchar* _tmp183_;
+ gchar* _tmp184_;
+ gchar* _tmp185_;
Camera* gcamera = NULL;
- Camera* _tmp199_ = NULL;
- int _tmp200_;
- const gchar* _tmp201_;
- gchar* _tmp202_;
- gchar* _tmp203_;
+ Camera* _tmp186_ = NULL;
+ int _tmp187_;
+ const gchar* _tmp188_;
+ gchar* _tmp189_;
+ gchar* _tmp190_;
+ Camera* _tmp191_;
+ CameraAbilities _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_;
- CameraAbilities _tmp205_;
- int _tmp206_;
+ const gchar* _tmp205_;
+ const gchar* _tmp206_;
const gchar* _tmp207_;
- gchar* _tmp208_;
- gchar* _tmp209_;
- Camera* _tmp210_;
- GPPortInfo _tmp211_;
- int _tmp212_;
- const gchar* _tmp213_;
- const gchar* _tmp214_;
- gchar* _tmp215_;
- gchar* _tmp216_;
- const gchar* _tmp217_;
- const gchar* _tmp218_;
- DiscoveredCamera* camera = NULL;
- Camera* _tmp219_;
- const gchar* _tmp220_;
- const gchar* _tmp221_;
- const gchar* _tmp222_;
- DiscoveredCamera* _tmp223_;
- GeeHashMap* _tmp224_;
- const gchar* _tmp225_;
- DiscoveredCamera* _tmp226_;
- DiscoveredCamera* _tmp227_;
+ DiscoveredCamera* _tmp208_;
+ GeeHashMap* _tmp209_;
+ const gchar* _tmp210_;
+ DiscoveredCamera* _tmp211_;
+ DiscoveredCamera* _tmp212_;
#line 315 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp106_ = _port_it;
+ _tmp98_ = _port_it;
#line 315 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp107_ = gee_iterator_next (_tmp106_);
-#line 315 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- if (!_tmp107_) {
+ if (!gee_iterator_next (_tmp98_)) {
#line 315 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
break;
-#line 3203 "CameraTable.c"
+#line 3191 "CameraTable.c"
}
#line 315 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp108_ = _port_it;
+ _tmp99_ = _port_it;
#line 315 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp109_ = gee_iterator_get (_tmp108_);
+ _tmp100_ = gee_iterator_get (_tmp99_);
#line 315 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- port = (gchar*) _tmp109_;
+ port = (gchar*) _tmp100_;
#line 316 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp110_ = detected_map;
+ _tmp101_ = detected_map;
#line 316 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp111_ = port;
+ _tmp102_ = port;
#line 316 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp112_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp110_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp111_);
+ _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*) _tmp112_;
+ name = (gchar*) _tmp103_;
#line 317 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
display_name = NULL;
#line 318 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
icon = NULL;
#line 319 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp113_ = port;
+ _tmp104_ = port;
#line 319 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp114_ = camera_table_get_port_uri (_tmp113_);
+ _tmp105_ = camera_table_get_port_uri (_tmp104_);
#line 319 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- uri = _tmp114_;
-#line 321 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp115_ = self->priv->camera_map;
+ uri = _tmp105_;
#line 321 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp116_ = uri;
+ _tmp106_ = self->priv->camera_map;
#line 321 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp117_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp115_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp116_);
+ _tmp107_ = uri;
#line 321 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- if (_tmp117_) {
-#line 3237 "CameraTable.c"
- const gchar* _tmp118_;
- const gchar* _tmp119_;
+ 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"
- _tmp118_ = name;
+ _tmp108_ = name;
#line 323 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp119_ = port;
+ _tmp109_ = port;
#line 323 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- g_debug ("CameraTable.vala:323: %s @ %s already registered, skipping", _tmp118_, _tmp119_);
+ g_debug ("CameraTable.vala:323: %s @ %s already registered, skipping", _tmp108_, _tmp109_);
#line 325 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (uri);
#line 325 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -3256,213 +3242,211 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
_g_free0 (port);
#line 325 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
continue;
-#line 3258 "CameraTable.c"
+#line 3244 "CameraTable.c"
}
#line 329 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp120_ = port;
+ _tmp110_ = port;
#line 329 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp121_ = camera_table_get_port_path (_tmp120_);
+ _tmp111_ = camera_table_get_port_path (_tmp110_);
#line 329 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- path = _tmp121_;
+ path = _tmp111_;
#line 330 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp122_ = path;
+ _tmp112_ = path;
#line 330 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- if (NULL != _tmp122_) {
-#line 3270 "CameraTable.c"
+ if (NULL != _tmp112_) {
+#line 3256 "CameraTable.c"
GUdevDevice* device = NULL;
- GUdevClient* _tmp123_;
- const gchar* _tmp124_;
- GUdevDevice* _tmp125_;
+ GUdevClient* _tmp113_;
+ const gchar* _tmp114_;
+ GUdevDevice* _tmp115_;
gchar* serial = NULL;
- GUdevDevice* _tmp126_;
- const gchar* _tmp127_;
- gchar* _tmp128_;
- const gchar* _tmp129_;
- const gchar* _tmp134_;
- const gchar* _tmp138_;
+ 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"
- _tmp123_ = self->priv->client;
+ _tmp113_ = self->priv->client;
#line 331 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp124_ = path;
+ _tmp114_ = path;
#line 331 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp125_ = g_udev_client_query_by_device_file (_tmp123_, _tmp124_);
+ _tmp115_ = g_udev_client_query_by_device_file (_tmp113_, _tmp114_);
#line 331 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- device = _tmp125_;
+ device = _tmp115_;
#line 332 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp126_ = device;
+ _tmp116_ = device;
#line 332 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp127_ = g_udev_device_get_property (_tmp126_, "ID_SERIAL_SHORT");
+ _tmp117_ = g_udev_device_get_property (_tmp116_, "ID_SERIAL_SHORT");
#line 332 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp128_ = g_strdup (_tmp127_);
+ _tmp118_ = g_strdup (_tmp117_);
#line 332 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- serial = _tmp128_;
+ serial = _tmp118_;
#line 333 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp129_ = serial;
+ _tmp119_ = serial;
#line 333 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- if (NULL != _tmp129_) {
-#line 3302 "CameraTable.c"
- const gchar* _tmp130_;
- gchar* _tmp131_;
- const gchar* _tmp132_;
- gchar* _tmp133_;
+ 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"
- _tmp130_ = serial;
+ _tmp120_ = serial;
#line 335 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp131_ = camera_table_get_name_for_uuid (self, _tmp130_);
+ _tmp121_ = camera_table_get_name_for_uuid (self, _tmp120_);
#line 335 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (display_name);
#line 335 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- display_name = _tmp131_;
+ display_name = _tmp121_;
#line 336 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp132_ = serial;
+ _tmp122_ = serial;
#line 336 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp133_ = camera_table_get_icon_for_uuid (self, _tmp132_);
+ _tmp123_ = camera_table_get_icon_for_uuid (self, _tmp122_);
#line 336 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (icon);
#line 336 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- icon = _tmp133_;
-#line 3323 "CameraTable.c"
+ icon = _tmp123_;
+#line 3309 "CameraTable.c"
}
#line 338 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp134_ = display_name;
+ _tmp124_ = display_name;
#line 338 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- if (NULL == _tmp134_) {
-#line 3329 "CameraTable.c"
- GUdevDevice* _tmp135_;
- const gchar* _tmp136_;
- gchar* _tmp137_;
+ if (NULL == _tmp124_) {
+#line 3315 "CameraTable.c"
+ GUdevDevice* _tmp125_;
+ const gchar* _tmp126_;
+ gchar* _tmp127_;
#line 339 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp135_ = device;
+ _tmp125_ = device;
#line 339 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp136_ = g_udev_device_get_sysfs_attr (_tmp135_, "product");
+ _tmp126_ = g_udev_device_get_sysfs_attr (_tmp125_, "product");
#line 339 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp137_ = g_strdup (_tmp136_);
+ _tmp127_ = g_strdup (_tmp126_);
#line 339 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (display_name);
#line 339 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- display_name = _tmp137_;
-#line 3343 "CameraTable.c"
+ display_name = _tmp127_;
+#line 3329 "CameraTable.c"
}
#line 341 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp138_ = display_name;
+ _tmp128_ = display_name;
#line 341 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- if (NULL == _tmp138_) {
-#line 3349 "CameraTable.c"
- GUdevDevice* _tmp139_;
- const gchar* _tmp140_;
- gchar* _tmp141_;
+ if (NULL == _tmp128_) {
+#line 3335 "CameraTable.c"
+ GUdevDevice* _tmp129_;
+ const gchar* _tmp130_;
+ gchar* _tmp131_;
#line 342 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp139_ = device;
+ _tmp129_ = device;
#line 342 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp140_ = g_udev_device_get_property (_tmp139_, "ID_MODEL");
+ _tmp130_ = g_udev_device_get_property (_tmp129_, "ID_MODEL");
#line 342 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp141_ = g_strdup (_tmp140_);
+ _tmp131_ = g_strdup (_tmp130_);
#line 342 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (display_name);
#line 342 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- display_name = _tmp141_;
-#line 3363 "CameraTable.c"
+ display_name = _tmp131_;
+#line 3349 "CameraTable.c"
}
#line 330 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (serial);
#line 330 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_object_unref0 (device);
-#line 3369 "CameraTable.c"
+#line 3355 "CameraTable.c"
}
#line 346 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp142_ = port;
-#line 346 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp143_ = g_str_has_prefix (_tmp142_, "disk:");
+ _tmp132_ = port;
#line 346 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- if (_tmp143_) {
-#line 3377 "CameraTable.c"
+ if (g_str_has_prefix (_tmp132_, "disk:")) {
+#line 3361 "CameraTable.c"
{
GMount* mount = NULL;
- const gchar* _tmp144_;
+ const gchar* _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_;
- GFile* _tmp147_;
- GFile* _tmp148_;
- GMount* _tmp149_;
- GMount* _tmp150_;
- GVolume* volume = NULL;
- GMount* _tmp151_;
- GVolume* _tmp152_;
- const gchar* _tmp153_;
- GVolume* _tmp154_;
- gchar* _tmp155_;
- gchar* _tmp156_;
- gchar* _tmp157_;
- GVolume* _tmp158_;
- GIcon* _tmp159_;
- GIcon* _tmp160_;
- gchar* _tmp161_;
+ GVolume* _tmp147_;
+ GIcon* _tmp148_;
+ GIcon* _tmp149_;
+ gchar* _tmp150_;
#line 348 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp144_ = port;
+ _tmp133_ = port;
#line 348 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp145_ = string_substring (_tmp144_, (glong) 5, (glong) -1);
+ _tmp134_ = string_substring (_tmp133_, (glong) 5, (glong) -1);
#line 348 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp146_ = _tmp145_;
+ _tmp135_ = _tmp134_;
#line 348 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp147_ = g_file_new_for_path (_tmp146_);
+ _tmp136_ = g_file_new_for_path (_tmp135_);
#line 348 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp148_ = _tmp147_;
+ _tmp137_ = _tmp136_;
#line 348 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp149_ = g_file_find_enclosing_mount (_tmp148_, NULL, &_inner_error_);
+ _tmp138_ = g_file_find_enclosing_mount (_tmp137_, NULL, &_inner_error_);
#line 348 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp150_ = _tmp149_;
+ _tmp139_ = _tmp138_;
#line 348 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _g_object_unref0 (_tmp148_);
+ _g_object_unref0 (_tmp137_);
#line 348 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _g_free0 (_tmp146_);
+ _g_free0 (_tmp135_);
#line 348 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- mount = _tmp150_;
+ mount = _tmp139_;
#line 348 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3421 "CameraTable.c"
+#line 3405 "CameraTable.c"
goto __catch67_g_error;
}
#line 349 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp151_ = mount;
+ _tmp140_ = mount;
#line 349 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp152_ = g_mount_get_volume (_tmp151_);
+ _tmp141_ = g_mount_get_volume (_tmp140_);
#line 349 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- volume = _tmp152_;
+ volume = _tmp141_;
#line 351 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp153_ = name;
+ _tmp142_ = name;
#line 351 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp154_ = volume;
+ _tmp143_ = volume;
#line 351 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp155_ = g_volume_get_name (_tmp154_);
+ _tmp144_ = g_volume_get_name (_tmp143_);
#line 351 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp156_ = _tmp155_;
+ _tmp145_ = _tmp144_;
#line 351 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp157_ = g_strdup_printf (_ ("%s (%s)"), _tmp153_, _tmp156_);
+ _tmp146_ = g_strdup_printf (_ ("%s (%s)"), _tmp142_, _tmp145_);
#line 351 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (display_name);
#line 351 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- display_name = _tmp157_;
+ display_name = _tmp146_;
#line 351 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _g_free0 (_tmp156_);
+ _g_free0 (_tmp145_);
#line 352 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp158_ = volume;
+ _tmp147_ = volume;
#line 352 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp159_ = g_volume_get_icon (_tmp158_);
+ _tmp148_ = g_volume_get_icon (_tmp147_);
#line 352 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp160_ = _tmp159_;
+ _tmp149_ = _tmp148_;
#line 352 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp161_ = g_icon_to_string (_tmp160_);
+ _tmp150_ = g_icon_to_string (_tmp149_);
#line 352 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (icon);
#line 352 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- icon = _tmp161_;
+ icon = _tmp150_;
#line 352 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _g_object_unref0 (_tmp160_);
+ _g_object_unref0 (_tmp149_);
#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_object_unref0 (volume);
#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_object_unref0 (mount);
-#line 3464 "CameraTable.c"
+#line 3448 "CameraTable.c"
}
goto __finally67;
__catch67_g_error:
@@ -3474,7 +3458,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
_inner_error_ = NULL;
#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_error_free0 (e);
-#line 3476 "CameraTable.c"
+#line 3460 "CameraTable.c"
}
__finally67:
#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -3509,7 +3493,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
_gp_port_info_list_free0 (port_info_list);
#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return;
-#line 3511 "CameraTable.c"
+#line 3495 "CameraTable.c"
} else {
#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (path);
@@ -3541,56 +3525,54 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
g_clear_error (&_inner_error_);
#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return;
-#line 3543 "CameraTable.c"
+#line 3527 "CameraTable.c"
}
}
}
#line 356 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp162_ = display_name;
+ _tmp151_ = display_name;
#line 356 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- if (NULL == _tmp162_) {
-#line 3551 "CameraTable.c"
- const gchar* _tmp163_;
- gchar* _tmp164_;
+ if (NULL == _tmp151_) {
+#line 3535 "CameraTable.c"
+ const gchar* _tmp152_;
+ gchar* _tmp153_;
#line 358 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp163_ = name;
+ _tmp152_ = name;
#line 358 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp164_ = g_strdup (_tmp163_);
+ _tmp153_ = g_strdup (_tmp152_);
#line 358 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (display_name);
#line 358 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- display_name = _tmp164_;
-#line 3562 "CameraTable.c"
+ display_name = _tmp153_;
+#line 3546 "CameraTable.c"
}
#line 360 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp165_ = port_info_list;
-#line 360 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp166_ = port;
+ _tmp154_ = port_info_list;
#line 360 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp167_ = gp_port_info_list_lookup_path (_tmp165_, _tmp166_);
+ _tmp155_ = port;
#line 360 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- index = _tmp167_;
+ index = gp_port_info_list_lookup_path (_tmp154_, _tmp155_);
#line 361 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp168_ = index;
+ _tmp156_ = index;
#line 361 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- if (_tmp168_ < 0) {
-#line 3576 "CameraTable.c"
- gint _tmp169_;
- const gchar* _tmp170_;
- gchar* _tmp171_;
- gchar* _tmp172_;
+ 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"
- _tmp169_ = index;
+ _tmp157_ = index;
#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp170_ = port;
+ _tmp158_ = port;
#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp171_ = g_strdup_printf ("lookup port %s", _tmp170_);
+ _tmp159_ = g_strdup_printf ("lookup port %s", _tmp158_);
#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp172_ = _tmp171_;
+ _tmp160_ = _tmp159_;
#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- camera_table_do_op (self, (int) _tmp169_, _tmp172_, &_inner_error_);
+ camera_table_do_op (self, (int) _tmp157_, _tmp160_, &_inner_error_);
#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _g_free0 (_tmp172_);
+ _g_free0 (_tmp160_);
#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -3623,7 +3605,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
_gp_port_info_list_free0 (port_info_list);
#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return;
-#line 3625 "CameraTable.c"
+#line 3607 "CameraTable.c"
} else {
#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (path);
@@ -3655,30 +3637,30 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
g_clear_error (&_inner_error_);
#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return;
-#line 3657 "CameraTable.c"
+#line 3639 "CameraTable.c"
}
}
}
#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp173_ = port_info_list;
+ _tmp161_ = port_info_list;
#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp174_ = index;
+ _tmp162_ = index;
#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp176_ = gp_port_info_list_get_info (_tmp173_, _tmp174_, &_tmp175_);
+ _tmp164_ = gp_port_info_list_get_info (_tmp161_, _tmp162_, &_tmp163_);
#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
(port_info);
#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- port_info = _tmp175_;
+ port_info = _tmp163_;
#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp177_ = port;
+ _tmp165_ = port;
#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp178_ = g_strdup_printf ("get port info for %s", _tmp177_);
+ _tmp166_ = g_strdup_printf ("get port info for %s", _tmp165_);
#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp179_ = _tmp178_;
+ _tmp167_ = _tmp166_;
#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- camera_table_do_op (self, _tmp176_, _tmp179_, &_inner_error_);
+ camera_table_do_op (self, _tmp164_, _tmp167_, &_inner_error_);
#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _g_free0 (_tmp179_);
+ _g_free0 (_tmp167_);
#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -3715,7 +3697,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
_gp_port_info_list_free0 (port_info_list);
#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return;
-#line 3717 "CameraTable.c"
+#line 3699 "CameraTable.c"
} else {
#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (tmp_path);
@@ -3751,52 +3733,50 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
g_clear_error (&_inner_error_);
#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return;
-#line 3753 "CameraTable.c"
+#line 3735 "CameraTable.c"
}
}
#line 368 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- gp_port_info_get_path (port_info, &_tmp180_);
+ gp_port_info_get_path (port_info, &_tmp168_);
#line 368 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (tmp_path);
#line 368 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp181_ = g_strdup (_tmp180_);
+ _tmp169_ = g_strdup (_tmp168_);
#line 368 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- tmp_path = _tmp181_;
+ tmp_path = _tmp169_;
#line 371 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp182_ = port;
+ _tmp170_ = port;
#line 371 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp183_ = tmp_path;
+ _tmp171_ = tmp_path;
#line 371 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _vala_assert (g_strcmp0 (_tmp182_, _tmp183_) == 0, "port == tmp_path");
-#line 373 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp184_ = self->priv->abilities_list;
+ _vala_assert (g_strcmp0 (_tmp170_, _tmp171_) == 0, "port == tmp_path");
#line 373 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp185_ = name;
+ _tmp172_ = self->priv->abilities_list;
#line 373 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp186_ = gp_abilities_list_lookup_model (_tmp184_, _tmp185_);
+ _tmp173_ = name;
#line 373 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- index = _tmp186_;
+ index = gp_abilities_list_lookup_model (_tmp172_, _tmp173_);
#line 374 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp187_ = index;
+ _tmp174_ = index;
#line 374 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- if (_tmp187_ < 0) {
-#line 3782 "CameraTable.c"
- gint _tmp188_;
- const gchar* _tmp189_;
- gchar* _tmp190_;
- gchar* _tmp191_;
+ 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"
- _tmp188_ = index;
+ _tmp175_ = index;
#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp189_ = name;
+ _tmp176_ = name;
#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp190_ = g_strdup_printf ("lookup camera model %s", _tmp189_);
+ _tmp177_ = g_strdup_printf ("lookup camera model %s", _tmp176_);
#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp191_ = _tmp190_;
+ _tmp178_ = _tmp177_;
#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- camera_table_do_op (self, (int) _tmp188_, _tmp191_, &_inner_error_);
+ camera_table_do_op (self, (int) _tmp175_, _tmp178_, &_inner_error_);
#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _g_free0 (_tmp191_);
+ _g_free0 (_tmp178_);
#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -3833,7 +3813,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
_gp_port_info_list_free0 (port_info_list);
#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return;
-#line 3835 "CameraTable.c"
+#line 3815 "CameraTable.c"
} else {
#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (tmp_path);
@@ -3869,30 +3849,30 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
g_clear_error (&_inner_error_);
#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return;
-#line 3871 "CameraTable.c"
+#line 3851 "CameraTable.c"
}
}
}
#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp192_ = self->priv->abilities_list;
+ _tmp179_ = self->priv->abilities_list;
#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp193_ = index;
+ _tmp180_ = index;
#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp195_ = gp_abilities_list_get_abilities (_tmp192_, _tmp193_, &_tmp194_);
+ _tmp182_ = gp_abilities_list_get_abilities (_tmp179_, _tmp180_, &_tmp181_);
#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
(camera_abilities);
#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- camera_abilities = _tmp194_;
+ camera_abilities = _tmp181_;
#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp196_ = name;
+ _tmp183_ = name;
#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp197_ = g_strdup_printf ("lookup camera abilities for %s", _tmp196_);
+ _tmp184_ = g_strdup_printf ("lookup camera abilities for %s", _tmp183_);
#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp198_ = _tmp197_;
+ _tmp185_ = _tmp184_;
#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- camera_table_do_op (self, _tmp195_, _tmp198_, &_inner_error_);
+ camera_table_do_op (self, _tmp182_, _tmp185_, &_inner_error_);
#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _g_free0 (_tmp198_);
+ _g_free0 (_tmp185_);
#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -3931,7 +3911,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
_gp_port_info_list_free0 (port_info_list);
#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return;
-#line 3933 "CameraTable.c"
+#line 3913 "CameraTable.c"
} else {
#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
(camera_abilities);
@@ -3969,25 +3949,25 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
g_clear_error (&_inner_error_);
#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return;
-#line 3971 "CameraTable.c"
+#line 3951 "CameraTable.c"
}
}
#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp200_ = gp_camera_new (&_tmp199_);
+ _tmp187_ = gp_camera_new (&_tmp186_);
#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_gp_camera_unref0 (gcamera);
#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- gcamera = _tmp199_;
+ gcamera = _tmp186_;
#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp201_ = name;
+ _tmp188_ = name;
#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp202_ = g_strdup_printf ("create camera object for %s", _tmp201_);
+ _tmp189_ = g_strdup_printf ("create camera object for %s", _tmp188_);
#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp203_ = _tmp202_;
+ _tmp190_ = _tmp189_;
#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- camera_table_do_op (self, _tmp200_, _tmp203_, &_inner_error_);
+ camera_table_do_op (self, _tmp187_, _tmp190_, &_inner_error_);
#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _g_free0 (_tmp203_);
+ _g_free0 (_tmp190_);
#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -4028,7 +4008,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
_gp_port_info_list_free0 (port_info_list);
#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return;
-#line 4030 "CameraTable.c"
+#line 4010 "CameraTable.c"
} else {
#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_gp_camera_unref0 (gcamera);
@@ -4068,25 +4048,23 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
g_clear_error (&_inner_error_);
#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return;
-#line 4070 "CameraTable.c"
+#line 4050 "CameraTable.c"
}
}
#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp204_ = gcamera;
-#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp205_ = camera_abilities;
+ _tmp191_ = gcamera;
#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp206_ = gp_camera_set_abilities (_tmp204_, _tmp205_);
+ _tmp192_ = camera_abilities;
#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp207_ = name;
+ _tmp193_ = name;
#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp208_ = g_strdup_printf ("set camera abilities for %s", _tmp207_);
+ _tmp194_ = g_strdup_printf ("set camera abilities for %s", _tmp193_);
#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp209_ = _tmp208_;
+ _tmp195_ = _tmp194_;
#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- camera_table_do_op (self, _tmp206_, _tmp209_, &_inner_error_);
+ 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 (_tmp209_);
+ _g_free0 (_tmp195_);
#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -4127,7 +4105,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
_gp_port_info_list_free0 (port_info_list);
#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return;
-#line 4129 "CameraTable.c"
+#line 4107 "CameraTable.c"
} else {
#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_gp_camera_unref0 (gcamera);
@@ -4167,27 +4145,25 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
g_clear_error (&_inner_error_);
#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return;
-#line 4169 "CameraTable.c"
+#line 4147 "CameraTable.c"
}
}
#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp210_ = gcamera;
+ _tmp196_ = gcamera;
#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp211_ = port_info;
+ _tmp197_ = port_info;
#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp212_ = gp_camera_set_port_info (_tmp210_, _tmp211_);
+ _tmp198_ = name;
#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp213_ = name;
+ _tmp199_ = port;
#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp214_ = port;
+ _tmp200_ = g_strdup_printf ("set port info for %s on %s", _tmp198_, _tmp199_);
#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp215_ = g_strdup_printf ("set port info for %s on %s", _tmp213_, _tmp214_);
+ _tmp201_ = _tmp200_;
#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp216_ = _tmp215_;
+ 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"
- camera_table_do_op (self, _tmp212_, _tmp216_, &_inner_error_);
-#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _g_free0 (_tmp216_);
+ _g_free0 (_tmp201_);
#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -4228,7 +4204,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
_gp_port_info_list_free0 (port_info_list);
#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return;
-#line 4230 "CameraTable.c"
+#line 4206 "CameraTable.c"
} else {
#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_gp_camera_unref0 (gcamera);
@@ -4268,39 +4244,39 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
g_clear_error (&_inner_error_);
#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return;
-#line 4270 "CameraTable.c"
+#line 4246 "CameraTable.c"
}
}
#line 386 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp217_ = name;
+ _tmp202_ = name;
#line 386 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp218_ = port;
+ _tmp203_ = port;
#line 386 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- g_debug ("CameraTable.vala:386: Adding to camera table: %s @ %s", _tmp217_, _tmp218_);
+ g_debug ("CameraTable.vala:386: Adding to camera table: %s @ %s", _tmp202_, _tmp203_);
#line 388 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp219_ = gcamera;
+ _tmp204_ = gcamera;
#line 388 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp220_ = uri;
+ _tmp205_ = uri;
#line 388 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp221_ = display_name;
+ _tmp206_ = display_name;
#line 388 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp222_ = icon;
+ _tmp207_ = icon;
#line 388 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp223_ = discovered_camera_new (_tmp219_, _tmp220_, _tmp221_, _tmp222_);
+ _tmp208_ = discovered_camera_new (_tmp204_, _tmp205_, _tmp206_, _tmp207_);
#line 388 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- camera = _tmp223_;
+ camera = _tmp208_;
#line 389 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp224_ = self->priv->camera_map;
+ _tmp209_ = self->priv->camera_map;
#line 389 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp225_ = uri;
+ _tmp210_ = uri;
#line 389 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp226_ = camera;
+ _tmp211_ = camera;
#line 389 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp224_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp225_, _tmp226_);
+ 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"
- _tmp227_ = camera;
+ _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, _tmp227_);
+ g_signal_emit (self, camera_table_signals[CAMERA_TABLE_CAMERA_ADDED_SIGNAL], 0, _tmp212_);
#line 315 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_discovered_camera_unref0 (camera);
#line 315 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -4323,11 +4299,11 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
_g_free0 (name);
#line 315 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (port);
-#line 4325 "CameraTable.c"
+#line 4301 "CameraTable.c"
}
#line 315 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_object_unref0 (_port_it);
-#line 4329 "CameraTable.c"
+#line 4305 "CameraTable.c"
}
#line 233 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
missing = (_vala_array_free (missing, missing_length1, (GDestroyNotify) discovered_camera_unref), NULL);
@@ -4339,15 +4315,17 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
_gp_list_unref0 (camera_list);
#line 233 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_gp_port_info_list_free0 (port_info_list);
-#line 4341 "CameraTable.c"
+#line 4317 "CameraTable.c"
}
-static void camera_table_on_udev_event (CameraTable* self, const gchar* action, GUdevDevice* device) {
+static void
+camera_table_on_udev_event (CameraTable* self,
+ const gchar* action,
+ GUdevDevice* device)
+{
const gchar* _tmp0_;
- GUdevDevice* _tmp1_;
- const gchar* _tmp2_;
- OneShotScheduler* _tmp3_;
+ OneShotScheduler* _tmp1_;
#line 395 "/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"
@@ -4355,22 +4333,21 @@ static void camera_table_on_udev_event (CameraTable* self, const gchar* action,
#line 395 "/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"
- _tmp0_ = action;
-#line 396 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp1_ = device;
+ _tmp0_ = g_udev_device_get_name (device);
#line 396 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp2_ = g_udev_device_get_name (_tmp1_);
-#line 396 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- g_debug ("CameraTable.vala:396: udev event: %s on %s", _tmp0_, _tmp2_);
+ g_debug ("CameraTable.vala:396: udev event: %s on %s", action, _tmp0_);
#line 400 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp3_ = self->priv->camera_update_scheduler;
+ _tmp1_ = self->priv->camera_update_scheduler;
#line 400 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- one_shot_scheduler_after_timeout (_tmp3_, (guint) CAMERA_TABLE_UPDATE_DELAY_MSEC, TRUE);
-#line 4368 "CameraTable.c"
+ one_shot_scheduler_after_timeout (_tmp1_, (guint) CAMERA_TABLE_UPDATE_DELAY_MSEC, TRUE);
+#line 4342 "CameraTable.c"
}
-void camera_table_on_volume_changed (CameraTable* self, GVolume* volume) {
+void
+camera_table_on_volume_changed (CameraTable* self,
+ GVolume* volume)
+{
OneShotScheduler* _tmp0_;
#line 403 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
g_return_if_fail (IS_CAMERA_TABLE (self));
@@ -4380,15 +4357,17 @@ void camera_table_on_volume_changed (CameraTable* self, GVolume* volume) {
_tmp0_ = self->priv->camera_update_scheduler;
#line 404 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
one_shot_scheduler_after_timeout (_tmp0_, (guint) CAMERA_TABLE_UPDATE_DELAY_MSEC, TRUE);
-#line 4382 "CameraTable.c"
+#line 4359 "CameraTable.c"
}
-static void camera_table_on_update_cameras (CameraTable* self) {
+static void
+camera_table_on_update_cameras (CameraTable* self)
+{
GError * _inner_error_ = NULL;
#line 407 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
g_return_if_fail (IS_CAMERA_TABLE (self));
-#line 4390 "CameraTable.c"
+#line 4369 "CameraTable.c"
{
CameraTable* _tmp0_;
CameraTable* _tmp1_;
@@ -4404,7 +4383,7 @@ static void camera_table_on_update_cameras (CameraTable* self) {
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 409 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (_inner_error_->domain == GPHOTO_ERROR) {
-#line 4406 "CameraTable.c"
+#line 4385 "CameraTable.c"
goto __catch68_gphoto_error;
}
#line 409 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -4413,7 +4392,7 @@ static void camera_table_on_update_cameras (CameraTable* self) {
g_clear_error (&_inner_error_);
#line 409 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return;
-#line 4415 "CameraTable.c"
+#line 4394 "CameraTable.c"
}
}
goto __finally68;
@@ -4434,7 +4413,7 @@ static void camera_table_on_update_cameras (CameraTable* self) {
g_warning ("CameraTable.vala:411: Error updating camera table: %s", _tmp3_);
#line 408 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_error_free0 (err);
-#line 4436 "CameraTable.c"
+#line 4415 "CameraTable.c"
}
__finally68:
#line 408 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -4445,12 +4424,19 @@ static void camera_table_on_update_cameras (CameraTable* self) {
g_clear_error (&_inner_error_);
#line 408 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return;
-#line 4447 "CameraTable.c"
+#line 4426 "CameraTable.c"
}
}
-static void g_cclosure_user_marshal_VOID__DISCOVERED_CAMERA (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data) {
+static void
+g_cclosure_user_marshal_VOID__DISCOVERED_CAMERA (GClosure * closure,
+ GValue * return_value,
+ guint n_param_values,
+ const GValue * param_values,
+ gpointer invocation_hint,
+ gpointer marshal_data)
+{
typedef void (*GMarshalFunc_VOID__DISCOVERED_CAMERA) (gpointer data1, gpointer arg_1, gpointer data2);
register GMarshalFunc_VOID__DISCOVERED_CAMERA callback;
register GCClosure * cc;
@@ -4465,61 +4451,75 @@ static void g_cclosure_user_marshal_VOID__DISCOVERED_CAMERA (GClosure * closure,
data1 = closure->data;
#line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
data2 = param_values->data[0].v_pointer;
-#line 4467 "CameraTable.c"
+#line 4453 "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 4473 "CameraTable.c"
+#line 4459 "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 4479 "CameraTable.c"
+#line 4465 "CameraTable.c"
}
-static void value_camera_table_init (GValue* value) {
+static void
+value_camera_table_init (GValue* value)
+{
#line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
value->data[0].v_pointer = NULL;
-#line 4486 "CameraTable.c"
+#line 4474 "CameraTable.c"
}
-static void value_camera_table_free_value (GValue* value) {
+static void
+value_camera_table_free_value (GValue* value)
+{
#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"
camera_table_unref (value->data[0].v_pointer);
-#line 4495 "CameraTable.c"
+#line 4485 "CameraTable.c"
}
}
-static void value_camera_table_copy_value (const GValue* src_value, GValue* dest_value) {
+static void
+value_camera_table_copy_value (const GValue* src_value,
+ GValue* dest_value)
+{
#line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
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 4505 "CameraTable.c"
+#line 4498 "CameraTable.c"
} else {
#line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
dest_value->data[0].v_pointer = NULL;
-#line 4509 "CameraTable.c"
+#line 4502 "CameraTable.c"
}
}
-static gpointer value_camera_table_peek_pointer (const GValue* value) {
+static gpointer
+value_camera_table_peek_pointer (const GValue* value)
+{
#line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return value->data[0].v_pointer;
-#line 4517 "CameraTable.c"
+#line 4512 "CameraTable.c"
}
-static gchar* value_camera_table_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+static gchar*
+value_camera_table_collect_value (GValue* value,
+ guint n_collect_values,
+ GTypeCValue* collect_values,
+ guint collect_flags)
+{
#line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (collect_values[0].v_pointer) {
#line 4524 "CameraTable.c"
@@ -4549,36 +4549,47 @@ static gchar* value_camera_table_collect_value (GValue* value, guint n_collect_v
}
-static gchar* value_camera_table_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+static gchar*
+value_camera_table_lcopy_value (const GValue* value,
+ guint n_collect_values,
+ GTypeCValue* collect_values,
+ guint collect_flags)
+{
CameraTable ** object_p;
object_p = collect_values[0].v_pointer;
#line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
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 4558 "CameraTable.c"
+#line 4563 "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 4564 "CameraTable.c"
+#line 4569 "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 4568 "CameraTable.c"
+#line 4573 "CameraTable.c"
} else {
#line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
*object_p = camera_table_ref (value->data[0].v_pointer);
-#line 4572 "CameraTable.c"
+#line 4577 "CameraTable.c"
}
#line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return NULL;
-#line 4576 "CameraTable.c"
+#line 4581 "CameraTable.c"
}
-GParamSpec* param_spec_camera_table (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
+GParamSpec*
+param_spec_camera_table (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags)
+{
ParamSpecCameraTable* spec;
#line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
g_return_val_if_fail (g_type_is_a (object_type, TYPE_CAMERA_TABLE), NULL);
@@ -4588,20 +4599,25 @@ GParamSpec* param_spec_camera_table (const gchar* name, const gchar* nick, const
G_PARAM_SPEC (spec)->value_type = object_type;
#line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return G_PARAM_SPEC (spec);
-#line 4590 "CameraTable.c"
+#line 4601 "CameraTable.c"
}
-gpointer value_get_camera_table (const GValue* value) {
+gpointer
+value_get_camera_table (const GValue* value)
+{
#line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
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 4599 "CameraTable.c"
+#line 4612 "CameraTable.c"
}
-void value_set_camera_table (GValue* value, gpointer v_object) {
+void
+value_set_camera_table (GValue* value,
+ gpointer v_object)
+{
CameraTable * old;
#line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_CAMERA_TABLE));
@@ -4617,22 +4633,25 @@ void value_set_camera_table (GValue* value, gpointer v_object) {
value->data[0].v_pointer = v_object;
#line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
camera_table_ref (value->data[0].v_pointer);
-#line 4619 "CameraTable.c"
+#line 4635 "CameraTable.c"
} else {
#line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
value->data[0].v_pointer = NULL;
-#line 4623 "CameraTable.c"
+#line 4639 "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 4629 "CameraTable.c"
+#line 4645 "CameraTable.c"
}
}
-void value_take_camera_table (GValue* value, gpointer v_object) {
+void
+value_take_camera_table (GValue* value,
+ gpointer v_object)
+{
CameraTable * old;
#line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_CAMERA_TABLE));
@@ -4646,22 +4665,24 @@ void value_take_camera_table (GValue* value, gpointer v_object) {
g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
#line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
value->data[0].v_pointer = v_object;
-#line 4648 "CameraTable.c"
+#line 4667 "CameraTable.c"
} else {
#line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
value->data[0].v_pointer = NULL;
-#line 4652 "CameraTable.c"
+#line 4671 "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 4658 "CameraTable.c"
+#line 4677 "CameraTable.c"
}
}
-static void camera_table_class_init (CameraTableClass * klass) {
+static void
+camera_table_class_init (CameraTableClass * klass)
+{
#line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
camera_table_parent_class = g_type_class_peek_parent (klass);
#line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -4672,11 +4693,13 @@ static void camera_table_class_init (CameraTableClass * klass) {
camera_table_signals[CAMERA_TABLE_CAMERA_ADDED_SIGNAL] = g_signal_new ("camera-added", TYPE_CAMERA_TABLE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__DISCOVERED_CAMERA, G_TYPE_NONE, 1, TYPE_DISCOVERED_CAMERA);
#line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
camera_table_signals[CAMERA_TABLE_CAMERA_REMOVED_SIGNAL] = g_signal_new ("camera-removed", TYPE_CAMERA_TABLE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__DISCOVERED_CAMERA, G_TYPE_NONE, 1, TYPE_DISCOVERED_CAMERA);
-#line 4674 "CameraTable.c"
+#line 4695 "CameraTable.c"
}
-static void camera_table_instance_init (CameraTable * self) {
+static void
+camera_table_instance_init (CameraTable * self)
+{
GUdevClient* _tmp0_;
GPContext* _tmp1_;
GeeHashMap* _tmp2_;
@@ -4698,11 +4721,13 @@ static void camera_table_instance_init (CameraTable * self) {
self->priv->camera_map = _tmp2_;
#line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
self->ref_count = 1;
-#line 4700 "CameraTable.c"
+#line 4723 "CameraTable.c"
}
-static void camera_table_finalize (CameraTable * obj) {
+static void
+camera_table_finalize (CameraTable * obj)
+{
CameraTable * self;
#line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_CAMERA_TABLE, CameraTable);
@@ -4720,11 +4745,13 @@ static void camera_table_finalize (CameraTable * obj) {
_g_object_unref0 (self->priv->volume_monitor);
#line 35 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_object_unref0 (self->priv->camera_map);
-#line 4722 "CameraTable.c"
+#line 4747 "CameraTable.c"
}
-GType camera_table_get_type (void) {
+GType
+camera_table_get_type (void)
+{
static volatile gsize camera_table_type_id__volatile = 0;
if (g_once_init_enter (&camera_table_type_id__volatile)) {
static const GTypeValueTable g_define_type_value_table = { value_camera_table_init, value_camera_table_free_value, value_camera_table_copy_value, value_camera_table_peek_pointer, "p", value_camera_table_collect_value, "p", value_camera_table_lcopy_value };
@@ -4738,18 +4765,22 @@ GType camera_table_get_type (void) {
}
-gpointer camera_table_ref (gpointer instance) {
+gpointer
+camera_table_ref (gpointer instance)
+{
CameraTable * self;
self = instance;
#line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
g_atomic_int_inc (&self->ref_count);
#line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return instance;
-#line 4747 "CameraTable.c"
+#line 4776 "CameraTable.c"
}
-void camera_table_unref (gpointer instance) {
+void
+camera_table_unref (gpointer instance)
+{
CameraTable * self;
self = instance;
#line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -4758,12 +4789,16 @@ void camera_table_unref (gpointer instance) {
CAMERA_TABLE_GET_CLASS (self)->finalize (self);
#line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
g_type_free_instance ((GTypeInstance *) self);
-#line 4760 "CameraTable.c"
+#line 4791 "CameraTable.c"
}
}
-static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func) {
+static void
+_vala_array_destroy (gpointer array,
+ gint array_length,
+ GDestroyNotify destroy_func)
+{
if ((array != NULL) && (destroy_func != NULL)) {
int i;
for (i = 0; i < array_length; i = i + 1) {
@@ -4775,7 +4810,11 @@ static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNoti
}
-static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func) {
+static void
+_vala_array_free (gpointer array,
+ gint array_length,
+ GDestroyNotify destroy_func)
+{
_vala_array_destroy (array, array_length, destroy_func);
g_free (array);
}