From 2492891f112caac6076ce49721d9d5d78a152c3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 12 Nov 2017 15:53:58 +0100 Subject: New upstream version 0.26.4 --- src/MediaMetadata.c | 210 ++++++++++++++++++++++++++-------------------------- 1 file changed, 105 insertions(+), 105 deletions(-) (limited to 'src/MediaMetadata.c') diff --git a/src/MediaMetadata.c b/src/MediaMetadata.c index b2e19cf..4bad2b6 100644 --- a/src/MediaMetadata.c +++ b/src/MediaMetadata.c @@ -1,4 +1,4 @@ -/* MediaMetadata.c generated by valac 0.34.7, the Vala compiler +/* MediaMetadata.c generated by valac 0.36.6, the Vala compiler * generated from MediaMetadata.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -124,7 +124,7 @@ gchar* media_metadata_get_title (MediaMetadata* self); static gchar* media_metadata_real_get_title (MediaMetadata* self); gchar* media_metadata_get_comment (MediaMetadata* self); static gchar* media_metadata_real_get_comment (MediaMetadata* self); -static void media_metadata_finalize (MediaMetadata* obj); +static void media_metadata_finalize (MediaMetadata * obj); GType metadata_rational_get_type (void) G_GNUC_CONST; MetadataRational* metadata_rational_dup (const MetadataRational* self); void metadata_rational_free (MetadataRational* self); @@ -151,7 +151,7 @@ gchar* metadata_date_time_get_exif_label (MetadataDateTime* self); gchar* metadata_date_time_to_exif_date_time (time_t timestamp); gchar* metadata_date_time_get_xmp_label (MetadataDateTime* self); gchar* metadata_date_time_to_string (MetadataDateTime* self); -static void metadata_date_time_finalize (MetadataDateTime* obj); +static void metadata_date_time_finalize (MetadataDateTime * obj); MediaMetadata* media_metadata_construct (GType object_type) { @@ -278,7 +278,7 @@ static gchar* value_media_metadata_collect_value (GValue* value, guint n_collect #line 7 "/home/jens/Source/shotwell/src/MediaMetadata.vala" if (collect_values[0].v_pointer) { #line 281 "MediaMetadata.c" - MediaMetadata* object; + MediaMetadata * object; object = collect_values[0].v_pointer; #line 7 "/home/jens/Source/shotwell/src/MediaMetadata.vala" if (object->parent_instance.g_class == NULL) { @@ -305,7 +305,7 @@ static gchar* value_media_metadata_collect_value (GValue* value, guint n_collect static gchar* value_media_metadata_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { - MediaMetadata** object_p; + MediaMetadata ** object_p; object_p = collect_values[0].v_pointer; #line 7 "/home/jens/Source/shotwell/src/MediaMetadata.vala" if (!object_p) { @@ -357,7 +357,7 @@ gpointer value_get_media_metadata (const GValue* value) { void value_set_media_metadata (GValue* value, gpointer v_object) { - MediaMetadata* old; + MediaMetadata * old; #line 7 "/home/jens/Source/shotwell/src/MediaMetadata.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_MEDIA_METADATA)); #line 7 "/home/jens/Source/shotwell/src/MediaMetadata.vala" @@ -388,7 +388,7 @@ void value_set_media_metadata (GValue* value, gpointer v_object) { void value_take_media_metadata (GValue* value, gpointer v_object) { - MediaMetadata* old; + MediaMetadata * old; #line 7 "/home/jens/Source/shotwell/src/MediaMetadata.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_MEDIA_METADATA)); #line 7 "/home/jens/Source/shotwell/src/MediaMetadata.vala" @@ -422,13 +422,13 @@ static void media_metadata_class_init (MediaMetadataClass * klass) { #line 7 "/home/jens/Source/shotwell/src/MediaMetadata.vala" ((MediaMetadataClass *) klass)->finalize = media_metadata_finalize; #line 7 "/home/jens/Source/shotwell/src/MediaMetadata.vala" - ((MediaMetadataClass *) klass)->read_from_file = (void (*)(MediaMetadata*, GFile*, GError**)) media_metadata_real_read_from_file; + ((MediaMetadataClass *) klass)->read_from_file = (void (*) (MediaMetadata *, GFile*, GError**)) media_metadata_real_read_from_file; #line 7 "/home/jens/Source/shotwell/src/MediaMetadata.vala" - ((MediaMetadataClass *) klass)->get_creation_date_time = (MetadataDateTime* (*)(MediaMetadata*)) media_metadata_real_get_creation_date_time; + ((MediaMetadataClass *) klass)->get_creation_date_time = (MetadataDateTime* (*) (MediaMetadata *)) media_metadata_real_get_creation_date_time; #line 7 "/home/jens/Source/shotwell/src/MediaMetadata.vala" - ((MediaMetadataClass *) klass)->get_title = (gchar* (*)(MediaMetadata*)) media_metadata_real_get_title; + ((MediaMetadataClass *) klass)->get_title = (gchar* (*) (MediaMetadata *)) media_metadata_real_get_title; #line 7 "/home/jens/Source/shotwell/src/MediaMetadata.vala" - ((MediaMetadataClass *) klass)->get_comment = (gchar* (*)(MediaMetadata*)) media_metadata_real_get_comment; + ((MediaMetadataClass *) klass)->get_comment = (gchar* (*) (MediaMetadata *)) media_metadata_real_get_comment; #line 433 "MediaMetadata.c" } @@ -440,7 +440,7 @@ static void media_metadata_instance_init (MediaMetadata * self) { } -static void media_metadata_finalize (MediaMetadata* obj) { +static void media_metadata_finalize (MediaMetadata * obj) { MediaMetadata * self; #line 7 "/home/jens/Source/shotwell/src/MediaMetadata.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_MEDIA_METADATA, MediaMetadata); @@ -465,7 +465,7 @@ GType media_metadata_get_type (void) { gpointer media_metadata_ref (gpointer instance) { - MediaMetadata* self; + MediaMetadata * self; self = instance; #line 7 "/home/jens/Source/shotwell/src/MediaMetadata.vala" g_atomic_int_inc (&self->ref_count); @@ -476,7 +476,7 @@ gpointer media_metadata_ref (gpointer instance) { void media_metadata_unref (gpointer instance) { - MediaMetadata* self; + MediaMetadata * self; self = instance; #line 7 "/home/jens/Source/shotwell/src/MediaMetadata.vala" if (g_atomic_int_dec_and_test (&self->ref_count)) { @@ -490,8 +490,8 @@ void media_metadata_unref (gpointer instance) { void metadata_rational_init (MetadataRational *self, gint numerator, gint denominator) { - gint _tmp0_ = 0; - gint _tmp1_ = 0; + gint _tmp0_; + gint _tmp1_; #line 24 "/home/jens/Source/shotwell/src/MediaMetadata.vala" memset (self, 0, sizeof (MetadataRational)); #line 25 "/home/jens/Source/shotwell/src/MediaMetadata.vala" @@ -509,13 +509,13 @@ void metadata_rational_init (MetadataRational *self, gint numerator, gint denomi static gboolean metadata_rational_is_component_valid (MetadataRational *self, gint component) { gboolean result = FALSE; gboolean _tmp0_ = FALSE; - gint _tmp1_ = 0; + gint _tmp1_; #line 30 "/home/jens/Source/shotwell/src/MediaMetadata.vala" _tmp1_ = component; #line 30 "/home/jens/Source/shotwell/src/MediaMetadata.vala" if (_tmp1_ >= 0) { #line 518 "MediaMetadata.c" - gint _tmp2_ = 0; + gint _tmp2_; #line 30 "/home/jens/Source/shotwell/src/MediaMetadata.vala" _tmp2_ = component; #line 30 "/home/jens/Source/shotwell/src/MediaMetadata.vala" @@ -537,8 +537,8 @@ static gboolean metadata_rational_is_component_valid (MetadataRational *self, gi gboolean metadata_rational_is_valid (MetadataRational *self) { gboolean result = FALSE; gboolean _tmp0_ = FALSE; - gint _tmp1_ = 0; - gboolean _tmp2_ = FALSE; + gint _tmp1_; + gboolean _tmp2_; #line 34 "/home/jens/Source/shotwell/src/MediaMetadata.vala" _tmp1_ = (*self).numerator; #line 34 "/home/jens/Source/shotwell/src/MediaMetadata.vala" @@ -546,8 +546,8 @@ gboolean metadata_rational_is_valid (MetadataRational *self) { #line 34 "/home/jens/Source/shotwell/src/MediaMetadata.vala" if (_tmp2_) { #line 549 "MediaMetadata.c" - gint _tmp3_ = 0; - gboolean _tmp4_ = FALSE; + gint _tmp3_; + gboolean _tmp4_; #line 34 "/home/jens/Source/shotwell/src/MediaMetadata.vala" _tmp3_ = (*self).denominator; #line 34 "/home/jens/Source/shotwell/src/MediaMetadata.vala" @@ -571,15 +571,15 @@ gboolean metadata_rational_is_valid (MetadataRational *self) { gchar* metadata_rational_to_string (MetadataRational *self) { gchar* result = NULL; gchar* _tmp0_ = NULL; - gboolean _tmp1_ = FALSE; + gboolean _tmp1_; #line 38 "/home/jens/Source/shotwell/src/MediaMetadata.vala" _tmp1_ = metadata_rational_is_valid (&(*self)); #line 38 "/home/jens/Source/shotwell/src/MediaMetadata.vala" if (_tmp1_) { #line 580 "MediaMetadata.c" - gint _tmp2_ = 0; - gint _tmp3_ = 0; - gchar* _tmp4_ = NULL; + gint _tmp2_; + gint _tmp3_; + gchar* _tmp4_; #line 38 "/home/jens/Source/shotwell/src/MediaMetadata.vala" _tmp2_ = (*self).numerator; #line 38 "/home/jens/Source/shotwell/src/MediaMetadata.vala" @@ -592,7 +592,7 @@ gchar* metadata_rational_to_string (MetadataRational *self) { _tmp0_ = _tmp4_; #line 594 "MediaMetadata.c" } else { - gchar* _tmp5_ = NULL; + gchar* _tmp5_; #line 38 "/home/jens/Source/shotwell/src/MediaMetadata.vala" _tmp5_ = g_strdup (""); #line 38 "/home/jens/Source/shotwell/src/MediaMetadata.vala" @@ -646,7 +646,7 @@ GQuark metadata_date_time_error_quark (void) { MetadataDateTime* metadata_date_time_construct (GType object_type, time_t timestamp) { MetadataDateTime* self = NULL; - time_t _tmp0_ = 0; + time_t _tmp0_; #line 51 "/home/jens/Source/shotwell/src/MediaMetadata.vala" self = (MetadataDateTime*) g_type_create_instance (object_type); #line 52 "/home/jens/Source/shotwell/src/MediaMetadata.vala" @@ -668,9 +668,9 @@ MetadataDateTime* metadata_date_time_new (time_t timestamp) { MetadataDateTime* metadata_date_time_construct_from_exif (GType object_type, const gchar* label, GError** error) { MetadataDateTime* self = NULL; - const gchar* _tmp0_ = NULL; + const gchar* _tmp0_; time_t _tmp1_ = 0; - gboolean _tmp2_ = FALSE; + gboolean _tmp2_; GError * _inner_error_ = NULL; #line 55 "/home/jens/Source/shotwell/src/MediaMetadata.vala" g_return_val_if_fail (label != NULL, NULL); @@ -685,8 +685,8 @@ MetadataDateTime* metadata_date_time_construct_from_exif (GType object_type, con #line 56 "/home/jens/Source/shotwell/src/MediaMetadata.vala" if (!_tmp2_) { #line 688 "MediaMetadata.c" - const gchar* _tmp3_ = NULL; - GError* _tmp4_ = NULL; + const gchar* _tmp3_; + GError* _tmp4_; #line 57 "/home/jens/Source/shotwell/src/MediaMetadata.vala" _tmp3_ = label; #line 57 "/home/jens/Source/shotwell/src/MediaMetadata.vala" @@ -727,7 +727,7 @@ MetadataDateTime* metadata_date_time_new_from_exif (const gchar* label, GError** MetadataDateTime* metadata_date_time_construct_from_iptc (GType object_type, const gchar* date, const gchar* time, GError** error) { MetadataDateTime* self = NULL; - GError* _tmp0_ = NULL; + GError* _tmp0_; GError * _inner_error_ = NULL; #line 60 "/home/jens/Source/shotwell/src/MediaMetadata.vala" g_return_val_if_fail (date != NULL, NULL); @@ -773,10 +773,10 @@ MetadataDateTime* metadata_date_time_new_from_iptc (const gchar* date, const gch MetadataDateTime* metadata_date_time_construct_from_xmp (GType object_type, const gchar* label, GError** error) { MetadataDateTime* self = NULL; GTimeVal time_val = {0}; - const gchar* _tmp0_ = NULL; - gboolean _tmp1_ = FALSE; - GTimeVal _tmp4_ = {0}; - glong _tmp5_ = 0L; + const gchar* _tmp0_; + gboolean _tmp1_; + GTimeVal _tmp4_; + glong _tmp5_; GError * _inner_error_ = NULL; #line 65 "/home/jens/Source/shotwell/src/MediaMetadata.vala" g_return_val_if_fail (label != NULL, NULL); @@ -791,8 +791,8 @@ MetadataDateTime* metadata_date_time_construct_from_xmp (GType object_type, cons #line 67 "/home/jens/Source/shotwell/src/MediaMetadata.vala" if (!_tmp1_) { #line 794 "MediaMetadata.c" - const gchar* _tmp2_ = NULL; - GError* _tmp3_ = NULL; + const gchar* _tmp2_; + GError* _tmp3_; #line 68 "/home/jens/Source/shotwell/src/MediaMetadata.vala" _tmp2_ = label; #line 68 "/home/jens/Source/shotwell/src/MediaMetadata.vala" @@ -839,7 +839,7 @@ MetadataDateTime* metadata_date_time_new_from_xmp (const gchar* label, GError** time_t metadata_date_time_get_timestamp (MetadataDateTime* self) { time_t result = 0; - time_t _tmp0_ = 0; + time_t _tmp0_; #line 73 "/home/jens/Source/shotwell/src/MediaMetadata.vala" g_return_val_if_fail (IS_METADATA_DATE_TIME (self), 0); #line 74 "/home/jens/Source/shotwell/src/MediaMetadata.vala" @@ -854,8 +854,8 @@ time_t metadata_date_time_get_timestamp (MetadataDateTime* self) { gchar* metadata_date_time_get_exif_label (MetadataDateTime* self) { gchar* result = NULL; - time_t _tmp0_ = 0; - gchar* _tmp1_ = NULL; + time_t _tmp0_; + gchar* _tmp1_; #line 77 "/home/jens/Source/shotwell/src/MediaMetadata.vala" g_return_val_if_fail (IS_METADATA_DATE_TIME (self), NULL); #line 78 "/home/jens/Source/shotwell/src/MediaMetadata.vala" @@ -873,8 +873,8 @@ gchar* metadata_date_time_get_exif_label (MetadataDateTime* self) { gchar* metadata_date_time_get_xmp_label (MetadataDateTime* self) { gchar* result = NULL; GTimeVal time_val = {0}; - time_t _tmp0_ = 0; - gchar* _tmp1_ = NULL; + time_t _tmp0_; + gchar* _tmp1_; #line 83 "/home/jens/Source/shotwell/src/MediaMetadata.vala" g_return_val_if_fail (IS_METADATA_DATE_TIME (self), NULL); #line 84 "/home/jens/Source/shotwell/src/MediaMetadata.vala" @@ -899,18 +899,18 @@ gboolean metadata_date_time_from_exif_date_time (const gchar* date_time, time_t* time_t _vala_timestamp = 0; gboolean result = FALSE; struct tm tm = {0}; - const gchar* _tmp0_ = NULL; - gint _tmp1_ = 0; + const gchar* _tmp0_; + gint _tmp1_; gboolean _tmp7_ = FALSE; gboolean _tmp8_ = FALSE; gboolean _tmp9_ = FALSE; gboolean _tmp10_ = FALSE; gboolean _tmp11_ = FALSE; - struct tm _tmp12_ = {0}; - gint _tmp13_ = 0; - gint _tmp24_ = 0; - gint _tmp25_ = 0; - time_t _tmp26_ = 0; + struct tm _tmp12_; + gint _tmp13_; + gint _tmp24_; + gint _tmp25_; + time_t _tmp26_; #line 91 "/home/jens/Source/shotwell/src/MediaMetadata.vala" g_return_val_if_fail (date_time != NULL, FALSE); #line 92 "/home/jens/Source/shotwell/src/MediaMetadata.vala" @@ -925,11 +925,11 @@ gboolean metadata_date_time_from_exif_date_time (const gchar* date_time, time_t* if (_tmp1_ != 6) { #line 927 "MediaMetadata.c" gchar* tmp = NULL; - const gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; - const gchar* _tmp4_ = NULL; - const gchar* _tmp5_ = NULL; - gint _tmp6_ = 0; + const gchar* _tmp2_; + gchar* _tmp3_; + const gchar* _tmp4_; + const gchar* _tmp5_; + gint _tmp6_; #line 100 "/home/jens/Source/shotwell/src/MediaMetadata.vala" _tmp2_ = date_time; #line 100 "/home/jens/Source/shotwell/src/MediaMetadata.vala" @@ -974,8 +974,8 @@ gboolean metadata_date_time_from_exif_date_time (const gchar* date_time, time_t* _tmp11_ = TRUE; #line 976 "MediaMetadata.c" } else { - struct tm _tmp14_ = {0}; - gint _tmp15_ = 0; + struct tm _tmp14_; + gint _tmp15_; #line 108 "/home/jens/Source/shotwell/src/MediaMetadata.vala" _tmp14_ = tm; #line 108 "/home/jens/Source/shotwell/src/MediaMetadata.vala" @@ -990,8 +990,8 @@ gboolean metadata_date_time_from_exif_date_time (const gchar* date_time, time_t* _tmp10_ = TRUE; #line 992 "MediaMetadata.c" } else { - struct tm _tmp16_ = {0}; - gint _tmp17_ = 0; + struct tm _tmp16_; + gint _tmp17_; #line 108 "/home/jens/Source/shotwell/src/MediaMetadata.vala" _tmp16_ = tm; #line 108 "/home/jens/Source/shotwell/src/MediaMetadata.vala" @@ -1006,8 +1006,8 @@ gboolean metadata_date_time_from_exif_date_time (const gchar* date_time, time_t* _tmp9_ = TRUE; #line 1008 "MediaMetadata.c" } else { - struct tm _tmp18_ = {0}; - gint _tmp19_ = 0; + struct tm _tmp18_; + gint _tmp19_; #line 108 "/home/jens/Source/shotwell/src/MediaMetadata.vala" _tmp18_ = tm; #line 108 "/home/jens/Source/shotwell/src/MediaMetadata.vala" @@ -1022,8 +1022,8 @@ gboolean metadata_date_time_from_exif_date_time (const gchar* date_time, time_t* _tmp8_ = TRUE; #line 1024 "MediaMetadata.c" } else { - struct tm _tmp20_ = {0}; - gint _tmp21_ = 0; + struct tm _tmp20_; + gint _tmp21_; #line 108 "/home/jens/Source/shotwell/src/MediaMetadata.vala" _tmp20_ = tm; #line 108 "/home/jens/Source/shotwell/src/MediaMetadata.vala" @@ -1038,8 +1038,8 @@ gboolean metadata_date_time_from_exif_date_time (const gchar* date_time, time_t* _tmp7_ = TRUE; #line 1040 "MediaMetadata.c" } else { - struct tm _tmp22_ = {0}; - gint _tmp23_ = 0; + struct tm _tmp22_; + gint _tmp23_; #line 108 "/home/jens/Source/shotwell/src/MediaMetadata.vala" _tmp22_ = tm; #line 108 "/home/jens/Source/shotwell/src/MediaMetadata.vala" @@ -1093,13 +1093,13 @@ gboolean metadata_date_time_from_exif_date_time (const gchar* date_time, time_t* static void g_time_local (time_t time, struct tm* result) { struct tm _result_ = {0}; struct tm _tmp0_ = {0}; -#line 2750 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 2846 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" localtime_r (&time, &_tmp0_); -#line 2750 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 2846 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _result_ = _tmp0_; -#line 2751 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 2847 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" *result = _result_; -#line 2751 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 2847 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" return; #line 1105 "MediaMetadata.c" } @@ -1108,44 +1108,44 @@ static void g_time_local (time_t time, struct tm* result) { static gchar* g_time_format (struct tm *self, const gchar* format) { gchar* result = NULL; gchar* buffer = NULL; - gchar* _tmp0_ = NULL; - gint buffer_length1 = 0; - gint _buffer_size_ = 0; - gchar* _tmp1_ = NULL; - gint _tmp1__length1 = 0; - const gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; - gint _tmp3__length1 = 0; - gchar* _tmp4_ = NULL; -#line 2758 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + gchar* _tmp0_; + gint buffer_length1; + gint _buffer_size_; + gchar* _tmp1_; + gint _tmp1__length1; + const gchar* _tmp2_; + gchar* _tmp3_; + gint _tmp3__length1; + gchar* _tmp4_; +#line 2854 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (format != NULL, NULL); -#line 2759 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 2855 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp0_ = g_new0 (gchar, 64); -#line 2759 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 2855 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" buffer = _tmp0_; -#line 2759 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 2855 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" buffer_length1 = 64; -#line 2759 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 2855 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _buffer_size_ = buffer_length1; -#line 2760 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 2856 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp1_ = buffer; -#line 2760 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 2856 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp1__length1 = buffer_length1; -#line 2760 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 2856 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp2_ = format; -#line 2760 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 2856 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" strftime (_tmp1_, _tmp1__length1, _tmp2_, &(*self)); -#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 2857 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp3_ = buffer; -#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 2857 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp3__length1 = buffer_length1; -#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 2857 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp4_ = g_strdup ((const gchar*) _tmp3_); -#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 2857 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" result = _tmp4_; -#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 2857 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" buffer = (g_free (buffer), NULL); -#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 2857 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" return result; #line 1151 "MediaMetadata.c" } @@ -1153,9 +1153,9 @@ static gchar* g_time_format (struct tm *self, const gchar* format) { gchar* metadata_date_time_to_exif_date_time (time_t timestamp) { gchar* result = NULL; - time_t _tmp0_ = 0; + time_t _tmp0_; struct tm _tmp1_ = {0}; - gchar* _tmp2_ = NULL; + gchar* _tmp2_; #line 121 "/home/jens/Source/shotwell/src/MediaMetadata.vala" _tmp0_ = timestamp; #line 121 "/home/jens/Source/shotwell/src/MediaMetadata.vala" @@ -1172,8 +1172,8 @@ gchar* metadata_date_time_to_exif_date_time (time_t timestamp) { gchar* metadata_date_time_to_string (MetadataDateTime* self) { gchar* result = NULL; - time_t _tmp0_ = 0; - gchar* _tmp1_ = NULL; + time_t _tmp0_; + gchar* _tmp1_; #line 124 "/home/jens/Source/shotwell/src/MediaMetadata.vala" g_return_val_if_fail (IS_METADATA_DATE_TIME (self), NULL); #line 125 "/home/jens/Source/shotwell/src/MediaMetadata.vala" @@ -1230,7 +1230,7 @@ static gchar* value_metadata_date_time_collect_value (GValue* value, guint n_col #line 47 "/home/jens/Source/shotwell/src/MediaMetadata.vala" if (collect_values[0].v_pointer) { #line 1233 "MediaMetadata.c" - MetadataDateTime* object; + MetadataDateTime * object; object = collect_values[0].v_pointer; #line 47 "/home/jens/Source/shotwell/src/MediaMetadata.vala" if (object->parent_instance.g_class == NULL) { @@ -1257,7 +1257,7 @@ static gchar* value_metadata_date_time_collect_value (GValue* value, guint n_col static gchar* value_metadata_date_time_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { - MetadataDateTime** object_p; + MetadataDateTime ** object_p; object_p = collect_values[0].v_pointer; #line 47 "/home/jens/Source/shotwell/src/MediaMetadata.vala" if (!object_p) { @@ -1309,7 +1309,7 @@ gpointer value_get_metadata_date_time (const GValue* value) { void value_set_metadata_date_time (GValue* value, gpointer v_object) { - MetadataDateTime* old; + MetadataDateTime * old; #line 47 "/home/jens/Source/shotwell/src/MediaMetadata.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_METADATA_DATE_TIME)); #line 47 "/home/jens/Source/shotwell/src/MediaMetadata.vala" @@ -1340,7 +1340,7 @@ void value_set_metadata_date_time (GValue* value, gpointer v_object) { void value_take_metadata_date_time (GValue* value, gpointer v_object) { - MetadataDateTime* old; + MetadataDateTime * old; #line 47 "/home/jens/Source/shotwell/src/MediaMetadata.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_METADATA_DATE_TIME)); #line 47 "/home/jens/Source/shotwell/src/MediaMetadata.vala" @@ -1388,7 +1388,7 @@ static void metadata_date_time_instance_init (MetadataDateTime * self) { } -static void metadata_date_time_finalize (MetadataDateTime* obj) { +static void metadata_date_time_finalize (MetadataDateTime * obj) { MetadataDateTime * self; #line 47 "/home/jens/Source/shotwell/src/MediaMetadata.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_METADATA_DATE_TIME, MetadataDateTime); @@ -1413,7 +1413,7 @@ GType metadata_date_time_get_type (void) { gpointer metadata_date_time_ref (gpointer instance) { - MetadataDateTime* self; + MetadataDateTime * self; self = instance; #line 47 "/home/jens/Source/shotwell/src/MediaMetadata.vala" g_atomic_int_inc (&self->ref_count); @@ -1424,7 +1424,7 @@ gpointer metadata_date_time_ref (gpointer instance) { void metadata_date_time_unref (gpointer instance) { - MetadataDateTime* self; + MetadataDateTime * self; self = instance; #line 47 "/home/jens/Source/shotwell/src/MediaMetadata.vala" if (g_atomic_int_dec_and_test (&self->ref_count)) { -- cgit v1.2.3