diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2018-06-25 20:57:00 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2018-06-25 20:57:00 +0200 |
| commit | a9bafe967a7a664c43dec4aeb64a6f6e0f284e05 (patch) | |
| tree | 653c43a63b70c47278367ad2a4e92640a6669b44 /src/db | |
| parent | 55778740c211992cc86ea87588ab62c6750f36d1 (diff) | |
| parent | ab841afa5cb39058d9ab2cebb67cfe6369443f6e (diff) | |
Update upstream source from tag 'upstream/0.28.3'
Update to upstream version '0.28.3'
with Debian dir 828a38627ed9287d7cf2466fb15ebdea073742b7
Diffstat (limited to 'src/db')
| -rw-r--r-- | src/db/DatabaseTable.c | 1978 | ||||
| -rw-r--r-- | src/db/Db.c | 497 | ||||
| -rw-r--r-- | src/db/EventTable.c | 1274 | ||||
| -rw-r--r-- | src/db/PhotoTable.c | 7658 | ||||
| -rw-r--r-- | src/db/SavedSearchDBTable.c | 3731 | ||||
| -rw-r--r-- | src/db/TagTable.c | 1497 | ||||
| -rw-r--r-- | src/db/TombstoneTable.c | 871 | ||||
| -rw-r--r-- | src/db/VersionTable.c | 373 | ||||
| -rw-r--r-- | src/db/VideoTable.c | 2513 |
9 files changed, 9723 insertions, 10669 deletions
diff --git a/src/db/DatabaseTable.c b/src/db/DatabaseTable.c index 8d595f0..4c1b44e 100644 --- a/src/db/DatabaseTable.c +++ b/src/db/DatabaseTable.c @@ -1,4 +1,4 @@ -/* DatabaseTable.c generated by valac 0.36.6, the Vala compiler +/* DatabaseTable.c generated by valac 0.40.4, the Vala compiler * generated from DatabaseTable.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,6 +7,7 @@ * See the COPYING file in this distribution. */ + #include <glib.h> #include <glib-object.h> #include <stdlib.h> @@ -73,41 +74,87 @@ static gint database_table_in_transaction = 0; GQuark database_error_quark (void); gpointer database_table_ref (gpointer instance); void database_table_unref (gpointer instance); -GParamSpec* param_spec_database_table (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_database_table (GValue* value, gpointer v_object); -void value_take_database_table (GValue* value, gpointer v_object); +GParamSpec* param_spec_database_table (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_database_table (GValue* value, + gpointer v_object); +void value_take_database_table (GValue* value, + gpointer v_object); gpointer value_get_database_table (const GValue* value); GType database_table_get_type (void) G_GNUC_CONST; -enum { - DATABASE_TABLE_DUMMY_PROPERTY -}; #define DATABASE_TABLE_SCHEMA_VERSION 20 static void database_table_prepare_db (const gchar* filename); void app_window_panic (const gchar* msg); #define DB_IN_MEMORY_NAME ":memory:" void database_table_on_trace (const gchar* message); -static void _database_table_on_trace_sqlite_trace_callback (gpointer self, const gchar* message); +static void _database_table_on_trace_sqlite_trace_callback (gpointer self, + const gchar* message); void database_table_init (const gchar* filename); -void database_table_warning (const gchar* op, gint res); +void database_table_warning (const gchar* op, + gint res); void database_table_terminate (void); -void database_table_fatal (const gchar* op, gint res); -void database_table_set_table_name (DatabaseTable* self, const gchar* table_name); -void database_table_throw_error (const gchar* method, gint res, GError** error); -gboolean database_table_exists_by_id (DatabaseTable* self, gint64 id); -gboolean database_table_select_by_id (DatabaseTable* self, gint64 id, const gchar* columns, sqlite3_stmt* * stmt); -static void database_table_prepare_update_by_id (DatabaseTable* self, gint64 id, const gchar* column, sqlite3_stmt* * stmt); -static gboolean database_table_execute_update_by_id (DatabaseTable* self, sqlite3_stmt* stmt); -gboolean database_table_update_text_by_id (DatabaseTable* self, gint64 id, const gchar* column, const gchar* text); -void database_table_update_text_by_id_2 (DatabaseTable* self, gint64 id, const gchar* column, const gchar* text, GError** error); -gboolean database_table_update_int_by_id (DatabaseTable* self, gint64 id, const gchar* column, gint value); -void database_table_update_int_by_id_2 (DatabaseTable* self, gint64 id, const gchar* column, gint value, GError** error); -gboolean database_table_update_int64_by_id (DatabaseTable* self, gint64 id, const gchar* column, gint64 value); -void database_table_update_int64_by_id_2 (DatabaseTable* self, gint64 id, const gchar* column, gint64 value, GError** error); -void database_table_delete_by_id (DatabaseTable* self, gint64 id, GError** error); -gboolean database_table_has_column (const gchar* table_name, const gchar* column_name); +void database_table_fatal (const gchar* op, + gint res); +void database_table_set_table_name (DatabaseTable* self, + const gchar* table_name); +void database_table_throw_error (const gchar* method, + gint res, + GError** error); +gboolean database_table_exists_by_id (DatabaseTable* self, + gint64 id); +gboolean database_table_select_by_id (DatabaseTable* self, + gint64 id, + const gchar* columns, + sqlite3_stmt* * stmt); +static void database_table_prepare_update_by_id (DatabaseTable* self, + gint64 id, + const gchar* column, + sqlite3_stmt* * stmt); +static gboolean database_table_execute_update_by_id (DatabaseTable* self, + sqlite3_stmt* stmt); +gboolean database_table_update_text_by_id (DatabaseTable* self, + gint64 id, + const gchar* column, + const gchar* text); +void database_table_update_text_by_id_2 (DatabaseTable* self, + gint64 id, + const gchar* column, + const gchar* text, + GError** error); +gboolean database_table_update_int_by_id (DatabaseTable* self, + gint64 id, + const gchar* column, + gint value); +void database_table_update_int_by_id_2 (DatabaseTable* self, + gint64 id, + const gchar* column, + gint value, + GError** error); +gboolean database_table_update_int64_by_id (DatabaseTable* self, + gint64 id, + const gchar* column, + gint64 value); +void database_table_update_int64_by_id_2 (DatabaseTable* self, + gint64 id, + const gchar* column, + gint64 value, + GError** error); +void database_table_delete_by_id (DatabaseTable* self, + gint64 id, + GError** error); +gboolean database_table_has_column (const gchar* table_name, + const gchar* column_name); gboolean database_table_has_table (const gchar* table_name); -gboolean database_table_add_column (const gchar* table_name, const gchar* column_name, const gchar* column_constraints); -gboolean database_table_ensure_column (const gchar* table_name, const gchar* column_name, const gchar* column_constraints, const gchar* upgrade_msg); +gboolean database_table_add_column (const gchar* table_name, + const gchar* column_name, + const gchar* column_constraints); +gboolean database_table_ensure_column (const gchar* table_name, + const gchar* column_name, + const gchar* column_constraints, + const gchar* upgrade_msg); gint database_table_get_row_count (DatabaseTable* self); void database_table_begin_transaction (void); void database_table_commit_transaction (GError** error); @@ -115,156 +162,142 @@ DatabaseTable* database_table_construct (GType object_type); static void database_table_finalize (DatabaseTable * obj); -GQuark database_error_quark (void) { +GQuark +database_error_quark (void) +{ return g_quark_from_static_string ("database_error-quark"); } -static void _database_table_on_trace_sqlite_trace_callback (gpointer self, const gchar* message) { +static void +_database_table_on_trace_sqlite_trace_callback (gpointer self, + const gchar* message) +{ #line 57 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" database_table_on_trace (message); -#line 127 "DatabaseTable.c" +#line 179 "DatabaseTable.c" } -static void database_table_prepare_db (const gchar* filename) { +static void +database_table_prepare_db (const gchar* filename) +{ gint res = 0; - const gchar* _tmp0_; - sqlite3* _tmp1_ = NULL; + sqlite3* _tmp0_ = NULL; + gint _tmp1_; gint _tmp2_; - gint _tmp3_; - const gchar* _tmp8_; const gchar* sql_debug = NULL; - const gchar* _tmp23_; - gboolean _tmp24_ = FALSE; - const gchar* _tmp25_; + const gchar* _tmp16_; + gboolean _tmp17_ = FALSE; + const gchar* _tmp18_; GError * _inner_error_ = NULL; #line 32 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" g_return_if_fail (filename != NULL); #line 34 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp0_ = filename; -#line 34 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp2_ = sqlite3_open_v2 (_tmp0_, &_tmp1_, SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE, NULL); + _tmp1_ = sqlite3_open_v2 (filename, &_tmp0_, SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE, NULL); #line 34 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _sqlite3_close0 (database_table_db); #line 34 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - database_table_db = _tmp1_; + database_table_db = _tmp0_; #line 34 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - res = _tmp2_; + res = _tmp1_; #line 36 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp3_ = res; + _tmp2_ = res; #line 36 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - if (_tmp3_ != SQLITE_OK) { -#line 159 "DatabaseTable.c" - const gchar* _tmp4_; - gint _tmp5_; - gchar* _tmp6_; - gchar* _tmp7_; -#line 37 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp4_ = filename; + if (_tmp2_ != SQLITE_OK) { +#line 209 "DatabaseTable.c" + gint _tmp3_; + gchar* _tmp4_; + gchar* _tmp5_; #line 37 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp5_ = res; + _tmp3_ = res; #line 37 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp6_ = g_strdup_printf (_ ("Unable to open/create photo database %s: error code %d"), _tmp4_, _tmp5_); + _tmp4_ = g_strdup_printf (_ ("Unable to open/create photo database %s: error code %d"), filename, _tmp3_); #line 37 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp7_ = _tmp6_; + _tmp5_ = _tmp4_; #line 37 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - app_window_panic (_tmp7_); + app_window_panic (_tmp5_); #line 37 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _g_free0 (_tmp7_); -#line 176 "DatabaseTable.c" + _g_free0 (_tmp5_); +#line 223 "DatabaseTable.c" } #line 41 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp8_ = filename; -#line 41 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - if (g_strcmp0 (_tmp8_, DB_IN_MEMORY_NAME) != 0) { -#line 182 "DatabaseTable.c" + if (g_strcmp0 (filename, DB_IN_MEMORY_NAME) != 0) { +#line 227 "DatabaseTable.c" { GFile* file_db = NULL; - const gchar* _tmp9_; - GFile* _tmp10_; + GFile* _tmp6_; GFileInfo* info = NULL; - GFile* _tmp11_; - GFileInfo* _tmp12_; - GFileInfo* _tmp13_; - gboolean _tmp14_; -#line 43 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp9_ = filename; + GFile* _tmp7_; + GFileInfo* _tmp8_; + GFileInfo* _tmp9_; #line 43 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp10_ = g_file_new_for_path (_tmp9_); + _tmp6_ = g_file_new_for_path (filename); #line 43 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - file_db = _tmp10_; + file_db = _tmp6_; #line 44 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp11_ = file_db; + _tmp7_ = file_db; #line 44 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp12_ = g_file_query_info (_tmp11_, G_FILE_ATTRIBUTE_ACCESS_CAN_WRITE, G_FILE_QUERY_INFO_NONE, NULL, &_inner_error_); + _tmp8_ = g_file_query_info (_tmp7_, G_FILE_ATTRIBUTE_ACCESS_CAN_WRITE, G_FILE_QUERY_INFO_NONE, NULL, &_inner_error_); #line 44 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - info = _tmp12_; + info = _tmp8_; #line 44 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 44 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _g_object_unref0 (file_db); -#line 208 "DatabaseTable.c" +#line 249 "DatabaseTable.c" goto __catch15_g_error; } #line 45 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp13_ = info; + _tmp9_ = info; #line 45 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp14_ = g_file_info_get_attribute_boolean (_tmp13_, G_FILE_ATTRIBUTE_ACCESS_CAN_WRITE); -#line 45 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - if (!_tmp14_) { -#line 217 "DatabaseTable.c" - const gchar* _tmp15_; - gchar* _tmp16_; - gchar* _tmp17_; -#line 46 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp15_ = filename; + if (!g_file_info_get_attribute_boolean (_tmp9_, G_FILE_ATTRIBUTE_ACCESS_CAN_WRITE)) { +#line 256 "DatabaseTable.c" + gchar* _tmp10_; + gchar* _tmp11_; #line 46 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp16_ = g_strdup_printf (_ ("Unable to write to photo database file:\n %s"), _tmp15_); + _tmp10_ = g_strdup_printf (_ ("Unable to write to photo database file:\n %s"), filename); #line 46 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp17_ = _tmp16_; + _tmp11_ = _tmp10_; #line 46 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - app_window_panic (_tmp17_); + app_window_panic (_tmp11_); #line 46 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _g_free0 (_tmp17_); -#line 231 "DatabaseTable.c" + _g_free0 (_tmp11_); +#line 267 "DatabaseTable.c" } #line 42 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _g_object_unref0 (info); #line 42 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _g_object_unref0 (file_db); -#line 237 "DatabaseTable.c" +#line 273 "DatabaseTable.c" } goto __finally15; __catch15_g_error: { GError* e = NULL; - const gchar* _tmp18_; - GError* _tmp19_; - const gchar* _tmp20_; - gchar* _tmp21_; - gchar* _tmp22_; + GError* _tmp12_; + const gchar* _tmp13_; + gchar* _tmp14_; + gchar* _tmp15_; #line 42 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" e = _inner_error_; #line 42 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _inner_error_ = NULL; #line 48 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp18_ = filename; -#line 48 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp19_ = e; + _tmp12_ = e; #line 48 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp20_ = _tmp19_->message; + _tmp13_ = _tmp12_->message; #line 48 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp21_ = g_strdup_printf (_ ("Error accessing database file:\n %s\n\nError was: \n%s"), _tmp18_, _tmp20_); + _tmp14_ = g_strdup_printf (_ ("Error accessing database file:\n %s\n\nError was: \n%s"), filename, _tmp13_); #line 48 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp22_ = _tmp21_; + _tmp15_ = _tmp14_; #line 48 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - app_window_panic (_tmp22_); + app_window_panic (_tmp15_); #line 48 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _g_free0 (_tmp22_); + _g_free0 (_tmp15_); #line 42 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _g_error_free0 (e); -#line 268 "DatabaseTable.c" +#line 301 "DatabaseTable.c" } __finally15: #line 42 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" @@ -275,239 +308,225 @@ static void database_table_prepare_db (const gchar* filename) { g_clear_error (&_inner_error_); #line 42 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" return; -#line 279 "DatabaseTable.c" +#line 312 "DatabaseTable.c" } } #line 53 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp23_ = g_getenv ("SHOTWELL_SQL_DEBUG"); + _tmp16_ = g_getenv ("SHOTWELL_SQL_DEBUG"); #line 53 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - sql_debug = _tmp23_; + sql_debug = _tmp16_; #line 56 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp25_ = sql_debug; + _tmp18_ = sql_debug; #line 56 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - if (_tmp25_ != NULL) { -#line 290 "DatabaseTable.c" - const gchar* _tmp26_; + if (_tmp18_ != NULL) { +#line 323 "DatabaseTable.c" + const gchar* _tmp19_; #line 56 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp26_ = sql_debug; + _tmp19_ = sql_debug; #line 56 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp24_ = g_strcmp0 (_tmp26_, "") != 0; -#line 296 "DatabaseTable.c" + _tmp17_ = g_strcmp0 (_tmp19_, "") != 0; +#line 329 "DatabaseTable.c" } else { #line 56 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp24_ = FALSE; -#line 300 "DatabaseTable.c" + _tmp17_ = FALSE; +#line 333 "DatabaseTable.c" } #line 56 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - if (_tmp24_) { -#line 304 "DatabaseTable.c" - sqlite3* _tmp27_; + if (_tmp17_) { +#line 337 "DatabaseTable.c" + sqlite3* _tmp20_; #line 57 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp27_ = database_table_db; + _tmp20_ = database_table_db; #line 57 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - sqlite3_trace (_tmp27_, _database_table_on_trace_sqlite_trace_callback, NULL); -#line 310 "DatabaseTable.c" + sqlite3_trace (_tmp20_, _database_table_on_trace_sqlite_trace_callback, NULL); +#line 343 "DatabaseTable.c" } } -void database_table_on_trace (const gchar* message) { - const gchar* _tmp0_; +void +database_table_on_trace (const gchar* message) +{ #line 61 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" g_return_if_fail (message != NULL); #line 62 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp0_ = message; -#line 62 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - g_debug ("DatabaseTable.vala:62: SQLITE: %s", _tmp0_); -#line 323 "DatabaseTable.c" + g_debug ("DatabaseTable.vala:62: SQLITE: %s", message); +#line 355 "DatabaseTable.c" } -static gint _sqlite3_exec (sqlite3* self, const gchar* sql, sqlite3_callback callback, void* callback_target, gchar* * errmsg) { +static gint +_sqlite3_exec (sqlite3* self, + const gchar* sql, + sqlite3_callback callback, + void* callback_target, + gchar* * errmsg) +{ gchar* _vala_errmsg = NULL; gint result = 0; const gchar* sqlite_errmsg = NULL; gint ec = 0; - const gchar* _tmp0_; - sqlite3_callback _tmp1_; - void* _tmp1__target; - const gchar* _tmp2_ = NULL; - gint _tmp3_; - const gchar* _tmp6_; -#line 34 "/usr/share/vala-0.36/vapi/sqlite3.vapi" + const gchar* _tmp0_ = NULL; + gint _tmp1_; + const gchar* _tmp4_; +#line 34 "/usr/share/vala-0.40/vapi/sqlite3.vapi" g_return_val_if_fail (self != NULL, 0); -#line 34 "/usr/share/vala-0.36/vapi/sqlite3.vapi" +#line 34 "/usr/share/vala-0.40/vapi/sqlite3.vapi" g_return_val_if_fail (sql != NULL, 0); -#line 36 "/usr/share/vala-0.36/vapi/sqlite3.vapi" - _tmp0_ = sql; -#line 36 "/usr/share/vala-0.36/vapi/sqlite3.vapi" - _tmp1_ = callback; -#line 36 "/usr/share/vala-0.36/vapi/sqlite3.vapi" - _tmp1__target = callback_target; -#line 36 "/usr/share/vala-0.36/vapi/sqlite3.vapi" - _tmp3_ = sqlite3_exec (self, _tmp0_, _tmp1_, _tmp1__target, (char**) (&_tmp2_)); -#line 36 "/usr/share/vala-0.36/vapi/sqlite3.vapi" - sqlite_errmsg = _tmp2_; -#line 36 "/usr/share/vala-0.36/vapi/sqlite3.vapi" - ec = _tmp3_; -#line 37 "/usr/share/vala-0.36/vapi/sqlite3.vapi" +#line 36 "/usr/share/vala-0.40/vapi/sqlite3.vapi" + _tmp1_ = sqlite3_exec (self, sql, callback, callback_target, (char**) (&_tmp0_)); +#line 36 "/usr/share/vala-0.40/vapi/sqlite3.vapi" + sqlite_errmsg = _tmp0_; +#line 36 "/usr/share/vala-0.40/vapi/sqlite3.vapi" + ec = _tmp1_; +#line 37 "/usr/share/vala-0.40/vapi/sqlite3.vapi" if ((&_vala_errmsg) != NULL) { -#line 356 "DatabaseTable.c" - const gchar* _tmp4_; - gchar* _tmp5_; -#line 38 "/usr/share/vala-0.36/vapi/sqlite3.vapi" - _tmp4_ = sqlite_errmsg; -#line 38 "/usr/share/vala-0.36/vapi/sqlite3.vapi" - _tmp5_ = g_strdup (_tmp4_); -#line 38 "/usr/share/vala-0.36/vapi/sqlite3.vapi" +#line 385 "DatabaseTable.c" + const gchar* _tmp2_; + gchar* _tmp3_; +#line 38 "/usr/share/vala-0.40/vapi/sqlite3.vapi" + _tmp2_ = sqlite_errmsg; +#line 38 "/usr/share/vala-0.40/vapi/sqlite3.vapi" + _tmp3_ = g_strdup (_tmp2_); +#line 38 "/usr/share/vala-0.40/vapi/sqlite3.vapi" _g_free0 (_vala_errmsg); -#line 38 "/usr/share/vala-0.36/vapi/sqlite3.vapi" - _vala_errmsg = _tmp5_; -#line 367 "DatabaseTable.c" +#line 38 "/usr/share/vala-0.40/vapi/sqlite3.vapi" + _vala_errmsg = _tmp3_; +#line 396 "DatabaseTable.c" } -#line 40 "/usr/share/vala-0.36/vapi/sqlite3.vapi" - _tmp6_ = sqlite_errmsg; -#line 40 "/usr/share/vala-0.36/vapi/sqlite3.vapi" - sqlite3_free ((void*) _tmp6_); -#line 41 "/usr/share/vala-0.36/vapi/sqlite3.vapi" +#line 40 "/usr/share/vala-0.40/vapi/sqlite3.vapi" + _tmp4_ = sqlite_errmsg; +#line 40 "/usr/share/vala-0.40/vapi/sqlite3.vapi" + sqlite3_free ((void*) _tmp4_); +#line 41 "/usr/share/vala-0.40/vapi/sqlite3.vapi" result = ec; -#line 41 "/usr/share/vala-0.36/vapi/sqlite3.vapi" +#line 41 "/usr/share/vala-0.40/vapi/sqlite3.vapi" if (errmsg) { -#line 41 "/usr/share/vala-0.36/vapi/sqlite3.vapi" +#line 41 "/usr/share/vala-0.40/vapi/sqlite3.vapi" *errmsg = _vala_errmsg; -#line 379 "DatabaseTable.c" +#line 408 "DatabaseTable.c" } else { -#line 41 "/usr/share/vala-0.36/vapi/sqlite3.vapi" +#line 41 "/usr/share/vala-0.40/vapi/sqlite3.vapi" _g_free0 (_vala_errmsg); -#line 383 "DatabaseTable.c" +#line 412 "DatabaseTable.c" } -#line 41 "/usr/share/vala-0.36/vapi/sqlite3.vapi" +#line 41 "/usr/share/vala-0.40/vapi/sqlite3.vapi" return result; -#line 387 "DatabaseTable.c" +#line 416 "DatabaseTable.c" } -void database_table_init (const gchar* filename) { - const gchar* _tmp0_; +void +database_table_init (const gchar* filename) +{ sqlite3_stmt* stmt = NULL; gint res = 0; - sqlite3* _tmp1_; - sqlite3_stmt* _tmp2_ = NULL; + sqlite3* _tmp0_; + sqlite3_stmt* _tmp1_ = NULL; + gint _tmp2_; gint _tmp3_; - gint _tmp4_; - sqlite3* _tmp18_; - gint _tmp19_; - gint _tmp20_; + sqlite3* _tmp14_; + gint _tmp15_; + gint _tmp16_; GError * _inner_error_ = NULL; #line 65 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" g_return_if_fail (filename != NULL); #line 67 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp0_ = filename; -#line 67 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - database_table_prepare_db (_tmp0_); + database_table_prepare_db (filename); #line 71 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp1_ = database_table_db; + _tmp0_ = database_table_db; #line 71 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp3_ = sqlite3_prepare_v2 (_tmp1_, "CREATE TABLE IF NOT EXISTS VersionTable (" "id INTEGER PRIMARY KEY, " "schema_version INTEGER, " "app_version TEXT, " "user_data TEXT NULL" ")", -1, &_tmp2_, NULL); + _tmp2_ = sqlite3_prepare_v2 (_tmp0_, "CREATE TABLE IF NOT EXISTS VersionTable (" "id INTEGER PRIMARY KEY, " "schema_version INTEGER, " "app_version TEXT, " "user_data TEXT NULL" ")", -1, &_tmp1_, NULL); #line 71 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _sqlite3_finalize0 (stmt); #line 71 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - stmt = _tmp2_; + stmt = _tmp1_; #line 71 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - res = _tmp3_; + res = _tmp2_; #line 79 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp4_ = res; + _tmp3_ = res; #line 79 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - if (_tmp4_ != SQLITE_OK) { -#line 423 "DatabaseTable.c" + if (_tmp3_ != SQLITE_OK) { +#line 451 "DatabaseTable.c" gchar* backup_path = NULL; - const gchar* _tmp5_; - gchar* _tmp6_; + gchar* _tmp4_; #line 80 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _sqlite3_close0 (database_table_db); #line 80 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" database_table_db = NULL; #line 82 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp5_ = filename; -#line 82 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp6_ = g_strconcat (_tmp5_, ".bak", NULL); + _tmp4_ = g_strconcat (filename, ".bak", NULL); #line 82 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - backup_path = _tmp6_; -#line 437 "DatabaseTable.c" + backup_path = _tmp4_; +#line 462 "DatabaseTable.c" { GFile* src = NULL; - const gchar* _tmp7_; - GFile* _tmp8_; + const gchar* _tmp5_; + GFile* _tmp6_; GFile* dest = NULL; - const gchar* _tmp9_; - GFile* _tmp10_; - GFile* _tmp11_; - GFile* _tmp12_; - const gchar* _tmp13_; + GFile* _tmp7_; + GFile* _tmp8_; + GFile* _tmp9_; #line 85 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp7_ = backup_path; + _tmp5_ = backup_path; #line 85 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp8_ = g_file_new_for_commandline_arg (_tmp7_); + _tmp6_ = g_file_new_for_commandline_arg (_tmp5_); #line 85 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - src = _tmp8_; -#line 86 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp9_ = filename; + src = _tmp6_; #line 86 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp10_ = g_file_new_for_commandline_arg (_tmp9_); + _tmp7_ = g_file_new_for_commandline_arg (filename); #line 86 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - dest = _tmp10_; + dest = _tmp7_; #line 87 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp11_ = src; + _tmp8_ = src; #line 87 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp12_ = dest; + _tmp9_ = dest; #line 87 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - g_file_copy (_tmp11_, _tmp12_, G_FILE_COPY_OVERWRITE | G_FILE_COPY_ALL_METADATA, NULL, NULL, NULL, &_inner_error_); + g_file_copy (_tmp8_, _tmp9_, G_FILE_COPY_OVERWRITE | G_FILE_COPY_ALL_METADATA, NULL, NULL, NULL, &_inner_error_); #line 87 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 87 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _g_object_unref0 (dest); #line 87 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _g_object_unref0 (src); -#line 472 "DatabaseTable.c" +#line 493 "DatabaseTable.c" goto __catch16_g_error; } #line 90 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp13_ = filename; -#line 90 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - database_table_prepare_db (_tmp13_); + database_table_prepare_db (filename); #line 84 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _g_object_unref0 (dest); #line 84 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _g_object_unref0 (src); -#line 483 "DatabaseTable.c" +#line 502 "DatabaseTable.c" } goto __finally16; __catch16_g_error: { GError* _error_ = NULL; - GError* _tmp14_; - const gchar* _tmp15_; - gchar* _tmp16_; - gchar* _tmp17_; + GError* _tmp10_; + const gchar* _tmp11_; + gchar* _tmp12_; + gchar* _tmp13_; #line 84 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _error_ = _inner_error_; #line 84 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _inner_error_ = NULL; #line 92 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp14_ = _error_; + _tmp10_ = _error_; #line 92 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp15_ = _tmp14_->message; + _tmp11_ = _tmp10_->message; #line 92 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp16_ = g_strdup_printf (_ ("Unable to restore photo database %s"), _tmp15_); + _tmp12_ = g_strdup_printf (_ ("Unable to restore photo database %s"), _tmp11_); #line 92 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp17_ = _tmp16_; + _tmp13_ = _tmp12_; #line 92 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - app_window_panic (_tmp17_); + app_window_panic (_tmp13_); #line 92 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _g_free0 (_tmp17_); + _g_free0 (_tmp13_); #line 84 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _g_error_free0 (_error_); -#line 511 "DatabaseTable.c" +#line 530 "DatabaseTable.c" } __finally16: #line 84 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" @@ -522,146 +541,137 @@ void database_table_init (const gchar* filename) { g_clear_error (&_inner_error_); #line 84 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" return; -#line 526 "DatabaseTable.c" +#line 545 "DatabaseTable.c" } #line 79 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _g_free0 (backup_path); -#line 530 "DatabaseTable.c" +#line 549 "DatabaseTable.c" } #line 98 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp18_ = database_table_db; + _tmp14_ = database_table_db; #line 98 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp19_ = _sqlite3_exec (_tmp18_, "PRAGMA synchronous=OFF", NULL, NULL, NULL); + _tmp15_ = _sqlite3_exec (_tmp14_, "PRAGMA synchronous=OFF", NULL, NULL, NULL); #line 98 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - res = _tmp19_; + res = _tmp15_; #line 99 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp20_ = res; + _tmp16_ = res; #line 99 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - if (_tmp20_ != SQLITE_OK) { -#line 542 "DatabaseTable.c" - gint _tmp21_; + if (_tmp16_ != SQLITE_OK) { +#line 561 "DatabaseTable.c" + gint _tmp17_; #line 100 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp21_ = res; + _tmp17_ = res; #line 100 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - database_table_warning ("Unable to disable synchronous mode", _tmp21_); -#line 548 "DatabaseTable.c" + database_table_warning ("Unable to disable synchronous mode", _tmp17_); +#line 567 "DatabaseTable.c" } #line 65 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _sqlite3_finalize0 (stmt); -#line 552 "DatabaseTable.c" +#line 571 "DatabaseTable.c" } -void database_table_terminate (void) { +void +database_table_terminate (void) +{ #line 105 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _sqlite3_close0 (database_table_db); #line 105 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" database_table_db = NULL; -#line 561 "DatabaseTable.c" +#line 582 "DatabaseTable.c" } -void database_table_fatal (const gchar* op, gint res) { - const gchar* _tmp0_; - gint _tmp1_; - sqlite3* _tmp2_; - const gchar* _tmp3_; +void +database_table_fatal (const gchar* op, + gint res) +{ + sqlite3* _tmp0_; + const gchar* _tmp1_; #line 109 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" g_return_if_fail (op != NULL); #line 110 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp0_ = op; -#line 110 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp1_ = res; -#line 110 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp2_ = database_table_db; + _tmp0_ = database_table_db; #line 110 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp3_ = sqlite3_errmsg (_tmp2_); + _tmp1_ = sqlite3_errmsg (_tmp0_); #line 110 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - g_error ("DatabaseTable.vala:110: %s: [%d] %s", _tmp0_, _tmp1_, _tmp3_); -#line 582 "DatabaseTable.c" + g_error ("DatabaseTable.vala:110: %s: [%d] %s", op, res, _tmp1_); +#line 600 "DatabaseTable.c" } -void database_table_warning (const gchar* op, gint res) { - const gchar* _tmp0_; - gint _tmp1_; - sqlite3* _tmp2_; - const gchar* _tmp3_; +void +database_table_warning (const gchar* op, + gint res) +{ + sqlite3* _tmp0_; + const gchar* _tmp1_; #line 114 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" g_return_if_fail (op != NULL); #line 115 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp0_ = op; -#line 115 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp1_ = res; -#line 115 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp2_ = database_table_db; + _tmp0_ = database_table_db; #line 115 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp3_ = sqlite3_errmsg (_tmp2_); + _tmp1_ = sqlite3_errmsg (_tmp0_); #line 115 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - g_warning ("DatabaseTable.vala:115: %s: [%d] %s", _tmp0_, _tmp1_, _tmp3_); -#line 603 "DatabaseTable.c" + g_warning ("DatabaseTable.vala:115: %s: [%d] %s", op, res, _tmp1_); +#line 618 "DatabaseTable.c" } -void database_table_set_table_name (DatabaseTable* self, const gchar* table_name) { - const gchar* _tmp0_; - gchar* _tmp1_; +void +database_table_set_table_name (DatabaseTable* self, + const gchar* table_name) +{ + gchar* _tmp0_; #line 118 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" g_return_if_fail (IS_DATABASE_TABLE (self)); #line 118 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" g_return_if_fail (table_name != NULL); #line 119 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp0_ = table_name; -#line 119 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp1_ = g_strdup (_tmp0_); + _tmp0_ = g_strdup (table_name); #line 119 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _g_free0 (self->table_name); #line 119 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - self->table_name = _tmp1_; -#line 622 "DatabaseTable.c" + self->table_name = _tmp0_; +#line 637 "DatabaseTable.c" } -void database_table_throw_error (const gchar* method, gint res, GError** error) { +void +database_table_throw_error (const gchar* method, + gint res, + GError** error) +{ gchar* msg = NULL; - const gchar* _tmp0_; - gint _tmp1_; - sqlite3* _tmp2_; - const gchar* _tmp3_; - gchar* _tmp4_; - gint _tmp5_; + sqlite3* _tmp0_; + const gchar* _tmp1_; + gchar* _tmp2_; GError * _inner_error_ = NULL; #line 124 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" g_return_if_fail (method != NULL); #line 125 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp0_ = method; -#line 125 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp1_ = res; -#line 125 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp2_ = database_table_db; + _tmp0_ = database_table_db; #line 125 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp3_ = sqlite3_errmsg (_tmp2_); + _tmp1_ = sqlite3_errmsg (_tmp0_); #line 125 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp4_ = g_strdup_printf ("(%s) [%d] - %s", _tmp0_, _tmp1_, _tmp3_); + _tmp2_ = g_strdup_printf ("(%s) [%d] - %s", method, res, _tmp1_); #line 125 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - msg = _tmp4_; + msg = _tmp2_; #line 127 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp5_ = res; -#line 127 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - switch (_tmp5_) { + switch (res) { #line 127 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" case SQLITE_OK: #line 127 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" case SQLITE_DONE: #line 127 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" case SQLITE_ROW: -#line 659 "DatabaseTable.c" +#line 669 "DatabaseTable.c" { #line 131 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _g_free0 (msg); #line 131 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" return; -#line 665 "DatabaseTable.c" +#line 675 "DatabaseTable.c" } #line 127 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" case SQLITE_PERM: @@ -683,16 +693,16 @@ void database_table_throw_error (const gchar* method, gint res, GError** error) case SQLITE_FORMAT: #line 127 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" case SQLITE_NOTADB: -#line 687 "DatabaseTable.c" +#line 697 "DatabaseTable.c" { - const gchar* _tmp6_; - GError* _tmp7_; + const gchar* _tmp3_; + GError* _tmp4_; #line 143 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp6_ = msg; + _tmp3_ = msg; #line 143 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp7_ = g_error_new_literal (DATABASE_ERROR, DATABASE_ERROR_BACKING, _tmp6_); + _tmp4_ = g_error_new_literal (DATABASE_ERROR, DATABASE_ERROR_BACKING, _tmp3_); #line 143 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _inner_error_ = _tmp7_; + _inner_error_ = _tmp4_; #line 143 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" if (_inner_error_->domain == DATABASE_ERROR) { #line 143 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" @@ -701,7 +711,7 @@ void database_table_throw_error (const gchar* method, gint res, GError** error) _g_free0 (msg); #line 143 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" return; -#line 705 "DatabaseTable.c" +#line 715 "DatabaseTable.c" } else { #line 143 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _g_free0 (msg); @@ -711,21 +721,21 @@ void database_table_throw_error (const gchar* method, gint res, GError** error) g_clear_error (&_inner_error_); #line 143 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" return; -#line 715 "DatabaseTable.c" +#line 725 "DatabaseTable.c" } } #line 127 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" case SQLITE_NOMEM: -#line 720 "DatabaseTable.c" +#line 730 "DatabaseTable.c" { - const gchar* _tmp8_; - GError* _tmp9_; + const gchar* _tmp5_; + GError* _tmp6_; #line 146 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp8_ = msg; + _tmp5_ = msg; #line 146 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp9_ = g_error_new_literal (DATABASE_ERROR, DATABASE_ERROR_MEMORY, _tmp8_); + _tmp6_ = g_error_new_literal (DATABASE_ERROR, DATABASE_ERROR_MEMORY, _tmp5_); #line 146 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _inner_error_ = _tmp9_; + _inner_error_ = _tmp6_; #line 146 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" if (_inner_error_->domain == DATABASE_ERROR) { #line 146 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" @@ -734,7 +744,7 @@ void database_table_throw_error (const gchar* method, gint res, GError** error) _g_free0 (msg); #line 146 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" return; -#line 738 "DatabaseTable.c" +#line 748 "DatabaseTable.c" } else { #line 146 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _g_free0 (msg); @@ -744,7 +754,7 @@ void database_table_throw_error (const gchar* method, gint res, GError** error) g_clear_error (&_inner_error_); #line 146 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" return; -#line 748 "DatabaseTable.c" +#line 758 "DatabaseTable.c" } } #line 127 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" @@ -753,16 +763,16 @@ void database_table_throw_error (const gchar* method, gint res, GError** error) case SQLITE_LOCKED: #line 127 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" case SQLITE_INTERRUPT: -#line 757 "DatabaseTable.c" +#line 767 "DatabaseTable.c" { - const gchar* _tmp10_; - GError* _tmp11_; + const gchar* _tmp7_; + GError* _tmp8_; #line 151 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp10_ = msg; + _tmp7_ = msg; #line 151 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp11_ = g_error_new_literal (DATABASE_ERROR, DATABASE_ERROR_ABORT, _tmp10_); + _tmp8_ = g_error_new_literal (DATABASE_ERROR, DATABASE_ERROR_ABORT, _tmp7_); #line 151 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _inner_error_ = _tmp11_; + _inner_error_ = _tmp8_; #line 151 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" if (_inner_error_->domain == DATABASE_ERROR) { #line 151 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" @@ -771,7 +781,7 @@ void database_table_throw_error (const gchar* method, gint res, GError** error) _g_free0 (msg); #line 151 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" return; -#line 775 "DatabaseTable.c" +#line 785 "DatabaseTable.c" } else { #line 151 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _g_free0 (msg); @@ -781,7 +791,7 @@ void database_table_throw_error (const gchar* method, gint res, GError** error) g_clear_error (&_inner_error_); #line 151 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" return; -#line 785 "DatabaseTable.c" +#line 795 "DatabaseTable.c" } } #line 127 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" @@ -794,16 +804,16 @@ void database_table_throw_error (const gchar* method, gint res, GError** error) case SQLITE_CONSTRAINT: #line 127 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" case SQLITE_RANGE: -#line 798 "DatabaseTable.c" +#line 808 "DatabaseTable.c" { - const gchar* _tmp12_; - GError* _tmp13_; + const gchar* _tmp9_; + GError* _tmp10_; #line 158 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp12_ = msg; + _tmp9_ = msg; #line 158 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp13_ = g_error_new_literal (DATABASE_ERROR, DATABASE_ERROR_LIMITS, _tmp12_); + _tmp10_ = g_error_new_literal (DATABASE_ERROR, DATABASE_ERROR_LIMITS, _tmp9_); #line 158 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _inner_error_ = _tmp13_; + _inner_error_ = _tmp10_; #line 158 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" if (_inner_error_->domain == DATABASE_ERROR) { #line 158 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" @@ -812,7 +822,7 @@ void database_table_throw_error (const gchar* method, gint res, GError** error) _g_free0 (msg); #line 158 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" return; -#line 816 "DatabaseTable.c" +#line 826 "DatabaseTable.c" } else { #line 158 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _g_free0 (msg); @@ -822,23 +832,23 @@ void database_table_throw_error (const gchar* method, gint res, GError** error) g_clear_error (&_inner_error_); #line 158 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" return; -#line 826 "DatabaseTable.c" +#line 836 "DatabaseTable.c" } } #line 127 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" case SQLITE_SCHEMA: #line 127 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" case SQLITE_MISMATCH: -#line 833 "DatabaseTable.c" +#line 843 "DatabaseTable.c" { - const gchar* _tmp14_; - GError* _tmp15_; + const gchar* _tmp11_; + GError* _tmp12_; #line 162 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp14_ = msg; + _tmp11_ = msg; #line 162 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp15_ = g_error_new_literal (DATABASE_ERROR, DATABASE_ERROR_TYPESPEC, _tmp14_); + _tmp12_ = g_error_new_literal (DATABASE_ERROR, DATABASE_ERROR_TYPESPEC, _tmp11_); #line 162 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _inner_error_ = _tmp15_; + _inner_error_ = _tmp12_; #line 162 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" if (_inner_error_->domain == DATABASE_ERROR) { #line 162 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" @@ -847,7 +857,7 @@ void database_table_throw_error (const gchar* method, gint res, GError** error) _g_free0 (msg); #line 162 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" return; -#line 851 "DatabaseTable.c" +#line 861 "DatabaseTable.c" } else { #line 162 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _g_free0 (msg); @@ -857,7 +867,7 @@ void database_table_throw_error (const gchar* method, gint res, GError** error) g_clear_error (&_inner_error_); #line 162 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" return; -#line 861 "DatabaseTable.c" +#line 871 "DatabaseTable.c" } } default: @@ -867,16 +877,16 @@ void database_table_throw_error (const gchar* method, gint res, GError** error) case SQLITE_INTERNAL: #line 127 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" case SQLITE_MISUSE: -#line 871 "DatabaseTable.c" +#line 881 "DatabaseTable.c" { - const gchar* _tmp16_; - GError* _tmp17_; + const gchar* _tmp13_; + GError* _tmp14_; #line 168 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp16_ = msg; + _tmp13_ = msg; #line 168 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp17_ = g_error_new_literal (DATABASE_ERROR, DATABASE_ERROR_ERROR, _tmp16_); + _tmp14_ = g_error_new_literal (DATABASE_ERROR, DATABASE_ERROR_ERROR, _tmp13_); #line 168 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _inner_error_ = _tmp17_; + _inner_error_ = _tmp14_; #line 168 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" if (_inner_error_->domain == DATABASE_ERROR) { #line 168 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" @@ -885,7 +895,7 @@ void database_table_throw_error (const gchar* method, gint res, GError** error) _g_free0 (msg); #line 168 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" return; -#line 889 "DatabaseTable.c" +#line 899 "DatabaseTable.c" } else { #line 168 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _g_free0 (msg); @@ -895,17 +905,20 @@ void database_table_throw_error (const gchar* method, gint res, GError** error) g_clear_error (&_inner_error_); #line 168 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" return; -#line 899 "DatabaseTable.c" +#line 909 "DatabaseTable.c" } } } #line 124 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _g_free0 (msg); -#line 905 "DatabaseTable.c" +#line 915 "DatabaseTable.c" } -gboolean database_table_exists_by_id (DatabaseTable* self, gint64 id) { +gboolean +database_table_exists_by_id (DatabaseTable* self, + gint64 id) +{ gboolean result = FALSE; sqlite3_stmt* stmt = NULL; gint res = 0; @@ -918,14 +931,11 @@ gboolean database_table_exists_by_id (DatabaseTable* self, gint64 id) { gint _tmp6_; gint _tmp7_; sqlite3_stmt* _tmp8_; - gint64 _tmp9_; - gint _tmp10_; - gint _tmp11_; - sqlite3_stmt* _tmp12_; - gint _tmp13_; - gboolean _tmp14_ = FALSE; - gint _tmp15_; - gint _tmp24_; + gint _tmp9_; + sqlite3_stmt* _tmp10_; + gboolean _tmp11_ = FALSE; + gint _tmp12_; + gint _tmp20_; #line 172 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" g_return_val_if_fail (IS_DATABASE_TABLE (self), FALSE); #line 174 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" @@ -955,236 +965,216 @@ gboolean database_table_exists_by_id (DatabaseTable* self, gint64 id) { #line 177 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _tmp8_ = stmt; #line 177 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp9_ = id; -#line 177 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp10_ = sqlite3_bind_int64 (_tmp8_, 1, _tmp9_); -#line 177 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - res = _tmp10_; + res = sqlite3_bind_int64 (_tmp8_, 1, id); #line 178 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp11_ = res; + _tmp9_ = res; #line 178 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _vala_assert (_tmp11_ == SQLITE_OK, "res == Sqlite.OK"); -#line 180 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp12_ = stmt; + _vala_assert (_tmp9_ == SQLITE_OK, "res == Sqlite.OK"); #line 180 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp13_ = sqlite3_step (_tmp12_); + _tmp10_ = stmt; #line 180 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - res = _tmp13_; + res = sqlite3_step (_tmp10_); #line 181 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp15_ = res; + _tmp12_ = res; #line 181 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - if (_tmp15_ != SQLITE_ROW) { -#line 978 "DatabaseTable.c" - gint _tmp16_; + if (_tmp12_ != SQLITE_ROW) { +#line 982 "DatabaseTable.c" + gint _tmp13_; #line 181 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp16_ = res; + _tmp13_ = res; #line 181 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp14_ = _tmp16_ != SQLITE_DONE; -#line 984 "DatabaseTable.c" + _tmp11_ = _tmp13_ != SQLITE_DONE; +#line 988 "DatabaseTable.c" } else { #line 181 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp14_ = FALSE; -#line 988 "DatabaseTable.c" + _tmp11_ = FALSE; +#line 992 "DatabaseTable.c" } #line 181 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - if (_tmp14_) { -#line 992 "DatabaseTable.c" - gint64 _tmp17_; + if (_tmp11_) { +#line 996 "DatabaseTable.c" + gchar* _tmp14_; + gchar* _tmp15_; + const gchar* _tmp16_; + gchar* _tmp17_; gchar* _tmp18_; - gchar* _tmp19_; - const gchar* _tmp20_; - gchar* _tmp21_; - gchar* _tmp22_; - gint _tmp23_; -#line 182 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp17_ = id; + gint _tmp19_; #line 182 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp18_ = g_strdup_printf ("%" G_GINT64_FORMAT, _tmp17_); + _tmp14_ = g_strdup_printf ("%" G_GINT64_FORMAT, id); #line 182 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp19_ = _tmp18_; + _tmp15_ = _tmp14_; #line 182 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp20_ = self->table_name; + _tmp16_ = self->table_name; #line 182 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp21_ = g_strdup_printf ("exists_by_id [%s] %s", _tmp19_, _tmp20_); + _tmp17_ = g_strdup_printf ("exists_by_id [%s] %s", _tmp15_, _tmp16_); #line 182 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp22_ = _tmp21_; + _tmp18_ = _tmp17_; #line 182 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp23_ = res; + _tmp19_ = res; #line 182 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - database_table_fatal (_tmp22_, _tmp23_); + database_table_fatal (_tmp18_, _tmp19_); #line 182 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _g_free0 (_tmp22_); + _g_free0 (_tmp18_); #line 182 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _g_free0 (_tmp19_); -#line 1020 "DatabaseTable.c" + _g_free0 (_tmp15_); +#line 1021 "DatabaseTable.c" } #line 184 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp24_ = res; + _tmp20_ = res; #line 184 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - result = _tmp24_ == SQLITE_ROW; + result = _tmp20_ == SQLITE_ROW; #line 184 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _sqlite3_finalize0 (stmt); #line 184 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" return result; -#line 1030 "DatabaseTable.c" +#line 1031 "DatabaseTable.c" } -gboolean database_table_select_by_id (DatabaseTable* self, gint64 id, const gchar* columns, sqlite3_stmt* * stmt) { +gboolean +database_table_select_by_id (DatabaseTable* self, + gint64 id, + const gchar* columns, + sqlite3_stmt* * stmt) +{ sqlite3_stmt* _vala_stmt = NULL; gboolean result = FALSE; gchar* sql = NULL; const gchar* _tmp0_; - const gchar* _tmp1_; - gchar* _tmp2_; + gchar* _tmp1_; gint res = 0; - sqlite3* _tmp3_; - const gchar* _tmp4_; - sqlite3_stmt* _tmp5_ = NULL; + sqlite3* _tmp2_; + const gchar* _tmp3_; + sqlite3_stmt* _tmp4_ = NULL; + gint _tmp5_; gint _tmp6_; - gint _tmp7_; - sqlite3_stmt* _tmp8_; - gint64 _tmp9_; - gint _tmp10_; + sqlite3_stmt* _tmp7_; + gint _tmp8_; + sqlite3_stmt* _tmp9_; + gboolean _tmp10_ = FALSE; gint _tmp11_; - sqlite3_stmt* _tmp12_; - gint _tmp13_; - gboolean _tmp14_ = FALSE; - gint _tmp15_; - gint _tmp25_; + gint _tmp19_; #line 187 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" g_return_val_if_fail (IS_DATABASE_TABLE (self), FALSE); #line 187 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" g_return_val_if_fail (columns != NULL, FALSE); #line 188 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp0_ = columns; -#line 188 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp1_ = self->table_name; + _tmp0_ = self->table_name; #line 188 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp2_ = g_strdup_printf ("SELECT %s FROM %s WHERE id=?", _tmp0_, _tmp1_); + _tmp1_ = g_strdup_printf ("SELECT %s FROM %s WHERE id=?", columns, _tmp0_); #line 188 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - sql = _tmp2_; + sql = _tmp1_; #line 190 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp3_ = database_table_db; + _tmp2_ = database_table_db; #line 190 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp4_ = sql; + _tmp3_ = sql; #line 190 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp6_ = sqlite3_prepare_v2 (_tmp3_, _tmp4_, -1, &_tmp5_, NULL); + _tmp5_ = sqlite3_prepare_v2 (_tmp2_, _tmp3_, -1, &_tmp4_, NULL); #line 190 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _sqlite3_finalize0 (_vala_stmt); #line 190 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _vala_stmt = _tmp5_; + _vala_stmt = _tmp4_; #line 190 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - res = _tmp6_; + res = _tmp5_; #line 191 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp7_ = res; + _tmp6_ = res; #line 191 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _vala_assert (_tmp7_ == SQLITE_OK, "res == Sqlite.OK"); -#line 193 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp8_ = _vala_stmt; -#line 193 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp9_ = id; + _vala_assert (_tmp6_ == SQLITE_OK, "res == Sqlite.OK"); #line 193 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp10_ = sqlite3_bind_int64 (_tmp8_, 1, _tmp9_); + _tmp7_ = _vala_stmt; #line 193 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - res = _tmp10_; + res = sqlite3_bind_int64 (_tmp7_, 1, id); #line 194 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp11_ = res; + _tmp8_ = res; #line 194 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _vala_assert (_tmp11_ == SQLITE_OK, "res == Sqlite.OK"); -#line 196 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp12_ = _vala_stmt; + _vala_assert (_tmp8_ == SQLITE_OK, "res == Sqlite.OK"); #line 196 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp13_ = sqlite3_step (_tmp12_); + _tmp9_ = _vala_stmt; #line 196 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - res = _tmp13_; + res = sqlite3_step (_tmp9_); #line 197 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp15_ = res; + _tmp11_ = res; #line 197 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - if (_tmp15_ != SQLITE_ROW) { -#line 1106 "DatabaseTable.c" - gint _tmp16_; + if (_tmp11_ != SQLITE_ROW) { +#line 1100 "DatabaseTable.c" + gint _tmp12_; #line 197 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp16_ = res; + _tmp12_ = res; #line 197 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp14_ = _tmp16_ != SQLITE_DONE; -#line 1112 "DatabaseTable.c" + _tmp10_ = _tmp12_ != SQLITE_DONE; +#line 1106 "DatabaseTable.c" } else { #line 197 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp14_ = FALSE; -#line 1116 "DatabaseTable.c" + _tmp10_ = FALSE; +#line 1110 "DatabaseTable.c" } #line 197 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - if (_tmp14_) { -#line 1120 "DatabaseTable.c" - gint64 _tmp17_; - gchar* _tmp18_; - gchar* _tmp19_; - const gchar* _tmp20_; - const gchar* _tmp21_; - gchar* _tmp22_; - gchar* _tmp23_; - gint _tmp24_; -#line 198 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp17_ = id; -#line 198 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp18_ = g_strdup_printf ("%" G_GINT64_FORMAT, _tmp17_); + if (_tmp10_) { +#line 1114 "DatabaseTable.c" + gchar* _tmp13_; + gchar* _tmp14_; + const gchar* _tmp15_; + gchar* _tmp16_; + gchar* _tmp17_; + gint _tmp18_; #line 198 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp19_ = _tmp18_; + _tmp13_ = g_strdup_printf ("%" G_GINT64_FORMAT, id); #line 198 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp20_ = self->table_name; + _tmp14_ = _tmp13_; #line 198 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp21_ = columns; + _tmp15_ = self->table_name; #line 198 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp22_ = g_strdup_printf ("select_by_id [%s] %s %s", _tmp19_, _tmp20_, _tmp21_); + _tmp16_ = g_strdup_printf ("select_by_id [%s] %s %s", _tmp14_, _tmp15_, columns); #line 198 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp23_ = _tmp22_; + _tmp17_ = _tmp16_; #line 198 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp24_ = res; + _tmp18_ = res; #line 198 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - database_table_fatal (_tmp23_, _tmp24_); + database_table_fatal (_tmp17_, _tmp18_); #line 198 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _g_free0 (_tmp23_); + _g_free0 (_tmp17_); #line 198 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _g_free0 (_tmp19_); -#line 1151 "DatabaseTable.c" + _g_free0 (_tmp14_); +#line 1139 "DatabaseTable.c" } #line 200 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp25_ = res; + _tmp19_ = res; #line 200 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - result = _tmp25_ == SQLITE_ROW; + result = _tmp19_ == SQLITE_ROW; #line 200 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _g_free0 (sql); #line 200 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" if (stmt) { #line 200 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" *stmt = _vala_stmt; -#line 1163 "DatabaseTable.c" +#line 1151 "DatabaseTable.c" } else { #line 200 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _sqlite3_finalize0 (_vala_stmt); -#line 1167 "DatabaseTable.c" +#line 1155 "DatabaseTable.c" } #line 200 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" return result; -#line 1171 "DatabaseTable.c" +#line 1159 "DatabaseTable.c" } -static void database_table_prepare_update_by_id (DatabaseTable* self, gint64 id, const gchar* column, sqlite3_stmt* * stmt) { +static void +database_table_prepare_update_by_id (DatabaseTable* self, + gint64 id, + const gchar* column, + sqlite3_stmt* * stmt) +{ sqlite3_stmt* _vala_stmt = NULL; gchar* sql = NULL; const gchar* _tmp0_; - const gchar* _tmp1_; - gchar* _tmp2_; + gchar* _tmp1_; gint res = 0; - sqlite3* _tmp3_; - sqlite3_stmt* _tmp4_ = NULL; + sqlite3* _tmp2_; + sqlite3_stmt* _tmp3_ = NULL; + gint _tmp4_; gint _tmp5_; gint _tmp6_; - gint64 _tmp7_; - gint _tmp8_; - gint _tmp9_; #line 204 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" g_return_if_fail (IS_DATABASE_TABLE (self)); #line 204 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" @@ -1192,102 +1182,93 @@ static void database_table_prepare_update_by_id (DatabaseTable* self, gint64 id, #line 205 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _tmp0_ = self->table_name; #line 205 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp1_ = column; -#line 205 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp2_ = g_strdup_printf ("UPDATE %s SET %s=? WHERE id=?", _tmp0_, _tmp1_); + _tmp1_ = g_strdup_printf ("UPDATE %s SET %s=? WHERE id=?", _tmp0_, column); #line 205 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - sql = _tmp2_; + sql = _tmp1_; #line 207 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp3_ = database_table_db; + _tmp2_ = database_table_db; #line 207 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp5_ = sqlite3_prepare_v2 (_tmp3_, sql, -1, &_tmp4_, NULL); + _tmp4_ = sqlite3_prepare_v2 (_tmp2_, sql, -1, &_tmp3_, NULL); #line 207 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _sqlite3_finalize0 (_vala_stmt); #line 207 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _vala_stmt = _tmp4_; + _vala_stmt = _tmp3_; #line 207 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - res = _tmp5_; + res = _tmp4_; #line 208 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp6_ = res; + _tmp5_ = res; #line 208 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _vala_assert (_tmp6_ == SQLITE_OK, "res == Sqlite.OK"); -#line 210 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp7_ = id; + _vala_assert (_tmp5_ == SQLITE_OK, "res == Sqlite.OK"); #line 210 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp8_ = sqlite3_bind_int64 (_vala_stmt, 2, _tmp7_); -#line 210 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - res = _tmp8_; + res = sqlite3_bind_int64 (_vala_stmt, 2, id); #line 211 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp9_ = res; + _tmp6_ = res; #line 211 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _vala_assert (_tmp9_ == SQLITE_OK, "res == Sqlite.OK"); + _vala_assert (_tmp6_ == SQLITE_OK, "res == Sqlite.OK"); #line 204 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _g_free0 (sql); #line 204 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" if (stmt) { #line 204 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" *stmt = _vala_stmt; -#line 1231 "DatabaseTable.c" +#line 1215 "DatabaseTable.c" } else { #line 204 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _sqlite3_finalize0 (_vala_stmt); -#line 1235 "DatabaseTable.c" +#line 1219 "DatabaseTable.c" } } -static gboolean database_table_execute_update_by_id (DatabaseTable* self, sqlite3_stmt* stmt) { +static gboolean +database_table_execute_update_by_id (DatabaseTable* self, + sqlite3_stmt* stmt) +{ gboolean result = FALSE; gint res = 0; - sqlite3_stmt* _tmp0_; - gint _tmp1_; - gint _tmp2_; + gint _tmp0_; #line 214 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" g_return_val_if_fail (IS_DATABASE_TABLE (self), FALSE); #line 214 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" g_return_val_if_fail (stmt != NULL, FALSE); #line 215 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp0_ = stmt; -#line 215 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp1_ = sqlite3_step (_tmp0_); -#line 215 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - res = _tmp1_; + res = sqlite3_step (stmt); #line 216 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp2_ = res; + _tmp0_ = res; #line 216 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - if (_tmp2_ != SQLITE_DONE) { -#line 1260 "DatabaseTable.c" - gint _tmp3_; + if (_tmp0_ != SQLITE_DONE) { +#line 1241 "DatabaseTable.c" + gint _tmp1_; #line 217 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp3_ = res; + _tmp1_ = res; #line 217 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - database_table_fatal ("execute_update_by_id", _tmp3_); + database_table_fatal ("execute_update_by_id", _tmp1_); #line 219 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" result = FALSE; #line 219 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" return result; -#line 1270 "DatabaseTable.c" +#line 1251 "DatabaseTable.c" } #line 222 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" result = TRUE; #line 222 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" return result; -#line 1276 "DatabaseTable.c" +#line 1257 "DatabaseTable.c" } -gboolean database_table_update_text_by_id (DatabaseTable* self, gint64 id, const gchar* column, const gchar* text) { +gboolean +database_table_update_text_by_id (DatabaseTable* self, + gint64 id, + const gchar* column, + const gchar* text) +{ gboolean result = FALSE; sqlite3_stmt* stmt = NULL; - gint64 _tmp0_; - const gchar* _tmp1_; - sqlite3_stmt* _tmp2_ = NULL; + sqlite3_stmt* _tmp0_ = NULL; gint res = 0; - const gchar* _tmp3_; - gchar* _tmp4_; - GDestroyNotify _tmp5_; - gint _tmp6_; - gboolean _tmp7_; + gchar* _tmp1_; + GDestroyNotify _tmp2_; #line 225 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" g_return_val_if_fail (IS_DATABASE_TABLE (self), FALSE); #line 225 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" @@ -1295,54 +1276,45 @@ gboolean database_table_update_text_by_id (DatabaseTable* self, gint64 id, const #line 225 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" g_return_val_if_fail (text != NULL, FALSE); #line 227 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp0_ = id; -#line 227 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp1_ = column; -#line 227 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - database_table_prepare_update_by_id (self, _tmp0_, _tmp1_, &_tmp2_); + database_table_prepare_update_by_id (self, id, column, &_tmp0_); #line 227 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _sqlite3_finalize0 (stmt); #line 227 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - stmt = _tmp2_; -#line 229 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp3_ = text; -#line 229 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp4_ = g_strdup (_tmp3_); + stmt = _tmp0_; #line 229 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp5_ = g_free; + _tmp1_ = g_strdup (text); #line 229 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp6_ = sqlite3_bind_text (stmt, 1, _tmp4_, -1, _tmp5_); + _tmp2_ = g_free; #line 229 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - res = _tmp6_; + res = sqlite3_bind_text (stmt, 1, _tmp1_, -1, _tmp2_); #line 230 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _vala_assert (res == SQLITE_OK, "res == Sqlite.OK"); #line 232 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp7_ = database_table_execute_update_by_id (self, stmt); -#line 232 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - result = _tmp7_; + result = database_table_execute_update_by_id (self, stmt); #line 232 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _sqlite3_finalize0 (stmt); #line 232 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" return result; -#line 1328 "DatabaseTable.c" +#line 1299 "DatabaseTable.c" } -void database_table_update_text_by_id_2 (DatabaseTable* self, gint64 id, const gchar* column, const gchar* text, GError** error) { +void +database_table_update_text_by_id_2 (DatabaseTable* self, + gint64 id, + const gchar* column, + const gchar* text, + GError** error) +{ sqlite3_stmt* stmt = NULL; - gint64 _tmp0_; - const gchar* _tmp1_; - sqlite3_stmt* _tmp2_ = NULL; + sqlite3_stmt* _tmp0_ = NULL; gint res = 0; - sqlite3_stmt* _tmp3_; - const gchar* _tmp4_; - gchar* _tmp5_; - GDestroyNotify _tmp6_; - gint _tmp7_; - gint _tmp8_; - sqlite3_stmt* _tmp9_; - gint _tmp10_; - gint _tmp11_; + sqlite3_stmt* _tmp1_; + gchar* _tmp2_; + GDestroyNotify _tmp3_; + gint _tmp4_; + sqlite3_stmt* _tmp5_; + gint _tmp6_; GError * _inner_error_ = NULL; #line 235 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" g_return_if_fail (IS_DATABASE_TABLE (self)); @@ -1351,61 +1323,48 @@ void database_table_update_text_by_id_2 (DatabaseTable* self, gint64 id, const g #line 235 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" g_return_if_fail (text != NULL); #line 237 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp0_ = id; -#line 237 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp1_ = column; -#line 237 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - database_table_prepare_update_by_id (self, _tmp0_, _tmp1_, &_tmp2_); + database_table_prepare_update_by_id (self, id, column, &_tmp0_); #line 237 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _sqlite3_finalize0 (stmt); #line 237 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - stmt = _tmp2_; -#line 239 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp3_ = stmt; + stmt = _tmp0_; #line 239 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp4_ = text; + _tmp1_ = stmt; #line 239 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp5_ = g_strdup (_tmp4_); + _tmp2_ = g_strdup (text); #line 239 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp6_ = g_free; + _tmp3_ = g_free; #line 239 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp7_ = sqlite3_bind_text (_tmp3_, 1, _tmp5_, -1, _tmp6_); -#line 239 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - res = _tmp7_; + res = sqlite3_bind_text (_tmp1_, 1, _tmp2_, -1, _tmp3_); #line 240 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp8_ = res; + _tmp4_ = res; #line 240 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _vala_assert (_tmp8_ == SQLITE_OK, "res == Sqlite.OK"); + _vala_assert (_tmp4_ == SQLITE_OK, "res == Sqlite.OK"); #line 242 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp9_ = stmt; + _tmp5_ = stmt; #line 242 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp10_ = sqlite3_step (_tmp9_); -#line 242 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - res = _tmp10_; + res = sqlite3_step (_tmp5_); #line 243 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp11_ = res; + _tmp6_ = res; #line 243 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - if (_tmp11_ != SQLITE_DONE) { -#line 1390 "DatabaseTable.c" - const gchar* _tmp12_; - const gchar* _tmp13_; - gchar* _tmp14_; - gchar* _tmp15_; - gint _tmp16_; + if (_tmp6_ != SQLITE_DONE) { +#line 1352 "DatabaseTable.c" + const gchar* _tmp7_; + gchar* _tmp8_; + gchar* _tmp9_; + gint _tmp10_; #line 244 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp12_ = self->table_name; + _tmp7_ = self->table_name; #line 244 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp13_ = column; + _tmp8_ = g_strdup_printf ("DatabaseTable.update_text_by_id_2 %s.%s", _tmp7_, column); #line 244 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp14_ = g_strdup_printf ("DatabaseTable.update_text_by_id_2 %s.%s", _tmp12_, _tmp13_); + _tmp9_ = _tmp8_; #line 244 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp15_ = _tmp14_; + _tmp10_ = res; #line 244 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp16_ = res; + database_table_throw_error (_tmp9_, _tmp10_, &_inner_error_); #line 244 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - database_table_throw_error (_tmp15_, _tmp16_, &_inner_error_); -#line 244 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _g_free0 (_tmp15_); + _g_free0 (_tmp9_); #line 244 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 244 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" @@ -1416,7 +1375,7 @@ void database_table_update_text_by_id_2 (DatabaseTable* self, gint64 id, const g _sqlite3_finalize0 (stmt); #line 244 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" return; -#line 1420 "DatabaseTable.c" +#line 1379 "DatabaseTable.c" } else { #line 244 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _sqlite3_finalize0 (stmt); @@ -1426,130 +1385,108 @@ void database_table_update_text_by_id_2 (DatabaseTable* self, gint64 id, const g g_clear_error (&_inner_error_); #line 244 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" return; -#line 1430 "DatabaseTable.c" +#line 1389 "DatabaseTable.c" } } } #line 235 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _sqlite3_finalize0 (stmt); -#line 1436 "DatabaseTable.c" +#line 1395 "DatabaseTable.c" } -gboolean database_table_update_int_by_id (DatabaseTable* self, gint64 id, const gchar* column, gint value) { +gboolean +database_table_update_int_by_id (DatabaseTable* self, + gint64 id, + const gchar* column, + gint value) +{ gboolean result = FALSE; sqlite3_stmt* stmt = NULL; - gint64 _tmp0_; - const gchar* _tmp1_; - sqlite3_stmt* _tmp2_ = NULL; + sqlite3_stmt* _tmp0_ = NULL; gint res = 0; - gint _tmp3_; - gint _tmp4_; - gboolean _tmp5_; #line 247 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" g_return_val_if_fail (IS_DATABASE_TABLE (self), FALSE); #line 247 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" g_return_val_if_fail (column != NULL, FALSE); #line 249 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp0_ = id; -#line 249 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp1_ = column; -#line 249 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - database_table_prepare_update_by_id (self, _tmp0_, _tmp1_, &_tmp2_); + database_table_prepare_update_by_id (self, id, column, &_tmp0_); #line 249 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _sqlite3_finalize0 (stmt); #line 249 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - stmt = _tmp2_; -#line 251 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp3_ = value; -#line 251 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp4_ = sqlite3_bind_int (stmt, 1, _tmp3_); + stmt = _tmp0_; #line 251 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - res = _tmp4_; + res = sqlite3_bind_int (stmt, 1, value); #line 252 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _vala_assert (res == SQLITE_OK, "res == Sqlite.OK"); #line 254 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp5_ = database_table_execute_update_by_id (self, stmt); -#line 254 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - result = _tmp5_; + result = database_table_execute_update_by_id (self, stmt); #line 254 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _sqlite3_finalize0 (stmt); #line 254 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" return result; -#line 1480 "DatabaseTable.c" +#line 1429 "DatabaseTable.c" } -void database_table_update_int_by_id_2 (DatabaseTable* self, gint64 id, const gchar* column, gint value, GError** error) { +void +database_table_update_int_by_id_2 (DatabaseTable* self, + gint64 id, + const gchar* column, + gint value, + GError** error) +{ sqlite3_stmt* stmt = NULL; - gint64 _tmp0_; - const gchar* _tmp1_; - sqlite3_stmt* _tmp2_ = NULL; + sqlite3_stmt* _tmp0_ = NULL; gint res = 0; + sqlite3_stmt* _tmp1_; + gint _tmp2_; sqlite3_stmt* _tmp3_; gint _tmp4_; - gint _tmp5_; - gint _tmp6_; - sqlite3_stmt* _tmp7_; - gint _tmp8_; - gint _tmp9_; GError * _inner_error_ = NULL; #line 257 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" g_return_if_fail (IS_DATABASE_TABLE (self)); #line 257 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" g_return_if_fail (column != NULL); #line 259 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp0_ = id; -#line 259 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp1_ = column; -#line 259 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - database_table_prepare_update_by_id (self, _tmp0_, _tmp1_, &_tmp2_); + database_table_prepare_update_by_id (self, id, column, &_tmp0_); #line 259 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _sqlite3_finalize0 (stmt); #line 259 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - stmt = _tmp2_; + stmt = _tmp0_; #line 261 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp3_ = stmt; -#line 261 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp4_ = value; + _tmp1_ = stmt; #line 261 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp5_ = sqlite3_bind_int (_tmp3_, 1, _tmp4_); -#line 261 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - res = _tmp5_; + res = sqlite3_bind_int (_tmp1_, 1, value); #line 262 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp6_ = res; + _tmp2_ = res; #line 262 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _vala_assert (_tmp6_ == SQLITE_OK, "res == Sqlite.OK"); + _vala_assert (_tmp2_ == SQLITE_OK, "res == Sqlite.OK"); #line 264 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp7_ = stmt; -#line 264 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp8_ = sqlite3_step (_tmp7_); + _tmp3_ = stmt; #line 264 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - res = _tmp8_; + res = sqlite3_step (_tmp3_); #line 265 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp9_ = res; + _tmp4_ = res; #line 265 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - if (_tmp9_ != SQLITE_DONE) { -#line 1534 "DatabaseTable.c" - const gchar* _tmp10_; - const gchar* _tmp11_; - gchar* _tmp12_; - gchar* _tmp13_; - gint _tmp14_; -#line 266 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp10_ = self->table_name; + if (_tmp4_ != SQLITE_DONE) { +#line 1474 "DatabaseTable.c" + const gchar* _tmp5_; + gchar* _tmp6_; + gchar* _tmp7_; + gint _tmp8_; #line 266 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp11_ = column; + _tmp5_ = self->table_name; #line 266 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp12_ = g_strdup_printf ("DatabaseTable.update_int_by_id_2 %s.%s", _tmp10_, _tmp11_); + _tmp6_ = g_strdup_printf ("DatabaseTable.update_int_by_id_2 %s.%s", _tmp5_, column); #line 266 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp13_ = _tmp12_; + _tmp7_ = _tmp6_; #line 266 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp14_ = res; + _tmp8_ = res; #line 266 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - database_table_throw_error (_tmp13_, _tmp14_, &_inner_error_); + database_table_throw_error (_tmp7_, _tmp8_, &_inner_error_); #line 266 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _g_free0 (_tmp13_); + _g_free0 (_tmp7_); #line 266 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 266 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" @@ -1560,7 +1497,7 @@ void database_table_update_int_by_id_2 (DatabaseTable* self, gint64 id, const gc _sqlite3_finalize0 (stmt); #line 266 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" return; -#line 1564 "DatabaseTable.c" +#line 1501 "DatabaseTable.c" } else { #line 266 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _sqlite3_finalize0 (stmt); @@ -1570,130 +1507,108 @@ void database_table_update_int_by_id_2 (DatabaseTable* self, gint64 id, const gc g_clear_error (&_inner_error_); #line 266 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" return; -#line 1574 "DatabaseTable.c" +#line 1511 "DatabaseTable.c" } } } #line 257 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _sqlite3_finalize0 (stmt); -#line 1580 "DatabaseTable.c" +#line 1517 "DatabaseTable.c" } -gboolean database_table_update_int64_by_id (DatabaseTable* self, gint64 id, const gchar* column, gint64 value) { +gboolean +database_table_update_int64_by_id (DatabaseTable* self, + gint64 id, + const gchar* column, + gint64 value) +{ gboolean result = FALSE; sqlite3_stmt* stmt = NULL; - gint64 _tmp0_; - const gchar* _tmp1_; - sqlite3_stmt* _tmp2_ = NULL; + sqlite3_stmt* _tmp0_ = NULL; gint res = 0; - gint64 _tmp3_; - gint _tmp4_; - gboolean _tmp5_; #line 269 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" g_return_val_if_fail (IS_DATABASE_TABLE (self), FALSE); #line 269 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" g_return_val_if_fail (column != NULL, FALSE); #line 271 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp0_ = id; -#line 271 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp1_ = column; -#line 271 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - database_table_prepare_update_by_id (self, _tmp0_, _tmp1_, &_tmp2_); + database_table_prepare_update_by_id (self, id, column, &_tmp0_); #line 271 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _sqlite3_finalize0 (stmt); #line 271 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - stmt = _tmp2_; -#line 273 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp3_ = value; + stmt = _tmp0_; #line 273 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp4_ = sqlite3_bind_int64 (stmt, 1, _tmp3_); -#line 273 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - res = _tmp4_; + res = sqlite3_bind_int64 (stmt, 1, value); #line 274 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _vala_assert (res == SQLITE_OK, "res == Sqlite.OK"); #line 276 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp5_ = database_table_execute_update_by_id (self, stmt); -#line 276 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - result = _tmp5_; + result = database_table_execute_update_by_id (self, stmt); #line 276 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _sqlite3_finalize0 (stmt); #line 276 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" return result; -#line 1624 "DatabaseTable.c" +#line 1551 "DatabaseTable.c" } -void database_table_update_int64_by_id_2 (DatabaseTable* self, gint64 id, const gchar* column, gint64 value, GError** error) { +void +database_table_update_int64_by_id_2 (DatabaseTable* self, + gint64 id, + const gchar* column, + gint64 value, + GError** error) +{ sqlite3_stmt* stmt = NULL; - gint64 _tmp0_; - const gchar* _tmp1_; - sqlite3_stmt* _tmp2_ = NULL; + sqlite3_stmt* _tmp0_ = NULL; gint res = 0; + sqlite3_stmt* _tmp1_; + gint _tmp2_; sqlite3_stmt* _tmp3_; - gint64 _tmp4_; - gint _tmp5_; - gint _tmp6_; - sqlite3_stmt* _tmp7_; - gint _tmp8_; - gint _tmp9_; + gint _tmp4_; GError * _inner_error_ = NULL; #line 279 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" g_return_if_fail (IS_DATABASE_TABLE (self)); #line 279 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" g_return_if_fail (column != NULL); #line 281 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp0_ = id; -#line 281 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp1_ = column; -#line 281 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - database_table_prepare_update_by_id (self, _tmp0_, _tmp1_, &_tmp2_); + database_table_prepare_update_by_id (self, id, column, &_tmp0_); #line 281 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _sqlite3_finalize0 (stmt); #line 281 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - stmt = _tmp2_; -#line 283 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp3_ = stmt; + stmt = _tmp0_; #line 283 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp4_ = value; + _tmp1_ = stmt; #line 283 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp5_ = sqlite3_bind_int64 (_tmp3_, 1, _tmp4_); -#line 283 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - res = _tmp5_; + res = sqlite3_bind_int64 (_tmp1_, 1, value); #line 284 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp6_ = res; + _tmp2_ = res; #line 284 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _vala_assert (_tmp6_ == SQLITE_OK, "res == Sqlite.OK"); -#line 286 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp7_ = stmt; + _vala_assert (_tmp2_ == SQLITE_OK, "res == Sqlite.OK"); #line 286 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp8_ = sqlite3_step (_tmp7_); + _tmp3_ = stmt; #line 286 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - res = _tmp8_; + res = sqlite3_step (_tmp3_); #line 287 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp9_ = res; + _tmp4_ = res; #line 287 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - if (_tmp9_ != SQLITE_DONE) { -#line 1678 "DatabaseTable.c" - const gchar* _tmp10_; - const gchar* _tmp11_; - gchar* _tmp12_; - gchar* _tmp13_; - gint _tmp14_; -#line 288 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp10_ = self->table_name; + if (_tmp4_ != SQLITE_DONE) { +#line 1596 "DatabaseTable.c" + const gchar* _tmp5_; + gchar* _tmp6_; + gchar* _tmp7_; + gint _tmp8_; #line 288 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp11_ = column; + _tmp5_ = self->table_name; #line 288 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp12_ = g_strdup_printf ("DatabaseTable.update_int64_by_id_2 %s.%s", _tmp10_, _tmp11_); + _tmp6_ = g_strdup_printf ("DatabaseTable.update_int64_by_id_2 %s.%s", _tmp5_, column); #line 288 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp13_ = _tmp12_; + _tmp7_ = _tmp6_; #line 288 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp14_ = res; + _tmp8_ = res; #line 288 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - database_table_throw_error (_tmp13_, _tmp14_, &_inner_error_); + database_table_throw_error (_tmp7_, _tmp8_, &_inner_error_); #line 288 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _g_free0 (_tmp13_); + _g_free0 (_tmp7_); #line 288 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 288 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" @@ -1704,7 +1619,7 @@ void database_table_update_int64_by_id_2 (DatabaseTable* self, gint64 id, const _sqlite3_finalize0 (stmt); #line 288 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" return; -#line 1708 "DatabaseTable.c" +#line 1623 "DatabaseTable.c" } else { #line 288 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _sqlite3_finalize0 (stmt); @@ -1714,17 +1629,21 @@ void database_table_update_int64_by_id_2 (DatabaseTable* self, gint64 id, const g_clear_error (&_inner_error_); #line 288 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" return; -#line 1718 "DatabaseTable.c" +#line 1633 "DatabaseTable.c" } } } #line 279 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _sqlite3_finalize0 (stmt); -#line 1724 "DatabaseTable.c" +#line 1639 "DatabaseTable.c" } -void database_table_delete_by_id (DatabaseTable* self, gint64 id, GError** error) { +void +database_table_delete_by_id (DatabaseTable* self, + gint64 id, + GError** error) +{ sqlite3_stmt* stmt = NULL; gint res = 0; sqlite3* _tmp0_; @@ -1736,12 +1655,9 @@ void database_table_delete_by_id (DatabaseTable* self, gint64 id, GError** error gint _tmp6_; gint _tmp7_; sqlite3_stmt* _tmp8_; - gint64 _tmp9_; - gint _tmp10_; + gint _tmp9_; + sqlite3_stmt* _tmp10_; gint _tmp11_; - sqlite3_stmt* _tmp12_; - gint _tmp13_; - gint _tmp14_; GError * _inner_error_ = NULL; #line 291 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" g_return_if_fail (IS_DATABASE_TABLE (self)); @@ -1772,42 +1688,36 @@ void database_table_delete_by_id (DatabaseTable* self, gint64 id, GError** error #line 296 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _tmp8_ = stmt; #line 296 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp9_ = id; -#line 296 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp10_ = sqlite3_bind_int64 (_tmp8_, 1, _tmp9_); -#line 296 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - res = _tmp10_; + res = sqlite3_bind_int64 (_tmp8_, 1, id); #line 297 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp11_ = res; + _tmp9_ = res; #line 297 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _vala_assert (_tmp11_ == SQLITE_OK, "res == Sqlite.OK"); -#line 299 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp12_ = stmt; + _vala_assert (_tmp9_ == SQLITE_OK, "res == Sqlite.OK"); #line 299 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp13_ = sqlite3_step (_tmp12_); + _tmp10_ = stmt; #line 299 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - res = _tmp13_; + res = sqlite3_step (_tmp10_); #line 300 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp14_ = res; + _tmp11_ = res; #line 300 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - if (_tmp14_ != SQLITE_DONE) { -#line 1795 "DatabaseTable.c" - const gchar* _tmp15_; - gchar* _tmp16_; - gchar* _tmp17_; - gint _tmp18_; + if (_tmp11_ != SQLITE_DONE) { +#line 1705 "DatabaseTable.c" + const gchar* _tmp12_; + gchar* _tmp13_; + gchar* _tmp14_; + gint _tmp15_; #line 301 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp15_ = self->table_name; + _tmp12_ = self->table_name; #line 301 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp16_ = g_strdup_printf ("%s.remove", _tmp15_); + _tmp13_ = g_strdup_printf ("%s.remove", _tmp12_); #line 301 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp17_ = _tmp16_; + _tmp14_ = _tmp13_; #line 301 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp18_ = res; + _tmp15_ = res; #line 301 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - database_table_throw_error (_tmp17_, _tmp18_, &_inner_error_); + database_table_throw_error (_tmp14_, _tmp15_, &_inner_error_); #line 301 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _g_free0 (_tmp17_); + _g_free0 (_tmp14_); #line 301 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 301 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" @@ -1818,7 +1728,7 @@ void database_table_delete_by_id (DatabaseTable* self, gint64 id, GError** error _sqlite3_finalize0 (stmt); #line 301 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" return; -#line 1822 "DatabaseTable.c" +#line 1732 "DatabaseTable.c" } else { #line 301 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _sqlite3_finalize0 (stmt); @@ -1828,28 +1738,30 @@ void database_table_delete_by_id (DatabaseTable* self, gint64 id, GError** error g_clear_error (&_inner_error_); #line 301 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" return; -#line 1832 "DatabaseTable.c" +#line 1742 "DatabaseTable.c" } } } #line 291 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _sqlite3_finalize0 (stmt); -#line 1838 "DatabaseTable.c" +#line 1748 "DatabaseTable.c" } -gboolean database_table_has_column (const gchar* table_name, const gchar* column_name) { +gboolean +database_table_has_column (const gchar* table_name, + const gchar* column_name) +{ gboolean result = FALSE; sqlite3_stmt* stmt = NULL; gint res = 0; sqlite3* _tmp0_; - const gchar* _tmp1_; + gchar* _tmp1_; gchar* _tmp2_; - gchar* _tmp3_; - sqlite3_stmt* _tmp4_ = NULL; + sqlite3_stmt* _tmp3_ = NULL; + gint _tmp4_; gint _tmp5_; gint _tmp6_; - gint _tmp7_; #line 304 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" g_return_val_if_fail (table_name != NULL, FALSE); #line 304 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" @@ -1857,119 +1769,108 @@ gboolean database_table_has_column (const gchar* table_name, const gchar* column #line 306 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _tmp0_ = database_table_db; #line 306 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp1_ = table_name; -#line 306 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp2_ = g_strdup_printf ("PRAGMA table_info(%s)", _tmp1_); + _tmp1_ = g_strdup_printf ("PRAGMA table_info(%s)", table_name); #line 306 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp3_ = _tmp2_; + _tmp2_ = _tmp1_; #line 306 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp5_ = sqlite3_prepare_v2 (_tmp0_, _tmp3_, -1, &_tmp4_, NULL); + _tmp4_ = sqlite3_prepare_v2 (_tmp0_, _tmp2_, -1, &_tmp3_, NULL); #line 306 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _sqlite3_finalize0 (stmt); #line 306 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - stmt = _tmp4_; + stmt = _tmp3_; #line 306 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp6_ = _tmp5_; + _tmp5_ = _tmp4_; #line 306 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _g_free0 (_tmp3_); + _g_free0 (_tmp2_); #line 306 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - res = _tmp6_; + res = _tmp5_; #line 307 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp7_ = res; + _tmp6_ = res; #line 307 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _vala_assert (_tmp7_ == SQLITE_OK, "res == Sqlite.OK"); -#line 1882 "DatabaseTable.c" + _vala_assert (_tmp6_ == SQLITE_OK, "res == Sqlite.OK"); +#line 1792 "DatabaseTable.c" { - gboolean _tmp8_ = FALSE; + gboolean _tmp7_ = FALSE; #line 309 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp8_ = TRUE; + _tmp7_ = TRUE; #line 309 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" while (TRUE) { -#line 1889 "DatabaseTable.c" - sqlite3_stmt* _tmp9_; - gint _tmp10_; - gint _tmp11_; +#line 1799 "DatabaseTable.c" + sqlite3_stmt* _tmp8_; + gint _tmp9_; #line 309 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - if (!_tmp8_) { -#line 1895 "DatabaseTable.c" + if (!_tmp7_) { +#line 1804 "DatabaseTable.c" } #line 309 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp8_ = FALSE; -#line 310 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp9_ = stmt; + _tmp7_ = FALSE; #line 310 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp10_ = sqlite3_step (_tmp9_); + _tmp8_ = stmt; #line 310 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - res = _tmp10_; + res = sqlite3_step (_tmp8_); #line 311 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp11_ = res; + _tmp9_ = res; #line 311 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - if (_tmp11_ == SQLITE_DONE) { + if (_tmp9_ == SQLITE_DONE) { #line 312 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" break; -#line 1911 "DatabaseTable.c" +#line 1818 "DatabaseTable.c" } else { - gint _tmp12_; + gint _tmp10_; #line 313 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp12_ = res; + _tmp10_ = res; #line 313 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - if (_tmp12_ != SQLITE_ROW) { -#line 1918 "DatabaseTable.c" - const gchar* _tmp13_; - gchar* _tmp14_; - gchar* _tmp15_; - gint _tmp16_; + if (_tmp10_ != SQLITE_ROW) { +#line 1825 "DatabaseTable.c" + gchar* _tmp11_; + gchar* _tmp12_; + gint _tmp13_; #line 314 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp13_ = table_name; + _tmp11_ = g_strdup_printf ("has_column %s", table_name); #line 314 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp14_ = g_strdup_printf ("has_column %s", _tmp13_); + _tmp12_ = _tmp11_; #line 314 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp15_ = _tmp14_; + _tmp13_ = res; #line 314 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp16_ = res; + database_table_fatal (_tmp12_, _tmp13_); #line 314 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - database_table_fatal (_tmp15_, _tmp16_); -#line 314 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _g_free0 (_tmp15_); + _g_free0 (_tmp12_); #line 316 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" break; -#line 1937 "DatabaseTable.c" +#line 1841 "DatabaseTable.c" } else { gchar* column = NULL; - sqlite3_stmt* _tmp17_; + sqlite3_stmt* _tmp14_; + const gchar* _tmp15_; + gchar* _tmp16_; + gboolean _tmp17_ = FALSE; const gchar* _tmp18_; - gchar* _tmp19_; - gboolean _tmp20_ = FALSE; - const gchar* _tmp21_; #line 318 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp17_ = stmt; + _tmp14_ = stmt; #line 318 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp18_ = sqlite3_column_text (_tmp17_, 1); + _tmp15_ = sqlite3_column_text (_tmp14_, 1); #line 318 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp19_ = g_strdup (_tmp18_); + _tmp16_ = g_strdup (_tmp15_); #line 318 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - column = _tmp19_; -#line 319 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp21_ = column; + column = _tmp16_; #line 319 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - if (_tmp21_ != NULL) { -#line 1957 "DatabaseTable.c" - const gchar* _tmp22_; - const gchar* _tmp23_; + _tmp18_ = column; #line 319 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp22_ = column; + if (_tmp18_ != NULL) { +#line 1861 "DatabaseTable.c" + const gchar* _tmp19_; #line 319 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp23_ = column_name; + _tmp19_ = column; #line 319 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp20_ = g_strcmp0 (_tmp22_, _tmp23_) == 0; -#line 1966 "DatabaseTable.c" + _tmp17_ = g_strcmp0 (_tmp19_, column_name) == 0; +#line 1867 "DatabaseTable.c" } else { #line 319 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp20_ = FALSE; -#line 1970 "DatabaseTable.c" + _tmp17_ = FALSE; +#line 1871 "DatabaseTable.c" } #line 319 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - if (_tmp20_) { + if (_tmp17_) { #line 320 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" result = TRUE; #line 320 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" @@ -1978,11 +1879,11 @@ gboolean database_table_has_column (const gchar* table_name, const gchar* column _sqlite3_finalize0 (stmt); #line 320 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" return result; -#line 1982 "DatabaseTable.c" +#line 1883 "DatabaseTable.c" } #line 313 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _g_free0 (column); -#line 1986 "DatabaseTable.c" +#line 1887 "DatabaseTable.c" } } } @@ -1993,83 +1894,79 @@ gboolean database_table_has_column (const gchar* table_name, const gchar* column _sqlite3_finalize0 (stmt); #line 324 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" return result; -#line 1997 "DatabaseTable.c" +#line 1898 "DatabaseTable.c" } -gboolean database_table_has_table (const gchar* table_name) { +gboolean +database_table_has_table (const gchar* table_name) +{ gboolean result = FALSE; sqlite3_stmt* stmt = NULL; gint res = 0; sqlite3* _tmp0_; - const gchar* _tmp1_; + gchar* _tmp1_; gchar* _tmp2_; - gchar* _tmp3_; - sqlite3_stmt* _tmp4_ = NULL; + sqlite3_stmt* _tmp3_ = NULL; + gint _tmp4_; gint _tmp5_; gint _tmp6_; gint _tmp7_; - gint _tmp8_; - gint _tmp9_; #line 327 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" g_return_val_if_fail (table_name != NULL, FALSE); #line 329 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _tmp0_ = database_table_db; #line 329 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp1_ = table_name; + _tmp1_ = g_strdup_printf ("PRAGMA table_info(%s)", table_name); #line 329 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp2_ = g_strdup_printf ("PRAGMA table_info(%s)", _tmp1_); + _tmp2_ = _tmp1_; #line 329 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp3_ = _tmp2_; -#line 329 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp5_ = sqlite3_prepare_v2 (_tmp0_, _tmp3_, -1, &_tmp4_, NULL); + _tmp4_ = sqlite3_prepare_v2 (_tmp0_, _tmp2_, -1, &_tmp3_, NULL); #line 329 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _sqlite3_finalize0 (stmt); #line 329 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - stmt = _tmp4_; + stmt = _tmp3_; #line 329 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp6_ = _tmp5_; + _tmp5_ = _tmp4_; #line 329 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _g_free0 (_tmp3_); + _g_free0 (_tmp2_); #line 329 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - res = _tmp6_; + res = _tmp5_; #line 330 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp7_ = res; + _tmp6_ = res; #line 330 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _vala_assert (_tmp7_ == SQLITE_OK, "res == Sqlite.OK"); -#line 332 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp8_ = sqlite3_step (stmt); + _vala_assert (_tmp6_ == SQLITE_OK, "res == Sqlite.OK"); #line 332 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - res = _tmp8_; + res = sqlite3_step (stmt); #line 334 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp9_ = res; + _tmp7_ = res; #line 334 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - result = _tmp9_ != SQLITE_DONE; + result = _tmp7_ != SQLITE_DONE; #line 334 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _sqlite3_finalize0 (stmt); #line 334 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" return result; -#line 2053 "DatabaseTable.c" +#line 1950 "DatabaseTable.c" } -gboolean database_table_add_column (const gchar* table_name, const gchar* column_name, const gchar* column_constraints) { +gboolean +database_table_add_column (const gchar* table_name, + const gchar* column_name, + const gchar* column_constraints) +{ gboolean result = FALSE; sqlite3_stmt* stmt = NULL; gint res = 0; sqlite3* _tmp0_; - const gchar* _tmp1_; - const gchar* _tmp2_; - const gchar* _tmp3_; - gchar* _tmp4_; - gchar* _tmp5_; - sqlite3_stmt* _tmp6_ = NULL; - gint _tmp7_; + gchar* _tmp1_; + gchar* _tmp2_; + sqlite3_stmt* _tmp3_ = NULL; + gint _tmp4_; + gint _tmp5_; + gint _tmp6_; + sqlite3_stmt* _tmp7_; gint _tmp8_; - gint _tmp9_; - sqlite3_stmt* _tmp10_; - gint _tmp11_; - gint _tmp12_; #line 337 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" g_return_val_if_fail (table_name != NULL, FALSE); #line 337 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" @@ -2079,69 +1976,52 @@ gboolean database_table_add_column (const gchar* table_name, const gchar* column #line 339 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _tmp0_ = database_table_db; #line 339 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp1_ = table_name; + _tmp1_ = g_strdup_printf ("ALTER TABLE %s ADD COLUMN %s %s", table_name, column_name, column_constraints); #line 339 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp2_ = column_name; + _tmp2_ = _tmp1_; #line 339 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp3_ = column_constraints; -#line 339 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp4_ = g_strdup_printf ("ALTER TABLE %s ADD COLUMN %s %s", _tmp1_, _tmp2_, _tmp3_); -#line 339 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp5_ = _tmp4_; -#line 339 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp7_ = sqlite3_prepare_v2 (_tmp0_, _tmp5_, -1, &_tmp6_, NULL); + _tmp4_ = sqlite3_prepare_v2 (_tmp0_, _tmp2_, -1, &_tmp3_, NULL); #line 339 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _sqlite3_finalize0 (stmt); #line 339 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - stmt = _tmp6_; + stmt = _tmp3_; #line 339 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp8_ = _tmp7_; + _tmp5_ = _tmp4_; #line 339 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _g_free0 (_tmp5_); + _g_free0 (_tmp2_); #line 339 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - res = _tmp8_; + res = _tmp5_; #line 341 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp9_ = res; + _tmp6_ = res; #line 341 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _vala_assert (_tmp9_ == SQLITE_OK, "res == Sqlite.OK"); -#line 343 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp10_ = stmt; + _vala_assert (_tmp6_ == SQLITE_OK, "res == Sqlite.OK"); #line 343 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp11_ = sqlite3_step (_tmp10_); + _tmp7_ = stmt; #line 343 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - res = _tmp11_; + res = sqlite3_step (_tmp7_); #line 344 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp12_ = res; + _tmp8_ = res; #line 344 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - if (_tmp12_ != SQLITE_DONE) { -#line 2118 "DatabaseTable.c" - const gchar* _tmp13_; - const gchar* _tmp14_; - const gchar* _tmp15_; - gint _tmp16_; - sqlite3* _tmp17_; - const gchar* _tmp18_; -#line 345 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp13_ = table_name; -#line 345 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp14_ = column_name; -#line 345 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp15_ = column_constraints; + if (_tmp8_ != SQLITE_DONE) { +#line 2007 "DatabaseTable.c" + gint _tmp9_; + sqlite3* _tmp10_; + const gchar* _tmp11_; #line 345 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp16_ = res; + _tmp9_ = res; #line 345 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp17_ = database_table_db; + _tmp10_ = database_table_db; #line 345 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp18_ = sqlite3_errmsg (_tmp17_); + _tmp11_ = sqlite3_errmsg (_tmp10_); #line 345 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - g_critical ("DatabaseTable.vala:345: Unable to add column %s %s %s: (%d) %s", _tmp13_, _tmp14_, _tmp15_, _tmp16_, _tmp18_); + g_critical ("DatabaseTable.vala:345: Unable to add column %s %s %s: (%d) %s", table_name, column_name, column_constraints, _tmp9_, _tmp11_); #line 348 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" result = FALSE; #line 348 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _sqlite3_finalize0 (stmt); #line 348 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" return result; -#line 2145 "DatabaseTable.c" +#line 2025 "DatabaseTable.c" } #line 351 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" result = TRUE; @@ -2149,20 +2029,18 @@ gboolean database_table_add_column (const gchar* table_name, const gchar* column _sqlite3_finalize0 (stmt); #line 351 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" return result; -#line 2153 "DatabaseTable.c" +#line 2033 "DatabaseTable.c" } -gboolean database_table_ensure_column (const gchar* table_name, const gchar* column_name, const gchar* column_constraints, const gchar* upgrade_msg) { +gboolean +database_table_ensure_column (const gchar* table_name, + const gchar* column_name, + const gchar* column_constraints, + const gchar* upgrade_msg) +{ gboolean result = FALSE; gboolean _tmp0_ = FALSE; - const gchar* _tmp1_; - gboolean _tmp2_; - const gchar* _tmp6_; - const gchar* _tmp7_; - const gchar* _tmp8_; - const gchar* _tmp9_; - gboolean _tmp10_; #line 357 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" g_return_val_if_fail (table_name != NULL, FALSE); #line 357 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" @@ -2172,27 +2050,14 @@ gboolean database_table_ensure_column (const gchar* table_name, const gchar* col #line 357 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" g_return_val_if_fail (upgrade_msg != NULL, FALSE); #line 359 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp1_ = table_name; -#line 359 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp2_ = database_table_has_table (_tmp1_); -#line 359 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - if (!_tmp2_) { + if (!database_table_has_table (table_name)) { #line 359 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _tmp0_ = TRUE; -#line 2183 "DatabaseTable.c" +#line 2057 "DatabaseTable.c" } else { - const gchar* _tmp3_; - const gchar* _tmp4_; - gboolean _tmp5_; -#line 359 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp3_ = table_name; -#line 359 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp4_ = column_name; #line 359 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp5_ = database_table_has_column (_tmp3_, _tmp4_); -#line 359 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp0_ = _tmp5_; -#line 2196 "DatabaseTable.c" + _tmp0_ = database_table_has_column (table_name, column_name); +#line 2061 "DatabaseTable.c" } #line 359 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" if (_tmp0_) { @@ -2200,29 +2065,21 @@ gboolean database_table_ensure_column (const gchar* table_name, const gchar* col result = TRUE; #line 360 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" return result; -#line 2204 "DatabaseTable.c" +#line 2069 "DatabaseTable.c" } #line 362 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp6_ = upgrade_msg; -#line 362 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - g_message ("DatabaseTable.vala:362: %s", _tmp6_); -#line 364 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp7_ = table_name; -#line 364 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp8_ = column_name; + g_message ("DatabaseTable.vala:362: %s", upgrade_msg); #line 364 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp9_ = column_constraints; -#line 364 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp10_ = database_table_add_column (_tmp7_, _tmp8_, _tmp9_); -#line 364 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - result = _tmp10_; + result = database_table_add_column (table_name, column_name, column_constraints); #line 364 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" return result; -#line 2222 "DatabaseTable.c" +#line 2077 "DatabaseTable.c" } -gint database_table_get_row_count (DatabaseTable* self) { +gint +database_table_get_row_count (DatabaseTable* self) +{ gint result = 0; sqlite3_stmt* stmt = NULL; gint res = 0; @@ -2236,9 +2093,7 @@ gint database_table_get_row_count (DatabaseTable* self) { gint _tmp7_; sqlite3_stmt* _tmp8_; gint _tmp9_; - gint _tmp10_; - sqlite3_stmt* _tmp15_; - gint _tmp16_; + sqlite3_stmt* _tmp14_; #line 367 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" g_return_val_if_fail (IS_DATABASE_TABLE (self), 0); #line 369 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" @@ -2268,51 +2123,49 @@ gint database_table_get_row_count (DatabaseTable* self) { #line 372 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _tmp8_ = stmt; #line 372 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp9_ = sqlite3_step (_tmp8_); -#line 372 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - res = _tmp9_; + res = sqlite3_step (_tmp8_); #line 373 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp10_ = res; + _tmp9_ = res; #line 373 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - if (_tmp10_ != SQLITE_ROW) { -#line 2279 "DatabaseTable.c" - const gchar* _tmp11_; - gint _tmp12_; - sqlite3* _tmp13_; - const gchar* _tmp14_; + if (_tmp9_ != SQLITE_ROW) { +#line 2132 "DatabaseTable.c" + const gchar* _tmp10_; + gint _tmp11_; + sqlite3* _tmp12_; + const gchar* _tmp13_; #line 374 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp11_ = self->table_name; + _tmp10_ = self->table_name; #line 374 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp12_ = res; + _tmp11_ = res; #line 374 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp13_ = database_table_db; + _tmp12_ = database_table_db; #line 374 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp14_ = sqlite3_errmsg (_tmp13_); + _tmp13_ = sqlite3_errmsg (_tmp12_); #line 374 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - g_critical ("DatabaseTable.vala:374: Unable to retrieve row count on %s: (%d) %s", _tmp11_, _tmp12_, _tmp14_); + g_critical ("DatabaseTable.vala:374: Unable to retrieve row count on %s: (%d) %s", _tmp10_, _tmp11_, _tmp13_); #line 376 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" result = 0; #line 376 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _sqlite3_finalize0 (stmt); #line 376 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" return result; -#line 2300 "DatabaseTable.c" +#line 2153 "DatabaseTable.c" } #line 379 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp15_ = stmt; -#line 379 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp16_ = sqlite3_column_int (_tmp15_, 0); + _tmp14_ = stmt; #line 379 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - result = _tmp16_; + result = sqlite3_column_int (_tmp14_, 0); #line 379 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _sqlite3_finalize0 (stmt); #line 379 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" return result; -#line 2312 "DatabaseTable.c" +#line 2163 "DatabaseTable.c" } -void database_table_begin_transaction (void) { +void +database_table_begin_transaction (void) +{ gint _tmp0_; gint res = 0; sqlite3* _tmp1_; @@ -2326,7 +2179,7 @@ void database_table_begin_transaction (void) { if (_tmp0_ != 0) { #line 385 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" return; -#line 2330 "DatabaseTable.c" +#line 2183 "DatabaseTable.c" } #line 387 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _tmp1_ = database_table_db; @@ -2338,11 +2191,13 @@ void database_table_begin_transaction (void) { _tmp3_ = res; #line 388 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _vala_assert (_tmp3_ == SQLITE_OK, "res == Sqlite.OK"); -#line 2342 "DatabaseTable.c" +#line 2195 "DatabaseTable.c" } -void database_table_commit_transaction (GError** error) { +void +database_table_commit_transaction (GError** error) +{ gint _tmp0_; gint _tmp1_; gint _tmp2_; @@ -2365,7 +2220,7 @@ void database_table_commit_transaction (GError** error) { if (_tmp2_ != 0) { #line 395 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" return; -#line 2369 "DatabaseTable.c" +#line 2224 "DatabaseTable.c" } #line 397 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _tmp3_ = database_table_db; @@ -2377,7 +2232,7 @@ void database_table_commit_transaction (GError** error) { _tmp5_ = res; #line 398 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" if (_tmp5_ != SQLITE_DONE) { -#line 2381 "DatabaseTable.c" +#line 2236 "DatabaseTable.c" gint _tmp6_; #line 399 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _tmp6_ = res; @@ -2391,7 +2246,7 @@ void database_table_commit_transaction (GError** error) { g_propagate_error (error, _inner_error_); #line 399 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" return; -#line 2395 "DatabaseTable.c" +#line 2250 "DatabaseTable.c" } else { #line 399 "/home/jens/Source/shotwell/src/db/DatabaseTable.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); @@ -2399,121 +2254,148 @@ void database_table_commit_transaction (GError** error) { g_clear_error (&_inner_error_); #line 399 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" return; -#line 2403 "DatabaseTable.c" +#line 2258 "DatabaseTable.c" } } } } -DatabaseTable* database_table_construct (GType object_type) { +DatabaseTable* +database_table_construct (GType object_type) +{ DatabaseTable* self = NULL; #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" self = (DatabaseTable*) g_type_create_instance (object_type); #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" return self; -#line 2416 "DatabaseTable.c" +#line 2273 "DatabaseTable.c" } -static void value_database_table_init (GValue* value) { +static void +value_database_table_init (GValue* value) +{ #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" value->data[0].v_pointer = NULL; -#line 2423 "DatabaseTable.c" +#line 2282 "DatabaseTable.c" } -static void value_database_table_free_value (GValue* value) { +static void +value_database_table_free_value (GValue* value) +{ #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" if (value->data[0].v_pointer) { #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" database_table_unref (value->data[0].v_pointer); -#line 2432 "DatabaseTable.c" +#line 2293 "DatabaseTable.c" } } -static void value_database_table_copy_value (const GValue* src_value, GValue* dest_value) { +static void +value_database_table_copy_value (const GValue* src_value, + GValue* dest_value) +{ #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" if (src_value->data[0].v_pointer) { #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" dest_value->data[0].v_pointer = database_table_ref (src_value->data[0].v_pointer); -#line 2442 "DatabaseTable.c" +#line 2306 "DatabaseTable.c" } else { #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" dest_value->data[0].v_pointer = NULL; -#line 2446 "DatabaseTable.c" +#line 2310 "DatabaseTable.c" } } -static gpointer value_database_table_peek_pointer (const GValue* value) { +static gpointer +value_database_table_peek_pointer (const GValue* value) +{ #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" return value->data[0].v_pointer; -#line 2454 "DatabaseTable.c" +#line 2320 "DatabaseTable.c" } -static gchar* value_database_table_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_database_table_collect_value (GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" if (collect_values[0].v_pointer) { -#line 2461 "DatabaseTable.c" +#line 2332 "DatabaseTable.c" DatabaseTable * object; object = collect_values[0].v_pointer; #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" if (object->parent_instance.g_class == NULL) { #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 2468 "DatabaseTable.c" +#line 2339 "DatabaseTable.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.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 2472 "DatabaseTable.c" +#line 2343 "DatabaseTable.c" } #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" value->data[0].v_pointer = database_table_ref (object); -#line 2476 "DatabaseTable.c" +#line 2347 "DatabaseTable.c" } else { #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" value->data[0].v_pointer = NULL; -#line 2480 "DatabaseTable.c" +#line 2351 "DatabaseTable.c" } #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" return NULL; -#line 2484 "DatabaseTable.c" +#line 2355 "DatabaseTable.c" } -static gchar* value_database_table_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_database_table_lcopy_value (const GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ DatabaseTable ** object_p; object_p = collect_values[0].v_pointer; #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" if (!object_p) { #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 2495 "DatabaseTable.c" +#line 2371 "DatabaseTable.c" } #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" if (!value->data[0].v_pointer) { #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" *object_p = NULL; -#line 2501 "DatabaseTable.c" +#line 2377 "DatabaseTable.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" *object_p = value->data[0].v_pointer; -#line 2505 "DatabaseTable.c" +#line 2381 "DatabaseTable.c" } else { #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" *object_p = database_table_ref (value->data[0].v_pointer); -#line 2509 "DatabaseTable.c" +#line 2385 "DatabaseTable.c" } #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" return NULL; -#line 2513 "DatabaseTable.c" +#line 2389 "DatabaseTable.c" } -GParamSpec* param_spec_database_table (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { +GParamSpec* +param_spec_database_table (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) +{ ParamSpecDatabaseTable* spec; #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" g_return_val_if_fail (g_type_is_a (object_type, TYPE_DATABASE_TABLE), NULL); @@ -2523,20 +2405,25 @@ GParamSpec* param_spec_database_table (const gchar* name, const gchar* nick, con G_PARAM_SPEC (spec)->value_type = object_type; #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" return G_PARAM_SPEC (spec); -#line 2527 "DatabaseTable.c" +#line 2409 "DatabaseTable.c" } -gpointer value_get_database_table (const GValue* value) { +gpointer +value_get_database_table (const GValue* value) +{ #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_DATABASE_TABLE), NULL); #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" return value->data[0].v_pointer; -#line 2536 "DatabaseTable.c" +#line 2420 "DatabaseTable.c" } -void value_set_database_table (GValue* value, gpointer v_object) { +void +value_set_database_table (GValue* value, + gpointer v_object) +{ DatabaseTable * old; #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_DATABASE_TABLE)); @@ -2552,22 +2439,25 @@ void value_set_database_table (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" database_table_ref (value->data[0].v_pointer); -#line 2556 "DatabaseTable.c" +#line 2443 "DatabaseTable.c" } else { #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" value->data[0].v_pointer = NULL; -#line 2560 "DatabaseTable.c" +#line 2447 "DatabaseTable.c" } #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" if (old) { #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" database_table_unref (old); -#line 2566 "DatabaseTable.c" +#line 2453 "DatabaseTable.c" } } -void value_take_database_table (GValue* value, gpointer v_object) { +void +value_take_database_table (GValue* value, + gpointer v_object) +{ DatabaseTable * old; #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_DATABASE_TABLE)); @@ -2581,40 +2471,46 @@ void value_take_database_table (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" value->data[0].v_pointer = v_object; -#line 2585 "DatabaseTable.c" +#line 2475 "DatabaseTable.c" } else { #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" value->data[0].v_pointer = NULL; -#line 2589 "DatabaseTable.c" +#line 2479 "DatabaseTable.c" } #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" if (old) { #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" database_table_unref (old); -#line 2595 "DatabaseTable.c" +#line 2485 "DatabaseTable.c" } } -static void database_table_class_init (DatabaseTableClass * klass) { +static void +database_table_class_init (DatabaseTableClass * klass) +{ #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" database_table_parent_class = g_type_class_peek_parent (klass); #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" ((DatabaseTableClass *) klass)->finalize = database_table_finalize; -#line 2605 "DatabaseTable.c" +#line 2497 "DatabaseTable.c" } -static void database_table_instance_init (DatabaseTable * self) { +static void +database_table_instance_init (DatabaseTable * self) +{ #line 30 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" self->table_name = NULL; #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" self->ref_count = 1; -#line 2614 "DatabaseTable.c" +#line 2508 "DatabaseTable.c" } -static void database_table_finalize (DatabaseTable * obj) { +static void +database_table_finalize (DatabaseTable * obj) +{ DatabaseTable * self; #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_DATABASE_TABLE, DatabaseTable); @@ -2622,11 +2518,13 @@ static void database_table_finalize (DatabaseTable * obj) { g_signal_handlers_destroy (self); #line 30 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _g_free0 (self->table_name); -#line 2626 "DatabaseTable.c" +#line 2522 "DatabaseTable.c" } -GType database_table_get_type (void) { +GType +database_table_get_type (void) +{ static volatile gsize database_table_type_id__volatile = 0; if (g_once_init_enter (&database_table_type_id__volatile)) { static const GTypeValueTable g_define_type_value_table = { value_database_table_init, value_database_table_free_value, value_database_table_copy_value, value_database_table_peek_pointer, "p", value_database_table_collect_value, "p", value_database_table_lcopy_value }; @@ -2640,18 +2538,22 @@ GType database_table_get_type (void) { } -gpointer database_table_ref (gpointer instance) { +gpointer +database_table_ref (gpointer instance) +{ DatabaseTable * self; self = instance; #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" g_atomic_int_inc (&self->ref_count); #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" return instance; -#line 2651 "DatabaseTable.c" +#line 2551 "DatabaseTable.c" } -void database_table_unref (gpointer instance) { +void +database_table_unref (gpointer instance) +{ DatabaseTable * self; self = instance; #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" @@ -2660,7 +2562,7 @@ void database_table_unref (gpointer instance) { DATABASE_TABLE_GET_CLASS (self)->finalize (self); #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" g_type_free_instance ((GTypeInstance *) self); -#line 2664 "DatabaseTable.c" +#line 2566 "DatabaseTable.c" } } diff --git a/src/db/Db.c b/src/db/Db.c index b5200cf..cafe2e4 100644 --- a/src/db/Db.c +++ b/src/db/Db.c @@ -1,4 +1,4 @@ -/* Db.c generated by valac 0.36.6, the Vala compiler +/* Db.c generated by valac 0.40.4, the Vala compiler * generated from Db.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,6 +7,7 @@ * (version 2.1 or later). See the COPYING file in this distribution. */ + #include <glib.h> #include <glib-object.h> #include <stdlib.h> @@ -71,84 +72,108 @@ void database_table_init (const gchar* filename); void db_terminate (void); void database_table_terminate (void); GType db_verify_result_get_type (void) G_GNUC_CONST; -DbVerifyResult db_verify_database (gchar* * app_version, gint* schema_version); +DbVerifyResult db_verify_database (gchar* * app_version, + gint* schema_version); gpointer database_table_ref (gpointer instance); void database_table_unref (gpointer instance); -GParamSpec* param_spec_database_table (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_database_table (GValue* value, gpointer v_object); -void value_take_database_table (GValue* value, gpointer v_object); +GParamSpec* param_spec_database_table (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_database_table (GValue* value, + gpointer v_object); +void value_take_database_table (GValue* value, + gpointer v_object); gpointer value_get_database_table (const GValue* value); GType database_table_get_type (void) G_GNUC_CONST; GType version_table_get_type (void) G_GNUC_CONST; VersionTable* version_table_get_instance (void); -gint version_table_get_version (VersionTable* self, gchar* * app_version); +gint version_table_get_version (VersionTable* self, + gchar* * app_version); #define DATABASE_TABLE_SCHEMA_VERSION 20 #define RESOURCES_APP_VERSION _VERSION -void version_table_set_version (VersionTable* self, gint version, const gchar* app_version, const gchar* user_data); +void version_table_set_version (VersionTable* self, + gint version, + const gchar* app_version, + const gchar* user_data); DbVerifyResult db_upgrade_database (gint input_version); -gboolean database_table_has_column (const gchar* table_name, const gchar* column_name); -gboolean database_table_add_column (const gchar* table_name, const gchar* column_name, const gchar* column_constraints); +gboolean database_table_has_column (const gchar* table_name, + const gchar* column_name); +gboolean database_table_add_column (const gchar* table_name, + const gchar* column_name, + const gchar* column_constraints); gboolean database_table_has_table (const gchar* table_name); -gboolean database_table_ensure_column (const gchar* table_name, const gchar* column_name, const gchar* column_constraints, const gchar* upgrade_msg); +gboolean database_table_ensure_column (const gchar* table_name, + const gchar* column_name, + const gchar* column_constraints, + const gchar* upgrade_msg); void tag_table_upgrade_for_htags (void); void gsettings_configuration_engine_run_gsettings_migrator (void); gpointer application_ref (gpointer instance); void application_unref (gpointer instance); -GParamSpec* param_spec_application (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_application (GValue* value, gpointer v_object); -void value_take_application (GValue* value, gpointer v_object); +GParamSpec* param_spec_application (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_application (GValue* value, + gpointer v_object); +void value_take_application (GValue* value, + gpointer v_object); gpointer value_get_application (const GValue* value); GType application_get_type (void) G_GNUC_CONST; Application* application_get_instance (void); -void application_set_raw_thumbs_fix_required (Application* self, gboolean should_fixup); -void version_table_update_version (VersionTable* self, gint version, const gchar* app_version); +void application_set_raw_thumbs_fix_required (Application* self, + gboolean should_fixup); +void version_table_update_version (VersionTable* self, + gint version, + const gchar* app_version); -void db_preconfigure (GFile* db_file) { +void +db_preconfigure (GFile* db_file) +{ gchar* _tmp0_ = NULL; - GFile* _tmp1_; - gchar* _tmp5_; + gchar* _tmp3_; #line 14 "/home/jens/Source/shotwell/src/db/Db.vala" g_return_if_fail ((db_file == NULL) || G_IS_FILE (db_file)); #line 15 "/home/jens/Source/shotwell/src/db/Db.vala" - _tmp1_ = db_file; -#line 15 "/home/jens/Source/shotwell/src/db/Db.vala" - if (_tmp1_ != NULL) { -#line 118 "Db.c" - GFile* _tmp2_; - gchar* _tmp3_; + if (db_file != NULL) { +#line 144 "Db.c" + gchar* _tmp1_; #line 15 "/home/jens/Source/shotwell/src/db/Db.vala" - _tmp2_ = db_file; -#line 15 "/home/jens/Source/shotwell/src/db/Db.vala" - _tmp3_ = g_file_get_path (_tmp2_); + _tmp1_ = g_file_get_path (db_file); #line 15 "/home/jens/Source/shotwell/src/db/Db.vala" _g_free0 (_tmp0_); #line 15 "/home/jens/Source/shotwell/src/db/Db.vala" - _tmp0_ = _tmp3_; -#line 129 "Db.c" + _tmp0_ = _tmp1_; +#line 152 "Db.c" } else { - gchar* _tmp4_; + gchar* _tmp2_; #line 15 "/home/jens/Source/shotwell/src/db/Db.vala" - _tmp4_ = g_strdup (DB_IN_MEMORY_NAME); + _tmp2_ = g_strdup (DB_IN_MEMORY_NAME); #line 15 "/home/jens/Source/shotwell/src/db/Db.vala" _g_free0 (_tmp0_); #line 15 "/home/jens/Source/shotwell/src/db/Db.vala" - _tmp0_ = _tmp4_; -#line 138 "Db.c" + _tmp0_ = _tmp2_; +#line 161 "Db.c" } #line 15 "/home/jens/Source/shotwell/src/db/Db.vala" - _tmp5_ = g_strdup (_tmp0_); + _tmp3_ = g_strdup (_tmp0_); #line 15 "/home/jens/Source/shotwell/src/db/Db.vala" _g_free0 (db_filename); #line 15 "/home/jens/Source/shotwell/src/db/Db.vala" - db_filename = _tmp5_; + db_filename = _tmp3_; #line 14 "/home/jens/Source/shotwell/src/db/Db.vala" _g_free0 (_tmp0_); -#line 148 "Db.c" +#line 171 "Db.c" } -void db_init (GError** error) { +void +db_init (GError** error) +{ const gchar* _tmp0_; const gchar* _tmp1_; #line 19 "/home/jens/Source/shotwell/src/db/Db.vala" @@ -159,18 +184,22 @@ void db_init (GError** error) { _tmp1_ = db_filename; #line 21 "/home/jens/Source/shotwell/src/db/Db.vala" database_table_init (_tmp1_); -#line 163 "Db.c" +#line 188 "Db.c" } -void db_terminate (void) { +void +db_terminate (void) +{ #line 25 "/home/jens/Source/shotwell/src/db/Db.vala" database_table_terminate (); -#line 170 "Db.c" +#line 197 "Db.c" } -GType db_verify_result_get_type (void) { +GType +db_verify_result_get_type (void) +{ static volatile gsize db_verify_result_type_id__volatile = 0; if (g_once_init_enter (&db_verify_result_type_id__volatile)) { static const GEnumValue values[] = {{DB_VERIFY_RESULT_OK, "DB_VERIFY_RESULT_OK", "ok"}, {DB_VERIFY_RESULT_FUTURE_VERSION, "DB_VERIFY_RESULT_FUTURE_VERSION", "future-version"}, {DB_VERIFY_RESULT_UPGRADE_ERROR, "DB_VERIFY_RESULT_UPGRADE_ERROR", "upgrade-error"}, {DB_VERIFY_RESULT_NO_UPGRADE_AVAILABLE, "DB_VERIFY_RESULT_NO_UPGRADE_AVAILABLE", "no-upgrade-available"}, {0, NULL, NULL}}; @@ -182,7 +211,10 @@ GType db_verify_result_get_type (void) { } -DbVerifyResult db_verify_database (gchar* * app_version, gint* schema_version) { +DbVerifyResult +db_verify_database (gchar* * app_version, + gint* schema_version) +{ gchar* _vala_app_version = NULL; gint _vala_schema_version = 0; DbVerifyResult result = 0; @@ -211,7 +243,7 @@ DbVerifyResult db_verify_database (gchar* * app_version, gint* schema_version) { _tmp4_ = _vala_schema_version; #line 39 "/home/jens/Source/shotwell/src/db/Db.vala" if (_tmp4_ >= 0) { -#line 215 "Db.c" +#line 247 "Db.c" gint _tmp5_; const gchar* _tmp6_; #line 40 "/home/jens/Source/shotwell/src/db/Db.vala" @@ -220,13 +252,13 @@ DbVerifyResult db_verify_database (gchar* * app_version, gint* schema_version) { _tmp6_ = _vala_app_version; #line 40 "/home/jens/Source/shotwell/src/db/Db.vala" g_debug ("Db.vala:40: Database schema version %d created by app version %s", _tmp5_, _tmp6_); -#line 224 "Db.c" +#line 256 "Db.c" } #line 42 "/home/jens/Source/shotwell/src/db/Db.vala" _tmp7_ = _vala_schema_version; #line 42 "/home/jens/Source/shotwell/src/db/Db.vala" if (_tmp7_ == -1) { -#line 230 "Db.c" +#line 262 "Db.c" VersionTable* _tmp8_; gchar* _tmp9_; #line 44 "/home/jens/Source/shotwell/src/db/Db.vala" @@ -243,7 +275,7 @@ DbVerifyResult db_verify_database (gchar* * app_version, gint* schema_version) { _vala_app_version = _tmp9_; #line 48 "/home/jens/Source/shotwell/src/db/Db.vala" _vala_schema_version = DATABASE_TABLE_SCHEMA_VERSION; -#line 247 "Db.c" +#line 279 "Db.c" } else { gint _tmp10_; #line 49 "/home/jens/Source/shotwell/src/db/Db.vala" @@ -258,42 +290,39 @@ DbVerifyResult db_verify_database (gchar* * app_version, gint* schema_version) { if (app_version) { #line 51 "/home/jens/Source/shotwell/src/db/Db.vala" *app_version = _vala_app_version; -#line 262 "Db.c" +#line 294 "Db.c" } else { #line 51 "/home/jens/Source/shotwell/src/db/Db.vala" _g_free0 (_vala_app_version); -#line 266 "Db.c" +#line 298 "Db.c" } #line 51 "/home/jens/Source/shotwell/src/db/Db.vala" if (schema_version) { #line 51 "/home/jens/Source/shotwell/src/db/Db.vala" *schema_version = _vala_schema_version; -#line 272 "Db.c" +#line 304 "Db.c" } #line 51 "/home/jens/Source/shotwell/src/db/Db.vala" return result; -#line 276 "Db.c" +#line 308 "Db.c" } else { gint _tmp11_; #line 52 "/home/jens/Source/shotwell/src/db/Db.vala" _tmp11_ = _vala_schema_version; #line 52 "/home/jens/Source/shotwell/src/db/Db.vala" if (_tmp11_ < DATABASE_TABLE_SCHEMA_VERSION) { -#line 283 "Db.c" +#line 315 "Db.c" DbVerifyResult _result_ = 0; gint _tmp12_; DbVerifyResult _tmp13_; - DbVerifyResult _tmp14_; #line 54 "/home/jens/Source/shotwell/src/db/Db.vala" _tmp12_ = _vala_schema_version; #line 54 "/home/jens/Source/shotwell/src/db/Db.vala" - _tmp13_ = db_upgrade_database (_tmp12_); -#line 54 "/home/jens/Source/shotwell/src/db/Db.vala" - _result_ = _tmp13_; + _result_ = db_upgrade_database (_tmp12_); #line 55 "/home/jens/Source/shotwell/src/db/Db.vala" - _tmp14_ = _result_; + _tmp13_ = _result_; #line 55 "/home/jens/Source/shotwell/src/db/Db.vala" - if (_tmp14_ != DB_VERIFY_RESULT_OK) { + if (_tmp13_ != DB_VERIFY_RESULT_OK) { #line 56 "/home/jens/Source/shotwell/src/db/Db.vala" result = _result_; #line 56 "/home/jens/Source/shotwell/src/db/Db.vala" @@ -302,21 +331,21 @@ DbVerifyResult db_verify_database (gchar* * app_version, gint* schema_version) { if (app_version) { #line 56 "/home/jens/Source/shotwell/src/db/Db.vala" *app_version = _vala_app_version; -#line 306 "Db.c" +#line 335 "Db.c" } else { #line 56 "/home/jens/Source/shotwell/src/db/Db.vala" _g_free0 (_vala_app_version); -#line 310 "Db.c" +#line 339 "Db.c" } #line 56 "/home/jens/Source/shotwell/src/db/Db.vala" if (schema_version) { #line 56 "/home/jens/Source/shotwell/src/db/Db.vala" *schema_version = _vala_schema_version; -#line 316 "Db.c" +#line 345 "Db.c" } #line 56 "/home/jens/Source/shotwell/src/db/Db.vala" return result; -#line 320 "Db.c" +#line 349 "Db.c" } } } @@ -329,526 +358,384 @@ DbVerifyResult db_verify_database (gchar* * app_version, gint* schema_version) { if (app_version) { #line 59 "/home/jens/Source/shotwell/src/db/Db.vala" *app_version = _vala_app_version; -#line 333 "Db.c" +#line 362 "Db.c" } else { #line 59 "/home/jens/Source/shotwell/src/db/Db.vala" _g_free0 (_vala_app_version); -#line 337 "Db.c" +#line 366 "Db.c" } #line 59 "/home/jens/Source/shotwell/src/db/Db.vala" if (schema_version) { #line 59 "/home/jens/Source/shotwell/src/db/Db.vala" *schema_version = _vala_schema_version; -#line 343 "Db.c" +#line 372 "Db.c" } #line 59 "/home/jens/Source/shotwell/src/db/Db.vala" return result; -#line 347 "Db.c" +#line 376 "Db.c" } -DbVerifyResult db_upgrade_database (gint input_version) { +DbVerifyResult +db_upgrade_database (gint input_version) +{ DbVerifyResult result = 0; - gint _tmp0_; gint version = 0; + gint _tmp0_; gint _tmp1_; - gint _tmp2_; - gint _tmp3_; - gboolean _tmp4_; - gboolean _tmp6_; - gboolean _tmp8_; - gboolean _tmp10_; - gboolean _tmp12_; - gboolean _tmp14_; - gboolean _tmp16_; - gboolean _tmp18_; - gboolean _tmp20_ = FALSE; - gboolean _tmp21_; - gboolean _tmp24_; - gboolean _tmp26_; - gboolean _tmp27_; - gboolean _tmp29_; - gboolean _tmp31_; - gboolean _tmp33_; - gint _tmp35_; - gint _tmp36_; - gboolean _tmp37_; - gboolean _tmp39_; - gboolean _tmp40_; - gboolean _tmp42_; - gint _tmp44_; - gint _tmp47_; - VersionTable* _tmp48_; - VersionTable* _tmp49_; - gint _tmp50_; - gint _tmp51_; -#line 63 "/home/jens/Source/shotwell/src/db/Db.vala" - _tmp0_ = input_version; + gboolean _tmp2_ = FALSE; + gint _tmp5_; + VersionTable* _tmp6_; + VersionTable* _tmp7_; + gint _tmp8_; + gint _tmp9_; #line 63 "/home/jens/Source/shotwell/src/db/Db.vala" - _vala_assert (_tmp0_ < DATABASE_TABLE_SCHEMA_VERSION, "input_version < DatabaseTable.SCHEMA_VERSION"); + _vala_assert (input_version < DATABASE_TABLE_SCHEMA_VERSION, "input_version < DatabaseTable.SCHEMA_VERSION"); #line 65 "/home/jens/Source/shotwell/src/db/Db.vala" - _tmp1_ = input_version; -#line 65 "/home/jens/Source/shotwell/src/db/Db.vala" - version = _tmp1_; + version = input_version; #line 68 "/home/jens/Source/shotwell/src/db/Db.vala" - _tmp2_ = version; + _tmp0_ = version; #line 68 "/home/jens/Source/shotwell/src/db/Db.vala" - if (_tmp2_ == 1) { + if (_tmp0_ == 1) { #line 69 "/home/jens/Source/shotwell/src/db/Db.vala" result = DB_VERIFY_RESULT_NO_UPGRADE_AVAILABLE; #line 69 "/home/jens/Source/shotwell/src/db/Db.vala" return result; -#line 402 "Db.c" +#line 405 "Db.c" } #line 71 "/home/jens/Source/shotwell/src/db/Db.vala" - _tmp3_ = version; + _tmp1_ = version; #line 71 "/home/jens/Source/shotwell/src/db/Db.vala" - g_message ("Db.vala:71: Upgrading database from schema version %d to %d", _tmp3_, DATABASE_TABLE_SCHEMA_VERSION); -#line 83 "/home/jens/Source/shotwell/src/db/Db.vala" - _tmp4_ = database_table_has_column ("PhotoTable", "flags"); + g_message ("Db.vala:71: Upgrading database from schema version %d to %d", _tmp1_, DATABASE_TABLE_SCHEMA_VERSION); #line 83 "/home/jens/Source/shotwell/src/db/Db.vala" - if (!_tmp4_) { -#line 412 "Db.c" - gboolean _tmp5_; + if (!database_table_has_column ("PhotoTable", "flags")) { #line 84 "/home/jens/Source/shotwell/src/db/Db.vala" g_message ("Db.vala:84: upgrade_database: adding flags column to PhotoTable"); #line 85 "/home/jens/Source/shotwell/src/db/Db.vala" - _tmp5_ = database_table_add_column ("PhotoTable", "flags", "INTEGER DEFAULT 0"); -#line 85 "/home/jens/Source/shotwell/src/db/Db.vala" - if (!_tmp5_) { + if (!database_table_add_column ("PhotoTable", "flags", "INTEGER DEFAULT 0")) { #line 86 "/home/jens/Source/shotwell/src/db/Db.vala" result = DB_VERIFY_RESULT_UPGRADE_ERROR; #line 86 "/home/jens/Source/shotwell/src/db/Db.vala" return result; -#line 424 "Db.c" +#line 421 "Db.c" } } #line 89 "/home/jens/Source/shotwell/src/db/Db.vala" version = 3; #line 100 "/home/jens/Source/shotwell/src/db/Db.vala" - _tmp6_ = database_table_has_column ("PhotoTable", "file_format"); -#line 100 "/home/jens/Source/shotwell/src/db/Db.vala" - if (!_tmp6_) { -#line 433 "Db.c" - gboolean _tmp7_; + if (!database_table_has_column ("PhotoTable", "file_format")) { #line 101 "/home/jens/Source/shotwell/src/db/Db.vala" g_message ("Db.vala:101: upgrade_database: adding file_format column to PhotoTable"); #line 102 "/home/jens/Source/shotwell/src/db/Db.vala" - _tmp7_ = database_table_add_column ("PhotoTable", "file_format", "INTEGER DEFAULT 0"); -#line 102 "/home/jens/Source/shotwell/src/db/Db.vala" - if (!_tmp7_) { + if (!database_table_add_column ("PhotoTable", "file_format", "INTEGER DEFAULT 0")) { #line 103 "/home/jens/Source/shotwell/src/db/Db.vala" result = DB_VERIFY_RESULT_UPGRADE_ERROR; #line 103 "/home/jens/Source/shotwell/src/db/Db.vala" return result; -#line 445 "Db.c" +#line 436 "Db.c" } } #line 106 "/home/jens/Source/shotwell/src/db/Db.vala" version = 4; #line 113 "/home/jens/Source/shotwell/src/db/Db.vala" - _tmp8_ = database_table_has_column ("PhotoTable", "title"); -#line 113 "/home/jens/Source/shotwell/src/db/Db.vala" - if (!_tmp8_) { -#line 454 "Db.c" - gboolean _tmp9_; + if (!database_table_has_column ("PhotoTable", "title")) { #line 114 "/home/jens/Source/shotwell/src/db/Db.vala" g_message ("Db.vala:114: upgrade_database: adding title column to PhotoTable"); #line 115 "/home/jens/Source/shotwell/src/db/Db.vala" - _tmp9_ = database_table_add_column ("PhotoTable", "title", "TEXT"); -#line 115 "/home/jens/Source/shotwell/src/db/Db.vala" - if (!_tmp9_) { + if (!database_table_add_column ("PhotoTable", "title", "TEXT")) { #line 116 "/home/jens/Source/shotwell/src/db/Db.vala" result = DB_VERIFY_RESULT_UPGRADE_ERROR; #line 116 "/home/jens/Source/shotwell/src/db/Db.vala" return result; -#line 466 "Db.c" +#line 451 "Db.c" } } #line 119 "/home/jens/Source/shotwell/src/db/Db.vala" version = 5; #line 126 "/home/jens/Source/shotwell/src/db/Db.vala" - _tmp10_ = database_table_has_column ("PhotoTable", "backlinks"); -#line 126 "/home/jens/Source/shotwell/src/db/Db.vala" - if (!_tmp10_) { -#line 475 "Db.c" - gboolean _tmp11_; + if (!database_table_has_column ("PhotoTable", "backlinks")) { #line 127 "/home/jens/Source/shotwell/src/db/Db.vala" g_message ("Db.vala:127: upgrade_database: adding backlinks column to PhotoTable"); #line 128 "/home/jens/Source/shotwell/src/db/Db.vala" - _tmp11_ = database_table_add_column ("PhotoTable", "backlinks", "TEXT"); -#line 128 "/home/jens/Source/shotwell/src/db/Db.vala" - if (!_tmp11_) { + if (!database_table_add_column ("PhotoTable", "backlinks", "TEXT")) { #line 129 "/home/jens/Source/shotwell/src/db/Db.vala" result = DB_VERIFY_RESULT_UPGRADE_ERROR; #line 129 "/home/jens/Source/shotwell/src/db/Db.vala" return result; -#line 487 "Db.c" +#line 466 "Db.c" } } #line 132 "/home/jens/Source/shotwell/src/db/Db.vala" version = 6; #line 146 "/home/jens/Source/shotwell/src/db/Db.vala" - _tmp12_ = database_table_has_column ("PhotoTable", "time_reimported"); -#line 146 "/home/jens/Source/shotwell/src/db/Db.vala" - if (!_tmp12_) { -#line 496 "Db.c" - gboolean _tmp13_; + if (!database_table_has_column ("PhotoTable", "time_reimported")) { #line 147 "/home/jens/Source/shotwell/src/db/Db.vala" g_message ("Db.vala:147: upgrade_database: adding time_reimported column to PhotoT" \ "able"); #line 148 "/home/jens/Source/shotwell/src/db/Db.vala" - _tmp13_ = database_table_add_column ("PhotoTable", "time_reimported", "INTEGER"); -#line 148 "/home/jens/Source/shotwell/src/db/Db.vala" - if (!_tmp13_) { + if (!database_table_add_column ("PhotoTable", "time_reimported", "INTEGER")) { #line 149 "/home/jens/Source/shotwell/src/db/Db.vala" result = DB_VERIFY_RESULT_UPGRADE_ERROR; #line 149 "/home/jens/Source/shotwell/src/db/Db.vala" return result; -#line 508 "Db.c" +#line 481 "Db.c" } } #line 152 "/home/jens/Source/shotwell/src/db/Db.vala" - _tmp14_ = database_table_has_column ("PhotoTable", "editable_id"); -#line 152 "/home/jens/Source/shotwell/src/db/Db.vala" - if (!_tmp14_) { -#line 515 "Db.c" - gboolean _tmp15_; + if (!database_table_has_column ("PhotoTable", "editable_id")) { #line 153 "/home/jens/Source/shotwell/src/db/Db.vala" g_message ("Db.vala:153: upgrade_database: adding editable_id column to PhotoTable"); #line 154 "/home/jens/Source/shotwell/src/db/Db.vala" - _tmp15_ = database_table_add_column ("PhotoTable", "editable_id", "INTEGER DEFAULT -1"); -#line 154 "/home/jens/Source/shotwell/src/db/Db.vala" - if (!_tmp15_) { + if (!database_table_add_column ("PhotoTable", "editable_id", "INTEGER DEFAULT -1")) { #line 155 "/home/jens/Source/shotwell/src/db/Db.vala" result = DB_VERIFY_RESULT_UPGRADE_ERROR; #line 155 "/home/jens/Source/shotwell/src/db/Db.vala" return result; -#line 527 "Db.c" +#line 494 "Db.c" } } #line 158 "/home/jens/Source/shotwell/src/db/Db.vala" version = 7; #line 170 "/home/jens/Source/shotwell/src/db/Db.vala" - _tmp16_ = database_table_has_column ("PhotoTable", "rating"); -#line 170 "/home/jens/Source/shotwell/src/db/Db.vala" - if (!_tmp16_) { -#line 536 "Db.c" - gboolean _tmp17_; + if (!database_table_has_column ("PhotoTable", "rating")) { #line 171 "/home/jens/Source/shotwell/src/db/Db.vala" g_message ("Db.vala:171: upgrade_database: adding rating column to PhotoTable"); #line 172 "/home/jens/Source/shotwell/src/db/Db.vala" - _tmp17_ = database_table_add_column ("PhotoTable", "rating", "INTEGER DEFAULT 0"); -#line 172 "/home/jens/Source/shotwell/src/db/Db.vala" - if (!_tmp17_) { + if (!database_table_add_column ("PhotoTable", "rating", "INTEGER DEFAULT 0")) { #line 173 "/home/jens/Source/shotwell/src/db/Db.vala" result = DB_VERIFY_RESULT_UPGRADE_ERROR; #line 173 "/home/jens/Source/shotwell/src/db/Db.vala" return result; -#line 548 "Db.c" +#line 509 "Db.c" } } #line 182 "/home/jens/Source/shotwell/src/db/Db.vala" - _tmp18_ = database_table_has_column ("PhotoTable", "metadata_dirty"); -#line 182 "/home/jens/Source/shotwell/src/db/Db.vala" - if (!_tmp18_) { -#line 555 "Db.c" - gboolean _tmp19_; + if (!database_table_has_column ("PhotoTable", "metadata_dirty")) { #line 183 "/home/jens/Source/shotwell/src/db/Db.vala" g_message ("Db.vala:183: upgrade_database: adding metadata_dirty column to PhotoTa" \ "ble"); #line 184 "/home/jens/Source/shotwell/src/db/Db.vala" - _tmp19_ = database_table_add_column ("PhotoTable", "metadata_dirty", "INTEGER DEFAULT 1"); -#line 184 "/home/jens/Source/shotwell/src/db/Db.vala" - if (!_tmp19_) { + if (!database_table_add_column ("PhotoTable", "metadata_dirty", "INTEGER DEFAULT 1")) { #line 185 "/home/jens/Source/shotwell/src/db/Db.vala" result = DB_VERIFY_RESULT_UPGRADE_ERROR; #line 185 "/home/jens/Source/shotwell/src/db/Db.vala" return result; -#line 567 "Db.c" +#line 522 "Db.c" } } #line 188 "/home/jens/Source/shotwell/src/db/Db.vala" version = 9; #line 195 "/home/jens/Source/shotwell/src/db/Db.vala" - _tmp21_ = database_table_has_table ("VideoTable"); -#line 195 "/home/jens/Source/shotwell/src/db/Db.vala" - if (_tmp21_) { -#line 576 "Db.c" - gboolean _tmp22_; -#line 195 "/home/jens/Source/shotwell/src/db/Db.vala" - _tmp22_ = database_table_has_column ("VideoTable", "flags"); + if (database_table_has_table ("VideoTable")) { #line 195 "/home/jens/Source/shotwell/src/db/Db.vala" - _tmp20_ = !_tmp22_; -#line 582 "Db.c" + _tmp2_ = !database_table_has_column ("VideoTable", "flags"); +#line 531 "Db.c" } else { #line 195 "/home/jens/Source/shotwell/src/db/Db.vala" - _tmp20_ = FALSE; -#line 586 "Db.c" + _tmp2_ = FALSE; +#line 535 "Db.c" } #line 195 "/home/jens/Source/shotwell/src/db/Db.vala" - if (_tmp20_) { -#line 590 "Db.c" - gboolean _tmp23_; + if (_tmp2_) { #line 196 "/home/jens/Source/shotwell/src/db/Db.vala" g_message ("Db.vala:196: upgrade_database: adding flags column to VideoTable"); #line 197 "/home/jens/Source/shotwell/src/db/Db.vala" - _tmp23_ = database_table_add_column ("VideoTable", "flags", "INTEGER DEFAULT 0"); -#line 197 "/home/jens/Source/shotwell/src/db/Db.vala" - if (!_tmp23_) { + if (!database_table_add_column ("VideoTable", "flags", "INTEGER DEFAULT 0")) { #line 198 "/home/jens/Source/shotwell/src/db/Db.vala" result = DB_VERIFY_RESULT_UPGRADE_ERROR; #line 198 "/home/jens/Source/shotwell/src/db/Db.vala" return result; -#line 602 "Db.c" +#line 547 "Db.c" } } #line 201 "/home/jens/Source/shotwell/src/db/Db.vala" version = 10; #line 208 "/home/jens/Source/shotwell/src/db/Db.vala" - _tmp24_ = database_table_has_column ("EventTable", "primary_source_id"); -#line 208 "/home/jens/Source/shotwell/src/db/Db.vala" - if (!_tmp24_) { -#line 611 "Db.c" - gboolean _tmp25_; + if (!database_table_has_column ("EventTable", "primary_source_id")) { #line 209 "/home/jens/Source/shotwell/src/db/Db.vala" g_message ("Db.vala:209: upgrade_database: adding primary_source_id column to Even" \ "tTable"); #line 210 "/home/jens/Source/shotwell/src/db/Db.vala" - _tmp25_ = database_table_add_column ("EventTable", "primary_source_id", "TEXT"); -#line 210 "/home/jens/Source/shotwell/src/db/Db.vala" - if (!_tmp25_) { + if (!database_table_add_column ("EventTable", "primary_source_id", "TEXT")) { #line 211 "/home/jens/Source/shotwell/src/db/Db.vala" result = DB_VERIFY_RESULT_UPGRADE_ERROR; #line 211 "/home/jens/Source/shotwell/src/db/Db.vala" return result; -#line 623 "Db.c" +#line 562 "Db.c" } } #line 214 "/home/jens/Source/shotwell/src/db/Db.vala" version = 11; #line 221 "/home/jens/Source/shotwell/src/db/Db.vala" - _tmp26_ = database_table_ensure_column ("TombstoneTable", "reason", "INTEGER DEFAULT 0", "upgrade_database: adding reason column to TombstoneTable"); -#line 221 "/home/jens/Source/shotwell/src/db/Db.vala" - if (!_tmp26_) { + if (!database_table_ensure_column ("TombstoneTable", "reason", "INTEGER DEFAULT 0", "upgrade_database: adding reason column to TombstoneTable")) { #line 223 "/home/jens/Source/shotwell/src/db/Db.vala" result = DB_VERIFY_RESULT_UPGRADE_ERROR; #line 223 "/home/jens/Source/shotwell/src/db/Db.vala" return result; -#line 636 "Db.c" +#line 573 "Db.c" } #line 226 "/home/jens/Source/shotwell/src/db/Db.vala" version = 12; #line 233 "/home/jens/Source/shotwell/src/db/Db.vala" - _tmp27_ = database_table_has_column ("PhotoTable", "developer"); -#line 233 "/home/jens/Source/shotwell/src/db/Db.vala" - if (!_tmp27_) { -#line 644 "Db.c" - gboolean _tmp28_; + if (!database_table_has_column ("PhotoTable", "developer")) { #line 234 "/home/jens/Source/shotwell/src/db/Db.vala" g_message ("Db.vala:234: upgrade_database: adding developer column to PhotoTable"); #line 235 "/home/jens/Source/shotwell/src/db/Db.vala" - _tmp28_ = database_table_add_column ("PhotoTable", "developer", "TEXT"); -#line 235 "/home/jens/Source/shotwell/src/db/Db.vala" - if (!_tmp28_) { + if (!database_table_add_column ("PhotoTable", "developer", "TEXT")) { #line 236 "/home/jens/Source/shotwell/src/db/Db.vala" result = DB_VERIFY_RESULT_UPGRADE_ERROR; #line 236 "/home/jens/Source/shotwell/src/db/Db.vala" return result; -#line 656 "Db.c" +#line 587 "Db.c" } } #line 239 "/home/jens/Source/shotwell/src/db/Db.vala" - _tmp29_ = database_table_has_column ("PhotoTable", "develop_shotwell_id"); -#line 239 "/home/jens/Source/shotwell/src/db/Db.vala" - if (!_tmp29_) { -#line 663 "Db.c" - gboolean _tmp30_; + if (!database_table_has_column ("PhotoTable", "develop_shotwell_id")) { #line 240 "/home/jens/Source/shotwell/src/db/Db.vala" g_message ("Db.vala:240: upgrade_database: adding develop_shotwell_id column to Ph" \ "otoTable"); #line 241 "/home/jens/Source/shotwell/src/db/Db.vala" - _tmp30_ = database_table_add_column ("PhotoTable", "develop_shotwell_id", "INTEGER DEFAULT -1"); -#line 241 "/home/jens/Source/shotwell/src/db/Db.vala" - if (!_tmp30_) { + if (!database_table_add_column ("PhotoTable", "develop_shotwell_id", "INTEGER DEFAULT -1")) { #line 242 "/home/jens/Source/shotwell/src/db/Db.vala" result = DB_VERIFY_RESULT_UPGRADE_ERROR; #line 242 "/home/jens/Source/shotwell/src/db/Db.vala" return result; -#line 675 "Db.c" +#line 600 "Db.c" } } #line 245 "/home/jens/Source/shotwell/src/db/Db.vala" - _tmp31_ = database_table_has_column ("PhotoTable", "develop_camera_id"); -#line 245 "/home/jens/Source/shotwell/src/db/Db.vala" - if (!_tmp31_) { -#line 682 "Db.c" - gboolean _tmp32_; + if (!database_table_has_column ("PhotoTable", "develop_camera_id")) { #line 246 "/home/jens/Source/shotwell/src/db/Db.vala" g_message ("Db.vala:246: upgrade_database: adding develop_camera_id column to Phot" \ "oTable"); #line 247 "/home/jens/Source/shotwell/src/db/Db.vala" - _tmp32_ = database_table_add_column ("PhotoTable", "develop_camera_id", "INTEGER DEFAULT -1"); -#line 247 "/home/jens/Source/shotwell/src/db/Db.vala" - if (!_tmp32_) { + if (!database_table_add_column ("PhotoTable", "develop_camera_id", "INTEGER DEFAULT -1")) { #line 248 "/home/jens/Source/shotwell/src/db/Db.vala" result = DB_VERIFY_RESULT_UPGRADE_ERROR; #line 248 "/home/jens/Source/shotwell/src/db/Db.vala" return result; -#line 694 "Db.c" +#line 613 "Db.c" } } #line 251 "/home/jens/Source/shotwell/src/db/Db.vala" - _tmp33_ = database_table_has_column ("PhotoTable", "develop_embedded_id"); -#line 251 "/home/jens/Source/shotwell/src/db/Db.vala" - if (!_tmp33_) { -#line 701 "Db.c" - gboolean _tmp34_; + if (!database_table_has_column ("PhotoTable", "develop_embedded_id")) { #line 252 "/home/jens/Source/shotwell/src/db/Db.vala" g_message ("Db.vala:252: upgrade_database: adding develop_embedded_id column to Ph" \ "otoTable"); #line 253 "/home/jens/Source/shotwell/src/db/Db.vala" - _tmp34_ = database_table_add_column ("PhotoTable", "develop_embedded_id", "INTEGER DEFAULT -1"); -#line 253 "/home/jens/Source/shotwell/src/db/Db.vala" - if (!_tmp34_) { + if (!database_table_add_column ("PhotoTable", "develop_embedded_id", "INTEGER DEFAULT -1")) { #line 254 "/home/jens/Source/shotwell/src/db/Db.vala" result = DB_VERIFY_RESULT_UPGRADE_ERROR; #line 254 "/home/jens/Source/shotwell/src/db/Db.vala" return result; -#line 713 "Db.c" +#line 626 "Db.c" } } #line 257 "/home/jens/Source/shotwell/src/db/Db.vala" version = 13; #line 264 "/home/jens/Source/shotwell/src/db/Db.vala" - _tmp35_ = input_version; -#line 264 "/home/jens/Source/shotwell/src/db/Db.vala" - if (_tmp35_ < 14) { + if (input_version < 14) { #line 265 "/home/jens/Source/shotwell/src/db/Db.vala" tag_table_upgrade_for_htags (); -#line 724 "Db.c" +#line 635 "Db.c" } #line 267 "/home/jens/Source/shotwell/src/db/Db.vala" version = 14; #line 279 "/home/jens/Source/shotwell/src/db/Db.vala" version = 15; #line 289 "/home/jens/Source/shotwell/src/db/Db.vala" - _tmp36_ = input_version; -#line 289 "/home/jens/Source/shotwell/src/db/Db.vala" - if (_tmp36_ < 16) { + if (input_version < 16) { #line 292 "/home/jens/Source/shotwell/src/db/Db.vala" gsettings_configuration_engine_run_gsettings_migrator (); -#line 736 "Db.c" +#line 645 "Db.c" } #line 295 "/home/jens/Source/shotwell/src/db/Db.vala" version = 16; #line 302 "/home/jens/Source/shotwell/src/db/Db.vala" - _tmp37_ = database_table_has_column ("PhotoTable", "comment"); -#line 302 "/home/jens/Source/shotwell/src/db/Db.vala" - if (!_tmp37_) { -#line 744 "Db.c" - gboolean _tmp38_; + if (!database_table_has_column ("PhotoTable", "comment")) { #line 303 "/home/jens/Source/shotwell/src/db/Db.vala" g_message ("Db.vala:303: upgrade_database: adding comment column to PhotoTable"); #line 304 "/home/jens/Source/shotwell/src/db/Db.vala" - _tmp38_ = database_table_add_column ("PhotoTable", "comment", "TEXT"); -#line 304 "/home/jens/Source/shotwell/src/db/Db.vala" - if (!_tmp38_) { + if (!database_table_add_column ("PhotoTable", "comment", "TEXT")) { #line 305 "/home/jens/Source/shotwell/src/db/Db.vala" result = DB_VERIFY_RESULT_UPGRADE_ERROR; #line 305 "/home/jens/Source/shotwell/src/db/Db.vala" return result; -#line 756 "Db.c" +#line 659 "Db.c" } } #line 307 "/home/jens/Source/shotwell/src/db/Db.vala" - _tmp39_ = database_table_has_table ("VideoTable"); -#line 307 "/home/jens/Source/shotwell/src/db/Db.vala" - _tmp40_ = database_table_has_column ("VideoTable", "comment"); -#line 307 "/home/jens/Source/shotwell/src/db/Db.vala" - if (_tmp39_ & (!_tmp40_)) { -#line 765 "Db.c" - gboolean _tmp41_; + if (database_table_has_table ("VideoTable") & (!database_table_has_column ("VideoTable", "comment"))) { #line 308 "/home/jens/Source/shotwell/src/db/Db.vala" g_message ("Db.vala:308: upgrade_database: adding comment column to VideoTable"); #line 309 "/home/jens/Source/shotwell/src/db/Db.vala" - _tmp41_ = database_table_add_column ("VideoTable", "comment", "TEXT"); -#line 309 "/home/jens/Source/shotwell/src/db/Db.vala" - if (!_tmp41_) { + if (!database_table_add_column ("VideoTable", "comment", "TEXT")) { #line 310 "/home/jens/Source/shotwell/src/db/Db.vala" result = DB_VERIFY_RESULT_UPGRADE_ERROR; #line 310 "/home/jens/Source/shotwell/src/db/Db.vala" return result; -#line 777 "Db.c" +#line 672 "Db.c" } } #line 313 "/home/jens/Source/shotwell/src/db/Db.vala" version = 17; #line 320 "/home/jens/Source/shotwell/src/db/Db.vala" - _tmp42_ = database_table_has_column ("EventTable", "comment"); -#line 320 "/home/jens/Source/shotwell/src/db/Db.vala" - if (!_tmp42_) { -#line 786 "Db.c" - gboolean _tmp43_; + if (!database_table_has_column ("EventTable", "comment")) { #line 321 "/home/jens/Source/shotwell/src/db/Db.vala" g_message ("Db.vala:321: upgrade_database: adding comment column to EventTable"); #line 322 "/home/jens/Source/shotwell/src/db/Db.vala" - _tmp43_ = database_table_add_column ("EventTable", "comment", "TEXT"); -#line 322 "/home/jens/Source/shotwell/src/db/Db.vala" - if (!_tmp43_) { + if (!database_table_add_column ("EventTable", "comment", "TEXT")) { #line 323 "/home/jens/Source/shotwell/src/db/Db.vala" result = DB_VERIFY_RESULT_UPGRADE_ERROR; #line 323 "/home/jens/Source/shotwell/src/db/Db.vala" return result; -#line 798 "Db.c" +#line 687 "Db.c" } } #line 326 "/home/jens/Source/shotwell/src/db/Db.vala" version = 18; #line 337 "/home/jens/Source/shotwell/src/db/Db.vala" - _tmp44_ = input_version; -#line 337 "/home/jens/Source/shotwell/src/db/Db.vala" - if (_tmp44_ < 19) { -#line 807 "Db.c" - Application* _tmp45_; - Application* _tmp46_; + if (input_version < 19) { +#line 694 "Db.c" + Application* _tmp3_; + Application* _tmp4_; #line 338 "/home/jens/Source/shotwell/src/db/Db.vala" - _tmp45_ = application_get_instance (); + _tmp3_ = application_get_instance (); #line 338 "/home/jens/Source/shotwell/src/db/Db.vala" - _tmp46_ = _tmp45_; + _tmp4_ = _tmp3_; #line 338 "/home/jens/Source/shotwell/src/db/Db.vala" - application_set_raw_thumbs_fix_required (_tmp46_, TRUE); + application_set_raw_thumbs_fix_required (_tmp4_, TRUE); #line 338 "/home/jens/Source/shotwell/src/db/Db.vala" - _application_unref0 (_tmp46_); -#line 818 "Db.c" + _application_unref0 (_tmp4_); +#line 705 "Db.c" } #line 341 "/home/jens/Source/shotwell/src/db/Db.vala" version = 19; #line 351 "/home/jens/Source/shotwell/src/db/Db.vala" version = 20; #line 357 "/home/jens/Source/shotwell/src/db/Db.vala" - _tmp47_ = version; + _tmp5_ = version; #line 357 "/home/jens/Source/shotwell/src/db/Db.vala" - _vala_assert (_tmp47_ == DATABASE_TABLE_SCHEMA_VERSION, "version == DatabaseTable.SCHEMA_VERSION"); + _vala_assert (_tmp5_ == DATABASE_TABLE_SCHEMA_VERSION, "version == DatabaseTable.SCHEMA_VERSION"); #line 358 "/home/jens/Source/shotwell/src/db/Db.vala" - _tmp48_ = version_table_get_instance (); + _tmp6_ = version_table_get_instance (); #line 358 "/home/jens/Source/shotwell/src/db/Db.vala" - _tmp49_ = _tmp48_; + _tmp7_ = _tmp6_; #line 358 "/home/jens/Source/shotwell/src/db/Db.vala" - _tmp50_ = version; + _tmp8_ = version; #line 358 "/home/jens/Source/shotwell/src/db/Db.vala" - version_table_update_version (_tmp49_, _tmp50_, RESOURCES_APP_VERSION); + version_table_update_version (_tmp7_, _tmp8_, RESOURCES_APP_VERSION); #line 358 "/home/jens/Source/shotwell/src/db/Db.vala" - _database_table_unref0 (_tmp49_); + _database_table_unref0 (_tmp7_); #line 360 "/home/jens/Source/shotwell/src/db/Db.vala" - _tmp51_ = version; + _tmp9_ = version; #line 360 "/home/jens/Source/shotwell/src/db/Db.vala" - g_message ("Db.vala:360: Database upgrade to schema version %d successful", _tmp51_); + g_message ("Db.vala:360: Database upgrade to schema version %d successful", _tmp9_); #line 362 "/home/jens/Source/shotwell/src/db/Db.vala" result = DB_VERIFY_RESULT_OK; #line 362 "/home/jens/Source/shotwell/src/db/Db.vala" return result; -#line 846 "Db.c" +#line 733 "Db.c" } diff --git a/src/db/EventTable.c b/src/db/EventTable.c index 462ebc8..ce14303 100644 --- a/src/db/EventTable.c +++ b/src/db/EventTable.c @@ -1,4 +1,4 @@ -/* EventTable.c generated by valac 0.36.6, the Vala compiler +/* EventTable.c generated by valac 0.40.4, the Vala compiler * generated from EventTable.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,6 +7,7 @@ * (version 2.1 or later). See the COPYING file in this distribution. */ + #include <glib.h> #include <glib-object.h> #include <string.h> @@ -146,88 +147,136 @@ GType event_id_get_type (void) G_GNUC_CONST; EventID* event_id_dup (const EventID* self); void event_id_free (EventID* self); #define EVENT_ID_INVALID ((gint64) -1) -void event_id_init (EventID *self, gint64 id); +void event_id_init (EventID *self, + gint64 id); gboolean event_id_is_invalid (EventID *self); gboolean event_id_is_valid (EventID *self); gpointer event_row_ref (gpointer instance); void event_row_unref (gpointer instance); -GParamSpec* param_spec_event_row (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_event_row (GValue* value, gpointer v_object); -void value_take_event_row (GValue* value, gpointer v_object); +GParamSpec* param_spec_event_row (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_event_row (GValue* value, + gpointer v_object); +void value_take_event_row (GValue* value, + gpointer v_object); gpointer value_get_event_row (const GValue* value); GType event_row_get_type (void) G_GNUC_CONST; -enum { - EVENT_ROW_DUMMY_PROPERTY -}; EventRow* event_row_new (void); EventRow* event_row_construct (GType object_type); static void event_row_finalize (EventRow * obj); gpointer database_table_ref (gpointer instance); void database_table_unref (gpointer instance); -GParamSpec* param_spec_database_table (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_database_table (GValue* value, gpointer v_object); -void value_take_database_table (GValue* value, gpointer v_object); +GParamSpec* param_spec_database_table (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_database_table (GValue* value, + gpointer v_object); +void value_take_database_table (GValue* value, + gpointer v_object); gpointer value_get_database_table (const GValue* value); GType database_table_get_type (void) G_GNUC_CONST; GType event_table_get_type (void) G_GNUC_CONST; -enum { - EVENT_TABLE_DUMMY_PROPERTY -}; static EventTable* event_table_new (void); static EventTable* event_table_construct (GType object_type); DatabaseTable* database_table_construct (GType object_type); -void database_table_fatal (const gchar* op, gint res); -void database_table_set_table_name (DatabaseTable* self, const gchar* table_name); +void database_table_fatal (const gchar* op, + gint res); +void database_table_set_table_name (DatabaseTable* self, + const gchar* table_name); EventTable* event_table_get_instance (void); -static gchar* event_table_source_id_upgrade (EventTable* self, gint64 primary_photo_id, const gchar* primary_source_id); +static gchar* event_table_source_id_upgrade (EventTable* self, + gint64 primary_photo_id, + const gchar* primary_source_id); gpointer media_collection_registry_ref (gpointer instance); void media_collection_registry_unref (gpointer instance); -GParamSpec* param_spec_media_collection_registry (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_media_collection_registry (GValue* value, gpointer v_object); -void value_take_media_collection_registry (GValue* value, gpointer v_object); +GParamSpec* param_spec_media_collection_registry (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_media_collection_registry (GValue* value, + gpointer v_object); +void value_take_media_collection_registry (GValue* value, + gpointer v_object); gpointer value_get_media_collection_registry (const GValue* value); GType media_collection_registry_get_type (void) G_GNUC_CONST; MediaCollectionRegistry* media_collection_registry_get_instance (void); -gboolean media_collection_registry_is_valid_source_id (MediaCollectionRegistry* self, const gchar* source_id); +gboolean media_collection_registry_is_valid_source_id (MediaCollectionRegistry* self, + const gchar* source_id); #define PHOTO_ID_INVALID ((gint64) -1) GType photo_id_get_type (void) G_GNUC_CONST; PhotoID* photo_id_dup (const PhotoID* self); void photo_id_free (PhotoID* self); gchar* photo_id_upgrade_photo_id_to_source_id (PhotoID* photo_id); -void photo_id_init (PhotoID *self, gint64 id); +void photo_id_init (PhotoID *self, + gint64 id); GQuark database_error_quark (void); -EventRow* event_table_create (EventTable* self, const gchar* primary_source_id, const gchar* comment, GError** error); +EventRow* event_table_create (EventTable* self, + const gchar* primary_source_id, + const gchar* comment, + GError** error); gulong now_sec (void); -void database_table_throw_error (const gchar* method, gint res, GError** error); -void event_table_create_from_row (EventTable* self, EventRow* row, EventID* result); -EventRow* event_table_get_row (EventTable* self, EventID* event_id); -void event_table_remove (EventTable* self, EventID* event_id, GError** error); -void database_table_delete_by_id (DatabaseTable* self, gint64 id, GError** error); +void database_table_throw_error (const gchar* method, + gint res, + GError** error); +void event_table_create_from_row (EventTable* self, + EventRow* row, + EventID* result); +EventRow* event_table_get_row (EventTable* self, + EventID* event_id); +void event_table_remove (EventTable* self, + EventID* event_id, + GError** error); +void database_table_delete_by_id (DatabaseTable* self, + gint64 id, + GError** error); GeeArrayList* event_table_get_events (EventTable* self); -gboolean event_table_rename (EventTable* self, EventID* event_id, const gchar* name); -gboolean database_table_update_text_by_id (DatabaseTable* self, gint64 id, const gchar* column, const gchar* text); -gchar* event_table_get_name (EventTable* self, EventID* event_id); -gboolean database_table_select_by_id (DatabaseTable* self, gint64 id, const gchar* columns, sqlite3_stmt* * stmt); -gchar* event_table_get_primary_source_id (EventTable* self, EventID* event_id); -gboolean event_table_set_primary_source_id (EventTable* self, EventID* event_id, const gchar* primary_source_id); -time_t event_table_get_time_created (EventTable* self, EventID* event_id); -gboolean event_table_set_comment (EventTable* self, EventID* event_id, const gchar* new_comment); +gboolean event_table_rename (EventTable* self, + EventID* event_id, + const gchar* name); +gboolean database_table_update_text_by_id (DatabaseTable* self, + gint64 id, + const gchar* column, + const gchar* text); +gchar* event_table_get_name (EventTable* self, + EventID* event_id); +gboolean database_table_select_by_id (DatabaseTable* self, + gint64 id, + const gchar* columns, + sqlite3_stmt* * stmt); +gchar* event_table_get_primary_source_id (EventTable* self, + EventID* event_id); +gboolean event_table_set_primary_source_id (EventTable* self, + EventID* event_id, + const gchar* primary_source_id); +time_t event_table_get_time_created (EventTable* self, + EventID* event_id); +gboolean event_table_set_comment (EventTable* self, + EventID* event_id, + const gchar* new_comment); static void event_table_finalize (DatabaseTable * obj); -void event_id_init (EventID *self, gint64 id) { - gint64 _tmp0_; +void +event_id_init (EventID *self, + gint64 id) +{ #line 12 "/home/jens/Source/shotwell/src/db/EventTable.vala" memset (self, 0, sizeof (EventID)); #line 13 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp0_ = id; -#line 13 "/home/jens/Source/shotwell/src/db/EventTable.vala" - (*self).id = _tmp0_; -#line 227 "EventTable.c" + (*self).id = id; +#line 274 "EventTable.c" } -gboolean event_id_is_invalid (EventID *self) { +gboolean +event_id_is_invalid (EventID *self) +{ gboolean result = FALSE; gint64 _tmp0_; #line 17 "/home/jens/Source/shotwell/src/db/EventTable.vala" @@ -236,11 +285,13 @@ gboolean event_id_is_invalid (EventID *self) { result = _tmp0_ == EVENT_ID_INVALID; #line 17 "/home/jens/Source/shotwell/src/db/EventTable.vala" return result; -#line 240 "EventTable.c" +#line 289 "EventTable.c" } -gboolean event_id_is_valid (EventID *self) { +gboolean +event_id_is_valid (EventID *self) +{ gboolean result = FALSE; gint64 _tmp0_; #line 21 "/home/jens/Source/shotwell/src/db/EventTable.vala" @@ -249,11 +300,13 @@ gboolean event_id_is_valid (EventID *self) { result = _tmp0_ != EVENT_ID_INVALID; #line 21 "/home/jens/Source/shotwell/src/db/EventTable.vala" return result; -#line 253 "EventTable.c" +#line 304 "EventTable.c" } -EventID* event_id_dup (const EventID* self) { +EventID* +event_id_dup (const EventID* self) +{ EventID* dup; #line 7 "/home/jens/Source/shotwell/src/db/EventTable.vala" dup = g_new0 (EventID, 1); @@ -261,18 +314,22 @@ EventID* event_id_dup (const EventID* self) { memcpy (dup, self, sizeof (EventID)); #line 7 "/home/jens/Source/shotwell/src/db/EventTable.vala" return dup; -#line 265 "EventTable.c" +#line 318 "EventTable.c" } -void event_id_free (EventID* self) { +void +event_id_free (EventID* self) +{ #line 7 "/home/jens/Source/shotwell/src/db/EventTable.vala" g_free (self); -#line 272 "EventTable.c" +#line 327 "EventTable.c" } -GType event_id_get_type (void) { +GType +event_id_get_type (void) +{ static volatile gsize event_id_type_id__volatile = 0; if (g_once_init_enter (&event_id_type_id__volatile)) { GType event_id_type_id; @@ -283,121 +340,150 @@ GType event_id_get_type (void) { } -EventRow* event_row_construct (GType object_type) { +EventRow* +event_row_construct (GType object_type) +{ EventRow* self = NULL; #line 25 "/home/jens/Source/shotwell/src/db/EventTable.vala" self = (EventRow*) g_type_create_instance (object_type); #line 25 "/home/jens/Source/shotwell/src/db/EventTable.vala" return self; -#line 293 "EventTable.c" +#line 352 "EventTable.c" } -EventRow* event_row_new (void) { +EventRow* +event_row_new (void) +{ #line 25 "/home/jens/Source/shotwell/src/db/EventTable.vala" return event_row_construct (TYPE_EVENT_ROW); -#line 300 "EventTable.c" +#line 361 "EventTable.c" } -static void value_event_row_init (GValue* value) { +static void +value_event_row_init (GValue* value) +{ #line 25 "/home/jens/Source/shotwell/src/db/EventTable.vala" value->data[0].v_pointer = NULL; -#line 307 "EventTable.c" +#line 370 "EventTable.c" } -static void value_event_row_free_value (GValue* value) { +static void +value_event_row_free_value (GValue* value) +{ #line 25 "/home/jens/Source/shotwell/src/db/EventTable.vala" if (value->data[0].v_pointer) { #line 25 "/home/jens/Source/shotwell/src/db/EventTable.vala" event_row_unref (value->data[0].v_pointer); -#line 316 "EventTable.c" +#line 381 "EventTable.c" } } -static void value_event_row_copy_value (const GValue* src_value, GValue* dest_value) { +static void +value_event_row_copy_value (const GValue* src_value, + GValue* dest_value) +{ #line 25 "/home/jens/Source/shotwell/src/db/EventTable.vala" if (src_value->data[0].v_pointer) { #line 25 "/home/jens/Source/shotwell/src/db/EventTable.vala" dest_value->data[0].v_pointer = event_row_ref (src_value->data[0].v_pointer); -#line 326 "EventTable.c" +#line 394 "EventTable.c" } else { #line 25 "/home/jens/Source/shotwell/src/db/EventTable.vala" dest_value->data[0].v_pointer = NULL; -#line 330 "EventTable.c" +#line 398 "EventTable.c" } } -static gpointer value_event_row_peek_pointer (const GValue* value) { +static gpointer +value_event_row_peek_pointer (const GValue* value) +{ #line 25 "/home/jens/Source/shotwell/src/db/EventTable.vala" return value->data[0].v_pointer; -#line 338 "EventTable.c" +#line 408 "EventTable.c" } -static gchar* value_event_row_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_event_row_collect_value (GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ #line 25 "/home/jens/Source/shotwell/src/db/EventTable.vala" if (collect_values[0].v_pointer) { -#line 345 "EventTable.c" +#line 420 "EventTable.c" EventRow * object; object = collect_values[0].v_pointer; #line 25 "/home/jens/Source/shotwell/src/db/EventTable.vala" if (object->parent_instance.g_class == NULL) { #line 25 "/home/jens/Source/shotwell/src/db/EventTable.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 352 "EventTable.c" +#line 427 "EventTable.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 25 "/home/jens/Source/shotwell/src/db/EventTable.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 356 "EventTable.c" +#line 431 "EventTable.c" } #line 25 "/home/jens/Source/shotwell/src/db/EventTable.vala" value->data[0].v_pointer = event_row_ref (object); -#line 360 "EventTable.c" +#line 435 "EventTable.c" } else { #line 25 "/home/jens/Source/shotwell/src/db/EventTable.vala" value->data[0].v_pointer = NULL; -#line 364 "EventTable.c" +#line 439 "EventTable.c" } #line 25 "/home/jens/Source/shotwell/src/db/EventTable.vala" return NULL; -#line 368 "EventTable.c" +#line 443 "EventTable.c" } -static gchar* value_event_row_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_event_row_lcopy_value (const GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ EventRow ** object_p; object_p = collect_values[0].v_pointer; #line 25 "/home/jens/Source/shotwell/src/db/EventTable.vala" if (!object_p) { #line 25 "/home/jens/Source/shotwell/src/db/EventTable.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 379 "EventTable.c" +#line 459 "EventTable.c" } #line 25 "/home/jens/Source/shotwell/src/db/EventTable.vala" if (!value->data[0].v_pointer) { #line 25 "/home/jens/Source/shotwell/src/db/EventTable.vala" *object_p = NULL; -#line 385 "EventTable.c" +#line 465 "EventTable.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 25 "/home/jens/Source/shotwell/src/db/EventTable.vala" *object_p = value->data[0].v_pointer; -#line 389 "EventTable.c" +#line 469 "EventTable.c" } else { #line 25 "/home/jens/Source/shotwell/src/db/EventTable.vala" *object_p = event_row_ref (value->data[0].v_pointer); -#line 393 "EventTable.c" +#line 473 "EventTable.c" } #line 25 "/home/jens/Source/shotwell/src/db/EventTable.vala" return NULL; -#line 397 "EventTable.c" +#line 477 "EventTable.c" } -GParamSpec* param_spec_event_row (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { +GParamSpec* +param_spec_event_row (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) +{ ParamSpecEventRow* spec; #line 25 "/home/jens/Source/shotwell/src/db/EventTable.vala" g_return_val_if_fail (g_type_is_a (object_type, TYPE_EVENT_ROW), NULL); @@ -407,20 +493,25 @@ GParamSpec* param_spec_event_row (const gchar* name, const gchar* nick, const gc G_PARAM_SPEC (spec)->value_type = object_type; #line 25 "/home/jens/Source/shotwell/src/db/EventTable.vala" return G_PARAM_SPEC (spec); -#line 411 "EventTable.c" +#line 497 "EventTable.c" } -gpointer value_get_event_row (const GValue* value) { +gpointer +value_get_event_row (const GValue* value) +{ #line 25 "/home/jens/Source/shotwell/src/db/EventTable.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_EVENT_ROW), NULL); #line 25 "/home/jens/Source/shotwell/src/db/EventTable.vala" return value->data[0].v_pointer; -#line 420 "EventTable.c" +#line 508 "EventTable.c" } -void value_set_event_row (GValue* value, gpointer v_object) { +void +value_set_event_row (GValue* value, + gpointer v_object) +{ EventRow * old; #line 25 "/home/jens/Source/shotwell/src/db/EventTable.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_EVENT_ROW)); @@ -436,22 +527,25 @@ void value_set_event_row (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 25 "/home/jens/Source/shotwell/src/db/EventTable.vala" event_row_ref (value->data[0].v_pointer); -#line 440 "EventTable.c" +#line 531 "EventTable.c" } else { #line 25 "/home/jens/Source/shotwell/src/db/EventTable.vala" value->data[0].v_pointer = NULL; -#line 444 "EventTable.c" +#line 535 "EventTable.c" } #line 25 "/home/jens/Source/shotwell/src/db/EventTable.vala" if (old) { #line 25 "/home/jens/Source/shotwell/src/db/EventTable.vala" event_row_unref (old); -#line 450 "EventTable.c" +#line 541 "EventTable.c" } } -void value_take_event_row (GValue* value, gpointer v_object) { +void +value_take_event_row (GValue* value, + gpointer v_object) +{ EventRow * old; #line 25 "/home/jens/Source/shotwell/src/db/EventTable.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_EVENT_ROW)); @@ -465,38 +559,44 @@ void value_take_event_row (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 25 "/home/jens/Source/shotwell/src/db/EventTable.vala" value->data[0].v_pointer = v_object; -#line 469 "EventTable.c" +#line 563 "EventTable.c" } else { #line 25 "/home/jens/Source/shotwell/src/db/EventTable.vala" value->data[0].v_pointer = NULL; -#line 473 "EventTable.c" +#line 567 "EventTable.c" } #line 25 "/home/jens/Source/shotwell/src/db/EventTable.vala" if (old) { #line 25 "/home/jens/Source/shotwell/src/db/EventTable.vala" event_row_unref (old); -#line 479 "EventTable.c" +#line 573 "EventTable.c" } } -static void event_row_class_init (EventRowClass * klass) { +static void +event_row_class_init (EventRowClass * klass) +{ #line 25 "/home/jens/Source/shotwell/src/db/EventTable.vala" event_row_parent_class = g_type_class_peek_parent (klass); #line 25 "/home/jens/Source/shotwell/src/db/EventTable.vala" ((EventRowClass *) klass)->finalize = event_row_finalize; -#line 489 "EventTable.c" +#line 585 "EventTable.c" } -static void event_row_instance_init (EventRow * self) { +static void +event_row_instance_init (EventRow * self) +{ #line 25 "/home/jens/Source/shotwell/src/db/EventTable.vala" self->ref_count = 1; -#line 496 "EventTable.c" +#line 594 "EventTable.c" } -static void event_row_finalize (EventRow * obj) { +static void +event_row_finalize (EventRow * obj) +{ EventRow * self; #line 25 "/home/jens/Source/shotwell/src/db/EventTable.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_EVENT_ROW, EventRow); @@ -508,11 +608,13 @@ static void event_row_finalize (EventRow * obj) { _g_free0 (self->primary_source_id); #line 30 "/home/jens/Source/shotwell/src/db/EventTable.vala" _g_free0 (self->comment); -#line 512 "EventTable.c" +#line 612 "EventTable.c" } -GType event_row_get_type (void) { +GType +event_row_get_type (void) +{ static volatile gsize event_row_type_id__volatile = 0; if (g_once_init_enter (&event_row_type_id__volatile)) { static const GTypeValueTable g_define_type_value_table = { value_event_row_init, value_event_row_free_value, value_event_row_copy_value, value_event_row_peek_pointer, "p", value_event_row_collect_value, "p", value_event_row_lcopy_value }; @@ -526,18 +628,22 @@ GType event_row_get_type (void) { } -gpointer event_row_ref (gpointer instance) { +gpointer +event_row_ref (gpointer instance) +{ EventRow * self; self = instance; #line 25 "/home/jens/Source/shotwell/src/db/EventTable.vala" g_atomic_int_inc (&self->ref_count); #line 25 "/home/jens/Source/shotwell/src/db/EventTable.vala" return instance; -#line 537 "EventTable.c" +#line 641 "EventTable.c" } -void event_row_unref (gpointer instance) { +void +event_row_unref (gpointer instance) +{ EventRow * self; self = instance; #line 25 "/home/jens/Source/shotwell/src/db/EventTable.vala" @@ -546,12 +652,14 @@ void event_row_unref (gpointer instance) { EVENT_ROW_GET_CLASS (self)->finalize (self); #line 25 "/home/jens/Source/shotwell/src/db/EventTable.vala" g_type_free_instance ((GTypeInstance *) self); -#line 550 "EventTable.c" +#line 656 "EventTable.c" } } -static EventTable* event_table_construct (GType object_type) { +static EventTable* +event_table_construct (GType object_type) +{ EventTable* self = NULL; sqlite3_stmt* stmt = NULL; gint res = 0; @@ -561,7 +669,6 @@ static EventTable* event_table_construct (GType object_type) { gint _tmp3_; sqlite3_stmt* _tmp4_; gint _tmp5_; - gint _tmp6_; #line 36 "/home/jens/Source/shotwell/src/db/EventTable.vala" self = (EventTable*) database_table_construct (object_type); #line 38 "/home/jens/Source/shotwell/src/db/EventTable.vala" @@ -581,20 +688,18 @@ static EventTable* event_table_construct (GType object_type) { #line 48 "/home/jens/Source/shotwell/src/db/EventTable.vala" _tmp4_ = stmt; #line 48 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp5_ = sqlite3_step (_tmp4_); -#line 48 "/home/jens/Source/shotwell/src/db/EventTable.vala" - res = _tmp5_; + res = sqlite3_step (_tmp4_); #line 49 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp6_ = res; + _tmp5_ = res; #line 49 "/home/jens/Source/shotwell/src/db/EventTable.vala" - if (_tmp6_ != SQLITE_DONE) { -#line 592 "EventTable.c" - gint _tmp7_; + if (_tmp5_ != SQLITE_DONE) { +#line 697 "EventTable.c" + gint _tmp6_; #line 50 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp7_ = res; + _tmp6_ = res; #line 50 "/home/jens/Source/shotwell/src/db/EventTable.vala" - database_table_fatal ("create photo table", _tmp7_); -#line 598 "EventTable.c" + database_table_fatal ("create photo table", _tmp6_); +#line 703 "EventTable.c" } #line 52 "/home/jens/Source/shotwell/src/db/EventTable.vala" database_table_set_table_name (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), "EventTable"); @@ -602,25 +707,31 @@ static EventTable* event_table_construct (GType object_type) { _sqlite3_finalize0 (stmt); #line 36 "/home/jens/Source/shotwell/src/db/EventTable.vala" return self; -#line 606 "EventTable.c" +#line 711 "EventTable.c" } -static EventTable* event_table_new (void) { +static EventTable* +event_table_new (void) +{ #line 36 "/home/jens/Source/shotwell/src/db/EventTable.vala" return event_table_construct (TYPE_EVENT_TABLE); -#line 613 "EventTable.c" +#line 720 "EventTable.c" } -static gpointer _database_table_ref0 (gpointer self) { +static gpointer +_database_table_ref0 (gpointer self) +{ #line 59 "/home/jens/Source/shotwell/src/db/EventTable.vala" return self ? database_table_ref (self) : NULL; -#line 620 "EventTable.c" +#line 729 "EventTable.c" } -EventTable* event_table_get_instance (void) { +EventTable* +event_table_get_instance (void) +{ EventTable* result = NULL; EventTable* _tmp0_; EventTable* _tmp2_; @@ -629,7 +740,7 @@ EventTable* event_table_get_instance (void) { _tmp0_ = event_table_instance; #line 56 "/home/jens/Source/shotwell/src/db/EventTable.vala" if (_tmp0_ == NULL) { -#line 633 "EventTable.c" +#line 744 "EventTable.c" EventTable* _tmp1_; #line 57 "/home/jens/Source/shotwell/src/db/EventTable.vala" _tmp1_ = event_table_new (); @@ -637,7 +748,7 @@ EventTable* event_table_get_instance (void) { _database_table_unref0 (event_table_instance); #line 57 "/home/jens/Source/shotwell/src/db/EventTable.vala" event_table_instance = _tmp1_; -#line 641 "EventTable.c" +#line 752 "EventTable.c" } #line 59 "/home/jens/Source/shotwell/src/db/EventTable.vala" _tmp2_ = event_table_instance; @@ -647,18 +758,19 @@ EventTable* event_table_get_instance (void) { result = _tmp3_; #line 59 "/home/jens/Source/shotwell/src/db/EventTable.vala" return result; -#line 651 "EventTable.c" +#line 762 "EventTable.c" } -static gchar* event_table_source_id_upgrade (EventTable* self, gint64 primary_photo_id, const gchar* primary_source_id) { +static gchar* +event_table_source_id_upgrade (EventTable* self, + gint64 primary_photo_id, + const gchar* primary_source_id) +{ gchar* result = NULL; MediaCollectionRegistry* _tmp0_; MediaCollectionRegistry* _tmp1_; - const gchar* _tmp2_; - gboolean _tmp3_; - gboolean _tmp4_; - gint64 _tmp7_; + gboolean _tmp2_; #line 63 "/home/jens/Source/shotwell/src/db/EventTable.vala" g_return_val_if_fail (IS_EVENT_TABLE (self), NULL); #line 64 "/home/jens/Source/shotwell/src/db/EventTable.vala" @@ -666,201 +778,163 @@ static gchar* event_table_source_id_upgrade (EventTable* self, gint64 primary_ph #line 64 "/home/jens/Source/shotwell/src/db/EventTable.vala" _tmp1_ = _tmp0_; #line 64 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp2_ = primary_source_id; -#line 64 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp3_ = media_collection_registry_is_valid_source_id (_tmp1_, _tmp2_); -#line 64 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp4_ = _tmp3_; + _tmp2_ = media_collection_registry_is_valid_source_id (_tmp1_, primary_source_id); #line 64 "/home/jens/Source/shotwell/src/db/EventTable.vala" _media_collection_registry_unref0 (_tmp1_); #line 64 "/home/jens/Source/shotwell/src/db/EventTable.vala" - if (_tmp4_) { -#line 679 "EventTable.c" - const gchar* _tmp5_; - gchar* _tmp6_; -#line 65 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp5_ = primary_source_id; + if (_tmp2_) { +#line 787 "EventTable.c" + gchar* _tmp3_; #line 65 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp6_ = g_strdup (_tmp5_); + _tmp3_ = g_strdup (primary_source_id); #line 65 "/home/jens/Source/shotwell/src/db/EventTable.vala" - result = _tmp6_; + result = _tmp3_; #line 65 "/home/jens/Source/shotwell/src/db/EventTable.vala" return result; -#line 690 "EventTable.c" +#line 795 "EventTable.c" } #line 67 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp7_ = primary_photo_id; -#line 67 "/home/jens/Source/shotwell/src/db/EventTable.vala" - if (_tmp7_ != PHOTO_ID_INVALID) { -#line 696 "EventTable.c" - gint64 _tmp8_; - PhotoID _tmp9_ = {0}; - gchar* _tmp10_; -#line 69 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp8_ = primary_photo_id; + if (primary_photo_id != PHOTO_ID_INVALID) { +#line 799 "EventTable.c" + PhotoID _tmp4_ = {0}; + gchar* _tmp5_; #line 69 "/home/jens/Source/shotwell/src/db/EventTable.vala" - photo_id_init (&_tmp9_, _tmp8_); + photo_id_init (&_tmp4_, primary_photo_id); #line 69 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp10_ = photo_id_upgrade_photo_id_to_source_id (&_tmp9_); + _tmp5_ = photo_id_upgrade_photo_id_to_source_id (&_tmp4_); #line 69 "/home/jens/Source/shotwell/src/db/EventTable.vala" - result = _tmp10_; + result = _tmp5_; #line 69 "/home/jens/Source/shotwell/src/db/EventTable.vala" return result; -#line 710 "EventTable.c" +#line 810 "EventTable.c" } #line 71 "/home/jens/Source/shotwell/src/db/EventTable.vala" result = NULL; #line 71 "/home/jens/Source/shotwell/src/db/EventTable.vala" return result; -#line 716 "EventTable.c" +#line 816 "EventTable.c" } -EventRow* event_table_create (EventTable* self, const gchar* primary_source_id, const gchar* comment, GError** error) { +EventRow* +event_table_create (EventTable* self, + const gchar* primary_source_id, + const gchar* comment, + GError** error) +{ EventRow* result = NULL; gboolean _tmp0_ = FALSE; - const gchar* _tmp1_; sqlite3_stmt* stmt = NULL; gint res = 0; - sqlite3* _tmp3_; - sqlite3_stmt* _tmp4_ = NULL; - gint _tmp5_; - gint _tmp6_; + sqlite3* _tmp1_; + sqlite3_stmt* _tmp2_ = NULL; + gint _tmp3_; + gint _tmp4_; time_t time_created = 0; - gulong _tmp7_; - sqlite3_stmt* _tmp8_; - const gchar* _tmp9_; - gchar* _tmp10_; - GDestroyNotify _tmp11_; - gint _tmp12_; - gint _tmp13_; - sqlite3_stmt* _tmp14_; - time_t _tmp15_; - gint _tmp16_; + sqlite3_stmt* _tmp5_; + gchar* _tmp6_; + GDestroyNotify _tmp7_; + gint _tmp8_; + sqlite3_stmt* _tmp9_; + time_t _tmp10_; + gint _tmp11_; + sqlite3_stmt* _tmp12_; + gchar* _tmp13_; + GDestroyNotify _tmp14_; + gint _tmp15_; + sqlite3_stmt* _tmp16_; gint _tmp17_; - sqlite3_stmt* _tmp18_; - const gchar* _tmp19_; - gchar* _tmp20_; - GDestroyNotify _tmp21_; - gint _tmp22_; - gint _tmp23_; - sqlite3_stmt* _tmp24_; - gint _tmp25_; - gint _tmp26_; EventRow* row = NULL; - EventRow* _tmp28_; - EventRow* _tmp29_; - sqlite3* _tmp30_; - gint64 _tmp31_; - EventRow* _tmp32_; - EventRow* _tmp33_; - const gchar* _tmp34_; - gchar* _tmp35_; - EventRow* _tmp36_; - time_t _tmp37_; - EventRow* _tmp38_; - const gchar* _tmp39_; - gchar* _tmp40_; + EventRow* _tmp19_; + EventRow* _tmp20_; + sqlite3* _tmp21_; + EventRow* _tmp22_; + EventRow* _tmp23_; + gchar* _tmp24_; + EventRow* _tmp25_; + time_t _tmp26_; + EventRow* _tmp27_; + gchar* _tmp28_; GError * _inner_error_ = NULL; #line 74 "/home/jens/Source/shotwell/src/db/EventTable.vala" g_return_val_if_fail (IS_EVENT_TABLE (self), NULL); #line 75 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp1_ = primary_source_id; -#line 75 "/home/jens/Source/shotwell/src/db/EventTable.vala" - if (_tmp1_ != NULL) { -#line 772 "EventTable.c" - const gchar* _tmp2_; -#line 75 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp2_ = primary_source_id; + if (primary_source_id != NULL) { #line 75 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp0_ = g_strcmp0 (_tmp2_, "") != 0; -#line 778 "EventTable.c" + _tmp0_ = g_strcmp0 (primary_source_id, "") != 0; +#line 866 "EventTable.c" } else { #line 75 "/home/jens/Source/shotwell/src/db/EventTable.vala" _tmp0_ = FALSE; -#line 782 "EventTable.c" +#line 870 "EventTable.c" } #line 75 "/home/jens/Source/shotwell/src/db/EventTable.vala" _vala_assert (_tmp0_, "primary_source_id != null && primary_source_id != \"\""); #line 78 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp3_ = database_table_db; + _tmp1_ = database_table_db; #line 78 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp5_ = sqlite3_prepare_v2 (_tmp3_, "INSERT INTO EventTable (primary_source_id, time_created, comment) VALU" \ -"ES (?, ?, ?)", -1, &_tmp4_, NULL); + _tmp3_ = sqlite3_prepare_v2 (_tmp1_, "INSERT INTO EventTable (primary_source_id, time_created, comment) VALU" \ +"ES (?, ?, ?)", -1, &_tmp2_, NULL); #line 78 "/home/jens/Source/shotwell/src/db/EventTable.vala" _sqlite3_finalize0 (stmt); #line 78 "/home/jens/Source/shotwell/src/db/EventTable.vala" - stmt = _tmp4_; + stmt = _tmp2_; #line 78 "/home/jens/Source/shotwell/src/db/EventTable.vala" - res = _tmp5_; + res = _tmp3_; #line 81 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp6_ = res; + _tmp4_ = res; #line 81 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _vala_assert (_tmp6_ == SQLITE_OK, "res == Sqlite.OK"); -#line 83 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp7_ = now_sec (); + _vala_assert (_tmp4_ == SQLITE_OK, "res == Sqlite.OK"); #line 83 "/home/jens/Source/shotwell/src/db/EventTable.vala" - time_created = (time_t) _tmp7_; -#line 85 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp8_ = stmt; + time_created = (time_t) now_sec (); #line 85 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp9_ = primary_source_id; + _tmp5_ = stmt; #line 85 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp10_ = g_strdup (_tmp9_); + _tmp6_ = g_strdup (primary_source_id); #line 85 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp11_ = g_free; + _tmp7_ = g_free; #line 85 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp12_ = sqlite3_bind_text (_tmp8_, 1, _tmp10_, -1, _tmp11_); -#line 85 "/home/jens/Source/shotwell/src/db/EventTable.vala" - res = _tmp12_; + res = sqlite3_bind_text (_tmp5_, 1, _tmp6_, -1, _tmp7_); #line 86 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp13_ = res; + _tmp8_ = res; #line 86 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _vala_assert (_tmp13_ == SQLITE_OK, "res == Sqlite.OK"); -#line 87 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp14_ = stmt; + _vala_assert (_tmp8_ == SQLITE_OK, "res == Sqlite.OK"); #line 87 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp15_ = time_created; + _tmp9_ = stmt; #line 87 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp16_ = sqlite3_bind_int64 (_tmp14_, 2, (gint64) _tmp15_); + _tmp10_ = time_created; #line 87 "/home/jens/Source/shotwell/src/db/EventTable.vala" - res = _tmp16_; + res = sqlite3_bind_int64 (_tmp9_, 2, (gint64) _tmp10_); #line 88 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp17_ = res; + _tmp11_ = res; #line 88 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _vala_assert (_tmp17_ == SQLITE_OK, "res == Sqlite.OK"); -#line 89 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp18_ = stmt; -#line 89 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp19_ = comment; + _vala_assert (_tmp11_ == SQLITE_OK, "res == Sqlite.OK"); #line 89 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp20_ = g_strdup (_tmp19_); + _tmp12_ = stmt; #line 89 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp21_ = g_free; + _tmp13_ = g_strdup (comment); #line 89 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp22_ = sqlite3_bind_text (_tmp18_, 3, _tmp20_, -1, _tmp21_); + _tmp14_ = g_free; #line 89 "/home/jens/Source/shotwell/src/db/EventTable.vala" - res = _tmp22_; + res = sqlite3_bind_text (_tmp12_, 3, _tmp13_, -1, _tmp14_); #line 90 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp23_ = res; + _tmp15_ = res; #line 90 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _vala_assert (_tmp23_ == SQLITE_OK, "res == Sqlite.OK"); + _vala_assert (_tmp15_ == SQLITE_OK, "res == Sqlite.OK"); #line 92 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp24_ = stmt; + _tmp16_ = stmt; #line 92 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp25_ = sqlite3_step (_tmp24_); -#line 92 "/home/jens/Source/shotwell/src/db/EventTable.vala" - res = _tmp25_; + res = sqlite3_step (_tmp16_); #line 93 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp26_ = res; + _tmp17_ = res; #line 93 "/home/jens/Source/shotwell/src/db/EventTable.vala" - if (_tmp26_ != SQLITE_DONE) { -#line 858 "EventTable.c" - gint _tmp27_; + if (_tmp17_ != SQLITE_DONE) { +#line 932 "EventTable.c" + gint _tmp18_; #line 94 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp27_ = res; + _tmp18_ = res; #line 94 "/home/jens/Source/shotwell/src/db/EventTable.vala" - database_table_throw_error ("EventTable.create", _tmp27_, &_inner_error_); + database_table_throw_error ("EventTable.create", _tmp18_, &_inner_error_); #line 94 "/home/jens/Source/shotwell/src/db/EventTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 94 "/home/jens/Source/shotwell/src/db/EventTable.vala" @@ -871,7 +945,7 @@ EventRow* event_table_create (EventTable* self, const gchar* primary_source_id, _sqlite3_finalize0 (stmt); #line 94 "/home/jens/Source/shotwell/src/db/EventTable.vala" return NULL; -#line 874 "EventTable.c" +#line 948 "EventTable.c" } else { #line 94 "/home/jens/Source/shotwell/src/db/EventTable.vala" _sqlite3_finalize0 (stmt); @@ -881,65 +955,63 @@ EventRow* event_table_create (EventTable* self, const gchar* primary_source_id, g_clear_error (&_inner_error_); #line 94 "/home/jens/Source/shotwell/src/db/EventTable.vala" return NULL; -#line 884 "EventTable.c" +#line 958 "EventTable.c" } } } #line 96 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp28_ = event_row_new (); + _tmp19_ = event_row_new (); #line 96 "/home/jens/Source/shotwell/src/db/EventTable.vala" - row = _tmp28_; + row = _tmp19_; #line 97 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp29_ = row; -#line 97 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp30_ = database_table_db; + _tmp20_ = row; #line 97 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp31_ = sqlite3_last_insert_rowid (_tmp30_); + _tmp21_ = database_table_db; #line 97 "/home/jens/Source/shotwell/src/db/EventTable.vala" - event_id_init (&_tmp29_->event_id, _tmp31_); + event_id_init (&_tmp20_->event_id, sqlite3_last_insert_rowid (_tmp21_)); #line 98 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp32_ = row; + _tmp22_ = row; #line 98 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _g_free0 (_tmp32_->name); + _g_free0 (_tmp22_->name); #line 98 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp32_->name = NULL; -#line 99 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp33_ = row; + _tmp22_->name = NULL; #line 99 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp34_ = primary_source_id; + _tmp23_ = row; #line 99 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp35_ = g_strdup (_tmp34_); + _tmp24_ = g_strdup (primary_source_id); #line 99 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _g_free0 (_tmp33_->primary_source_id); + _g_free0 (_tmp23_->primary_source_id); #line 99 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp33_->primary_source_id = _tmp35_; + _tmp23_->primary_source_id = _tmp24_; #line 100 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp36_ = row; + _tmp25_ = row; #line 100 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp37_ = time_created; + _tmp26_ = time_created; #line 100 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp36_->time_created = _tmp37_; + _tmp25_->time_created = _tmp26_; #line 101 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp38_ = row; -#line 101 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp39_ = comment; + _tmp27_ = row; #line 101 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp40_ = g_strdup (_tmp39_); + _tmp28_ = g_strdup (comment); #line 101 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _g_free0 (_tmp38_->comment); + _g_free0 (_tmp27_->comment); #line 101 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp38_->comment = _tmp40_; + _tmp27_->comment = _tmp28_; #line 103 "/home/jens/Source/shotwell/src/db/EventTable.vala" result = row; #line 103 "/home/jens/Source/shotwell/src/db/EventTable.vala" _sqlite3_finalize0 (stmt); #line 103 "/home/jens/Source/shotwell/src/db/EventTable.vala" return result; -#line 938 "EventTable.c" +#line 1006 "EventTable.c" } -void event_table_create_from_row (EventTable* self, EventRow* row, EventID* result) { +void +event_table_create_from_row (EventTable* self, + EventRow* row, + EventID* result) +{ sqlite3_stmt* stmt = NULL; gint res = 0; sqlite3* _tmp0_; @@ -947,40 +1019,29 @@ void event_table_create_from_row (EventTable* self, EventRow* row, EventID* resu gint _tmp2_; gint _tmp3_; sqlite3_stmt* _tmp4_; - EventRow* _tmp5_; - const gchar* _tmp6_; - gchar* _tmp7_; - GDestroyNotify _tmp8_; - gint _tmp9_; + const gchar* _tmp5_; + gchar* _tmp6_; + GDestroyNotify _tmp7_; + gint _tmp8_; + sqlite3_stmt* _tmp9_; gint _tmp10_; sqlite3_stmt* _tmp11_; - gint _tmp12_; - gint _tmp13_; - sqlite3_stmt* _tmp14_; - EventRow* _tmp15_; - const gchar* _tmp16_; - gchar* _tmp17_; - GDestroyNotify _tmp18_; - gint _tmp19_; - gint _tmp20_; - sqlite3_stmt* _tmp21_; - EventRow* _tmp22_; - time_t _tmp23_; - gint _tmp24_; + const gchar* _tmp12_; + gchar* _tmp13_; + GDestroyNotify _tmp14_; + gint _tmp15_; + sqlite3_stmt* _tmp16_; + time_t _tmp17_; + gint _tmp18_; + sqlite3_stmt* _tmp19_; + const gchar* _tmp20_; + gchar* _tmp21_; + GDestroyNotify _tmp22_; + gint _tmp23_; + sqlite3_stmt* _tmp24_; gint _tmp25_; - sqlite3_stmt* _tmp26_; - EventRow* _tmp27_; - const gchar* _tmp28_; - gchar* _tmp29_; - GDestroyNotify _tmp30_; - gint _tmp31_; - gint _tmp32_; - sqlite3_stmt* _tmp33_; - gint _tmp34_; - gint _tmp35_; - sqlite3* _tmp38_; - gint64 _tmp39_; - EventID _tmp40_ = {0}; + sqlite3* _tmp28_; + EventID _tmp29_ = {0}; #line 109 "/home/jens/Source/shotwell/src/db/EventTable.vala" g_return_if_fail (IS_EVENT_TABLE (self)); #line 109 "/home/jens/Source/shotwell/src/db/EventTable.vala" @@ -1003,125 +1064,106 @@ void event_table_create_from_row (EventTable* self, EventRow* row, EventID* resu #line 115 "/home/jens/Source/shotwell/src/db/EventTable.vala" _tmp4_ = stmt; #line 115 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp5_ = row; -#line 115 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp6_ = _tmp5_->name; + _tmp5_ = row->name; #line 115 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp7_ = g_strdup (_tmp6_); -#line 115 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp8_ = g_free; + _tmp6_ = g_strdup (_tmp5_); #line 115 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp9_ = sqlite3_bind_text (_tmp4_, 1, _tmp7_, -1, _tmp8_); + _tmp7_ = g_free; #line 115 "/home/jens/Source/shotwell/src/db/EventTable.vala" - res = _tmp9_; + res = sqlite3_bind_text (_tmp4_, 1, _tmp6_, -1, _tmp7_); #line 116 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp10_ = res; + _tmp8_ = res; #line 116 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _vala_assert (_tmp10_ == SQLITE_OK, "res == Sqlite.OK"); -#line 117 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp11_ = stmt; + _vala_assert (_tmp8_ == SQLITE_OK, "res == Sqlite.OK"); #line 117 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp12_ = sqlite3_bind_int64 (_tmp11_, 2, PHOTO_ID_INVALID); + _tmp9_ = stmt; #line 117 "/home/jens/Source/shotwell/src/db/EventTable.vala" - res = _tmp12_; + res = sqlite3_bind_int64 (_tmp9_, 2, PHOTO_ID_INVALID); #line 118 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp13_ = res; + _tmp10_ = res; #line 118 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _vala_assert (_tmp13_ == SQLITE_OK, "res == Sqlite.OK"); -#line 119 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp14_ = stmt; -#line 119 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp15_ = row; + _vala_assert (_tmp10_ == SQLITE_OK, "res == Sqlite.OK"); #line 119 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp16_ = _tmp15_->primary_source_id; + _tmp11_ = stmt; #line 119 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp17_ = g_strdup (_tmp16_); + _tmp12_ = row->primary_source_id; #line 119 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp18_ = g_free; + _tmp13_ = g_strdup (_tmp12_); #line 119 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp19_ = sqlite3_bind_text (_tmp14_, 3, _tmp17_, -1, _tmp18_); + _tmp14_ = g_free; #line 119 "/home/jens/Source/shotwell/src/db/EventTable.vala" - res = _tmp19_; + res = sqlite3_bind_text (_tmp11_, 3, _tmp13_, -1, _tmp14_); #line 120 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp20_ = res; + _tmp15_ = res; #line 120 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _vala_assert (_tmp20_ == SQLITE_OK, "res == Sqlite.OK"); -#line 121 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp21_ = stmt; -#line 121 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp22_ = row; + _vala_assert (_tmp15_ == SQLITE_OK, "res == Sqlite.OK"); #line 121 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp23_ = _tmp22_->time_created; + _tmp16_ = stmt; #line 121 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp24_ = sqlite3_bind_int64 (_tmp21_, 4, (gint64) _tmp23_); + _tmp17_ = row->time_created; #line 121 "/home/jens/Source/shotwell/src/db/EventTable.vala" - res = _tmp24_; + res = sqlite3_bind_int64 (_tmp16_, 4, (gint64) _tmp17_); #line 122 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp25_ = res; + _tmp18_ = res; #line 122 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _vala_assert (_tmp25_ == SQLITE_OK, "res == Sqlite.OK"); -#line 123 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp26_ = stmt; + _vala_assert (_tmp18_ == SQLITE_OK, "res == Sqlite.OK"); #line 123 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp27_ = row; + _tmp19_ = stmt; #line 123 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp28_ = _tmp27_->comment; + _tmp20_ = row->comment; #line 123 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp29_ = g_strdup (_tmp28_); + _tmp21_ = g_strdup (_tmp20_); #line 123 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp30_ = g_free; + _tmp22_ = g_free; #line 123 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp31_ = sqlite3_bind_text (_tmp26_, 5, _tmp29_, -1, _tmp30_); -#line 123 "/home/jens/Source/shotwell/src/db/EventTable.vala" - res = _tmp31_; + res = sqlite3_bind_text (_tmp19_, 5, _tmp21_, -1, _tmp22_); #line 124 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp32_ = res; + _tmp23_ = res; #line 124 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _vala_assert (_tmp32_ == SQLITE_OK, "res == Sqlite.OK"); -#line 126 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp33_ = stmt; + _vala_assert (_tmp23_ == SQLITE_OK, "res == Sqlite.OK"); #line 126 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp34_ = sqlite3_step (_tmp33_); + _tmp24_ = stmt; #line 126 "/home/jens/Source/shotwell/src/db/EventTable.vala" - res = _tmp34_; + res = sqlite3_step (_tmp24_); #line 127 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp35_ = res; + _tmp25_ = res; #line 127 "/home/jens/Source/shotwell/src/db/EventTable.vala" - if (_tmp35_ != SQLITE_DONE) { -#line 1090 "EventTable.c" - gint _tmp36_; - EventID _tmp37_ = {0}; + if (_tmp25_ != SQLITE_DONE) { +#line 1131 "EventTable.c" + gint _tmp26_; + EventID _tmp27_ = {0}; #line 128 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp36_ = res; + _tmp26_ = res; #line 128 "/home/jens/Source/shotwell/src/db/EventTable.vala" - database_table_fatal ("Event create_from_row", _tmp36_); + database_table_fatal ("Event create_from_row", _tmp26_); #line 130 "/home/jens/Source/shotwell/src/db/EventTable.vala" - event_id_init (&_tmp37_, EVENT_ID_INVALID); + event_id_init (&_tmp27_, EVENT_ID_INVALID); #line 130 "/home/jens/Source/shotwell/src/db/EventTable.vala" - *result = _tmp37_; + *result = _tmp27_; #line 130 "/home/jens/Source/shotwell/src/db/EventTable.vala" _sqlite3_finalize0 (stmt); #line 130 "/home/jens/Source/shotwell/src/db/EventTable.vala" return; -#line 1105 "EventTable.c" +#line 1146 "EventTable.c" } #line 133 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp38_ = database_table_db; + _tmp28_ = database_table_db; #line 133 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp39_ = sqlite3_last_insert_rowid (_tmp38_); + event_id_init (&_tmp29_, sqlite3_last_insert_rowid (_tmp28_)); #line 133 "/home/jens/Source/shotwell/src/db/EventTable.vala" - event_id_init (&_tmp40_, _tmp39_); -#line 133 "/home/jens/Source/shotwell/src/db/EventTable.vala" - *result = _tmp40_; + *result = _tmp29_; #line 133 "/home/jens/Source/shotwell/src/db/EventTable.vala" _sqlite3_finalize0 (stmt); #line 133 "/home/jens/Source/shotwell/src/db/EventTable.vala" return; -#line 1119 "EventTable.c" +#line 1158 "EventTable.c" } -EventRow* event_table_get_row (EventTable* self, EventID* event_id) { +EventRow* +event_table_get_row (EventTable* self, + EventID* event_id) +{ EventRow* result = NULL; sqlite3_stmt* stmt = NULL; gint res = 0; @@ -1133,33 +1175,29 @@ EventRow* event_table_get_row (EventTable* self, EventID* event_id) { EventID _tmp5_; gint64 _tmp6_; gint _tmp7_; - gint _tmp8_; - sqlite3_stmt* _tmp9_; - gint _tmp10_; + sqlite3_stmt* _tmp8_; EventRow* row = NULL; - EventRow* _tmp11_; + EventRow* _tmp9_; + EventRow* _tmp10_; + EventID _tmp11_; EventRow* _tmp12_; - EventID _tmp13_; - EventRow* _tmp14_; - sqlite3_stmt* _tmp15_; - const gchar* _tmp16_; - gchar* _tmp17_; - gboolean _tmp18_ = FALSE; - EventRow* _tmp19_; - const gchar* _tmp20_; - EventRow* _tmp26_; - sqlite3_stmt* _tmp27_; - gint64 _tmp28_; - sqlite3_stmt* _tmp29_; - const gchar* _tmp30_; - gchar* _tmp31_; - EventRow* _tmp32_; - sqlite3_stmt* _tmp33_; - gint64 _tmp34_; - EventRow* _tmp35_; - sqlite3_stmt* _tmp36_; - const gchar* _tmp37_; - gchar* _tmp38_; + sqlite3_stmt* _tmp13_; + const gchar* _tmp14_; + gchar* _tmp15_; + gboolean _tmp16_ = FALSE; + EventRow* _tmp17_; + const gchar* _tmp18_; + EventRow* _tmp24_; + sqlite3_stmt* _tmp25_; + sqlite3_stmt* _tmp26_; + const gchar* _tmp27_; + gchar* _tmp28_; + EventRow* _tmp29_; + sqlite3_stmt* _tmp30_; + EventRow* _tmp31_; + sqlite3_stmt* _tmp32_; + const gchar* _tmp33_; + gchar* _tmp34_; #line 136 "/home/jens/Source/shotwell/src/db/EventTable.vala" g_return_val_if_fail (IS_EVENT_TABLE (self), NULL); #line 136 "/home/jens/Source/shotwell/src/db/EventTable.vala" @@ -1186,135 +1224,131 @@ EventRow* event_table_get_row (EventTable* self, EventID* event_id) { #line 142 "/home/jens/Source/shotwell/src/db/EventTable.vala" _tmp6_ = _tmp5_.id; #line 142 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp7_ = sqlite3_bind_int64 (_tmp4_, 1, _tmp6_); -#line 142 "/home/jens/Source/shotwell/src/db/EventTable.vala" - res = _tmp7_; + res = sqlite3_bind_int64 (_tmp4_, 1, _tmp6_); #line 143 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp8_ = res; + _tmp7_ = res; #line 143 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _vala_assert (_tmp8_ == SQLITE_OK, "res == Sqlite.OK"); -#line 145 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp9_ = stmt; + _vala_assert (_tmp7_ == SQLITE_OK, "res == Sqlite.OK"); #line 145 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp10_ = sqlite3_step (_tmp9_); + _tmp8_ = stmt; #line 145 "/home/jens/Source/shotwell/src/db/EventTable.vala" - if (_tmp10_ != SQLITE_ROW) { + if (sqlite3_step (_tmp8_) != SQLITE_ROW) { #line 146 "/home/jens/Source/shotwell/src/db/EventTable.vala" result = NULL; #line 146 "/home/jens/Source/shotwell/src/db/EventTable.vala" _sqlite3_finalize0 (stmt); #line 146 "/home/jens/Source/shotwell/src/db/EventTable.vala" return result; -#line 1206 "EventTable.c" +#line 1240 "EventTable.c" } #line 148 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp11_ = event_row_new (); + _tmp9_ = event_row_new (); #line 148 "/home/jens/Source/shotwell/src/db/EventTable.vala" - row = _tmp11_; + row = _tmp9_; #line 149 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp12_ = row; + _tmp10_ = row; #line 149 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp13_ = *event_id; + _tmp11_ = *event_id; #line 149 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp12_->event_id = _tmp13_; + _tmp10_->event_id = _tmp11_; #line 150 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp14_ = row; + _tmp12_ = row; #line 150 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp15_ = stmt; + _tmp13_ = stmt; #line 150 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp16_ = sqlite3_column_text (_tmp15_, 0); + _tmp14_ = sqlite3_column_text (_tmp13_, 0); #line 150 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp17_ = g_strdup (_tmp16_); + _tmp15_ = g_strdup (_tmp14_); #line 150 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _g_free0 (_tmp14_->name); + _g_free0 (_tmp12_->name); #line 150 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp14_->name = _tmp17_; + _tmp12_->name = _tmp15_; #line 151 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp19_ = row; + _tmp17_ = row; #line 151 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp20_ = _tmp19_->name; + _tmp18_ = _tmp17_->name; #line 151 "/home/jens/Source/shotwell/src/db/EventTable.vala" - if (_tmp20_ != NULL) { -#line 1236 "EventTable.c" - EventRow* _tmp21_; - const gchar* _tmp22_; - gint _tmp23_; - gint _tmp24_; + if (_tmp18_ != NULL) { +#line 1270 "EventTable.c" + EventRow* _tmp19_; + const gchar* _tmp20_; + gint _tmp21_; + gint _tmp22_; #line 151 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp21_ = row; + _tmp19_ = row; #line 151 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp22_ = _tmp21_->name; + _tmp20_ = _tmp19_->name; #line 151 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp23_ = strlen (_tmp22_); + _tmp21_ = strlen (_tmp20_); #line 151 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp24_ = _tmp23_; + _tmp22_ = _tmp21_; #line 151 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp18_ = _tmp24_ == 0; -#line 1251 "EventTable.c" + _tmp16_ = _tmp22_ == 0; +#line 1285 "EventTable.c" } else { #line 151 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp18_ = FALSE; -#line 1255 "EventTable.c" + _tmp16_ = FALSE; +#line 1289 "EventTable.c" } #line 151 "/home/jens/Source/shotwell/src/db/EventTable.vala" - if (_tmp18_) { -#line 1259 "EventTable.c" - EventRow* _tmp25_; + if (_tmp16_) { +#line 1293 "EventTable.c" + EventRow* _tmp23_; #line 152 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp25_ = row; + _tmp23_ = row; #line 152 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _g_free0 (_tmp25_->name); + _g_free0 (_tmp23_->name); #line 152 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp25_->name = NULL; -#line 1267 "EventTable.c" + _tmp23_->name = NULL; +#line 1301 "EventTable.c" } #line 153 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp26_ = row; + _tmp24_ = row; #line 153 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp27_ = stmt; + _tmp25_ = stmt; #line 153 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp28_ = sqlite3_column_int64 (_tmp27_, 1); -#line 153 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp29_ = stmt; + _tmp26_ = stmt; #line 153 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp30_ = sqlite3_column_text (_tmp29_, 2); + _tmp27_ = sqlite3_column_text (_tmp26_, 2); #line 153 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp31_ = event_table_source_id_upgrade (self, _tmp28_, _tmp30_); + _tmp28_ = event_table_source_id_upgrade (self, sqlite3_column_int64 (_tmp25_, 1), _tmp27_); #line 153 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _g_free0 (_tmp26_->primary_source_id); + _g_free0 (_tmp24_->primary_source_id); #line 153 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp26_->primary_source_id = _tmp31_; + _tmp24_->primary_source_id = _tmp28_; #line 154 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp32_ = row; -#line 154 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp33_ = stmt; + _tmp29_ = row; #line 154 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp34_ = sqlite3_column_int64 (_tmp33_, 3); + _tmp30_ = stmt; #line 154 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp32_->time_created = (time_t) _tmp34_; + _tmp29_->time_created = (time_t) sqlite3_column_int64 (_tmp30_, 3); #line 155 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp35_ = row; + _tmp31_ = row; #line 155 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp36_ = stmt; + _tmp32_ = stmt; #line 155 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp37_ = sqlite3_column_text (_tmp36_, 4); + _tmp33_ = sqlite3_column_text (_tmp32_, 4); #line 155 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp38_ = g_strdup (_tmp37_); + _tmp34_ = g_strdup (_tmp33_); #line 155 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _g_free0 (_tmp35_->comment); + _g_free0 (_tmp31_->comment); #line 155 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp35_->comment = _tmp38_; + _tmp31_->comment = _tmp34_; #line 157 "/home/jens/Source/shotwell/src/db/EventTable.vala" result = row; #line 157 "/home/jens/Source/shotwell/src/db/EventTable.vala" _sqlite3_finalize0 (stmt); #line 157 "/home/jens/Source/shotwell/src/db/EventTable.vala" return result; -#line 1311 "EventTable.c" +#line 1341 "EventTable.c" } -void event_table_remove (EventTable* self, EventID* event_id, GError** error) { +void +event_table_remove (EventTable* self, + EventID* event_id, + GError** error) +{ EventID _tmp0_; gint64 _tmp1_; GError * _inner_error_ = NULL; @@ -1336,7 +1370,7 @@ void event_table_remove (EventTable* self, EventID* event_id, GError** error) { g_propagate_error (error, _inner_error_); #line 161 "/home/jens/Source/shotwell/src/db/EventTable.vala" return; -#line 1337 "EventTable.c" +#line 1371 "EventTable.c" } else { #line 161 "/home/jens/Source/shotwell/src/db/EventTable.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); @@ -1344,13 +1378,15 @@ void event_table_remove (EventTable* self, EventID* event_id, GError** error) { g_clear_error (&_inner_error_); #line 161 "/home/jens/Source/shotwell/src/db/EventTable.vala" return; -#line 1345 "EventTable.c" +#line 1379 "EventTable.c" } } } -GeeArrayList* event_table_get_events (EventTable* self) { +GeeArrayList* +event_table_get_events (EventTable* self) +{ GeeArrayList* result = NULL; sqlite3_stmt* stmt = NULL; gint res = 0; @@ -1381,146 +1417,134 @@ GeeArrayList* event_table_get_events (EventTable* self) { _tmp4_ = gee_array_list_new (TYPE_EVENT_ROW, (GBoxedCopyFunc) event_row_ref, (GDestroyNotify) event_row_unref, NULL, NULL, NULL); #line 170 "/home/jens/Source/shotwell/src/db/EventTable.vala" event_rows = _tmp4_; -#line 1381 "EventTable.c" +#line 1417 "EventTable.c" { gboolean _tmp5_ = FALSE; #line 171 "/home/jens/Source/shotwell/src/db/EventTable.vala" _tmp5_ = TRUE; #line 171 "/home/jens/Source/shotwell/src/db/EventTable.vala" while (TRUE) { -#line 1388 "EventTable.c" +#line 1424 "EventTable.c" sqlite3_stmt* _tmp6_; gint _tmp7_; - gint _tmp8_; EventRow* row = NULL; + EventRow* _tmp10_; EventRow* _tmp11_; - EventRow* _tmp12_; - sqlite3_stmt* _tmp13_; - gint64 _tmp14_; - EventRow* _tmp15_; - sqlite3_stmt* _tmp16_; - const gchar* _tmp17_; - gchar* _tmp18_; - EventRow* _tmp19_; - sqlite3_stmt* _tmp20_; - gint64 _tmp21_; - sqlite3_stmt* _tmp22_; - const gchar* _tmp23_; - gchar* _tmp24_; - EventRow* _tmp25_; - sqlite3_stmt* _tmp26_; - gint64 _tmp27_; - EventRow* _tmp28_; - sqlite3_stmt* _tmp29_; - const gchar* _tmp30_; - gchar* _tmp31_; - GeeArrayList* _tmp32_; - EventRow* _tmp33_; + sqlite3_stmt* _tmp12_; + EventRow* _tmp13_; + sqlite3_stmt* _tmp14_; + const gchar* _tmp15_; + gchar* _tmp16_; + EventRow* _tmp17_; + sqlite3_stmt* _tmp18_; + sqlite3_stmt* _tmp19_; + const gchar* _tmp20_; + gchar* _tmp21_; + EventRow* _tmp22_; + sqlite3_stmt* _tmp23_; + EventRow* _tmp24_; + sqlite3_stmt* _tmp25_; + const gchar* _tmp26_; + gchar* _tmp27_; + GeeArrayList* _tmp28_; + EventRow* _tmp29_; #line 171 "/home/jens/Source/shotwell/src/db/EventTable.vala" if (!_tmp5_) { -#line 1418 "EventTable.c" +#line 1450 "EventTable.c" } #line 171 "/home/jens/Source/shotwell/src/db/EventTable.vala" _tmp5_ = FALSE; #line 172 "/home/jens/Source/shotwell/src/db/EventTable.vala" _tmp6_ = stmt; #line 172 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp7_ = sqlite3_step (_tmp6_); -#line 172 "/home/jens/Source/shotwell/src/db/EventTable.vala" - res = _tmp7_; + res = sqlite3_step (_tmp6_); #line 173 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp8_ = res; + _tmp7_ = res; #line 173 "/home/jens/Source/shotwell/src/db/EventTable.vala" - if (_tmp8_ == SQLITE_DONE) { + if (_tmp7_ == SQLITE_DONE) { #line 174 "/home/jens/Source/shotwell/src/db/EventTable.vala" break; -#line 1434 "EventTable.c" +#line 1464 "EventTable.c" } else { - gint _tmp9_; + gint _tmp8_; #line 175 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp9_ = res; + _tmp8_ = res; #line 175 "/home/jens/Source/shotwell/src/db/EventTable.vala" - if (_tmp9_ != SQLITE_ROW) { -#line 1441 "EventTable.c" - gint _tmp10_; + if (_tmp8_ != SQLITE_ROW) { +#line 1471 "EventTable.c" + gint _tmp9_; #line 176 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp10_ = res; + _tmp9_ = res; #line 176 "/home/jens/Source/shotwell/src/db/EventTable.vala" - database_table_fatal ("get_events", _tmp10_); + database_table_fatal ("get_events", _tmp9_); #line 178 "/home/jens/Source/shotwell/src/db/EventTable.vala" break; -#line 1449 "EventTable.c" +#line 1479 "EventTable.c" } } #line 181 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp11_ = event_row_new (); + _tmp10_ = event_row_new (); #line 181 "/home/jens/Source/shotwell/src/db/EventTable.vala" - row = _tmp11_; + row = _tmp10_; #line 183 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp12_ = row; + _tmp11_ = row; #line 183 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp13_ = stmt; + _tmp12_ = stmt; #line 183 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp14_ = sqlite3_column_int64 (_tmp13_, 0); -#line 183 "/home/jens/Source/shotwell/src/db/EventTable.vala" - event_id_init (&_tmp12_->event_id, _tmp14_); + event_id_init (&_tmp11_->event_id, sqlite3_column_int64 (_tmp12_, 0)); #line 184 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp15_ = row; + _tmp13_ = row; #line 184 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp16_ = stmt; + _tmp14_ = stmt; #line 184 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp17_ = sqlite3_column_text (_tmp16_, 1); + _tmp15_ = sqlite3_column_text (_tmp14_, 1); #line 184 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp18_ = g_strdup (_tmp17_); + _tmp16_ = g_strdup (_tmp15_); #line 184 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _g_free0 (_tmp15_->name); + _g_free0 (_tmp13_->name); #line 184 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp15_->name = _tmp18_; -#line 185 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp19_ = row; + _tmp13_->name = _tmp16_; #line 185 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp20_ = stmt; + _tmp17_ = row; #line 185 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp21_ = sqlite3_column_int64 (_tmp20_, 2); + _tmp18_ = stmt; #line 185 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp22_ = stmt; + _tmp19_ = stmt; #line 185 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp23_ = sqlite3_column_text (_tmp22_, 3); + _tmp20_ = sqlite3_column_text (_tmp19_, 3); #line 185 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp24_ = event_table_source_id_upgrade (self, _tmp21_, _tmp23_); + _tmp21_ = event_table_source_id_upgrade (self, sqlite3_column_int64 (_tmp18_, 2), _tmp20_); #line 185 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _g_free0 (_tmp19_->primary_source_id); + _g_free0 (_tmp17_->primary_source_id); #line 185 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp19_->primary_source_id = _tmp24_; + _tmp17_->primary_source_id = _tmp21_; #line 186 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp25_ = row; + _tmp22_ = row; #line 186 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp26_ = stmt; + _tmp23_ = stmt; #line 186 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp27_ = sqlite3_column_int64 (_tmp26_, 4); -#line 186 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp25_->time_created = (time_t) _tmp27_; + _tmp22_->time_created = (time_t) sqlite3_column_int64 (_tmp23_, 4); #line 187 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp28_ = row; + _tmp24_ = row; #line 187 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp29_ = stmt; + _tmp25_ = stmt; #line 187 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp30_ = sqlite3_column_text (_tmp29_, 5); + _tmp26_ = sqlite3_column_text (_tmp25_, 5); #line 187 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp31_ = g_strdup (_tmp30_); + _tmp27_ = g_strdup (_tmp26_); #line 187 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _g_free0 (_tmp28_->comment); + _g_free0 (_tmp24_->comment); #line 187 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp28_->comment = _tmp31_; + _tmp24_->comment = _tmp27_; #line 189 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp32_ = event_rows; + _tmp28_ = event_rows; #line 189 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp33_ = row; + _tmp29_ = row; #line 189 "/home/jens/Source/shotwell/src/db/EventTable.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp33_); + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp29_); #line 171 "/home/jens/Source/shotwell/src/db/EventTable.vala" _event_row_unref0 (row); -#line 1520 "EventTable.c" +#line 1544 "EventTable.c" } } #line 192 "/home/jens/Source/shotwell/src/db/EventTable.vala" @@ -1529,52 +1553,49 @@ GeeArrayList* event_table_get_events (EventTable* self) { _sqlite3_finalize0 (stmt); #line 192 "/home/jens/Source/shotwell/src/db/EventTable.vala" return result; -#line 1529 "EventTable.c" +#line 1553 "EventTable.c" } -gboolean event_table_rename (EventTable* self, EventID* event_id, const gchar* name) { +gboolean +event_table_rename (EventTable* self, + EventID* event_id, + const gchar* name) +{ gboolean result = FALSE; const gchar* _tmp0_ = NULL; - const gchar* _tmp1_; - EventID _tmp3_; - gint64 _tmp4_; - gboolean _tmp5_; + EventID _tmp1_; + gint64 _tmp2_; #line 195 "/home/jens/Source/shotwell/src/db/EventTable.vala" g_return_val_if_fail (IS_EVENT_TABLE (self), FALSE); #line 195 "/home/jens/Source/shotwell/src/db/EventTable.vala" g_return_val_if_fail (event_id != NULL, FALSE); #line 196 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp1_ = name; -#line 196 "/home/jens/Source/shotwell/src/db/EventTable.vala" - if (_tmp1_ != NULL) { -#line 1548 "EventTable.c" - const gchar* _tmp2_; + if (name != NULL) { #line 196 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp2_ = name; -#line 196 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp0_ = _tmp2_; -#line 1554 "EventTable.c" + _tmp0_ = name; +#line 1574 "EventTable.c" } else { #line 196 "/home/jens/Source/shotwell/src/db/EventTable.vala" _tmp0_ = ""; -#line 1558 "EventTable.c" +#line 1578 "EventTable.c" } #line 196 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp3_ = *event_id; -#line 196 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp4_ = _tmp3_.id; + _tmp1_ = *event_id; #line 196 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp5_ = database_table_update_text_by_id (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp4_, "name", _tmp0_); + _tmp2_ = _tmp1_.id; #line 196 "/home/jens/Source/shotwell/src/db/EventTable.vala" - result = _tmp5_; + result = database_table_update_text_by_id (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp2_, "name", _tmp0_); #line 196 "/home/jens/Source/shotwell/src/db/EventTable.vala" return result; -#line 1570 "EventTable.c" +#line 1588 "EventTable.c" } -gchar* event_table_get_name (EventTable* self, EventID* event_id) { +gchar* +event_table_get_name (EventTable* self, + EventID* event_id) +{ gchar* result = NULL; sqlite3_stmt* stmt = NULL; EventID _tmp0_; @@ -1611,7 +1632,7 @@ gchar* event_table_get_name (EventTable* self, EventID* event_id) { _sqlite3_finalize0 (stmt); #line 202 "/home/jens/Source/shotwell/src/db/EventTable.vala" return result; -#line 1611 "EventTable.c" +#line 1632 "EventTable.c" } #line 204 "/home/jens/Source/shotwell/src/db/EventTable.vala" _tmp4_ = stmt; @@ -1625,7 +1646,7 @@ gchar* event_table_get_name (EventTable* self, EventID* event_id) { _tmp9_ = name; #line 206 "/home/jens/Source/shotwell/src/db/EventTable.vala" if (_tmp9_ != NULL) { -#line 1625 "EventTable.c" +#line 1646 "EventTable.c" const gchar* _tmp10_; gint _tmp11_; gint _tmp12_; @@ -1637,25 +1658,25 @@ gchar* event_table_get_name (EventTable* self, EventID* event_id) { _tmp12_ = _tmp11_; #line 206 "/home/jens/Source/shotwell/src/db/EventTable.vala" _tmp8_ = _tmp12_ > 0; -#line 1637 "EventTable.c" +#line 1658 "EventTable.c" } else { #line 206 "/home/jens/Source/shotwell/src/db/EventTable.vala" _tmp8_ = FALSE; -#line 1641 "EventTable.c" +#line 1662 "EventTable.c" } #line 206 "/home/jens/Source/shotwell/src/db/EventTable.vala" if (_tmp8_) { -#line 1645 "EventTable.c" +#line 1666 "EventTable.c" const gchar* _tmp13_; #line 206 "/home/jens/Source/shotwell/src/db/EventTable.vala" _tmp13_ = name; #line 206 "/home/jens/Source/shotwell/src/db/EventTable.vala" _tmp7_ = _tmp13_; -#line 1651 "EventTable.c" +#line 1672 "EventTable.c" } else { #line 206 "/home/jens/Source/shotwell/src/db/EventTable.vala" _tmp7_ = NULL; -#line 1655 "EventTable.c" +#line 1676 "EventTable.c" } #line 206 "/home/jens/Source/shotwell/src/db/EventTable.vala" _tmp14_ = g_strdup (_tmp7_); @@ -1667,11 +1688,14 @@ gchar* event_table_get_name (EventTable* self, EventID* event_id) { _sqlite3_finalize0 (stmt); #line 206 "/home/jens/Source/shotwell/src/db/EventTable.vala" return result; -#line 1667 "EventTable.c" +#line 1688 "EventTable.c" } -gchar* event_table_get_primary_source_id (EventTable* self, EventID* event_id) { +gchar* +event_table_get_primary_source_id (EventTable* self, + EventID* event_id) +{ gchar* result = NULL; sqlite3_stmt* stmt = NULL; EventID _tmp0_; @@ -1703,7 +1727,7 @@ gchar* event_table_get_primary_source_id (EventTable* self, EventID* event_id) { _sqlite3_finalize0 (stmt); #line 212 "/home/jens/Source/shotwell/src/db/EventTable.vala" return result; -#line 1703 "EventTable.c" +#line 1727 "EventTable.c" } #line 214 "/home/jens/Source/shotwell/src/db/EventTable.vala" _tmp4_ = stmt; @@ -1717,16 +1741,18 @@ gchar* event_table_get_primary_source_id (EventTable* self, EventID* event_id) { _sqlite3_finalize0 (stmt); #line 214 "/home/jens/Source/shotwell/src/db/EventTable.vala" return result; -#line 1717 "EventTable.c" +#line 1741 "EventTable.c" } -gboolean event_table_set_primary_source_id (EventTable* self, EventID* event_id, const gchar* primary_source_id) { +gboolean +event_table_set_primary_source_id (EventTable* self, + EventID* event_id, + const gchar* primary_source_id) +{ gboolean result = FALSE; EventID _tmp0_; gint64 _tmp1_; - const gchar* _tmp2_; - gboolean _tmp3_; #line 217 "/home/jens/Source/shotwell/src/db/EventTable.vala" g_return_val_if_fail (IS_EVENT_TABLE (self), FALSE); #line 217 "/home/jens/Source/shotwell/src/db/EventTable.vala" @@ -1738,18 +1764,17 @@ gboolean event_table_set_primary_source_id (EventTable* self, EventID* event_id, #line 218 "/home/jens/Source/shotwell/src/db/EventTable.vala" _tmp1_ = _tmp0_.id; #line 218 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp2_ = primary_source_id; -#line 218 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp3_ = database_table_update_text_by_id (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp1_, "primary_source_id", _tmp2_); -#line 218 "/home/jens/Source/shotwell/src/db/EventTable.vala" - result = _tmp3_; + result = database_table_update_text_by_id (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp1_, "primary_source_id", primary_source_id); #line 218 "/home/jens/Source/shotwell/src/db/EventTable.vala" return result; -#line 1745 "EventTable.c" +#line 1767 "EventTable.c" } -time_t event_table_get_time_created (EventTable* self, EventID* event_id) { +time_t +event_table_get_time_created (EventTable* self, + EventID* event_id) +{ time_t result = 0; sqlite3_stmt* stmt = NULL; EventID _tmp0_; @@ -1757,7 +1782,6 @@ time_t event_table_get_time_created (EventTable* self, EventID* event_id) { sqlite3_stmt* _tmp2_ = NULL; gboolean _tmp3_; sqlite3_stmt* _tmp4_; - gint64 _tmp5_; #line 221 "/home/jens/Source/shotwell/src/db/EventTable.vala" g_return_val_if_fail (IS_EVENT_TABLE (self), 0); #line 221 "/home/jens/Source/shotwell/src/db/EventTable.vala" @@ -1780,29 +1804,29 @@ time_t event_table_get_time_created (EventTable* self, EventID* event_id) { _sqlite3_finalize0 (stmt); #line 224 "/home/jens/Source/shotwell/src/db/EventTable.vala" return result; -#line 1780 "EventTable.c" +#line 1804 "EventTable.c" } #line 226 "/home/jens/Source/shotwell/src/db/EventTable.vala" _tmp4_ = stmt; #line 226 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp5_ = sqlite3_column_int64 (_tmp4_, 0); -#line 226 "/home/jens/Source/shotwell/src/db/EventTable.vala" - result = (time_t) _tmp5_; + result = (time_t) sqlite3_column_int64 (_tmp4_, 0); #line 226 "/home/jens/Source/shotwell/src/db/EventTable.vala" _sqlite3_finalize0 (stmt); #line 226 "/home/jens/Source/shotwell/src/db/EventTable.vala" return result; -#line 1792 "EventTable.c" +#line 1814 "EventTable.c" } -gboolean event_table_set_comment (EventTable* self, EventID* event_id, const gchar* new_comment) { +gboolean +event_table_set_comment (EventTable* self, + EventID* event_id, + const gchar* new_comment) +{ gboolean result = FALSE; const gchar* _tmp0_ = NULL; - const gchar* _tmp1_; - EventID _tmp3_; - gint64 _tmp4_; - gboolean _tmp5_; + EventID _tmp1_; + gint64 _tmp2_; #line 229 "/home/jens/Source/shotwell/src/db/EventTable.vala" g_return_val_if_fail (IS_EVENT_TABLE (self), FALSE); #line 229 "/home/jens/Source/shotwell/src/db/EventTable.vala" @@ -1810,59 +1834,59 @@ gboolean event_table_set_comment (EventTable* self, EventID* event_id, const gch #line 229 "/home/jens/Source/shotwell/src/db/EventTable.vala" g_return_val_if_fail (new_comment != NULL, FALSE); #line 230 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp1_ = new_comment; -#line 230 "/home/jens/Source/shotwell/src/db/EventTable.vala" - if (_tmp1_ != NULL) { -#line 1813 "EventTable.c" - const gchar* _tmp2_; + if (new_comment != NULL) { #line 230 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp2_ = new_comment; -#line 230 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp0_ = _tmp2_; -#line 1819 "EventTable.c" + _tmp0_ = new_comment; +#line 1837 "EventTable.c" } else { #line 230 "/home/jens/Source/shotwell/src/db/EventTable.vala" _tmp0_ = ""; -#line 1823 "EventTable.c" +#line 1841 "EventTable.c" } #line 230 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp3_ = *event_id; -#line 230 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp4_ = _tmp3_.id; + _tmp1_ = *event_id; #line 230 "/home/jens/Source/shotwell/src/db/EventTable.vala" - _tmp5_ = database_table_update_text_by_id (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp4_, "comment", _tmp0_); + _tmp2_ = _tmp1_.id; #line 230 "/home/jens/Source/shotwell/src/db/EventTable.vala" - result = _tmp5_; + result = database_table_update_text_by_id (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp2_, "comment", _tmp0_); #line 230 "/home/jens/Source/shotwell/src/db/EventTable.vala" return result; -#line 1835 "EventTable.c" +#line 1851 "EventTable.c" } -static void event_table_class_init (EventTableClass * klass) { +static void +event_table_class_init (EventTableClass * klass) +{ #line 33 "/home/jens/Source/shotwell/src/db/EventTable.vala" event_table_parent_class = g_type_class_peek_parent (klass); #line 33 "/home/jens/Source/shotwell/src/db/EventTable.vala" ((DatabaseTableClass *) klass)->finalize = event_table_finalize; -#line 1844 "EventTable.c" +#line 1862 "EventTable.c" } -static void event_table_instance_init (EventTable * self) { +static void +event_table_instance_init (EventTable * self) +{ } -static void event_table_finalize (DatabaseTable * obj) { +static void +event_table_finalize (DatabaseTable * obj) +{ EventTable * self; #line 33 "/home/jens/Source/shotwell/src/db/EventTable.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_EVENT_TABLE, EventTable); #line 33 "/home/jens/Source/shotwell/src/db/EventTable.vala" DATABASE_TABLE_CLASS (event_table_parent_class)->finalize (obj); -#line 1858 "EventTable.c" +#line 1880 "EventTable.c" } -GType event_table_get_type (void) { +GType +event_table_get_type (void) +{ static volatile gsize event_table_type_id__volatile = 0; if (g_once_init_enter (&event_table_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (EventTableClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) event_table_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (EventTable), 0, (GInstanceInitFunc) event_table_instance_init, NULL }; diff --git a/src/db/PhotoTable.c b/src/db/PhotoTable.c index 3fd09f6..a2832f0 100644 --- a/src/db/PhotoTable.c +++ b/src/db/PhotoTable.c @@ -1,4 +1,4 @@ -/* PhotoTable.c generated by valac 0.36.6, the Vala compiler +/* PhotoTable.c generated by valac 0.40.4, the Vala compiler * generated from PhotoTable.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,6 +7,7 @@ * (version 2.1 or later). See the COPYING file in this distribution. */ + #include <glib.h> #include <glib-object.h> #include <string.h> @@ -285,36 +286,53 @@ GType photo_id_get_type (void) G_GNUC_CONST; PhotoID* photo_id_dup (const PhotoID* self); void photo_id_free (PhotoID* self); #define PHOTO_ID_INVALID ((gint64) -1) -void photo_id_init (PhotoID *self, gint64 id); +void photo_id_init (PhotoID *self, + gint64 id); gboolean photo_id_is_invalid (PhotoID *self); gboolean photo_id_is_valid (PhotoID *self); guint photo_id_hash (PhotoID *self); guint int64_hash (gint64* n); -gboolean photo_id_equal (void* a, void* b); +gboolean photo_id_equal (void* a, + void* b); gchar* photo_id_upgrade_photo_id_to_source_id (PhotoID* photo_id); #define PHOTO_TYPENAME "thumb" GType import_id_get_type (void) G_GNUC_CONST; ImportID* import_id_dup (const ImportID* self); void import_id_free (ImportID* self); #define IMPORT_ID_INVALID ((gint64) 0) -void import_id_init (ImportID *self, gint64 id); +void import_id_init (ImportID *self, + gint64 id); void import_id_generate (ImportID* result); gboolean import_id_is_invalid (ImportID *self); gboolean import_id_is_valid (ImportID *self); -gint import_id_compare_func (ImportID* a, ImportID* b); -gint64 import_id_comparator (void* a, void* b); +gint import_id_compare_func (ImportID* a, + ImportID* b); +gint64 import_id_comparator (void* a, + void* b); gpointer photo_row_ref (gpointer instance); void photo_row_unref (gpointer instance); -GParamSpec* param_spec_photo_row (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_photo_row (GValue* value, gpointer v_object); -void value_take_photo_row (GValue* value, gpointer v_object); +GParamSpec* param_spec_photo_row (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_photo_row (GValue* value, + gpointer v_object); +void value_take_photo_row (GValue* value, + gpointer v_object); gpointer value_get_photo_row (const GValue* value); GType photo_row_get_type (void) G_GNUC_CONST; gpointer backing_photo_row_ref (gpointer instance); void backing_photo_row_unref (gpointer instance); -GParamSpec* param_spec_backing_photo_row (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_backing_photo_row (GValue* value, gpointer v_object); -void value_take_backing_photo_row (GValue* value, gpointer v_object); +GParamSpec* param_spec_backing_photo_row (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_backing_photo_row (GValue* value, + gpointer v_object); +void value_take_backing_photo_row (GValue* value, + gpointer v_object); gpointer value_get_backing_photo_row (const GValue* value); GType backing_photo_row_get_type (void) G_GNUC_CONST; GType event_id_get_type (void) G_GNUC_CONST; @@ -326,36 +344,42 @@ GType backing_photo_id_get_type (void) G_GNUC_CONST; BackingPhotoID* backing_photo_id_dup (const BackingPhotoID* self); void backing_photo_id_free (BackingPhotoID* self); GType raw_developer_get_type (void) G_GNUC_CONST; -enum { - PHOTO_ROW_DUMMY_PROPERTY -}; PhotoRow* photo_row_new (void); PhotoRow* photo_row_construct (GType object_type); BackingPhotoRow* backing_photo_row_new (void); BackingPhotoRow* backing_photo_row_construct (GType object_type); #define BACKING_PHOTO_ID_INVALID ((gint64) -1) -void backing_photo_id_init (BackingPhotoID *self, gint64 id); +void backing_photo_id_init (BackingPhotoID *self, + gint64 id); RawDeveloper* raw_developer_as_array (int* result_length1); static void photo_row_finalize (PhotoRow * obj); gpointer database_table_ref (gpointer instance); void database_table_unref (gpointer instance); -GParamSpec* param_spec_database_table (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_database_table (GValue* value, gpointer v_object); -void value_take_database_table (GValue* value, gpointer v_object); +GParamSpec* param_spec_database_table (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_database_table (GValue* value, + gpointer v_object); +void value_take_database_table (GValue* value, + gpointer v_object); gpointer value_get_database_table (const GValue* value); GType database_table_get_type (void) G_GNUC_CONST; GType photo_table_get_type (void) G_GNUC_CONST; -enum { - PHOTO_TABLE_DUMMY_PROPERTY -}; static PhotoTable* photo_table_new (void); static PhotoTable* photo_table_construct (GType object_type); DatabaseTable* database_table_construct (GType object_type); -void database_table_fatal (const gchar* op, gint res); -void database_table_warning (const gchar* op, gint res); -void database_table_set_table_name (DatabaseTable* self, const gchar* table_name); +void database_table_fatal (const gchar* op, + gint res); +void database_table_warning (const gchar* op, + gint res); +void database_table_set_table_name (DatabaseTable* self, + const gchar* table_name); PhotoTable* photo_table_get_instance (void); -void photo_table_add (PhotoTable* self, PhotoRow* photo_row, PhotoID* result); +void photo_table_add (PhotoTable* self, + PhotoRow* photo_row, + PhotoID* result); gulong now_sec (void); GType photo_file_format_get_type (void) G_GNUC_CONST; GType dimensions_get_type (void) G_GNUC_CONST; @@ -365,104 +389,249 @@ void dimensions_free (Dimensions* self); gint photo_file_format_serialize (PhotoFileFormat self); gint rating_serialize (Rating self); gchar* raw_developer_to_string (RawDeveloper self); -void event_id_init (EventID *self, gint64 id); +void event_id_init (EventID *self, + gint64 id); GQuark database_error_quark (void); -void photo_table_reimport (PhotoTable* self, PhotoRow* row, GError** error); -void database_table_throw_error (const gchar* method, gint res, GError** error); -gboolean photo_table_master_exif_updated (PhotoTable* self, PhotoID* photoID, gint64 filesize, glong timestamp, const gchar* md5, const gchar* exif_md5, const gchar* thumbnail_md5, PhotoRow* row); -static void photo_table_validate_orientation (PhotoTable* self, PhotoRow* row); -gboolean photo_table_set_orientation (PhotoTable* self, PhotoID* photo_id, Orientation orientation); -PhotoRow* photo_table_get_row (PhotoTable* self, PhotoID* photo_id); -void dimensions_init (Dimensions *self, gint width, gint height); +void photo_table_reimport (PhotoTable* self, + PhotoRow* row, + GError** error); +void database_table_throw_error (const gchar* method, + gint res, + GError** error); +gboolean photo_table_master_exif_updated (PhotoTable* self, + PhotoID* photoID, + gint64 filesize, + glong timestamp, + const gchar* md5, + const gchar* exif_md5, + const gchar* thumbnail_md5, + PhotoRow* row); +static void photo_table_validate_orientation (PhotoTable* self, + PhotoRow* row); +gboolean photo_table_set_orientation (PhotoTable* self, + PhotoID* photo_id, + Orientation orientation); +PhotoRow* photo_table_get_row (PhotoTable* self, + PhotoID* photo_id); +void dimensions_init (Dimensions *self, + gint width, + gint height); GeeHashMap* photo_table_marshall_all_transformations (const gchar* trans); Rating rating_unserialize (gint value); PhotoFileFormat photo_file_format_unserialize (gint value); RawDeveloper raw_developer_from_string (const gchar* value); GeeArrayList* photo_table_get_all (PhotoTable* self); -void photo_table_duplicate (PhotoTable* self, PhotoID* photo_id, const gchar* new_filename, BackingPhotoID* editable_id, BackingPhotoID* develop_shotwell, BackingPhotoID* develop_camera_id, BackingPhotoID* develop_embedded_id, PhotoID* result); +void photo_table_duplicate (PhotoTable* self, + PhotoID* photo_id, + const gchar* new_filename, + BackingPhotoID* editable_id, + BackingPhotoID* develop_shotwell, + BackingPhotoID* develop_camera_id, + BackingPhotoID* develop_embedded_id, + PhotoID* result); gchar* photo_table_unmarshall_all_transformations (GeeHashMap* transformations); -gboolean photo_table_set_title (PhotoTable* self, PhotoID* photo_id, const gchar* new_title); -gboolean database_table_update_text_by_id (DatabaseTable* self, gint64 id, const gchar* column, const gchar* text); -gboolean photo_table_set_comment (PhotoTable* self, PhotoID* photo_id, const gchar* new_comment); -void photo_table_set_filepath (PhotoTable* self, PhotoID* photo_id, const gchar* filepath, GError** error); -void database_table_update_text_by_id_2 (DatabaseTable* self, gint64 id, const gchar* column, const gchar* text, GError** error); -void photo_table_update_timestamp (PhotoTable* self, PhotoID* photo_id, time_t timestamp, GError** error); -void database_table_update_int64_by_id_2 (DatabaseTable* self, gint64 id, const gchar* column, gint64 value, GError** error); -gboolean photo_table_set_exposure_time (PhotoTable* self, PhotoID* photo_id, time_t time); -gboolean database_table_update_int64_by_id (DatabaseTable* self, gint64 id, const gchar* column, gint64 value); -void photo_table_set_import_id (PhotoTable* self, PhotoID* photo_id, ImportID* import_id, GError** error); -gboolean photo_table_remove_by_file (PhotoTable* self, GFile* file); -void photo_table_remove (PhotoTable* self, PhotoID* photo_id, GError** error); -void database_table_delete_by_id (DatabaseTable* self, gint64 id, GError** error); +gboolean photo_table_set_title (PhotoTable* self, + PhotoID* photo_id, + const gchar* new_title); +gboolean database_table_update_text_by_id (DatabaseTable* self, + gint64 id, + const gchar* column, + const gchar* text); +gboolean photo_table_set_comment (PhotoTable* self, + PhotoID* photo_id, + const gchar* new_comment); +void photo_table_set_filepath (PhotoTable* self, + PhotoID* photo_id, + const gchar* filepath, + GError** error); +void database_table_update_text_by_id_2 (DatabaseTable* self, + gint64 id, + const gchar* column, + const gchar* text, + GError** error); +void photo_table_update_timestamp (PhotoTable* self, + PhotoID* photo_id, + time_t timestamp, + GError** error); +void database_table_update_int64_by_id_2 (DatabaseTable* self, + gint64 id, + const gchar* column, + gint64 value, + GError** error); +gboolean photo_table_set_exposure_time (PhotoTable* self, + PhotoID* photo_id, + time_t time); +gboolean database_table_update_int64_by_id (DatabaseTable* self, + gint64 id, + const gchar* column, + gint64 value); +void photo_table_set_import_id (PhotoTable* self, + PhotoID* photo_id, + ImportID* import_id, + GError** error); +gboolean photo_table_remove_by_file (PhotoTable* self, + GFile* file); +void photo_table_remove (PhotoTable* self, + PhotoID* photo_id, + GError** error); +void database_table_delete_by_id (DatabaseTable* self, + gint64 id, + GError** error); GeeArrayList* photo_table_get_photos (PhotoTable* self); -gboolean database_table_update_int_by_id (DatabaseTable* self, gint64 id, const gchar* column, gint value); -gboolean photo_table_replace_flags (PhotoTable* self, PhotoID* photo_id, guint64 flags); -gboolean photo_table_set_rating (PhotoTable* self, PhotoID* photo_id, Rating rating); -gint photo_table_get_event_photo_count (PhotoTable* self, EventID* event_id); -GeeArrayList* photo_table_get_event_source_ids (PhotoTable* self, EventID* event_id); -gboolean photo_table_event_has_photos (PhotoTable* self, EventID* event_id); -gboolean photo_table_drop_event (PhotoTable* self, EventID* event_id); -gboolean photo_table_set_event (PhotoTable* self, PhotoID* photo_id, EventID* event_id); -static gchar* photo_table_get_raw_transformations (PhotoTable* self, PhotoID* photo_id); -gboolean database_table_select_by_id (DatabaseTable* self, gint64 id, const gchar* columns, sqlite3_stmt* * stmt); -static gboolean photo_table_set_raw_transformations (PhotoTable* self, PhotoID* photo_id, const gchar* trans); -gboolean photo_table_set_transformation_state (PhotoTable* self, PhotoID* photo_id, Orientation orientation, GeeHashMap* transformations); -gboolean photo_table_set_transformation (PhotoTable* self, PhotoID* photo_id, KeyValueMap* map); -gboolean photo_table_remove_transformation (PhotoTable* self, PhotoID* photo_id, const gchar* object); -gboolean photo_table_remove_all_transformations (PhotoTable* self, PhotoID* photo_id); -static sqlite3_stmt* photo_table_get_duplicate_stmt (PhotoTable* self, GFile* file, const gchar* thumbnail_md5, const gchar* md5, PhotoFileFormat file_format); -gboolean photo_table_has_duplicate (PhotoTable* self, GFile* file, const gchar* thumbnail_md5, const gchar* md5, PhotoFileFormat file_format); -PhotoID* photo_table_get_duplicate_ids (PhotoTable* self, GFile* file, const gchar* thumbnail_md5, const gchar* md5, PhotoFileFormat file_format, int* result_length1); -static void _vala_array_add2 (PhotoID* * array, int* length, int* size, const PhotoID* value); -void photo_table_update_backlinks (PhotoTable* self, PhotoID* photo_id, const gchar* backlinks, GError** error); -void photo_table_attach_editable (PhotoTable* self, PhotoRow* row, BackingPhotoID* editable_id, GError** error); -void photo_table_detach_editable (PhotoTable* self, PhotoRow* row, GError** error); -void photo_table_set_metadata_dirty (PhotoTable* self, PhotoID* photo_id, gboolean dirty, GError** error); -void database_table_update_int_by_id_2 (DatabaseTable* self, gint64 id, const gchar* column, gint value, GError** error); -void photo_table_update_raw_development (PhotoTable* self, PhotoRow* row, RawDeveloper rd, BackingPhotoID* backing_photo_id, GError** error); -void photo_table_remove_development (PhotoTable* self, PhotoRow* row, RawDeveloper rd, GError** error); +gboolean database_table_update_int_by_id (DatabaseTable* self, + gint64 id, + const gchar* column, + gint value); +gboolean photo_table_replace_flags (PhotoTable* self, + PhotoID* photo_id, + guint64 flags); +gboolean photo_table_set_rating (PhotoTable* self, + PhotoID* photo_id, + Rating rating); +gint photo_table_get_event_photo_count (PhotoTable* self, + EventID* event_id); +GeeArrayList* photo_table_get_event_source_ids (PhotoTable* self, + EventID* event_id); +gboolean photo_table_event_has_photos (PhotoTable* self, + EventID* event_id); +gboolean photo_table_drop_event (PhotoTable* self, + EventID* event_id); +gboolean photo_table_set_event (PhotoTable* self, + PhotoID* photo_id, + EventID* event_id); +static gchar* photo_table_get_raw_transformations (PhotoTable* self, + PhotoID* photo_id); +gboolean database_table_select_by_id (DatabaseTable* self, + gint64 id, + const gchar* columns, + sqlite3_stmt* * stmt); +static gboolean photo_table_set_raw_transformations (PhotoTable* self, + PhotoID* photo_id, + const gchar* trans); +gboolean photo_table_set_transformation_state (PhotoTable* self, + PhotoID* photo_id, + Orientation orientation, + GeeHashMap* transformations); +gboolean photo_table_set_transformation (PhotoTable* self, + PhotoID* photo_id, + KeyValueMap* map); +gboolean photo_table_remove_transformation (PhotoTable* self, + PhotoID* photo_id, + const gchar* object); +gboolean photo_table_remove_all_transformations (PhotoTable* self, + PhotoID* photo_id); +static sqlite3_stmt* photo_table_get_duplicate_stmt (PhotoTable* self, + GFile* file, + const gchar* thumbnail_md5, + const gchar* md5, + PhotoFileFormat file_format); +gboolean photo_table_has_duplicate (PhotoTable* self, + GFile* file, + const gchar* thumbnail_md5, + const gchar* md5, + PhotoFileFormat file_format); +PhotoID* photo_table_get_duplicate_ids (PhotoTable* self, + GFile* file, + const gchar* thumbnail_md5, + const gchar* md5, + PhotoFileFormat file_format, + int* result_length1); +static void _vala_array_add2 (PhotoID* * array, + int* length, + int* size, + const PhotoID* value); +void photo_table_update_backlinks (PhotoTable* self, + PhotoID* photo_id, + const gchar* backlinks, + GError** error); +void photo_table_attach_editable (PhotoTable* self, + PhotoRow* row, + BackingPhotoID* editable_id, + GError** error); +void photo_table_detach_editable (PhotoTable* self, + PhotoRow* row, + GError** error); +void photo_table_set_metadata_dirty (PhotoTable* self, + PhotoID* photo_id, + gboolean dirty, + GError** error); +void database_table_update_int_by_id_2 (DatabaseTable* self, + gint64 id, + const gchar* column, + gint value, + GError** error); +void photo_table_update_raw_development (PhotoTable* self, + PhotoRow* row, + RawDeveloper rd, + BackingPhotoID* backing_photo_id, + GError** error); +void photo_table_remove_development (PhotoTable* self, + PhotoRow* row, + RawDeveloper rd, + GError** error); static void photo_table_finalize (DatabaseTable * obj); gboolean backing_photo_id_is_invalid (BackingPhotoID *self); gboolean backing_photo_id_is_valid (BackingPhotoID *self); -enum { - BACKING_PHOTO_ROW_DUMMY_PROPERTY -}; -gboolean backing_photo_row_matches_file_info (BackingPhotoRow* self, GFileInfo* info); -gboolean backing_photo_row_is_touched (BackingPhotoRow* self, GFileInfo* info); -void backing_photo_row_copy_from (BackingPhotoRow* self, BackingPhotoRow* from); +gboolean backing_photo_row_matches_file_info (BackingPhotoRow* self, + GFileInfo* info); +gboolean backing_photo_row_is_touched (BackingPhotoRow* self, + GFileInfo* info); +void backing_photo_row_copy_from (BackingPhotoRow* self, + BackingPhotoRow* from); static void backing_photo_row_finalize (BackingPhotoRow * obj); GType backing_photo_table_get_type (void) G_GNUC_CONST; -enum { - BACKING_PHOTO_TABLE_DUMMY_PROPERTY -}; static BackingPhotoTable* backing_photo_table_new (void); static BackingPhotoTable* backing_photo_table_construct (GType object_type); BackingPhotoTable* backing_photo_table_get_instance (void); -void backing_photo_table_add (BackingPhotoTable* self, BackingPhotoRow* state, GError** error); -BackingPhotoRow* backing_photo_table_fetch (BackingPhotoTable* self, BackingPhotoID* id, GError** error); -void backing_photo_table_update (BackingPhotoTable* self, BackingPhotoRow* row, GError** error); -void backing_photo_table_update_attributes (BackingPhotoTable* self, BackingPhotoID* id, time_t timestamp, gint64 filesize, GError** error); -void backing_photo_table_remove (BackingPhotoTable* self, BackingPhotoID* backing_id, GError** error); -void backing_photo_table_set_filepath (BackingPhotoTable* self, BackingPhotoID* id, const gchar* filepath, GError** error); -void backing_photo_table_update_timestamp (BackingPhotoTable* self, BackingPhotoID* id, time_t timestamp, GError** error); +void backing_photo_table_add (BackingPhotoTable* self, + BackingPhotoRow* state, + GError** error); +BackingPhotoRow* backing_photo_table_fetch (BackingPhotoTable* self, + BackingPhotoID* id, + GError** error); +void backing_photo_table_update (BackingPhotoTable* self, + BackingPhotoRow* row, + GError** error); +void backing_photo_table_update_attributes (BackingPhotoTable* self, + BackingPhotoID* id, + time_t timestamp, + gint64 filesize, + GError** error); +void backing_photo_table_remove (BackingPhotoTable* self, + BackingPhotoID* backing_id, + GError** error); +void backing_photo_table_set_filepath (BackingPhotoTable* self, + BackingPhotoID* id, + const gchar* filepath, + GError** error); +void backing_photo_table_update_timestamp (BackingPhotoTable* self, + BackingPhotoID* id, + time_t timestamp, + GError** error); static void backing_photo_table_finalize (DatabaseTable * obj); -static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func); -static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func); - - -void photo_id_init (PhotoID *self, gint64 id) { - gint64 _tmp0_; +static void _vala_array_destroy (gpointer array, + gint array_length, + GDestroyNotify destroy_func); +static void _vala_array_free (gpointer array, + gint array_length, + GDestroyNotify destroy_func); + + +void +photo_id_init (PhotoID *self, + gint64 id) +{ #line 12 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" memset (self, 0, sizeof (PhotoID)); #line 13 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp0_ = id; -#line 13 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - (*self).id = _tmp0_; -#line 462 "PhotoTable.c" + (*self).id = id; +#line 629 "PhotoTable.c" } -gboolean photo_id_is_invalid (PhotoID *self) { +gboolean +photo_id_is_invalid (PhotoID *self) +{ gboolean result = FALSE; gint64 _tmp0_; #line 17 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -471,11 +640,13 @@ gboolean photo_id_is_invalid (PhotoID *self) { result = _tmp0_ == PHOTO_ID_INVALID; #line 17 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 475 "PhotoTable.c" +#line 644 "PhotoTable.c" } -gboolean photo_id_is_valid (PhotoID *self) { +gboolean +photo_id_is_valid (PhotoID *self) +{ gboolean result = FALSE; gint64 _tmp0_; #line 21 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -484,49 +655,47 @@ gboolean photo_id_is_valid (PhotoID *self) { result = _tmp0_ != PHOTO_ID_INVALID; #line 21 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 488 "PhotoTable.c" +#line 659 "PhotoTable.c" } -guint photo_id_hash (PhotoID *self) { +guint +photo_id_hash (PhotoID *self) +{ guint result = 0U; gint64 _tmp0_; - guint _tmp1_; #line 25 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp0_ = (*self).id; #line 25 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp1_ = int64_hash (&_tmp0_); -#line 25 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - result = _tmp1_; + result = int64_hash (&_tmp0_); #line 25 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 504 "PhotoTable.c" +#line 674 "PhotoTable.c" } -gboolean photo_id_equal (void* a, void* b) { +gboolean +photo_id_equal (void* a, + void* b) +{ gboolean result = FALSE; - void* _tmp0_; + gint64 _tmp0_; gint64 _tmp1_; - void* _tmp2_; - gint64 _tmp3_; #line 29 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp0_ = a; + _tmp0_ = (*((PhotoID*) a)).id; #line 29 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp1_ = (*((PhotoID*) _tmp0_)).id; + _tmp1_ = (*((PhotoID*) b)).id; #line 29 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp2_ = b; -#line 29 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp3_ = (*((PhotoID*) _tmp2_)).id; -#line 29 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - result = _tmp1_ == _tmp3_; + result = _tmp0_ == _tmp1_; #line 29 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 526 "PhotoTable.c" +#line 693 "PhotoTable.c" } -gchar* photo_id_upgrade_photo_id_to_source_id (PhotoID* photo_id) { +gchar* +photo_id_upgrade_photo_id_to_source_id (PhotoID* photo_id) +{ gchar* result = NULL; PhotoID _tmp0_; gint64 _tmp1_; @@ -543,11 +712,13 @@ gchar* photo_id_upgrade_photo_id_to_source_id (PhotoID* photo_id) { result = _tmp2_; #line 33 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 547 "PhotoTable.c" +#line 716 "PhotoTable.c" } -PhotoID* photo_id_dup (const PhotoID* self) { +PhotoID* +photo_id_dup (const PhotoID* self) +{ PhotoID* dup; #line 7 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" dup = g_new0 (PhotoID, 1); @@ -555,18 +726,22 @@ PhotoID* photo_id_dup (const PhotoID* self) { memcpy (dup, self, sizeof (PhotoID)); #line 7 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return dup; -#line 559 "PhotoTable.c" +#line 730 "PhotoTable.c" } -void photo_id_free (PhotoID* self) { +void +photo_id_free (PhotoID* self) +{ #line 7 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_free (self); -#line 566 "PhotoTable.c" +#line 739 "PhotoTable.c" } -GType photo_id_get_type (void) { +GType +photo_id_get_type (void) +{ static volatile gsize photo_id_type_id__volatile = 0; if (g_once_init_enter (&photo_id_type_id__volatile)) { GType photo_id_type_id; @@ -577,19 +752,21 @@ GType photo_id_get_type (void) { } -void import_id_init (ImportID *self, gint64 id) { - gint64 _tmp0_; +void +import_id_init (ImportID *self, + gint64 id) +{ #line 42 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" memset (self, 0, sizeof (ImportID)); #line 43 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp0_ = id; -#line 43 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - (*self).id = _tmp0_; -#line 589 "PhotoTable.c" + (*self).id = id; +#line 764 "PhotoTable.c" } -void import_id_generate (ImportID* result) { +void +import_id_generate (ImportID* result) +{ GTimeVal timestamp = {0}; gint64 id = 0LL; GTimeVal _tmp0_; @@ -611,11 +788,13 @@ void import_id_generate (ImportID* result) { *result = _tmp2_; #line 51 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; -#line 615 "PhotoTable.c" +#line 792 "PhotoTable.c" } -gboolean import_id_is_invalid (ImportID *self) { +gboolean +import_id_is_invalid (ImportID *self) +{ gboolean result = FALSE; gint64 _tmp0_; #line 55 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -624,11 +803,13 @@ gboolean import_id_is_invalid (ImportID *self) { result = _tmp0_ == IMPORT_ID_INVALID; #line 55 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 628 "PhotoTable.c" +#line 807 "PhotoTable.c" } -gboolean import_id_is_valid (ImportID *self) { +gboolean +import_id_is_valid (ImportID *self) +{ gboolean result = FALSE; gint64 _tmp0_; #line 59 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -637,75 +818,64 @@ gboolean import_id_is_valid (ImportID *self) { result = _tmp0_ != IMPORT_ID_INVALID; #line 59 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 641 "PhotoTable.c" +#line 822 "PhotoTable.c" } -gint import_id_compare_func (ImportID* a, ImportID* b) { +gint +import_id_compare_func (ImportID* a, + ImportID* b) +{ gint result = 0; gboolean _tmp0_ = FALSE; - ImportID* _tmp1_; - ImportID* _tmp3_; - gint64 _tmp4_; - ImportID* _tmp5_; - gint64 _tmp6_; -#line 63 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp1_ = a; -#line 63 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp1_ != NULL) { -#line 657 "PhotoTable.c" - ImportID* _tmp2_; + gint64 _tmp1_; + gint64 _tmp2_; #line 63 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp2_ = b; + if (a != NULL) { #line 63 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp0_ = _tmp2_ != NULL; -#line 663 "PhotoTable.c" + _tmp0_ = b != NULL; +#line 838 "PhotoTable.c" } else { #line 63 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp0_ = FALSE; -#line 667 "PhotoTable.c" +#line 842 "PhotoTable.c" } #line 63 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _vala_assert (_tmp0_, "a != null && b != null"); #line 64 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp3_ = a; + _tmp1_ = (*a).id; #line 64 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp4_ = (*_tmp3_).id; + _tmp2_ = (*b).id; #line 64 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp5_ = b; -#line 64 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp6_ = (*_tmp5_).id; -#line 64 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - result = (gint) (_tmp4_ - _tmp6_); + result = (gint) (_tmp1_ - _tmp2_); #line 64 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 683 "PhotoTable.c" +#line 854 "PhotoTable.c" } -gint64 import_id_comparator (void* a, void* b) { +gint64 +import_id_comparator (void* a, + void* b) +{ gint64 result = 0LL; - void* _tmp0_; + gint64 _tmp0_; gint64 _tmp1_; - void* _tmp2_; - gint64 _tmp3_; -#line 68 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp0_ = a; -#line 68 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp1_ = (*((ImportID*) _tmp0_)).id; #line 68 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp2_ = b; + _tmp0_ = (*((ImportID*) a)).id; #line 68 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp3_ = (*((ImportID*) _tmp2_)).id; + _tmp1_ = (*((ImportID*) b)).id; #line 68 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - result = _tmp1_ - _tmp3_; + result = _tmp0_ - _tmp1_; #line 68 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 705 "PhotoTable.c" +#line 873 "PhotoTable.c" } -ImportID* import_id_dup (const ImportID* self) { +ImportID* +import_id_dup (const ImportID* self) +{ ImportID* dup; #line 37 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" dup = g_new0 (ImportID, 1); @@ -713,18 +883,22 @@ ImportID* import_id_dup (const ImportID* self) { memcpy (dup, self, sizeof (ImportID)); #line 37 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return dup; -#line 717 "PhotoTable.c" +#line 887 "PhotoTable.c" } -void import_id_free (ImportID* self) { +void +import_id_free (ImportID* self) +{ #line 37 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_free (self); -#line 724 "PhotoTable.c" +#line 896 "PhotoTable.c" } -GType import_id_get_type (void) { +GType +import_id_get_type (void) +{ static volatile gsize import_id_type_id__volatile = 0; if (g_once_init_enter (&import_id_type_id__volatile)) { GType import_id_type_id; @@ -735,7 +909,9 @@ GType import_id_get_type (void) { } -PhotoRow* photo_row_construct (GType object_type) { +PhotoRow* +photo_row_construct (GType object_type) +{ PhotoRow* self = NULL; BackingPhotoRow* _tmp0_; gint _tmp1_; @@ -773,7 +949,7 @@ PhotoRow* photo_row_construct (GType object_type) { _tmp3_ = (g_free (_tmp3_), NULL); #line 104 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp6_ = raw_developer_as_array (&_tmp5_); -#line 777 "PhotoTable.c" +#line 953 "PhotoTable.c" { RawDeveloper* d_collection = NULL; gint d_collection_length1 = 0; @@ -785,11 +961,11 @@ PhotoRow* photo_row_construct (GType object_type) { d_collection_length1 = _tmp5_; #line 104 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" for (d_it = 0; d_it < _tmp5_; d_it = d_it + 1) { -#line 789 "PhotoTable.c" +#line 965 "PhotoTable.c" RawDeveloper d = 0; #line 104 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" d = d_collection[d_it]; -#line 793 "PhotoTable.c" +#line 969 "PhotoTable.c" { BackingPhotoID* _tmp7_; gint _tmp7__length1; @@ -808,124 +984,151 @@ PhotoRow* photo_row_construct (GType object_type) { _tmp7_[_tmp8_] = _tmp9_; #line 105 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp10_ = _tmp7_[_tmp8_]; -#line 812 "PhotoTable.c" +#line 988 "PhotoTable.c" } } #line 104 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" d_collection = (g_free (d_collection), NULL); -#line 817 "PhotoTable.c" +#line 993 "PhotoTable.c" } #line 100 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return self; -#line 821 "PhotoTable.c" +#line 997 "PhotoTable.c" } -PhotoRow* photo_row_new (void) { +PhotoRow* +photo_row_new (void) +{ #line 100 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return photo_row_construct (TYPE_PHOTO_ROW); -#line 828 "PhotoTable.c" +#line 1006 "PhotoTable.c" } -static void value_photo_row_init (GValue* value) { +static void +value_photo_row_init (GValue* value) +{ #line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" value->data[0].v_pointer = NULL; -#line 835 "PhotoTable.c" +#line 1015 "PhotoTable.c" } -static void value_photo_row_free_value (GValue* value) { +static void +value_photo_row_free_value (GValue* value) +{ #line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (value->data[0].v_pointer) { #line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" photo_row_unref (value->data[0].v_pointer); -#line 844 "PhotoTable.c" +#line 1026 "PhotoTable.c" } } -static void value_photo_row_copy_value (const GValue* src_value, GValue* dest_value) { +static void +value_photo_row_copy_value (const GValue* src_value, + GValue* dest_value) +{ #line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (src_value->data[0].v_pointer) { #line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" dest_value->data[0].v_pointer = photo_row_ref (src_value->data[0].v_pointer); -#line 854 "PhotoTable.c" +#line 1039 "PhotoTable.c" } else { #line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" dest_value->data[0].v_pointer = NULL; -#line 858 "PhotoTable.c" +#line 1043 "PhotoTable.c" } } -static gpointer value_photo_row_peek_pointer (const GValue* value) { +static gpointer +value_photo_row_peek_pointer (const GValue* value) +{ #line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return value->data[0].v_pointer; -#line 866 "PhotoTable.c" +#line 1053 "PhotoTable.c" } -static gchar* value_photo_row_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_photo_row_collect_value (GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ #line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (collect_values[0].v_pointer) { -#line 873 "PhotoTable.c" +#line 1065 "PhotoTable.c" PhotoRow * object; object = collect_values[0].v_pointer; #line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (object->parent_instance.g_class == NULL) { #line 72 "/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 880 "PhotoTable.c" +#line 1072 "PhotoTable.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 72 "/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 884 "PhotoTable.c" +#line 1076 "PhotoTable.c" } #line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" value->data[0].v_pointer = photo_row_ref (object); -#line 888 "PhotoTable.c" +#line 1080 "PhotoTable.c" } else { #line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" value->data[0].v_pointer = NULL; -#line 892 "PhotoTable.c" +#line 1084 "PhotoTable.c" } #line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return NULL; -#line 896 "PhotoTable.c" +#line 1088 "PhotoTable.c" } -static gchar* value_photo_row_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_photo_row_lcopy_value (const GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ PhotoRow ** object_p; object_p = collect_values[0].v_pointer; #line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (!object_p) { #line 72 "/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 907 "PhotoTable.c" +#line 1104 "PhotoTable.c" } #line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (!value->data[0].v_pointer) { #line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" *object_p = NULL; -#line 913 "PhotoTable.c" +#line 1110 "PhotoTable.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" *object_p = value->data[0].v_pointer; -#line 917 "PhotoTable.c" +#line 1114 "PhotoTable.c" } else { #line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" *object_p = photo_row_ref (value->data[0].v_pointer); -#line 921 "PhotoTable.c" +#line 1118 "PhotoTable.c" } #line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return NULL; -#line 925 "PhotoTable.c" +#line 1122 "PhotoTable.c" } -GParamSpec* param_spec_photo_row (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { +GParamSpec* +param_spec_photo_row (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) +{ ParamSpecPhotoRow* spec; #line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_val_if_fail (g_type_is_a (object_type, TYPE_PHOTO_ROW), NULL); @@ -935,20 +1138,25 @@ GParamSpec* param_spec_photo_row (const gchar* name, const gchar* nick, const gc G_PARAM_SPEC (spec)->value_type = object_type; #line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return G_PARAM_SPEC (spec); -#line 939 "PhotoTable.c" +#line 1142 "PhotoTable.c" } -gpointer value_get_photo_row (const GValue* value) { +gpointer +value_get_photo_row (const GValue* value) +{ #line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PHOTO_ROW), NULL); #line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return value->data[0].v_pointer; -#line 948 "PhotoTable.c" +#line 1153 "PhotoTable.c" } -void value_set_photo_row (GValue* value, gpointer v_object) { +void +value_set_photo_row (GValue* value, + gpointer v_object) +{ PhotoRow * old; #line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PHOTO_ROW)); @@ -964,22 +1172,25 @@ void value_set_photo_row (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" photo_row_ref (value->data[0].v_pointer); -#line 968 "PhotoTable.c" +#line 1176 "PhotoTable.c" } else { #line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" value->data[0].v_pointer = NULL; -#line 972 "PhotoTable.c" +#line 1180 "PhotoTable.c" } #line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (old) { #line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" photo_row_unref (old); -#line 978 "PhotoTable.c" +#line 1186 "PhotoTable.c" } } -void value_take_photo_row (GValue* value, gpointer v_object) { +void +value_take_photo_row (GValue* value, + gpointer v_object) +{ PhotoRow * old; #line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PHOTO_ROW)); @@ -993,38 +1204,44 @@ void value_take_photo_row (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" value->data[0].v_pointer = v_object; -#line 997 "PhotoTable.c" +#line 1208 "PhotoTable.c" } else { #line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" value->data[0].v_pointer = NULL; -#line 1001 "PhotoTable.c" +#line 1212 "PhotoTable.c" } #line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (old) { #line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" photo_row_unref (old); -#line 1007 "PhotoTable.c" +#line 1218 "PhotoTable.c" } } -static void photo_row_class_init (PhotoRowClass * klass) { +static void +photo_row_class_init (PhotoRowClass * klass) +{ #line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" photo_row_parent_class = g_type_class_peek_parent (klass); #line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" ((PhotoRowClass *) klass)->finalize = photo_row_finalize; -#line 1017 "PhotoTable.c" +#line 1230 "PhotoTable.c" } -static void photo_row_instance_init (PhotoRow * self) { +static void +photo_row_instance_init (PhotoRow * self) +{ #line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" self->ref_count = 1; -#line 1024 "PhotoTable.c" +#line 1239 "PhotoTable.c" } -static void photo_row_finalize (PhotoRow * obj) { +static void +photo_row_finalize (PhotoRow * obj) +{ PhotoRow * self; #line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PHOTO_ROW, PhotoRow); @@ -1048,11 +1265,13 @@ static void photo_row_finalize (PhotoRow * obj) { _g_free0 (self->backlinks); #line 97 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" self->development_ids = (g_free (self->development_ids), NULL); -#line 1052 "PhotoTable.c" +#line 1269 "PhotoTable.c" } -GType photo_row_get_type (void) { +GType +photo_row_get_type (void) +{ static volatile gsize photo_row_type_id__volatile = 0; if (g_once_init_enter (&photo_row_type_id__volatile)) { static const GTypeValueTable g_define_type_value_table = { value_photo_row_init, value_photo_row_free_value, value_photo_row_copy_value, value_photo_row_peek_pointer, "p", value_photo_row_collect_value, "p", value_photo_row_lcopy_value }; @@ -1066,18 +1285,22 @@ GType photo_row_get_type (void) { } -gpointer photo_row_ref (gpointer instance) { +gpointer +photo_row_ref (gpointer instance) +{ PhotoRow * self; self = instance; #line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_atomic_int_inc (&self->ref_count); #line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return instance; -#line 1077 "PhotoTable.c" +#line 1298 "PhotoTable.c" } -void photo_row_unref (gpointer instance) { +void +photo_row_unref (gpointer instance) +{ PhotoRow * self; self = instance; #line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -1086,12 +1309,14 @@ void photo_row_unref (gpointer instance) { PHOTO_ROW_GET_CLASS (self)->finalize (self); #line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_type_free_instance ((GTypeInstance *) self); -#line 1090 "PhotoTable.c" +#line 1313 "PhotoTable.c" } } -static PhotoTable* photo_table_construct (GType object_type) { +static PhotoTable* +photo_table_construct (GType object_type) +{ PhotoTable* self = NULL; sqlite3_stmt* stmt = NULL; gint res = 0; @@ -1101,44 +1326,38 @@ static PhotoTable* photo_table_construct (GType object_type) { gint _tmp3_; sqlite3_stmt* _tmp4_; gint _tmp5_; - gint _tmp6_; sqlite3_stmt* stmt2 = NULL; gint res2 = 0; - sqlite3* _tmp8_; - sqlite3_stmt* _tmp9_ = NULL; + sqlite3* _tmp7_; + sqlite3_stmt* _tmp8_ = NULL; + gint _tmp9_; gint _tmp10_; - gint _tmp11_; - sqlite3_stmt* _tmp12_; - gint _tmp13_; - gint _tmp14_; - sqlite3* _tmp16_; - sqlite3_stmt* _tmp17_ = NULL; - gint _tmp18_; + sqlite3_stmt* _tmp11_; + gint _tmp12_; + sqlite3* _tmp14_; + sqlite3_stmt* _tmp15_ = NULL; + gint _tmp16_; + gint _tmp17_; + sqlite3_stmt* _tmp18_; gint _tmp19_; - sqlite3_stmt* _tmp20_; - gint _tmp21_; - gint _tmp22_; - sqlite3* _tmp24_; - sqlite3_stmt* _tmp25_ = NULL; + sqlite3* _tmp21_; + sqlite3_stmt* _tmp22_ = NULL; + gint _tmp23_; + gint _tmp24_; + sqlite3_stmt* _tmp25_; gint _tmp26_; - gint _tmp27_; - sqlite3_stmt* _tmp28_; - gint _tmp29_; + sqlite3* _tmp28_; + sqlite3_stmt* _tmp29_ = NULL; gint _tmp30_; - sqlite3* _tmp32_; - sqlite3_stmt* _tmp33_ = NULL; - gint _tmp34_; - gint _tmp35_; - sqlite3_stmt* _tmp36_; + gint _tmp31_; + sqlite3_stmt* _tmp32_; + gint _tmp33_; + sqlite3* _tmp35_; + sqlite3_stmt* _tmp36_ = NULL; gint _tmp37_; gint _tmp38_; - sqlite3* _tmp40_; - sqlite3_stmt* _tmp41_ = NULL; - gint _tmp42_; - gint _tmp43_; - sqlite3_stmt* _tmp44_; - gint _tmp45_; - gint _tmp46_; + sqlite3_stmt* _tmp39_; + gint _tmp40_; #line 112 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" self = (PhotoTable*) database_table_construct (object_type); #line 114 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -1158,183 +1377,171 @@ static PhotoTable* photo_table_construct (GType object_type) { #line 147 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp4_ = stmt; #line 147 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp5_ = sqlite3_step (_tmp4_); -#line 147 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp5_; + res = sqlite3_step (_tmp4_); #line 148 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp6_ = res; + _tmp5_ = res; #line 148 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp6_ != SQLITE_DONE) { -#line 1169 "PhotoTable.c" - gint _tmp7_; + if (_tmp5_ != SQLITE_DONE) { +#line 1386 "PhotoTable.c" + gint _tmp6_; #line 149 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp7_ = res; + _tmp6_ = res; #line 149 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - database_table_fatal ("create photo table", _tmp7_); -#line 1175 "PhotoTable.c" + database_table_fatal ("create photo table", _tmp6_); +#line 1392 "PhotoTable.c" } #line 153 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp8_ = database_table_db; + _tmp7_ = database_table_db; #line 153 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp10_ = sqlite3_prepare_v2 (_tmp8_, "CREATE INDEX IF NOT EXISTS PhotoEventIDIndex ON PhotoTable (event_id)", -1, &_tmp9_, NULL); + _tmp9_ = sqlite3_prepare_v2 (_tmp7_, "CREATE INDEX IF NOT EXISTS PhotoEventIDIndex ON PhotoTable (event_id)", -1, &_tmp8_, NULL); #line 153 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _sqlite3_finalize0 (stmt2); #line 153 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - stmt2 = _tmp9_; + stmt2 = _tmp8_; #line 153 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res2 = _tmp10_; + res2 = _tmp9_; #line 155 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp11_ = res2; + _tmp10_ = res2; #line 155 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp11_ == SQLITE_OK, "res2 == Sqlite.OK"); -#line 157 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp12_ = stmt2; + _vala_assert (_tmp10_ == SQLITE_OK, "res2 == Sqlite.OK"); #line 157 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp13_ = sqlite3_step (_tmp12_); + _tmp11_ = stmt2; #line 157 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res2 = _tmp13_; + res2 = sqlite3_step (_tmp11_); #line 158 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp14_ = res2; + _tmp12_ = res2; #line 158 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp14_ != SQLITE_DONE) { -#line 1201 "PhotoTable.c" - gint _tmp15_; + if (_tmp12_ != SQLITE_DONE) { +#line 1416 "PhotoTable.c" + gint _tmp13_; #line 159 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp15_ = res2; + _tmp13_ = res2; #line 159 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - database_table_fatal ("create photo table", _tmp15_); -#line 1207 "PhotoTable.c" + database_table_fatal ("create photo table", _tmp13_); +#line 1422 "PhotoTable.c" } #line 165 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp16_ = database_table_db; + _tmp14_ = database_table_db; #line 165 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp18_ = sqlite3_prepare_v2 (_tmp16_, "DROP INDEX IF EXISTS PhotoTableMD5Format", -1, &_tmp17_, NULL); + _tmp16_ = sqlite3_prepare_v2 (_tmp14_, "DROP INDEX IF EXISTS PhotoTableMD5Format", -1, &_tmp15_, NULL); #line 165 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _sqlite3_finalize0 (stmt); #line 165 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - stmt = _tmp17_; + stmt = _tmp15_; #line 165 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp18_; + res = _tmp16_; #line 166 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp19_ = res; + _tmp17_ = res; #line 166 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp19_ == SQLITE_OK, "res == Sqlite.OK"); -#line 167 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp20_ = stmt; + _vala_assert (_tmp17_ == SQLITE_OK, "res == Sqlite.OK"); #line 167 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp21_ = sqlite3_step (_tmp20_); + _tmp18_ = stmt; #line 167 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp21_; + res = sqlite3_step (_tmp18_); #line 168 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp22_ = res; + _tmp19_ = res; #line 168 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp22_ != SQLITE_DONE) { -#line 1233 "PhotoTable.c" - gint _tmp23_; + if (_tmp19_ != SQLITE_DONE) { +#line 1446 "PhotoTable.c" + gint _tmp20_; #line 169 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp23_ = res; + _tmp20_ = res; #line 169 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - database_table_warning ("Failed to drop old PhotoTable index", _tmp23_); -#line 1239 "PhotoTable.c" + database_table_warning ("Failed to drop old PhotoTable index", _tmp20_); +#line 1452 "PhotoTable.c" } #line 172 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp24_ = database_table_db; + _tmp21_ = database_table_db; #line 172 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp26_ = sqlite3_prepare_v2 (_tmp24_, "CREATE INDEX IF NOT EXISTS PhotoTableMD5FormatV2 on PhotoTable(md5, fi" \ -"le_format)", -1, &_tmp25_, NULL); + _tmp23_ = sqlite3_prepare_v2 (_tmp21_, "CREATE INDEX IF NOT EXISTS PhotoTableMD5FormatV2 on PhotoTable(md5, fi" \ +"le_format)", -1, &_tmp22_, NULL); #line 172 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _sqlite3_finalize0 (stmt); #line 172 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - stmt = _tmp25_; + stmt = _tmp22_; #line 172 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp26_; + res = _tmp23_; #line 173 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp27_ = res; + _tmp24_ = res; #line 173 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp27_ == SQLITE_OK, "res == Sqlite.OK"); -#line 174 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp28_ = stmt; + _vala_assert (_tmp24_ == SQLITE_OK, "res == Sqlite.OK"); #line 174 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp29_ = sqlite3_step (_tmp28_); + _tmp25_ = stmt; #line 174 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp29_; + res = sqlite3_step (_tmp25_); #line 175 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp30_ = res; + _tmp26_ = res; #line 175 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp30_ != SQLITE_DONE) { -#line 1265 "PhotoTable.c" - gint _tmp31_; + if (_tmp26_ != SQLITE_DONE) { +#line 1476 "PhotoTable.c" + gint _tmp27_; #line 176 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp31_ = res; + _tmp27_ = res; #line 176 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - database_table_warning ("Failed to create index on md5 and file_format", _tmp31_); -#line 1271 "PhotoTable.c" + database_table_warning ("Failed to create index on md5 and file_format", _tmp27_); +#line 1482 "PhotoTable.c" } #line 180 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp32_ = database_table_db; + _tmp28_ = database_table_db; #line 180 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp34_ = sqlite3_prepare_v2 (_tmp32_, "CREATE INDEX IF NOT EXISTS PhotoTableThumbnailMD5Format on PhotoTable(" \ -"thumbnail_md5, file_format)", -1, &_tmp33_, NULL); + _tmp30_ = sqlite3_prepare_v2 (_tmp28_, "CREATE INDEX IF NOT EXISTS PhotoTableThumbnailMD5Format on PhotoTable(" \ +"thumbnail_md5, file_format)", -1, &_tmp29_, NULL); #line 180 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _sqlite3_finalize0 (stmt); #line 180 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - stmt = _tmp33_; + stmt = _tmp29_; #line 180 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp34_; + res = _tmp30_; #line 181 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp35_ = res; + _tmp31_ = res; #line 181 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp35_ == SQLITE_OK, "res == Sqlite.OK"); -#line 182 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp36_ = stmt; + _vala_assert (_tmp31_ == SQLITE_OK, "res == Sqlite.OK"); #line 182 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp37_ = sqlite3_step (_tmp36_); + _tmp32_ = stmt; #line 182 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp37_; + res = sqlite3_step (_tmp32_); #line 183 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp38_ = res; + _tmp33_ = res; #line 183 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp38_ != SQLITE_DONE) { -#line 1297 "PhotoTable.c" - gint _tmp39_; + if (_tmp33_ != SQLITE_DONE) { +#line 1506 "PhotoTable.c" + gint _tmp34_; #line 184 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp39_ = res; + _tmp34_ = res; #line 184 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - database_table_warning ("Failed to create index on md5 and file_format", _tmp39_); -#line 1303 "PhotoTable.c" + database_table_warning ("Failed to create index on md5 and file_format", _tmp34_); +#line 1512 "PhotoTable.c" } #line 188 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp40_ = database_table_db; + _tmp35_ = database_table_db; #line 188 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp42_ = sqlite3_prepare_v2 (_tmp40_, "CREATE INDEX IF NOT EXISTS PhotoTableThumbnailMD5MD5 on PhotoTable(thu" \ -"mbnail_md5, md5)", -1, &_tmp41_, NULL); + _tmp37_ = sqlite3_prepare_v2 (_tmp35_, "CREATE INDEX IF NOT EXISTS PhotoTableThumbnailMD5MD5 on PhotoTable(thu" \ +"mbnail_md5, md5)", -1, &_tmp36_, NULL); #line 188 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _sqlite3_finalize0 (stmt); #line 188 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - stmt = _tmp41_; + stmt = _tmp36_; #line 188 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp42_; + res = _tmp37_; #line 189 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp43_ = res; + _tmp38_ = res; #line 189 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp43_ == SQLITE_OK, "res == Sqlite.OK"); -#line 190 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp44_ = stmt; + _vala_assert (_tmp38_ == SQLITE_OK, "res == Sqlite.OK"); #line 190 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp45_ = sqlite3_step (_tmp44_); + _tmp39_ = stmt; #line 190 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp45_; + res = sqlite3_step (_tmp39_); #line 191 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp46_ = res; + _tmp40_ = res; #line 191 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp46_ != SQLITE_DONE) { -#line 1329 "PhotoTable.c" - gint _tmp47_; + if (_tmp40_ != SQLITE_DONE) { +#line 1536 "PhotoTable.c" + gint _tmp41_; #line 192 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp47_ = res; + _tmp41_ = res; #line 192 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - database_table_warning ("Failed to create index on thumbnail_md5 and md5", _tmp47_); -#line 1335 "PhotoTable.c" + database_table_warning ("Failed to create index on thumbnail_md5 and md5", _tmp41_); +#line 1542 "PhotoTable.c" } #line 195 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" database_table_set_table_name (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), "PhotoTable"); @@ -1344,25 +1551,31 @@ static PhotoTable* photo_table_construct (GType object_type) { _sqlite3_finalize0 (stmt); #line 112 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return self; -#line 1345 "PhotoTable.c" +#line 1552 "PhotoTable.c" } -static PhotoTable* photo_table_new (void) { +static PhotoTable* +photo_table_new (void) +{ #line 112 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return photo_table_construct (TYPE_PHOTO_TABLE); -#line 1352 "PhotoTable.c" +#line 1561 "PhotoTable.c" } -static gpointer _database_table_ref0 (gpointer self) { +static gpointer +_database_table_ref0 (gpointer self) +{ #line 202 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return self ? database_table_ref (self) : NULL; -#line 1359 "PhotoTable.c" +#line 1570 "PhotoTable.c" } -PhotoTable* photo_table_get_instance (void) { +PhotoTable* +photo_table_get_instance (void) +{ PhotoTable* result = NULL; PhotoTable* _tmp0_; PhotoTable* _tmp2_; @@ -1371,7 +1584,7 @@ PhotoTable* photo_table_get_instance (void) { _tmp0_ = photo_table_instance; #line 199 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (_tmp0_ == NULL) { -#line 1372 "PhotoTable.c" +#line 1585 "PhotoTable.c" PhotoTable* _tmp1_; #line 200 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp1_ = photo_table_new (); @@ -1379,7 +1592,7 @@ PhotoTable* photo_table_get_instance (void) { _database_table_unref0 (photo_table_instance); #line 200 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" photo_table_instance = _tmp1_; -#line 1380 "PhotoTable.c" +#line 1593 "PhotoTable.c" } #line 202 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp2_ = photo_table_instance; @@ -1389,11 +1602,15 @@ PhotoTable* photo_table_get_instance (void) { result = _tmp3_; #line 202 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 1390 "PhotoTable.c" +#line 1603 "PhotoTable.c" } -void photo_table_add (PhotoTable* self, PhotoRow* photo_row, PhotoID* result) { +void +photo_table_add (PhotoTable* self, + PhotoRow* photo_row, + PhotoID* result) +{ sqlite3_stmt* stmt = NULL; gint res = 0; sqlite3* _tmp0_; @@ -1401,145 +1618,96 @@ void photo_table_add (PhotoTable* self, PhotoRow* photo_row, PhotoID* result) { gint _tmp2_; gint _tmp3_; gulong time_created = 0UL; - gulong _tmp4_; - sqlite3_stmt* _tmp5_; - PhotoRow* _tmp6_; - BackingPhotoRow* _tmp7_; - const gchar* _tmp8_; - gchar* _tmp9_; - GDestroyNotify _tmp10_; - gint _tmp11_; - gint _tmp12_; - sqlite3_stmt* _tmp13_; - PhotoRow* _tmp14_; - BackingPhotoRow* _tmp15_; - Dimensions _tmp16_; - gint _tmp17_; + sqlite3_stmt* _tmp4_; + BackingPhotoRow* _tmp5_; + const gchar* _tmp6_; + gchar* _tmp7_; + GDestroyNotify _tmp8_; + gint _tmp9_; + sqlite3_stmt* _tmp10_; + BackingPhotoRow* _tmp11_; + Dimensions _tmp12_; + gint _tmp13_; + gint _tmp14_; + sqlite3_stmt* _tmp15_; + BackingPhotoRow* _tmp16_; + Dimensions _tmp17_; gint _tmp18_; gint _tmp19_; sqlite3_stmt* _tmp20_; - PhotoRow* _tmp21_; - BackingPhotoRow* _tmp22_; - Dimensions _tmp23_; - gint _tmp24_; - gint _tmp25_; - gint _tmp26_; - sqlite3_stmt* _tmp27_; - PhotoRow* _tmp28_; - BackingPhotoRow* _tmp29_; - gint64 _tmp30_; - gint _tmp31_; - gint _tmp32_; - sqlite3_stmt* _tmp33_; - PhotoRow* _tmp34_; - BackingPhotoRow* _tmp35_; - time_t _tmp36_; - gint _tmp37_; + BackingPhotoRow* _tmp21_; + gint64 _tmp22_; + gint _tmp23_; + sqlite3_stmt* _tmp24_; + BackingPhotoRow* _tmp25_; + time_t _tmp26_; + gint _tmp27_; + sqlite3_stmt* _tmp28_; + time_t _tmp29_; + gint _tmp30_; + sqlite3_stmt* _tmp31_; + BackingPhotoRow* _tmp32_; + Orientation _tmp33_; + gint _tmp34_; + sqlite3_stmt* _tmp35_; + BackingPhotoRow* _tmp36_; + Orientation _tmp37_; gint _tmp38_; sqlite3_stmt* _tmp39_; - PhotoRow* _tmp40_; - time_t _tmp41_; + ImportID _tmp40_; + gint64 _tmp41_; gint _tmp42_; - gint _tmp43_; - sqlite3_stmt* _tmp44_; - PhotoRow* _tmp45_; - BackingPhotoRow* _tmp46_; - Orientation _tmp47_; - gint _tmp48_; + sqlite3_stmt* _tmp43_; + gint _tmp44_; + sqlite3_stmt* _tmp45_; + const gchar* _tmp46_; + gchar* _tmp47_; + GDestroyNotify _tmp48_; gint _tmp49_; sqlite3_stmt* _tmp50_; - PhotoRow* _tmp51_; - BackingPhotoRow* _tmp52_; - Orientation _tmp53_; + const gchar* _tmp51_; + gchar* _tmp52_; + GDestroyNotify _tmp53_; gint _tmp54_; - gint _tmp55_; - sqlite3_stmt* _tmp56_; - PhotoRow* _tmp57_; - ImportID _tmp58_; - gint64 _tmp59_; - gint _tmp60_; - gint _tmp61_; - sqlite3_stmt* _tmp62_; - gint _tmp63_; - gint _tmp64_; - sqlite3_stmt* _tmp65_; - PhotoRow* _tmp66_; - const gchar* _tmp67_; - gchar* _tmp68_; - GDestroyNotify _tmp69_; - gint _tmp70_; + sqlite3_stmt* _tmp55_; + const gchar* _tmp56_; + gchar* _tmp57_; + GDestroyNotify _tmp58_; + gint _tmp59_; + sqlite3_stmt* _tmp60_; + gulong _tmp61_; + gint _tmp62_; + sqlite3_stmt* _tmp63_; + BackingPhotoRow* _tmp64_; + PhotoFileFormat _tmp65_; + gint _tmp66_; + sqlite3_stmt* _tmp67_; + const gchar* _tmp68_; + gchar* _tmp69_; + GDestroyNotify _tmp70_; gint _tmp71_; sqlite3_stmt* _tmp72_; - PhotoRow* _tmp73_; - const gchar* _tmp74_; - gchar* _tmp75_; - GDestroyNotify _tmp76_; - gint _tmp77_; - gint _tmp78_; - sqlite3_stmt* _tmp79_; - PhotoRow* _tmp80_; - const gchar* _tmp81_; - gchar* _tmp82_; - GDestroyNotify _tmp83_; - gint _tmp84_; - gint _tmp85_; - sqlite3_stmt* _tmp86_; - gulong _tmp87_; + Rating _tmp73_; + gint _tmp74_; + sqlite3_stmt* _tmp75_; + gint _tmp76_; + sqlite3_stmt* _tmp77_; + RawDeveloper _tmp78_; + gchar* _tmp79_; + GDestroyNotify _tmp80_; + gint _tmp81_; + sqlite3_stmt* _tmp82_; + const gchar* _tmp83_; + gchar* _tmp84_; + GDestroyNotify _tmp85_; + gint _tmp86_; + sqlite3_stmt* _tmp87_; gint _tmp88_; - gint _tmp89_; - sqlite3_stmt* _tmp90_; - PhotoRow* _tmp91_; - BackingPhotoRow* _tmp92_; - PhotoFileFormat _tmp93_; - gint _tmp94_; - gint _tmp95_; - gint _tmp96_; - sqlite3_stmt* _tmp97_; - PhotoRow* _tmp98_; - const gchar* _tmp99_; - gchar* _tmp100_; - GDestroyNotify _tmp101_; - gint _tmp102_; - gint _tmp103_; - sqlite3_stmt* _tmp104_; - PhotoRow* _tmp105_; - Rating _tmp106_; - gint _tmp107_; - gint _tmp108_; - gint _tmp109_; - sqlite3_stmt* _tmp110_; - gint _tmp111_; - gint _tmp112_; - sqlite3_stmt* _tmp113_; - PhotoRow* _tmp114_; - RawDeveloper _tmp115_; - gchar* _tmp116_; - GDestroyNotify _tmp117_; - gint _tmp118_; - gint _tmp119_; - sqlite3_stmt* _tmp120_; - PhotoRow* _tmp121_; - const gchar* _tmp122_; - gchar* _tmp123_; - GDestroyNotify _tmp124_; - gint _tmp125_; - gint _tmp126_; - sqlite3_stmt* _tmp127_; - gint _tmp128_; - gint _tmp129_; - PhotoRow* _tmp133_; - sqlite3* _tmp134_; - gint64 _tmp135_; - PhotoRow* _tmp136_; - PhotoRow* _tmp137_; - BackingPhotoRow* _tmp138_; - Orientation _tmp139_; - PhotoRow* _tmp140_; - PhotoRow* _tmp141_; - gulong _tmp142_; - PhotoRow* _tmp143_; - PhotoRow* _tmp144_; - PhotoID _tmp145_; + sqlite3* _tmp92_; + BackingPhotoRow* _tmp93_; + Orientation _tmp94_; + gulong _tmp95_; + PhotoID _tmp96_; #line 207 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_if_fail (IS_PHOTO_TABLE (self)); #line 207 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -1562,415 +1730,321 @@ void photo_table_add (PhotoTable* self, PhotoRow* photo_row, PhotoID* result) { #line 215 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _vala_assert (_tmp3_ == SQLITE_OK, "res == Sqlite.OK"); #line 217 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp4_ = now_sec (); -#line 217 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - time_created = _tmp4_; -#line 219 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp5_ = stmt; + time_created = now_sec (); #line 219 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp6_ = photo_row; + _tmp4_ = stmt; #line 219 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp7_ = _tmp6_->master; + _tmp5_ = photo_row->master; #line 219 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp8_ = _tmp7_->filepath; + _tmp6_ = _tmp5_->filepath; #line 219 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp9_ = g_strdup (_tmp8_); + _tmp7_ = g_strdup (_tmp6_); #line 219 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp10_ = g_free; + _tmp8_ = g_free; #line 219 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp11_ = sqlite3_bind_text (_tmp5_, 1, _tmp9_, -1, _tmp10_); -#line 219 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp11_; + res = sqlite3_bind_text (_tmp4_, 1, _tmp7_, -1, _tmp8_); #line 220 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp12_ = res; + _tmp9_ = res; #line 220 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp12_ == SQLITE_OK, "res == Sqlite.OK"); -#line 221 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp13_ = stmt; -#line 221 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp14_ = photo_row; + _vala_assert (_tmp9_ == SQLITE_OK, "res == Sqlite.OK"); #line 221 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp15_ = _tmp14_->master; + _tmp10_ = stmt; #line 221 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp16_ = _tmp15_->dim; + _tmp11_ = photo_row->master; #line 221 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp17_ = _tmp16_.width; + _tmp12_ = _tmp11_->dim; #line 221 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp18_ = sqlite3_bind_int (_tmp13_, 2, _tmp17_); + _tmp13_ = _tmp12_.width; #line 221 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp18_; + res = sqlite3_bind_int (_tmp10_, 2, _tmp13_); #line 222 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp19_ = res; + _tmp14_ = res; #line 222 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp19_ == SQLITE_OK, "res == Sqlite.OK"); + _vala_assert (_tmp14_ == SQLITE_OK, "res == Sqlite.OK"); #line 223 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp20_ = stmt; + _tmp15_ = stmt; #line 223 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp21_ = photo_row; + _tmp16_ = photo_row->master; #line 223 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp22_ = _tmp21_->master; -#line 223 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp23_ = _tmp22_->dim; + _tmp17_ = _tmp16_->dim; #line 223 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp24_ = _tmp23_.height; + _tmp18_ = _tmp17_.height; #line 223 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp25_ = sqlite3_bind_int (_tmp20_, 3, _tmp24_); -#line 223 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp25_; + res = sqlite3_bind_int (_tmp15_, 3, _tmp18_); #line 224 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp26_ = res; + _tmp19_ = res; #line 224 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp26_ == SQLITE_OK, "res == Sqlite.OK"); -#line 225 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp27_ = stmt; -#line 225 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp28_ = photo_row; + _vala_assert (_tmp19_ == SQLITE_OK, "res == Sqlite.OK"); #line 225 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp29_ = _tmp28_->master; + _tmp20_ = stmt; #line 225 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp30_ = _tmp29_->filesize; + _tmp21_ = photo_row->master; #line 225 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp31_ = sqlite3_bind_int64 (_tmp27_, 4, _tmp30_); + _tmp22_ = _tmp21_->filesize; #line 225 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp31_; + res = sqlite3_bind_int64 (_tmp20_, 4, _tmp22_); #line 226 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp32_ = res; + _tmp23_ = res; #line 226 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp32_ == SQLITE_OK, "res == Sqlite.OK"); -#line 227 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp33_ = stmt; -#line 227 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp34_ = photo_row; + _vala_assert (_tmp23_ == SQLITE_OK, "res == Sqlite.OK"); #line 227 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp35_ = _tmp34_->master; + _tmp24_ = stmt; #line 227 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp36_ = _tmp35_->timestamp; + _tmp25_ = photo_row->master; #line 227 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp37_ = sqlite3_bind_int64 (_tmp33_, 5, (gint64) _tmp36_); + _tmp26_ = _tmp25_->timestamp; #line 227 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp37_; + res = sqlite3_bind_int64 (_tmp24_, 5, (gint64) _tmp26_); #line 228 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp38_ = res; + _tmp27_ = res; #line 228 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp38_ == SQLITE_OK, "res == Sqlite.OK"); -#line 229 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp39_ = stmt; -#line 229 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp40_ = photo_row; + _vala_assert (_tmp27_ == SQLITE_OK, "res == Sqlite.OK"); #line 229 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp41_ = _tmp40_->exposure_time; + _tmp28_ = stmt; #line 229 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp42_ = sqlite3_bind_int64 (_tmp39_, 6, (gint64) _tmp41_); + _tmp29_ = photo_row->exposure_time; #line 229 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp42_; + res = sqlite3_bind_int64 (_tmp28_, 6, (gint64) _tmp29_); #line 230 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp43_ = res; + _tmp30_ = res; #line 230 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp43_ == SQLITE_OK, "res == Sqlite.OK"); -#line 231 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp44_ = stmt; -#line 231 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp45_ = photo_row; + _vala_assert (_tmp30_ == SQLITE_OK, "res == Sqlite.OK"); #line 231 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp46_ = _tmp45_->master; + _tmp31_ = stmt; #line 231 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp47_ = _tmp46_->original_orientation; + _tmp32_ = photo_row->master; #line 231 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp48_ = sqlite3_bind_int (_tmp44_, 7, (gint) _tmp47_); + _tmp33_ = _tmp32_->original_orientation; #line 231 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp48_; + res = sqlite3_bind_int (_tmp31_, 7, (gint) _tmp33_); #line 232 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp49_ = res; + _tmp34_ = res; #line 232 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp49_ == SQLITE_OK, "res == Sqlite.OK"); -#line 233 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp50_ = stmt; -#line 233 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp51_ = photo_row; + _vala_assert (_tmp34_ == SQLITE_OK, "res == Sqlite.OK"); #line 233 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp52_ = _tmp51_->master; + _tmp35_ = stmt; #line 233 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp53_ = _tmp52_->original_orientation; + _tmp36_ = photo_row->master; #line 233 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp54_ = sqlite3_bind_int (_tmp50_, 8, (gint) _tmp53_); + _tmp37_ = _tmp36_->original_orientation; #line 233 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp54_; + res = sqlite3_bind_int (_tmp35_, 8, (gint) _tmp37_); #line 234 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp55_ = res; + _tmp38_ = res; #line 234 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp55_ == SQLITE_OK, "res == Sqlite.OK"); -#line 235 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp56_ = stmt; -#line 235 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp57_ = photo_row; + _vala_assert (_tmp38_ == SQLITE_OK, "res == Sqlite.OK"); #line 235 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp58_ = _tmp57_->import_id; + _tmp39_ = stmt; #line 235 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp59_ = _tmp58_.id; + _tmp40_ = photo_row->import_id; #line 235 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp60_ = sqlite3_bind_int64 (_tmp56_, 9, _tmp59_); + _tmp41_ = _tmp40_.id; #line 235 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp60_; + res = sqlite3_bind_int64 (_tmp39_, 9, _tmp41_); #line 236 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp61_ = res; + _tmp42_ = res; #line 236 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp61_ == SQLITE_OK, "res == Sqlite.OK"); -#line 237 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp62_ = stmt; + _vala_assert (_tmp42_ == SQLITE_OK, "res == Sqlite.OK"); #line 237 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp63_ = sqlite3_bind_int64 (_tmp62_, 10, EVENT_ID_INVALID); + _tmp43_ = stmt; #line 237 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp63_; + res = sqlite3_bind_int64 (_tmp43_, 10, EVENT_ID_INVALID); #line 238 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp64_ = res; + _tmp44_ = res; #line 238 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp64_ == SQLITE_OK, "res == Sqlite.OK"); -#line 239 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp65_ = stmt; -#line 239 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp66_ = photo_row; + _vala_assert (_tmp44_ == SQLITE_OK, "res == Sqlite.OK"); #line 239 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp67_ = _tmp66_->md5; + _tmp45_ = stmt; #line 239 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp68_ = g_strdup (_tmp67_); + _tmp46_ = photo_row->md5; #line 239 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp69_ = g_free; + _tmp47_ = g_strdup (_tmp46_); #line 239 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp70_ = sqlite3_bind_text (_tmp65_, 11, _tmp68_, -1, _tmp69_); + _tmp48_ = g_free; #line 239 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp70_; + res = sqlite3_bind_text (_tmp45_, 11, _tmp47_, -1, _tmp48_); #line 240 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp71_ = res; + _tmp49_ = res; #line 240 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp71_ == SQLITE_OK, "res == Sqlite.OK"); -#line 241 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp72_ = stmt; -#line 241 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp73_ = photo_row; + _vala_assert (_tmp49_ == SQLITE_OK, "res == Sqlite.OK"); #line 241 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp74_ = _tmp73_->thumbnail_md5; + _tmp50_ = stmt; #line 241 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp75_ = g_strdup (_tmp74_); + _tmp51_ = photo_row->thumbnail_md5; #line 241 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp76_ = g_free; + _tmp52_ = g_strdup (_tmp51_); #line 241 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp77_ = sqlite3_bind_text (_tmp72_, 12, _tmp75_, -1, _tmp76_); + _tmp53_ = g_free; #line 241 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp77_; + res = sqlite3_bind_text (_tmp50_, 12, _tmp52_, -1, _tmp53_); #line 242 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp78_ = res; + _tmp54_ = res; #line 242 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp78_ == SQLITE_OK, "res == Sqlite.OK"); -#line 243 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp79_ = stmt; -#line 243 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp80_ = photo_row; + _vala_assert (_tmp54_ == SQLITE_OK, "res == Sqlite.OK"); #line 243 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp81_ = _tmp80_->exif_md5; + _tmp55_ = stmt; #line 243 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp82_ = g_strdup (_tmp81_); + _tmp56_ = photo_row->exif_md5; #line 243 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp83_ = g_free; + _tmp57_ = g_strdup (_tmp56_); #line 243 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp84_ = sqlite3_bind_text (_tmp79_, 13, _tmp82_, -1, _tmp83_); + _tmp58_ = g_free; #line 243 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp84_; + res = sqlite3_bind_text (_tmp55_, 13, _tmp57_, -1, _tmp58_); #line 244 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp85_ = res; + _tmp59_ = res; #line 244 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp85_ == SQLITE_OK, "res == Sqlite.OK"); -#line 245 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp86_ = stmt; + _vala_assert (_tmp59_ == SQLITE_OK, "res == Sqlite.OK"); #line 245 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp87_ = time_created; + _tmp60_ = stmt; #line 245 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp88_ = sqlite3_bind_int64 (_tmp86_, 14, (gint64) _tmp87_); + _tmp61_ = time_created; #line 245 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp88_; + res = sqlite3_bind_int64 (_tmp60_, 14, (gint64) _tmp61_); #line 246 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp89_ = res; + _tmp62_ = res; #line 246 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp89_ == SQLITE_OK, "res == Sqlite.OK"); -#line 247 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp90_ = stmt; -#line 247 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp91_ = photo_row; + _vala_assert (_tmp62_ == SQLITE_OK, "res == Sqlite.OK"); #line 247 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp92_ = _tmp91_->master; + _tmp63_ = stmt; #line 247 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp93_ = _tmp92_->file_format; + _tmp64_ = photo_row->master; #line 247 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp94_ = photo_file_format_serialize (_tmp93_); + _tmp65_ = _tmp64_->file_format; #line 247 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp95_ = sqlite3_bind_int (_tmp90_, 15, _tmp94_); -#line 247 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp95_; + res = sqlite3_bind_int (_tmp63_, 15, photo_file_format_serialize (_tmp65_)); #line 248 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp96_ = res; + _tmp66_ = res; #line 248 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp96_ == SQLITE_OK, "res == Sqlite.OK"); -#line 249 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp97_ = stmt; + _vala_assert (_tmp66_ == SQLITE_OK, "res == Sqlite.OK"); #line 249 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp98_ = photo_row; + _tmp67_ = stmt; #line 249 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp99_ = _tmp98_->title; + _tmp68_ = photo_row->title; #line 249 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp100_ = g_strdup (_tmp99_); + _tmp69_ = g_strdup (_tmp68_); #line 249 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp101_ = g_free; -#line 249 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp102_ = sqlite3_bind_text (_tmp97_, 16, _tmp100_, -1, _tmp101_); + _tmp70_ = g_free; #line 249 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp102_; + res = sqlite3_bind_text (_tmp67_, 16, _tmp69_, -1, _tmp70_); #line 250 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp103_ = res; + _tmp71_ = res; #line 250 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp103_ == SQLITE_OK, "res == Sqlite.OK"); -#line 251 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp104_ = stmt; -#line 251 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp105_ = photo_row; -#line 251 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp106_ = _tmp105_->rating; + _vala_assert (_tmp71_ == SQLITE_OK, "res == Sqlite.OK"); #line 251 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp107_ = rating_serialize (_tmp106_); + _tmp72_ = stmt; #line 251 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp108_ = sqlite3_bind_int64 (_tmp104_, 17, (gint64) _tmp107_); + _tmp73_ = photo_row->rating; #line 251 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp108_; + res = sqlite3_bind_int64 (_tmp72_, 17, (gint64) rating_serialize (_tmp73_)); #line 252 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp109_ = res; + _tmp74_ = res; #line 252 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp109_ == SQLITE_OK, "res == Sqlite.OK"); -#line 253 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp110_ = stmt; + _vala_assert (_tmp74_ == SQLITE_OK, "res == Sqlite.OK"); #line 253 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp111_ = sqlite3_bind_int64 (_tmp110_, 18, BACKING_PHOTO_ID_INVALID); + _tmp75_ = stmt; #line 253 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp111_; + res = sqlite3_bind_int64 (_tmp75_, 18, BACKING_PHOTO_ID_INVALID); #line 254 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp112_ = res; + _tmp76_ = res; #line 254 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp112_ == SQLITE_OK, "res == Sqlite.OK"); + _vala_assert (_tmp76_ == SQLITE_OK, "res == Sqlite.OK"); #line 255 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp113_ = stmt; -#line 255 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp114_ = photo_row; -#line 255 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp115_ = _tmp114_->developer; + _tmp77_ = stmt; #line 255 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp116_ = raw_developer_to_string (_tmp115_); + _tmp78_ = photo_row->developer; #line 255 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp117_ = g_free; + _tmp79_ = raw_developer_to_string (_tmp78_); #line 255 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp118_ = sqlite3_bind_text (_tmp113_, 19, _tmp116_, -1, _tmp117_); + _tmp80_ = g_free; #line 255 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp118_; + res = sqlite3_bind_text (_tmp77_, 19, _tmp79_, -1, _tmp80_); #line 256 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp119_ = res; + _tmp81_ = res; #line 256 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp119_ == SQLITE_OK, "res == Sqlite.OK"); -#line 257 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp120_ = stmt; + _vala_assert (_tmp81_ == SQLITE_OK, "res == Sqlite.OK"); #line 257 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp121_ = photo_row; + _tmp82_ = stmt; #line 257 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp122_ = _tmp121_->comment; + _tmp83_ = photo_row->comment; #line 257 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp123_ = g_strdup (_tmp122_); + _tmp84_ = g_strdup (_tmp83_); #line 257 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp124_ = g_free; + _tmp85_ = g_free; #line 257 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp125_ = sqlite3_bind_text (_tmp120_, 20, _tmp123_, -1, _tmp124_); -#line 257 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp125_; + res = sqlite3_bind_text (_tmp82_, 20, _tmp84_, -1, _tmp85_); #line 258 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp126_ = res; + _tmp86_ = res; #line 258 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp126_ == SQLITE_OK, "res == Sqlite.OK"); -#line 260 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp127_ = stmt; + _vala_assert (_tmp86_ == SQLITE_OK, "res == Sqlite.OK"); #line 260 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp128_ = sqlite3_step (_tmp127_); + _tmp87_ = stmt; #line 260 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp128_; + res = sqlite3_step (_tmp87_); #line 261 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp129_ = res; + _tmp88_ = res; #line 261 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp129_ != SQLITE_DONE) { -#line 1897 "PhotoTable.c" - gint _tmp130_; - PhotoID _tmp132_ = {0}; + if (_tmp88_ != SQLITE_DONE) { +#line 1983 "PhotoTable.c" + gint _tmp89_; + PhotoID _tmp91_ = {0}; #line 262 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp130_ = res; + _tmp89_ = res; #line 262 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp130_ != SQLITE_CONSTRAINT) { -#line 1904 "PhotoTable.c" - gint _tmp131_; + if (_tmp89_ != SQLITE_CONSTRAINT) { +#line 1990 "PhotoTable.c" + gint _tmp90_; #line 263 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp131_ = res; + _tmp90_ = res; #line 263 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - database_table_fatal ("add_photo", _tmp131_); -#line 1910 "PhotoTable.c" + database_table_fatal ("add_photo", _tmp90_); +#line 1996 "PhotoTable.c" } #line 265 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - photo_id_init (&_tmp132_, PHOTO_ID_INVALID); + photo_id_init (&_tmp91_, PHOTO_ID_INVALID); #line 265 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - *result = _tmp132_; + *result = _tmp91_; #line 265 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _sqlite3_finalize0 (stmt); #line 265 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; -#line 1920 "PhotoTable.c" +#line 2006 "PhotoTable.c" } #line 269 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp133_ = photo_row; -#line 269 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp134_ = database_table_db; -#line 269 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp135_ = sqlite3_last_insert_rowid (_tmp134_); + _tmp92_ = database_table_db; #line 269 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - photo_id_init (&_tmp133_->photo_id, _tmp135_); + photo_id_init (&photo_row->photo_id, sqlite3_last_insert_rowid (_tmp92_)); #line 270 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp136_ = photo_row; + _tmp93_ = photo_row->master; #line 270 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp137_ = photo_row; + _tmp94_ = _tmp93_->original_orientation; #line 270 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp138_ = _tmp137_->master; -#line 270 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp139_ = _tmp138_->original_orientation; -#line 270 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp136_->orientation = _tmp139_; -#line 271 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp140_ = photo_row; + photo_row->orientation = _tmp94_; #line 271 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - event_id_init (&_tmp140_->event_id, EVENT_ID_INVALID); + event_id_init (&photo_row->event_id, EVENT_ID_INVALID); #line 272 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp141_ = photo_row; + _tmp95_ = time_created; #line 272 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp142_ = time_created; -#line 272 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp141_->time_created = (time_t) _tmp142_; -#line 273 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp143_ = photo_row; + photo_row->time_created = (time_t) _tmp95_; #line 273 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp143_->flags = (guint64) 0; + photo_row->flags = (guint64) 0; #line 275 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp144_ = photo_row; + _tmp96_ = photo_row->photo_id; #line 275 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp145_ = _tmp144_->photo_id; -#line 275 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - *result = _tmp145_; + *result = _tmp96_; #line 275 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _sqlite3_finalize0 (stmt); #line 275 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; -#line 1964 "PhotoTable.c" +#line 2034 "PhotoTable.c" } -void photo_table_reimport (PhotoTable* self, PhotoRow* row, GError** error) { +void +photo_table_reimport (PhotoTable* self, + PhotoRow* row, + GError** error) +{ sqlite3_stmt* stmt = NULL; gint res = 0; sqlite3* _tmp0_; @@ -1978,104 +2052,71 @@ void photo_table_reimport (PhotoTable* self, PhotoRow* row, GError** error) { gint _tmp2_; gint _tmp3_; time_t time_reimported = 0; - gulong _tmp4_; - sqlite3_stmt* _tmp5_; - PhotoRow* _tmp6_; - BackingPhotoRow* _tmp7_; - Dimensions _tmp8_; - gint _tmp9_; - gint _tmp10_; - gint _tmp11_; - sqlite3_stmt* _tmp12_; - PhotoRow* _tmp13_; - BackingPhotoRow* _tmp14_; - Dimensions _tmp15_; - gint _tmp16_; + sqlite3_stmt* _tmp4_; + BackingPhotoRow* _tmp5_; + Dimensions _tmp6_; + gint _tmp7_; + gint _tmp8_; + sqlite3_stmt* _tmp9_; + BackingPhotoRow* _tmp10_; + Dimensions _tmp11_; + gint _tmp12_; + gint _tmp13_; + sqlite3_stmt* _tmp14_; + BackingPhotoRow* _tmp15_; + gint64 _tmp16_; gint _tmp17_; - gint _tmp18_; - sqlite3_stmt* _tmp19_; - PhotoRow* _tmp20_; - BackingPhotoRow* _tmp21_; - gint64 _tmp22_; - gint _tmp23_; + sqlite3_stmt* _tmp18_; + BackingPhotoRow* _tmp19_; + time_t _tmp20_; + gint _tmp21_; + sqlite3_stmt* _tmp22_; + time_t _tmp23_; gint _tmp24_; sqlite3_stmt* _tmp25_; - PhotoRow* _tmp26_; - BackingPhotoRow* _tmp27_; - time_t _tmp28_; - gint _tmp29_; - gint _tmp30_; - sqlite3_stmt* _tmp31_; - PhotoRow* _tmp32_; - time_t _tmp33_; - gint _tmp34_; - gint _tmp35_; - sqlite3_stmt* _tmp36_; - PhotoRow* _tmp37_; - BackingPhotoRow* _tmp38_; - Orientation _tmp39_; - gint _tmp40_; - gint _tmp41_; - sqlite3_stmt* _tmp42_; - PhotoRow* _tmp43_; - BackingPhotoRow* _tmp44_; - Orientation _tmp45_; - gint _tmp46_; + BackingPhotoRow* _tmp26_; + Orientation _tmp27_; + gint _tmp28_; + sqlite3_stmt* _tmp29_; + BackingPhotoRow* _tmp30_; + Orientation _tmp31_; + gint _tmp32_; + sqlite3_stmt* _tmp33_; + const gchar* _tmp34_; + gchar* _tmp35_; + GDestroyNotify _tmp36_; + gint _tmp37_; + sqlite3_stmt* _tmp38_; + const gchar* _tmp39_; + gchar* _tmp40_; + GDestroyNotify _tmp41_; + gint _tmp42_; + sqlite3_stmt* _tmp43_; + const gchar* _tmp44_; + gchar* _tmp45_; + GDestroyNotify _tmp46_; gint _tmp47_; sqlite3_stmt* _tmp48_; - PhotoRow* _tmp49_; - const gchar* _tmp50_; - gchar* _tmp51_; - GDestroyNotify _tmp52_; - gint _tmp53_; - gint _tmp54_; - sqlite3_stmt* _tmp55_; - PhotoRow* _tmp56_; - const gchar* _tmp57_; - gchar* _tmp58_; - GDestroyNotify _tmp59_; - gint _tmp60_; - gint _tmp61_; - sqlite3_stmt* _tmp62_; - PhotoRow* _tmp63_; - const gchar* _tmp64_; - gchar* _tmp65_; - GDestroyNotify _tmp66_; - gint _tmp67_; - gint _tmp68_; - sqlite3_stmt* _tmp69_; - PhotoRow* _tmp70_; - BackingPhotoRow* _tmp71_; - PhotoFileFormat _tmp72_; - gint _tmp73_; - gint _tmp74_; - gint _tmp75_; - sqlite3_stmt* _tmp76_; - PhotoRow* _tmp77_; - const gchar* _tmp78_; - gchar* _tmp79_; - GDestroyNotify _tmp80_; - gint _tmp81_; - gint _tmp82_; - sqlite3_stmt* _tmp83_; - time_t _tmp84_; - gint _tmp85_; - gint _tmp86_; - sqlite3_stmt* _tmp87_; - PhotoRow* _tmp88_; - PhotoID _tmp89_; - gint64 _tmp90_; - gint _tmp91_; - gint _tmp92_; - sqlite3_stmt* _tmp93_; - gint _tmp94_; - gint _tmp95_; - PhotoRow* _tmp97_; - time_t _tmp98_; - PhotoRow* _tmp99_; - PhotoRow* _tmp100_; - BackingPhotoRow* _tmp101_; - Orientation _tmp102_; + BackingPhotoRow* _tmp49_; + PhotoFileFormat _tmp50_; + gint _tmp51_; + sqlite3_stmt* _tmp52_; + const gchar* _tmp53_; + gchar* _tmp54_; + GDestroyNotify _tmp55_; + gint _tmp56_; + sqlite3_stmt* _tmp57_; + time_t _tmp58_; + gint _tmp59_; + sqlite3_stmt* _tmp60_; + PhotoID _tmp61_; + gint64 _tmp62_; + gint _tmp63_; + sqlite3_stmt* _tmp64_; + gint _tmp65_; + time_t _tmp67_; + BackingPhotoRow* _tmp68_; + Orientation _tmp69_; GError * _inner_error_ = NULL; #line 283 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_if_fail (IS_PHOTO_TABLE (self)); @@ -2099,257 +2140,197 @@ void photo_table_reimport (PhotoTable* self, PhotoRow* row, GError** error) { #line 290 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _vala_assert (_tmp3_ == SQLITE_OK, "res == Sqlite.OK"); #line 292 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp4_ = now_sec (); -#line 292 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - time_reimported = (time_t) _tmp4_; -#line 294 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp5_ = stmt; + time_reimported = (time_t) now_sec (); #line 294 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp6_ = row; -#line 294 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp7_ = _tmp6_->master; + _tmp4_ = stmt; #line 294 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp8_ = _tmp7_->dim; + _tmp5_ = row->master; #line 294 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp9_ = _tmp8_.width; + _tmp6_ = _tmp5_->dim; #line 294 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp10_ = sqlite3_bind_int (_tmp5_, 1, _tmp9_); + _tmp7_ = _tmp6_.width; #line 294 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp10_; + res = sqlite3_bind_int (_tmp4_, 1, _tmp7_); #line 295 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp11_ = res; + _tmp8_ = res; #line 295 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp11_ == SQLITE_OK, "res == Sqlite.OK"); -#line 296 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp12_ = stmt; -#line 296 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp13_ = row; + _vala_assert (_tmp8_ == SQLITE_OK, "res == Sqlite.OK"); #line 296 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp14_ = _tmp13_->master; + _tmp9_ = stmt; #line 296 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp15_ = _tmp14_->dim; + _tmp10_ = row->master; #line 296 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp16_ = _tmp15_.height; + _tmp11_ = _tmp10_->dim; #line 296 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp17_ = sqlite3_bind_int (_tmp12_, 2, _tmp16_); + _tmp12_ = _tmp11_.height; #line 296 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp17_; + res = sqlite3_bind_int (_tmp9_, 2, _tmp12_); #line 297 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp18_ = res; + _tmp13_ = res; #line 297 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp18_ == SQLITE_OK, "res == Sqlite.OK"); -#line 298 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp19_ = stmt; -#line 298 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp20_ = row; + _vala_assert (_tmp13_ == SQLITE_OK, "res == Sqlite.OK"); #line 298 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp21_ = _tmp20_->master; + _tmp14_ = stmt; #line 298 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp22_ = _tmp21_->filesize; + _tmp15_ = row->master; #line 298 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp23_ = sqlite3_bind_int64 (_tmp19_, 3, _tmp22_); + _tmp16_ = _tmp15_->filesize; #line 298 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp23_; + res = sqlite3_bind_int64 (_tmp14_, 3, _tmp16_); #line 299 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp24_ = res; + _tmp17_ = res; #line 299 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp24_ == SQLITE_OK, "res == Sqlite.OK"); -#line 300 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp25_ = stmt; -#line 300 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp26_ = row; + _vala_assert (_tmp17_ == SQLITE_OK, "res == Sqlite.OK"); #line 300 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp27_ = _tmp26_->master; + _tmp18_ = stmt; #line 300 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp28_ = _tmp27_->timestamp; + _tmp19_ = row->master; #line 300 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp29_ = sqlite3_bind_int64 (_tmp25_, 4, (gint64) _tmp28_); + _tmp20_ = _tmp19_->timestamp; #line 300 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp29_; + res = sqlite3_bind_int64 (_tmp18_, 4, (gint64) _tmp20_); #line 301 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp30_ = res; + _tmp21_ = res; #line 301 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp30_ == SQLITE_OK, "res == Sqlite.OK"); -#line 302 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp31_ = stmt; -#line 302 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp32_ = row; + _vala_assert (_tmp21_ == SQLITE_OK, "res == Sqlite.OK"); #line 302 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp33_ = _tmp32_->exposure_time; + _tmp22_ = stmt; #line 302 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp34_ = sqlite3_bind_int64 (_tmp31_, 5, (gint64) _tmp33_); + _tmp23_ = row->exposure_time; #line 302 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp34_; + res = sqlite3_bind_int64 (_tmp22_, 5, (gint64) _tmp23_); #line 303 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp35_ = res; + _tmp24_ = res; #line 303 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp35_ == SQLITE_OK, "res == Sqlite.OK"); -#line 304 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp36_ = stmt; -#line 304 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp37_ = row; + _vala_assert (_tmp24_ == SQLITE_OK, "res == Sqlite.OK"); #line 304 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp38_ = _tmp37_->master; + _tmp25_ = stmt; #line 304 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp39_ = _tmp38_->original_orientation; + _tmp26_ = row->master; #line 304 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp40_ = sqlite3_bind_int (_tmp36_, 6, (gint) _tmp39_); + _tmp27_ = _tmp26_->original_orientation; #line 304 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp40_; + res = sqlite3_bind_int (_tmp25_, 6, (gint) _tmp27_); #line 305 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp41_ = res; + _tmp28_ = res; #line 305 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp41_ == SQLITE_OK, "res == Sqlite.OK"); -#line 306 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp42_ = stmt; + _vala_assert (_tmp28_ == SQLITE_OK, "res == Sqlite.OK"); #line 306 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp43_ = row; + _tmp29_ = stmt; #line 306 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp44_ = _tmp43_->master; + _tmp30_ = row->master; #line 306 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp45_ = _tmp44_->original_orientation; + _tmp31_ = _tmp30_->original_orientation; #line 306 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp46_ = sqlite3_bind_int (_tmp42_, 7, (gint) _tmp45_); -#line 306 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp46_; + res = sqlite3_bind_int (_tmp29_, 7, (gint) _tmp31_); #line 307 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp47_ = res; + _tmp32_ = res; #line 307 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp47_ == SQLITE_OK, "res == Sqlite.OK"); -#line 308 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp48_ = stmt; -#line 308 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp49_ = row; + _vala_assert (_tmp32_ == SQLITE_OK, "res == Sqlite.OK"); #line 308 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp50_ = _tmp49_->md5; + _tmp33_ = stmt; #line 308 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp51_ = g_strdup (_tmp50_); + _tmp34_ = row->md5; #line 308 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp52_ = g_free; + _tmp35_ = g_strdup (_tmp34_); #line 308 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp53_ = sqlite3_bind_text (_tmp48_, 8, _tmp51_, -1, _tmp52_); + _tmp36_ = g_free; #line 308 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp53_; + res = sqlite3_bind_text (_tmp33_, 8, _tmp35_, -1, _tmp36_); #line 309 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp54_ = res; + _tmp37_ = res; #line 309 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp54_ == SQLITE_OK, "res == Sqlite.OK"); -#line 310 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp55_ = stmt; + _vala_assert (_tmp37_ == SQLITE_OK, "res == Sqlite.OK"); #line 310 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp56_ = row; + _tmp38_ = stmt; #line 310 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp57_ = _tmp56_->exif_md5; + _tmp39_ = row->exif_md5; #line 310 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp58_ = g_strdup (_tmp57_); + _tmp40_ = g_strdup (_tmp39_); #line 310 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp59_ = g_free; + _tmp41_ = g_free; #line 310 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp60_ = sqlite3_bind_text (_tmp55_, 9, _tmp58_, -1, _tmp59_); -#line 310 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp60_; + res = sqlite3_bind_text (_tmp38_, 9, _tmp40_, -1, _tmp41_); #line 311 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp61_ = res; + _tmp42_ = res; #line 311 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp61_ == SQLITE_OK, "res == Sqlite.OK"); -#line 312 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp62_ = stmt; -#line 312 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp63_ = row; + _vala_assert (_tmp42_ == SQLITE_OK, "res == Sqlite.OK"); #line 312 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp64_ = _tmp63_->thumbnail_md5; + _tmp43_ = stmt; #line 312 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp65_ = g_strdup (_tmp64_); + _tmp44_ = row->thumbnail_md5; #line 312 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp66_ = g_free; + _tmp45_ = g_strdup (_tmp44_); #line 312 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp67_ = sqlite3_bind_text (_tmp62_, 10, _tmp65_, -1, _tmp66_); + _tmp46_ = g_free; #line 312 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp67_; + res = sqlite3_bind_text (_tmp43_, 10, _tmp45_, -1, _tmp46_); #line 313 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp68_ = res; + _tmp47_ = res; #line 313 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp68_ == SQLITE_OK, "res == Sqlite.OK"); -#line 314 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp69_ = stmt; -#line 314 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp70_ = row; -#line 314 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp71_ = _tmp70_->master; + _vala_assert (_tmp47_ == SQLITE_OK, "res == Sqlite.OK"); #line 314 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp72_ = _tmp71_->file_format; + _tmp48_ = stmt; #line 314 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp73_ = photo_file_format_serialize (_tmp72_); + _tmp49_ = row->master; #line 314 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp74_ = sqlite3_bind_int (_tmp69_, 11, _tmp73_); + _tmp50_ = _tmp49_->file_format; #line 314 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp74_; + res = sqlite3_bind_int (_tmp48_, 11, photo_file_format_serialize (_tmp50_)); #line 315 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp75_ = res; + _tmp51_ = res; #line 315 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp75_ == SQLITE_OK, "res == Sqlite.OK"); -#line 316 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp76_ = stmt; -#line 316 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp77_ = row; + _vala_assert (_tmp51_ == SQLITE_OK, "res == Sqlite.OK"); #line 316 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp78_ = _tmp77_->title; + _tmp52_ = stmt; #line 316 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp79_ = g_strdup (_tmp78_); + _tmp53_ = row->title; #line 316 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp80_ = g_free; + _tmp54_ = g_strdup (_tmp53_); #line 316 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp81_ = sqlite3_bind_text (_tmp76_, 12, _tmp79_, -1, _tmp80_); + _tmp55_ = g_free; #line 316 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp81_; + res = sqlite3_bind_text (_tmp52_, 12, _tmp54_, -1, _tmp55_); #line 317 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp82_ = res; + _tmp56_ = res; #line 317 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp82_ == SQLITE_OK, "res == Sqlite.OK"); -#line 318 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp83_ = stmt; + _vala_assert (_tmp56_ == SQLITE_OK, "res == Sqlite.OK"); #line 318 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp84_ = time_reimported; + _tmp57_ = stmt; #line 318 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp85_ = sqlite3_bind_int64 (_tmp83_, 13, (gint64) _tmp84_); + _tmp58_ = time_reimported; #line 318 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp85_; + res = sqlite3_bind_int64 (_tmp57_, 13, (gint64) _tmp58_); #line 319 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp86_ = res; + _tmp59_ = res; #line 319 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp86_ == SQLITE_OK, "res == Sqlite.OK"); -#line 320 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp87_ = stmt; -#line 320 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp88_ = row; + _vala_assert (_tmp59_ == SQLITE_OK, "res == Sqlite.OK"); #line 320 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp89_ = _tmp88_->photo_id; + _tmp60_ = stmt; #line 320 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp90_ = _tmp89_.id; + _tmp61_ = row->photo_id; #line 320 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp91_ = sqlite3_bind_int64 (_tmp87_, 14, _tmp90_); + _tmp62_ = _tmp61_.id; #line 320 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp91_; + res = sqlite3_bind_int64 (_tmp60_, 14, _tmp62_); #line 321 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp92_ = res; + _tmp63_ = res; #line 321 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp92_ == SQLITE_OK, "res == Sqlite.OK"); -#line 323 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp93_ = stmt; + _vala_assert (_tmp63_ == SQLITE_OK, "res == Sqlite.OK"); #line 323 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp94_ = sqlite3_step (_tmp93_); + _tmp64_ = stmt; #line 323 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp94_; + res = sqlite3_step (_tmp64_); #line 324 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp95_ = res; + _tmp65_ = res; #line 324 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp95_ != SQLITE_DONE) { -#line 2339 "PhotoTable.c" - gint _tmp96_; + if (_tmp65_ != SQLITE_DONE) { +#line 2320 "PhotoTable.c" + gint _tmp66_; #line 325 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp96_ = res; + _tmp66_ = res; #line 325 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - database_table_throw_error ("PhotoTable.reimport_master", _tmp96_, &_inner_error_); + database_table_throw_error ("PhotoTable.reimport_master", _tmp66_, &_inner_error_); #line 325 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 325 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -2360,7 +2341,7 @@ void photo_table_reimport (PhotoTable* self, PhotoRow* row, GError** error) { _sqlite3_finalize0 (stmt); #line 325 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; -#line 2355 "PhotoTable.c" +#line 2336 "PhotoTable.c" } else { #line 325 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _sqlite3_finalize0 (stmt); @@ -2370,33 +2351,36 @@ void photo_table_reimport (PhotoTable* self, PhotoRow* row, GError** error) { g_clear_error (&_inner_error_); #line 325 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; -#line 2365 "PhotoTable.c" +#line 2346 "PhotoTable.c" } } } #line 327 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp97_ = row; -#line 327 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp98_ = time_reimported; + _tmp67_ = time_reimported; #line 327 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp97_->time_reimported = _tmp98_; + row->time_reimported = _tmp67_; #line 328 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp99_ = row; + _tmp68_ = row->master; #line 328 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp100_ = row; + _tmp69_ = _tmp68_->original_orientation; #line 328 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp101_ = _tmp100_->master; -#line 328 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp102_ = _tmp101_->original_orientation; -#line 328 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp99_->orientation = _tmp102_; + row->orientation = _tmp69_; #line 283 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _sqlite3_finalize0 (stmt); -#line 2387 "PhotoTable.c" +#line 2362 "PhotoTable.c" } -gboolean photo_table_master_exif_updated (PhotoTable* self, PhotoID* photoID, gint64 filesize, glong timestamp, const gchar* md5, const gchar* exif_md5, const gchar* thumbnail_md5, PhotoRow* row) { +gboolean +photo_table_master_exif_updated (PhotoTable* self, + PhotoID* photoID, + gint64 filesize, + glong timestamp, + const gchar* md5, + const gchar* exif_md5, + const gchar* thumbnail_md5, + PhotoRow* row) +{ gboolean result = FALSE; sqlite3_stmt* stmt = NULL; gint res = 0; @@ -2405,54 +2389,32 @@ gboolean photo_table_master_exif_updated (PhotoTable* self, PhotoID* photoID, gi gint _tmp2_; gint _tmp3_; sqlite3_stmt* _tmp4_; - gint64 _tmp5_; - gint _tmp6_; + gint _tmp5_; + sqlite3_stmt* _tmp6_; gint _tmp7_; sqlite3_stmt* _tmp8_; - glong _tmp9_; - gint _tmp10_; + gchar* _tmp9_; + GDestroyNotify _tmp10_; gint _tmp11_; sqlite3_stmt* _tmp12_; - const gchar* _tmp13_; - gchar* _tmp14_; - GDestroyNotify _tmp15_; - gint _tmp16_; - gint _tmp17_; - sqlite3_stmt* _tmp18_; - const gchar* _tmp19_; - gchar* _tmp20_; - GDestroyNotify _tmp21_; - gint _tmp22_; + gchar* _tmp13_; + GDestroyNotify _tmp14_; + gint _tmp15_; + sqlite3_stmt* _tmp16_; + gchar* _tmp17_; + GDestroyNotify _tmp18_; + gint _tmp19_; + sqlite3_stmt* _tmp20_; + PhotoID _tmp21_; + gint64 _tmp22_; gint _tmp23_; sqlite3_stmt* _tmp24_; - const gchar* _tmp25_; - gchar* _tmp26_; - GDestroyNotify _tmp27_; - gint _tmp28_; - gint _tmp29_; - sqlite3_stmt* _tmp30_; - PhotoID _tmp31_; - gint64 _tmp32_; - gint _tmp33_; - gint _tmp34_; - sqlite3_stmt* _tmp35_; - gint _tmp36_; - gint _tmp37_; - PhotoRow* _tmp40_; - BackingPhotoRow* _tmp41_; - gint64 _tmp42_; - PhotoRow* _tmp43_; - BackingPhotoRow* _tmp44_; - glong _tmp45_; - PhotoRow* _tmp46_; - const gchar* _tmp47_; - gchar* _tmp48_; - PhotoRow* _tmp49_; - const gchar* _tmp50_; - gchar* _tmp51_; - PhotoRow* _tmp52_; - const gchar* _tmp53_; - gchar* _tmp54_; + gint _tmp25_; + BackingPhotoRow* _tmp28_; + BackingPhotoRow* _tmp29_; + gchar* _tmp30_; + gchar* _tmp31_; + gchar* _tmp32_; #line 331 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_val_if_fail (IS_PHOTO_TABLE (self), FALSE); #line 331 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -2479,112 +2441,88 @@ gboolean photo_table_master_exif_updated (PhotoTable* self, PhotoID* photoID, gi #line 339 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp4_ = stmt; #line 339 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp5_ = filesize; -#line 339 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp6_ = sqlite3_bind_int64 (_tmp4_, 1, _tmp5_); -#line 339 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp6_; + res = sqlite3_bind_int64 (_tmp4_, 1, filesize); #line 340 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp7_ = res; + _tmp5_ = res; #line 340 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp7_ == SQLITE_OK, "res == Sqlite.OK"); -#line 341 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp8_ = stmt; -#line 341 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp9_ = timestamp; + _vala_assert (_tmp5_ == SQLITE_OK, "res == Sqlite.OK"); #line 341 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp10_ = sqlite3_bind_int64 (_tmp8_, 2, (gint64) _tmp9_); + _tmp6_ = stmt; #line 341 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp10_; + res = sqlite3_bind_int64 (_tmp6_, 2, (gint64) timestamp); #line 342 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp11_ = res; + _tmp7_ = res; #line 342 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp11_ == SQLITE_OK, "res == Sqlite.OK"); -#line 343 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp12_ = stmt; -#line 343 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp13_ = md5; + _vala_assert (_tmp7_ == SQLITE_OK, "res == Sqlite.OK"); #line 343 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp14_ = g_strdup (_tmp13_); + _tmp8_ = stmt; #line 343 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp15_ = g_free; + _tmp9_ = g_strdup (md5); #line 343 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp16_ = sqlite3_bind_text (_tmp12_, 3, _tmp14_, -1, _tmp15_); + _tmp10_ = g_free; #line 343 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp16_; + res = sqlite3_bind_text (_tmp8_, 3, _tmp9_, -1, _tmp10_); #line 344 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp17_ = res; + _tmp11_ = res; #line 344 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp17_ == SQLITE_OK, "res == Sqlite.OK"); -#line 345 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp18_ = stmt; -#line 345 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp19_ = exif_md5; + _vala_assert (_tmp11_ == SQLITE_OK, "res == Sqlite.OK"); #line 345 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp20_ = g_strdup (_tmp19_); + _tmp12_ = stmt; #line 345 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp21_ = g_free; + _tmp13_ = g_strdup (exif_md5); #line 345 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp22_ = sqlite3_bind_text (_tmp18_, 4, _tmp20_, -1, _tmp21_); + _tmp14_ = g_free; #line 345 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp22_; + res = sqlite3_bind_text (_tmp12_, 4, _tmp13_, -1, _tmp14_); #line 346 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp23_ = res; + _tmp15_ = res; #line 346 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp23_ == SQLITE_OK, "res == Sqlite.OK"); -#line 347 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp24_ = stmt; -#line 347 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp25_ = thumbnail_md5; + _vala_assert (_tmp15_ == SQLITE_OK, "res == Sqlite.OK"); #line 347 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp26_ = g_strdup (_tmp25_); + _tmp16_ = stmt; #line 347 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp27_ = g_free; + _tmp17_ = g_strdup (thumbnail_md5); #line 347 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp28_ = sqlite3_bind_text (_tmp24_, 5, _tmp26_, -1, _tmp27_); + _tmp18_ = g_free; #line 347 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp28_; + res = sqlite3_bind_text (_tmp16_, 5, _tmp17_, -1, _tmp18_); #line 348 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp29_ = res; + _tmp19_ = res; #line 348 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp29_ == SQLITE_OK, "res == Sqlite.OK"); -#line 349 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp30_ = stmt; + _vala_assert (_tmp19_ == SQLITE_OK, "res == Sqlite.OK"); #line 349 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp31_ = *photoID; + _tmp20_ = stmt; #line 349 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp32_ = _tmp31_.id; + _tmp21_ = *photoID; #line 349 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp33_ = sqlite3_bind_int64 (_tmp30_, 6, _tmp32_); + _tmp22_ = _tmp21_.id; #line 349 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp33_; + res = sqlite3_bind_int64 (_tmp20_, 6, _tmp22_); #line 350 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp34_ = res; + _tmp23_ = res; #line 350 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp34_ == SQLITE_OK, "res == Sqlite.OK"); -#line 352 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp35_ = stmt; + _vala_assert (_tmp23_ == SQLITE_OK, "res == Sqlite.OK"); #line 352 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp36_ = sqlite3_step (_tmp35_); + _tmp24_ = stmt; #line 352 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp36_; + res = sqlite3_step (_tmp24_); #line 353 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp37_ = res; + _tmp25_ = res; #line 353 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp37_ != SQLITE_DONE) { -#line 2566 "PhotoTable.c" - gint _tmp38_; + if (_tmp25_ != SQLITE_DONE) { +#line 2504 "PhotoTable.c" + gint _tmp26_; #line 354 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp38_ = res; + _tmp26_ = res; #line 354 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp38_ != SQLITE_CONSTRAINT) { -#line 2572 "PhotoTable.c" - gint _tmp39_; + if (_tmp26_ != SQLITE_CONSTRAINT) { +#line 2510 "PhotoTable.c" + gint _tmp27_; #line 355 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp39_ = res; + _tmp27_ = res; #line 355 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - database_table_fatal ("write_update_photo", _tmp39_); -#line 2578 "PhotoTable.c" + database_table_fatal ("write_update_photo", _tmp27_); +#line 2516 "PhotoTable.c" } #line 357 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" result = FALSE; @@ -2592,114 +2530,88 @@ gboolean photo_table_master_exif_updated (PhotoTable* self, PhotoID* photoID, gi _sqlite3_finalize0 (stmt); #line 357 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 2586 "PhotoTable.c" +#line 2524 "PhotoTable.c" } #line 360 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp40_ = row; -#line 360 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp41_ = _tmp40_->master; + _tmp28_ = row->master; #line 360 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp42_ = filesize; -#line 360 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp41_->filesize = _tmp42_; -#line 361 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp43_ = row; + _tmp28_->filesize = filesize; #line 361 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp44_ = _tmp43_->master; + _tmp29_ = row->master; #line 361 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp45_ = timestamp; -#line 361 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp44_->timestamp = (time_t) _tmp45_; + _tmp29_->timestamp = (time_t) timestamp; #line 362 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp46_ = row; + _tmp30_ = g_strdup (md5); #line 362 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp47_ = md5; + _g_free0 (row->md5); #line 362 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp48_ = g_strdup (_tmp47_); -#line 362 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _g_free0 (_tmp46_->md5); -#line 362 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp46_->md5 = _tmp48_; -#line 363 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp49_ = row; + row->md5 = _tmp30_; #line 363 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp50_ = exif_md5; + _tmp31_ = g_strdup (exif_md5); #line 363 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp51_ = g_strdup (_tmp50_); + _g_free0 (row->exif_md5); #line 363 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _g_free0 (_tmp49_->exif_md5); -#line 363 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp49_->exif_md5 = _tmp51_; -#line 364 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp52_ = row; + row->exif_md5 = _tmp31_; #line 364 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp53_ = thumbnail_md5; -#line 364 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp54_ = g_strdup (_tmp53_); + _tmp32_ = g_strdup (thumbnail_md5); #line 364 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _g_free0 (_tmp52_->thumbnail_md5); + _g_free0 (row->thumbnail_md5); #line 364 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp52_->thumbnail_md5 = _tmp54_; + row->thumbnail_md5 = _tmp32_; #line 366 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" result = TRUE; #line 366 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _sqlite3_finalize0 (stmt); #line 366 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 2640 "PhotoTable.c" +#line 2558 "PhotoTable.c" } -static void photo_table_validate_orientation (PhotoTable* self, PhotoRow* row) { +static void +photo_table_validate_orientation (PhotoTable* self, + PhotoRow* row) +{ gboolean _tmp0_ = FALSE; - PhotoRow* _tmp1_; - Orientation _tmp2_; + Orientation _tmp1_; #line 377 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_if_fail (IS_PHOTO_TABLE (self)); #line 377 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_if_fail (IS_PHOTO_ROW (row)); #line 378 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp1_ = row; -#line 378 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp2_ = _tmp1_->orientation; + _tmp1_ = row->orientation; #line 378 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp2_ < ORIENTATION_MIN) { + if (_tmp1_ < ORIENTATION_MIN) { #line 378 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp0_ = TRUE; -#line 2660 "PhotoTable.c" +#line 2578 "PhotoTable.c" } else { - PhotoRow* _tmp3_; - Orientation _tmp4_; + Orientation _tmp2_; #line 379 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp3_ = row; + _tmp2_ = row->orientation; #line 379 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp4_ = _tmp3_->orientation; -#line 379 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp0_ = _tmp4_ > ORIENTATION_MAX; -#line 2670 "PhotoTable.c" + _tmp0_ = _tmp2_ > ORIENTATION_MAX; +#line 2585 "PhotoTable.c" } #line 378 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (_tmp0_) { -#line 2674 "PhotoTable.c" - PhotoRow* _tmp5_; - PhotoID _tmp6_; - PhotoRow* _tmp7_; +#line 2589 "PhotoTable.c" + PhotoID _tmp3_; #line 381 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp5_ = row; + _tmp3_ = row->photo_id; #line 381 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp6_ = _tmp5_->photo_id; -#line 381 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - photo_table_set_orientation (self, &_tmp6_, ORIENTATION_MIN); -#line 382 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp7_ = row; + photo_table_set_orientation (self, &_tmp3_, ORIENTATION_MIN); #line 382 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp7_->orientation = ORIENTATION_MIN; -#line 2688 "PhotoTable.c" + row->orientation = ORIENTATION_MIN; +#line 2597 "PhotoTable.c" } } -PhotoRow* photo_table_get_row (PhotoTable* self, PhotoID* photo_id) { +PhotoRow* +photo_table_get_row (PhotoTable* self, + PhotoID* photo_id) +{ PhotoRow* result = NULL; sqlite3_stmt* stmt = NULL; gint res = 0; @@ -2711,125 +2623,102 @@ PhotoRow* photo_table_get_row (PhotoTable* self, PhotoID* photo_id) { PhotoID _tmp5_; gint64 _tmp6_; gint _tmp7_; - gint _tmp8_; - sqlite3_stmt* _tmp9_; - gint _tmp10_; + sqlite3_stmt* _tmp8_; PhotoRow* row = NULL; - PhotoRow* _tmp11_; + PhotoRow* _tmp9_; + PhotoRow* _tmp10_; + PhotoID _tmp11_; PhotoRow* _tmp12_; - PhotoID _tmp13_; - PhotoRow* _tmp14_; - BackingPhotoRow* _tmp15_; - sqlite3_stmt* _tmp16_; - const gchar* _tmp17_; - gchar* _tmp18_; - PhotoRow* _tmp19_; - BackingPhotoRow* _tmp20_; - sqlite3_stmt* _tmp21_; - gint _tmp22_; + BackingPhotoRow* _tmp13_; + sqlite3_stmt* _tmp14_; + const gchar* _tmp15_; + gchar* _tmp16_; + PhotoRow* _tmp17_; + BackingPhotoRow* _tmp18_; + sqlite3_stmt* _tmp19_; + sqlite3_stmt* _tmp20_; + PhotoRow* _tmp21_; + BackingPhotoRow* _tmp22_; sqlite3_stmt* _tmp23_; - gint _tmp24_; - PhotoRow* _tmp25_; - BackingPhotoRow* _tmp26_; - sqlite3_stmt* _tmp27_; - gint64 _tmp28_; + PhotoRow* _tmp24_; + BackingPhotoRow* _tmp25_; + sqlite3_stmt* _tmp26_; + PhotoRow* _tmp27_; + sqlite3_stmt* _tmp28_; PhotoRow* _tmp29_; - BackingPhotoRow* _tmp30_; - sqlite3_stmt* _tmp31_; - gint64 _tmp32_; - PhotoRow* _tmp33_; - sqlite3_stmt* _tmp34_; - gint64 _tmp35_; + sqlite3_stmt* _tmp30_; + PhotoRow* _tmp31_; + BackingPhotoRow* _tmp32_; + sqlite3_stmt* _tmp33_; + PhotoRow* _tmp34_; + sqlite3_stmt* _tmp35_; PhotoRow* _tmp36_; sqlite3_stmt* _tmp37_; - gint _tmp38_; - PhotoRow* _tmp39_; - BackingPhotoRow* _tmp40_; - sqlite3_stmt* _tmp41_; - gint _tmp42_; - PhotoRow* _tmp43_; - sqlite3_stmt* _tmp44_; - gint64 _tmp45_; + PhotoRow* _tmp38_; + sqlite3_stmt* _tmp39_; + const gchar* _tmp40_; + GeeHashMap* _tmp41_; + PhotoRow* _tmp42_; + sqlite3_stmt* _tmp43_; + const gchar* _tmp44_; + gchar* _tmp45_; PhotoRow* _tmp46_; sqlite3_stmt* _tmp47_; - gint64 _tmp48_; - PhotoRow* _tmp49_; - sqlite3_stmt* _tmp50_; - const gchar* _tmp51_; - GeeHashMap* _tmp52_; - PhotoRow* _tmp53_; - sqlite3_stmt* _tmp54_; - const gchar* _tmp55_; - gchar* _tmp56_; - PhotoRow* _tmp57_; - sqlite3_stmt* _tmp58_; - const gchar* _tmp59_; - gchar* _tmp60_; - PhotoRow* _tmp61_; + const gchar* _tmp48_; + gchar* _tmp49_; + PhotoRow* _tmp50_; + sqlite3_stmt* _tmp51_; + const gchar* _tmp52_; + gchar* _tmp53_; + PhotoRow* _tmp54_; + sqlite3_stmt* _tmp55_; + PhotoRow* _tmp56_; + sqlite3_stmt* _tmp57_; + PhotoRow* _tmp58_; + sqlite3_stmt* _tmp59_; + PhotoRow* _tmp60_; + BackingPhotoRow* _tmp61_; sqlite3_stmt* _tmp62_; - const gchar* _tmp63_; - gchar* _tmp64_; - PhotoRow* _tmp65_; - sqlite3_stmt* _tmp66_; - gint64 _tmp67_; - PhotoRow* _tmp68_; - sqlite3_stmt* _tmp69_; - gint64 _tmp70_; + PhotoRow* _tmp63_; + sqlite3_stmt* _tmp64_; + const gchar* _tmp65_; + gchar* _tmp66_; + PhotoRow* _tmp67_; + sqlite3_stmt* _tmp68_; + const gchar* _tmp69_; + gchar* _tmp70_; PhotoRow* _tmp71_; sqlite3_stmt* _tmp72_; - gint _tmp73_; - Rating _tmp74_; + PhotoRow* _tmp73_; + sqlite3_stmt* _tmp74_; PhotoRow* _tmp75_; - BackingPhotoRow* _tmp76_; - sqlite3_stmt* _tmp77_; - gint _tmp78_; - PhotoFileFormat _tmp79_; - PhotoRow* _tmp80_; - sqlite3_stmt* _tmp81_; - const gchar* _tmp82_; - gchar* _tmp83_; - PhotoRow* _tmp84_; + sqlite3_stmt* _tmp76_; + RawDeveloper _tmp77_ = 0; + sqlite3_stmt* _tmp78_; + const gchar* _tmp79_; + PhotoRow* _tmp82_; + PhotoRow* _tmp83_; + BackingPhotoID* _tmp84_; + gint _tmp84__length1; sqlite3_stmt* _tmp85_; - const gchar* _tmp86_; - gchar* _tmp87_; + BackingPhotoID _tmp86_ = {0}; + BackingPhotoID _tmp87_; PhotoRow* _tmp88_; - sqlite3_stmt* _tmp89_; - gint64 _tmp90_; - PhotoRow* _tmp91_; - sqlite3_stmt* _tmp92_; - gint64 _tmp93_; - PhotoRow* _tmp94_; + BackingPhotoID* _tmp89_; + gint _tmp89__length1; + sqlite3_stmt* _tmp90_; + BackingPhotoID _tmp91_ = {0}; + BackingPhotoID _tmp92_; + PhotoRow* _tmp93_; + BackingPhotoID* _tmp94_; + gint _tmp94__length1; sqlite3_stmt* _tmp95_; - gint _tmp96_; - RawDeveloper _tmp97_ = 0; - sqlite3_stmt* _tmp98_; - const gchar* _tmp99_; - PhotoRow* _tmp103_; - PhotoRow* _tmp104_; - BackingPhotoID* _tmp105_; - gint _tmp105__length1; - sqlite3_stmt* _tmp106_; - gint64 _tmp107_; - BackingPhotoID _tmp108_ = {0}; - BackingPhotoID _tmp109_; - PhotoRow* _tmp110_; - BackingPhotoID* _tmp111_; - gint _tmp111__length1; - sqlite3_stmt* _tmp112_; - gint64 _tmp113_; - BackingPhotoID _tmp114_ = {0}; - BackingPhotoID _tmp115_; - PhotoRow* _tmp116_; - BackingPhotoID* _tmp117_; - gint _tmp117__length1; - sqlite3_stmt* _tmp118_; - gint64 _tmp119_; - BackingPhotoID _tmp120_ = {0}; - BackingPhotoID _tmp121_; - PhotoRow* _tmp122_; - sqlite3_stmt* _tmp123_; - const gchar* _tmp124_; - gchar* _tmp125_; + BackingPhotoID _tmp96_ = {0}; + BackingPhotoID _tmp97_; + PhotoRow* _tmp98_; + sqlite3_stmt* _tmp99_; + const gchar* _tmp100_; + gchar* _tmp101_; #line 386 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_val_if_fail (IS_PHOTO_TABLE (self), NULL); #line 386 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -2858,360 +2747,313 @@ PhotoRow* photo_table_get_row (PhotoTable* self, PhotoID* photo_id) { #line 398 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp6_ = _tmp5_.id; #line 398 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp7_ = sqlite3_bind_int64 (_tmp4_, 1, _tmp6_); -#line 398 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp7_; + res = sqlite3_bind_int64 (_tmp4_, 1, _tmp6_); #line 399 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp8_ = res; + _tmp7_ = res; #line 399 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp8_ == SQLITE_OK, "res == Sqlite.OK"); -#line 401 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp9_ = stmt; + _vala_assert (_tmp7_ == SQLITE_OK, "res == Sqlite.OK"); #line 401 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp10_ = sqlite3_step (_tmp9_); + _tmp8_ = stmt; #line 401 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp10_ != SQLITE_ROW) { + if (sqlite3_step (_tmp8_) != SQLITE_ROW) { #line 402 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" result = NULL; #line 402 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _sqlite3_finalize0 (stmt); #line 402 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 2868 "PhotoTable.c" +#line 2753 "PhotoTable.c" } #line 404 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp11_ = photo_row_new (); + _tmp9_ = photo_row_new (); #line 404 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - row = _tmp11_; + row = _tmp9_; #line 405 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp12_ = row; + _tmp10_ = row; #line 405 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp13_ = *photo_id; + _tmp11_ = *photo_id; #line 405 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp12_->photo_id = _tmp13_; + _tmp10_->photo_id = _tmp11_; #line 406 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp14_ = row; + _tmp12_ = row; #line 406 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp15_ = _tmp14_->master; + _tmp13_ = _tmp12_->master; #line 406 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp16_ = stmt; + _tmp14_ = stmt; #line 406 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp17_ = sqlite3_column_text (_tmp16_, 0); + _tmp15_ = sqlite3_column_text (_tmp14_, 0); #line 406 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp18_ = g_strdup (_tmp17_); + _tmp16_ = g_strdup (_tmp15_); #line 406 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _g_free0 (_tmp15_->filepath); + _g_free0 (_tmp13_->filepath); #line 406 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp15_->filepath = _tmp18_; + _tmp13_->filepath = _tmp16_; #line 407 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp19_ = row; -#line 407 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp20_ = _tmp19_->master; -#line 407 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp21_ = stmt; + _tmp17_ = row; #line 407 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp22_ = sqlite3_column_int (_tmp21_, 1); + _tmp18_ = _tmp17_->master; #line 407 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp23_ = stmt; + _tmp19_ = stmt; #line 407 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp24_ = sqlite3_column_int (_tmp23_, 2); + _tmp20_ = stmt; #line 407 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - dimensions_init (&_tmp20_->dim, _tmp22_, _tmp24_); -#line 408 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp25_ = row; + dimensions_init (&_tmp18_->dim, sqlite3_column_int (_tmp19_, 1), sqlite3_column_int (_tmp20_, 2)); #line 408 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp26_ = _tmp25_->master; + _tmp21_ = row; #line 408 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp27_ = stmt; + _tmp22_ = _tmp21_->master; #line 408 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp28_ = sqlite3_column_int64 (_tmp27_, 3); + _tmp23_ = stmt; #line 408 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp26_->filesize = _tmp28_; + _tmp22_->filesize = sqlite3_column_int64 (_tmp23_, 3); #line 409 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp29_ = row; -#line 409 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp30_ = _tmp29_->master; + _tmp24_ = row; #line 409 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp31_ = stmt; + _tmp25_ = _tmp24_->master; #line 409 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp32_ = sqlite3_column_int64 (_tmp31_, 4); + _tmp26_ = stmt; #line 409 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp30_->timestamp = (time_t) _tmp32_; + _tmp25_->timestamp = (time_t) sqlite3_column_int64 (_tmp26_, 4); #line 410 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp33_ = row; -#line 410 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp34_ = stmt; + _tmp27_ = row; #line 410 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp35_ = sqlite3_column_int64 (_tmp34_, 5); + _tmp28_ = stmt; #line 410 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp33_->exposure_time = (time_t) _tmp35_; + _tmp27_->exposure_time = (time_t) sqlite3_column_int64 (_tmp28_, 5); #line 411 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp36_ = row; -#line 411 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp37_ = stmt; + _tmp29_ = row; #line 411 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp38_ = sqlite3_column_int (_tmp37_, 6); + _tmp30_ = stmt; #line 411 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp36_->orientation = (Orientation) _tmp38_; + _tmp29_->orientation = (Orientation) sqlite3_column_int (_tmp30_, 6); #line 412 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp39_ = row; + _tmp31_ = row; #line 412 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp40_ = _tmp39_->master; + _tmp32_ = _tmp31_->master; #line 412 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp41_ = stmt; -#line 412 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp42_ = sqlite3_column_int (_tmp41_, 7); + _tmp33_ = stmt; #line 412 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp40_->original_orientation = (Orientation) _tmp42_; -#line 413 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp43_ = row; + _tmp32_->original_orientation = (Orientation) sqlite3_column_int (_tmp33_, 7); #line 413 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp44_ = stmt; + _tmp34_ = row; #line 413 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp45_ = sqlite3_column_int64 (_tmp44_, 8); + _tmp35_ = stmt; #line 413 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp43_->import_id.id = _tmp45_; -#line 414 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp46_ = row; + _tmp34_->import_id.id = sqlite3_column_int64 (_tmp35_, 8); #line 414 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp47_ = stmt; + _tmp36_ = row; #line 414 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp48_ = sqlite3_column_int64 (_tmp47_, 9); + _tmp37_ = stmt; #line 414 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp46_->event_id.id = _tmp48_; + _tmp36_->event_id.id = sqlite3_column_int64 (_tmp37_, 9); #line 415 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp49_ = row; + _tmp38_ = row; #line 415 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp50_ = stmt; + _tmp39_ = stmt; #line 415 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp51_ = sqlite3_column_text (_tmp50_, 10); + _tmp40_ = sqlite3_column_text (_tmp39_, 10); #line 415 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp52_ = photo_table_marshall_all_transformations (_tmp51_); + _tmp41_ = photo_table_marshall_all_transformations (_tmp40_); #line 415 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _g_object_unref0 (_tmp49_->transformations); + _g_object_unref0 (_tmp38_->transformations); #line 415 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp49_->transformations = _tmp52_; + _tmp38_->transformations = _tmp41_; #line 416 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp53_ = row; + _tmp42_ = row; #line 416 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp54_ = stmt; + _tmp43_ = stmt; #line 416 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp55_ = sqlite3_column_text (_tmp54_, 11); + _tmp44_ = sqlite3_column_text (_tmp43_, 11); #line 416 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp56_ = g_strdup (_tmp55_); + _tmp45_ = g_strdup (_tmp44_); #line 416 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _g_free0 (_tmp53_->md5); + _g_free0 (_tmp42_->md5); #line 416 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp53_->md5 = _tmp56_; + _tmp42_->md5 = _tmp45_; #line 417 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp57_ = row; + _tmp46_ = row; #line 417 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp58_ = stmt; + _tmp47_ = stmt; #line 417 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp59_ = sqlite3_column_text (_tmp58_, 12); + _tmp48_ = sqlite3_column_text (_tmp47_, 12); #line 417 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp60_ = g_strdup (_tmp59_); + _tmp49_ = g_strdup (_tmp48_); #line 417 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _g_free0 (_tmp57_->thumbnail_md5); + _g_free0 (_tmp46_->thumbnail_md5); #line 417 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp57_->thumbnail_md5 = _tmp60_; + _tmp46_->thumbnail_md5 = _tmp49_; #line 418 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp61_ = row; + _tmp50_ = row; #line 418 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp62_ = stmt; + _tmp51_ = stmt; #line 418 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp63_ = sqlite3_column_text (_tmp62_, 13); + _tmp52_ = sqlite3_column_text (_tmp51_, 13); #line 418 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp64_ = g_strdup (_tmp63_); + _tmp53_ = g_strdup (_tmp52_); #line 418 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _g_free0 (_tmp61_->exif_md5); + _g_free0 (_tmp50_->exif_md5); #line 418 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp61_->exif_md5 = _tmp64_; + _tmp50_->exif_md5 = _tmp53_; #line 419 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp65_ = row; + _tmp54_ = row; #line 419 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp66_ = stmt; -#line 419 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp67_ = sqlite3_column_int64 (_tmp66_, 14); + _tmp55_ = stmt; #line 419 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp65_->time_created = (time_t) _tmp67_; + _tmp54_->time_created = (time_t) sqlite3_column_int64 (_tmp55_, 14); #line 420 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp68_ = row; -#line 420 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp69_ = stmt; + _tmp56_ = row; #line 420 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp70_ = sqlite3_column_int64 (_tmp69_, 15); + _tmp57_ = stmt; #line 420 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp68_->flags = (guint64) _tmp70_; -#line 421 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp71_ = row; -#line 421 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp72_ = stmt; + _tmp56_->flags = (guint64) sqlite3_column_int64 (_tmp57_, 15); #line 421 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp73_ = sqlite3_column_int (_tmp72_, 16); + _tmp58_ = row; #line 421 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp74_ = rating_unserialize (_tmp73_); + _tmp59_ = stmt; #line 421 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp71_->rating = _tmp74_; + _tmp58_->rating = rating_unserialize (sqlite3_column_int (_tmp59_, 16)); #line 422 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp75_ = row; -#line 422 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp76_ = _tmp75_->master; -#line 422 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp77_ = stmt; + _tmp60_ = row; #line 422 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp78_ = sqlite3_column_int (_tmp77_, 17); + _tmp61_ = _tmp60_->master; #line 422 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp79_ = photo_file_format_unserialize (_tmp78_); + _tmp62_ = stmt; #line 422 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp76_->file_format = _tmp79_; + _tmp61_->file_format = photo_file_format_unserialize (sqlite3_column_int (_tmp62_, 17)); #line 423 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp80_ = row; + _tmp63_ = row; #line 423 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp81_ = stmt; + _tmp64_ = stmt; #line 423 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp82_ = sqlite3_column_text (_tmp81_, 18); + _tmp65_ = sqlite3_column_text (_tmp64_, 18); #line 423 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp83_ = g_strdup (_tmp82_); + _tmp66_ = g_strdup (_tmp65_); #line 423 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _g_free0 (_tmp80_->title); + _g_free0 (_tmp63_->title); #line 423 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp80_->title = _tmp83_; + _tmp63_->title = _tmp66_; #line 424 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp84_ = row; + _tmp67_ = row; #line 424 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp85_ = stmt; + _tmp68_ = stmt; #line 424 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp86_ = sqlite3_column_text (_tmp85_, 19); + _tmp69_ = sqlite3_column_text (_tmp68_, 19); #line 424 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp87_ = g_strdup (_tmp86_); + _tmp70_ = g_strdup (_tmp69_); #line 424 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _g_free0 (_tmp84_->backlinks); + _g_free0 (_tmp67_->backlinks); #line 424 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp84_->backlinks = _tmp87_; -#line 425 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp88_ = row; + _tmp67_->backlinks = _tmp70_; #line 425 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp89_ = stmt; + _tmp71_ = row; #line 425 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp90_ = sqlite3_column_int64 (_tmp89_, 20); + _tmp72_ = stmt; #line 425 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp88_->time_reimported = (time_t) _tmp90_; -#line 426 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp91_ = row; + _tmp71_->time_reimported = (time_t) sqlite3_column_int64 (_tmp72_, 20); #line 426 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp92_ = stmt; + _tmp73_ = row; #line 426 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp93_ = sqlite3_column_int64 (_tmp92_, 21); + _tmp74_ = stmt; #line 426 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - backing_photo_id_init (&_tmp91_->editable_id, _tmp93_); + backing_photo_id_init (&_tmp73_->editable_id, sqlite3_column_int64 (_tmp74_, 21)); #line 427 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp94_ = row; -#line 427 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp95_ = stmt; + _tmp75_ = row; #line 427 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp96_ = sqlite3_column_int (_tmp95_, 22); + _tmp76_ = stmt; #line 427 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp94_->metadata_dirty = _tmp96_ != 0; + _tmp75_->metadata_dirty = sqlite3_column_int (_tmp76_, 22) != 0; #line 428 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp98_ = stmt; + _tmp78_ = stmt; #line 428 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp99_ = sqlite3_column_text (_tmp98_, 23); + _tmp79_ = sqlite3_column_text (_tmp78_, 23); #line 428 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp99_ != NULL) { -#line 3110 "PhotoTable.c" - sqlite3_stmt* _tmp100_; - const gchar* _tmp101_; - RawDeveloper _tmp102_; + if (_tmp79_ != NULL) { +#line 2959 "PhotoTable.c" + sqlite3_stmt* _tmp80_; + const gchar* _tmp81_; #line 428 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp100_ = stmt; + _tmp80_ = stmt; #line 428 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp101_ = sqlite3_column_text (_tmp100_, 23); + _tmp81_ = sqlite3_column_text (_tmp80_, 23); #line 428 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp102_ = raw_developer_from_string (_tmp101_); -#line 428 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp97_ = _tmp102_; -#line 3122 "PhotoTable.c" + _tmp77_ = raw_developer_from_string (_tmp81_); +#line 2968 "PhotoTable.c" } else { #line 429 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp97_ = RAW_DEVELOPER_CAMERA; -#line 3126 "PhotoTable.c" + _tmp77_ = RAW_DEVELOPER_CAMERA; +#line 2972 "PhotoTable.c" } #line 428 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp103_ = row; + _tmp82_ = row; #line 428 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp103_->developer = _tmp97_; -#line 430 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp104_ = row; + _tmp82_->developer = _tmp77_; #line 430 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp105_ = _tmp104_->development_ids; + _tmp83_ = row; #line 430 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp105__length1 = _tmp104_->development_ids_length1; + _tmp84_ = _tmp83_->development_ids; #line 430 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp106_ = stmt; + _tmp84__length1 = _tmp83_->development_ids_length1; #line 430 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp107_ = sqlite3_column_int64 (_tmp106_, 24); + _tmp85_ = stmt; #line 430 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - backing_photo_id_init (&_tmp108_, _tmp107_); + backing_photo_id_init (&_tmp86_, sqlite3_column_int64 (_tmp85_, 24)); #line 430 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp105_[RAW_DEVELOPER_SHOTWELL] = _tmp108_; + _tmp84_[RAW_DEVELOPER_SHOTWELL] = _tmp86_; #line 430 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp109_ = _tmp105_[RAW_DEVELOPER_SHOTWELL]; + _tmp87_ = _tmp84_[RAW_DEVELOPER_SHOTWELL]; #line 431 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp110_ = row; -#line 431 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp111_ = _tmp110_->development_ids; + _tmp88_ = row; #line 431 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp111__length1 = _tmp110_->development_ids_length1; + _tmp89_ = _tmp88_->development_ids; #line 431 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp112_ = stmt; + _tmp89__length1 = _tmp88_->development_ids_length1; #line 431 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp113_ = sqlite3_column_int64 (_tmp112_, 25); + _tmp90_ = stmt; #line 431 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - backing_photo_id_init (&_tmp114_, _tmp113_); + backing_photo_id_init (&_tmp91_, sqlite3_column_int64 (_tmp90_, 25)); #line 431 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp111_[RAW_DEVELOPER_CAMERA] = _tmp114_; + _tmp89_[RAW_DEVELOPER_CAMERA] = _tmp91_; #line 431 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp115_ = _tmp111_[RAW_DEVELOPER_CAMERA]; -#line 432 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp116_ = row; + _tmp92_ = _tmp89_[RAW_DEVELOPER_CAMERA]; #line 432 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp117_ = _tmp116_->development_ids; + _tmp93_ = row; #line 432 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp117__length1 = _tmp116_->development_ids_length1; + _tmp94_ = _tmp93_->development_ids; #line 432 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp118_ = stmt; + _tmp94__length1 = _tmp93_->development_ids_length1; #line 432 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp119_ = sqlite3_column_int64 (_tmp118_, 26); + _tmp95_ = stmt; #line 432 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - backing_photo_id_init (&_tmp120_, _tmp119_); + backing_photo_id_init (&_tmp96_, sqlite3_column_int64 (_tmp95_, 26)); #line 432 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp117_[RAW_DEVELOPER_EMBEDDED] = _tmp120_; + _tmp94_[RAW_DEVELOPER_EMBEDDED] = _tmp96_; #line 432 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp121_ = _tmp117_[RAW_DEVELOPER_EMBEDDED]; + _tmp97_ = _tmp94_[RAW_DEVELOPER_EMBEDDED]; #line 433 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp122_ = row; + _tmp98_ = row; #line 433 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp123_ = stmt; + _tmp99_ = stmt; #line 433 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp124_ = sqlite3_column_text (_tmp123_, 27); + _tmp100_ = sqlite3_column_text (_tmp99_, 27); #line 433 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp125_ = g_strdup (_tmp124_); + _tmp101_ = g_strdup (_tmp100_); #line 433 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _g_free0 (_tmp122_->comment); + _g_free0 (_tmp98_->comment); #line 433 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp122_->comment = _tmp125_; + _tmp98_->comment = _tmp101_; #line 435 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" result = row; #line 435 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _sqlite3_finalize0 (stmt); #line 435 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 3198 "PhotoTable.c" +#line 3038 "PhotoTable.c" } -GeeArrayList* photo_table_get_all (PhotoTable* self) { +GeeArrayList* +photo_table_get_all (PhotoTable* self) +{ GeeArrayList* result = NULL; sqlite3_stmt* stmt = NULL; gint res = 0; @@ -3247,481 +3089,409 @@ GeeArrayList* photo_table_get_all (PhotoTable* self) { all = _tmp4_; #line 451 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" while (TRUE) { -#line 3234 "PhotoTable.c" +#line 3076 "PhotoTable.c" sqlite3_stmt* _tmp5_; gint _tmp6_; - gint _tmp7_; PhotoRow* row = NULL; + PhotoRow* _tmp7_; PhotoRow* _tmp8_; - PhotoRow* _tmp9_; - sqlite3_stmt* _tmp10_; - gint64 _tmp11_; - PhotoRow* _tmp12_; - BackingPhotoRow* _tmp13_; - sqlite3_stmt* _tmp14_; - const gchar* _tmp15_; - gchar* _tmp16_; - PhotoRow* _tmp17_; - BackingPhotoRow* _tmp18_; - sqlite3_stmt* _tmp19_; - gint _tmp20_; + sqlite3_stmt* _tmp9_; + PhotoRow* _tmp10_; + BackingPhotoRow* _tmp11_; + sqlite3_stmt* _tmp12_; + const gchar* _tmp13_; + gchar* _tmp14_; + PhotoRow* _tmp15_; + BackingPhotoRow* _tmp16_; + sqlite3_stmt* _tmp17_; + sqlite3_stmt* _tmp18_; + PhotoRow* _tmp19_; + BackingPhotoRow* _tmp20_; sqlite3_stmt* _tmp21_; - gint _tmp22_; - PhotoRow* _tmp23_; - BackingPhotoRow* _tmp24_; - sqlite3_stmt* _tmp25_; - gint64 _tmp26_; + PhotoRow* _tmp22_; + BackingPhotoRow* _tmp23_; + sqlite3_stmt* _tmp24_; + PhotoRow* _tmp25_; + sqlite3_stmt* _tmp26_; PhotoRow* _tmp27_; - BackingPhotoRow* _tmp28_; - sqlite3_stmt* _tmp29_; - gint64 _tmp30_; - PhotoRow* _tmp31_; - sqlite3_stmt* _tmp32_; - gint64 _tmp33_; + sqlite3_stmt* _tmp28_; + PhotoRow* _tmp29_; + BackingPhotoRow* _tmp30_; + sqlite3_stmt* _tmp31_; + PhotoRow* _tmp32_; + sqlite3_stmt* _tmp33_; PhotoRow* _tmp34_; sqlite3_stmt* _tmp35_; - gint _tmp36_; - PhotoRow* _tmp37_; - BackingPhotoRow* _tmp38_; - sqlite3_stmt* _tmp39_; - gint _tmp40_; - PhotoRow* _tmp41_; - sqlite3_stmt* _tmp42_; - gint64 _tmp43_; + PhotoRow* _tmp36_; + sqlite3_stmt* _tmp37_; + const gchar* _tmp38_; + GeeHashMap* _tmp39_; + PhotoRow* _tmp40_; + sqlite3_stmt* _tmp41_; + const gchar* _tmp42_; + gchar* _tmp43_; PhotoRow* _tmp44_; sqlite3_stmt* _tmp45_; - gint64 _tmp46_; - PhotoRow* _tmp47_; - sqlite3_stmt* _tmp48_; - const gchar* _tmp49_; - GeeHashMap* _tmp50_; - PhotoRow* _tmp51_; - sqlite3_stmt* _tmp52_; - const gchar* _tmp53_; - gchar* _tmp54_; - PhotoRow* _tmp55_; - sqlite3_stmt* _tmp56_; - const gchar* _tmp57_; - gchar* _tmp58_; - PhotoRow* _tmp59_; + const gchar* _tmp46_; + gchar* _tmp47_; + PhotoRow* _tmp48_; + sqlite3_stmt* _tmp49_; + const gchar* _tmp50_; + gchar* _tmp51_; + PhotoRow* _tmp52_; + sqlite3_stmt* _tmp53_; + PhotoRow* _tmp54_; + sqlite3_stmt* _tmp55_; + PhotoRow* _tmp56_; + sqlite3_stmt* _tmp57_; + PhotoRow* _tmp58_; + BackingPhotoRow* _tmp59_; sqlite3_stmt* _tmp60_; - const gchar* _tmp61_; - gchar* _tmp62_; - PhotoRow* _tmp63_; - sqlite3_stmt* _tmp64_; - gint64 _tmp65_; - PhotoRow* _tmp66_; - sqlite3_stmt* _tmp67_; - gint64 _tmp68_; + PhotoRow* _tmp61_; + sqlite3_stmt* _tmp62_; + const gchar* _tmp63_; + gchar* _tmp64_; + PhotoRow* _tmp65_; + sqlite3_stmt* _tmp66_; + const gchar* _tmp67_; + gchar* _tmp68_; PhotoRow* _tmp69_; sqlite3_stmt* _tmp70_; - gint _tmp71_; - Rating _tmp72_; + PhotoRow* _tmp71_; + sqlite3_stmt* _tmp72_; PhotoRow* _tmp73_; - BackingPhotoRow* _tmp74_; - sqlite3_stmt* _tmp75_; - gint _tmp76_; - PhotoFileFormat _tmp77_; - PhotoRow* _tmp78_; - sqlite3_stmt* _tmp79_; - const gchar* _tmp80_; - gchar* _tmp81_; - PhotoRow* _tmp82_; + sqlite3_stmt* _tmp74_; + RawDeveloper _tmp75_ = 0; + sqlite3_stmt* _tmp76_; + const gchar* _tmp77_; + PhotoRow* _tmp80_; + PhotoRow* _tmp81_; + BackingPhotoID* _tmp82_; + gint _tmp82__length1; sqlite3_stmt* _tmp83_; - const gchar* _tmp84_; - gchar* _tmp85_; + BackingPhotoID _tmp84_ = {0}; + BackingPhotoID _tmp85_; PhotoRow* _tmp86_; - sqlite3_stmt* _tmp87_; - gint64 _tmp88_; - PhotoRow* _tmp89_; - sqlite3_stmt* _tmp90_; - gint64 _tmp91_; - PhotoRow* _tmp92_; + BackingPhotoID* _tmp87_; + gint _tmp87__length1; + sqlite3_stmt* _tmp88_; + BackingPhotoID _tmp89_ = {0}; + BackingPhotoID _tmp90_; + PhotoRow* _tmp91_; + BackingPhotoID* _tmp92_; + gint _tmp92__length1; sqlite3_stmt* _tmp93_; - gint _tmp94_; - RawDeveloper _tmp95_ = 0; - sqlite3_stmt* _tmp96_; - const gchar* _tmp97_; - PhotoRow* _tmp101_; + BackingPhotoID _tmp94_ = {0}; + BackingPhotoID _tmp95_; + PhotoRow* _tmp96_; + sqlite3_stmt* _tmp97_; + const gchar* _tmp98_; + gchar* _tmp99_; + PhotoRow* _tmp100_; + GeeArrayList* _tmp101_; PhotoRow* _tmp102_; - BackingPhotoID* _tmp103_; - gint _tmp103__length1; - sqlite3_stmt* _tmp104_; - gint64 _tmp105_; - BackingPhotoID _tmp106_ = {0}; - BackingPhotoID _tmp107_; - PhotoRow* _tmp108_; - BackingPhotoID* _tmp109_; - gint _tmp109__length1; - sqlite3_stmt* _tmp110_; - gint64 _tmp111_; - BackingPhotoID _tmp112_ = {0}; - BackingPhotoID _tmp113_; - PhotoRow* _tmp114_; - BackingPhotoID* _tmp115_; - gint _tmp115__length1; - sqlite3_stmt* _tmp116_; - gint64 _tmp117_; - BackingPhotoID _tmp118_ = {0}; - BackingPhotoID _tmp119_; - PhotoRow* _tmp120_; - sqlite3_stmt* _tmp121_; - const gchar* _tmp122_; - gchar* _tmp123_; - PhotoRow* _tmp124_; - GeeArrayList* _tmp125_; - PhotoRow* _tmp126_; #line 451 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp5_ = stmt; #line 451 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp6_ = sqlite3_step (_tmp5_); -#line 451 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp6_; + res = sqlite3_step (_tmp5_); #line 451 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp7_ = res; + _tmp6_ = res; #line 451 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (!(_tmp7_ == SQLITE_ROW)) { + if (!(_tmp6_ == SQLITE_ROW)) { #line 451 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" break; -#line 3370 "PhotoTable.c" +#line 3187 "PhotoTable.c" } #line 452 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp8_ = photo_row_new (); + _tmp7_ = photo_row_new (); #line 452 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - row = _tmp8_; + row = _tmp7_; #line 453 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp9_ = row; + _tmp8_ = row; #line 453 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp10_ = stmt; + _tmp9_ = stmt; #line 453 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp11_ = sqlite3_column_int64 (_tmp10_, 0); -#line 453 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp9_->photo_id.id = _tmp11_; + _tmp8_->photo_id.id = sqlite3_column_int64 (_tmp9_, 0); #line 454 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp12_ = row; + _tmp10_ = row; #line 454 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp13_ = _tmp12_->master; + _tmp11_ = _tmp10_->master; #line 454 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp14_ = stmt; + _tmp12_ = stmt; #line 454 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp15_ = sqlite3_column_text (_tmp14_, 1); + _tmp13_ = sqlite3_column_text (_tmp12_, 1); #line 454 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp16_ = g_strdup (_tmp15_); + _tmp14_ = g_strdup (_tmp13_); #line 454 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _g_free0 (_tmp13_->filepath); + _g_free0 (_tmp11_->filepath); #line 454 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp13_->filepath = _tmp16_; -#line 455 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp17_ = row; + _tmp11_->filepath = _tmp14_; #line 455 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp18_ = _tmp17_->master; + _tmp15_ = row; #line 455 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp19_ = stmt; + _tmp16_ = _tmp15_->master; #line 455 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp20_ = sqlite3_column_int (_tmp19_, 2); -#line 455 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp21_ = stmt; + _tmp17_ = stmt; #line 455 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp22_ = sqlite3_column_int (_tmp21_, 3); + _tmp18_ = stmt; #line 455 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - dimensions_init (&_tmp18_->dim, _tmp20_, _tmp22_); + dimensions_init (&_tmp16_->dim, sqlite3_column_int (_tmp17_, 2), sqlite3_column_int (_tmp18_, 3)); #line 456 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp23_ = row; + _tmp19_ = row; #line 456 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp24_ = _tmp23_->master; + _tmp20_ = _tmp19_->master; #line 456 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp25_ = stmt; -#line 456 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp26_ = sqlite3_column_int64 (_tmp25_, 4); + _tmp21_ = stmt; #line 456 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp24_->filesize = _tmp26_; -#line 457 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp27_ = row; + _tmp20_->filesize = sqlite3_column_int64 (_tmp21_, 4); #line 457 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp28_ = _tmp27_->master; + _tmp22_ = row; #line 457 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp29_ = stmt; + _tmp23_ = _tmp22_->master; #line 457 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp30_ = sqlite3_column_int64 (_tmp29_, 5); + _tmp24_ = stmt; #line 457 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp28_->timestamp = (time_t) _tmp30_; -#line 458 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp31_ = row; + _tmp23_->timestamp = (time_t) sqlite3_column_int64 (_tmp24_, 5); #line 458 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp32_ = stmt; + _tmp25_ = row; #line 458 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp33_ = sqlite3_column_int64 (_tmp32_, 6); + _tmp26_ = stmt; #line 458 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp31_->exposure_time = (time_t) _tmp33_; -#line 459 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp34_ = row; + _tmp25_->exposure_time = (time_t) sqlite3_column_int64 (_tmp26_, 6); #line 459 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp35_ = stmt; + _tmp27_ = row; #line 459 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp36_ = sqlite3_column_int (_tmp35_, 7); + _tmp28_ = stmt; #line 459 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp34_->orientation = (Orientation) _tmp36_; -#line 460 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp37_ = row; + _tmp27_->orientation = (Orientation) sqlite3_column_int (_tmp28_, 7); #line 460 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp38_ = _tmp37_->master; + _tmp29_ = row; #line 460 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp39_ = stmt; + _tmp30_ = _tmp29_->master; #line 460 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp40_ = sqlite3_column_int (_tmp39_, 8); + _tmp31_ = stmt; #line 460 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp38_->original_orientation = (Orientation) _tmp40_; + _tmp30_->original_orientation = (Orientation) sqlite3_column_int (_tmp31_, 8); #line 461 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp41_ = row; + _tmp32_ = row; #line 461 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp42_ = stmt; + _tmp33_ = stmt; #line 461 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp43_ = sqlite3_column_int64 (_tmp42_, 9); -#line 461 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp41_->import_id.id = _tmp43_; -#line 462 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp44_ = row; + _tmp32_->import_id.id = sqlite3_column_int64 (_tmp33_, 9); #line 462 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp45_ = stmt; + _tmp34_ = row; #line 462 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp46_ = sqlite3_column_int64 (_tmp45_, 10); + _tmp35_ = stmt; #line 462 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp44_->event_id.id = _tmp46_; + _tmp34_->event_id.id = sqlite3_column_int64 (_tmp35_, 10); #line 463 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp47_ = row; + _tmp36_ = row; #line 463 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp48_ = stmt; + _tmp37_ = stmt; #line 463 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp49_ = sqlite3_column_text (_tmp48_, 11); + _tmp38_ = sqlite3_column_text (_tmp37_, 11); #line 463 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp50_ = photo_table_marshall_all_transformations (_tmp49_); + _tmp39_ = photo_table_marshall_all_transformations (_tmp38_); #line 463 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _g_object_unref0 (_tmp47_->transformations); + _g_object_unref0 (_tmp36_->transformations); #line 463 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp47_->transformations = _tmp50_; + _tmp36_->transformations = _tmp39_; #line 464 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp51_ = row; + _tmp40_ = row; #line 464 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp52_ = stmt; + _tmp41_ = stmt; #line 464 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp53_ = sqlite3_column_text (_tmp52_, 12); + _tmp42_ = sqlite3_column_text (_tmp41_, 12); #line 464 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp54_ = g_strdup (_tmp53_); + _tmp43_ = g_strdup (_tmp42_); #line 464 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _g_free0 (_tmp51_->md5); + _g_free0 (_tmp40_->md5); #line 464 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp51_->md5 = _tmp54_; + _tmp40_->md5 = _tmp43_; #line 465 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp55_ = row; + _tmp44_ = row; #line 465 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp56_ = stmt; + _tmp45_ = stmt; #line 465 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp57_ = sqlite3_column_text (_tmp56_, 13); + _tmp46_ = sqlite3_column_text (_tmp45_, 13); #line 465 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp58_ = g_strdup (_tmp57_); + _tmp47_ = g_strdup (_tmp46_); #line 465 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _g_free0 (_tmp55_->thumbnail_md5); + _g_free0 (_tmp44_->thumbnail_md5); #line 465 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp55_->thumbnail_md5 = _tmp58_; + _tmp44_->thumbnail_md5 = _tmp47_; #line 466 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp59_ = row; + _tmp48_ = row; #line 466 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp60_ = stmt; + _tmp49_ = stmt; #line 466 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp61_ = sqlite3_column_text (_tmp60_, 14); + _tmp50_ = sqlite3_column_text (_tmp49_, 14); #line 466 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp62_ = g_strdup (_tmp61_); + _tmp51_ = g_strdup (_tmp50_); #line 466 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _g_free0 (_tmp59_->exif_md5); + _g_free0 (_tmp48_->exif_md5); #line 466 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp59_->exif_md5 = _tmp62_; -#line 467 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp63_ = row; + _tmp48_->exif_md5 = _tmp51_; #line 467 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp64_ = stmt; + _tmp52_ = row; #line 467 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp65_ = sqlite3_column_int64 (_tmp64_, 15); + _tmp53_ = stmt; #line 467 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp63_->time_created = (time_t) _tmp65_; + _tmp52_->time_created = (time_t) sqlite3_column_int64 (_tmp53_, 15); #line 468 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp66_ = row; + _tmp54_ = row; #line 468 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp67_ = stmt; -#line 468 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp68_ = sqlite3_column_int64 (_tmp67_, 16); + _tmp55_ = stmt; #line 468 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp66_->flags = (guint64) _tmp68_; + _tmp54_->flags = (guint64) sqlite3_column_int64 (_tmp55_, 16); #line 469 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp69_ = row; -#line 469 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp70_ = stmt; + _tmp56_ = row; #line 469 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp71_ = sqlite3_column_int (_tmp70_, 17); + _tmp57_ = stmt; #line 469 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp72_ = rating_unserialize (_tmp71_); -#line 469 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp69_->rating = _tmp72_; -#line 470 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp73_ = row; -#line 470 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp74_ = _tmp73_->master; + _tmp56_->rating = rating_unserialize (sqlite3_column_int (_tmp57_, 17)); #line 470 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp75_ = stmt; + _tmp58_ = row; #line 470 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp76_ = sqlite3_column_int (_tmp75_, 18); + _tmp59_ = _tmp58_->master; #line 470 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp77_ = photo_file_format_unserialize (_tmp76_); + _tmp60_ = stmt; #line 470 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp74_->file_format = _tmp77_; + _tmp59_->file_format = photo_file_format_unserialize (sqlite3_column_int (_tmp60_, 18)); #line 471 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp78_ = row; + _tmp61_ = row; #line 471 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp79_ = stmt; + _tmp62_ = stmt; #line 471 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp80_ = sqlite3_column_text (_tmp79_, 19); + _tmp63_ = sqlite3_column_text (_tmp62_, 19); #line 471 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp81_ = g_strdup (_tmp80_); + _tmp64_ = g_strdup (_tmp63_); #line 471 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _g_free0 (_tmp78_->title); + _g_free0 (_tmp61_->title); #line 471 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp78_->title = _tmp81_; + _tmp61_->title = _tmp64_; #line 472 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp82_ = row; + _tmp65_ = row; #line 472 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp83_ = stmt; + _tmp66_ = stmt; #line 472 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp84_ = sqlite3_column_text (_tmp83_, 20); + _tmp67_ = sqlite3_column_text (_tmp66_, 20); #line 472 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp85_ = g_strdup (_tmp84_); + _tmp68_ = g_strdup (_tmp67_); #line 472 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _g_free0 (_tmp82_->backlinks); + _g_free0 (_tmp65_->backlinks); #line 472 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp82_->backlinks = _tmp85_; -#line 473 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp86_ = row; + _tmp65_->backlinks = _tmp68_; #line 473 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp87_ = stmt; + _tmp69_ = row; #line 473 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp88_ = sqlite3_column_int64 (_tmp87_, 21); + _tmp70_ = stmt; #line 473 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp86_->time_reimported = (time_t) _tmp88_; -#line 474 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp89_ = row; + _tmp69_->time_reimported = (time_t) sqlite3_column_int64 (_tmp70_, 21); #line 474 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp90_ = stmt; + _tmp71_ = row; #line 474 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp91_ = sqlite3_column_int64 (_tmp90_, 22); + _tmp72_ = stmt; #line 474 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - backing_photo_id_init (&_tmp89_->editable_id, _tmp91_); + backing_photo_id_init (&_tmp71_->editable_id, sqlite3_column_int64 (_tmp72_, 22)); #line 475 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp92_ = row; -#line 475 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp93_ = stmt; + _tmp73_ = row; #line 475 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp94_ = sqlite3_column_int (_tmp93_, 23); + _tmp74_ = stmt; #line 475 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp92_->metadata_dirty = _tmp94_ != 0; + _tmp73_->metadata_dirty = sqlite3_column_int (_tmp74_, 23) != 0; #line 476 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp96_ = stmt; + _tmp76_ = stmt; #line 476 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp97_ = sqlite3_column_text (_tmp96_, 24); + _tmp77_ = sqlite3_column_text (_tmp76_, 24); #line 476 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp97_ != NULL) { -#line 3614 "PhotoTable.c" - sqlite3_stmt* _tmp98_; - const gchar* _tmp99_; - RawDeveloper _tmp100_; + if (_tmp77_ != NULL) { +#line 3393 "PhotoTable.c" + sqlite3_stmt* _tmp78_; + const gchar* _tmp79_; #line 476 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp98_ = stmt; + _tmp78_ = stmt; #line 476 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp99_ = sqlite3_column_text (_tmp98_, 24); + _tmp79_ = sqlite3_column_text (_tmp78_, 24); #line 476 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp100_ = raw_developer_from_string (_tmp99_); -#line 476 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp95_ = _tmp100_; -#line 3626 "PhotoTable.c" + _tmp75_ = raw_developer_from_string (_tmp79_); +#line 3402 "PhotoTable.c" } else { #line 477 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp95_ = RAW_DEVELOPER_CAMERA; -#line 3630 "PhotoTable.c" + _tmp75_ = RAW_DEVELOPER_CAMERA; +#line 3406 "PhotoTable.c" } #line 476 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp101_ = row; + _tmp80_ = row; #line 476 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp101_->developer = _tmp95_; -#line 478 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp102_ = row; + _tmp80_->developer = _tmp75_; #line 478 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp103_ = _tmp102_->development_ids; + _tmp81_ = row; #line 478 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp103__length1 = _tmp102_->development_ids_length1; + _tmp82_ = _tmp81_->development_ids; #line 478 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp104_ = stmt; + _tmp82__length1 = _tmp81_->development_ids_length1; #line 478 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp105_ = sqlite3_column_int64 (_tmp104_, 25); + _tmp83_ = stmt; #line 478 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - backing_photo_id_init (&_tmp106_, _tmp105_); + backing_photo_id_init (&_tmp84_, sqlite3_column_int64 (_tmp83_, 25)); #line 478 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp103_[RAW_DEVELOPER_SHOTWELL] = _tmp106_; + _tmp82_[RAW_DEVELOPER_SHOTWELL] = _tmp84_; #line 478 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp107_ = _tmp103_[RAW_DEVELOPER_SHOTWELL]; + _tmp85_ = _tmp82_[RAW_DEVELOPER_SHOTWELL]; #line 479 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp108_ = row; -#line 479 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp109_ = _tmp108_->development_ids; + _tmp86_ = row; #line 479 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp109__length1 = _tmp108_->development_ids_length1; + _tmp87_ = _tmp86_->development_ids; #line 479 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp110_ = stmt; + _tmp87__length1 = _tmp86_->development_ids_length1; #line 479 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp111_ = sqlite3_column_int64 (_tmp110_, 26); + _tmp88_ = stmt; #line 479 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - backing_photo_id_init (&_tmp112_, _tmp111_); + backing_photo_id_init (&_tmp89_, sqlite3_column_int64 (_tmp88_, 26)); #line 479 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp109_[RAW_DEVELOPER_CAMERA] = _tmp112_; + _tmp87_[RAW_DEVELOPER_CAMERA] = _tmp89_; #line 479 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp113_ = _tmp109_[RAW_DEVELOPER_CAMERA]; + _tmp90_ = _tmp87_[RAW_DEVELOPER_CAMERA]; #line 480 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp114_ = row; + _tmp91_ = row; #line 480 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp115_ = _tmp114_->development_ids; + _tmp92_ = _tmp91_->development_ids; #line 480 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp115__length1 = _tmp114_->development_ids_length1; + _tmp92__length1 = _tmp91_->development_ids_length1; #line 480 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp116_ = stmt; -#line 480 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp117_ = sqlite3_column_int64 (_tmp116_, 27); + _tmp93_ = stmt; #line 480 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - backing_photo_id_init (&_tmp118_, _tmp117_); + backing_photo_id_init (&_tmp94_, sqlite3_column_int64 (_tmp93_, 27)); #line 480 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp115_[RAW_DEVELOPER_EMBEDDED] = _tmp118_; + _tmp92_[RAW_DEVELOPER_EMBEDDED] = _tmp94_; #line 480 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp119_ = _tmp115_[RAW_DEVELOPER_EMBEDDED]; + _tmp95_ = _tmp92_[RAW_DEVELOPER_EMBEDDED]; #line 481 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp120_ = row; + _tmp96_ = row; #line 481 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp121_ = stmt; + _tmp97_ = stmt; #line 481 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp122_ = sqlite3_column_text (_tmp121_, 28); + _tmp98_ = sqlite3_column_text (_tmp97_, 28); #line 481 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp123_ = g_strdup (_tmp122_); + _tmp99_ = g_strdup (_tmp98_); #line 481 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _g_free0 (_tmp120_->comment); + _g_free0 (_tmp96_->comment); #line 481 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp120_->comment = _tmp123_; + _tmp96_->comment = _tmp99_; #line 483 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp124_ = row; + _tmp100_ = row; #line 483 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - photo_table_validate_orientation (self, _tmp124_); + photo_table_validate_orientation (self, _tmp100_); #line 485 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp125_ = all; + _tmp101_ = all; #line 485 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp126_ = row; + _tmp102_ = row; #line 485 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp125_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp126_); + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp101_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp102_); #line 451 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _photo_row_unref0 (row); -#line 3708 "PhotoTable.c" +#line 3478 "PhotoTable.c" } #line 488 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" result = all; @@ -3729,11 +3499,20 @@ GeeArrayList* photo_table_get_all (PhotoTable* self) { _sqlite3_finalize0 (stmt); #line 488 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 3716 "PhotoTable.c" +#line 3486 "PhotoTable.c" } -void photo_table_duplicate (PhotoTable* self, PhotoID* photo_id, const gchar* new_filename, BackingPhotoID* editable_id, BackingPhotoID* develop_shotwell, BackingPhotoID* develop_camera_id, BackingPhotoID* develop_embedded_id, PhotoID* result) { +void +photo_table_duplicate (PhotoTable* self, + PhotoID* photo_id, + const gchar* new_filename, + BackingPhotoID* editable_id, + BackingPhotoID* develop_shotwell, + BackingPhotoID* develop_camera_id, + BackingPhotoID* develop_embedded_id, + PhotoID* result) +{ PhotoRow* original = NULL; PhotoID _tmp0_; PhotoRow* _tmp1_; @@ -3744,71 +3523,71 @@ void photo_table_duplicate (PhotoTable* self, PhotoID* photo_id, const gchar* ne gint _tmp4_; gint _tmp5_; sqlite3_stmt* _tmp6_; - const gchar* _tmp7_; - gchar* _tmp8_; - GDestroyNotify _tmp9_; - gint _tmp10_; - gint _tmp11_; - sqlite3_stmt* _tmp12_; - PhotoRow* _tmp13_; - BackingPhotoRow* _tmp14_; - Dimensions _tmp15_; - gint _tmp16_; - gint _tmp17_; - gint _tmp18_; - sqlite3_stmt* _tmp19_; - PhotoRow* _tmp20_; - BackingPhotoRow* _tmp21_; - Dimensions _tmp22_; - gint _tmp23_; - gint _tmp24_; - gint _tmp25_; - sqlite3_stmt* _tmp26_; - PhotoRow* _tmp27_; - BackingPhotoRow* _tmp28_; - gint64 _tmp29_; - gint _tmp30_; + gchar* _tmp7_; + GDestroyNotify _tmp8_; + gint _tmp9_; + sqlite3_stmt* _tmp10_; + PhotoRow* _tmp11_; + BackingPhotoRow* _tmp12_; + Dimensions _tmp13_; + gint _tmp14_; + gint _tmp15_; + sqlite3_stmt* _tmp16_; + PhotoRow* _tmp17_; + BackingPhotoRow* _tmp18_; + Dimensions _tmp19_; + gint _tmp20_; + gint _tmp21_; + sqlite3_stmt* _tmp22_; + PhotoRow* _tmp23_; + BackingPhotoRow* _tmp24_; + gint64 _tmp25_; + gint _tmp26_; + sqlite3_stmt* _tmp27_; + PhotoRow* _tmp28_; + BackingPhotoRow* _tmp29_; + time_t _tmp30_; gint _tmp31_; sqlite3_stmt* _tmp32_; PhotoRow* _tmp33_; - BackingPhotoRow* _tmp34_; - time_t _tmp35_; - gint _tmp36_; - gint _tmp37_; - sqlite3_stmt* _tmp38_; - PhotoRow* _tmp39_; - time_t _tmp40_; - gint _tmp41_; - gint _tmp42_; - sqlite3_stmt* _tmp43_; - PhotoRow* _tmp44_; - Orientation _tmp45_; - gint _tmp46_; - gint _tmp47_; - sqlite3_stmt* _tmp48_; - PhotoRow* _tmp49_; - BackingPhotoRow* _tmp50_; - Orientation _tmp51_; - gint _tmp52_; - gint _tmp53_; - sqlite3_stmt* _tmp54_; - PhotoRow* _tmp55_; - ImportID _tmp56_; - gint64 _tmp57_; - gint _tmp58_; - gint _tmp59_; - sqlite3_stmt* _tmp60_; - PhotoRow* _tmp61_; - EventID _tmp62_; - gint64 _tmp63_; - gint _tmp64_; - gint _tmp65_; - sqlite3_stmt* _tmp66_; - PhotoRow* _tmp67_; - GeeHashMap* _tmp68_; - gchar* _tmp69_; - GDestroyNotify _tmp70_; - gint _tmp71_; + time_t _tmp34_; + gint _tmp35_; + sqlite3_stmt* _tmp36_; + PhotoRow* _tmp37_; + Orientation _tmp38_; + gint _tmp39_; + sqlite3_stmt* _tmp40_; + PhotoRow* _tmp41_; + BackingPhotoRow* _tmp42_; + Orientation _tmp43_; + gint _tmp44_; + sqlite3_stmt* _tmp45_; + PhotoRow* _tmp46_; + ImportID _tmp47_; + gint64 _tmp48_; + gint _tmp49_; + sqlite3_stmt* _tmp50_; + PhotoRow* _tmp51_; + EventID _tmp52_; + gint64 _tmp53_; + gint _tmp54_; + sqlite3_stmt* _tmp55_; + PhotoRow* _tmp56_; + GeeHashMap* _tmp57_; + gchar* _tmp58_; + GDestroyNotify _tmp59_; + gint _tmp60_; + sqlite3_stmt* _tmp61_; + PhotoRow* _tmp62_; + const gchar* _tmp63_; + gchar* _tmp64_; + GDestroyNotify _tmp65_; + gint _tmp66_; + sqlite3_stmt* _tmp67_; + PhotoRow* _tmp68_; + const gchar* _tmp69_; + gchar* _tmp70_; + GDestroyNotify _tmp71_; gint _tmp72_; sqlite3_stmt* _tmp73_; PhotoRow* _tmp74_; @@ -3816,90 +3595,59 @@ void photo_table_duplicate (PhotoTable* self, PhotoID* photo_id, const gchar* ne gchar* _tmp76_; GDestroyNotify _tmp77_; gint _tmp78_; - gint _tmp79_; - sqlite3_stmt* _tmp80_; - PhotoRow* _tmp81_; - const gchar* _tmp82_; - gchar* _tmp83_; - GDestroyNotify _tmp84_; - gint _tmp85_; - gint _tmp86_; - sqlite3_stmt* _tmp87_; - PhotoRow* _tmp88_; - const gchar* _tmp89_; - gchar* _tmp90_; - GDestroyNotify _tmp91_; - gint _tmp92_; + sqlite3_stmt* _tmp79_; + gint _tmp80_; + sqlite3_stmt* _tmp81_; + PhotoRow* _tmp82_; + guint64 _tmp83_; + gint _tmp84_; + sqlite3_stmt* _tmp85_; + PhotoRow* _tmp86_; + Rating _tmp87_; + gint _tmp88_; + sqlite3_stmt* _tmp89_; + PhotoRow* _tmp90_; + BackingPhotoRow* _tmp91_; + PhotoFileFormat _tmp92_; gint _tmp93_; sqlite3_stmt* _tmp94_; - gulong _tmp95_; - gint _tmp96_; - gint _tmp97_; - sqlite3_stmt* _tmp98_; - PhotoRow* _tmp99_; - guint64 _tmp100_; - gint _tmp101_; - gint _tmp102_; - sqlite3_stmt* _tmp103_; - PhotoRow* _tmp104_; - Rating _tmp105_; - gint _tmp106_; - gint _tmp107_; - gint _tmp108_; - sqlite3_stmt* _tmp109_; - PhotoRow* _tmp110_; - BackingPhotoRow* _tmp111_; - PhotoFileFormat _tmp112_; + PhotoRow* _tmp95_; + const gchar* _tmp96_; + gchar* _tmp97_; + GDestroyNotify _tmp98_; + gint _tmp99_; + sqlite3_stmt* _tmp100_; + BackingPhotoID _tmp101_; + gint64 _tmp102_; + gint _tmp103_; + sqlite3_stmt* _tmp104_; + PhotoRow* _tmp105_; + RawDeveloper _tmp106_; + gchar* _tmp107_; + GDestroyNotify _tmp108_; + gint _tmp109_; + sqlite3_stmt* _tmp110_; + BackingPhotoID _tmp111_; + gint64 _tmp112_; gint _tmp113_; - gint _tmp114_; - gint _tmp115_; - sqlite3_stmt* _tmp116_; - PhotoRow* _tmp117_; - const gchar* _tmp118_; - gchar* _tmp119_; - GDestroyNotify _tmp120_; + sqlite3_stmt* _tmp114_; + BackingPhotoID _tmp115_; + gint64 _tmp116_; + gint _tmp117_; + sqlite3_stmt* _tmp118_; + BackingPhotoID _tmp119_; + gint64 _tmp120_; gint _tmp121_; - gint _tmp122_; - sqlite3_stmt* _tmp123_; - BackingPhotoID _tmp124_; - gint64 _tmp125_; - gint _tmp126_; + sqlite3_stmt* _tmp122_; + PhotoRow* _tmp123_; + const gchar* _tmp124_; + gchar* _tmp125_; + GDestroyNotify _tmp126_; gint _tmp127_; sqlite3_stmt* _tmp128_; - PhotoRow* _tmp129_; - RawDeveloper _tmp130_; - gchar* _tmp131_; - GDestroyNotify _tmp132_; - gint _tmp133_; - gint _tmp134_; - sqlite3_stmt* _tmp135_; - BackingPhotoID _tmp136_; - gint64 _tmp137_; - gint _tmp138_; - gint _tmp139_; - sqlite3_stmt* _tmp140_; - BackingPhotoID _tmp141_; - gint64 _tmp142_; - gint _tmp143_; - gint _tmp144_; - sqlite3_stmt* _tmp145_; - BackingPhotoID _tmp146_; - gint64 _tmp147_; - gint _tmp148_; - gint _tmp149_; - sqlite3_stmt* _tmp150_; - PhotoRow* _tmp151_; - const gchar* _tmp152_; - gchar* _tmp153_; - GDestroyNotify _tmp154_; - gint _tmp155_; - gint _tmp156_; - sqlite3_stmt* _tmp157_; - gint _tmp158_; - gint _tmp159_; - sqlite3* _tmp163_; - gint64 _tmp164_; - PhotoID _tmp165_ = {0}; + gint _tmp129_; + sqlite3* _tmp133_; + PhotoID _tmp134_ = {0}; #line 493 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_if_fail (IS_PHOTO_TABLE (self)); #line 493 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -3941,546 +3689,476 @@ void photo_table_duplicate (PhotoTable* self, PhotoID* photo_id, const gchar* ne #line 509 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp6_ = stmt; #line 509 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp7_ = new_filename; -#line 509 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp8_ = g_strdup (_tmp7_); + _tmp7_ = g_strdup (new_filename); #line 509 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp9_ = g_free; + _tmp8_ = g_free; #line 509 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp10_ = sqlite3_bind_text (_tmp6_, 1, _tmp8_, -1, _tmp9_); -#line 509 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp10_; + res = sqlite3_bind_text (_tmp6_, 1, _tmp7_, -1, _tmp8_); #line 510 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp11_ = res; + _tmp9_ = res; #line 510 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp11_ == SQLITE_OK, "res == Sqlite.OK"); -#line 511 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp12_ = stmt; + _vala_assert (_tmp9_ == SQLITE_OK, "res == Sqlite.OK"); #line 511 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp13_ = original; + _tmp10_ = stmt; #line 511 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp14_ = _tmp13_->master; + _tmp11_ = original; #line 511 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp15_ = _tmp14_->dim; + _tmp12_ = _tmp11_->master; #line 511 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp16_ = _tmp15_.width; + _tmp13_ = _tmp12_->dim; #line 511 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp17_ = sqlite3_bind_int (_tmp12_, 2, _tmp16_); + _tmp14_ = _tmp13_.width; #line 511 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp17_; + res = sqlite3_bind_int (_tmp10_, 2, _tmp14_); #line 512 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp18_ = res; + _tmp15_ = res; #line 512 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp18_ == SQLITE_OK, "res == Sqlite.OK"); + _vala_assert (_tmp15_ == SQLITE_OK, "res == Sqlite.OK"); #line 513 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp19_ = stmt; -#line 513 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp20_ = original; + _tmp16_ = stmt; #line 513 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp21_ = _tmp20_->master; + _tmp17_ = original; #line 513 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp22_ = _tmp21_->dim; + _tmp18_ = _tmp17_->master; #line 513 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp23_ = _tmp22_.height; + _tmp19_ = _tmp18_->dim; #line 513 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp24_ = sqlite3_bind_int (_tmp19_, 3, _tmp23_); + _tmp20_ = _tmp19_.height; #line 513 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp24_; + res = sqlite3_bind_int (_tmp16_, 3, _tmp20_); #line 514 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp25_ = res; + _tmp21_ = res; #line 514 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp25_ == SQLITE_OK, "res == Sqlite.OK"); -#line 515 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp26_ = stmt; + _vala_assert (_tmp21_ == SQLITE_OK, "res == Sqlite.OK"); #line 515 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp27_ = original; + _tmp22_ = stmt; #line 515 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp28_ = _tmp27_->master; + _tmp23_ = original; #line 515 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp29_ = _tmp28_->filesize; + _tmp24_ = _tmp23_->master; #line 515 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp30_ = sqlite3_bind_int64 (_tmp26_, 4, _tmp29_); + _tmp25_ = _tmp24_->filesize; #line 515 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp30_; + res = sqlite3_bind_int64 (_tmp22_, 4, _tmp25_); #line 516 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp31_ = res; + _tmp26_ = res; #line 516 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp31_ == SQLITE_OK, "res == Sqlite.OK"); -#line 517 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp32_ = stmt; + _vala_assert (_tmp26_ == SQLITE_OK, "res == Sqlite.OK"); #line 517 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp33_ = original; + _tmp27_ = stmt; #line 517 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp34_ = _tmp33_->master; + _tmp28_ = original; #line 517 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp35_ = _tmp34_->timestamp; + _tmp29_ = _tmp28_->master; #line 517 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp36_ = sqlite3_bind_int64 (_tmp32_, 5, (gint64) _tmp35_); + _tmp30_ = _tmp29_->timestamp; #line 517 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp36_; + res = sqlite3_bind_int64 (_tmp27_, 5, (gint64) _tmp30_); #line 518 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp37_ = res; + _tmp31_ = res; #line 518 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp37_ == SQLITE_OK, "res == Sqlite.OK"); -#line 519 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp38_ = stmt; + _vala_assert (_tmp31_ == SQLITE_OK, "res == Sqlite.OK"); #line 519 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp39_ = original; + _tmp32_ = stmt; #line 519 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp40_ = _tmp39_->exposure_time; + _tmp33_ = original; #line 519 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp41_ = sqlite3_bind_int64 (_tmp38_, 6, (gint64) _tmp40_); + _tmp34_ = _tmp33_->exposure_time; #line 519 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp41_; + res = sqlite3_bind_int64 (_tmp32_, 6, (gint64) _tmp34_); #line 520 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp42_ = res; + _tmp35_ = res; #line 520 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp42_ == SQLITE_OK, "res == Sqlite.OK"); -#line 521 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp43_ = stmt; + _vala_assert (_tmp35_ == SQLITE_OK, "res == Sqlite.OK"); #line 521 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp44_ = original; + _tmp36_ = stmt; #line 521 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp45_ = _tmp44_->orientation; + _tmp37_ = original; #line 521 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp46_ = sqlite3_bind_int (_tmp43_, 7, (gint) _tmp45_); + _tmp38_ = _tmp37_->orientation; #line 521 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp46_; + res = sqlite3_bind_int (_tmp36_, 7, (gint) _tmp38_); #line 522 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp47_ = res; + _tmp39_ = res; #line 522 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp47_ == SQLITE_OK, "res == Sqlite.OK"); + _vala_assert (_tmp39_ == SQLITE_OK, "res == Sqlite.OK"); #line 523 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp48_ = stmt; -#line 523 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp49_ = original; + _tmp40_ = stmt; #line 523 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp50_ = _tmp49_->master; + _tmp41_ = original; #line 523 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp51_ = _tmp50_->original_orientation; + _tmp42_ = _tmp41_->master; #line 523 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp52_ = sqlite3_bind_int (_tmp48_, 8, (gint) _tmp51_); + _tmp43_ = _tmp42_->original_orientation; #line 523 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp52_; + res = sqlite3_bind_int (_tmp40_, 8, (gint) _tmp43_); #line 524 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp53_ = res; + _tmp44_ = res; #line 524 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp53_ == SQLITE_OK, "res == Sqlite.OK"); -#line 525 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp54_ = stmt; + _vala_assert (_tmp44_ == SQLITE_OK, "res == Sqlite.OK"); #line 525 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp55_ = original; + _tmp45_ = stmt; #line 525 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp56_ = _tmp55_->import_id; + _tmp46_ = original; #line 525 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp57_ = _tmp56_.id; + _tmp47_ = _tmp46_->import_id; #line 525 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp58_ = sqlite3_bind_int64 (_tmp54_, 9, _tmp57_); + _tmp48_ = _tmp47_.id; #line 525 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp58_; + res = sqlite3_bind_int64 (_tmp45_, 9, _tmp48_); #line 526 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp59_ = res; + _tmp49_ = res; #line 526 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp59_ == SQLITE_OK, "res == Sqlite.OK"); -#line 527 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp60_ = stmt; + _vala_assert (_tmp49_ == SQLITE_OK, "res == Sqlite.OK"); #line 527 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp61_ = original; + _tmp50_ = stmt; #line 527 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp62_ = _tmp61_->event_id; + _tmp51_ = original; #line 527 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp63_ = _tmp62_.id; + _tmp52_ = _tmp51_->event_id; #line 527 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp64_ = sqlite3_bind_int64 (_tmp60_, 10, _tmp63_); + _tmp53_ = _tmp52_.id; #line 527 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp64_; + res = sqlite3_bind_int64 (_tmp50_, 10, _tmp53_); #line 528 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp65_ = res; + _tmp54_ = res; #line 528 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp65_ == SQLITE_OK, "res == Sqlite.OK"); -#line 529 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp66_ = stmt; + _vala_assert (_tmp54_ == SQLITE_OK, "res == Sqlite.OK"); #line 529 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp67_ = original; + _tmp55_ = stmt; #line 529 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp68_ = _tmp67_->transformations; + _tmp56_ = original; #line 529 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp69_ = photo_table_unmarshall_all_transformations (_tmp68_); + _tmp57_ = _tmp56_->transformations; #line 529 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp70_ = g_free; + _tmp58_ = photo_table_unmarshall_all_transformations (_tmp57_); #line 529 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp71_ = sqlite3_bind_text (_tmp66_, 11, _tmp69_, -1, _tmp70_); + _tmp59_ = g_free; #line 529 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp71_; + res = sqlite3_bind_text (_tmp55_, 11, _tmp58_, -1, _tmp59_); #line 530 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp72_ = res; + _tmp60_ = res; #line 530 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp72_ == SQLITE_OK, "res == Sqlite.OK"); -#line 531 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp73_ = stmt; + _vala_assert (_tmp60_ == SQLITE_OK, "res == Sqlite.OK"); #line 531 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp74_ = original; + _tmp61_ = stmt; #line 531 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp75_ = _tmp74_->md5; + _tmp62_ = original; #line 531 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp76_ = g_strdup (_tmp75_); + _tmp63_ = _tmp62_->md5; #line 531 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp77_ = g_free; + _tmp64_ = g_strdup (_tmp63_); #line 531 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp78_ = sqlite3_bind_text (_tmp73_, 12, _tmp76_, -1, _tmp77_); + _tmp65_ = g_free; #line 531 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp78_; + res = sqlite3_bind_text (_tmp61_, 12, _tmp64_, -1, _tmp65_); #line 532 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp79_ = res; + _tmp66_ = res; #line 532 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp79_ == SQLITE_OK, "res == Sqlite.OK"); + _vala_assert (_tmp66_ == SQLITE_OK, "res == Sqlite.OK"); #line 533 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp80_ = stmt; + _tmp67_ = stmt; #line 533 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp81_ = original; + _tmp68_ = original; #line 533 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp82_ = _tmp81_->thumbnail_md5; + _tmp69_ = _tmp68_->thumbnail_md5; #line 533 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp83_ = g_strdup (_tmp82_); + _tmp70_ = g_strdup (_tmp69_); #line 533 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp84_ = g_free; + _tmp71_ = g_free; #line 533 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp85_ = sqlite3_bind_text (_tmp80_, 13, _tmp83_, -1, _tmp84_); -#line 533 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp85_; + res = sqlite3_bind_text (_tmp67_, 13, _tmp70_, -1, _tmp71_); #line 534 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp86_ = res; + _tmp72_ = res; #line 534 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp86_ == SQLITE_OK, "res == Sqlite.OK"); -#line 535 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp87_ = stmt; + _vala_assert (_tmp72_ == SQLITE_OK, "res == Sqlite.OK"); #line 535 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp88_ = original; + _tmp73_ = stmt; #line 535 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp89_ = _tmp88_->exif_md5; + _tmp74_ = original; #line 535 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp90_ = g_strdup (_tmp89_); + _tmp75_ = _tmp74_->exif_md5; #line 535 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp91_ = g_free; + _tmp76_ = g_strdup (_tmp75_); #line 535 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp92_ = sqlite3_bind_text (_tmp87_, 14, _tmp90_, -1, _tmp91_); + _tmp77_ = g_free; #line 535 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp92_; + res = sqlite3_bind_text (_tmp73_, 14, _tmp76_, -1, _tmp77_); #line 536 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp93_ = res; + _tmp78_ = res; #line 536 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp93_ == SQLITE_OK, "res == Sqlite.OK"); -#line 537 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp94_ = stmt; -#line 537 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp95_ = now_sec (); + _vala_assert (_tmp78_ == SQLITE_OK, "res == Sqlite.OK"); #line 537 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp96_ = sqlite3_bind_int64 (_tmp94_, 15, (gint64) _tmp95_); + _tmp79_ = stmt; #line 537 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp96_; + res = sqlite3_bind_int64 (_tmp79_, 15, (gint64) now_sec ()); #line 538 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp97_ = res; + _tmp80_ = res; #line 538 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp97_ == SQLITE_OK, "res == Sqlite.OK"); -#line 539 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp98_ = stmt; + _vala_assert (_tmp80_ == SQLITE_OK, "res == Sqlite.OK"); #line 539 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp99_ = original; + _tmp81_ = stmt; #line 539 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp100_ = _tmp99_->flags; + _tmp82_ = original; #line 539 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp101_ = sqlite3_bind_int64 (_tmp98_, 16, (gint64) _tmp100_); + _tmp83_ = _tmp82_->flags; #line 539 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp101_; + res = sqlite3_bind_int64 (_tmp81_, 16, (gint64) _tmp83_); #line 540 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp102_ = res; + _tmp84_ = res; #line 540 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp102_ == SQLITE_OK, "res == Sqlite.OK"); -#line 541 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp103_ = stmt; + _vala_assert (_tmp84_ == SQLITE_OK, "res == Sqlite.OK"); #line 541 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp104_ = original; -#line 541 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp105_ = _tmp104_->rating; + _tmp85_ = stmt; #line 541 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp106_ = rating_serialize (_tmp105_); + _tmp86_ = original; #line 541 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp107_ = sqlite3_bind_int64 (_tmp103_, 17, (gint64) _tmp106_); + _tmp87_ = _tmp86_->rating; #line 541 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp107_; + res = sqlite3_bind_int64 (_tmp85_, 17, (gint64) rating_serialize (_tmp87_)); #line 542 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp108_ = res; + _tmp88_ = res; #line 542 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp108_ == SQLITE_OK, "res == Sqlite.OK"); -#line 543 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp109_ = stmt; + _vala_assert (_tmp88_ == SQLITE_OK, "res == Sqlite.OK"); #line 543 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp110_ = original; -#line 543 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp111_ = _tmp110_->master; + _tmp89_ = stmt; #line 543 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp112_ = _tmp111_->file_format; + _tmp90_ = original; #line 543 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp113_ = photo_file_format_serialize (_tmp112_); + _tmp91_ = _tmp90_->master; #line 543 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp114_ = sqlite3_bind_int (_tmp109_, 18, _tmp113_); + _tmp92_ = _tmp91_->file_format; #line 543 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp114_; + res = sqlite3_bind_int (_tmp89_, 18, photo_file_format_serialize (_tmp92_)); #line 544 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp115_ = res; + _tmp93_ = res; #line 544 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp115_ == SQLITE_OK, "res == Sqlite.OK"); -#line 545 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp116_ = stmt; + _vala_assert (_tmp93_ == SQLITE_OK, "res == Sqlite.OK"); #line 545 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp117_ = original; + _tmp94_ = stmt; #line 545 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp118_ = _tmp117_->title; + _tmp95_ = original; #line 545 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp119_ = g_strdup (_tmp118_); + _tmp96_ = _tmp95_->title; #line 545 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp120_ = g_free; + _tmp97_ = g_strdup (_tmp96_); #line 545 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp121_ = sqlite3_bind_text (_tmp116_, 19, _tmp119_, -1, _tmp120_); + _tmp98_ = g_free; #line 545 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp121_; + res = sqlite3_bind_text (_tmp94_, 19, _tmp97_, -1, _tmp98_); #line 546 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp122_ = res; + _tmp99_ = res; #line 546 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp122_ == SQLITE_OK, "res == Sqlite.OK"); -#line 547 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp123_ = stmt; + _vala_assert (_tmp99_ == SQLITE_OK, "res == Sqlite.OK"); #line 547 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp124_ = *editable_id; + _tmp100_ = stmt; #line 547 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp125_ = _tmp124_.id; + _tmp101_ = *editable_id; #line 547 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp126_ = sqlite3_bind_int64 (_tmp123_, 20, _tmp125_); + _tmp102_ = _tmp101_.id; #line 547 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp126_; + res = sqlite3_bind_int64 (_tmp100_, 20, _tmp102_); #line 548 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp127_ = res; + _tmp103_ = res; #line 548 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp127_ == SQLITE_OK, "res == Sqlite.OK"); -#line 550 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp128_ = stmt; + _vala_assert (_tmp103_ == SQLITE_OK, "res == Sqlite.OK"); #line 550 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp129_ = original; + _tmp104_ = stmt; #line 550 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp130_ = _tmp129_->developer; + _tmp105_ = original; #line 550 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp131_ = raw_developer_to_string (_tmp130_); + _tmp106_ = _tmp105_->developer; #line 550 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp132_ = g_free; + _tmp107_ = raw_developer_to_string (_tmp106_); #line 550 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp133_ = sqlite3_bind_text (_tmp128_, 21, _tmp131_, -1, _tmp132_); + _tmp108_ = g_free; #line 550 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp133_; + res = sqlite3_bind_text (_tmp104_, 21, _tmp107_, -1, _tmp108_); #line 551 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp134_ = res; + _tmp109_ = res; #line 551 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp134_ == SQLITE_OK, "res == Sqlite.OK"); -#line 552 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp135_ = stmt; + _vala_assert (_tmp109_ == SQLITE_OK, "res == Sqlite.OK"); #line 552 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp136_ = *develop_shotwell; + _tmp110_ = stmt; #line 552 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp137_ = _tmp136_.id; + _tmp111_ = *develop_shotwell; #line 552 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp138_ = sqlite3_bind_int64 (_tmp135_, 22, _tmp137_); + _tmp112_ = _tmp111_.id; #line 552 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp138_; + res = sqlite3_bind_int64 (_tmp110_, 22, _tmp112_); #line 553 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp139_ = res; + _tmp113_ = res; #line 553 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp139_ == SQLITE_OK, "res == Sqlite.OK"); -#line 554 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp140_ = stmt; + _vala_assert (_tmp113_ == SQLITE_OK, "res == Sqlite.OK"); #line 554 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp141_ = *develop_camera_id; + _tmp114_ = stmt; #line 554 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp142_ = _tmp141_.id; + _tmp115_ = *develop_camera_id; #line 554 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp143_ = sqlite3_bind_int64 (_tmp140_, 23, _tmp142_); + _tmp116_ = _tmp115_.id; #line 554 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp143_; + res = sqlite3_bind_int64 (_tmp114_, 23, _tmp116_); #line 555 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp144_ = res; + _tmp117_ = res; #line 555 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp144_ == SQLITE_OK, "res == Sqlite.OK"); + _vala_assert (_tmp117_ == SQLITE_OK, "res == Sqlite.OK"); #line 556 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp145_ = stmt; -#line 556 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp146_ = *develop_embedded_id; + _tmp118_ = stmt; #line 556 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp147_ = _tmp146_.id; + _tmp119_ = *develop_embedded_id; #line 556 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp148_ = sqlite3_bind_int64 (_tmp145_, 24, _tmp147_); + _tmp120_ = _tmp119_.id; #line 556 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp148_; + res = sqlite3_bind_int64 (_tmp118_, 24, _tmp120_); #line 557 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp149_ = res; + _tmp121_ = res; #line 557 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp149_ == SQLITE_OK, "res == Sqlite.OK"); -#line 558 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp150_ = stmt; + _vala_assert (_tmp121_ == SQLITE_OK, "res == Sqlite.OK"); #line 558 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp151_ = original; + _tmp122_ = stmt; #line 558 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp152_ = _tmp151_->comment; + _tmp123_ = original; #line 558 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp153_ = g_strdup (_tmp152_); + _tmp124_ = _tmp123_->comment; #line 558 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp154_ = g_free; + _tmp125_ = g_strdup (_tmp124_); #line 558 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp155_ = sqlite3_bind_text (_tmp150_, 25, _tmp153_, -1, _tmp154_); + _tmp126_ = g_free; #line 558 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp155_; + res = sqlite3_bind_text (_tmp122_, 25, _tmp125_, -1, _tmp126_); #line 559 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp156_ = res; + _tmp127_ = res; #line 559 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp156_ == SQLITE_OK, "res == Sqlite.OK"); -#line 561 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp157_ = stmt; + _vala_assert (_tmp127_ == SQLITE_OK, "res == Sqlite.OK"); #line 561 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp158_ = sqlite3_step (_tmp157_); + _tmp128_ = stmt; #line 561 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp158_; + res = sqlite3_step (_tmp128_); #line 562 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp159_ = res; + _tmp129_ = res; #line 562 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp159_ != SQLITE_DONE) { -#line 4333 "PhotoTable.c" - gint _tmp160_; - PhotoID _tmp162_ = {0}; + if (_tmp129_ != SQLITE_DONE) { +#line 4021 "PhotoTable.c" + gint _tmp130_; + PhotoID _tmp132_ = {0}; #line 563 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp160_ = res; + _tmp130_ = res; #line 563 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp160_ != SQLITE_CONSTRAINT) { -#line 4340 "PhotoTable.c" - gint _tmp161_; + if (_tmp130_ != SQLITE_CONSTRAINT) { +#line 4028 "PhotoTable.c" + gint _tmp131_; #line 564 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp161_ = res; + _tmp131_ = res; #line 564 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - database_table_fatal ("duplicate", _tmp161_); -#line 4346 "PhotoTable.c" + database_table_fatal ("duplicate", _tmp131_); +#line 4034 "PhotoTable.c" } #line 566 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - photo_id_init (&_tmp162_, PHOTO_ID_INVALID); + photo_id_init (&_tmp132_, PHOTO_ID_INVALID); #line 566 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - *result = _tmp162_; + *result = _tmp132_; #line 566 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _sqlite3_finalize0 (stmt); #line 566 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _photo_row_unref0 (original); #line 566 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; -#line 4358 "PhotoTable.c" +#line 4046 "PhotoTable.c" } #line 569 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp163_ = database_table_db; -#line 569 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp164_ = sqlite3_last_insert_rowid (_tmp163_); + _tmp133_ = database_table_db; #line 569 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - photo_id_init (&_tmp165_, _tmp164_); + photo_id_init (&_tmp134_, sqlite3_last_insert_rowid (_tmp133_)); #line 569 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - *result = _tmp165_; + *result = _tmp134_; #line 569 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _sqlite3_finalize0 (stmt); #line 569 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _photo_row_unref0 (original); #line 569 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; -#line 4374 "PhotoTable.c" +#line 4060 "PhotoTable.c" } -gboolean photo_table_set_title (PhotoTable* self, PhotoID* photo_id, const gchar* new_title) { +gboolean +photo_table_set_title (PhotoTable* self, + PhotoID* photo_id, + const gchar* new_title) +{ gboolean result = FALSE; const gchar* _tmp0_ = NULL; - const gchar* _tmp1_; - PhotoID _tmp3_; - gint64 _tmp4_; - gboolean _tmp5_; + PhotoID _tmp1_; + gint64 _tmp2_; #line 572 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_val_if_fail (IS_PHOTO_TABLE (self), FALSE); #line 572 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_val_if_fail (photo_id != NULL, FALSE); #line 573 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp1_ = new_title; -#line 573 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp1_ != NULL) { -#line 4393 "PhotoTable.c" - const gchar* _tmp2_; + if (new_title != NULL) { #line 573 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp2_ = new_title; -#line 573 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp0_ = _tmp2_; -#line 4399 "PhotoTable.c" + _tmp0_ = new_title; +#line 4081 "PhotoTable.c" } else { #line 573 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp0_ = ""; -#line 4403 "PhotoTable.c" +#line 4085 "PhotoTable.c" } #line 573 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp3_ = *photo_id; -#line 573 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp4_ = _tmp3_.id; + _tmp1_ = *photo_id; #line 573 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp5_ = database_table_update_text_by_id (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp4_, "title", _tmp0_); + _tmp2_ = _tmp1_.id; #line 573 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - result = _tmp5_; + result = database_table_update_text_by_id (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp2_, "title", _tmp0_); #line 573 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 4415 "PhotoTable.c" +#line 4095 "PhotoTable.c" } -gboolean photo_table_set_comment (PhotoTable* self, PhotoID* photo_id, const gchar* new_comment) { +gboolean +photo_table_set_comment (PhotoTable* self, + PhotoID* photo_id, + const gchar* new_comment) +{ gboolean result = FALSE; const gchar* _tmp0_ = NULL; - const gchar* _tmp1_; - PhotoID _tmp3_; - gint64 _tmp4_; - gboolean _tmp5_; + PhotoID _tmp1_; + gint64 _tmp2_; #line 576 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_val_if_fail (IS_PHOTO_TABLE (self), FALSE); #line 576 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_val_if_fail (photo_id != NULL, FALSE); #line 577 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp1_ = new_comment; -#line 577 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp1_ != NULL) { -#line 4434 "PhotoTable.c" - const gchar* _tmp2_; + if (new_comment != NULL) { #line 577 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp2_ = new_comment; -#line 577 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp0_ = _tmp2_; -#line 4440 "PhotoTable.c" + _tmp0_ = new_comment; +#line 4116 "PhotoTable.c" } else { #line 577 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp0_ = ""; -#line 4444 "PhotoTable.c" +#line 4120 "PhotoTable.c" } #line 577 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp3_ = *photo_id; -#line 577 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp4_ = _tmp3_.id; + _tmp1_ = *photo_id; #line 577 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp5_ = database_table_update_text_by_id (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp4_, "comment", _tmp0_); + _tmp2_ = _tmp1_.id; #line 577 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - result = _tmp5_; + result = database_table_update_text_by_id (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp2_, "comment", _tmp0_); #line 577 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 4456 "PhotoTable.c" +#line 4130 "PhotoTable.c" } -void photo_table_set_filepath (PhotoTable* self, PhotoID* photo_id, const gchar* filepath, GError** error) { +void +photo_table_set_filepath (PhotoTable* self, + PhotoID* photo_id, + const gchar* filepath, + GError** error) +{ PhotoID _tmp0_; gint64 _tmp1_; - const gchar* _tmp2_; GError * _inner_error_ = NULL; #line 580 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_if_fail (IS_PHOTO_TABLE (self)); @@ -4493,9 +4171,7 @@ void photo_table_set_filepath (PhotoTable* self, PhotoID* photo_id, const gchar* #line 581 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp1_ = _tmp0_.id; #line 581 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp2_ = filepath; -#line 581 "/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_, "filename", _tmp2_, &_inner_error_); + database_table_update_text_by_id_2 (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp1_, "filename", filepath, &_inner_error_); #line 581 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 581 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -4504,7 +4180,7 @@ void photo_table_set_filepath (PhotoTable* self, PhotoID* photo_id, const gchar* g_propagate_error (error, _inner_error_); #line 581 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; -#line 4487 "PhotoTable.c" +#line 4163 "PhotoTable.c" } else { #line 581 "/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); @@ -4512,16 +4188,20 @@ void photo_table_set_filepath (PhotoTable* self, PhotoID* photo_id, const gchar* g_clear_error (&_inner_error_); #line 581 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; -#line 4495 "PhotoTable.c" +#line 4171 "PhotoTable.c" } } } -void photo_table_update_timestamp (PhotoTable* self, PhotoID* photo_id, time_t timestamp, GError** error) { +void +photo_table_update_timestamp (PhotoTable* self, + PhotoID* photo_id, + time_t timestamp, + GError** error) +{ PhotoID _tmp0_; gint64 _tmp1_; - time_t _tmp2_; GError * _inner_error_ = NULL; #line 584 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_if_fail (IS_PHOTO_TABLE (self)); @@ -4532,9 +4212,7 @@ void photo_table_update_timestamp (PhotoTable* self, PhotoID* photo_id, time_t t #line 585 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp1_ = _tmp0_.id; #line 585 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp2_ = timestamp; -#line 585 "/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_); + database_table_update_int64_by_id_2 (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp1_, "timestamp", (gint64) timestamp, &_inner_error_); #line 585 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 585 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -4543,7 +4221,7 @@ void photo_table_update_timestamp (PhotoTable* self, PhotoID* photo_id, time_t t g_propagate_error (error, _inner_error_); #line 585 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; -#line 4526 "PhotoTable.c" +#line 4204 "PhotoTable.c" } else { #line 585 "/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); @@ -4551,18 +4229,20 @@ void photo_table_update_timestamp (PhotoTable* self, PhotoID* photo_id, time_t t g_clear_error (&_inner_error_); #line 585 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; -#line 4534 "PhotoTable.c" +#line 4212 "PhotoTable.c" } } } -gboolean photo_table_set_exposure_time (PhotoTable* self, PhotoID* photo_id, time_t time) { +gboolean +photo_table_set_exposure_time (PhotoTable* self, + PhotoID* photo_id, + time_t time) +{ gboolean result = FALSE; PhotoID _tmp0_; gint64 _tmp1_; - time_t _tmp2_; - gboolean _tmp3_; #line 588 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_val_if_fail (IS_PHOTO_TABLE (self), FALSE); #line 588 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -4572,18 +4252,19 @@ gboolean photo_table_set_exposure_time (PhotoTable* self, PhotoID* photo_id, tim #line 589 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp1_ = _tmp0_.id; #line 589 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp2_ = time; -#line 589 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp3_ = database_table_update_int64_by_id (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp1_, "exposure_time", (gint64) _tmp2_); -#line 589 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - result = _tmp3_; + result = database_table_update_int64_by_id (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp1_, "exposure_time", (gint64) time); #line 589 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 4562 "PhotoTable.c" +#line 4238 "PhotoTable.c" } -void photo_table_set_import_id (PhotoTable* self, PhotoID* photo_id, ImportID* import_id, GError** error) { +void +photo_table_set_import_id (PhotoTable* self, + PhotoID* photo_id, + ImportID* import_id, + GError** error) +{ PhotoID _tmp0_; gint64 _tmp1_; ImportID _tmp2_; @@ -4613,7 +4294,7 @@ void photo_table_set_import_id (PhotoTable* self, PhotoID* photo_id, ImportID* i g_propagate_error (error, _inner_error_); #line 593 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; -#line 4596 "PhotoTable.c" +#line 4277 "PhotoTable.c" } else { #line 593 "/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); @@ -4621,13 +4302,16 @@ void photo_table_set_import_id (PhotoTable* self, PhotoID* photo_id, ImportID* i g_clear_error (&_inner_error_); #line 593 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; -#line 4604 "PhotoTable.c" +#line 4285 "PhotoTable.c" } } } -gboolean photo_table_remove_by_file (PhotoTable* self, GFile* file) { +gboolean +photo_table_remove_by_file (PhotoTable* self, + GFile* file) +{ gboolean result = FALSE; sqlite3_stmt* stmt = NULL; gint res = 0; @@ -4636,14 +4320,11 @@ gboolean photo_table_remove_by_file (PhotoTable* self, GFile* file) { gint _tmp2_; gint _tmp3_; sqlite3_stmt* _tmp4_; - GFile* _tmp5_; - gchar* _tmp6_; - GDestroyNotify _tmp7_; - gint _tmp8_; + gchar* _tmp5_; + GDestroyNotify _tmp6_; + gint _tmp7_; + sqlite3_stmt* _tmp8_; gint _tmp9_; - sqlite3_stmt* _tmp10_; - gint _tmp11_; - gint _tmp12_; #line 596 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_val_if_fail (IS_PHOTO_TABLE (self), FALSE); #line 596 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -4665,42 +4346,36 @@ gboolean photo_table_remove_by_file (PhotoTable* self, GFile* file) { #line 601 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp4_ = stmt; #line 601 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp5_ = file; -#line 601 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp6_ = g_file_get_path (_tmp5_); -#line 601 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp7_ = g_free; + _tmp5_ = g_file_get_path (file); #line 601 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp8_ = sqlite3_bind_text (_tmp4_, 1, _tmp6_, -1, _tmp7_); + _tmp6_ = g_free; #line 601 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp8_; + res = sqlite3_bind_text (_tmp4_, 1, _tmp5_, -1, _tmp6_); #line 602 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp9_ = res; + _tmp7_ = res; #line 602 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp9_ == SQLITE_OK, "res == Sqlite.OK"); -#line 604 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp10_ = stmt; + _vala_assert (_tmp7_ == SQLITE_OK, "res == Sqlite.OK"); #line 604 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp11_ = sqlite3_step (_tmp10_); + _tmp8_ = stmt; #line 604 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp11_; + res = sqlite3_step (_tmp8_); #line 605 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp12_ = res; + _tmp9_ = res; #line 605 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp12_ != SQLITE_DONE) { -#line 4671 "PhotoTable.c" - gint _tmp13_; + if (_tmp9_ != SQLITE_DONE) { +#line 4346 "PhotoTable.c" + gint _tmp10_; #line 606 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp13_ = res; + _tmp10_ = res; #line 606 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - database_table_warning ("remove", _tmp13_); + database_table_warning ("remove", _tmp10_); #line 608 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" result = FALSE; #line 608 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _sqlite3_finalize0 (stmt); #line 608 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 4683 "PhotoTable.c" +#line 4358 "PhotoTable.c" } #line 611 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" result = TRUE; @@ -4708,11 +4383,15 @@ gboolean photo_table_remove_by_file (PhotoTable* self, GFile* file) { _sqlite3_finalize0 (stmt); #line 611 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 4691 "PhotoTable.c" +#line 4366 "PhotoTable.c" } -void photo_table_remove (PhotoTable* self, PhotoID* photo_id, GError** error) { +void +photo_table_remove (PhotoTable* self, + PhotoID* photo_id, + GError** error) +{ PhotoID _tmp0_; gint64 _tmp1_; GError * _inner_error_ = NULL; @@ -4734,7 +4413,7 @@ void photo_table_remove (PhotoTable* self, PhotoID* photo_id, GError** error) { g_propagate_error (error, _inner_error_); #line 615 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; -#line 4717 "PhotoTable.c" +#line 4396 "PhotoTable.c" } else { #line 615 "/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); @@ -4742,13 +4421,15 @@ void photo_table_remove (PhotoTable* self, PhotoID* photo_id, GError** error) { g_clear_error (&_inner_error_); #line 615 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; -#line 4725 "PhotoTable.c" +#line 4404 "PhotoTable.c" } } } -GeeArrayList* photo_table_get_photos (PhotoTable* self) { +GeeArrayList* +photo_table_get_photos (PhotoTable* self) +{ GeeArrayList* result = NULL; sqlite3_stmt* stmt = NULL; gint res = 0; @@ -4778,68 +4459,62 @@ GeeArrayList* photo_table_get_photos (PhotoTable* self) { _tmp4_ = gee_array_list_new (TYPE_PHOTO_ID, (GBoxedCopyFunc) photo_id_dup, (GDestroyNotify) photo_id_free, NULL, NULL, NULL); #line 623 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" photo_ids = _tmp4_; -#line 4761 "PhotoTable.c" +#line 4442 "PhotoTable.c" { gboolean _tmp5_ = FALSE; #line 624 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp5_ = TRUE; #line 624 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" while (TRUE) { -#line 4768 "PhotoTable.c" +#line 4449 "PhotoTable.c" sqlite3_stmt* _tmp6_; gint _tmp7_; - gint _tmp8_; - GeeArrayList* _tmp11_; - sqlite3_stmt* _tmp12_; - gint64 _tmp13_; - PhotoID _tmp14_ = {0}; + GeeArrayList* _tmp10_; + sqlite3_stmt* _tmp11_; + PhotoID _tmp12_ = {0}; #line 624 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (!_tmp5_) { -#line 4778 "PhotoTable.c" +#line 4457 "PhotoTable.c" } #line 624 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp5_ = FALSE; #line 625 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp6_ = stmt; #line 625 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp7_ = sqlite3_step (_tmp6_); -#line 625 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp7_; + res = sqlite3_step (_tmp6_); #line 626 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp8_ = res; + _tmp7_ = res; #line 626 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp8_ == SQLITE_DONE) { + if (_tmp7_ == SQLITE_DONE) { #line 627 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" break; -#line 4794 "PhotoTable.c" +#line 4471 "PhotoTable.c" } else { - gint _tmp9_; + gint _tmp8_; #line 628 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp9_ = res; + _tmp8_ = res; #line 628 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp9_ != SQLITE_ROW) { -#line 4801 "PhotoTable.c" - gint _tmp10_; + if (_tmp8_ != SQLITE_ROW) { +#line 4478 "PhotoTable.c" + gint _tmp9_; #line 629 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp10_ = res; + _tmp9_ = res; #line 629 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - database_table_fatal ("get_photos", _tmp10_); + database_table_fatal ("get_photos", _tmp9_); #line 631 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" break; -#line 4809 "PhotoTable.c" +#line 4486 "PhotoTable.c" } } #line 634 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp11_ = photo_ids; + _tmp10_ = photo_ids; #line 634 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp12_ = stmt; -#line 634 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp13_ = sqlite3_column_int64 (_tmp12_, 0); + _tmp11_ = stmt; #line 634 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - photo_id_init (&_tmp14_, _tmp13_); + photo_id_init (&_tmp12_, sqlite3_column_int64 (_tmp11_, 0)); #line 634 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), &_tmp14_); -#line 4822 "PhotoTable.c" + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), &_tmp12_); +#line 4497 "PhotoTable.c" } } #line 637 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -4848,16 +4523,18 @@ GeeArrayList* photo_table_get_photos (PhotoTable* self) { _sqlite3_finalize0 (stmt); #line 637 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 4831 "PhotoTable.c" +#line 4506 "PhotoTable.c" } -gboolean photo_table_set_orientation (PhotoTable* self, PhotoID* photo_id, Orientation orientation) { +gboolean +photo_table_set_orientation (PhotoTable* self, + PhotoID* photo_id, + Orientation orientation) +{ gboolean result = FALSE; PhotoID _tmp0_; gint64 _tmp1_; - Orientation _tmp2_; - gboolean _tmp3_; #line 640 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_val_if_fail (IS_PHOTO_TABLE (self), FALSE); #line 640 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -4867,23 +4544,21 @@ gboolean photo_table_set_orientation (PhotoTable* self, PhotoID* photo_id, Orien #line 641 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp1_ = _tmp0_.id; #line 641 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp2_ = orientation; -#line 641 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp3_ = database_table_update_int_by_id (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp1_, "orientation", (gint) _tmp2_); -#line 641 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - result = _tmp3_; + result = database_table_update_int_by_id (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp1_, "orientation", (gint) orientation); #line 641 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 4857 "PhotoTable.c" +#line 4530 "PhotoTable.c" } -gboolean photo_table_replace_flags (PhotoTable* self, PhotoID* photo_id, guint64 flags) { +gboolean +photo_table_replace_flags (PhotoTable* self, + PhotoID* photo_id, + guint64 flags) +{ gboolean result = FALSE; PhotoID _tmp0_; gint64 _tmp1_; - guint64 _tmp2_; - gboolean _tmp3_; #line 644 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_val_if_fail (IS_PHOTO_TABLE (self), FALSE); #line 644 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -4893,24 +4568,21 @@ gboolean photo_table_replace_flags (PhotoTable* self, PhotoID* photo_id, guint64 #line 645 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp1_ = _tmp0_.id; #line 645 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp2_ = flags; -#line 645 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp3_ = database_table_update_int64_by_id (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp1_, "flags", (gint64) _tmp2_); -#line 645 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - result = _tmp3_; + result = database_table_update_int64_by_id (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp1_, "flags", (gint64) flags); #line 645 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 4883 "PhotoTable.c" +#line 4554 "PhotoTable.c" } -gboolean photo_table_set_rating (PhotoTable* self, PhotoID* photo_id, Rating rating) { +gboolean +photo_table_set_rating (PhotoTable* self, + PhotoID* photo_id, + Rating rating) +{ gboolean result = FALSE; PhotoID _tmp0_; gint64 _tmp1_; - Rating _tmp2_; - gint _tmp3_; - gboolean _tmp4_; #line 648 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_val_if_fail (IS_PHOTO_TABLE (self), FALSE); #line 648 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -4920,20 +4592,17 @@ gboolean photo_table_set_rating (PhotoTable* self, PhotoID* photo_id, Rating rat #line 649 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp1_ = _tmp0_.id; #line 649 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp2_ = rating; -#line 649 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp3_ = rating_serialize (_tmp2_); -#line 649 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp4_ = database_table_update_int_by_id (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp1_, "rating", _tmp3_); -#line 649 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - result = _tmp4_; + result = database_table_update_int_by_id (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp1_, "rating", rating_serialize (rating)); #line 649 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 4912 "PhotoTable.c" +#line 4578 "PhotoTable.c" } -gint photo_table_get_event_photo_count (PhotoTable* self, EventID* event_id) { +gint +photo_table_get_event_photo_count (PhotoTable* self, + EventID* event_id) +{ gint result = 0; sqlite3_stmt* stmt = NULL; gint res = 0; @@ -4945,7 +4614,6 @@ gint photo_table_get_event_photo_count (PhotoTable* self, EventID* event_id) { EventID _tmp5_; gint64 _tmp6_; gint _tmp7_; - gint _tmp8_; gint count = 0; #line 652 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_val_if_fail (IS_PHOTO_TABLE (self), 0); @@ -4972,68 +4640,63 @@ gint photo_table_get_event_photo_count (PhotoTable* self, EventID* event_id) { #line 657 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp6_ = _tmp5_.id; #line 657 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp7_ = sqlite3_bind_int64 (_tmp4_, 1, _tmp6_); -#line 657 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp7_; + res = sqlite3_bind_int64 (_tmp4_, 1, _tmp6_); #line 658 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp8_ = res; + _tmp7_ = res; #line 658 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp8_ == SQLITE_OK, "res == Sqlite.OK"); + _vala_assert (_tmp7_ == SQLITE_OK, "res == Sqlite.OK"); #line 660 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" count = 0; -#line 4964 "PhotoTable.c" +#line 4630 "PhotoTable.c" { - gboolean _tmp9_ = FALSE; + gboolean _tmp8_ = FALSE; #line 661 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp9_ = TRUE; + _tmp8_ = TRUE; #line 661 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" while (TRUE) { -#line 4971 "PhotoTable.c" - sqlite3_stmt* _tmp10_; - gint _tmp11_; - gint _tmp12_; - gint _tmp15_; +#line 4637 "PhotoTable.c" + sqlite3_stmt* _tmp9_; + gint _tmp10_; + gint _tmp13_; #line 661 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (!_tmp9_) { -#line 4978 "PhotoTable.c" + if (!_tmp8_) { +#line 4643 "PhotoTable.c" } #line 661 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp9_ = FALSE; + _tmp8_ = FALSE; #line 662 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp10_ = stmt; -#line 662 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp11_ = sqlite3_step (_tmp10_); + _tmp9_ = stmt; #line 662 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp11_; + res = sqlite3_step (_tmp9_); #line 663 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp12_ = res; + _tmp10_ = res; #line 663 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp12_ == SQLITE_DONE) { + if (_tmp10_ == SQLITE_DONE) { #line 664 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" break; -#line 4994 "PhotoTable.c" +#line 4657 "PhotoTable.c" } else { - gint _tmp13_; + gint _tmp11_; #line 665 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp13_ = res; + _tmp11_ = res; #line 665 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp13_ != SQLITE_ROW) { -#line 5001 "PhotoTable.c" - gint _tmp14_; + if (_tmp11_ != SQLITE_ROW) { +#line 4664 "PhotoTable.c" + gint _tmp12_; #line 666 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp14_ = res; + _tmp12_ = res; #line 666 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - database_table_fatal ("get_event_photo_count", _tmp14_); + database_table_fatal ("get_event_photo_count", _tmp12_); #line 668 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" break; -#line 5009 "PhotoTable.c" +#line 4672 "PhotoTable.c" } } #line 671 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp15_ = count; + _tmp13_ = count; #line 671 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - count = _tmp15_ + 1; -#line 5016 "PhotoTable.c" + count = _tmp13_ + 1; +#line 4679 "PhotoTable.c" } } #line 674 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -5042,11 +4705,14 @@ gint photo_table_get_event_photo_count (PhotoTable* self, EventID* event_id) { _sqlite3_finalize0 (stmt); #line 674 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 5025 "PhotoTable.c" +#line 4688 "PhotoTable.c" } -GeeArrayList* photo_table_get_event_source_ids (PhotoTable* self, EventID* event_id) { +GeeArrayList* +photo_table_get_event_source_ids (PhotoTable* self, + EventID* event_id) +{ GeeArrayList* result = NULL; sqlite3_stmt* stmt = NULL; gint res = 0; @@ -5058,9 +4724,8 @@ GeeArrayList* photo_table_get_event_source_ids (PhotoTable* self, EventID* event EventID _tmp5_; gint64 _tmp6_; gint _tmp7_; - gint _tmp8_; GeeArrayList* _result_ = NULL; - GeeArrayList* _tmp9_; + GeeArrayList* _tmp8_; #line 677 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_val_if_fail (IS_PHOTO_TABLE (self), NULL); #line 677 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -5086,87 +4751,79 @@ GeeArrayList* photo_table_get_event_source_ids (PhotoTable* self, EventID* event #line 682 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp6_ = _tmp5_.id; #line 682 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp7_ = sqlite3_bind_int64 (_tmp4_, 1, _tmp6_); -#line 682 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp7_; + res = sqlite3_bind_int64 (_tmp4_, 1, _tmp6_); #line 683 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp8_ = res; + _tmp7_ = res; #line 683 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp8_ == SQLITE_OK, "res == Sqlite.OK"); + _vala_assert (_tmp7_ == SQLITE_OK, "res == Sqlite.OK"); #line 685 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp9_ = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL); + _tmp8_ = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL); #line 685 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _result_ = _tmp9_; -#line 5080 "PhotoTable.c" + _result_ = _tmp8_; +#line 4743 "PhotoTable.c" { - gboolean _tmp10_ = FALSE; + gboolean _tmp9_ = FALSE; #line 686 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp10_ = TRUE; + _tmp9_ = TRUE; #line 686 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" while (TRUE) { -#line 5087 "PhotoTable.c" - sqlite3_stmt* _tmp11_; - gint _tmp12_; - gint _tmp13_; - GeeArrayList* _tmp16_; - sqlite3_stmt* _tmp17_; - gint64 _tmp18_; - PhotoID _tmp19_ = {0}; - gchar* _tmp20_; - gchar* _tmp21_; +#line 4750 "PhotoTable.c" + sqlite3_stmt* _tmp10_; + gint _tmp11_; + GeeArrayList* _tmp14_; + sqlite3_stmt* _tmp15_; + PhotoID _tmp16_ = {0}; + gchar* _tmp17_; + gchar* _tmp18_; #line 686 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (!_tmp10_) { -#line 5099 "PhotoTable.c" + if (!_tmp9_) { +#line 4760 "PhotoTable.c" } #line 686 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp10_ = FALSE; -#line 687 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp11_ = stmt; + _tmp9_ = FALSE; #line 687 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp12_ = sqlite3_step (_tmp11_); + _tmp10_ = stmt; #line 687 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp12_; + res = sqlite3_step (_tmp10_); #line 688 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp13_ = res; + _tmp11_ = res; #line 688 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp13_ == SQLITE_DONE) { + if (_tmp11_ == SQLITE_DONE) { #line 689 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" break; -#line 5115 "PhotoTable.c" +#line 4774 "PhotoTable.c" } else { - gint _tmp14_; + gint _tmp12_; #line 690 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp14_ = res; + _tmp12_ = res; #line 690 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp14_ != SQLITE_ROW) { -#line 5122 "PhotoTable.c" - gint _tmp15_; + if (_tmp12_ != SQLITE_ROW) { +#line 4781 "PhotoTable.c" + gint _tmp13_; #line 691 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp15_ = res; + _tmp13_ = res; #line 691 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - database_table_fatal ("get_event_source_ids", _tmp15_); + database_table_fatal ("get_event_source_ids", _tmp13_); #line 693 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" break; -#line 5130 "PhotoTable.c" +#line 4789 "PhotoTable.c" } } #line 696 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp16_ = _result_; -#line 696 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp17_ = stmt; + _tmp14_ = _result_; #line 696 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp18_ = sqlite3_column_int64 (_tmp17_, 0); + _tmp15_ = stmt; #line 696 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - photo_id_init (&_tmp19_, _tmp18_); + photo_id_init (&_tmp16_, sqlite3_column_int64 (_tmp15_, 0)); #line 696 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp20_ = photo_id_upgrade_photo_id_to_source_id (&_tmp19_); + _tmp17_ = photo_id_upgrade_photo_id_to_source_id (&_tmp16_); #line 696 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp21_ = _tmp20_; + _tmp18_ = _tmp17_; #line 696 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp21_); + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp18_); #line 696 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _g_free0 (_tmp21_); -#line 5149 "PhotoTable.c" + _g_free0 (_tmp18_); +#line 4806 "PhotoTable.c" } } #line 699 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -5175,11 +4832,14 @@ GeeArrayList* photo_table_get_event_source_ids (PhotoTable* self, EventID* event _sqlite3_finalize0 (stmt); #line 699 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 5158 "PhotoTable.c" +#line 4815 "PhotoTable.c" } -gboolean photo_table_event_has_photos (PhotoTable* self, EventID* event_id) { +gboolean +photo_table_event_has_photos (PhotoTable* self, + EventID* event_id) +{ gboolean result = FALSE; sqlite3_stmt* stmt = NULL; gint res = 0; @@ -5191,10 +4851,8 @@ gboolean photo_table_event_has_photos (PhotoTable* self, EventID* event_id) { EventID _tmp5_; gint64 _tmp6_; gint _tmp7_; - gint _tmp8_; - sqlite3_stmt* _tmp9_; - gint _tmp10_; - gint _tmp11_; + sqlite3_stmt* _tmp8_; + gint _tmp9_; #line 702 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_val_if_fail (IS_PHOTO_TABLE (self), FALSE); #line 702 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -5220,49 +4878,45 @@ gboolean photo_table_event_has_photos (PhotoTable* self, EventID* event_id) { #line 707 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp6_ = _tmp5_.id; #line 707 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp7_ = sqlite3_bind_int64 (_tmp4_, 1, _tmp6_); -#line 707 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp7_; + res = sqlite3_bind_int64 (_tmp4_, 1, _tmp6_); #line 708 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp8_ = res; + _tmp7_ = res; #line 708 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp8_ == SQLITE_OK, "res == Sqlite.OK"); -#line 710 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp9_ = stmt; + _vala_assert (_tmp7_ == SQLITE_OK, "res == Sqlite.OK"); #line 710 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp10_ = sqlite3_step (_tmp9_); + _tmp8_ = stmt; #line 710 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp10_; + res = sqlite3_step (_tmp8_); #line 711 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp11_ = res; + _tmp9_ = res; #line 711 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp11_ == SQLITE_DONE) { + if (_tmp9_ == SQLITE_DONE) { #line 712 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" result = FALSE; #line 712 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _sqlite3_finalize0 (stmt); #line 712 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 5226 "PhotoTable.c" +#line 4880 "PhotoTable.c" } else { - gint _tmp12_; + gint _tmp10_; #line 713 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp12_ = res; + _tmp10_ = res; #line 713 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp12_ != SQLITE_ROW) { -#line 5233 "PhotoTable.c" - gint _tmp13_; + if (_tmp10_ != SQLITE_ROW) { +#line 4887 "PhotoTable.c" + gint _tmp11_; #line 714 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp13_ = res; + _tmp11_ = res; #line 714 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - database_table_fatal ("event_has_photos", _tmp13_); + database_table_fatal ("event_has_photos", _tmp11_); #line 716 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" result = FALSE; #line 716 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _sqlite3_finalize0 (stmt); #line 716 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 5245 "PhotoTable.c" +#line 4899 "PhotoTable.c" } } #line 719 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -5271,11 +4925,14 @@ gboolean photo_table_event_has_photos (PhotoTable* self, EventID* event_id) { _sqlite3_finalize0 (stmt); #line 719 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 5254 "PhotoTable.c" +#line 4908 "PhotoTable.c" } -gboolean photo_table_drop_event (PhotoTable* self, EventID* event_id) { +gboolean +photo_table_drop_event (PhotoTable* self, + EventID* event_id) +{ gboolean result = FALSE; sqlite3_stmt* stmt = NULL; gint res = 0; @@ -5285,15 +4942,12 @@ gboolean photo_table_drop_event (PhotoTable* self, EventID* event_id) { gint _tmp3_; sqlite3_stmt* _tmp4_; gint _tmp5_; - gint _tmp6_; - sqlite3_stmt* _tmp7_; - EventID _tmp8_; - gint64 _tmp9_; - gint _tmp10_; + sqlite3_stmt* _tmp6_; + EventID _tmp7_; + gint64 _tmp8_; + gint _tmp9_; + sqlite3_stmt* _tmp10_; gint _tmp11_; - sqlite3_stmt* _tmp12_; - gint _tmp13_; - gint _tmp14_; #line 722 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_val_if_fail (IS_PHOTO_TABLE (self), FALSE); #line 722 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -5315,50 +4969,44 @@ gboolean photo_table_drop_event (PhotoTable* self, EventID* event_id) { #line 727 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp4_ = stmt; #line 727 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp5_ = sqlite3_bind_int64 (_tmp4_, 1, EVENT_ID_INVALID); -#line 727 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp5_; + res = sqlite3_bind_int64 (_tmp4_, 1, EVENT_ID_INVALID); #line 728 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp6_ = res; + _tmp5_ = res; #line 728 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp6_ == SQLITE_OK, "res == Sqlite.OK"); -#line 729 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp7_ = stmt; + _vala_assert (_tmp5_ == SQLITE_OK, "res == Sqlite.OK"); #line 729 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp8_ = *event_id; + _tmp6_ = stmt; #line 729 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp9_ = _tmp8_.id; + _tmp7_ = *event_id; #line 729 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp10_ = sqlite3_bind_int64 (_tmp7_, 2, _tmp9_); + _tmp8_ = _tmp7_.id; #line 729 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp10_; + res = sqlite3_bind_int64 (_tmp6_, 2, _tmp8_); #line 730 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp11_ = res; + _tmp9_ = res; #line 730 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp11_ == SQLITE_OK, "res == Sqlite.OK"); -#line 732 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp12_ = stmt; + _vala_assert (_tmp9_ == SQLITE_OK, "res == Sqlite.OK"); #line 732 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp13_ = sqlite3_step (_tmp12_); + _tmp10_ = stmt; #line 732 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp13_; + res = sqlite3_step (_tmp10_); #line 733 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp14_ = res; + _tmp11_ = res; #line 733 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp14_ != SQLITE_DONE) { -#line 5329 "PhotoTable.c" - gint _tmp15_; + if (_tmp11_ != SQLITE_DONE) { +#line 4977 "PhotoTable.c" + gint _tmp12_; #line 734 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp15_ = res; + _tmp12_ = res; #line 734 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - database_table_fatal ("drop_event", _tmp15_); + database_table_fatal ("drop_event", _tmp12_); #line 736 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" result = FALSE; #line 736 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _sqlite3_finalize0 (stmt); #line 736 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 5341 "PhotoTable.c" +#line 4989 "PhotoTable.c" } #line 739 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" result = TRUE; @@ -5366,17 +5014,20 @@ gboolean photo_table_drop_event (PhotoTable* self, EventID* event_id) { _sqlite3_finalize0 (stmt); #line 739 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 5349 "PhotoTable.c" +#line 4997 "PhotoTable.c" } -gboolean photo_table_set_event (PhotoTable* self, PhotoID* photo_id, EventID* event_id) { +gboolean +photo_table_set_event (PhotoTable* self, + PhotoID* photo_id, + EventID* event_id) +{ gboolean result = FALSE; PhotoID _tmp0_; gint64 _tmp1_; EventID _tmp2_; gint64 _tmp3_; - gboolean _tmp4_; #line 742 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_val_if_fail (IS_PHOTO_TABLE (self), FALSE); #line 742 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -5392,16 +5043,17 @@ gboolean photo_table_set_event (PhotoTable* self, PhotoID* photo_id, EventID* ev #line 743 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp3_ = _tmp2_.id; #line 743 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp4_ = database_table_update_int64_by_id (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp1_, "event_id", _tmp3_); -#line 743 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - result = _tmp4_; + result = database_table_update_int64_by_id (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp1_, "event_id", _tmp3_); #line 743 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 5380 "PhotoTable.c" +#line 5029 "PhotoTable.c" } -static gchar* photo_table_get_raw_transformations (PhotoTable* self, PhotoID* photo_id) { +static gchar* +photo_table_get_raw_transformations (PhotoTable* self, + PhotoID* photo_id) +{ gchar* result = NULL; sqlite3_stmt* stmt = NULL; PhotoID _tmp0_; @@ -5436,7 +5088,7 @@ static gchar* photo_table_get_raw_transformations (PhotoTable* self, PhotoID* ph _sqlite3_finalize0 (stmt); #line 749 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 5419 "PhotoTable.c" +#line 5071 "PhotoTable.c" } #line 751 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp4_ = stmt; @@ -5452,7 +5104,7 @@ static gchar* photo_table_get_raw_transformations (PhotoTable* self, PhotoID* ph if (_tmp8_ == NULL) { #line 752 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp7_ = TRUE; -#line 5435 "PhotoTable.c" +#line 5087 "PhotoTable.c" } else { const gchar* _tmp9_; gint _tmp10_; @@ -5465,7 +5117,7 @@ static gchar* photo_table_get_raw_transformations (PhotoTable* self, PhotoID* ph _tmp11_ = _tmp10_; #line 752 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp7_ = _tmp11_ == 0; -#line 5448 "PhotoTable.c" +#line 5100 "PhotoTable.c" } #line 752 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (_tmp7_) { @@ -5477,7 +5129,7 @@ static gchar* photo_table_get_raw_transformations (PhotoTable* self, PhotoID* ph _sqlite3_finalize0 (stmt); #line 753 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 5460 "PhotoTable.c" +#line 5112 "PhotoTable.c" } #line 755 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" result = trans; @@ -5485,16 +5137,18 @@ static gchar* photo_table_get_raw_transformations (PhotoTable* self, PhotoID* ph _sqlite3_finalize0 (stmt); #line 755 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 5468 "PhotoTable.c" +#line 5120 "PhotoTable.c" } -static gboolean photo_table_set_raw_transformations (PhotoTable* self, PhotoID* photo_id, const gchar* trans) { +static gboolean +photo_table_set_raw_transformations (PhotoTable* self, + PhotoID* photo_id, + const gchar* trans) +{ gboolean result = FALSE; PhotoID _tmp0_; gint64 _tmp1_; - const gchar* _tmp2_; - gboolean _tmp3_; #line 758 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_val_if_fail (IS_PHOTO_TABLE (self), FALSE); #line 758 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -5506,18 +5160,19 @@ static gboolean photo_table_set_raw_transformations (PhotoTable* self, PhotoID* #line 759 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp1_ = _tmp0_.id; #line 759 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp2_ = trans; -#line 759 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp3_ = database_table_update_text_by_id (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp1_, "transformations", _tmp2_); -#line 759 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - result = _tmp3_; + result = database_table_update_text_by_id (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp1_, "transformations", trans); #line 759 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 5496 "PhotoTable.c" +#line 5146 "PhotoTable.c" } -gboolean photo_table_set_transformation_state (PhotoTable* self, PhotoID* photo_id, Orientation orientation, GeeHashMap* transformations) { +gboolean +photo_table_set_transformation_state (PhotoTable* self, + PhotoID* photo_id, + Orientation orientation, + GeeHashMap* transformations) +{ gboolean result = FALSE; sqlite3_stmt* stmt = NULL; gint res = 0; @@ -5526,23 +5181,17 @@ gboolean photo_table_set_transformation_state (PhotoTable* self, PhotoID* photo_ gint _tmp2_; gint _tmp3_; sqlite3_stmt* _tmp4_; - Orientation _tmp5_; - gint _tmp6_; - gint _tmp7_; - sqlite3_stmt* _tmp8_; - GeeHashMap* _tmp9_; - gchar* _tmp10_; - GDestroyNotify _tmp11_; - gint _tmp12_; + gint _tmp5_; + sqlite3_stmt* _tmp6_; + gchar* _tmp7_; + GDestroyNotify _tmp8_; + gint _tmp9_; + sqlite3_stmt* _tmp10_; + PhotoID _tmp11_; + gint64 _tmp12_; gint _tmp13_; sqlite3_stmt* _tmp14_; - PhotoID _tmp15_; - gint64 _tmp16_; - gint _tmp17_; - gint _tmp18_; - sqlite3_stmt* _tmp19_; - gint _tmp20_; - gint _tmp21_; + gint _tmp15_; #line 762 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_val_if_fail (IS_PHOTO_TABLE (self), FALSE); #line 762 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -5567,68 +5216,56 @@ gboolean photo_table_set_transformation_state (PhotoTable* self, PhotoID* photo_ #line 769 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp4_ = stmt; #line 769 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp5_ = orientation; -#line 769 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp6_ = sqlite3_bind_int (_tmp4_, 1, (gint) _tmp5_); -#line 769 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp6_; + res = sqlite3_bind_int (_tmp4_, 1, (gint) orientation); #line 770 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp7_ = res; + _tmp5_ = res; #line 770 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp7_ == SQLITE_OK, "res == Sqlite.OK"); -#line 771 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp8_ = stmt; -#line 771 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp9_ = transformations; + _vala_assert (_tmp5_ == SQLITE_OK, "res == Sqlite.OK"); #line 771 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp10_ = photo_table_unmarshall_all_transformations (_tmp9_); + _tmp6_ = stmt; #line 771 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp11_ = g_free; + _tmp7_ = photo_table_unmarshall_all_transformations (transformations); #line 771 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp12_ = sqlite3_bind_text (_tmp8_, 2, _tmp10_, -1, _tmp11_); + _tmp8_ = g_free; #line 771 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp12_; + res = sqlite3_bind_text (_tmp6_, 2, _tmp7_, -1, _tmp8_); #line 772 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp13_ = res; + _tmp9_ = res; #line 772 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp13_ == SQLITE_OK, "res == Sqlite.OK"); -#line 773 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp14_ = stmt; + _vala_assert (_tmp9_ == SQLITE_OK, "res == Sqlite.OK"); #line 773 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp15_ = *photo_id; + _tmp10_ = stmt; #line 773 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp16_ = _tmp15_.id; + _tmp11_ = *photo_id; #line 773 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp17_ = sqlite3_bind_int64 (_tmp14_, 3, _tmp16_); + _tmp12_ = _tmp11_.id; #line 773 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp17_; + res = sqlite3_bind_int64 (_tmp10_, 3, _tmp12_); #line 774 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp18_ = res; + _tmp13_ = res; #line 774 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp18_ == SQLITE_OK, "res == Sqlite.OK"); -#line 776 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp19_ = stmt; + _vala_assert (_tmp13_ == SQLITE_OK, "res == Sqlite.OK"); #line 776 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp20_ = sqlite3_step (_tmp19_); + _tmp14_ = stmt; #line 776 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp20_; + res = sqlite3_step (_tmp14_); #line 777 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp21_ = res; + _tmp15_ = res; #line 777 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp21_ != SQLITE_DONE) { -#line 5598 "PhotoTable.c" - gint _tmp22_; + if (_tmp15_ != SQLITE_DONE) { +#line 5235 "PhotoTable.c" + gint _tmp16_; #line 778 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp22_ = res; + _tmp16_ = res; #line 778 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - database_table_fatal ("set_transformation_state", _tmp22_); + database_table_fatal ("set_transformation_state", _tmp16_); #line 780 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" result = FALSE; #line 780 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _sqlite3_finalize0 (stmt); #line 780 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 5610 "PhotoTable.c" +#line 5247 "PhotoTable.c" } #line 783 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" result = TRUE; @@ -5636,35 +5273,31 @@ gboolean photo_table_set_transformation_state (PhotoTable* self, PhotoID* photo_ _sqlite3_finalize0 (stmt); #line 783 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 5618 "PhotoTable.c" +#line 5255 "PhotoTable.c" } -GeeHashMap* photo_table_marshall_all_transformations (const gchar* trans) { +GeeHashMap* +photo_table_marshall_all_transformations (const gchar* trans) +{ GeeHashMap* result = NULL; gboolean _tmp0_ = FALSE; - const gchar* _tmp1_; GError * _inner_error_ = NULL; #line 787 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp1_ = trans; -#line 787 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp1_ == NULL) { + if (trans == NULL) { #line 787 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp0_ = TRUE; -#line 5633 "PhotoTable.c" +#line 5269 "PhotoTable.c" } else { - const gchar* _tmp2_; - gint _tmp3_; - gint _tmp4_; + gint _tmp1_; + gint _tmp2_; #line 787 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp2_ = trans; + _tmp1_ = strlen (trans); #line 787 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp3_ = strlen (_tmp2_); + _tmp2_ = _tmp1_; #line 787 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp4_ = _tmp3_; -#line 787 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp0_ = _tmp4_ == 0; -#line 5646 "PhotoTable.c" + _tmp0_ = _tmp2_ == 0; +#line 5279 "PhotoTable.c" } #line 787 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (_tmp0_) { @@ -5672,128 +5305,119 @@ GeeHashMap* photo_table_marshall_all_transformations (const gchar* trans) { result = NULL; #line 788 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 5654 "PhotoTable.c" +#line 5287 "PhotoTable.c" } { GKeyFile* keyfile = NULL; + GKeyFile* _tmp3_; + gboolean _tmp4_ = FALSE; GKeyFile* _tmp5_; - gboolean _tmp6_ = FALSE; - GKeyFile* _tmp7_; - const gchar* _tmp8_; - const gchar* _tmp9_; - gint _tmp10_; - gint _tmp11_; - gboolean _tmp12_; + gint _tmp6_; + gint _tmp7_; GeeHashMap* map = NULL; - GeeHashMap* _tmp13_; + GeeHashMap* _tmp8_; gchar** objects = NULL; - GKeyFile* _tmp14_; - gsize _tmp15_; - gchar** _tmp16_; + GKeyFile* _tmp9_; + gsize _tmp10_; + gchar** _tmp11_; gint objects_length1; gint _objects_size_; - gchar** _tmp17_; - gint _tmp17__length1; + gchar** _tmp12_; + gint _tmp12__length1; #line 791 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp5_ = g_key_file_new (); + _tmp3_ = g_key_file_new (); #line 791 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - keyfile = _tmp5_; -#line 792 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp7_ = keyfile; -#line 792 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp8_ = trans; -#line 792 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp9_ = trans; + keyfile = _tmp3_; #line 792 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp10_ = strlen (_tmp9_); + _tmp5_ = keyfile; #line 792 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp11_ = _tmp10_; + _tmp6_ = strlen (trans); #line 792 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp12_ = g_key_file_load_from_data (_tmp7_, _tmp8_, (gsize) _tmp11_, G_KEY_FILE_NONE, &_inner_error_); + _tmp7_ = _tmp6_; #line 792 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp6_ = _tmp12_; + _tmp4_ = g_key_file_load_from_data (_tmp5_, trans, (gsize) _tmp7_, G_KEY_FILE_NONE, &_inner_error_); #line 792 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 792 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_key_file_unref0 (keyfile); -#line 5698 "PhotoTable.c" +#line 5322 "PhotoTable.c" goto __catch17_g_error; } #line 792 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (!_tmp6_) { + if (!_tmp4_) { #line 793 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" result = NULL; #line 793 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_key_file_unref0 (keyfile); #line 793 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 5709 "PhotoTable.c" +#line 5333 "PhotoTable.c" } #line 795 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp13_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, TYPE_KEY_VALUE_MAP, (GBoxedCopyFunc) key_value_map_ref, (GDestroyNotify) key_value_map_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); + _tmp8_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, TYPE_KEY_VALUE_MAP, (GBoxedCopyFunc) key_value_map_ref, (GDestroyNotify) key_value_map_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); #line 795 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - map = _tmp13_; + map = _tmp8_; #line 797 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp14_ = keyfile; + _tmp9_ = keyfile; #line 797 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp16_ = g_key_file_get_groups (_tmp14_, &_tmp15_); + _tmp11_ = g_key_file_get_groups (_tmp9_, &_tmp10_); #line 797 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - objects = _tmp16_; + objects = _tmp11_; #line 797 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - objects_length1 = _tmp15_; + objects_length1 = _tmp10_; #line 797 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _objects_size_ = objects_length1; #line 798 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp17_ = objects; + _tmp12_ = objects; #line 798 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp17__length1 = objects_length1; -#line 5729 "PhotoTable.c" + _tmp12__length1 = objects_length1; +#line 5353 "PhotoTable.c" { gchar** object_collection = NULL; gint object_collection_length1 = 0; gint _object_collection_size_ = 0; gint object_it = 0; #line 798 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - object_collection = _tmp17_; + object_collection = _tmp12_; #line 798 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - object_collection_length1 = _tmp17__length1; + object_collection_length1 = _tmp12__length1; #line 798 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - for (object_it = 0; object_it < _tmp17__length1; object_it = object_it + 1) { -#line 5741 "PhotoTable.c" - gchar* _tmp18_; + for (object_it = 0; object_it < _tmp12__length1; object_it = object_it + 1) { +#line 5365 "PhotoTable.c" + gchar* _tmp13_; gchar* object = NULL; #line 798 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp18_ = g_strdup (object_collection[object_it]); + _tmp13_ = g_strdup (object_collection[object_it]); #line 798 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - object = _tmp18_; -#line 5748 "PhotoTable.c" + object = _tmp13_; +#line 5372 "PhotoTable.c" { gchar** keys = NULL; - GKeyFile* _tmp19_; - const gchar* _tmp20_; - gsize _tmp21_; - gchar** _tmp22_; + GKeyFile* _tmp14_; + const gchar* _tmp15_; + gsize _tmp16_; + gchar** _tmp17_; gint keys_length1; gint _keys_size_; - gboolean _tmp23_ = FALSE; - gchar** _tmp24_; - gint _tmp24__length1; + gboolean _tmp18_ = FALSE; + gchar** _tmp19_; + gint _tmp19__length1; KeyValueMap* key_map = NULL; - const gchar* _tmp26_; - KeyValueMap* _tmp27_; - GeeHashMap* _tmp43_; - const gchar* _tmp44_; - KeyValueMap* _tmp45_; + const gchar* _tmp21_; + KeyValueMap* _tmp22_; + GeeHashMap* _tmp38_; + const gchar* _tmp39_; + KeyValueMap* _tmp40_; #line 799 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp19_ = keyfile; + _tmp14_ = keyfile; #line 799 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp20_ = object; + _tmp15_ = object; #line 799 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp22_ = g_key_file_get_keys (_tmp19_, _tmp20_, &_tmp21_, &_inner_error_); + _tmp17_ = g_key_file_get_keys (_tmp14_, _tmp15_, &_tmp16_, &_inner_error_); #line 799 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - keys = _tmp22_; + keys = _tmp17_; #line 799 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - keys_length1 = _tmp21_; + keys_length1 = _tmp16_; #line 799 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _keys_size_ = keys_length1; #line 799 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -5806,114 +5430,114 @@ GeeHashMap* photo_table_marshall_all_transformations (const gchar* trans) { _g_object_unref0 (map); #line 799 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_key_file_unref0 (keyfile); -#line 5788 "PhotoTable.c" +#line 5412 "PhotoTable.c" goto __catch17_g_error; } #line 800 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp24_ = keys; + _tmp19_ = keys; #line 800 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp24__length1 = keys_length1; + _tmp19__length1 = keys_length1; #line 800 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp24_ == NULL) { + if (_tmp19_ == NULL) { #line 800 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp23_ = TRUE; -#line 5799 "PhotoTable.c" + _tmp18_ = TRUE; +#line 5423 "PhotoTable.c" } else { - gchar** _tmp25_; - gint _tmp25__length1; + gchar** _tmp20_; + gint _tmp20__length1; #line 800 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp25_ = keys; + _tmp20_ = keys; #line 800 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp25__length1 = keys_length1; + _tmp20__length1 = keys_length1; #line 800 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp23_ = _tmp25__length1 == 0; -#line 5809 "PhotoTable.c" + _tmp18_ = _tmp20__length1 == 0; +#line 5433 "PhotoTable.c" } #line 800 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp23_) { + if (_tmp18_) { #line 801 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" keys = (_vala_array_free (keys, keys_length1, (GDestroyNotify) g_free), NULL); #line 801 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_free0 (object); #line 801 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" continue; -#line 5819 "PhotoTable.c" +#line 5443 "PhotoTable.c" } #line 803 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp26_ = object; + _tmp21_ = object; #line 803 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp27_ = key_value_map_new (_tmp26_); + _tmp22_ = key_value_map_new (_tmp21_); #line 803 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - key_map = _tmp27_; -#line 5827 "PhotoTable.c" + key_map = _tmp22_; +#line 5451 "PhotoTable.c" { gint ctr = 0; #line 804 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" ctr = 0; -#line 5832 "PhotoTable.c" +#line 5456 "PhotoTable.c" { - gboolean _tmp28_ = FALSE; + gboolean _tmp23_ = FALSE; #line 804 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp28_ = TRUE; + _tmp23_ = TRUE; #line 804 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" while (TRUE) { -#line 5839 "PhotoTable.c" - gint _tmp30_; - gchar** _tmp31_; - gint _tmp31__length1; - gchar* _tmp32_ = NULL; - GKeyFile* _tmp33_; - const gchar* _tmp34_; +#line 5463 "PhotoTable.c" + gint _tmp25_; + gchar** _tmp26_; + gint _tmp26__length1; + gchar* _tmp27_ = NULL; + GKeyFile* _tmp28_; + const gchar* _tmp29_; + gchar** _tmp30_; + gint _tmp30__length1; + gint _tmp31_; + const gchar* _tmp32_; + gchar* _tmp33_; + KeyValueMap* _tmp34_; gchar** _tmp35_; gint _tmp35__length1; gint _tmp36_; const gchar* _tmp37_; - gchar* _tmp38_; - KeyValueMap* _tmp39_; - gchar** _tmp40_; - gint _tmp40__length1; - gint _tmp41_; - const gchar* _tmp42_; #line 804 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (!_tmp28_) { -#line 5858 "PhotoTable.c" - gint _tmp29_; + if (!_tmp23_) { +#line 5482 "PhotoTable.c" + gint _tmp24_; #line 804 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp29_ = ctr; + _tmp24_ = ctr; #line 804 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - ctr = _tmp29_ + 1; -#line 5864 "PhotoTable.c" + ctr = _tmp24_ + 1; +#line 5488 "PhotoTable.c" } #line 804 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp28_ = FALSE; + _tmp23_ = FALSE; #line 804 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp30_ = ctr; + _tmp25_ = ctr; #line 804 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp31_ = keys; + _tmp26_ = keys; #line 804 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp31__length1 = keys_length1; + _tmp26__length1 = keys_length1; #line 804 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (!(_tmp30_ < _tmp31__length1)) { + if (!(_tmp25_ < _tmp26__length1)) { #line 804 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" break; -#line 5878 "PhotoTable.c" +#line 5502 "PhotoTable.c" } #line 805 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp33_ = keyfile; + _tmp28_ = keyfile; #line 805 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp34_ = object; + _tmp29_ = object; #line 805 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp35_ = keys; + _tmp30_ = keys; #line 805 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp35__length1 = keys_length1; + _tmp30__length1 = keys_length1; #line 805 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp36_ = ctr; + _tmp31_ = ctr; #line 805 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp37_ = _tmp35_[_tmp36_]; + _tmp32_ = _tmp30_[_tmp31_]; #line 805 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp38_ = g_key_file_get_string (_tmp33_, _tmp34_, _tmp37_, &_inner_error_); + _tmp33_ = g_key_file_get_string (_tmp28_, _tmp29_, _tmp32_, &_inner_error_); #line 805 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp32_ = _tmp38_; + _tmp27_ = _tmp33_; #line 805 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 805 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -5928,42 +5552,42 @@ GeeHashMap* photo_table_marshall_all_transformations (const gchar* trans) { _g_object_unref0 (map); #line 805 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_key_file_unref0 (keyfile); -#line 5910 "PhotoTable.c" +#line 5534 "PhotoTable.c" goto __catch17_g_error; } #line 805 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp39_ = key_map; + _tmp34_ = key_map; #line 805 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp40_ = keys; + _tmp35_ = keys; #line 805 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp40__length1 = keys_length1; + _tmp35__length1 = keys_length1; #line 805 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp41_ = ctr; + _tmp36_ = ctr; #line 805 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp42_ = _tmp40_[_tmp41_]; + _tmp37_ = _tmp35_[_tmp36_]; #line 805 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - key_value_map_set_string (_tmp39_, _tmp42_, _tmp32_); + key_value_map_set_string (_tmp34_, _tmp37_, _tmp27_); #line 804 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _g_free0 (_tmp32_); -#line 5927 "PhotoTable.c" + _g_free0 (_tmp27_); +#line 5551 "PhotoTable.c" } } } #line 807 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp43_ = map; + _tmp38_ = map; #line 807 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp44_ = object; + _tmp39_ = object; #line 807 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp45_ = key_map; + _tmp40_ = key_map; #line 807 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp44_, _tmp45_); + gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp39_, _tmp40_); #line 798 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _key_value_map_unref0 (key_map); #line 798 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" keys = (_vala_array_free (keys, keys_length1, (GDestroyNotify) g_free), NULL); #line 798 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_free0 (object); -#line 5945 "PhotoTable.c" +#line 5569 "PhotoTable.c" } } } @@ -5975,24 +5599,24 @@ GeeHashMap* photo_table_marshall_all_transformations (const gchar* trans) { _g_key_file_unref0 (keyfile); #line 810 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 5957 "PhotoTable.c" +#line 5581 "PhotoTable.c" } goto __finally17; __catch17_g_error: { GError* err = NULL; - const gchar* _tmp46_; + const gchar* _tmp41_; #line 790 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" err = _inner_error_; #line 790 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _inner_error_ = NULL; #line 812 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp46_ = err->message; + _tmp41_ = err->message; #line 812 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - g_error ("PhotoTable.vala:812: %s", _tmp46_); + g_error ("PhotoTable.vala:812: %s", _tmp41_); #line 790 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_error_free0 (err); -#line 5974 "PhotoTable.c" +#line 5598 "PhotoTable.c" } __finally17: #line 790 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -6001,58 +5625,54 @@ GeeHashMap* photo_table_marshall_all_transformations (const gchar* trans) { g_clear_error (&_inner_error_); #line 790 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return NULL; -#line 5983 "PhotoTable.c" +#line 5607 "PhotoTable.c" } -gchar* photo_table_unmarshall_all_transformations (GeeHashMap* transformations) { +gchar* +photo_table_unmarshall_all_transformations (GeeHashMap* transformations) +{ gchar* result = NULL; gboolean _tmp0_ = FALSE; - GeeHashMap* _tmp1_; GKeyFile* keyfile = NULL; - GKeyFile* _tmp8_; + GKeyFile* _tmp6_; gsize length = 0UL; gchar* unmarshalled = NULL; - GKeyFile* _tmp39_; - gsize _tmp40_ = 0UL; - gchar* _tmp41_; - const gchar* _tmp42_; - const gchar* _tmp43_; - gint _tmp44_; - gint _tmp45_; + GKeyFile* _tmp33_; + gsize _tmp34_ = 0UL; + gchar* _tmp35_; + const gchar* _tmp36_; + const gchar* _tmp37_; + gint _tmp38_; + gint _tmp39_; #line 816 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_val_if_fail ((transformations == NULL) || GEE_IS_HASH_MAP (transformations), NULL); #line 817 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp1_ = transformations; -#line 817 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp1_ == NULL) { + if (transformations == NULL) { #line 817 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp0_ = TRUE; -#line 6010 "PhotoTable.c" +#line 5633 "PhotoTable.c" } else { - GeeHashMap* _tmp2_; + GeeSet* _tmp1_; + GeeSet* _tmp2_; GeeSet* _tmp3_; - GeeSet* _tmp4_; - GeeSet* _tmp5_; - gint _tmp6_; - gint _tmp7_; -#line 817 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp2_ = transformations; + gint _tmp4_; + gint _tmp5_; #line 817 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp3_ = gee_abstract_map_get_keys (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap)); + _tmp1_ = gee_abstract_map_get_keys (G_TYPE_CHECK_INSTANCE_CAST (transformations, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap)); #line 817 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp4_ = _tmp3_; + _tmp2_ = _tmp1_; #line 817 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp5_ = _tmp4_; + _tmp3_ = _tmp2_; #line 817 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp6_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp4_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection)); #line 817 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp7_ = _tmp6_; + _tmp5_ = _tmp4_; #line 817 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp0_ = _tmp7_ == 0; + _tmp0_ = _tmp5_ == 0; #line 817 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _g_object_unref0 (_tmp5_); -#line 6034 "PhotoTable.c" + _g_object_unref0 (_tmp3_); +#line 5654 "PhotoTable.c" } #line 817 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (_tmp0_) { @@ -6060,208 +5680,199 @@ gchar* photo_table_unmarshall_all_transformations (GeeHashMap* transformations) result = NULL; #line 818 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 6042 "PhotoTable.c" +#line 5662 "PhotoTable.c" } #line 820 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp8_ = g_key_file_new (); + _tmp6_ = g_key_file_new (); #line 820 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - keyfile = _tmp8_; -#line 6048 "PhotoTable.c" + keyfile = _tmp6_; +#line 5668 "PhotoTable.c" { GeeIterator* _object_it = NULL; - GeeHashMap* _tmp9_; - GeeSet* _tmp10_; - GeeSet* _tmp11_; - GeeSet* _tmp12_; - GeeIterator* _tmp13_; - GeeIterator* _tmp14_; + GeeSet* _tmp7_; + GeeSet* _tmp8_; + GeeSet* _tmp9_; + GeeIterator* _tmp10_; + GeeIterator* _tmp11_; #line 822 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp9_ = transformations; + _tmp7_ = gee_abstract_map_get_keys (G_TYPE_CHECK_INSTANCE_CAST (transformations, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap)); #line 822 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp10_ = gee_abstract_map_get_keys (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap)); + _tmp8_ = _tmp7_; #line 822 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp11_ = _tmp10_; -#line 822 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp12_ = _tmp11_; + _tmp9_ = _tmp8_; #line 822 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp13_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp10_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ITERABLE, GeeIterable)); #line 822 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp14_ = _tmp13_; + _tmp11_ = _tmp10_; #line 822 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _g_object_unref0 (_tmp12_); + _g_object_unref0 (_tmp9_); #line 822 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _object_it = _tmp14_; + _object_it = _tmp11_; #line 822 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" while (TRUE) { -#line 6075 "PhotoTable.c" - GeeIterator* _tmp15_; - gboolean _tmp16_; +#line 5692 "PhotoTable.c" + GeeIterator* _tmp12_; gchar* object = NULL; - GeeIterator* _tmp17_; - gpointer _tmp18_; + GeeIterator* _tmp13_; + gpointer _tmp14_; KeyValueMap* map = NULL; - GeeHashMap* _tmp19_; - const gchar* _tmp20_; - gpointer _tmp21_; -#line 822 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp15_ = _object_it; + const gchar* _tmp15_; + gpointer _tmp16_; #line 822 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp16_ = gee_iterator_next (_tmp15_); + _tmp12_ = _object_it; #line 822 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (!_tmp16_) { + if (!gee_iterator_next (_tmp12_)) { #line 822 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" break; -#line 6093 "PhotoTable.c" +#line 5706 "PhotoTable.c" } #line 822 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp17_ = _object_it; + _tmp13_ = _object_it; #line 822 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp18_ = gee_iterator_get (_tmp17_); + _tmp14_ = gee_iterator_get (_tmp13_); #line 822 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - object = (gchar*) _tmp18_; + object = (gchar*) _tmp14_; #line 823 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp19_ = transformations; + _tmp15_ = object; #line 823 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp20_ = object; + _tmp16_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (transformations, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp15_); #line 823 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp21_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp20_); -#line 823 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - map = (KeyValueMap*) _tmp21_; -#line 6109 "PhotoTable.c" + map = (KeyValueMap*) _tmp16_; +#line 5720 "PhotoTable.c" { GeeIterator* _key_it = NULL; - KeyValueMap* _tmp22_; - GeeSet* _tmp23_; - GeeSet* _tmp24_; - GeeIterator* _tmp25_; - GeeIterator* _tmp26_; + KeyValueMap* _tmp17_; + GeeSet* _tmp18_; + GeeSet* _tmp19_; + GeeIterator* _tmp20_; + GeeIterator* _tmp21_; #line 825 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp22_ = map; + _tmp17_ = map; #line 825 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp23_ = key_value_map_get_keys (_tmp22_); + _tmp18_ = key_value_map_get_keys (_tmp17_); #line 825 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp24_ = _tmp23_; + _tmp19_ = _tmp18_; #line 825 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp25_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp20_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GEE_TYPE_ITERABLE, GeeIterable)); #line 825 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp26_ = _tmp25_; + _tmp21_ = _tmp20_; #line 825 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _g_object_unref0 (_tmp24_); + _g_object_unref0 (_tmp19_); #line 825 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _key_it = _tmp26_; + _key_it = _tmp21_; #line 825 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" while (TRUE) { -#line 6133 "PhotoTable.c" - GeeIterator* _tmp27_; - gboolean _tmp28_; +#line 5744 "PhotoTable.c" + GeeIterator* _tmp22_; gchar* key = NULL; - GeeIterator* _tmp29_; - gpointer _tmp30_; + GeeIterator* _tmp23_; + gpointer _tmp24_; gchar* value = NULL; - KeyValueMap* _tmp31_; + KeyValueMap* _tmp25_; + const gchar* _tmp26_; + gchar* _tmp27_; + const gchar* _tmp28_; + GKeyFile* _tmp29_; + const gchar* _tmp30_; + const gchar* _tmp31_; const gchar* _tmp32_; - gchar* _tmp33_; - const gchar* _tmp34_; - GKeyFile* _tmp35_; - const gchar* _tmp36_; - const gchar* _tmp37_; - const gchar* _tmp38_; #line 825 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp27_ = _key_it; + _tmp22_ = _key_it; #line 825 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp28_ = gee_iterator_next (_tmp27_); -#line 825 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (!_tmp28_) { + if (!gee_iterator_next (_tmp22_)) { #line 825 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" break; -#line 6156 "PhotoTable.c" +#line 5764 "PhotoTable.c" } #line 825 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp29_ = _key_it; + _tmp23_ = _key_it; #line 825 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp30_ = gee_iterator_get (_tmp29_); + _tmp24_ = gee_iterator_get (_tmp23_); #line 825 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - key = (gchar*) _tmp30_; + key = (gchar*) _tmp24_; #line 826 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp31_ = map; + _tmp25_ = map; #line 826 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp32_ = key; + _tmp26_ = key; #line 826 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp33_ = key_value_map_get_string (_tmp31_, _tmp32_, NULL); + _tmp27_ = key_value_map_get_string (_tmp25_, _tmp26_, NULL); #line 826 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - value = _tmp33_; + value = _tmp27_; #line 827 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp34_ = value; + _tmp28_ = value; #line 827 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp34_ != NULL, "value != null"); + _vala_assert (_tmp28_ != NULL, "value != null"); #line 829 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp35_ = keyfile; + _tmp29_ = keyfile; #line 829 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp36_ = object; + _tmp30_ = object; #line 829 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp37_ = key; + _tmp31_ = key; #line 829 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp38_ = value; + _tmp32_ = value; #line 829 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - g_key_file_set_string (_tmp35_, _tmp36_, _tmp37_, _tmp38_); + g_key_file_set_string (_tmp29_, _tmp30_, _tmp31_, _tmp32_); #line 825 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_free0 (value); #line 825 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_free0 (key); -#line 6190 "PhotoTable.c" +#line 5798 "PhotoTable.c" } #line 825 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_object_unref0 (_key_it); -#line 6194 "PhotoTable.c" +#line 5802 "PhotoTable.c" } #line 822 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _key_value_map_unref0 (map); #line 822 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_free0 (object); -#line 6200 "PhotoTable.c" +#line 5808 "PhotoTable.c" } #line 822 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_object_unref0 (_object_it); -#line 6204 "PhotoTable.c" +#line 5812 "PhotoTable.c" } #line 834 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp39_ = keyfile; + _tmp33_ = keyfile; #line 834 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp41_ = g_key_file_to_data (_tmp39_, &_tmp40_, NULL); + _tmp35_ = g_key_file_to_data (_tmp33_, &_tmp34_, NULL); #line 834 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - length = _tmp40_; + length = _tmp34_; #line 834 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - unmarshalled = _tmp41_; + unmarshalled = _tmp35_; #line 835 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp42_ = unmarshalled; + _tmp36_ = unmarshalled; #line 835 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp42_ != NULL, "unmarshalled != null"); + _vala_assert (_tmp36_ != NULL, "unmarshalled != null"); #line 836 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp43_ = unmarshalled; + _tmp37_ = unmarshalled; #line 836 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp44_ = strlen (_tmp43_); + _tmp38_ = strlen (_tmp37_); #line 836 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp45_ = _tmp44_; + _tmp39_ = _tmp38_; #line 836 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp45_ > 0, "unmarshalled.length > 0"); + _vala_assert (_tmp39_ > 0, "unmarshalled.length > 0"); #line 838 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" result = unmarshalled; #line 838 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_key_file_unref0 (keyfile); #line 838 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 6232 "PhotoTable.c" +#line 5840 "PhotoTable.c" } -gboolean photo_table_set_transformation (PhotoTable* self, PhotoID* photo_id, KeyValueMap* map) { +gboolean +photo_table_set_transformation (PhotoTable* self, + PhotoID* photo_id, + KeyValueMap* map) +{ gboolean result = FALSE; gchar* trans = NULL; PhotoID _tmp0_; gchar* _tmp1_; - PhotoID _tmp38_; - const gchar* _tmp39_; - gboolean _tmp40_; + PhotoID _tmp33_; + const gchar* _tmp34_; GError * _inner_error_ = NULL; #line 841 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_val_if_fail (IS_PHOTO_TABLE (self), FALSE); @@ -6275,22 +5886,21 @@ gboolean photo_table_set_transformation (PhotoTable* self, PhotoID* photo_id, Ke _tmp1_ = photo_table_get_raw_transformations (self, &_tmp0_); #line 842 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" trans = _tmp1_; -#line 6257 "PhotoTable.c" +#line 5868 "PhotoTable.c" { GKeyFile* keyfile = NULL; GKeyFile* _tmp2_; const gchar* _tmp3_; GeeSet* keys = NULL; - KeyValueMap* _tmp11_; - GeeSet* _tmp12_; + GeeSet* _tmp10_; gsize length = 0UL; - GKeyFile* _tmp29_; - gsize _tmp30_ = 0UL; - gchar* _tmp31_; - const gchar* _tmp32_; - const gchar* _tmp33_; - gint _tmp34_; - gint _tmp35_; + GKeyFile* _tmp24_; + gsize _tmp25_ = 0UL; + gchar* _tmp26_; + const gchar* _tmp27_; + const gchar* _tmp28_; + gint _tmp29_; + gint _tmp30_; #line 845 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp2_ = g_key_file_new (); #line 845 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -6299,14 +5909,13 @@ gboolean photo_table_set_transformation (PhotoTable* self, PhotoID* photo_id, Ke _tmp3_ = trans; #line 846 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (_tmp3_ != NULL) { -#line 6281 "PhotoTable.c" +#line 5891 "PhotoTable.c" gboolean _tmp4_ = FALSE; GKeyFile* _tmp5_; const gchar* _tmp6_; const gchar* _tmp7_; gint _tmp8_; gint _tmp9_; - gboolean _tmp10_; #line 847 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp5_ = keyfile; #line 847 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -6318,14 +5927,12 @@ gboolean photo_table_set_transformation (PhotoTable* self, PhotoID* photo_id, Ke #line 847 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp9_ = _tmp8_; #line 847 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp10_ = g_key_file_load_from_data (_tmp5_, _tmp6_, (gsize) _tmp9_, G_KEY_FILE_NONE, &_inner_error_); -#line 847 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp4_ = _tmp10_; + _tmp4_ = g_key_file_load_from_data (_tmp5_, _tmp6_, (gsize) _tmp9_, G_KEY_FILE_NONE, &_inner_error_); #line 847 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 847 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_key_file_unref0 (keyfile); -#line 6307 "PhotoTable.c" +#line 5914 "PhotoTable.c" goto __catch18_g_error; } #line 847 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -6338,149 +5945,138 @@ gboolean photo_table_set_transformation (PhotoTable* self, PhotoID* photo_id, Ke _g_free0 (trans); #line 848 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 6320 "PhotoTable.c" +#line 5927 "PhotoTable.c" } } #line 851 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp11_ = map; -#line 851 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp12_ = key_value_map_get_keys (_tmp11_); + _tmp10_ = key_value_map_get_keys (map); #line 851 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - keys = _tmp12_; -#line 6329 "PhotoTable.c" + keys = _tmp10_; +#line 5934 "PhotoTable.c" { GeeIterator* _key_it = NULL; - GeeSet* _tmp13_; - GeeIterator* _tmp14_; + GeeSet* _tmp11_; + GeeIterator* _tmp12_; #line 852 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp13_ = keys; + _tmp11_ = keys; #line 852 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp14_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp12_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_ITERABLE, GeeIterable)); #line 852 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _key_it = _tmp14_; + _key_it = _tmp12_; #line 852 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" while (TRUE) { -#line 6342 "PhotoTable.c" - GeeIterator* _tmp15_; - gboolean _tmp16_; +#line 5947 "PhotoTable.c" + GeeIterator* _tmp13_; gchar* key = NULL; - GeeIterator* _tmp17_; - gpointer _tmp18_; + GeeIterator* _tmp14_; + gpointer _tmp15_; gchar* value = NULL; - KeyValueMap* _tmp19_; - const gchar* _tmp20_; + const gchar* _tmp16_; + gchar* _tmp17_; + const gchar* _tmp18_; + GKeyFile* _tmp19_; + gchar* _tmp20_; gchar* _tmp21_; const gchar* _tmp22_; - GKeyFile* _tmp23_; - KeyValueMap* _tmp24_; - gchar* _tmp25_; - gchar* _tmp26_; - const gchar* _tmp27_; - const gchar* _tmp28_; + const gchar* _tmp23_; #line 852 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp15_ = _key_it; + _tmp13_ = _key_it; #line 852 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp16_ = gee_iterator_next (_tmp15_); -#line 852 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (!_tmp16_) { + if (!gee_iterator_next (_tmp13_)) { #line 852 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" break; -#line 6367 "PhotoTable.c" +#line 5967 "PhotoTable.c" } #line 852 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp17_ = _key_it; + _tmp14_ = _key_it; #line 852 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp18_ = gee_iterator_get (_tmp17_); + _tmp15_ = gee_iterator_get (_tmp14_); #line 852 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - key = (gchar*) _tmp18_; -#line 853 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp19_ = map; + key = (gchar*) _tmp15_; #line 853 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp20_ = key; + _tmp16_ = key; #line 853 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp21_ = key_value_map_get_string (_tmp19_, _tmp20_, NULL); + _tmp17_ = key_value_map_get_string (map, _tmp16_, NULL); #line 853 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - value = _tmp21_; + value = _tmp17_; #line 854 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp22_ = value; + _tmp18_ = value; #line 854 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp22_ != NULL, "value != null"); + _vala_assert (_tmp18_ != NULL, "value != null"); #line 856 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp23_ = keyfile; + _tmp19_ = keyfile; #line 856 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp24_ = map; + _tmp20_ = key_value_map_get_group (map); #line 856 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp25_ = key_value_map_get_group (_tmp24_); + _tmp21_ = _tmp20_; #line 856 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp26_ = _tmp25_; + _tmp22_ = key; #line 856 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp27_ = key; + _tmp23_ = value; #line 856 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp28_ = value; + g_key_file_set_string (_tmp19_, _tmp21_, _tmp22_, _tmp23_); #line 856 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - g_key_file_set_string (_tmp23_, _tmp26_, _tmp27_, _tmp28_); -#line 856 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _g_free0 (_tmp26_); + _g_free0 (_tmp21_); #line 852 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_free0 (value); #line 852 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_free0 (key); -#line 6407 "PhotoTable.c" +#line 6003 "PhotoTable.c" } #line 852 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_object_unref0 (_key_it); -#line 6411 "PhotoTable.c" +#line 6007 "PhotoTable.c" } #line 860 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp29_ = keyfile; + _tmp24_ = keyfile; #line 860 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp31_ = g_key_file_to_data (_tmp29_, &_tmp30_, NULL); + _tmp26_ = g_key_file_to_data (_tmp24_, &_tmp25_, NULL); #line 860 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - length = _tmp30_; + length = _tmp25_; #line 860 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_free0 (trans); #line 860 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - trans = _tmp31_; + trans = _tmp26_; #line 861 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp32_ = trans; + _tmp27_ = trans; #line 861 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp32_ != NULL, "trans != null"); + _vala_assert (_tmp27_ != NULL, "trans != null"); #line 862 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp33_ = trans; + _tmp28_ = trans; #line 862 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp34_ = strlen (_tmp33_); + _tmp29_ = strlen (_tmp28_); #line 862 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp35_ = _tmp34_; + _tmp30_ = _tmp29_; #line 862 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp35_ > 0, "trans.length > 0"); + _vala_assert (_tmp30_ > 0, "trans.length > 0"); #line 844 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_object_unref0 (keys); #line 844 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_key_file_unref0 (keyfile); -#line 6439 "PhotoTable.c" +#line 6035 "PhotoTable.c" } goto __finally18; __catch18_g_error: { GError* err = NULL; - const gchar* _tmp36_; + const gchar* _tmp31_; #line 844 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" err = _inner_error_; #line 844 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _inner_error_ = NULL; #line 864 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp36_ = err->message; + _tmp31_ = err->message; #line 864 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - g_error ("PhotoTable.vala:864: %s", _tmp36_); + g_error ("PhotoTable.vala:864: %s", _tmp31_); #line 844 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_error_free0 (err); -#line 6456 "PhotoTable.c" +#line 6052 "PhotoTable.c" } __finally18: #line 844 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 6461 "PhotoTable.c" - gboolean _tmp37_ = FALSE; +#line 6057 "PhotoTable.c" + gboolean _tmp32_ = FALSE; #line 844 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_free0 (trans); #line 844 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -6488,34 +6084,35 @@ gboolean photo_table_set_transformation (PhotoTable* self, PhotoID* photo_id, Ke #line 844 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_clear_error (&_inner_error_); #line 844 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - return _tmp37_; -#line 6471 "PhotoTable.c" + return _tmp32_; +#line 6067 "PhotoTable.c" } #line 867 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp38_ = *photo_id; -#line 867 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp39_ = trans; + _tmp33_ = *photo_id; #line 867 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp40_ = photo_table_set_raw_transformations (self, &_tmp38_, _tmp39_); + _tmp34_ = trans; #line 867 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - result = _tmp40_; + result = photo_table_set_raw_transformations (self, &_tmp33_, _tmp34_); #line 867 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_free0 (trans); #line 867 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 6485 "PhotoTable.c" +#line 6079 "PhotoTable.c" } -gboolean photo_table_remove_transformation (PhotoTable* self, PhotoID* photo_id, const gchar* object) { +gboolean +photo_table_remove_transformation (PhotoTable* self, + PhotoID* photo_id, + const gchar* object) +{ gboolean result = FALSE; gchar* trans = NULL; PhotoID _tmp0_; gchar* _tmp1_; const gchar* _tmp2_; - PhotoID _tmp22_; - const gchar* _tmp23_; - gboolean _tmp24_; + PhotoID _tmp18_; + const gchar* _tmp19_; GError * _inner_error_ = NULL; #line 870 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_val_if_fail (IS_PHOTO_TABLE (self), FALSE); @@ -6539,7 +6136,7 @@ gboolean photo_table_remove_transformation (PhotoTable* self, PhotoID* photo_id, _g_free0 (trans); #line 873 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 6521 "PhotoTable.c" +#line 6118 "PhotoTable.c" } { GKeyFile* keyfile = NULL; @@ -6550,17 +6147,13 @@ gboolean photo_table_remove_transformation (PhotoTable* self, PhotoID* photo_id, const gchar* _tmp7_; gint _tmp8_; gint _tmp9_; - gboolean _tmp10_; + GKeyFile* _tmp10_; GKeyFile* _tmp11_; - const gchar* _tmp12_; - gboolean _tmp13_; - GKeyFile* _tmp14_; - const gchar* _tmp15_; gsize length = 0UL; - GKeyFile* _tmp16_; - gsize _tmp17_ = 0UL; - gchar* _tmp18_; - const gchar* _tmp19_; + GKeyFile* _tmp12_; + gsize _tmp13_ = 0UL; + gchar* _tmp14_; + const gchar* _tmp15_; #line 876 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp3_ = g_key_file_new (); #line 876 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -6576,14 +6169,12 @@ gboolean photo_table_remove_transformation (PhotoTable* self, PhotoID* photo_id, #line 877 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp9_ = _tmp8_; #line 877 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp10_ = g_key_file_load_from_data (_tmp5_, _tmp6_, (gsize) _tmp9_, G_KEY_FILE_NONE, &_inner_error_); -#line 877 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp4_ = _tmp10_; + _tmp4_ = g_key_file_load_from_data (_tmp5_, _tmp6_, (gsize) _tmp9_, G_KEY_FILE_NONE, &_inner_error_); #line 877 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 877 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_key_file_unref0 (keyfile); -#line 6565 "PhotoTable.c" +#line 6156 "PhotoTable.c" goto __catch19_g_error; } #line 877 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -6596,16 +6187,12 @@ gboolean photo_table_remove_transformation (PhotoTable* self, PhotoID* photo_id, _g_free0 (trans); #line 878 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 6578 "PhotoTable.c" +#line 6169 "PhotoTable.c" } #line 880 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp11_ = keyfile; + _tmp10_ = keyfile; #line 880 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp12_ = object; -#line 880 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp13_ = g_key_file_has_group (_tmp11_, _tmp12_); -#line 880 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (!_tmp13_) { + if (!g_key_file_has_group (_tmp10_, object)) { #line 881 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" result = TRUE; #line 881 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -6614,61 +6201,59 @@ gboolean photo_table_remove_transformation (PhotoTable* self, PhotoID* photo_id, _g_free0 (trans); #line 881 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 6596 "PhotoTable.c" +#line 6183 "PhotoTable.c" } #line 883 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp14_ = keyfile; -#line 883 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp15_ = object; + _tmp11_ = keyfile; #line 883 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - g_key_file_remove_group (_tmp14_, _tmp15_, &_inner_error_); + g_key_file_remove_group (_tmp11_, object, &_inner_error_); #line 883 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 883 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_key_file_unref0 (keyfile); -#line 6608 "PhotoTable.c" +#line 6193 "PhotoTable.c" goto __catch19_g_error; } #line 886 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp16_ = keyfile; + _tmp12_ = keyfile; #line 886 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp18_ = g_key_file_to_data (_tmp16_, &_tmp17_, NULL); + _tmp14_ = g_key_file_to_data (_tmp12_, &_tmp13_, NULL); #line 886 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - length = _tmp17_; + length = _tmp13_; #line 886 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_free0 (trans); #line 886 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - trans = _tmp18_; + trans = _tmp14_; #line 887 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp19_ = trans; + _tmp15_ = trans; #line 887 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp19_ != NULL, "trans != null"); + _vala_assert (_tmp15_ != NULL, "trans != null"); #line 875 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_key_file_unref0 (keyfile); -#line 6627 "PhotoTable.c" +#line 6212 "PhotoTable.c" } goto __finally19; __catch19_g_error: { GError* err = NULL; - const gchar* _tmp20_; + const gchar* _tmp16_; #line 875 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" err = _inner_error_; #line 875 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _inner_error_ = NULL; #line 889 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp20_ = err->message; + _tmp16_ = err->message; #line 889 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - g_error ("PhotoTable.vala:889: %s", _tmp20_); + g_error ("PhotoTable.vala:889: %s", _tmp16_); #line 875 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_error_free0 (err); -#line 6644 "PhotoTable.c" +#line 6229 "PhotoTable.c" } __finally19: #line 875 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 6649 "PhotoTable.c" - gboolean _tmp21_ = FALSE; +#line 6234 "PhotoTable.c" + gboolean _tmp17_ = FALSE; #line 875 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_free0 (trans); #line 875 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -6676,26 +6261,27 @@ gboolean photo_table_remove_transformation (PhotoTable* self, PhotoID* photo_id, #line 875 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_clear_error (&_inner_error_); #line 875 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - return _tmp21_; -#line 6659 "PhotoTable.c" + return _tmp17_; +#line 6244 "PhotoTable.c" } #line 892 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp22_ = *photo_id; -#line 892 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp23_ = trans; + _tmp18_ = *photo_id; #line 892 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp24_ = photo_table_set_raw_transformations (self, &_tmp22_, _tmp23_); + _tmp19_ = trans; #line 892 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - result = _tmp24_; + result = photo_table_set_raw_transformations (self, &_tmp18_, _tmp19_); #line 892 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_free0 (trans); #line 892 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 6673 "PhotoTable.c" +#line 6256 "PhotoTable.c" } -gboolean photo_table_remove_all_transformations (PhotoTable* self, PhotoID* photo_id) { +gboolean +photo_table_remove_all_transformations (PhotoTable* self, + PhotoID* photo_id) +{ gboolean result = FALSE; PhotoID _tmp0_; gchar* _tmp1_; @@ -6703,7 +6289,6 @@ gboolean photo_table_remove_all_transformations (PhotoTable* self, PhotoID* phot gboolean _tmp3_; PhotoID _tmp4_; gint64 _tmp5_; - gboolean _tmp6_; #line 895 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_val_if_fail (IS_PHOTO_TABLE (self), FALSE); #line 895 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -6724,428 +6309,355 @@ gboolean photo_table_remove_all_transformations (PhotoTable* self, PhotoID* phot result = FALSE; #line 897 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 6706 "PhotoTable.c" +#line 6291 "PhotoTable.c" } #line 899 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp4_ = *photo_id; #line 899 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp5_ = _tmp4_.id; #line 899 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp6_ = database_table_update_text_by_id (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp5_, "transformations", ""); -#line 899 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - result = _tmp6_; + result = database_table_update_text_by_id (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp5_, "transformations", ""); #line 899 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 6718 "PhotoTable.c" +#line 6301 "PhotoTable.c" } -static sqlite3_stmt* photo_table_get_duplicate_stmt (PhotoTable* self, GFile* file, const gchar* thumbnail_md5, const gchar* md5, PhotoFileFormat file_format) { +static sqlite3_stmt* +photo_table_get_duplicate_stmt (PhotoTable* self, + GFile* file, + const gchar* thumbnail_md5, + const gchar* md5, + PhotoFileFormat file_format) +{ sqlite3_stmt* result = NULL; gboolean _tmp0_ = FALSE; gboolean _tmp1_ = FALSE; - GFile* _tmp2_; gchar* sql = NULL; - gchar* _tmp5_; + gchar* _tmp2_; gboolean first = FALSE; - GFile* _tmp6_; - gboolean _tmp9_ = FALSE; - const gchar* _tmp10_; + gboolean _tmp5_ = FALSE; sqlite3_stmt* stmt = NULL; gint res = 0; - sqlite3* _tmp33_; - const gchar* _tmp34_; - sqlite3_stmt* _tmp35_ = NULL; - gint _tmp36_; - gint _tmp37_; + sqlite3* _tmp23_; + const gchar* _tmp24_; + sqlite3_stmt* _tmp25_ = NULL; + gint _tmp26_; + gint _tmp27_; gint col = 0; - GFile* _tmp38_; - const gchar* _tmp46_; - const gchar* _tmp54_; - gboolean _tmp62_ = FALSE; - gboolean _tmp63_ = FALSE; - const gchar* _tmp64_; + gboolean _tmp43_ = FALSE; + gboolean _tmp44_ = FALSE; #line 904 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_val_if_fail (IS_PHOTO_TABLE (self), NULL); #line 904 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_val_if_fail ((file == NULL) || G_IS_FILE (file), NULL); #line 906 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp2_ = file; -#line 906 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp2_ != NULL) { + if (file != NULL) { #line 906 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp1_ = TRUE; -#line 6757 "PhotoTable.c" +#line 6337 "PhotoTable.c" } else { - const gchar* _tmp3_; #line 906 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp3_ = thumbnail_md5; -#line 906 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp1_ = _tmp3_ != NULL; -#line 6764 "PhotoTable.c" + _tmp1_ = thumbnail_md5 != NULL; +#line 6341 "PhotoTable.c" } #line 906 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (_tmp1_) { #line 906 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp0_ = TRUE; -#line 6770 "PhotoTable.c" +#line 6347 "PhotoTable.c" } else { - const gchar* _tmp4_; -#line 906 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp4_ = md5; #line 906 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp0_ = _tmp4_ != NULL; -#line 6777 "PhotoTable.c" + _tmp0_ = md5 != NULL; +#line 6351 "PhotoTable.c" } #line 906 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _vala_assert (_tmp0_, "file != null || thumbnail_md5 != null || md5 != null"); #line 908 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp5_ = g_strdup ("SELECT id FROM PhotoTable WHERE"); + _tmp2_ = g_strdup ("SELECT id FROM PhotoTable WHERE"); #line 908 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - sql = _tmp5_; + sql = _tmp2_; #line 909 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" first = TRUE; #line 911 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp6_ = file; -#line 911 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp6_ != NULL) { -#line 6791 "PhotoTable.c" - const gchar* _tmp7_; - gchar* _tmp8_; + if (file != NULL) { +#line 6363 "PhotoTable.c" + const gchar* _tmp3_; + gchar* _tmp4_; #line 912 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp7_ = sql; + _tmp3_ = sql; #line 912 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp8_ = g_strconcat (_tmp7_, " filename=?", NULL); + _tmp4_ = g_strconcat (_tmp3_, " filename=?", NULL); #line 912 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_free0 (sql); #line 912 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - sql = _tmp8_; + sql = _tmp4_; #line 913 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" first = FALSE; -#line 6804 "PhotoTable.c" +#line 6376 "PhotoTable.c" } #line 916 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp10_ = thumbnail_md5; -#line 916 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp10_ != NULL) { + if (thumbnail_md5 != NULL) { #line 916 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp9_ = TRUE; -#line 6812 "PhotoTable.c" + _tmp5_ = TRUE; +#line 6382 "PhotoTable.c" } else { - const gchar* _tmp11_; -#line 916 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp11_ = md5; #line 916 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp9_ = _tmp11_ != NULL; -#line 6819 "PhotoTable.c" + _tmp5_ = md5 != NULL; +#line 6386 "PhotoTable.c" } #line 916 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp9_) { -#line 6823 "PhotoTable.c" - gboolean _tmp12_; + if (_tmp5_) { +#line 6390 "PhotoTable.c" + gboolean _tmp6_; const gchar* _tmp17_; - const gchar* _tmp20_; - const gchar* _tmp26_; - gchar* _tmp27_; - PhotoFileFormat _tmp28_; - const gchar* _tmp31_; - gchar* _tmp32_; + gchar* _tmp18_; + const gchar* _tmp21_; + gchar* _tmp22_; #line 917 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp12_ = first; + _tmp6_ = first; #line 917 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp12_) { -#line 6836 "PhotoTable.c" - const gchar* _tmp13_; - gchar* _tmp14_; + if (_tmp6_) { +#line 6400 "PhotoTable.c" + const gchar* _tmp7_; + gchar* _tmp8_; #line 918 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp13_ = sql; + _tmp7_ = sql; #line 918 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp14_ = g_strconcat (_tmp13_, " ((", NULL); + _tmp8_ = g_strconcat (_tmp7_, " ((", NULL); #line 918 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_free0 (sql); #line 918 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - sql = _tmp14_; -#line 6847 "PhotoTable.c" + sql = _tmp8_; +#line 6411 "PhotoTable.c" } else { - const gchar* _tmp15_; - gchar* _tmp16_; + const gchar* _tmp9_; + gchar* _tmp10_; #line 920 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp15_ = sql; + _tmp9_ = sql; #line 920 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp16_ = g_strconcat (_tmp15_, " OR ((", NULL); + _tmp10_ = g_strconcat (_tmp9_, " OR ((", NULL); #line 920 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_free0 (sql); #line 920 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - sql = _tmp16_; -#line 6859 "PhotoTable.c" + sql = _tmp10_; +#line 6423 "PhotoTable.c" } #line 921 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" first = FALSE; #line 923 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp17_ = md5; -#line 923 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp17_ != NULL) { -#line 6867 "PhotoTable.c" - const gchar* _tmp18_; - gchar* _tmp19_; + if (md5 != NULL) { +#line 6429 "PhotoTable.c" + const gchar* _tmp11_; + gchar* _tmp12_; #line 924 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp18_ = sql; + _tmp11_ = sql; #line 924 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp19_ = g_strconcat (_tmp18_, " md5=?", NULL); + _tmp12_ = g_strconcat (_tmp11_, " 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 6878 "PhotoTable.c" + sql = _tmp12_; +#line 6440 "PhotoTable.c" } #line 927 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp20_ = thumbnail_md5; -#line 927 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp20_ != NULL) { -#line 6884 "PhotoTable.c" - const gchar* _tmp21_; -#line 928 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp21_ = md5; + if (thumbnail_md5 != NULL) { #line 928 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp21_ == NULL) { -#line 6890 "PhotoTable.c" - const gchar* _tmp22_; - gchar* _tmp23_; + if (md5 == NULL) { +#line 6446 "PhotoTable.c" + const gchar* _tmp13_; + gchar* _tmp14_; #line 929 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp22_ = sql; + _tmp13_ = sql; #line 929 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp23_ = g_strconcat (_tmp22_, " thumbnail_md5=?", NULL); + _tmp14_ = g_strconcat (_tmp13_, " thumbnail_md5=?", NULL); #line 929 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_free0 (sql); #line 929 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - sql = _tmp23_; -#line 6901 "PhotoTable.c" + sql = _tmp14_; +#line 6457 "PhotoTable.c" } else { - const gchar* _tmp24_; - gchar* _tmp25_; + const gchar* _tmp15_; + gchar* _tmp16_; #line 931 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp24_ = sql; + _tmp15_ = sql; #line 931 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp25_ = g_strconcat (_tmp24_, " OR (md5 IS NULL AND thumbnail_md5=?)", NULL); + _tmp16_ = g_strconcat (_tmp15_, " OR (md5 IS NULL AND thumbnail_md5=?)", NULL); #line 931 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_free0 (sql); #line 931 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - sql = _tmp25_; -#line 6913 "PhotoTable.c" + sql = _tmp16_; +#line 6469 "PhotoTable.c" } } #line 934 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp26_ = sql; + _tmp17_ = sql; #line 934 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp27_ = g_strconcat (_tmp26_, ")", NULL); + _tmp18_ = g_strconcat (_tmp17_, ")", NULL); #line 934 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_free0 (sql); #line 934 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - sql = _tmp27_; -#line 936 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp28_ = file_format; + sql = _tmp18_; #line 936 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp28_ != PHOTO_FILE_FORMAT_UNKNOWN) { -#line 6928 "PhotoTable.c" - const gchar* _tmp29_; - gchar* _tmp30_; + if (file_format != PHOTO_FILE_FORMAT_UNKNOWN) { +#line 6482 "PhotoTable.c" + const gchar* _tmp19_; + gchar* _tmp20_; #line 937 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp29_ = sql; + _tmp19_ = sql; #line 937 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp30_ = g_strconcat (_tmp29_, " AND file_format=?", NULL); + _tmp20_ = g_strconcat (_tmp19_, " AND file_format=?", NULL); #line 937 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_free0 (sql); #line 937 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - sql = _tmp30_; -#line 6939 "PhotoTable.c" + sql = _tmp20_; +#line 6493 "PhotoTable.c" } #line 939 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp31_ = sql; + _tmp21_ = sql; #line 939 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp32_ = g_strconcat (_tmp31_, ")", NULL); + _tmp22_ = g_strconcat (_tmp21_, ")", NULL); #line 939 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_free0 (sql); #line 939 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - sql = _tmp32_; -#line 6949 "PhotoTable.c" + sql = _tmp22_; +#line 6503 "PhotoTable.c" } #line 943 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp33_ = database_table_db; + _tmp23_ = database_table_db; #line 943 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp34_ = sql; + _tmp24_ = sql; #line 943 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp36_ = sqlite3_prepare_v2 (_tmp33_, _tmp34_, -1, &_tmp35_, NULL); + _tmp26_ = sqlite3_prepare_v2 (_tmp23_, _tmp24_, -1, &_tmp25_, NULL); #line 943 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _sqlite3_finalize0 (stmt); #line 943 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - stmt = _tmp35_; + stmt = _tmp25_; #line 943 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp36_; + res = _tmp26_; #line 944 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp37_ = res; + _tmp27_ = res; #line 944 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp37_ == SQLITE_OK, "res == Sqlite.OK"); + _vala_assert (_tmp27_ == SQLITE_OK, "res == Sqlite.OK"); #line 946 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" col = 1; #line 948 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp38_ = file; -#line 948 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp38_ != NULL) { -#line 6973 "PhotoTable.c" - sqlite3_stmt* _tmp39_; - gint _tmp40_; - GFile* _tmp41_; - gchar* _tmp42_; - GDestroyNotify _tmp43_; - gint _tmp44_; - gint _tmp45_; -#line 949 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp39_ = stmt; + if (file != NULL) { +#line 6525 "PhotoTable.c" + sqlite3_stmt* _tmp28_; + gint _tmp29_; + gchar* _tmp30_; + GDestroyNotify _tmp31_; + gint _tmp32_; #line 949 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp40_ = col; + _tmp28_ = stmt; #line 949 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - col = _tmp40_ + 1; + _tmp29_ = col; #line 949 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp41_ = file; + col = _tmp29_ + 1; #line 949 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp42_ = g_file_get_path (_tmp41_); + _tmp30_ = g_file_get_path (file); #line 949 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp43_ = g_free; + _tmp31_ = g_free; #line 949 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp44_ = sqlite3_bind_text (_tmp39_, _tmp40_, _tmp42_, -1, _tmp43_); -#line 949 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp44_; + res = sqlite3_bind_text (_tmp28_, _tmp29_, _tmp30_, -1, _tmp31_); #line 950 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp45_ = res; + _tmp32_ = res; #line 950 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp45_ == SQLITE_OK, "res == Sqlite.OK"); -#line 7001 "PhotoTable.c" + _vala_assert (_tmp32_ == SQLITE_OK, "res == Sqlite.OK"); +#line 6547 "PhotoTable.c" } #line 953 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp46_ = thumbnail_md5; -#line 953 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp46_ != NULL) { -#line 7007 "PhotoTable.c" - sqlite3_stmt* _tmp47_; - gint _tmp48_; - const gchar* _tmp49_; - gchar* _tmp50_; - GDestroyNotify _tmp51_; - gint _tmp52_; - gint _tmp53_; -#line 954 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp47_ = stmt; -#line 954 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp48_ = col; + if (thumbnail_md5 != NULL) { +#line 6551 "PhotoTable.c" + sqlite3_stmt* _tmp33_; + gint _tmp34_; + gchar* _tmp35_; + GDestroyNotify _tmp36_; + gint _tmp37_; #line 954 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - col = _tmp48_ + 1; + _tmp33_ = stmt; #line 954 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp49_ = thumbnail_md5; + _tmp34_ = col; #line 954 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp50_ = g_strdup (_tmp49_); + col = _tmp34_ + 1; #line 954 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp51_ = g_free; + _tmp35_ = g_strdup (thumbnail_md5); #line 954 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp52_ = sqlite3_bind_text (_tmp47_, _tmp48_, _tmp50_, -1, _tmp51_); + _tmp36_ = g_free; #line 954 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp52_; + res = sqlite3_bind_text (_tmp33_, _tmp34_, _tmp35_, -1, _tmp36_); #line 955 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp53_ = res; + _tmp37_ = res; #line 955 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp53_ == SQLITE_OK, "res == Sqlite.OK"); -#line 7035 "PhotoTable.c" + _vala_assert (_tmp37_ == SQLITE_OK, "res == Sqlite.OK"); +#line 6573 "PhotoTable.c" } #line 958 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp54_ = md5; -#line 958 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp54_ != NULL) { -#line 7041 "PhotoTable.c" - sqlite3_stmt* _tmp55_; - gint _tmp56_; - const gchar* _tmp57_; - gchar* _tmp58_; - GDestroyNotify _tmp59_; - gint _tmp60_; - gint _tmp61_; -#line 959 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp55_ = stmt; -#line 959 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp56_ = col; + if (md5 != NULL) { +#line 6577 "PhotoTable.c" + sqlite3_stmt* _tmp38_; + gint _tmp39_; + gchar* _tmp40_; + GDestroyNotify _tmp41_; + gint _tmp42_; #line 959 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - col = _tmp56_ + 1; + _tmp38_ = stmt; #line 959 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp57_ = md5; + _tmp39_ = col; #line 959 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp58_ = g_strdup (_tmp57_); + col = _tmp39_ + 1; #line 959 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp59_ = g_free; + _tmp40_ = g_strdup (md5); #line 959 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp60_ = sqlite3_bind_text (_tmp55_, _tmp56_, _tmp58_, -1, _tmp59_); + _tmp41_ = g_free; #line 959 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp60_; + res = sqlite3_bind_text (_tmp38_, _tmp39_, _tmp40_, -1, _tmp41_); #line 960 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp61_ = res; + _tmp42_ = res; #line 960 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp61_ == SQLITE_OK, "res == Sqlite.OK"); -#line 7069 "PhotoTable.c" + _vala_assert (_tmp42_ == SQLITE_OK, "res == Sqlite.OK"); +#line 6599 "PhotoTable.c" } #line 963 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp64_ = thumbnail_md5; -#line 963 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp64_ != NULL) { + if (thumbnail_md5 != NULL) { #line 963 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp63_ = TRUE; -#line 7077 "PhotoTable.c" + _tmp44_ = TRUE; +#line 6605 "PhotoTable.c" } else { - const gchar* _tmp65_; #line 963 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp65_ = md5; -#line 963 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp63_ = _tmp65_ != NULL; -#line 7084 "PhotoTable.c" + _tmp44_ = md5 != NULL; +#line 6609 "PhotoTable.c" } #line 963 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp63_) { -#line 7088 "PhotoTable.c" - PhotoFileFormat _tmp66_; -#line 963 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp66_ = file_format; + if (_tmp44_) { #line 963 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp62_ = _tmp66_ != PHOTO_FILE_FORMAT_UNKNOWN; -#line 7094 "PhotoTable.c" + _tmp43_ = file_format != PHOTO_FILE_FORMAT_UNKNOWN; +#line 6615 "PhotoTable.c" } else { #line 963 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp62_ = FALSE; -#line 7098 "PhotoTable.c" + _tmp43_ = FALSE; +#line 6619 "PhotoTable.c" } #line 963 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp62_) { -#line 7102 "PhotoTable.c" - sqlite3_stmt* _tmp67_; - gint _tmp68_; - PhotoFileFormat _tmp69_; - gint _tmp70_; - gint _tmp71_; - gint _tmp72_; -#line 964 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp67_ = stmt; -#line 964 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp68_ = col; -#line 964 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - col = _tmp68_ + 1; + if (_tmp43_) { +#line 6623 "PhotoTable.c" + sqlite3_stmt* _tmp45_; + gint _tmp46_; + gint _tmp47_; #line 964 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp69_ = file_format; + _tmp45_ = stmt; #line 964 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp70_ = photo_file_format_serialize (_tmp69_); + _tmp46_ = col; #line 964 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp71_ = sqlite3_bind_int (_tmp67_, _tmp68_, _tmp70_); + col = _tmp46_ + 1; #line 964 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp71_; + res = sqlite3_bind_int (_tmp45_, _tmp46_, photo_file_format_serialize (file_format)); #line 965 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp72_ = res; + _tmp47_ = res; #line 965 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp72_ == SQLITE_OK, "res == Sqlite.OK"); -#line 7127 "PhotoTable.c" + _vala_assert (_tmp47_ == SQLITE_OK, "res == Sqlite.OK"); +#line 6639 "PhotoTable.c" } #line 968 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" result = stmt; @@ -7153,242 +6665,222 @@ static sqlite3_stmt* photo_table_get_duplicate_stmt (PhotoTable* self, GFile* fi _g_free0 (sql); #line 968 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 7135 "PhotoTable.c" +#line 6647 "PhotoTable.c" } -gboolean photo_table_has_duplicate (PhotoTable* self, GFile* file, const gchar* thumbnail_md5, const gchar* md5, PhotoFileFormat file_format) { +gboolean +photo_table_has_duplicate (PhotoTable* self, + GFile* file, + const gchar* thumbnail_md5, + const gchar* md5, + PhotoFileFormat file_format) +{ gboolean result = FALSE; sqlite3_stmt* stmt = NULL; - GFile* _tmp0_; - const gchar* _tmp1_; - const gchar* _tmp2_; - PhotoFileFormat _tmp3_; - sqlite3_stmt* _tmp4_; + sqlite3_stmt* _tmp0_; gint res = 0; - sqlite3_stmt* _tmp5_; - gint _tmp6_; - gint _tmp7_; + sqlite3_stmt* _tmp1_; + gint _tmp2_; #line 971 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_val_if_fail (IS_PHOTO_TABLE (self), 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 972 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp1_ = thumbnail_md5; -#line 972 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp2_ = md5; -#line 972 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp3_ = file_format; + _tmp0_ = photo_table_get_duplicate_stmt (self, file, thumbnail_md5, md5, file_format); #line 972 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp4_ = photo_table_get_duplicate_stmt (self, _tmp0_, _tmp1_, _tmp2_, _tmp3_); -#line 972 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - stmt = _tmp4_; -#line 973 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp5_ = stmt; + stmt = _tmp0_; #line 973 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp6_ = sqlite3_step (_tmp5_); + _tmp1_ = stmt; #line 973 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp6_; + res = sqlite3_step (_tmp1_); #line 975 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp7_ = res; + _tmp2_ = res; #line 975 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp7_ == SQLITE_DONE) { + if (_tmp2_ == SQLITE_DONE) { #line 977 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" result = FALSE; #line 977 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _sqlite3_finalize0 (stmt); #line 977 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 7183 "PhotoTable.c" +#line 6686 "PhotoTable.c" } else { - gint _tmp8_; + gint _tmp3_; #line 978 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp8_ = res; + _tmp3_ = res; #line 978 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp8_ == SQLITE_ROW) { + if (_tmp3_ == SQLITE_ROW) { #line 980 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" result = TRUE; #line 980 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _sqlite3_finalize0 (stmt); #line 980 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 7196 "PhotoTable.c" +#line 6699 "PhotoTable.c" } else { - gint _tmp9_; + gint _tmp4_; #line 982 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp9_ = res; + _tmp4_ = res; #line 982 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - database_table_fatal ("has_duplicate", _tmp9_); + database_table_fatal ("has_duplicate", _tmp4_); #line 984 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" result = FALSE; #line 984 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _sqlite3_finalize0 (stmt); #line 984 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 7209 "PhotoTable.c" +#line 6712 "PhotoTable.c" } } #line 971 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _sqlite3_finalize0 (stmt); -#line 7214 "PhotoTable.c" +#line 6717 "PhotoTable.c" } -static void _vala_array_add2 (PhotoID* * array, int* length, int* size, const PhotoID* value) { +static void +_vala_array_add2 (PhotoID* * array, + int* length, + int* size, + const PhotoID* value) +{ #line 996 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if ((*length) == (*size)) { #line 996 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" *size = (*size) ? (2 * (*size)) : 4; #line 996 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" *array = g_renew (PhotoID, *array, *size); -#line 7225 "PhotoTable.c" +#line 6733 "PhotoTable.c" } #line 996 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" (*array)[(*length)++] = *value; -#line 7229 "PhotoTable.c" +#line 6737 "PhotoTable.c" } -PhotoID* photo_table_get_duplicate_ids (PhotoTable* self, GFile* file, const gchar* thumbnail_md5, const gchar* md5, PhotoFileFormat file_format, int* result_length1) { +PhotoID* +photo_table_get_duplicate_ids (PhotoTable* self, + GFile* file, + const gchar* thumbnail_md5, + const gchar* md5, + PhotoFileFormat file_format, + int* result_length1) +{ PhotoID* result = NULL; sqlite3_stmt* stmt = NULL; - GFile* _tmp0_; - const gchar* _tmp1_; - const gchar* _tmp2_; - PhotoFileFormat _tmp3_; - sqlite3_stmt* _tmp4_; + sqlite3_stmt* _tmp0_; PhotoID* ids = NULL; - PhotoID* _tmp5_; + PhotoID* _tmp1_; gint ids_length1; gint _ids_size_; gint res = 0; - sqlite3_stmt* _tmp6_; - gint _tmp7_; - PhotoID* _tmp15_; - gint _tmp15__length1; + sqlite3_stmt* _tmp2_; + PhotoID* _tmp8_; + gint _tmp8__length1; #line 988 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_val_if_fail (IS_PHOTO_TABLE (self), NULL); #line 988 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_val_if_fail ((file == NULL) || G_IS_FILE (file), NULL); #line 990 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp0_ = file; -#line 990 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp1_ = thumbnail_md5; -#line 990 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp2_ = md5; -#line 990 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp3_ = file_format; + _tmp0_ = photo_table_get_duplicate_stmt (self, file, thumbnail_md5, md5, file_format); #line 990 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp4_ = photo_table_get_duplicate_stmt (self, _tmp0_, _tmp1_, _tmp2_, _tmp3_); -#line 990 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - stmt = _tmp4_; + stmt = _tmp0_; #line 992 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp5_ = g_new0 (PhotoID, 0); + _tmp1_ = g_new0 (PhotoID, 0); #line 992 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - ids = _tmp5_; + ids = _tmp1_; #line 992 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" ids_length1 = 0; #line 992 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _ids_size_ = ids_length1; #line 994 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp6_ = stmt; -#line 994 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp7_ = sqlite3_step (_tmp6_); + _tmp2_ = stmt; #line 994 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp7_; + res = sqlite3_step (_tmp2_); #line 995 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" while (TRUE) { -#line 7282 "PhotoTable.c" - gint _tmp8_; - PhotoID* _tmp9_; - gint _tmp9__length1; - sqlite3_stmt* _tmp10_; - gint64 _tmp11_; - PhotoID _tmp12_ = {0}; - sqlite3_stmt* _tmp13_; - gint _tmp14_; +#line 6782 "PhotoTable.c" + gint _tmp3_; + PhotoID* _tmp4_; + gint _tmp4__length1; + sqlite3_stmt* _tmp5_; + PhotoID _tmp6_ = {0}; + sqlite3_stmt* _tmp7_; #line 995 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp8_ = res; + _tmp3_ = res; #line 995 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (!(_tmp8_ == SQLITE_ROW)) { + if (!(_tmp3_ == SQLITE_ROW)) { #line 995 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" break; -#line 7297 "PhotoTable.c" +#line 6795 "PhotoTable.c" } #line 996 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp9_ = ids; + _tmp4_ = ids; #line 996 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp9__length1 = ids_length1; + _tmp4__length1 = ids_length1; #line 996 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp10_ = stmt; -#line 996 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp11_ = sqlite3_column_int64 (_tmp10_, 0); + _tmp5_ = stmt; #line 996 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - photo_id_init (&_tmp12_, _tmp11_); + photo_id_init (&_tmp6_, sqlite3_column_int64 (_tmp5_, 0)); #line 996 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_array_add2 (&ids, &ids_length1, &_ids_size_, &_tmp12_); + _vala_array_add2 (&ids, &ids_length1, &_ids_size_, &_tmp6_); #line 997 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp13_ = stmt; + _tmp7_ = stmt; #line 997 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp14_ = sqlite3_step (_tmp13_); -#line 997 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp14_; -#line 7317 "PhotoTable.c" + res = sqlite3_step (_tmp7_); +#line 6811 "PhotoTable.c" } #line 1000 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp15_ = ids; + _tmp8_ = ids; #line 1000 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp15__length1 = ids_length1; + _tmp8__length1 = ids_length1; #line 1000 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (result_length1) { #line 1000 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - *result_length1 = _tmp15__length1; -#line 7327 "PhotoTable.c" + *result_length1 = _tmp8__length1; +#line 6821 "PhotoTable.c" } #line 1000 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - result = _tmp15_; + result = _tmp8_; #line 1000 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _sqlite3_finalize0 (stmt); #line 1000 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 7335 "PhotoTable.c" +#line 6829 "PhotoTable.c" } -void photo_table_update_backlinks (PhotoTable* self, PhotoID* photo_id, const gchar* backlinks, GError** error) { +void +photo_table_update_backlinks (PhotoTable* self, + PhotoID* photo_id, + const gchar* backlinks, + GError** error) +{ const gchar* _tmp0_ = NULL; - const gchar* _tmp1_; - PhotoID _tmp3_; - gint64 _tmp4_; + PhotoID _tmp1_; + gint64 _tmp2_; GError * _inner_error_ = NULL; #line 1003 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_if_fail (IS_PHOTO_TABLE (self)); #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 1004 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp1_ != NULL) { -#line 7353 "PhotoTable.c" - const gchar* _tmp2_; + if (backlinks != NULL) { #line 1004 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp2_ = backlinks; -#line 1004 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp0_ = _tmp2_; -#line 7359 "PhotoTable.c" + _tmp0_ = backlinks; +#line 6851 "PhotoTable.c" } else { #line 1004 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp0_ = ""; -#line 7363 "PhotoTable.c" +#line 6855 "PhotoTable.c" } #line 1004 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp3_ = *photo_id; + _tmp1_ = *photo_id; #line 1004 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp4_ = _tmp3_.id; + _tmp2_ = _tmp1_.id; #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_); + database_table_update_text_by_id_2 (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp2_, "backlinks", _tmp0_, &_inner_error_); #line 1004 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1004 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -7397,7 +6889,7 @@ void photo_table_update_backlinks (PhotoTable* self, PhotoID* photo_id, const gc g_propagate_error (error, _inner_error_); #line 1004 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; -#line 7379 "PhotoTable.c" +#line 6871 "PhotoTable.c" } else { #line 1004 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -7405,20 +6897,23 @@ void photo_table_update_backlinks (PhotoTable* self, PhotoID* photo_id, const gc g_clear_error (&_inner_error_); #line 1004 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; -#line 7387 "PhotoTable.c" +#line 6879 "PhotoTable.c" } } } -void photo_table_attach_editable (PhotoTable* self, PhotoRow* row, BackingPhotoID* editable_id, GError** error) { - PhotoRow* _tmp0_; - PhotoID _tmp1_; - gint64 _tmp2_; - BackingPhotoID _tmp3_; - gint64 _tmp4_; - PhotoRow* _tmp5_; - BackingPhotoID _tmp6_; +void +photo_table_attach_editable (PhotoTable* self, + PhotoRow* row, + BackingPhotoID* editable_id, + GError** error) +{ + PhotoID _tmp0_; + gint64 _tmp1_; + BackingPhotoID _tmp2_; + gint64 _tmp3_; + BackingPhotoID _tmp4_; GError * _inner_error_ = NULL; #line 1007 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_if_fail (IS_PHOTO_TABLE (self)); @@ -7427,17 +6922,15 @@ void photo_table_attach_editable (PhotoTable* self, PhotoRow* row, BackingPhotoI #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 1008 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp1_ = _tmp0_->photo_id; + _tmp0_ = row->photo_id; #line 1008 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp2_ = _tmp1_.id; + _tmp1_ = _tmp0_.id; #line 1008 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp3_ = *editable_id; + _tmp2_ = *editable_id; #line 1008 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp4_ = _tmp3_.id; + _tmp3_ = _tmp2_.id; #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_); + database_table_update_int64_by_id_2 (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp1_, "editable_id", _tmp3_, &_inner_error_); #line 1008 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1008 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -7446,7 +6939,7 @@ void photo_table_attach_editable (PhotoTable* self, PhotoRow* row, BackingPhotoI g_propagate_error (error, _inner_error_); #line 1008 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; -#line 7428 "PhotoTable.c" +#line 6921 "PhotoTable.c" } else { #line 1008 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -7454,37 +6947,35 @@ void photo_table_attach_editable (PhotoTable* self, PhotoRow* row, BackingPhotoI g_clear_error (&_inner_error_); #line 1008 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; -#line 7436 "PhotoTable.c" +#line 6929 "PhotoTable.c" } } #line 1010 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp5_ = row; -#line 1010 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp6_ = *editable_id; + _tmp4_ = *editable_id; #line 1010 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp5_->editable_id = _tmp6_; -#line 7445 "PhotoTable.c" + row->editable_id = _tmp4_; +#line 6936 "PhotoTable.c" } -void photo_table_detach_editable (PhotoTable* self, PhotoRow* row, GError** error) { - PhotoRow* _tmp0_; - PhotoID _tmp1_; - gint64 _tmp2_; - PhotoRow* _tmp3_; +void +photo_table_detach_editable (PhotoTable* self, + PhotoRow* row, + GError** error) +{ + PhotoID _tmp0_; + gint64 _tmp1_; GError * _inner_error_ = NULL; #line 1013 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_if_fail (IS_PHOTO_TABLE (self)); #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 1014 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp1_ = _tmp0_->photo_id; + _tmp0_ = row->photo_id; #line 1014 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp2_ = _tmp1_.id; + _tmp1_ = _tmp0_.id; #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_); + database_table_update_int64_by_id_2 (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp1_, "editable_id", BACKING_PHOTO_ID_INVALID, &_inner_error_); #line 1014 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1014 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -7493,7 +6984,7 @@ void photo_table_detach_editable (PhotoTable* self, PhotoRow* row, GError** erro g_propagate_error (error, _inner_error_); #line 1014 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; -#line 7475 "PhotoTable.c" +#line 6966 "PhotoTable.c" } else { #line 1014 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -7501,45 +6992,45 @@ void photo_table_detach_editable (PhotoTable* self, PhotoRow* row, GError** erro g_clear_error (&_inner_error_); #line 1014 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; -#line 7483 "PhotoTable.c" +#line 6974 "PhotoTable.c" } } #line 1016 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp3_ = row; -#line 1016 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - backing_photo_id_init (&_tmp3_->editable_id, BACKING_PHOTO_ID_INVALID); -#line 7490 "PhotoTable.c" + backing_photo_id_init (&row->editable_id, BACKING_PHOTO_ID_INVALID); +#line 6979 "PhotoTable.c" } -void photo_table_set_metadata_dirty (PhotoTable* self, PhotoID* photo_id, gboolean dirty, GError** error) { +void +photo_table_set_metadata_dirty (PhotoTable* self, + PhotoID* photo_id, + gboolean dirty, + GError** error) +{ gint _tmp0_ = 0; - gboolean _tmp1_; - PhotoID _tmp2_; - gint64 _tmp3_; + PhotoID _tmp1_; + gint64 _tmp2_; GError * _inner_error_ = NULL; #line 1019 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_if_fail (IS_PHOTO_TABLE (self)); #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 1020 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp1_) { + if (dirty) { #line 1020 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp0_ = 1; -#line 7510 "PhotoTable.c" +#line 7001 "PhotoTable.c" } else { #line 1020 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp0_ = 0; -#line 7514 "PhotoTable.c" +#line 7005 "PhotoTable.c" } #line 1020 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp2_ = *photo_id; + _tmp1_ = *photo_id; #line 1020 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp3_ = _tmp2_.id; + _tmp2_ = _tmp1_.id; #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_); + database_table_update_int_by_id_2 (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp2_, "metadata_dirty", _tmp0_, &_inner_error_); #line 1020 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1020 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -7548,7 +7039,7 @@ void photo_table_set_metadata_dirty (PhotoTable* self, PhotoID* photo_id, gboole g_propagate_error (error, _inner_error_); #line 1020 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; -#line 7530 "PhotoTable.c" +#line 7021 "PhotoTable.c" } else { #line 1020 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -7556,29 +7047,31 @@ void photo_table_set_metadata_dirty (PhotoTable* self, PhotoID* photo_id, gboole g_clear_error (&_inner_error_); #line 1020 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; -#line 7538 "PhotoTable.c" +#line 7029 "PhotoTable.c" } } } -void photo_table_update_raw_development (PhotoTable* self, PhotoRow* row, RawDeveloper rd, BackingPhotoID* backing_photo_id, GError** error) { +void +photo_table_update_raw_development (PhotoTable* self, + PhotoRow* row, + RawDeveloper rd, + BackingPhotoID* backing_photo_id, + GError** error) +{ gchar* col = NULL; - RawDeveloper _tmp0_; - PhotoRow* _tmp4_; - BackingPhotoID* _tmp5_; - gint _tmp5__length1; - RawDeveloper _tmp6_; - BackingPhotoID _tmp7_; - BackingPhotoID _tmp8_; - PhotoRow* _tmp9_; - PhotoID _tmp10_; - gint64 _tmp11_; - const gchar* _tmp12_; - BackingPhotoID _tmp13_; - gint64 _tmp14_; - BackingPhotoID _tmp15_; - gint64 _tmp16_; + BackingPhotoID* _tmp3_; + gint _tmp3__length1; + BackingPhotoID _tmp4_; + BackingPhotoID _tmp5_; + PhotoID _tmp6_; + gint64 _tmp7_; + const gchar* _tmp8_; + BackingPhotoID _tmp9_; + gint64 _tmp10_; + BackingPhotoID _tmp11_; + gint64 _tmp12_; GError * _inner_error_ = NULL; #line 1023 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_if_fail (IS_PHOTO_TABLE (self)); @@ -7587,89 +7080,81 @@ void photo_table_update_raw_development (PhotoTable* self, PhotoRow* row, RawDev #line 1023 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_if_fail (backing_photo_id != NULL); #line 1027 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp0_ = rd; -#line 1027 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - switch (_tmp0_) { + switch (rd) { #line 1027 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" case RAW_DEVELOPER_SHOTWELL: -#line 7574 "PhotoTable.c" +#line 7065 "PhotoTable.c" { - gchar* _tmp1_; + gchar* _tmp0_; #line 1029 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp1_ = g_strdup ("develop_shotwell_id"); + _tmp0_ = g_strdup ("develop_shotwell_id"); #line 1029 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_free0 (col); #line 1029 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - col = _tmp1_; + col = _tmp0_; #line 1030 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" break; -#line 7585 "PhotoTable.c" +#line 7076 "PhotoTable.c" } #line 1027 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" case RAW_DEVELOPER_CAMERA: -#line 7589 "PhotoTable.c" +#line 7080 "PhotoTable.c" { - gchar* _tmp2_; + gchar* _tmp1_; #line 1033 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp2_ = g_strdup ("develop_camera_id"); + _tmp1_ = g_strdup ("develop_camera_id"); #line 1033 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_free0 (col); #line 1033 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - col = _tmp2_; + col = _tmp1_; #line 1034 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" break; -#line 7600 "PhotoTable.c" +#line 7091 "PhotoTable.c" } #line 1027 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" case RAW_DEVELOPER_EMBEDDED: -#line 7604 "PhotoTable.c" +#line 7095 "PhotoTable.c" { - gchar* _tmp3_; + gchar* _tmp2_; #line 1037 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp3_ = g_strdup ("develop_embedded_id"); + _tmp2_ = g_strdup ("develop_embedded_id"); #line 1037 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_free0 (col); #line 1037 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - col = _tmp3_; + col = _tmp2_; #line 1038 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" break; -#line 7615 "PhotoTable.c" +#line 7106 "PhotoTable.c" } default: { #line 1041 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_assert_not_reached (); -#line 7621 "PhotoTable.c" +#line 7112 "PhotoTable.c" } } #line 1044 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp4_ = row; + _tmp3_ = row->development_ids; #line 1044 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp5_ = _tmp4_->development_ids; + _tmp3__length1 = row->development_ids_length1; #line 1044 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp5__length1 = _tmp4_->development_ids_length1; + _tmp4_ = *backing_photo_id; #line 1044 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp6_ = rd; + _tmp3_[rd] = _tmp4_; #line 1044 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp7_ = *backing_photo_id; -#line 1044 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp5_[_tmp6_] = _tmp7_; -#line 1044 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp8_ = _tmp5_[_tmp6_]; + _tmp5_ = _tmp3_[rd]; #line 1045 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp9_ = row; + _tmp6_ = row->photo_id; #line 1045 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp10_ = _tmp9_->photo_id; + _tmp7_ = _tmp6_.id; #line 1045 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp11_ = _tmp10_.id; + _tmp8_ = col; #line 1045 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp12_ = col; + _tmp9_ = *backing_photo_id; #line 1045 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp13_ = *backing_photo_id; + _tmp10_ = _tmp9_.id; #line 1045 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp14_ = _tmp13_.id; -#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_); + database_table_update_int64_by_id_2 (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp7_, _tmp8_, _tmp10_, &_inner_error_); #line 1045 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1045 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -7680,7 +7165,7 @@ void photo_table_update_raw_development (PhotoTable* self, PhotoRow* row, RawDev _g_free0 (col); #line 1045 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; -#line 7662 "PhotoTable.c" +#line 7147 "PhotoTable.c" } else { #line 1045 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_free0 (col); @@ -7690,38 +7175,32 @@ void photo_table_update_raw_development (PhotoTable* self, PhotoRow* row, RawDev g_clear_error (&_inner_error_); #line 1045 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; -#line 7672 "PhotoTable.c" +#line 7157 "PhotoTable.c" } } #line 1047 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp15_ = *backing_photo_id; + _tmp11_ = *backing_photo_id; #line 1047 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp16_ = _tmp15_.id; + _tmp12_ = _tmp11_.id; #line 1047 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp16_ != BACKING_PHOTO_ID_INVALID) { -#line 7681 "PhotoTable.c" - PhotoRow* _tmp17_; - PhotoID _tmp18_; - gint64 _tmp19_; - RawDeveloper _tmp20_; - gchar* _tmp21_; - gchar* _tmp22_; -#line 1048 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp17_ = row; -#line 1048 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp18_ = _tmp17_->photo_id; + if (_tmp12_ != BACKING_PHOTO_ID_INVALID) { +#line 7166 "PhotoTable.c" + PhotoID _tmp13_; + gint64 _tmp14_; + gchar* _tmp15_; + gchar* _tmp16_; #line 1048 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp19_ = _tmp18_.id; + _tmp13_ = row->photo_id; #line 1048 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp20_ = rd; + _tmp14_ = _tmp13_.id; #line 1048 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp21_ = raw_developer_to_string (_tmp20_); + _tmp15_ = raw_developer_to_string (rd); #line 1048 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp22_ = _tmp21_; + _tmp16_ = _tmp15_; #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_); + database_table_update_text_by_id_2 (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp14_, "developer", _tmp16_, &_inner_error_); #line 1048 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _g_free0 (_tmp22_); + _g_free0 (_tmp16_); #line 1048 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1048 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -7732,7 +7211,7 @@ void photo_table_update_raw_development (PhotoTable* self, PhotoRow* row, RawDev _g_free0 (col); #line 1048 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; -#line 7714 "PhotoTable.c" +#line 7193 "PhotoTable.c" } else { #line 1048 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_free0 (col); @@ -7742,33 +7221,32 @@ void photo_table_update_raw_development (PhotoTable* self, PhotoRow* row, RawDev g_clear_error (&_inner_error_); #line 1048 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; -#line 7724 "PhotoTable.c" +#line 7203 "PhotoTable.c" } } } #line 1023 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_free0 (col); -#line 7730 "PhotoTable.c" +#line 7209 "PhotoTable.c" } -void photo_table_remove_development (PhotoTable* self, PhotoRow* row, RawDeveloper rd, GError** error) { - PhotoRow* _tmp0_; - RawDeveloper _tmp1_; - BackingPhotoID _tmp2_ = {0}; +void +photo_table_remove_development (PhotoTable* self, + PhotoRow* row, + RawDeveloper rd, + GError** error) +{ + BackingPhotoID _tmp0_ = {0}; GError * _inner_error_ = NULL; #line 1051 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_if_fail (IS_PHOTO_TABLE (self)); #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 1052 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp1_ = rd; + backing_photo_id_init (&_tmp0_, BACKING_PHOTO_ID_INVALID); #line 1052 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - backing_photo_id_init (&_tmp2_, BACKING_PHOTO_ID_INVALID); -#line 1052 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - photo_table_update_raw_development (self, _tmp0_, _tmp1_, &_tmp2_, &_inner_error_); + photo_table_update_raw_development (self, row, rd, &_tmp0_, &_inner_error_); #line 1052 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1052 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -7777,7 +7255,7 @@ void photo_table_remove_development (PhotoTable* self, PhotoRow* row, RawDevelop g_propagate_error (error, _inner_error_); #line 1052 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; -#line 7759 "PhotoTable.c" +#line 7237 "PhotoTable.c" } else { #line 1052 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -7785,36 +7263,44 @@ void photo_table_remove_development (PhotoTable* self, PhotoRow* row, RawDevelop g_clear_error (&_inner_error_); #line 1052 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; -#line 7767 "PhotoTable.c" +#line 7245 "PhotoTable.c" } } } -static void photo_table_class_init (PhotoTableClass * klass) { +static void +photo_table_class_init (PhotoTableClass * klass) +{ #line 109 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" photo_table_parent_class = g_type_class_peek_parent (klass); #line 109 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" ((DatabaseTableClass *) klass)->finalize = photo_table_finalize; -#line 7778 "PhotoTable.c" +#line 7258 "PhotoTable.c" } -static void photo_table_instance_init (PhotoTable * self) { +static void +photo_table_instance_init (PhotoTable * self) +{ } -static void photo_table_finalize (DatabaseTable * obj) { +static void +photo_table_finalize (DatabaseTable * obj) +{ PhotoTable * self; #line 109 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PHOTO_TABLE, PhotoTable); #line 109 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" DATABASE_TABLE_CLASS (photo_table_parent_class)->finalize (obj); -#line 7792 "PhotoTable.c" +#line 7276 "PhotoTable.c" } -GType photo_table_get_type (void) { +GType +photo_table_get_type (void) +{ static volatile gsize photo_table_type_id__volatile = 0; if (g_once_init_enter (&photo_table_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (PhotoTableClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) photo_table_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PhotoTable), 0, (GInstanceInitFunc) photo_table_instance_init, NULL }; @@ -7826,19 +7312,21 @@ GType photo_table_get_type (void) { } -void backing_photo_id_init (BackingPhotoID *self, gint64 id) { - gint64 _tmp0_; +void +backing_photo_id_init (BackingPhotoID *self, + gint64 id) +{ #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 1073 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - (*self).id = _tmp0_; -#line 7816 "PhotoTable.c" + (*self).id = id; +#line 7302 "PhotoTable.c" } -gboolean backing_photo_id_is_invalid (BackingPhotoID *self) { +gboolean +backing_photo_id_is_invalid (BackingPhotoID *self) +{ gboolean result = FALSE; gint64 _tmp0_; #line 1077 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -7847,11 +7335,13 @@ gboolean backing_photo_id_is_invalid (BackingPhotoID *self) { result = _tmp0_ == BACKING_PHOTO_ID_INVALID; #line 1077 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 7829 "PhotoTable.c" +#line 7317 "PhotoTable.c" } -gboolean backing_photo_id_is_valid (BackingPhotoID *self) { +gboolean +backing_photo_id_is_valid (BackingPhotoID *self) +{ gboolean result = FALSE; gint64 _tmp0_; #line 1081 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -7860,11 +7350,13 @@ gboolean backing_photo_id_is_valid (BackingPhotoID *self) { result = _tmp0_ != BACKING_PHOTO_ID_INVALID; #line 1081 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 7842 "PhotoTable.c" +#line 7332 "PhotoTable.c" } -BackingPhotoID* backing_photo_id_dup (const BackingPhotoID* self) { +BackingPhotoID* +backing_photo_id_dup (const BackingPhotoID* self) +{ BackingPhotoID* dup; #line 1067 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" dup = g_new0 (BackingPhotoID, 1); @@ -7872,18 +7364,22 @@ BackingPhotoID* backing_photo_id_dup (const BackingPhotoID* self) { memcpy (dup, self, sizeof (BackingPhotoID)); #line 1067 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return dup; -#line 7854 "PhotoTable.c" +#line 7346 "PhotoTable.c" } -void backing_photo_id_free (BackingPhotoID* self) { +void +backing_photo_id_free (BackingPhotoID* self) +{ #line 1067 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_free (self); -#line 7861 "PhotoTable.c" +#line 7355 "PhotoTable.c" } -GType backing_photo_id_get_type (void) { +GType +backing_photo_id_get_type (void) +{ static volatile gsize backing_photo_id_type_id__volatile = 0; if (g_once_init_enter (&backing_photo_id_type_id__volatile)) { GType backing_photo_id_type_id; @@ -7894,15 +7390,15 @@ GType backing_photo_id_get_type (void) { } -gboolean backing_photo_row_matches_file_info (BackingPhotoRow* self, GFileInfo* info) { +gboolean +backing_photo_row_matches_file_info (BackingPhotoRow* self, + GFileInfo* info) +{ gboolean result = FALSE; gint64 _tmp0_; - GFileInfo* _tmp1_; - gint64 _tmp2_; - time_t _tmp3_; - GFileInfo* _tmp4_; - GTimeVal _tmp5_ = {0}; - glong _tmp6_; + time_t _tmp1_; + GTimeVal _tmp2_ = {0}; + glong _tmp3_; #line 1095 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_val_if_fail (IS_BACKING_PHOTO_ROW (self), FALSE); #line 1095 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -7910,42 +7406,36 @@ gboolean backing_photo_row_matches_file_info (BackingPhotoRow* self, GFileInfo* #line 1096 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp0_ = self->filesize; #line 1096 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp1_ = info; -#line 1096 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp2_ = g_file_info_get_size (_tmp1_); -#line 1096 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp0_ != _tmp2_) { + if (_tmp0_ != g_file_info_get_size (info)) { #line 1097 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" result = FALSE; #line 1097 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 7901 "PhotoTable.c" +#line 7393 "PhotoTable.c" } #line 1099 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp3_ = self->timestamp; -#line 1099 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp4_ = info; + _tmp1_ = self->timestamp; #line 1099 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - g_file_info_get_modification_time (_tmp4_, &_tmp5_); + g_file_info_get_modification_time (info, &_tmp2_); #line 1099 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp6_ = _tmp5_.tv_sec; + _tmp3_ = _tmp2_.tv_sec; #line 1099 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - result = _tmp3_ == ((time_t) _tmp6_); + result = _tmp1_ == ((time_t) _tmp3_); #line 1099 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 7915 "PhotoTable.c" +#line 7405 "PhotoTable.c" } -gboolean backing_photo_row_is_touched (BackingPhotoRow* self, GFileInfo* info) { +gboolean +backing_photo_row_is_touched (BackingPhotoRow* self, + GFileInfo* info) +{ gboolean result = FALSE; gint64 _tmp0_; - GFileInfo* _tmp1_; - gint64 _tmp2_; - time_t _tmp3_; - GFileInfo* _tmp4_; - GTimeVal _tmp5_ = {0}; - glong _tmp6_; + time_t _tmp1_; + GTimeVal _tmp2_ = {0}; + glong _tmp3_; #line 1102 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_val_if_fail (IS_BACKING_PHOTO_ROW (self), FALSE); #line 1102 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -7953,226 +7443,228 @@ gboolean backing_photo_row_is_touched (BackingPhotoRow* self, GFileInfo* info) { #line 1103 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp0_ = self->filesize; #line 1103 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp1_ = info; -#line 1103 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp2_ = g_file_info_get_size (_tmp1_); -#line 1103 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp0_ != _tmp2_) { + if (_tmp0_ != g_file_info_get_size (info)) { #line 1104 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" result = FALSE; #line 1104 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 7944 "PhotoTable.c" +#line 7430 "PhotoTable.c" } #line 1106 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp3_ = self->timestamp; -#line 1106 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp4_ = info; + _tmp1_ = self->timestamp; #line 1106 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - g_file_info_get_modification_time (_tmp4_, &_tmp5_); + g_file_info_get_modification_time (info, &_tmp2_); #line 1106 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp6_ = _tmp5_.tv_sec; + _tmp3_ = _tmp2_.tv_sec; #line 1106 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - result = _tmp3_ != ((time_t) _tmp6_); + result = _tmp1_ != ((time_t) _tmp3_); #line 1106 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 7958 "PhotoTable.c" +#line 7442 "PhotoTable.c" } -void backing_photo_row_copy_from (BackingPhotoRow* self, BackingPhotoRow* from) { - BackingPhotoRow* _tmp0_; - BackingPhotoID _tmp1_; - BackingPhotoRow* _tmp2_; - time_t _tmp3_; - BackingPhotoRow* _tmp4_; - const gchar* _tmp5_; - gchar* _tmp6_; - BackingPhotoRow* _tmp7_; - gint64 _tmp8_; - BackingPhotoRow* _tmp9_; - time_t _tmp10_; - BackingPhotoRow* _tmp11_; - PhotoFileFormat _tmp12_; - BackingPhotoRow* _tmp13_; - Dimensions _tmp14_; - BackingPhotoRow* _tmp15_; - Orientation _tmp16_; +void +backing_photo_row_copy_from (BackingPhotoRow* self, + BackingPhotoRow* from) +{ + BackingPhotoID _tmp0_; + time_t _tmp1_; + const gchar* _tmp2_; + gchar* _tmp3_; + gint64 _tmp4_; + time_t _tmp5_; + PhotoFileFormat _tmp6_; + Dimensions _tmp7_; + Orientation _tmp8_; #line 1110 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_if_fail (IS_BACKING_PHOTO_ROW (self)); #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; + _tmp0_ = from->id; #line 1111 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp1_ = _tmp0_->id; -#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; + self->id = _tmp0_; #line 1112 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp3_ = _tmp2_->time_created; + _tmp1_ = from->time_created; #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; + self->time_created = _tmp1_; #line 1113 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp5_ = _tmp4_->filepath; + _tmp2_ = from->filepath; #line 1113 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp6_ = g_strdup (_tmp5_); + _tmp3_ = g_strdup (_tmp2_); #line 1113 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_free0 (self->filepath); #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; + self->filepath = _tmp3_; #line 1114 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp8_ = _tmp7_->filesize; + _tmp4_ = from->filesize; #line 1114 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - self->filesize = _tmp8_; + self->filesize = _tmp4_; #line 1115 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp9_ = from; + _tmp5_ = from->timestamp; #line 1115 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp10_ = _tmp9_->timestamp; -#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; + self->timestamp = _tmp5_; #line 1116 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp12_ = _tmp11_->file_format; + _tmp6_ = from->file_format; #line 1116 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - self->file_format = _tmp12_; + self->file_format = _tmp6_; #line 1117 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp13_ = from; + _tmp7_ = from->dim; #line 1117 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp14_ = _tmp13_->dim; -#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; + self->dim = _tmp7_; #line 1118 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp16_ = _tmp15_->original_orientation; + _tmp8_ = from->original_orientation; #line 1118 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - self->original_orientation = _tmp16_; -#line 8036 "PhotoTable.c" + self->original_orientation = _tmp8_; +#line 7499 "PhotoTable.c" } -BackingPhotoRow* backing_photo_row_construct (GType object_type) { +BackingPhotoRow* +backing_photo_row_construct (GType object_type) +{ BackingPhotoRow* self = NULL; #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" self = (BackingPhotoRow*) g_type_create_instance (object_type); #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return self; -#line 8046 "PhotoTable.c" +#line 7511 "PhotoTable.c" } -BackingPhotoRow* backing_photo_row_new (void) { +BackingPhotoRow* +backing_photo_row_new (void) +{ #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return backing_photo_row_construct (TYPE_BACKING_PHOTO_ROW); -#line 8053 "PhotoTable.c" +#line 7520 "PhotoTable.c" } -static void value_backing_photo_row_init (GValue* value) { +static void +value_backing_photo_row_init (GValue* value) +{ #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" value->data[0].v_pointer = NULL; -#line 8060 "PhotoTable.c" +#line 7529 "PhotoTable.c" } -static void value_backing_photo_row_free_value (GValue* value) { +static void +value_backing_photo_row_free_value (GValue* value) +{ #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (value->data[0].v_pointer) { #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" backing_photo_row_unref (value->data[0].v_pointer); -#line 8069 "PhotoTable.c" +#line 7540 "PhotoTable.c" } } -static void value_backing_photo_row_copy_value (const GValue* src_value, GValue* dest_value) { +static void +value_backing_photo_row_copy_value (const GValue* src_value, + GValue* dest_value) +{ #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (src_value->data[0].v_pointer) { #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" dest_value->data[0].v_pointer = backing_photo_row_ref (src_value->data[0].v_pointer); -#line 8079 "PhotoTable.c" +#line 7553 "PhotoTable.c" } else { #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" dest_value->data[0].v_pointer = NULL; -#line 8083 "PhotoTable.c" +#line 7557 "PhotoTable.c" } } -static gpointer value_backing_photo_row_peek_pointer (const GValue* value) { +static gpointer +value_backing_photo_row_peek_pointer (const GValue* value) +{ #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return value->data[0].v_pointer; -#line 8091 "PhotoTable.c" +#line 7567 "PhotoTable.c" } -static gchar* value_backing_photo_row_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_backing_photo_row_collect_value (GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (collect_values[0].v_pointer) { -#line 8098 "PhotoTable.c" +#line 7579 "PhotoTable.c" BackingPhotoRow * object; object = collect_values[0].v_pointer; #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (object->parent_instance.g_class == NULL) { #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 8105 "PhotoTable.c" +#line 7586 "PhotoTable.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 8109 "PhotoTable.c" +#line 7590 "PhotoTable.c" } #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" value->data[0].v_pointer = backing_photo_row_ref (object); -#line 8113 "PhotoTable.c" +#line 7594 "PhotoTable.c" } else { #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" value->data[0].v_pointer = NULL; -#line 8117 "PhotoTable.c" +#line 7598 "PhotoTable.c" } #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return NULL; -#line 8121 "PhotoTable.c" +#line 7602 "PhotoTable.c" } -static gchar* value_backing_photo_row_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +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 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (!object_p) { #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 8132 "PhotoTable.c" +#line 7618 "PhotoTable.c" } #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (!value->data[0].v_pointer) { #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" *object_p = NULL; -#line 8138 "PhotoTable.c" +#line 7624 "PhotoTable.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" *object_p = value->data[0].v_pointer; -#line 8142 "PhotoTable.c" +#line 7628 "PhotoTable.c" } else { #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" *object_p = backing_photo_row_ref (value->data[0].v_pointer); -#line 8146 "PhotoTable.c" +#line 7632 "PhotoTable.c" } #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return NULL; -#line 8150 "PhotoTable.c" +#line 7636 "PhotoTable.c" } -GParamSpec* param_spec_backing_photo_row (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { +GParamSpec* +param_spec_backing_photo_row (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) +{ ParamSpecBackingPhotoRow* spec; #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); @@ -8182,20 +7674,25 @@ GParamSpec* param_spec_backing_photo_row (const gchar* name, const gchar* nick, G_PARAM_SPEC (spec)->value_type = object_type; #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return G_PARAM_SPEC (spec); -#line 8164 "PhotoTable.c" +#line 7656 "PhotoTable.c" } -gpointer value_get_backing_photo_row (const GValue* value) { +gpointer +value_get_backing_photo_row (const GValue* value) +{ #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 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return value->data[0].v_pointer; -#line 8173 "PhotoTable.c" +#line 7667 "PhotoTable.c" } -void value_set_backing_photo_row (GValue* value, gpointer v_object) { +void +value_set_backing_photo_row (GValue* value, + gpointer v_object) +{ BackingPhotoRow * old; #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_BACKING_PHOTO_ROW)); @@ -8211,22 +7708,25 @@ void value_set_backing_photo_row (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" backing_photo_row_ref (value->data[0].v_pointer); -#line 8193 "PhotoTable.c" +#line 7690 "PhotoTable.c" } else { #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" value->data[0].v_pointer = NULL; -#line 8197 "PhotoTable.c" +#line 7694 "PhotoTable.c" } #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (old) { #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" backing_photo_row_unref (old); -#line 8203 "PhotoTable.c" +#line 7700 "PhotoTable.c" } } -void value_take_backing_photo_row (GValue* value, gpointer v_object) { +void +value_take_backing_photo_row (GValue* value, + gpointer v_object) +{ BackingPhotoRow * old; #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_BACKING_PHOTO_ROW)); @@ -8240,40 +7740,46 @@ void value_take_backing_photo_row (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" value->data[0].v_pointer = v_object; -#line 8222 "PhotoTable.c" +#line 7722 "PhotoTable.c" } else { #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" value->data[0].v_pointer = NULL; -#line 8226 "PhotoTable.c" +#line 7726 "PhotoTable.c" } #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (old) { #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" backing_photo_row_unref (old); -#line 8232 "PhotoTable.c" +#line 7732 "PhotoTable.c" } } -static void backing_photo_row_class_init (BackingPhotoRowClass * klass) { +static void +backing_photo_row_class_init (BackingPhotoRowClass * klass) +{ #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" backing_photo_row_parent_class = g_type_class_peek_parent (klass); #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" ((BackingPhotoRowClass *) klass)->finalize = backing_photo_row_finalize; -#line 8242 "PhotoTable.c" +#line 7744 "PhotoTable.c" } -static void backing_photo_row_instance_init (BackingPhotoRow * self) { +static void +backing_photo_row_instance_init (BackingPhotoRow * self) +{ #line 1088 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" self->filepath = NULL; #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" self->ref_count = 1; -#line 8251 "PhotoTable.c" +#line 7755 "PhotoTable.c" } -static void backing_photo_row_finalize (BackingPhotoRow * obj) { +static void +backing_photo_row_finalize (BackingPhotoRow * obj) +{ BackingPhotoRow * self; #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_BACKING_PHOTO_ROW, BackingPhotoRow); @@ -8281,11 +7787,13 @@ static void backing_photo_row_finalize (BackingPhotoRow * obj) { g_signal_handlers_destroy (self); #line 1088 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_free0 (self->filepath); -#line 8263 "PhotoTable.c" +#line 7769 "PhotoTable.c" } -GType backing_photo_row_get_type (void) { +GType +backing_photo_row_get_type (void) +{ static volatile gsize backing_photo_row_type_id__volatile = 0; if (g_once_init_enter (&backing_photo_row_type_id__volatile)) { static const GTypeValueTable g_define_type_value_table = { value_backing_photo_row_init, value_backing_photo_row_free_value, value_backing_photo_row_copy_value, value_backing_photo_row_peek_pointer, "p", value_backing_photo_row_collect_value, "p", value_backing_photo_row_lcopy_value }; @@ -8299,18 +7807,22 @@ GType backing_photo_row_get_type (void) { } -gpointer backing_photo_row_ref (gpointer instance) { +gpointer +backing_photo_row_ref (gpointer instance) +{ BackingPhotoRow * self; self = instance; #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_atomic_int_inc (&self->ref_count); #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return instance; -#line 8288 "PhotoTable.c" +#line 7798 "PhotoTable.c" } -void backing_photo_row_unref (gpointer instance) { +void +backing_photo_row_unref (gpointer instance) +{ BackingPhotoRow * self; self = instance; #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -8319,12 +7831,14 @@ void backing_photo_row_unref (gpointer instance) { BACKING_PHOTO_ROW_GET_CLASS (self)->finalize (self); #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_type_free_instance ((GTypeInstance *) self); -#line 8301 "PhotoTable.c" +#line 7813 "PhotoTable.c" } } -static BackingPhotoTable* backing_photo_table_construct (GType object_type) { +static BackingPhotoTable* +backing_photo_table_construct (GType object_type) +{ BackingPhotoTable* self = NULL; sqlite3_stmt* stmt = NULL; gint res = 0; @@ -8334,7 +7848,6 @@ static BackingPhotoTable* backing_photo_table_construct (GType object_type) { gint _tmp3_; sqlite3_stmt* _tmp4_; gint _tmp5_; - gint _tmp6_; #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" @@ -8356,37 +7869,39 @@ static BackingPhotoTable* backing_photo_table_construct (GType object_type) { #line 1144 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp4_ = stmt; #line 1144 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp5_ = sqlite3_step (_tmp4_); -#line 1144 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp5_; + res = sqlite3_step (_tmp4_); #line 1145 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp6_ = res; + _tmp5_ = res; #line 1145 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp6_ != SQLITE_DONE) { -#line 8345 "PhotoTable.c" - gint _tmp7_; + if (_tmp5_ != SQLITE_DONE) { +#line 7856 "PhotoTable.c" + gint _tmp6_; #line 1146 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp7_ = res; + _tmp6_ = res; #line 1146 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - database_table_fatal ("create PhotoBackingTable", _tmp7_); -#line 8351 "PhotoTable.c" + database_table_fatal ("create PhotoBackingTable", _tmp6_); +#line 7862 "PhotoTable.c" } #line 1125 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _sqlite3_finalize0 (stmt); #line 1125 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return self; -#line 8357 "PhotoTable.c" +#line 7868 "PhotoTable.c" } -static BackingPhotoTable* backing_photo_table_new (void) { +static BackingPhotoTable* +backing_photo_table_new (void) +{ #line 1125 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return backing_photo_table_construct (TYPE_BACKING_PHOTO_TABLE); -#line 8364 "PhotoTable.c" +#line 7877 "PhotoTable.c" } -BackingPhotoTable* backing_photo_table_get_instance (void) { +BackingPhotoTable* +backing_photo_table_get_instance (void) +{ BackingPhotoTable* result = NULL; BackingPhotoTable* _tmp0_; BackingPhotoTable* _tmp2_; @@ -8395,7 +7910,7 @@ BackingPhotoTable* backing_photo_table_get_instance (void) { _tmp0_ = backing_photo_table_instance; #line 1150 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (_tmp0_ == NULL) { -#line 8377 "PhotoTable.c" +#line 7892 "PhotoTable.c" BackingPhotoTable* _tmp1_; #line 1151 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp1_ = backing_photo_table_new (); @@ -8403,7 +7918,7 @@ BackingPhotoTable* backing_photo_table_get_instance (void) { _database_table_unref0 (backing_photo_table_instance); #line 1151 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" backing_photo_table_instance = _tmp1_; -#line 8385 "PhotoTable.c" +#line 7900 "PhotoTable.c" } #line 1153 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp2_ = backing_photo_table_instance; @@ -8413,11 +7928,15 @@ BackingPhotoTable* backing_photo_table_get_instance (void) { result = _tmp3_; #line 1153 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 8395 "PhotoTable.c" +#line 7910 "PhotoTable.c" } -void backing_photo_table_add (BackingPhotoTable* self, BackingPhotoRow* state, GError** error) { +void +backing_photo_table_add (BackingPhotoTable* self, + BackingPhotoRow* state, + GError** error) +{ sqlite3_stmt* stmt = NULL; gint res = 0; sqlite3* _tmp0_; @@ -8425,59 +7944,38 @@ void backing_photo_table_add (BackingPhotoTable* self, BackingPhotoRow* state, G gint _tmp2_; gint _tmp3_; time_t time_created = 0; - gulong _tmp4_; - sqlite3_stmt* _tmp5_; - BackingPhotoRow* _tmp6_; - const gchar* _tmp7_; - gchar* _tmp8_; - GDestroyNotify _tmp9_; - gint _tmp10_; + sqlite3_stmt* _tmp4_; + const gchar* _tmp5_; + gchar* _tmp6_; + GDestroyNotify _tmp7_; + gint _tmp8_; + sqlite3_stmt* _tmp9_; + time_t _tmp10_; gint _tmp11_; sqlite3_stmt* _tmp12_; - BackingPhotoRow* _tmp13_; - time_t _tmp14_; - gint _tmp15_; - gint _tmp16_; - sqlite3_stmt* _tmp17_; - BackingPhotoRow* _tmp18_; - gint64 _tmp19_; - gint _tmp20_; + gint64 _tmp13_; + gint _tmp14_; + sqlite3_stmt* _tmp15_; + Dimensions _tmp16_; + gint _tmp17_; + gint _tmp18_; + sqlite3_stmt* _tmp19_; + Dimensions _tmp20_; gint _tmp21_; - sqlite3_stmt* _tmp22_; - BackingPhotoRow* _tmp23_; - Dimensions _tmp24_; + gint _tmp22_; + sqlite3_stmt* _tmp23_; + Orientation _tmp24_; gint _tmp25_; - gint _tmp26_; - gint _tmp27_; - sqlite3_stmt* _tmp28_; - BackingPhotoRow* _tmp29_; - Dimensions _tmp30_; + sqlite3_stmt* _tmp26_; + PhotoFileFormat _tmp27_; + gint _tmp28_; + sqlite3_stmt* _tmp29_; + time_t _tmp30_; gint _tmp31_; - gint _tmp32_; + sqlite3_stmt* _tmp32_; gint _tmp33_; - sqlite3_stmt* _tmp34_; - BackingPhotoRow* _tmp35_; - Orientation _tmp36_; - gint _tmp37_; - gint _tmp38_; - sqlite3_stmt* _tmp39_; - BackingPhotoRow* _tmp40_; - PhotoFileFormat _tmp41_; - gint _tmp42_; - gint _tmp43_; - gint _tmp44_; - sqlite3_stmt* _tmp45_; - time_t _tmp46_; - gint _tmp47_; - gint _tmp48_; - sqlite3_stmt* _tmp49_; - gint _tmp50_; - gint _tmp51_; - BackingPhotoRow* _tmp53_; - sqlite3* _tmp54_; - gint64 _tmp55_; - BackingPhotoRow* _tmp56_; - time_t _tmp57_; + sqlite3* _tmp35_; + time_t _tmp36_; GError * _inner_error_ = NULL; #line 1156 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_if_fail (IS_BACKING_PHOTO_TABLE (self)); @@ -8498,145 +7996,109 @@ void backing_photo_table_add (BackingPhotoTable* self, BackingPhotoRow* state, G #line 1163 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _vala_assert (_tmp3_ == SQLITE_OK, "res == Sqlite.OK"); #line 1165 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp4_ = now_sec (); -#line 1165 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - time_created = (time_t) _tmp4_; + time_created = (time_t) now_sec (); #line 1167 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp5_ = stmt; -#line 1167 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp6_ = state; -#line 1167 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp7_ = _tmp6_->filepath; + _tmp4_ = stmt; #line 1167 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp8_ = g_strdup (_tmp7_); + _tmp5_ = state->filepath; #line 1167 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp9_ = g_free; + _tmp6_ = g_strdup (_tmp5_); #line 1167 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp10_ = sqlite3_bind_text (_tmp5_, 1, _tmp8_, -1, _tmp9_); + _tmp7_ = g_free; #line 1167 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp10_; + res = sqlite3_bind_text (_tmp4_, 1, _tmp6_, -1, _tmp7_); #line 1168 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp11_ = res; + _tmp8_ = res; #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 1169 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp13_ = state; + _vala_assert (_tmp8_ == SQLITE_OK, "res == Sqlite.OK"); #line 1169 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp14_ = _tmp13_->timestamp; + _tmp9_ = stmt; #line 1169 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp15_ = sqlite3_bind_int64 (_tmp12_, 2, (gint64) _tmp14_); + _tmp10_ = state->timestamp; #line 1169 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp15_; + res = sqlite3_bind_int64 (_tmp9_, 2, (gint64) _tmp10_); #line 1170 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp16_ = res; + _tmp11_ = res; #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 1171 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp18_ = state; + _vala_assert (_tmp11_ == SQLITE_OK, "res == Sqlite.OK"); #line 1171 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp19_ = _tmp18_->filesize; + _tmp12_ = stmt; #line 1171 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp20_ = sqlite3_bind_int64 (_tmp17_, 3, _tmp19_); + _tmp13_ = state->filesize; #line 1171 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp20_; + res = sqlite3_bind_int64 (_tmp12_, 3, _tmp13_); #line 1172 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp21_ = res; + _tmp14_ = res; #line 1172 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp21_ == SQLITE_OK, "res == Sqlite.OK"); + _vala_assert (_tmp14_ == SQLITE_OK, "res == Sqlite.OK"); #line 1173 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp22_ = stmt; + _tmp15_ = stmt; #line 1173 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp23_ = state; + _tmp16_ = state->dim; #line 1173 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp24_ = _tmp23_->dim; -#line 1173 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp25_ = _tmp24_.width; -#line 1173 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp26_ = sqlite3_bind_int (_tmp22_, 4, _tmp25_); + _tmp17_ = _tmp16_.width; #line 1173 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp26_; + res = sqlite3_bind_int (_tmp15_, 4, _tmp17_); #line 1174 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp27_ = res; + _tmp18_ = res; #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 1175 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp29_ = state; + _vala_assert (_tmp18_ == SQLITE_OK, "res == Sqlite.OK"); #line 1175 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp30_ = _tmp29_->dim; + _tmp19_ = stmt; #line 1175 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp31_ = _tmp30_.height; + _tmp20_ = state->dim; #line 1175 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp32_ = sqlite3_bind_int (_tmp28_, 5, _tmp31_); + _tmp21_ = _tmp20_.height; #line 1175 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp32_; + res = sqlite3_bind_int (_tmp19_, 5, _tmp21_); #line 1176 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp33_ = res; + _tmp22_ = res; #line 1176 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp33_ == SQLITE_OK, "res == Sqlite.OK"); + _vala_assert (_tmp22_ == SQLITE_OK, "res == Sqlite.OK"); #line 1177 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp34_ = stmt; -#line 1177 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp35_ = state; -#line 1177 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp36_ = _tmp35_->original_orientation; + _tmp23_ = stmt; #line 1177 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp37_ = sqlite3_bind_int (_tmp34_, 6, (gint) _tmp36_); + _tmp24_ = state->original_orientation; #line 1177 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp37_; + res = sqlite3_bind_int (_tmp23_, 6, (gint) _tmp24_); #line 1178 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp38_ = res; + _tmp25_ = res; #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 1179 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp40_ = state; -#line 1179 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp41_ = _tmp40_->file_format; + _vala_assert (_tmp25_ == SQLITE_OK, "res == Sqlite.OK"); #line 1179 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp42_ = photo_file_format_serialize (_tmp41_); + _tmp26_ = stmt; #line 1179 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp43_ = sqlite3_bind_int (_tmp39_, 7, _tmp42_); + _tmp27_ = state->file_format; #line 1179 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp43_; + res = sqlite3_bind_int (_tmp26_, 7, photo_file_format_serialize (_tmp27_)); #line 1180 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp44_ = res; + _tmp28_ = res; #line 1180 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp44_ == SQLITE_OK, "res == Sqlite.OK"); + _vala_assert (_tmp28_ == SQLITE_OK, "res == Sqlite.OK"); #line 1181 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp45_ = stmt; -#line 1181 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp46_ = time_created; + _tmp29_ = stmt; #line 1181 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp47_ = sqlite3_bind_int64 (_tmp45_, 8, (gint64) _tmp46_); + _tmp30_ = time_created; #line 1181 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp47_; + res = sqlite3_bind_int64 (_tmp29_, 8, (gint64) _tmp30_); #line 1182 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp48_ = res; + _tmp31_ = res; #line 1182 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp48_ == SQLITE_OK, "res == Sqlite.OK"); -#line 1184 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp49_ = stmt; + _vala_assert (_tmp31_ == SQLITE_OK, "res == Sqlite.OK"); #line 1184 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp50_ = sqlite3_step (_tmp49_); + _tmp32_ = stmt; #line 1184 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp50_; + res = sqlite3_step (_tmp32_); #line 1185 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp51_ = res; + _tmp33_ = res; #line 1185 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp51_ != SQLITE_DONE) { -#line 8613 "PhotoTable.c" - gint _tmp52_; + if (_tmp33_ != SQLITE_DONE) { +#line 8075 "PhotoTable.c" + gint _tmp34_; #line 1186 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp52_ = res; + _tmp34_ = res; #line 1186 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - database_table_throw_error ("PhotoBackingTable.add", _tmp52_, &_inner_error_); + database_table_throw_error ("PhotoBackingTable.add", _tmp34_, &_inner_error_); #line 1186 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1186 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -8647,7 +8109,7 @@ void backing_photo_table_add (BackingPhotoTable* self, BackingPhotoRow* state, G _sqlite3_finalize0 (stmt); #line 1186 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; -#line 8629 "PhotoTable.c" +#line 8091 "PhotoTable.c" } else { #line 1186 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _sqlite3_finalize0 (stmt); @@ -8657,31 +8119,29 @@ void backing_photo_table_add (BackingPhotoTable* self, BackingPhotoRow* state, G g_clear_error (&_inner_error_); #line 1186 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; -#line 8639 "PhotoTable.c" +#line 8101 "PhotoTable.c" } } } #line 1188 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp53_ = state; + _tmp35_ = database_table_db; #line 1188 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp54_ = database_table_db; -#line 1188 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp55_ = sqlite3_last_insert_rowid (_tmp54_); -#line 1188 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - backing_photo_id_init (&_tmp53_->id, _tmp55_); + backing_photo_id_init (&state->id, sqlite3_last_insert_rowid (_tmp35_)); #line 1189 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp56_ = state; + _tmp36_ = time_created; #line 1189 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp57_ = time_created; -#line 1189 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp56_->time_created = _tmp57_; + state->time_created = _tmp36_; #line 1156 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _sqlite3_finalize0 (stmt); -#line 8659 "PhotoTable.c" +#line 8115 "PhotoTable.c" } -BackingPhotoRow* backing_photo_table_fetch (BackingPhotoTable* self, BackingPhotoID* id, GError** error) { +BackingPhotoRow* +backing_photo_table_fetch (BackingPhotoTable* self, + BackingPhotoID* id, + GError** error) +{ BackingPhotoRow* result = NULL; sqlite3_stmt* stmt = NULL; gint res = 0; @@ -8693,39 +8153,29 @@ BackingPhotoRow* backing_photo_table_fetch (BackingPhotoTable* self, BackingPhot BackingPhotoID _tmp5_; gint64 _tmp6_; gint _tmp7_; - gint _tmp8_; - sqlite3_stmt* _tmp9_; - gint _tmp10_; - gint _tmp11_; + sqlite3_stmt* _tmp8_; + gint _tmp9_; BackingPhotoRow* row = NULL; - BackingPhotoRow* _tmp14_; + BackingPhotoRow* _tmp12_; + BackingPhotoRow* _tmp13_; + BackingPhotoID _tmp14_; BackingPhotoRow* _tmp15_; - BackingPhotoID _tmp16_; - BackingPhotoRow* _tmp17_; - sqlite3_stmt* _tmp18_; - const gchar* _tmp19_; - gchar* _tmp20_; + sqlite3_stmt* _tmp16_; + const gchar* _tmp17_; + gchar* _tmp18_; + BackingPhotoRow* _tmp19_; + sqlite3_stmt* _tmp20_; BackingPhotoRow* _tmp21_; sqlite3_stmt* _tmp22_; - gint64 _tmp23_; - BackingPhotoRow* _tmp24_; + BackingPhotoRow* _tmp23_; + sqlite3_stmt* _tmp24_; sqlite3_stmt* _tmp25_; - gint64 _tmp26_; - BackingPhotoRow* _tmp27_; - sqlite3_stmt* _tmp28_; - gint _tmp29_; - sqlite3_stmt* _tmp30_; - gint _tmp31_; - BackingPhotoRow* _tmp32_; - sqlite3_stmt* _tmp33_; - gint _tmp34_; - BackingPhotoRow* _tmp35_; - sqlite3_stmt* _tmp36_; - gint _tmp37_; - PhotoFileFormat _tmp38_; - BackingPhotoRow* _tmp39_; - sqlite3_stmt* _tmp40_; - gint64 _tmp41_; + BackingPhotoRow* _tmp26_; + sqlite3_stmt* _tmp27_; + BackingPhotoRow* _tmp28_; + sqlite3_stmt* _tmp29_; + BackingPhotoRow* _tmp30_; + sqlite3_stmt* _tmp31_; GError * _inner_error_ = NULL; #line 1192 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_val_if_fail (IS_BACKING_PHOTO_TABLE (self), NULL); @@ -8753,42 +8203,38 @@ BackingPhotoRow* backing_photo_table_fetch (BackingPhotoTable* self, BackingPhot #line 1199 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp6_ = _tmp5_.id; #line 1199 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp7_ = sqlite3_bind_int64 (_tmp4_, 1, _tmp6_); -#line 1199 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp7_; + res = sqlite3_bind_int64 (_tmp4_, 1, _tmp6_); #line 1200 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp8_ = res; + _tmp7_ = res; #line 1200 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp8_ == SQLITE_OK, "res == Sqlite.OK"); -#line 1202 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp9_ = stmt; + _vala_assert (_tmp7_ == SQLITE_OK, "res == Sqlite.OK"); #line 1202 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp10_ = sqlite3_step (_tmp9_); + _tmp8_ = stmt; #line 1202 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp10_; + res = sqlite3_step (_tmp8_); #line 1203 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp11_ = res; + _tmp9_ = res; #line 1203 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp11_ == SQLITE_DONE) { + if (_tmp9_ == SQLITE_DONE) { #line 1204 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" result = NULL; #line 1204 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _sqlite3_finalize0 (stmt); #line 1204 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 8757 "PhotoTable.c" +#line 8203 "PhotoTable.c" } else { - gint _tmp12_; + gint _tmp10_; #line 1205 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp12_ = res; + _tmp10_ = res; #line 1205 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp12_ != SQLITE_ROW) { -#line 8764 "PhotoTable.c" - gint _tmp13_; + if (_tmp10_ != SQLITE_ROW) { +#line 8210 "PhotoTable.c" + gint _tmp11_; #line 1206 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp13_ = res; + _tmp11_ = res; #line 1206 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - database_table_throw_error ("BackingPhotoTable.fetch_for_photo", _tmp13_, &_inner_error_); + database_table_throw_error ("BackingPhotoTable.fetch_for_photo", _tmp11_, &_inner_error_); #line 1206 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1206 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -8799,7 +8245,7 @@ BackingPhotoRow* backing_photo_table_fetch (BackingPhotoTable* self, BackingPhot _sqlite3_finalize0 (stmt); #line 1206 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return NULL; -#line 8780 "PhotoTable.c" +#line 8226 "PhotoTable.c" } else { #line 1206 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _sqlite3_finalize0 (stmt); @@ -8809,98 +8255,86 @@ BackingPhotoRow* backing_photo_table_fetch (BackingPhotoTable* self, BackingPhot g_clear_error (&_inner_error_); #line 1206 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return NULL; -#line 8790 "PhotoTable.c" +#line 8236 "PhotoTable.c" } } } } #line 1208 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp14_ = backing_photo_row_new (); + _tmp12_ = backing_photo_row_new (); #line 1208 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - row = _tmp14_; + row = _tmp12_; #line 1209 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp15_ = row; + _tmp13_ = row; #line 1209 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp16_ = *id; + _tmp14_ = *id; #line 1209 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp15_->id = _tmp16_; + _tmp13_->id = _tmp14_; #line 1210 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp17_ = row; + _tmp15_ = row; #line 1210 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp18_ = stmt; + _tmp16_ = stmt; #line 1210 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp19_ = sqlite3_column_text (_tmp18_, 0); + _tmp17_ = sqlite3_column_text (_tmp16_, 0); #line 1210 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp20_ = g_strdup (_tmp19_); + _tmp18_ = g_strdup (_tmp17_); #line 1210 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _g_free0 (_tmp17_->filepath); + _g_free0 (_tmp15_->filepath); #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; + _tmp15_->filepath = _tmp18_; #line 1211 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp22_ = stmt; + _tmp19_ = row; #line 1211 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp23_ = sqlite3_column_int64 (_tmp22_, 1); + _tmp20_ = stmt; #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; + _tmp19_->timestamp = (time_t) sqlite3_column_int64 (_tmp20_, 1); #line 1212 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp25_ = stmt; + _tmp21_ = row; #line 1212 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp26_ = sqlite3_column_int64 (_tmp25_, 2); + _tmp22_ = stmt; #line 1212 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp24_->filesize = _tmp26_; + _tmp21_->filesize = sqlite3_column_int64 (_tmp22_, 2); #line 1213 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp27_ = row; -#line 1213 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp28_ = stmt; -#line 1213 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp29_ = sqlite3_column_int (_tmp28_, 3); + _tmp23_ = row; #line 1213 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp30_ = stmt; + _tmp24_ = stmt; #line 1213 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp31_ = sqlite3_column_int (_tmp30_, 4); + _tmp25_ = stmt; #line 1213 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - dimensions_init (&_tmp27_->dim, _tmp29_, _tmp31_); + dimensions_init (&_tmp23_->dim, sqlite3_column_int (_tmp24_, 3), sqlite3_column_int (_tmp25_, 4)); #line 1214 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp32_ = row; -#line 1214 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp33_ = stmt; + _tmp26_ = row; #line 1214 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp34_ = sqlite3_column_int (_tmp33_, 5); + _tmp27_ = stmt; #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 1215 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp36_ = stmt; + _tmp26_->original_orientation = (Orientation) sqlite3_column_int (_tmp27_, 5); #line 1215 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp37_ = sqlite3_column_int (_tmp36_, 6); + _tmp28_ = row; #line 1215 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp38_ = photo_file_format_unserialize (_tmp37_); + _tmp29_ = stmt; #line 1215 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp35_->file_format = _tmp38_; + _tmp28_->file_format = photo_file_format_unserialize (sqlite3_column_int (_tmp29_, 6)); #line 1216 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp39_ = row; + _tmp30_ = row; #line 1216 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp40_ = stmt; -#line 1216 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp41_ = sqlite3_column_int64 (_tmp40_, 7); + _tmp31_ = stmt; #line 1216 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp39_->time_created = (time_t) _tmp41_; + _tmp30_->time_created = (time_t) sqlite3_column_int64 (_tmp31_, 7); #line 1218 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" result = row; #line 1218 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _sqlite3_finalize0 (stmt); #line 1218 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 8877 "PhotoTable.c" +#line 8307 "PhotoTable.c" } -void backing_photo_table_update (BackingPhotoTable* self, BackingPhotoRow* row, GError** error) { +void +backing_photo_table_update (BackingPhotoTable* self, + BackingPhotoRow* row, + GError** error) +{ sqlite3_stmt* stmt = NULL; gint res = 0; sqlite3* _tmp0_; @@ -8908,47 +8342,31 @@ void backing_photo_table_update (BackingPhotoTable* self, BackingPhotoRow* row, gint _tmp2_; gint _tmp3_; sqlite3_stmt* _tmp4_; - BackingPhotoRow* _tmp5_; - time_t _tmp6_; - gint _tmp7_; - gint _tmp8_; - sqlite3_stmt* _tmp9_; - BackingPhotoRow* _tmp10_; - gint64 _tmp11_; + time_t _tmp5_; + gint _tmp6_; + sqlite3_stmt* _tmp7_; + gint64 _tmp8_; + gint _tmp9_; + sqlite3_stmt* _tmp10_; + Dimensions _tmp11_; gint _tmp12_; gint _tmp13_; sqlite3_stmt* _tmp14_; - BackingPhotoRow* _tmp15_; - Dimensions _tmp16_; + Dimensions _tmp15_; + gint _tmp16_; gint _tmp17_; - gint _tmp18_; - gint _tmp19_; - sqlite3_stmt* _tmp20_; - BackingPhotoRow* _tmp21_; - Dimensions _tmp22_; + sqlite3_stmt* _tmp18_; + Orientation _tmp19_; + gint _tmp20_; + sqlite3_stmt* _tmp21_; + PhotoFileFormat _tmp22_; gint _tmp23_; - gint _tmp24_; - gint _tmp25_; - sqlite3_stmt* _tmp26_; - BackingPhotoRow* _tmp27_; - Orientation _tmp28_; + sqlite3_stmt* _tmp24_; + BackingPhotoID _tmp25_; + gint64 _tmp26_; + gint _tmp27_; + sqlite3_stmt* _tmp28_; gint _tmp29_; - gint _tmp30_; - sqlite3_stmt* _tmp31_; - BackingPhotoRow* _tmp32_; - PhotoFileFormat _tmp33_; - gint _tmp34_; - gint _tmp35_; - gint _tmp36_; - sqlite3_stmt* _tmp37_; - BackingPhotoRow* _tmp38_; - BackingPhotoID _tmp39_; - gint64 _tmp40_; - gint _tmp41_; - gint _tmp42_; - sqlite3_stmt* _tmp43_; - gint _tmp44_; - gint _tmp45_; GError * _inner_error_ = NULL; #line 1222 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_if_fail (IS_BACKING_PHOTO_TABLE (self)); @@ -8971,125 +8389,93 @@ void backing_photo_table_update (BackingPhotoTable* self, BackingPhotoRow* row, #line 1230 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp4_ = stmt; #line 1230 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp5_ = row; + _tmp5_ = row->timestamp; #line 1230 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp6_ = _tmp5_->timestamp; -#line 1230 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp7_ = sqlite3_bind_int64 (_tmp4_, 1, (gint64) _tmp6_); -#line 1230 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp7_; + res = sqlite3_bind_int64 (_tmp4_, 1, (gint64) _tmp5_); #line 1231 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp8_ = res; + _tmp6_ = res; #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 1232 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp10_ = row; + _vala_assert (_tmp6_ == SQLITE_OK, "res == Sqlite.OK"); #line 1232 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp11_ = _tmp10_->filesize; + _tmp7_ = stmt; #line 1232 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp12_ = sqlite3_bind_int64 (_tmp9_, 2, _tmp11_); + _tmp8_ = row->filesize; #line 1232 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp12_; + res = sqlite3_bind_int64 (_tmp7_, 2, _tmp8_); #line 1233 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp13_ = res; + _tmp9_ = res; #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 1234 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp15_ = row; + _vala_assert (_tmp9_ == SQLITE_OK, "res == Sqlite.OK"); #line 1234 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp16_ = _tmp15_->dim; + _tmp10_ = stmt; #line 1234 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp17_ = _tmp16_.width; + _tmp11_ = row->dim; #line 1234 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp18_ = sqlite3_bind_int (_tmp14_, 3, _tmp17_); + _tmp12_ = _tmp11_.width; #line 1234 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp18_; + res = sqlite3_bind_int (_tmp10_, 3, _tmp12_); #line 1235 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp19_ = res; + _tmp13_ = res; #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 1236 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp21_ = row; + _vala_assert (_tmp13_ == SQLITE_OK, "res == Sqlite.OK"); #line 1236 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp22_ = _tmp21_->dim; + _tmp14_ = stmt; #line 1236 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp23_ = _tmp22_.height; + _tmp15_ = row->dim; #line 1236 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp24_ = sqlite3_bind_int (_tmp20_, 4, _tmp23_); + _tmp16_ = _tmp15_.height; #line 1236 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp24_; + res = sqlite3_bind_int (_tmp14_, 4, _tmp16_); #line 1237 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp25_ = res; + _tmp17_ = res; #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 1238 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp27_ = row; + _vala_assert (_tmp17_ == SQLITE_OK, "res == Sqlite.OK"); #line 1238 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp28_ = _tmp27_->original_orientation; + _tmp18_ = stmt; #line 1238 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp29_ = sqlite3_bind_int (_tmp26_, 5, (gint) _tmp28_); + _tmp19_ = row->original_orientation; #line 1238 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp29_; + res = sqlite3_bind_int (_tmp18_, 5, (gint) _tmp19_); #line 1239 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp30_ = res; + _tmp20_ = res; #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 1240 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp32_ = row; -#line 1240 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp33_ = _tmp32_->file_format; + _vala_assert (_tmp20_ == SQLITE_OK, "res == Sqlite.OK"); #line 1240 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp34_ = photo_file_format_serialize (_tmp33_); + _tmp21_ = stmt; #line 1240 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp35_ = sqlite3_bind_int (_tmp31_, 6, _tmp34_); + _tmp22_ = row->file_format; #line 1240 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp35_; + res = sqlite3_bind_int (_tmp21_, 6, photo_file_format_serialize (_tmp22_)); #line 1241 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp36_ = res; + _tmp23_ = res; #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 1242 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp38_ = row; + _vala_assert (_tmp23_ == SQLITE_OK, "res == Sqlite.OK"); #line 1242 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp39_ = _tmp38_->id; + _tmp24_ = stmt; #line 1242 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp40_ = _tmp39_.id; + _tmp25_ = row->id; #line 1242 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp41_ = sqlite3_bind_int64 (_tmp37_, 7, _tmp40_); + _tmp26_ = _tmp25_.id; #line 1242 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp41_; + res = sqlite3_bind_int64 (_tmp24_, 7, _tmp26_); #line 1243 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp42_ = res; + _tmp27_ = res; #line 1243 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp42_ == SQLITE_OK, "res == Sqlite.OK"); -#line 1245 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp43_ = stmt; + _vala_assert (_tmp27_ == SQLITE_OK, "res == Sqlite.OK"); #line 1245 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp44_ = sqlite3_step (_tmp43_); + _tmp28_ = stmt; #line 1245 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp44_; + res = sqlite3_step (_tmp28_); #line 1246 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp45_ = res; + _tmp29_ = res; #line 1246 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp45_ != SQLITE_DONE) { -#line 9065 "PhotoTable.c" - gint _tmp46_; + if (_tmp29_ != SQLITE_DONE) { +#line 8451 "PhotoTable.c" + gint _tmp30_; #line 1247 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp46_ = res; + _tmp30_ = res; #line 1247 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - database_table_throw_error ("BackingPhotoTable.update", _tmp46_, &_inner_error_); + database_table_throw_error ("BackingPhotoTable.update", _tmp30_, &_inner_error_); #line 1247 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1247 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -9100,7 +8486,7 @@ void backing_photo_table_update (BackingPhotoTable* self, BackingPhotoRow* row, _sqlite3_finalize0 (stmt); #line 1247 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; -#line 9081 "PhotoTable.c" +#line 8467 "PhotoTable.c" } else { #line 1247 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _sqlite3_finalize0 (stmt); @@ -9110,17 +8496,23 @@ void backing_photo_table_update (BackingPhotoTable* self, BackingPhotoRow* row, g_clear_error (&_inner_error_); #line 1247 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; -#line 9091 "PhotoTable.c" +#line 8477 "PhotoTable.c" } } } #line 1222 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _sqlite3_finalize0 (stmt); -#line 9097 "PhotoTable.c" +#line 8483 "PhotoTable.c" } -void backing_photo_table_update_attributes (BackingPhotoTable* self, BackingPhotoID* id, time_t timestamp, gint64 filesize, GError** error) { +void +backing_photo_table_update_attributes (BackingPhotoTable* self, + BackingPhotoID* id, + time_t timestamp, + gint64 filesize, + GError** error) +{ sqlite3_stmt* stmt = NULL; gint res = 0; sqlite3* _tmp0_; @@ -9128,21 +8520,15 @@ void backing_photo_table_update_attributes (BackingPhotoTable* self, BackingPhot gint _tmp2_; gint _tmp3_; sqlite3_stmt* _tmp4_; - time_t _tmp5_; - gint _tmp6_; + gint _tmp5_; + sqlite3_stmt* _tmp6_; gint _tmp7_; sqlite3_stmt* _tmp8_; - gint64 _tmp9_; - gint _tmp10_; + BackingPhotoID _tmp9_; + gint64 _tmp10_; gint _tmp11_; sqlite3_stmt* _tmp12_; - BackingPhotoID _tmp13_; - gint64 _tmp14_; - gint _tmp15_; - gint _tmp16_; - sqlite3_stmt* _tmp17_; - gint _tmp18_; - gint _tmp19_; + gint _tmp13_; GError * _inner_error_ = NULL; #line 1250 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_if_fail (IS_BACKING_PHOTO_TABLE (self)); @@ -9165,57 +8551,45 @@ void backing_photo_table_update_attributes (BackingPhotoTable* self, BackingPhot #line 1256 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp4_ = stmt; #line 1256 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp5_ = timestamp; -#line 1256 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp6_ = sqlite3_bind_int64 (_tmp4_, 1, (gint64) _tmp5_); -#line 1256 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp6_; + res = sqlite3_bind_int64 (_tmp4_, 1, (gint64) timestamp); #line 1257 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp7_ = res; + _tmp5_ = res; #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 1258 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp9_ = filesize; + _vala_assert (_tmp5_ == SQLITE_OK, "res == Sqlite.OK"); #line 1258 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp10_ = sqlite3_bind_int64 (_tmp8_, 2, _tmp9_); + _tmp6_ = stmt; #line 1258 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp10_; + res = sqlite3_bind_int64 (_tmp6_, 2, filesize); #line 1259 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp11_ = res; + _tmp7_ = res; #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; + _vala_assert (_tmp7_ == SQLITE_OK, "res == Sqlite.OK"); #line 1260 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp13_ = *id; + _tmp8_ = stmt; #line 1260 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp14_ = _tmp13_.id; + _tmp9_ = *id; #line 1260 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp15_ = sqlite3_bind_int64 (_tmp12_, 3, _tmp14_); + _tmp10_ = _tmp9_.id; #line 1260 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp15_; + res = sqlite3_bind_int64 (_tmp8_, 3, _tmp10_); #line 1261 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp16_ = res; + _tmp11_ = res; #line 1261 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _vala_assert (_tmp16_ == SQLITE_OK, "res == Sqlite.OK"); -#line 1263 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp17_ = stmt; + _vala_assert (_tmp11_ == SQLITE_OK, "res == Sqlite.OK"); #line 1263 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp18_ = sqlite3_step (_tmp17_); + _tmp12_ = stmt; #line 1263 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - res = _tmp18_; + res = sqlite3_step (_tmp12_); #line 1264 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp19_ = res; + _tmp13_ = res; #line 1264 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - if (_tmp19_ != SQLITE_DONE) { -#line 9191 "PhotoTable.c" - gint _tmp20_; + if (_tmp13_ != SQLITE_DONE) { +#line 8565 "PhotoTable.c" + gint _tmp14_; #line 1265 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp20_ = res; + _tmp14_ = res; #line 1265 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - database_table_throw_error ("BackingPhotoTable.update_attributes", _tmp20_, &_inner_error_); + database_table_throw_error ("BackingPhotoTable.update_attributes", _tmp14_, &_inner_error_); #line 1265 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1265 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -9226,7 +8600,7 @@ void backing_photo_table_update_attributes (BackingPhotoTable* self, BackingPhot _sqlite3_finalize0 (stmt); #line 1265 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; -#line 9207 "PhotoTable.c" +#line 8581 "PhotoTable.c" } else { #line 1265 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _sqlite3_finalize0 (stmt); @@ -9236,17 +8610,21 @@ void backing_photo_table_update_attributes (BackingPhotoTable* self, BackingPhot g_clear_error (&_inner_error_); #line 1265 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; -#line 9217 "PhotoTable.c" +#line 8591 "PhotoTable.c" } } } #line 1250 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _sqlite3_finalize0 (stmt); -#line 9223 "PhotoTable.c" +#line 8597 "PhotoTable.c" } -void backing_photo_table_remove (BackingPhotoTable* self, BackingPhotoID* backing_id, GError** error) { +void +backing_photo_table_remove (BackingPhotoTable* self, + BackingPhotoID* backing_id, + GError** error) +{ BackingPhotoID _tmp0_; gint64 _tmp1_; GError * _inner_error_ = NULL; @@ -9268,7 +8646,7 @@ void backing_photo_table_remove (BackingPhotoTable* self, BackingPhotoID* backin g_propagate_error (error, _inner_error_); #line 1269 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; -#line 9249 "PhotoTable.c" +#line 8627 "PhotoTable.c" } else { #line 1269 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -9276,16 +8654,20 @@ void backing_photo_table_remove (BackingPhotoTable* self, BackingPhotoID* backin g_clear_error (&_inner_error_); #line 1269 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; -#line 9257 "PhotoTable.c" +#line 8635 "PhotoTable.c" } } } -void backing_photo_table_set_filepath (BackingPhotoTable* self, BackingPhotoID* id, const gchar* filepath, GError** error) { +void +backing_photo_table_set_filepath (BackingPhotoTable* self, + BackingPhotoID* id, + const gchar* filepath, + GError** error) +{ BackingPhotoID _tmp0_; gint64 _tmp1_; - const gchar* _tmp2_; GError * _inner_error_ = NULL; #line 1272 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_if_fail (IS_BACKING_PHOTO_TABLE (self)); @@ -9298,9 +8680,7 @@ void backing_photo_table_set_filepath (BackingPhotoTable* self, BackingPhotoID* #line 1273 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp1_ = _tmp0_.id; #line 1273 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp2_ = filepath; -#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_); + database_table_update_text_by_id_2 (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp1_, "filepath", filepath, &_inner_error_); #line 1273 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1273 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -9309,7 +8689,7 @@ void backing_photo_table_set_filepath (BackingPhotoTable* self, BackingPhotoID* g_propagate_error (error, _inner_error_); #line 1273 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; -#line 9290 "PhotoTable.c" +#line 8670 "PhotoTable.c" } else { #line 1273 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -9317,16 +8697,20 @@ void backing_photo_table_set_filepath (BackingPhotoTable* self, BackingPhotoID* g_clear_error (&_inner_error_); #line 1273 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; -#line 9298 "PhotoTable.c" +#line 8678 "PhotoTable.c" } } } -void backing_photo_table_update_timestamp (BackingPhotoTable* self, BackingPhotoID* id, time_t timestamp, GError** error) { +void +backing_photo_table_update_timestamp (BackingPhotoTable* self, + BackingPhotoID* id, + time_t timestamp, + GError** error) +{ BackingPhotoID _tmp0_; gint64 _tmp1_; - time_t _tmp2_; GError * _inner_error_ = NULL; #line 1276 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_if_fail (IS_BACKING_PHOTO_TABLE (self)); @@ -9337,9 +8721,7 @@ void backing_photo_table_update_timestamp (BackingPhotoTable* self, BackingPhoto #line 1277 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp1_ = _tmp0_.id; #line 1277 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" - _tmp2_ = timestamp; -#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_); + database_table_update_int64_by_id_2 (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp1_, "timestamp", (gint64) timestamp, &_inner_error_); #line 1277 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1277 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -9348,7 +8730,7 @@ void backing_photo_table_update_timestamp (BackingPhotoTable* self, BackingPhoto g_propagate_error (error, _inner_error_); #line 1277 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; -#line 9329 "PhotoTable.c" +#line 8711 "PhotoTable.c" } else { #line 1277 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -9356,36 +8738,44 @@ void backing_photo_table_update_timestamp (BackingPhotoTable* self, BackingPhoto g_clear_error (&_inner_error_); #line 1277 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; -#line 9337 "PhotoTable.c" +#line 8719 "PhotoTable.c" } } } -static void backing_photo_table_class_init (BackingPhotoTableClass * klass) { +static void +backing_photo_table_class_init (BackingPhotoTableClass * klass) +{ #line 1122 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" backing_photo_table_parent_class = g_type_class_peek_parent (klass); #line 1122 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" ((DatabaseTableClass *) klass)->finalize = backing_photo_table_finalize; -#line 9348 "PhotoTable.c" +#line 8732 "PhotoTable.c" } -static void backing_photo_table_instance_init (BackingPhotoTable * self) { +static void +backing_photo_table_instance_init (BackingPhotoTable * self) +{ } -static void backing_photo_table_finalize (DatabaseTable * obj) { +static void +backing_photo_table_finalize (DatabaseTable * obj) +{ BackingPhotoTable * self; #line 1122 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_BACKING_PHOTO_TABLE, BackingPhotoTable); #line 1122 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" DATABASE_TABLE_CLASS (backing_photo_table_parent_class)->finalize (obj); -#line 9362 "PhotoTable.c" +#line 8750 "PhotoTable.c" } -GType backing_photo_table_get_type (void) { +GType +backing_photo_table_get_type (void) +{ static volatile gsize backing_photo_table_type_id__volatile = 0; if (g_once_init_enter (&backing_photo_table_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (BackingPhotoTableClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) backing_photo_table_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (BackingPhotoTable), 0, (GInstanceInitFunc) backing_photo_table_instance_init, NULL }; @@ -9397,7 +8787,11 @@ GType backing_photo_table_get_type (void) { } -static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func) { +static void +_vala_array_destroy (gpointer array, + gint array_length, + GDestroyNotify destroy_func) +{ if ((array != NULL) && (destroy_func != NULL)) { int i; for (i = 0; i < array_length; i = i + 1) { @@ -9409,7 +8803,11 @@ static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNoti } -static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func) { +static void +_vala_array_free (gpointer array, + gint array_length, + GDestroyNotify destroy_func) +{ _vala_array_destroy (array, array_length, destroy_func); g_free (array); } diff --git a/src/db/SavedSearchDBTable.c b/src/db/SavedSearchDBTable.c index bedc8f4..d2d20d2 100644 --- a/src/db/SavedSearchDBTable.c +++ b/src/db/SavedSearchDBTable.c @@ -1,4 +1,4 @@ -/* SavedSearchDBTable.c generated by valac 0.36.6, the Vala compiler +/* SavedSearchDBTable.c generated by valac 0.40.4, the Vala compiler * generated from SavedSearchDBTable.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,6 +7,7 @@ * (version 2.1 or later). See the COPYING file in this distribution. */ + #include <glib.h> #include <glib-object.h> #include <string.h> @@ -301,52 +302,76 @@ GType saved_search_id_get_type (void) G_GNUC_CONST; SavedSearchID* saved_search_id_dup (const SavedSearchID* self); void saved_search_id_free (SavedSearchID* self); #define SAVED_SEARCH_ID_INVALID ((gint64) -1) -void saved_search_id_init (SavedSearchID *self, gint64 id); +void saved_search_id_init (SavedSearchID *self, + gint64 id); gboolean saved_search_id_is_invalid (SavedSearchID *self); gboolean saved_search_id_is_valid (SavedSearchID *self); gpointer saved_search_row_ref (gpointer instance); void saved_search_row_unref (gpointer instance); -GParamSpec* param_spec_saved_search_row (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_saved_search_row (GValue* value, gpointer v_object); -void value_take_saved_search_row (GValue* value, gpointer v_object); +GParamSpec* param_spec_saved_search_row (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_saved_search_row (GValue* value, + gpointer v_object); +void value_take_saved_search_row (GValue* value, + gpointer v_object); gpointer value_get_saved_search_row (const GValue* value); GType saved_search_row_get_type (void) G_GNUC_CONST; GType search_operator_get_type (void) G_GNUC_CONST; gpointer search_condition_ref (gpointer instance); void search_condition_unref (gpointer instance); -GParamSpec* param_spec_search_condition (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_search_condition (GValue* value, gpointer v_object); -void value_take_search_condition (GValue* value, gpointer v_object); +GParamSpec* param_spec_search_condition (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_search_condition (GValue* value, + gpointer v_object); +void value_take_search_condition (GValue* value, + gpointer v_object); gpointer value_get_search_condition (const GValue* value); GType search_condition_get_type (void) G_GNUC_CONST; -enum { - SAVED_SEARCH_ROW_DUMMY_PROPERTY -}; SavedSearchRow* saved_search_row_new (void); SavedSearchRow* saved_search_row_construct (GType object_type); static void saved_search_row_finalize (SavedSearchRow * obj); gpointer database_table_ref (gpointer instance); void database_table_unref (gpointer instance); -GParamSpec* param_spec_database_table (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_database_table (GValue* value, gpointer v_object); -void value_take_database_table (GValue* value, gpointer v_object); +GParamSpec* param_spec_database_table (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_database_table (GValue* value, + gpointer v_object); +void value_take_database_table (GValue* value, + gpointer v_object); gpointer value_get_database_table (const GValue* value); GType database_table_get_type (void) G_GNUC_CONST; GType saved_search_db_table_get_type (void) G_GNUC_CONST; -enum { - SAVED_SEARCH_DB_TABLE_DUMMY_PROPERTY -}; static SavedSearchDBTable* saved_search_db_table_new (void); static SavedSearchDBTable* saved_search_db_table_construct (GType object_type); DatabaseTable* database_table_construct (GType object_type); -void database_table_set_table_name (DatabaseTable* self, const gchar* table_name); -void database_table_fatal (const gchar* op, gint res); +void database_table_set_table_name (DatabaseTable* self, + const gchar* table_name); +void database_table_fatal (const gchar* op, + gint res); SavedSearchDBTable* saved_search_db_table_get_instance (void); GQuark database_error_quark (void); -SavedSearchRow* saved_search_db_table_add (SavedSearchDBTable* self, const gchar* name, SearchOperator operator, GeeArrayList* conditions, GError** error); +SavedSearchRow* saved_search_db_table_add (SavedSearchDBTable* self, + const gchar* name, + SearchOperator operator, + GeeArrayList* conditions, + GError** error); gchar* search_operator_to_string (SearchOperator self); -void database_table_throw_error (const gchar* method, gint res, GError** error); -static void saved_search_db_table_add_condition (SavedSearchDBTable* self, SavedSearchID* id, SearchCondition* condition, GError** error); +void database_table_throw_error (const gchar* method, + gint res, + GError** error); +static void saved_search_db_table_add_condition (SavedSearchDBTable* self, + SavedSearchID* id, + SearchCondition* condition, + GError** error); GType search_condition_text_get_type (void) G_GNUC_CONST; GType search_condition_search_type_get_type (void) G_GNUC_CONST; SearchConditionSearchType search_condition_get_search_type (SearchCondition* self); @@ -386,55 +411,111 @@ SearchConditionDateContext search_condition_date_get_context (SearchConditionDat gchar* search_condition_date_context_to_string (SearchConditionDateContext self); GDateTime* search_condition_date_get_date_one (SearchConditionDate* self); GDateTime* search_condition_date_get_date_two (SearchConditionDate* self); -static void saved_search_db_table_remove_conditions_for_search_id (SavedSearchDBTable* self, SavedSearchID* search_id, GError** error); -static void saved_search_db_table_remove_conditions_for_table (SavedSearchDBTable* self, const gchar* table_name, SavedSearchID* search_id, GError** error); -static GeeList* saved_search_db_table_get_conditions_for_id (SavedSearchDBTable* self, SavedSearchID* search_id, GError** error); +static void saved_search_db_table_remove_conditions_for_search_id (SavedSearchDBTable* self, + SavedSearchID* search_id, + GError** error); +static void saved_search_db_table_remove_conditions_for_table (SavedSearchDBTable* self, + const gchar* table_name, + SavedSearchID* search_id, + GError** error); +static GeeList* saved_search_db_table_get_conditions_for_id (SavedSearchDBTable* self, + SavedSearchID* search_id, + GError** error); SearchConditionSearchType search_condition_search_type_from_string (const gchar* str); SearchConditionTextContext search_condition_text_context_from_string (const gchar* str); -SearchConditionText* search_condition_text_new (SearchConditionSearchType search_type, const gchar* text, SearchConditionTextContext context); -SearchConditionText* search_condition_text_construct (GType object_type, SearchConditionSearchType search_type, const gchar* text, SearchConditionTextContext context); +SearchConditionText* search_condition_text_new (SearchConditionSearchType search_type, + const gchar* text, + SearchConditionTextContext context); +SearchConditionText* search_condition_text_construct (GType object_type, + SearchConditionSearchType search_type, + const gchar* text, + SearchConditionTextContext context); SearchConditionMediaTypeContext search_condition_media_type_context_from_string (const gchar* str); SearchConditionMediaTypeMediaType search_condition_media_type_media_type_from_string (const gchar* str); -SearchConditionMediaType* search_condition_media_type_new (SearchConditionSearchType search_type, SearchConditionMediaTypeContext context, SearchConditionMediaTypeMediaType media_type); -SearchConditionMediaType* search_condition_media_type_construct (GType object_type, SearchConditionSearchType search_type, SearchConditionMediaTypeContext context, SearchConditionMediaTypeMediaType media_type); +SearchConditionMediaType* search_condition_media_type_new (SearchConditionSearchType search_type, + SearchConditionMediaTypeContext context, + SearchConditionMediaTypeMediaType media_type); +SearchConditionMediaType* search_condition_media_type_construct (GType object_type, + SearchConditionSearchType search_type, + SearchConditionMediaTypeContext context, + SearchConditionMediaTypeMediaType media_type); SearchConditionFlaggedState search_condition_flagged_state_from_string (const gchar* str); -SearchConditionFlagged* search_condition_flagged_new (SearchConditionSearchType search_type, SearchConditionFlaggedState state); -SearchConditionFlagged* search_condition_flagged_construct (GType object_type, SearchConditionSearchType search_type, SearchConditionFlaggedState state); +SearchConditionFlagged* search_condition_flagged_new (SearchConditionSearchType search_type, + SearchConditionFlaggedState state); +SearchConditionFlagged* search_condition_flagged_construct (GType object_type, + SearchConditionSearchType search_type, + SearchConditionFlaggedState state); SearchConditionModifiedContext search_condition_modified_context_from_string (const gchar* str); SearchConditionModifiedState search_condition_modified_state_from_string (const gchar* str); -SearchConditionModified* search_condition_modified_new (SearchConditionSearchType search_type, SearchConditionModifiedContext context, SearchConditionModifiedState state); -SearchConditionModified* search_condition_modified_construct (GType object_type, SearchConditionSearchType search_type, SearchConditionModifiedContext context, SearchConditionModifiedState state); +SearchConditionModified* search_condition_modified_new (SearchConditionSearchType search_type, + SearchConditionModifiedContext context, + SearchConditionModifiedState state); +SearchConditionModified* search_condition_modified_construct (GType object_type, + SearchConditionSearchType search_type, + SearchConditionModifiedContext context, + SearchConditionModifiedState state); Rating rating_unserialize (gint value); SearchConditionRatingContext search_condition_rating_context_from_string (const gchar* str); -SearchConditionRating* search_condition_rating_new (SearchConditionSearchType search_type, Rating rating, SearchConditionRatingContext context); -SearchConditionRating* search_condition_rating_construct (GType object_type, SearchConditionSearchType search_type, Rating rating, SearchConditionRatingContext context); +SearchConditionRating* search_condition_rating_new (SearchConditionSearchType search_type, + Rating rating, + SearchConditionRatingContext context); +SearchConditionRating* search_condition_rating_construct (GType object_type, + SearchConditionSearchType search_type, + Rating rating, + SearchConditionRatingContext context); SearchConditionDateContext search_condition_date_context_from_string (const gchar* str); -SearchConditionDate* search_condition_date_new (SearchConditionSearchType search_type, SearchConditionDateContext context, GDateTime* date_one, GDateTime* date_two); -SearchConditionDate* search_condition_date_construct (GType object_type, SearchConditionSearchType search_type, SearchConditionDateContext context, GDateTime* date_one, GDateTime* date_two); -void saved_search_db_table_create_from_row (SavedSearchDBTable* self, SavedSearchRow* row, SavedSearchID* result, GError** error); -void saved_search_db_table_remove (SavedSearchDBTable* self, SavedSearchID* search_id, GError** error); -void database_table_delete_by_id (DatabaseTable* self, gint64 id, GError** error); -SavedSearchRow* saved_search_db_table_get_row (SavedSearchDBTable* self, SavedSearchID* search_id, GError** error); +SearchConditionDate* search_condition_date_new (SearchConditionSearchType search_type, + SearchConditionDateContext context, + GDateTime* date_one, + GDateTime* date_two); +SearchConditionDate* search_condition_date_construct (GType object_type, + SearchConditionSearchType search_type, + SearchConditionDateContext context, + GDateTime* date_one, + GDateTime* date_two); +void saved_search_db_table_create_from_row (SavedSearchDBTable* self, + SavedSearchRow* row, + SavedSearchID* result, + GError** error); +void saved_search_db_table_remove (SavedSearchDBTable* self, + SavedSearchID* search_id, + GError** error); +void database_table_delete_by_id (DatabaseTable* self, + gint64 id, + GError** error); +SavedSearchRow* saved_search_db_table_get_row (SavedSearchDBTable* self, + SavedSearchID* search_id, + GError** error); SearchOperator search_operator_from_string (const gchar* str); -GeeList* saved_search_db_table_get_all_rows (SavedSearchDBTable* self, GError** error); -void saved_search_db_table_rename (SavedSearchDBTable* self, SavedSearchID* search_id, const gchar* new_name, GError** error); -void database_table_update_text_by_id_2 (DatabaseTable* self, gint64 id, const gchar* column, const gchar* text, GError** error); +GeeList* saved_search_db_table_get_all_rows (SavedSearchDBTable* self, + GError** error); +void saved_search_db_table_rename (SavedSearchDBTable* self, + SavedSearchID* search_id, + const gchar* new_name, + GError** error); +void database_table_update_text_by_id_2 (DatabaseTable* self, + gint64 id, + const gchar* column, + const gchar* text, + GError** error); static void saved_search_db_table_finalize (DatabaseTable * obj); -void saved_search_id_init (SavedSearchID *self, gint64 id) { - gint64 _tmp0_; +void +saved_search_id_init (SavedSearchID *self, + gint64 id) +{ #line 12 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" memset (self, 0, sizeof (SavedSearchID)); #line 13 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp0_ = id; -#line 13 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - (*self).id = _tmp0_; -#line 434 "SavedSearchDBTable.c" + (*self).id = id; +#line 513 "SavedSearchDBTable.c" } -gboolean saved_search_id_is_invalid (SavedSearchID *self) { +gboolean +saved_search_id_is_invalid (SavedSearchID *self) +{ gboolean result = FALSE; gint64 _tmp0_; #line 17 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" @@ -443,11 +524,13 @@ gboolean saved_search_id_is_invalid (SavedSearchID *self) { result = _tmp0_ == SAVED_SEARCH_ID_INVALID; #line 17 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return result; -#line 447 "SavedSearchDBTable.c" +#line 528 "SavedSearchDBTable.c" } -gboolean saved_search_id_is_valid (SavedSearchID *self) { +gboolean +saved_search_id_is_valid (SavedSearchID *self) +{ gboolean result = FALSE; gint64 _tmp0_; #line 21 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" @@ -456,11 +539,13 @@ gboolean saved_search_id_is_valid (SavedSearchID *self) { result = _tmp0_ != SAVED_SEARCH_ID_INVALID; #line 21 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return result; -#line 460 "SavedSearchDBTable.c" +#line 543 "SavedSearchDBTable.c" } -SavedSearchID* saved_search_id_dup (const SavedSearchID* self) { +SavedSearchID* +saved_search_id_dup (const SavedSearchID* self) +{ SavedSearchID* dup; #line 7 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" dup = g_new0 (SavedSearchID, 1); @@ -468,18 +553,22 @@ SavedSearchID* saved_search_id_dup (const SavedSearchID* self) { memcpy (dup, self, sizeof (SavedSearchID)); #line 7 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return dup; -#line 472 "SavedSearchDBTable.c" +#line 557 "SavedSearchDBTable.c" } -void saved_search_id_free (SavedSearchID* self) { +void +saved_search_id_free (SavedSearchID* self) +{ #line 7 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" g_free (self); -#line 479 "SavedSearchDBTable.c" +#line 566 "SavedSearchDBTable.c" } -GType saved_search_id_get_type (void) { +GType +saved_search_id_get_type (void) +{ static volatile gsize saved_search_id_type_id__volatile = 0; if (g_once_init_enter (&saved_search_id_type_id__volatile)) { GType saved_search_id_type_id; @@ -490,121 +579,150 @@ GType saved_search_id_get_type (void) { } -SavedSearchRow* saved_search_row_construct (GType object_type) { +SavedSearchRow* +saved_search_row_construct (GType object_type) +{ SavedSearchRow* self = NULL; #line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" self = (SavedSearchRow*) g_type_create_instance (object_type); #line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return self; -#line 500 "SavedSearchDBTable.c" +#line 591 "SavedSearchDBTable.c" } -SavedSearchRow* saved_search_row_new (void) { +SavedSearchRow* +saved_search_row_new (void) +{ #line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return saved_search_row_construct (TYPE_SAVED_SEARCH_ROW); -#line 507 "SavedSearchDBTable.c" +#line 600 "SavedSearchDBTable.c" } -static void value_saved_search_row_init (GValue* value) { +static void +value_saved_search_row_init (GValue* value) +{ #line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" value->data[0].v_pointer = NULL; -#line 514 "SavedSearchDBTable.c" +#line 609 "SavedSearchDBTable.c" } -static void value_saved_search_row_free_value (GValue* value) { +static void +value_saved_search_row_free_value (GValue* value) +{ #line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" if (value->data[0].v_pointer) { #line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" saved_search_row_unref (value->data[0].v_pointer); -#line 523 "SavedSearchDBTable.c" +#line 620 "SavedSearchDBTable.c" } } -static void value_saved_search_row_copy_value (const GValue* src_value, GValue* dest_value) { +static void +value_saved_search_row_copy_value (const GValue* src_value, + GValue* dest_value) +{ #line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" if (src_value->data[0].v_pointer) { #line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" dest_value->data[0].v_pointer = saved_search_row_ref (src_value->data[0].v_pointer); -#line 533 "SavedSearchDBTable.c" +#line 633 "SavedSearchDBTable.c" } else { #line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" dest_value->data[0].v_pointer = NULL; -#line 537 "SavedSearchDBTable.c" +#line 637 "SavedSearchDBTable.c" } } -static gpointer value_saved_search_row_peek_pointer (const GValue* value) { +static gpointer +value_saved_search_row_peek_pointer (const GValue* value) +{ #line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return value->data[0].v_pointer; -#line 545 "SavedSearchDBTable.c" +#line 647 "SavedSearchDBTable.c" } -static gchar* value_saved_search_row_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_saved_search_row_collect_value (GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ #line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" if (collect_values[0].v_pointer) { -#line 552 "SavedSearchDBTable.c" +#line 659 "SavedSearchDBTable.c" SavedSearchRow * object; object = collect_values[0].v_pointer; #line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" if (object->parent_instance.g_class == NULL) { #line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 559 "SavedSearchDBTable.c" +#line 666 "SavedSearchDBTable.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.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 563 "SavedSearchDBTable.c" +#line 670 "SavedSearchDBTable.c" } #line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" value->data[0].v_pointer = saved_search_row_ref (object); -#line 567 "SavedSearchDBTable.c" +#line 674 "SavedSearchDBTable.c" } else { #line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" value->data[0].v_pointer = NULL; -#line 571 "SavedSearchDBTable.c" +#line 678 "SavedSearchDBTable.c" } #line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return NULL; -#line 575 "SavedSearchDBTable.c" +#line 682 "SavedSearchDBTable.c" } -static gchar* value_saved_search_row_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_saved_search_row_lcopy_value (const GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ SavedSearchRow ** object_p; object_p = collect_values[0].v_pointer; #line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" if (!object_p) { #line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 586 "SavedSearchDBTable.c" +#line 698 "SavedSearchDBTable.c" } #line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" if (!value->data[0].v_pointer) { #line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" *object_p = NULL; -#line 592 "SavedSearchDBTable.c" +#line 704 "SavedSearchDBTable.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" *object_p = value->data[0].v_pointer; -#line 596 "SavedSearchDBTable.c" +#line 708 "SavedSearchDBTable.c" } else { #line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" *object_p = saved_search_row_ref (value->data[0].v_pointer); -#line 600 "SavedSearchDBTable.c" +#line 712 "SavedSearchDBTable.c" } #line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return NULL; -#line 604 "SavedSearchDBTable.c" +#line 716 "SavedSearchDBTable.c" } -GParamSpec* param_spec_saved_search_row (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { +GParamSpec* +param_spec_saved_search_row (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) +{ ParamSpecSavedSearchRow* spec; #line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" g_return_val_if_fail (g_type_is_a (object_type, TYPE_SAVED_SEARCH_ROW), NULL); @@ -614,20 +732,25 @@ GParamSpec* param_spec_saved_search_row (const gchar* name, const gchar* nick, c G_PARAM_SPEC (spec)->value_type = object_type; #line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return G_PARAM_SPEC (spec); -#line 618 "SavedSearchDBTable.c" +#line 736 "SavedSearchDBTable.c" } -gpointer value_get_saved_search_row (const GValue* value) { +gpointer +value_get_saved_search_row (const GValue* value) +{ #line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SAVED_SEARCH_ROW), NULL); #line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return value->data[0].v_pointer; -#line 627 "SavedSearchDBTable.c" +#line 747 "SavedSearchDBTable.c" } -void value_set_saved_search_row (GValue* value, gpointer v_object) { +void +value_set_saved_search_row (GValue* value, + gpointer v_object) +{ SavedSearchRow * old; #line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SAVED_SEARCH_ROW)); @@ -643,22 +766,25 @@ void value_set_saved_search_row (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" saved_search_row_ref (value->data[0].v_pointer); -#line 647 "SavedSearchDBTable.c" +#line 770 "SavedSearchDBTable.c" } else { #line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" value->data[0].v_pointer = NULL; -#line 651 "SavedSearchDBTable.c" +#line 774 "SavedSearchDBTable.c" } #line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" if (old) { #line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" saved_search_row_unref (old); -#line 657 "SavedSearchDBTable.c" +#line 780 "SavedSearchDBTable.c" } } -void value_take_saved_search_row (GValue* value, gpointer v_object) { +void +value_take_saved_search_row (GValue* value, + gpointer v_object) +{ SavedSearchRow * old; #line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SAVED_SEARCH_ROW)); @@ -672,38 +798,44 @@ void value_take_saved_search_row (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" value->data[0].v_pointer = v_object; -#line 676 "SavedSearchDBTable.c" +#line 802 "SavedSearchDBTable.c" } else { #line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" value->data[0].v_pointer = NULL; -#line 680 "SavedSearchDBTable.c" +#line 806 "SavedSearchDBTable.c" } #line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" if (old) { #line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" saved_search_row_unref (old); -#line 686 "SavedSearchDBTable.c" +#line 812 "SavedSearchDBTable.c" } } -static void saved_search_row_class_init (SavedSearchRowClass * klass) { +static void +saved_search_row_class_init (SavedSearchRowClass * klass) +{ #line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" saved_search_row_parent_class = g_type_class_peek_parent (klass); #line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" ((SavedSearchRowClass *) klass)->finalize = saved_search_row_finalize; -#line 696 "SavedSearchDBTable.c" +#line 824 "SavedSearchDBTable.c" } -static void saved_search_row_instance_init (SavedSearchRow * self) { +static void +saved_search_row_instance_init (SavedSearchRow * self) +{ #line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" self->ref_count = 1; -#line 703 "SavedSearchDBTable.c" +#line 833 "SavedSearchDBTable.c" } -static void saved_search_row_finalize (SavedSearchRow * obj) { +static void +saved_search_row_finalize (SavedSearchRow * obj) +{ SavedSearchRow * self; #line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SAVED_SEARCH_ROW, SavedSearchRow); @@ -713,11 +845,13 @@ static void saved_search_row_finalize (SavedSearchRow * obj) { _g_free0 (self->name); #line 30 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _g_object_unref0 (self->conditions); -#line 717 "SavedSearchDBTable.c" +#line 849 "SavedSearchDBTable.c" } -GType saved_search_row_get_type (void) { +GType +saved_search_row_get_type (void) +{ static volatile gsize saved_search_row_type_id__volatile = 0; if (g_once_init_enter (&saved_search_row_type_id__volatile)) { static const GTypeValueTable g_define_type_value_table = { value_saved_search_row_init, value_saved_search_row_free_value, value_saved_search_row_copy_value, value_saved_search_row_peek_pointer, "p", value_saved_search_row_collect_value, "p", value_saved_search_row_lcopy_value }; @@ -731,18 +865,22 @@ GType saved_search_row_get_type (void) { } -gpointer saved_search_row_ref (gpointer instance) { +gpointer +saved_search_row_ref (gpointer instance) +{ SavedSearchRow * self; self = instance; #line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" g_atomic_int_inc (&self->ref_count); #line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return instance; -#line 742 "SavedSearchDBTable.c" +#line 878 "SavedSearchDBTable.c" } -void saved_search_row_unref (gpointer instance) { +void +saved_search_row_unref (gpointer instance) +{ SavedSearchRow * self; self = instance; #line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" @@ -751,12 +889,14 @@ void saved_search_row_unref (gpointer instance) { SAVED_SEARCH_ROW_GET_CLASS (self)->finalize (self); #line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" g_type_free_instance ((GTypeInstance *) self); -#line 755 "SavedSearchDBTable.c" +#line 893 "SavedSearchDBTable.c" } } -static SavedSearchDBTable* saved_search_db_table_construct (GType object_type) { +static SavedSearchDBTable* +saved_search_db_table_construct (GType object_type) +{ SavedSearchDBTable* self = NULL; sqlite3_stmt* stmt = NULL; gint res = 0; @@ -766,48 +906,47 @@ static SavedSearchDBTable* saved_search_db_table_construct (GType object_type) { gint _tmp3_; sqlite3_stmt* _tmp4_; gint _tmp5_; - gint _tmp6_; - sqlite3* _tmp8_; - sqlite3_stmt* _tmp9_ = NULL; + sqlite3* _tmp7_; + sqlite3_stmt* _tmp8_ = NULL; + gint _tmp9_; gint _tmp10_; - gint _tmp11_; - sqlite3_stmt* _tmp12_; - gint _tmp13_; - gint _tmp14_; - sqlite3* _tmp16_; - sqlite3_stmt* _tmp17_ = NULL; - gint _tmp18_; + sqlite3_stmt* _tmp11_; + gint _tmp12_; + sqlite3* _tmp14_; + sqlite3_stmt* _tmp15_ = NULL; + gint _tmp16_; + gint _tmp17_; + sqlite3_stmt* _tmp18_; gint _tmp19_; - sqlite3_stmt* _tmp20_; - gint _tmp21_; - gint _tmp22_; - sqlite3* _tmp24_; - sqlite3_stmt* _tmp25_ = NULL; + sqlite3* _tmp21_; + sqlite3_stmt* _tmp22_ = NULL; + gint _tmp23_; + gint _tmp24_; + sqlite3_stmt* _tmp25_; gint _tmp26_; - gint _tmp27_; - sqlite3_stmt* _tmp28_; - gint _tmp29_; + sqlite3* _tmp28_; + sqlite3_stmt* _tmp29_ = NULL; gint _tmp30_; - sqlite3* _tmp32_; - sqlite3_stmt* _tmp33_ = NULL; - gint _tmp34_; - gint _tmp35_; - sqlite3_stmt* _tmp36_; + gint _tmp31_; + sqlite3_stmt* _tmp32_; + gint _tmp33_; + sqlite3* _tmp35_; + sqlite3_stmt* _tmp36_ = NULL; gint _tmp37_; gint _tmp38_; - sqlite3* _tmp40_; - sqlite3_stmt* _tmp41_ = NULL; - gint _tmp42_; - gint _tmp43_; - sqlite3_stmt* _tmp44_; + sqlite3_stmt* _tmp39_; + gint _tmp40_; + sqlite3* _tmp42_; + sqlite3_stmt* _tmp43_ = NULL; + gint _tmp44_; gint _tmp45_; - gint _tmp46_; - sqlite3* _tmp48_; - sqlite3_stmt* _tmp49_ = NULL; - gint _tmp50_; + sqlite3_stmt* _tmp46_; + gint _tmp47_; + sqlite3* _tmp49_; + sqlite3_stmt* _tmp50_ = NULL; gint _tmp51_; - sqlite3_stmt* _tmp52_; - gint _tmp53_; + gint _tmp52_; + sqlite3_stmt* _tmp53_; gint _tmp54_; sqlite3* _tmp56_; sqlite3_stmt* _tmp57_ = NULL; @@ -815,42 +954,30 @@ static SavedSearchDBTable* saved_search_db_table_construct (GType object_type) { gint _tmp59_; sqlite3_stmt* _tmp60_; gint _tmp61_; - gint _tmp62_; - sqlite3* _tmp64_; - sqlite3_stmt* _tmp65_ = NULL; + sqlite3* _tmp63_; + sqlite3_stmt* _tmp64_ = NULL; + gint _tmp65_; gint _tmp66_; - gint _tmp67_; - sqlite3_stmt* _tmp68_; - gint _tmp69_; - gint _tmp70_; - sqlite3* _tmp72_; - sqlite3_stmt* _tmp73_ = NULL; - gint _tmp74_; + sqlite3_stmt* _tmp67_; + gint _tmp68_; + sqlite3* _tmp70_; + sqlite3_stmt* _tmp71_ = NULL; + gint _tmp72_; + gint _tmp73_; + sqlite3_stmt* _tmp74_; gint _tmp75_; - sqlite3_stmt* _tmp76_; - gint _tmp77_; - gint _tmp78_; - sqlite3* _tmp80_; - sqlite3_stmt* _tmp81_ = NULL; + sqlite3* _tmp77_; + sqlite3_stmt* _tmp78_ = NULL; + gint _tmp79_; + gint _tmp80_; + sqlite3_stmt* _tmp81_; gint _tmp82_; - gint _tmp83_; - sqlite3_stmt* _tmp84_; - gint _tmp85_; + sqlite3* _tmp84_; + sqlite3_stmt* _tmp85_ = NULL; gint _tmp86_; - sqlite3* _tmp88_; - sqlite3_stmt* _tmp89_ = NULL; - gint _tmp90_; - gint _tmp91_; - sqlite3_stmt* _tmp92_; - gint _tmp93_; - gint _tmp94_; - sqlite3* _tmp96_; - sqlite3_stmt* _tmp97_ = NULL; - gint _tmp98_; - gint _tmp99_; - sqlite3_stmt* _tmp100_; - gint _tmp101_; - gint _tmp102_; + gint _tmp87_; + sqlite3_stmt* _tmp88_; + gint _tmp89_; #line 36 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" self = (SavedSearchDBTable*) database_table_construct (object_type); #line 37 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" @@ -872,428 +999,408 @@ static SavedSearchDBTable* saved_search_db_table_construct (GType object_type) { #line 50 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _tmp4_ = stmt; #line 50 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp5_ = sqlite3_step (_tmp4_); -#line 50 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp5_; + res = sqlite3_step (_tmp4_); #line 51 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp6_ = res; + _tmp5_ = res; #line 51 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - if (_tmp6_ != SQLITE_DONE) { -#line 883 "SavedSearchDBTable.c" - gint _tmp7_; + if (_tmp5_ != SQLITE_DONE) { +#line 1008 "SavedSearchDBTable.c" + gint _tmp6_; #line 52 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp7_ = res; + _tmp6_ = res; #line 52 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - database_table_fatal ("create SavedSearchDBTable", _tmp7_); -#line 889 "SavedSearchDBTable.c" + database_table_fatal ("create SavedSearchDBTable", _tmp6_); +#line 1014 "SavedSearchDBTable.c" } #line 55 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp8_ = database_table_db; + _tmp7_ = database_table_db; #line 55 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp10_ = sqlite3_prepare_v2 (_tmp8_, "CREATE TABLE IF NOT EXISTS " "SavedSearchDBTable_Text " "(" "id INTEGER PRIMARY KEY, " "search_id INTEGER NOT NULL, " "search_type TEXT NOT NULL, " "context TEXT NOT NULL, " "text TEXT" ")", -1, &_tmp9_, NULL); + _tmp9_ = sqlite3_prepare_v2 (_tmp7_, "CREATE TABLE IF NOT EXISTS " "SavedSearchDBTable_Text " "(" "id INTEGER PRIMARY KEY, " "search_id INTEGER NOT NULL, " "search_type TEXT NOT NULL, " "context TEXT NOT NULL, " "text TEXT" ")", -1, &_tmp8_, NULL); #line 55 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _sqlite3_finalize0 (stmt); #line 55 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - stmt = _tmp9_; + stmt = _tmp8_; #line 55 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp10_; + res = _tmp9_; #line 64 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp11_ = res; + _tmp10_ = res; #line 64 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _vala_assert (_tmp11_ == SQLITE_OK, "res == Sqlite.OK"); -#line 66 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp12_ = stmt; + _vala_assert (_tmp10_ == SQLITE_OK, "res == Sqlite.OK"); #line 66 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp13_ = sqlite3_step (_tmp12_); + _tmp11_ = stmt; #line 66 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp13_; + res = sqlite3_step (_tmp11_); #line 67 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp14_ = res; + _tmp12_ = res; #line 67 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - if (_tmp14_ != SQLITE_DONE) { -#line 915 "SavedSearchDBTable.c" - gint _tmp15_; + if (_tmp12_ != SQLITE_DONE) { +#line 1038 "SavedSearchDBTable.c" + gint _tmp13_; #line 68 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp15_ = res; + _tmp13_ = res; #line 68 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - database_table_fatal ("create SavedSearchDBTable_Text", _tmp15_); -#line 921 "SavedSearchDBTable.c" + database_table_fatal ("create SavedSearchDBTable_Text", _tmp13_); +#line 1044 "SavedSearchDBTable.c" } #line 71 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp16_ = database_table_db; + _tmp14_ = database_table_db; #line 71 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp18_ = sqlite3_prepare_v2 (_tmp16_, "CREATE TABLE IF NOT EXISTS " "SavedSearchDBTable_MediaType " "(" "id INTEGER PRIMARY KEY, " "search_id INTEGER NOT NULL, " "search_type TEXT NOT NULL, " "context TEXT NOT NULL, " "type TEXT NOT_NULL" ")", -1, &_tmp17_, NULL); + _tmp16_ = sqlite3_prepare_v2 (_tmp14_, "CREATE TABLE IF NOT EXISTS " "SavedSearchDBTable_MediaType " "(" "id INTEGER PRIMARY KEY, " "search_id INTEGER NOT NULL, " "search_type TEXT NOT NULL, " "context TEXT NOT NULL, " "type TEXT NOT_NULL" ")", -1, &_tmp15_, NULL); #line 71 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _sqlite3_finalize0 (stmt); #line 71 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - stmt = _tmp17_; + stmt = _tmp15_; #line 71 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp18_; + res = _tmp16_; #line 80 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp19_ = res; + _tmp17_ = res; #line 80 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _vala_assert (_tmp19_ == SQLITE_OK, "res == Sqlite.OK"); -#line 82 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp20_ = stmt; + _vala_assert (_tmp17_ == SQLITE_OK, "res == Sqlite.OK"); #line 82 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp21_ = sqlite3_step (_tmp20_); + _tmp18_ = stmt; #line 82 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp21_; + res = sqlite3_step (_tmp18_); #line 83 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp22_ = res; + _tmp19_ = res; #line 83 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - if (_tmp22_ != SQLITE_DONE) { -#line 947 "SavedSearchDBTable.c" - gint _tmp23_; + if (_tmp19_ != SQLITE_DONE) { +#line 1068 "SavedSearchDBTable.c" + gint _tmp20_; #line 84 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp23_ = res; + _tmp20_ = res; #line 84 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - database_table_fatal ("create SavedSearchDBTable_MediaType", _tmp23_); -#line 953 "SavedSearchDBTable.c" + database_table_fatal ("create SavedSearchDBTable_MediaType", _tmp20_); +#line 1074 "SavedSearchDBTable.c" } #line 87 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp24_ = database_table_db; + _tmp21_ = database_table_db; #line 87 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp26_ = sqlite3_prepare_v2 (_tmp24_, "CREATE TABLE IF NOT EXISTS " "SavedSearchDBTable_Flagged " "(" "id INTEGER PRIMARY KEY, " "search_id INTEGER NOT NULL, " "search_type TEXT NOT NULL, " "flag_state TEXT NOT NULL" ")", -1, &_tmp25_, NULL); + _tmp23_ = sqlite3_prepare_v2 (_tmp21_, "CREATE TABLE IF NOT EXISTS " "SavedSearchDBTable_Flagged " "(" "id INTEGER PRIMARY KEY, " "search_id INTEGER NOT NULL, " "search_type TEXT NOT NULL, " "flag_state TEXT NOT NULL" ")", -1, &_tmp22_, NULL); #line 87 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _sqlite3_finalize0 (stmt); #line 87 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - stmt = _tmp25_; + stmt = _tmp22_; #line 87 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp26_; + res = _tmp23_; #line 95 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp27_ = res; + _tmp24_ = res; #line 95 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _vala_assert (_tmp27_ == SQLITE_OK, "res == Sqlite.OK"); -#line 97 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp28_ = stmt; + _vala_assert (_tmp24_ == SQLITE_OK, "res == Sqlite.OK"); #line 97 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp29_ = sqlite3_step (_tmp28_); + _tmp25_ = stmt; #line 97 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp29_; + res = sqlite3_step (_tmp25_); #line 98 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp30_ = res; + _tmp26_ = res; #line 98 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - if (_tmp30_ != SQLITE_DONE) { -#line 979 "SavedSearchDBTable.c" - gint _tmp31_; + if (_tmp26_ != SQLITE_DONE) { +#line 1098 "SavedSearchDBTable.c" + gint _tmp27_; #line 99 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp31_ = res; + _tmp27_ = res; #line 99 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - database_table_fatal ("create SavedSearchDBTable_Flagged", _tmp31_); -#line 985 "SavedSearchDBTable.c" + database_table_fatal ("create SavedSearchDBTable_Flagged", _tmp27_); +#line 1104 "SavedSearchDBTable.c" } #line 102 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp32_ = database_table_db; + _tmp28_ = database_table_db; #line 102 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp34_ = sqlite3_prepare_v2 (_tmp32_, "CREATE TABLE IF NOT EXISTS " "SavedSearchDBTable_Modified " "(" "id INTEGER PRIMARY KEY, " "search_id INTEGER NOT NULL, " "search_type TEXT NOT NULL, " "context TEXT NOT NULL, " "modified_state TEXT NOT NULL" ")", -1, &_tmp33_, NULL); + _tmp30_ = sqlite3_prepare_v2 (_tmp28_, "CREATE TABLE IF NOT EXISTS " "SavedSearchDBTable_Modified " "(" "id INTEGER PRIMARY KEY, " "search_id INTEGER NOT NULL, " "search_type TEXT NOT NULL, " "context TEXT NOT NULL, " "modified_state TEXT NOT NULL" ")", -1, &_tmp29_, NULL); #line 102 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _sqlite3_finalize0 (stmt); #line 102 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - stmt = _tmp33_; + stmt = _tmp29_; #line 102 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp34_; + res = _tmp30_; #line 111 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp35_ = res; + _tmp31_ = res; #line 111 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _vala_assert (_tmp35_ == SQLITE_OK, "res == Sqlite.OK"); -#line 113 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp36_ = stmt; + _vala_assert (_tmp31_ == SQLITE_OK, "res == Sqlite.OK"); #line 113 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp37_ = sqlite3_step (_tmp36_); + _tmp32_ = stmt; #line 113 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp37_; + res = sqlite3_step (_tmp32_); #line 114 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp38_ = res; + _tmp33_ = res; #line 114 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - if (_tmp38_ != SQLITE_DONE) { -#line 1011 "SavedSearchDBTable.c" - gint _tmp39_; + if (_tmp33_ != SQLITE_DONE) { +#line 1128 "SavedSearchDBTable.c" + gint _tmp34_; #line 115 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp39_ = res; + _tmp34_ = res; #line 115 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - database_table_fatal ("create SavedSearchDBTable_Modified", _tmp39_); -#line 1017 "SavedSearchDBTable.c" + database_table_fatal ("create SavedSearchDBTable_Modified", _tmp34_); +#line 1134 "SavedSearchDBTable.c" } #line 118 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp40_ = database_table_db; + _tmp35_ = database_table_db; #line 118 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp42_ = sqlite3_prepare_v2 (_tmp40_, "CREATE TABLE IF NOT EXISTS " "SavedSearchDBTable_Rating " "(" "id INTEGER PRIMARY KEY, " "search_id INTEGER NOT NULL, " "search_type TEXT NOT NULL, " "rating INTEGER NOT_NULL, " "context TEXT NOT NULL" ")", -1, &_tmp41_, NULL); + _tmp37_ = sqlite3_prepare_v2 (_tmp35_, "CREATE TABLE IF NOT EXISTS " "SavedSearchDBTable_Rating " "(" "id INTEGER PRIMARY KEY, " "search_id INTEGER NOT NULL, " "search_type TEXT NOT NULL, " "rating INTEGER NOT_NULL, " "context TEXT NOT NULL" ")", -1, &_tmp36_, NULL); #line 118 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _sqlite3_finalize0 (stmt); #line 118 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - stmt = _tmp41_; + stmt = _tmp36_; #line 118 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp42_; + res = _tmp37_; #line 127 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp43_ = res; + _tmp38_ = res; #line 127 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _vala_assert (_tmp43_ == SQLITE_OK, "res == Sqlite.OK"); -#line 129 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp44_ = stmt; + _vala_assert (_tmp38_ == SQLITE_OK, "res == Sqlite.OK"); #line 129 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp45_ = sqlite3_step (_tmp44_); + _tmp39_ = stmt; #line 129 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp45_; + res = sqlite3_step (_tmp39_); #line 130 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp46_ = res; + _tmp40_ = res; #line 130 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - if (_tmp46_ != SQLITE_DONE) { -#line 1043 "SavedSearchDBTable.c" - gint _tmp47_; + if (_tmp40_ != SQLITE_DONE) { +#line 1158 "SavedSearchDBTable.c" + gint _tmp41_; #line 131 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp47_ = res; + _tmp41_ = res; #line 131 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - database_table_fatal ("create SavedSearchDBTable_Rating", _tmp47_); -#line 1049 "SavedSearchDBTable.c" + database_table_fatal ("create SavedSearchDBTable_Rating", _tmp41_); +#line 1164 "SavedSearchDBTable.c" } #line 134 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp48_ = database_table_db; + _tmp42_ = database_table_db; #line 134 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp50_ = sqlite3_prepare_v2 (_tmp48_, "CREATE TABLE IF NOT EXISTS " "SavedSearchDBTable_Date " "(" "id INTEGER PRIMARY KEY, " "search_id INTEGER NOT NULL, " "search_type TEXT NOT NULL, " "context TEXT NOT NULL, " "date_one INTEGER NOT_NULL, " "date_two INTEGER NOT_NULL" ")", -1, &_tmp49_, NULL); + _tmp44_ = sqlite3_prepare_v2 (_tmp42_, "CREATE TABLE IF NOT EXISTS " "SavedSearchDBTable_Date " "(" "id INTEGER PRIMARY KEY, " "search_id INTEGER NOT NULL, " "search_type TEXT NOT NULL, " "context TEXT NOT NULL, " "date_one INTEGER NOT_NULL, " "date_two INTEGER NOT_NULL" ")", -1, &_tmp43_, NULL); #line 134 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _sqlite3_finalize0 (stmt); #line 134 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - stmt = _tmp49_; + stmt = _tmp43_; #line 134 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp50_; + res = _tmp44_; #line 144 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp51_ = res; + _tmp45_ = res; #line 144 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _vala_assert (_tmp51_ == SQLITE_OK, "res == Sqlite.OK"); -#line 146 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp52_ = stmt; + _vala_assert (_tmp45_ == SQLITE_OK, "res == Sqlite.OK"); #line 146 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp53_ = sqlite3_step (_tmp52_); + _tmp46_ = stmt; #line 146 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp53_; + res = sqlite3_step (_tmp46_); #line 147 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp54_ = res; + _tmp47_ = res; #line 147 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - if (_tmp54_ != SQLITE_DONE) { -#line 1075 "SavedSearchDBTable.c" - gint _tmp55_; + if (_tmp47_ != SQLITE_DONE) { +#line 1188 "SavedSearchDBTable.c" + gint _tmp48_; #line 148 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp55_ = res; + _tmp48_ = res; #line 148 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - database_table_fatal ("create SavedSearchDBTable_Rating", _tmp55_); -#line 1081 "SavedSearchDBTable.c" + database_table_fatal ("create SavedSearchDBTable_Rating", _tmp48_); +#line 1194 "SavedSearchDBTable.c" } #line 151 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp56_ = database_table_db; + _tmp49_ = database_table_db; #line 151 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp58_ = sqlite3_prepare_v2 (_tmp56_, "CREATE INDEX IF NOT EXISTS " "SavedSearchDBTable_Text_Index " "ON SavedSearchDBTable_Text(search_id)", -1, &_tmp57_, NULL); + _tmp51_ = sqlite3_prepare_v2 (_tmp49_, "CREATE INDEX IF NOT EXISTS " "SavedSearchDBTable_Text_Index " "ON SavedSearchDBTable_Text(search_id)", -1, &_tmp50_, NULL); #line 151 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _sqlite3_finalize0 (stmt); #line 151 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - stmt = _tmp57_; + stmt = _tmp50_; #line 151 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp58_; + res = _tmp51_; #line 154 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp59_ = res; + _tmp52_ = res; #line 154 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _vala_assert (_tmp59_ == SQLITE_OK, "res == Sqlite.OK"); + _vala_assert (_tmp52_ == SQLITE_OK, "res == Sqlite.OK"); #line 155 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp60_ = stmt; -#line 155 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp61_ = sqlite3_step (_tmp60_); + _tmp53_ = stmt; #line 155 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp61_; + res = sqlite3_step (_tmp53_); #line 156 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp62_ = res; + _tmp54_ = res; #line 156 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - if (_tmp62_ != SQLITE_DONE) { -#line 1107 "SavedSearchDBTable.c" - gint _tmp63_; + if (_tmp54_ != SQLITE_DONE) { +#line 1218 "SavedSearchDBTable.c" + gint _tmp55_; #line 157 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp63_ = res; + _tmp55_ = res; #line 157 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - database_table_fatal ("create SavedSearchDBTable_Text_Index", _tmp63_); -#line 1113 "SavedSearchDBTable.c" + database_table_fatal ("create SavedSearchDBTable_Text_Index", _tmp55_); +#line 1224 "SavedSearchDBTable.c" } #line 159 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp64_ = database_table_db; + _tmp56_ = database_table_db; #line 159 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp66_ = sqlite3_prepare_v2 (_tmp64_, "CREATE INDEX IF NOT EXISTS " "SavedSearchDBTable_MediaType_Index " "ON SavedSearchDBTable_MediaType(search_id)", -1, &_tmp65_, NULL); + _tmp58_ = sqlite3_prepare_v2 (_tmp56_, "CREATE INDEX IF NOT EXISTS " "SavedSearchDBTable_MediaType_Index " "ON SavedSearchDBTable_MediaType(search_id)", -1, &_tmp57_, NULL); #line 159 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _sqlite3_finalize0 (stmt); #line 159 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - stmt = _tmp65_; + stmt = _tmp57_; #line 159 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp66_; + res = _tmp58_; #line 162 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp67_ = res; + _tmp59_ = res; #line 162 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _vala_assert (_tmp67_ == SQLITE_OK, "res == Sqlite.OK"); -#line 163 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp68_ = stmt; + _vala_assert (_tmp59_ == SQLITE_OK, "res == Sqlite.OK"); #line 163 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp69_ = sqlite3_step (_tmp68_); + _tmp60_ = stmt; #line 163 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp69_; + res = sqlite3_step (_tmp60_); #line 164 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp70_ = res; + _tmp61_ = res; #line 164 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - if (_tmp70_ != SQLITE_DONE) { -#line 1139 "SavedSearchDBTable.c" - gint _tmp71_; + if (_tmp61_ != SQLITE_DONE) { +#line 1248 "SavedSearchDBTable.c" + gint _tmp62_; #line 165 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp71_ = res; + _tmp62_ = res; #line 165 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - database_table_fatal ("create SavedSearchDBTable_MediaType_Index", _tmp71_); -#line 1145 "SavedSearchDBTable.c" + database_table_fatal ("create SavedSearchDBTable_MediaType_Index", _tmp62_); +#line 1254 "SavedSearchDBTable.c" } #line 167 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp72_ = database_table_db; + _tmp63_ = database_table_db; #line 167 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp74_ = sqlite3_prepare_v2 (_tmp72_, "CREATE INDEX IF NOT EXISTS " "SavedSearchDBTable_Flagged_Index " "ON SavedSearchDBTable_Flagged(search_id)", -1, &_tmp73_, NULL); + _tmp65_ = sqlite3_prepare_v2 (_tmp63_, "CREATE INDEX IF NOT EXISTS " "SavedSearchDBTable_Flagged_Index " "ON SavedSearchDBTable_Flagged(search_id)", -1, &_tmp64_, NULL); #line 167 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _sqlite3_finalize0 (stmt); #line 167 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - stmt = _tmp73_; + stmt = _tmp64_; #line 167 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp74_; + res = _tmp65_; #line 170 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp75_ = res; + _tmp66_ = res; #line 170 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _vala_assert (_tmp75_ == SQLITE_OK, "res == Sqlite.OK"); -#line 171 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp76_ = stmt; + _vala_assert (_tmp66_ == SQLITE_OK, "res == Sqlite.OK"); #line 171 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp77_ = sqlite3_step (_tmp76_); + _tmp67_ = stmt; #line 171 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp77_; + res = sqlite3_step (_tmp67_); #line 172 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp78_ = res; + _tmp68_ = res; #line 172 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - if (_tmp78_ != SQLITE_DONE) { -#line 1171 "SavedSearchDBTable.c" - gint _tmp79_; + if (_tmp68_ != SQLITE_DONE) { +#line 1278 "SavedSearchDBTable.c" + gint _tmp69_; #line 173 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp79_ = res; + _tmp69_ = res; #line 173 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - database_table_fatal ("create SavedSearchDBTable_Flagged_Index", _tmp79_); -#line 1177 "SavedSearchDBTable.c" + database_table_fatal ("create SavedSearchDBTable_Flagged_Index", _tmp69_); +#line 1284 "SavedSearchDBTable.c" } #line 175 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp80_ = database_table_db; + _tmp70_ = database_table_db; #line 175 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp82_ = sqlite3_prepare_v2 (_tmp80_, "CREATE INDEX IF NOT EXISTS " "SavedSearchDBTable_Modified_Index " "ON SavedSearchDBTable_Modified(search_id)", -1, &_tmp81_, NULL); + _tmp72_ = sqlite3_prepare_v2 (_tmp70_, "CREATE INDEX IF NOT EXISTS " "SavedSearchDBTable_Modified_Index " "ON SavedSearchDBTable_Modified(search_id)", -1, &_tmp71_, NULL); #line 175 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _sqlite3_finalize0 (stmt); #line 175 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - stmt = _tmp81_; + stmt = _tmp71_; #line 175 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp82_; + res = _tmp72_; #line 178 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp83_ = res; + _tmp73_ = res; #line 178 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _vala_assert (_tmp83_ == SQLITE_OK, "res == Sqlite.OK"); + _vala_assert (_tmp73_ == SQLITE_OK, "res == Sqlite.OK"); #line 179 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp84_ = stmt; + _tmp74_ = stmt; #line 179 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp85_ = sqlite3_step (_tmp84_); -#line 179 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp85_; + res = sqlite3_step (_tmp74_); #line 180 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp86_ = res; + _tmp75_ = res; #line 180 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - if (_tmp86_ != SQLITE_DONE) { -#line 1203 "SavedSearchDBTable.c" - gint _tmp87_; + if (_tmp75_ != SQLITE_DONE) { +#line 1308 "SavedSearchDBTable.c" + gint _tmp76_; #line 181 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp87_ = res; + _tmp76_ = res; #line 181 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - database_table_fatal ("create SavedSearchDBTable_Modified_Index", _tmp87_); -#line 1209 "SavedSearchDBTable.c" + database_table_fatal ("create SavedSearchDBTable_Modified_Index", _tmp76_); +#line 1314 "SavedSearchDBTable.c" } #line 183 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp88_ = database_table_db; + _tmp77_ = database_table_db; #line 183 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp90_ = sqlite3_prepare_v2 (_tmp88_, "CREATE INDEX IF NOT EXISTS " "SavedSearchDBTable_Rating_Index " "ON SavedSearchDBTable_Rating(search_id)", -1, &_tmp89_, NULL); + _tmp79_ = sqlite3_prepare_v2 (_tmp77_, "CREATE INDEX IF NOT EXISTS " "SavedSearchDBTable_Rating_Index " "ON SavedSearchDBTable_Rating(search_id)", -1, &_tmp78_, NULL); #line 183 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _sqlite3_finalize0 (stmt); #line 183 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - stmt = _tmp89_; + stmt = _tmp78_; #line 183 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp90_; + res = _tmp79_; #line 186 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp91_ = res; + _tmp80_ = res; #line 186 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _vala_assert (_tmp91_ == SQLITE_OK, "res == Sqlite.OK"); + _vala_assert (_tmp80_ == SQLITE_OK, "res == Sqlite.OK"); #line 187 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp92_ = stmt; + _tmp81_ = stmt; #line 187 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp93_ = sqlite3_step (_tmp92_); -#line 187 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp93_; + res = sqlite3_step (_tmp81_); #line 188 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp94_ = res; + _tmp82_ = res; #line 188 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - if (_tmp94_ != SQLITE_DONE) { -#line 1235 "SavedSearchDBTable.c" - gint _tmp95_; + if (_tmp82_ != SQLITE_DONE) { +#line 1338 "SavedSearchDBTable.c" + gint _tmp83_; #line 189 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp95_ = res; + _tmp83_ = res; #line 189 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - database_table_fatal ("create SavedSearchDBTable_Rating_Index", _tmp95_); -#line 1241 "SavedSearchDBTable.c" + database_table_fatal ("create SavedSearchDBTable_Rating_Index", _tmp83_); +#line 1344 "SavedSearchDBTable.c" } #line 191 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp96_ = database_table_db; + _tmp84_ = database_table_db; #line 191 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp98_ = sqlite3_prepare_v2 (_tmp96_, "CREATE INDEX IF NOT EXISTS " "SavedSearchDBTable_Date_Index " "ON SavedSearchDBTable_Date(search_id)", -1, &_tmp97_, NULL); + _tmp86_ = sqlite3_prepare_v2 (_tmp84_, "CREATE INDEX IF NOT EXISTS " "SavedSearchDBTable_Date_Index " "ON SavedSearchDBTable_Date(search_id)", -1, &_tmp85_, NULL); #line 191 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _sqlite3_finalize0 (stmt); #line 191 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - stmt = _tmp97_; + stmt = _tmp85_; #line 191 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp98_; + res = _tmp86_; #line 194 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp99_ = res; + _tmp87_ = res; #line 194 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _vala_assert (_tmp99_ == SQLITE_OK, "res == Sqlite.OK"); -#line 195 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp100_ = stmt; + _vala_assert (_tmp87_ == SQLITE_OK, "res == Sqlite.OK"); #line 195 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp101_ = sqlite3_step (_tmp100_); + _tmp88_ = stmt; #line 195 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp101_; + res = sqlite3_step (_tmp88_); #line 196 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp102_ = res; + _tmp89_ = res; #line 196 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - if (_tmp102_ != SQLITE_DONE) { -#line 1267 "SavedSearchDBTable.c" - gint _tmp103_; + if (_tmp89_ != SQLITE_DONE) { +#line 1368 "SavedSearchDBTable.c" + gint _tmp90_; #line 197 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp103_ = res; + _tmp90_ = res; #line 197 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - database_table_fatal ("create SavedSearchDBTable_Date_Index", _tmp103_); -#line 1273 "SavedSearchDBTable.c" + database_table_fatal ("create SavedSearchDBTable_Date_Index", _tmp90_); +#line 1374 "SavedSearchDBTable.c" } #line 36 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _sqlite3_finalize0 (stmt); #line 36 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return self; -#line 1279 "SavedSearchDBTable.c" +#line 1380 "SavedSearchDBTable.c" } -static SavedSearchDBTable* saved_search_db_table_new (void) { +static SavedSearchDBTable* +saved_search_db_table_new (void) +{ #line 36 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return saved_search_db_table_construct (TYPE_SAVED_SEARCH_DB_TABLE); -#line 1286 "SavedSearchDBTable.c" +#line 1389 "SavedSearchDBTable.c" } -static gpointer _database_table_ref0 (gpointer self) { +static gpointer +_database_table_ref0 (gpointer self) +{ #line 204 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return self ? database_table_ref (self) : NULL; -#line 1293 "SavedSearchDBTable.c" +#line 1398 "SavedSearchDBTable.c" } -SavedSearchDBTable* saved_search_db_table_get_instance (void) { +SavedSearchDBTable* +saved_search_db_table_get_instance (void) +{ SavedSearchDBTable* result = NULL; SavedSearchDBTable* _tmp0_; SavedSearchDBTable* _tmp2_; @@ -1302,7 +1409,7 @@ SavedSearchDBTable* saved_search_db_table_get_instance (void) { _tmp0_ = saved_search_db_table_instance; #line 201 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" if (_tmp0_ == NULL) { -#line 1306 "SavedSearchDBTable.c" +#line 1413 "SavedSearchDBTable.c" SavedSearchDBTable* _tmp1_; #line 202 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _tmp1_ = saved_search_db_table_new (); @@ -1310,7 +1417,7 @@ SavedSearchDBTable* saved_search_db_table_get_instance (void) { _database_table_unref0 (saved_search_db_table_instance); #line 202 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" saved_search_db_table_instance = _tmp1_; -#line 1314 "SavedSearchDBTable.c" +#line 1421 "SavedSearchDBTable.c" } #line 204 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _tmp2_ = saved_search_db_table_instance; @@ -1320,18 +1427,26 @@ SavedSearchDBTable* saved_search_db_table_get_instance (void) { result = _tmp3_; #line 204 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return result; -#line 1324 "SavedSearchDBTable.c" +#line 1431 "SavedSearchDBTable.c" } -static gpointer _g_object_ref0 (gpointer self) { +static gpointer +_g_object_ref0 (gpointer self) +{ #line 227 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return self ? g_object_ref (self) : NULL; -#line 1331 "SavedSearchDBTable.c" +#line 1440 "SavedSearchDBTable.c" } -SavedSearchRow* saved_search_db_table_add (SavedSearchDBTable* self, const gchar* name, SearchOperator operator, GeeArrayList* conditions, GError** error) { +SavedSearchRow* +saved_search_db_table_add (SavedSearchDBTable* self, + const gchar* name, + SearchOperator operator, + GeeArrayList* conditions, + GError** error) +{ SavedSearchRow* result = NULL; sqlite3_stmt* stmt = NULL; gint res = 0; @@ -1340,33 +1455,24 @@ SavedSearchRow* saved_search_db_table_add (SavedSearchDBTable* self, const gchar gint _tmp2_; gint _tmp3_; sqlite3_stmt* _tmp4_; - const gchar* _tmp5_; - gchar* _tmp6_; - GDestroyNotify _tmp7_; - gint _tmp8_; - gint _tmp9_; - sqlite3_stmt* _tmp10_; - SearchOperator _tmp11_; - gchar* _tmp12_; - GDestroyNotify _tmp13_; - gint _tmp14_; - gint _tmp15_; - sqlite3_stmt* _tmp16_; - gint _tmp17_; - gint _tmp18_; + gchar* _tmp5_; + GDestroyNotify _tmp6_; + gint _tmp7_; + sqlite3_stmt* _tmp8_; + gchar* _tmp9_; + GDestroyNotify _tmp10_; + gint _tmp11_; + sqlite3_stmt* _tmp12_; + gint _tmp13_; SavedSearchRow* row = NULL; + SavedSearchRow* _tmp15_; + SavedSearchRow* _tmp16_; + sqlite3* _tmp17_; + SavedSearchRow* _tmp18_; + gchar* _tmp19_; SavedSearchRow* _tmp20_; SavedSearchRow* _tmp21_; - sqlite3* _tmp22_; - gint64 _tmp23_; - SavedSearchRow* _tmp24_; - const gchar* _tmp25_; - gchar* _tmp26_; - SavedSearchRow* _tmp27_; - SearchOperator _tmp28_; - SavedSearchRow* _tmp29_; - GeeArrayList* _tmp30_; - GeeList* _tmp31_; + GeeList* _tmp22_; GError * _inner_error_ = NULL; #line 207 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" g_return_val_if_fail (IS_SAVED_SEARCH_DB_TABLE (self), NULL); @@ -1391,51 +1497,41 @@ SavedSearchRow* saved_search_db_table_add (SavedSearchDBTable* self, const gchar #line 214 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _tmp4_ = stmt; #line 214 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp5_ = name; -#line 214 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp6_ = g_strdup (_tmp5_); -#line 214 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp7_ = g_free; + _tmp5_ = g_strdup (name); #line 214 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp8_ = sqlite3_bind_text (_tmp4_, 1, _tmp6_, -1, _tmp7_); + _tmp6_ = g_free; #line 214 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp8_; + res = sqlite3_bind_text (_tmp4_, 1, _tmp5_, -1, _tmp6_); #line 215 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp9_ = res; + _tmp7_ = res; #line 215 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _vala_assert (_tmp9_ == SQLITE_OK, "res == Sqlite.OK"); -#line 216 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp10_ = stmt; -#line 216 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp11_ = operator; + _vala_assert (_tmp7_ == SQLITE_OK, "res == Sqlite.OK"); #line 216 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp12_ = search_operator_to_string (_tmp11_); + _tmp8_ = stmt; #line 216 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp13_ = g_free; + _tmp9_ = search_operator_to_string (operator); #line 216 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp14_ = sqlite3_bind_text (_tmp10_, 2, _tmp12_, -1, _tmp13_); + _tmp10_ = g_free; #line 216 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp14_; + res = sqlite3_bind_text (_tmp8_, 2, _tmp9_, -1, _tmp10_); #line 217 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp15_ = res; + _tmp11_ = res; #line 217 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _vala_assert (_tmp15_ == SQLITE_OK, "res == Sqlite.OK"); -#line 219 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp16_ = stmt; + _vala_assert (_tmp11_ == SQLITE_OK, "res == Sqlite.OK"); #line 219 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp17_ = sqlite3_step (_tmp16_); + _tmp12_ = stmt; #line 219 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp17_; + res = sqlite3_step (_tmp12_); #line 220 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp18_ = res; + _tmp13_ = res; #line 220 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - if (_tmp18_ != SQLITE_DONE) { -#line 1434 "SavedSearchDBTable.c" - gint _tmp19_; + if (_tmp13_ != SQLITE_DONE) { +#line 1530 "SavedSearchDBTable.c" + gint _tmp14_; #line 221 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp19_ = res; + _tmp14_ = res; #line 221 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - database_table_throw_error ("SavedSearchDBTable.add", _tmp19_, &_inner_error_); + database_table_throw_error ("SavedSearchDBTable.add", _tmp14_, &_inner_error_); #line 221 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 221 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" @@ -1446,7 +1542,7 @@ SavedSearchRow* saved_search_db_table_add (SavedSearchDBTable* self, const gchar _sqlite3_finalize0 (stmt); #line 221 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return NULL; -#line 1450 "SavedSearchDBTable.c" +#line 1546 "SavedSearchDBTable.c" } else { #line 221 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _sqlite3_finalize0 (stmt); @@ -1456,117 +1552,106 @@ SavedSearchRow* saved_search_db_table_add (SavedSearchDBTable* self, const gchar g_clear_error (&_inner_error_); #line 221 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return NULL; -#line 1460 "SavedSearchDBTable.c" +#line 1556 "SavedSearchDBTable.c" } } } #line 223 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp20_ = saved_search_row_new (); + _tmp15_ = saved_search_row_new (); #line 223 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - row = _tmp20_; -#line 224 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp21_ = row; + row = _tmp15_; #line 224 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp22_ = database_table_db; + _tmp16_ = row; #line 224 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp23_ = sqlite3_last_insert_rowid (_tmp22_); + _tmp17_ = database_table_db; #line 224 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - saved_search_id_init (&_tmp21_->search_id, _tmp23_); + saved_search_id_init (&_tmp16_->search_id, sqlite3_last_insert_rowid (_tmp17_)); #line 225 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp24_ = row; + _tmp18_ = row; #line 225 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp25_ = name; + _tmp19_ = g_strdup (name); #line 225 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp26_ = g_strdup (_tmp25_); + _g_free0 (_tmp18_->name); #line 225 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _g_free0 (_tmp24_->name); -#line 225 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp24_->name = _tmp26_; -#line 226 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp27_ = row; + _tmp18_->name = _tmp19_; #line 226 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp28_ = operator; + _tmp20_ = row; #line 226 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp27_->operator = _tmp28_; -#line 227 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp29_ = row; + _tmp20_->operator = operator; #line 227 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp30_ = conditions; + _tmp21_ = row; #line 227 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp31_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, GEE_TYPE_LIST, GeeList)); + _tmp22_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (conditions, GEE_TYPE_LIST, GeeList)); #line 227 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _g_object_unref0 (_tmp29_->conditions); + _g_object_unref0 (_tmp21_->conditions); #line 227 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp29_->conditions = _tmp31_; -#line 1502 "SavedSearchDBTable.c" + _tmp21_->conditions = _tmp22_; +#line 1590 "SavedSearchDBTable.c" { GeeArrayList* _sc_list = NULL; - GeeArrayList* _tmp32_; - GeeArrayList* _tmp33_; + GeeArrayList* _tmp23_; gint _sc_size = 0; - GeeArrayList* _tmp34_; - gint _tmp35_; - gint _tmp36_; + GeeArrayList* _tmp24_; + gint _tmp25_; + gint _tmp26_; gint _sc_index = 0; #line 229 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp32_ = conditions; -#line 229 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp33_ = _g_object_ref0 (_tmp32_); + _tmp23_ = _g_object_ref0 (conditions); #line 229 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _sc_list = _tmp33_; + _sc_list = _tmp23_; #line 229 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp34_ = _sc_list; + _tmp24_ = _sc_list; #line 229 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp35_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp25_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 229 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp36_ = _tmp35_; + _tmp26_ = _tmp25_; #line 229 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _sc_size = _tmp36_; + _sc_size = _tmp26_; #line 229 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _sc_index = -1; #line 229 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" while (TRUE) { -#line 1530 "SavedSearchDBTable.c" - gint _tmp37_; - gint _tmp38_; - gint _tmp39_; +#line 1615 "SavedSearchDBTable.c" + gint _tmp27_; + gint _tmp28_; + gint _tmp29_; SearchCondition* sc = NULL; - GeeArrayList* _tmp40_; - gint _tmp41_; - gpointer _tmp42_; - SavedSearchRow* _tmp43_; - SavedSearchID _tmp44_; - SearchCondition* _tmp45_; + GeeArrayList* _tmp30_; + gint _tmp31_; + gpointer _tmp32_; + SavedSearchRow* _tmp33_; + SavedSearchID _tmp34_; + SearchCondition* _tmp35_; #line 229 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp37_ = _sc_index; + _tmp27_ = _sc_index; #line 229 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _sc_index = _tmp37_ + 1; + _sc_index = _tmp27_ + 1; #line 229 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp38_ = _sc_index; + _tmp28_ = _sc_index; #line 229 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp39_ = _sc_size; + _tmp29_ = _sc_size; #line 229 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - if (!(_tmp38_ < _tmp39_)) { + if (!(_tmp28_ < _tmp29_)) { #line 229 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" break; -#line 1553 "SavedSearchDBTable.c" +#line 1638 "SavedSearchDBTable.c" } #line 229 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp40_ = _sc_list; + _tmp30_ = _sc_list; #line 229 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp41_ = _sc_index; + _tmp31_ = _sc_index; #line 229 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp42_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp41_); + _tmp32_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp31_); #line 229 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - sc = (SearchCondition*) _tmp42_; + sc = (SearchCondition*) _tmp32_; #line 230 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp43_ = row; + _tmp33_ = row; #line 230 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp44_ = _tmp43_->search_id; + _tmp34_ = _tmp33_->search_id; #line 230 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp45_ = sc; + _tmp35_ = sc; #line 230 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - saved_search_db_table_add_condition (self, &_tmp44_, _tmp45_, &_inner_error_); + saved_search_db_table_add_condition (self, &_tmp34_, _tmp35_, &_inner_error_); #line 230 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 230 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" @@ -1583,7 +1668,7 @@ SavedSearchRow* saved_search_db_table_add (SavedSearchDBTable* self, const gchar _sqlite3_finalize0 (stmt); #line 230 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return NULL; -#line 1587 "SavedSearchDBTable.c" +#line 1672 "SavedSearchDBTable.c" } else { #line 230 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _search_condition_unref0 (sc); @@ -1599,16 +1684,16 @@ SavedSearchRow* saved_search_db_table_add (SavedSearchDBTable* self, const gchar g_clear_error (&_inner_error_); #line 230 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return NULL; -#line 1603 "SavedSearchDBTable.c" +#line 1688 "SavedSearchDBTable.c" } } #line 229 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _search_condition_unref0 (sc); -#line 1608 "SavedSearchDBTable.c" +#line 1693 "SavedSearchDBTable.c" } #line 229 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _g_object_unref0 (_sc_list); -#line 1612 "SavedSearchDBTable.c" +#line 1697 "SavedSearchDBTable.c" } #line 233 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" result = row; @@ -1616,19 +1701,25 @@ SavedSearchRow* saved_search_db_table_add (SavedSearchDBTable* self, const gchar _sqlite3_finalize0 (stmt); #line 233 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return result; -#line 1620 "SavedSearchDBTable.c" +#line 1705 "SavedSearchDBTable.c" } -static gpointer _search_condition_ref0 (gpointer self) { +static gpointer +_search_condition_ref0 (gpointer self) +{ #line 238 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return self ? search_condition_ref (self) : NULL; -#line 1627 "SavedSearchDBTable.c" +#line 1714 "SavedSearchDBTable.c" } -static void saved_search_db_table_add_condition (SavedSearchDBTable* self, SavedSearchID* id, SearchCondition* condition, GError** error) { - SearchCondition* _tmp0_; +static void +saved_search_db_table_add_condition (SavedSearchDBTable* self, + SavedSearchID* id, + SearchCondition* condition, + GError** error) +{ GError * _inner_error_ = NULL; #line 236 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" g_return_if_fail (IS_SAVED_SEARCH_DB_TABLE (self)); @@ -1637,161 +1728,141 @@ static void saved_search_db_table_add_condition (SavedSearchDBTable* self, Saved #line 236 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" g_return_if_fail (IS_SEARCH_CONDITION (condition)); #line 237 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp0_ = condition; -#line 237 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_SEARCH_CONDITION_TEXT)) { -#line 1644 "SavedSearchDBTable.c" + if (G_TYPE_CHECK_INSTANCE_TYPE (condition, TYPE_SEARCH_CONDITION_TEXT)) { +#line 1733 "SavedSearchDBTable.c" SearchConditionText* text = NULL; - SearchCondition* _tmp1_; - SearchConditionText* _tmp2_; + SearchConditionText* _tmp0_; sqlite3_stmt* stmt = NULL; gint res = 0; - sqlite3* _tmp3_; - sqlite3_stmt* _tmp4_ = NULL; - gint _tmp5_; - gint _tmp6_; - sqlite3_stmt* _tmp7_; - SavedSearchID _tmp8_; - gint64 _tmp9_; - gint _tmp10_; - gint _tmp11_; - sqlite3_stmt* _tmp12_; - SearchConditionText* _tmp13_; - SearchConditionSearchType _tmp14_; - SearchConditionSearchType _tmp15_; - gchar* _tmp16_; - GDestroyNotify _tmp17_; - gint _tmp18_; - gint _tmp19_; - sqlite3_stmt* _tmp20_; - SearchConditionText* _tmp21_; - SearchConditionTextContext _tmp22_; - SearchConditionTextContext _tmp23_; - gchar* _tmp24_; - GDestroyNotify _tmp25_; - gint _tmp26_; - gint _tmp27_; - sqlite3_stmt* _tmp28_; - SearchConditionText* _tmp29_; - const gchar* _tmp30_; - const gchar* _tmp31_; - gchar* _tmp32_; - GDestroyNotify _tmp33_; - gint _tmp34_; - gint _tmp35_; - sqlite3_stmt* _tmp36_; - gint _tmp37_; - gint _tmp38_; -#line 238 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp1_ = condition; + sqlite3* _tmp1_; + sqlite3_stmt* _tmp2_ = NULL; + gint _tmp3_; + gint _tmp4_; + sqlite3_stmt* _tmp5_; + SavedSearchID _tmp6_; + gint64 _tmp7_; + gint _tmp8_; + sqlite3_stmt* _tmp9_; + SearchConditionText* _tmp10_; + SearchConditionSearchType _tmp11_; + SearchConditionSearchType _tmp12_; + gchar* _tmp13_; + GDestroyNotify _tmp14_; + gint _tmp15_; + sqlite3_stmt* _tmp16_; + SearchConditionText* _tmp17_; + SearchConditionTextContext _tmp18_; + SearchConditionTextContext _tmp19_; + gchar* _tmp20_; + GDestroyNotify _tmp21_; + gint _tmp22_; + sqlite3_stmt* _tmp23_; + SearchConditionText* _tmp24_; + const gchar* _tmp25_; + const gchar* _tmp26_; + gchar* _tmp27_; + GDestroyNotify _tmp28_; + gint _tmp29_; + sqlite3_stmt* _tmp30_; + gint _tmp31_; #line 238 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp2_ = _search_condition_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, TYPE_SEARCH_CONDITION_TEXT) ? ((SearchConditionText*) _tmp1_) : NULL); + _tmp0_ = _search_condition_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (condition, TYPE_SEARCH_CONDITION_TEXT) ? ((SearchConditionText*) condition) : NULL); #line 238 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - text = _tmp2_; + text = _tmp0_; #line 240 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp3_ = database_table_db; + _tmp1_ = database_table_db; #line 240 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp5_ = sqlite3_prepare_v2 (_tmp3_, "INSERT INTO SavedSearchDBTable_Text (search_id, search_type, context, " "text) VALUES (?, ?, ?, ?)", -1, &_tmp4_, NULL); + _tmp3_ = sqlite3_prepare_v2 (_tmp1_, "INSERT INTO SavedSearchDBTable_Text (search_id, search_type, context, " "text) VALUES (?, ?, ?, ?)", -1, &_tmp2_, NULL); #line 240 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _sqlite3_finalize0 (stmt); #line 240 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - stmt = _tmp4_; + stmt = _tmp2_; #line 240 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp5_; + res = _tmp3_; #line 243 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp6_ = res; + _tmp4_ = res; #line 243 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _vala_assert (_tmp6_ == SQLITE_OK, "res == Sqlite.OK"); -#line 245 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp7_ = stmt; + _vala_assert (_tmp4_ == SQLITE_OK, "res == Sqlite.OK"); #line 245 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp8_ = *id; + _tmp5_ = stmt; #line 245 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp9_ = _tmp8_.id; + _tmp6_ = *id; #line 245 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp10_ = sqlite3_bind_int64 (_tmp7_, 1, _tmp9_); + _tmp7_ = _tmp6_.id; #line 245 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp10_; + res = sqlite3_bind_int64 (_tmp5_, 1, _tmp7_); #line 246 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp11_ = res; + _tmp8_ = res; #line 246 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _vala_assert (_tmp11_ == SQLITE_OK, "res == Sqlite.OK"); + _vala_assert (_tmp8_ == SQLITE_OK, "res == Sqlite.OK"); #line 248 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp12_ = stmt; + _tmp9_ = stmt; #line 248 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp13_ = text; + _tmp10_ = text; #line 248 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp14_ = search_condition_get_search_type (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_SEARCH_CONDITION, SearchCondition)); + _tmp11_ = search_condition_get_search_type (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_SEARCH_CONDITION, SearchCondition)); #line 248 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp15_ = _tmp14_; + _tmp12_ = _tmp11_; #line 248 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp16_ = search_condition_search_type_to_string (_tmp15_); + _tmp13_ = search_condition_search_type_to_string (_tmp12_); #line 248 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp17_ = g_free; + _tmp14_ = g_free; #line 248 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp18_ = sqlite3_bind_text (_tmp12_, 2, _tmp16_, -1, _tmp17_); -#line 248 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp18_; + res = sqlite3_bind_text (_tmp9_, 2, _tmp13_, -1, _tmp14_); #line 249 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp19_ = res; + _tmp15_ = res; #line 249 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _vala_assert (_tmp19_ == SQLITE_OK, "res == Sqlite.OK"); + _vala_assert (_tmp15_ == SQLITE_OK, "res == Sqlite.OK"); #line 251 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp20_ = stmt; + _tmp16_ = stmt; #line 251 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp21_ = text; + _tmp17_ = text; #line 251 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp22_ = search_condition_text_get_context (_tmp21_); + _tmp18_ = search_condition_text_get_context (_tmp17_); #line 251 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp23_ = _tmp22_; + _tmp19_ = _tmp18_; #line 251 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp24_ = search_condition_text_context_to_string (_tmp23_); + _tmp20_ = search_condition_text_context_to_string (_tmp19_); #line 251 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp25_ = g_free; + _tmp21_ = g_free; #line 251 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp26_ = sqlite3_bind_text (_tmp20_, 3, _tmp24_, -1, _tmp25_); -#line 251 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp26_; + res = sqlite3_bind_text (_tmp16_, 3, _tmp20_, -1, _tmp21_); #line 252 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp27_ = res; + _tmp22_ = res; #line 252 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _vala_assert (_tmp27_ == SQLITE_OK, "res == Sqlite.OK"); -#line 254 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp28_ = stmt; + _vala_assert (_tmp22_ == SQLITE_OK, "res == Sqlite.OK"); #line 254 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp29_ = text; + _tmp23_ = stmt; #line 254 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp30_ = search_condition_text_get_text (_tmp29_); + _tmp24_ = text; #line 254 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp31_ = _tmp30_; + _tmp25_ = search_condition_text_get_text (_tmp24_); #line 254 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp32_ = g_strdup (_tmp31_); + _tmp26_ = _tmp25_; #line 254 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp33_ = g_free; + _tmp27_ = g_strdup (_tmp26_); #line 254 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp34_ = sqlite3_bind_text (_tmp28_, 4, _tmp32_, -1, _tmp33_); + _tmp28_ = g_free; #line 254 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp34_; + res = sqlite3_bind_text (_tmp23_, 4, _tmp27_, -1, _tmp28_); #line 255 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp35_ = res; + _tmp29_ = res; #line 255 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _vala_assert (_tmp35_ == SQLITE_OK, "res == Sqlite.OK"); + _vala_assert (_tmp29_ == SQLITE_OK, "res == Sqlite.OK"); #line 257 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp36_ = stmt; + _tmp30_ = stmt; #line 257 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp37_ = sqlite3_step (_tmp36_); -#line 257 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp37_; + res = sqlite3_step (_tmp30_); #line 258 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp38_ = res; + _tmp31_ = res; #line 258 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - if (_tmp38_ != SQLITE_DONE) { -#line 1790 "SavedSearchDBTable.c" - gint _tmp39_; + if (_tmp31_ != SQLITE_DONE) { +#line 1861 "SavedSearchDBTable.c" + gint _tmp32_; #line 259 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp39_ = res; + _tmp32_ = res; #line 259 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - database_table_throw_error ("SavedSearchDBTable_Text.add", _tmp39_, &_inner_error_); + database_table_throw_error ("SavedSearchDBTable_Text.add", _tmp32_, &_inner_error_); #line 259 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 259 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" @@ -1804,7 +1875,7 @@ static void saved_search_db_table_add_condition (SavedSearchDBTable* self, Saved _search_condition_unref0 (text); #line 259 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return; -#line 1808 "SavedSearchDBTable.c" +#line 1879 "SavedSearchDBTable.c" } else { #line 259 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _sqlite3_finalize0 (stmt); @@ -1816,7 +1887,7 @@ static void saved_search_db_table_add_condition (SavedSearchDBTable* self, Saved g_clear_error (&_inner_error_); #line 259 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return; -#line 1820 "SavedSearchDBTable.c" +#line 1891 "SavedSearchDBTable.c" } } } @@ -1824,166 +1895,145 @@ static void saved_search_db_table_add_condition (SavedSearchDBTable* self, Saved _sqlite3_finalize0 (stmt); #line 237 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _search_condition_unref0 (text); -#line 1828 "SavedSearchDBTable.c" +#line 1899 "SavedSearchDBTable.c" } else { - SearchCondition* _tmp40_; #line 260 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp40_ = condition; -#line 260 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp40_, TYPE_SEARCH_CONDITION_MEDIA_TYPE)) { -#line 1835 "SavedSearchDBTable.c" + if (G_TYPE_CHECK_INSTANCE_TYPE (condition, TYPE_SEARCH_CONDITION_MEDIA_TYPE)) { +#line 1903 "SavedSearchDBTable.c" SearchConditionMediaType* media_type = NULL; - SearchCondition* _tmp41_; - SearchConditionMediaType* _tmp42_; + SearchConditionMediaType* _tmp33_; sqlite3_stmt* stmt = NULL; gint res = 0; - sqlite3* _tmp43_; - sqlite3_stmt* _tmp44_ = NULL; - gint _tmp45_; - gint _tmp46_; - sqlite3_stmt* _tmp47_; - SavedSearchID _tmp48_; - gint64 _tmp49_; - gint _tmp50_; - gint _tmp51_; - sqlite3_stmt* _tmp52_; - SearchConditionMediaType* _tmp53_; - SearchConditionSearchType _tmp54_; - SearchConditionSearchType _tmp55_; - gchar* _tmp56_; - GDestroyNotify _tmp57_; - gint _tmp58_; - gint _tmp59_; - sqlite3_stmt* _tmp60_; - SearchConditionMediaType* _tmp61_; - SearchConditionMediaTypeContext _tmp62_; - SearchConditionMediaTypeContext _tmp63_; - gchar* _tmp64_; - GDestroyNotify _tmp65_; - gint _tmp66_; - gint _tmp67_; - sqlite3_stmt* _tmp68_; - SearchConditionMediaType* _tmp69_; - SearchConditionMediaTypeMediaType _tmp70_; - SearchConditionMediaTypeMediaType _tmp71_; - gchar* _tmp72_; - GDestroyNotify _tmp73_; - gint _tmp74_; - gint _tmp75_; - sqlite3_stmt* _tmp76_; - gint _tmp77_; - gint _tmp78_; -#line 261 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp41_ = condition; + sqlite3* _tmp34_; + sqlite3_stmt* _tmp35_ = NULL; + gint _tmp36_; + gint _tmp37_; + sqlite3_stmt* _tmp38_; + SavedSearchID _tmp39_; + gint64 _tmp40_; + gint _tmp41_; + sqlite3_stmt* _tmp42_; + SearchConditionMediaType* _tmp43_; + SearchConditionSearchType _tmp44_; + SearchConditionSearchType _tmp45_; + gchar* _tmp46_; + GDestroyNotify _tmp47_; + gint _tmp48_; + sqlite3_stmt* _tmp49_; + SearchConditionMediaType* _tmp50_; + SearchConditionMediaTypeContext _tmp51_; + SearchConditionMediaTypeContext _tmp52_; + gchar* _tmp53_; + GDestroyNotify _tmp54_; + gint _tmp55_; + sqlite3_stmt* _tmp56_; + SearchConditionMediaType* _tmp57_; + SearchConditionMediaTypeMediaType _tmp58_; + SearchConditionMediaTypeMediaType _tmp59_; + gchar* _tmp60_; + GDestroyNotify _tmp61_; + gint _tmp62_; + sqlite3_stmt* _tmp63_; + gint _tmp64_; #line 261 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp42_ = _search_condition_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp41_, TYPE_SEARCH_CONDITION_MEDIA_TYPE) ? ((SearchConditionMediaType*) _tmp41_) : NULL); + _tmp33_ = _search_condition_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (condition, TYPE_SEARCH_CONDITION_MEDIA_TYPE) ? ((SearchConditionMediaType*) condition) : NULL); #line 261 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - media_type = _tmp42_; + media_type = _tmp33_; #line 263 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp43_ = database_table_db; + _tmp34_ = database_table_db; #line 263 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp45_ = sqlite3_prepare_v2 (_tmp43_, "INSERT INTO SavedSearchDBTable_MediaType (search_id, search_type, cont" \ -"ext, " "type) VALUES (?, ?, ?, ?)", -1, &_tmp44_, NULL); + _tmp36_ = sqlite3_prepare_v2 (_tmp34_, "INSERT INTO SavedSearchDBTable_MediaType (search_id, search_type, cont" \ +"ext, " "type) VALUES (?, ?, ?, ?)", -1, &_tmp35_, NULL); #line 263 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _sqlite3_finalize0 (stmt); #line 263 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - stmt = _tmp44_; + stmt = _tmp35_; #line 263 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp45_; + res = _tmp36_; #line 266 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp46_ = res; + _tmp37_ = res; #line 266 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _vala_assert (_tmp46_ == SQLITE_OK, "res == Sqlite.OK"); + _vala_assert (_tmp37_ == SQLITE_OK, "res == Sqlite.OK"); #line 268 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp47_ = stmt; + _tmp38_ = stmt; #line 268 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp48_ = *id; + _tmp39_ = *id; #line 268 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp49_ = _tmp48_.id; + _tmp40_ = _tmp39_.id; #line 268 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp50_ = sqlite3_bind_int64 (_tmp47_, 1, _tmp49_); -#line 268 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp50_; + res = sqlite3_bind_int64 (_tmp38_, 1, _tmp40_); #line 269 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp51_ = res; + _tmp41_ = res; #line 269 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _vala_assert (_tmp51_ == SQLITE_OK, "res == Sqlite.OK"); -#line 271 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp52_ = stmt; + _vala_assert (_tmp41_ == SQLITE_OK, "res == Sqlite.OK"); #line 271 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp53_ = media_type; + _tmp42_ = stmt; #line 271 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp54_ = search_condition_get_search_type (G_TYPE_CHECK_INSTANCE_CAST (_tmp53_, TYPE_SEARCH_CONDITION, SearchCondition)); + _tmp43_ = media_type; #line 271 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp55_ = _tmp54_; + _tmp44_ = search_condition_get_search_type (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, TYPE_SEARCH_CONDITION, SearchCondition)); #line 271 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp56_ = search_condition_search_type_to_string (_tmp55_); + _tmp45_ = _tmp44_; #line 271 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp57_ = g_free; + _tmp46_ = search_condition_search_type_to_string (_tmp45_); #line 271 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp58_ = sqlite3_bind_text (_tmp52_, 2, _tmp56_, -1, _tmp57_); + _tmp47_ = g_free; #line 271 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp58_; + res = sqlite3_bind_text (_tmp42_, 2, _tmp46_, -1, _tmp47_); #line 272 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp59_ = res; + _tmp48_ = res; #line 272 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _vala_assert (_tmp59_ == SQLITE_OK, "res == Sqlite.OK"); + _vala_assert (_tmp48_ == SQLITE_OK, "res == Sqlite.OK"); #line 274 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp60_ = stmt; -#line 274 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp61_ = media_type; + _tmp49_ = stmt; #line 274 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp62_ = search_condition_media_type_get_context (_tmp61_); + _tmp50_ = media_type; #line 274 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp63_ = _tmp62_; + _tmp51_ = search_condition_media_type_get_context (_tmp50_); #line 274 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp64_ = search_condition_media_type_context_to_string (_tmp63_); + _tmp52_ = _tmp51_; #line 274 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp65_ = g_free; + _tmp53_ = search_condition_media_type_context_to_string (_tmp52_); #line 274 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp66_ = sqlite3_bind_text (_tmp60_, 3, _tmp64_, -1, _tmp65_); + _tmp54_ = g_free; #line 274 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp66_; + res = sqlite3_bind_text (_tmp49_, 3, _tmp53_, -1, _tmp54_); #line 275 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp67_ = res; + _tmp55_ = res; #line 275 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _vala_assert (_tmp67_ == SQLITE_OK, "res == Sqlite.OK"); -#line 277 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp68_ = stmt; + _vala_assert (_tmp55_ == SQLITE_OK, "res == Sqlite.OK"); #line 277 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp69_ = media_type; + _tmp56_ = stmt; #line 277 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp70_ = search_condition_media_type_get_media_type (_tmp69_); + _tmp57_ = media_type; #line 277 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp71_ = _tmp70_; + _tmp58_ = search_condition_media_type_get_media_type (_tmp57_); #line 277 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp72_ = search_condition_media_type_media_type_to_string (_tmp71_); + _tmp59_ = _tmp58_; #line 277 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp73_ = g_free; + _tmp60_ = search_condition_media_type_media_type_to_string (_tmp59_); #line 277 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp74_ = sqlite3_bind_text (_tmp68_, 4, _tmp72_, -1, _tmp73_); + _tmp61_ = g_free; #line 277 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp74_; + res = sqlite3_bind_text (_tmp56_, 4, _tmp60_, -1, _tmp61_); #line 278 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp75_ = res; + _tmp62_ = res; #line 278 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _vala_assert (_tmp75_ == SQLITE_OK, "res == Sqlite.OK"); -#line 280 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp76_ = stmt; + _vala_assert (_tmp62_ == SQLITE_OK, "res == Sqlite.OK"); #line 280 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp77_ = sqlite3_step (_tmp76_); + _tmp63_ = stmt; #line 280 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp77_; + res = sqlite3_step (_tmp63_); #line 281 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp78_ = res; + _tmp64_ = res; #line 281 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - if (_tmp78_ != SQLITE_DONE) { -#line 1981 "SavedSearchDBTable.c" - gint _tmp79_; + if (_tmp64_ != SQLITE_DONE) { +#line 2031 "SavedSearchDBTable.c" + gint _tmp65_; #line 282 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp79_ = res; + _tmp65_ = res; #line 282 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - database_table_throw_error ("SavedSearchDBTable_MediaType.add", _tmp79_, &_inner_error_); + database_table_throw_error ("SavedSearchDBTable_MediaType.add", _tmp65_, &_inner_error_); #line 282 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 282 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" @@ -1996,7 +2046,7 @@ static void saved_search_db_table_add_condition (SavedSearchDBTable* self, Saved _search_condition_unref0 (media_type); #line 282 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return; -#line 1999 "SavedSearchDBTable.c" +#line 2049 "SavedSearchDBTable.c" } else { #line 282 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _sqlite3_finalize0 (stmt); @@ -2008,7 +2058,7 @@ static void saved_search_db_table_add_condition (SavedSearchDBTable* self, Saved g_clear_error (&_inner_error_); #line 282 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return; -#line 2011 "SavedSearchDBTable.c" +#line 2061 "SavedSearchDBTable.c" } } } @@ -2016,137 +2066,119 @@ static void saved_search_db_table_add_condition (SavedSearchDBTable* self, Saved _sqlite3_finalize0 (stmt); #line 260 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _search_condition_unref0 (media_type); -#line 2019 "SavedSearchDBTable.c" +#line 2069 "SavedSearchDBTable.c" } else { - SearchCondition* _tmp80_; -#line 283 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp80_ = condition; #line 283 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp80_, TYPE_SEARCH_CONDITION_FLAGGED)) { -#line 2026 "SavedSearchDBTable.c" + if (G_TYPE_CHECK_INSTANCE_TYPE (condition, TYPE_SEARCH_CONDITION_FLAGGED)) { +#line 2073 "SavedSearchDBTable.c" SearchConditionFlagged* flag_state = NULL; - SearchCondition* _tmp81_; - SearchConditionFlagged* _tmp82_; + SearchConditionFlagged* _tmp66_; sqlite3_stmt* stmt = NULL; gint res = 0; - sqlite3* _tmp83_; - sqlite3_stmt* _tmp84_ = NULL; - gint _tmp85_; - gint _tmp86_; - sqlite3_stmt* _tmp87_; - SavedSearchID _tmp88_; - gint64 _tmp89_; + sqlite3* _tmp67_; + sqlite3_stmt* _tmp68_ = NULL; + gint _tmp69_; + gint _tmp70_; + sqlite3_stmt* _tmp71_; + SavedSearchID _tmp72_; + gint64 _tmp73_; + gint _tmp74_; + sqlite3_stmt* _tmp75_; + SearchConditionFlagged* _tmp76_; + SearchConditionSearchType _tmp77_; + SearchConditionSearchType _tmp78_; + gchar* _tmp79_; + GDestroyNotify _tmp80_; + gint _tmp81_; + sqlite3_stmt* _tmp82_; + SearchConditionFlagged* _tmp83_; + SearchConditionFlaggedState _tmp84_; + SearchConditionFlaggedState _tmp85_; + gchar* _tmp86_; + GDestroyNotify _tmp87_; + gint _tmp88_; + sqlite3_stmt* _tmp89_; gint _tmp90_; - gint _tmp91_; - sqlite3_stmt* _tmp92_; - SearchConditionFlagged* _tmp93_; - SearchConditionSearchType _tmp94_; - SearchConditionSearchType _tmp95_; - gchar* _tmp96_; - GDestroyNotify _tmp97_; - gint _tmp98_; - gint _tmp99_; - sqlite3_stmt* _tmp100_; - SearchConditionFlagged* _tmp101_; - SearchConditionFlaggedState _tmp102_; - SearchConditionFlaggedState _tmp103_; - gchar* _tmp104_; - GDestroyNotify _tmp105_; - gint _tmp106_; - gint _tmp107_; - sqlite3_stmt* _tmp108_; - gint _tmp109_; - gint _tmp110_; -#line 284 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp81_ = condition; #line 284 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp82_ = _search_condition_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp81_, TYPE_SEARCH_CONDITION_FLAGGED) ? ((SearchConditionFlagged*) _tmp81_) : NULL); + _tmp66_ = _search_condition_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (condition, TYPE_SEARCH_CONDITION_FLAGGED) ? ((SearchConditionFlagged*) condition) : NULL); #line 284 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - flag_state = _tmp82_; + flag_state = _tmp66_; #line 286 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp83_ = database_table_db; + _tmp67_ = database_table_db; #line 286 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp85_ = sqlite3_prepare_v2 (_tmp83_, "INSERT INTO SavedSearchDBTable_Flagged (search_id, search_type, " "flag_state) VALUES (?, ?, ?)", -1, &_tmp84_, NULL); + _tmp69_ = sqlite3_prepare_v2 (_tmp67_, "INSERT INTO SavedSearchDBTable_Flagged (search_id, search_type, " "flag_state) VALUES (?, ?, ?)", -1, &_tmp68_, NULL); #line 286 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _sqlite3_finalize0 (stmt); #line 286 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - stmt = _tmp84_; + stmt = _tmp68_; #line 286 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp85_; + res = _tmp69_; #line 289 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp86_ = res; + _tmp70_ = res; #line 289 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _vala_assert (_tmp86_ == SQLITE_OK, "res == Sqlite.OK"); -#line 291 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp87_ = stmt; + _vala_assert (_tmp70_ == SQLITE_OK, "res == Sqlite.OK"); #line 291 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp88_ = *id; + _tmp71_ = stmt; #line 291 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp89_ = _tmp88_.id; + _tmp72_ = *id; #line 291 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp90_ = sqlite3_bind_int64 (_tmp87_, 1, _tmp89_); + _tmp73_ = _tmp72_.id; #line 291 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp90_; + res = sqlite3_bind_int64 (_tmp71_, 1, _tmp73_); #line 292 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp91_ = res; + _tmp74_ = res; #line 292 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _vala_assert (_tmp91_ == SQLITE_OK, "res == Sqlite.OK"); + _vala_assert (_tmp74_ == SQLITE_OK, "res == Sqlite.OK"); #line 294 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp92_ = stmt; + _tmp75_ = stmt; #line 294 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp93_ = flag_state; + _tmp76_ = flag_state; #line 294 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp94_ = search_condition_get_search_type (G_TYPE_CHECK_INSTANCE_CAST (_tmp93_, TYPE_SEARCH_CONDITION, SearchCondition)); + _tmp77_ = search_condition_get_search_type (G_TYPE_CHECK_INSTANCE_CAST (_tmp76_, TYPE_SEARCH_CONDITION, SearchCondition)); #line 294 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp95_ = _tmp94_; + _tmp78_ = _tmp77_; #line 294 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp96_ = search_condition_search_type_to_string (_tmp95_); + _tmp79_ = search_condition_search_type_to_string (_tmp78_); #line 294 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp97_ = g_free; + _tmp80_ = g_free; #line 294 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp98_ = sqlite3_bind_text (_tmp92_, 2, _tmp96_, -1, _tmp97_); -#line 294 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp98_; + res = sqlite3_bind_text (_tmp75_, 2, _tmp79_, -1, _tmp80_); #line 295 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp99_ = res; + _tmp81_ = res; #line 295 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _vala_assert (_tmp99_ == SQLITE_OK, "res == Sqlite.OK"); -#line 297 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp100_ = stmt; + _vala_assert (_tmp81_ == SQLITE_OK, "res == Sqlite.OK"); #line 297 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp101_ = flag_state; + _tmp82_ = stmt; #line 297 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp102_ = search_condition_flagged_get_state (_tmp101_); + _tmp83_ = flag_state; #line 297 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp103_ = _tmp102_; + _tmp84_ = search_condition_flagged_get_state (_tmp83_); #line 297 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp104_ = search_condition_flagged_state_to_string (_tmp103_); + _tmp85_ = _tmp84_; #line 297 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp105_ = g_free; + _tmp86_ = search_condition_flagged_state_to_string (_tmp85_); #line 297 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp106_ = sqlite3_bind_text (_tmp100_, 3, _tmp104_, -1, _tmp105_); + _tmp87_ = g_free; #line 297 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp106_; + res = sqlite3_bind_text (_tmp82_, 3, _tmp86_, -1, _tmp87_); #line 298 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp107_ = res; + _tmp88_ = res; #line 298 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _vala_assert (_tmp107_ == SQLITE_OK, "res == Sqlite.OK"); -#line 300 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp108_ = stmt; + _vala_assert (_tmp88_ == SQLITE_OK, "res == Sqlite.OK"); #line 300 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp109_ = sqlite3_step (_tmp108_); + _tmp89_ = stmt; #line 300 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp109_; + res = sqlite3_step (_tmp89_); #line 301 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp110_ = res; + _tmp90_ = res; #line 301 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - if (_tmp110_ != SQLITE_DONE) { -#line 2144 "SavedSearchDBTable.c" - gint _tmp111_; + if (_tmp90_ != SQLITE_DONE) { +#line 2176 "SavedSearchDBTable.c" + gint _tmp91_; #line 302 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp111_ = res; + _tmp91_ = res; #line 302 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - database_table_throw_error ("SavedSearchDBTable_Flagged.add", _tmp111_, &_inner_error_); + database_table_throw_error ("SavedSearchDBTable_Flagged.add", _tmp91_, &_inner_error_); #line 302 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 302 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" @@ -2159,7 +2191,7 @@ static void saved_search_db_table_add_condition (SavedSearchDBTable* self, Saved _search_condition_unref0 (flag_state); #line 302 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return; -#line 2162 "SavedSearchDBTable.c" +#line 2194 "SavedSearchDBTable.c" } else { #line 302 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _sqlite3_finalize0 (stmt); @@ -2171,7 +2203,7 @@ static void saved_search_db_table_add_condition (SavedSearchDBTable* self, Saved g_clear_error (&_inner_error_); #line 302 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return; -#line 2174 "SavedSearchDBTable.c" +#line 2206 "SavedSearchDBTable.c" } } } @@ -2179,166 +2211,145 @@ static void saved_search_db_table_add_condition (SavedSearchDBTable* self, Saved _sqlite3_finalize0 (stmt); #line 283 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _search_condition_unref0 (flag_state); -#line 2182 "SavedSearchDBTable.c" +#line 2214 "SavedSearchDBTable.c" } else { - SearchCondition* _tmp112_; #line 303 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp112_ = condition; -#line 303 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp112_, TYPE_SEARCH_CONDITION_MODIFIED)) { -#line 2189 "SavedSearchDBTable.c" + if (G_TYPE_CHECK_INSTANCE_TYPE (condition, TYPE_SEARCH_CONDITION_MODIFIED)) { +#line 2218 "SavedSearchDBTable.c" SearchConditionModified* modified_state = NULL; - SearchCondition* _tmp113_; - SearchConditionModified* _tmp114_; + SearchConditionModified* _tmp92_; sqlite3_stmt* stmt = NULL; gint res = 0; - sqlite3* _tmp115_; - sqlite3_stmt* _tmp116_ = NULL; - gint _tmp117_; - gint _tmp118_; - sqlite3_stmt* _tmp119_; - SavedSearchID _tmp120_; - gint64 _tmp121_; - gint _tmp122_; + sqlite3* _tmp93_; + sqlite3_stmt* _tmp94_ = NULL; + gint _tmp95_; + gint _tmp96_; + sqlite3_stmt* _tmp97_; + SavedSearchID _tmp98_; + gint64 _tmp99_; + gint _tmp100_; + sqlite3_stmt* _tmp101_; + SearchConditionModified* _tmp102_; + SearchConditionSearchType _tmp103_; + SearchConditionSearchType _tmp104_; + gchar* _tmp105_; + GDestroyNotify _tmp106_; + gint _tmp107_; + sqlite3_stmt* _tmp108_; + SearchConditionModified* _tmp109_; + SearchConditionModifiedContext _tmp110_; + SearchConditionModifiedContext _tmp111_; + gchar* _tmp112_; + GDestroyNotify _tmp113_; + gint _tmp114_; + sqlite3_stmt* _tmp115_; + SearchConditionModified* _tmp116_; + SearchConditionModifiedState _tmp117_; + SearchConditionModifiedState _tmp118_; + gchar* _tmp119_; + GDestroyNotify _tmp120_; + gint _tmp121_; + sqlite3_stmt* _tmp122_; gint _tmp123_; - sqlite3_stmt* _tmp124_; - SearchConditionModified* _tmp125_; - SearchConditionSearchType _tmp126_; - SearchConditionSearchType _tmp127_; - gchar* _tmp128_; - GDestroyNotify _tmp129_; - gint _tmp130_; - gint _tmp131_; - sqlite3_stmt* _tmp132_; - SearchConditionModified* _tmp133_; - SearchConditionModifiedContext _tmp134_; - SearchConditionModifiedContext _tmp135_; - gchar* _tmp136_; - GDestroyNotify _tmp137_; - gint _tmp138_; - gint _tmp139_; - sqlite3_stmt* _tmp140_; - SearchConditionModified* _tmp141_; - SearchConditionModifiedState _tmp142_; - SearchConditionModifiedState _tmp143_; - gchar* _tmp144_; - GDestroyNotify _tmp145_; - gint _tmp146_; - gint _tmp147_; - sqlite3_stmt* _tmp148_; - gint _tmp149_; - gint _tmp150_; -#line 304 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp113_ = condition; #line 304 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp114_ = _search_condition_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp113_, TYPE_SEARCH_CONDITION_MODIFIED) ? ((SearchConditionModified*) _tmp113_) : NULL); + _tmp92_ = _search_condition_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (condition, TYPE_SEARCH_CONDITION_MODIFIED) ? ((SearchConditionModified*) condition) : NULL); #line 304 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - modified_state = _tmp114_; + modified_state = _tmp92_; #line 306 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp115_ = database_table_db; + _tmp93_ = database_table_db; #line 306 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp117_ = sqlite3_prepare_v2 (_tmp115_, "INSERT INTO SavedSearchDBTable_Modified (search_id, search_type, conte" \ -"xt, " "modified_state) VALUES (?, ?, ?, ?)", -1, &_tmp116_, NULL); + _tmp95_ = sqlite3_prepare_v2 (_tmp93_, "INSERT INTO SavedSearchDBTable_Modified (search_id, search_type, conte" \ +"xt, " "modified_state) VALUES (?, ?, ?, ?)", -1, &_tmp94_, NULL); #line 306 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _sqlite3_finalize0 (stmt); #line 306 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - stmt = _tmp116_; + stmt = _tmp94_; #line 306 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp117_; + res = _tmp95_; #line 309 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp118_ = res; + _tmp96_ = res; #line 309 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _vala_assert (_tmp118_ == SQLITE_OK, "res == Sqlite.OK"); -#line 311 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp119_ = stmt; + _vala_assert (_tmp96_ == SQLITE_OK, "res == Sqlite.OK"); #line 311 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp120_ = *id; + _tmp97_ = stmt; #line 311 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp121_ = _tmp120_.id; + _tmp98_ = *id; #line 311 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp122_ = sqlite3_bind_int64 (_tmp119_, 1, _tmp121_); + _tmp99_ = _tmp98_.id; #line 311 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp122_; + res = sqlite3_bind_int64 (_tmp97_, 1, _tmp99_); #line 312 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp123_ = res; + _tmp100_ = res; #line 312 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _vala_assert (_tmp123_ == SQLITE_OK, "res == Sqlite.OK"); -#line 314 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp124_ = stmt; + _vala_assert (_tmp100_ == SQLITE_OK, "res == Sqlite.OK"); #line 314 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp125_ = modified_state; + _tmp101_ = stmt; #line 314 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp126_ = search_condition_get_search_type (G_TYPE_CHECK_INSTANCE_CAST (_tmp125_, TYPE_SEARCH_CONDITION, SearchCondition)); + _tmp102_ = modified_state; #line 314 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp127_ = _tmp126_; + _tmp103_ = search_condition_get_search_type (G_TYPE_CHECK_INSTANCE_CAST (_tmp102_, TYPE_SEARCH_CONDITION, SearchCondition)); #line 314 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp128_ = search_condition_search_type_to_string (_tmp127_); + _tmp104_ = _tmp103_; #line 314 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp129_ = g_free; + _tmp105_ = search_condition_search_type_to_string (_tmp104_); #line 314 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp130_ = sqlite3_bind_text (_tmp124_, 2, _tmp128_, -1, _tmp129_); + _tmp106_ = g_free; #line 314 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp130_; + res = sqlite3_bind_text (_tmp101_, 2, _tmp105_, -1, _tmp106_); #line 315 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp131_ = res; + _tmp107_ = res; #line 315 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _vala_assert (_tmp131_ == SQLITE_OK, "res == Sqlite.OK"); -#line 317 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp132_ = stmt; + _vala_assert (_tmp107_ == SQLITE_OK, "res == Sqlite.OK"); #line 317 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp133_ = modified_state; + _tmp108_ = stmt; #line 317 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp134_ = search_condition_modified_get_context (_tmp133_); + _tmp109_ = modified_state; #line 317 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp135_ = _tmp134_; + _tmp110_ = search_condition_modified_get_context (_tmp109_); #line 317 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp136_ = search_condition_modified_context_to_string (_tmp135_); + _tmp111_ = _tmp110_; #line 317 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp137_ = g_free; + _tmp112_ = search_condition_modified_context_to_string (_tmp111_); #line 317 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp138_ = sqlite3_bind_text (_tmp132_, 3, _tmp136_, -1, _tmp137_); + _tmp113_ = g_free; #line 317 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp138_; + res = sqlite3_bind_text (_tmp108_, 3, _tmp112_, -1, _tmp113_); #line 318 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp139_ = res; + _tmp114_ = res; #line 318 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _vala_assert (_tmp139_ == SQLITE_OK, "res == Sqlite.OK"); + _vala_assert (_tmp114_ == SQLITE_OK, "res == Sqlite.OK"); #line 320 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp140_ = stmt; + _tmp115_ = stmt; #line 320 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp141_ = modified_state; + _tmp116_ = modified_state; #line 320 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp142_ = search_condition_modified_get_state (_tmp141_); + _tmp117_ = search_condition_modified_get_state (_tmp116_); #line 320 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp143_ = _tmp142_; + _tmp118_ = _tmp117_; #line 320 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp144_ = search_condition_modified_state_to_string (_tmp143_); + _tmp119_ = search_condition_modified_state_to_string (_tmp118_); #line 320 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp145_ = g_free; + _tmp120_ = g_free; #line 320 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp146_ = sqlite3_bind_text (_tmp140_, 4, _tmp144_, -1, _tmp145_); -#line 320 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp146_; + res = sqlite3_bind_text (_tmp115_, 4, _tmp119_, -1, _tmp120_); #line 321 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp147_ = res; + _tmp121_ = res; #line 321 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _vala_assert (_tmp147_ == SQLITE_OK, "res == Sqlite.OK"); -#line 323 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp148_ = stmt; + _vala_assert (_tmp121_ == SQLITE_OK, "res == Sqlite.OK"); #line 323 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp149_ = sqlite3_step (_tmp148_); + _tmp122_ = stmt; #line 323 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp149_; + res = sqlite3_step (_tmp122_); #line 324 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp150_ = res; + _tmp123_ = res; #line 324 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - if (_tmp150_ != SQLITE_DONE) { -#line 2335 "SavedSearchDBTable.c" - gint _tmp151_; + if (_tmp123_ != SQLITE_DONE) { +#line 2346 "SavedSearchDBTable.c" + gint _tmp124_; #line 325 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp151_ = res; + _tmp124_ = res; #line 325 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - database_table_throw_error ("SavedSearchDBTable_Modified.add", _tmp151_, &_inner_error_); + database_table_throw_error ("SavedSearchDBTable_Modified.add", _tmp124_, &_inner_error_); #line 325 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 325 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" @@ -2351,7 +2362,7 @@ static void saved_search_db_table_add_condition (SavedSearchDBTable* self, Saved _search_condition_unref0 (modified_state); #line 325 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return; -#line 2353 "SavedSearchDBTable.c" +#line 2364 "SavedSearchDBTable.c" } else { #line 325 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _sqlite3_finalize0 (stmt); @@ -2363,7 +2374,7 @@ static void saved_search_db_table_add_condition (SavedSearchDBTable* self, Saved g_clear_error (&_inner_error_); #line 325 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return; -#line 2365 "SavedSearchDBTable.c" +#line 2376 "SavedSearchDBTable.c" } } } @@ -2371,163 +2382,139 @@ static void saved_search_db_table_add_condition (SavedSearchDBTable* self, Saved _sqlite3_finalize0 (stmt); #line 303 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _search_condition_unref0 (modified_state); -#line 2373 "SavedSearchDBTable.c" +#line 2384 "SavedSearchDBTable.c" } else { - SearchCondition* _tmp152_; #line 326 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp152_ = condition; -#line 326 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp152_, TYPE_SEARCH_CONDITION_RATING)) { -#line 2380 "SavedSearchDBTable.c" + if (G_TYPE_CHECK_INSTANCE_TYPE (condition, TYPE_SEARCH_CONDITION_RATING)) { +#line 2388 "SavedSearchDBTable.c" SearchConditionRating* rating = NULL; - SearchCondition* _tmp153_; - SearchConditionRating* _tmp154_; + SearchConditionRating* _tmp125_; sqlite3_stmt* stmt = NULL; gint res = 0; - sqlite3* _tmp155_; - sqlite3_stmt* _tmp156_ = NULL; - gint _tmp157_; - gint _tmp158_; - sqlite3_stmt* _tmp159_; - SavedSearchID _tmp160_; - gint64 _tmp161_; - gint _tmp162_; - gint _tmp163_; - sqlite3_stmt* _tmp164_; - SearchConditionRating* _tmp165_; - SearchConditionSearchType _tmp166_; - SearchConditionSearchType _tmp167_; - gchar* _tmp168_; - GDestroyNotify _tmp169_; - gint _tmp170_; - gint _tmp171_; - sqlite3_stmt* _tmp172_; - SearchConditionRating* _tmp173_; - Rating _tmp174_; - Rating _tmp175_; - gint _tmp176_; - gint _tmp177_; - gint _tmp178_; - sqlite3_stmt* _tmp179_; - SearchConditionRating* _tmp180_; - SearchConditionRatingContext _tmp181_; - SearchConditionRatingContext _tmp182_; - gchar* _tmp183_; - GDestroyNotify _tmp184_; - gint _tmp185_; - gint _tmp186_; - sqlite3_stmt* _tmp187_; - gint _tmp188_; - gint _tmp189_; -#line 327 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp153_ = condition; + sqlite3* _tmp126_; + sqlite3_stmt* _tmp127_ = NULL; + gint _tmp128_; + gint _tmp129_; + sqlite3_stmt* _tmp130_; + SavedSearchID _tmp131_; + gint64 _tmp132_; + gint _tmp133_; + sqlite3_stmt* _tmp134_; + SearchConditionRating* _tmp135_; + SearchConditionSearchType _tmp136_; + SearchConditionSearchType _tmp137_; + gchar* _tmp138_; + GDestroyNotify _tmp139_; + gint _tmp140_; + sqlite3_stmt* _tmp141_; + SearchConditionRating* _tmp142_; + Rating _tmp143_; + Rating _tmp144_; + gint _tmp145_; + sqlite3_stmt* _tmp146_; + SearchConditionRating* _tmp147_; + SearchConditionRatingContext _tmp148_; + SearchConditionRatingContext _tmp149_; + gchar* _tmp150_; + GDestroyNotify _tmp151_; + gint _tmp152_; + sqlite3_stmt* _tmp153_; + gint _tmp154_; #line 327 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp154_ = _search_condition_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp153_, TYPE_SEARCH_CONDITION_RATING) ? ((SearchConditionRating*) _tmp153_) : NULL); + _tmp125_ = _search_condition_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (condition, TYPE_SEARCH_CONDITION_RATING) ? ((SearchConditionRating*) condition) : NULL); #line 327 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - rating = _tmp154_; + rating = _tmp125_; #line 329 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp155_ = database_table_db; + _tmp126_ = database_table_db; #line 329 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp157_ = sqlite3_prepare_v2 (_tmp155_, "INSERT INTO SavedSearchDBTable_Rating (search_id, search_type, rating," \ -" " "context) VALUES (?, ?, ?, ?)", -1, &_tmp156_, NULL); + _tmp128_ = sqlite3_prepare_v2 (_tmp126_, "INSERT INTO SavedSearchDBTable_Rating (search_id, search_type, rating," \ +" " "context) VALUES (?, ?, ?, ?)", -1, &_tmp127_, NULL); #line 329 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _sqlite3_finalize0 (stmt); #line 329 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - stmt = _tmp156_; + stmt = _tmp127_; #line 329 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp157_; + res = _tmp128_; #line 332 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp158_ = res; + _tmp129_ = res; #line 332 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _vala_assert (_tmp158_ == SQLITE_OK, "res == Sqlite.OK"); -#line 334 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp159_ = stmt; + _vala_assert (_tmp129_ == SQLITE_OK, "res == Sqlite.OK"); #line 334 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp160_ = *id; + _tmp130_ = stmt; #line 334 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp161_ = _tmp160_.id; + _tmp131_ = *id; #line 334 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp162_ = sqlite3_bind_int64 (_tmp159_, 1, _tmp161_); + _tmp132_ = _tmp131_.id; #line 334 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp162_; + res = sqlite3_bind_int64 (_tmp130_, 1, _tmp132_); #line 335 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp163_ = res; + _tmp133_ = res; #line 335 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _vala_assert (_tmp163_ == SQLITE_OK, "res == Sqlite.OK"); + _vala_assert (_tmp133_ == SQLITE_OK, "res == Sqlite.OK"); #line 337 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp164_ = stmt; + _tmp134_ = stmt; #line 337 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp165_ = rating; + _tmp135_ = rating; #line 337 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp166_ = search_condition_get_search_type (G_TYPE_CHECK_INSTANCE_CAST (_tmp165_, TYPE_SEARCH_CONDITION, SearchCondition)); + _tmp136_ = search_condition_get_search_type (G_TYPE_CHECK_INSTANCE_CAST (_tmp135_, TYPE_SEARCH_CONDITION, SearchCondition)); #line 337 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp167_ = _tmp166_; + _tmp137_ = _tmp136_; #line 337 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp168_ = search_condition_search_type_to_string (_tmp167_); + _tmp138_ = search_condition_search_type_to_string (_tmp137_); #line 337 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp169_ = g_free; + _tmp139_ = g_free; #line 337 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp170_ = sqlite3_bind_text (_tmp164_, 2, _tmp168_, -1, _tmp169_); -#line 337 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp170_; + res = sqlite3_bind_text (_tmp134_, 2, _tmp138_, -1, _tmp139_); #line 338 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp171_ = res; + _tmp140_ = res; #line 338 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _vala_assert (_tmp171_ == SQLITE_OK, "res == Sqlite.OK"); -#line 340 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp172_ = stmt; -#line 340 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp173_ = rating; + _vala_assert (_tmp140_ == SQLITE_OK, "res == Sqlite.OK"); #line 340 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp174_ = search_condition_rating_get_rating (_tmp173_); + _tmp141_ = stmt; #line 340 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp175_ = _tmp174_; + _tmp142_ = rating; #line 340 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp176_ = rating_serialize (_tmp175_); + _tmp143_ = search_condition_rating_get_rating (_tmp142_); #line 340 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp177_ = sqlite3_bind_int (_tmp172_, 3, _tmp176_); + _tmp144_ = _tmp143_; #line 340 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp177_; + res = sqlite3_bind_int (_tmp141_, 3, rating_serialize (_tmp144_)); #line 341 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp178_ = res; + _tmp145_ = res; #line 341 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _vala_assert (_tmp178_ == SQLITE_OK, "res == Sqlite.OK"); + _vala_assert (_tmp145_ == SQLITE_OK, "res == Sqlite.OK"); #line 343 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp179_ = stmt; + _tmp146_ = stmt; #line 343 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp180_ = rating; + _tmp147_ = rating; #line 343 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp181_ = search_condition_rating_get_context (_tmp180_); + _tmp148_ = search_condition_rating_get_context (_tmp147_); #line 343 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp182_ = _tmp181_; + _tmp149_ = _tmp148_; #line 343 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp183_ = search_condition_rating_context_to_string (_tmp182_); + _tmp150_ = search_condition_rating_context_to_string (_tmp149_); #line 343 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp184_ = g_free; + _tmp151_ = g_free; #line 343 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp185_ = sqlite3_bind_text (_tmp179_, 4, _tmp183_, -1, _tmp184_); -#line 343 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp185_; + res = sqlite3_bind_text (_tmp146_, 4, _tmp150_, -1, _tmp151_); #line 344 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp186_ = res; + _tmp152_ = res; #line 344 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _vala_assert (_tmp186_ == SQLITE_OK, "res == Sqlite.OK"); -#line 346 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp187_ = stmt; + _vala_assert (_tmp152_ == SQLITE_OK, "res == Sqlite.OK"); #line 346 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp188_ = sqlite3_step (_tmp187_); + _tmp153_ = stmt; #line 346 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp188_; + res = sqlite3_step (_tmp153_); #line 347 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp189_ = res; + _tmp154_ = res; #line 347 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - if (_tmp189_ != SQLITE_DONE) { -#line 2523 "SavedSearchDBTable.c" - gint _tmp190_; + if (_tmp154_ != SQLITE_DONE) { +#line 2510 "SavedSearchDBTable.c" + gint _tmp155_; #line 348 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp190_ = res; + _tmp155_ = res; #line 348 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - database_table_throw_error ("SavedSearchDBTable_Rating.add", _tmp190_, &_inner_error_); + database_table_throw_error ("SavedSearchDBTable_Rating.add", _tmp155_, &_inner_error_); #line 348 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 348 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" @@ -2540,7 +2527,7 @@ static void saved_search_db_table_add_condition (SavedSearchDBTable* self, Saved _search_condition_unref0 (rating); #line 348 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return; -#line 2541 "SavedSearchDBTable.c" +#line 2528 "SavedSearchDBTable.c" } else { #line 348 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _sqlite3_finalize0 (stmt); @@ -2552,7 +2539,7 @@ static void saved_search_db_table_add_condition (SavedSearchDBTable* self, Saved g_clear_error (&_inner_error_); #line 348 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return; -#line 2553 "SavedSearchDBTable.c" +#line 2540 "SavedSearchDBTable.c" } } } @@ -2560,187 +2547,157 @@ static void saved_search_db_table_add_condition (SavedSearchDBTable* self, Saved _sqlite3_finalize0 (stmt); #line 326 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _search_condition_unref0 (rating); -#line 2561 "SavedSearchDBTable.c" +#line 2548 "SavedSearchDBTable.c" } else { - SearchCondition* _tmp191_; #line 349 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp191_ = condition; -#line 349 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp191_, TYPE_SEARCH_CONDITION_DATE)) { -#line 2568 "SavedSearchDBTable.c" + if (G_TYPE_CHECK_INSTANCE_TYPE (condition, TYPE_SEARCH_CONDITION_DATE)) { +#line 2552 "SavedSearchDBTable.c" SearchConditionDate* date = NULL; - SearchCondition* _tmp192_; - SearchConditionDate* _tmp193_; + SearchConditionDate* _tmp156_; sqlite3_stmt* stmt = NULL; gint res = 0; - sqlite3* _tmp194_; - sqlite3_stmt* _tmp195_ = NULL; - gint _tmp196_; - gint _tmp197_; - sqlite3_stmt* _tmp198_; - SavedSearchID _tmp199_; - gint64 _tmp200_; - gint _tmp201_; - gint _tmp202_; - sqlite3_stmt* _tmp203_; - SearchConditionDate* _tmp204_; - SearchConditionSearchType _tmp205_; - SearchConditionSearchType _tmp206_; - gchar* _tmp207_; - GDestroyNotify _tmp208_; - gint _tmp209_; - gint _tmp210_; - sqlite3_stmt* _tmp211_; - SearchConditionDate* _tmp212_; - SearchConditionDateContext _tmp213_; - SearchConditionDateContext _tmp214_; - gchar* _tmp215_; - GDestroyNotify _tmp216_; - gint _tmp217_; - gint _tmp218_; - sqlite3_stmt* _tmp219_; - SearchConditionDate* _tmp220_; - GDateTime* _tmp221_; - GDateTime* _tmp222_; - gint64 _tmp223_; - gint _tmp224_; - gint _tmp225_; - sqlite3_stmt* _tmp226_; - SearchConditionDate* _tmp227_; - GDateTime* _tmp228_; - GDateTime* _tmp229_; - gint64 _tmp230_; - gint _tmp231_; - gint _tmp232_; - sqlite3_stmt* _tmp233_; - gint _tmp234_; - gint _tmp235_; -#line 350 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp192_ = condition; + sqlite3* _tmp157_; + sqlite3_stmt* _tmp158_ = NULL; + gint _tmp159_; + gint _tmp160_; + sqlite3_stmt* _tmp161_; + SavedSearchID _tmp162_; + gint64 _tmp163_; + gint _tmp164_; + sqlite3_stmt* _tmp165_; + SearchConditionDate* _tmp166_; + SearchConditionSearchType _tmp167_; + SearchConditionSearchType _tmp168_; + gchar* _tmp169_; + GDestroyNotify _tmp170_; + gint _tmp171_; + sqlite3_stmt* _tmp172_; + SearchConditionDate* _tmp173_; + SearchConditionDateContext _tmp174_; + SearchConditionDateContext _tmp175_; + gchar* _tmp176_; + GDestroyNotify _tmp177_; + gint _tmp178_; + sqlite3_stmt* _tmp179_; + SearchConditionDate* _tmp180_; + GDateTime* _tmp181_; + GDateTime* _tmp182_; + gint _tmp183_; + sqlite3_stmt* _tmp184_; + SearchConditionDate* _tmp185_; + GDateTime* _tmp186_; + GDateTime* _tmp187_; + gint _tmp188_; + sqlite3_stmt* _tmp189_; + gint _tmp190_; #line 350 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp193_ = _search_condition_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp192_, TYPE_SEARCH_CONDITION_DATE) ? ((SearchConditionDate*) _tmp192_) : NULL); + _tmp156_ = _search_condition_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (condition, TYPE_SEARCH_CONDITION_DATE) ? ((SearchConditionDate*) condition) : NULL); #line 350 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - date = _tmp193_; + date = _tmp156_; #line 352 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp194_ = database_table_db; + _tmp157_ = database_table_db; #line 352 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp196_ = sqlite3_prepare_v2 (_tmp194_, "INSERT INTO SavedSearchDBTable_Date (search_id, search_type, " "context, date_one, date_two) VALUES (?, ?, ?, ?, ?)", -1, &_tmp195_, NULL); + _tmp159_ = sqlite3_prepare_v2 (_tmp157_, "INSERT INTO SavedSearchDBTable_Date (search_id, search_type, " "context, date_one, date_two) VALUES (?, ?, ?, ?, ?)", -1, &_tmp158_, NULL); #line 352 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _sqlite3_finalize0 (stmt); #line 352 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - stmt = _tmp195_; + stmt = _tmp158_; #line 352 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp196_; + res = _tmp159_; #line 355 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp197_ = res; + _tmp160_ = res; #line 355 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _vala_assert (_tmp197_ == SQLITE_OK, "res == Sqlite.OK"); + _vala_assert (_tmp160_ == SQLITE_OK, "res == Sqlite.OK"); #line 357 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp198_ = stmt; + _tmp161_ = stmt; #line 357 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp199_ = *id; + _tmp162_ = *id; #line 357 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp200_ = _tmp199_.id; + _tmp163_ = _tmp162_.id; #line 357 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp201_ = sqlite3_bind_int64 (_tmp198_, 1, _tmp200_); -#line 357 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp201_; + res = sqlite3_bind_int64 (_tmp161_, 1, _tmp163_); #line 358 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp202_ = res; + _tmp164_ = res; #line 358 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _vala_assert (_tmp202_ == SQLITE_OK, "res == Sqlite.OK"); -#line 360 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp203_ = stmt; + _vala_assert (_tmp164_ == SQLITE_OK, "res == Sqlite.OK"); #line 360 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp204_ = date; + _tmp165_ = stmt; #line 360 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp205_ = search_condition_get_search_type (G_TYPE_CHECK_INSTANCE_CAST (_tmp204_, TYPE_SEARCH_CONDITION, SearchCondition)); + _tmp166_ = date; #line 360 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp206_ = _tmp205_; + _tmp167_ = search_condition_get_search_type (G_TYPE_CHECK_INSTANCE_CAST (_tmp166_, TYPE_SEARCH_CONDITION, SearchCondition)); #line 360 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp207_ = search_condition_search_type_to_string (_tmp206_); + _tmp168_ = _tmp167_; #line 360 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp208_ = g_free; + _tmp169_ = search_condition_search_type_to_string (_tmp168_); #line 360 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp209_ = sqlite3_bind_text (_tmp203_, 2, _tmp207_, -1, _tmp208_); + _tmp170_ = g_free; #line 360 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp209_; + res = sqlite3_bind_text (_tmp165_, 2, _tmp169_, -1, _tmp170_); #line 361 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp210_ = res; + _tmp171_ = res; #line 361 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _vala_assert (_tmp210_ == SQLITE_OK, "res == Sqlite.OK"); -#line 363 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp211_ = stmt; + _vala_assert (_tmp171_ == SQLITE_OK, "res == Sqlite.OK"); #line 363 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp212_ = date; + _tmp172_ = stmt; #line 363 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp213_ = search_condition_date_get_context (_tmp212_); + _tmp173_ = date; #line 363 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp214_ = _tmp213_; + _tmp174_ = search_condition_date_get_context (_tmp173_); #line 363 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp215_ = search_condition_date_context_to_string (_tmp214_); + _tmp175_ = _tmp174_; #line 363 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp216_ = g_free; + _tmp176_ = search_condition_date_context_to_string (_tmp175_); #line 363 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp217_ = sqlite3_bind_text (_tmp211_, 3, _tmp215_, -1, _tmp216_); + _tmp177_ = g_free; #line 363 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp217_; + res = sqlite3_bind_text (_tmp172_, 3, _tmp176_, -1, _tmp177_); #line 364 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp218_ = res; + _tmp178_ = res; #line 364 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _vala_assert (_tmp218_ == SQLITE_OK, "res == Sqlite.OK"); + _vala_assert (_tmp178_ == SQLITE_OK, "res == Sqlite.OK"); #line 366 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp219_ = stmt; + _tmp179_ = stmt; #line 366 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp220_ = date; + _tmp180_ = date; #line 366 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp221_ = search_condition_date_get_date_one (_tmp220_); + _tmp181_ = search_condition_date_get_date_one (_tmp180_); #line 366 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp222_ = _tmp221_; + _tmp182_ = _tmp181_; #line 366 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp223_ = g_date_time_to_unix (_tmp222_); -#line 366 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp224_ = sqlite3_bind_int64 (_tmp219_, 4, _tmp223_); -#line 366 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp224_; + res = sqlite3_bind_int64 (_tmp179_, 4, g_date_time_to_unix (_tmp182_)); #line 367 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp225_ = res; + _tmp183_ = res; #line 367 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _vala_assert (_tmp225_ == SQLITE_OK, "res == Sqlite.OK"); -#line 369 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp226_ = stmt; + _vala_assert (_tmp183_ == SQLITE_OK, "res == Sqlite.OK"); #line 369 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp227_ = date; + _tmp184_ = stmt; #line 369 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp228_ = search_condition_date_get_date_two (_tmp227_); + _tmp185_ = date; #line 369 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp229_ = _tmp228_; + _tmp186_ = search_condition_date_get_date_two (_tmp185_); #line 369 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp230_ = g_date_time_to_unix (_tmp229_); + _tmp187_ = _tmp186_; #line 369 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp231_ = sqlite3_bind_int64 (_tmp226_, 5, _tmp230_); -#line 369 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp231_; + res = sqlite3_bind_int64 (_tmp184_, 5, g_date_time_to_unix (_tmp187_)); #line 370 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp232_ = res; + _tmp188_ = res; #line 370 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _vala_assert (_tmp232_ == SQLITE_OK, "res == Sqlite.OK"); -#line 372 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp233_ = stmt; + _vala_assert (_tmp188_ == SQLITE_OK, "res == Sqlite.OK"); #line 372 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp234_ = sqlite3_step (_tmp233_); + _tmp189_ = stmt; #line 372 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp234_; + res = sqlite3_step (_tmp189_); #line 373 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp235_ = res; + _tmp190_ = res; #line 373 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - if (_tmp235_ != SQLITE_DONE) { -#line 2736 "SavedSearchDBTable.c" - gint _tmp236_; + if (_tmp190_ != SQLITE_DONE) { +#line 2693 "SavedSearchDBTable.c" + gint _tmp191_; #line 374 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp236_ = res; + _tmp191_ = res; #line 374 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - database_table_throw_error ("SavedSearchDBTable_Date.add", _tmp236_, &_inner_error_); + database_table_throw_error ("SavedSearchDBTable_Date.add", _tmp191_, &_inner_error_); #line 374 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 374 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" @@ -2753,7 +2710,7 @@ static void saved_search_db_table_add_condition (SavedSearchDBTable* self, Saved _search_condition_unref0 (date); #line 374 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return; -#line 2754 "SavedSearchDBTable.c" +#line 2711 "SavedSearchDBTable.c" } else { #line 374 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _sqlite3_finalize0 (stmt); @@ -2765,7 +2722,7 @@ static void saved_search_db_table_add_condition (SavedSearchDBTable* self, Saved g_clear_error (&_inner_error_); #line 374 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return; -#line 2766 "SavedSearchDBTable.c" +#line 2723 "SavedSearchDBTable.c" } } } @@ -2773,11 +2730,11 @@ static void saved_search_db_table_add_condition (SavedSearchDBTable* self, Saved _sqlite3_finalize0 (stmt); #line 349 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _search_condition_unref0 (date); -#line 2774 "SavedSearchDBTable.c" +#line 2731 "SavedSearchDBTable.c" } else { #line 376 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" g_assert_not_reached (); -#line 2778 "SavedSearchDBTable.c" +#line 2735 "SavedSearchDBTable.c" } } } @@ -2787,7 +2744,11 @@ static void saved_search_db_table_add_condition (SavedSearchDBTable* self, Saved } -static void saved_search_db_table_remove_conditions_for_search_id (SavedSearchDBTable* self, SavedSearchID* search_id, GError** error) { +static void +saved_search_db_table_remove_conditions_for_search_id (SavedSearchDBTable* self, + SavedSearchID* search_id, + GError** error) +{ SavedSearchID _tmp0_; SavedSearchID _tmp1_; SavedSearchID _tmp2_; @@ -2811,7 +2772,7 @@ static void saved_search_db_table_remove_conditions_for_search_id (SavedSearchDB g_propagate_error (error, _inner_error_); #line 382 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return; -#line 2812 "SavedSearchDBTable.c" +#line 2773 "SavedSearchDBTable.c" } else { #line 382 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.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); @@ -2819,7 +2780,7 @@ static void saved_search_db_table_remove_conditions_for_search_id (SavedSearchDB g_clear_error (&_inner_error_); #line 382 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return; -#line 2820 "SavedSearchDBTable.c" +#line 2781 "SavedSearchDBTable.c" } } #line 383 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" @@ -2834,7 +2795,7 @@ static void saved_search_db_table_remove_conditions_for_search_id (SavedSearchDB g_propagate_error (error, _inner_error_); #line 383 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return; -#line 2835 "SavedSearchDBTable.c" +#line 2796 "SavedSearchDBTable.c" } else { #line 383 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.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); @@ -2842,7 +2803,7 @@ static void saved_search_db_table_remove_conditions_for_search_id (SavedSearchDB g_clear_error (&_inner_error_); #line 383 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return; -#line 2843 "SavedSearchDBTable.c" +#line 2804 "SavedSearchDBTable.c" } } #line 384 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" @@ -2857,7 +2818,7 @@ static void saved_search_db_table_remove_conditions_for_search_id (SavedSearchDB g_propagate_error (error, _inner_error_); #line 384 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return; -#line 2858 "SavedSearchDBTable.c" +#line 2819 "SavedSearchDBTable.c" } else { #line 384 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.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); @@ -2865,7 +2826,7 @@ static void saved_search_db_table_remove_conditions_for_search_id (SavedSearchDB g_clear_error (&_inner_error_); #line 384 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return; -#line 2866 "SavedSearchDBTable.c" +#line 2827 "SavedSearchDBTable.c" } } #line 385 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" @@ -2880,7 +2841,7 @@ static void saved_search_db_table_remove_conditions_for_search_id (SavedSearchDB g_propagate_error (error, _inner_error_); #line 385 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return; -#line 2881 "SavedSearchDBTable.c" +#line 2842 "SavedSearchDBTable.c" } else { #line 385 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.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); @@ -2888,7 +2849,7 @@ static void saved_search_db_table_remove_conditions_for_search_id (SavedSearchDB g_clear_error (&_inner_error_); #line 385 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return; -#line 2889 "SavedSearchDBTable.c" +#line 2850 "SavedSearchDBTable.c" } } #line 386 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" @@ -2903,7 +2864,7 @@ static void saved_search_db_table_remove_conditions_for_search_id (SavedSearchDB g_propagate_error (error, _inner_error_); #line 386 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return; -#line 2904 "SavedSearchDBTable.c" +#line 2865 "SavedSearchDBTable.c" } else { #line 386 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.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); @@ -2911,7 +2872,7 @@ static void saved_search_db_table_remove_conditions_for_search_id (SavedSearchDB g_clear_error (&_inner_error_); #line 386 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return; -#line 2912 "SavedSearchDBTable.c" +#line 2873 "SavedSearchDBTable.c" } } #line 387 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" @@ -2926,7 +2887,7 @@ static void saved_search_db_table_remove_conditions_for_search_id (SavedSearchDB g_propagate_error (error, _inner_error_); #line 387 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return; -#line 2927 "SavedSearchDBTable.c" +#line 2888 "SavedSearchDBTable.c" } else { #line 387 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.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); @@ -2934,31 +2895,33 @@ static void saved_search_db_table_remove_conditions_for_search_id (SavedSearchDB g_clear_error (&_inner_error_); #line 387 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return; -#line 2935 "SavedSearchDBTable.c" +#line 2896 "SavedSearchDBTable.c" } } } -static void saved_search_db_table_remove_conditions_for_table (SavedSearchDBTable* self, const gchar* table_name, SavedSearchID* search_id, GError** error) { +static void +saved_search_db_table_remove_conditions_for_table (SavedSearchDBTable* self, + const gchar* table_name, + SavedSearchID* search_id, + GError** error) +{ sqlite3_stmt* stmt = NULL; gint res = 0; sqlite3* _tmp0_; - const gchar* _tmp1_; + gchar* _tmp1_; gchar* _tmp2_; - gchar* _tmp3_; - sqlite3_stmt* _tmp4_ = NULL; + sqlite3_stmt* _tmp3_ = NULL; + gint _tmp4_; gint _tmp5_; gint _tmp6_; - gint _tmp7_; - sqlite3_stmt* _tmp8_; - SavedSearchID _tmp9_; - gint64 _tmp10_; - gint _tmp11_; + sqlite3_stmt* _tmp7_; + SavedSearchID _tmp8_; + gint64 _tmp9_; + gint _tmp10_; + sqlite3_stmt* _tmp11_; gint _tmp12_; - sqlite3_stmt* _tmp13_; - gint _tmp14_; - gint _tmp15_; GError * _inner_error_ = NULL; #line 390 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" g_return_if_fail (IS_SAVED_SEARCH_DB_TABLE (self)); @@ -2969,68 +2932,59 @@ static void saved_search_db_table_remove_conditions_for_table (SavedSearchDBTabl #line 393 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _tmp0_ = database_table_db; #line 393 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp1_ = table_name; -#line 393 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp2_ = g_strdup_printf ("DELETE FROM %s WHERE search_id=?", _tmp1_); + _tmp1_ = g_strdup_printf ("DELETE FROM %s WHERE search_id=?", table_name); #line 393 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp3_ = _tmp2_; + _tmp2_ = _tmp1_; #line 393 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp5_ = sqlite3_prepare_v2 (_tmp0_, _tmp3_, -1, &_tmp4_, NULL); + _tmp4_ = sqlite3_prepare_v2 (_tmp0_, _tmp2_, -1, &_tmp3_, NULL); #line 393 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _sqlite3_finalize0 (stmt); #line 393 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - stmt = _tmp4_; + stmt = _tmp3_; #line 393 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp6_ = _tmp5_; + _tmp5_ = _tmp4_; #line 393 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _g_free0 (_tmp3_); + _g_free0 (_tmp2_); #line 393 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp6_; + res = _tmp5_; #line 394 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp7_ = res; + _tmp6_ = res; #line 394 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _vala_assert (_tmp7_ == SQLITE_OK, "res == Sqlite.OK"); + _vala_assert (_tmp6_ == SQLITE_OK, "res == Sqlite.OK"); #line 396 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp8_ = stmt; -#line 396 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp9_ = *search_id; + _tmp7_ = stmt; #line 396 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp10_ = _tmp9_.id; + _tmp8_ = *search_id; #line 396 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp11_ = sqlite3_bind_int64 (_tmp8_, 1, _tmp10_); + _tmp9_ = _tmp8_.id; #line 396 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp11_; + res = sqlite3_bind_int64 (_tmp7_, 1, _tmp9_); #line 397 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp12_ = res; + _tmp10_ = res; #line 397 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _vala_assert (_tmp12_ == SQLITE_OK, "res == Sqlite.OK"); -#line 399 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp13_ = stmt; + _vala_assert (_tmp10_ == SQLITE_OK, "res == Sqlite.OK"); #line 399 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp14_ = sqlite3_step (_tmp13_); + _tmp11_ = stmt; #line 399 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp14_; + res = sqlite3_step (_tmp11_); #line 400 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp15_ = res; + _tmp12_ = res; #line 400 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - if (_tmp15_ != SQLITE_DONE) { -#line 3015 "SavedSearchDBTable.c" - const gchar* _tmp16_; - gchar* _tmp17_; - gchar* _tmp18_; - gint _tmp19_; -#line 401 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp16_ = table_name; + if (_tmp12_ != SQLITE_DONE) { +#line 2972 "SavedSearchDBTable.c" + gchar* _tmp13_; + gchar* _tmp14_; + gint _tmp15_; #line 401 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp17_ = g_strdup_printf ("%s.remove", _tmp16_); + _tmp13_ = g_strdup_printf ("%s.remove", table_name); #line 401 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp18_ = _tmp17_; + _tmp14_ = _tmp13_; #line 401 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp19_ = res; + _tmp15_ = res; #line 401 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - database_table_throw_error (_tmp18_, _tmp19_, &_inner_error_); + database_table_throw_error (_tmp14_, _tmp15_, &_inner_error_); #line 401 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _g_free0 (_tmp18_); + _g_free0 (_tmp14_); #line 401 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 401 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" @@ -3041,7 +2995,7 @@ static void saved_search_db_table_remove_conditions_for_table (SavedSearchDBTabl _sqlite3_finalize0 (stmt); #line 401 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return; -#line 3042 "SavedSearchDBTable.c" +#line 2996 "SavedSearchDBTable.c" } else { #line 401 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _sqlite3_finalize0 (stmt); @@ -3051,17 +3005,21 @@ static void saved_search_db_table_remove_conditions_for_table (SavedSearchDBTabl g_clear_error (&_inner_error_); #line 401 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return; -#line 3052 "SavedSearchDBTable.c" +#line 3006 "SavedSearchDBTable.c" } } } #line 390 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _sqlite3_finalize0 (stmt); -#line 3058 "SavedSearchDBTable.c" +#line 3012 "SavedSearchDBTable.c" } -static GeeList* saved_search_db_table_get_conditions_for_id (SavedSearchDBTable* self, SavedSearchID* search_id, GError** error) { +static GeeList* +saved_search_db_table_get_conditions_for_id (SavedSearchDBTable* self, + SavedSearchID* search_id, + GError** error) +{ GeeList* result = NULL; GeeList* list = NULL; GeeArrayList* _tmp0_; @@ -3075,52 +3033,46 @@ static GeeList* saved_search_db_table_get_conditions_for_id (SavedSearchDBTable* SavedSearchID _tmp6_; gint64 _tmp7_; gint _tmp8_; - gint _tmp9_; - sqlite3* _tmp27_; - sqlite3_stmt* _tmp28_ = NULL; - gint _tmp29_; + sqlite3* _tmp23_; + sqlite3_stmt* _tmp24_ = NULL; + gint _tmp25_; + gint _tmp26_; + sqlite3_stmt* _tmp27_; + SavedSearchID _tmp28_; + gint64 _tmp29_; gint _tmp30_; - sqlite3_stmt* _tmp31_; - SavedSearchID _tmp32_; - gint64 _tmp33_; - gint _tmp34_; - gint _tmp35_; - sqlite3* _tmp54_; - sqlite3_stmt* _tmp55_ = NULL; - gint _tmp56_; - gint _tmp57_; - sqlite3_stmt* _tmp58_; - SavedSearchID _tmp59_; - gint64 _tmp60_; - gint _tmp61_; - gint _tmp62_; - sqlite3* _tmp78_; - sqlite3_stmt* _tmp79_ = NULL; - gint _tmp80_; - gint _tmp81_; - sqlite3_stmt* _tmp82_; - SavedSearchID _tmp83_; - gint64 _tmp84_; - gint _tmp85_; - gint _tmp86_; - sqlite3* _tmp105_; - sqlite3_stmt* _tmp106_ = NULL; - gint _tmp107_; - gint _tmp108_; - sqlite3_stmt* _tmp109_; - SavedSearchID _tmp110_; - gint64 _tmp111_; - gint _tmp112_; - gint _tmp113_; - sqlite3* _tmp132_; - sqlite3_stmt* _tmp133_ = NULL; - gint _tmp134_; - gint _tmp135_; - sqlite3_stmt* _tmp136_; - SavedSearchID _tmp137_; - gint64 _tmp138_; - gint _tmp139_; - gint _tmp140_; + sqlite3* _tmp45_; + sqlite3_stmt* _tmp46_ = NULL; + gint _tmp47_; + gint _tmp48_; + sqlite3_stmt* _tmp49_; + SavedSearchID _tmp50_; + gint64 _tmp51_; + gint _tmp52_; + sqlite3* _tmp65_; + sqlite3_stmt* _tmp66_ = NULL; + gint _tmp67_; + gint _tmp68_; + sqlite3_stmt* _tmp69_; + SavedSearchID _tmp70_; + gint64 _tmp71_; + gint _tmp72_; + sqlite3* _tmp87_; + sqlite3_stmt* _tmp88_ = NULL; + gint _tmp89_; + gint _tmp90_; + sqlite3_stmt* _tmp91_; + SavedSearchID _tmp92_; + gint64 _tmp93_; + gint _tmp94_; + sqlite3* _tmp108_; + sqlite3_stmt* _tmp109_ = NULL; + gint _tmp110_; + gint _tmp111_; + sqlite3_stmt* _tmp112_; + SavedSearchID _tmp113_; + gint64 _tmp114_; + gint _tmp115_; GError * _inner_error_ = NULL; #line 405 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" g_return_val_if_fail (IS_SAVED_SEARCH_DB_TABLE (self), NULL); @@ -3151,67 +3103,60 @@ static GeeList* saved_search_db_table_get_conditions_for_id (SavedSearchDBTable* #line 417 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _tmp7_ = _tmp6_.id; #line 417 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp8_ = sqlite3_bind_int64 (_tmp5_, 1, _tmp7_); -#line 417 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp8_; + res = sqlite3_bind_int64 (_tmp5_, 1, _tmp7_); #line 418 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp9_ = res; + _tmp8_ = res; #line 418 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _vala_assert (_tmp9_ == SQLITE_OK, "res == Sqlite.OK"); -#line 3159 "SavedSearchDBTable.c" + _vala_assert (_tmp8_ == SQLITE_OK, "res == Sqlite.OK"); +#line 3109 "SavedSearchDBTable.c" { - gboolean _tmp10_ = FALSE; + gboolean _tmp9_ = FALSE; #line 420 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp10_ = TRUE; + _tmp9_ = TRUE; #line 420 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" while (TRUE) { -#line 3166 "SavedSearchDBTable.c" - sqlite3_stmt* _tmp11_; - gint _tmp12_; - gint _tmp13_; +#line 3116 "SavedSearchDBTable.c" + sqlite3_stmt* _tmp10_; + gint _tmp11_; SearchConditionText* condition = NULL; + sqlite3_stmt* _tmp14_; + const gchar* _tmp15_; sqlite3_stmt* _tmp16_; const gchar* _tmp17_; - SearchConditionSearchType _tmp18_; - sqlite3_stmt* _tmp19_; - const gchar* _tmp20_; - sqlite3_stmt* _tmp21_; - const gchar* _tmp22_; - SearchConditionTextContext _tmp23_; - SearchConditionText* _tmp24_; - GeeList* _tmp25_; - SearchConditionText* _tmp26_; + sqlite3_stmt* _tmp18_; + const gchar* _tmp19_; + SearchConditionText* _tmp20_; + GeeList* _tmp21_; + SearchConditionText* _tmp22_; #line 420 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - if (!_tmp10_) { -#line 3184 "SavedSearchDBTable.c" + if (!_tmp9_) { +#line 3131 "SavedSearchDBTable.c" } #line 420 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp10_ = FALSE; -#line 421 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp11_ = stmt; + _tmp9_ = FALSE; #line 421 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp12_ = sqlite3_step (_tmp11_); + _tmp10_ = stmt; #line 421 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp12_; + res = sqlite3_step (_tmp10_); #line 422 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp13_ = res; + _tmp11_ = res; #line 422 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - if (_tmp13_ == SQLITE_DONE) { + if (_tmp11_ == SQLITE_DONE) { #line 423 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" break; -#line 3200 "SavedSearchDBTable.c" +#line 3145 "SavedSearchDBTable.c" } else { - gint _tmp14_; + gint _tmp12_; #line 424 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp14_ = res; + _tmp12_ = res; #line 424 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - if (_tmp14_ != SQLITE_ROW) { -#line 3207 "SavedSearchDBTable.c" - gint _tmp15_; + if (_tmp12_ != SQLITE_ROW) { +#line 3152 "SavedSearchDBTable.c" + gint _tmp13_; #line 425 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp15_ = res; + _tmp13_ = res; #line 425 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - database_table_throw_error ("SavedSearchDBTable_Text.get_all_rows", _tmp15_, &_inner_error_); + database_table_throw_error ("SavedSearchDBTable_Text.get_all_rows", _tmp13_, &_inner_error_); #line 425 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 425 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" @@ -3224,7 +3169,7 @@ static GeeList* saved_search_db_table_get_conditions_for_id (SavedSearchDBTable* _g_object_unref0 (list); #line 425 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return NULL; -#line 3225 "SavedSearchDBTable.c" +#line 3170 "SavedSearchDBTable.c" } else { #line 425 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _sqlite3_finalize0 (stmt); @@ -3236,125 +3181,113 @@ static GeeList* saved_search_db_table_get_conditions_for_id (SavedSearchDBTable* g_clear_error (&_inner_error_); #line 425 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return NULL; -#line 3237 "SavedSearchDBTable.c" +#line 3182 "SavedSearchDBTable.c" } } } } #line 427 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp16_ = stmt; + _tmp14_ = stmt; #line 427 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp17_ = sqlite3_column_text (_tmp16_, 0); + _tmp15_ = sqlite3_column_text (_tmp14_, 0); #line 427 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp18_ = search_condition_search_type_from_string (_tmp17_); -#line 427 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp19_ = stmt; -#line 427 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp20_ = sqlite3_column_text (_tmp19_, 2); + _tmp16_ = stmt; #line 427 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp21_ = stmt; + _tmp17_ = sqlite3_column_text (_tmp16_, 2); #line 427 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp22_ = sqlite3_column_text (_tmp21_, 1); + _tmp18_ = stmt; #line 427 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp23_ = search_condition_text_context_from_string (_tmp22_); + _tmp19_ = sqlite3_column_text (_tmp18_, 1); #line 427 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp24_ = search_condition_text_new (_tmp18_, _tmp20_, _tmp23_); + _tmp20_ = search_condition_text_new (search_condition_search_type_from_string (_tmp15_), _tmp17_, search_condition_text_context_from_string (_tmp19_)); #line 427 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - condition = _tmp24_; + condition = _tmp20_; #line 432 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp25_ = list; + _tmp21_ = list; #line 432 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp26_ = condition; + _tmp22_ = condition; #line 432 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, TYPE_SEARCH_CONDITION, SearchCondition)); + gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, TYPE_SEARCH_CONDITION, SearchCondition)); #line 420 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _search_condition_unref0 (condition); -#line 3270 "SavedSearchDBTable.c" +#line 3211 "SavedSearchDBTable.c" } } #line 436 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp27_ = database_table_db; + _tmp23_ = database_table_db; #line 436 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp29_ = sqlite3_prepare_v2 (_tmp27_, "SELECT search_type, context, type FROM SavedSearchDBTable_MediaType " "WHERE search_id=?", -1, &_tmp28_, NULL); + _tmp25_ = sqlite3_prepare_v2 (_tmp23_, "SELECT search_type, context, type FROM SavedSearchDBTable_MediaType " "WHERE search_id=?", -1, &_tmp24_, NULL); #line 436 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _sqlite3_finalize0 (stmt); #line 436 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - stmt = _tmp28_; + stmt = _tmp24_; #line 436 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp29_; + res = _tmp25_; #line 439 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp30_ = res; + _tmp26_ = res; #line 439 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _vala_assert (_tmp30_ == SQLITE_OK, "res == Sqlite.OK"); -#line 441 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp31_ = stmt; + _vala_assert (_tmp26_ == SQLITE_OK, "res == Sqlite.OK"); #line 441 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp32_ = *search_id; + _tmp27_ = stmt; #line 441 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp33_ = _tmp32_.id; + _tmp28_ = *search_id; #line 441 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp34_ = sqlite3_bind_int64 (_tmp31_, 1, _tmp33_); + _tmp29_ = _tmp28_.id; #line 441 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp34_; + res = sqlite3_bind_int64 (_tmp27_, 1, _tmp29_); #line 442 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp35_ = res; + _tmp30_ = res; #line 442 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _vala_assert (_tmp35_ == SQLITE_OK, "res == Sqlite.OK"); -#line 3301 "SavedSearchDBTable.c" + _vala_assert (_tmp30_ == SQLITE_OK, "res == Sqlite.OK"); +#line 3240 "SavedSearchDBTable.c" { - gboolean _tmp36_ = FALSE; + gboolean _tmp31_ = FALSE; #line 444 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp36_ = TRUE; + _tmp31_ = TRUE; #line 444 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" while (TRUE) { -#line 3308 "SavedSearchDBTable.c" - sqlite3_stmt* _tmp37_; - gint _tmp38_; - gint _tmp39_; +#line 3247 "SavedSearchDBTable.c" + sqlite3_stmt* _tmp32_; + gint _tmp33_; SearchConditionMediaType* condition = NULL; - sqlite3_stmt* _tmp42_; - const gchar* _tmp43_; - SearchConditionSearchType _tmp44_; - sqlite3_stmt* _tmp45_; - const gchar* _tmp46_; - SearchConditionMediaTypeContext _tmp47_; - sqlite3_stmt* _tmp48_; - const gchar* _tmp49_; - SearchConditionMediaTypeMediaType _tmp50_; - SearchConditionMediaType* _tmp51_; - GeeList* _tmp52_; - SearchConditionMediaType* _tmp53_; + sqlite3_stmt* _tmp36_; + const gchar* _tmp37_; + sqlite3_stmt* _tmp38_; + const gchar* _tmp39_; + sqlite3_stmt* _tmp40_; + const gchar* _tmp41_; + SearchConditionMediaType* _tmp42_; + GeeList* _tmp43_; + SearchConditionMediaType* _tmp44_; #line 444 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - if (!_tmp36_) { -#line 3327 "SavedSearchDBTable.c" + if (!_tmp31_) { +#line 3262 "SavedSearchDBTable.c" } #line 444 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp36_ = FALSE; + _tmp31_ = FALSE; #line 445 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp37_ = stmt; + _tmp32_ = stmt; #line 445 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp38_ = sqlite3_step (_tmp37_); -#line 445 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp38_; + res = sqlite3_step (_tmp32_); #line 446 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp39_ = res; + _tmp33_ = res; #line 446 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - if (_tmp39_ == SQLITE_DONE) { + if (_tmp33_ == SQLITE_DONE) { #line 447 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" break; -#line 3343 "SavedSearchDBTable.c" +#line 3276 "SavedSearchDBTable.c" } else { - gint _tmp40_; + gint _tmp34_; #line 448 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp40_ = res; + _tmp34_ = res; #line 448 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - if (_tmp40_ != SQLITE_ROW) { -#line 3350 "SavedSearchDBTable.c" - gint _tmp41_; + if (_tmp34_ != SQLITE_ROW) { +#line 3283 "SavedSearchDBTable.c" + gint _tmp35_; #line 449 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp41_ = res; + _tmp35_ = res; #line 449 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - database_table_throw_error ("SavedSearchDBTable_MediaType.get_all_rows", _tmp41_, &_inner_error_); + database_table_throw_error ("SavedSearchDBTable_MediaType.get_all_rows", _tmp35_, &_inner_error_); #line 449 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 449 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" @@ -3367,7 +3300,7 @@ static GeeList* saved_search_db_table_get_conditions_for_id (SavedSearchDBTable* _g_object_unref0 (list); #line 449 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return NULL; -#line 3368 "SavedSearchDBTable.c" +#line 3301 "SavedSearchDBTable.c" } else { #line 449 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _sqlite3_finalize0 (stmt); @@ -3379,124 +3312,111 @@ static GeeList* saved_search_db_table_get_conditions_for_id (SavedSearchDBTable* g_clear_error (&_inner_error_); #line 449 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return NULL; -#line 3380 "SavedSearchDBTable.c" +#line 3313 "SavedSearchDBTable.c" } } } } #line 451 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp42_ = stmt; -#line 451 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp43_ = sqlite3_column_text (_tmp42_, 0); -#line 451 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp44_ = search_condition_search_type_from_string (_tmp43_); -#line 451 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp45_ = stmt; + _tmp36_ = stmt; #line 451 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp46_ = sqlite3_column_text (_tmp45_, 1); + _tmp37_ = sqlite3_column_text (_tmp36_, 0); #line 451 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp47_ = search_condition_media_type_context_from_string (_tmp46_); + _tmp38_ = stmt; #line 451 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp48_ = stmt; + _tmp39_ = sqlite3_column_text (_tmp38_, 1); #line 451 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp49_ = sqlite3_column_text (_tmp48_, 2); + _tmp40_ = stmt; #line 451 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp50_ = search_condition_media_type_media_type_from_string (_tmp49_); + _tmp41_ = sqlite3_column_text (_tmp40_, 2); #line 451 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp51_ = search_condition_media_type_new (_tmp44_, _tmp47_, _tmp50_); + _tmp42_ = search_condition_media_type_new (search_condition_search_type_from_string (_tmp37_), search_condition_media_type_context_from_string (_tmp39_), search_condition_media_type_media_type_from_string (_tmp41_)); #line 451 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - condition = _tmp51_; + condition = _tmp42_; #line 456 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp52_ = list; + _tmp43_ = list; #line 456 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp53_ = condition; + _tmp44_ = condition; #line 456 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp52_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp53_, TYPE_SEARCH_CONDITION, SearchCondition)); + gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, TYPE_SEARCH_CONDITION, SearchCondition)); #line 444 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _search_condition_unref0 (condition); -#line 3415 "SavedSearchDBTable.c" +#line 3342 "SavedSearchDBTable.c" } } #line 460 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp54_ = database_table_db; + _tmp45_ = database_table_db; #line 460 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp56_ = sqlite3_prepare_v2 (_tmp54_, "SELECT search_type, flag_state FROM SavedSearchDBTable_Flagged " "WHERE search_id=?", -1, &_tmp55_, NULL); + _tmp47_ = sqlite3_prepare_v2 (_tmp45_, "SELECT search_type, flag_state FROM SavedSearchDBTable_Flagged " "WHERE search_id=?", -1, &_tmp46_, NULL); #line 460 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _sqlite3_finalize0 (stmt); #line 460 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - stmt = _tmp55_; + stmt = _tmp46_; #line 460 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp56_; + res = _tmp47_; #line 463 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp57_ = res; + _tmp48_ = res; #line 463 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _vala_assert (_tmp57_ == SQLITE_OK, "res == Sqlite.OK"); + _vala_assert (_tmp48_ == SQLITE_OK, "res == Sqlite.OK"); #line 465 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp58_ = stmt; + _tmp49_ = stmt; #line 465 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp59_ = *search_id; + _tmp50_ = *search_id; #line 465 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp60_ = _tmp59_.id; + _tmp51_ = _tmp50_.id; #line 465 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp61_ = sqlite3_bind_int64 (_tmp58_, 1, _tmp60_); -#line 465 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp61_; + res = sqlite3_bind_int64 (_tmp49_, 1, _tmp51_); #line 466 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp62_ = res; + _tmp52_ = res; #line 466 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _vala_assert (_tmp62_ == SQLITE_OK, "res == Sqlite.OK"); -#line 3446 "SavedSearchDBTable.c" + _vala_assert (_tmp52_ == SQLITE_OK, "res == Sqlite.OK"); +#line 3371 "SavedSearchDBTable.c" { - gboolean _tmp63_ = FALSE; + gboolean _tmp53_ = FALSE; #line 468 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp63_ = TRUE; + _tmp53_ = TRUE; #line 468 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" while (TRUE) { -#line 3453 "SavedSearchDBTable.c" - sqlite3_stmt* _tmp64_; - gint _tmp65_; - gint _tmp66_; +#line 3378 "SavedSearchDBTable.c" + sqlite3_stmt* _tmp54_; + gint _tmp55_; SearchConditionFlagged* condition = NULL; - sqlite3_stmt* _tmp69_; - const gchar* _tmp70_; - SearchConditionSearchType _tmp71_; - sqlite3_stmt* _tmp72_; - const gchar* _tmp73_; - SearchConditionFlaggedState _tmp74_; - SearchConditionFlagged* _tmp75_; - GeeList* _tmp76_; - SearchConditionFlagged* _tmp77_; + sqlite3_stmt* _tmp58_; + const gchar* _tmp59_; + sqlite3_stmt* _tmp60_; + const gchar* _tmp61_; + SearchConditionFlagged* _tmp62_; + GeeList* _tmp63_; + SearchConditionFlagged* _tmp64_; #line 468 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - if (!_tmp63_) { -#line 3469 "SavedSearchDBTable.c" + if (!_tmp53_) { +#line 3391 "SavedSearchDBTable.c" } #line 468 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp63_ = FALSE; -#line 469 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp64_ = stmt; + _tmp53_ = FALSE; #line 469 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp65_ = sqlite3_step (_tmp64_); + _tmp54_ = stmt; #line 469 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp65_; + res = sqlite3_step (_tmp54_); #line 470 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp66_ = res; + _tmp55_ = res; #line 470 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - if (_tmp66_ == SQLITE_DONE) { + if (_tmp55_ == SQLITE_DONE) { #line 471 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" break; -#line 3485 "SavedSearchDBTable.c" +#line 3405 "SavedSearchDBTable.c" } else { - gint _tmp67_; + gint _tmp56_; #line 472 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp67_ = res; + _tmp56_ = res; #line 472 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - if (_tmp67_ != SQLITE_ROW) { -#line 3492 "SavedSearchDBTable.c" - gint _tmp68_; + if (_tmp56_ != SQLITE_ROW) { +#line 3412 "SavedSearchDBTable.c" + gint _tmp57_; #line 473 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp68_ = res; + _tmp57_ = res; #line 473 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - database_table_throw_error ("SavedSearchDBTable_Flagged.get_all_rows", _tmp68_, &_inner_error_); + database_table_throw_error ("SavedSearchDBTable_Flagged.get_all_rows", _tmp57_, &_inner_error_); #line 473 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 473 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" @@ -3509,7 +3429,7 @@ static GeeList* saved_search_db_table_get_conditions_for_id (SavedSearchDBTable* _g_object_unref0 (list); #line 473 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return NULL; -#line 3510 "SavedSearchDBTable.c" +#line 3430 "SavedSearchDBTable.c" } else { #line 473 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _sqlite3_finalize0 (stmt); @@ -3521,122 +3441,110 @@ static GeeList* saved_search_db_table_get_conditions_for_id (SavedSearchDBTable* g_clear_error (&_inner_error_); #line 473 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return NULL; -#line 3522 "SavedSearchDBTable.c" +#line 3442 "SavedSearchDBTable.c" } } } } #line 475 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp69_ = stmt; + _tmp58_ = stmt; #line 475 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp70_ = sqlite3_column_text (_tmp69_, 0); + _tmp59_ = sqlite3_column_text (_tmp58_, 0); #line 475 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp71_ = search_condition_search_type_from_string (_tmp70_); -#line 475 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp72_ = stmt; -#line 475 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp73_ = sqlite3_column_text (_tmp72_, 1); + _tmp60_ = stmt; #line 475 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp74_ = search_condition_flagged_state_from_string (_tmp73_); + _tmp61_ = sqlite3_column_text (_tmp60_, 1); #line 475 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp75_ = search_condition_flagged_new (_tmp71_, _tmp74_); + _tmp62_ = search_condition_flagged_new (search_condition_search_type_from_string (_tmp59_), search_condition_flagged_state_from_string (_tmp61_)); #line 475 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - condition = _tmp75_; + condition = _tmp62_; #line 479 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp76_ = list; + _tmp63_ = list; #line 479 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp77_ = condition; + _tmp64_ = condition; #line 479 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp76_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp77_, TYPE_SEARCH_CONDITION, SearchCondition)); + gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp63_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp64_, TYPE_SEARCH_CONDITION, SearchCondition)); #line 468 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _search_condition_unref0 (condition); -#line 3551 "SavedSearchDBTable.c" +#line 3467 "SavedSearchDBTable.c" } } #line 483 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp78_ = database_table_db; + _tmp65_ = database_table_db; #line 483 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp80_ = sqlite3_prepare_v2 (_tmp78_, "SELECT search_type, context, modified_state FROM SavedSearchDBTable_Mo" \ -"dified " "WHERE search_id=?", -1, &_tmp79_, NULL); + _tmp67_ = sqlite3_prepare_v2 (_tmp65_, "SELECT search_type, context, modified_state FROM SavedSearchDBTable_Mo" \ +"dified " "WHERE search_id=?", -1, &_tmp66_, NULL); #line 483 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _sqlite3_finalize0 (stmt); #line 483 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - stmt = _tmp79_; + stmt = _tmp66_; #line 483 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp80_; + res = _tmp67_; #line 486 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp81_ = res; + _tmp68_ = res; #line 486 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _vala_assert (_tmp81_ == SQLITE_OK, "res == Sqlite.OK"); + _vala_assert (_tmp68_ == SQLITE_OK, "res == Sqlite.OK"); #line 488 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp82_ = stmt; + _tmp69_ = stmt; #line 488 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp83_ = *search_id; + _tmp70_ = *search_id; #line 488 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp84_ = _tmp83_.id; + _tmp71_ = _tmp70_.id; #line 488 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp85_ = sqlite3_bind_int64 (_tmp82_, 1, _tmp84_); -#line 488 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp85_; + res = sqlite3_bind_int64 (_tmp69_, 1, _tmp71_); #line 489 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp86_ = res; + _tmp72_ = res; #line 489 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _vala_assert (_tmp86_ == SQLITE_OK, "res == Sqlite.OK"); -#line 3582 "SavedSearchDBTable.c" + _vala_assert (_tmp72_ == SQLITE_OK, "res == Sqlite.OK"); +#line 3496 "SavedSearchDBTable.c" { - gboolean _tmp87_ = FALSE; + gboolean _tmp73_ = FALSE; #line 491 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp87_ = TRUE; + _tmp73_ = TRUE; #line 491 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" while (TRUE) { -#line 3589 "SavedSearchDBTable.c" - sqlite3_stmt* _tmp88_; - gint _tmp89_; - gint _tmp90_; +#line 3503 "SavedSearchDBTable.c" + sqlite3_stmt* _tmp74_; + gint _tmp75_; SearchConditionModified* condition = NULL; - sqlite3_stmt* _tmp93_; - const gchar* _tmp94_; - SearchConditionSearchType _tmp95_; - sqlite3_stmt* _tmp96_; - const gchar* _tmp97_; - SearchConditionModifiedContext _tmp98_; - sqlite3_stmt* _tmp99_; - const gchar* _tmp100_; - SearchConditionModifiedState _tmp101_; - SearchConditionModified* _tmp102_; - GeeList* _tmp103_; - SearchConditionModified* _tmp104_; + sqlite3_stmt* _tmp78_; + const gchar* _tmp79_; + sqlite3_stmt* _tmp80_; + const gchar* _tmp81_; + sqlite3_stmt* _tmp82_; + const gchar* _tmp83_; + SearchConditionModified* _tmp84_; + GeeList* _tmp85_; + SearchConditionModified* _tmp86_; #line 491 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - if (!_tmp87_) { -#line 3608 "SavedSearchDBTable.c" + if (!_tmp73_) { +#line 3518 "SavedSearchDBTable.c" } #line 491 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp87_ = FALSE; + _tmp73_ = FALSE; #line 492 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp88_ = stmt; + _tmp74_ = stmt; #line 492 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp89_ = sqlite3_step (_tmp88_); -#line 492 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp89_; + res = sqlite3_step (_tmp74_); #line 493 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp90_ = res; + _tmp75_ = res; #line 493 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - if (_tmp90_ == SQLITE_DONE) { + if (_tmp75_ == SQLITE_DONE) { #line 494 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" break; -#line 3624 "SavedSearchDBTable.c" +#line 3532 "SavedSearchDBTable.c" } else { - gint _tmp91_; + gint _tmp76_; #line 495 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp91_ = res; + _tmp76_ = res; #line 495 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - if (_tmp91_ != SQLITE_ROW) { -#line 3631 "SavedSearchDBTable.c" - gint _tmp92_; + if (_tmp76_ != SQLITE_ROW) { +#line 3539 "SavedSearchDBTable.c" + gint _tmp77_; #line 496 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp92_ = res; + _tmp77_ = res; #line 496 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - database_table_throw_error ("SavedSearchDBTable_Modified.get_all_rows", _tmp92_, &_inner_error_); + database_table_throw_error ("SavedSearchDBTable_Modified.get_all_rows", _tmp77_, &_inner_error_); #line 496 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 496 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" @@ -3649,7 +3557,7 @@ static GeeList* saved_search_db_table_get_conditions_for_id (SavedSearchDBTable* _g_object_unref0 (list); #line 496 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return NULL; -#line 3649 "SavedSearchDBTable.c" +#line 3557 "SavedSearchDBTable.c" } else { #line 496 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _sqlite3_finalize0 (stmt); @@ -3661,127 +3569,112 @@ static GeeList* saved_search_db_table_get_conditions_for_id (SavedSearchDBTable* g_clear_error (&_inner_error_); #line 496 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return NULL; -#line 3661 "SavedSearchDBTable.c" +#line 3569 "SavedSearchDBTable.c" } } } } #line 498 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp93_ = stmt; -#line 498 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp94_ = sqlite3_column_text (_tmp93_, 0); + _tmp78_ = stmt; #line 498 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp95_ = search_condition_search_type_from_string (_tmp94_); + _tmp79_ = sqlite3_column_text (_tmp78_, 0); #line 498 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp96_ = stmt; -#line 498 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp97_ = sqlite3_column_text (_tmp96_, 1); -#line 498 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp98_ = search_condition_modified_context_from_string (_tmp97_); + _tmp80_ = stmt; #line 498 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp99_ = stmt; + _tmp81_ = sqlite3_column_text (_tmp80_, 1); #line 498 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp100_ = sqlite3_column_text (_tmp99_, 2); + _tmp82_ = stmt; #line 498 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp101_ = search_condition_modified_state_from_string (_tmp100_); + _tmp83_ = sqlite3_column_text (_tmp82_, 2); #line 498 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp102_ = search_condition_modified_new (_tmp95_, _tmp98_, _tmp101_); + _tmp84_ = search_condition_modified_new (search_condition_search_type_from_string (_tmp79_), search_condition_modified_context_from_string (_tmp81_), search_condition_modified_state_from_string (_tmp83_)); #line 498 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - condition = _tmp102_; + condition = _tmp84_; #line 503 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp103_ = list; + _tmp85_ = list; #line 503 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp104_ = condition; + _tmp86_ = condition; #line 503 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp103_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp104_, TYPE_SEARCH_CONDITION, SearchCondition)); + gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp85_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp86_, TYPE_SEARCH_CONDITION, SearchCondition)); #line 491 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _search_condition_unref0 (condition); -#line 3696 "SavedSearchDBTable.c" +#line 3598 "SavedSearchDBTable.c" } } #line 507 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp105_ = database_table_db; + _tmp87_ = database_table_db; #line 507 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp107_ = sqlite3_prepare_v2 (_tmp105_, "SELECT search_type, rating, context FROM SavedSearchDBTable_Rating " "WHERE search_id=?", -1, &_tmp106_, NULL); + _tmp89_ = sqlite3_prepare_v2 (_tmp87_, "SELECT search_type, rating, context FROM SavedSearchDBTable_Rating " "WHERE search_id=?", -1, &_tmp88_, NULL); #line 507 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _sqlite3_finalize0 (stmt); #line 507 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - stmt = _tmp106_; + stmt = _tmp88_; #line 507 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp107_; + res = _tmp89_; #line 510 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp108_ = res; + _tmp90_ = res; #line 510 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _vala_assert (_tmp108_ == SQLITE_OK, "res == Sqlite.OK"); + _vala_assert (_tmp90_ == SQLITE_OK, "res == Sqlite.OK"); #line 512 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp109_ = stmt; + _tmp91_ = stmt; #line 512 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp110_ = *search_id; + _tmp92_ = *search_id; #line 512 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp111_ = _tmp110_.id; + _tmp93_ = _tmp92_.id; #line 512 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp112_ = sqlite3_bind_int64 (_tmp109_, 1, _tmp111_); -#line 512 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp112_; + res = sqlite3_bind_int64 (_tmp91_, 1, _tmp93_); #line 513 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp113_ = res; + _tmp94_ = res; #line 513 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _vala_assert (_tmp113_ == SQLITE_OK, "res == Sqlite.OK"); -#line 3727 "SavedSearchDBTable.c" + _vala_assert (_tmp94_ == SQLITE_OK, "res == Sqlite.OK"); +#line 3627 "SavedSearchDBTable.c" { - gboolean _tmp114_ = FALSE; + gboolean _tmp95_ = FALSE; #line 515 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp114_ = TRUE; + _tmp95_ = TRUE; #line 515 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" while (TRUE) { -#line 3734 "SavedSearchDBTable.c" - sqlite3_stmt* _tmp115_; - gint _tmp116_; - gint _tmp117_; +#line 3634 "SavedSearchDBTable.c" + sqlite3_stmt* _tmp96_; + gint _tmp97_; SearchConditionRating* condition = NULL; - sqlite3_stmt* _tmp120_; - const gchar* _tmp121_; - SearchConditionSearchType _tmp122_; - sqlite3_stmt* _tmp123_; - gint _tmp124_; - Rating _tmp125_; - sqlite3_stmt* _tmp126_; - const gchar* _tmp127_; - SearchConditionRatingContext _tmp128_; - SearchConditionRating* _tmp129_; - GeeList* _tmp130_; - SearchConditionRating* _tmp131_; + sqlite3_stmt* _tmp100_; + const gchar* _tmp101_; + sqlite3_stmt* _tmp102_; + sqlite3_stmt* _tmp103_; + const gchar* _tmp104_; + SearchConditionRating* _tmp105_; + GeeList* _tmp106_; + SearchConditionRating* _tmp107_; #line 515 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - if (!_tmp114_) { -#line 3753 "SavedSearchDBTable.c" + if (!_tmp95_) { +#line 3648 "SavedSearchDBTable.c" } #line 515 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp114_ = FALSE; -#line 516 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp115_ = stmt; + _tmp95_ = FALSE; #line 516 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp116_ = sqlite3_step (_tmp115_); + _tmp96_ = stmt; #line 516 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp116_; + res = sqlite3_step (_tmp96_); #line 517 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp117_ = res; + _tmp97_ = res; #line 517 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - if (_tmp117_ == SQLITE_DONE) { + if (_tmp97_ == SQLITE_DONE) { #line 518 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" break; -#line 3769 "SavedSearchDBTable.c" +#line 3662 "SavedSearchDBTable.c" } else { - gint _tmp118_; + gint _tmp98_; #line 519 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp118_ = res; + _tmp98_ = res; #line 519 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - if (_tmp118_ != SQLITE_ROW) { -#line 3776 "SavedSearchDBTable.c" - gint _tmp119_; + if (_tmp98_ != SQLITE_ROW) { +#line 3669 "SavedSearchDBTable.c" + gint _tmp99_; #line 520 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp119_ = res; + _tmp99_ = res; #line 520 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - database_table_throw_error ("SavedSearchDBTable_Rating.get_all_rows", _tmp119_, &_inner_error_); + database_table_throw_error ("SavedSearchDBTable_Rating.get_all_rows", _tmp99_, &_inner_error_); #line 520 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 520 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" @@ -3794,7 +3687,7 @@ static GeeList* saved_search_db_table_get_conditions_for_id (SavedSearchDBTable* _g_object_unref0 (list); #line 520 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return NULL; -#line 3794 "SavedSearchDBTable.c" +#line 3687 "SavedSearchDBTable.c" } else { #line 520 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _sqlite3_finalize0 (stmt); @@ -3806,134 +3699,117 @@ static GeeList* saved_search_db_table_get_conditions_for_id (SavedSearchDBTable* g_clear_error (&_inner_error_); #line 520 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return NULL; -#line 3806 "SavedSearchDBTable.c" +#line 3699 "SavedSearchDBTable.c" } } } } #line 522 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp120_ = stmt; -#line 522 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp121_ = sqlite3_column_text (_tmp120_, 0); -#line 522 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp122_ = search_condition_search_type_from_string (_tmp121_); + _tmp100_ = stmt; #line 522 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp123_ = stmt; -#line 522 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp124_ = sqlite3_column_int (_tmp123_, 1); + _tmp101_ = sqlite3_column_text (_tmp100_, 0); #line 522 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp125_ = rating_unserialize (_tmp124_); + _tmp102_ = stmt; #line 522 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp126_ = stmt; + _tmp103_ = stmt; #line 522 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp127_ = sqlite3_column_text (_tmp126_, 2); + _tmp104_ = sqlite3_column_text (_tmp103_, 2); #line 522 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp128_ = search_condition_rating_context_from_string (_tmp127_); + _tmp105_ = search_condition_rating_new (search_condition_search_type_from_string (_tmp101_), rating_unserialize (sqlite3_column_int (_tmp102_, 1)), search_condition_rating_context_from_string (_tmp104_)); #line 522 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp129_ = search_condition_rating_new (_tmp122_, _tmp125_, _tmp128_); -#line 522 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - condition = _tmp129_; + condition = _tmp105_; #line 527 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp130_ = list; + _tmp106_ = list; #line 527 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp131_ = condition; + _tmp107_ = condition; #line 527 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp130_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp131_, TYPE_SEARCH_CONDITION, SearchCondition)); + gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp106_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp107_, TYPE_SEARCH_CONDITION, SearchCondition)); #line 515 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _search_condition_unref0 (condition); -#line 3841 "SavedSearchDBTable.c" +#line 3726 "SavedSearchDBTable.c" } } #line 531 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp132_ = database_table_db; + _tmp108_ = database_table_db; #line 531 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp134_ = sqlite3_prepare_v2 (_tmp132_, "SELECT search_type, context, date_one, date_two FROM SavedSearchDBTabl" \ -"e_Date " "WHERE search_id=?", -1, &_tmp133_, NULL); + _tmp110_ = sqlite3_prepare_v2 (_tmp108_, "SELECT search_type, context, date_one, date_two FROM SavedSearchDBTabl" \ +"e_Date " "WHERE search_id=?", -1, &_tmp109_, NULL); #line 531 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _sqlite3_finalize0 (stmt); #line 531 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - stmt = _tmp133_; + stmt = _tmp109_; #line 531 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp134_; + res = _tmp110_; #line 534 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp135_ = res; + _tmp111_ = res; #line 534 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _vala_assert (_tmp135_ == SQLITE_OK, "res == Sqlite.OK"); -#line 536 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp136_ = stmt; + _vala_assert (_tmp111_ == SQLITE_OK, "res == Sqlite.OK"); #line 536 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp137_ = *search_id; + _tmp112_ = stmt; #line 536 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp138_ = _tmp137_.id; + _tmp113_ = *search_id; #line 536 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp139_ = sqlite3_bind_int64 (_tmp136_, 1, _tmp138_); + _tmp114_ = _tmp113_.id; #line 536 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp139_; + res = sqlite3_bind_int64 (_tmp112_, 1, _tmp114_); #line 537 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp140_ = res; + _tmp115_ = res; #line 537 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _vala_assert (_tmp140_ == SQLITE_OK, "res == Sqlite.OK"); -#line 3872 "SavedSearchDBTable.c" + _vala_assert (_tmp115_ == SQLITE_OK, "res == Sqlite.OK"); +#line 3755 "SavedSearchDBTable.c" { - gboolean _tmp141_ = FALSE; + gboolean _tmp116_ = FALSE; #line 539 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp141_ = TRUE; + _tmp116_ = TRUE; #line 539 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" while (TRUE) { -#line 3879 "SavedSearchDBTable.c" - sqlite3_stmt* _tmp142_; - gint _tmp143_; - gint _tmp144_; +#line 3762 "SavedSearchDBTable.c" + sqlite3_stmt* _tmp117_; + gint _tmp118_; SearchConditionDate* condition = NULL; - sqlite3_stmt* _tmp147_; - const gchar* _tmp148_; - SearchConditionSearchType _tmp149_; - sqlite3_stmt* _tmp150_; - const gchar* _tmp151_; - SearchConditionDateContext _tmp152_; - sqlite3_stmt* _tmp153_; - gint64 _tmp154_; - GDateTime* _tmp155_; - GDateTime* _tmp156_; - sqlite3_stmt* _tmp157_; - gint64 _tmp158_; - GDateTime* _tmp159_; - GDateTime* _tmp160_; - SearchConditionDate* _tmp161_; - SearchConditionDate* _tmp162_; - GeeList* _tmp163_; - SearchConditionDate* _tmp164_; + sqlite3_stmt* _tmp121_; + const gchar* _tmp122_; + sqlite3_stmt* _tmp123_; + const gchar* _tmp124_; + sqlite3_stmt* _tmp125_; + GDateTime* _tmp126_; + GDateTime* _tmp127_; + sqlite3_stmt* _tmp128_; + GDateTime* _tmp129_; + GDateTime* _tmp130_; + SearchConditionDate* _tmp131_; + SearchConditionDate* _tmp132_; + GeeList* _tmp133_; + SearchConditionDate* _tmp134_; #line 539 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - if (!_tmp141_) { -#line 3904 "SavedSearchDBTable.c" + if (!_tmp116_) { +#line 3782 "SavedSearchDBTable.c" } #line 539 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp141_ = FALSE; -#line 540 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp142_ = stmt; + _tmp116_ = FALSE; #line 540 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp143_ = sqlite3_step (_tmp142_); + _tmp117_ = stmt; #line 540 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp143_; + res = sqlite3_step (_tmp117_); #line 541 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp144_ = res; + _tmp118_ = res; #line 541 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - if (_tmp144_ == SQLITE_DONE) { + if (_tmp118_ == SQLITE_DONE) { #line 542 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" break; -#line 3920 "SavedSearchDBTable.c" +#line 3796 "SavedSearchDBTable.c" } else { - gint _tmp145_; + gint _tmp119_; #line 543 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp145_ = res; + _tmp119_ = res; #line 543 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - if (_tmp145_ != SQLITE_ROW) { -#line 3927 "SavedSearchDBTable.c" - gint _tmp146_; + if (_tmp119_ != SQLITE_ROW) { +#line 3803 "SavedSearchDBTable.c" + gint _tmp120_; #line 544 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp146_ = res; + _tmp120_ = res; #line 544 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - database_table_throw_error ("SavedSearchDBTable_Date.get_all_rows", _tmp146_, &_inner_error_); + database_table_throw_error ("SavedSearchDBTable_Date.get_all_rows", _tmp120_, &_inner_error_); #line 544 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 544 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" @@ -3946,7 +3822,7 @@ static GeeList* saved_search_db_table_get_conditions_for_id (SavedSearchDBTable* _g_object_unref0 (list); #line 544 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return NULL; -#line 3945 "SavedSearchDBTable.c" +#line 3821 "SavedSearchDBTable.c" } else { #line 544 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _sqlite3_finalize0 (stmt); @@ -3958,58 +3834,50 @@ static GeeList* saved_search_db_table_get_conditions_for_id (SavedSearchDBTable* g_clear_error (&_inner_error_); #line 544 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return NULL; -#line 3957 "SavedSearchDBTable.c" +#line 3833 "SavedSearchDBTable.c" } } } } #line 546 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp147_ = stmt; -#line 546 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp148_ = sqlite3_column_text (_tmp147_, 0); + _tmp121_ = stmt; #line 546 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp149_ = search_condition_search_type_from_string (_tmp148_); + _tmp122_ = sqlite3_column_text (_tmp121_, 0); #line 546 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp150_ = stmt; -#line 546 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp151_ = sqlite3_column_text (_tmp150_, 1); -#line 546 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp152_ = search_condition_date_context_from_string (_tmp151_); -#line 546 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp153_ = stmt; + _tmp123_ = stmt; #line 546 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp154_ = sqlite3_column_int64 (_tmp153_, 2); + _tmp124_ = sqlite3_column_text (_tmp123_, 1); #line 546 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp155_ = g_date_time_new_from_unix_local (_tmp154_); + _tmp125_ = stmt; #line 546 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp156_ = _tmp155_; + _tmp126_ = g_date_time_new_from_unix_local (sqlite3_column_int64 (_tmp125_, 2)); #line 546 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp157_ = stmt; + _tmp127_ = _tmp126_; #line 546 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp158_ = sqlite3_column_int64 (_tmp157_, 3); + _tmp128_ = stmt; #line 546 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp159_ = g_date_time_new_from_unix_local (_tmp158_); + _tmp129_ = g_date_time_new_from_unix_local (sqlite3_column_int64 (_tmp128_, 3)); #line 546 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp160_ = _tmp159_; + _tmp130_ = _tmp129_; #line 546 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp161_ = search_condition_date_new (_tmp149_, _tmp152_, _tmp156_, _tmp160_); + _tmp131_ = search_condition_date_new (search_condition_search_type_from_string (_tmp122_), search_condition_date_context_from_string (_tmp124_), _tmp127_, _tmp130_); #line 546 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp162_ = _tmp161_; + _tmp132_ = _tmp131_; #line 546 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _g_date_time_unref0 (_tmp160_); + _g_date_time_unref0 (_tmp130_); #line 546 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _g_date_time_unref0 (_tmp156_); + _g_date_time_unref0 (_tmp127_); #line 546 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - condition = _tmp162_; + condition = _tmp132_; #line 551 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp163_ = list; + _tmp133_ = list; #line 551 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp164_ = condition; + _tmp134_ = condition; #line 551 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp163_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp164_, TYPE_SEARCH_CONDITION, SearchCondition)); + gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp133_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp134_, TYPE_SEARCH_CONDITION, SearchCondition)); #line 539 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _search_condition_unref0 (condition); -#line 4008 "SavedSearchDBTable.c" +#line 3876 "SavedSearchDBTable.c" } } #line 554 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" @@ -4018,11 +3886,16 @@ static GeeList* saved_search_db_table_get_conditions_for_id (SavedSearchDBTable* _sqlite3_finalize0 (stmt); #line 554 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return result; -#line 4017 "SavedSearchDBTable.c" +#line 3885 "SavedSearchDBTable.c" } -void saved_search_db_table_create_from_row (SavedSearchDBTable* self, SavedSearchRow* row, SavedSearchID* result, GError** error) { +void +saved_search_db_table_create_from_row (SavedSearchDBTable* self, + SavedSearchRow* row, + SavedSearchID* result, + GError** error) +{ sqlite3_stmt* stmt = NULL; gint res = 0; sqlite3* _tmp0_; @@ -4030,25 +3903,19 @@ void saved_search_db_table_create_from_row (SavedSearchDBTable* self, SavedSearc gint _tmp2_; gint _tmp3_; sqlite3_stmt* _tmp4_; - SavedSearchRow* _tmp5_; - const gchar* _tmp6_; - gchar* _tmp7_; - GDestroyNotify _tmp8_; - gint _tmp9_; - gint _tmp10_; - sqlite3_stmt* _tmp11_; - SavedSearchRow* _tmp12_; - SearchOperator _tmp13_; - gchar* _tmp14_; - GDestroyNotify _tmp15_; - gint _tmp16_; - gint _tmp17_; - sqlite3_stmt* _tmp18_; - gint _tmp19_; - gint _tmp20_; + const gchar* _tmp5_; + gchar* _tmp6_; + GDestroyNotify _tmp7_; + gint _tmp8_; + sqlite3_stmt* _tmp9_; + SearchOperator _tmp10_; + gchar* _tmp11_; + GDestroyNotify _tmp12_; + gint _tmp13_; + sqlite3_stmt* _tmp14_; + gint _tmp15_; SavedSearchID search_id = {0}; - sqlite3* _tmp22_; - gint64 _tmp23_; + sqlite3* _tmp17_; GError * _inner_error_ = NULL; #line 558 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" g_return_if_fail (IS_SAVED_SEARCH_DB_TABLE (self)); @@ -4071,55 +3938,45 @@ void saved_search_db_table_create_from_row (SavedSearchDBTable* self, SavedSearc #line 564 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _tmp4_ = stmt; #line 564 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp5_ = row; -#line 564 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp6_ = _tmp5_->name; -#line 564 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp7_ = g_strdup (_tmp6_); + _tmp5_ = row->name; #line 564 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp8_ = g_free; + _tmp6_ = g_strdup (_tmp5_); #line 564 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp9_ = sqlite3_bind_text (_tmp4_, 1, _tmp7_, -1, _tmp8_); + _tmp7_ = g_free; #line 564 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp9_; + res = sqlite3_bind_text (_tmp4_, 1, _tmp6_, -1, _tmp7_); #line 565 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp10_ = res; + _tmp8_ = res; #line 565 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _vala_assert (_tmp10_ == SQLITE_OK, "res == Sqlite.OK"); -#line 566 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp11_ = stmt; -#line 566 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp12_ = row; + _vala_assert (_tmp8_ == SQLITE_OK, "res == Sqlite.OK"); #line 566 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp13_ = _tmp12_->operator; + _tmp9_ = stmt; #line 566 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp14_ = search_operator_to_string (_tmp13_); + _tmp10_ = row->operator; #line 566 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp15_ = g_free; + _tmp11_ = search_operator_to_string (_tmp10_); #line 566 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp16_ = sqlite3_bind_text (_tmp11_, 2, _tmp14_, -1, _tmp15_); + _tmp12_ = g_free; #line 566 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp16_; + res = sqlite3_bind_text (_tmp9_, 2, _tmp11_, -1, _tmp12_); #line 567 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp17_ = res; + _tmp13_ = res; #line 567 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _vala_assert (_tmp17_ == SQLITE_OK, "res == Sqlite.OK"); -#line 569 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp18_ = stmt; + _vala_assert (_tmp13_ == SQLITE_OK, "res == Sqlite.OK"); #line 569 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp19_ = sqlite3_step (_tmp18_); + _tmp14_ = stmt; #line 569 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp19_; + res = sqlite3_step (_tmp14_); #line 570 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp20_ = res; + _tmp15_ = res; #line 570 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - if (_tmp20_ != SQLITE_DONE) { -#line 4113 "SavedSearchDBTable.c" - gint _tmp21_; + if (_tmp15_ != SQLITE_DONE) { +#line 3970 "SavedSearchDBTable.c" + gint _tmp16_; #line 571 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp21_ = res; + _tmp16_ = res; #line 571 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - database_table_throw_error ("SavedSearchDBTable.create_from_row", _tmp21_, &_inner_error_); + database_table_throw_error ("SavedSearchDBTable.create_from_row", _tmp16_, &_inner_error_); #line 571 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 571 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" @@ -4130,7 +3987,7 @@ void saved_search_db_table_create_from_row (SavedSearchDBTable* self, SavedSearc _sqlite3_finalize0 (stmt); #line 571 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return; -#line 4129 "SavedSearchDBTable.c" +#line 3986 "SavedSearchDBTable.c" } else { #line 571 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _sqlite3_finalize0 (stmt); @@ -4140,85 +3997,80 @@ void saved_search_db_table_create_from_row (SavedSearchDBTable* self, SavedSearc g_clear_error (&_inner_error_); #line 571 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return; -#line 4139 "SavedSearchDBTable.c" +#line 3996 "SavedSearchDBTable.c" } } } #line 573 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp22_ = database_table_db; -#line 573 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp23_ = sqlite3_last_insert_rowid (_tmp22_); + _tmp17_ = database_table_db; #line 573 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - saved_search_id_init (&search_id, _tmp23_); -#line 4149 "SavedSearchDBTable.c" + saved_search_id_init (&search_id, sqlite3_last_insert_rowid (_tmp17_)); +#line 4004 "SavedSearchDBTable.c" { GeeList* _sc_list = NULL; - SavedSearchRow* _tmp24_; - GeeList* _tmp25_; - GeeList* _tmp26_; + GeeList* _tmp18_; + GeeList* _tmp19_; gint _sc_size = 0; - GeeList* _tmp27_; - gint _tmp28_; - gint _tmp29_; + GeeList* _tmp20_; + gint _tmp21_; + gint _tmp22_; gint _sc_index = 0; #line 575 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp24_ = row; -#line 575 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp25_ = _tmp24_->conditions; + _tmp18_ = row->conditions; #line 575 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp26_ = _g_object_ref0 (_tmp25_); + _tmp19_ = _g_object_ref0 (_tmp18_); #line 575 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _sc_list = _tmp26_; + _sc_list = _tmp19_; #line 575 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp27_ = _sc_list; + _tmp20_ = _sc_list; #line 575 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp28_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp21_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, GEE_TYPE_COLLECTION, GeeCollection)); #line 575 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp29_ = _tmp28_; + _tmp22_ = _tmp21_; #line 575 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _sc_size = _tmp29_; + _sc_size = _tmp22_; #line 575 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _sc_index = -1; #line 575 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" while (TRUE) { -#line 4180 "SavedSearchDBTable.c" - gint _tmp30_; - gint _tmp31_; - gint _tmp32_; +#line 4032 "SavedSearchDBTable.c" + gint _tmp23_; + gint _tmp24_; + gint _tmp25_; SearchCondition* sc = NULL; - GeeList* _tmp33_; - gint _tmp34_; - gpointer _tmp35_; - SavedSearchID _tmp36_; - SearchCondition* _tmp37_; + GeeList* _tmp26_; + gint _tmp27_; + gpointer _tmp28_; + SavedSearchID _tmp29_; + SearchCondition* _tmp30_; #line 575 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp30_ = _sc_index; + _tmp23_ = _sc_index; #line 575 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _sc_index = _tmp30_ + 1; + _sc_index = _tmp23_ + 1; #line 575 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp31_ = _sc_index; + _tmp24_ = _sc_index; #line 575 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp32_ = _sc_size; + _tmp25_ = _sc_size; #line 575 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - if (!(_tmp31_ < _tmp32_)) { + if (!(_tmp24_ < _tmp25_)) { #line 575 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" break; -#line 4202 "SavedSearchDBTable.c" +#line 4054 "SavedSearchDBTable.c" } #line 575 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp33_ = _sc_list; + _tmp26_ = _sc_list; #line 575 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp34_ = _sc_index; + _tmp27_ = _sc_index; #line 575 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp35_ = gee_list_get (_tmp33_, _tmp34_); + _tmp28_ = gee_list_get (_tmp26_, _tmp27_); #line 575 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - sc = (SearchCondition*) _tmp35_; + sc = (SearchCondition*) _tmp28_; #line 576 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp36_ = search_id; + _tmp29_ = search_id; #line 576 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp37_ = sc; + _tmp30_ = sc; #line 576 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - saved_search_db_table_add_condition (self, &_tmp36_, _tmp37_, &_inner_error_); + saved_search_db_table_add_condition (self, &_tmp29_, _tmp30_, &_inner_error_); #line 576 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 576 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" @@ -4233,7 +4085,7 @@ void saved_search_db_table_create_from_row (SavedSearchDBTable* self, SavedSearc _sqlite3_finalize0 (stmt); #line 576 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return; -#line 4232 "SavedSearchDBTable.c" +#line 4084 "SavedSearchDBTable.c" } else { #line 576 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _search_condition_unref0 (sc); @@ -4247,16 +4099,16 @@ void saved_search_db_table_create_from_row (SavedSearchDBTable* self, SavedSearc g_clear_error (&_inner_error_); #line 576 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return; -#line 4246 "SavedSearchDBTable.c" +#line 4098 "SavedSearchDBTable.c" } } #line 575 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _search_condition_unref0 (sc); -#line 4251 "SavedSearchDBTable.c" +#line 4103 "SavedSearchDBTable.c" } #line 575 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _g_object_unref0 (_sc_list); -#line 4255 "SavedSearchDBTable.c" +#line 4107 "SavedSearchDBTable.c" } #line 579 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" *result = search_id; @@ -4264,11 +4116,15 @@ void saved_search_db_table_create_from_row (SavedSearchDBTable* self, SavedSearc _sqlite3_finalize0 (stmt); #line 579 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return; -#line 4263 "SavedSearchDBTable.c" +#line 4115 "SavedSearchDBTable.c" } -void saved_search_db_table_remove (SavedSearchDBTable* self, SavedSearchID* search_id, GError** error) { +void +saved_search_db_table_remove (SavedSearchDBTable* self, + SavedSearchID* search_id, + GError** error) +{ SavedSearchID _tmp0_; SavedSearchID _tmp1_; gint64 _tmp2_; @@ -4289,7 +4145,7 @@ void saved_search_db_table_remove (SavedSearchDBTable* self, SavedSearchID* sear g_propagate_error (error, _inner_error_); #line 583 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return; -#line 4288 "SavedSearchDBTable.c" +#line 4144 "SavedSearchDBTable.c" } else { #line 583 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.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); @@ -4297,7 +4153,7 @@ void saved_search_db_table_remove (SavedSearchDBTable* self, SavedSearchID* sear g_clear_error (&_inner_error_); #line 583 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return; -#line 4296 "SavedSearchDBTable.c" +#line 4152 "SavedSearchDBTable.c" } } #line 584 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" @@ -4314,7 +4170,7 @@ void saved_search_db_table_remove (SavedSearchDBTable* self, SavedSearchID* sear g_propagate_error (error, _inner_error_); #line 584 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return; -#line 4313 "SavedSearchDBTable.c" +#line 4169 "SavedSearchDBTable.c" } else { #line 584 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.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); @@ -4322,13 +4178,17 @@ void saved_search_db_table_remove (SavedSearchDBTable* self, SavedSearchID* sear g_clear_error (&_inner_error_); #line 584 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return; -#line 4321 "SavedSearchDBTable.c" +#line 4177 "SavedSearchDBTable.c" } } } -SavedSearchRow* saved_search_db_table_get_row (SavedSearchDBTable* self, SavedSearchID* search_id, GError** error) { +SavedSearchRow* +saved_search_db_table_get_row (SavedSearchDBTable* self, + SavedSearchID* search_id, + GError** error) +{ SavedSearchRow* result = NULL; sqlite3_stmt* stmt = NULL; gint res = 0; @@ -4340,22 +4200,19 @@ SavedSearchRow* saved_search_db_table_get_row (SavedSearchDBTable* self, SavedSe SavedSearchID _tmp5_; gint64 _tmp6_; gint _tmp7_; - gint _tmp8_; - sqlite3_stmt* _tmp9_; - gint _tmp10_; - gint _tmp11_; + sqlite3_stmt* _tmp8_; + gint _tmp9_; SavedSearchRow* row = NULL; - SavedSearchRow* _tmp14_; + SavedSearchRow* _tmp12_; + SavedSearchRow* _tmp13_; + SavedSearchID _tmp14_; SavedSearchRow* _tmp15_; - SavedSearchID _tmp16_; - SavedSearchRow* _tmp17_; - sqlite3_stmt* _tmp18_; - const gchar* _tmp19_; - gchar* _tmp20_; - SavedSearchRow* _tmp21_; - sqlite3_stmt* _tmp22_; - const gchar* _tmp23_; - SearchOperator _tmp24_; + sqlite3_stmt* _tmp16_; + const gchar* _tmp17_; + gchar* _tmp18_; + SavedSearchRow* _tmp19_; + sqlite3_stmt* _tmp20_; + const gchar* _tmp21_; GError * _inner_error_ = NULL; #line 587 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" g_return_val_if_fail (IS_SAVED_SEARCH_DB_TABLE (self), NULL); @@ -4382,42 +4239,38 @@ SavedSearchRow* saved_search_db_table_get_row (SavedSearchDBTable* self, SavedSe #line 593 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _tmp6_ = _tmp5_.id; #line 593 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp7_ = sqlite3_bind_int64 (_tmp4_, 1, _tmp6_); -#line 593 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp7_; + res = sqlite3_bind_int64 (_tmp4_, 1, _tmp6_); #line 594 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp8_ = res; + _tmp7_ = res; #line 594 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _vala_assert (_tmp8_ == SQLITE_OK, "res == Sqlite.OK"); -#line 596 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp9_ = stmt; + _vala_assert (_tmp7_ == SQLITE_OK, "res == Sqlite.OK"); #line 596 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp10_ = sqlite3_step (_tmp9_); + _tmp8_ = stmt; #line 596 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp10_; + res = sqlite3_step (_tmp8_); #line 597 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp11_ = res; + _tmp9_ = res; #line 597 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - if (_tmp11_ == SQLITE_DONE) { + if (_tmp9_ == SQLITE_DONE) { #line 598 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" result = NULL; #line 598 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _sqlite3_finalize0 (stmt); #line 598 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return result; -#line 4404 "SavedSearchDBTable.c" +#line 4257 "SavedSearchDBTable.c" } else { - gint _tmp12_; + gint _tmp10_; #line 599 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp12_ = res; + _tmp10_ = res; #line 599 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - if (_tmp12_ != SQLITE_ROW) { -#line 4411 "SavedSearchDBTable.c" - gint _tmp13_; + if (_tmp10_ != SQLITE_ROW) { +#line 4264 "SavedSearchDBTable.c" + gint _tmp11_; #line 600 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp13_ = res; + _tmp11_ = res; #line 600 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - database_table_throw_error ("SavedSearchDBTable.get_row", _tmp13_, &_inner_error_); + database_table_throw_error ("SavedSearchDBTable.get_row", _tmp11_, &_inner_error_); #line 600 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 600 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" @@ -4428,7 +4281,7 @@ SavedSearchRow* saved_search_db_table_get_row (SavedSearchDBTable* self, SavedSe _sqlite3_finalize0 (stmt); #line 600 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return NULL; -#line 4427 "SavedSearchDBTable.c" +#line 4280 "SavedSearchDBTable.c" } else { #line 600 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _sqlite3_finalize0 (stmt); @@ -4438,54 +4291,55 @@ SavedSearchRow* saved_search_db_table_get_row (SavedSearchDBTable* self, SavedSe g_clear_error (&_inner_error_); #line 600 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return NULL; -#line 4437 "SavedSearchDBTable.c" +#line 4290 "SavedSearchDBTable.c" } } } } #line 602 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp14_ = saved_search_row_new (); + _tmp12_ = saved_search_row_new (); #line 602 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - row = _tmp14_; + row = _tmp12_; #line 603 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp15_ = row; + _tmp13_ = row; #line 603 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp16_ = *search_id; + _tmp14_ = *search_id; #line 603 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp15_->search_id = _tmp16_; + _tmp13_->search_id = _tmp14_; #line 604 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp17_ = row; + _tmp15_ = row; #line 604 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp18_ = stmt; + _tmp16_ = stmt; #line 604 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp19_ = sqlite3_column_text (_tmp18_, 0); + _tmp17_ = sqlite3_column_text (_tmp16_, 0); #line 604 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp20_ = g_strdup (_tmp19_); + _tmp18_ = g_strdup (_tmp17_); #line 604 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _g_free0 (_tmp17_->name); + _g_free0 (_tmp15_->name); #line 604 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp17_->name = _tmp20_; -#line 605 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp21_ = row; + _tmp15_->name = _tmp18_; #line 605 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp22_ = stmt; + _tmp19_ = row; #line 605 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp23_ = sqlite3_column_text (_tmp22_, 1); + _tmp20_ = stmt; #line 605 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp24_ = search_operator_from_string (_tmp23_); + _tmp21_ = sqlite3_column_text (_tmp20_, 1); #line 605 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp21_->operator = _tmp24_; + _tmp19_->operator = search_operator_from_string (_tmp21_); #line 607 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" result = row; #line 607 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _sqlite3_finalize0 (stmt); #line 607 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return result; -#line 4480 "SavedSearchDBTable.c" +#line 4331 "SavedSearchDBTable.c" } -GeeList* saved_search_db_table_get_all_rows (SavedSearchDBTable* self, GError** error) { +GeeList* +saved_search_db_table_get_all_rows (SavedSearchDBTable* self, + GError** error) +{ GeeList* result = NULL; sqlite3_stmt* stmt = NULL; gint res = 0; @@ -4516,69 +4370,64 @@ GeeList* saved_search_db_table_get_all_rows (SavedSearchDBTable* self, GError** _tmp4_ = gee_array_list_new (TYPE_SAVED_SEARCH_ROW, (GBoxedCopyFunc) saved_search_row_ref, (GDestroyNotify) saved_search_row_unref, NULL, NULL, NULL); #line 616 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" rows = G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_LIST, GeeList); -#line 4515 "SavedSearchDBTable.c" +#line 4369 "SavedSearchDBTable.c" { gboolean _tmp5_ = FALSE; #line 618 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _tmp5_ = TRUE; #line 618 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" while (TRUE) { -#line 4522 "SavedSearchDBTable.c" +#line 4376 "SavedSearchDBTable.c" sqlite3_stmt* _tmp6_; gint _tmp7_; - gint _tmp8_; SavedSearchRow* row = NULL; + SavedSearchRow* _tmp10_; SavedSearchRow* _tmp11_; - SavedSearchRow* _tmp12_; - sqlite3_stmt* _tmp13_; - gint64 _tmp14_; - SavedSearchRow* _tmp15_; - sqlite3_stmt* _tmp16_; - const gchar* _tmp17_; - gchar* _tmp18_; - SavedSearchRow* _tmp19_; - sqlite3_stmt* _tmp20_; - const gchar* _tmp21_; - SearchOperator _tmp22_; - GeeList* _tmp23_ = NULL; + sqlite3_stmt* _tmp12_; + SavedSearchRow* _tmp13_; + sqlite3_stmt* _tmp14_; + const gchar* _tmp15_; + gchar* _tmp16_; + SavedSearchRow* _tmp17_; + sqlite3_stmt* _tmp18_; + const gchar* _tmp19_; + GeeList* _tmp20_ = NULL; + SavedSearchRow* _tmp21_; + SavedSearchID _tmp22_; + GeeList* _tmp23_; SavedSearchRow* _tmp24_; - SavedSearchID _tmp25_; + GeeList* _tmp25_; GeeList* _tmp26_; SavedSearchRow* _tmp27_; - GeeList* _tmp28_; - GeeList* _tmp29_; - SavedSearchRow* _tmp30_; #line 618 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" if (!_tmp5_) { -#line 4549 "SavedSearchDBTable.c" +#line 4400 "SavedSearchDBTable.c" } #line 618 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _tmp5_ = FALSE; #line 619 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _tmp6_ = stmt; #line 619 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp7_ = sqlite3_step (_tmp6_); -#line 619 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp7_; + res = sqlite3_step (_tmp6_); #line 620 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp8_ = res; + _tmp7_ = res; #line 620 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - if (_tmp8_ == SQLITE_DONE) { + if (_tmp7_ == SQLITE_DONE) { #line 621 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" break; -#line 4565 "SavedSearchDBTable.c" +#line 4414 "SavedSearchDBTable.c" } else { - gint _tmp9_; + gint _tmp8_; #line 622 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp9_ = res; + _tmp8_ = res; #line 622 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - if (_tmp9_ != SQLITE_ROW) { -#line 4572 "SavedSearchDBTable.c" - gint _tmp10_; + if (_tmp8_ != SQLITE_ROW) { +#line 4421 "SavedSearchDBTable.c" + gint _tmp9_; #line 623 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp10_ = res; + _tmp9_ = res; #line 623 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - database_table_throw_error ("SavedSearchDBTable.get_all_rows", _tmp10_, &_inner_error_); + database_table_throw_error ("SavedSearchDBTable.get_all_rows", _tmp9_, &_inner_error_); #line 623 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 623 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" @@ -4591,7 +4440,7 @@ GeeList* saved_search_db_table_get_all_rows (SavedSearchDBTable* self, GError** _sqlite3_finalize0 (stmt); #line 623 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return NULL; -#line 4590 "SavedSearchDBTable.c" +#line 4439 "SavedSearchDBTable.c" } else { #line 623 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _g_object_unref0 (rows); @@ -4603,53 +4452,49 @@ GeeList* saved_search_db_table_get_all_rows (SavedSearchDBTable* self, GError** g_clear_error (&_inner_error_); #line 623 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return NULL; -#line 4602 "SavedSearchDBTable.c" +#line 4451 "SavedSearchDBTable.c" } } } } #line 625 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp11_ = saved_search_row_new (); + _tmp10_ = saved_search_row_new (); #line 625 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - row = _tmp11_; + row = _tmp10_; #line 626 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp12_ = row; + _tmp11_ = row; #line 626 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp13_ = stmt; + _tmp12_ = stmt; #line 626 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp14_ = sqlite3_column_int64 (_tmp13_, 0); -#line 626 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - saved_search_id_init (&_tmp12_->search_id, _tmp14_); + saved_search_id_init (&_tmp11_->search_id, sqlite3_column_int64 (_tmp12_, 0)); #line 627 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp15_ = row; + _tmp13_ = row; #line 627 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp16_ = stmt; + _tmp14_ = stmt; #line 627 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp17_ = sqlite3_column_text (_tmp16_, 1); + _tmp15_ = sqlite3_column_text (_tmp14_, 1); #line 627 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp18_ = g_strdup (_tmp17_); + _tmp16_ = g_strdup (_tmp15_); #line 627 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _g_free0 (_tmp15_->name); + _g_free0 (_tmp13_->name); #line 627 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp15_->name = _tmp18_; -#line 628 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp19_ = row; + _tmp13_->name = _tmp16_; #line 628 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp20_ = stmt; + _tmp17_ = row; #line 628 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp21_ = sqlite3_column_text (_tmp20_, 2); + _tmp18_ = stmt; #line 628 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp22_ = search_operator_from_string (_tmp21_); + _tmp19_ = sqlite3_column_text (_tmp18_, 2); #line 628 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp19_->operator = _tmp22_; + _tmp17_->operator = search_operator_from_string (_tmp19_); #line 629 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp24_ = row; + _tmp21_ = row; #line 629 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp25_ = _tmp24_->search_id; + _tmp22_ = _tmp21_->search_id; #line 629 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp26_ = saved_search_db_table_get_conditions_for_id (self, &_tmp25_, &_inner_error_); + _tmp23_ = saved_search_db_table_get_conditions_for_id (self, &_tmp22_, &_inner_error_); #line 629 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp23_ = _tmp26_; + _tmp20_ = _tmp23_; #line 629 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 629 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" @@ -4664,7 +4509,7 @@ GeeList* saved_search_db_table_get_all_rows (SavedSearchDBTable* self, GError** _sqlite3_finalize0 (stmt); #line 629 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return NULL; -#line 4663 "SavedSearchDBTable.c" +#line 4508 "SavedSearchDBTable.c" } else { #line 629 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _saved_search_row_unref0 (row); @@ -4678,30 +4523,30 @@ GeeList* saved_search_db_table_get_all_rows (SavedSearchDBTable* self, GError** g_clear_error (&_inner_error_); #line 629 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return NULL; -#line 4677 "SavedSearchDBTable.c" +#line 4522 "SavedSearchDBTable.c" } } #line 629 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp27_ = row; + _tmp24_ = row; #line 629 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp28_ = _tmp23_; + _tmp25_ = _tmp20_; #line 629 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp23_ = NULL; + _tmp20_ = NULL; #line 629 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _g_object_unref0 (_tmp27_->conditions); + _g_object_unref0 (_tmp24_->conditions); #line 629 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp27_->conditions = _tmp28_; + _tmp24_->conditions = _tmp25_; #line 631 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp29_ = rows; + _tmp26_ = rows; #line 631 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp30_ = row; + _tmp27_ = row; #line 631 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, GEE_TYPE_COLLECTION, GeeCollection), _tmp30_); + gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, GEE_TYPE_COLLECTION, GeeCollection), _tmp27_); #line 618 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _g_object_unref0 (_tmp23_); + _g_object_unref0 (_tmp20_); #line 618 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _saved_search_row_unref0 (row); -#line 4700 "SavedSearchDBTable.c" +#line 4545 "SavedSearchDBTable.c" } } #line 634 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" @@ -4710,14 +4555,18 @@ GeeList* saved_search_db_table_get_all_rows (SavedSearchDBTable* self, GError** _sqlite3_finalize0 (stmt); #line 634 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return result; -#line 4709 "SavedSearchDBTable.c" +#line 4554 "SavedSearchDBTable.c" } -void saved_search_db_table_rename (SavedSearchDBTable* self, SavedSearchID* search_id, const gchar* new_name, GError** error) { +void +saved_search_db_table_rename (SavedSearchDBTable* self, + SavedSearchID* search_id, + const gchar* new_name, + GError** error) +{ SavedSearchID _tmp0_; gint64 _tmp1_; - const gchar* _tmp2_; GError * _inner_error_ = NULL; #line 637 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" g_return_if_fail (IS_SAVED_SEARCH_DB_TABLE (self)); @@ -4730,9 +4579,7 @@ void saved_search_db_table_rename (SavedSearchDBTable* self, SavedSearchID* sear #line 638 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _tmp1_ = _tmp0_.id; #line 638 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp2_ = new_name; -#line 638 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - database_table_update_text_by_id_2 (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp1_, "name", _tmp2_, &_inner_error_); + database_table_update_text_by_id_2 (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp1_, "name", new_name, &_inner_error_); #line 638 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 638 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" @@ -4741,7 +4588,7 @@ void saved_search_db_table_rename (SavedSearchDBTable* self, SavedSearchID* sear g_propagate_error (error, _inner_error_); #line 638 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return; -#line 4740 "SavedSearchDBTable.c" +#line 4587 "SavedSearchDBTable.c" } else { #line 638 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.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); @@ -4749,36 +4596,44 @@ void saved_search_db_table_rename (SavedSearchDBTable* self, SavedSearchID* sear g_clear_error (&_inner_error_); #line 638 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return; -#line 4748 "SavedSearchDBTable.c" +#line 4595 "SavedSearchDBTable.c" } } } -static void saved_search_db_table_class_init (SavedSearchDBTableClass * klass) { +static void +saved_search_db_table_class_init (SavedSearchDBTableClass * klass) +{ #line 33 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" saved_search_db_table_parent_class = g_type_class_peek_parent (klass); #line 33 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" ((DatabaseTableClass *) klass)->finalize = saved_search_db_table_finalize; -#line 4759 "SavedSearchDBTable.c" +#line 4608 "SavedSearchDBTable.c" } -static void saved_search_db_table_instance_init (SavedSearchDBTable * self) { +static void +saved_search_db_table_instance_init (SavedSearchDBTable * self) +{ } -static void saved_search_db_table_finalize (DatabaseTable * obj) { +static void +saved_search_db_table_finalize (DatabaseTable * obj) +{ SavedSearchDBTable * self; #line 33 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SAVED_SEARCH_DB_TABLE, SavedSearchDBTable); #line 33 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" DATABASE_TABLE_CLASS (saved_search_db_table_parent_class)->finalize (obj); -#line 4773 "SavedSearchDBTable.c" +#line 4626 "SavedSearchDBTable.c" } -GType saved_search_db_table_get_type (void) { +GType +saved_search_db_table_get_type (void) +{ static volatile gsize saved_search_db_table_type_id__volatile = 0; if (g_once_init_enter (&saved_search_db_table_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (SavedSearchDBTableClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) saved_search_db_table_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (SavedSearchDBTable), 0, (GInstanceInitFunc) saved_search_db_table_instance_init, NULL }; diff --git a/src/db/TagTable.c b/src/db/TagTable.c index 986af84..b1c77a4 100644 --- a/src/db/TagTable.c +++ b/src/db/TagTable.c @@ -1,4 +1,4 @@ -/* TagTable.c generated by valac 0.36.6, the Vala compiler +/* TagTable.c generated by valac 0.40.4, the Vala compiler * generated from TagTable.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,6 +7,7 @@ * (version 2.1 or later). See the COPYING file in this distribution. */ + #include <glib.h> #include <glib-object.h> #include <string.h> @@ -137,83 +138,131 @@ GType tag_id_get_type (void) G_GNUC_CONST; TagID* tag_id_dup (const TagID* self); void tag_id_free (TagID* self); #define TAG_ID_INVALID ((gint64) -1) -void tag_id_init (TagID *self, gint64 id); +void tag_id_init (TagID *self, + gint64 id); gboolean tag_id_is_invalid (TagID *self); gboolean tag_id_is_valid (TagID *self); gpointer tag_row_ref (gpointer instance); void tag_row_unref (gpointer instance); -GParamSpec* param_spec_tag_row (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_tag_row (GValue* value, gpointer v_object); -void value_take_tag_row (GValue* value, gpointer v_object); +GParamSpec* param_spec_tag_row (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_tag_row (GValue* value, + gpointer v_object); +void value_take_tag_row (GValue* value, + gpointer v_object); gpointer value_get_tag_row (const GValue* value); GType tag_row_get_type (void) G_GNUC_CONST; -enum { - TAG_ROW_DUMMY_PROPERTY -}; TagRow* tag_row_new (void); TagRow* tag_row_construct (GType object_type); static void tag_row_finalize (TagRow * obj); gpointer database_table_ref (gpointer instance); void database_table_unref (gpointer instance); -GParamSpec* param_spec_database_table (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_database_table (GValue* value, gpointer v_object); -void value_take_database_table (GValue* value, gpointer v_object); +GParamSpec* param_spec_database_table (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_database_table (GValue* value, + gpointer v_object); +void value_take_database_table (GValue* value, + gpointer v_object); gpointer value_get_database_table (const GValue* value); GType database_table_get_type (void) G_GNUC_CONST; GType tag_table_get_type (void) G_GNUC_CONST; -enum { - TAG_TABLE_DUMMY_PROPERTY -}; static TagTable* tag_table_new (void); static TagTable* tag_table_construct (GType object_type); DatabaseTable* database_table_construct (GType object_type); -void database_table_set_table_name (DatabaseTable* self, const gchar* table_name); -void database_table_fatal (const gchar* op, gint res); +void database_table_set_table_name (DatabaseTable* self, + const gchar* table_name); +void database_table_fatal (const gchar* op, + gint res); TagTable* tag_table_get_instance (void); void tag_table_upgrade_for_htags (void); GQuark database_error_quark (void); -GeeList* tag_table_get_all_rows (TagTable* self, GError** error); +GeeList* tag_table_get_all_rows (TagTable* self, + GError** error); #define TAG_PATH_SEPARATOR_STRING "/" -void tag_table_rename (TagTable* self, TagID* tag_id, const gchar* new_name, GError** error); -TagRow* tag_table_add (TagTable* self, const gchar* name, GError** error); +void tag_table_rename (TagTable* self, + TagID* tag_id, + const gchar* new_name, + GError** error); +TagRow* tag_table_add (TagTable* self, + const gchar* name, + GError** error); gulong now_sec (void); -void database_table_throw_error (const gchar* method, gint res, GError** error); -void tag_table_create_from_row (TagTable* self, TagRow* row, TagID* result, GError** error); -static gchar* tag_table_serialize_source_ids (TagTable* self, GeeCollection* source_ids); -void tag_table_remove (TagTable* self, TagID* tag_id, GError** error); -void database_table_delete_by_id (DatabaseTable* self, gint64 id, GError** error); -gchar* tag_table_get_name (TagTable* self, TagID* tag_id, GError** error); -gboolean database_table_select_by_id (DatabaseTable* self, gint64 id, const gchar* columns, sqlite3_stmt* * stmt); -TagRow* tag_table_get_row (TagTable* self, TagID* tag_id, GError** error); -static GeeSet* tag_table_unserialize_source_ids (TagTable* self, const gchar* text_list); -void database_table_update_text_by_id_2 (DatabaseTable* self, gint64 id, const gchar* column, const gchar* text, GError** error); -void tag_table_set_tagged_sources (TagTable* self, TagID* tag_id, GeeCollection* source_ids, GError** error); +void database_table_throw_error (const gchar* method, + gint res, + GError** error); +void tag_table_create_from_row (TagTable* self, + TagRow* row, + TagID* result, + GError** error); +static gchar* tag_table_serialize_source_ids (TagTable* self, + GeeCollection* source_ids); +void tag_table_remove (TagTable* self, + TagID* tag_id, + GError** error); +void database_table_delete_by_id (DatabaseTable* self, + gint64 id, + GError** error); +gchar* tag_table_get_name (TagTable* self, + TagID* tag_id, + GError** error); +gboolean database_table_select_by_id (DatabaseTable* self, + gint64 id, + const gchar* columns, + sqlite3_stmt* * stmt); +TagRow* tag_table_get_row (TagTable* self, + TagID* tag_id, + GError** error); +static GeeSet* tag_table_unserialize_source_ids (TagTable* self, + const gchar* text_list); +void database_table_update_text_by_id_2 (DatabaseTable* self, + gint64 id, + const gchar* column, + const gchar* text, + GError** error); +void tag_table_set_tagged_sources (TagTable* self, + TagID* tag_id, + GeeCollection* source_ids, + GError** error); gboolean is_string_empty (const gchar* s); GType photo_id_get_type (void) G_GNUC_CONST; PhotoID* photo_id_dup (const PhotoID* self); void photo_id_free (PhotoID* self); gchar* photo_id_upgrade_photo_id_to_source_id (PhotoID* photo_id); -gint64 parse_int64 (const gchar* str, gint num_base); -void photo_id_init (PhotoID *self, gint64 id); +gint64 parse_int64 (const gchar* str, + gint num_base); +void photo_id_init (PhotoID *self, + gint64 id); static void tag_table_finalize (DatabaseTable * obj); -static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func); -static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func); +static void _vala_array_destroy (gpointer array, + gint array_length, + GDestroyNotify destroy_func); +static void _vala_array_free (gpointer array, + gint array_length, + GDestroyNotify destroy_func); static gint _vala_array_length (gpointer array); -void tag_id_init (TagID *self, gint64 id) { - gint64 _tmp0_; +void +tag_id_init (TagID *self, + gint64 id) +{ #line 12 "/home/jens/Source/shotwell/src/db/TagTable.vala" memset (self, 0, sizeof (TagID)); #line 13 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp0_ = id; -#line 13 "/home/jens/Source/shotwell/src/db/TagTable.vala" - (*self).id = _tmp0_; -#line 213 "TagTable.c" + (*self).id = id; +#line 260 "TagTable.c" } -gboolean tag_id_is_invalid (TagID *self) { +gboolean +tag_id_is_invalid (TagID *self) +{ gboolean result = FALSE; gint64 _tmp0_; #line 17 "/home/jens/Source/shotwell/src/db/TagTable.vala" @@ -222,11 +271,13 @@ gboolean tag_id_is_invalid (TagID *self) { result = _tmp0_ == TAG_ID_INVALID; #line 17 "/home/jens/Source/shotwell/src/db/TagTable.vala" return result; -#line 226 "TagTable.c" +#line 275 "TagTable.c" } -gboolean tag_id_is_valid (TagID *self) { +gboolean +tag_id_is_valid (TagID *self) +{ gboolean result = FALSE; gint64 _tmp0_; #line 21 "/home/jens/Source/shotwell/src/db/TagTable.vala" @@ -235,11 +286,13 @@ gboolean tag_id_is_valid (TagID *self) { result = _tmp0_ != TAG_ID_INVALID; #line 21 "/home/jens/Source/shotwell/src/db/TagTable.vala" return result; -#line 239 "TagTable.c" +#line 290 "TagTable.c" } -TagID* tag_id_dup (const TagID* self) { +TagID* +tag_id_dup (const TagID* self) +{ TagID* dup; #line 7 "/home/jens/Source/shotwell/src/db/TagTable.vala" dup = g_new0 (TagID, 1); @@ -247,18 +300,22 @@ TagID* tag_id_dup (const TagID* self) { memcpy (dup, self, sizeof (TagID)); #line 7 "/home/jens/Source/shotwell/src/db/TagTable.vala" return dup; -#line 251 "TagTable.c" +#line 304 "TagTable.c" } -void tag_id_free (TagID* self) { +void +tag_id_free (TagID* self) +{ #line 7 "/home/jens/Source/shotwell/src/db/TagTable.vala" g_free (self); -#line 258 "TagTable.c" +#line 313 "TagTable.c" } -GType tag_id_get_type (void) { +GType +tag_id_get_type (void) +{ static volatile gsize tag_id_type_id__volatile = 0; if (g_once_init_enter (&tag_id_type_id__volatile)) { GType tag_id_type_id; @@ -269,121 +326,150 @@ GType tag_id_get_type (void) { } -TagRow* tag_row_construct (GType object_type) { +TagRow* +tag_row_construct (GType object_type) +{ TagRow* self = NULL; #line 25 "/home/jens/Source/shotwell/src/db/TagTable.vala" self = (TagRow*) g_type_create_instance (object_type); #line 25 "/home/jens/Source/shotwell/src/db/TagTable.vala" return self; -#line 279 "TagTable.c" +#line 338 "TagTable.c" } -TagRow* tag_row_new (void) { +TagRow* +tag_row_new (void) +{ #line 25 "/home/jens/Source/shotwell/src/db/TagTable.vala" return tag_row_construct (TYPE_TAG_ROW); -#line 286 "TagTable.c" +#line 347 "TagTable.c" } -static void value_tag_row_init (GValue* value) { +static void +value_tag_row_init (GValue* value) +{ #line 25 "/home/jens/Source/shotwell/src/db/TagTable.vala" value->data[0].v_pointer = NULL; -#line 293 "TagTable.c" +#line 356 "TagTable.c" } -static void value_tag_row_free_value (GValue* value) { +static void +value_tag_row_free_value (GValue* value) +{ #line 25 "/home/jens/Source/shotwell/src/db/TagTable.vala" if (value->data[0].v_pointer) { #line 25 "/home/jens/Source/shotwell/src/db/TagTable.vala" tag_row_unref (value->data[0].v_pointer); -#line 302 "TagTable.c" +#line 367 "TagTable.c" } } -static void value_tag_row_copy_value (const GValue* src_value, GValue* dest_value) { +static void +value_tag_row_copy_value (const GValue* src_value, + GValue* dest_value) +{ #line 25 "/home/jens/Source/shotwell/src/db/TagTable.vala" if (src_value->data[0].v_pointer) { #line 25 "/home/jens/Source/shotwell/src/db/TagTable.vala" dest_value->data[0].v_pointer = tag_row_ref (src_value->data[0].v_pointer); -#line 312 "TagTable.c" +#line 380 "TagTable.c" } else { #line 25 "/home/jens/Source/shotwell/src/db/TagTable.vala" dest_value->data[0].v_pointer = NULL; -#line 316 "TagTable.c" +#line 384 "TagTable.c" } } -static gpointer value_tag_row_peek_pointer (const GValue* value) { +static gpointer +value_tag_row_peek_pointer (const GValue* value) +{ #line 25 "/home/jens/Source/shotwell/src/db/TagTable.vala" return value->data[0].v_pointer; -#line 324 "TagTable.c" +#line 394 "TagTable.c" } -static gchar* value_tag_row_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_tag_row_collect_value (GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ #line 25 "/home/jens/Source/shotwell/src/db/TagTable.vala" if (collect_values[0].v_pointer) { -#line 331 "TagTable.c" +#line 406 "TagTable.c" TagRow * object; object = collect_values[0].v_pointer; #line 25 "/home/jens/Source/shotwell/src/db/TagTable.vala" if (object->parent_instance.g_class == NULL) { #line 25 "/home/jens/Source/shotwell/src/db/TagTable.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 338 "TagTable.c" +#line 413 "TagTable.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 25 "/home/jens/Source/shotwell/src/db/TagTable.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 342 "TagTable.c" +#line 417 "TagTable.c" } #line 25 "/home/jens/Source/shotwell/src/db/TagTable.vala" value->data[0].v_pointer = tag_row_ref (object); -#line 346 "TagTable.c" +#line 421 "TagTable.c" } else { #line 25 "/home/jens/Source/shotwell/src/db/TagTable.vala" value->data[0].v_pointer = NULL; -#line 350 "TagTable.c" +#line 425 "TagTable.c" } #line 25 "/home/jens/Source/shotwell/src/db/TagTable.vala" return NULL; -#line 354 "TagTable.c" +#line 429 "TagTable.c" } -static gchar* value_tag_row_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_tag_row_lcopy_value (const GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ TagRow ** object_p; object_p = collect_values[0].v_pointer; #line 25 "/home/jens/Source/shotwell/src/db/TagTable.vala" if (!object_p) { #line 25 "/home/jens/Source/shotwell/src/db/TagTable.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 365 "TagTable.c" +#line 445 "TagTable.c" } #line 25 "/home/jens/Source/shotwell/src/db/TagTable.vala" if (!value->data[0].v_pointer) { #line 25 "/home/jens/Source/shotwell/src/db/TagTable.vala" *object_p = NULL; -#line 371 "TagTable.c" +#line 451 "TagTable.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 25 "/home/jens/Source/shotwell/src/db/TagTable.vala" *object_p = value->data[0].v_pointer; -#line 375 "TagTable.c" +#line 455 "TagTable.c" } else { #line 25 "/home/jens/Source/shotwell/src/db/TagTable.vala" *object_p = tag_row_ref (value->data[0].v_pointer); -#line 379 "TagTable.c" +#line 459 "TagTable.c" } #line 25 "/home/jens/Source/shotwell/src/db/TagTable.vala" return NULL; -#line 383 "TagTable.c" +#line 463 "TagTable.c" } -GParamSpec* param_spec_tag_row (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { +GParamSpec* +param_spec_tag_row (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) +{ ParamSpecTagRow* spec; #line 25 "/home/jens/Source/shotwell/src/db/TagTable.vala" g_return_val_if_fail (g_type_is_a (object_type, TYPE_TAG_ROW), NULL); @@ -393,20 +479,25 @@ GParamSpec* param_spec_tag_row (const gchar* name, const gchar* nick, const gcha G_PARAM_SPEC (spec)->value_type = object_type; #line 25 "/home/jens/Source/shotwell/src/db/TagTable.vala" return G_PARAM_SPEC (spec); -#line 397 "TagTable.c" +#line 483 "TagTable.c" } -gpointer value_get_tag_row (const GValue* value) { +gpointer +value_get_tag_row (const GValue* value) +{ #line 25 "/home/jens/Source/shotwell/src/db/TagTable.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_TAG_ROW), NULL); #line 25 "/home/jens/Source/shotwell/src/db/TagTable.vala" return value->data[0].v_pointer; -#line 406 "TagTable.c" +#line 494 "TagTable.c" } -void value_set_tag_row (GValue* value, gpointer v_object) { +void +value_set_tag_row (GValue* value, + gpointer v_object) +{ TagRow * old; #line 25 "/home/jens/Source/shotwell/src/db/TagTable.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_TAG_ROW)); @@ -422,22 +513,25 @@ void value_set_tag_row (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 25 "/home/jens/Source/shotwell/src/db/TagTable.vala" tag_row_ref (value->data[0].v_pointer); -#line 426 "TagTable.c" +#line 517 "TagTable.c" } else { #line 25 "/home/jens/Source/shotwell/src/db/TagTable.vala" value->data[0].v_pointer = NULL; -#line 430 "TagTable.c" +#line 521 "TagTable.c" } #line 25 "/home/jens/Source/shotwell/src/db/TagTable.vala" if (old) { #line 25 "/home/jens/Source/shotwell/src/db/TagTable.vala" tag_row_unref (old); -#line 436 "TagTable.c" +#line 527 "TagTable.c" } } -void value_take_tag_row (GValue* value, gpointer v_object) { +void +value_take_tag_row (GValue* value, + gpointer v_object) +{ TagRow * old; #line 25 "/home/jens/Source/shotwell/src/db/TagTable.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_TAG_ROW)); @@ -451,38 +545,44 @@ void value_take_tag_row (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 25 "/home/jens/Source/shotwell/src/db/TagTable.vala" value->data[0].v_pointer = v_object; -#line 455 "TagTable.c" +#line 549 "TagTable.c" } else { #line 25 "/home/jens/Source/shotwell/src/db/TagTable.vala" value->data[0].v_pointer = NULL; -#line 459 "TagTable.c" +#line 553 "TagTable.c" } #line 25 "/home/jens/Source/shotwell/src/db/TagTable.vala" if (old) { #line 25 "/home/jens/Source/shotwell/src/db/TagTable.vala" tag_row_unref (old); -#line 465 "TagTable.c" +#line 559 "TagTable.c" } } -static void tag_row_class_init (TagRowClass * klass) { +static void +tag_row_class_init (TagRowClass * klass) +{ #line 25 "/home/jens/Source/shotwell/src/db/TagTable.vala" tag_row_parent_class = g_type_class_peek_parent (klass); #line 25 "/home/jens/Source/shotwell/src/db/TagTable.vala" ((TagRowClass *) klass)->finalize = tag_row_finalize; -#line 475 "TagTable.c" +#line 571 "TagTable.c" } -static void tag_row_instance_init (TagRow * self) { +static void +tag_row_instance_init (TagRow * self) +{ #line 25 "/home/jens/Source/shotwell/src/db/TagTable.vala" self->ref_count = 1; -#line 482 "TagTable.c" +#line 580 "TagTable.c" } -static void tag_row_finalize (TagRow * obj) { +static void +tag_row_finalize (TagRow * obj) +{ TagRow * self; #line 25 "/home/jens/Source/shotwell/src/db/TagTable.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_TAG_ROW, TagRow); @@ -492,11 +592,13 @@ static void tag_row_finalize (TagRow * obj) { _g_free0 (self->name); #line 28 "/home/jens/Source/shotwell/src/db/TagTable.vala" _g_object_unref0 (self->source_id_list); -#line 496 "TagTable.c" +#line 596 "TagTable.c" } -GType tag_row_get_type (void) { +GType +tag_row_get_type (void) +{ static volatile gsize tag_row_type_id__volatile = 0; if (g_once_init_enter (&tag_row_type_id__volatile)) { static const GTypeValueTable g_define_type_value_table = { value_tag_row_init, value_tag_row_free_value, value_tag_row_copy_value, value_tag_row_peek_pointer, "p", value_tag_row_collect_value, "p", value_tag_row_lcopy_value }; @@ -510,18 +612,22 @@ GType tag_row_get_type (void) { } -gpointer tag_row_ref (gpointer instance) { +gpointer +tag_row_ref (gpointer instance) +{ TagRow * self; self = instance; #line 25 "/home/jens/Source/shotwell/src/db/TagTable.vala" g_atomic_int_inc (&self->ref_count); #line 25 "/home/jens/Source/shotwell/src/db/TagTable.vala" return instance; -#line 521 "TagTable.c" +#line 625 "TagTable.c" } -void tag_row_unref (gpointer instance) { +void +tag_row_unref (gpointer instance) +{ TagRow * self; self = instance; #line 25 "/home/jens/Source/shotwell/src/db/TagTable.vala" @@ -530,12 +636,14 @@ void tag_row_unref (gpointer instance) { TAG_ROW_GET_CLASS (self)->finalize (self); #line 25 "/home/jens/Source/shotwell/src/db/TagTable.vala" g_type_free_instance ((GTypeInstance *) self); -#line 534 "TagTable.c" +#line 640 "TagTable.c" } } -static TagTable* tag_table_construct (GType object_type) { +static TagTable* +tag_table_construct (GType object_type) +{ TagTable* self = NULL; sqlite3_stmt* stmt = NULL; gint res = 0; @@ -545,7 +653,6 @@ static TagTable* tag_table_construct (GType object_type) { gint _tmp3_; sqlite3_stmt* _tmp4_; gint _tmp5_; - gint _tmp6_; #line 35 "/home/jens/Source/shotwell/src/db/TagTable.vala" self = (TagTable*) database_table_construct (object_type); #line 36 "/home/jens/Source/shotwell/src/db/TagTable.vala" @@ -567,44 +674,48 @@ static TagTable* tag_table_construct (GType object_type) { #line 49 "/home/jens/Source/shotwell/src/db/TagTable.vala" _tmp4_ = stmt; #line 49 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp5_ = sqlite3_step (_tmp4_); -#line 49 "/home/jens/Source/shotwell/src/db/TagTable.vala" - res = _tmp5_; + res = sqlite3_step (_tmp4_); #line 50 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp6_ = res; + _tmp5_ = res; #line 50 "/home/jens/Source/shotwell/src/db/TagTable.vala" - if (_tmp6_ != SQLITE_DONE) { -#line 578 "TagTable.c" - gint _tmp7_; + if (_tmp5_ != SQLITE_DONE) { +#line 683 "TagTable.c" + gint _tmp6_; #line 51 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp7_ = res; + _tmp6_ = res; #line 51 "/home/jens/Source/shotwell/src/db/TagTable.vala" - database_table_fatal ("create TagTable", _tmp7_); -#line 584 "TagTable.c" + database_table_fatal ("create TagTable", _tmp6_); +#line 689 "TagTable.c" } #line 35 "/home/jens/Source/shotwell/src/db/TagTable.vala" _sqlite3_finalize0 (stmt); #line 35 "/home/jens/Source/shotwell/src/db/TagTable.vala" return self; -#line 590 "TagTable.c" +#line 695 "TagTable.c" } -static TagTable* tag_table_new (void) { +static TagTable* +tag_table_new (void) +{ #line 35 "/home/jens/Source/shotwell/src/db/TagTable.vala" return tag_table_construct (TYPE_TAG_TABLE); -#line 597 "TagTable.c" +#line 704 "TagTable.c" } -static gpointer _database_table_ref0 (gpointer self) { +static gpointer +_database_table_ref0 (gpointer self) +{ #line 58 "/home/jens/Source/shotwell/src/db/TagTable.vala" return self ? database_table_ref (self) : NULL; -#line 604 "TagTable.c" +#line 713 "TagTable.c" } -TagTable* tag_table_get_instance (void) { +TagTable* +tag_table_get_instance (void) +{ TagTable* result = NULL; TagTable* _tmp0_; TagTable* _tmp2_; @@ -613,7 +724,7 @@ TagTable* tag_table_get_instance (void) { _tmp0_ = tag_table_instance; #line 55 "/home/jens/Source/shotwell/src/db/TagTable.vala" if (_tmp0_ == NULL) { -#line 617 "TagTable.c" +#line 728 "TagTable.c" TagTable* _tmp1_; #line 56 "/home/jens/Source/shotwell/src/db/TagTable.vala" _tmp1_ = tag_table_new (); @@ -621,7 +732,7 @@ TagTable* tag_table_get_instance (void) { _database_table_unref0 (tag_table_instance); #line 56 "/home/jens/Source/shotwell/src/db/TagTable.vala" tag_table_instance = _tmp1_; -#line 625 "TagTable.c" +#line 736 "TagTable.c" } #line 58 "/home/jens/Source/shotwell/src/db/TagTable.vala" _tmp2_ = tag_table_instance; @@ -631,180 +742,173 @@ TagTable* tag_table_get_instance (void) { result = _tmp3_; #line 58 "/home/jens/Source/shotwell/src/db/TagTable.vala" return result; -#line 635 "TagTable.c" +#line 746 "TagTable.c" } -static gpointer _g_object_ref0 (gpointer self) { +static gpointer +_g_object_ref0 (gpointer self) +{ #line 67 "/home/jens/Source/shotwell/src/db/TagTable.vala" return self ? g_object_ref (self) : NULL; -#line 642 "TagTable.c" +#line 755 "TagTable.c" } -static gchar* string_replace (const gchar* self, const gchar* old, const gchar* replacement) { +static gchar* +string_replace (const gchar* self, + const gchar* old, + const gchar* replacement) +{ gchar* result = NULL; gboolean _tmp0_ = FALSE; gboolean _tmp1_ = FALSE; GError * _inner_error_ = NULL; -#line 1407 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1421 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1407 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1421 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_return_val_if_fail (old != NULL, NULL); -#line 1407 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1421 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_return_val_if_fail (replacement != NULL, NULL); -#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" if ((*((gchar*) self)) == '\0') { -#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _tmp1_ = TRUE; -#line 661 "TagTable.c" +#line 778 "TagTable.c" } else { - const gchar* _tmp2_; -#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp2_ = old; -#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp1_ = (*((gchar*) _tmp2_)) == '\0'; -#line 668 "TagTable.c" +#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp1_ = (*((gchar*) old)) == '\0'; +#line 782 "TagTable.c" } -#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" if (_tmp1_) { -#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _tmp0_ = TRUE; -#line 674 "TagTable.c" +#line 788 "TagTable.c" } else { - const gchar* _tmp3_; - const gchar* _tmp4_; -#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp3_ = old; -#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp4_ = replacement; -#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp0_ = g_strcmp0 (_tmp3_, _tmp4_) == 0; -#line 684 "TagTable.c" +#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp0_ = g_strcmp0 (old, replacement) == 0; +#line 792 "TagTable.c" } -#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" if (_tmp0_) { -#line 688 "TagTable.c" - gchar* _tmp5_; -#line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp5_ = g_strdup (self); -#line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - result = _tmp5_; -#line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 796 "TagTable.c" + gchar* _tmp2_; +#line 1423 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp2_ = g_strdup (self); +#line 1423 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + result = _tmp2_; +#line 1423 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 696 "TagTable.c" +#line 804 "TagTable.c" } { GRegex* regex = NULL; - const gchar* _tmp6_; - gchar* _tmp7_; - gchar* _tmp8_; - GRegex* _tmp9_; - GRegex* _tmp10_; - gchar* _tmp11_ = NULL; - GRegex* _tmp12_; - const gchar* _tmp13_; - gchar* _tmp14_; - gchar* _tmp15_; -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp6_ = old; -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp7_ = g_regex_escape_string (_tmp6_, -1); -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp8_ = _tmp7_; -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp9_ = g_regex_new (_tmp8_, 0, 0, &_inner_error_); -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp10_ = _tmp9_; -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _g_free0 (_tmp8_); -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - regex = _tmp10_; -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + gchar* _tmp3_; + gchar* _tmp4_; + GRegex* _tmp5_; + GRegex* _tmp6_; + gchar* _tmp7_ = NULL; + GRegex* _tmp8_; + gchar* _tmp9_; + gchar* _tmp10_; +#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp3_ = g_regex_escape_string (old, -1); +#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp4_ = _tmp3_; +#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp5_ = g_regex_new (_tmp4_, 0, 0, &_inner_error_); +#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp6_ = _tmp5_; +#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _g_free0 (_tmp4_); +#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + regex = _tmp6_; +#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" if (_inner_error_->domain == G_REGEX_ERROR) { -#line 728 "TagTable.c" +#line 832 "TagTable.c" goto __catch21_g_regex_error; } -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_clear_error (&_inner_error_); -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return NULL; -#line 737 "TagTable.c" +#line 841 "TagTable.c" } -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp12_ = regex; -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp13_ = replacement; -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp14_ = g_regex_replace_literal (_tmp12_, self, (gssize) -1, 0, _tmp13_, 0, &_inner_error_); -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp11_ = _tmp14_; -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp8_ = regex; +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp9_ = g_regex_replace_literal (_tmp8_, self, (gssize) -1, 0, replacement, 0, &_inner_error_); +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp7_ = _tmp9_; +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _g_regex_unref0 (regex); -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" if (_inner_error_->domain == G_REGEX_ERROR) { -#line 753 "TagTable.c" +#line 855 "TagTable.c" goto __catch21_g_regex_error; } -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _g_regex_unref0 (regex); -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_clear_error (&_inner_error_); -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return NULL; -#line 764 "TagTable.c" +#line 866 "TagTable.c" } -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp15_ = _tmp11_; -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp11_ = NULL; -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - result = _tmp15_; -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _g_free0 (_tmp11_); -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp10_ = _tmp7_; +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp7_ = NULL; +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + result = _tmp10_; +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _g_free0 (_tmp7_); +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _g_regex_unref0 (regex); -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 778 "TagTable.c" +#line 880 "TagTable.c" } goto __finally21; __catch21_g_regex_error: { GError* e = NULL; -#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" e = _inner_error_; -#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _inner_error_ = NULL; -#line 1415 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1429 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_assert_not_reached (); -#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _g_error_free0 (e); -#line 792 "TagTable.c" +#line 894 "TagTable.c" } __finally21: -#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_clear_error (&_inner_error_); -#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return NULL; -#line 803 "TagTable.c" +#line 905 "TagTable.c" } } -void tag_table_upgrade_for_htags (void) { +void +tag_table_upgrade_for_htags (void) +{ TagTable* table = NULL; TagTable* _tmp0_; GError * _inner_error_ = NULL; @@ -812,7 +916,7 @@ void tag_table_upgrade_for_htags (void) { _tmp0_ = tag_table_get_instance (); #line 62 "/home/jens/Source/shotwell/src/db/TagTable.vala" table = _tmp0_; -#line 816 "TagTable.c" +#line 920 "TagTable.c" { GeeList* rows = NULL; TagTable* _tmp1_; @@ -827,7 +931,7 @@ void tag_table_upgrade_for_htags (void) { if (G_UNLIKELY (_inner_error_ != NULL)) { #line 65 "/home/jens/Source/shotwell/src/db/TagTable.vala" if (_inner_error_->domain == DATABASE_ERROR) { -#line 831 "TagTable.c" +#line 935 "TagTable.c" goto __catch20_database_error; } #line 65 "/home/jens/Source/shotwell/src/db/TagTable.vala" @@ -838,7 +942,7 @@ void tag_table_upgrade_for_htags (void) { g_clear_error (&_inner_error_); #line 65 "/home/jens/Source/shotwell/src/db/TagTable.vala" return; -#line 842 "TagTable.c" +#line 946 "TagTable.c" } { GeeList* _row_list = NULL; @@ -867,7 +971,7 @@ void tag_table_upgrade_for_htags (void) { _row_index = -1; #line 67 "/home/jens/Source/shotwell/src/db/TagTable.vala" while (TRUE) { -#line 871 "TagTable.c" +#line 975 "TagTable.c" gint _tmp8_; gint _tmp9_; gint _tmp10_; @@ -896,7 +1000,7 @@ void tag_table_upgrade_for_htags (void) { if (!(_tmp9_ < _tmp10_)) { #line 67 "/home/jens/Source/shotwell/src/db/TagTable.vala" break; -#line 900 "TagTable.c" +#line 1004 "TagTable.c" } #line 67 "/home/jens/Source/shotwell/src/db/TagTable.vala" _tmp11_ = _row_list; @@ -940,7 +1044,7 @@ void tag_table_upgrade_for_htags (void) { _g_object_unref0 (rows); #line 69 "/home/jens/Source/shotwell/src/db/TagTable.vala" if (_inner_error_->domain == DATABASE_ERROR) { -#line 944 "TagTable.c" +#line 1048 "TagTable.c" goto __catch20_database_error; } #line 69 "/home/jens/Source/shotwell/src/db/TagTable.vala" @@ -957,19 +1061,19 @@ void tag_table_upgrade_for_htags (void) { g_clear_error (&_inner_error_); #line 69 "/home/jens/Source/shotwell/src/db/TagTable.vala" return; -#line 961 "TagTable.c" +#line 1065 "TagTable.c" } #line 67 "/home/jens/Source/shotwell/src/db/TagTable.vala" _tag_row_unref0 (row); -#line 965 "TagTable.c" +#line 1069 "TagTable.c" } #line 67 "/home/jens/Source/shotwell/src/db/TagTable.vala" _g_object_unref0 (_row_list); -#line 969 "TagTable.c" +#line 1073 "TagTable.c" } #line 64 "/home/jens/Source/shotwell/src/db/TagTable.vala" _g_object_unref0 (rows); -#line 973 "TagTable.c" +#line 1077 "TagTable.c" } goto __finally20; __catch20_database_error: @@ -987,7 +1091,7 @@ void tag_table_upgrade_for_htags (void) { "ag support: %s", _tmp23_); #line 64 "/home/jens/Source/shotwell/src/db/TagTable.vala" _g_error_free0 (e); -#line 990 "TagTable.c" +#line 1094 "TagTable.c" } __finally20: #line 64 "/home/jens/Source/shotwell/src/db/TagTable.vala" @@ -1000,15 +1104,19 @@ void tag_table_upgrade_for_htags (void) { g_clear_error (&_inner_error_); #line 64 "/home/jens/Source/shotwell/src/db/TagTable.vala" return; -#line 1003 "TagTable.c" +#line 1107 "TagTable.c" } #line 61 "/home/jens/Source/shotwell/src/db/TagTable.vala" _database_table_unref0 (table); -#line 1007 "TagTable.c" +#line 1111 "TagTable.c" } -TagRow* tag_table_add (TagTable* self, const gchar* name, GError** error) { +TagRow* +tag_table_add (TagTable* self, + const gchar* name, + GError** error) +{ TagRow* result = NULL; sqlite3_stmt* stmt = NULL; gint res = 0; @@ -1017,31 +1125,24 @@ TagRow* tag_table_add (TagTable* self, const gchar* name, GError** error) { gint _tmp2_; gint _tmp3_; time_t time_created = 0; - gulong _tmp4_; - sqlite3_stmt* _tmp5_; - const gchar* _tmp6_; - gchar* _tmp7_; - GDestroyNotify _tmp8_; - gint _tmp9_; + sqlite3_stmt* _tmp4_; + gchar* _tmp5_; + GDestroyNotify _tmp6_; + gint _tmp7_; + sqlite3_stmt* _tmp8_; + time_t _tmp9_; gint _tmp10_; sqlite3_stmt* _tmp11_; - time_t _tmp12_; - gint _tmp13_; - gint _tmp14_; - sqlite3_stmt* _tmp15_; - gint _tmp16_; - gint _tmp17_; + gint _tmp12_; TagRow* row = NULL; + TagRow* _tmp14_; + TagRow* _tmp15_; + sqlite3* _tmp16_; + TagRow* _tmp17_; + gchar* _tmp18_; TagRow* _tmp19_; TagRow* _tmp20_; - sqlite3* _tmp21_; - gint64 _tmp22_; - TagRow* _tmp23_; - const gchar* _tmp24_; - gchar* _tmp25_; - TagRow* _tmp26_; - TagRow* _tmp27_; - time_t _tmp28_; + time_t _tmp21_; GError * _inner_error_ = NULL; #line 76 "/home/jens/Source/shotwell/src/db/TagTable.vala" g_return_val_if_fail (IS_TAG_TABLE (self), NULL); @@ -1062,53 +1163,43 @@ TagRow* tag_table_add (TagTable* self, const gchar* name, GError** error) { #line 80 "/home/jens/Source/shotwell/src/db/TagTable.vala" _vala_assert (_tmp3_ == SQLITE_OK, "res == Sqlite.OK"); #line 82 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp4_ = now_sec (); -#line 82 "/home/jens/Source/shotwell/src/db/TagTable.vala" - time_created = (time_t) _tmp4_; -#line 84 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp5_ = stmt; + time_created = (time_t) now_sec (); #line 84 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp6_ = name; -#line 84 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp7_ = g_strdup (_tmp6_); + _tmp4_ = stmt; #line 84 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp8_ = g_free; + _tmp5_ = g_strdup (name); #line 84 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp9_ = sqlite3_bind_text (_tmp5_, 1, _tmp7_, -1, _tmp8_); + _tmp6_ = g_free; #line 84 "/home/jens/Source/shotwell/src/db/TagTable.vala" - res = _tmp9_; + res = sqlite3_bind_text (_tmp4_, 1, _tmp5_, -1, _tmp6_); #line 85 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp10_ = res; + _tmp7_ = res; #line 85 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _vala_assert (_tmp10_ == SQLITE_OK, "res == Sqlite.OK"); + _vala_assert (_tmp7_ == SQLITE_OK, "res == Sqlite.OK"); #line 86 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp11_ = stmt; + _tmp8_ = stmt; #line 86 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp12_ = time_created; + _tmp9_ = time_created; #line 86 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp13_ = sqlite3_bind_int64 (_tmp11_, 2, (gint64) _tmp12_); -#line 86 "/home/jens/Source/shotwell/src/db/TagTable.vala" - res = _tmp13_; + res = sqlite3_bind_int64 (_tmp8_, 2, (gint64) _tmp9_); #line 87 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp14_ = res; + _tmp10_ = res; #line 87 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _vala_assert (_tmp14_ == SQLITE_OK, "res == Sqlite.OK"); -#line 89 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp15_ = stmt; + _vala_assert (_tmp10_ == SQLITE_OK, "res == Sqlite.OK"); #line 89 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp16_ = sqlite3_step (_tmp15_); + _tmp11_ = stmt; #line 89 "/home/jens/Source/shotwell/src/db/TagTable.vala" - res = _tmp16_; + res = sqlite3_step (_tmp11_); #line 90 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp17_ = res; + _tmp12_ = res; #line 90 "/home/jens/Source/shotwell/src/db/TagTable.vala" - if (_tmp17_ != SQLITE_DONE) { -#line 1106 "TagTable.c" - gint _tmp18_; + if (_tmp12_ != SQLITE_DONE) { +#line 1197 "TagTable.c" + gint _tmp13_; #line 91 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp18_ = res; + _tmp13_ = res; #line 91 "/home/jens/Source/shotwell/src/db/TagTable.vala" - database_table_throw_error ("TagTable.add", _tmp18_, &_inner_error_); + database_table_throw_error ("TagTable.add", _tmp13_, &_inner_error_); #line 91 "/home/jens/Source/shotwell/src/db/TagTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 91 "/home/jens/Source/shotwell/src/db/TagTable.vala" @@ -1119,7 +1210,7 @@ TagRow* tag_table_add (TagTable* self, const gchar* name, GError** error) { _sqlite3_finalize0 (stmt); #line 91 "/home/jens/Source/shotwell/src/db/TagTable.vala" return NULL; -#line 1122 "TagTable.c" +#line 1213 "TagTable.c" } else { #line 91 "/home/jens/Source/shotwell/src/db/TagTable.vala" _sqlite3_finalize0 (stmt); @@ -1129,55 +1220,56 @@ TagRow* tag_table_add (TagTable* self, const gchar* name, GError** error) { g_clear_error (&_inner_error_); #line 91 "/home/jens/Source/shotwell/src/db/TagTable.vala" return NULL; -#line 1132 "TagTable.c" +#line 1223 "TagTable.c" } } } #line 93 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp19_ = tag_row_new (); + _tmp14_ = tag_row_new (); #line 93 "/home/jens/Source/shotwell/src/db/TagTable.vala" - row = _tmp19_; -#line 94 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp20_ = row; + row = _tmp14_; #line 94 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp21_ = database_table_db; + _tmp15_ = row; #line 94 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp22_ = sqlite3_last_insert_rowid (_tmp21_); + _tmp16_ = database_table_db; #line 94 "/home/jens/Source/shotwell/src/db/TagTable.vala" - tag_id_init (&_tmp20_->tag_id, _tmp22_); + tag_id_init (&_tmp15_->tag_id, sqlite3_last_insert_rowid (_tmp16_)); #line 95 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp23_ = row; -#line 95 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp24_ = name; + _tmp17_ = row; #line 95 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp25_ = g_strdup (_tmp24_); + _tmp18_ = g_strdup (name); #line 95 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _g_free0 (_tmp23_->name); + _g_free0 (_tmp17_->name); #line 95 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp23_->name = _tmp25_; + _tmp17_->name = _tmp18_; #line 96 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp26_ = row; + _tmp19_ = row; #line 96 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _g_object_unref0 (_tmp26_->source_id_list); + _g_object_unref0 (_tmp19_->source_id_list); #line 96 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp26_->source_id_list = NULL; + _tmp19_->source_id_list = NULL; #line 97 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp27_ = row; + _tmp20_ = row; #line 97 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp28_ = time_created; + _tmp21_ = time_created; #line 97 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp27_->time_created = _tmp28_; + _tmp20_->time_created = _tmp21_; #line 99 "/home/jens/Source/shotwell/src/db/TagTable.vala" result = row; #line 99 "/home/jens/Source/shotwell/src/db/TagTable.vala" _sqlite3_finalize0 (stmt); #line 99 "/home/jens/Source/shotwell/src/db/TagTable.vala" return result; -#line 1176 "TagTable.c" +#line 1263 "TagTable.c" } -void tag_table_create_from_row (TagTable* self, TagRow* row, TagID* result, GError** error) { +void +tag_table_create_from_row (TagTable* self, + TagRow* row, + TagID* result, + GError** error) +{ sqlite3_stmt* stmt = NULL; gint res = 0; sqlite3* _tmp0_; @@ -1185,30 +1277,22 @@ void tag_table_create_from_row (TagTable* self, TagRow* row, TagID* result, GErr gint _tmp2_; gint _tmp3_; sqlite3_stmt* _tmp4_; - TagRow* _tmp5_; - const gchar* _tmp6_; - gchar* _tmp7_; - GDestroyNotify _tmp8_; - gint _tmp9_; - gint _tmp10_; - sqlite3_stmt* _tmp11_; - TagRow* _tmp12_; - GeeSet* _tmp13_; - gchar* _tmp14_; - GDestroyNotify _tmp15_; + const gchar* _tmp5_; + gchar* _tmp6_; + GDestroyNotify _tmp7_; + gint _tmp8_; + sqlite3_stmt* _tmp9_; + GeeSet* _tmp10_; + gchar* _tmp11_; + GDestroyNotify _tmp12_; + gint _tmp13_; + sqlite3_stmt* _tmp14_; + time_t _tmp15_; gint _tmp16_; - gint _tmp17_; - sqlite3_stmt* _tmp18_; - TagRow* _tmp19_; - time_t _tmp20_; - gint _tmp21_; - gint _tmp22_; - sqlite3_stmt* _tmp23_; - gint _tmp24_; - gint _tmp25_; - sqlite3* _tmp27_; - gint64 _tmp28_; - TagID _tmp29_ = {0}; + sqlite3_stmt* _tmp17_; + gint _tmp18_; + sqlite3* _tmp20_; + TagID _tmp21_ = {0}; GError * _inner_error_ = NULL; #line 103 "/home/jens/Source/shotwell/src/db/TagTable.vala" g_return_if_fail (IS_TAG_TABLE (self)); @@ -1232,69 +1316,55 @@ void tag_table_create_from_row (TagTable* self, TagRow* row, TagID* result, GErr #line 109 "/home/jens/Source/shotwell/src/db/TagTable.vala" _tmp4_ = stmt; #line 109 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp5_ = row; -#line 109 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp6_ = _tmp5_->name; + _tmp5_ = row->name; #line 109 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp7_ = g_strdup (_tmp6_); -#line 109 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp8_ = g_free; + _tmp6_ = g_strdup (_tmp5_); #line 109 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp9_ = sqlite3_bind_text (_tmp4_, 1, _tmp7_, -1, _tmp8_); + _tmp7_ = g_free; #line 109 "/home/jens/Source/shotwell/src/db/TagTable.vala" - res = _tmp9_; + res = sqlite3_bind_text (_tmp4_, 1, _tmp6_, -1, _tmp7_); #line 110 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp10_ = res; + _tmp8_ = res; #line 110 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _vala_assert (_tmp10_ == SQLITE_OK, "res == Sqlite.OK"); -#line 111 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp11_ = stmt; -#line 111 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp12_ = row; + _vala_assert (_tmp8_ == SQLITE_OK, "res == Sqlite.OK"); #line 111 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp13_ = _tmp12_->source_id_list; + _tmp9_ = stmt; #line 111 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp14_ = tag_table_serialize_source_ids (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp10_ = row->source_id_list; #line 111 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp15_ = g_free; + _tmp11_ = tag_table_serialize_source_ids (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_COLLECTION, GeeCollection)); #line 111 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp16_ = sqlite3_bind_text (_tmp11_, 2, _tmp14_, -1, _tmp15_); + _tmp12_ = g_free; #line 111 "/home/jens/Source/shotwell/src/db/TagTable.vala" - res = _tmp16_; + res = sqlite3_bind_text (_tmp9_, 2, _tmp11_, -1, _tmp12_); #line 112 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp17_ = res; + _tmp13_ = res; #line 112 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _vala_assert (_tmp17_ == SQLITE_OK, "res == Sqlite.OK"); + _vala_assert (_tmp13_ == SQLITE_OK, "res == Sqlite.OK"); #line 113 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp18_ = stmt; + _tmp14_ = stmt; #line 113 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp19_ = row; -#line 113 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp20_ = _tmp19_->time_created; -#line 113 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp21_ = sqlite3_bind_int64 (_tmp18_, 3, (gint64) _tmp20_); + _tmp15_ = row->time_created; #line 113 "/home/jens/Source/shotwell/src/db/TagTable.vala" - res = _tmp21_; + res = sqlite3_bind_int64 (_tmp14_, 3, (gint64) _tmp15_); #line 114 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp22_ = res; + _tmp16_ = res; #line 114 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _vala_assert (_tmp22_ == SQLITE_OK, "res == Sqlite.OK"); + _vala_assert (_tmp16_ == SQLITE_OK, "res == Sqlite.OK"); #line 116 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp23_ = stmt; + _tmp17_ = stmt; #line 116 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp24_ = sqlite3_step (_tmp23_); -#line 116 "/home/jens/Source/shotwell/src/db/TagTable.vala" - res = _tmp24_; + res = sqlite3_step (_tmp17_); #line 117 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp25_ = res; + _tmp18_ = res; #line 117 "/home/jens/Source/shotwell/src/db/TagTable.vala" - if (_tmp25_ != SQLITE_DONE) { -#line 1291 "TagTable.c" - gint _tmp26_; + if (_tmp18_ != SQLITE_DONE) { +#line 1361 "TagTable.c" + gint _tmp19_; #line 118 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp26_ = res; + _tmp19_ = res; #line 118 "/home/jens/Source/shotwell/src/db/TagTable.vala" - database_table_throw_error ("TagTable.create_from_row", _tmp26_, &_inner_error_); + database_table_throw_error ("TagTable.create_from_row", _tmp19_, &_inner_error_); #line 118 "/home/jens/Source/shotwell/src/db/TagTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 118 "/home/jens/Source/shotwell/src/db/TagTable.vala" @@ -1305,7 +1375,7 @@ void tag_table_create_from_row (TagTable* self, TagRow* row, TagID* result, GErr _sqlite3_finalize0 (stmt); #line 118 "/home/jens/Source/shotwell/src/db/TagTable.vala" return; -#line 1307 "TagTable.c" +#line 1377 "TagTable.c" } else { #line 118 "/home/jens/Source/shotwell/src/db/TagTable.vala" _sqlite3_finalize0 (stmt); @@ -1315,27 +1385,29 @@ void tag_table_create_from_row (TagTable* self, TagRow* row, TagID* result, GErr g_clear_error (&_inner_error_); #line 118 "/home/jens/Source/shotwell/src/db/TagTable.vala" return; -#line 1317 "TagTable.c" +#line 1387 "TagTable.c" } } } #line 120 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp27_ = database_table_db; -#line 120 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp28_ = sqlite3_last_insert_rowid (_tmp27_); + _tmp20_ = database_table_db; #line 120 "/home/jens/Source/shotwell/src/db/TagTable.vala" - tag_id_init (&_tmp29_, _tmp28_); + tag_id_init (&_tmp21_, sqlite3_last_insert_rowid (_tmp20_)); #line 120 "/home/jens/Source/shotwell/src/db/TagTable.vala" - *result = _tmp29_; + *result = _tmp21_; #line 120 "/home/jens/Source/shotwell/src/db/TagTable.vala" _sqlite3_finalize0 (stmt); #line 120 "/home/jens/Source/shotwell/src/db/TagTable.vala" return; -#line 1333 "TagTable.c" +#line 1401 "TagTable.c" } -void tag_table_remove (TagTable* self, TagID* tag_id, GError** error) { +void +tag_table_remove (TagTable* self, + TagID* tag_id, + GError** error) +{ TagID _tmp0_; gint64 _tmp1_; GError * _inner_error_ = NULL; @@ -1357,7 +1429,7 @@ void tag_table_remove (TagTable* self, TagID* tag_id, GError** error) { g_propagate_error (error, _inner_error_); #line 124 "/home/jens/Source/shotwell/src/db/TagTable.vala" return; -#line 1359 "TagTable.c" +#line 1431 "TagTable.c" } else { #line 124 "/home/jens/Source/shotwell/src/db/TagTable.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); @@ -1365,13 +1437,17 @@ void tag_table_remove (TagTable* self, TagID* tag_id, GError** error) { g_clear_error (&_inner_error_); #line 124 "/home/jens/Source/shotwell/src/db/TagTable.vala" return; -#line 1367 "TagTable.c" +#line 1439 "TagTable.c" } } } -gchar* tag_table_get_name (TagTable* self, TagID* tag_id, GError** error) { +gchar* +tag_table_get_name (TagTable* self, + TagID* tag_id, + GError** error) +{ gchar* result = NULL; sqlite3_stmt* stmt = NULL; TagID _tmp0_; @@ -1403,7 +1479,7 @@ gchar* tag_table_get_name (TagTable* self, TagID* tag_id, GError** error) { _sqlite3_finalize0 (stmt); #line 130 "/home/jens/Source/shotwell/src/db/TagTable.vala" return result; -#line 1405 "TagTable.c" +#line 1481 "TagTable.c" } #line 132 "/home/jens/Source/shotwell/src/db/TagTable.vala" _tmp4_ = stmt; @@ -1417,11 +1493,15 @@ gchar* tag_table_get_name (TagTable* self, TagID* tag_id, GError** error) { _sqlite3_finalize0 (stmt); #line 132 "/home/jens/Source/shotwell/src/db/TagTable.vala" return result; -#line 1419 "TagTable.c" +#line 1495 "TagTable.c" } -TagRow* tag_table_get_row (TagTable* self, TagID* tag_id, GError** error) { +TagRow* +tag_table_get_row (TagTable* self, + TagID* tag_id, + GError** error) +{ TagRow* result = NULL; sqlite3_stmt* stmt = NULL; gint res = 0; @@ -1433,25 +1513,22 @@ TagRow* tag_table_get_row (TagTable* self, TagID* tag_id, GError** error) { TagID _tmp5_; gint64 _tmp6_; gint _tmp7_; - gint _tmp8_; - sqlite3_stmt* _tmp9_; - gint _tmp10_; - gint _tmp11_; + sqlite3_stmt* _tmp8_; + gint _tmp9_; TagRow* row = NULL; - TagRow* _tmp14_; + TagRow* _tmp12_; + TagRow* _tmp13_; + TagID _tmp14_; TagRow* _tmp15_; - TagID _tmp16_; - TagRow* _tmp17_; - sqlite3_stmt* _tmp18_; - const gchar* _tmp19_; - gchar* _tmp20_; - TagRow* _tmp21_; - sqlite3_stmt* _tmp22_; - const gchar* _tmp23_; - GeeSet* _tmp24_; - TagRow* _tmp25_; - sqlite3_stmt* _tmp26_; - gint64 _tmp27_; + sqlite3_stmt* _tmp16_; + const gchar* _tmp17_; + gchar* _tmp18_; + TagRow* _tmp19_; + sqlite3_stmt* _tmp20_; + const gchar* _tmp21_; + GeeSet* _tmp22_; + TagRow* _tmp23_; + sqlite3_stmt* _tmp24_; GError * _inner_error_ = NULL; #line 135 "/home/jens/Source/shotwell/src/db/TagTable.vala" g_return_val_if_fail (IS_TAG_TABLE (self), NULL); @@ -1478,42 +1555,38 @@ TagRow* tag_table_get_row (TagTable* self, TagID* tag_id, GError** error) { #line 141 "/home/jens/Source/shotwell/src/db/TagTable.vala" _tmp6_ = _tmp5_.id; #line 141 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp7_ = sqlite3_bind_int64 (_tmp4_, 1, _tmp6_); -#line 141 "/home/jens/Source/shotwell/src/db/TagTable.vala" - res = _tmp7_; + res = sqlite3_bind_int64 (_tmp4_, 1, _tmp6_); #line 142 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp8_ = res; + _tmp7_ = res; #line 142 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _vala_assert (_tmp8_ == SQLITE_OK, "res == Sqlite.OK"); -#line 144 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp9_ = stmt; + _vala_assert (_tmp7_ == SQLITE_OK, "res == Sqlite.OK"); #line 144 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp10_ = sqlite3_step (_tmp9_); + _tmp8_ = stmt; #line 144 "/home/jens/Source/shotwell/src/db/TagTable.vala" - res = _tmp10_; + res = sqlite3_step (_tmp8_); #line 145 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp11_ = res; + _tmp9_ = res; #line 145 "/home/jens/Source/shotwell/src/db/TagTable.vala" - if (_tmp11_ == SQLITE_DONE) { + if (_tmp9_ == SQLITE_DONE) { #line 146 "/home/jens/Source/shotwell/src/db/TagTable.vala" result = NULL; #line 146 "/home/jens/Source/shotwell/src/db/TagTable.vala" _sqlite3_finalize0 (stmt); #line 146 "/home/jens/Source/shotwell/src/db/TagTable.vala" return result; -#line 1503 "TagTable.c" +#line 1576 "TagTable.c" } else { - gint _tmp12_; + gint _tmp10_; #line 147 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp12_ = res; + _tmp10_ = res; #line 147 "/home/jens/Source/shotwell/src/db/TagTable.vala" - if (_tmp12_ != SQLITE_ROW) { -#line 1510 "TagTable.c" - gint _tmp13_; + if (_tmp10_ != SQLITE_ROW) { +#line 1583 "TagTable.c" + gint _tmp11_; #line 148 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp13_ = res; + _tmp11_ = res; #line 148 "/home/jens/Source/shotwell/src/db/TagTable.vala" - database_table_throw_error ("TagTable.get_row", _tmp13_, &_inner_error_); + database_table_throw_error ("TagTable.get_row", _tmp11_, &_inner_error_); #line 148 "/home/jens/Source/shotwell/src/db/TagTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 148 "/home/jens/Source/shotwell/src/db/TagTable.vala" @@ -1524,7 +1597,7 @@ TagRow* tag_table_get_row (TagTable* self, TagID* tag_id, GError** error) { _sqlite3_finalize0 (stmt); #line 148 "/home/jens/Source/shotwell/src/db/TagTable.vala" return NULL; -#line 1526 "TagTable.c" +#line 1599 "TagTable.c" } else { #line 148 "/home/jens/Source/shotwell/src/db/TagTable.vala" _sqlite3_finalize0 (stmt); @@ -1534,64 +1607,65 @@ TagRow* tag_table_get_row (TagTable* self, TagID* tag_id, GError** error) { g_clear_error (&_inner_error_); #line 148 "/home/jens/Source/shotwell/src/db/TagTable.vala" return NULL; -#line 1536 "TagTable.c" +#line 1609 "TagTable.c" } } } } #line 150 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp14_ = tag_row_new (); + _tmp12_ = tag_row_new (); #line 150 "/home/jens/Source/shotwell/src/db/TagTable.vala" - row = _tmp14_; + row = _tmp12_; #line 151 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp15_ = row; + _tmp13_ = row; #line 151 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp16_ = *tag_id; + _tmp14_ = *tag_id; #line 151 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp15_->tag_id = _tmp16_; + _tmp13_->tag_id = _tmp14_; #line 152 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp17_ = row; + _tmp15_ = row; #line 152 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp18_ = stmt; + _tmp16_ = stmt; #line 152 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp19_ = sqlite3_column_text (_tmp18_, 0); + _tmp17_ = sqlite3_column_text (_tmp16_, 0); #line 152 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp20_ = g_strdup (_tmp19_); + _tmp18_ = g_strdup (_tmp17_); #line 152 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _g_free0 (_tmp17_->name); + _g_free0 (_tmp15_->name); #line 152 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp17_->name = _tmp20_; + _tmp15_->name = _tmp18_; #line 153 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp21_ = row; + _tmp19_ = row; #line 153 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp22_ = stmt; + _tmp20_ = stmt; #line 153 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp23_ = sqlite3_column_text (_tmp22_, 1); + _tmp21_ = sqlite3_column_text (_tmp20_, 1); #line 153 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp24_ = tag_table_unserialize_source_ids (self, _tmp23_); + _tmp22_ = tag_table_unserialize_source_ids (self, _tmp21_); #line 153 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _g_object_unref0 (_tmp21_->source_id_list); + _g_object_unref0 (_tmp19_->source_id_list); #line 153 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp21_->source_id_list = _tmp24_; -#line 154 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp25_ = row; + _tmp19_->source_id_list = _tmp22_; #line 154 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp26_ = stmt; + _tmp23_ = row; #line 154 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp27_ = sqlite3_column_int64 (_tmp26_, 2); + _tmp24_ = stmt; #line 154 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp25_->time_created = (time_t) _tmp27_; + _tmp23_->time_created = (time_t) sqlite3_column_int64 (_tmp24_, 2); #line 156 "/home/jens/Source/shotwell/src/db/TagTable.vala" result = row; #line 156 "/home/jens/Source/shotwell/src/db/TagTable.vala" _sqlite3_finalize0 (stmt); #line 156 "/home/jens/Source/shotwell/src/db/TagTable.vala" return result; -#line 1589 "TagTable.c" +#line 1660 "TagTable.c" } -GeeList* tag_table_get_all_rows (TagTable* self, GError** error) { +GeeList* +tag_table_get_all_rows (TagTable* self, + GError** error) +{ GeeList* result = NULL; sqlite3_stmt* stmt = NULL; gint res = 0; @@ -1622,66 +1696,61 @@ GeeList* tag_table_get_all_rows (TagTable* self, GError** error) { _tmp4_ = gee_array_list_new (TYPE_TAG_ROW, (GBoxedCopyFunc) tag_row_ref, (GDestroyNotify) tag_row_unref, NULL, NULL, NULL); #line 165 "/home/jens/Source/shotwell/src/db/TagTable.vala" rows = G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_LIST, GeeList); -#line 1624 "TagTable.c" +#line 1698 "TagTable.c" { gboolean _tmp5_ = FALSE; #line 167 "/home/jens/Source/shotwell/src/db/TagTable.vala" _tmp5_ = TRUE; #line 167 "/home/jens/Source/shotwell/src/db/TagTable.vala" while (TRUE) { -#line 1631 "TagTable.c" +#line 1705 "TagTable.c" sqlite3_stmt* _tmp6_; gint _tmp7_; - gint _tmp8_; TagRow* row = NULL; + TagRow* _tmp10_; TagRow* _tmp11_; - TagRow* _tmp12_; - sqlite3_stmt* _tmp13_; - gint64 _tmp14_; - TagRow* _tmp15_; - sqlite3_stmt* _tmp16_; - const gchar* _tmp17_; - gchar* _tmp18_; - TagRow* _tmp19_; - sqlite3_stmt* _tmp20_; - const gchar* _tmp21_; - GeeSet* _tmp22_; - TagRow* _tmp23_; - sqlite3_stmt* _tmp24_; - gint64 _tmp25_; - GeeList* _tmp26_; - TagRow* _tmp27_; + sqlite3_stmt* _tmp12_; + TagRow* _tmp13_; + sqlite3_stmt* _tmp14_; + const gchar* _tmp15_; + gchar* _tmp16_; + TagRow* _tmp17_; + sqlite3_stmt* _tmp18_; + const gchar* _tmp19_; + GeeSet* _tmp20_; + TagRow* _tmp21_; + sqlite3_stmt* _tmp22_; + GeeList* _tmp23_; + TagRow* _tmp24_; #line 167 "/home/jens/Source/shotwell/src/db/TagTable.vala" if (!_tmp5_) { -#line 1655 "TagTable.c" +#line 1726 "TagTable.c" } #line 167 "/home/jens/Source/shotwell/src/db/TagTable.vala" _tmp5_ = FALSE; #line 168 "/home/jens/Source/shotwell/src/db/TagTable.vala" _tmp6_ = stmt; #line 168 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp7_ = sqlite3_step (_tmp6_); -#line 168 "/home/jens/Source/shotwell/src/db/TagTable.vala" - res = _tmp7_; + res = sqlite3_step (_tmp6_); #line 169 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp8_ = res; + _tmp7_ = res; #line 169 "/home/jens/Source/shotwell/src/db/TagTable.vala" - if (_tmp8_ == SQLITE_DONE) { + if (_tmp7_ == SQLITE_DONE) { #line 170 "/home/jens/Source/shotwell/src/db/TagTable.vala" break; -#line 1671 "TagTable.c" +#line 1740 "TagTable.c" } else { - gint _tmp9_; + gint _tmp8_; #line 171 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp9_ = res; + _tmp8_ = res; #line 171 "/home/jens/Source/shotwell/src/db/TagTable.vala" - if (_tmp9_ != SQLITE_ROW) { -#line 1678 "TagTable.c" - gint _tmp10_; + if (_tmp8_ != SQLITE_ROW) { +#line 1747 "TagTable.c" + gint _tmp9_; #line 172 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp10_ = res; + _tmp9_ = res; #line 172 "/home/jens/Source/shotwell/src/db/TagTable.vala" - database_table_throw_error ("TagTable.get_all_rows", _tmp10_, &_inner_error_); + database_table_throw_error ("TagTable.get_all_rows", _tmp9_, &_inner_error_); #line 172 "/home/jens/Source/shotwell/src/db/TagTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 172 "/home/jens/Source/shotwell/src/db/TagTable.vala" @@ -1694,7 +1763,7 @@ GeeList* tag_table_get_all_rows (TagTable* self, GError** error) { _sqlite3_finalize0 (stmt); #line 172 "/home/jens/Source/shotwell/src/db/TagTable.vala" return NULL; -#line 1696 "TagTable.c" +#line 1765 "TagTable.c" } else { #line 172 "/home/jens/Source/shotwell/src/db/TagTable.vala" _g_object_unref0 (rows); @@ -1706,64 +1775,60 @@ GeeList* tag_table_get_all_rows (TagTable* self, GError** error) { g_clear_error (&_inner_error_); #line 172 "/home/jens/Source/shotwell/src/db/TagTable.vala" return NULL; -#line 1708 "TagTable.c" +#line 1777 "TagTable.c" } } } } #line 175 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp11_ = tag_row_new (); + _tmp10_ = tag_row_new (); #line 175 "/home/jens/Source/shotwell/src/db/TagTable.vala" - row = _tmp11_; + row = _tmp10_; #line 176 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp12_ = row; + _tmp11_ = row; #line 176 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp13_ = stmt; + _tmp12_ = stmt; #line 176 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp14_ = sqlite3_column_int64 (_tmp13_, 0); -#line 176 "/home/jens/Source/shotwell/src/db/TagTable.vala" - tag_id_init (&_tmp12_->tag_id, _tmp14_); + tag_id_init (&_tmp11_->tag_id, sqlite3_column_int64 (_tmp12_, 0)); #line 177 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp15_ = row; + _tmp13_ = row; #line 177 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp16_ = stmt; + _tmp14_ = stmt; #line 177 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp17_ = sqlite3_column_text (_tmp16_, 1); + _tmp15_ = sqlite3_column_text (_tmp14_, 1); #line 177 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp18_ = g_strdup (_tmp17_); + _tmp16_ = g_strdup (_tmp15_); #line 177 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _g_free0 (_tmp15_->name); + _g_free0 (_tmp13_->name); #line 177 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp15_->name = _tmp18_; + _tmp13_->name = _tmp16_; #line 178 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp19_ = row; + _tmp17_ = row; #line 178 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp20_ = stmt; + _tmp18_ = stmt; #line 178 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp21_ = sqlite3_column_text (_tmp20_, 2); + _tmp19_ = sqlite3_column_text (_tmp18_, 2); #line 178 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp22_ = tag_table_unserialize_source_ids (self, _tmp21_); + _tmp20_ = tag_table_unserialize_source_ids (self, _tmp19_); #line 178 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _g_object_unref0 (_tmp19_->source_id_list); + _g_object_unref0 (_tmp17_->source_id_list); #line 178 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp19_->source_id_list = _tmp22_; -#line 179 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp23_ = row; + _tmp17_->source_id_list = _tmp20_; #line 179 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp24_ = stmt; + _tmp21_ = row; #line 179 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp25_ = sqlite3_column_int64 (_tmp24_, 3); + _tmp22_ = stmt; #line 179 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp23_->time_created = (time_t) _tmp25_; + _tmp21_->time_created = (time_t) sqlite3_column_int64 (_tmp22_, 3); #line 181 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp26_ = rows; + _tmp23_ = rows; #line 181 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp27_ = row; + _tmp24_ = row; #line 181 "/home/jens/Source/shotwell/src/db/TagTable.vala" - gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, GEE_TYPE_COLLECTION, GeeCollection), _tmp27_); + gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GEE_TYPE_COLLECTION, GeeCollection), _tmp24_); #line 167 "/home/jens/Source/shotwell/src/db/TagTable.vala" _tag_row_unref0 (row); -#line 1765 "TagTable.c" +#line 1830 "TagTable.c" } } #line 184 "/home/jens/Source/shotwell/src/db/TagTable.vala" @@ -1772,14 +1837,18 @@ GeeList* tag_table_get_all_rows (TagTable* self, GError** error) { _sqlite3_finalize0 (stmt); #line 184 "/home/jens/Source/shotwell/src/db/TagTable.vala" return result; -#line 1774 "TagTable.c" +#line 1839 "TagTable.c" } -void tag_table_rename (TagTable* self, TagID* tag_id, const gchar* new_name, GError** error) { +void +tag_table_rename (TagTable* self, + TagID* tag_id, + const gchar* new_name, + GError** error) +{ TagID _tmp0_; gint64 _tmp1_; - const gchar* _tmp2_; GError * _inner_error_ = NULL; #line 187 "/home/jens/Source/shotwell/src/db/TagTable.vala" g_return_if_fail (IS_TAG_TABLE (self)); @@ -1792,9 +1861,7 @@ void tag_table_rename (TagTable* self, TagID* tag_id, const gchar* new_name, GEr #line 188 "/home/jens/Source/shotwell/src/db/TagTable.vala" _tmp1_ = _tmp0_.id; #line 188 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp2_ = new_name; -#line 188 "/home/jens/Source/shotwell/src/db/TagTable.vala" - database_table_update_text_by_id_2 (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp1_, "name", _tmp2_, &_inner_error_); + database_table_update_text_by_id_2 (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp1_, "name", new_name, &_inner_error_); #line 188 "/home/jens/Source/shotwell/src/db/TagTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 188 "/home/jens/Source/shotwell/src/db/TagTable.vala" @@ -1803,7 +1870,7 @@ void tag_table_rename (TagTable* self, TagID* tag_id, const gchar* new_name, GEr g_propagate_error (error, _inner_error_); #line 188 "/home/jens/Source/shotwell/src/db/TagTable.vala" return; -#line 1805 "TagTable.c" +#line 1872 "TagTable.c" } else { #line 188 "/home/jens/Source/shotwell/src/db/TagTable.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); @@ -1811,13 +1878,18 @@ void tag_table_rename (TagTable* self, TagID* tag_id, const gchar* new_name, GEr g_clear_error (&_inner_error_); #line 188 "/home/jens/Source/shotwell/src/db/TagTable.vala" return; -#line 1813 "TagTable.c" +#line 1880 "TagTable.c" } } } -void tag_table_set_tagged_sources (TagTable* self, TagID* tag_id, GeeCollection* source_ids, GError** error) { +void +tag_table_set_tagged_sources (TagTable* self, + TagID* tag_id, + GeeCollection* source_ids, + GError** error) +{ sqlite3_stmt* stmt = NULL; gint res = 0; sqlite3* _tmp0_; @@ -1825,19 +1897,15 @@ void tag_table_set_tagged_sources (TagTable* self, TagID* tag_id, GeeCollection* gint _tmp2_; gint _tmp3_; sqlite3_stmt* _tmp4_; - GeeCollection* _tmp5_; - gchar* _tmp6_; - GDestroyNotify _tmp7_; - gint _tmp8_; - gint _tmp9_; - sqlite3_stmt* _tmp10_; - TagID _tmp11_; - gint64 _tmp12_; + gchar* _tmp5_; + GDestroyNotify _tmp6_; + gint _tmp7_; + sqlite3_stmt* _tmp8_; + TagID _tmp9_; + gint64 _tmp10_; + gint _tmp11_; + sqlite3_stmt* _tmp12_; gint _tmp13_; - gint _tmp14_; - sqlite3_stmt* _tmp15_; - gint _tmp16_; - gint _tmp17_; GError * _inner_error_ = NULL; #line 191 "/home/jens/Source/shotwell/src/db/TagTable.vala" g_return_if_fail (IS_TAG_TABLE (self)); @@ -1862,49 +1930,41 @@ void tag_table_set_tagged_sources (TagTable* self, TagID* tag_id, GeeCollection* #line 196 "/home/jens/Source/shotwell/src/db/TagTable.vala" _tmp4_ = stmt; #line 196 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp5_ = source_ids; -#line 196 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp6_ = tag_table_serialize_source_ids (self, _tmp5_); -#line 196 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp7_ = g_free; + _tmp5_ = tag_table_serialize_source_ids (self, source_ids); #line 196 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp8_ = sqlite3_bind_text (_tmp4_, 1, _tmp6_, -1, _tmp7_); + _tmp6_ = g_free; #line 196 "/home/jens/Source/shotwell/src/db/TagTable.vala" - res = _tmp8_; + res = sqlite3_bind_text (_tmp4_, 1, _tmp5_, -1, _tmp6_); #line 197 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp9_ = res; + _tmp7_ = res; #line 197 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _vala_assert (_tmp9_ == SQLITE_OK, "res == Sqlite.OK"); -#line 198 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp10_ = stmt; + _vala_assert (_tmp7_ == SQLITE_OK, "res == Sqlite.OK"); #line 198 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp11_ = *tag_id; + _tmp8_ = stmt; #line 198 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp12_ = _tmp11_.id; + _tmp9_ = *tag_id; #line 198 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp13_ = sqlite3_bind_int64 (_tmp10_, 2, _tmp12_); + _tmp10_ = _tmp9_.id; #line 198 "/home/jens/Source/shotwell/src/db/TagTable.vala" - res = _tmp13_; + res = sqlite3_bind_int64 (_tmp8_, 2, _tmp10_); #line 199 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp14_ = res; + _tmp11_ = res; #line 199 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _vala_assert (_tmp14_ == SQLITE_OK, "res == Sqlite.OK"); + _vala_assert (_tmp11_ == SQLITE_OK, "res == Sqlite.OK"); #line 201 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp15_ = stmt; + _tmp12_ = stmt; #line 201 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp16_ = sqlite3_step (_tmp15_); -#line 201 "/home/jens/Source/shotwell/src/db/TagTable.vala" - res = _tmp16_; + res = sqlite3_step (_tmp12_); #line 202 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp17_ = res; + _tmp13_ = res; #line 202 "/home/jens/Source/shotwell/src/db/TagTable.vala" - if (_tmp17_ != SQLITE_DONE) { -#line 1901 "TagTable.c" - gint _tmp18_; + if (_tmp13_ != SQLITE_DONE) { +#line 1961 "TagTable.c" + gint _tmp14_; #line 203 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp18_ = res; + _tmp14_ = res; #line 203 "/home/jens/Source/shotwell/src/db/TagTable.vala" - database_table_throw_error ("TagTable.set_tagged_photos", _tmp18_, &_inner_error_); + database_table_throw_error ("TagTable.set_tagged_photos", _tmp14_, &_inner_error_); #line 203 "/home/jens/Source/shotwell/src/db/TagTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 203 "/home/jens/Source/shotwell/src/db/TagTable.vala" @@ -1915,7 +1975,7 @@ void tag_table_set_tagged_sources (TagTable* self, TagID* tag_id, GeeCollection* _sqlite3_finalize0 (stmt); #line 203 "/home/jens/Source/shotwell/src/db/TagTable.vala" return; -#line 1917 "TagTable.c" +#line 1977 "TagTable.c" } else { #line 203 "/home/jens/Source/shotwell/src/db/TagTable.vala" _sqlite3_finalize0 (stmt); @@ -1925,163 +1985,158 @@ void tag_table_set_tagged_sources (TagTable* self, TagID* tag_id, GeeCollection* g_clear_error (&_inner_error_); #line 203 "/home/jens/Source/shotwell/src/db/TagTable.vala" return; -#line 1927 "TagTable.c" +#line 1987 "TagTable.c" } } } #line 191 "/home/jens/Source/shotwell/src/db/TagTable.vala" _sqlite3_finalize0 (stmt); -#line 1933 "TagTable.c" +#line 1993 "TagTable.c" } -static gchar* tag_table_serialize_source_ids (TagTable* self, GeeCollection* source_ids) { +static gchar* +tag_table_serialize_source_ids (TagTable* self, + GeeCollection* source_ids) +{ gchar* result = NULL; - GeeCollection* _tmp0_; GString* _result_ = NULL; - GString* _tmp1_; - const gchar* _tmp11_ = NULL; - GString* _tmp12_; - gssize _tmp13_; - gchar* _tmp16_; + GString* _tmp0_; + const gchar* _tmp8_ = NULL; + GString* _tmp9_; + gssize _tmp10_; + gchar* _tmp13_; #line 206 "/home/jens/Source/shotwell/src/db/TagTable.vala" g_return_val_if_fail (IS_TAG_TABLE (self), NULL); #line 206 "/home/jens/Source/shotwell/src/db/TagTable.vala" g_return_val_if_fail ((source_ids == NULL) || GEE_IS_COLLECTION (source_ids), NULL); #line 207 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp0_ = source_ids; -#line 207 "/home/jens/Source/shotwell/src/db/TagTable.vala" - if (_tmp0_ == NULL) { + if (source_ids == NULL) { #line 208 "/home/jens/Source/shotwell/src/db/TagTable.vala" result = NULL; #line 208 "/home/jens/Source/shotwell/src/db/TagTable.vala" return result; -#line 1958 "TagTable.c" +#line 2018 "TagTable.c" } #line 210 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp1_ = g_string_new (""); + _tmp0_ = g_string_new (""); #line 210 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _result_ = _tmp1_; -#line 1964 "TagTable.c" + _result_ = _tmp0_; +#line 2024 "TagTable.c" { GeeIterator* _source_id_it = NULL; - GeeCollection* _tmp2_; - GeeIterator* _tmp3_; + GeeIterator* _tmp1_; #line 212 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp2_ = source_ids; + _tmp1_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (source_ids, GEE_TYPE_ITERABLE, GeeIterable)); #line 212 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp3_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 212 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _source_id_it = _tmp3_; + _source_id_it = _tmp1_; #line 212 "/home/jens/Source/shotwell/src/db/TagTable.vala" while (TRUE) { -#line 1977 "TagTable.c" - GeeIterator* _tmp4_; - gboolean _tmp5_; +#line 2034 "TagTable.c" + GeeIterator* _tmp2_; gchar* source_id = NULL; - GeeIterator* _tmp6_; - gpointer _tmp7_; - GString* _tmp8_; - const gchar* _tmp9_; - GString* _tmp10_; + GeeIterator* _tmp3_; + gpointer _tmp4_; + GString* _tmp5_; + const gchar* _tmp6_; + GString* _tmp7_; #line 212 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp4_ = _source_id_it; + _tmp2_ = _source_id_it; #line 212 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp5_ = gee_iterator_next (_tmp4_); -#line 212 "/home/jens/Source/shotwell/src/db/TagTable.vala" - if (!_tmp5_) { + if (!gee_iterator_next (_tmp2_)) { #line 212 "/home/jens/Source/shotwell/src/db/TagTable.vala" break; -#line 1994 "TagTable.c" +#line 2048 "TagTable.c" } #line 212 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp6_ = _source_id_it; + _tmp3_ = _source_id_it; #line 212 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp7_ = gee_iterator_get (_tmp6_); + _tmp4_ = gee_iterator_get (_tmp3_); #line 212 "/home/jens/Source/shotwell/src/db/TagTable.vala" - source_id = (gchar*) _tmp7_; + source_id = (gchar*) _tmp4_; #line 213 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp8_ = _result_; + _tmp5_ = _result_; #line 213 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp9_ = source_id; + _tmp6_ = source_id; #line 213 "/home/jens/Source/shotwell/src/db/TagTable.vala" - g_string_append (_tmp8_, _tmp9_); + g_string_append (_tmp5_, _tmp6_); #line 214 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp10_ = _result_; + _tmp7_ = _result_; #line 214 "/home/jens/Source/shotwell/src/db/TagTable.vala" - g_string_append (_tmp10_, ","); + g_string_append (_tmp7_, ","); #line 212 "/home/jens/Source/shotwell/src/db/TagTable.vala" _g_free0 (source_id); -#line 2014 "TagTable.c" +#line 2068 "TagTable.c" } #line 212 "/home/jens/Source/shotwell/src/db/TagTable.vala" _g_object_unref0 (_source_id_it); -#line 2018 "TagTable.c" +#line 2072 "TagTable.c" } #line 217 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp12_ = _result_; + _tmp9_ = _result_; #line 217 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp13_ = _tmp12_->len; + _tmp10_ = _tmp9_->len; #line 217 "/home/jens/Source/shotwell/src/db/TagTable.vala" - if (_tmp13_ != ((gssize) 0)) { -#line 2026 "TagTable.c" - GString* _tmp14_; - const gchar* _tmp15_; + if (_tmp10_ != ((gssize) 0)) { +#line 2080 "TagTable.c" + GString* _tmp11_; + const gchar* _tmp12_; #line 217 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp14_ = _result_; + _tmp11_ = _result_; #line 217 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp15_ = _tmp14_->str; + _tmp12_ = _tmp11_->str; #line 217 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp11_ = _tmp15_; -#line 2035 "TagTable.c" + _tmp8_ = _tmp12_; +#line 2089 "TagTable.c" } else { #line 217 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp11_ = NULL; -#line 2039 "TagTable.c" + _tmp8_ = NULL; +#line 2093 "TagTable.c" } #line 217 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp16_ = g_strdup (_tmp11_); + _tmp13_ = g_strdup (_tmp8_); #line 217 "/home/jens/Source/shotwell/src/db/TagTable.vala" - result = _tmp16_; + result = _tmp13_; #line 217 "/home/jens/Source/shotwell/src/db/TagTable.vala" _g_string_free0 (_result_); #line 217 "/home/jens/Source/shotwell/src/db/TagTable.vala" return result; -#line 2049 "TagTable.c" +#line 2103 "TagTable.c" } -static gchar string_get (const gchar* self, glong index) { +static gchar +string_get (const gchar* self, + glong index) +{ gchar result = '\0'; - glong _tmp0_; - gchar _tmp1_; -#line 1110 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + gchar _tmp0_; +#line 1124 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, '\0'); -#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp0_ = index; -#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp1_ = ((gchar*) self)[_tmp0_]; -#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - result = _tmp1_; -#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1125 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp0_ = ((gchar*) self)[index]; +#line 1125 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + result = _tmp0_; +#line 1125 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 2067 "TagTable.c" +#line 2121 "TagTable.c" } -static GeeSet* tag_table_unserialize_source_ids (TagTable* self, const gchar* text_list) { +static GeeSet* +tag_table_unserialize_source_ids (TagTable* self, + const gchar* text_list) +{ GeeSet* result = NULL; GeeSet* _result_ = NULL; GeeHashSet* _tmp0_; - const gchar* _tmp1_; gchar** split = NULL; - const gchar* _tmp2_; - gchar** _tmp3_; - gchar** _tmp4_; + gchar** _tmp1_; + gchar** _tmp2_; gint split_length1; gint _split_size_; - gchar** _tmp5_; - gint _tmp5__length1; + gchar** _tmp3_; + gint _tmp3__length1; #line 220 "/home/jens/Source/shotwell/src/db/TagTable.vala" g_return_val_if_fail (IS_TAG_TABLE (self), NULL); #line 221 "/home/jens/Source/shotwell/src/db/TagTable.vala" @@ -2089,126 +2144,104 @@ static GeeSet* tag_table_unserialize_source_ids (TagTable* self, const gchar* te #line 221 "/home/jens/Source/shotwell/src/db/TagTable.vala" _result_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_SET, GeeSet); #line 223 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp1_ = text_list; -#line 223 "/home/jens/Source/shotwell/src/db/TagTable.vala" - if (_tmp1_ == NULL) { + if (text_list == NULL) { #line 224 "/home/jens/Source/shotwell/src/db/TagTable.vala" result = _result_; #line 224 "/home/jens/Source/shotwell/src/db/TagTable.vala" return result; -#line 2098 "TagTable.c" +#line 2151 "TagTable.c" } #line 226 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp2_ = text_list; -#line 226 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp4_ = _tmp3_ = g_strsplit (_tmp2_, ",", 0); + _tmp2_ = _tmp1_ = g_strsplit (text_list, ",", 0); #line 226 "/home/jens/Source/shotwell/src/db/TagTable.vala" - split = _tmp4_; + split = _tmp2_; #line 226 "/home/jens/Source/shotwell/src/db/TagTable.vala" - split_length1 = _vala_array_length (_tmp3_); + split_length1 = _vala_array_length (_tmp1_); #line 226 "/home/jens/Source/shotwell/src/db/TagTable.vala" _split_size_ = split_length1; #line 227 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp5_ = split; + _tmp3_ = split; #line 227 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp5__length1 = split_length1; -#line 2114 "TagTable.c" + _tmp3__length1 = split_length1; +#line 2165 "TagTable.c" { gchar** token_collection = NULL; gint token_collection_length1 = 0; gint _token_collection_size_ = 0; gint token_it = 0; #line 227 "/home/jens/Source/shotwell/src/db/TagTable.vala" - token_collection = _tmp5_; + token_collection = _tmp3_; #line 227 "/home/jens/Source/shotwell/src/db/TagTable.vala" - token_collection_length1 = _tmp5__length1; + token_collection_length1 = _tmp3__length1; #line 227 "/home/jens/Source/shotwell/src/db/TagTable.vala" - for (token_it = 0; token_it < _tmp5__length1; token_it = token_it + 1) { -#line 2126 "TagTable.c" - gchar* _tmp6_; + for (token_it = 0; token_it < _tmp3__length1; token_it = token_it + 1) { +#line 2177 "TagTable.c" + gchar* _tmp4_; gchar* token = NULL; #line 227 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp6_ = g_strdup (token_collection[token_it]); + _tmp4_ = g_strdup (token_collection[token_it]); #line 227 "/home/jens/Source/shotwell/src/db/TagTable.vala" - token = _tmp6_; -#line 2133 "TagTable.c" + token = _tmp4_; +#line 2184 "TagTable.c" { - const gchar* _tmp7_; - gboolean _tmp8_; - const gchar* _tmp9_; - gchar _tmp10_; - gboolean _tmp11_; -#line 228 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp7_ = token; + const gchar* _tmp5_; + const gchar* _tmp6_; #line 228 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp8_ = is_string_empty (_tmp7_); + _tmp5_ = token; #line 228 "/home/jens/Source/shotwell/src/db/TagTable.vala" - if (_tmp8_) { + if (is_string_empty (_tmp5_)) { #line 229 "/home/jens/Source/shotwell/src/db/TagTable.vala" _g_free0 (token); #line 229 "/home/jens/Source/shotwell/src/db/TagTable.vala" continue; -#line 2150 "TagTable.c" +#line 2196 "TagTable.c" } #line 236 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp9_ = token; -#line 236 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp10_ = string_get (_tmp9_, (glong) 0); + _tmp6_ = token; #line 236 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp11_ = g_ascii_isdigit (_tmp10_); -#line 236 "/home/jens/Source/shotwell/src/db/TagTable.vala" - if (_tmp11_) { -#line 2160 "TagTable.c" - GeeSet* _tmp12_; - const gchar* _tmp13_; - gint64 _tmp14_; - PhotoID _tmp15_ = {0}; - gchar* _tmp16_; - gchar* _tmp17_; -#line 238 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp12_ = _result_; + if (g_ascii_isdigit (string_get (_tmp6_, (glong) 0))) { +#line 2202 "TagTable.c" + GeeSet* _tmp7_; + const gchar* _tmp8_; + PhotoID _tmp9_ = {0}; + gchar* _tmp10_; + gchar* _tmp11_; #line 238 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp13_ = token; + _tmp7_ = _result_; #line 238 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp14_ = parse_int64 (_tmp13_, 10); + _tmp8_ = token; #line 238 "/home/jens/Source/shotwell/src/db/TagTable.vala" - photo_id_init (&_tmp15_, _tmp14_); + photo_id_init (&_tmp9_, parse_int64 (_tmp8_, 10)); #line 238 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp16_ = photo_id_upgrade_photo_id_to_source_id (&_tmp15_); + _tmp10_ = photo_id_upgrade_photo_id_to_source_id (&_tmp9_); #line 238 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp17_ = _tmp16_; + _tmp11_ = _tmp10_; #line 238 "/home/jens/Source/shotwell/src/db/TagTable.vala" - gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_COLLECTION, GeeCollection), _tmp17_); + gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_COLLECTION, GeeCollection), _tmp11_); #line 238 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _g_free0 (_tmp17_); -#line 2183 "TagTable.c" + _g_free0 (_tmp11_); +#line 2222 "TagTable.c" } else { - const gchar* _tmp18_; - gchar _tmp19_; - gboolean _tmp20_; -#line 239 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp18_ = token; + const gchar* _tmp12_; #line 239 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp19_ = string_get (_tmp18_, (glong) 0); + _tmp12_ = token; #line 239 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp20_ = g_ascii_isalpha (_tmp19_); -#line 239 "/home/jens/Source/shotwell/src/db/TagTable.vala" - if (_tmp20_) { -#line 2196 "TagTable.c" - GeeSet* _tmp21_; - const gchar* _tmp22_; + if (g_ascii_isalpha (string_get (_tmp12_, (glong) 0))) { +#line 2229 "TagTable.c" + GeeSet* _tmp13_; + const gchar* _tmp14_; #line 241 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp21_ = _result_; + _tmp13_ = _result_; #line 241 "/home/jens/Source/shotwell/src/db/TagTable.vala" - _tmp22_ = token; + _tmp14_ = token; #line 241 "/home/jens/Source/shotwell/src/db/TagTable.vala" - gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, GEE_TYPE_COLLECTION, GeeCollection), _tmp22_); -#line 2205 "TagTable.c" + gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_COLLECTION, GeeCollection), _tmp14_); +#line 2238 "TagTable.c" } } #line 227 "/home/jens/Source/shotwell/src/db/TagTable.vala" _g_free0 (token); -#line 2210 "TagTable.c" +#line 2243 "TagTable.c" } } } @@ -2218,34 +2251,42 @@ static GeeSet* tag_table_unserialize_source_ids (TagTable* self, const gchar* te split = (_vala_array_free (split, split_length1, (GDestroyNotify) g_free), NULL); #line 245 "/home/jens/Source/shotwell/src/db/TagTable.vala" return result; -#line 2220 "TagTable.c" +#line 2253 "TagTable.c" } -static void tag_table_class_init (TagTableClass * klass) { +static void +tag_table_class_init (TagTableClass * klass) +{ #line 32 "/home/jens/Source/shotwell/src/db/TagTable.vala" tag_table_parent_class = g_type_class_peek_parent (klass); #line 32 "/home/jens/Source/shotwell/src/db/TagTable.vala" ((DatabaseTableClass *) klass)->finalize = tag_table_finalize; -#line 2229 "TagTable.c" +#line 2264 "TagTable.c" } -static void tag_table_instance_init (TagTable * self) { +static void +tag_table_instance_init (TagTable * self) +{ } -static void tag_table_finalize (DatabaseTable * obj) { +static void +tag_table_finalize (DatabaseTable * obj) +{ TagTable * self; #line 32 "/home/jens/Source/shotwell/src/db/TagTable.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_TAG_TABLE, TagTable); #line 32 "/home/jens/Source/shotwell/src/db/TagTable.vala" DATABASE_TABLE_CLASS (tag_table_parent_class)->finalize (obj); -#line 2243 "TagTable.c" +#line 2282 "TagTable.c" } -GType tag_table_get_type (void) { +GType +tag_table_get_type (void) +{ static volatile gsize tag_table_type_id__volatile = 0; if (g_once_init_enter (&tag_table_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (TagTableClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) tag_table_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (TagTable), 0, (GInstanceInitFunc) tag_table_instance_init, NULL }; @@ -2257,7 +2298,11 @@ GType tag_table_get_type (void) { } -static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func) { +static void +_vala_array_destroy (gpointer array, + gint array_length, + GDestroyNotify destroy_func) +{ if ((array != NULL) && (destroy_func != NULL)) { int i; for (i = 0; i < array_length; i = i + 1) { @@ -2269,13 +2314,19 @@ static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNoti } -static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func) { +static void +_vala_array_free (gpointer array, + gint array_length, + GDestroyNotify destroy_func) +{ _vala_array_destroy (array, array_length, destroy_func); g_free (array); } -static gint _vala_array_length (gpointer array) { +static gint +_vala_array_length (gpointer array) +{ int length; length = 0; if (array) { diff --git a/src/db/TombstoneTable.c b/src/db/TombstoneTable.c index 8c9400e..b7b9f58 100644 --- a/src/db/TombstoneTable.c +++ b/src/db/TombstoneTable.c @@ -1,4 +1,4 @@ -/* TombstoneTable.c generated by valac 0.36.6, the Vala compiler +/* TombstoneTable.c generated by valac 0.40.4, the Vala compiler * generated from TombstoneTable.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,6 +7,7 @@ * (version 2.1 or later). See the COPYING file in this distribution. */ + #include <glib.h> #include <glib-object.h> #include <string.h> @@ -134,70 +135,105 @@ GType tombstone_id_get_type (void) G_GNUC_CONST; TombstoneID* tombstone_id_dup (const TombstoneID* self); void tombstone_id_free (TombstoneID* self); #define TOMBSTONE_ID_INVALID ((gint64) -1) -void tombstone_id_init (TombstoneID *self, gint64 id); +void tombstone_id_init (TombstoneID *self, + gint64 id); gboolean tombstone_id_is_invalid (TombstoneID *self); gboolean tombstone_id_is_valid (TombstoneID *self); gpointer tombstone_row_ref (gpointer instance); void tombstone_row_unref (gpointer instance); -GParamSpec* param_spec_tombstone_row (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_tombstone_row (GValue* value, gpointer v_object); -void value_take_tombstone_row (GValue* value, gpointer v_object); +GParamSpec* param_spec_tombstone_row (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_tombstone_row (GValue* value, + gpointer v_object); +void value_take_tombstone_row (GValue* value, + gpointer v_object); gpointer value_get_tombstone_row (const GValue* value); GType tombstone_row_get_type (void) G_GNUC_CONST; GType tombstone_reason_get_type (void) G_GNUC_CONST; -enum { - TOMBSTONE_ROW_DUMMY_PROPERTY -}; TombstoneRow* tombstone_row_new (void); TombstoneRow* tombstone_row_construct (GType object_type); static void tombstone_row_finalize (TombstoneRow * obj); gpointer database_table_ref (gpointer instance); void database_table_unref (gpointer instance); -GParamSpec* param_spec_database_table (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_database_table (GValue* value, gpointer v_object); -void value_take_database_table (GValue* value, gpointer v_object); +GParamSpec* param_spec_database_table (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_database_table (GValue* value, + gpointer v_object); +void value_take_database_table (GValue* value, + gpointer v_object); gpointer value_get_database_table (const GValue* value); GType database_table_get_type (void) G_GNUC_CONST; GType tombstone_table_get_type (void) G_GNUC_CONST; -enum { - TOMBSTONE_TABLE_DUMMY_PROPERTY -}; static TombstoneTable* tombstone_table_new (void); static TombstoneTable* tombstone_table_construct (GType object_type); DatabaseTable* database_table_construct (GType object_type); -void database_table_set_table_name (DatabaseTable* self, const gchar* table_name); -void database_table_fatal (const gchar* op, gint res); +void database_table_set_table_name (DatabaseTable* self, + const gchar* table_name); +void database_table_fatal (const gchar* op, + gint res); TombstoneTable* tombstone_table_get_instance (void); GQuark database_error_quark (void); -TombstoneRow* tombstone_table_add (TombstoneTable* self, const gchar* filepath, gint64 filesize, const gchar* md5, TombstoneReason reason, GError** error); +TombstoneRow* tombstone_table_add (TombstoneTable* self, + const gchar* filepath, + gint64 filesize, + const gchar* md5, + TombstoneReason reason, + GError** error); gulong now_sec (void); gint tombstone_reason_serialize (TombstoneReason self); -void database_table_throw_error (const gchar* method, gint res, GError** error); -TombstoneRow** tombstone_table_fetch_all (TombstoneTable* self, int* result_length1, GError** error); +void database_table_throw_error (const gchar* method, + gint res, + GError** error); +TombstoneRow** tombstone_table_fetch_all (TombstoneTable* self, + int* result_length1, + GError** error); gint database_table_get_row_count (DatabaseTable* self); TombstoneReason tombstone_reason_unserialize (gint value); -void tombstone_table_update_file (TombstoneTable* self, TombstoneID* tombstone_id, const gchar* filepath, GError** error); -void database_table_update_text_by_id_2 (DatabaseTable* self, gint64 id, const gchar* column, const gchar* text, GError** error); -void tombstone_table_remove (TombstoneTable* self, TombstoneID* tombstone_id, GError** error); -void database_table_delete_by_id (DatabaseTable* self, gint64 id, GError** error); +void tombstone_table_update_file (TombstoneTable* self, + TombstoneID* tombstone_id, + const gchar* filepath, + GError** error); +void database_table_update_text_by_id_2 (DatabaseTable* self, + gint64 id, + const gchar* column, + const gchar* text, + GError** error); +void tombstone_table_remove (TombstoneTable* self, + TombstoneID* tombstone_id, + GError** error); +void database_table_delete_by_id (DatabaseTable* self, + gint64 id, + GError** error); static void tombstone_table_finalize (DatabaseTable * obj); -static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func); -static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func); - - -void tombstone_id_init (TombstoneID *self, gint64 id) { - gint64 _tmp0_; +static void _vala_array_destroy (gpointer array, + gint array_length, + GDestroyNotify destroy_func); +static void _vala_array_free (gpointer array, + gint array_length, + GDestroyNotify destroy_func); + + +void +tombstone_id_init (TombstoneID *self, + gint64 id) +{ #line 12 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" memset (self, 0, sizeof (TombstoneID)); #line 13 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp0_ = id; -#line 13 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - (*self).id = _tmp0_; -#line 197 "TombstoneTable.c" + (*self).id = id; +#line 231 "TombstoneTable.c" } -gboolean tombstone_id_is_invalid (TombstoneID *self) { +gboolean +tombstone_id_is_invalid (TombstoneID *self) +{ gboolean result = FALSE; gint64 _tmp0_; #line 17 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" @@ -206,11 +242,13 @@ gboolean tombstone_id_is_invalid (TombstoneID *self) { result = _tmp0_ == TOMBSTONE_ID_INVALID; #line 17 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" return result; -#line 210 "TombstoneTable.c" +#line 246 "TombstoneTable.c" } -gboolean tombstone_id_is_valid (TombstoneID *self) { +gboolean +tombstone_id_is_valid (TombstoneID *self) +{ gboolean result = FALSE; gint64 _tmp0_; #line 21 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" @@ -219,11 +257,13 @@ gboolean tombstone_id_is_valid (TombstoneID *self) { result = _tmp0_ != TOMBSTONE_ID_INVALID; #line 21 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" return result; -#line 223 "TombstoneTable.c" +#line 261 "TombstoneTable.c" } -TombstoneID* tombstone_id_dup (const TombstoneID* self) { +TombstoneID* +tombstone_id_dup (const TombstoneID* self) +{ TombstoneID* dup; #line 7 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" dup = g_new0 (TombstoneID, 1); @@ -231,18 +271,22 @@ TombstoneID* tombstone_id_dup (const TombstoneID* self) { memcpy (dup, self, sizeof (TombstoneID)); #line 7 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" return dup; -#line 235 "TombstoneTable.c" +#line 275 "TombstoneTable.c" } -void tombstone_id_free (TombstoneID* self) { +void +tombstone_id_free (TombstoneID* self) +{ #line 7 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" g_free (self); -#line 242 "TombstoneTable.c" +#line 284 "TombstoneTable.c" } -GType tombstone_id_get_type (void) { +GType +tombstone_id_get_type (void) +{ static volatile gsize tombstone_id_type_id__volatile = 0; if (g_once_init_enter (&tombstone_id_type_id__volatile)) { GType tombstone_id_type_id; @@ -253,121 +297,150 @@ GType tombstone_id_get_type (void) { } -TombstoneRow* tombstone_row_construct (GType object_type) { +TombstoneRow* +tombstone_row_construct (GType object_type) +{ TombstoneRow* self = NULL; #line 25 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" self = (TombstoneRow*) g_type_create_instance (object_type); #line 25 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" return self; -#line 263 "TombstoneTable.c" +#line 309 "TombstoneTable.c" } -TombstoneRow* tombstone_row_new (void) { +TombstoneRow* +tombstone_row_new (void) +{ #line 25 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" return tombstone_row_construct (TYPE_TOMBSTONE_ROW); -#line 270 "TombstoneTable.c" +#line 318 "TombstoneTable.c" } -static void value_tombstone_row_init (GValue* value) { +static void +value_tombstone_row_init (GValue* value) +{ #line 25 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" value->data[0].v_pointer = NULL; -#line 277 "TombstoneTable.c" +#line 327 "TombstoneTable.c" } -static void value_tombstone_row_free_value (GValue* value) { +static void +value_tombstone_row_free_value (GValue* value) +{ #line 25 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" if (value->data[0].v_pointer) { #line 25 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" tombstone_row_unref (value->data[0].v_pointer); -#line 286 "TombstoneTable.c" +#line 338 "TombstoneTable.c" } } -static void value_tombstone_row_copy_value (const GValue* src_value, GValue* dest_value) { +static void +value_tombstone_row_copy_value (const GValue* src_value, + GValue* dest_value) +{ #line 25 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" if (src_value->data[0].v_pointer) { #line 25 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" dest_value->data[0].v_pointer = tombstone_row_ref (src_value->data[0].v_pointer); -#line 296 "TombstoneTable.c" +#line 351 "TombstoneTable.c" } else { #line 25 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" dest_value->data[0].v_pointer = NULL; -#line 300 "TombstoneTable.c" +#line 355 "TombstoneTable.c" } } -static gpointer value_tombstone_row_peek_pointer (const GValue* value) { +static gpointer +value_tombstone_row_peek_pointer (const GValue* value) +{ #line 25 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" return value->data[0].v_pointer; -#line 308 "TombstoneTable.c" +#line 365 "TombstoneTable.c" } -static gchar* value_tombstone_row_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_tombstone_row_collect_value (GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ #line 25 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" if (collect_values[0].v_pointer) { -#line 315 "TombstoneTable.c" +#line 377 "TombstoneTable.c" TombstoneRow * object; object = collect_values[0].v_pointer; #line 25 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" if (object->parent_instance.g_class == NULL) { #line 25 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 322 "TombstoneTable.c" +#line 384 "TombstoneTable.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 25 "/home/jens/Source/shotwell/src/db/TombstoneTable.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 326 "TombstoneTable.c" +#line 388 "TombstoneTable.c" } #line 25 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" value->data[0].v_pointer = tombstone_row_ref (object); -#line 330 "TombstoneTable.c" +#line 392 "TombstoneTable.c" } else { #line 25 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" value->data[0].v_pointer = NULL; -#line 334 "TombstoneTable.c" +#line 396 "TombstoneTable.c" } #line 25 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" return NULL; -#line 338 "TombstoneTable.c" +#line 400 "TombstoneTable.c" } -static gchar* value_tombstone_row_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_tombstone_row_lcopy_value (const GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ TombstoneRow ** object_p; object_p = collect_values[0].v_pointer; #line 25 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" if (!object_p) { #line 25 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 349 "TombstoneTable.c" +#line 416 "TombstoneTable.c" } #line 25 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" if (!value->data[0].v_pointer) { #line 25 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" *object_p = NULL; -#line 355 "TombstoneTable.c" +#line 422 "TombstoneTable.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 25 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" *object_p = value->data[0].v_pointer; -#line 359 "TombstoneTable.c" +#line 426 "TombstoneTable.c" } else { #line 25 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" *object_p = tombstone_row_ref (value->data[0].v_pointer); -#line 363 "TombstoneTable.c" +#line 430 "TombstoneTable.c" } #line 25 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" return NULL; -#line 367 "TombstoneTable.c" +#line 434 "TombstoneTable.c" } -GParamSpec* param_spec_tombstone_row (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { +GParamSpec* +param_spec_tombstone_row (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) +{ ParamSpecTombstoneRow* spec; #line 25 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" g_return_val_if_fail (g_type_is_a (object_type, TYPE_TOMBSTONE_ROW), NULL); @@ -377,20 +450,25 @@ GParamSpec* param_spec_tombstone_row (const gchar* name, const gchar* nick, cons G_PARAM_SPEC (spec)->value_type = object_type; #line 25 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" return G_PARAM_SPEC (spec); -#line 381 "TombstoneTable.c" +#line 454 "TombstoneTable.c" } -gpointer value_get_tombstone_row (const GValue* value) { +gpointer +value_get_tombstone_row (const GValue* value) +{ #line 25 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_TOMBSTONE_ROW), NULL); #line 25 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" return value->data[0].v_pointer; -#line 390 "TombstoneTable.c" +#line 465 "TombstoneTable.c" } -void value_set_tombstone_row (GValue* value, gpointer v_object) { +void +value_set_tombstone_row (GValue* value, + gpointer v_object) +{ TombstoneRow * old; #line 25 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_TOMBSTONE_ROW)); @@ -406,22 +484,25 @@ void value_set_tombstone_row (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 25 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" tombstone_row_ref (value->data[0].v_pointer); -#line 410 "TombstoneTable.c" +#line 488 "TombstoneTable.c" } else { #line 25 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" value->data[0].v_pointer = NULL; -#line 414 "TombstoneTable.c" +#line 492 "TombstoneTable.c" } #line 25 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" if (old) { #line 25 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" tombstone_row_unref (old); -#line 420 "TombstoneTable.c" +#line 498 "TombstoneTable.c" } } -void value_take_tombstone_row (GValue* value, gpointer v_object) { +void +value_take_tombstone_row (GValue* value, + gpointer v_object) +{ TombstoneRow * old; #line 25 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_TOMBSTONE_ROW)); @@ -435,38 +516,44 @@ void value_take_tombstone_row (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 25 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" value->data[0].v_pointer = v_object; -#line 439 "TombstoneTable.c" +#line 520 "TombstoneTable.c" } else { #line 25 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" value->data[0].v_pointer = NULL; -#line 443 "TombstoneTable.c" +#line 524 "TombstoneTable.c" } #line 25 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" if (old) { #line 25 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" tombstone_row_unref (old); -#line 449 "TombstoneTable.c" +#line 530 "TombstoneTable.c" } } -static void tombstone_row_class_init (TombstoneRowClass * klass) { +static void +tombstone_row_class_init (TombstoneRowClass * klass) +{ #line 25 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" tombstone_row_parent_class = g_type_class_peek_parent (klass); #line 25 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" ((TombstoneRowClass *) klass)->finalize = tombstone_row_finalize; -#line 459 "TombstoneTable.c" +#line 542 "TombstoneTable.c" } -static void tombstone_row_instance_init (TombstoneRow * self) { +static void +tombstone_row_instance_init (TombstoneRow * self) +{ #line 25 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" self->ref_count = 1; -#line 466 "TombstoneTable.c" +#line 551 "TombstoneTable.c" } -static void tombstone_row_finalize (TombstoneRow * obj) { +static void +tombstone_row_finalize (TombstoneRow * obj) +{ TombstoneRow * self; #line 25 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_TOMBSTONE_ROW, TombstoneRow); @@ -476,11 +563,13 @@ static void tombstone_row_finalize (TombstoneRow * obj) { _g_free0 (self->filepath); #line 29 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" _g_free0 (self->md5); -#line 480 "TombstoneTable.c" +#line 567 "TombstoneTable.c" } -GType tombstone_row_get_type (void) { +GType +tombstone_row_get_type (void) +{ static volatile gsize tombstone_row_type_id__volatile = 0; if (g_once_init_enter (&tombstone_row_type_id__volatile)) { static const GTypeValueTable g_define_type_value_table = { value_tombstone_row_init, value_tombstone_row_free_value, value_tombstone_row_copy_value, value_tombstone_row_peek_pointer, "p", value_tombstone_row_collect_value, "p", value_tombstone_row_lcopy_value }; @@ -494,18 +583,22 @@ GType tombstone_row_get_type (void) { } -gpointer tombstone_row_ref (gpointer instance) { +gpointer +tombstone_row_ref (gpointer instance) +{ TombstoneRow * self; self = instance; #line 25 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" g_atomic_int_inc (&self->ref_count); #line 25 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" return instance; -#line 505 "TombstoneTable.c" +#line 596 "TombstoneTable.c" } -void tombstone_row_unref (gpointer instance) { +void +tombstone_row_unref (gpointer instance) +{ TombstoneRow * self; self = instance; #line 25 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" @@ -514,12 +607,14 @@ void tombstone_row_unref (gpointer instance) { TOMBSTONE_ROW_GET_CLASS (self)->finalize (self); #line 25 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" g_type_free_instance ((GTypeInstance *) self); -#line 518 "TombstoneTable.c" +#line 611 "TombstoneTable.c" } } -static TombstoneTable* tombstone_table_construct (GType object_type) { +static TombstoneTable* +tombstone_table_construct (GType object_type) +{ TombstoneTable* self = NULL; sqlite3_stmt* stmt = NULL; gint res = 0; @@ -529,7 +624,6 @@ static TombstoneTable* tombstone_table_construct (GType object_type) { gint _tmp3_; sqlite3_stmt* _tmp4_; gint _tmp5_; - gint _tmp6_; #line 37 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" self = (TombstoneTable*) database_table_construct (object_type); #line 38 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" @@ -551,44 +645,48 @@ static TombstoneTable* tombstone_table_construct (GType object_type) { #line 53 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" _tmp4_ = stmt; #line 53 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp5_ = sqlite3_step (_tmp4_); -#line 53 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - res = _tmp5_; + res = sqlite3_step (_tmp4_); #line 54 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp6_ = res; + _tmp5_ = res; #line 54 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - if (_tmp6_ != SQLITE_DONE) { -#line 562 "TombstoneTable.c" - gint _tmp7_; + if (_tmp5_ != SQLITE_DONE) { +#line 654 "TombstoneTable.c" + gint _tmp6_; #line 55 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp7_ = res; + _tmp6_ = res; #line 55 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - database_table_fatal ("create TombstoneTable", _tmp7_); -#line 568 "TombstoneTable.c" + database_table_fatal ("create TombstoneTable", _tmp6_); +#line 660 "TombstoneTable.c" } #line 37 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" _sqlite3_finalize0 (stmt); #line 37 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" return self; -#line 574 "TombstoneTable.c" +#line 666 "TombstoneTable.c" } -static TombstoneTable* tombstone_table_new (void) { +static TombstoneTable* +tombstone_table_new (void) +{ #line 37 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" return tombstone_table_construct (TYPE_TOMBSTONE_TABLE); -#line 581 "TombstoneTable.c" +#line 675 "TombstoneTable.c" } -static gpointer _database_table_ref0 (gpointer self) { +static gpointer +_database_table_ref0 (gpointer self) +{ #line 62 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" return self ? database_table_ref (self) : NULL; -#line 588 "TombstoneTable.c" +#line 684 "TombstoneTable.c" } -TombstoneTable* tombstone_table_get_instance (void) { +TombstoneTable* +tombstone_table_get_instance (void) +{ TombstoneTable* result = NULL; TombstoneTable* _tmp0_; TombstoneTable* _tmp2_; @@ -597,7 +695,7 @@ TombstoneTable* tombstone_table_get_instance (void) { _tmp0_ = tombstone_table_instance; #line 59 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" if (_tmp0_ == NULL) { -#line 601 "TombstoneTable.c" +#line 699 "TombstoneTable.c" TombstoneTable* _tmp1_; #line 60 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" _tmp1_ = tombstone_table_new (); @@ -605,7 +703,7 @@ TombstoneTable* tombstone_table_get_instance (void) { _database_table_unref0 (tombstone_table_instance); #line 60 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" tombstone_table_instance = _tmp1_; -#line 609 "TombstoneTable.c" +#line 707 "TombstoneTable.c" } #line 62 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" _tmp2_ = tombstone_table_instance; @@ -615,11 +713,18 @@ TombstoneTable* tombstone_table_get_instance (void) { result = _tmp3_; #line 62 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" return result; -#line 619 "TombstoneTable.c" +#line 717 "TombstoneTable.c" } -TombstoneRow* tombstone_table_add (TombstoneTable* self, const gchar* filepath, gint64 filesize, const gchar* md5, TombstoneReason reason, GError** error) { +TombstoneRow* +tombstone_table_add (TombstoneTable* self, + const gchar* filepath, + gint64 filesize, + const gchar* md5, + TombstoneReason reason, + GError** error) +{ TombstoneRow* result = NULL; sqlite3_stmt* stmt = NULL; gint res = 0; @@ -628,52 +733,35 @@ TombstoneRow* tombstone_table_add (TombstoneTable* self, const gchar* filepath, gint _tmp2_; gint _tmp3_; time_t time_created = 0; - gulong _tmp4_; - sqlite3_stmt* _tmp5_; - const gchar* _tmp6_; - gchar* _tmp7_; - GDestroyNotify _tmp8_; + sqlite3_stmt* _tmp4_; + gchar* _tmp5_; + GDestroyNotify _tmp6_; + gint _tmp7_; + sqlite3_stmt* _tmp8_; gint _tmp9_; - gint _tmp10_; - sqlite3_stmt* _tmp11_; - gint64 _tmp12_; + sqlite3_stmt* _tmp10_; + gchar* _tmp11_; + GDestroyNotify _tmp12_; gint _tmp13_; - gint _tmp14_; - sqlite3_stmt* _tmp15_; - const gchar* _tmp16_; - gchar* _tmp17_; - GDestroyNotify _tmp18_; - gint _tmp19_; + sqlite3_stmt* _tmp14_; + time_t _tmp15_; + gint _tmp16_; + sqlite3_stmt* _tmp17_; + gint _tmp18_; + sqlite3_stmt* _tmp19_; gint _tmp20_; - sqlite3_stmt* _tmp21_; - time_t _tmp22_; - gint _tmp23_; - gint _tmp24_; - sqlite3_stmt* _tmp25_; - TombstoneReason _tmp26_; - gint _tmp27_; - gint _tmp28_; - gint _tmp29_; - sqlite3_stmt* _tmp30_; - gint _tmp31_; - gint _tmp32_; TombstoneRow* row = NULL; - TombstoneRow* _tmp34_; - TombstoneRow* _tmp35_; - sqlite3* _tmp36_; - gint64 _tmp37_; - TombstoneRow* _tmp38_; - const gchar* _tmp39_; - gchar* _tmp40_; - TombstoneRow* _tmp41_; - gint64 _tmp42_; - TombstoneRow* _tmp43_; - const gchar* _tmp44_; - gchar* _tmp45_; - TombstoneRow* _tmp46_; - time_t _tmp47_; - TombstoneRow* _tmp48_; - TombstoneReason _tmp49_; + TombstoneRow* _tmp22_; + TombstoneRow* _tmp23_; + sqlite3* _tmp24_; + TombstoneRow* _tmp25_; + gchar* _tmp26_; + TombstoneRow* _tmp27_; + TombstoneRow* _tmp28_; + gchar* _tmp29_; + TombstoneRow* _tmp30_; + time_t _tmp31_; + TombstoneRow* _tmp32_; GError * _inner_error_ = NULL; #line 65 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" g_return_val_if_fail (IS_TOMBSTONE_TABLE (self), NULL); @@ -694,95 +782,71 @@ TombstoneRow* tombstone_table_add (TombstoneTable* self, const gchar* filepath, #line 72 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" _vala_assert (_tmp3_ == SQLITE_OK, "res == Sqlite.OK"); #line 74 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp4_ = now_sec (); -#line 74 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - time_created = (time_t) _tmp4_; -#line 76 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp5_ = stmt; + time_created = (time_t) now_sec (); #line 76 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp6_ = filepath; -#line 76 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp7_ = g_strdup (_tmp6_); + _tmp4_ = stmt; #line 76 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp8_ = g_free; + _tmp5_ = g_strdup (filepath); #line 76 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp9_ = sqlite3_bind_text (_tmp5_, 1, _tmp7_, -1, _tmp8_); + _tmp6_ = g_free; #line 76 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - res = _tmp9_; + res = sqlite3_bind_text (_tmp4_, 1, _tmp5_, -1, _tmp6_); #line 77 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp10_ = res; + _tmp7_ = res; #line 77 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _vala_assert (_tmp10_ == SQLITE_OK, "res == Sqlite.OK"); + _vala_assert (_tmp7_ == SQLITE_OK, "res == Sqlite.OK"); #line 78 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp11_ = stmt; + _tmp8_ = stmt; #line 78 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp12_ = filesize; -#line 78 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp13_ = sqlite3_bind_int64 (_tmp11_, 2, _tmp12_); -#line 78 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - res = _tmp13_; + res = sqlite3_bind_int64 (_tmp8_, 2, filesize); #line 79 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp14_ = res; + _tmp9_ = res; #line 79 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _vala_assert (_tmp14_ == SQLITE_OK, "res == Sqlite.OK"); -#line 80 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp15_ = stmt; -#line 80 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp16_ = md5; + _vala_assert (_tmp9_ == SQLITE_OK, "res == Sqlite.OK"); #line 80 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp17_ = g_strdup (_tmp16_); + _tmp10_ = stmt; #line 80 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp18_ = g_free; + _tmp11_ = g_strdup (md5); #line 80 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp19_ = sqlite3_bind_text (_tmp15_, 3, _tmp17_, -1, _tmp18_); + _tmp12_ = g_free; #line 80 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - res = _tmp19_; + res = sqlite3_bind_text (_tmp10_, 3, _tmp11_, -1, _tmp12_); #line 81 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp20_ = res; + _tmp13_ = res; #line 81 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _vala_assert (_tmp20_ == SQLITE_OK, "res == Sqlite.OK"); -#line 82 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp21_ = stmt; + _vala_assert (_tmp13_ == SQLITE_OK, "res == Sqlite.OK"); #line 82 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp22_ = time_created; + _tmp14_ = stmt; #line 82 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp23_ = sqlite3_bind_int64 (_tmp21_, 4, (gint64) _tmp22_); + _tmp15_ = time_created; #line 82 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - res = _tmp23_; + res = sqlite3_bind_int64 (_tmp14_, 4, (gint64) _tmp15_); #line 83 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp24_ = res; + _tmp16_ = res; #line 83 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _vala_assert (_tmp24_ == SQLITE_OK, "res == Sqlite.OK"); -#line 84 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp25_ = stmt; -#line 84 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp26_ = reason; + _vala_assert (_tmp16_ == SQLITE_OK, "res == Sqlite.OK"); #line 84 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp27_ = tombstone_reason_serialize (_tmp26_); + _tmp17_ = stmt; #line 84 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp28_ = sqlite3_bind_int (_tmp25_, 5, _tmp27_); -#line 84 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - res = _tmp28_; + res = sqlite3_bind_int (_tmp17_, 5, tombstone_reason_serialize (reason)); #line 85 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp29_ = res; + _tmp18_ = res; #line 85 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _vala_assert (_tmp29_ == SQLITE_OK, "res == Sqlite.OK"); -#line 87 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp30_ = stmt; + _vala_assert (_tmp18_ == SQLITE_OK, "res == Sqlite.OK"); #line 87 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp31_ = sqlite3_step (_tmp30_); + _tmp19_ = stmt; #line 87 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - res = _tmp31_; + res = sqlite3_step (_tmp19_); #line 88 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp32_ = res; + _tmp20_ = res; #line 88 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - if (_tmp32_ != SQLITE_DONE) { -#line 781 "TombstoneTable.c" - gint _tmp33_; + if (_tmp20_ != SQLITE_DONE) { +#line 845 "TombstoneTable.c" + gint _tmp21_; #line 89 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp33_ = res; + _tmp21_ = res; #line 89 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - database_table_throw_error ("TombstoneTable.add", _tmp33_, &_inner_error_); + database_table_throw_error ("TombstoneTable.add", _tmp21_, &_inner_error_); #line 89 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 89 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" @@ -793,7 +857,7 @@ TombstoneRow* tombstone_table_add (TombstoneTable* self, const gchar* filepath, _sqlite3_finalize0 (stmt); #line 89 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" return NULL; -#line 797 "TombstoneTable.c" +#line 861 "TombstoneTable.c" } else { #line 89 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" _sqlite3_finalize0 (stmt); @@ -803,225 +867,210 @@ TombstoneRow* tombstone_table_add (TombstoneTable* self, const gchar* filepath, g_clear_error (&_inner_error_); #line 89 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" return NULL; -#line 807 "TombstoneTable.c" +#line 871 "TombstoneTable.c" } } } #line 91 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp34_ = tombstone_row_new (); + _tmp22_ = tombstone_row_new (); #line 91 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - row = _tmp34_; + row = _tmp22_; #line 92 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp35_ = row; + _tmp23_ = row; #line 92 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp36_ = database_table_db; + _tmp24_ = database_table_db; #line 92 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp37_ = sqlite3_last_insert_rowid (_tmp36_); -#line 92 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - tombstone_id_init (&_tmp35_->id, _tmp37_); -#line 93 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp38_ = row; + tombstone_id_init (&_tmp23_->id, sqlite3_last_insert_rowid (_tmp24_)); #line 93 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp39_ = filepath; + _tmp25_ = row; #line 93 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp40_ = g_strdup (_tmp39_); + _tmp26_ = g_strdup (filepath); #line 93 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _g_free0 (_tmp38_->filepath); + _g_free0 (_tmp25_->filepath); #line 93 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp38_->filepath = _tmp40_; + _tmp25_->filepath = _tmp26_; #line 94 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp41_ = row; + _tmp27_ = row; #line 94 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp42_ = filesize; -#line 94 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp41_->filesize = _tmp42_; -#line 95 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp43_ = row; + _tmp27_->filesize = filesize; #line 95 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp44_ = md5; + _tmp28_ = row; #line 95 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp45_ = g_strdup (_tmp44_); + _tmp29_ = g_strdup (md5); #line 95 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _g_free0 (_tmp43_->md5); + _g_free0 (_tmp28_->md5); #line 95 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp43_->md5 = _tmp45_; + _tmp28_->md5 = _tmp29_; #line 96 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp46_ = row; + _tmp30_ = row; #line 96 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp47_ = time_created; + _tmp31_ = time_created; #line 96 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp46_->time_created = _tmp47_; + _tmp30_->time_created = _tmp31_; #line 97 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp48_ = row; + _tmp32_ = row; #line 97 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp49_ = reason; -#line 97 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp48_->reason = _tmp49_; + _tmp32_->reason = reason; #line 99 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" result = row; #line 99 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" _sqlite3_finalize0 (stmt); #line 99 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" return result; -#line 867 "TombstoneTable.c" +#line 921 "TombstoneTable.c" } -static gpointer _tombstone_row_ref0 (gpointer self) { +static gpointer +_tombstone_row_ref0 (gpointer self) +{ #line 130 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" return self ? tombstone_row_ref (self) : NULL; -#line 874 "TombstoneTable.c" +#line 930 "TombstoneTable.c" } -TombstoneRow** tombstone_table_fetch_all (TombstoneTable* self, int* result_length1, GError** error) { +TombstoneRow** +tombstone_table_fetch_all (TombstoneTable* self, + int* result_length1, + GError** error) +{ TombstoneRow** result = NULL; gint row_count = 0; gint _tmp0_; - gint _tmp1_; sqlite3_stmt* stmt = NULL; gint res = 0; - sqlite3* _tmp3_; - sqlite3_stmt* _tmp4_ = NULL; + sqlite3* _tmp2_; + sqlite3_stmt* _tmp3_ = NULL; + gint _tmp4_; gint _tmp5_; - gint _tmp6_; TombstoneRow** rows = NULL; - gint _tmp7_; - TombstoneRow** _tmp8_; + gint _tmp6_; + TombstoneRow** _tmp7_; gint rows_length1; gint _rows_size_; gint index = 0; - gint _tmp42_; - gint _tmp43_; - TombstoneRow** _tmp44_; - gint _tmp44__length1; + gint _tmp35_; + gint _tmp36_; + TombstoneRow** _tmp37_; + gint _tmp37__length1; GError * _inner_error_ = NULL; #line 102 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" g_return_val_if_fail (IS_TOMBSTONE_TABLE (self), NULL); #line 103 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp0_ = database_table_get_row_count (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable)); -#line 103 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - row_count = _tmp0_; + row_count = database_table_get_row_count (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable)); #line 104 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp1_ = row_count; + _tmp0_ = row_count; #line 104 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - if (_tmp1_ == 0) { -#line 910 "TombstoneTable.c" - TombstoneRow** _tmp2_; - gint _tmp2__length1; + if (_tmp0_ == 0) { +#line 967 "TombstoneTable.c" + TombstoneRow** _tmp1_; + gint _tmp1__length1; #line 105 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp2_ = NULL; + _tmp1_ = NULL; #line 105 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp2__length1 = 0; + _tmp1__length1 = 0; #line 105 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" if (result_length1) { #line 105 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - *result_length1 = _tmp2__length1; -#line 921 "TombstoneTable.c" + *result_length1 = _tmp1__length1; +#line 978 "TombstoneTable.c" } #line 105 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - result = _tmp2_; + result = _tmp1_; #line 105 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" return result; -#line 927 "TombstoneTable.c" +#line 984 "TombstoneTable.c" } #line 108 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp3_ = database_table_db; + _tmp2_ = database_table_db; #line 108 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp5_ = sqlite3_prepare_v2 (_tmp3_, "SELECT id, filepath, filesize, md5, time_created, reason " "FROM TombstoneTable", -1, &_tmp4_, NULL); + _tmp4_ = sqlite3_prepare_v2 (_tmp2_, "SELECT id, filepath, filesize, md5, time_created, reason " "FROM TombstoneTable", -1, &_tmp3_, NULL); #line 108 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" _sqlite3_finalize0 (stmt); #line 108 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - stmt = _tmp4_; + stmt = _tmp3_; #line 108 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - res = _tmp5_; + res = _tmp4_; #line 110 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp6_ = res; + _tmp5_ = res; #line 110 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _vala_assert (_tmp6_ == SQLITE_OK, "res == Sqlite.OK"); + _vala_assert (_tmp5_ == SQLITE_OK, "res == Sqlite.OK"); #line 112 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp7_ = row_count; + _tmp6_ = row_count; #line 112 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp8_ = g_new0 (TombstoneRow*, _tmp7_ + 1); + _tmp7_ = g_new0 (TombstoneRow*, _tmp6_ + 1); #line 112 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - rows = _tmp8_; + rows = _tmp7_; #line 112 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - rows_length1 = _tmp7_; + rows_length1 = _tmp6_; #line 112 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" _rows_size_ = rows_length1; #line 114 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" index = 0; -#line 955 "TombstoneTable.c" +#line 1012 "TombstoneTable.c" { - gboolean _tmp9_ = FALSE; + gboolean _tmp8_ = FALSE; #line 115 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp9_ = TRUE; + _tmp8_ = TRUE; #line 115 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" while (TRUE) { -#line 962 "TombstoneTable.c" - sqlite3_stmt* _tmp10_; - gint _tmp11_; - gint _tmp12_; +#line 1019 "TombstoneTable.c" + sqlite3_stmt* _tmp9_; + gint _tmp10_; TombstoneRow* row = NULL; - TombstoneRow* _tmp15_; + TombstoneRow* _tmp13_; + TombstoneRow* _tmp14_; + sqlite3_stmt* _tmp15_; TombstoneRow* _tmp16_; sqlite3_stmt* _tmp17_; - gint64 _tmp18_; - TombstoneRow* _tmp19_; - sqlite3_stmt* _tmp20_; - const gchar* _tmp21_; - gchar* _tmp22_; - TombstoneRow* _tmp23_; - sqlite3_stmt* _tmp24_; - gint64 _tmp25_; + const gchar* _tmp18_; + gchar* _tmp19_; + TombstoneRow* _tmp20_; + sqlite3_stmt* _tmp21_; + TombstoneRow* _tmp22_; + sqlite3_stmt* _tmp23_; + const gchar* _tmp24_; + gchar* _tmp25_; TombstoneRow* _tmp26_; sqlite3_stmt* _tmp27_; - const gchar* _tmp28_; - gchar* _tmp29_; - TombstoneRow* _tmp30_; - sqlite3_stmt* _tmp31_; - gint64 _tmp32_; + TombstoneRow* _tmp28_; + sqlite3_stmt* _tmp29_; + TombstoneRow** _tmp30_; + gint _tmp30__length1; + gint _tmp31_; + TombstoneRow* _tmp32_; TombstoneRow* _tmp33_; - sqlite3_stmt* _tmp34_; - gint _tmp35_; - TombstoneReason _tmp36_; - TombstoneRow** _tmp37_; - gint _tmp37__length1; - gint _tmp38_; - TombstoneRow* _tmp39_; - TombstoneRow* _tmp40_; - TombstoneRow* _tmp41_; + TombstoneRow* _tmp34_; #line 115 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - if (!_tmp9_) { -#line 997 "TombstoneTable.c" + if (!_tmp8_) { +#line 1048 "TombstoneTable.c" } #line 115 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp9_ = FALSE; -#line 116 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp10_ = stmt; + _tmp8_ = FALSE; #line 116 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp11_ = sqlite3_step (_tmp10_); + _tmp9_ = stmt; #line 116 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - res = _tmp11_; + res = sqlite3_step (_tmp9_); #line 117 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp12_ = res; + _tmp10_ = res; #line 117 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - if (_tmp12_ == SQLITE_DONE) { + if (_tmp10_ == SQLITE_DONE) { #line 118 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" break; -#line 1013 "TombstoneTable.c" +#line 1062 "TombstoneTable.c" } else { - gint _tmp13_; + gint _tmp11_; #line 119 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp13_ = res; + _tmp11_ = res; #line 119 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - if (_tmp13_ != SQLITE_ROW) { -#line 1020 "TombstoneTable.c" - gint _tmp14_; + if (_tmp11_ != SQLITE_ROW) { +#line 1069 "TombstoneTable.c" + gint _tmp12_; #line 120 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp14_ = res; + _tmp12_ = res; #line 120 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - database_table_throw_error ("TombstoneTable.fetch_all", _tmp14_, &_inner_error_); + database_table_throw_error ("TombstoneTable.fetch_all", _tmp12_, &_inner_error_); #line 120 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 120 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" @@ -1034,7 +1083,7 @@ TombstoneRow** tombstone_table_fetch_all (TombstoneTable* self, int* result_leng _sqlite3_finalize0 (stmt); #line 120 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" return NULL; -#line 1038 "TombstoneTable.c" +#line 1087 "TombstoneTable.c" } else { #line 120 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" rows = (_vala_array_free (rows, rows_length1, (GDestroyNotify) tombstone_row_unref), NULL); @@ -1046,126 +1095,120 @@ TombstoneRow** tombstone_table_fetch_all (TombstoneTable* self, int* result_leng g_clear_error (&_inner_error_); #line 120 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" return NULL; -#line 1050 "TombstoneTable.c" +#line 1099 "TombstoneTable.c" } } } } #line 122 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp15_ = tombstone_row_new (); + _tmp13_ = tombstone_row_new (); #line 122 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - row = _tmp15_; + row = _tmp13_; #line 123 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp16_ = row; -#line 123 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp17_ = stmt; + _tmp14_ = row; #line 123 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp18_ = sqlite3_column_int64 (_tmp17_, 0); + _tmp15_ = stmt; #line 123 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - tombstone_id_init (&_tmp16_->id, _tmp18_); + tombstone_id_init (&_tmp14_->id, sqlite3_column_int64 (_tmp15_, 0)); #line 124 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp19_ = row; + _tmp16_ = row; #line 124 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp20_ = stmt; + _tmp17_ = stmt; #line 124 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp21_ = sqlite3_column_text (_tmp20_, 1); + _tmp18_ = sqlite3_column_text (_tmp17_, 1); #line 124 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp22_ = g_strdup (_tmp21_); + _tmp19_ = g_strdup (_tmp18_); #line 124 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _g_free0 (_tmp19_->filepath); + _g_free0 (_tmp16_->filepath); #line 124 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp19_->filepath = _tmp22_; + _tmp16_->filepath = _tmp19_; #line 125 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp23_ = row; + _tmp20_ = row; #line 125 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp24_ = stmt; + _tmp21_ = stmt; #line 125 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp25_ = sqlite3_column_int64 (_tmp24_, 2); -#line 125 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp23_->filesize = _tmp25_; + _tmp20_->filesize = sqlite3_column_int64 (_tmp21_, 2); #line 126 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp26_ = row; + _tmp22_ = row; #line 126 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp27_ = stmt; + _tmp23_ = stmt; #line 126 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp28_ = sqlite3_column_text (_tmp27_, 3); + _tmp24_ = sqlite3_column_text (_tmp23_, 3); #line 126 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp29_ = g_strdup (_tmp28_); + _tmp25_ = g_strdup (_tmp24_); #line 126 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _g_free0 (_tmp26_->md5); + _g_free0 (_tmp22_->md5); #line 126 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp26_->md5 = _tmp29_; -#line 127 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp30_ = row; + _tmp22_->md5 = _tmp25_; #line 127 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp31_ = stmt; + _tmp26_ = row; #line 127 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp32_ = sqlite3_column_int64 (_tmp31_, 4); + _tmp27_ = stmt; #line 127 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp30_->time_created = (time_t) _tmp32_; + _tmp26_->time_created = (time_t) sqlite3_column_int64 (_tmp27_, 4); #line 128 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp33_ = row; + _tmp28_ = row; #line 128 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp34_ = stmt; + _tmp29_ = stmt; #line 128 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp35_ = sqlite3_column_int (_tmp34_, 5); -#line 128 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp36_ = tombstone_reason_unserialize (_tmp35_); -#line 128 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp33_->reason = _tmp36_; + _tmp28_->reason = tombstone_reason_unserialize (sqlite3_column_int (_tmp29_, 5)); #line 130 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp37_ = rows; + _tmp30_ = rows; #line 130 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp37__length1 = rows_length1; + _tmp30__length1 = rows_length1; #line 130 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp38_ = index; + _tmp31_ = index; #line 130 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - index = _tmp38_ + 1; + index = _tmp31_ + 1; #line 130 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp39_ = row; + _tmp32_ = row; #line 130 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp40_ = _tombstone_row_ref0 (_tmp39_); + _tmp33_ = _tombstone_row_ref0 (_tmp32_); #line 130 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tombstone_row_unref0 (_tmp37_[_tmp38_]); + _tombstone_row_unref0 (_tmp30_[_tmp31_]); #line 130 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp37_[_tmp38_] = _tmp40_; + _tmp30_[_tmp31_] = _tmp33_; #line 130 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp41_ = _tmp37_[_tmp38_]; + _tmp34_ = _tmp30_[_tmp31_]; #line 115 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" _tombstone_row_unref0 (row); -#line 1137 "TombstoneTable.c" +#line 1176 "TombstoneTable.c" } } #line 133 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp42_ = index; + _tmp35_ = index; #line 133 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp43_ = row_count; + _tmp36_ = row_count; #line 133 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _vala_assert (_tmp42_ == _tmp43_, "index == row_count"); + _vala_assert (_tmp35_ == _tmp36_, "index == row_count"); #line 135 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp44_ = rows; + _tmp37_ = rows; #line 135 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp44__length1 = rows_length1; + _tmp37__length1 = rows_length1; #line 135 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" if (result_length1) { #line 135 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - *result_length1 = _tmp44__length1; -#line 1154 "TombstoneTable.c" + *result_length1 = _tmp37__length1; +#line 1193 "TombstoneTable.c" } #line 135 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - result = _tmp44_; + result = _tmp37_; #line 135 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" _sqlite3_finalize0 (stmt); #line 135 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" return result; -#line 1162 "TombstoneTable.c" +#line 1201 "TombstoneTable.c" } -void tombstone_table_update_file (TombstoneTable* self, TombstoneID* tombstone_id, const gchar* filepath, GError** error) { +void +tombstone_table_update_file (TombstoneTable* self, + TombstoneID* tombstone_id, + const gchar* filepath, + GError** error) +{ TombstoneID _tmp0_; gint64 _tmp1_; - const gchar* _tmp2_; GError * _inner_error_ = NULL; #line 138 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" g_return_if_fail (IS_TOMBSTONE_TABLE (self)); @@ -1178,9 +1221,7 @@ void tombstone_table_update_file (TombstoneTable* self, TombstoneID* tombstone_i #line 139 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" _tmp1_ = _tmp0_.id; #line 139 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - _tmp2_ = filepath; -#line 139 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" - database_table_update_text_by_id_2 (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp1_, "filepath", _tmp2_, &_inner_error_); + database_table_update_text_by_id_2 (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp1_, "filepath", filepath, &_inner_error_); #line 139 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 139 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" @@ -1189,7 +1230,7 @@ void tombstone_table_update_file (TombstoneTable* self, TombstoneID* tombstone_i g_propagate_error (error, _inner_error_); #line 139 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" return; -#line 1193 "TombstoneTable.c" +#line 1234 "TombstoneTable.c" } else { #line 139 "/home/jens/Source/shotwell/src/db/TombstoneTable.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); @@ -1197,13 +1238,17 @@ void tombstone_table_update_file (TombstoneTable* self, TombstoneID* tombstone_i g_clear_error (&_inner_error_); #line 139 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" return; -#line 1201 "TombstoneTable.c" +#line 1242 "TombstoneTable.c" } } } -void tombstone_table_remove (TombstoneTable* self, TombstoneID* tombstone_id, GError** error) { +void +tombstone_table_remove (TombstoneTable* self, + TombstoneID* tombstone_id, + GError** error) +{ TombstoneID _tmp0_; gint64 _tmp1_; GError * _inner_error_ = NULL; @@ -1225,7 +1270,7 @@ void tombstone_table_remove (TombstoneTable* self, TombstoneID* tombstone_id, GE g_propagate_error (error, _inner_error_); #line 143 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" return; -#line 1229 "TombstoneTable.c" +#line 1274 "TombstoneTable.c" } else { #line 143 "/home/jens/Source/shotwell/src/db/TombstoneTable.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); @@ -1233,36 +1278,44 @@ void tombstone_table_remove (TombstoneTable* self, TombstoneID* tombstone_id, GE g_clear_error (&_inner_error_); #line 143 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" return; -#line 1237 "TombstoneTable.c" +#line 1282 "TombstoneTable.c" } } } -static void tombstone_table_class_init (TombstoneTableClass * klass) { +static void +tombstone_table_class_init (TombstoneTableClass * klass) +{ #line 34 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" tombstone_table_parent_class = g_type_class_peek_parent (klass); #line 34 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" ((DatabaseTableClass *) klass)->finalize = tombstone_table_finalize; -#line 1248 "TombstoneTable.c" +#line 1295 "TombstoneTable.c" } -static void tombstone_table_instance_init (TombstoneTable * self) { +static void +tombstone_table_instance_init (TombstoneTable * self) +{ } -static void tombstone_table_finalize (DatabaseTable * obj) { +static void +tombstone_table_finalize (DatabaseTable * obj) +{ TombstoneTable * self; #line 34 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_TOMBSTONE_TABLE, TombstoneTable); #line 34 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" DATABASE_TABLE_CLASS (tombstone_table_parent_class)->finalize (obj); -#line 1262 "TombstoneTable.c" +#line 1313 "TombstoneTable.c" } -GType tombstone_table_get_type (void) { +GType +tombstone_table_get_type (void) +{ static volatile gsize tombstone_table_type_id__volatile = 0; if (g_once_init_enter (&tombstone_table_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (TombstoneTableClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) tombstone_table_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (TombstoneTable), 0, (GInstanceInitFunc) tombstone_table_instance_init, NULL }; @@ -1274,7 +1327,11 @@ GType tombstone_table_get_type (void) { } -static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func) { +static void +_vala_array_destroy (gpointer array, + gint array_length, + GDestroyNotify destroy_func) +{ if ((array != NULL) && (destroy_func != NULL)) { int i; for (i = 0; i < array_length; i = i + 1) { @@ -1286,7 +1343,11 @@ static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNoti } -static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func) { +static void +_vala_array_free (gpointer array, + gint array_length, + GDestroyNotify destroy_func) +{ _vala_array_destroy (array, array_length, destroy_func); g_free (array); } diff --git a/src/db/VersionTable.c b/src/db/VersionTable.c index 4505a6f..a5847d7 100644 --- a/src/db/VersionTable.c +++ b/src/db/VersionTable.c @@ -1,4 +1,4 @@ -/* VersionTable.c generated by valac 0.36.6, the Vala compiler +/* VersionTable.c generated by valac 0.40.4, the Vala compiler * generated from VersionTable.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,6 +7,7 @@ * (version 2.1 or later). See the COPYING file in this distribution. */ + #include <glib.h> #include <glib-object.h> #include <stdlib.h> @@ -72,28 +73,41 @@ extern sqlite3* database_table_db; gpointer database_table_ref (gpointer instance); void database_table_unref (gpointer instance); -GParamSpec* param_spec_database_table (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_database_table (GValue* value, gpointer v_object); -void value_take_database_table (GValue* value, gpointer v_object); +GParamSpec* param_spec_database_table (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_database_table (GValue* value, + gpointer v_object); +void value_take_database_table (GValue* value, + gpointer v_object); gpointer value_get_database_table (const GValue* value); GType database_table_get_type (void) G_GNUC_CONST; GType version_table_get_type (void) G_GNUC_CONST; -enum { - VERSION_TABLE_DUMMY_PROPERTY -}; static VersionTable* version_table_new (void); static VersionTable* version_table_construct (GType object_type); DatabaseTable* database_table_construct (GType object_type); -void database_table_fatal (const gchar* op, gint res); -void database_table_set_table_name (DatabaseTable* self, const gchar* table_name); +void database_table_fatal (const gchar* op, + gint res); +void database_table_set_table_name (DatabaseTable* self, + const gchar* table_name); VersionTable* version_table_get_instance (void); -gint version_table_get_version (VersionTable* self, gchar* * app_version); -void version_table_set_version (VersionTable* self, gint version, const gchar* app_version, const gchar* user_data); -void version_table_update_version (VersionTable* self, gint version, const gchar* app_version); +gint version_table_get_version (VersionTable* self, + gchar* * app_version); +void version_table_set_version (VersionTable* self, + gint version, + const gchar* app_version, + const gchar* user_data); +void version_table_update_version (VersionTable* self, + gint version, + const gchar* app_version); static void version_table_finalize (DatabaseTable * obj); -static VersionTable* version_table_construct (GType object_type) { +static VersionTable* +version_table_construct (GType object_type) +{ VersionTable* self = NULL; sqlite3_stmt* stmt = NULL; gint res = 0; @@ -103,7 +117,6 @@ static VersionTable* version_table_construct (GType object_type) { gint _tmp3_; sqlite3_stmt* _tmp4_; gint _tmp5_; - gint _tmp6_; #line 10 "/home/jens/Source/shotwell/src/db/VersionTable.vala" self = (VersionTable*) database_table_construct (object_type); #line 12 "/home/jens/Source/shotwell/src/db/VersionTable.vala" @@ -123,20 +136,18 @@ static VersionTable* version_table_construct (GType object_type) { #line 20 "/home/jens/Source/shotwell/src/db/VersionTable.vala" _tmp4_ = stmt; #line 20 "/home/jens/Source/shotwell/src/db/VersionTable.vala" - _tmp5_ = sqlite3_step (_tmp4_); -#line 20 "/home/jens/Source/shotwell/src/db/VersionTable.vala" - res = _tmp5_; + res = sqlite3_step (_tmp4_); #line 21 "/home/jens/Source/shotwell/src/db/VersionTable.vala" - _tmp6_ = res; + _tmp5_ = res; #line 21 "/home/jens/Source/shotwell/src/db/VersionTable.vala" - if (_tmp6_ != SQLITE_DONE) { -#line 134 "VersionTable.c" - gint _tmp7_; + if (_tmp5_ != SQLITE_DONE) { +#line 145 "VersionTable.c" + gint _tmp6_; #line 22 "/home/jens/Source/shotwell/src/db/VersionTable.vala" - _tmp7_ = res; + _tmp6_ = res; #line 22 "/home/jens/Source/shotwell/src/db/VersionTable.vala" - database_table_fatal ("create version table", _tmp7_); -#line 140 "VersionTable.c" + database_table_fatal ("create version table", _tmp6_); +#line 151 "VersionTable.c" } #line 24 "/home/jens/Source/shotwell/src/db/VersionTable.vala" database_table_set_table_name (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), "VersionTable"); @@ -144,25 +155,31 @@ static VersionTable* version_table_construct (GType object_type) { _sqlite3_finalize0 (stmt); #line 10 "/home/jens/Source/shotwell/src/db/VersionTable.vala" return self; -#line 148 "VersionTable.c" +#line 159 "VersionTable.c" } -static VersionTable* version_table_new (void) { +static VersionTable* +version_table_new (void) +{ #line 10 "/home/jens/Source/shotwell/src/db/VersionTable.vala" return version_table_construct (TYPE_VERSION_TABLE); -#line 155 "VersionTable.c" +#line 168 "VersionTable.c" } -static gpointer _database_table_ref0 (gpointer self) { +static gpointer +_database_table_ref0 (gpointer self) +{ #line 31 "/home/jens/Source/shotwell/src/db/VersionTable.vala" return self ? database_table_ref (self) : NULL; -#line 162 "VersionTable.c" +#line 177 "VersionTable.c" } -VersionTable* version_table_get_instance (void) { +VersionTable* +version_table_get_instance (void) +{ VersionTable* result = NULL; VersionTable* _tmp0_; VersionTable* _tmp2_; @@ -171,7 +188,7 @@ VersionTable* version_table_get_instance (void) { _tmp0_ = version_table_instance; #line 28 "/home/jens/Source/shotwell/src/db/VersionTable.vala" if (_tmp0_ == NULL) { -#line 175 "VersionTable.c" +#line 192 "VersionTable.c" VersionTable* _tmp1_; #line 29 "/home/jens/Source/shotwell/src/db/VersionTable.vala" _tmp1_ = version_table_new (); @@ -179,7 +196,7 @@ VersionTable* version_table_get_instance (void) { _database_table_unref0 (version_table_instance); #line 29 "/home/jens/Source/shotwell/src/db/VersionTable.vala" version_table_instance = _tmp1_; -#line 183 "VersionTable.c" +#line 200 "VersionTable.c" } #line 31 "/home/jens/Source/shotwell/src/db/VersionTable.vala" _tmp2_ = version_table_instance; @@ -189,11 +206,14 @@ VersionTable* version_table_get_instance (void) { result = _tmp3_; #line 31 "/home/jens/Source/shotwell/src/db/VersionTable.vala" return result; -#line 193 "VersionTable.c" +#line 210 "VersionTable.c" } -gint version_table_get_version (VersionTable* self, gchar* * app_version) { +gint +version_table_get_version (VersionTable* self, + gchar* * app_version) +{ gchar* _vala_app_version = NULL; gint result = 0; sqlite3_stmt* stmt = NULL; @@ -204,12 +224,10 @@ gint version_table_get_version (VersionTable* self, gchar* * app_version) { gint _tmp3_; sqlite3_stmt* _tmp4_; gint _tmp5_; - gint _tmp6_; - sqlite3_stmt* _tmp9_; - const gchar* _tmp10_; - gchar* _tmp11_; - sqlite3_stmt* _tmp12_; - gint _tmp13_; + sqlite3_stmt* _tmp8_; + const gchar* _tmp9_; + gchar* _tmp10_; + sqlite3_stmt* _tmp11_; #line 34 "/home/jens/Source/shotwell/src/db/VersionTable.vala" g_return_val_if_fail (IS_VERSION_TABLE (self), 0); #line 36 "/home/jens/Source/shotwell/src/db/VersionTable.vala" @@ -230,26 +248,24 @@ gint version_table_get_version (VersionTable* self, gchar* * app_version) { #line 40 "/home/jens/Source/shotwell/src/db/VersionTable.vala" _tmp4_ = stmt; #line 40 "/home/jens/Source/shotwell/src/db/VersionTable.vala" - _tmp5_ = sqlite3_step (_tmp4_); -#line 40 "/home/jens/Source/shotwell/src/db/VersionTable.vala" - res = _tmp5_; + res = sqlite3_step (_tmp4_); #line 41 "/home/jens/Source/shotwell/src/db/VersionTable.vala" - _tmp6_ = res; + _tmp5_ = res; #line 41 "/home/jens/Source/shotwell/src/db/VersionTable.vala" - if (_tmp6_ != SQLITE_ROW) { -#line 240 "VersionTable.c" - gint _tmp7_; + if (_tmp5_ != SQLITE_ROW) { +#line 256 "VersionTable.c" + gint _tmp6_; #line 42 "/home/jens/Source/shotwell/src/db/VersionTable.vala" - _tmp7_ = res; + _tmp6_ = res; #line 42 "/home/jens/Source/shotwell/src/db/VersionTable.vala" - if (_tmp7_ != SQLITE_DONE) { -#line 246 "VersionTable.c" - gint _tmp8_; + if (_tmp6_ != SQLITE_DONE) { +#line 262 "VersionTable.c" + gint _tmp7_; #line 43 "/home/jens/Source/shotwell/src/db/VersionTable.vala" - _tmp8_ = res; + _tmp7_ = res; #line 43 "/home/jens/Source/shotwell/src/db/VersionTable.vala" - database_table_fatal ("get_version", _tmp8_); -#line 252 "VersionTable.c" + database_table_fatal ("get_version", _tmp7_); +#line 268 "VersionTable.c" } #line 45 "/home/jens/Source/shotwell/src/db/VersionTable.vala" _g_free0 (_vala_app_version); @@ -263,51 +279,54 @@ gint version_table_get_version (VersionTable* self, gchar* * app_version) { if (app_version) { #line 47 "/home/jens/Source/shotwell/src/db/VersionTable.vala" *app_version = _vala_app_version; -#line 266 "VersionTable.c" +#line 282 "VersionTable.c" } else { #line 47 "/home/jens/Source/shotwell/src/db/VersionTable.vala" _g_free0 (_vala_app_version); -#line 270 "VersionTable.c" +#line 286 "VersionTable.c" } #line 47 "/home/jens/Source/shotwell/src/db/VersionTable.vala" return result; -#line 274 "VersionTable.c" +#line 290 "VersionTable.c" } #line 50 "/home/jens/Source/shotwell/src/db/VersionTable.vala" - _tmp9_ = stmt; + _tmp8_ = stmt; #line 50 "/home/jens/Source/shotwell/src/db/VersionTable.vala" - _tmp10_ = sqlite3_column_text (_tmp9_, 1); + _tmp9_ = sqlite3_column_text (_tmp8_, 1); #line 50 "/home/jens/Source/shotwell/src/db/VersionTable.vala" - _tmp11_ = g_strdup (_tmp10_); + _tmp10_ = g_strdup (_tmp9_); #line 50 "/home/jens/Source/shotwell/src/db/VersionTable.vala" _g_free0 (_vala_app_version); #line 50 "/home/jens/Source/shotwell/src/db/VersionTable.vala" - _vala_app_version = _tmp11_; -#line 52 "/home/jens/Source/shotwell/src/db/VersionTable.vala" - _tmp12_ = stmt; + _vala_app_version = _tmp10_; #line 52 "/home/jens/Source/shotwell/src/db/VersionTable.vala" - _tmp13_ = sqlite3_column_int (_tmp12_, 0); + _tmp11_ = stmt; #line 52 "/home/jens/Source/shotwell/src/db/VersionTable.vala" - result = _tmp13_; + result = sqlite3_column_int (_tmp11_, 0); #line 52 "/home/jens/Source/shotwell/src/db/VersionTable.vala" _sqlite3_finalize0 (stmt); #line 52 "/home/jens/Source/shotwell/src/db/VersionTable.vala" if (app_version) { #line 52 "/home/jens/Source/shotwell/src/db/VersionTable.vala" *app_version = _vala_app_version; -#line 298 "VersionTable.c" +#line 312 "VersionTable.c" } else { #line 52 "/home/jens/Source/shotwell/src/db/VersionTable.vala" _g_free0 (_vala_app_version); -#line 302 "VersionTable.c" +#line 316 "VersionTable.c" } #line 52 "/home/jens/Source/shotwell/src/db/VersionTable.vala" return result; -#line 306 "VersionTable.c" +#line 320 "VersionTable.c" } -void version_table_set_version (VersionTable* self, gint version, const gchar* app_version, const gchar* user_data) { +void +version_table_set_version (VersionTable* self, + gint version, + const gchar* app_version, + const gchar* user_data) +{ sqlite3_stmt* stmt = NULL; gchar* bitbucket = NULL; gchar* _tmp0_ = NULL; @@ -315,23 +334,16 @@ void version_table_set_version (VersionTable* self, gint version, const gchar* a gint res = 0; sqlite3_stmt* _tmp10_; gint _tmp11_; - gint _tmp12_; - gint _tmp13_; - sqlite3_stmt* _tmp14_; - const gchar* _tmp15_; - gchar* _tmp16_; - GDestroyNotify _tmp17_; - gint _tmp18_; + sqlite3_stmt* _tmp12_; + gchar* _tmp13_; + GDestroyNotify _tmp14_; + gint _tmp15_; + sqlite3_stmt* _tmp16_; + gchar* _tmp17_; + GDestroyNotify _tmp18_; gint _tmp19_; sqlite3_stmt* _tmp20_; - const gchar* _tmp21_; - gchar* _tmp22_; - GDestroyNotify _tmp23_; - gint _tmp24_; - gint _tmp25_; - sqlite3_stmt* _tmp26_; - gint _tmp27_; - gint _tmp28_; + gint _tmp21_; #line 55 "/home/jens/Source/shotwell/src/db/VersionTable.vala" g_return_if_fail (IS_VERSION_TABLE (self)); #line 55 "/home/jens/Source/shotwell/src/db/VersionTable.vala" @@ -344,7 +356,7 @@ void version_table_set_version (VersionTable* self, gint version, const gchar* a bitbucket = _tmp0_; #line 59 "/home/jens/Source/shotwell/src/db/VersionTable.vala" if (_tmp1_ != -1) { -#line 347 "VersionTable.c" +#line 359 "VersionTable.c" gint res = 0; sqlite3* _tmp2_; sqlite3_stmt* _tmp3_ = NULL; @@ -364,7 +376,7 @@ void version_table_set_version (VersionTable* self, gint version, const gchar* a _tmp5_ = res; #line 63 "/home/jens/Source/shotwell/src/db/VersionTable.vala" _vala_assert (_tmp5_ == SQLITE_OK, "res == Sqlite.OK"); -#line 367 "VersionTable.c" +#line 379 "VersionTable.c" } else { gint res = 0; sqlite3* _tmp6_; @@ -386,96 +398,77 @@ void version_table_set_version (VersionTable* self, gint version, const gchar* a _tmp9_ = res; #line 68 "/home/jens/Source/shotwell/src/db/VersionTable.vala" _vala_assert (_tmp9_ == SQLITE_OK, "res == Sqlite.OK"); -#line 388 "VersionTable.c" +#line 400 "VersionTable.c" } #line 71 "/home/jens/Source/shotwell/src/db/VersionTable.vala" _tmp10_ = stmt; #line 71 "/home/jens/Source/shotwell/src/db/VersionTable.vala" - _tmp11_ = version; -#line 71 "/home/jens/Source/shotwell/src/db/VersionTable.vala" - _tmp12_ = sqlite3_bind_int (_tmp10_, 1, _tmp11_); -#line 71 "/home/jens/Source/shotwell/src/db/VersionTable.vala" - res = _tmp12_; + res = sqlite3_bind_int (_tmp10_, 1, version); #line 72 "/home/jens/Source/shotwell/src/db/VersionTable.vala" - _tmp13_ = res; + _tmp11_ = res; #line 72 "/home/jens/Source/shotwell/src/db/VersionTable.vala" - _vala_assert (_tmp13_ == SQLITE_OK, "res == Sqlite.OK"); -#line 73 "/home/jens/Source/shotwell/src/db/VersionTable.vala" - _tmp14_ = stmt; -#line 73 "/home/jens/Source/shotwell/src/db/VersionTable.vala" - _tmp15_ = app_version; + _vala_assert (_tmp11_ == SQLITE_OK, "res == Sqlite.OK"); #line 73 "/home/jens/Source/shotwell/src/db/VersionTable.vala" - _tmp16_ = g_strdup (_tmp15_); + _tmp12_ = stmt; #line 73 "/home/jens/Source/shotwell/src/db/VersionTable.vala" - _tmp17_ = g_free; + _tmp13_ = g_strdup (app_version); #line 73 "/home/jens/Source/shotwell/src/db/VersionTable.vala" - _tmp18_ = sqlite3_bind_text (_tmp14_, 2, _tmp16_, -1, _tmp17_); + _tmp14_ = g_free; #line 73 "/home/jens/Source/shotwell/src/db/VersionTable.vala" - res = _tmp18_; + res = sqlite3_bind_text (_tmp12_, 2, _tmp13_, -1, _tmp14_); #line 74 "/home/jens/Source/shotwell/src/db/VersionTable.vala" - _tmp19_ = res; + _tmp15_ = res; #line 74 "/home/jens/Source/shotwell/src/db/VersionTable.vala" - _vala_assert (_tmp19_ == SQLITE_OK, "res == Sqlite.OK"); -#line 75 "/home/jens/Source/shotwell/src/db/VersionTable.vala" - _tmp20_ = stmt; + _vala_assert (_tmp15_ == SQLITE_OK, "res == Sqlite.OK"); #line 75 "/home/jens/Source/shotwell/src/db/VersionTable.vala" - _tmp21_ = user_data; + _tmp16_ = stmt; #line 75 "/home/jens/Source/shotwell/src/db/VersionTable.vala" - _tmp22_ = g_strdup (_tmp21_); + _tmp17_ = g_strdup (user_data); #line 75 "/home/jens/Source/shotwell/src/db/VersionTable.vala" - _tmp23_ = g_free; + _tmp18_ = g_free; #line 75 "/home/jens/Source/shotwell/src/db/VersionTable.vala" - _tmp24_ = sqlite3_bind_text (_tmp20_, 3, _tmp22_, -1, _tmp23_); -#line 75 "/home/jens/Source/shotwell/src/db/VersionTable.vala" - res = _tmp24_; + res = sqlite3_bind_text (_tmp16_, 3, _tmp17_, -1, _tmp18_); #line 76 "/home/jens/Source/shotwell/src/db/VersionTable.vala" - _tmp25_ = res; + _tmp19_ = res; #line 76 "/home/jens/Source/shotwell/src/db/VersionTable.vala" - _vala_assert (_tmp25_ == SQLITE_OK, "res == Sqlite.OK"); -#line 78 "/home/jens/Source/shotwell/src/db/VersionTable.vala" - _tmp26_ = stmt; + _vala_assert (_tmp19_ == SQLITE_OK, "res == Sqlite.OK"); #line 78 "/home/jens/Source/shotwell/src/db/VersionTable.vala" - _tmp27_ = sqlite3_step (_tmp26_); + _tmp20_ = stmt; #line 78 "/home/jens/Source/shotwell/src/db/VersionTable.vala" - res = _tmp27_; + res = sqlite3_step (_tmp20_); #line 79 "/home/jens/Source/shotwell/src/db/VersionTable.vala" - _tmp28_ = res; + _tmp21_ = res; #line 79 "/home/jens/Source/shotwell/src/db/VersionTable.vala" - if (_tmp28_ != SQLITE_DONE) { -#line 444 "VersionTable.c" - gint _tmp29_; - const gchar* _tmp30_; - const gchar* _tmp31_; - gchar* _tmp32_; - gchar* _tmp33_; - gint _tmp34_; -#line 80 "/home/jens/Source/shotwell/src/db/VersionTable.vala" - _tmp29_ = version; + if (_tmp21_ != SQLITE_DONE) { +#line 442 "VersionTable.c" + gchar* _tmp22_; + gchar* _tmp23_; + gint _tmp24_; #line 80 "/home/jens/Source/shotwell/src/db/VersionTable.vala" - _tmp30_ = app_version; + _tmp22_ = g_strdup_printf ("set_version %d %s %s", version, app_version, user_data); #line 80 "/home/jens/Source/shotwell/src/db/VersionTable.vala" - _tmp31_ = user_data; + _tmp23_ = _tmp22_; #line 80 "/home/jens/Source/shotwell/src/db/VersionTable.vala" - _tmp32_ = g_strdup_printf ("set_version %d %s %s", _tmp29_, _tmp30_, _tmp31_); + _tmp24_ = res; #line 80 "/home/jens/Source/shotwell/src/db/VersionTable.vala" - _tmp33_ = _tmp32_; + database_table_fatal (_tmp23_, _tmp24_); #line 80 "/home/jens/Source/shotwell/src/db/VersionTable.vala" - _tmp34_ = res; -#line 80 "/home/jens/Source/shotwell/src/db/VersionTable.vala" - database_table_fatal (_tmp33_, _tmp34_); -#line 80 "/home/jens/Source/shotwell/src/db/VersionTable.vala" - _g_free0 (_tmp33_); -#line 467 "VersionTable.c" + _g_free0 (_tmp23_); +#line 456 "VersionTable.c" } #line 55 "/home/jens/Source/shotwell/src/db/VersionTable.vala" _g_free0 (bitbucket); #line 55 "/home/jens/Source/shotwell/src/db/VersionTable.vala" _sqlite3_finalize0 (stmt); -#line 473 "VersionTable.c" +#line 462 "VersionTable.c" } -void version_table_update_version (VersionTable* self, gint version, const gchar* app_version) { +void +version_table_update_version (VersionTable* self, + gint version, + const gchar* app_version) +{ sqlite3_stmt* stmt = NULL; gint res = 0; sqlite3* _tmp0_; @@ -484,17 +477,12 @@ void version_table_update_version (VersionTable* self, gint version, const gchar gint _tmp3_; sqlite3_stmt* _tmp4_; gint _tmp5_; - gint _tmp6_; - gint _tmp7_; - sqlite3_stmt* _tmp8_; - const gchar* _tmp9_; - gchar* _tmp10_; - GDestroyNotify _tmp11_; - gint _tmp12_; - gint _tmp13_; - sqlite3_stmt* _tmp14_; - gint _tmp15_; - gint _tmp16_; + sqlite3_stmt* _tmp6_; + gchar* _tmp7_; + GDestroyNotify _tmp8_; + gint _tmp9_; + sqlite3_stmt* _tmp10_; + gint _tmp11_; #line 83 "/home/jens/Source/shotwell/src/db/VersionTable.vala" g_return_if_fail (IS_VERSION_TABLE (self)); #line 83 "/home/jens/Source/shotwell/src/db/VersionTable.vala" @@ -516,90 +504,85 @@ void version_table_update_version (VersionTable* self, gint version, const gchar #line 88 "/home/jens/Source/shotwell/src/db/VersionTable.vala" _tmp4_ = stmt; #line 88 "/home/jens/Source/shotwell/src/db/VersionTable.vala" - _tmp5_ = version; -#line 88 "/home/jens/Source/shotwell/src/db/VersionTable.vala" - _tmp6_ = sqlite3_bind_int (_tmp4_, 1, _tmp5_); -#line 88 "/home/jens/Source/shotwell/src/db/VersionTable.vala" - res = _tmp6_; + res = sqlite3_bind_int (_tmp4_, 1, version); #line 89 "/home/jens/Source/shotwell/src/db/VersionTable.vala" - _tmp7_ = res; + _tmp5_ = res; #line 89 "/home/jens/Source/shotwell/src/db/VersionTable.vala" - _vala_assert (_tmp7_ == SQLITE_OK, "res == Sqlite.OK"); + _vala_assert (_tmp5_ == SQLITE_OK, "res == Sqlite.OK"); #line 90 "/home/jens/Source/shotwell/src/db/VersionTable.vala" - _tmp8_ = stmt; + _tmp6_ = stmt; #line 90 "/home/jens/Source/shotwell/src/db/VersionTable.vala" - _tmp9_ = app_version; + _tmp7_ = g_strdup (app_version); #line 90 "/home/jens/Source/shotwell/src/db/VersionTable.vala" - _tmp10_ = g_strdup (_tmp9_); + _tmp8_ = g_free; #line 90 "/home/jens/Source/shotwell/src/db/VersionTable.vala" - _tmp11_ = g_free; -#line 90 "/home/jens/Source/shotwell/src/db/VersionTable.vala" - _tmp12_ = sqlite3_bind_text (_tmp8_, 2, _tmp10_, -1, _tmp11_); -#line 90 "/home/jens/Source/shotwell/src/db/VersionTable.vala" - res = _tmp12_; + res = sqlite3_bind_text (_tmp6_, 2, _tmp7_, -1, _tmp8_); #line 91 "/home/jens/Source/shotwell/src/db/VersionTable.vala" - _tmp13_ = res; + _tmp9_ = res; #line 91 "/home/jens/Source/shotwell/src/db/VersionTable.vala" - _vala_assert (_tmp13_ == SQLITE_OK, "res == Sqlite.OK"); -#line 93 "/home/jens/Source/shotwell/src/db/VersionTable.vala" - _tmp14_ = stmt; + _vala_assert (_tmp9_ == SQLITE_OK, "res == Sqlite.OK"); #line 93 "/home/jens/Source/shotwell/src/db/VersionTable.vala" - _tmp15_ = sqlite3_step (_tmp14_); + _tmp10_ = stmt; #line 93 "/home/jens/Source/shotwell/src/db/VersionTable.vala" - res = _tmp15_; + res = sqlite3_step (_tmp10_); #line 94 "/home/jens/Source/shotwell/src/db/VersionTable.vala" - _tmp16_ = res; + _tmp11_ = res; #line 94 "/home/jens/Source/shotwell/src/db/VersionTable.vala" - if (_tmp16_ != SQLITE_DONE) { -#line 553 "VersionTable.c" - gint _tmp17_; - gchar* _tmp18_; - gchar* _tmp19_; - gint _tmp20_; -#line 95 "/home/jens/Source/shotwell/src/db/VersionTable.vala" - _tmp17_ = version; + if (_tmp11_ != SQLITE_DONE) { +#line 531 "VersionTable.c" + gchar* _tmp12_; + gchar* _tmp13_; + gint _tmp14_; #line 95 "/home/jens/Source/shotwell/src/db/VersionTable.vala" - _tmp18_ = g_strdup_printf ("update_version %d", _tmp17_); + _tmp12_ = g_strdup_printf ("update_version %d", version); #line 95 "/home/jens/Source/shotwell/src/db/VersionTable.vala" - _tmp19_ = _tmp18_; + _tmp13_ = _tmp12_; #line 95 "/home/jens/Source/shotwell/src/db/VersionTable.vala" - _tmp20_ = res; + _tmp14_ = res; #line 95 "/home/jens/Source/shotwell/src/db/VersionTable.vala" - database_table_fatal (_tmp19_, _tmp20_); + database_table_fatal (_tmp13_, _tmp14_); #line 95 "/home/jens/Source/shotwell/src/db/VersionTable.vala" - _g_free0 (_tmp19_); -#line 570 "VersionTable.c" + _g_free0 (_tmp13_); +#line 545 "VersionTable.c" } #line 83 "/home/jens/Source/shotwell/src/db/VersionTable.vala" _sqlite3_finalize0 (stmt); -#line 574 "VersionTable.c" +#line 549 "VersionTable.c" } -static void version_table_class_init (VersionTableClass * klass) { +static void +version_table_class_init (VersionTableClass * klass) +{ #line 7 "/home/jens/Source/shotwell/src/db/VersionTable.vala" version_table_parent_class = g_type_class_peek_parent (klass); #line 7 "/home/jens/Source/shotwell/src/db/VersionTable.vala" ((DatabaseTableClass *) klass)->finalize = version_table_finalize; -#line 583 "VersionTable.c" +#line 560 "VersionTable.c" } -static void version_table_instance_init (VersionTable * self) { +static void +version_table_instance_init (VersionTable * self) +{ } -static void version_table_finalize (DatabaseTable * obj) { +static void +version_table_finalize (DatabaseTable * obj) +{ VersionTable * self; #line 7 "/home/jens/Source/shotwell/src/db/VersionTable.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_VERSION_TABLE, VersionTable); #line 7 "/home/jens/Source/shotwell/src/db/VersionTable.vala" DATABASE_TABLE_CLASS (version_table_parent_class)->finalize (obj); -#line 597 "VersionTable.c" +#line 578 "VersionTable.c" } -GType version_table_get_type (void) { +GType +version_table_get_type (void) +{ static volatile gsize version_table_type_id__volatile = 0; if (g_once_init_enter (&version_table_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (VersionTableClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) version_table_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (VersionTable), 0, (GInstanceInitFunc) version_table_instance_init, NULL }; diff --git a/src/db/VideoTable.c b/src/db/VideoTable.c index 69ca2ca..0780862 100644 --- a/src/db/VideoTable.c +++ b/src/db/VideoTable.c @@ -1,4 +1,4 @@ -/* VideoTable.c generated by valac 0.36.6, the Vala compiler +/* VideoTable.c generated by valac 0.40.4, the Vala compiler * generated from VideoTable.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,6 +7,7 @@ * (version 2.1 or later). See the COPYING file in this distribution. */ + #include <glib.h> #include <glib-object.h> #include <string.h> @@ -171,19 +172,27 @@ GType video_id_get_type (void) G_GNUC_CONST; VideoID* video_id_dup (const VideoID* self); void video_id_free (VideoID* self); #define VIDEO_ID_INVALID ((gint64) -1) -void video_id_init (VideoID *self, gint64 id); +void video_id_init (VideoID *self, + gint64 id); gboolean video_id_is_invalid (VideoID *self); gboolean video_id_is_valid (VideoID *self); guint video_id_hash (VideoID* a); guint int64_hash (gint64* n); -gboolean video_id_equal (void* a, void* b); +gboolean video_id_equal (void* a, + void* b); gchar* video_id_upgrade_video_id_to_source_id (VideoID* video_id); #define VIDEO_TYPENAME "video" gpointer video_row_ref (gpointer instance); void video_row_unref (gpointer instance); -GParamSpec* param_spec_video_row (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_video_row (GValue* value, gpointer v_object); -void value_take_video_row (GValue* value, gpointer v_object); +GParamSpec* param_spec_video_row (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_video_row (GValue* value, + gpointer v_object); +void value_take_video_row (GValue* value, + gpointer v_object); gpointer value_get_video_row (const GValue* value); GType video_row_get_type (void) G_GNUC_CONST; GType import_id_get_type (void) G_GNUC_CONST; @@ -193,80 +202,155 @@ GType event_id_get_type (void) G_GNUC_CONST; EventID* event_id_dup (const EventID* self); void event_id_free (EventID* self); GType rating_get_type (void) G_GNUC_CONST; -enum { - VIDEO_ROW_DUMMY_PROPERTY -}; VideoRow* video_row_new (void); VideoRow* video_row_construct (GType object_type); static void video_row_finalize (VideoRow * obj); gpointer database_table_ref (gpointer instance); void database_table_unref (gpointer instance); -GParamSpec* param_spec_database_table (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_database_table (GValue* value, gpointer v_object); -void value_take_database_table (GValue* value, gpointer v_object); +GParamSpec* param_spec_database_table (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_database_table (GValue* value, + gpointer v_object); +void value_take_database_table (GValue* value, + gpointer v_object); gpointer value_get_database_table (const GValue* value); GType database_table_get_type (void) G_GNUC_CONST; GType video_table_get_type (void) G_GNUC_CONST; -enum { - VIDEO_TABLE_DUMMY_PROPERTY -}; static VideoTable* video_table_new (void); static VideoTable* video_table_construct (GType object_type); DatabaseTable* database_table_construct (GType object_type); -void database_table_fatal (const gchar* op, gint res); -void database_table_set_table_name (DatabaseTable* self, const gchar* table_name); +void database_table_fatal (const gchar* op, + gint res); +void database_table_set_table_name (DatabaseTable* self, + const gchar* table_name); VideoTable* video_table_get_instance (void); GQuark database_error_quark (void); -void video_table_add (VideoTable* self, VideoRow* video_row, VideoID* result, GError** error); +void video_table_add (VideoTable* self, + VideoRow* video_row, + VideoID* result, + GError** error); gulong now_sec (void); #define EVENT_ID_INVALID ((gint64) -1) -void database_table_throw_error (const gchar* method, gint res, GError** error); -void event_id_init (EventID *self, gint64 id); -gboolean video_table_drop_event (VideoTable* self, EventID* event_id); -VideoRow* video_table_get_row (VideoTable* self, VideoID* video_id); +void database_table_throw_error (const gchar* method, + gint res, + GError** error); +void event_id_init (EventID *self, + gint64 id); +gboolean video_table_drop_event (VideoTable* self, + EventID* event_id); +VideoRow* video_table_get_row (VideoTable* self, + VideoID* video_id); Rating rating_unserialize (gint value); GeeArrayList* video_table_get_all (VideoTable* self); -void video_table_set_filepath (VideoTable* self, VideoID* video_id, const gchar* filepath, GError** error); -void database_table_update_text_by_id_2 (DatabaseTable* self, gint64 id, const gchar* column, const gchar* text, GError** error); -void video_table_set_title (VideoTable* self, VideoID* video_id, const gchar* new_title, GError** error); -void video_table_set_comment (VideoTable* self, VideoID* video_id, const gchar* new_comment, GError** error); -void video_table_set_exposure_time (VideoTable* self, VideoID* video_id, time_t time, GError** error); -void database_table_update_int64_by_id_2 (DatabaseTable* self, gint64 id, const gchar* column, gint64 value, GError** error); -void video_table_set_rating (VideoTable* self, VideoID* video_id, Rating rating, GError** error); +void video_table_set_filepath (VideoTable* self, + VideoID* video_id, + const gchar* filepath, + GError** error); +void database_table_update_text_by_id_2 (DatabaseTable* self, + gint64 id, + const gchar* column, + const gchar* text, + GError** error); +void video_table_set_title (VideoTable* self, + VideoID* video_id, + const gchar* new_title, + GError** error); +void video_table_set_comment (VideoTable* self, + VideoID* video_id, + const gchar* new_comment, + GError** error); +void video_table_set_exposure_time (VideoTable* self, + VideoID* video_id, + time_t time, + GError** error); +void database_table_update_int64_by_id_2 (DatabaseTable* self, + gint64 id, + const gchar* column, + gint64 value, + GError** error); +void video_table_set_rating (VideoTable* self, + VideoID* video_id, + Rating rating, + GError** error); gint rating_serialize (Rating self); -void video_table_set_flags (VideoTable* self, VideoID* video_id, guint64 flags, GError** error); -void video_table_update_backlinks (VideoTable* self, VideoID* video_id, const gchar* backlinks, GError** error); -void video_table_update_is_interpretable (VideoTable* self, VideoID* video_id, gboolean is_interpretable, GError** error); -void database_table_update_int_by_id_2 (DatabaseTable* self, gint64 id, const gchar* column, gint value, GError** error); -gboolean video_table_set_event (VideoTable* self, VideoID* video_id, EventID* event_id); -gboolean database_table_update_int64_by_id (DatabaseTable* self, gint64 id, const gchar* column, gint64 value); -void video_table_remove_by_file (VideoTable* self, GFile* file, GError** error); -void video_table_remove (VideoTable* self, VideoID* videoID, GError** error); -gboolean video_table_is_video_stored (VideoTable* self, GFile* file); -void video_table_get_id (VideoTable* self, GFile* file, VideoID* result); -GeeArrayList* video_table_get_videos (VideoTable* self, GError** error); -static sqlite3_stmt* video_table_get_duplicate_stmt (VideoTable* self, GFile* file, const gchar* md5); -gboolean video_table_has_duplicate (VideoTable* self, GFile* file, const gchar* md5); -VideoID* video_table_get_duplicate_ids (VideoTable* self, GFile* file, const gchar* md5, int* result_length1); -static void _vala_array_add3 (VideoID* * array, int* length, int* size, const VideoID* value); -GeeArrayList* video_table_get_event_source_ids (VideoTable* self, EventID* event_id); -void video_table_set_timestamp (VideoTable* self, VideoID* video_id, time_t timestamp, GError** error); +void video_table_set_flags (VideoTable* self, + VideoID* video_id, + guint64 flags, + GError** error); +void video_table_update_backlinks (VideoTable* self, + VideoID* video_id, + const gchar* backlinks, + GError** error); +void video_table_update_is_interpretable (VideoTable* self, + VideoID* video_id, + gboolean is_interpretable, + GError** error); +void database_table_update_int_by_id_2 (DatabaseTable* self, + gint64 id, + const gchar* column, + gint value, + GError** error); +gboolean video_table_set_event (VideoTable* self, + VideoID* video_id, + EventID* event_id); +gboolean database_table_update_int64_by_id (DatabaseTable* self, + gint64 id, + const gchar* column, + gint64 value); +void video_table_remove_by_file (VideoTable* self, + GFile* file, + GError** error); +void video_table_remove (VideoTable* self, + VideoID* videoID, + GError** error); +gboolean video_table_is_video_stored (VideoTable* self, + GFile* file); +void video_table_get_id (VideoTable* self, + GFile* file, + VideoID* result); +GeeArrayList* video_table_get_videos (VideoTable* self, + GError** error); +static sqlite3_stmt* video_table_get_duplicate_stmt (VideoTable* self, + GFile* file, + const gchar* md5); +gboolean video_table_has_duplicate (VideoTable* self, + GFile* file, + const gchar* md5); +VideoID* video_table_get_duplicate_ids (VideoTable* self, + GFile* file, + const gchar* md5, + int* result_length1); +static void _vala_array_add3 (VideoID* * array, + int* length, + int* size, + const VideoID* value); +GeeArrayList* video_table_get_event_source_ids (VideoTable* self, + EventID* event_id); +void video_table_set_timestamp (VideoTable* self, + VideoID* video_id, + time_t timestamp, + GError** error); static void video_table_finalize (DatabaseTable * obj); -void video_id_init (VideoID *self, gint64 id) { - gint64 _tmp0_; +void +video_id_init (VideoID *self, + gint64 id) +{ #line 12 "/home/jens/Source/shotwell/src/db/VideoTable.vala" memset (self, 0, sizeof (VideoID)); #line 13 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp0_ = id; -#line 13 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - (*self).id = _tmp0_; -#line 266 "VideoTable.c" + (*self).id = id; +#line 348 "VideoTable.c" } -gboolean video_id_is_invalid (VideoID *self) { +gboolean +video_id_is_invalid (VideoID *self) +{ gboolean result = FALSE; gint64 _tmp0_; #line 17 "/home/jens/Source/shotwell/src/db/VideoTable.vala" @@ -275,11 +359,13 @@ gboolean video_id_is_invalid (VideoID *self) { result = _tmp0_ == VIDEO_ID_INVALID; #line 17 "/home/jens/Source/shotwell/src/db/VideoTable.vala" return result; -#line 279 "VideoTable.c" +#line 363 "VideoTable.c" } -gboolean video_id_is_valid (VideoID *self) { +gboolean +video_id_is_valid (VideoID *self) +{ gboolean result = FALSE; gint64 _tmp0_; #line 21 "/home/jens/Source/shotwell/src/db/VideoTable.vala" @@ -288,52 +374,47 @@ gboolean video_id_is_valid (VideoID *self) { result = _tmp0_ != VIDEO_ID_INVALID; #line 21 "/home/jens/Source/shotwell/src/db/VideoTable.vala" return result; -#line 292 "VideoTable.c" +#line 378 "VideoTable.c" } -guint video_id_hash (VideoID* a) { +guint +video_id_hash (VideoID* a) +{ guint result = 0U; - VideoID* _tmp0_; - gint64 _tmp1_; - guint _tmp2_; -#line 25 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp0_ = a; -#line 25 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp1_ = (*_tmp0_).id; + gint64 _tmp0_; #line 25 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp2_ = int64_hash (&_tmp1_); + _tmp0_ = (*a).id; #line 25 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - result = _tmp2_; + result = int64_hash (&_tmp0_); #line 25 "/home/jens/Source/shotwell/src/db/VideoTable.vala" return result; -#line 311 "VideoTable.c" +#line 393 "VideoTable.c" } -gboolean video_id_equal (void* a, void* b) { +gboolean +video_id_equal (void* a, + void* b) +{ gboolean result = FALSE; - void* _tmp0_; + gint64 _tmp0_; gint64 _tmp1_; - void* _tmp2_; - gint64 _tmp3_; -#line 29 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp0_ = a; #line 29 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp1_ = (*((VideoID*) _tmp0_)).id; + _tmp0_ = (*((VideoID*) a)).id; #line 29 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp2_ = b; + _tmp1_ = (*((VideoID*) b)).id; #line 29 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp3_ = (*((VideoID*) _tmp2_)).id; -#line 29 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - result = _tmp1_ == _tmp3_; + result = _tmp0_ == _tmp1_; #line 29 "/home/jens/Source/shotwell/src/db/VideoTable.vala" return result; -#line 333 "VideoTable.c" +#line 412 "VideoTable.c" } -gchar* video_id_upgrade_video_id_to_source_id (VideoID* video_id) { +gchar* +video_id_upgrade_video_id_to_source_id (VideoID* video_id) +{ gchar* result = NULL; VideoID _tmp0_; gint64 _tmp1_; @@ -350,11 +431,13 @@ gchar* video_id_upgrade_video_id_to_source_id (VideoID* video_id) { result = _tmp2_; #line 33 "/home/jens/Source/shotwell/src/db/VideoTable.vala" return result; -#line 354 "VideoTable.c" +#line 435 "VideoTable.c" } -VideoID* video_id_dup (const VideoID* self) { +VideoID* +video_id_dup (const VideoID* self) +{ VideoID* dup; #line 7 "/home/jens/Source/shotwell/src/db/VideoTable.vala" dup = g_new0 (VideoID, 1); @@ -362,18 +445,22 @@ VideoID* video_id_dup (const VideoID* self) { memcpy (dup, self, sizeof (VideoID)); #line 7 "/home/jens/Source/shotwell/src/db/VideoTable.vala" return dup; -#line 366 "VideoTable.c" +#line 449 "VideoTable.c" } -void video_id_free (VideoID* self) { +void +video_id_free (VideoID* self) +{ #line 7 "/home/jens/Source/shotwell/src/db/VideoTable.vala" g_free (self); -#line 373 "VideoTable.c" +#line 458 "VideoTable.c" } -GType video_id_get_type (void) { +GType +video_id_get_type (void) +{ static volatile gsize video_id_type_id__volatile = 0; if (g_once_init_enter (&video_id_type_id__volatile)) { GType video_id_type_id; @@ -384,121 +471,150 @@ GType video_id_get_type (void) { } -VideoRow* video_row_construct (GType object_type) { +VideoRow* +video_row_construct (GType object_type) +{ VideoRow* self = NULL; #line 37 "/home/jens/Source/shotwell/src/db/VideoTable.vala" self = (VideoRow*) g_type_create_instance (object_type); #line 37 "/home/jens/Source/shotwell/src/db/VideoTable.vala" return self; -#line 394 "VideoTable.c" +#line 483 "VideoTable.c" } -VideoRow* video_row_new (void) { +VideoRow* +video_row_new (void) +{ #line 37 "/home/jens/Source/shotwell/src/db/VideoTable.vala" return video_row_construct (TYPE_VIDEO_ROW); -#line 401 "VideoTable.c" +#line 492 "VideoTable.c" } -static void value_video_row_init (GValue* value) { +static void +value_video_row_init (GValue* value) +{ #line 37 "/home/jens/Source/shotwell/src/db/VideoTable.vala" value->data[0].v_pointer = NULL; -#line 408 "VideoTable.c" +#line 501 "VideoTable.c" } -static void value_video_row_free_value (GValue* value) { +static void +value_video_row_free_value (GValue* value) +{ #line 37 "/home/jens/Source/shotwell/src/db/VideoTable.vala" if (value->data[0].v_pointer) { #line 37 "/home/jens/Source/shotwell/src/db/VideoTable.vala" video_row_unref (value->data[0].v_pointer); -#line 417 "VideoTable.c" +#line 512 "VideoTable.c" } } -static void value_video_row_copy_value (const GValue* src_value, GValue* dest_value) { +static void +value_video_row_copy_value (const GValue* src_value, + GValue* dest_value) +{ #line 37 "/home/jens/Source/shotwell/src/db/VideoTable.vala" if (src_value->data[0].v_pointer) { #line 37 "/home/jens/Source/shotwell/src/db/VideoTable.vala" dest_value->data[0].v_pointer = video_row_ref (src_value->data[0].v_pointer); -#line 427 "VideoTable.c" +#line 525 "VideoTable.c" } else { #line 37 "/home/jens/Source/shotwell/src/db/VideoTable.vala" dest_value->data[0].v_pointer = NULL; -#line 431 "VideoTable.c" +#line 529 "VideoTable.c" } } -static gpointer value_video_row_peek_pointer (const GValue* value) { +static gpointer +value_video_row_peek_pointer (const GValue* value) +{ #line 37 "/home/jens/Source/shotwell/src/db/VideoTable.vala" return value->data[0].v_pointer; -#line 439 "VideoTable.c" +#line 539 "VideoTable.c" } -static gchar* value_video_row_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_video_row_collect_value (GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ #line 37 "/home/jens/Source/shotwell/src/db/VideoTable.vala" if (collect_values[0].v_pointer) { -#line 446 "VideoTable.c" +#line 551 "VideoTable.c" VideoRow * object; object = collect_values[0].v_pointer; #line 37 "/home/jens/Source/shotwell/src/db/VideoTable.vala" if (object->parent_instance.g_class == NULL) { #line 37 "/home/jens/Source/shotwell/src/db/VideoTable.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 453 "VideoTable.c" +#line 558 "VideoTable.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 37 "/home/jens/Source/shotwell/src/db/VideoTable.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 457 "VideoTable.c" +#line 562 "VideoTable.c" } #line 37 "/home/jens/Source/shotwell/src/db/VideoTable.vala" value->data[0].v_pointer = video_row_ref (object); -#line 461 "VideoTable.c" +#line 566 "VideoTable.c" } else { #line 37 "/home/jens/Source/shotwell/src/db/VideoTable.vala" value->data[0].v_pointer = NULL; -#line 465 "VideoTable.c" +#line 570 "VideoTable.c" } #line 37 "/home/jens/Source/shotwell/src/db/VideoTable.vala" return NULL; -#line 469 "VideoTable.c" +#line 574 "VideoTable.c" } -static gchar* value_video_row_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_video_row_lcopy_value (const GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ VideoRow ** object_p; object_p = collect_values[0].v_pointer; #line 37 "/home/jens/Source/shotwell/src/db/VideoTable.vala" if (!object_p) { #line 37 "/home/jens/Source/shotwell/src/db/VideoTable.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 480 "VideoTable.c" +#line 590 "VideoTable.c" } #line 37 "/home/jens/Source/shotwell/src/db/VideoTable.vala" if (!value->data[0].v_pointer) { #line 37 "/home/jens/Source/shotwell/src/db/VideoTable.vala" *object_p = NULL; -#line 486 "VideoTable.c" +#line 596 "VideoTable.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 37 "/home/jens/Source/shotwell/src/db/VideoTable.vala" *object_p = value->data[0].v_pointer; -#line 490 "VideoTable.c" +#line 600 "VideoTable.c" } else { #line 37 "/home/jens/Source/shotwell/src/db/VideoTable.vala" *object_p = video_row_ref (value->data[0].v_pointer); -#line 494 "VideoTable.c" +#line 604 "VideoTable.c" } #line 37 "/home/jens/Source/shotwell/src/db/VideoTable.vala" return NULL; -#line 498 "VideoTable.c" +#line 608 "VideoTable.c" } -GParamSpec* param_spec_video_row (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { +GParamSpec* +param_spec_video_row (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) +{ ParamSpecVideoRow* spec; #line 37 "/home/jens/Source/shotwell/src/db/VideoTable.vala" g_return_val_if_fail (g_type_is_a (object_type, TYPE_VIDEO_ROW), NULL); @@ -508,20 +624,25 @@ GParamSpec* param_spec_video_row (const gchar* name, const gchar* nick, const gc G_PARAM_SPEC (spec)->value_type = object_type; #line 37 "/home/jens/Source/shotwell/src/db/VideoTable.vala" return G_PARAM_SPEC (spec); -#line 512 "VideoTable.c" +#line 628 "VideoTable.c" } -gpointer value_get_video_row (const GValue* value) { +gpointer +value_get_video_row (const GValue* value) +{ #line 37 "/home/jens/Source/shotwell/src/db/VideoTable.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_VIDEO_ROW), NULL); #line 37 "/home/jens/Source/shotwell/src/db/VideoTable.vala" return value->data[0].v_pointer; -#line 521 "VideoTable.c" +#line 639 "VideoTable.c" } -void value_set_video_row (GValue* value, gpointer v_object) { +void +value_set_video_row (GValue* value, + gpointer v_object) +{ VideoRow * old; #line 37 "/home/jens/Source/shotwell/src/db/VideoTable.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_VIDEO_ROW)); @@ -537,22 +658,25 @@ void value_set_video_row (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 37 "/home/jens/Source/shotwell/src/db/VideoTable.vala" video_row_ref (value->data[0].v_pointer); -#line 541 "VideoTable.c" +#line 662 "VideoTable.c" } else { #line 37 "/home/jens/Source/shotwell/src/db/VideoTable.vala" value->data[0].v_pointer = NULL; -#line 545 "VideoTable.c" +#line 666 "VideoTable.c" } #line 37 "/home/jens/Source/shotwell/src/db/VideoTable.vala" if (old) { #line 37 "/home/jens/Source/shotwell/src/db/VideoTable.vala" video_row_unref (old); -#line 551 "VideoTable.c" +#line 672 "VideoTable.c" } } -void value_take_video_row (GValue* value, gpointer v_object) { +void +value_take_video_row (GValue* value, + gpointer v_object) +{ VideoRow * old; #line 37 "/home/jens/Source/shotwell/src/db/VideoTable.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_VIDEO_ROW)); @@ -566,38 +690,44 @@ void value_take_video_row (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 37 "/home/jens/Source/shotwell/src/db/VideoTable.vala" value->data[0].v_pointer = v_object; -#line 570 "VideoTable.c" +#line 694 "VideoTable.c" } else { #line 37 "/home/jens/Source/shotwell/src/db/VideoTable.vala" value->data[0].v_pointer = NULL; -#line 574 "VideoTable.c" +#line 698 "VideoTable.c" } #line 37 "/home/jens/Source/shotwell/src/db/VideoTable.vala" if (old) { #line 37 "/home/jens/Source/shotwell/src/db/VideoTable.vala" video_row_unref (old); -#line 580 "VideoTable.c" +#line 704 "VideoTable.c" } } -static void video_row_class_init (VideoRowClass * klass) { +static void +video_row_class_init (VideoRowClass * klass) +{ #line 37 "/home/jens/Source/shotwell/src/db/VideoTable.vala" video_row_parent_class = g_type_class_peek_parent (klass); #line 37 "/home/jens/Source/shotwell/src/db/VideoTable.vala" ((VideoRowClass *) klass)->finalize = video_row_finalize; -#line 590 "VideoTable.c" +#line 716 "VideoTable.c" } -static void video_row_instance_init (VideoRow * self) { +static void +video_row_instance_init (VideoRow * self) +{ #line 37 "/home/jens/Source/shotwell/src/db/VideoTable.vala" self->ref_count = 1; -#line 597 "VideoTable.c" +#line 725 "VideoTable.c" } -static void video_row_finalize (VideoRow * obj) { +static void +video_row_finalize (VideoRow * obj) +{ VideoRow * self; #line 37 "/home/jens/Source/shotwell/src/db/VideoTable.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_VIDEO_ROW, VideoRow); @@ -613,11 +743,13 @@ static void video_row_finalize (VideoRow * obj) { _g_free0 (self->backlinks); #line 56 "/home/jens/Source/shotwell/src/db/VideoTable.vala" _g_free0 (self->comment); -#line 617 "VideoTable.c" +#line 747 "VideoTable.c" } -GType video_row_get_type (void) { +GType +video_row_get_type (void) +{ static volatile gsize video_row_type_id__volatile = 0; if (g_once_init_enter (&video_row_type_id__volatile)) { static const GTypeValueTable g_define_type_value_table = { value_video_row_init, value_video_row_free_value, value_video_row_copy_value, value_video_row_peek_pointer, "p", value_video_row_collect_value, "p", value_video_row_lcopy_value }; @@ -631,18 +763,22 @@ GType video_row_get_type (void) { } -gpointer video_row_ref (gpointer instance) { +gpointer +video_row_ref (gpointer instance) +{ VideoRow * self; self = instance; #line 37 "/home/jens/Source/shotwell/src/db/VideoTable.vala" g_atomic_int_inc (&self->ref_count); #line 37 "/home/jens/Source/shotwell/src/db/VideoTable.vala" return instance; -#line 642 "VideoTable.c" +#line 776 "VideoTable.c" } -void video_row_unref (gpointer instance) { +void +video_row_unref (gpointer instance) +{ VideoRow * self; self = instance; #line 37 "/home/jens/Source/shotwell/src/db/VideoTable.vala" @@ -651,12 +787,14 @@ void video_row_unref (gpointer instance) { VIDEO_ROW_GET_CLASS (self)->finalize (self); #line 37 "/home/jens/Source/shotwell/src/db/VideoTable.vala" g_type_free_instance ((GTypeInstance *) self); -#line 655 "VideoTable.c" +#line 791 "VideoTable.c" } } -static VideoTable* video_table_construct (GType object_type) { +static VideoTable* +video_table_construct (GType object_type) +{ VideoTable* self = NULL; sqlite3_stmt* stmt = NULL; gint res = 0; @@ -666,16 +804,14 @@ static VideoTable* video_table_construct (GType object_type) { gint _tmp3_; sqlite3_stmt* _tmp4_; gint _tmp5_; - gint _tmp6_; sqlite3_stmt* stmt2 = NULL; gint res2 = 0; - sqlite3* _tmp8_; - sqlite3_stmt* _tmp9_ = NULL; + sqlite3* _tmp7_; + sqlite3_stmt* _tmp8_ = NULL; + gint _tmp9_; gint _tmp10_; - gint _tmp11_; - sqlite3_stmt* _tmp12_; - gint _tmp13_; - gint _tmp14_; + sqlite3_stmt* _tmp11_; + gint _tmp12_; #line 62 "/home/jens/Source/shotwell/src/db/VideoTable.vala" self = (VideoTable*) database_table_construct (object_type); #line 64 "/home/jens/Source/shotwell/src/db/VideoTable.vala" @@ -695,52 +831,48 @@ static VideoTable* video_table_construct (GType object_type) { #line 87 "/home/jens/Source/shotwell/src/db/VideoTable.vala" _tmp4_ = stmt; #line 87 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp5_ = sqlite3_step (_tmp4_); -#line 87 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - res = _tmp5_; + res = sqlite3_step (_tmp4_); #line 88 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp6_ = res; + _tmp5_ = res; #line 88 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - if (_tmp6_ != SQLITE_DONE) { -#line 706 "VideoTable.c" - gint _tmp7_; + if (_tmp5_ != SQLITE_DONE) { +#line 840 "VideoTable.c" + gint _tmp6_; #line 89 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp7_ = res; + _tmp6_ = res; #line 89 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - database_table_fatal ("VideoTable constructor", _tmp7_); -#line 712 "VideoTable.c" + database_table_fatal ("VideoTable constructor", _tmp6_); +#line 846 "VideoTable.c" } #line 93 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp8_ = database_table_db; + _tmp7_ = database_table_db; #line 93 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp10_ = sqlite3_prepare_v2 (_tmp8_, "CREATE INDEX IF NOT EXISTS VideoEventIDIndex ON VideoTable (event_id)", -1, &_tmp9_, NULL); + _tmp9_ = sqlite3_prepare_v2 (_tmp7_, "CREATE INDEX IF NOT EXISTS VideoEventIDIndex ON VideoTable (event_id)", -1, &_tmp8_, NULL); #line 93 "/home/jens/Source/shotwell/src/db/VideoTable.vala" _sqlite3_finalize0 (stmt2); #line 93 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - stmt2 = _tmp9_; + stmt2 = _tmp8_; #line 93 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - res2 = _tmp10_; + res2 = _tmp9_; #line 95 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp11_ = res2; + _tmp10_ = res2; #line 95 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _vala_assert (_tmp11_ == SQLITE_OK, "res2 == Sqlite.OK"); -#line 97 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp12_ = stmt2; + _vala_assert (_tmp10_ == SQLITE_OK, "res2 == Sqlite.OK"); #line 97 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp13_ = sqlite3_step (_tmp12_); + _tmp11_ = stmt2; #line 97 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - res2 = _tmp13_; + res2 = sqlite3_step (_tmp11_); #line 98 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp14_ = res2; + _tmp12_ = res2; #line 98 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - if (_tmp14_ != SQLITE_DONE) { -#line 738 "VideoTable.c" - gint _tmp15_; + if (_tmp12_ != SQLITE_DONE) { +#line 870 "VideoTable.c" + gint _tmp13_; #line 99 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp15_ = res2; + _tmp13_ = res2; #line 99 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - database_table_fatal ("VideoTable constructor", _tmp15_); -#line 744 "VideoTable.c" + database_table_fatal ("VideoTable constructor", _tmp13_); +#line 876 "VideoTable.c" } #line 101 "/home/jens/Source/shotwell/src/db/VideoTable.vala" database_table_set_table_name (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), "VideoTable"); @@ -750,25 +882,31 @@ static VideoTable* video_table_construct (GType object_type) { _sqlite3_finalize0 (stmt); #line 62 "/home/jens/Source/shotwell/src/db/VideoTable.vala" return self; -#line 754 "VideoTable.c" +#line 886 "VideoTable.c" } -static VideoTable* video_table_new (void) { +static VideoTable* +video_table_new (void) +{ #line 62 "/home/jens/Source/shotwell/src/db/VideoTable.vala" return video_table_construct (TYPE_VIDEO_TABLE); -#line 761 "VideoTable.c" +#line 895 "VideoTable.c" } -static gpointer _database_table_ref0 (gpointer self) { +static gpointer +_database_table_ref0 (gpointer self) +{ #line 108 "/home/jens/Source/shotwell/src/db/VideoTable.vala" return self ? database_table_ref (self) : NULL; -#line 768 "VideoTable.c" +#line 904 "VideoTable.c" } -VideoTable* video_table_get_instance (void) { +VideoTable* +video_table_get_instance (void) +{ VideoTable* result = NULL; VideoTable* _tmp0_; VideoTable* _tmp2_; @@ -777,7 +915,7 @@ VideoTable* video_table_get_instance (void) { _tmp0_ = video_table_instance; #line 105 "/home/jens/Source/shotwell/src/db/VideoTable.vala" if (_tmp0_ == NULL) { -#line 781 "VideoTable.c" +#line 919 "VideoTable.c" VideoTable* _tmp1_; #line 106 "/home/jens/Source/shotwell/src/db/VideoTable.vala" _tmp1_ = video_table_new (); @@ -785,7 +923,7 @@ VideoTable* video_table_get_instance (void) { _database_table_unref0 (video_table_instance); #line 106 "/home/jens/Source/shotwell/src/db/VideoTable.vala" video_table_instance = _tmp1_; -#line 789 "VideoTable.c" +#line 927 "VideoTable.c" } #line 108 "/home/jens/Source/shotwell/src/db/VideoTable.vala" _tmp2_ = video_table_instance; @@ -795,11 +933,16 @@ VideoTable* video_table_get_instance (void) { result = _tmp3_; #line 108 "/home/jens/Source/shotwell/src/db/VideoTable.vala" return result; -#line 799 "VideoTable.c" +#line 937 "VideoTable.c" } -void video_table_add (VideoTable* self, VideoRow* video_row, VideoID* result, GError** error) { +void +video_table_add (VideoTable* self, + VideoRow* video_row, + VideoID* result, + GError** error) +{ sqlite3_stmt* stmt = NULL; gint res = 0; sqlite3* _tmp0_; @@ -807,96 +950,62 @@ void video_table_add (VideoTable* self, VideoRow* video_row, VideoID* result, GE gint _tmp2_; gint _tmp3_; gulong time_created = 0UL; - gulong _tmp4_; - sqlite3_stmt* _tmp5_; - VideoRow* _tmp6_; - const gchar* _tmp7_; - gchar* _tmp8_; - GDestroyNotify _tmp9_; + sqlite3_stmt* _tmp4_; + const gchar* _tmp5_; + gchar* _tmp6_; + GDestroyNotify _tmp7_; + gint _tmp8_; + sqlite3_stmt* _tmp9_; gint _tmp10_; gint _tmp11_; sqlite3_stmt* _tmp12_; - VideoRow* _tmp13_; + gint _tmp13_; gint _tmp14_; - gint _tmp15_; - gint _tmp16_; - sqlite3_stmt* _tmp17_; - VideoRow* _tmp18_; - gint _tmp19_; - gint _tmp20_; + sqlite3_stmt* _tmp15_; + gdouble _tmp16_; + gint _tmp17_; + gint _tmp18_ = 0; + gboolean _tmp19_; + sqlite3_stmt* _tmp20_; gint _tmp21_; sqlite3_stmt* _tmp22_; - VideoRow* _tmp23_; - gdouble _tmp24_; - gint _tmp25_; - gint _tmp26_; - gint _tmp27_ = 0; - VideoRow* _tmp28_; - gboolean _tmp29_; - sqlite3_stmt* _tmp30_; - gint _tmp31_; - gint _tmp32_; - sqlite3_stmt* _tmp33_; - VideoRow* _tmp34_; - gint64 _tmp35_; + gint64 _tmp23_; + gint _tmp24_; + sqlite3_stmt* _tmp25_; + time_t _tmp26_; + gint _tmp27_; + sqlite3_stmt* _tmp28_; + time_t _tmp29_; + gint _tmp30_; + sqlite3_stmt* _tmp31_; + ImportID _tmp32_; + gint64 _tmp33_; + gint _tmp34_; + sqlite3_stmt* _tmp35_; gint _tmp36_; - gint _tmp37_; - sqlite3_stmt* _tmp38_; - VideoRow* _tmp39_; - time_t _tmp40_; + sqlite3_stmt* _tmp37_; + const gchar* _tmp38_; + gchar* _tmp39_; + GDestroyNotify _tmp40_; gint _tmp41_; - gint _tmp42_; - sqlite3_stmt* _tmp43_; - VideoRow* _tmp44_; - time_t _tmp45_; - gint _tmp46_; - gint _tmp47_; - sqlite3_stmt* _tmp48_; - VideoRow* _tmp49_; - ImportID _tmp50_; - gint64 _tmp51_; - gint _tmp52_; - gint _tmp53_; - sqlite3_stmt* _tmp54_; - gint _tmp55_; + sqlite3_stmt* _tmp42_; + gulong _tmp43_; + gint _tmp44_; + sqlite3_stmt* _tmp45_; + const gchar* _tmp46_; + gchar* _tmp47_; + GDestroyNotify _tmp48_; + gint _tmp49_; + sqlite3_stmt* _tmp50_; + const gchar* _tmp51_; + gchar* _tmp52_; + GDestroyNotify _tmp53_; + gint _tmp54_; + sqlite3_stmt* _tmp55_; gint _tmp56_; - sqlite3_stmt* _tmp57_; - VideoRow* _tmp58_; - const gchar* _tmp59_; - gchar* _tmp60_; - GDestroyNotify _tmp61_; - gint _tmp62_; - gint _tmp63_; - sqlite3_stmt* _tmp64_; - gulong _tmp65_; - gint _tmp66_; - gint _tmp67_; - sqlite3_stmt* _tmp68_; - VideoRow* _tmp69_; - const gchar* _tmp70_; - gchar* _tmp71_; - GDestroyNotify _tmp72_; - gint _tmp73_; - gint _tmp74_; - sqlite3_stmt* _tmp75_; - VideoRow* _tmp76_; - const gchar* _tmp77_; - gchar* _tmp78_; - GDestroyNotify _tmp79_; - gint _tmp80_; - gint _tmp81_; - sqlite3_stmt* _tmp82_; - gint _tmp83_; - gint _tmp84_; - VideoRow* _tmp87_; - sqlite3* _tmp88_; - gint64 _tmp89_; - VideoRow* _tmp90_; - VideoRow* _tmp91_; - gulong _tmp92_; - VideoRow* _tmp93_; - VideoRow* _tmp94_; - VideoID _tmp95_; + sqlite3* _tmp59_; + gulong _tmp60_; + VideoID _tmp61_; GError * _inner_error_ = NULL; #line 113 "/home/jens/Source/shotwell/src/db/VideoTable.vala" g_return_if_fail (IS_VIDEO_TABLE (self)); @@ -919,249 +1028,193 @@ void video_table_add (VideoTable* self, VideoRow* video_row, VideoID* result, GE #line 120 "/home/jens/Source/shotwell/src/db/VideoTable.vala" _vala_assert (_tmp3_ == SQLITE_OK, "res == Sqlite.OK"); #line 122 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp4_ = now_sec (); -#line 122 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - time_created = _tmp4_; + time_created = now_sec (); #line 124 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp5_ = stmt; -#line 124 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp6_ = video_row; -#line 124 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp7_ = _tmp6_->filepath; + _tmp4_ = stmt; #line 124 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp8_ = g_strdup (_tmp7_); + _tmp5_ = video_row->filepath; #line 124 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp9_ = g_free; + _tmp6_ = g_strdup (_tmp5_); #line 124 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp10_ = sqlite3_bind_text (_tmp5_, 1, _tmp8_, -1, _tmp9_); + _tmp7_ = g_free; #line 124 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - res = _tmp10_; + res = sqlite3_bind_text (_tmp4_, 1, _tmp6_, -1, _tmp7_); #line 125 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp11_ = res; + _tmp8_ = res; #line 125 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _vala_assert (_tmp11_ == SQLITE_OK, "res == Sqlite.OK"); -#line 126 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp12_ = stmt; -#line 126 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp13_ = video_row; + _vala_assert (_tmp8_ == SQLITE_OK, "res == Sqlite.OK"); #line 126 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp14_ = _tmp13_->width; + _tmp9_ = stmt; #line 126 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp15_ = sqlite3_bind_int (_tmp12_, 2, _tmp14_); + _tmp10_ = video_row->width; #line 126 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - res = _tmp15_; + res = sqlite3_bind_int (_tmp9_, 2, _tmp10_); #line 127 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp16_ = res; + _tmp11_ = res; #line 127 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _vala_assert (_tmp16_ == SQLITE_OK, "res == Sqlite.OK"); -#line 128 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp17_ = stmt; -#line 128 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp18_ = video_row; + _vala_assert (_tmp11_ == SQLITE_OK, "res == Sqlite.OK"); #line 128 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp19_ = _tmp18_->height; + _tmp12_ = stmt; #line 128 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp20_ = sqlite3_bind_int (_tmp17_, 3, _tmp19_); + _tmp13_ = video_row->height; #line 128 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - res = _tmp20_; + res = sqlite3_bind_int (_tmp12_, 3, _tmp13_); #line 129 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp21_ = res; + _tmp14_ = res; #line 129 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _vala_assert (_tmp21_ == SQLITE_OK, "res == Sqlite.OK"); -#line 130 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp22_ = stmt; + _vala_assert (_tmp14_ == SQLITE_OK, "res == Sqlite.OK"); #line 130 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp23_ = video_row; -#line 130 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp24_ = _tmp23_->clip_duration; + _tmp15_ = stmt; #line 130 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp25_ = sqlite3_bind_double (_tmp22_, 4, _tmp24_); + _tmp16_ = video_row->clip_duration; #line 130 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - res = _tmp25_; + res = sqlite3_bind_double (_tmp15_, 4, _tmp16_); #line 131 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp26_ = res; + _tmp17_ = res; #line 131 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _vala_assert (_tmp26_ == SQLITE_OK, "res == Sqlite.OK"); -#line 132 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp28_ = video_row; + _vala_assert (_tmp17_ == SQLITE_OK, "res == Sqlite.OK"); #line 132 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp29_ = _tmp28_->is_interpretable; + _tmp19_ = video_row->is_interpretable; #line 132 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - if (_tmp29_) { + if (_tmp19_) { #line 132 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp27_ = 1; -#line 992 "VideoTable.c" + _tmp18_ = 1; +#line 1081 "VideoTable.c" } else { #line 132 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp27_ = 0; -#line 996 "VideoTable.c" + _tmp18_ = 0; +#line 1085 "VideoTable.c" } #line 132 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp30_ = stmt; -#line 132 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp31_ = sqlite3_bind_int (_tmp30_, 5, _tmp27_); + _tmp20_ = stmt; #line 132 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - res = _tmp31_; + res = sqlite3_bind_int (_tmp20_, 5, _tmp18_); #line 133 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp32_ = res; + _tmp21_ = res; #line 133 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _vala_assert (_tmp32_ == SQLITE_OK, "res == Sqlite.OK"); -#line 134 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp33_ = stmt; -#line 134 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp34_ = video_row; + _vala_assert (_tmp21_ == SQLITE_OK, "res == Sqlite.OK"); #line 134 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp35_ = _tmp34_->filesize; + _tmp22_ = stmt; #line 134 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp36_ = sqlite3_bind_int64 (_tmp33_, 6, _tmp35_); + _tmp23_ = video_row->filesize; #line 134 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - res = _tmp36_; + res = sqlite3_bind_int64 (_tmp22_, 6, _tmp23_); #line 135 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp37_ = res; + _tmp24_ = res; #line 135 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _vala_assert (_tmp37_ == SQLITE_OK, "res == Sqlite.OK"); + _vala_assert (_tmp24_ == SQLITE_OK, "res == Sqlite.OK"); #line 136 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp38_ = stmt; -#line 136 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp39_ = video_row; -#line 136 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp40_ = _tmp39_->timestamp; + _tmp25_ = stmt; #line 136 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp41_ = sqlite3_bind_int64 (_tmp38_, 7, (gint64) _tmp40_); + _tmp26_ = video_row->timestamp; #line 136 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - res = _tmp41_; + res = sqlite3_bind_int64 (_tmp25_, 7, (gint64) _tmp26_); #line 137 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp42_ = res; + _tmp27_ = res; #line 137 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _vala_assert (_tmp42_ == SQLITE_OK, "res == Sqlite.OK"); + _vala_assert (_tmp27_ == SQLITE_OK, "res == Sqlite.OK"); #line 138 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp43_ = stmt; -#line 138 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp44_ = video_row; -#line 138 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp45_ = _tmp44_->exposure_time; + _tmp28_ = stmt; #line 138 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp46_ = sqlite3_bind_int64 (_tmp43_, 8, (gint64) _tmp45_); + _tmp29_ = video_row->exposure_time; #line 138 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - res = _tmp46_; + res = sqlite3_bind_int64 (_tmp28_, 8, (gint64) _tmp29_); #line 139 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp47_ = res; + _tmp30_ = res; #line 139 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _vala_assert (_tmp47_ == SQLITE_OK, "res == Sqlite.OK"); -#line 140 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp48_ = stmt; -#line 140 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp49_ = video_row; + _vala_assert (_tmp30_ == SQLITE_OK, "res == Sqlite.OK"); #line 140 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp50_ = _tmp49_->import_id; + _tmp31_ = stmt; #line 140 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp51_ = _tmp50_.id; + _tmp32_ = video_row->import_id; #line 140 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp52_ = sqlite3_bind_int64 (_tmp48_, 9, _tmp51_); + _tmp33_ = _tmp32_.id; #line 140 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - res = _tmp52_; + res = sqlite3_bind_int64 (_tmp31_, 9, _tmp33_); #line 141 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp53_ = res; + _tmp34_ = res; #line 141 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _vala_assert (_tmp53_ == SQLITE_OK, "res == Sqlite.OK"); -#line 142 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp54_ = stmt; + _vala_assert (_tmp34_ == SQLITE_OK, "res == Sqlite.OK"); #line 142 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp55_ = sqlite3_bind_int64 (_tmp54_, 10, EVENT_ID_INVALID); + _tmp35_ = stmt; #line 142 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - res = _tmp55_; + res = sqlite3_bind_int64 (_tmp35_, 10, EVENT_ID_INVALID); #line 143 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp56_ = res; + _tmp36_ = res; #line 143 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _vala_assert (_tmp56_ == SQLITE_OK, "res == Sqlite.OK"); -#line 144 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp57_ = stmt; + _vala_assert (_tmp36_ == SQLITE_OK, "res == Sqlite.OK"); #line 144 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp58_ = video_row; -#line 144 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp59_ = _tmp58_->md5; + _tmp37_ = stmt; #line 144 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp60_ = g_strdup (_tmp59_); + _tmp38_ = video_row->md5; #line 144 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp61_ = g_free; + _tmp39_ = g_strdup (_tmp38_); #line 144 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp62_ = sqlite3_bind_text (_tmp57_, 11, _tmp60_, -1, _tmp61_); + _tmp40_ = g_free; #line 144 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - res = _tmp62_; + res = sqlite3_bind_text (_tmp37_, 11, _tmp39_, -1, _tmp40_); #line 145 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp63_ = res; + _tmp41_ = res; #line 145 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _vala_assert (_tmp63_ == SQLITE_OK, "res == Sqlite.OK"); -#line 146 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp64_ = stmt; + _vala_assert (_tmp41_ == SQLITE_OK, "res == Sqlite.OK"); #line 146 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp65_ = time_created; + _tmp42_ = stmt; #line 146 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp66_ = sqlite3_bind_int64 (_tmp64_, 12, (gint64) _tmp65_); + _tmp43_ = time_created; #line 146 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - res = _tmp66_; + res = sqlite3_bind_int64 (_tmp42_, 12, (gint64) _tmp43_); #line 147 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp67_ = res; + _tmp44_ = res; #line 147 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _vala_assert (_tmp67_ == SQLITE_OK, "res == Sqlite.OK"); + _vala_assert (_tmp44_ == SQLITE_OK, "res == Sqlite.OK"); #line 148 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp68_ = stmt; + _tmp45_ = stmt; #line 148 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp69_ = video_row; + _tmp46_ = video_row->title; #line 148 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp70_ = _tmp69_->title; + _tmp47_ = g_strdup (_tmp46_); #line 148 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp71_ = g_strdup (_tmp70_); + _tmp48_ = g_free; #line 148 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp72_ = g_free; -#line 148 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp73_ = sqlite3_bind_text (_tmp68_, 13, _tmp71_, -1, _tmp72_); -#line 148 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - res = _tmp73_; + res = sqlite3_bind_text (_tmp45_, 13, _tmp47_, -1, _tmp48_); #line 149 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp74_ = res; + _tmp49_ = res; #line 149 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _vala_assert (_tmp74_ == SQLITE_OK, "res == Sqlite.OK"); -#line 150 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp75_ = stmt; + _vala_assert (_tmp49_ == SQLITE_OK, "res == Sqlite.OK"); #line 150 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp76_ = video_row; -#line 150 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp77_ = _tmp76_->comment; + _tmp50_ = stmt; #line 150 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp78_ = g_strdup (_tmp77_); + _tmp51_ = video_row->comment; #line 150 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp79_ = g_free; + _tmp52_ = g_strdup (_tmp51_); #line 150 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp80_ = sqlite3_bind_text (_tmp75_, 14, _tmp78_, -1, _tmp79_); + _tmp53_ = g_free; #line 150 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - res = _tmp80_; + res = sqlite3_bind_text (_tmp50_, 14, _tmp52_, -1, _tmp53_); #line 151 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp81_ = res; + _tmp54_ = res; #line 151 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _vala_assert (_tmp81_ == SQLITE_OK, "res == Sqlite.OK"); -#line 153 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp82_ = stmt; + _vala_assert (_tmp54_ == SQLITE_OK, "res == Sqlite.OK"); #line 153 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp83_ = sqlite3_step (_tmp82_); + _tmp55_ = stmt; #line 153 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - res = _tmp83_; + res = sqlite3_step (_tmp55_); #line 154 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp84_ = res; + _tmp56_ = res; #line 154 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - if (_tmp84_ != SQLITE_DONE) { -#line 1152 "VideoTable.c" - gint _tmp85_; + if (_tmp56_ != SQLITE_DONE) { +#line 1205 "VideoTable.c" + gint _tmp57_; #line 155 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp85_ = res; + _tmp57_ = res; #line 155 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - if (_tmp85_ != SQLITE_CONSTRAINT) { -#line 1158 "VideoTable.c" - gint _tmp86_; + if (_tmp57_ != SQLITE_CONSTRAINT) { +#line 1211 "VideoTable.c" + gint _tmp58_; #line 156 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp86_ = res; + _tmp58_ = res; #line 156 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - database_table_throw_error ("VideoTable.add", _tmp86_, &_inner_error_); + database_table_throw_error ("VideoTable.add", _tmp58_, &_inner_error_); #line 156 "/home/jens/Source/shotwell/src/db/VideoTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 156 "/home/jens/Source/shotwell/src/db/VideoTable.vala" @@ -1172,7 +1225,7 @@ void video_table_add (VideoTable* self, VideoRow* video_row, VideoID* result, GE _sqlite3_finalize0 (stmt); #line 156 "/home/jens/Source/shotwell/src/db/VideoTable.vala" return; -#line 1174 "VideoTable.c" +#line 1227 "VideoTable.c" } else { #line 156 "/home/jens/Source/shotwell/src/db/VideoTable.vala" _sqlite3_finalize0 (stmt); @@ -1182,48 +1235,39 @@ void video_table_add (VideoTable* self, VideoRow* video_row, VideoID* result, GE g_clear_error (&_inner_error_); #line 156 "/home/jens/Source/shotwell/src/db/VideoTable.vala" return; -#line 1184 "VideoTable.c" +#line 1237 "VideoTable.c" } } } } #line 160 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp87_ = video_row; -#line 160 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp88_ = database_table_db; + _tmp59_ = database_table_db; #line 160 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp89_ = sqlite3_last_insert_rowid (_tmp88_); -#line 160 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - video_id_init (&_tmp87_->video_id, _tmp89_); -#line 161 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp90_ = video_row; + video_id_init (&video_row->video_id, sqlite3_last_insert_rowid (_tmp59_)); #line 161 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - event_id_init (&_tmp90_->event_id, EVENT_ID_INVALID); + event_id_init (&video_row->event_id, EVENT_ID_INVALID); #line 162 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp91_ = video_row; + _tmp60_ = time_created; #line 162 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp92_ = time_created; -#line 162 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp91_->time_created = (time_t) _tmp92_; -#line 163 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp93_ = video_row; + video_row->time_created = (time_t) _tmp60_; #line 163 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp93_->flags = (guint64) 0; -#line 165 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp94_ = video_row; + video_row->flags = (guint64) 0; #line 165 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp95_ = _tmp94_->video_id; + _tmp61_ = video_row->video_id; #line 165 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - *result = _tmp95_; + *result = _tmp61_; #line 165 "/home/jens/Source/shotwell/src/db/VideoTable.vala" _sqlite3_finalize0 (stmt); #line 165 "/home/jens/Source/shotwell/src/db/VideoTable.vala" return; -#line 1221 "VideoTable.c" +#line 1262 "VideoTable.c" } -gboolean video_table_drop_event (VideoTable* self, EventID* event_id) { +gboolean +video_table_drop_event (VideoTable* self, + EventID* event_id) +{ gboolean result = FALSE; sqlite3_stmt* stmt = NULL; gint res = 0; @@ -1233,15 +1277,12 @@ gboolean video_table_drop_event (VideoTable* self, EventID* event_id) { gint _tmp3_; sqlite3_stmt* _tmp4_; gint _tmp5_; - gint _tmp6_; - sqlite3_stmt* _tmp7_; - EventID _tmp8_; - gint64 _tmp9_; - gint _tmp10_; + sqlite3_stmt* _tmp6_; + EventID _tmp7_; + gint64 _tmp8_; + gint _tmp9_; + sqlite3_stmt* _tmp10_; gint _tmp11_; - sqlite3_stmt* _tmp12_; - gint _tmp13_; - gint _tmp14_; #line 168 "/home/jens/Source/shotwell/src/db/VideoTable.vala" g_return_val_if_fail (IS_VIDEO_TABLE (self), FALSE); #line 168 "/home/jens/Source/shotwell/src/db/VideoTable.vala" @@ -1263,50 +1304,44 @@ gboolean video_table_drop_event (VideoTable* self, EventID* event_id) { #line 173 "/home/jens/Source/shotwell/src/db/VideoTable.vala" _tmp4_ = stmt; #line 173 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp5_ = sqlite3_bind_int64 (_tmp4_, 1, EVENT_ID_INVALID); -#line 173 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - res = _tmp5_; + res = sqlite3_bind_int64 (_tmp4_, 1, EVENT_ID_INVALID); #line 174 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp6_ = res; + _tmp5_ = res; #line 174 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _vala_assert (_tmp6_ == SQLITE_OK, "res == Sqlite.OK"); + _vala_assert (_tmp5_ == SQLITE_OK, "res == Sqlite.OK"); #line 175 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp7_ = stmt; + _tmp6_ = stmt; #line 175 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp8_ = *event_id; + _tmp7_ = *event_id; #line 175 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp9_ = _tmp8_.id; + _tmp8_ = _tmp7_.id; #line 175 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp10_ = sqlite3_bind_int64 (_tmp7_, 2, _tmp9_); -#line 175 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - res = _tmp10_; + res = sqlite3_bind_int64 (_tmp6_, 2, _tmp8_); #line 176 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp11_ = res; + _tmp9_ = res; #line 176 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _vala_assert (_tmp11_ == SQLITE_OK, "res == Sqlite.OK"); -#line 178 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp12_ = stmt; + _vala_assert (_tmp9_ == SQLITE_OK, "res == Sqlite.OK"); #line 178 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp13_ = sqlite3_step (_tmp12_); + _tmp10_ = stmt; #line 178 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - res = _tmp13_; + res = sqlite3_step (_tmp10_); #line 179 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp14_ = res; + _tmp11_ = res; #line 179 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - if (_tmp14_ != SQLITE_DONE) { -#line 1296 "VideoTable.c" - gint _tmp15_; + if (_tmp11_ != SQLITE_DONE) { +#line 1331 "VideoTable.c" + gint _tmp12_; #line 180 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp15_ = res; + _tmp12_ = res; #line 180 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - database_table_fatal ("VideoTable.drop_event", _tmp15_); + database_table_fatal ("VideoTable.drop_event", _tmp12_); #line 182 "/home/jens/Source/shotwell/src/db/VideoTable.vala" result = FALSE; #line 182 "/home/jens/Source/shotwell/src/db/VideoTable.vala" _sqlite3_finalize0 (stmt); #line 182 "/home/jens/Source/shotwell/src/db/VideoTable.vala" return result; -#line 1308 "VideoTable.c" +#line 1343 "VideoTable.c" } #line 185 "/home/jens/Source/shotwell/src/db/VideoTable.vala" result = TRUE; @@ -1314,11 +1349,14 @@ gboolean video_table_drop_event (VideoTable* self, EventID* event_id) { _sqlite3_finalize0 (stmt); #line 185 "/home/jens/Source/shotwell/src/db/VideoTable.vala" return result; -#line 1316 "VideoTable.c" +#line 1351 "VideoTable.c" } -VideoRow* video_table_get_row (VideoTable* self, VideoID* video_id) { +VideoRow* +video_table_get_row (VideoTable* self, + VideoID* video_id) +{ VideoRow* result = NULL; sqlite3_stmt* stmt = NULL; gint res = 0; @@ -1330,73 +1368,57 @@ VideoRow* video_table_get_row (VideoTable* self, VideoID* video_id) { VideoID _tmp5_; gint64 _tmp6_; gint _tmp7_; - gint _tmp8_; - sqlite3_stmt* _tmp9_; - gint _tmp10_; + sqlite3_stmt* _tmp8_; VideoRow* row = NULL; - VideoRow* _tmp11_; + VideoRow* _tmp9_; + VideoRow* _tmp10_; + VideoID _tmp11_; VideoRow* _tmp12_; - VideoID _tmp13_; - VideoRow* _tmp14_; - sqlite3_stmt* _tmp15_; - const gchar* _tmp16_; - gchar* _tmp17_; + sqlite3_stmt* _tmp13_; + const gchar* _tmp14_; + gchar* _tmp15_; + VideoRow* _tmp16_; + sqlite3_stmt* _tmp17_; VideoRow* _tmp18_; sqlite3_stmt* _tmp19_; - gint _tmp20_; - VideoRow* _tmp21_; - sqlite3_stmt* _tmp22_; - gint _tmp23_; + VideoRow* _tmp20_; + sqlite3_stmt* _tmp21_; + VideoRow* _tmp22_; + sqlite3_stmt* _tmp23_; VideoRow* _tmp24_; sqlite3_stmt* _tmp25_; - gdouble _tmp26_; - VideoRow* _tmp27_; - sqlite3_stmt* _tmp28_; - gint _tmp29_; + VideoRow* _tmp26_; + sqlite3_stmt* _tmp27_; + VideoRow* _tmp28_; + sqlite3_stmt* _tmp29_; VideoRow* _tmp30_; sqlite3_stmt* _tmp31_; - gint64 _tmp32_; - VideoRow* _tmp33_; - sqlite3_stmt* _tmp34_; - gint64 _tmp35_; - VideoRow* _tmp36_; - sqlite3_stmt* _tmp37_; - gint64 _tmp38_; - VideoRow* _tmp39_; - sqlite3_stmt* _tmp40_; - gint64 _tmp41_; + VideoRow* _tmp32_; + sqlite3_stmt* _tmp33_; + VideoRow* _tmp34_; + sqlite3_stmt* _tmp35_; + const gchar* _tmp36_; + gchar* _tmp37_; + VideoRow* _tmp38_; + sqlite3_stmt* _tmp39_; + VideoRow* _tmp40_; + sqlite3_stmt* _tmp41_; VideoRow* _tmp42_; sqlite3_stmt* _tmp43_; - gint64 _tmp44_; - VideoRow* _tmp45_; - sqlite3_stmt* _tmp46_; - const gchar* _tmp47_; - gchar* _tmp48_; - VideoRow* _tmp49_; - sqlite3_stmt* _tmp50_; - gint64 _tmp51_; + const gchar* _tmp44_; + gchar* _tmp45_; + VideoRow* _tmp46_; + sqlite3_stmt* _tmp47_; + const gchar* _tmp48_; + gchar* _tmp49_; + VideoRow* _tmp50_; + sqlite3_stmt* _tmp51_; VideoRow* _tmp52_; sqlite3_stmt* _tmp53_; - gint _tmp54_; - Rating _tmp55_; - VideoRow* _tmp56_; - sqlite3_stmt* _tmp57_; - const gchar* _tmp58_; - gchar* _tmp59_; - VideoRow* _tmp60_; - sqlite3_stmt* _tmp61_; - const gchar* _tmp62_; - gchar* _tmp63_; - VideoRow* _tmp64_; - sqlite3_stmt* _tmp65_; - gint64 _tmp66_; - VideoRow* _tmp67_; - sqlite3_stmt* _tmp68_; - gint64 _tmp69_; - VideoRow* _tmp70_; - sqlite3_stmt* _tmp71_; - const gchar* _tmp72_; - gchar* _tmp73_; + VideoRow* _tmp54_; + sqlite3_stmt* _tmp55_; + const gchar* _tmp56_; + gchar* _tmp57_; #line 188 "/home/jens/Source/shotwell/src/db/VideoTable.vala" g_return_val_if_fail (IS_VIDEO_TABLE (self), NULL); #line 188 "/home/jens/Source/shotwell/src/db/VideoTable.vala" @@ -1424,214 +1446,184 @@ VideoRow* video_table_get_row (VideoTable* self, VideoID* video_id) { #line 197 "/home/jens/Source/shotwell/src/db/VideoTable.vala" _tmp6_ = _tmp5_.id; #line 197 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp7_ = sqlite3_bind_int64 (_tmp4_, 1, _tmp6_); -#line 197 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - res = _tmp7_; + res = sqlite3_bind_int64 (_tmp4_, 1, _tmp6_); #line 198 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp8_ = res; + _tmp7_ = res; #line 198 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _vala_assert (_tmp8_ == SQLITE_OK, "res == Sqlite.OK"); + _vala_assert (_tmp7_ == SQLITE_OK, "res == Sqlite.OK"); #line 200 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp9_ = stmt; -#line 200 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp10_ = sqlite3_step (_tmp9_); + _tmp8_ = stmt; #line 200 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - if (_tmp10_ != SQLITE_ROW) { + if (sqlite3_step (_tmp8_) != SQLITE_ROW) { #line 201 "/home/jens/Source/shotwell/src/db/VideoTable.vala" result = NULL; #line 201 "/home/jens/Source/shotwell/src/db/VideoTable.vala" _sqlite3_finalize0 (stmt); #line 201 "/home/jens/Source/shotwell/src/db/VideoTable.vala" return result; -#line 1443 "VideoTable.c" +#line 1461 "VideoTable.c" } #line 203 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp11_ = video_row_new (); + _tmp9_ = video_row_new (); #line 203 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - row = _tmp11_; + row = _tmp9_; #line 204 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp12_ = row; + _tmp10_ = row; #line 204 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp13_ = *video_id; + _tmp11_ = *video_id; #line 204 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp12_->video_id = _tmp13_; + _tmp10_->video_id = _tmp11_; #line 205 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp14_ = row; + _tmp12_ = row; #line 205 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp15_ = stmt; + _tmp13_ = stmt; #line 205 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp16_ = sqlite3_column_text (_tmp15_, 0); + _tmp14_ = sqlite3_column_text (_tmp13_, 0); #line 205 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp17_ = g_strdup (_tmp16_); + _tmp15_ = g_strdup (_tmp14_); #line 205 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _g_free0 (_tmp14_->filepath); + _g_free0 (_tmp12_->filepath); #line 205 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp14_->filepath = _tmp17_; -#line 206 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp18_ = row; + _tmp12_->filepath = _tmp15_; #line 206 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp19_ = stmt; + _tmp16_ = row; #line 206 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp20_ = sqlite3_column_int (_tmp19_, 1); + _tmp17_ = stmt; #line 206 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp18_->width = _tmp20_; -#line 207 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp21_ = row; + _tmp16_->width = sqlite3_column_int (_tmp17_, 1); #line 207 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp22_ = stmt; + _tmp18_ = row; #line 207 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp23_ = sqlite3_column_int (_tmp22_, 2); + _tmp19_ = stmt; #line 207 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp21_->height = _tmp23_; + _tmp18_->height = sqlite3_column_int (_tmp19_, 2); #line 208 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp24_ = row; -#line 208 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp25_ = stmt; + _tmp20_ = row; #line 208 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp26_ = sqlite3_column_double (_tmp25_, 3); + _tmp21_ = stmt; #line 208 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp24_->clip_duration = _tmp26_; + _tmp20_->clip_duration = sqlite3_column_double (_tmp21_, 3); #line 209 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp27_ = row; + _tmp22_ = row; #line 209 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp28_ = stmt; -#line 209 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp29_ = sqlite3_column_int (_tmp28_, 4); + _tmp23_ = stmt; #line 209 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp27_->is_interpretable = _tmp29_ == 1; + _tmp22_->is_interpretable = sqlite3_column_int (_tmp23_, 4) == 1; #line 210 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp30_ = row; -#line 210 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp31_ = stmt; + _tmp24_ = row; #line 210 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp32_ = sqlite3_column_int64 (_tmp31_, 5); + _tmp25_ = stmt; #line 210 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp30_->filesize = _tmp32_; + _tmp24_->filesize = sqlite3_column_int64 (_tmp25_, 5); #line 211 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp33_ = row; + _tmp26_ = row; #line 211 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp34_ = stmt; + _tmp27_ = stmt; #line 211 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp35_ = sqlite3_column_int64 (_tmp34_, 6); -#line 211 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp33_->timestamp = (time_t) _tmp35_; -#line 212 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp36_ = row; + _tmp26_->timestamp = (time_t) sqlite3_column_int64 (_tmp27_, 6); #line 212 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp37_ = stmt; + _tmp28_ = row; #line 212 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp38_ = sqlite3_column_int64 (_tmp37_, 7); + _tmp29_ = stmt; #line 212 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp36_->exposure_time = (time_t) _tmp38_; + _tmp28_->exposure_time = (time_t) sqlite3_column_int64 (_tmp29_, 7); #line 213 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp39_ = row; -#line 213 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp40_ = stmt; + _tmp30_ = row; #line 213 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp41_ = sqlite3_column_int64 (_tmp40_, 8); + _tmp31_ = stmt; #line 213 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp39_->import_id.id = _tmp41_; + _tmp30_->import_id.id = sqlite3_column_int64 (_tmp31_, 8); #line 214 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp42_ = row; -#line 214 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp43_ = stmt; + _tmp32_ = row; #line 214 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp44_ = sqlite3_column_int64 (_tmp43_, 9); + _tmp33_ = stmt; #line 214 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp42_->event_id.id = _tmp44_; + _tmp32_->event_id.id = sqlite3_column_int64 (_tmp33_, 9); #line 215 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp45_ = row; + _tmp34_ = row; #line 215 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp46_ = stmt; + _tmp35_ = stmt; #line 215 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp47_ = sqlite3_column_text (_tmp46_, 10); + _tmp36_ = sqlite3_column_text (_tmp35_, 10); #line 215 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp48_ = g_strdup (_tmp47_); + _tmp37_ = g_strdup (_tmp36_); #line 215 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _g_free0 (_tmp45_->md5); + _g_free0 (_tmp34_->md5); #line 215 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp45_->md5 = _tmp48_; -#line 216 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp49_ = row; + _tmp34_->md5 = _tmp37_; #line 216 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp50_ = stmt; + _tmp38_ = row; #line 216 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp51_ = sqlite3_column_int64 (_tmp50_, 11); + _tmp39_ = stmt; #line 216 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp49_->time_created = (time_t) _tmp51_; -#line 217 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp52_ = row; -#line 217 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp53_ = stmt; + _tmp38_->time_created = (time_t) sqlite3_column_int64 (_tmp39_, 11); #line 217 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp54_ = sqlite3_column_int (_tmp53_, 12); + _tmp40_ = row; #line 217 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp55_ = rating_unserialize (_tmp54_); + _tmp41_ = stmt; #line 217 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp52_->rating = _tmp55_; + _tmp40_->rating = rating_unserialize (sqlite3_column_int (_tmp41_, 12)); #line 218 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp56_ = row; + _tmp42_ = row; #line 218 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp57_ = stmt; + _tmp43_ = stmt; #line 218 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp58_ = sqlite3_column_text (_tmp57_, 13); + _tmp44_ = sqlite3_column_text (_tmp43_, 13); #line 218 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp59_ = g_strdup (_tmp58_); + _tmp45_ = g_strdup (_tmp44_); #line 218 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _g_free0 (_tmp56_->title); + _g_free0 (_tmp42_->title); #line 218 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp56_->title = _tmp59_; + _tmp42_->title = _tmp45_; #line 219 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp60_ = row; + _tmp46_ = row; #line 219 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp61_ = stmt; + _tmp47_ = stmt; #line 219 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp62_ = sqlite3_column_text (_tmp61_, 14); + _tmp48_ = sqlite3_column_text (_tmp47_, 14); #line 219 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp63_ = g_strdup (_tmp62_); + _tmp49_ = g_strdup (_tmp48_); #line 219 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _g_free0 (_tmp60_->backlinks); + _g_free0 (_tmp46_->backlinks); #line 219 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp60_->backlinks = _tmp63_; + _tmp46_->backlinks = _tmp49_; #line 220 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp64_ = row; + _tmp50_ = row; #line 220 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp65_ = stmt; + _tmp51_ = stmt; #line 220 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp66_ = sqlite3_column_int64 (_tmp65_, 15); -#line 220 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp64_->time_reimported = (time_t) _tmp66_; -#line 221 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp67_ = row; + _tmp50_->time_reimported = (time_t) sqlite3_column_int64 (_tmp51_, 15); #line 221 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp68_ = stmt; + _tmp52_ = row; #line 221 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp69_ = sqlite3_column_int64 (_tmp68_, 16); + _tmp53_ = stmt; #line 221 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp67_->flags = (guint64) _tmp69_; + _tmp52_->flags = (guint64) sqlite3_column_int64 (_tmp53_, 16); #line 222 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp70_ = row; + _tmp54_ = row; #line 222 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp71_ = stmt; + _tmp55_ = stmt; #line 222 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp72_ = sqlite3_column_text (_tmp71_, 17); + _tmp56_ = sqlite3_column_text (_tmp55_, 17); #line 222 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp73_ = g_strdup (_tmp72_); + _tmp57_ = g_strdup (_tmp56_); #line 222 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _g_free0 (_tmp70_->comment); + _g_free0 (_tmp54_->comment); #line 222 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp70_->comment = _tmp73_; + _tmp54_->comment = _tmp57_; #line 224 "/home/jens/Source/shotwell/src/db/VideoTable.vala" result = row; #line 224 "/home/jens/Source/shotwell/src/db/VideoTable.vala" _sqlite3_finalize0 (stmt); #line 224 "/home/jens/Source/shotwell/src/db/VideoTable.vala" return result; -#line 1627 "VideoTable.c" +#line 1617 "VideoTable.c" } -GeeArrayList* video_table_get_all (VideoTable* self) { +GeeArrayList* +video_table_get_all (VideoTable* self) +{ GeeArrayList* result = NULL; sqlite3_stmt* stmt = NULL; gint res = 0; @@ -1665,278 +1657,230 @@ GeeArrayList* video_table_get_all (VideoTable* self) { all = _tmp4_; #line 238 "/home/jens/Source/shotwell/src/db/VideoTable.vala" while (TRUE) { -#line 1663 "VideoTable.c" +#line 1655 "VideoTable.c" sqlite3_stmt* _tmp5_; gint _tmp6_; - gint _tmp7_; VideoRow* row = NULL; + VideoRow* _tmp7_; VideoRow* _tmp8_; - VideoRow* _tmp9_; - sqlite3_stmt* _tmp10_; - gint64 _tmp11_; - VideoRow* _tmp12_; - sqlite3_stmt* _tmp13_; - const gchar* _tmp14_; - gchar* _tmp15_; + sqlite3_stmt* _tmp9_; + VideoRow* _tmp10_; + sqlite3_stmt* _tmp11_; + const gchar* _tmp12_; + gchar* _tmp13_; + VideoRow* _tmp14_; + sqlite3_stmt* _tmp15_; VideoRow* _tmp16_; sqlite3_stmt* _tmp17_; - gint _tmp18_; - VideoRow* _tmp19_; - sqlite3_stmt* _tmp20_; - gint _tmp21_; + VideoRow* _tmp18_; + sqlite3_stmt* _tmp19_; + VideoRow* _tmp20_; + sqlite3_stmt* _tmp21_; VideoRow* _tmp22_; sqlite3_stmt* _tmp23_; - gdouble _tmp24_; - VideoRow* _tmp25_; - sqlite3_stmt* _tmp26_; - gint _tmp27_; + VideoRow* _tmp24_; + sqlite3_stmt* _tmp25_; + VideoRow* _tmp26_; + sqlite3_stmt* _tmp27_; VideoRow* _tmp28_; sqlite3_stmt* _tmp29_; - gint64 _tmp30_; - VideoRow* _tmp31_; - sqlite3_stmt* _tmp32_; - gint64 _tmp33_; - VideoRow* _tmp34_; - sqlite3_stmt* _tmp35_; - gint64 _tmp36_; - VideoRow* _tmp37_; - sqlite3_stmt* _tmp38_; - gint64 _tmp39_; + VideoRow* _tmp30_; + sqlite3_stmt* _tmp31_; + VideoRow* _tmp32_; + sqlite3_stmt* _tmp33_; + const gchar* _tmp34_; + gchar* _tmp35_; + VideoRow* _tmp36_; + sqlite3_stmt* _tmp37_; + VideoRow* _tmp38_; + sqlite3_stmt* _tmp39_; VideoRow* _tmp40_; sqlite3_stmt* _tmp41_; - gint64 _tmp42_; - VideoRow* _tmp43_; - sqlite3_stmt* _tmp44_; - const gchar* _tmp45_; - gchar* _tmp46_; - VideoRow* _tmp47_; - sqlite3_stmt* _tmp48_; - gint64 _tmp49_; + const gchar* _tmp42_; + gchar* _tmp43_; + VideoRow* _tmp44_; + sqlite3_stmt* _tmp45_; + const gchar* _tmp46_; + gchar* _tmp47_; + VideoRow* _tmp48_; + sqlite3_stmt* _tmp49_; VideoRow* _tmp50_; sqlite3_stmt* _tmp51_; - gint _tmp52_; - Rating _tmp53_; - VideoRow* _tmp54_; - sqlite3_stmt* _tmp55_; - const gchar* _tmp56_; - gchar* _tmp57_; - VideoRow* _tmp58_; - sqlite3_stmt* _tmp59_; - const gchar* _tmp60_; - gchar* _tmp61_; - VideoRow* _tmp62_; - sqlite3_stmt* _tmp63_; - gint64 _tmp64_; - VideoRow* _tmp65_; - sqlite3_stmt* _tmp66_; - gint64 _tmp67_; - VideoRow* _tmp68_; - sqlite3_stmt* _tmp69_; - const gchar* _tmp70_; - gchar* _tmp71_; - GeeArrayList* _tmp72_; - VideoRow* _tmp73_; + VideoRow* _tmp52_; + sqlite3_stmt* _tmp53_; + const gchar* _tmp54_; + gchar* _tmp55_; + GeeArrayList* _tmp56_; + VideoRow* _tmp57_; #line 238 "/home/jens/Source/shotwell/src/db/VideoTable.vala" _tmp5_ = stmt; #line 238 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp6_ = sqlite3_step (_tmp5_); -#line 238 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - res = _tmp6_; + res = sqlite3_step (_tmp5_); #line 238 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp7_ = res; + _tmp6_ = res; #line 238 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - if (!(_tmp7_ == SQLITE_ROW)) { + if (!(_tmp6_ == SQLITE_ROW)) { #line 238 "/home/jens/Source/shotwell/src/db/VideoTable.vala" break; -#line 1746 "VideoTable.c" +#line 1720 "VideoTable.c" } #line 239 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp8_ = video_row_new (); + _tmp7_ = video_row_new (); #line 239 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - row = _tmp8_; -#line 240 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp9_ = row; + row = _tmp7_; #line 240 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp10_ = stmt; + _tmp8_ = row; #line 240 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp11_ = sqlite3_column_int64 (_tmp10_, 0); + _tmp9_ = stmt; #line 240 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp9_->video_id.id = _tmp11_; + _tmp8_->video_id.id = sqlite3_column_int64 (_tmp9_, 0); #line 241 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp12_ = row; + _tmp10_ = row; #line 241 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp13_ = stmt; + _tmp11_ = stmt; #line 241 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp14_ = sqlite3_column_text (_tmp13_, 1); + _tmp12_ = sqlite3_column_text (_tmp11_, 1); #line 241 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp15_ = g_strdup (_tmp14_); + _tmp13_ = g_strdup (_tmp12_); #line 241 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _g_free0 (_tmp12_->filepath); + _g_free0 (_tmp10_->filepath); #line 241 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp12_->filepath = _tmp15_; + _tmp10_->filepath = _tmp13_; #line 242 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp16_ = row; -#line 242 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp17_ = stmt; + _tmp14_ = row; #line 242 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp18_ = sqlite3_column_int (_tmp17_, 2); + _tmp15_ = stmt; #line 242 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp16_->width = _tmp18_; + _tmp14_->width = sqlite3_column_int (_tmp15_, 2); #line 243 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp19_ = row; -#line 243 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp20_ = stmt; + _tmp16_ = row; #line 243 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp21_ = sqlite3_column_int (_tmp20_, 3); + _tmp17_ = stmt; #line 243 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp19_->height = _tmp21_; + _tmp16_->height = sqlite3_column_int (_tmp17_, 3); #line 244 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp22_ = row; + _tmp18_ = row; #line 244 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp23_ = stmt; -#line 244 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp24_ = sqlite3_column_double (_tmp23_, 4); + _tmp19_ = stmt; #line 244 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp22_->clip_duration = _tmp24_; + _tmp18_->clip_duration = sqlite3_column_double (_tmp19_, 4); #line 245 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp25_ = row; + _tmp20_ = row; #line 245 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp26_ = stmt; + _tmp21_ = stmt; #line 245 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp27_ = sqlite3_column_int (_tmp26_, 5); -#line 245 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp25_->is_interpretable = _tmp27_ == 1; -#line 246 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp28_ = row; + _tmp20_->is_interpretable = sqlite3_column_int (_tmp21_, 5) == 1; #line 246 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp29_ = stmt; + _tmp22_ = row; #line 246 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp30_ = sqlite3_column_int64 (_tmp29_, 6); + _tmp23_ = stmt; #line 246 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp28_->filesize = _tmp30_; + _tmp22_->filesize = sqlite3_column_int64 (_tmp23_, 6); #line 247 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp31_ = row; + _tmp24_ = row; #line 247 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp32_ = stmt; + _tmp25_ = stmt; #line 247 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp33_ = sqlite3_column_int64 (_tmp32_, 7); -#line 247 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp31_->timestamp = (time_t) _tmp33_; -#line 248 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp34_ = row; + _tmp24_->timestamp = (time_t) sqlite3_column_int64 (_tmp25_, 7); #line 248 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp35_ = stmt; + _tmp26_ = row; #line 248 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp36_ = sqlite3_column_int64 (_tmp35_, 8); + _tmp27_ = stmt; #line 248 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp34_->exposure_time = (time_t) _tmp36_; -#line 249 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp37_ = row; + _tmp26_->exposure_time = (time_t) sqlite3_column_int64 (_tmp27_, 8); #line 249 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp38_ = stmt; + _tmp28_ = row; #line 249 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp39_ = sqlite3_column_int64 (_tmp38_, 9); + _tmp29_ = stmt; #line 249 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp37_->import_id.id = _tmp39_; + _tmp28_->import_id.id = sqlite3_column_int64 (_tmp29_, 9); #line 250 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp40_ = row; + _tmp30_ = row; #line 250 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp41_ = stmt; -#line 250 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp42_ = sqlite3_column_int64 (_tmp41_, 10); + _tmp31_ = stmt; #line 250 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp40_->event_id.id = _tmp42_; + _tmp30_->event_id.id = sqlite3_column_int64 (_tmp31_, 10); #line 251 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp43_ = row; + _tmp32_ = row; #line 251 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp44_ = stmt; + _tmp33_ = stmt; #line 251 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp45_ = sqlite3_column_text (_tmp44_, 11); + _tmp34_ = sqlite3_column_text (_tmp33_, 11); #line 251 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp46_ = g_strdup (_tmp45_); + _tmp35_ = g_strdup (_tmp34_); #line 251 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _g_free0 (_tmp43_->md5); + _g_free0 (_tmp32_->md5); #line 251 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp43_->md5 = _tmp46_; -#line 252 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp47_ = row; + _tmp32_->md5 = _tmp35_; #line 252 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp48_ = stmt; + _tmp36_ = row; #line 252 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp49_ = sqlite3_column_int64 (_tmp48_, 12); + _tmp37_ = stmt; #line 252 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp47_->time_created = (time_t) _tmp49_; -#line 253 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp50_ = row; -#line 253 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp51_ = stmt; + _tmp36_->time_created = (time_t) sqlite3_column_int64 (_tmp37_, 12); #line 253 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp52_ = sqlite3_column_int (_tmp51_, 13); + _tmp38_ = row; #line 253 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp53_ = rating_unserialize (_tmp52_); + _tmp39_ = stmt; #line 253 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp50_->rating = _tmp53_; + _tmp38_->rating = rating_unserialize (sqlite3_column_int (_tmp39_, 13)); #line 254 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp54_ = row; + _tmp40_ = row; #line 254 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp55_ = stmt; + _tmp41_ = stmt; #line 254 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp56_ = sqlite3_column_text (_tmp55_, 14); + _tmp42_ = sqlite3_column_text (_tmp41_, 14); #line 254 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp57_ = g_strdup (_tmp56_); + _tmp43_ = g_strdup (_tmp42_); #line 254 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _g_free0 (_tmp54_->title); + _g_free0 (_tmp40_->title); #line 254 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp54_->title = _tmp57_; + _tmp40_->title = _tmp43_; #line 255 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp58_ = row; + _tmp44_ = row; #line 255 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp59_ = stmt; + _tmp45_ = stmt; #line 255 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp60_ = sqlite3_column_text (_tmp59_, 15); + _tmp46_ = sqlite3_column_text (_tmp45_, 15); #line 255 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp61_ = g_strdup (_tmp60_); + _tmp47_ = g_strdup (_tmp46_); #line 255 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _g_free0 (_tmp58_->backlinks); + _g_free0 (_tmp44_->backlinks); #line 255 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp58_->backlinks = _tmp61_; -#line 256 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp62_ = row; + _tmp44_->backlinks = _tmp47_; #line 256 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp63_ = stmt; + _tmp48_ = row; #line 256 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp64_ = sqlite3_column_int64 (_tmp63_, 16); + _tmp49_ = stmt; #line 256 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp62_->time_reimported = (time_t) _tmp64_; + _tmp48_->time_reimported = (time_t) sqlite3_column_int64 (_tmp49_, 16); #line 257 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp65_ = row; -#line 257 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp66_ = stmt; + _tmp50_ = row; #line 257 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp67_ = sqlite3_column_int64 (_tmp66_, 17); + _tmp51_ = stmt; #line 257 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp65_->flags = (guint64) _tmp67_; + _tmp50_->flags = (guint64) sqlite3_column_int64 (_tmp51_, 17); #line 258 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp68_ = row; + _tmp52_ = row; #line 258 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp69_ = stmt; + _tmp53_ = stmt; #line 258 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp70_ = sqlite3_column_text (_tmp69_, 18); + _tmp54_ = sqlite3_column_text (_tmp53_, 18); #line 258 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp71_ = g_strdup (_tmp70_); + _tmp55_ = g_strdup (_tmp54_); #line 258 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _g_free0 (_tmp68_->comment); + _g_free0 (_tmp52_->comment); #line 258 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp68_->comment = _tmp71_; + _tmp52_->comment = _tmp55_; #line 260 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp72_ = all; + _tmp56_ = all; #line 260 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp73_ = row; + _tmp57_ = row; #line 260 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp72_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp73_); + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp56_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp57_); #line 238 "/home/jens/Source/shotwell/src/db/VideoTable.vala" _video_row_unref0 (row); -#line 1934 "VideoTable.c" +#line 1878 "VideoTable.c" } #line 263 "/home/jens/Source/shotwell/src/db/VideoTable.vala" result = all; @@ -1944,14 +1888,18 @@ GeeArrayList* video_table_get_all (VideoTable* self) { _sqlite3_finalize0 (stmt); #line 263 "/home/jens/Source/shotwell/src/db/VideoTable.vala" return result; -#line 1942 "VideoTable.c" +#line 1886 "VideoTable.c" } -void video_table_set_filepath (VideoTable* self, VideoID* video_id, const gchar* filepath, GError** error) { +void +video_table_set_filepath (VideoTable* self, + VideoID* video_id, + const gchar* filepath, + GError** error) +{ VideoID _tmp0_; gint64 _tmp1_; - const gchar* _tmp2_; GError * _inner_error_ = NULL; #line 266 "/home/jens/Source/shotwell/src/db/VideoTable.vala" g_return_if_fail (IS_VIDEO_TABLE (self)); @@ -1964,9 +1912,7 @@ void video_table_set_filepath (VideoTable* self, VideoID* video_id, const gchar* #line 267 "/home/jens/Source/shotwell/src/db/VideoTable.vala" _tmp1_ = _tmp0_.id; #line 267 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp2_ = filepath; -#line 267 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - database_table_update_text_by_id_2 (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp1_, "filename", _tmp2_, &_inner_error_); + database_table_update_text_by_id_2 (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp1_, "filename", filepath, &_inner_error_); #line 267 "/home/jens/Source/shotwell/src/db/VideoTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 267 "/home/jens/Source/shotwell/src/db/VideoTable.vala" @@ -1975,7 +1921,7 @@ void video_table_set_filepath (VideoTable* self, VideoID* video_id, const gchar* g_propagate_error (error, _inner_error_); #line 267 "/home/jens/Source/shotwell/src/db/VideoTable.vala" return; -#line 1973 "VideoTable.c" +#line 1919 "VideoTable.c" } else { #line 267 "/home/jens/Source/shotwell/src/db/VideoTable.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); @@ -1983,44 +1929,42 @@ void video_table_set_filepath (VideoTable* self, VideoID* video_id, const gchar* g_clear_error (&_inner_error_); #line 267 "/home/jens/Source/shotwell/src/db/VideoTable.vala" return; -#line 1981 "VideoTable.c" +#line 1927 "VideoTable.c" } } } -void video_table_set_title (VideoTable* self, VideoID* video_id, const gchar* new_title, GError** error) { +void +video_table_set_title (VideoTable* self, + VideoID* video_id, + const gchar* new_title, + GError** error) +{ const gchar* _tmp0_ = NULL; - const gchar* _tmp1_; - VideoID _tmp3_; - gint64 _tmp4_; + VideoID _tmp1_; + gint64 _tmp2_; GError * _inner_error_ = NULL; #line 270 "/home/jens/Source/shotwell/src/db/VideoTable.vala" g_return_if_fail (IS_VIDEO_TABLE (self)); #line 270 "/home/jens/Source/shotwell/src/db/VideoTable.vala" g_return_if_fail (video_id != NULL); #line 271 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp1_ = new_title; -#line 271 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - if (_tmp1_ != NULL) { -#line 2001 "VideoTable.c" - const gchar* _tmp2_; -#line 271 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp2_ = new_title; + if (new_title != NULL) { #line 271 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp0_ = _tmp2_; -#line 2007 "VideoTable.c" + _tmp0_ = new_title; +#line 1951 "VideoTable.c" } else { #line 271 "/home/jens/Source/shotwell/src/db/VideoTable.vala" _tmp0_ = ""; -#line 2011 "VideoTable.c" +#line 1955 "VideoTable.c" } #line 271 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp3_ = *video_id; + _tmp1_ = *video_id; #line 271 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp4_ = _tmp3_.id; + _tmp2_ = _tmp1_.id; #line 271 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - database_table_update_text_by_id_2 (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp4_, "title", _tmp0_, &_inner_error_); + database_table_update_text_by_id_2 (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp2_, "title", _tmp0_, &_inner_error_); #line 271 "/home/jens/Source/shotwell/src/db/VideoTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 271 "/home/jens/Source/shotwell/src/db/VideoTable.vala" @@ -2029,7 +1973,7 @@ void video_table_set_title (VideoTable* self, VideoID* video_id, const gchar* ne g_propagate_error (error, _inner_error_); #line 271 "/home/jens/Source/shotwell/src/db/VideoTable.vala" return; -#line 2027 "VideoTable.c" +#line 1971 "VideoTable.c" } else { #line 271 "/home/jens/Source/shotwell/src/db/VideoTable.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); @@ -2037,44 +1981,42 @@ void video_table_set_title (VideoTable* self, VideoID* video_id, const gchar* ne g_clear_error (&_inner_error_); #line 271 "/home/jens/Source/shotwell/src/db/VideoTable.vala" return; -#line 2035 "VideoTable.c" +#line 1979 "VideoTable.c" } } } -void video_table_set_comment (VideoTable* self, VideoID* video_id, const gchar* new_comment, GError** error) { +void +video_table_set_comment (VideoTable* self, + VideoID* video_id, + const gchar* new_comment, + GError** error) +{ const gchar* _tmp0_ = NULL; - const gchar* _tmp1_; - VideoID _tmp3_; - gint64 _tmp4_; + VideoID _tmp1_; + gint64 _tmp2_; GError * _inner_error_ = NULL; #line 274 "/home/jens/Source/shotwell/src/db/VideoTable.vala" g_return_if_fail (IS_VIDEO_TABLE (self)); #line 274 "/home/jens/Source/shotwell/src/db/VideoTable.vala" g_return_if_fail (video_id != NULL); #line 275 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp1_ = new_comment; + if (new_comment != NULL) { #line 275 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - if (_tmp1_ != NULL) { -#line 2055 "VideoTable.c" - const gchar* _tmp2_; -#line 275 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp2_ = new_comment; -#line 275 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp0_ = _tmp2_; -#line 2061 "VideoTable.c" + _tmp0_ = new_comment; +#line 2003 "VideoTable.c" } else { #line 275 "/home/jens/Source/shotwell/src/db/VideoTable.vala" _tmp0_ = ""; -#line 2065 "VideoTable.c" +#line 2007 "VideoTable.c" } #line 275 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp3_ = *video_id; + _tmp1_ = *video_id; #line 275 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp4_ = _tmp3_.id; + _tmp2_ = _tmp1_.id; #line 275 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - database_table_update_text_by_id_2 (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp4_, "comment", _tmp0_, &_inner_error_); + database_table_update_text_by_id_2 (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp2_, "comment", _tmp0_, &_inner_error_); #line 275 "/home/jens/Source/shotwell/src/db/VideoTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 275 "/home/jens/Source/shotwell/src/db/VideoTable.vala" @@ -2083,7 +2025,7 @@ void video_table_set_comment (VideoTable* self, VideoID* video_id, const gchar* g_propagate_error (error, _inner_error_); #line 275 "/home/jens/Source/shotwell/src/db/VideoTable.vala" return; -#line 2081 "VideoTable.c" +#line 2023 "VideoTable.c" } else { #line 275 "/home/jens/Source/shotwell/src/db/VideoTable.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); @@ -2091,16 +2033,20 @@ void video_table_set_comment (VideoTable* self, VideoID* video_id, const gchar* g_clear_error (&_inner_error_); #line 275 "/home/jens/Source/shotwell/src/db/VideoTable.vala" return; -#line 2089 "VideoTable.c" +#line 2031 "VideoTable.c" } } } -void video_table_set_exposure_time (VideoTable* self, VideoID* video_id, time_t time, GError** error) { +void +video_table_set_exposure_time (VideoTable* self, + VideoID* video_id, + time_t time, + GError** error) +{ VideoID _tmp0_; gint64 _tmp1_; - time_t _tmp2_; GError * _inner_error_ = NULL; #line 278 "/home/jens/Source/shotwell/src/db/VideoTable.vala" g_return_if_fail (IS_VIDEO_TABLE (self)); @@ -2111,9 +2057,7 @@ void video_table_set_exposure_time (VideoTable* self, VideoID* video_id, time_t #line 279 "/home/jens/Source/shotwell/src/db/VideoTable.vala" _tmp1_ = _tmp0_.id; #line 279 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp2_ = time; -#line 279 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - database_table_update_int64_by_id_2 (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp1_, "exposure_time", (gint64) _tmp2_, &_inner_error_); + database_table_update_int64_by_id_2 (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp1_, "exposure_time", (gint64) time, &_inner_error_); #line 279 "/home/jens/Source/shotwell/src/db/VideoTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 279 "/home/jens/Source/shotwell/src/db/VideoTable.vala" @@ -2122,7 +2066,7 @@ void video_table_set_exposure_time (VideoTable* self, VideoID* video_id, time_t g_propagate_error (error, _inner_error_); #line 279 "/home/jens/Source/shotwell/src/db/VideoTable.vala" return; -#line 2120 "VideoTable.c" +#line 2064 "VideoTable.c" } else { #line 279 "/home/jens/Source/shotwell/src/db/VideoTable.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); @@ -2130,17 +2074,20 @@ void video_table_set_exposure_time (VideoTable* self, VideoID* video_id, time_t g_clear_error (&_inner_error_); #line 279 "/home/jens/Source/shotwell/src/db/VideoTable.vala" return; -#line 2128 "VideoTable.c" +#line 2072 "VideoTable.c" } } } -void video_table_set_rating (VideoTable* self, VideoID* video_id, Rating rating, GError** error) { +void +video_table_set_rating (VideoTable* self, + VideoID* video_id, + Rating rating, + GError** error) +{ VideoID _tmp0_; gint64 _tmp1_; - Rating _tmp2_; - gint _tmp3_; GError * _inner_error_ = NULL; #line 282 "/home/jens/Source/shotwell/src/db/VideoTable.vala" g_return_if_fail (IS_VIDEO_TABLE (self)); @@ -2151,11 +2098,7 @@ void video_table_set_rating (VideoTable* self, VideoID* video_id, Rating rating, #line 283 "/home/jens/Source/shotwell/src/db/VideoTable.vala" _tmp1_ = _tmp0_.id; #line 283 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp2_ = rating; -#line 283 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp3_ = rating_serialize (_tmp2_); -#line 283 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - database_table_update_int64_by_id_2 (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp1_, "rating", (gint64) _tmp3_, &_inner_error_); + database_table_update_int64_by_id_2 (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp1_, "rating", (gint64) rating_serialize (rating), &_inner_error_); #line 283 "/home/jens/Source/shotwell/src/db/VideoTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 283 "/home/jens/Source/shotwell/src/db/VideoTable.vala" @@ -2164,7 +2107,7 @@ void video_table_set_rating (VideoTable* self, VideoID* video_id, Rating rating, g_propagate_error (error, _inner_error_); #line 283 "/home/jens/Source/shotwell/src/db/VideoTable.vala" return; -#line 2162 "VideoTable.c" +#line 2105 "VideoTable.c" } else { #line 283 "/home/jens/Source/shotwell/src/db/VideoTable.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); @@ -2172,16 +2115,20 @@ void video_table_set_rating (VideoTable* self, VideoID* video_id, Rating rating, g_clear_error (&_inner_error_); #line 283 "/home/jens/Source/shotwell/src/db/VideoTable.vala" return; -#line 2170 "VideoTable.c" +#line 2113 "VideoTable.c" } } } -void video_table_set_flags (VideoTable* self, VideoID* video_id, guint64 flags, GError** error) { +void +video_table_set_flags (VideoTable* self, + VideoID* video_id, + guint64 flags, + GError** error) +{ VideoID _tmp0_; gint64 _tmp1_; - guint64 _tmp2_; GError * _inner_error_ = NULL; #line 286 "/home/jens/Source/shotwell/src/db/VideoTable.vala" g_return_if_fail (IS_VIDEO_TABLE (self)); @@ -2192,9 +2139,7 @@ void video_table_set_flags (VideoTable* self, VideoID* video_id, guint64 flags, #line 287 "/home/jens/Source/shotwell/src/db/VideoTable.vala" _tmp1_ = _tmp0_.id; #line 287 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp2_ = flags; -#line 287 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - database_table_update_int64_by_id_2 (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp1_, "flags", (gint64) _tmp2_, &_inner_error_); + database_table_update_int64_by_id_2 (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp1_, "flags", (gint64) flags, &_inner_error_); #line 287 "/home/jens/Source/shotwell/src/db/VideoTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 287 "/home/jens/Source/shotwell/src/db/VideoTable.vala" @@ -2203,7 +2148,7 @@ void video_table_set_flags (VideoTable* self, VideoID* video_id, guint64 flags, g_propagate_error (error, _inner_error_); #line 287 "/home/jens/Source/shotwell/src/db/VideoTable.vala" return; -#line 2201 "VideoTable.c" +#line 2146 "VideoTable.c" } else { #line 287 "/home/jens/Source/shotwell/src/db/VideoTable.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); @@ -2211,44 +2156,42 @@ void video_table_set_flags (VideoTable* self, VideoID* video_id, guint64 flags, g_clear_error (&_inner_error_); #line 287 "/home/jens/Source/shotwell/src/db/VideoTable.vala" return; -#line 2209 "VideoTable.c" +#line 2154 "VideoTable.c" } } } -void video_table_update_backlinks (VideoTable* self, VideoID* video_id, const gchar* backlinks, GError** error) { +void +video_table_update_backlinks (VideoTable* self, + VideoID* video_id, + const gchar* backlinks, + GError** error) +{ const gchar* _tmp0_ = NULL; - const gchar* _tmp1_; - VideoID _tmp3_; - gint64 _tmp4_; + VideoID _tmp1_; + gint64 _tmp2_; GError * _inner_error_ = NULL; #line 290 "/home/jens/Source/shotwell/src/db/VideoTable.vala" g_return_if_fail (IS_VIDEO_TABLE (self)); #line 290 "/home/jens/Source/shotwell/src/db/VideoTable.vala" g_return_if_fail (video_id != NULL); #line 291 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp1_ = backlinks; -#line 291 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - if (_tmp1_ != NULL) { -#line 2229 "VideoTable.c" - const gchar* _tmp2_; -#line 291 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp2_ = backlinks; + if (backlinks != NULL) { #line 291 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp0_ = _tmp2_; -#line 2235 "VideoTable.c" + _tmp0_ = backlinks; +#line 2178 "VideoTable.c" } else { #line 291 "/home/jens/Source/shotwell/src/db/VideoTable.vala" _tmp0_ = ""; -#line 2239 "VideoTable.c" +#line 2182 "VideoTable.c" } #line 291 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp3_ = *video_id; + _tmp1_ = *video_id; #line 291 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp4_ = _tmp3_.id; + _tmp2_ = _tmp1_.id; #line 291 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - database_table_update_text_by_id_2 (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp4_, "backlinks", _tmp0_, &_inner_error_); + database_table_update_text_by_id_2 (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp2_, "backlinks", _tmp0_, &_inner_error_); #line 291 "/home/jens/Source/shotwell/src/db/VideoTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 291 "/home/jens/Source/shotwell/src/db/VideoTable.vala" @@ -2257,7 +2200,7 @@ void video_table_update_backlinks (VideoTable* self, VideoID* video_id, const gc g_propagate_error (error, _inner_error_); #line 291 "/home/jens/Source/shotwell/src/db/VideoTable.vala" return; -#line 2255 "VideoTable.c" +#line 2198 "VideoTable.c" } else { #line 291 "/home/jens/Source/shotwell/src/db/VideoTable.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); @@ -2265,40 +2208,42 @@ void video_table_update_backlinks (VideoTable* self, VideoID* video_id, const gc g_clear_error (&_inner_error_); #line 291 "/home/jens/Source/shotwell/src/db/VideoTable.vala" return; -#line 2263 "VideoTable.c" +#line 2206 "VideoTable.c" } } } -void video_table_update_is_interpretable (VideoTable* self, VideoID* video_id, gboolean is_interpretable, GError** error) { +void +video_table_update_is_interpretable (VideoTable* self, + VideoID* video_id, + gboolean is_interpretable, + GError** error) +{ gint _tmp0_ = 0; - gboolean _tmp1_; - VideoID _tmp2_; - gint64 _tmp3_; + VideoID _tmp1_; + gint64 _tmp2_; GError * _inner_error_ = NULL; #line 294 "/home/jens/Source/shotwell/src/db/VideoTable.vala" g_return_if_fail (IS_VIDEO_TABLE (self)); #line 294 "/home/jens/Source/shotwell/src/db/VideoTable.vala" g_return_if_fail (video_id != NULL); #line 295 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp1_ = is_interpretable; -#line 295 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - if (_tmp1_) { + if (is_interpretable) { #line 295 "/home/jens/Source/shotwell/src/db/VideoTable.vala" _tmp0_ = 1; -#line 2285 "VideoTable.c" +#line 2230 "VideoTable.c" } else { #line 295 "/home/jens/Source/shotwell/src/db/VideoTable.vala" _tmp0_ = 0; -#line 2289 "VideoTable.c" +#line 2234 "VideoTable.c" } #line 295 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp2_ = *video_id; + _tmp1_ = *video_id; #line 295 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp3_ = _tmp2_.id; + _tmp2_ = _tmp1_.id; #line 295 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - database_table_update_int_by_id_2 (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp3_, "is_interpretable", _tmp0_, &_inner_error_); + database_table_update_int_by_id_2 (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp2_, "is_interpretable", _tmp0_, &_inner_error_); #line 295 "/home/jens/Source/shotwell/src/db/VideoTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 295 "/home/jens/Source/shotwell/src/db/VideoTable.vala" @@ -2307,7 +2252,7 @@ void video_table_update_is_interpretable (VideoTable* self, VideoID* video_id, g g_propagate_error (error, _inner_error_); #line 295 "/home/jens/Source/shotwell/src/db/VideoTable.vala" return; -#line 2305 "VideoTable.c" +#line 2250 "VideoTable.c" } else { #line 295 "/home/jens/Source/shotwell/src/db/VideoTable.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); @@ -2315,19 +2260,22 @@ void video_table_update_is_interpretable (VideoTable* self, VideoID* video_id, g g_clear_error (&_inner_error_); #line 295 "/home/jens/Source/shotwell/src/db/VideoTable.vala" return; -#line 2313 "VideoTable.c" +#line 2258 "VideoTable.c" } } } -gboolean video_table_set_event (VideoTable* self, VideoID* video_id, EventID* event_id) { +gboolean +video_table_set_event (VideoTable* self, + VideoID* video_id, + EventID* event_id) +{ gboolean result = FALSE; VideoID _tmp0_; gint64 _tmp1_; EventID _tmp2_; gint64 _tmp3_; - gboolean _tmp4_; #line 298 "/home/jens/Source/shotwell/src/db/VideoTable.vala" g_return_val_if_fail (IS_VIDEO_TABLE (self), FALSE); #line 298 "/home/jens/Source/shotwell/src/db/VideoTable.vala" @@ -2343,16 +2291,18 @@ gboolean video_table_set_event (VideoTable* self, VideoID* video_id, EventID* ev #line 299 "/home/jens/Source/shotwell/src/db/VideoTable.vala" _tmp3_ = _tmp2_.id; #line 299 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp4_ = database_table_update_int64_by_id (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp1_, "event_id", _tmp3_); -#line 299 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - result = _tmp4_; + result = database_table_update_int64_by_id (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp1_, "event_id", _tmp3_); #line 299 "/home/jens/Source/shotwell/src/db/VideoTable.vala" return result; -#line 2346 "VideoTable.c" +#line 2292 "VideoTable.c" } -void video_table_remove_by_file (VideoTable* self, GFile* file, GError** error) { +void +video_table_remove_by_file (VideoTable* self, + GFile* file, + GError** error) +{ sqlite3_stmt* stmt = NULL; gint res = 0; sqlite3* _tmp0_; @@ -2360,14 +2310,11 @@ void video_table_remove_by_file (VideoTable* self, GFile* file, GError** error) gint _tmp2_; gint _tmp3_; sqlite3_stmt* _tmp4_; - GFile* _tmp5_; - gchar* _tmp6_; - GDestroyNotify _tmp7_; - gint _tmp8_; + gchar* _tmp5_; + GDestroyNotify _tmp6_; + gint _tmp7_; + sqlite3_stmt* _tmp8_; gint _tmp9_; - sqlite3_stmt* _tmp10_; - gint _tmp11_; - gint _tmp12_; GError * _inner_error_ = NULL; #line 302 "/home/jens/Source/shotwell/src/db/VideoTable.vala" g_return_if_fail (IS_VIDEO_TABLE (self)); @@ -2390,35 +2337,29 @@ void video_table_remove_by_file (VideoTable* self, GFile* file, GError** error) #line 307 "/home/jens/Source/shotwell/src/db/VideoTable.vala" _tmp4_ = stmt; #line 307 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp5_ = file; -#line 307 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp6_ = g_file_get_path (_tmp5_); + _tmp5_ = g_file_get_path (file); #line 307 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp7_ = g_free; -#line 307 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp8_ = sqlite3_bind_text (_tmp4_, 1, _tmp6_, -1, _tmp7_); + _tmp6_ = g_free; #line 307 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - res = _tmp8_; + res = sqlite3_bind_text (_tmp4_, 1, _tmp5_, -1, _tmp6_); #line 308 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp9_ = res; + _tmp7_ = res; #line 308 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _vala_assert (_tmp9_ == SQLITE_OK, "res == Sqlite.OK"); -#line 310 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp10_ = stmt; + _vala_assert (_tmp7_ == SQLITE_OK, "res == Sqlite.OK"); #line 310 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp11_ = sqlite3_step (_tmp10_); + _tmp8_ = stmt; #line 310 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - res = _tmp11_; + res = sqlite3_step (_tmp8_); #line 311 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp12_ = res; + _tmp9_ = res; #line 311 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - if (_tmp12_ != SQLITE_DONE) { -#line 2411 "VideoTable.c" - gint _tmp13_; + if (_tmp9_ != SQLITE_DONE) { +#line 2352 "VideoTable.c" + gint _tmp10_; #line 312 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp13_ = res; + _tmp10_ = res; #line 312 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - database_table_throw_error ("VideoTable.remove_by_file", _tmp13_, &_inner_error_); + database_table_throw_error ("VideoTable.remove_by_file", _tmp10_, &_inner_error_); #line 312 "/home/jens/Source/shotwell/src/db/VideoTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 312 "/home/jens/Source/shotwell/src/db/VideoTable.vala" @@ -2429,7 +2370,7 @@ void video_table_remove_by_file (VideoTable* self, GFile* file, GError** error) _sqlite3_finalize0 (stmt); #line 312 "/home/jens/Source/shotwell/src/db/VideoTable.vala" return; -#line 2427 "VideoTable.c" +#line 2368 "VideoTable.c" } else { #line 312 "/home/jens/Source/shotwell/src/db/VideoTable.vala" _sqlite3_finalize0 (stmt); @@ -2439,17 +2380,21 @@ void video_table_remove_by_file (VideoTable* self, GFile* file, GError** error) g_clear_error (&_inner_error_); #line 312 "/home/jens/Source/shotwell/src/db/VideoTable.vala" return; -#line 2437 "VideoTable.c" +#line 2378 "VideoTable.c" } } } #line 302 "/home/jens/Source/shotwell/src/db/VideoTable.vala" _sqlite3_finalize0 (stmt); -#line 2443 "VideoTable.c" +#line 2384 "VideoTable.c" } -void video_table_remove (VideoTable* self, VideoID* videoID, GError** error) { +void +video_table_remove (VideoTable* self, + VideoID* videoID, + GError** error) +{ sqlite3_stmt* stmt = NULL; gint res = 0; sqlite3* _tmp0_; @@ -2460,10 +2405,8 @@ void video_table_remove (VideoTable* self, VideoID* videoID, GError** error) { VideoID _tmp5_; gint64 _tmp6_; gint _tmp7_; - gint _tmp8_; - sqlite3_stmt* _tmp9_; - gint _tmp10_; - gint _tmp11_; + sqlite3_stmt* _tmp8_; + gint _tmp9_; GError * _inner_error_ = NULL; #line 315 "/home/jens/Source/shotwell/src/db/VideoTable.vala" g_return_if_fail (IS_VIDEO_TABLE (self)); @@ -2490,29 +2433,25 @@ void video_table_remove (VideoTable* self, VideoID* videoID, GError** error) { #line 320 "/home/jens/Source/shotwell/src/db/VideoTable.vala" _tmp6_ = _tmp5_.id; #line 320 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp7_ = sqlite3_bind_int64 (_tmp4_, 1, _tmp6_); -#line 320 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - res = _tmp7_; + res = sqlite3_bind_int64 (_tmp4_, 1, _tmp6_); #line 321 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp8_ = res; + _tmp7_ = res; #line 321 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _vala_assert (_tmp8_ == SQLITE_OK, "res == Sqlite.OK"); -#line 323 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp9_ = stmt; + _vala_assert (_tmp7_ == SQLITE_OK, "res == Sqlite.OK"); #line 323 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp10_ = sqlite3_step (_tmp9_); + _tmp8_ = stmt; #line 323 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - res = _tmp10_; + res = sqlite3_step (_tmp8_); #line 324 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp11_ = res; + _tmp9_ = res; #line 324 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - if (_tmp11_ != SQLITE_DONE) { -#line 2505 "VideoTable.c" - gint _tmp12_; + if (_tmp9_ != SQLITE_DONE) { +#line 2444 "VideoTable.c" + gint _tmp10_; #line 325 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp12_ = res; + _tmp10_ = res; #line 325 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - database_table_throw_error ("VideoTable.remove", _tmp12_, &_inner_error_); + database_table_throw_error ("VideoTable.remove", _tmp10_, &_inner_error_); #line 325 "/home/jens/Source/shotwell/src/db/VideoTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 325 "/home/jens/Source/shotwell/src/db/VideoTable.vala" @@ -2523,7 +2462,7 @@ void video_table_remove (VideoTable* self, VideoID* videoID, GError** error) { _sqlite3_finalize0 (stmt); #line 325 "/home/jens/Source/shotwell/src/db/VideoTable.vala" return; -#line 2521 "VideoTable.c" +#line 2460 "VideoTable.c" } else { #line 325 "/home/jens/Source/shotwell/src/db/VideoTable.vala" _sqlite3_finalize0 (stmt); @@ -2533,40 +2472,41 @@ void video_table_remove (VideoTable* self, VideoID* videoID, GError** error) { g_clear_error (&_inner_error_); #line 325 "/home/jens/Source/shotwell/src/db/VideoTable.vala" return; -#line 2531 "VideoTable.c" +#line 2470 "VideoTable.c" } } } #line 315 "/home/jens/Source/shotwell/src/db/VideoTable.vala" _sqlite3_finalize0 (stmt); -#line 2537 "VideoTable.c" +#line 2476 "VideoTable.c" } -gboolean video_table_is_video_stored (VideoTable* self, GFile* file) { +gboolean +video_table_is_video_stored (VideoTable* self, + GFile* file) +{ gboolean result = FALSE; - GFile* _tmp0_; - VideoID _tmp1_ = {0}; - gboolean _tmp2_; + VideoID _tmp0_ = {0}; #line 328 "/home/jens/Source/shotwell/src/db/VideoTable.vala" g_return_val_if_fail (IS_VIDEO_TABLE (self), FALSE); #line 328 "/home/jens/Source/shotwell/src/db/VideoTable.vala" g_return_val_if_fail (G_IS_FILE (file), FALSE); #line 329 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp0_ = file; -#line 329 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - video_table_get_id (self, _tmp0_, &_tmp1_); + video_table_get_id (self, file, &_tmp0_); #line 329 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp2_ = video_id_is_valid (&_tmp1_); -#line 329 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - result = _tmp2_; + result = video_id_is_valid (&_tmp0_); #line 329 "/home/jens/Source/shotwell/src/db/VideoTable.vala" return result; -#line 2560 "VideoTable.c" +#line 2496 "VideoTable.c" } -void video_table_get_id (VideoTable* self, GFile* file, VideoID* result) { +void +video_table_get_id (VideoTable* self, + GFile* file, + VideoID* result) +{ sqlite3_stmt* stmt = NULL; gint res = 0; sqlite3* _tmp0_; @@ -2574,15 +2514,12 @@ void video_table_get_id (VideoTable* self, GFile* file, VideoID* result) { gint _tmp2_; gint _tmp3_; sqlite3_stmt* _tmp4_; - GFile* _tmp5_; - gchar* _tmp6_; - GDestroyNotify _tmp7_; - gint _tmp8_; - gint _tmp9_; - sqlite3_stmt* _tmp10_; - gint _tmp11_; - VideoID _tmp12_ = {0}; - gint _tmp13_; + gchar* _tmp5_; + GDestroyNotify _tmp6_; + gint _tmp7_; + sqlite3_stmt* _tmp8_; + VideoID _tmp9_ = {0}; + gint _tmp10_; #line 332 "/home/jens/Source/shotwell/src/db/VideoTable.vala" g_return_if_fail (IS_VIDEO_TABLE (self)); #line 332 "/home/jens/Source/shotwell/src/db/VideoTable.vala" @@ -2604,55 +2541,49 @@ void video_table_get_id (VideoTable* self, GFile* file, VideoID* result) { #line 337 "/home/jens/Source/shotwell/src/db/VideoTable.vala" _tmp4_ = stmt; #line 337 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp5_ = file; -#line 337 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp6_ = g_file_get_path (_tmp5_); -#line 337 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp7_ = g_free; + _tmp5_ = g_file_get_path (file); #line 337 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp8_ = sqlite3_bind_text (_tmp4_, 1, _tmp6_, -1, _tmp7_); + _tmp6_ = g_free; #line 337 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - res = _tmp8_; + res = sqlite3_bind_text (_tmp4_, 1, _tmp5_, -1, _tmp6_); #line 338 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp9_ = res; + _tmp7_ = res; #line 338 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _vala_assert (_tmp9_ == SQLITE_OK, "res == Sqlite.OK"); + _vala_assert (_tmp7_ == SQLITE_OK, "res == Sqlite.OK"); #line 340 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp10_ = stmt; -#line 340 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp11_ = sqlite3_step (_tmp10_); + _tmp8_ = stmt; #line 340 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - res = _tmp11_; + res = sqlite3_step (_tmp8_); #line 342 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp13_ = res; + _tmp10_ = res; #line 342 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - if (_tmp13_ == SQLITE_ROW) { -#line 2625 "VideoTable.c" - sqlite3_stmt* _tmp14_; - gint64 _tmp15_; -#line 342 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp14_ = stmt; + if (_tmp10_ == SQLITE_ROW) { +#line 2556 "VideoTable.c" + sqlite3_stmt* _tmp11_; #line 342 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp15_ = sqlite3_column_int64 (_tmp14_, 0); + _tmp11_ = stmt; #line 342 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - video_id_init (&_tmp12_, _tmp15_); -#line 2634 "VideoTable.c" + video_id_init (&_tmp9_, sqlite3_column_int64 (_tmp11_, 0)); +#line 2562 "VideoTable.c" } else { #line 342 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - video_id_init (&_tmp12_, VIDEO_ID_INVALID); -#line 2638 "VideoTable.c" + video_id_init (&_tmp9_, VIDEO_ID_INVALID); +#line 2566 "VideoTable.c" } #line 342 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - *result = _tmp12_; + *result = _tmp9_; #line 342 "/home/jens/Source/shotwell/src/db/VideoTable.vala" _sqlite3_finalize0 (stmt); #line 342 "/home/jens/Source/shotwell/src/db/VideoTable.vala" return; -#line 2646 "VideoTable.c" +#line 2574 "VideoTable.c" } -GeeArrayList* video_table_get_videos (VideoTable* self, GError** error) { +GeeArrayList* +video_table_get_videos (VideoTable* self, + GError** error) +{ GeeArrayList* result = NULL; sqlite3_stmt* stmt = NULL; gint res = 0; @@ -2683,52 +2614,48 @@ GeeArrayList* video_table_get_videos (VideoTable* self, GError** error) { _tmp4_ = gee_array_list_new (TYPE_VIDEO_ID, (GBoxedCopyFunc) video_id_dup, (GDestroyNotify) video_id_free, NULL, NULL, NULL); #line 350 "/home/jens/Source/shotwell/src/db/VideoTable.vala" video_ids = _tmp4_; -#line 2681 "VideoTable.c" +#line 2612 "VideoTable.c" { gboolean _tmp5_ = FALSE; #line 351 "/home/jens/Source/shotwell/src/db/VideoTable.vala" _tmp5_ = TRUE; #line 351 "/home/jens/Source/shotwell/src/db/VideoTable.vala" while (TRUE) { -#line 2688 "VideoTable.c" +#line 2619 "VideoTable.c" sqlite3_stmt* _tmp6_; gint _tmp7_; - gint _tmp8_; - GeeArrayList* _tmp11_; - sqlite3_stmt* _tmp12_; - gint64 _tmp13_; - VideoID _tmp14_ = {0}; + GeeArrayList* _tmp10_; + sqlite3_stmt* _tmp11_; + VideoID _tmp12_ = {0}; #line 351 "/home/jens/Source/shotwell/src/db/VideoTable.vala" if (!_tmp5_) { -#line 2698 "VideoTable.c" +#line 2627 "VideoTable.c" } #line 351 "/home/jens/Source/shotwell/src/db/VideoTable.vala" _tmp5_ = FALSE; #line 352 "/home/jens/Source/shotwell/src/db/VideoTable.vala" _tmp6_ = stmt; #line 352 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp7_ = sqlite3_step (_tmp6_); -#line 352 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - res = _tmp7_; + res = sqlite3_step (_tmp6_); #line 353 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp8_ = res; + _tmp7_ = res; #line 353 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - if (_tmp8_ == SQLITE_DONE) { + if (_tmp7_ == SQLITE_DONE) { #line 354 "/home/jens/Source/shotwell/src/db/VideoTable.vala" break; -#line 2714 "VideoTable.c" +#line 2641 "VideoTable.c" } else { - gint _tmp9_; + gint _tmp8_; #line 355 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp9_ = res; + _tmp8_ = res; #line 355 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - if (_tmp9_ != SQLITE_ROW) { -#line 2721 "VideoTable.c" - gint _tmp10_; + if (_tmp8_ != SQLITE_ROW) { +#line 2648 "VideoTable.c" + gint _tmp9_; #line 356 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp10_ = res; + _tmp9_ = res; #line 356 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - database_table_throw_error ("VideoTable.get_videos", _tmp10_, &_inner_error_); + database_table_throw_error ("VideoTable.get_videos", _tmp9_, &_inner_error_); #line 356 "/home/jens/Source/shotwell/src/db/VideoTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 356 "/home/jens/Source/shotwell/src/db/VideoTable.vala" @@ -2741,7 +2668,7 @@ GeeArrayList* video_table_get_videos (VideoTable* self, GError** error) { _sqlite3_finalize0 (stmt); #line 356 "/home/jens/Source/shotwell/src/db/VideoTable.vala" return NULL; -#line 2739 "VideoTable.c" +#line 2666 "VideoTable.c" } else { #line 356 "/home/jens/Source/shotwell/src/db/VideoTable.vala" _g_object_unref0 (video_ids); @@ -2753,22 +2680,20 @@ GeeArrayList* video_table_get_videos (VideoTable* self, GError** error) { g_clear_error (&_inner_error_); #line 356 "/home/jens/Source/shotwell/src/db/VideoTable.vala" return NULL; -#line 2751 "VideoTable.c" +#line 2678 "VideoTable.c" } } } } #line 359 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp11_ = video_ids; -#line 359 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp12_ = stmt; + _tmp10_ = video_ids; #line 359 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp13_ = sqlite3_column_int64 (_tmp12_, 0); + _tmp11_ = stmt; #line 359 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - video_id_init (&_tmp14_, _tmp13_); + video_id_init (&_tmp12_, sqlite3_column_int64 (_tmp11_, 0)); #line 359 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), &_tmp14_); -#line 2766 "VideoTable.c" + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), &_tmp12_); +#line 2691 "VideoTable.c" } } #line 362 "/home/jens/Source/shotwell/src/db/VideoTable.vala" @@ -2777,195 +2702,169 @@ GeeArrayList* video_table_get_videos (VideoTable* self, GError** error) { _sqlite3_finalize0 (stmt); #line 362 "/home/jens/Source/shotwell/src/db/VideoTable.vala" return result; -#line 2775 "VideoTable.c" +#line 2700 "VideoTable.c" } -static sqlite3_stmt* video_table_get_duplicate_stmt (VideoTable* self, GFile* file, const gchar* md5) { +static sqlite3_stmt* +video_table_get_duplicate_stmt (VideoTable* self, + GFile* file, + const gchar* md5) +{ sqlite3_stmt* result = NULL; gboolean _tmp0_ = FALSE; - GFile* _tmp1_; gchar* sql = NULL; - gchar* _tmp3_; + gchar* _tmp1_; gboolean first = FALSE; - GFile* _tmp4_; - const gchar* _tmp7_; sqlite3_stmt* stmt = NULL; gint res = 0; - sqlite3* _tmp13_; - const gchar* _tmp14_; - sqlite3_stmt* _tmp15_ = NULL; - gint _tmp16_; - gint _tmp17_; + sqlite3* _tmp9_; + const gchar* _tmp10_; + sqlite3_stmt* _tmp11_ = NULL; + gint _tmp12_; + gint _tmp13_; gint col = 0; - GFile* _tmp18_; - const gchar* _tmp26_; #line 365 "/home/jens/Source/shotwell/src/db/VideoTable.vala" g_return_val_if_fail (IS_VIDEO_TABLE (self), NULL); #line 365 "/home/jens/Source/shotwell/src/db/VideoTable.vala" g_return_val_if_fail ((file == NULL) || G_IS_FILE (file), NULL); #line 366 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp1_ = file; -#line 366 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - if (_tmp1_ != NULL) { + if (file != NULL) { #line 366 "/home/jens/Source/shotwell/src/db/VideoTable.vala" _tmp0_ = TRUE; -#line 2808 "VideoTable.c" +#line 2730 "VideoTable.c" } else { - const gchar* _tmp2_; -#line 366 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp2_ = md5; #line 366 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp0_ = _tmp2_ != NULL; -#line 2815 "VideoTable.c" + _tmp0_ = md5 != NULL; +#line 2734 "VideoTable.c" } #line 366 "/home/jens/Source/shotwell/src/db/VideoTable.vala" _vala_assert (_tmp0_, "file != null || md5 != null"); #line 368 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp3_ = g_strdup ("SELECT id FROM VideoTable WHERE"); + _tmp1_ = g_strdup ("SELECT id FROM VideoTable WHERE"); #line 368 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - sql = _tmp3_; + sql = _tmp1_; #line 369 "/home/jens/Source/shotwell/src/db/VideoTable.vala" first = TRUE; #line 371 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp4_ = file; -#line 371 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - if (_tmp4_ != NULL) { -#line 2829 "VideoTable.c" - const gchar* _tmp5_; - gchar* _tmp6_; + if (file != NULL) { +#line 2746 "VideoTable.c" + const gchar* _tmp2_; + gchar* _tmp3_; #line 372 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp5_ = sql; + _tmp2_ = sql; #line 372 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp6_ = g_strconcat (_tmp5_, " filename=?", NULL); + _tmp3_ = g_strconcat (_tmp2_, " filename=?", NULL); #line 372 "/home/jens/Source/shotwell/src/db/VideoTable.vala" _g_free0 (sql); #line 372 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - sql = _tmp6_; + sql = _tmp3_; #line 373 "/home/jens/Source/shotwell/src/db/VideoTable.vala" first = FALSE; -#line 2842 "VideoTable.c" +#line 2759 "VideoTable.c" } #line 376 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp7_ = md5; -#line 376 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - if (_tmp7_ != NULL) { -#line 2848 "VideoTable.c" - gboolean _tmp8_; - const gchar* _tmp11_; - gchar* _tmp12_; + if (md5 != NULL) { +#line 2763 "VideoTable.c" + gboolean _tmp4_; + const gchar* _tmp7_; + gchar* _tmp8_; #line 377 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp8_ = first; + _tmp4_ = first; #line 377 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - if (!_tmp8_) { -#line 2856 "VideoTable.c" - const gchar* _tmp9_; - gchar* _tmp10_; + if (!_tmp4_) { +#line 2771 "VideoTable.c" + const gchar* _tmp5_; + gchar* _tmp6_; #line 378 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp9_ = sql; + _tmp5_ = sql; #line 378 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp10_ = g_strconcat (_tmp9_, " OR ", NULL); + _tmp6_ = g_strconcat (_tmp5_, " OR ", NULL); #line 378 "/home/jens/Source/shotwell/src/db/VideoTable.vala" _g_free0 (sql); #line 378 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - sql = _tmp10_; -#line 2867 "VideoTable.c" + sql = _tmp6_; +#line 2782 "VideoTable.c" } #line 380 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp11_ = sql; + _tmp7_ = sql; #line 380 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp12_ = g_strconcat (_tmp11_, " md5=?", NULL); + _tmp8_ = g_strconcat (_tmp7_, " md5=?", NULL); #line 380 "/home/jens/Source/shotwell/src/db/VideoTable.vala" _g_free0 (sql); #line 380 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - sql = _tmp12_; -#line 2877 "VideoTable.c" + sql = _tmp8_; +#line 2792 "VideoTable.c" } #line 384 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp13_ = database_table_db; + _tmp9_ = database_table_db; #line 384 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp14_ = sql; + _tmp10_ = sql; #line 384 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp16_ = sqlite3_prepare_v2 (_tmp13_, _tmp14_, -1, &_tmp15_, NULL); + _tmp12_ = sqlite3_prepare_v2 (_tmp9_, _tmp10_, -1, &_tmp11_, NULL); #line 384 "/home/jens/Source/shotwell/src/db/VideoTable.vala" _sqlite3_finalize0 (stmt); #line 384 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - stmt = _tmp15_; + stmt = _tmp11_; #line 384 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - res = _tmp16_; + res = _tmp12_; #line 385 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp17_ = res; + _tmp13_ = res; #line 385 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _vala_assert (_tmp17_ == SQLITE_OK, "res == Sqlite.OK"); + _vala_assert (_tmp13_ == SQLITE_OK, "res == Sqlite.OK"); #line 387 "/home/jens/Source/shotwell/src/db/VideoTable.vala" col = 1; #line 389 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp18_ = file; -#line 389 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - if (_tmp18_ != NULL) { -#line 2901 "VideoTable.c" - sqlite3_stmt* _tmp19_; - gint _tmp20_; - GFile* _tmp21_; - gchar* _tmp22_; - GDestroyNotify _tmp23_; - gint _tmp24_; - gint _tmp25_; -#line 390 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp19_ = stmt; -#line 390 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp20_ = col; + if (file != NULL) { +#line 2814 "VideoTable.c" + sqlite3_stmt* _tmp14_; + gint _tmp15_; + gchar* _tmp16_; + GDestroyNotify _tmp17_; + gint _tmp18_; #line 390 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - col = _tmp20_ + 1; + _tmp14_ = stmt; #line 390 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp21_ = file; + _tmp15_ = col; #line 390 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp22_ = g_file_get_path (_tmp21_); + col = _tmp15_ + 1; #line 390 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp23_ = g_free; + _tmp16_ = g_file_get_path (file); #line 390 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp24_ = sqlite3_bind_text (_tmp19_, _tmp20_, _tmp22_, -1, _tmp23_); + _tmp17_ = g_free; #line 390 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - res = _tmp24_; + res = sqlite3_bind_text (_tmp14_, _tmp15_, _tmp16_, -1, _tmp17_); #line 391 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp25_ = res; + _tmp18_ = res; #line 391 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _vala_assert (_tmp25_ == SQLITE_OK, "res == Sqlite.OK"); -#line 2929 "VideoTable.c" + _vala_assert (_tmp18_ == SQLITE_OK, "res == Sqlite.OK"); +#line 2836 "VideoTable.c" } #line 394 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp26_ = md5; -#line 394 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - if (_tmp26_ != NULL) { -#line 2935 "VideoTable.c" - sqlite3_stmt* _tmp27_; - gint _tmp28_; - const gchar* _tmp29_; - gchar* _tmp30_; - GDestroyNotify _tmp31_; - gint _tmp32_; - gint _tmp33_; -#line 395 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp27_ = stmt; -#line 395 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp28_ = col; + if (md5 != NULL) { +#line 2840 "VideoTable.c" + sqlite3_stmt* _tmp19_; + gint _tmp20_; + gchar* _tmp21_; + GDestroyNotify _tmp22_; + gint _tmp23_; #line 395 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - col = _tmp28_ + 1; + _tmp19_ = stmt; #line 395 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp29_ = md5; + _tmp20_ = col; #line 395 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp30_ = g_strdup (_tmp29_); + col = _tmp20_ + 1; #line 395 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp31_ = g_free; + _tmp21_ = g_strdup (md5); #line 395 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp32_ = sqlite3_bind_text (_tmp27_, _tmp28_, _tmp30_, -1, _tmp31_); + _tmp22_ = g_free; #line 395 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - res = _tmp32_; + res = sqlite3_bind_text (_tmp19_, _tmp20_, _tmp21_, -1, _tmp22_); #line 396 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp33_ = res; + _tmp23_ = res; #line 396 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _vala_assert (_tmp33_ == SQLITE_OK, "res == Sqlite.OK"); -#line 2963 "VideoTable.c" + _vala_assert (_tmp23_ == SQLITE_OK, "res == Sqlite.OK"); +#line 2862 "VideoTable.c" } #line 399 "/home/jens/Source/shotwell/src/db/VideoTable.vala" result = stmt; @@ -2973,69 +2872,64 @@ static sqlite3_stmt* video_table_get_duplicate_stmt (VideoTable* self, GFile* fi _g_free0 (sql); #line 399 "/home/jens/Source/shotwell/src/db/VideoTable.vala" return result; -#line 2971 "VideoTable.c" +#line 2870 "VideoTable.c" } -gboolean video_table_has_duplicate (VideoTable* self, GFile* file, const gchar* md5) { +gboolean +video_table_has_duplicate (VideoTable* self, + GFile* file, + const gchar* md5) +{ gboolean result = FALSE; sqlite3_stmt* stmt = NULL; - GFile* _tmp0_; - const gchar* _tmp1_; - sqlite3_stmt* _tmp2_; + sqlite3_stmt* _tmp0_; gint res = 0; - sqlite3_stmt* _tmp3_; - gint _tmp4_; - gint _tmp5_; + sqlite3_stmt* _tmp1_; + gint _tmp2_; #line 402 "/home/jens/Source/shotwell/src/db/VideoTable.vala" g_return_val_if_fail (IS_VIDEO_TABLE (self), FALSE); #line 402 "/home/jens/Source/shotwell/src/db/VideoTable.vala" g_return_val_if_fail ((file == NULL) || G_IS_FILE (file), FALSE); #line 403 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp0_ = file; -#line 403 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp1_ = md5; + _tmp0_ = video_table_get_duplicate_stmt (self, file, md5); #line 403 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp2_ = video_table_get_duplicate_stmt (self, _tmp0_, _tmp1_); -#line 403 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - stmt = _tmp2_; -#line 404 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp3_ = stmt; + stmt = _tmp0_; #line 404 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp4_ = sqlite3_step (_tmp3_); + _tmp1_ = stmt; #line 404 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - res = _tmp4_; + res = sqlite3_step (_tmp1_); #line 406 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp5_ = res; + _tmp2_ = res; #line 406 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - if (_tmp5_ == SQLITE_DONE) { + if (_tmp2_ == SQLITE_DONE) { #line 408 "/home/jens/Source/shotwell/src/db/VideoTable.vala" result = FALSE; #line 408 "/home/jens/Source/shotwell/src/db/VideoTable.vala" _sqlite3_finalize0 (stmt); #line 408 "/home/jens/Source/shotwell/src/db/VideoTable.vala" return result; -#line 3013 "VideoTable.c" +#line 2907 "VideoTable.c" } else { - gint _tmp6_; + gint _tmp3_; #line 409 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp6_ = res; + _tmp3_ = res; #line 409 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - if (_tmp6_ == SQLITE_ROW) { + if (_tmp3_ == SQLITE_ROW) { #line 411 "/home/jens/Source/shotwell/src/db/VideoTable.vala" result = TRUE; #line 411 "/home/jens/Source/shotwell/src/db/VideoTable.vala" _sqlite3_finalize0 (stmt); #line 411 "/home/jens/Source/shotwell/src/db/VideoTable.vala" return result; -#line 3026 "VideoTable.c" +#line 2920 "VideoTable.c" } else { - gint _tmp7_; + gint _tmp4_; #line 413 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp7_ = res; + _tmp4_ = res; #line 413 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - database_table_fatal ("VideoTable.has_duplicate", _tmp7_); -#line 3033 "VideoTable.c" + database_table_fatal ("VideoTable.has_duplicate", _tmp4_); +#line 2927 "VideoTable.c" } } #line 416 "/home/jens/Source/shotwell/src/db/VideoTable.vala" @@ -3044,126 +2938,124 @@ gboolean video_table_has_duplicate (VideoTable* self, GFile* file, const gchar* _sqlite3_finalize0 (stmt); #line 416 "/home/jens/Source/shotwell/src/db/VideoTable.vala" return result; -#line 3042 "VideoTable.c" +#line 2936 "VideoTable.c" } -static void _vala_array_add3 (VideoID* * array, int* length, int* size, const VideoID* value) { +static void +_vala_array_add3 (VideoID* * array, + int* length, + int* size, + const VideoID* value) +{ #line 426 "/home/jens/Source/shotwell/src/db/VideoTable.vala" if ((*length) == (*size)) { #line 426 "/home/jens/Source/shotwell/src/db/VideoTable.vala" *size = (*size) ? (2 * (*size)) : 4; #line 426 "/home/jens/Source/shotwell/src/db/VideoTable.vala" *array = g_renew (VideoID, *array, *size); -#line 3053 "VideoTable.c" +#line 2952 "VideoTable.c" } #line 426 "/home/jens/Source/shotwell/src/db/VideoTable.vala" (*array)[(*length)++] = *value; -#line 3057 "VideoTable.c" +#line 2956 "VideoTable.c" } -VideoID* video_table_get_duplicate_ids (VideoTable* self, GFile* file, const gchar* md5, int* result_length1) { +VideoID* +video_table_get_duplicate_ids (VideoTable* self, + GFile* file, + const gchar* md5, + int* result_length1) +{ VideoID* result = NULL; sqlite3_stmt* stmt = NULL; - GFile* _tmp0_; - const gchar* _tmp1_; - sqlite3_stmt* _tmp2_; + sqlite3_stmt* _tmp0_; VideoID* ids = NULL; - VideoID* _tmp3_; + VideoID* _tmp1_; gint ids_length1; gint _ids_size_; gint res = 0; - sqlite3_stmt* _tmp4_; - gint _tmp5_; - VideoID* _tmp13_; - gint _tmp13__length1; + sqlite3_stmt* _tmp2_; + VideoID* _tmp8_; + gint _tmp8__length1; #line 419 "/home/jens/Source/shotwell/src/db/VideoTable.vala" g_return_val_if_fail (IS_VIDEO_TABLE (self), NULL); #line 419 "/home/jens/Source/shotwell/src/db/VideoTable.vala" g_return_val_if_fail ((file == NULL) || G_IS_FILE (file), NULL); #line 420 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp0_ = file; -#line 420 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp1_ = md5; -#line 420 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp2_ = video_table_get_duplicate_stmt (self, _tmp0_, _tmp1_); + _tmp0_ = video_table_get_duplicate_stmt (self, file, md5); #line 420 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - stmt = _tmp2_; + stmt = _tmp0_; #line 422 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp3_ = g_new0 (VideoID, 0); + _tmp1_ = g_new0 (VideoID, 0); #line 422 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - ids = _tmp3_; + ids = _tmp1_; #line 422 "/home/jens/Source/shotwell/src/db/VideoTable.vala" ids_length1 = 0; #line 422 "/home/jens/Source/shotwell/src/db/VideoTable.vala" _ids_size_ = ids_length1; #line 424 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp4_ = stmt; -#line 424 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp5_ = sqlite3_step (_tmp4_); + _tmp2_ = stmt; #line 424 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - res = _tmp5_; + res = sqlite3_step (_tmp2_); #line 425 "/home/jens/Source/shotwell/src/db/VideoTable.vala" while (TRUE) { -#line 3104 "VideoTable.c" - gint _tmp6_; - VideoID* _tmp7_; - gint _tmp7__length1; - sqlite3_stmt* _tmp8_; - gint64 _tmp9_; - VideoID _tmp10_ = {0}; - sqlite3_stmt* _tmp11_; - gint _tmp12_; +#line 2999 "VideoTable.c" + gint _tmp3_; + VideoID* _tmp4_; + gint _tmp4__length1; + sqlite3_stmt* _tmp5_; + VideoID _tmp6_ = {0}; + sqlite3_stmt* _tmp7_; #line 425 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp6_ = res; + _tmp3_ = res; #line 425 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - if (!(_tmp6_ == SQLITE_ROW)) { + if (!(_tmp3_ == SQLITE_ROW)) { #line 425 "/home/jens/Source/shotwell/src/db/VideoTable.vala" break; -#line 3119 "VideoTable.c" +#line 3012 "VideoTable.c" } #line 426 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp7_ = ids; -#line 426 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp7__length1 = ids_length1; + _tmp4_ = ids; #line 426 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp8_ = stmt; + _tmp4__length1 = ids_length1; #line 426 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp9_ = sqlite3_column_int64 (_tmp8_, 0); + _tmp5_ = stmt; #line 426 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - video_id_init (&_tmp10_, _tmp9_); + video_id_init (&_tmp6_, sqlite3_column_int64 (_tmp5_, 0)); #line 426 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _vala_array_add3 (&ids, &ids_length1, &_ids_size_, &_tmp10_); + _vala_array_add3 (&ids, &ids_length1, &_ids_size_, &_tmp6_); #line 427 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp11_ = stmt; -#line 427 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp12_ = sqlite3_step (_tmp11_); + _tmp7_ = stmt; #line 427 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - res = _tmp12_; -#line 3139 "VideoTable.c" + res = sqlite3_step (_tmp7_); +#line 3028 "VideoTable.c" } #line 430 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp13_ = ids; + _tmp8_ = ids; #line 430 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp13__length1 = ids_length1; + _tmp8__length1 = ids_length1; #line 430 "/home/jens/Source/shotwell/src/db/VideoTable.vala" if (result_length1) { #line 430 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - *result_length1 = _tmp13__length1; -#line 3149 "VideoTable.c" + *result_length1 = _tmp8__length1; +#line 3038 "VideoTable.c" } #line 430 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - result = _tmp13_; + result = _tmp8_; #line 430 "/home/jens/Source/shotwell/src/db/VideoTable.vala" _sqlite3_finalize0 (stmt); #line 430 "/home/jens/Source/shotwell/src/db/VideoTable.vala" return result; -#line 3157 "VideoTable.c" +#line 3046 "VideoTable.c" } -GeeArrayList* video_table_get_event_source_ids (VideoTable* self, EventID* event_id) { +GeeArrayList* +video_table_get_event_source_ids (VideoTable* self, + EventID* event_id) +{ GeeArrayList* result = NULL; sqlite3_stmt* stmt = NULL; gint res = 0; @@ -3175,9 +3067,8 @@ GeeArrayList* video_table_get_event_source_ids (VideoTable* self, EventID* event EventID _tmp5_; gint64 _tmp6_; gint _tmp7_; - gint _tmp8_; GeeArrayList* _result_ = NULL; - GeeArrayList* _tmp9_; + GeeArrayList* _tmp8_; #line 433 "/home/jens/Source/shotwell/src/db/VideoTable.vala" g_return_val_if_fail (IS_VIDEO_TABLE (self), NULL); #line 433 "/home/jens/Source/shotwell/src/db/VideoTable.vala" @@ -3203,87 +3094,79 @@ GeeArrayList* video_table_get_event_source_ids (VideoTable* self, EventID* event #line 438 "/home/jens/Source/shotwell/src/db/VideoTable.vala" _tmp6_ = _tmp5_.id; #line 438 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp7_ = sqlite3_bind_int64 (_tmp4_, 1, _tmp6_); -#line 438 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - res = _tmp7_; + res = sqlite3_bind_int64 (_tmp4_, 1, _tmp6_); #line 439 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp8_ = res; + _tmp7_ = res; #line 439 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _vala_assert (_tmp8_ == SQLITE_OK, "res == Sqlite.OK"); + _vala_assert (_tmp7_ == SQLITE_OK, "res == Sqlite.OK"); #line 441 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp9_ = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL); + _tmp8_ = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL); #line 441 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _result_ = _tmp9_; -#line 3212 "VideoTable.c" + _result_ = _tmp8_; +#line 3101 "VideoTable.c" { - gboolean _tmp10_ = FALSE; + gboolean _tmp9_ = FALSE; #line 442 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp10_ = TRUE; + _tmp9_ = TRUE; #line 442 "/home/jens/Source/shotwell/src/db/VideoTable.vala" while (TRUE) { -#line 3219 "VideoTable.c" - sqlite3_stmt* _tmp11_; - gint _tmp12_; - gint _tmp13_; - GeeArrayList* _tmp16_; - sqlite3_stmt* _tmp17_; - gint64 _tmp18_; - VideoID _tmp19_ = {0}; - gchar* _tmp20_; - gchar* _tmp21_; +#line 3108 "VideoTable.c" + sqlite3_stmt* _tmp10_; + gint _tmp11_; + GeeArrayList* _tmp14_; + sqlite3_stmt* _tmp15_; + VideoID _tmp16_ = {0}; + gchar* _tmp17_; + gchar* _tmp18_; #line 442 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - if (!_tmp10_) { -#line 3231 "VideoTable.c" + if (!_tmp9_) { +#line 3118 "VideoTable.c" } #line 442 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp10_ = FALSE; + _tmp9_ = FALSE; #line 443 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp11_ = stmt; -#line 443 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp12_ = sqlite3_step (_tmp11_); + _tmp10_ = stmt; #line 443 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - res = _tmp12_; + res = sqlite3_step (_tmp10_); #line 444 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp13_ = res; + _tmp11_ = res; #line 444 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - if (_tmp13_ == SQLITE_DONE) { + if (_tmp11_ == SQLITE_DONE) { #line 445 "/home/jens/Source/shotwell/src/db/VideoTable.vala" break; -#line 3247 "VideoTable.c" +#line 3132 "VideoTable.c" } else { - gint _tmp14_; + gint _tmp12_; #line 446 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp14_ = res; + _tmp12_ = res; #line 446 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - if (_tmp14_ != SQLITE_ROW) { -#line 3254 "VideoTable.c" - gint _tmp15_; + if (_tmp12_ != SQLITE_ROW) { +#line 3139 "VideoTable.c" + gint _tmp13_; #line 447 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp15_ = res; + _tmp13_ = res; #line 447 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - database_table_fatal ("get_event_source_ids", _tmp15_); + database_table_fatal ("get_event_source_ids", _tmp13_); #line 449 "/home/jens/Source/shotwell/src/db/VideoTable.vala" break; -#line 3262 "VideoTable.c" +#line 3147 "VideoTable.c" } } #line 452 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp16_ = _result_; + _tmp14_ = _result_; #line 452 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp17_ = stmt; + _tmp15_ = stmt; #line 452 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp18_ = sqlite3_column_int64 (_tmp17_, 0); + video_id_init (&_tmp16_, sqlite3_column_int64 (_tmp15_, 0)); #line 452 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - video_id_init (&_tmp19_, _tmp18_); + _tmp17_ = video_id_upgrade_video_id_to_source_id (&_tmp16_); #line 452 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp20_ = video_id_upgrade_video_id_to_source_id (&_tmp19_); + _tmp18_ = _tmp17_; #line 452 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp21_ = _tmp20_; + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp18_); #line 452 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp21_); -#line 452 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _g_free0 (_tmp21_); -#line 3281 "VideoTable.c" + _g_free0 (_tmp18_); +#line 3164 "VideoTable.c" } } #line 455 "/home/jens/Source/shotwell/src/db/VideoTable.vala" @@ -3292,14 +3175,18 @@ GeeArrayList* video_table_get_event_source_ids (VideoTable* self, EventID* event _sqlite3_finalize0 (stmt); #line 455 "/home/jens/Source/shotwell/src/db/VideoTable.vala" return result; -#line 3290 "VideoTable.c" +#line 3173 "VideoTable.c" } -void video_table_set_timestamp (VideoTable* self, VideoID* video_id, time_t timestamp, GError** error) { +void +video_table_set_timestamp (VideoTable* self, + VideoID* video_id, + time_t timestamp, + GError** error) +{ VideoID _tmp0_; gint64 _tmp1_; - time_t _tmp2_; GError * _inner_error_ = NULL; #line 458 "/home/jens/Source/shotwell/src/db/VideoTable.vala" g_return_if_fail (IS_VIDEO_TABLE (self)); @@ -3310,9 +3197,7 @@ void video_table_set_timestamp (VideoTable* self, VideoID* video_id, time_t time #line 459 "/home/jens/Source/shotwell/src/db/VideoTable.vala" _tmp1_ = _tmp0_.id; #line 459 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - _tmp2_ = timestamp; -#line 459 "/home/jens/Source/shotwell/src/db/VideoTable.vala" - database_table_update_int64_by_id_2 (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp1_, "timestamp", (gint64) _tmp2_, &_inner_error_); + database_table_update_int64_by_id_2 (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp1_, "timestamp", (gint64) timestamp, &_inner_error_); #line 459 "/home/jens/Source/shotwell/src/db/VideoTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 459 "/home/jens/Source/shotwell/src/db/VideoTable.vala" @@ -3321,7 +3206,7 @@ void video_table_set_timestamp (VideoTable* self, VideoID* video_id, time_t time g_propagate_error (error, _inner_error_); #line 459 "/home/jens/Source/shotwell/src/db/VideoTable.vala" return; -#line 3319 "VideoTable.c" +#line 3204 "VideoTable.c" } else { #line 459 "/home/jens/Source/shotwell/src/db/VideoTable.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); @@ -3329,36 +3214,44 @@ void video_table_set_timestamp (VideoTable* self, VideoID* video_id, time_t time g_clear_error (&_inner_error_); #line 459 "/home/jens/Source/shotwell/src/db/VideoTable.vala" return; -#line 3327 "VideoTable.c" +#line 3212 "VideoTable.c" } } } -static void video_table_class_init (VideoTableClass * klass) { +static void +video_table_class_init (VideoTableClass * klass) +{ #line 59 "/home/jens/Source/shotwell/src/db/VideoTable.vala" video_table_parent_class = g_type_class_peek_parent (klass); #line 59 "/home/jens/Source/shotwell/src/db/VideoTable.vala" ((DatabaseTableClass *) klass)->finalize = video_table_finalize; -#line 3338 "VideoTable.c" +#line 3225 "VideoTable.c" } -static void video_table_instance_init (VideoTable * self) { +static void +video_table_instance_init (VideoTable * self) +{ } -static void video_table_finalize (DatabaseTable * obj) { +static void +video_table_finalize (DatabaseTable * obj) +{ VideoTable * self; #line 59 "/home/jens/Source/shotwell/src/db/VideoTable.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_VIDEO_TABLE, VideoTable); #line 59 "/home/jens/Source/shotwell/src/db/VideoTable.vala" DATABASE_TABLE_CLASS (video_table_parent_class)->finalize (obj); -#line 3352 "VideoTable.c" +#line 3243 "VideoTable.c" } -GType video_table_get_type (void) { +GType +video_table_get_type (void) +{ static volatile gsize video_table_type_id__volatile = 0; if (g_once_init_enter (&video_table_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (VideoTableClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) video_table_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (VideoTable), 0, (GInstanceInitFunc) video_table_instance_init, NULL }; |