From 9e7cd144725a270e0460b21747619f447ca87684 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Fri, 14 Apr 2017 18:51:46 +0200 Subject: New upstream version 0.26.1 --- src/db/DatabaseTable.c | 2 +- src/db/Db.c | 2 +- src/db/EventTable.c | 4 +- src/db/PhotoTable.c | 378 ++++++++++++++++++++++---------------------- src/db/SavedSearchDBTable.c | 8 +- src/db/TagTable.c | 6 +- src/db/TombstoneTable.c | 2 +- src/db/VersionTable.c | 2 +- src/db/VideoTable.c | 8 +- 9 files changed, 208 insertions(+), 204 deletions(-) (limited to 'src/db') diff --git a/src/db/DatabaseTable.c b/src/db/DatabaseTable.c index 790a6df..cd0a93e 100644 --- a/src/db/DatabaseTable.c +++ b/src/db/DatabaseTable.c @@ -1,4 +1,4 @@ -/* DatabaseTable.c generated by valac 0.34.4, the Vala compiler +/* DatabaseTable.c generated by valac 0.34.7, the Vala compiler * generated from DatabaseTable.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/db/Db.c b/src/db/Db.c index 4133a36..eeaf220 100644 --- a/src/db/Db.c +++ b/src/db/Db.c @@ -1,4 +1,4 @@ -/* Db.c generated by valac 0.34.4, the Vala compiler +/* Db.c generated by valac 0.34.7, the Vala compiler * generated from Db.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/db/EventTable.c b/src/db/EventTable.c index 60feebf..65a2508 100644 --- a/src/db/EventTable.c +++ b/src/db/EventTable.c @@ -1,4 +1,4 @@ -/* EventTable.c generated by valac 0.34.4, the Vala compiler +/* EventTable.c generated by valac 0.34.7, the Vala compiler * generated from EventTable.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -1378,7 +1378,7 @@ GeeArrayList* event_table_get_events (EventTable* self) { #line 168 "/home/jens/Source/shotwell/src/db/EventTable.vala" _vala_assert (_tmp3_ == SQLITE_OK, "res == Sqlite.OK"); #line 170 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp4_ = gee_array_list_new (TYPE_EVENT_ROW, (GBoxedCopyFunc) event_row_ref, event_row_unref, NULL, NULL, NULL); + _tmp4_ = gee_array_list_new (TYPE_EVENT_ROW, (GBoxedCopyFunc) event_row_ref, (GDestroyNotify) event_row_unref, NULL, NULL, NULL); #line 170 "/home/jens/Source/shotwell/src/db/EventTable.vala" event_rows = _tmp4_; #line 1381 "EventTable.c" diff --git a/src/db/PhotoTable.c b/src/db/PhotoTable.c index 4cd6830..da28230 100644 --- a/src/db/PhotoTable.c +++ b/src/db/PhotoTable.c @@ -1,4 +1,4 @@ -/* PhotoTable.c generated by valac 0.34.4, the Vala compiler +/* PhotoTable.c generated by valac 0.34.7, the Vala compiler * generated from PhotoTable.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -3264,7 +3264,7 @@ GeeArrayList* photo_table_get_all (PhotoTable* self) { #line 447 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _vala_assert (_tmp3_ == SQLITE_OK, "res == Sqlite.OK"); #line 449 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp4_ = gee_array_list_new (TYPE_PHOTO_ROW, (GBoxedCopyFunc) photo_row_ref, photo_row_unref, NULL, NULL, NULL); + _tmp4_ = gee_array_list_new (TYPE_PHOTO_ROW, (GBoxedCopyFunc) photo_row_ref, (GDestroyNotify) photo_row_unref, NULL, NULL, NULL); #line 449 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" all = _tmp4_; #line 451 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -4797,7 +4797,7 @@ GeeArrayList* photo_table_get_photos (PhotoTable* self) { #line 621 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _vala_assert (_tmp3_ == SQLITE_OK, "res == Sqlite.OK"); #line 623 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp4_ = gee_array_list_new (TYPE_PHOTO_ID, (GBoxedCopyFunc) photo_id_dup, photo_id_free, NULL, NULL, NULL); + _tmp4_ = gee_array_list_new (TYPE_PHOTO_ID, (GBoxedCopyFunc) photo_id_dup, (GDestroyNotify) photo_id_free, NULL, NULL, NULL); #line 623 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" photo_ids = _tmp4_; #line 4783 "PhotoTable.c" @@ -5116,7 +5116,7 @@ GeeArrayList* photo_table_get_event_source_ids (PhotoTable* self, EventID* event #line 683 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _vala_assert (_tmp8_ == SQLITE_OK, "res == Sqlite.OK"); #line 685 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp9_ = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL, NULL); + _tmp9_ = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL); #line 685 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _result_ = _tmp9_; #line 5102 "PhotoTable.c" @@ -5752,7 +5752,7 @@ GeeHashMap* photo_table_marshall_all_transformations (const gchar* trans) { #line 5731 "PhotoTable.c" } #line 795 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp13_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, TYPE_KEY_VALUE_MAP, (GBoxedCopyFunc) key_value_map_ref, key_value_map_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); + _tmp13_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, TYPE_KEY_VALUE_MAP, (GBoxedCopyFunc) key_value_map_ref, (GDestroyNotify) key_value_map_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); #line 795 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" map = _tmp13_; #line 797 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -6061,7 +6061,7 @@ gchar* photo_table_unmarshall_all_transformations (GeeHashMap* transformations) #line 817 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp2_ = transformations; #line 817 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp3_ = gee_abstract_map_get_keys (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_MAP, GeeMap)); + _tmp3_ = gee_abstract_map_get_keys (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap)); #line 817 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp4_ = _tmp3_; #line 817 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -6100,7 +6100,7 @@ gchar* photo_table_unmarshall_all_transformations (GeeHashMap* transformations) #line 822 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp9_ = transformations; #line 822 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp10_ = gee_abstract_map_get_keys (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_MAP, GeeMap)); + _tmp10_ = gee_abstract_map_get_keys (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap)); #line 822 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp11_ = _tmp10_; #line 822 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -6281,9 +6281,9 @@ gboolean photo_table_set_transformation (PhotoTable* self, PhotoID* photo_id, Ke gchar* trans = NULL; PhotoID _tmp0_ = {0}; gchar* _tmp1_ = NULL; - PhotoID _tmp37_ = {0}; - const gchar* _tmp38_ = NULL; - gboolean _tmp39_ = FALSE; + PhotoID _tmp38_ = {0}; + const gchar* _tmp39_ = NULL; + gboolean _tmp40_ = FALSE; GError * _inner_error_ = NULL; #line 841 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_val_if_fail (IS_PHOTO_TABLE (self), FALSE); @@ -6501,6 +6501,8 @@ gboolean photo_table_set_transformation (PhotoTable* self, PhotoID* photo_id, Ke __finally18: #line 844 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { +#line 6483 "PhotoTable.c" + gboolean _tmp37_ = FALSE; #line 844 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_free0 (trans); #line 844 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -6508,22 +6510,22 @@ gboolean photo_table_set_transformation (PhotoTable* self, PhotoID* photo_id, Ke #line 844 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_clear_error (&_inner_error_); #line 844 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - return FALSE; -#line 6491 "PhotoTable.c" + return _tmp37_; +#line 6493 "PhotoTable.c" } #line 867 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp37_ = *photo_id; + _tmp38_ = *photo_id; #line 867 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp38_ = trans; + _tmp39_ = trans; #line 867 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp39_ = photo_table_set_raw_transformations (self, &_tmp37_, _tmp38_); + _tmp40_ = photo_table_set_raw_transformations (self, &_tmp38_, _tmp39_); #line 867 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - result = _tmp39_; + result = _tmp40_; #line 867 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_free0 (trans); #line 867 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 6505 "PhotoTable.c" +#line 6507 "PhotoTable.c" } @@ -6533,9 +6535,9 @@ gboolean photo_table_remove_transformation (PhotoTable* self, PhotoID* photo_id, PhotoID _tmp0_ = {0}; gchar* _tmp1_ = NULL; const gchar* _tmp2_ = NULL; - PhotoID _tmp21_ = {0}; - const gchar* _tmp22_ = NULL; - gboolean _tmp23_ = FALSE; + PhotoID _tmp22_ = {0}; + const gchar* _tmp23_ = NULL; + gboolean _tmp24_ = FALSE; GError * _inner_error_ = NULL; #line 870 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_val_if_fail (IS_PHOTO_TABLE (self), FALSE); @@ -6559,7 +6561,7 @@ gboolean photo_table_remove_transformation (PhotoTable* self, PhotoID* photo_id, _g_free0 (trans); #line 873 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 6541 "PhotoTable.c" +#line 6543 "PhotoTable.c" } { GKeyFile* keyfile = NULL; @@ -6603,7 +6605,7 @@ gboolean photo_table_remove_transformation (PhotoTable* self, PhotoID* photo_id, if (G_UNLIKELY (_inner_error_ != NULL)) { #line 877 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_key_file_unref0 (keyfile); -#line 6585 "PhotoTable.c" +#line 6587 "PhotoTable.c" goto __catch19_g_error; } #line 877 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -6616,7 +6618,7 @@ gboolean photo_table_remove_transformation (PhotoTable* self, PhotoID* photo_id, _g_free0 (trans); #line 878 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 6598 "PhotoTable.c" +#line 6600 "PhotoTable.c" } #line 880 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp11_ = keyfile; @@ -6634,7 +6636,7 @@ gboolean photo_table_remove_transformation (PhotoTable* self, PhotoID* photo_id, _g_free0 (trans); #line 881 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 6616 "PhotoTable.c" +#line 6618 "PhotoTable.c" } #line 883 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp14_ = keyfile; @@ -6646,7 +6648,7 @@ gboolean photo_table_remove_transformation (PhotoTable* self, PhotoID* photo_id, if (G_UNLIKELY (_inner_error_ != NULL)) { #line 883 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_key_file_unref0 (keyfile); -#line 6628 "PhotoTable.c" +#line 6630 "PhotoTable.c" goto __catch19_g_error; } #line 886 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -6665,7 +6667,7 @@ gboolean photo_table_remove_transformation (PhotoTable* self, PhotoID* photo_id, _vala_assert (_tmp19_ != NULL, "trans != null"); #line 875 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_key_file_unref0 (keyfile); -#line 6647 "PhotoTable.c" +#line 6649 "PhotoTable.c" } goto __finally19; __catch19_g_error: @@ -6682,11 +6684,13 @@ gboolean photo_table_remove_transformation (PhotoTable* self, PhotoID* photo_id, g_error ("PhotoTable.vala:889: %s", _tmp20_); #line 875 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_error_free0 (err); -#line 6664 "PhotoTable.c" +#line 6666 "PhotoTable.c" } __finally19: #line 875 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { +#line 6671 "PhotoTable.c" + gboolean _tmp21_ = FALSE; #line 875 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_free0 (trans); #line 875 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -6694,22 +6698,22 @@ gboolean photo_table_remove_transformation (PhotoTable* self, PhotoID* photo_id, #line 875 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_clear_error (&_inner_error_); #line 875 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - return FALSE; -#line 6677 "PhotoTable.c" + return _tmp21_; +#line 6681 "PhotoTable.c" } #line 892 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp21_ = *photo_id; + _tmp22_ = *photo_id; #line 892 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp22_ = trans; + _tmp23_ = trans; #line 892 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp23_ = photo_table_set_raw_transformations (self, &_tmp21_, _tmp22_); + _tmp24_ = photo_table_set_raw_transformations (self, &_tmp22_, _tmp23_); #line 892 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - result = _tmp23_; + result = _tmp24_; #line 892 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_free0 (trans); #line 892 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 6691 "PhotoTable.c" +#line 6695 "PhotoTable.c" } @@ -6742,7 +6746,7 @@ gboolean photo_table_remove_all_transformations (PhotoTable* self, PhotoID* phot result = FALSE; #line 897 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 6724 "PhotoTable.c" +#line 6728 "PhotoTable.c" } #line 899 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp4_ = *photo_id; @@ -6754,7 +6758,7 @@ gboolean photo_table_remove_all_transformations (PhotoTable* self, PhotoID* phot result = _tmp6_; #line 899 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 6736 "PhotoTable.c" +#line 6740 "PhotoTable.c" } @@ -6793,27 +6797,27 @@ static sqlite3_stmt* photo_table_get_duplicate_stmt (PhotoTable* self, GFile* fi if (_tmp2_ != NULL) { #line 906 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp1_ = TRUE; -#line 6775 "PhotoTable.c" +#line 6779 "PhotoTable.c" } else { const gchar* _tmp3_ = NULL; #line 906 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp3_ = thumbnail_md5; #line 906 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp1_ = _tmp3_ != NULL; -#line 6782 "PhotoTable.c" +#line 6786 "PhotoTable.c" } #line 906 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (_tmp1_) { #line 906 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp0_ = TRUE; -#line 6788 "PhotoTable.c" +#line 6792 "PhotoTable.c" } else { const gchar* _tmp4_ = NULL; #line 906 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp4_ = md5; #line 906 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp0_ = _tmp4_ != NULL; -#line 6795 "PhotoTable.c" +#line 6799 "PhotoTable.c" } #line 906 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _vala_assert (_tmp0_, "file != null || thumbnail_md5 != null || md5 != null"); @@ -6827,7 +6831,7 @@ static sqlite3_stmt* photo_table_get_duplicate_stmt (PhotoTable* self, GFile* fi _tmp6_ = file; #line 911 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (_tmp6_ != NULL) { -#line 6809 "PhotoTable.c" +#line 6813 "PhotoTable.c" const gchar* _tmp7_ = NULL; gchar* _tmp8_ = NULL; #line 912 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -6840,7 +6844,7 @@ static sqlite3_stmt* photo_table_get_duplicate_stmt (PhotoTable* self, GFile* fi sql = _tmp8_; #line 913 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" first = FALSE; -#line 6822 "PhotoTable.c" +#line 6826 "PhotoTable.c" } #line 916 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp10_ = thumbnail_md5; @@ -6848,18 +6852,18 @@ static sqlite3_stmt* photo_table_get_duplicate_stmt (PhotoTable* self, GFile* fi if (_tmp10_ != NULL) { #line 916 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp9_ = TRUE; -#line 6830 "PhotoTable.c" +#line 6834 "PhotoTable.c" } else { const gchar* _tmp11_ = NULL; #line 916 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp11_ = md5; #line 916 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp9_ = _tmp11_ != NULL; -#line 6837 "PhotoTable.c" +#line 6841 "PhotoTable.c" } #line 916 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (_tmp9_) { -#line 6841 "PhotoTable.c" +#line 6845 "PhotoTable.c" gboolean _tmp12_ = FALSE; const gchar* _tmp17_ = NULL; const gchar* _tmp20_ = NULL; @@ -6872,7 +6876,7 @@ static sqlite3_stmt* photo_table_get_duplicate_stmt (PhotoTable* self, GFile* fi _tmp12_ = first; #line 917 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (_tmp12_) { -#line 6854 "PhotoTable.c" +#line 6858 "PhotoTable.c" const gchar* _tmp13_ = NULL; gchar* _tmp14_ = NULL; #line 918 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -6883,7 +6887,7 @@ static sqlite3_stmt* photo_table_get_duplicate_stmt (PhotoTable* self, GFile* fi _g_free0 (sql); #line 918 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" sql = _tmp14_; -#line 6865 "PhotoTable.c" +#line 6869 "PhotoTable.c" } else { const gchar* _tmp15_ = NULL; gchar* _tmp16_ = NULL; @@ -6895,7 +6899,7 @@ static sqlite3_stmt* photo_table_get_duplicate_stmt (PhotoTable* self, GFile* fi _g_free0 (sql); #line 920 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" sql = _tmp16_; -#line 6877 "PhotoTable.c" +#line 6881 "PhotoTable.c" } #line 921 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" first = FALSE; @@ -6903,7 +6907,7 @@ static sqlite3_stmt* photo_table_get_duplicate_stmt (PhotoTable* self, GFile* fi _tmp17_ = md5; #line 923 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (_tmp17_ != NULL) { -#line 6885 "PhotoTable.c" +#line 6889 "PhotoTable.c" const gchar* _tmp18_ = NULL; gchar* _tmp19_ = NULL; #line 924 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -6914,19 +6918,19 @@ static sqlite3_stmt* photo_table_get_duplicate_stmt (PhotoTable* self, GFile* fi _g_free0 (sql); #line 924 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" sql = _tmp19_; -#line 6896 "PhotoTable.c" +#line 6900 "PhotoTable.c" } #line 927 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp20_ = thumbnail_md5; #line 927 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (_tmp20_ != NULL) { -#line 6902 "PhotoTable.c" +#line 6906 "PhotoTable.c" const gchar* _tmp21_ = NULL; #line 928 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp21_ = md5; #line 928 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (_tmp21_ == NULL) { -#line 6908 "PhotoTable.c" +#line 6912 "PhotoTable.c" const gchar* _tmp22_ = NULL; gchar* _tmp23_ = NULL; #line 929 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -6937,7 +6941,7 @@ static sqlite3_stmt* photo_table_get_duplicate_stmt (PhotoTable* self, GFile* fi _g_free0 (sql); #line 929 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" sql = _tmp23_; -#line 6919 "PhotoTable.c" +#line 6923 "PhotoTable.c" } else { const gchar* _tmp24_ = NULL; gchar* _tmp25_ = NULL; @@ -6949,7 +6953,7 @@ static sqlite3_stmt* photo_table_get_duplicate_stmt (PhotoTable* self, GFile* fi _g_free0 (sql); #line 931 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" sql = _tmp25_; -#line 6931 "PhotoTable.c" +#line 6935 "PhotoTable.c" } } #line 934 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -6964,7 +6968,7 @@ static sqlite3_stmt* photo_table_get_duplicate_stmt (PhotoTable* self, GFile* fi _tmp28_ = file_format; #line 936 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (_tmp28_ != PHOTO_FILE_FORMAT_UNKNOWN) { -#line 6946 "PhotoTable.c" +#line 6950 "PhotoTable.c" const gchar* _tmp29_ = NULL; gchar* _tmp30_ = NULL; #line 937 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -6975,7 +6979,7 @@ static sqlite3_stmt* photo_table_get_duplicate_stmt (PhotoTable* self, GFile* fi _g_free0 (sql); #line 937 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" sql = _tmp30_; -#line 6957 "PhotoTable.c" +#line 6961 "PhotoTable.c" } #line 939 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp31_ = sql; @@ -6985,7 +6989,7 @@ static sqlite3_stmt* photo_table_get_duplicate_stmt (PhotoTable* self, GFile* fi _g_free0 (sql); #line 939 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" sql = _tmp32_; -#line 6967 "PhotoTable.c" +#line 6971 "PhotoTable.c" } #line 943 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp33_ = database_table_db; @@ -7009,7 +7013,7 @@ static sqlite3_stmt* photo_table_get_duplicate_stmt (PhotoTable* self, GFile* fi _tmp38_ = file; #line 948 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (_tmp38_ != NULL) { -#line 6991 "PhotoTable.c" +#line 6995 "PhotoTable.c" sqlite3_stmt* _tmp39_ = NULL; gint _tmp40_ = 0; GFile* _tmp41_ = NULL; @@ -7037,13 +7041,13 @@ static sqlite3_stmt* photo_table_get_duplicate_stmt (PhotoTable* self, GFile* fi _tmp45_ = res; #line 950 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _vala_assert (_tmp45_ == SQLITE_OK, "res == Sqlite.OK"); -#line 7019 "PhotoTable.c" +#line 7023 "PhotoTable.c" } #line 953 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp46_ = thumbnail_md5; #line 953 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (_tmp46_ != NULL) { -#line 7025 "PhotoTable.c" +#line 7029 "PhotoTable.c" sqlite3_stmt* _tmp47_ = NULL; gint _tmp48_ = 0; const gchar* _tmp49_ = NULL; @@ -7071,13 +7075,13 @@ static sqlite3_stmt* photo_table_get_duplicate_stmt (PhotoTable* self, GFile* fi _tmp53_ = res; #line 955 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _vala_assert (_tmp53_ == SQLITE_OK, "res == Sqlite.OK"); -#line 7053 "PhotoTable.c" +#line 7057 "PhotoTable.c" } #line 958 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp54_ = md5; #line 958 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (_tmp54_ != NULL) { -#line 7059 "PhotoTable.c" +#line 7063 "PhotoTable.c" sqlite3_stmt* _tmp55_ = NULL; gint _tmp56_ = 0; const gchar* _tmp57_ = NULL; @@ -7105,7 +7109,7 @@ static sqlite3_stmt* photo_table_get_duplicate_stmt (PhotoTable* self, GFile* fi _tmp61_ = res; #line 960 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _vala_assert (_tmp61_ == SQLITE_OK, "res == Sqlite.OK"); -#line 7087 "PhotoTable.c" +#line 7091 "PhotoTable.c" } #line 963 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp64_ = thumbnail_md5; @@ -7113,32 +7117,32 @@ static sqlite3_stmt* photo_table_get_duplicate_stmt (PhotoTable* self, GFile* fi if (_tmp64_ != NULL) { #line 963 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp63_ = TRUE; -#line 7095 "PhotoTable.c" +#line 7099 "PhotoTable.c" } else { const gchar* _tmp65_ = NULL; #line 963 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp65_ = md5; #line 963 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp63_ = _tmp65_ != NULL; -#line 7102 "PhotoTable.c" +#line 7106 "PhotoTable.c" } #line 963 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (_tmp63_) { -#line 7106 "PhotoTable.c" +#line 7110 "PhotoTable.c" PhotoFileFormat _tmp66_ = 0; #line 963 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp66_ = file_format; #line 963 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp62_ = _tmp66_ != PHOTO_FILE_FORMAT_UNKNOWN; -#line 7112 "PhotoTable.c" +#line 7116 "PhotoTable.c" } else { #line 963 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp62_ = FALSE; -#line 7116 "PhotoTable.c" +#line 7120 "PhotoTable.c" } #line 963 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (_tmp62_) { -#line 7120 "PhotoTable.c" +#line 7124 "PhotoTable.c" sqlite3_stmt* _tmp67_ = NULL; gint _tmp68_ = 0; PhotoFileFormat _tmp69_ = 0; @@ -7163,7 +7167,7 @@ static sqlite3_stmt* photo_table_get_duplicate_stmt (PhotoTable* self, GFile* fi _tmp72_ = res; #line 965 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _vala_assert (_tmp72_ == SQLITE_OK, "res == Sqlite.OK"); -#line 7145 "PhotoTable.c" +#line 7149 "PhotoTable.c" } #line 968 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" result = stmt; @@ -7171,7 +7175,7 @@ static sqlite3_stmt* photo_table_get_duplicate_stmt (PhotoTable* self, GFile* fi _g_free0 (sql); #line 968 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 7153 "PhotoTable.c" +#line 7157 "PhotoTable.c" } @@ -7219,7 +7223,7 @@ gboolean photo_table_has_duplicate (PhotoTable* self, GFile* file, const gchar* _sqlite3_finalize0 (stmt); #line 977 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 7201 "PhotoTable.c" +#line 7205 "PhotoTable.c" } else { gint _tmp8_ = 0; #line 978 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -7232,7 +7236,7 @@ gboolean photo_table_has_duplicate (PhotoTable* self, GFile* file, const gchar* _sqlite3_finalize0 (stmt); #line 980 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 7214 "PhotoTable.c" +#line 7218 "PhotoTable.c" } else { gint _tmp9_ = 0; #line 982 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -7245,12 +7249,12 @@ gboolean photo_table_has_duplicate (PhotoTable* self, GFile* file, const gchar* _sqlite3_finalize0 (stmt); #line 984 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 7227 "PhotoTable.c" +#line 7231 "PhotoTable.c" } } #line 971 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _sqlite3_finalize0 (stmt); -#line 7232 "PhotoTable.c" +#line 7236 "PhotoTable.c" } @@ -7261,11 +7265,11 @@ static void _vala_array_add2 (PhotoID** array, int* length, int* size, const Pho *size = (*size) ? (2 * (*size)) : 4; #line 996 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" *array = g_renew (PhotoID, *array, *size); -#line 7243 "PhotoTable.c" +#line 7247 "PhotoTable.c" } #line 996 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" (*array)[(*length)++] = *value; -#line 7247 "PhotoTable.c" +#line 7251 "PhotoTable.c" } @@ -7318,7 +7322,7 @@ PhotoID* photo_table_get_duplicate_ids (PhotoTable* self, GFile* file, const gch res = _tmp7_; #line 995 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" while (TRUE) { -#line 7300 "PhotoTable.c" +#line 7304 "PhotoTable.c" gint _tmp8_ = 0; PhotoID* _tmp9_ = NULL; gint _tmp9__length1 = 0; @@ -7333,7 +7337,7 @@ PhotoID* photo_table_get_duplicate_ids (PhotoTable* self, GFile* file, const gch if (!(_tmp8_ == SQLITE_ROW)) { #line 995 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" break; -#line 7315 "PhotoTable.c" +#line 7319 "PhotoTable.c" } #line 996 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp9_ = ids; @@ -7353,7 +7357,7 @@ PhotoID* photo_table_get_duplicate_ids (PhotoTable* self, GFile* file, const gch _tmp14_ = sqlite3_step (_tmp13_); #line 997 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" res = _tmp14_; -#line 7335 "PhotoTable.c" +#line 7339 "PhotoTable.c" } #line 1000 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp15_ = ids; @@ -7363,7 +7367,7 @@ PhotoID* photo_table_get_duplicate_ids (PhotoTable* self, GFile* file, const gch if (result_length1) { #line 1000 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" *result_length1 = _tmp15__length1; -#line 7345 "PhotoTable.c" +#line 7349 "PhotoTable.c" } #line 1000 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" result = _tmp15_; @@ -7371,7 +7375,7 @@ PhotoID* photo_table_get_duplicate_ids (PhotoTable* self, GFile* file, const gch _sqlite3_finalize0 (stmt); #line 1000 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 7353 "PhotoTable.c" +#line 7357 "PhotoTable.c" } @@ -7389,17 +7393,17 @@ void photo_table_update_backlinks (PhotoTable* self, PhotoID* photo_id, const gc _tmp1_ = backlinks; #line 1004 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (_tmp1_ != NULL) { -#line 7371 "PhotoTable.c" +#line 7375 "PhotoTable.c" const gchar* _tmp2_ = NULL; #line 1004 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp2_ = backlinks; #line 1004 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp0_ = _tmp2_; -#line 7377 "PhotoTable.c" +#line 7381 "PhotoTable.c" } else { #line 1004 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp0_ = ""; -#line 7381 "PhotoTable.c" +#line 7385 "PhotoTable.c" } #line 1004 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp3_ = *photo_id; @@ -7415,7 +7419,7 @@ void photo_table_update_backlinks (PhotoTable* self, PhotoID* photo_id, const gc g_propagate_error (error, _inner_error_); #line 1004 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; -#line 7397 "PhotoTable.c" +#line 7401 "PhotoTable.c" } else { #line 1004 "/home/jens/Source/shotwell/src/db/PhotoTable.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); @@ -7423,7 +7427,7 @@ void photo_table_update_backlinks (PhotoTable* self, PhotoID* photo_id, const gc g_clear_error (&_inner_error_); #line 1004 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; -#line 7405 "PhotoTable.c" +#line 7409 "PhotoTable.c" } } } @@ -7464,7 +7468,7 @@ void photo_table_attach_editable (PhotoTable* self, PhotoRow* row, BackingPhotoI g_propagate_error (error, _inner_error_); #line 1008 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; -#line 7446 "PhotoTable.c" +#line 7450 "PhotoTable.c" } else { #line 1008 "/home/jens/Source/shotwell/src/db/PhotoTable.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); @@ -7472,7 +7476,7 @@ void photo_table_attach_editable (PhotoTable* self, PhotoRow* row, BackingPhotoI g_clear_error (&_inner_error_); #line 1008 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; -#line 7454 "PhotoTable.c" +#line 7458 "PhotoTable.c" } } #line 1010 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -7481,7 +7485,7 @@ void photo_table_attach_editable (PhotoTable* self, PhotoRow* row, BackingPhotoI _tmp6_ = *editable_id; #line 1010 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp5_->editable_id = _tmp6_; -#line 7463 "PhotoTable.c" +#line 7467 "PhotoTable.c" } @@ -7511,7 +7515,7 @@ void photo_table_detach_editable (PhotoTable* self, PhotoRow* row, GError** erro g_propagate_error (error, _inner_error_); #line 1014 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; -#line 7493 "PhotoTable.c" +#line 7497 "PhotoTable.c" } else { #line 1014 "/home/jens/Source/shotwell/src/db/PhotoTable.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); @@ -7519,14 +7523,14 @@ void photo_table_detach_editable (PhotoTable* self, PhotoRow* row, GError** erro g_clear_error (&_inner_error_); #line 1014 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; -#line 7501 "PhotoTable.c" +#line 7505 "PhotoTable.c" } } #line 1016 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp3_ = row; #line 1016 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" backing_photo_id_init (&_tmp3_->editable_id, BACKING_PHOTO_ID_INVALID); -#line 7508 "PhotoTable.c" +#line 7512 "PhotoTable.c" } @@ -7546,11 +7550,11 @@ void photo_table_set_metadata_dirty (PhotoTable* self, PhotoID* photo_id, gboole if (_tmp1_) { #line 1020 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp0_ = 1; -#line 7528 "PhotoTable.c" +#line 7532 "PhotoTable.c" } else { #line 1020 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp0_ = 0; -#line 7532 "PhotoTable.c" +#line 7536 "PhotoTable.c" } #line 1020 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp2_ = *photo_id; @@ -7566,7 +7570,7 @@ void photo_table_set_metadata_dirty (PhotoTable* self, PhotoID* photo_id, gboole g_propagate_error (error, _inner_error_); #line 1020 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; -#line 7548 "PhotoTable.c" +#line 7552 "PhotoTable.c" } else { #line 1020 "/home/jens/Source/shotwell/src/db/PhotoTable.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); @@ -7574,7 +7578,7 @@ void photo_table_set_metadata_dirty (PhotoTable* self, PhotoID* photo_id, gboole g_clear_error (&_inner_error_); #line 1020 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; -#line 7556 "PhotoTable.c" +#line 7560 "PhotoTable.c" } } } @@ -7610,7 +7614,7 @@ void photo_table_update_raw_development (PhotoTable* self, PhotoRow* row, RawDev switch (_tmp0_) { #line 1027 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" case RAW_DEVELOPER_SHOTWELL: -#line 7592 "PhotoTable.c" +#line 7596 "PhotoTable.c" { gchar* _tmp1_ = NULL; #line 1029 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -7621,11 +7625,11 @@ void photo_table_update_raw_development (PhotoTable* self, PhotoRow* row, RawDev col = _tmp1_; #line 1030 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" break; -#line 7603 "PhotoTable.c" +#line 7607 "PhotoTable.c" } #line 1027 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" case RAW_DEVELOPER_CAMERA: -#line 7607 "PhotoTable.c" +#line 7611 "PhotoTable.c" { gchar* _tmp2_ = NULL; #line 1033 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -7636,11 +7640,11 @@ void photo_table_update_raw_development (PhotoTable* self, PhotoRow* row, RawDev col = _tmp2_; #line 1034 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" break; -#line 7618 "PhotoTable.c" +#line 7622 "PhotoTable.c" } #line 1027 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" case RAW_DEVELOPER_EMBEDDED: -#line 7622 "PhotoTable.c" +#line 7626 "PhotoTable.c" { gchar* _tmp3_ = NULL; #line 1037 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -7651,13 +7655,13 @@ void photo_table_update_raw_development (PhotoTable* self, PhotoRow* row, RawDev col = _tmp3_; #line 1038 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" break; -#line 7633 "PhotoTable.c" +#line 7637 "PhotoTable.c" } default: { #line 1041 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_assert_not_reached (); -#line 7639 "PhotoTable.c" +#line 7643 "PhotoTable.c" } } #line 1044 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -7698,7 +7702,7 @@ void photo_table_update_raw_development (PhotoTable* self, PhotoRow* row, RawDev _g_free0 (col); #line 1045 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; -#line 7680 "PhotoTable.c" +#line 7684 "PhotoTable.c" } else { #line 1045 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_free0 (col); @@ -7708,7 +7712,7 @@ void photo_table_update_raw_development (PhotoTable* self, PhotoRow* row, RawDev g_clear_error (&_inner_error_); #line 1045 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; -#line 7690 "PhotoTable.c" +#line 7694 "PhotoTable.c" } } #line 1047 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -7717,7 +7721,7 @@ void photo_table_update_raw_development (PhotoTable* self, PhotoRow* row, RawDev _tmp16_ = _tmp15_.id; #line 1047 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (_tmp16_ != BACKING_PHOTO_ID_INVALID) { -#line 7699 "PhotoTable.c" +#line 7703 "PhotoTable.c" PhotoRow* _tmp17_ = NULL; PhotoID _tmp18_ = {0}; gint64 _tmp19_ = 0LL; @@ -7750,7 +7754,7 @@ void photo_table_update_raw_development (PhotoTable* self, PhotoRow* row, RawDev _g_free0 (col); #line 1048 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; -#line 7732 "PhotoTable.c" +#line 7736 "PhotoTable.c" } else { #line 1048 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_free0 (col); @@ -7760,13 +7764,13 @@ void photo_table_update_raw_development (PhotoTable* self, PhotoRow* row, RawDev g_clear_error (&_inner_error_); #line 1048 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; -#line 7742 "PhotoTable.c" +#line 7746 "PhotoTable.c" } } } #line 1023 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_free0 (col); -#line 7748 "PhotoTable.c" +#line 7752 "PhotoTable.c" } @@ -7795,7 +7799,7 @@ void photo_table_remove_development (PhotoTable* self, PhotoRow* row, RawDevelop g_propagate_error (error, _inner_error_); #line 1052 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; -#line 7777 "PhotoTable.c" +#line 7781 "PhotoTable.c" } else { #line 1052 "/home/jens/Source/shotwell/src/db/PhotoTable.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); @@ -7803,7 +7807,7 @@ void photo_table_remove_development (PhotoTable* self, PhotoRow* row, RawDevelop g_clear_error (&_inner_error_); #line 1052 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; -#line 7785 "PhotoTable.c" +#line 7789 "PhotoTable.c" } } } @@ -7814,7 +7818,7 @@ static void photo_table_class_init (PhotoTableClass * klass) { photo_table_parent_class = g_type_class_peek_parent (klass); #line 109 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" ((DatabaseTableClass *) klass)->finalize = photo_table_finalize; -#line 7796 "PhotoTable.c" +#line 7800 "PhotoTable.c" } @@ -7828,7 +7832,7 @@ static void photo_table_finalize (DatabaseTable* obj) { self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PHOTO_TABLE, PhotoTable); #line 109 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" DATABASE_TABLE_CLASS (photo_table_parent_class)->finalize (obj); -#line 7810 "PhotoTable.c" +#line 7814 "PhotoTable.c" } @@ -7852,7 +7856,7 @@ void backing_photo_id_init (BackingPhotoID *self, gint64 id) { _tmp0_ = id; #line 1073 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" (*self).id = _tmp0_; -#line 7834 "PhotoTable.c" +#line 7838 "PhotoTable.c" } @@ -7865,7 +7869,7 @@ gboolean backing_photo_id_is_invalid (BackingPhotoID *self) { result = _tmp0_ == BACKING_PHOTO_ID_INVALID; #line 1077 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 7847 "PhotoTable.c" +#line 7851 "PhotoTable.c" } @@ -7878,7 +7882,7 @@ gboolean backing_photo_id_is_valid (BackingPhotoID *self) { result = _tmp0_ != BACKING_PHOTO_ID_INVALID; #line 1081 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 7860 "PhotoTable.c" +#line 7864 "PhotoTable.c" } @@ -7890,14 +7894,14 @@ BackingPhotoID* backing_photo_id_dup (const BackingPhotoID* self) { memcpy (dup, self, sizeof (BackingPhotoID)); #line 1067 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return dup; -#line 7872 "PhotoTable.c" +#line 7876 "PhotoTable.c" } void backing_photo_id_free (BackingPhotoID* self) { #line 1067 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_free (self); -#line 7879 "PhotoTable.c" +#line 7883 "PhotoTable.c" } @@ -7937,7 +7941,7 @@ gboolean backing_photo_row_matches_file_info (BackingPhotoRow* self, GFileInfo* result = FALSE; #line 1097 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 7919 "PhotoTable.c" +#line 7923 "PhotoTable.c" } #line 1099 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp3_ = self->timestamp; @@ -7951,7 +7955,7 @@ gboolean backing_photo_row_matches_file_info (BackingPhotoRow* self, GFileInfo* result = _tmp3_ == ((time_t) _tmp6_); #line 1099 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 7933 "PhotoTable.c" +#line 7937 "PhotoTable.c" } @@ -7980,7 +7984,7 @@ gboolean backing_photo_row_is_touched (BackingPhotoRow* self, GFileInfo* info) { result = FALSE; #line 1104 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 7962 "PhotoTable.c" +#line 7966 "PhotoTable.c" } #line 1106 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp3_ = self->timestamp; @@ -7994,7 +7998,7 @@ gboolean backing_photo_row_is_touched (BackingPhotoRow* self, GFileInfo* info) { result = _tmp3_ != ((time_t) _tmp6_); #line 1106 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 7976 "PhotoTable.c" +#line 7980 "PhotoTable.c" } @@ -8072,7 +8076,7 @@ void backing_photo_row_copy_from (BackingPhotoRow* self, BackingPhotoRow* from) _tmp16_ = _tmp15_->original_orientation; #line 1118 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" self->original_orientation = _tmp16_; -#line 8054 "PhotoTable.c" +#line 8058 "PhotoTable.c" } @@ -8082,21 +8086,21 @@ BackingPhotoRow* backing_photo_row_construct (GType object_type) { self = (BackingPhotoRow*) g_type_create_instance (object_type); #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return self; -#line 8064 "PhotoTable.c" +#line 8068 "PhotoTable.c" } BackingPhotoRow* backing_photo_row_new (void) { #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return backing_photo_row_construct (TYPE_BACKING_PHOTO_ROW); -#line 8071 "PhotoTable.c" +#line 8075 "PhotoTable.c" } static void value_backing_photo_row_init (GValue* value) { #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" value->data[0].v_pointer = NULL; -#line 8078 "PhotoTable.c" +#line 8082 "PhotoTable.c" } @@ -8105,7 +8109,7 @@ static void value_backing_photo_row_free_value (GValue* value) { if (value->data[0].v_pointer) { #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" backing_photo_row_unref (value->data[0].v_pointer); -#line 8087 "PhotoTable.c" +#line 8091 "PhotoTable.c" } } @@ -8115,11 +8119,11 @@ static void value_backing_photo_row_copy_value (const GValue* src_value, GValue* if (src_value->data[0].v_pointer) { #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" dest_value->data[0].v_pointer = backing_photo_row_ref (src_value->data[0].v_pointer); -#line 8097 "PhotoTable.c" +#line 8101 "PhotoTable.c" } else { #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" dest_value->data[0].v_pointer = NULL; -#line 8101 "PhotoTable.c" +#line 8105 "PhotoTable.c" } } @@ -8127,37 +8131,37 @@ static void value_backing_photo_row_copy_value (const GValue* src_value, GValue* static gpointer value_backing_photo_row_peek_pointer (const GValue* value) { #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return value->data[0].v_pointer; -#line 8109 "PhotoTable.c" +#line 8113 "PhotoTable.c" } static gchar* value_backing_photo_row_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (collect_values[0].v_pointer) { -#line 8116 "PhotoTable.c" +#line 8120 "PhotoTable.c" BackingPhotoRow* object; object = collect_values[0].v_pointer; #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (object->parent_instance.g_class == NULL) { #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 8123 "PhotoTable.c" +#line 8127 "PhotoTable.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.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 8127 "PhotoTable.c" +#line 8131 "PhotoTable.c" } #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" value->data[0].v_pointer = backing_photo_row_ref (object); -#line 8131 "PhotoTable.c" +#line 8135 "PhotoTable.c" } else { #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" value->data[0].v_pointer = NULL; -#line 8135 "PhotoTable.c" +#line 8139 "PhotoTable.c" } #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return NULL; -#line 8139 "PhotoTable.c" +#line 8143 "PhotoTable.c" } @@ -8168,25 +8172,25 @@ static gchar* value_backing_photo_row_lcopy_value (const GValue* value, guint n_ if (!object_p) { #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 8150 "PhotoTable.c" +#line 8154 "PhotoTable.c" } #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (!value->data[0].v_pointer) { #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" *object_p = NULL; -#line 8156 "PhotoTable.c" +#line 8160 "PhotoTable.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" *object_p = value->data[0].v_pointer; -#line 8160 "PhotoTable.c" +#line 8164 "PhotoTable.c" } else { #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" *object_p = backing_photo_row_ref (value->data[0].v_pointer); -#line 8164 "PhotoTable.c" +#line 8168 "PhotoTable.c" } #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return NULL; -#line 8168 "PhotoTable.c" +#line 8172 "PhotoTable.c" } @@ -8200,7 +8204,7 @@ GParamSpec* param_spec_backing_photo_row (const gchar* name, const gchar* nick, G_PARAM_SPEC (spec)->value_type = object_type; #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return G_PARAM_SPEC (spec); -#line 8182 "PhotoTable.c" +#line 8186 "PhotoTable.c" } @@ -8209,7 +8213,7 @@ gpointer value_get_backing_photo_row (const GValue* value) { g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_BACKING_PHOTO_ROW), NULL); #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return value->data[0].v_pointer; -#line 8191 "PhotoTable.c" +#line 8195 "PhotoTable.c" } @@ -8229,17 +8233,17 @@ void value_set_backing_photo_row (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" backing_photo_row_ref (value->data[0].v_pointer); -#line 8211 "PhotoTable.c" +#line 8215 "PhotoTable.c" } else { #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" value->data[0].v_pointer = NULL; -#line 8215 "PhotoTable.c" +#line 8219 "PhotoTable.c" } #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (old) { #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" backing_photo_row_unref (old); -#line 8221 "PhotoTable.c" +#line 8225 "PhotoTable.c" } } @@ -8258,17 +8262,17 @@ void value_take_backing_photo_row (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" value->data[0].v_pointer = v_object; -#line 8240 "PhotoTable.c" +#line 8244 "PhotoTable.c" } else { #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" value->data[0].v_pointer = NULL; -#line 8244 "PhotoTable.c" +#line 8248 "PhotoTable.c" } #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (old) { #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" backing_photo_row_unref (old); -#line 8250 "PhotoTable.c" +#line 8254 "PhotoTable.c" } } @@ -8278,7 +8282,7 @@ static void backing_photo_row_class_init (BackingPhotoRowClass * klass) { backing_photo_row_parent_class = g_type_class_peek_parent (klass); #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" ((BackingPhotoRowClass *) klass)->finalize = backing_photo_row_finalize; -#line 8260 "PhotoTable.c" +#line 8264 "PhotoTable.c" } @@ -8287,7 +8291,7 @@ static void backing_photo_row_instance_init (BackingPhotoRow * self) { self->filepath = NULL; #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" self->ref_count = 1; -#line 8269 "PhotoTable.c" +#line 8273 "PhotoTable.c" } @@ -8299,7 +8303,7 @@ static void backing_photo_row_finalize (BackingPhotoRow* obj) { g_signal_handlers_destroy (self); #line 1088 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_free0 (self->filepath); -#line 8281 "PhotoTable.c" +#line 8285 "PhotoTable.c" } @@ -8324,7 +8328,7 @@ gpointer backing_photo_row_ref (gpointer instance) { g_atomic_int_inc (&self->ref_count); #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return instance; -#line 8306 "PhotoTable.c" +#line 8310 "PhotoTable.c" } @@ -8337,7 +8341,7 @@ void backing_photo_row_unref (gpointer instance) { BACKING_PHOTO_ROW_GET_CLASS (self)->finalize (self); #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_type_free_instance ((GTypeInstance *) self); -#line 8319 "PhotoTable.c" +#line 8323 "PhotoTable.c" } } @@ -8381,26 +8385,26 @@ static BackingPhotoTable* backing_photo_table_construct (GType object_type) { _tmp6_ = res; #line 1145 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (_tmp6_ != SQLITE_DONE) { -#line 8363 "PhotoTable.c" +#line 8367 "PhotoTable.c" gint _tmp7_ = 0; #line 1146 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp7_ = res; #line 1146 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" database_table_fatal ("create PhotoBackingTable", _tmp7_); -#line 8369 "PhotoTable.c" +#line 8373 "PhotoTable.c" } #line 1125 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _sqlite3_finalize0 (stmt); #line 1125 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return self; -#line 8375 "PhotoTable.c" +#line 8379 "PhotoTable.c" } static BackingPhotoTable* backing_photo_table_new (void) { #line 1125 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return backing_photo_table_construct (TYPE_BACKING_PHOTO_TABLE); -#line 8382 "PhotoTable.c" +#line 8386 "PhotoTable.c" } @@ -8413,7 +8417,7 @@ BackingPhotoTable* backing_photo_table_get_instance (void) { _tmp0_ = backing_photo_table_instance; #line 1150 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (_tmp0_ == NULL) { -#line 8395 "PhotoTable.c" +#line 8399 "PhotoTable.c" BackingPhotoTable* _tmp1_ = NULL; #line 1151 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp1_ = backing_photo_table_new (); @@ -8421,7 +8425,7 @@ BackingPhotoTable* backing_photo_table_get_instance (void) { _database_table_unref0 (backing_photo_table_instance); #line 1151 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" backing_photo_table_instance = _tmp1_; -#line 8403 "PhotoTable.c" +#line 8407 "PhotoTable.c" } #line 1153 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp2_ = backing_photo_table_instance; @@ -8431,7 +8435,7 @@ BackingPhotoTable* backing_photo_table_get_instance (void) { result = _tmp3_; #line 1153 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 8413 "PhotoTable.c" +#line 8417 "PhotoTable.c" } @@ -8649,7 +8653,7 @@ void backing_photo_table_add (BackingPhotoTable* self, BackingPhotoRow* state, G _tmp51_ = res; #line 1185 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (_tmp51_ != SQLITE_DONE) { -#line 8631 "PhotoTable.c" +#line 8635 "PhotoTable.c" gint _tmp52_ = 0; #line 1186 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp52_ = res; @@ -8665,7 +8669,7 @@ void backing_photo_table_add (BackingPhotoTable* self, BackingPhotoRow* state, G _sqlite3_finalize0 (stmt); #line 1186 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; -#line 8647 "PhotoTable.c" +#line 8651 "PhotoTable.c" } else { #line 1186 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _sqlite3_finalize0 (stmt); @@ -8675,7 +8679,7 @@ void backing_photo_table_add (BackingPhotoTable* self, BackingPhotoRow* state, G g_clear_error (&_inner_error_); #line 1186 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; -#line 8657 "PhotoTable.c" +#line 8661 "PhotoTable.c" } } } @@ -8695,7 +8699,7 @@ void backing_photo_table_add (BackingPhotoTable* self, BackingPhotoRow* state, G _tmp56_->time_created = _tmp57_; #line 1156 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _sqlite3_finalize0 (stmt); -#line 8677 "PhotoTable.c" +#line 8681 "PhotoTable.c" } @@ -8794,14 +8798,14 @@ BackingPhotoRow* backing_photo_table_fetch (BackingPhotoTable* self, BackingPhot _sqlite3_finalize0 (stmt); #line 1204 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 8775 "PhotoTable.c" +#line 8779 "PhotoTable.c" } else { gint _tmp12_ = 0; #line 1205 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp12_ = res; #line 1205 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (_tmp12_ != SQLITE_ROW) { -#line 8782 "PhotoTable.c" +#line 8786 "PhotoTable.c" gint _tmp13_ = 0; #line 1206 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp13_ = res; @@ -8817,7 +8821,7 @@ BackingPhotoRow* backing_photo_table_fetch (BackingPhotoTable* self, BackingPhot _sqlite3_finalize0 (stmt); #line 1206 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return NULL; -#line 8798 "PhotoTable.c" +#line 8802 "PhotoTable.c" } else { #line 1206 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _sqlite3_finalize0 (stmt); @@ -8827,7 +8831,7 @@ BackingPhotoRow* backing_photo_table_fetch (BackingPhotoTable* self, BackingPhot g_clear_error (&_inner_error_); #line 1206 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return NULL; -#line 8808 "PhotoTable.c" +#line 8812 "PhotoTable.c" } } } @@ -8914,7 +8918,7 @@ BackingPhotoRow* backing_photo_table_fetch (BackingPhotoTable* self, BackingPhot _sqlite3_finalize0 (stmt); #line 1218 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 8895 "PhotoTable.c" +#line 8899 "PhotoTable.c" } @@ -9102,7 +9106,7 @@ void backing_photo_table_update (BackingPhotoTable* self, BackingPhotoRow* row, _tmp45_ = res; #line 1246 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (_tmp45_ != SQLITE_DONE) { -#line 9083 "PhotoTable.c" +#line 9087 "PhotoTable.c" gint _tmp46_ = 0; #line 1247 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp46_ = res; @@ -9118,7 +9122,7 @@ void backing_photo_table_update (BackingPhotoTable* self, BackingPhotoRow* row, _sqlite3_finalize0 (stmt); #line 1247 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; -#line 9099 "PhotoTable.c" +#line 9103 "PhotoTable.c" } else { #line 1247 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _sqlite3_finalize0 (stmt); @@ -9128,13 +9132,13 @@ void backing_photo_table_update (BackingPhotoTable* self, BackingPhotoRow* row, g_clear_error (&_inner_error_); #line 1247 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; -#line 9109 "PhotoTable.c" +#line 9113 "PhotoTable.c" } } } #line 1222 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _sqlite3_finalize0 (stmt); -#line 9115 "PhotoTable.c" +#line 9119 "PhotoTable.c" } @@ -9228,7 +9232,7 @@ void backing_photo_table_update_attributes (BackingPhotoTable* self, BackingPhot _tmp19_ = res; #line 1264 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (_tmp19_ != SQLITE_DONE) { -#line 9209 "PhotoTable.c" +#line 9213 "PhotoTable.c" gint _tmp20_ = 0; #line 1265 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp20_ = res; @@ -9244,7 +9248,7 @@ void backing_photo_table_update_attributes (BackingPhotoTable* self, BackingPhot _sqlite3_finalize0 (stmt); #line 1265 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; -#line 9225 "PhotoTable.c" +#line 9229 "PhotoTable.c" } else { #line 1265 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _sqlite3_finalize0 (stmt); @@ -9254,13 +9258,13 @@ void backing_photo_table_update_attributes (BackingPhotoTable* self, BackingPhot g_clear_error (&_inner_error_); #line 1265 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; -#line 9235 "PhotoTable.c" +#line 9239 "PhotoTable.c" } } } #line 1250 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _sqlite3_finalize0 (stmt); -#line 9241 "PhotoTable.c" +#line 9245 "PhotoTable.c" } @@ -9286,7 +9290,7 @@ void backing_photo_table_remove (BackingPhotoTable* self, BackingPhotoID* backin g_propagate_error (error, _inner_error_); #line 1269 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; -#line 9267 "PhotoTable.c" +#line 9271 "PhotoTable.c" } else { #line 1269 "/home/jens/Source/shotwell/src/db/PhotoTable.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); @@ -9294,7 +9298,7 @@ void backing_photo_table_remove (BackingPhotoTable* self, BackingPhotoID* backin g_clear_error (&_inner_error_); #line 1269 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; -#line 9275 "PhotoTable.c" +#line 9279 "PhotoTable.c" } } } @@ -9327,7 +9331,7 @@ void backing_photo_table_set_filepath (BackingPhotoTable* self, BackingPhotoID* g_propagate_error (error, _inner_error_); #line 1273 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; -#line 9308 "PhotoTable.c" +#line 9312 "PhotoTable.c" } else { #line 1273 "/home/jens/Source/shotwell/src/db/PhotoTable.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); @@ -9335,7 +9339,7 @@ void backing_photo_table_set_filepath (BackingPhotoTable* self, BackingPhotoID* g_clear_error (&_inner_error_); #line 1273 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; -#line 9316 "PhotoTable.c" +#line 9320 "PhotoTable.c" } } } @@ -9366,7 +9370,7 @@ void backing_photo_table_update_timestamp (BackingPhotoTable* self, BackingPhoto g_propagate_error (error, _inner_error_); #line 1277 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; -#line 9347 "PhotoTable.c" +#line 9351 "PhotoTable.c" } else { #line 1277 "/home/jens/Source/shotwell/src/db/PhotoTable.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); @@ -9374,7 +9378,7 @@ void backing_photo_table_update_timestamp (BackingPhotoTable* self, BackingPhoto g_clear_error (&_inner_error_); #line 1277 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; -#line 9355 "PhotoTable.c" +#line 9359 "PhotoTable.c" } } } @@ -9385,7 +9389,7 @@ static void backing_photo_table_class_init (BackingPhotoTableClass * klass) { backing_photo_table_parent_class = g_type_class_peek_parent (klass); #line 1122 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" ((DatabaseTableClass *) klass)->finalize = backing_photo_table_finalize; -#line 9366 "PhotoTable.c" +#line 9370 "PhotoTable.c" } @@ -9399,7 +9403,7 @@ static void backing_photo_table_finalize (DatabaseTable* obj) { self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_BACKING_PHOTO_TABLE, BackingPhotoTable); #line 1122 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" DATABASE_TABLE_CLASS (backing_photo_table_parent_class)->finalize (obj); -#line 9380 "PhotoTable.c" +#line 9384 "PhotoTable.c" } diff --git a/src/db/SavedSearchDBTable.c b/src/db/SavedSearchDBTable.c index f0c850f..14f8c4c 100644 --- a/src/db/SavedSearchDBTable.c +++ b/src/db/SavedSearchDBTable.c @@ -1,4 +1,4 @@ -/* SavedSearchDBTable.c generated by valac 0.34.4, the Vala compiler +/* SavedSearchDBTable.c generated by valac 0.34.7, the Vala compiler * generated from SavedSearchDBTable.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -1517,7 +1517,7 @@ SavedSearchRow* saved_search_db_table_add (SavedSearchDBTable* self, const gchar #line 229 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _tmp34_ = _sc_list; #line 229 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp35_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp35_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 229 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _tmp36_ = _tmp35_; #line 229 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" @@ -3127,7 +3127,7 @@ static GeeList* saved_search_db_table_get_conditions_for_id (SavedSearchDBTable* #line 405 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" g_return_val_if_fail (search_id != NULL, NULL); #line 407 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp0_ = gee_array_list_new (TYPE_SEARCH_CONDITION, (GBoxedCopyFunc) search_condition_ref, search_condition_unref, NULL, NULL, NULL); + _tmp0_ = gee_array_list_new (TYPE_SEARCH_CONDITION, (GBoxedCopyFunc) search_condition_ref, (GDestroyNotify) search_condition_unref, NULL, NULL, NULL); #line 407 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" list = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_LIST, GeeList); #line 412 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" @@ -4513,7 +4513,7 @@ GeeList* saved_search_db_table_get_all_rows (SavedSearchDBTable* self, GError** #line 614 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _vala_assert (_tmp3_ == SQLITE_OK, "res == Sqlite.OK"); #line 616 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp4_ = gee_array_list_new (TYPE_SAVED_SEARCH_ROW, (GBoxedCopyFunc) saved_search_row_ref, saved_search_row_unref, NULL, NULL, NULL); + _tmp4_ = gee_array_list_new (TYPE_SAVED_SEARCH_ROW, (GBoxedCopyFunc) saved_search_row_ref, (GDestroyNotify) saved_search_row_unref, NULL, NULL, NULL); #line 616 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" rows = G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_LIST, GeeList); #line 4515 "SavedSearchDBTable.c" diff --git a/src/db/TagTable.c b/src/db/TagTable.c index 1e38ccd..e0aa0b1 100644 --- a/src/db/TagTable.c +++ b/src/db/TagTable.c @@ -1,4 +1,4 @@ -/* TagTable.c generated by valac 0.34.4, the Vala compiler +/* TagTable.c generated by valac 0.34.7, the Vala compiler * generated from TagTable.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -1577,7 +1577,7 @@ GeeList* tag_table_get_all_rows (TagTable* self, GError** error) { #line 163 "/home/jens/Source/shotwell/src/db/TagTable.vala" _vala_assert (_tmp3_ == SQLITE_OK, "res == Sqlite.OK"); #line 165 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp4_ = gee_array_list_new (TYPE_TAG_ROW, (GBoxedCopyFunc) tag_row_ref, tag_row_unref, NULL, NULL, NULL); + _tmp4_ = gee_array_list_new (TYPE_TAG_ROW, (GBoxedCopyFunc) tag_row_ref, (GDestroyNotify) tag_row_unref, NULL, NULL, NULL); #line 165 "/home/jens/Source/shotwell/src/db/TagTable.vala" rows = G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_LIST, GeeList); #line 1582 "TagTable.c" @@ -2043,7 +2043,7 @@ static GeeSet* tag_table_unserialize_source_ids (TagTable* self, const gchar* te #line 220 "/home/jens/Source/shotwell/src/db/TagTable.vala" g_return_val_if_fail (IS_TAG_TABLE (self), NULL); #line 221 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp0_ = gee_hash_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL, NULL, NULL, NULL, NULL); + _tmp0_ = gee_hash_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL, NULL, NULL, NULL); #line 221 "/home/jens/Source/shotwell/src/db/TagTable.vala" _result_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_SET, GeeSet); #line 223 "/home/jens/Source/shotwell/src/db/TagTable.vala" diff --git a/src/db/TombstoneTable.c b/src/db/TombstoneTable.c index 7829600..5897398 100644 --- a/src/db/TombstoneTable.c +++ b/src/db/TombstoneTable.c @@ -1,4 +1,4 @@ -/* TombstoneTable.c generated by valac 0.34.4, the Vala compiler +/* TombstoneTable.c generated by valac 0.34.7, the Vala compiler * generated from TombstoneTable.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/db/VersionTable.c b/src/db/VersionTable.c index 895d2ad..e678847 100644 --- a/src/db/VersionTable.c +++ b/src/db/VersionTable.c @@ -1,4 +1,4 @@ -/* VersionTable.c generated by valac 0.34.4, the Vala compiler +/* VersionTable.c generated by valac 0.34.7, the Vala compiler * generated from VersionTable.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/db/VideoTable.c b/src/db/VideoTable.c index 39adf72..da6cbc7 100644 --- a/src/db/VideoTable.c +++ b/src/db/VideoTable.c @@ -1,4 +1,4 @@ -/* VideoTable.c generated by valac 0.34.4, the Vala compiler +/* VideoTable.c generated by valac 0.34.7, the Vala compiler * generated from VideoTable.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -1660,7 +1660,7 @@ GeeArrayList* video_table_get_all (VideoTable* self) { #line 234 "/home/jens/Source/shotwell/src/db/VideoTable.vala" _vala_assert (_tmp3_ == SQLITE_OK, "res == Sqlite.OK"); #line 236 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp4_ = gee_array_list_new (TYPE_VIDEO_ROW, (GBoxedCopyFunc) video_row_ref, video_row_unref, NULL, NULL, NULL); + _tmp4_ = gee_array_list_new (TYPE_VIDEO_ROW, (GBoxedCopyFunc) video_row_ref, (GDestroyNotify) video_row_unref, NULL, NULL, NULL); #line 236 "/home/jens/Source/shotwell/src/db/VideoTable.vala" all = _tmp4_; #line 238 "/home/jens/Source/shotwell/src/db/VideoTable.vala" @@ -2680,7 +2680,7 @@ GeeArrayList* video_table_get_videos (VideoTable* self, GError** error) { #line 348 "/home/jens/Source/shotwell/src/db/VideoTable.vala" _vala_assert (_tmp3_ == SQLITE_OK, "res == Sqlite.OK"); #line 350 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp4_ = gee_array_list_new (TYPE_VIDEO_ID, (GBoxedCopyFunc) video_id_dup, video_id_free, NULL, NULL, NULL); + _tmp4_ = gee_array_list_new (TYPE_VIDEO_ID, (GBoxedCopyFunc) video_id_dup, (GDestroyNotify) video_id_free, NULL, NULL, NULL); #line 350 "/home/jens/Source/shotwell/src/db/VideoTable.vala" video_ids = _tmp4_; #line 2681 "VideoTable.c" @@ -3211,7 +3211,7 @@ GeeArrayList* video_table_get_event_source_ids (VideoTable* self, EventID* event #line 439 "/home/jens/Source/shotwell/src/db/VideoTable.vala" _vala_assert (_tmp8_ == SQLITE_OK, "res == Sqlite.OK"); #line 441 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp9_ = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL, NULL); + _tmp9_ = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL); #line 441 "/home/jens/Source/shotwell/src/db/VideoTable.vala" _result_ = _tmp9_; #line 3212 "VideoTable.c" -- cgit v1.2.3