From a7ff7c49085c320c1e0a2ffb66cc6d283c5acb8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sat, 21 Jan 2017 19:17:10 +0100 Subject: New upstream version 0.25.3 --- src/db/DatabaseTable.c | 58 +- src/db/Db.c | 2 +- src/db/EventTable.c | 2 +- src/db/PhotoTable.c | 1648 +++++++++++++++++++++---------------------- src/db/PhotoTable.vala | 13 +- src/db/SavedSearchDBTable.c | 2 +- src/db/TagTable.c | 112 +-- src/db/TombstoneTable.c | 2 +- src/db/VersionTable.c | 2 +- src/db/VideoTable.c | 2 +- 10 files changed, 922 insertions(+), 921 deletions(-) (limited to 'src/db') diff --git a/src/db/DatabaseTable.c b/src/db/DatabaseTable.c index d1df4f4..790a6df 100644 --- a/src/db/DatabaseTable.c +++ b/src/db/DatabaseTable.c @@ -1,4 +1,4 @@ -/* DatabaseTable.c generated by valac 0.32.1, the Vala compiler +/* DatabaseTable.c generated by valac 0.34.4, the Vala compiler * generated from DatabaseTable.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -208,7 +208,7 @@ static void database_table_prepare_db (const gchar* filename) { #line 44 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _g_object_unref0 (file_db); #line 211 "DatabaseTable.c" - goto __catch13_g_error; + goto __catch15_g_error; } #line 45 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _tmp14_ = info; @@ -241,8 +241,8 @@ static void database_table_prepare_db (const gchar* filename) { _g_object_unref0 (file_db); #line 243 "DatabaseTable.c" } - goto __finally13; - __catch13_g_error: + goto __finally15; + __catch15_g_error: { GError* e = NULL; const gchar* _tmp20_ = NULL; @@ -275,7 +275,7 @@ static void database_table_prepare_db (const gchar* filename) { _g_error_free0 (e); #line 277 "DatabaseTable.c" } - __finally13: + __finally15: #line 42 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 42 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" @@ -343,54 +343,54 @@ static gint _sqlite3_exec (sqlite3* self, const gchar* sql, sqlite3_callback cal const gchar* _tmp2_ = NULL; gint _tmp3_ = 0; const gchar* _tmp6_ = NULL; -#line 34 "/usr/share/vala-0.32/vapi/sqlite3.vapi" +#line 34 "/usr/share/vala-0.34/vapi/sqlite3.vapi" g_return_val_if_fail (self != NULL, 0); -#line 34 "/usr/share/vala-0.32/vapi/sqlite3.vapi" +#line 34 "/usr/share/vala-0.34/vapi/sqlite3.vapi" g_return_val_if_fail (sql != NULL, 0); -#line 36 "/usr/share/vala-0.32/vapi/sqlite3.vapi" +#line 36 "/usr/share/vala-0.34/vapi/sqlite3.vapi" _tmp0_ = sql; -#line 36 "/usr/share/vala-0.32/vapi/sqlite3.vapi" +#line 36 "/usr/share/vala-0.34/vapi/sqlite3.vapi" _tmp1_ = callback; -#line 36 "/usr/share/vala-0.32/vapi/sqlite3.vapi" +#line 36 "/usr/share/vala-0.34/vapi/sqlite3.vapi" _tmp1__target = callback_target; -#line 36 "/usr/share/vala-0.32/vapi/sqlite3.vapi" +#line 36 "/usr/share/vala-0.34/vapi/sqlite3.vapi" _tmp3_ = sqlite3_exec (self, _tmp0_, _tmp1_, _tmp1__target, (char**) (&_tmp2_)); -#line 36 "/usr/share/vala-0.32/vapi/sqlite3.vapi" +#line 36 "/usr/share/vala-0.34/vapi/sqlite3.vapi" sqlite_errmsg = _tmp2_; -#line 36 "/usr/share/vala-0.32/vapi/sqlite3.vapi" +#line 36 "/usr/share/vala-0.34/vapi/sqlite3.vapi" ec = _tmp3_; -#line 37 "/usr/share/vala-0.32/vapi/sqlite3.vapi" +#line 37 "/usr/share/vala-0.34/vapi/sqlite3.vapi" if ((&_vala_errmsg) != NULL) { #line 365 "DatabaseTable.c" const gchar* _tmp4_ = NULL; gchar* _tmp5_ = NULL; -#line 38 "/usr/share/vala-0.32/vapi/sqlite3.vapi" +#line 38 "/usr/share/vala-0.34/vapi/sqlite3.vapi" _tmp4_ = sqlite_errmsg; -#line 38 "/usr/share/vala-0.32/vapi/sqlite3.vapi" +#line 38 "/usr/share/vala-0.34/vapi/sqlite3.vapi" _tmp5_ = g_strdup (_tmp4_); -#line 38 "/usr/share/vala-0.32/vapi/sqlite3.vapi" +#line 38 "/usr/share/vala-0.34/vapi/sqlite3.vapi" _g_free0 (_vala_errmsg); -#line 38 "/usr/share/vala-0.32/vapi/sqlite3.vapi" +#line 38 "/usr/share/vala-0.34/vapi/sqlite3.vapi" _vala_errmsg = _tmp5_; #line 376 "DatabaseTable.c" } -#line 40 "/usr/share/vala-0.32/vapi/sqlite3.vapi" +#line 40 "/usr/share/vala-0.34/vapi/sqlite3.vapi" _tmp6_ = sqlite_errmsg; -#line 40 "/usr/share/vala-0.32/vapi/sqlite3.vapi" +#line 40 "/usr/share/vala-0.34/vapi/sqlite3.vapi" sqlite3_free ((void*) _tmp6_); -#line 41 "/usr/share/vala-0.32/vapi/sqlite3.vapi" +#line 41 "/usr/share/vala-0.34/vapi/sqlite3.vapi" result = ec; -#line 41 "/usr/share/vala-0.32/vapi/sqlite3.vapi" +#line 41 "/usr/share/vala-0.34/vapi/sqlite3.vapi" if (errmsg) { -#line 41 "/usr/share/vala-0.32/vapi/sqlite3.vapi" +#line 41 "/usr/share/vala-0.34/vapi/sqlite3.vapi" *errmsg = _vala_errmsg; #line 388 "DatabaseTable.c" } else { -#line 41 "/usr/share/vala-0.32/vapi/sqlite3.vapi" +#line 41 "/usr/share/vala-0.34/vapi/sqlite3.vapi" _g_free0 (_vala_errmsg); #line 392 "DatabaseTable.c" } -#line 41 "/usr/share/vala-0.32/vapi/sqlite3.vapi" +#line 41 "/usr/share/vala-0.34/vapi/sqlite3.vapi" return result; #line 396 "DatabaseTable.c" } @@ -478,7 +478,7 @@ void database_table_init (const gchar* filename) { #line 87 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _g_object_unref0 (src); #line 481 "DatabaseTable.c" - goto __catch14_g_error; + goto __catch16_g_error; } #line 90 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _tmp13_ = filename; @@ -490,8 +490,8 @@ void database_table_init (const gchar* filename) { _g_object_unref0 (src); #line 492 "DatabaseTable.c" } - goto __finally14; - __catch14_g_error: + goto __finally16; + __catch16_g_error: { GError* _error_ = NULL; const gchar* _tmp14_ = NULL; @@ -521,7 +521,7 @@ void database_table_init (const gchar* filename) { _g_error_free0 (_error_); #line 523 "DatabaseTable.c" } - __finally14: + __finally16: #line 84 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 84 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" diff --git a/src/db/Db.c b/src/db/Db.c index 9c7e328..4133a36 100644 --- a/src/db/Db.c +++ b/src/db/Db.c @@ -1,4 +1,4 @@ -/* Db.c generated by valac 0.32.1, the Vala compiler +/* Db.c generated by valac 0.34.4, 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 0e763e9..60feebf 100644 --- a/src/db/EventTable.c +++ b/src/db/EventTable.c @@ -1,4 +1,4 @@ -/* EventTable.c generated by valac 0.32.1, the Vala compiler +/* EventTable.c generated by valac 0.34.4, the Vala compiler * generated from EventTable.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/db/PhotoTable.c b/src/db/PhotoTable.c index a2923f7..4cd6830 100644 --- a/src/db/PhotoTable.c +++ b/src/db/PhotoTable.c @@ -1,4 +1,4 @@ -/* PhotoTable.c generated by valac 0.32.1, the Vala compiler +/* PhotoTable.c generated by valac 0.34.4, the Vala compiler * generated from PhotoTable.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -5739,7 +5739,7 @@ GeeHashMap* photo_table_marshall_all_transformations (const gchar* trans) { #line 792 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_key_file_unref0 (keyfile); #line 5720 "PhotoTable.c" - goto __catch15_g_error; + goto __catch17_g_error; } #line 792 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (!_tmp6_) { @@ -5829,7 +5829,7 @@ GeeHashMap* photo_table_marshall_all_transformations (const gchar* trans) { #line 799 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_key_file_unref0 (keyfile); #line 5810 "PhotoTable.c" - goto __catch15_g_error; + goto __catch17_g_error; } #line 800 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp24_ = keys; @@ -5951,7 +5951,7 @@ GeeHashMap* photo_table_marshall_all_transformations (const gchar* trans) { #line 805 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_key_file_unref0 (keyfile); #line 5932 "PhotoTable.c" - goto __catch15_g_error; + goto __catch17_g_error; } #line 805 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp39_ = key_map; @@ -5999,8 +5999,8 @@ GeeHashMap* photo_table_marshall_all_transformations (const gchar* trans) { return result; #line 5979 "PhotoTable.c" } - goto __finally15; - __catch15_g_error: + goto __finally17; + __catch17_g_error: { GError* err = NULL; const gchar* _tmp46_ = NULL; @@ -6016,7 +6016,7 @@ GeeHashMap* photo_table_marshall_all_transformations (const gchar* trans) { _g_error_free0 (err); #line 5996 "PhotoTable.c" } - __finally15: + __finally17: #line 790 "/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); #line 790 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -6348,7 +6348,7 @@ gboolean photo_table_set_transformation (PhotoTable* self, PhotoID* photo_id, Ke #line 847 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_key_file_unref0 (keyfile); #line 6329 "PhotoTable.c" - goto __catch16_g_error; + goto __catch18_g_error; } #line 847 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (!_tmp4_) { @@ -6481,8 +6481,8 @@ gboolean photo_table_set_transformation (PhotoTable* self, PhotoID* photo_id, Ke _g_key_file_unref0 (keyfile); #line 6461 "PhotoTable.c" } - goto __finally16; - __catch16_g_error: + goto __finally18; + __catch18_g_error: { GError* err = NULL; const gchar* _tmp36_ = NULL; @@ -6498,7 +6498,7 @@ gboolean photo_table_set_transformation (PhotoTable* self, PhotoID* photo_id, Ke _g_error_free0 (err); #line 6478 "PhotoTable.c" } - __finally16: + __finally18: #line 844 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 844 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -6604,7 +6604,7 @@ gboolean photo_table_remove_transformation (PhotoTable* self, PhotoID* photo_id, #line 877 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_key_file_unref0 (keyfile); #line 6585 "PhotoTable.c" - goto __catch17_g_error; + goto __catch19_g_error; } #line 877 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (!_tmp4_) { @@ -6647,7 +6647,7 @@ gboolean photo_table_remove_transformation (PhotoTable* self, PhotoID* photo_id, #line 883 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_key_file_unref0 (keyfile); #line 6628 "PhotoTable.c" - goto __catch17_g_error; + goto __catch19_g_error; } #line 886 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp16_ = keyfile; @@ -6667,8 +6667,8 @@ gboolean photo_table_remove_transformation (PhotoTable* self, PhotoID* photo_id, _g_key_file_unref0 (keyfile); #line 6647 "PhotoTable.c" } - goto __finally17; - __catch17_g_error: + goto __finally19; + __catch19_g_error: { GError* err = NULL; const gchar* _tmp20_ = NULL; @@ -6684,7 +6684,7 @@ gboolean photo_table_remove_transformation (PhotoTable* self, PhotoID* photo_id, _g_error_free0 (err); #line 6664 "PhotoTable.c" } - __finally17: + __finally19: #line 875 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 875 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -6900,7 +6900,7 @@ static sqlite3_stmt* photo_table_get_duplicate_stmt (PhotoTable* self, GFile* fi #line 921 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" first = FALSE; #line 923 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp17_ = thumbnail_md5; + _tmp17_ = md5; #line 923 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (_tmp17_ != NULL) { #line 6885 "PhotoTable.c" @@ -6909,105 +6909,105 @@ static sqlite3_stmt* photo_table_get_duplicate_stmt (PhotoTable* self, GFile* fi #line 924 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp18_ = sql; #line 924 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp19_ = g_strconcat (_tmp18_, " thumbnail_md5=?", NULL); + _tmp19_ = g_strconcat (_tmp18_, " md5=?", NULL); #line 924 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_free0 (sql); #line 924 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" sql = _tmp19_; #line 6896 "PhotoTable.c" } -#line 926 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp20_ = md5; -#line 926 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#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" const gchar* _tmp21_ = NULL; -#line 927 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp21_ = thumbnail_md5; -#line 927 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#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" const gchar* _tmp22_ = NULL; gchar* _tmp23_ = NULL; -#line 928 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 929 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp22_ = sql; -#line 928 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp23_ = g_strconcat (_tmp22_, " md5=?", NULL); -#line 928 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 929 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" + _tmp23_ = g_strconcat (_tmp22_, " thumbnail_md5=?", NULL); +#line 929 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_free0 (sql); -#line 928 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 929 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" sql = _tmp23_; #line 6919 "PhotoTable.c" } else { const gchar* _tmp24_ = NULL; gchar* _tmp25_ = NULL; -#line 930 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 931 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp24_ = sql; -#line 930 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp25_ = g_strconcat (_tmp24_, " OR md5=?", NULL); -#line 930 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 931 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" + _tmp25_ = g_strconcat (_tmp24_, " OR (md5 IS NULL AND thumbnail_md5=?)", NULL); +#line 931 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_free0 (sql); -#line 930 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 931 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" sql = _tmp25_; #line 6931 "PhotoTable.c" } } -#line 933 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 934 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp26_ = sql; -#line 933 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 934 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp27_ = g_strconcat (_tmp26_, ")", NULL); -#line 933 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 934 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_free0 (sql); -#line 933 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 934 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" sql = _tmp27_; -#line 935 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 936 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp28_ = file_format; -#line 935 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 936 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (_tmp28_ != PHOTO_FILE_FORMAT_UNKNOWN) { #line 6946 "PhotoTable.c" const gchar* _tmp29_ = NULL; gchar* _tmp30_ = NULL; -#line 936 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 937 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp29_ = sql; -#line 936 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 937 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp30_ = g_strconcat (_tmp29_, " AND file_format=?", NULL); -#line 936 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 937 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_free0 (sql); -#line 936 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 937 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" sql = _tmp30_; #line 6957 "PhotoTable.c" } -#line 938 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 939 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp31_ = sql; -#line 938 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 939 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp32_ = g_strconcat (_tmp31_, ")", NULL); -#line 938 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 939 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_free0 (sql); -#line 938 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 939 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" sql = _tmp32_; #line 6967 "PhotoTable.c" } -#line 942 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 943 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp33_ = database_table_db; -#line 942 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 943 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp34_ = sql; -#line 942 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 943 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp36_ = sqlite3_prepare_v2 (_tmp33_, _tmp34_, -1, &_tmp35_, NULL); -#line 942 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 943 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _sqlite3_finalize0 (stmt); -#line 942 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 943 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" stmt = _tmp35_; -#line 942 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp36_; #line 943 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" + res = _tmp36_; +#line 944 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp37_ = res; -#line 943 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 944 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _vala_assert (_tmp37_ == SQLITE_OK, "res == Sqlite.OK"); -#line 945 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 946 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" col = 1; -#line 947 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 948 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp38_ = file; -#line 947 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 948 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (_tmp38_ != NULL) { #line 6991 "PhotoTable.c" sqlite3_stmt* _tmp39_ = NULL; @@ -7017,31 +7017,31 @@ static sqlite3_stmt* photo_table_get_duplicate_stmt (PhotoTable* self, GFile* fi GDestroyNotify _tmp43_ = NULL; gint _tmp44_ = 0; gint _tmp45_ = 0; -#line 948 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 949 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp39_ = stmt; -#line 948 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 949 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp40_ = col; -#line 948 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 949 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" col = _tmp40_ + 1; -#line 948 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 949 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp41_ = file; -#line 948 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 949 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp42_ = g_file_get_path (_tmp41_); -#line 948 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 949 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp43_ = g_free; -#line 948 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 949 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp44_ = sqlite3_bind_text (_tmp39_, _tmp40_, _tmp42_, -1, _tmp43_); -#line 948 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp44_; #line 949 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" + res = _tmp44_; +#line 950 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp45_ = res; -#line 949 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 950 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _vala_assert (_tmp45_ == SQLITE_OK, "res == Sqlite.OK"); #line 7019 "PhotoTable.c" } -#line 952 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 953 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp46_ = thumbnail_md5; -#line 952 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 953 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (_tmp46_ != NULL) { #line 7025 "PhotoTable.c" sqlite3_stmt* _tmp47_ = NULL; @@ -7051,31 +7051,31 @@ static sqlite3_stmt* photo_table_get_duplicate_stmt (PhotoTable* self, GFile* fi GDestroyNotify _tmp51_ = NULL; gint _tmp52_ = 0; gint _tmp53_ = 0; -#line 953 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 954 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp47_ = stmt; -#line 953 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 954 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp48_ = col; -#line 953 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 954 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" col = _tmp48_ + 1; -#line 953 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 954 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp49_ = thumbnail_md5; -#line 953 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 954 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp50_ = g_strdup (_tmp49_); -#line 953 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 954 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp51_ = g_free; -#line 953 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 954 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp52_ = sqlite3_bind_text (_tmp47_, _tmp48_, _tmp50_, -1, _tmp51_); -#line 953 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp52_; #line 954 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" + res = _tmp52_; +#line 955 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp53_ = res; -#line 954 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 955 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _vala_assert (_tmp53_ == SQLITE_OK, "res == Sqlite.OK"); #line 7053 "PhotoTable.c" } -#line 957 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 958 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp54_ = md5; -#line 957 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 958 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (_tmp54_ != NULL) { #line 7059 "PhotoTable.c" sqlite3_stmt* _tmp55_ = NULL; @@ -7085,58 +7085,58 @@ static sqlite3_stmt* photo_table_get_duplicate_stmt (PhotoTable* self, GFile* fi GDestroyNotify _tmp59_ = NULL; gint _tmp60_ = 0; gint _tmp61_ = 0; -#line 958 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 959 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp55_ = stmt; -#line 958 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 959 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp56_ = col; -#line 958 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 959 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" col = _tmp56_ + 1; -#line 958 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 959 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp57_ = md5; -#line 958 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 959 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp58_ = g_strdup (_tmp57_); -#line 958 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 959 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp59_ = g_free; -#line 958 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 959 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp60_ = sqlite3_bind_text (_tmp55_, _tmp56_, _tmp58_, -1, _tmp59_); -#line 958 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp60_; #line 959 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" + res = _tmp60_; +#line 960 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp61_ = res; -#line 959 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 960 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _vala_assert (_tmp61_ == SQLITE_OK, "res == Sqlite.OK"); #line 7087 "PhotoTable.c" } -#line 962 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 963 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp64_ = thumbnail_md5; -#line 962 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 963 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (_tmp64_ != NULL) { -#line 962 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 963 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp63_ = TRUE; #line 7095 "PhotoTable.c" } else { const gchar* _tmp65_ = NULL; -#line 962 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 963 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp65_ = md5; -#line 962 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 963 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp63_ = _tmp65_ != NULL; #line 7102 "PhotoTable.c" } -#line 962 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 963 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (_tmp63_) { #line 7106 "PhotoTable.c" PhotoFileFormat _tmp66_ = 0; -#line 962 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 963 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp66_ = file_format; -#line 962 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 963 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp62_ = _tmp66_ != PHOTO_FILE_FORMAT_UNKNOWN; #line 7112 "PhotoTable.c" } else { -#line 962 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 963 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp62_ = FALSE; #line 7116 "PhotoTable.c" } -#line 962 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 963 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (_tmp62_) { #line 7120 "PhotoTable.c" sqlite3_stmt* _tmp67_ = NULL; @@ -7145,31 +7145,31 @@ static sqlite3_stmt* photo_table_get_duplicate_stmt (PhotoTable* self, GFile* fi gint _tmp70_ = 0; gint _tmp71_ = 0; gint _tmp72_ = 0; -#line 963 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 964 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp67_ = stmt; -#line 963 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 964 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp68_ = col; -#line 963 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 964 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" col = _tmp68_ + 1; -#line 963 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 964 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp69_ = file_format; -#line 963 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 964 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp70_ = photo_file_format_serialize (_tmp69_); -#line 963 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 964 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp71_ = sqlite3_bind_int (_tmp67_, _tmp68_, _tmp70_); -#line 963 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp71_; #line 964 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" + res = _tmp71_; +#line 965 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp72_ = res; -#line 964 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 965 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _vala_assert (_tmp72_ == SQLITE_OK, "res == Sqlite.OK"); #line 7145 "PhotoTable.c" } -#line 967 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 968 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" result = stmt; -#line 967 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 968 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_free0 (sql); -#line 967 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 968 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; #line 7153 "PhotoTable.c" } @@ -7187,83 +7187,83 @@ gboolean photo_table_has_duplicate (PhotoTable* self, GFile* file, const gchar* sqlite3_stmt* _tmp5_ = NULL; gint _tmp6_ = 0; gint _tmp7_ = 0; -#line 970 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 971 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_val_if_fail (IS_PHOTO_TABLE (self), FALSE); -#line 970 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - g_return_val_if_fail ((file == NULL) || G_IS_FILE (file), FALSE); #line 971 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" + g_return_val_if_fail ((file == NULL) || G_IS_FILE (file), FALSE); +#line 972 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp0_ = file; -#line 971 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 972 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp1_ = thumbnail_md5; -#line 971 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 972 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp2_ = md5; -#line 971 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 972 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp3_ = file_format; -#line 971 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 972 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp4_ = photo_table_get_duplicate_stmt (self, _tmp0_, _tmp1_, _tmp2_, _tmp3_); -#line 971 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - stmt = _tmp4_; #line 972 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" + stmt = _tmp4_; +#line 973 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp5_ = stmt; -#line 972 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 973 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp6_ = sqlite3_step (_tmp5_); -#line 972 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 973 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" res = _tmp6_; -#line 974 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 975 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp7_ = res; -#line 974 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 975 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (_tmp7_ == SQLITE_DONE) { -#line 976 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 977 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" result = FALSE; -#line 976 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 977 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _sqlite3_finalize0 (stmt); -#line 976 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 977 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; #line 7201 "PhotoTable.c" } else { gint _tmp8_ = 0; -#line 977 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 978 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp8_ = res; -#line 977 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 978 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (_tmp8_ == SQLITE_ROW) { -#line 979 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 980 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" result = TRUE; -#line 979 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 980 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _sqlite3_finalize0 (stmt); -#line 979 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 980 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; #line 7214 "PhotoTable.c" } else { gint _tmp9_ = 0; -#line 981 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 982 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp9_ = res; -#line 981 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 982 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" database_table_fatal ("has_duplicate", _tmp9_); -#line 983 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 984 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" result = FALSE; -#line 983 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 984 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _sqlite3_finalize0 (stmt); -#line 983 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 984 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; #line 7227 "PhotoTable.c" } } -#line 970 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 971 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _sqlite3_finalize0 (stmt); #line 7232 "PhotoTable.c" } static void _vala_array_add2 (PhotoID** array, int* length, int* size, const PhotoID* value) { -#line 995 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 996 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if ((*length) == (*size)) { -#line 995 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 996 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" *size = (*size) ? (2 * (*size)) : 4; -#line 995 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 996 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" *array = g_renew (PhotoID, *array, *size); #line 7243 "PhotoTable.c" } -#line 995 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 996 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" (*array)[(*length)++] = *value; #line 7247 "PhotoTable.c" } @@ -7286,37 +7286,37 @@ PhotoID* photo_table_get_duplicate_ids (PhotoTable* self, GFile* file, const gch gint _tmp7_ = 0; PhotoID* _tmp15_ = NULL; gint _tmp15__length1 = 0; -#line 987 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 988 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_val_if_fail (IS_PHOTO_TABLE (self), NULL); -#line 987 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 988 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_val_if_fail ((file == NULL) || G_IS_FILE (file), NULL); -#line 989 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 990 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp0_ = file; -#line 989 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 990 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp1_ = thumbnail_md5; -#line 989 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 990 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp2_ = md5; -#line 989 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 990 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp3_ = file_format; -#line 989 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 990 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp4_ = photo_table_get_duplicate_stmt (self, _tmp0_, _tmp1_, _tmp2_, _tmp3_); -#line 989 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 990 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" stmt = _tmp4_; -#line 991 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 992 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp5_ = g_new0 (PhotoID, 0); -#line 991 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 992 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" ids = _tmp5_; -#line 991 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 992 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" ids_length1 = 0; -#line 991 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 992 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _ids_size_ = ids_length1; -#line 993 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 994 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp6_ = stmt; -#line 993 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 994 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp7_ = sqlite3_step (_tmp6_); -#line 993 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp7_; #line 994 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" + res = _tmp7_; +#line 995 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" while (TRUE) { #line 7300 "PhotoTable.c" gint _tmp8_ = 0; @@ -7327,49 +7327,49 @@ PhotoID* photo_table_get_duplicate_ids (PhotoTable* self, GFile* file, const gch PhotoID _tmp12_ = {0}; sqlite3_stmt* _tmp13_ = NULL; gint _tmp14_ = 0; -#line 994 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 995 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp8_ = res; -#line 994 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 995 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (!(_tmp8_ == SQLITE_ROW)) { -#line 994 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 995 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" break; #line 7315 "PhotoTable.c" } -#line 995 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 996 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp9_ = ids; -#line 995 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 996 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp9__length1 = ids_length1; -#line 995 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 996 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp10_ = stmt; -#line 995 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 996 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp11_ = sqlite3_column_int64 (_tmp10_, 0); -#line 995 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 996 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" photo_id_init (&_tmp12_, _tmp11_); -#line 995 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_array_add2 (&ids, &ids_length1, &_ids_size_, &_tmp12_); #line 996 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" + _vala_array_add2 (&ids, &ids_length1, &_ids_size_, &_tmp12_); +#line 997 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp13_ = stmt; -#line 996 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 997 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp14_ = sqlite3_step (_tmp13_); -#line 996 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 997 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" res = _tmp14_; #line 7335 "PhotoTable.c" } -#line 999 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1000 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp15_ = ids; -#line 999 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1000 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp15__length1 = ids_length1; -#line 999 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1000 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (result_length1) { -#line 999 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1000 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" *result_length1 = _tmp15__length1; #line 7345 "PhotoTable.c" } -#line 999 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1000 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" result = _tmp15_; -#line 999 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1000 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _sqlite3_finalize0 (stmt); -#line 999 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1000 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; #line 7353 "PhotoTable.c" } @@ -7381,47 +7381,47 @@ void photo_table_update_backlinks (PhotoTable* self, PhotoID* photo_id, const gc PhotoID _tmp3_ = {0}; gint64 _tmp4_ = 0LL; GError * _inner_error_ = NULL; -#line 1002 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1003 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_if_fail (IS_PHOTO_TABLE (self)); -#line 1002 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - g_return_if_fail (photo_id != NULL); #line 1003 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" + g_return_if_fail (photo_id != NULL); +#line 1004 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp1_ = backlinks; -#line 1003 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1004 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (_tmp1_ != NULL) { #line 7371 "PhotoTable.c" const gchar* _tmp2_ = NULL; -#line 1003 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1004 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp2_ = backlinks; -#line 1003 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1004 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp0_ = _tmp2_; #line 7377 "PhotoTable.c" } else { -#line 1003 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1004 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp0_ = ""; #line 7381 "PhotoTable.c" } -#line 1003 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1004 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp3_ = *photo_id; -#line 1003 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1004 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp4_ = _tmp3_.id; -#line 1003 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1004 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" database_table_update_text_by_id_2 (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp4_, "backlinks", _tmp0_, &_inner_error_); -#line 1003 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1004 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1003 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1004 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (_inner_error_->domain == DATABASE_ERROR) { -#line 1003 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1004 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_propagate_error (error, _inner_error_); -#line 1003 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1004 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; #line 7397 "PhotoTable.c" } else { -#line 1003 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#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); -#line 1003 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1004 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_clear_error (&_inner_error_); -#line 1003 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1004 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; #line 7405 "PhotoTable.c" } @@ -7438,48 +7438,48 @@ void photo_table_attach_editable (PhotoTable* self, PhotoRow* row, BackingPhotoI PhotoRow* _tmp5_ = NULL; BackingPhotoID _tmp6_ = {0}; GError * _inner_error_ = NULL; -#line 1006 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1007 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_if_fail (IS_PHOTO_TABLE (self)); -#line 1006 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1007 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_if_fail (IS_PHOTO_ROW (row)); -#line 1006 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - g_return_if_fail (editable_id != NULL); #line 1007 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" + g_return_if_fail (editable_id != NULL); +#line 1008 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp0_ = row; -#line 1007 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1008 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp1_ = _tmp0_->photo_id; -#line 1007 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1008 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp2_ = _tmp1_.id; -#line 1007 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1008 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp3_ = *editable_id; -#line 1007 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1008 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp4_ = _tmp3_.id; -#line 1007 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1008 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" database_table_update_int64_by_id_2 (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp2_, "editable_id", _tmp4_, &_inner_error_); -#line 1007 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1008 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1007 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1008 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (_inner_error_->domain == DATABASE_ERROR) { -#line 1007 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1008 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_propagate_error (error, _inner_error_); -#line 1007 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1008 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; #line 7446 "PhotoTable.c" } else { -#line 1007 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#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); -#line 1007 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1008 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_clear_error (&_inner_error_); -#line 1007 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1008 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; #line 7454 "PhotoTable.c" } } -#line 1009 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1010 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp5_ = row; -#line 1009 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1010 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp6_ = *editable_id; -#line 1009 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1010 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp5_->editable_id = _tmp6_; #line 7463 "PhotoTable.c" } @@ -7491,40 +7491,40 @@ void photo_table_detach_editable (PhotoTable* self, PhotoRow* row, GError** erro gint64 _tmp2_ = 0LL; PhotoRow* _tmp3_ = NULL; GError * _inner_error_ = NULL; -#line 1012 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1013 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_if_fail (IS_PHOTO_TABLE (self)); -#line 1012 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - g_return_if_fail (IS_PHOTO_ROW (row)); #line 1013 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" + g_return_if_fail (IS_PHOTO_ROW (row)); +#line 1014 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp0_ = row; -#line 1013 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1014 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp1_ = _tmp0_->photo_id; -#line 1013 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1014 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp2_ = _tmp1_.id; -#line 1013 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1014 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" database_table_update_int64_by_id_2 (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp2_, "editable_id", BACKING_PHOTO_ID_INVALID, &_inner_error_); -#line 1013 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1014 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1013 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1014 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (_inner_error_->domain == DATABASE_ERROR) { -#line 1013 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1014 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_propagate_error (error, _inner_error_); -#line 1013 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1014 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; #line 7493 "PhotoTable.c" } else { -#line 1013 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#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); -#line 1013 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1014 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_clear_error (&_inner_error_); -#line 1013 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1014 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; #line 7501 "PhotoTable.c" } } -#line 1015 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1016 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp3_ = row; -#line 1015 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#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" } @@ -7536,43 +7536,43 @@ void photo_table_set_metadata_dirty (PhotoTable* self, PhotoID* photo_id, gboole PhotoID _tmp2_ = {0}; gint64 _tmp3_ = 0LL; GError * _inner_error_ = NULL; -#line 1018 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1019 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_if_fail (IS_PHOTO_TABLE (self)); -#line 1018 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - g_return_if_fail (photo_id != NULL); #line 1019 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" + g_return_if_fail (photo_id != NULL); +#line 1020 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp1_ = dirty; -#line 1019 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1020 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (_tmp1_) { -#line 1019 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1020 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp0_ = 1; #line 7528 "PhotoTable.c" } else { -#line 1019 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1020 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp0_ = 0; #line 7532 "PhotoTable.c" } -#line 1019 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1020 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp2_ = *photo_id; -#line 1019 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1020 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp3_ = _tmp2_.id; -#line 1019 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1020 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" database_table_update_int_by_id_2 (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp3_, "metadata_dirty", _tmp0_, &_inner_error_); -#line 1019 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1020 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1019 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1020 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (_inner_error_->domain == DATABASE_ERROR) { -#line 1019 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1020 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_propagate_error (error, _inner_error_); -#line 1019 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1020 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; #line 7548 "PhotoTable.c" } else { -#line 1019 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#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); -#line 1019 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1020 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_clear_error (&_inner_error_); -#line 1019 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1020 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; #line 7556 "PhotoTable.c" } @@ -7598,124 +7598,124 @@ void photo_table_update_raw_development (PhotoTable* self, PhotoRow* row, RawDev BackingPhotoID _tmp15_ = {0}; gint64 _tmp16_ = 0LL; GError * _inner_error_ = NULL; -#line 1022 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1023 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_if_fail (IS_PHOTO_TABLE (self)); -#line 1022 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1023 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_if_fail (IS_PHOTO_ROW (row)); -#line 1022 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1023 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_if_fail (backing_photo_id != NULL); -#line 1026 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1027 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp0_ = rd; -#line 1026 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1027 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" switch (_tmp0_) { -#line 1026 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1027 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" case RAW_DEVELOPER_SHOTWELL: #line 7592 "PhotoTable.c" { gchar* _tmp1_ = NULL; -#line 1028 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1029 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp1_ = g_strdup ("develop_shotwell_id"); -#line 1028 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1029 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_free0 (col); -#line 1028 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - col = _tmp1_; #line 1029 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" + col = _tmp1_; +#line 1030 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" break; #line 7603 "PhotoTable.c" } -#line 1026 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1027 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" case RAW_DEVELOPER_CAMERA: #line 7607 "PhotoTable.c" { gchar* _tmp2_ = NULL; -#line 1032 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1033 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp2_ = g_strdup ("develop_camera_id"); -#line 1032 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1033 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_free0 (col); -#line 1032 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - col = _tmp2_; #line 1033 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" + col = _tmp2_; +#line 1034 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" break; #line 7618 "PhotoTable.c" } -#line 1026 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1027 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" case RAW_DEVELOPER_EMBEDDED: #line 7622 "PhotoTable.c" { gchar* _tmp3_ = NULL; -#line 1036 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1037 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp3_ = g_strdup ("develop_embedded_id"); -#line 1036 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1037 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_free0 (col); -#line 1036 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - col = _tmp3_; #line 1037 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" + col = _tmp3_; +#line 1038 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" break; #line 7633 "PhotoTable.c" } default: { -#line 1040 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1041 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_assert_not_reached (); #line 7639 "PhotoTable.c" } } -#line 1043 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1044 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp4_ = row; -#line 1043 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1044 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp5_ = _tmp4_->development_ids; -#line 1043 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1044 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp5__length1 = _tmp4_->development_ids_length1; -#line 1043 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1044 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp6_ = rd; -#line 1043 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1044 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp7_ = *backing_photo_id; -#line 1043 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1044 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp5_[_tmp6_] = _tmp7_; -#line 1043 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp8_ = _tmp5_[_tmp6_]; #line 1044 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" + _tmp8_ = _tmp5_[_tmp6_]; +#line 1045 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp9_ = row; -#line 1044 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1045 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp10_ = _tmp9_->photo_id; -#line 1044 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1045 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp11_ = _tmp10_.id; -#line 1044 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1045 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp12_ = col; -#line 1044 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1045 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp13_ = *backing_photo_id; -#line 1044 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1045 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp14_ = _tmp13_.id; -#line 1044 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1045 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" database_table_update_int64_by_id_2 (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp11_, _tmp12_, _tmp14_, &_inner_error_); -#line 1044 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1045 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1044 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1045 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (_inner_error_->domain == DATABASE_ERROR) { -#line 1044 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1045 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_propagate_error (error, _inner_error_); -#line 1044 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1045 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_free0 (col); -#line 1044 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1045 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; #line 7680 "PhotoTable.c" } else { -#line 1044 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1045 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_free0 (col); -#line 1044 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1045 "/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); -#line 1044 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1045 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_clear_error (&_inner_error_); -#line 1044 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1045 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; #line 7690 "PhotoTable.c" } } -#line 1046 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1047 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp15_ = *backing_photo_id; -#line 1046 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1047 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp16_ = _tmp15_.id; -#line 1046 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1047 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (_tmp16_ != BACKING_PHOTO_ID_INVALID) { #line 7699 "PhotoTable.c" PhotoRow* _tmp17_ = NULL; @@ -7724,47 +7724,47 @@ void photo_table_update_raw_development (PhotoTable* self, PhotoRow* row, RawDev RawDeveloper _tmp20_ = 0; gchar* _tmp21_ = NULL; gchar* _tmp22_ = NULL; -#line 1047 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1048 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp17_ = row; -#line 1047 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1048 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp18_ = _tmp17_->photo_id; -#line 1047 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1048 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp19_ = _tmp18_.id; -#line 1047 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1048 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp20_ = rd; -#line 1047 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1048 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp21_ = raw_developer_to_string (_tmp20_); -#line 1047 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1048 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp22_ = _tmp21_; -#line 1047 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1048 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" database_table_update_text_by_id_2 (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp19_, "developer", _tmp22_, &_inner_error_); -#line 1047 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1048 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_free0 (_tmp22_); -#line 1047 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1048 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1047 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1048 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (_inner_error_->domain == DATABASE_ERROR) { -#line 1047 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1048 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_propagate_error (error, _inner_error_); -#line 1047 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1048 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_free0 (col); -#line 1047 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1048 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; #line 7732 "PhotoTable.c" } else { -#line 1047 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1048 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_free0 (col); -#line 1047 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1048 "/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); -#line 1047 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1048 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_clear_error (&_inner_error_); -#line 1047 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1048 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; #line 7742 "PhotoTable.c" } } } -#line 1022 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1023 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_free0 (col); #line 7748 "PhotoTable.c" } @@ -7775,33 +7775,33 @@ void photo_table_remove_development (PhotoTable* self, PhotoRow* row, RawDevelop RawDeveloper _tmp1_ = 0; BackingPhotoID _tmp2_ = {0}; GError * _inner_error_ = NULL; -#line 1050 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1051 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_if_fail (IS_PHOTO_TABLE (self)); -#line 1050 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - g_return_if_fail (IS_PHOTO_ROW (row)); #line 1051 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" + g_return_if_fail (IS_PHOTO_ROW (row)); +#line 1052 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp0_ = row; -#line 1051 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1052 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp1_ = rd; -#line 1051 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1052 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" backing_photo_id_init (&_tmp2_, BACKING_PHOTO_ID_INVALID); -#line 1051 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1052 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" photo_table_update_raw_development (self, _tmp0_, _tmp1_, &_tmp2_, &_inner_error_); -#line 1051 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1052 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1051 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1052 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (_inner_error_->domain == DATABASE_ERROR) { -#line 1051 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1052 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_propagate_error (error, _inner_error_); -#line 1051 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1052 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; #line 7777 "PhotoTable.c" } else { -#line 1051 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#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); -#line 1051 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1052 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_clear_error (&_inner_error_); -#line 1051 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1052 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; #line 7785 "PhotoTable.c" } @@ -7846,11 +7846,11 @@ GType photo_table_get_type (void) { void backing_photo_id_init (BackingPhotoID *self, gint64 id) { gint64 _tmp0_ = 0LL; -#line 1071 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - memset (self, 0, sizeof (BackingPhotoID)); #line 1072 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" + memset (self, 0, sizeof (BackingPhotoID)); +#line 1073 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp0_ = id; -#line 1072 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1073 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" (*self).id = _tmp0_; #line 7834 "PhotoTable.c" } @@ -7859,11 +7859,11 @@ void backing_photo_id_init (BackingPhotoID *self, gint64 id) { gboolean backing_photo_id_is_invalid (BackingPhotoID *self) { gboolean result = FALSE; gint64 _tmp0_ = 0LL; -#line 1076 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1077 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp0_ = (*self).id; -#line 1076 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1077 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" result = _tmp0_ == BACKING_PHOTO_ID_INVALID; -#line 1076 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1077 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; #line 7847 "PhotoTable.c" } @@ -7872,11 +7872,11 @@ gboolean backing_photo_id_is_invalid (BackingPhotoID *self) { gboolean backing_photo_id_is_valid (BackingPhotoID *self) { gboolean result = FALSE; gint64 _tmp0_ = 0LL; -#line 1080 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1081 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp0_ = (*self).id; -#line 1080 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1081 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" result = _tmp0_ != BACKING_PHOTO_ID_INVALID; -#line 1080 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1081 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; #line 7860 "PhotoTable.c" } @@ -7884,18 +7884,18 @@ gboolean backing_photo_id_is_valid (BackingPhotoID *self) { BackingPhotoID* backing_photo_id_dup (const BackingPhotoID* self) { BackingPhotoID* dup; -#line 1066 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1067 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" dup = g_new0 (BackingPhotoID, 1); -#line 1066 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1067 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" memcpy (dup, self, sizeof (BackingPhotoID)); -#line 1066 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1067 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return dup; #line 7872 "PhotoTable.c" } void backing_photo_id_free (BackingPhotoID* self) { -#line 1066 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1067 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_free (self); #line 7879 "PhotoTable.c" } @@ -7921,35 +7921,35 @@ gboolean backing_photo_row_matches_file_info (BackingPhotoRow* self, GFileInfo* GFileInfo* _tmp4_ = NULL; GTimeVal _tmp5_ = {0}; glong _tmp6_ = 0L; -#line 1094 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1095 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_val_if_fail (IS_BACKING_PHOTO_ROW (self), FALSE); -#line 1094 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - g_return_val_if_fail (G_IS_FILE_INFO (info), FALSE); #line 1095 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" + g_return_val_if_fail (G_IS_FILE_INFO (info), FALSE); +#line 1096 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp0_ = self->filesize; -#line 1095 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1096 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp1_ = info; -#line 1095 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1096 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp2_ = g_file_info_get_size (_tmp1_); -#line 1095 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp0_ != _tmp2_) { #line 1096 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" + if (_tmp0_ != _tmp2_) { +#line 1097 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" result = FALSE; -#line 1096 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1097 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; #line 7919 "PhotoTable.c" } -#line 1098 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1099 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp3_ = self->timestamp; -#line 1098 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1099 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp4_ = info; -#line 1098 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1099 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_file_info_get_modification_time (_tmp4_, &_tmp5_); -#line 1098 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1099 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp6_ = _tmp5_.tv_sec; -#line 1098 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1099 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" result = _tmp3_ == ((time_t) _tmp6_); -#line 1098 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1099 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; #line 7933 "PhotoTable.c" } @@ -7964,35 +7964,35 @@ gboolean backing_photo_row_is_touched (BackingPhotoRow* self, GFileInfo* info) { GFileInfo* _tmp4_ = NULL; GTimeVal _tmp5_ = {0}; glong _tmp6_ = 0L; -#line 1101 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1102 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_val_if_fail (IS_BACKING_PHOTO_ROW (self), FALSE); -#line 1101 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - g_return_val_if_fail (G_IS_FILE_INFO (info), FALSE); #line 1102 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" + g_return_val_if_fail (G_IS_FILE_INFO (info), FALSE); +#line 1103 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp0_ = self->filesize; -#line 1102 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1103 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp1_ = info; -#line 1102 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1103 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp2_ = g_file_info_get_size (_tmp1_); -#line 1102 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp0_ != _tmp2_) { #line 1103 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" + if (_tmp0_ != _tmp2_) { +#line 1104 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" result = FALSE; -#line 1103 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1104 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; #line 7962 "PhotoTable.c" } -#line 1105 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1106 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp3_ = self->timestamp; -#line 1105 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1106 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp4_ = info; -#line 1105 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1106 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_file_info_get_modification_time (_tmp4_, &_tmp5_); -#line 1105 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1106 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp6_ = _tmp5_.tv_sec; -#line 1105 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1106 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" result = _tmp3_ != ((time_t) _tmp6_); -#line 1105 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1106 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; #line 7976 "PhotoTable.c" } @@ -8016,61 +8016,61 @@ void backing_photo_row_copy_from (BackingPhotoRow* self, BackingPhotoRow* from) Dimensions _tmp14_ = {0}; BackingPhotoRow* _tmp15_ = NULL; Orientation _tmp16_ = 0; -#line 1109 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1110 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_if_fail (IS_BACKING_PHOTO_ROW (self)); -#line 1109 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - g_return_if_fail (IS_BACKING_PHOTO_ROW (from)); #line 1110 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" + g_return_if_fail (IS_BACKING_PHOTO_ROW (from)); +#line 1111 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp0_ = from; -#line 1110 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1111 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp1_ = _tmp0_->id; -#line 1110 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - self->id = _tmp1_; #line 1111 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" + self->id = _tmp1_; +#line 1112 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp2_ = from; -#line 1111 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1112 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp3_ = _tmp2_->time_created; -#line 1111 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - self->time_created = _tmp3_; #line 1112 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" + self->time_created = _tmp3_; +#line 1113 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp4_ = from; -#line 1112 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1113 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp5_ = _tmp4_->filepath; -#line 1112 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1113 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp6_ = g_strdup (_tmp5_); -#line 1112 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1113 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_free0 (self->filepath); -#line 1112 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - self->filepath = _tmp6_; #line 1113 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" + self->filepath = _tmp6_; +#line 1114 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp7_ = from; -#line 1113 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1114 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp8_ = _tmp7_->filesize; -#line 1113 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - self->filesize = _tmp8_; #line 1114 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" + self->filesize = _tmp8_; +#line 1115 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp9_ = from; -#line 1114 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1115 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp10_ = _tmp9_->timestamp; -#line 1114 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - self->timestamp = _tmp10_; #line 1115 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" + self->timestamp = _tmp10_; +#line 1116 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp11_ = from; -#line 1115 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1116 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp12_ = _tmp11_->file_format; -#line 1115 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - self->file_format = _tmp12_; #line 1116 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" + self->file_format = _tmp12_; +#line 1117 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp13_ = from; -#line 1116 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1117 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp14_ = _tmp13_->dim; -#line 1116 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - self->dim = _tmp14_; #line 1117 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" + self->dim = _tmp14_; +#line 1118 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp15_ = from; -#line 1117 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1118 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp16_ = _tmp15_->original_orientation; -#line 1117 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1118 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" self->original_orientation = _tmp16_; #line 8054 "PhotoTable.c" } @@ -8078,32 +8078,32 @@ void backing_photo_row_copy_from (BackingPhotoRow* self, BackingPhotoRow* from) BackingPhotoRow* backing_photo_row_construct (GType object_type) { BackingPhotoRow* self = NULL; -#line 1084 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" self = (BackingPhotoRow*) g_type_create_instance (object_type); -#line 1084 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return self; #line 8064 "PhotoTable.c" } BackingPhotoRow* backing_photo_row_new (void) { -#line 1084 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return backing_photo_row_construct (TYPE_BACKING_PHOTO_ROW); #line 8071 "PhotoTable.c" } static void value_backing_photo_row_init (GValue* value) { -#line 1084 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" value->data[0].v_pointer = NULL; #line 8078 "PhotoTable.c" } static void value_backing_photo_row_free_value (GValue* value) { -#line 1084 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (value->data[0].v_pointer) { -#line 1084 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" backing_photo_row_unref (value->data[0].v_pointer); #line 8087 "PhotoTable.c" } @@ -8111,13 +8111,13 @@ static void value_backing_photo_row_free_value (GValue* value) { static void value_backing_photo_row_copy_value (const GValue* src_value, GValue* dest_value) { -#line 1084 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (src_value->data[0].v_pointer) { -#line 1084 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#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" } else { -#line 1084 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" dest_value->data[0].v_pointer = NULL; #line 8101 "PhotoTable.c" } @@ -8125,37 +8125,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 1084 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return value->data[0].v_pointer; #line 8109 "PhotoTable.c" } static gchar* value_backing_photo_row_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { -#line 1084 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (collect_values[0].v_pointer) { #line 8116 "PhotoTable.c" BackingPhotoRow* object; object = collect_values[0].v_pointer; -#line 1084 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (object->parent_instance.g_class == NULL) { -#line 1084 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#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" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { -#line 1084 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#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 1084 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" value->data[0].v_pointer = backing_photo_row_ref (object); #line 8131 "PhotoTable.c" } else { -#line 1084 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" value->data[0].v_pointer = NULL; #line 8135 "PhotoTable.c" } -#line 1084 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return NULL; #line 8139 "PhotoTable.c" } @@ -8164,27 +8164,27 @@ static gchar* value_backing_photo_row_collect_value (GValue* value, guint n_coll static gchar* value_backing_photo_row_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { BackingPhotoRow** object_p; object_p = collect_values[0].v_pointer; -#line 1084 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (!object_p) { -#line 1084 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#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 1084 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (!value->data[0].v_pointer) { -#line 1084 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" *object_p = NULL; #line 8156 "PhotoTable.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { -#line 1084 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" *object_p = value->data[0].v_pointer; #line 8160 "PhotoTable.c" } else { -#line 1084 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#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 1084 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return NULL; #line 8168 "PhotoTable.c" } @@ -8192,22 +8192,22 @@ static gchar* value_backing_photo_row_lcopy_value (const GValue* value, guint n_ GParamSpec* param_spec_backing_photo_row (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { ParamSpecBackingPhotoRow* spec; -#line 1084 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_val_if_fail (g_type_is_a (object_type, TYPE_BACKING_PHOTO_ROW), NULL); -#line 1084 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags); -#line 1084 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" G_PARAM_SPEC (spec)->value_type = object_type; -#line 1084 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return G_PARAM_SPEC (spec); #line 8182 "PhotoTable.c" } gpointer value_get_backing_photo_row (const GValue* value) { -#line 1084 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_BACKING_PHOTO_ROW), NULL); -#line 1084 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return value->data[0].v_pointer; #line 8191 "PhotoTable.c" } @@ -8215,29 +8215,29 @@ gpointer value_get_backing_photo_row (const GValue* value) { void value_set_backing_photo_row (GValue* value, gpointer v_object) { BackingPhotoRow* old; -#line 1084 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_BACKING_PHOTO_ROW)); -#line 1084 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" old = value->data[0].v_pointer; -#line 1084 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (v_object) { -#line 1084 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_BACKING_PHOTO_ROW)); -#line 1084 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); -#line 1084 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" value->data[0].v_pointer = v_object; -#line 1084 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" backing_photo_row_ref (value->data[0].v_pointer); #line 8211 "PhotoTable.c" } else { -#line 1084 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" value->data[0].v_pointer = NULL; #line 8215 "PhotoTable.c" } -#line 1084 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (old) { -#line 1084 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" backing_photo_row_unref (old); #line 8221 "PhotoTable.c" } @@ -8246,27 +8246,27 @@ void value_set_backing_photo_row (GValue* value, gpointer v_object) { void value_take_backing_photo_row (GValue* value, gpointer v_object) { BackingPhotoRow* old; -#line 1084 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_BACKING_PHOTO_ROW)); -#line 1084 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" old = value->data[0].v_pointer; -#line 1084 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (v_object) { -#line 1084 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_BACKING_PHOTO_ROW)); -#line 1084 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); -#line 1084 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" value->data[0].v_pointer = v_object; #line 8240 "PhotoTable.c" } else { -#line 1084 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" value->data[0].v_pointer = NULL; #line 8244 "PhotoTable.c" } -#line 1084 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (old) { -#line 1084 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" backing_photo_row_unref (old); #line 8250 "PhotoTable.c" } @@ -8274,18 +8274,18 @@ void value_take_backing_photo_row (GValue* value, gpointer v_object) { static void backing_photo_row_class_init (BackingPhotoRowClass * klass) { -#line 1084 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" backing_photo_row_parent_class = g_type_class_peek_parent (klass); -#line 1084 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" ((BackingPhotoRowClass *) klass)->finalize = backing_photo_row_finalize; #line 8260 "PhotoTable.c" } static void backing_photo_row_instance_init (BackingPhotoRow * self) { -#line 1087 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1088 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" self->filepath = NULL; -#line 1084 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" self->ref_count = 1; #line 8269 "PhotoTable.c" } @@ -8293,11 +8293,11 @@ static void backing_photo_row_instance_init (BackingPhotoRow * self) { static void backing_photo_row_finalize (BackingPhotoRow* obj) { BackingPhotoRow * self; -#line 1084 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_BACKING_PHOTO_ROW, BackingPhotoRow); -#line 1084 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_signal_handlers_destroy (self); -#line 1087 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1088 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_free0 (self->filepath); #line 8281 "PhotoTable.c" } @@ -8320,9 +8320,9 @@ GType backing_photo_row_get_type (void) { gpointer backing_photo_row_ref (gpointer instance) { BackingPhotoRow* self; self = instance; -#line 1084 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_atomic_int_inc (&self->ref_count); -#line 1084 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return instance; #line 8306 "PhotoTable.c" } @@ -8331,11 +8331,11 @@ gpointer backing_photo_row_ref (gpointer instance) { void backing_photo_row_unref (gpointer instance) { BackingPhotoRow* self; self = instance; -#line 1084 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (g_atomic_int_dec_and_test (&self->ref_count)) { -#line 1084 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" BACKING_PHOTO_ROW_GET_CLASS (self)->finalize (self); -#line 1084 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_type_free_instance ((GTypeInstance *) self); #line 8319 "PhotoTable.c" } @@ -8353,52 +8353,52 @@ static BackingPhotoTable* backing_photo_table_construct (GType object_type) { sqlite3_stmt* _tmp4_ = NULL; gint _tmp5_ = 0; gint _tmp6_ = 0; -#line 1124 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - self = (BackingPhotoTable*) database_table_construct (object_type); #line 1125 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" + self = (BackingPhotoTable*) database_table_construct (object_type); +#line 1126 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" database_table_set_table_name (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), "BackingPhotoTable"); -#line 1128 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1129 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp0_ = database_table_db; -#line 1128 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1129 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp2_ = sqlite3_prepare_v2 (_tmp0_, "CREATE TABLE IF NOT EXISTS " "BackingPhotoTable " "(" "id INTEGER PRIMARY KEY, " "filepath TEXT UNIQUE NOT NULL, " "timestamp INTEGER, " "filesize INTEGER, " "width INTEGER, " "height INTEGER, " "original_orientation INTEGER, " "file_format INTEGER, " "time_created INTEGER " ")", -1, &_tmp1_, NULL); -#line 1128 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1129 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _sqlite3_finalize0 (stmt); -#line 1128 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1129 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" stmt = _tmp1_; -#line 1128 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1129 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" res = _tmp2_; -#line 1141 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1142 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp3_ = res; -#line 1141 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1142 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _vala_assert (_tmp3_ == SQLITE_OK, "res == Sqlite.OK"); -#line 1143 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1144 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp4_ = stmt; -#line 1143 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1144 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp5_ = sqlite3_step (_tmp4_); -#line 1143 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp5_; #line 1144 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" + res = _tmp5_; +#line 1145 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp6_ = res; -#line 1144 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1145 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (_tmp6_ != SQLITE_DONE) { #line 8363 "PhotoTable.c" gint _tmp7_ = 0; -#line 1145 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1146 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp7_ = res; -#line 1145 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1146 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" database_table_fatal ("create PhotoBackingTable", _tmp7_); #line 8369 "PhotoTable.c" } -#line 1124 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1125 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _sqlite3_finalize0 (stmt); -#line 1124 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1125 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return self; #line 8375 "PhotoTable.c" } static BackingPhotoTable* backing_photo_table_new (void) { -#line 1124 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1125 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return backing_photo_table_construct (TYPE_BACKING_PHOTO_TABLE); #line 8382 "PhotoTable.c" } @@ -8409,27 +8409,27 @@ BackingPhotoTable* backing_photo_table_get_instance (void) { BackingPhotoTable* _tmp0_ = NULL; BackingPhotoTable* _tmp2_ = NULL; BackingPhotoTable* _tmp3_ = NULL; -#line 1149 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1150 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp0_ = backing_photo_table_instance; -#line 1149 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1150 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (_tmp0_ == NULL) { #line 8395 "PhotoTable.c" BackingPhotoTable* _tmp1_ = NULL; -#line 1150 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1151 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp1_ = backing_photo_table_new (); -#line 1150 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1151 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _database_table_unref0 (backing_photo_table_instance); -#line 1150 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1151 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" backing_photo_table_instance = _tmp1_; #line 8403 "PhotoTable.c" } -#line 1152 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1153 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp2_ = backing_photo_table_instance; -#line 1152 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1153 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp3_ = _database_table_ref0 (_tmp2_); -#line 1152 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1153 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" result = _tmp3_; -#line 1152 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1153 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; #line 8413 "PhotoTable.c" } @@ -8497,203 +8497,203 @@ void backing_photo_table_add (BackingPhotoTable* self, BackingPhotoRow* state, G BackingPhotoRow* _tmp56_ = NULL; time_t _tmp57_ = 0; GError * _inner_error_ = NULL; -#line 1155 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1156 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_if_fail (IS_BACKING_PHOTO_TABLE (self)); -#line 1155 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1156 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_if_fail (IS_BACKING_PHOTO_ROW (state)); -#line 1157 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1158 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp0_ = database_table_db; -#line 1157 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1158 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp2_ = sqlite3_prepare_v2 (_tmp0_, "INSERT INTO BackingPhotoTable " "(filepath, timestamp, filesize, width, height, original_orientation, " "file_format, time_created) " "VALUES (?, ?, ?, ?, ?, ?, ?, ?)", -1, &_tmp1_, NULL); -#line 1157 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1158 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _sqlite3_finalize0 (stmt); -#line 1157 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1158 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" stmt = _tmp1_; -#line 1157 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1158 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" res = _tmp2_; -#line 1162 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1163 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp3_ = res; -#line 1162 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1163 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _vala_assert (_tmp3_ == SQLITE_OK, "res == Sqlite.OK"); -#line 1164 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1165 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp4_ = now_sec (); -#line 1164 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1165 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" time_created = (time_t) _tmp4_; -#line 1166 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1167 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp5_ = stmt; -#line 1166 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1167 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp6_ = state; -#line 1166 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1167 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp7_ = _tmp6_->filepath; -#line 1166 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1167 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp8_ = g_strdup (_tmp7_); -#line 1166 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1167 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp9_ = g_free; -#line 1166 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1167 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp10_ = sqlite3_bind_text (_tmp5_, 1, _tmp8_, -1, _tmp9_); -#line 1166 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp10_; #line 1167 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" + res = _tmp10_; +#line 1168 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp11_ = res; -#line 1167 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp11_ == SQLITE_OK, "res == Sqlite.OK"); #line 1168 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" + _vala_assert (_tmp11_ == SQLITE_OK, "res == Sqlite.OK"); +#line 1169 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp12_ = stmt; -#line 1168 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1169 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp13_ = state; -#line 1168 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1169 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp14_ = _tmp13_->timestamp; -#line 1168 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1169 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp15_ = sqlite3_bind_int64 (_tmp12_, 2, (gint64) _tmp14_); -#line 1168 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp15_; #line 1169 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" + res = _tmp15_; +#line 1170 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp16_ = res; -#line 1169 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp16_ == SQLITE_OK, "res == Sqlite.OK"); #line 1170 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" + _vala_assert (_tmp16_ == SQLITE_OK, "res == Sqlite.OK"); +#line 1171 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp17_ = stmt; -#line 1170 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1171 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp18_ = state; -#line 1170 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1171 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp19_ = _tmp18_->filesize; -#line 1170 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1171 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp20_ = sqlite3_bind_int64 (_tmp17_, 3, _tmp19_); -#line 1170 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp20_; #line 1171 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" + res = _tmp20_; +#line 1172 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp21_ = res; -#line 1171 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp21_ == SQLITE_OK, "res == Sqlite.OK"); #line 1172 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" + _vala_assert (_tmp21_ == SQLITE_OK, "res == Sqlite.OK"); +#line 1173 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp22_ = stmt; -#line 1172 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1173 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp23_ = state; -#line 1172 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1173 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp24_ = _tmp23_->dim; -#line 1172 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1173 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp25_ = _tmp24_.width; -#line 1172 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1173 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp26_ = sqlite3_bind_int (_tmp22_, 4, _tmp25_); -#line 1172 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp26_; #line 1173 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" + res = _tmp26_; +#line 1174 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp27_ = res; -#line 1173 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp27_ == SQLITE_OK, "res == Sqlite.OK"); #line 1174 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" + _vala_assert (_tmp27_ == SQLITE_OK, "res == Sqlite.OK"); +#line 1175 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp28_ = stmt; -#line 1174 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1175 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp29_ = state; -#line 1174 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1175 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp30_ = _tmp29_->dim; -#line 1174 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1175 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp31_ = _tmp30_.height; -#line 1174 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1175 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp32_ = sqlite3_bind_int (_tmp28_, 5, _tmp31_); -#line 1174 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp32_; #line 1175 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" + res = _tmp32_; +#line 1176 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp33_ = res; -#line 1175 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp33_ == SQLITE_OK, "res == Sqlite.OK"); #line 1176 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" + _vala_assert (_tmp33_ == SQLITE_OK, "res == Sqlite.OK"); +#line 1177 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp34_ = stmt; -#line 1176 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1177 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp35_ = state; -#line 1176 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1177 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp36_ = _tmp35_->original_orientation; -#line 1176 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1177 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp37_ = sqlite3_bind_int (_tmp34_, 6, (gint) _tmp36_); -#line 1176 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp37_; #line 1177 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" + res = _tmp37_; +#line 1178 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp38_ = res; -#line 1177 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp38_ == SQLITE_OK, "res == Sqlite.OK"); #line 1178 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" + _vala_assert (_tmp38_ == SQLITE_OK, "res == Sqlite.OK"); +#line 1179 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp39_ = stmt; -#line 1178 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1179 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp40_ = state; -#line 1178 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1179 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp41_ = _tmp40_->file_format; -#line 1178 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1179 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp42_ = photo_file_format_serialize (_tmp41_); -#line 1178 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1179 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp43_ = sqlite3_bind_int (_tmp39_, 7, _tmp42_); -#line 1178 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp43_; #line 1179 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" + res = _tmp43_; +#line 1180 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp44_ = res; -#line 1179 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp44_ == SQLITE_OK, "res == Sqlite.OK"); #line 1180 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" + _vala_assert (_tmp44_ == SQLITE_OK, "res == Sqlite.OK"); +#line 1181 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp45_ = stmt; -#line 1180 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1181 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp46_ = time_created; -#line 1180 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1181 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp47_ = sqlite3_bind_int64 (_tmp45_, 8, (gint64) _tmp46_); -#line 1180 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp47_; #line 1181 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" + res = _tmp47_; +#line 1182 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp48_ = res; -#line 1181 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1182 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _vala_assert (_tmp48_ == SQLITE_OK, "res == Sqlite.OK"); -#line 1183 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1184 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp49_ = stmt; -#line 1183 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1184 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp50_ = sqlite3_step (_tmp49_); -#line 1183 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp50_; #line 1184 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" + res = _tmp50_; +#line 1185 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp51_ = res; -#line 1184 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1185 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (_tmp51_ != SQLITE_DONE) { #line 8631 "PhotoTable.c" gint _tmp52_ = 0; -#line 1185 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1186 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp52_ = res; -#line 1185 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1186 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" database_table_throw_error ("PhotoBackingTable.add", _tmp52_, &_inner_error_); -#line 1185 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1186 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1185 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1186 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (_inner_error_->domain == DATABASE_ERROR) { -#line 1185 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1186 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_propagate_error (error, _inner_error_); -#line 1185 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1186 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _sqlite3_finalize0 (stmt); -#line 1185 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1186 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; #line 8647 "PhotoTable.c" } else { -#line 1185 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1186 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _sqlite3_finalize0 (stmt); -#line 1185 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1186 "/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); -#line 1185 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1186 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_clear_error (&_inner_error_); -#line 1185 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1186 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; #line 8657 "PhotoTable.c" } } } -#line 1187 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1188 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp53_ = state; -#line 1187 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1188 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp54_ = database_table_db; -#line 1187 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1188 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp55_ = sqlite3_last_insert_rowid (_tmp54_); -#line 1187 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - backing_photo_id_init (&_tmp53_->id, _tmp55_); #line 1188 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" + backing_photo_id_init (&_tmp53_->id, _tmp55_); +#line 1189 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp56_ = state; -#line 1188 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1189 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp57_ = time_created; -#line 1188 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1189 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp56_->time_created = _tmp57_; -#line 1155 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1156 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _sqlite3_finalize0 (stmt); #line 8677 "PhotoTable.c" } @@ -8745,174 +8745,174 @@ BackingPhotoRow* backing_photo_table_fetch (BackingPhotoTable* self, BackingPhot sqlite3_stmt* _tmp40_ = NULL; gint64 _tmp41_ = 0LL; GError * _inner_error_ = NULL; -#line 1191 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1192 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_val_if_fail (IS_BACKING_PHOTO_TABLE (self), NULL); -#line 1191 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1192 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_val_if_fail (id != NULL, NULL); -#line 1193 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1194 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp0_ = database_table_db; -#line 1193 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1194 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp2_ = sqlite3_prepare_v2 (_tmp0_, "SELECT filepath, timestamp, filesize, width, height, " "original_orientation, file_format, time_created FROM BackingPhotoTable" \ " WHERE id=?", -1, &_tmp1_, NULL); -#line 1193 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1194 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _sqlite3_finalize0 (stmt); -#line 1193 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1194 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" stmt = _tmp1_; -#line 1193 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1194 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" res = _tmp2_; -#line 1196 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1197 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp3_ = res; -#line 1196 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1197 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _vala_assert (_tmp3_ == SQLITE_OK, "res == Sqlite.OK"); -#line 1198 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1199 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp4_ = stmt; -#line 1198 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1199 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp5_ = *id; -#line 1198 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1199 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp6_ = _tmp5_.id; -#line 1198 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1199 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp7_ = sqlite3_bind_int64 (_tmp4_, 1, _tmp6_); -#line 1198 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp7_; #line 1199 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" + res = _tmp7_; +#line 1200 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp8_ = res; -#line 1199 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1200 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _vala_assert (_tmp8_ == SQLITE_OK, "res == Sqlite.OK"); -#line 1201 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1202 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp9_ = stmt; -#line 1201 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1202 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp10_ = sqlite3_step (_tmp9_); -#line 1201 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp10_; #line 1202 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" + res = _tmp10_; +#line 1203 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp11_ = res; -#line 1202 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp11_ == SQLITE_DONE) { #line 1203 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" + if (_tmp11_ == SQLITE_DONE) { +#line 1204 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" result = NULL; -#line 1203 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1204 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _sqlite3_finalize0 (stmt); -#line 1203 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1204 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; #line 8775 "PhotoTable.c" } else { gint _tmp12_ = 0; -#line 1204 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1205 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp12_ = res; -#line 1204 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1205 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (_tmp12_ != SQLITE_ROW) { #line 8782 "PhotoTable.c" gint _tmp13_ = 0; -#line 1205 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1206 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp13_ = res; -#line 1205 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1206 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" database_table_throw_error ("BackingPhotoTable.fetch_for_photo", _tmp13_, &_inner_error_); -#line 1205 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1206 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1205 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1206 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (_inner_error_->domain == DATABASE_ERROR) { -#line 1205 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1206 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_propagate_error (error, _inner_error_); -#line 1205 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1206 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _sqlite3_finalize0 (stmt); -#line 1205 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1206 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return NULL; #line 8798 "PhotoTable.c" } else { -#line 1205 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1206 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _sqlite3_finalize0 (stmt); -#line 1205 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1206 "/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); -#line 1205 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1206 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_clear_error (&_inner_error_); -#line 1205 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1206 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return NULL; #line 8808 "PhotoTable.c" } } } } -#line 1207 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1208 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp14_ = backing_photo_row_new (); -#line 1207 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - row = _tmp14_; #line 1208 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" + row = _tmp14_; +#line 1209 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp15_ = row; -#line 1208 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1209 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp16_ = *id; -#line 1208 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp15_->id = _tmp16_; #line 1209 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" + _tmp15_->id = _tmp16_; +#line 1210 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp17_ = row; -#line 1209 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1210 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp18_ = stmt; -#line 1209 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1210 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp19_ = sqlite3_column_text (_tmp18_, 0); -#line 1209 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1210 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp20_ = g_strdup (_tmp19_); -#line 1209 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1210 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_free0 (_tmp17_->filepath); -#line 1209 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp17_->filepath = _tmp20_; #line 1210 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" + _tmp17_->filepath = _tmp20_; +#line 1211 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp21_ = row; -#line 1210 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1211 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp22_ = stmt; -#line 1210 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1211 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp23_ = sqlite3_column_int64 (_tmp22_, 1); -#line 1210 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp21_->timestamp = (time_t) _tmp23_; #line 1211 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" + _tmp21_->timestamp = (time_t) _tmp23_; +#line 1212 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp24_ = row; -#line 1211 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1212 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp25_ = stmt; -#line 1211 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1212 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp26_ = sqlite3_column_int64 (_tmp25_, 2); -#line 1211 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp24_->filesize = _tmp26_; #line 1212 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" + _tmp24_->filesize = _tmp26_; +#line 1213 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp27_ = row; -#line 1212 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1213 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp28_ = stmt; -#line 1212 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1213 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp29_ = sqlite3_column_int (_tmp28_, 3); -#line 1212 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1213 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp30_ = stmt; -#line 1212 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1213 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp31_ = sqlite3_column_int (_tmp30_, 4); -#line 1212 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - dimensions_init (&_tmp27_->dim, _tmp29_, _tmp31_); #line 1213 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" + dimensions_init (&_tmp27_->dim, _tmp29_, _tmp31_); +#line 1214 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp32_ = row; -#line 1213 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1214 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp33_ = stmt; -#line 1213 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1214 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp34_ = sqlite3_column_int (_tmp33_, 5); -#line 1213 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp32_->original_orientation = (Orientation) _tmp34_; #line 1214 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" + _tmp32_->original_orientation = (Orientation) _tmp34_; +#line 1215 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp35_ = row; -#line 1214 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1215 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp36_ = stmt; -#line 1214 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1215 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp37_ = sqlite3_column_int (_tmp36_, 6); -#line 1214 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1215 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp38_ = photo_file_format_unserialize (_tmp37_); -#line 1214 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp35_->file_format = _tmp38_; #line 1215 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" + _tmp35_->file_format = _tmp38_; +#line 1216 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp39_ = row; -#line 1215 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1216 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp40_ = stmt; -#line 1215 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1216 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp41_ = sqlite3_column_int64 (_tmp40_, 7); -#line 1215 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1216 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp39_->time_created = (time_t) _tmp41_; -#line 1217 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1218 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" result = row; -#line 1217 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1218 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _sqlite3_finalize0 (stmt); -#line 1217 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1218 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; #line 8895 "PhotoTable.c" } @@ -8968,171 +8968,171 @@ void backing_photo_table_update (BackingPhotoTable* self, BackingPhotoRow* row, gint _tmp44_ = 0; gint _tmp45_ = 0; GError * _inner_error_ = NULL; -#line 1221 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1222 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_if_fail (IS_BACKING_PHOTO_TABLE (self)); -#line 1221 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1222 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_if_fail (IS_BACKING_PHOTO_ROW (row)); -#line 1223 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1224 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp0_ = database_table_db; -#line 1223 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1224 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp2_ = sqlite3_prepare_v2 (_tmp0_, "UPDATE BackingPhotoTable SET timestamp=?, filesize=?, " "width=?, height=?, original_orientation=?, file_format=? " "WHERE id=?", -1, &_tmp1_, NULL); -#line 1223 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1224 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _sqlite3_finalize0 (stmt); -#line 1223 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1224 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" stmt = _tmp1_; -#line 1223 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1224 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" res = _tmp2_; -#line 1227 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1228 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp3_ = res; -#line 1227 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1228 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _vala_assert (_tmp3_ == SQLITE_OK, "res == Sqlite.OK"); -#line 1229 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1230 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp4_ = stmt; -#line 1229 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1230 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp5_ = row; -#line 1229 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1230 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp6_ = _tmp5_->timestamp; -#line 1229 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1230 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp7_ = sqlite3_bind_int64 (_tmp4_, 1, (gint64) _tmp6_); -#line 1229 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp7_; #line 1230 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" + res = _tmp7_; +#line 1231 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp8_ = res; -#line 1230 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp8_ == SQLITE_OK, "res == Sqlite.OK"); #line 1231 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" + _vala_assert (_tmp8_ == SQLITE_OK, "res == Sqlite.OK"); +#line 1232 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp9_ = stmt; -#line 1231 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1232 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp10_ = row; -#line 1231 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1232 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp11_ = _tmp10_->filesize; -#line 1231 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1232 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp12_ = sqlite3_bind_int64 (_tmp9_, 2, _tmp11_); -#line 1231 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp12_; #line 1232 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" + res = _tmp12_; +#line 1233 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp13_ = res; -#line 1232 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp13_ == SQLITE_OK, "res == Sqlite.OK"); #line 1233 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" + _vala_assert (_tmp13_ == SQLITE_OK, "res == Sqlite.OK"); +#line 1234 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp14_ = stmt; -#line 1233 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1234 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp15_ = row; -#line 1233 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1234 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp16_ = _tmp15_->dim; -#line 1233 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1234 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp17_ = _tmp16_.width; -#line 1233 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1234 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp18_ = sqlite3_bind_int (_tmp14_, 3, _tmp17_); -#line 1233 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp18_; #line 1234 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" + res = _tmp18_; +#line 1235 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp19_ = res; -#line 1234 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp19_ == SQLITE_OK, "res == Sqlite.OK"); #line 1235 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" + _vala_assert (_tmp19_ == SQLITE_OK, "res == Sqlite.OK"); +#line 1236 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp20_ = stmt; -#line 1235 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1236 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp21_ = row; -#line 1235 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1236 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp22_ = _tmp21_->dim; -#line 1235 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1236 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp23_ = _tmp22_.height; -#line 1235 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1236 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp24_ = sqlite3_bind_int (_tmp20_, 4, _tmp23_); -#line 1235 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp24_; #line 1236 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" + res = _tmp24_; +#line 1237 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp25_ = res; -#line 1236 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp25_ == SQLITE_OK, "res == Sqlite.OK"); #line 1237 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" + _vala_assert (_tmp25_ == SQLITE_OK, "res == Sqlite.OK"); +#line 1238 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp26_ = stmt; -#line 1237 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1238 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp27_ = row; -#line 1237 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1238 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp28_ = _tmp27_->original_orientation; -#line 1237 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1238 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp29_ = sqlite3_bind_int (_tmp26_, 5, (gint) _tmp28_); -#line 1237 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp29_; #line 1238 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" + res = _tmp29_; +#line 1239 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp30_ = res; -#line 1238 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp30_ == SQLITE_OK, "res == Sqlite.OK"); #line 1239 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" + _vala_assert (_tmp30_ == SQLITE_OK, "res == Sqlite.OK"); +#line 1240 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp31_ = stmt; -#line 1239 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1240 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp32_ = row; -#line 1239 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1240 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp33_ = _tmp32_->file_format; -#line 1239 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1240 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp34_ = photo_file_format_serialize (_tmp33_); -#line 1239 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1240 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp35_ = sqlite3_bind_int (_tmp31_, 6, _tmp34_); -#line 1239 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp35_; #line 1240 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" + res = _tmp35_; +#line 1241 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp36_ = res; -#line 1240 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp36_ == SQLITE_OK, "res == Sqlite.OK"); #line 1241 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" + _vala_assert (_tmp36_ == SQLITE_OK, "res == Sqlite.OK"); +#line 1242 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp37_ = stmt; -#line 1241 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1242 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp38_ = row; -#line 1241 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1242 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp39_ = _tmp38_->id; -#line 1241 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1242 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp40_ = _tmp39_.id; -#line 1241 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1242 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp41_ = sqlite3_bind_int64 (_tmp37_, 7, _tmp40_); -#line 1241 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp41_; #line 1242 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" + res = _tmp41_; +#line 1243 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp42_ = res; -#line 1242 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1243 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _vala_assert (_tmp42_ == SQLITE_OK, "res == Sqlite.OK"); -#line 1244 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1245 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp43_ = stmt; -#line 1244 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1245 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp44_ = sqlite3_step (_tmp43_); -#line 1244 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp44_; #line 1245 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" + res = _tmp44_; +#line 1246 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp45_ = res; -#line 1245 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1246 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (_tmp45_ != SQLITE_DONE) { #line 9083 "PhotoTable.c" gint _tmp46_ = 0; -#line 1246 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1247 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp46_ = res; -#line 1246 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1247 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" database_table_throw_error ("BackingPhotoTable.update", _tmp46_, &_inner_error_); -#line 1246 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1247 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1246 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1247 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (_inner_error_->domain == DATABASE_ERROR) { -#line 1246 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1247 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_propagate_error (error, _inner_error_); -#line 1246 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1247 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _sqlite3_finalize0 (stmt); -#line 1246 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1247 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; #line 9099 "PhotoTable.c" } else { -#line 1246 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1247 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _sqlite3_finalize0 (stmt); -#line 1246 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1247 "/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); -#line 1246 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1247 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_clear_error (&_inner_error_); -#line 1246 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1247 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; #line 9109 "PhotoTable.c" } } } -#line 1221 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1222 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _sqlite3_finalize0 (stmt); #line 9115 "PhotoTable.c" } @@ -9162,103 +9162,103 @@ void backing_photo_table_update_attributes (BackingPhotoTable* self, BackingPhot gint _tmp18_ = 0; gint _tmp19_ = 0; GError * _inner_error_ = NULL; -#line 1249 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1250 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_if_fail (IS_BACKING_PHOTO_TABLE (self)); -#line 1249 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1250 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_if_fail (id != NULL); -#line 1251 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1252 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp0_ = database_table_db; -#line 1251 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1252 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp2_ = sqlite3_prepare_v2 (_tmp0_, "UPDATE BackingPhotoTable SET timestamp=?, filesize=? WHERE id=?", -1, &_tmp1_, NULL); -#line 1251 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1252 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _sqlite3_finalize0 (stmt); -#line 1251 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1252 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" stmt = _tmp1_; -#line 1251 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1252 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" res = _tmp2_; -#line 1253 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1254 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp3_ = res; -#line 1253 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1254 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _vala_assert (_tmp3_ == SQLITE_OK, "res == Sqlite.OK"); -#line 1255 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1256 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp4_ = stmt; -#line 1255 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1256 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp5_ = timestamp; -#line 1255 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1256 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp6_ = sqlite3_bind_int64 (_tmp4_, 1, (gint64) _tmp5_); -#line 1255 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp6_; #line 1256 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" + res = _tmp6_; +#line 1257 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp7_ = res; -#line 1256 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp7_ == SQLITE_OK, "res == Sqlite.OK"); #line 1257 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" + _vala_assert (_tmp7_ == SQLITE_OK, "res == Sqlite.OK"); +#line 1258 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp8_ = stmt; -#line 1257 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1258 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp9_ = filesize; -#line 1257 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1258 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp10_ = sqlite3_bind_int64 (_tmp8_, 2, _tmp9_); -#line 1257 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp10_; #line 1258 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" + res = _tmp10_; +#line 1259 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp11_ = res; -#line 1258 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp11_ == SQLITE_OK, "res == Sqlite.OK"); #line 1259 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" + _vala_assert (_tmp11_ == SQLITE_OK, "res == Sqlite.OK"); +#line 1260 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp12_ = stmt; -#line 1259 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1260 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp13_ = *id; -#line 1259 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1260 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp14_ = _tmp13_.id; -#line 1259 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1260 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp15_ = sqlite3_bind_int64 (_tmp12_, 3, _tmp14_); -#line 1259 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp15_; #line 1260 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" + res = _tmp15_; +#line 1261 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp16_ = res; -#line 1260 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1261 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _vala_assert (_tmp16_ == SQLITE_OK, "res == Sqlite.OK"); -#line 1262 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1263 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp17_ = stmt; -#line 1262 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1263 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp18_ = sqlite3_step (_tmp17_); -#line 1262 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp18_; #line 1263 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" + res = _tmp18_; +#line 1264 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp19_ = res; -#line 1263 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1264 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (_tmp19_ != SQLITE_DONE) { #line 9209 "PhotoTable.c" gint _tmp20_ = 0; -#line 1264 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1265 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp20_ = res; -#line 1264 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1265 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" database_table_throw_error ("BackingPhotoTable.update_attributes", _tmp20_, &_inner_error_); -#line 1264 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1265 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1264 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1265 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (_inner_error_->domain == DATABASE_ERROR) { -#line 1264 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1265 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_propagate_error (error, _inner_error_); -#line 1264 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1265 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _sqlite3_finalize0 (stmt); -#line 1264 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1265 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; #line 9225 "PhotoTable.c" } else { -#line 1264 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1265 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _sqlite3_finalize0 (stmt); -#line 1264 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1265 "/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); -#line 1264 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1265 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_clear_error (&_inner_error_); -#line 1264 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1265 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; #line 9235 "PhotoTable.c" } } } -#line 1249 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1250 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _sqlite3_finalize0 (stmt); #line 9241 "PhotoTable.c" } @@ -9268,31 +9268,31 @@ void backing_photo_table_remove (BackingPhotoTable* self, BackingPhotoID* backin BackingPhotoID _tmp0_ = {0}; gint64 _tmp1_ = 0LL; GError * _inner_error_ = NULL; -#line 1267 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1268 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_if_fail (IS_BACKING_PHOTO_TABLE (self)); -#line 1267 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - g_return_if_fail (backing_id != NULL); #line 1268 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" + g_return_if_fail (backing_id != NULL); +#line 1269 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp0_ = *backing_id; -#line 1268 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1269 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp1_ = _tmp0_.id; -#line 1268 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1269 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" database_table_delete_by_id (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp1_, &_inner_error_); -#line 1268 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1269 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1268 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1269 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (_inner_error_->domain == DATABASE_ERROR) { -#line 1268 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1269 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_propagate_error (error, _inner_error_); -#line 1268 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1269 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; #line 9267 "PhotoTable.c" } else { -#line 1268 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#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); -#line 1268 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1269 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_clear_error (&_inner_error_); -#line 1268 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1269 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; #line 9275 "PhotoTable.c" } @@ -9305,35 +9305,35 @@ void backing_photo_table_set_filepath (BackingPhotoTable* self, BackingPhotoID* gint64 _tmp1_ = 0LL; const gchar* _tmp2_ = NULL; GError * _inner_error_ = NULL; -#line 1271 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1272 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_if_fail (IS_BACKING_PHOTO_TABLE (self)); -#line 1271 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1272 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_if_fail (id != NULL); -#line 1271 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - g_return_if_fail (filepath != NULL); #line 1272 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" + g_return_if_fail (filepath != NULL); +#line 1273 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp0_ = *id; -#line 1272 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1273 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp1_ = _tmp0_.id; -#line 1272 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1273 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp2_ = filepath; -#line 1272 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1273 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" database_table_update_text_by_id_2 (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp1_, "filepath", _tmp2_, &_inner_error_); -#line 1272 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1273 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1272 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1273 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (_inner_error_->domain == DATABASE_ERROR) { -#line 1272 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1273 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_propagate_error (error, _inner_error_); -#line 1272 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1273 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; #line 9308 "PhotoTable.c" } else { -#line 1272 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#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); -#line 1272 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1273 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_clear_error (&_inner_error_); -#line 1272 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1273 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; #line 9316 "PhotoTable.c" } @@ -9346,33 +9346,33 @@ void backing_photo_table_update_timestamp (BackingPhotoTable* self, BackingPhoto gint64 _tmp1_ = 0LL; time_t _tmp2_ = 0; GError * _inner_error_ = NULL; -#line 1275 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1276 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_if_fail (IS_BACKING_PHOTO_TABLE (self)); -#line 1275 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - g_return_if_fail (id != NULL); #line 1276 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" + g_return_if_fail (id != NULL); +#line 1277 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp0_ = *id; -#line 1276 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1277 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp1_ = _tmp0_.id; -#line 1276 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1277 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp2_ = timestamp; -#line 1276 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1277 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" database_table_update_int64_by_id_2 (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp1_, "timestamp", (gint64) _tmp2_, &_inner_error_); -#line 1276 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1277 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1276 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1277 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (_inner_error_->domain == DATABASE_ERROR) { -#line 1276 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1277 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_propagate_error (error, _inner_error_); -#line 1276 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1277 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; #line 9347 "PhotoTable.c" } else { -#line 1276 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#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); -#line 1276 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1277 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_clear_error (&_inner_error_); -#line 1276 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1277 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; #line 9355 "PhotoTable.c" } @@ -9381,9 +9381,9 @@ void backing_photo_table_update_timestamp (BackingPhotoTable* self, BackingPhoto static void backing_photo_table_class_init (BackingPhotoTableClass * klass) { -#line 1121 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1122 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" backing_photo_table_parent_class = g_type_class_peek_parent (klass); -#line 1121 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1122 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" ((DatabaseTableClass *) klass)->finalize = backing_photo_table_finalize; #line 9366 "PhotoTable.c" } @@ -9395,9 +9395,9 @@ static void backing_photo_table_instance_init (BackingPhotoTable * self) { static void backing_photo_table_finalize (DatabaseTable* obj) { BackingPhotoTable * self; -#line 1121 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1122 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_BACKING_PHOTO_TABLE, BackingPhotoTable); -#line 1121 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" +#line 1122 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" DATABASE_TABLE_CLASS (backing_photo_table_parent_class)->finalize (obj); #line 9380 "PhotoTable.c" } diff --git a/src/db/PhotoTable.vala b/src/db/PhotoTable.vala index 4304da8..24cec86 100644 --- a/src/db/PhotoTable.vala +++ b/src/db/PhotoTable.vala @@ -920,14 +920,15 @@ public class PhotoTable : DatabaseTable { sql += " OR (("; first = false; - if (thumbnail_md5 != null) - sql += " thumbnail_md5=?"; - if (md5 != null) { - if (thumbnail_md5 == null) - sql += " md5=?"; + sql += " md5=?"; + + } + if (thumbnail_md5 != null) { + if (md5 == null) + sql += " thumbnail_md5=?"; else - sql += " OR md5=?"; + sql += " OR (md5 IS NULL AND thumbnail_md5=?)"; } sql += ")"; diff --git a/src/db/SavedSearchDBTable.c b/src/db/SavedSearchDBTable.c index 1747d47..f0c850f 100644 --- a/src/db/SavedSearchDBTable.c +++ b/src/db/SavedSearchDBTable.c @@ -1,4 +1,4 @@ -/* SavedSearchDBTable.c generated by valac 0.32.1, the Vala compiler +/* SavedSearchDBTable.c generated by valac 0.34.4, the Vala compiler * generated from SavedSearchDBTable.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/db/TagTable.c b/src/db/TagTable.c index 1c58788..1e38ccd 100644 --- a/src/db/TagTable.c +++ b/src/db/TagTable.c @@ -1,4 +1,4 @@ -/* TagTable.c generated by valac 0.32.1, the Vala compiler +/* TagTable.c generated by valac 0.34.4, the Vala compiler * generated from TagTable.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -645,11 +645,11 @@ static gpointer _g_object_ref0 (gpointer self) { static gchar* string_replace (const gchar* self, const gchar* old, const gchar* replacement) { gchar* result = NULL; GError * _inner_error_ = NULL; -#line 1380 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1380 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_return_val_if_fail (old != NULL, NULL); -#line 1380 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_return_val_if_fail (replacement != NULL, NULL); #line 655 "TagTable.c" { @@ -664,98 +664,98 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar* const gchar* _tmp7_ = NULL; gchar* _tmp8_ = NULL; gchar* _tmp9_ = NULL; -#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp0_ = old; -#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp1_ = g_regex_escape_string (_tmp0_, -1); -#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp2_ = _tmp1_; -#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp3_ = g_regex_new (_tmp2_, 0, 0, &_inner_error_); -#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp4_ = _tmp3_; -#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _g_free0 (_tmp2_); -#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" regex = _tmp4_; -#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_inner_error_->domain == G_REGEX_ERROR) { #line 686 "TagTable.c" - goto __catch19_g_regex_error; + goto __catch21_g_regex_error; } -#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_clear_error (&_inner_error_); -#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return NULL; #line 695 "TagTable.c" } -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp6_ = regex; -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp7_ = replacement; -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp8_ = g_regex_replace_literal (_tmp6_, self, (gssize) -1, 0, _tmp7_, 0, &_inner_error_); -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp5_ = _tmp8_; -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _g_regex_unref0 (regex); -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_inner_error_->domain == G_REGEX_ERROR) { #line 711 "TagTable.c" - goto __catch19_g_regex_error; + goto __catch21_g_regex_error; } -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _g_regex_unref0 (regex); -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_clear_error (&_inner_error_); -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return NULL; #line 722 "TagTable.c" } -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp9_ = _tmp5_; -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp5_ = NULL; -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" result = _tmp9_; -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _g_free0 (_tmp5_); -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _g_regex_unref0 (regex); -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return result; #line 736 "TagTable.c" } - goto __finally19; - __catch19_g_regex_error: + goto __finally21; + __catch21_g_regex_error: { GError* e = NULL; -#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" e = _inner_error_; -#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _inner_error_ = NULL; -#line 1385 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1385 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_assert_not_reached (); -#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _g_error_free0 (e); #line 750 "TagTable.c" } - __finally19: -#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" + __finally21: +#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_clear_error (&_inner_error_); -#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return NULL; #line 761 "TagTable.c" } @@ -786,7 +786,7 @@ void tag_table_upgrade_for_htags (void) { #line 65 "/home/jens/Source/shotwell/src/db/TagTable.vala" if (_inner_error_->domain == DATABASE_ERROR) { #line 789 "TagTable.c" - goto __catch18_database_error; + goto __catch20_database_error; } #line 65 "/home/jens/Source/shotwell/src/db/TagTable.vala" _database_table_unref0 (table); @@ -899,7 +899,7 @@ void tag_table_upgrade_for_htags (void) { #line 69 "/home/jens/Source/shotwell/src/db/TagTable.vala" if (_inner_error_->domain == DATABASE_ERROR) { #line 902 "TagTable.c" - goto __catch18_database_error; + goto __catch20_database_error; } #line 69 "/home/jens/Source/shotwell/src/db/TagTable.vala" _tag_row_unref0 (row); @@ -929,8 +929,8 @@ void tag_table_upgrade_for_htags (void) { _g_object_unref0 (rows); #line 931 "TagTable.c" } - goto __finally18; - __catch18_database_error: + goto __finally20; + __catch20_database_error: { GError* e = NULL; const gchar* _tmp23_ = NULL; @@ -947,7 +947,7 @@ void tag_table_upgrade_for_htags (void) { _g_error_free0 (e); #line 948 "TagTable.c" } - __finally18: + __finally20: #line 64 "/home/jens/Source/shotwell/src/db/TagTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 64 "/home/jens/Source/shotwell/src/db/TagTable.vala" @@ -2013,15 +2013,15 @@ static gchar string_get (const gchar* self, glong index) { gchar result = '\0'; glong _tmp0_ = 0L; gchar _tmp1_ = '\0'; -#line 1086 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1086 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, '\0'); -#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp0_ = index; -#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp1_ = ((gchar*) self)[_tmp0_]; -#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" result = _tmp1_; -#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return result; #line 2025 "TagTable.c" } diff --git a/src/db/TombstoneTable.c b/src/db/TombstoneTable.c index 542e568..7829600 100644 --- a/src/db/TombstoneTable.c +++ b/src/db/TombstoneTable.c @@ -1,4 +1,4 @@ -/* TombstoneTable.c generated by valac 0.32.1, the Vala compiler +/* TombstoneTable.c generated by valac 0.34.4, 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 fa79d52..895d2ad 100644 --- a/src/db/VersionTable.c +++ b/src/db/VersionTable.c @@ -1,4 +1,4 @@ -/* VersionTable.c generated by valac 0.32.1, the Vala compiler +/* VersionTable.c generated by valac 0.34.4, 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 8b8d78a..39adf72 100644 --- a/src/db/VideoTable.c +++ b/src/db/VideoTable.c @@ -1,4 +1,4 @@ -/* VideoTable.c generated by valac 0.32.1, the Vala compiler +/* VideoTable.c generated by valac 0.34.4, the Vala compiler * generated from VideoTable.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. -- cgit v1.2.3