summaryrefslogtreecommitdiff
path: root/thumbnailer
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2017-04-14 18:53:12 +0200
committerJörg Frings-Fürst <debian@jff-webhosting.net>2017-04-14 18:53:12 +0200
commitdfdb61e578cccb4b7ec2e9ccfa16a66ec481fab5 (patch)
treedee893916166ac1c8b479b74e7f341429945260e /thumbnailer
parenta5ea701acc282ade4ccb9b08a8613a8d66ca82a5 (diff)
parent9e7cd144725a270e0460b21747619f447ca87684 (diff)
Merge tag 'upstream/0.26.1'
Upstream version 0.26.1
Diffstat (limited to 'thumbnailer')
-rw-r--r--thumbnailer/shotwell-video-thumbnailer.c74
1 files changed, 38 insertions, 36 deletions
diff --git a/thumbnailer/shotwell-video-thumbnailer.c b/thumbnailer/shotwell-video-thumbnailer.c
index 6208614..9eca431 100644
--- a/thumbnailer/shotwell-video-thumbnailer.c
+++ b/thumbnailer/shotwell-video-thumbnailer.c
@@ -1,4 +1,4 @@
-/* shotwell-video-thumbnailer.c generated by valac 0.34.4, the Vala compiler
+/* shotwell-video-thumbnailer.c generated by valac 0.34.7, the Vala compiler
* generated from shotwell-video-thumbnailer.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -565,6 +565,8 @@ gint shotwell_thumbnailer_main (gchar** args, int args_length1) {
__finally0:
#line 47 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 569 "shotwell-video-thumbnailer.c"
+ gint _tmp59_ = 0;
#line 47 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
_g_object_unref0 (feature);
#line 47 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
@@ -584,8 +586,8 @@ gint shotwell_thumbnailer_main (gchar** args, int args_length1) {
#line 47 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
g_clear_error (&_inner_error_);
#line 47 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
- return 0;
-#line 589 "shotwell-video-thumbnailer.c"
+ return _tmp59_;
+#line 591 "shotwell-video-thumbnailer.c"
}
#line 107 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
result = 0;
@@ -605,7 +607,7 @@ gint shotwell_thumbnailer_main (gchar** args, int args_length1) {
_g_object_unref0 (pipeline);
#line 107 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
return result;
-#line 609 "shotwell-video-thumbnailer.c"
+#line 611 "shotwell-video-thumbnailer.c"
}
@@ -618,7 +620,7 @@ int main (int argc, char ** argv) {
#endif
#line 15 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
return shotwell_thumbnailer_main (argv, argc);
-#line 622 "shotwell-video-thumbnailer.c"
+#line 624 "shotwell-video-thumbnailer.c"
}
@@ -628,21 +630,21 @@ ShotwellThumbnailer* shotwell_thumbnailer_construct (GType object_type) {
self = (ShotwellThumbnailer*) g_type_create_instance (object_type);
#line 12 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
return self;
-#line 632 "shotwell-video-thumbnailer.c"
+#line 634 "shotwell-video-thumbnailer.c"
}
ShotwellThumbnailer* shotwell_thumbnailer_new (void) {
#line 12 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
return shotwell_thumbnailer_construct (TYPE_SHOTWELL_THUMBNAILER);
-#line 639 "shotwell-video-thumbnailer.c"
+#line 641 "shotwell-video-thumbnailer.c"
}
static void value_shotwell_thumbnailer_init (GValue* value) {
#line 12 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
value->data[0].v_pointer = NULL;
-#line 646 "shotwell-video-thumbnailer.c"
+#line 648 "shotwell-video-thumbnailer.c"
}
@@ -651,7 +653,7 @@ static void value_shotwell_thumbnailer_free_value (GValue* value) {
if (value->data[0].v_pointer) {
#line 12 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
shotwell_thumbnailer_unref (value->data[0].v_pointer);
-#line 655 "shotwell-video-thumbnailer.c"
+#line 657 "shotwell-video-thumbnailer.c"
}
}
@@ -661,11 +663,11 @@ static void value_shotwell_thumbnailer_copy_value (const GValue* src_value, GVal
if (src_value->data[0].v_pointer) {
#line 12 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
dest_value->data[0].v_pointer = shotwell_thumbnailer_ref (src_value->data[0].v_pointer);
-#line 665 "shotwell-video-thumbnailer.c"
+#line 667 "shotwell-video-thumbnailer.c"
} else {
#line 12 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
dest_value->data[0].v_pointer = NULL;
-#line 669 "shotwell-video-thumbnailer.c"
+#line 671 "shotwell-video-thumbnailer.c"
}
}
@@ -673,37 +675,37 @@ static void value_shotwell_thumbnailer_copy_value (const GValue* src_value, GVal
static gpointer value_shotwell_thumbnailer_peek_pointer (const GValue* value) {
#line 12 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
return value->data[0].v_pointer;
-#line 677 "shotwell-video-thumbnailer.c"
+#line 679 "shotwell-video-thumbnailer.c"
}
static gchar* value_shotwell_thumbnailer_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
#line 12 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
if (collect_values[0].v_pointer) {
-#line 684 "shotwell-video-thumbnailer.c"
+#line 686 "shotwell-video-thumbnailer.c"
ShotwellThumbnailer* object;
object = collect_values[0].v_pointer;
#line 12 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
if (object->parent_instance.g_class == NULL) {
#line 12 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 691 "shotwell-video-thumbnailer.c"
+#line 693 "shotwell-video-thumbnailer.c"
} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
#line 12 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.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 695 "shotwell-video-thumbnailer.c"
+#line 697 "shotwell-video-thumbnailer.c"
}
#line 12 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
value->data[0].v_pointer = shotwell_thumbnailer_ref (object);
-#line 699 "shotwell-video-thumbnailer.c"
+#line 701 "shotwell-video-thumbnailer.c"
} else {
#line 12 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
value->data[0].v_pointer = NULL;
-#line 703 "shotwell-video-thumbnailer.c"
+#line 705 "shotwell-video-thumbnailer.c"
}
#line 12 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
return NULL;
-#line 707 "shotwell-video-thumbnailer.c"
+#line 709 "shotwell-video-thumbnailer.c"
}
@@ -714,25 +716,25 @@ static gchar* value_shotwell_thumbnailer_lcopy_value (const GValue* value, guint
if (!object_p) {
#line 12 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 718 "shotwell-video-thumbnailer.c"
+#line 720 "shotwell-video-thumbnailer.c"
}
#line 12 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
if (!value->data[0].v_pointer) {
#line 12 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
*object_p = NULL;
-#line 724 "shotwell-video-thumbnailer.c"
+#line 726 "shotwell-video-thumbnailer.c"
} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
#line 12 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
*object_p = value->data[0].v_pointer;
-#line 728 "shotwell-video-thumbnailer.c"
+#line 730 "shotwell-video-thumbnailer.c"
} else {
#line 12 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
*object_p = shotwell_thumbnailer_ref (value->data[0].v_pointer);
-#line 732 "shotwell-video-thumbnailer.c"
+#line 734 "shotwell-video-thumbnailer.c"
}
#line 12 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
return NULL;
-#line 736 "shotwell-video-thumbnailer.c"
+#line 738 "shotwell-video-thumbnailer.c"
}
@@ -746,7 +748,7 @@ GParamSpec* param_spec_shotwell_thumbnailer (const gchar* name, const gchar* nic
G_PARAM_SPEC (spec)->value_type = object_type;
#line 12 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
return G_PARAM_SPEC (spec);
-#line 750 "shotwell-video-thumbnailer.c"
+#line 752 "shotwell-video-thumbnailer.c"
}
@@ -755,7 +757,7 @@ gpointer value_get_shotwell_thumbnailer (const GValue* value) {
g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SHOTWELL_THUMBNAILER), NULL);
#line 12 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
return value->data[0].v_pointer;
-#line 759 "shotwell-video-thumbnailer.c"
+#line 761 "shotwell-video-thumbnailer.c"
}
@@ -775,17 +777,17 @@ void value_set_shotwell_thumbnailer (GValue* value, gpointer v_object) {
value->data[0].v_pointer = v_object;
#line 12 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
shotwell_thumbnailer_ref (value->data[0].v_pointer);
-#line 779 "shotwell-video-thumbnailer.c"
+#line 781 "shotwell-video-thumbnailer.c"
} else {
#line 12 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
value->data[0].v_pointer = NULL;
-#line 783 "shotwell-video-thumbnailer.c"
+#line 785 "shotwell-video-thumbnailer.c"
}
#line 12 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
if (old) {
#line 12 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
shotwell_thumbnailer_unref (old);
-#line 789 "shotwell-video-thumbnailer.c"
+#line 791 "shotwell-video-thumbnailer.c"
}
}
@@ -804,17 +806,17 @@ void value_take_shotwell_thumbnailer (GValue* value, gpointer v_object) {
g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
#line 12 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
value->data[0].v_pointer = v_object;
-#line 808 "shotwell-video-thumbnailer.c"
+#line 810 "shotwell-video-thumbnailer.c"
} else {
#line 12 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
value->data[0].v_pointer = NULL;
-#line 812 "shotwell-video-thumbnailer.c"
+#line 814 "shotwell-video-thumbnailer.c"
}
#line 12 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
if (old) {
#line 12 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
shotwell_thumbnailer_unref (old);
-#line 818 "shotwell-video-thumbnailer.c"
+#line 820 "shotwell-video-thumbnailer.c"
}
}
@@ -824,14 +826,14 @@ static void shotwell_thumbnailer_class_init (ShotwellThumbnailerClass * klass) {
shotwell_thumbnailer_parent_class = g_type_class_peek_parent (klass);
#line 12 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
((ShotwellThumbnailerClass *) klass)->finalize = shotwell_thumbnailer_finalize;
-#line 828 "shotwell-video-thumbnailer.c"
+#line 830 "shotwell-video-thumbnailer.c"
}
static void shotwell_thumbnailer_instance_init (ShotwellThumbnailer * self) {
#line 12 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
self->ref_count = 1;
-#line 835 "shotwell-video-thumbnailer.c"
+#line 837 "shotwell-video-thumbnailer.c"
}
@@ -841,7 +843,7 @@ static void shotwell_thumbnailer_finalize (ShotwellThumbnailer* obj) {
self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SHOTWELL_THUMBNAILER, ShotwellThumbnailer);
#line 12 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
g_signal_handlers_destroy (self);
-#line 845 "shotwell-video-thumbnailer.c"
+#line 847 "shotwell-video-thumbnailer.c"
}
@@ -866,7 +868,7 @@ gpointer shotwell_thumbnailer_ref (gpointer instance) {
g_atomic_int_inc (&self->ref_count);
#line 12 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
return instance;
-#line 870 "shotwell-video-thumbnailer.c"
+#line 872 "shotwell-video-thumbnailer.c"
}
@@ -879,7 +881,7 @@ void shotwell_thumbnailer_unref (gpointer instance) {
SHOTWELL_THUMBNAILER_GET_CLASS (self)->finalize (self);
#line 12 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
g_type_free_instance ((GTypeInstance *) self);
-#line 883 "shotwell-video-thumbnailer.c"
+#line 885 "shotwell-video-thumbnailer.c"
}
}