From 49120f48474fc8fdc2448c75d961bc238213cfac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Tue, 1 May 2018 14:34:32 +0200 Subject: New upstream version 0.28.2 --- src/db/Db.c | 155 +++++----- src/db/Db.vala | 4 +- src/db/PhotoTable.c | 798 +++++++++++++++++++++++++--------------------------- 3 files changed, 469 insertions(+), 488 deletions(-) (limited to 'src/db') diff --git a/src/db/Db.c b/src/db/Db.c index 0695500..b5200cf 100644 --- a/src/db/Db.c +++ b/src/db/Db.c @@ -374,13 +374,14 @@ DbVerifyResult db_upgrade_database (gint input_version) { gint _tmp36_; gboolean _tmp37_; gboolean _tmp39_; - gboolean _tmp41_; - gint _tmp43_; - gint _tmp46_; - VersionTable* _tmp47_; + gboolean _tmp40_; + gboolean _tmp42_; + gint _tmp44_; + gint _tmp47_; VersionTable* _tmp48_; - gint _tmp49_; + VersionTable* _tmp49_; gint _tmp50_; + gint _tmp51_; #line 63 "/home/jens/Source/shotwell/src/db/Db.vala" _tmp0_ = input_version; #line 63 "/home/jens/Source/shotwell/src/db/Db.vala" @@ -397,7 +398,7 @@ DbVerifyResult db_upgrade_database (gint input_version) { result = DB_VERIFY_RESULT_NO_UPGRADE_AVAILABLE; #line 69 "/home/jens/Source/shotwell/src/db/Db.vala" return result; -#line 401 "Db.c" +#line 402 "Db.c" } #line 71 "/home/jens/Source/shotwell/src/db/Db.vala" _tmp3_ = version; @@ -407,7 +408,7 @@ DbVerifyResult db_upgrade_database (gint input_version) { _tmp4_ = database_table_has_column ("PhotoTable", "flags"); #line 83 "/home/jens/Source/shotwell/src/db/Db.vala" if (!_tmp4_) { -#line 411 "Db.c" +#line 412 "Db.c" gboolean _tmp5_; #line 84 "/home/jens/Source/shotwell/src/db/Db.vala" g_message ("Db.vala:84: upgrade_database: adding flags column to PhotoTable"); @@ -419,7 +420,7 @@ DbVerifyResult db_upgrade_database (gint input_version) { result = DB_VERIFY_RESULT_UPGRADE_ERROR; #line 86 "/home/jens/Source/shotwell/src/db/Db.vala" return result; -#line 423 "Db.c" +#line 424 "Db.c" } } #line 89 "/home/jens/Source/shotwell/src/db/Db.vala" @@ -428,7 +429,7 @@ DbVerifyResult db_upgrade_database (gint input_version) { _tmp6_ = database_table_has_column ("PhotoTable", "file_format"); #line 100 "/home/jens/Source/shotwell/src/db/Db.vala" if (!_tmp6_) { -#line 432 "Db.c" +#line 433 "Db.c" gboolean _tmp7_; #line 101 "/home/jens/Source/shotwell/src/db/Db.vala" g_message ("Db.vala:101: upgrade_database: adding file_format column to PhotoTable"); @@ -440,7 +441,7 @@ DbVerifyResult db_upgrade_database (gint input_version) { result = DB_VERIFY_RESULT_UPGRADE_ERROR; #line 103 "/home/jens/Source/shotwell/src/db/Db.vala" return result; -#line 444 "Db.c" +#line 445 "Db.c" } } #line 106 "/home/jens/Source/shotwell/src/db/Db.vala" @@ -449,7 +450,7 @@ DbVerifyResult db_upgrade_database (gint input_version) { _tmp8_ = database_table_has_column ("PhotoTable", "title"); #line 113 "/home/jens/Source/shotwell/src/db/Db.vala" if (!_tmp8_) { -#line 453 "Db.c" +#line 454 "Db.c" gboolean _tmp9_; #line 114 "/home/jens/Source/shotwell/src/db/Db.vala" g_message ("Db.vala:114: upgrade_database: adding title column to PhotoTable"); @@ -461,7 +462,7 @@ DbVerifyResult db_upgrade_database (gint input_version) { result = DB_VERIFY_RESULT_UPGRADE_ERROR; #line 116 "/home/jens/Source/shotwell/src/db/Db.vala" return result; -#line 465 "Db.c" +#line 466 "Db.c" } } #line 119 "/home/jens/Source/shotwell/src/db/Db.vala" @@ -470,7 +471,7 @@ DbVerifyResult db_upgrade_database (gint input_version) { _tmp10_ = database_table_has_column ("PhotoTable", "backlinks"); #line 126 "/home/jens/Source/shotwell/src/db/Db.vala" if (!_tmp10_) { -#line 474 "Db.c" +#line 475 "Db.c" gboolean _tmp11_; #line 127 "/home/jens/Source/shotwell/src/db/Db.vala" g_message ("Db.vala:127: upgrade_database: adding backlinks column to PhotoTable"); @@ -482,7 +483,7 @@ DbVerifyResult db_upgrade_database (gint input_version) { result = DB_VERIFY_RESULT_UPGRADE_ERROR; #line 129 "/home/jens/Source/shotwell/src/db/Db.vala" return result; -#line 486 "Db.c" +#line 487 "Db.c" } } #line 132 "/home/jens/Source/shotwell/src/db/Db.vala" @@ -491,7 +492,7 @@ DbVerifyResult db_upgrade_database (gint input_version) { _tmp12_ = database_table_has_column ("PhotoTable", "time_reimported"); #line 146 "/home/jens/Source/shotwell/src/db/Db.vala" if (!_tmp12_) { -#line 495 "Db.c" +#line 496 "Db.c" gboolean _tmp13_; #line 147 "/home/jens/Source/shotwell/src/db/Db.vala" g_message ("Db.vala:147: upgrade_database: adding time_reimported column to PhotoT" \ @@ -504,14 +505,14 @@ DbVerifyResult db_upgrade_database (gint input_version) { result = DB_VERIFY_RESULT_UPGRADE_ERROR; #line 149 "/home/jens/Source/shotwell/src/db/Db.vala" return result; -#line 507 "Db.c" +#line 508 "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 514 "Db.c" +#line 515 "Db.c" gboolean _tmp15_; #line 153 "/home/jens/Source/shotwell/src/db/Db.vala" g_message ("Db.vala:153: upgrade_database: adding editable_id column to PhotoTable"); @@ -523,7 +524,7 @@ DbVerifyResult db_upgrade_database (gint input_version) { result = DB_VERIFY_RESULT_UPGRADE_ERROR; #line 155 "/home/jens/Source/shotwell/src/db/Db.vala" return result; -#line 526 "Db.c" +#line 527 "Db.c" } } #line 158 "/home/jens/Source/shotwell/src/db/Db.vala" @@ -532,7 +533,7 @@ DbVerifyResult db_upgrade_database (gint input_version) { _tmp16_ = database_table_has_column ("PhotoTable", "rating"); #line 170 "/home/jens/Source/shotwell/src/db/Db.vala" if (!_tmp16_) { -#line 535 "Db.c" +#line 536 "Db.c" gboolean _tmp17_; #line 171 "/home/jens/Source/shotwell/src/db/Db.vala" g_message ("Db.vala:171: upgrade_database: adding rating column to PhotoTable"); @@ -544,14 +545,14 @@ DbVerifyResult db_upgrade_database (gint input_version) { result = DB_VERIFY_RESULT_UPGRADE_ERROR; #line 173 "/home/jens/Source/shotwell/src/db/Db.vala" return result; -#line 547 "Db.c" +#line 548 "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 554 "Db.c" +#line 555 "Db.c" gboolean _tmp19_; #line 183 "/home/jens/Source/shotwell/src/db/Db.vala" g_message ("Db.vala:183: upgrade_database: adding metadata_dirty column to PhotoTa" \ @@ -564,7 +565,7 @@ DbVerifyResult db_upgrade_database (gint input_version) { result = DB_VERIFY_RESULT_UPGRADE_ERROR; #line 185 "/home/jens/Source/shotwell/src/db/Db.vala" return result; -#line 566 "Db.c" +#line 567 "Db.c" } } #line 188 "/home/jens/Source/shotwell/src/db/Db.vala" @@ -573,21 +574,21 @@ DbVerifyResult db_upgrade_database (gint input_version) { _tmp21_ = database_table_has_table ("VideoTable"); #line 195 "/home/jens/Source/shotwell/src/db/Db.vala" if (_tmp21_) { -#line 575 "Db.c" +#line 576 "Db.c" gboolean _tmp22_; #line 195 "/home/jens/Source/shotwell/src/db/Db.vala" _tmp22_ = database_table_has_column ("VideoTable", "flags"); #line 195 "/home/jens/Source/shotwell/src/db/Db.vala" _tmp20_ = !_tmp22_; -#line 581 "Db.c" +#line 582 "Db.c" } else { #line 195 "/home/jens/Source/shotwell/src/db/Db.vala" _tmp20_ = FALSE; -#line 585 "Db.c" +#line 586 "Db.c" } #line 195 "/home/jens/Source/shotwell/src/db/Db.vala" if (_tmp20_) { -#line 589 "Db.c" +#line 590 "Db.c" gboolean _tmp23_; #line 196 "/home/jens/Source/shotwell/src/db/Db.vala" g_message ("Db.vala:196: upgrade_database: adding flags column to VideoTable"); @@ -599,7 +600,7 @@ DbVerifyResult db_upgrade_database (gint input_version) { result = DB_VERIFY_RESULT_UPGRADE_ERROR; #line 198 "/home/jens/Source/shotwell/src/db/Db.vala" return result; -#line 601 "Db.c" +#line 602 "Db.c" } } #line 201 "/home/jens/Source/shotwell/src/db/Db.vala" @@ -608,20 +609,20 @@ DbVerifyResult db_upgrade_database (gint input_version) { _tmp24_ = database_table_has_column ("EventTable", "primary_source_id"); #line 208 "/home/jens/Source/shotwell/src/db/Db.vala" if (!_tmp24_) { -#line 610 "Db.c" +#line 611 "Db.c" gboolean _tmp25_; #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", "INTEGER DEFAULT 0"); + _tmp25_ = database_table_add_column ("EventTable", "primary_source_id", "TEXT"); #line 210 "/home/jens/Source/shotwell/src/db/Db.vala" if (!_tmp25_) { #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 622 "Db.c" +#line 623 "Db.c" } } #line 214 "/home/jens/Source/shotwell/src/db/Db.vala" @@ -634,7 +635,7 @@ DbVerifyResult db_upgrade_database (gint input_version) { result = DB_VERIFY_RESULT_UPGRADE_ERROR; #line 223 "/home/jens/Source/shotwell/src/db/Db.vala" return result; -#line 635 "Db.c" +#line 636 "Db.c" } #line 226 "/home/jens/Source/shotwell/src/db/Db.vala" version = 12; @@ -642,7 +643,7 @@ DbVerifyResult db_upgrade_database (gint input_version) { _tmp27_ = database_table_has_column ("PhotoTable", "developer"); #line 233 "/home/jens/Source/shotwell/src/db/Db.vala" if (!_tmp27_) { -#line 643 "Db.c" +#line 644 "Db.c" gboolean _tmp28_; #line 234 "/home/jens/Source/shotwell/src/db/Db.vala" g_message ("Db.vala:234: upgrade_database: adding developer column to PhotoTable"); @@ -654,14 +655,14 @@ DbVerifyResult db_upgrade_database (gint input_version) { result = DB_VERIFY_RESULT_UPGRADE_ERROR; #line 236 "/home/jens/Source/shotwell/src/db/Db.vala" return result; -#line 655 "Db.c" +#line 656 "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 662 "Db.c" +#line 663 "Db.c" gboolean _tmp30_; #line 240 "/home/jens/Source/shotwell/src/db/Db.vala" g_message ("Db.vala:240: upgrade_database: adding develop_shotwell_id column to Ph" \ @@ -674,14 +675,14 @@ DbVerifyResult db_upgrade_database (gint input_version) { result = DB_VERIFY_RESULT_UPGRADE_ERROR; #line 242 "/home/jens/Source/shotwell/src/db/Db.vala" return result; -#line 674 "Db.c" +#line 675 "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 681 "Db.c" +#line 682 "Db.c" gboolean _tmp32_; #line 246 "/home/jens/Source/shotwell/src/db/Db.vala" g_message ("Db.vala:246: upgrade_database: adding develop_camera_id column to Phot" \ @@ -694,14 +695,14 @@ DbVerifyResult db_upgrade_database (gint input_version) { result = DB_VERIFY_RESULT_UPGRADE_ERROR; #line 248 "/home/jens/Source/shotwell/src/db/Db.vala" return result; -#line 693 "Db.c" +#line 694 "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 700 "Db.c" +#line 701 "Db.c" gboolean _tmp34_; #line 252 "/home/jens/Source/shotwell/src/db/Db.vala" g_message ("Db.vala:252: upgrade_database: adding develop_embedded_id column to Ph" \ @@ -714,7 +715,7 @@ DbVerifyResult db_upgrade_database (gint input_version) { result = DB_VERIFY_RESULT_UPGRADE_ERROR; #line 254 "/home/jens/Source/shotwell/src/db/Db.vala" return result; -#line 712 "Db.c" +#line 713 "Db.c" } } #line 257 "/home/jens/Source/shotwell/src/db/Db.vala" @@ -725,7 +726,7 @@ DbVerifyResult db_upgrade_database (gint input_version) { if (_tmp35_ < 14) { #line 265 "/home/jens/Source/shotwell/src/db/Db.vala" tag_table_upgrade_for_htags (); -#line 723 "Db.c" +#line 724 "Db.c" } #line 267 "/home/jens/Source/shotwell/src/db/Db.vala" version = 14; @@ -737,7 +738,7 @@ DbVerifyResult db_upgrade_database (gint input_version) { if (_tmp36_ < 16) { #line 292 "/home/jens/Source/shotwell/src/db/Db.vala" gsettings_configuration_engine_run_gsettings_migrator (); -#line 735 "Db.c" +#line 736 "Db.c" } #line 295 "/home/jens/Source/shotwell/src/db/Db.vala" version = 16; @@ -745,7 +746,7 @@ DbVerifyResult db_upgrade_database (gint input_version) { _tmp37_ = database_table_has_column ("PhotoTable", "comment"); #line 302 "/home/jens/Source/shotwell/src/db/Db.vala" if (!_tmp37_) { -#line 743 "Db.c" +#line 744 "Db.c" gboolean _tmp38_; #line 303 "/home/jens/Source/shotwell/src/db/Db.vala" g_message ("Db.vala:303: upgrade_database: adding comment column to PhotoTable"); @@ -757,95 +758,97 @@ DbVerifyResult db_upgrade_database (gint input_version) { result = DB_VERIFY_RESULT_UPGRADE_ERROR; #line 305 "/home/jens/Source/shotwell/src/db/Db.vala" return result; -#line 755 "Db.c" +#line 756 "Db.c" } } #line 307 "/home/jens/Source/shotwell/src/db/Db.vala" - _tmp39_ = database_table_has_column ("VideoTable", "comment"); + _tmp39_ = database_table_has_table ("VideoTable"); #line 307 "/home/jens/Source/shotwell/src/db/Db.vala" - if (!_tmp39_) { -#line 762 "Db.c" - gboolean _tmp40_; + _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_; #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" - _tmp40_ = database_table_add_column ("VideoTable", "comment", "TEXT"); + _tmp41_ = database_table_add_column ("VideoTable", "comment", "TEXT"); #line 309 "/home/jens/Source/shotwell/src/db/Db.vala" - if (!_tmp40_) { + if (!_tmp41_) { #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 774 "Db.c" +#line 777 "Db.c" } } #line 313 "/home/jens/Source/shotwell/src/db/Db.vala" version = 17; #line 320 "/home/jens/Source/shotwell/src/db/Db.vala" - _tmp41_ = database_table_has_column ("EventTable", "comment"); + _tmp42_ = database_table_has_column ("EventTable", "comment"); #line 320 "/home/jens/Source/shotwell/src/db/Db.vala" - if (!_tmp41_) { -#line 783 "Db.c" - gboolean _tmp42_; + if (!_tmp42_) { +#line 786 "Db.c" + gboolean _tmp43_; #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" - _tmp42_ = database_table_add_column ("EventTable", "comment", "TEXT"); + _tmp43_ = database_table_add_column ("EventTable", "comment", "TEXT"); #line 322 "/home/jens/Source/shotwell/src/db/Db.vala" - if (!_tmp42_) { + if (!_tmp43_) { #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 795 "Db.c" +#line 798 "Db.c" } } #line 326 "/home/jens/Source/shotwell/src/db/Db.vala" version = 18; #line 337 "/home/jens/Source/shotwell/src/db/Db.vala" - _tmp43_ = input_version; + _tmp44_ = input_version; #line 337 "/home/jens/Source/shotwell/src/db/Db.vala" - if (_tmp43_ < 19) { -#line 804 "Db.c" - Application* _tmp44_; + if (_tmp44_ < 19) { +#line 807 "Db.c" Application* _tmp45_; + Application* _tmp46_; #line 338 "/home/jens/Source/shotwell/src/db/Db.vala" - _tmp44_ = application_get_instance (); + _tmp45_ = application_get_instance (); #line 338 "/home/jens/Source/shotwell/src/db/Db.vala" - _tmp45_ = _tmp44_; + _tmp46_ = _tmp45_; #line 338 "/home/jens/Source/shotwell/src/db/Db.vala" - application_set_raw_thumbs_fix_required (_tmp45_, TRUE); + application_set_raw_thumbs_fix_required (_tmp46_, TRUE); #line 338 "/home/jens/Source/shotwell/src/db/Db.vala" - _application_unref0 (_tmp45_); -#line 815 "Db.c" + _application_unref0 (_tmp46_); +#line 818 "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" - _tmp46_ = version; + _tmp47_ = version; #line 357 "/home/jens/Source/shotwell/src/db/Db.vala" - _vala_assert (_tmp46_ == DATABASE_TABLE_SCHEMA_VERSION, "version == DatabaseTable.SCHEMA_VERSION"); + _vala_assert (_tmp47_ == DATABASE_TABLE_SCHEMA_VERSION, "version == DatabaseTable.SCHEMA_VERSION"); #line 358 "/home/jens/Source/shotwell/src/db/Db.vala" - _tmp47_ = version_table_get_instance (); + _tmp48_ = version_table_get_instance (); #line 358 "/home/jens/Source/shotwell/src/db/Db.vala" - _tmp48_ = _tmp47_; + _tmp49_ = _tmp48_; #line 358 "/home/jens/Source/shotwell/src/db/Db.vala" - _tmp49_ = version; + _tmp50_ = version; #line 358 "/home/jens/Source/shotwell/src/db/Db.vala" - version_table_update_version (_tmp48_, _tmp49_, RESOURCES_APP_VERSION); + version_table_update_version (_tmp49_, _tmp50_, RESOURCES_APP_VERSION); #line 358 "/home/jens/Source/shotwell/src/db/Db.vala" - _database_table_unref0 (_tmp48_); + _database_table_unref0 (_tmp49_); #line 360 "/home/jens/Source/shotwell/src/db/Db.vala" - _tmp50_ = version; + _tmp51_ = version; #line 360 "/home/jens/Source/shotwell/src/db/Db.vala" - g_message ("Db.vala:360: Database upgrade to schema version %d successful", _tmp50_); + g_message ("Db.vala:360: Database upgrade to schema version %d successful", _tmp51_); #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 843 "Db.c" +#line 846 "Db.c" } diff --git a/src/db/Db.vala b/src/db/Db.vala index e4f83bf..3eca8ce 100644 --- a/src/db/Db.vala +++ b/src/db/Db.vala @@ -207,7 +207,7 @@ private VerifyResult upgrade_database(int input_version) { if (!DatabaseTable.has_column("EventTable", "primary_source_id")) { message("upgrade_database: adding primary_source_id column to EventTable"); - if (!DatabaseTable.add_column("EventTable", "primary_source_id", "INTEGER DEFAULT 0")) + if (!DatabaseTable.add_column("EventTable", "primary_source_id", "TEXT")) return VerifyResult.UPGRADE_ERROR; } @@ -304,7 +304,7 @@ private VerifyResult upgrade_database(int input_version) { if (!DatabaseTable.add_column("PhotoTable", "comment", "TEXT")) return VerifyResult.UPGRADE_ERROR; } - if (!DatabaseTable.has_column("VideoTable", "comment")) { + if (DatabaseTable.has_table("VideoTable") & !DatabaseTable.has_column("VideoTable", "comment")) { message("upgrade_database: adding comment column to VideoTable"); if (!DatabaseTable.add_column("VideoTable", "comment", "TEXT")) return VerifyResult.UPGRADE_ERROR; diff --git a/src/db/PhotoTable.c b/src/db/PhotoTable.c index 45e2254..3fd09f6 100644 --- a/src/db/PhotoTable.c +++ b/src/db/PhotoTable.c @@ -13,6 +13,7 @@ #include #include #include +#include "shotwell-graphics-processor.h" #include #include #include @@ -50,16 +51,6 @@ typedef struct _EventID EventID; #define TYPE_ORIENTATION (orientation_get_type ()) -#define TYPE_KEY_VALUE_MAP (key_value_map_get_type ()) -#define KEY_VALUE_MAP(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_KEY_VALUE_MAP, KeyValueMap)) -#define KEY_VALUE_MAP_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_KEY_VALUE_MAP, KeyValueMapClass)) -#define IS_KEY_VALUE_MAP(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_KEY_VALUE_MAP)) -#define IS_KEY_VALUE_MAP_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_KEY_VALUE_MAP)) -#define KEY_VALUE_MAP_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_KEY_VALUE_MAP, KeyValueMapClass)) - -typedef struct _KeyValueMap KeyValueMap; -typedef struct _KeyValueMapClass KeyValueMapClass; - #define TYPE_RATING (rating_get_type ()) #define TYPE_BACKING_PHOTO_ID (backing_photo_id_get_type ()) @@ -330,13 +321,6 @@ GType event_id_get_type (void) G_GNUC_CONST; EventID* event_id_dup (const EventID* self); void event_id_free (EventID* self); GType orientation_get_type (void) G_GNUC_CONST; -gpointer key_value_map_ref (gpointer instance); -void key_value_map_unref (gpointer instance); -GParamSpec* param_spec_key_value_map (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_key_value_map (GValue* value, gpointer v_object); -void value_take_key_value_map (GValue* value, gpointer v_object); -gpointer value_get_key_value_map (const GValue* value); -GType key_value_map_get_type (void) G_GNUC_CONST; GType rating_get_type (void) G_GNUC_CONST; GType backing_photo_id_get_type (void) G_GNUC_CONST; BackingPhotoID* backing_photo_id_dup (const BackingPhotoID* self); @@ -423,13 +407,7 @@ static gchar* photo_table_get_raw_transformations (PhotoTable* self, PhotoID* ph 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); -KeyValueMap* key_value_map_new (const gchar* group); -KeyValueMap* key_value_map_construct (GType object_type, const gchar* group); -void key_value_map_set_string (KeyValueMap* self, const gchar* key, const gchar* value); -GeeSet* key_value_map_get_keys (KeyValueMap* self); -gchar* key_value_map_get_string (KeyValueMap* self, const gchar* key, const gchar* def); gboolean photo_table_set_transformation (PhotoTable* self, PhotoID* photo_id, KeyValueMap* map); -gchar* key_value_map_get_group (KeyValueMap* self); 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); @@ -480,7 +458,7 @@ void photo_id_init (PhotoID *self, gint64 id) { _tmp0_ = id; #line 13 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" (*self).id = _tmp0_; -#line 484 "PhotoTable.c" +#line 462 "PhotoTable.c" } @@ -493,7 +471,7 @@ 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 497 "PhotoTable.c" +#line 475 "PhotoTable.c" } @@ -506,7 +484,7 @@ 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 510 "PhotoTable.c" +#line 488 "PhotoTable.c" } @@ -522,7 +500,7 @@ guint photo_id_hash (PhotoID *self) { result = _tmp1_; #line 25 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 526 "PhotoTable.c" +#line 504 "PhotoTable.c" } @@ -544,7 +522,7 @@ gboolean photo_id_equal (void* a, void* b) { result = _tmp1_ == _tmp3_; #line 29 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 548 "PhotoTable.c" +#line 526 "PhotoTable.c" } @@ -565,7 +543,7 @@ 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 569 "PhotoTable.c" +#line 547 "PhotoTable.c" } @@ -577,14 +555,14 @@ 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 581 "PhotoTable.c" +#line 559 "PhotoTable.c" } void photo_id_free (PhotoID* self) { #line 7 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_free (self); -#line 588 "PhotoTable.c" +#line 566 "PhotoTable.c" } @@ -607,7 +585,7 @@ void import_id_init (ImportID *self, gint64 id) { _tmp0_ = id; #line 43 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" (*self).id = _tmp0_; -#line 611 "PhotoTable.c" +#line 589 "PhotoTable.c" } @@ -633,7 +611,7 @@ void import_id_generate (ImportID* result) { *result = _tmp2_; #line 51 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; -#line 637 "PhotoTable.c" +#line 615 "PhotoTable.c" } @@ -646,7 +624,7 @@ 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 650 "PhotoTable.c" +#line 628 "PhotoTable.c" } @@ -659,7 +637,7 @@ 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 663 "PhotoTable.c" +#line 641 "PhotoTable.c" } @@ -675,17 +653,17 @@ gint import_id_compare_func (ImportID* a, ImportID* b) { _tmp1_ = a; #line 63 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (_tmp1_ != NULL) { -#line 679 "PhotoTable.c" +#line 657 "PhotoTable.c" ImportID* _tmp2_; #line 63 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp2_ = b; #line 63 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp0_ = _tmp2_ != NULL; -#line 685 "PhotoTable.c" +#line 663 "PhotoTable.c" } else { #line 63 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp0_ = FALSE; -#line 689 "PhotoTable.c" +#line 667 "PhotoTable.c" } #line 63 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _vala_assert (_tmp0_, "a != null && b != null"); @@ -701,7 +679,7 @@ gint import_id_compare_func (ImportID* a, ImportID* b) { result = (gint) (_tmp4_ - _tmp6_); #line 64 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 705 "PhotoTable.c" +#line 683 "PhotoTable.c" } @@ -723,7 +701,7 @@ gint64 import_id_comparator (void* a, void* b) { result = _tmp1_ - _tmp3_; #line 68 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 727 "PhotoTable.c" +#line 705 "PhotoTable.c" } @@ -735,14 +713,14 @@ 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 739 "PhotoTable.c" +#line 717 "PhotoTable.c" } void import_id_free (ImportID* self) { #line 37 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_free (self); -#line 746 "PhotoTable.c" +#line 724 "PhotoTable.c" } @@ -795,7 +773,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 799 "PhotoTable.c" +#line 777 "PhotoTable.c" { RawDeveloper* d_collection = NULL; gint d_collection_length1 = 0; @@ -807,11 +785,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 811 "PhotoTable.c" +#line 789 "PhotoTable.c" RawDeveloper d = 0; #line 104 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" d = d_collection[d_it]; -#line 815 "PhotoTable.c" +#line 793 "PhotoTable.c" { BackingPhotoID* _tmp7_; gint _tmp7__length1; @@ -830,30 +808,30 @@ PhotoRow* photo_row_construct (GType object_type) { _tmp7_[_tmp8_] = _tmp9_; #line 105 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp10_ = _tmp7_[_tmp8_]; -#line 834 "PhotoTable.c" +#line 812 "PhotoTable.c" } } #line 104 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" d_collection = (g_free (d_collection), NULL); -#line 839 "PhotoTable.c" +#line 817 "PhotoTable.c" } #line 100 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return self; -#line 843 "PhotoTable.c" +#line 821 "PhotoTable.c" } PhotoRow* photo_row_new (void) { #line 100 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return photo_row_construct (TYPE_PHOTO_ROW); -#line 850 "PhotoTable.c" +#line 828 "PhotoTable.c" } 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 857 "PhotoTable.c" +#line 835 "PhotoTable.c" } @@ -862,7 +840,7 @@ static void value_photo_row_free_value (GValue* value) { 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 866 "PhotoTable.c" +#line 844 "PhotoTable.c" } } @@ -872,11 +850,11 @@ static void value_photo_row_copy_value (const GValue* src_value, GValue* dest_va 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 876 "PhotoTable.c" +#line 854 "PhotoTable.c" } else { #line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" dest_value->data[0].v_pointer = NULL; -#line 880 "PhotoTable.c" +#line 858 "PhotoTable.c" } } @@ -884,37 +862,37 @@ static void value_photo_row_copy_value (const GValue* src_value, GValue* dest_va 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 888 "PhotoTable.c" +#line 866 "PhotoTable.c" } 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 895 "PhotoTable.c" +#line 873 "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 902 "PhotoTable.c" +#line 880 "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 906 "PhotoTable.c" +#line 884 "PhotoTable.c" } #line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" value->data[0].v_pointer = photo_row_ref (object); -#line 910 "PhotoTable.c" +#line 888 "PhotoTable.c" } else { #line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" value->data[0].v_pointer = NULL; -#line 914 "PhotoTable.c" +#line 892 "PhotoTable.c" } #line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return NULL; -#line 918 "PhotoTable.c" +#line 896 "PhotoTable.c" } @@ -925,25 +903,25 @@ static gchar* value_photo_row_lcopy_value (const GValue* value, guint n_collect_ 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 929 "PhotoTable.c" +#line 907 "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 935 "PhotoTable.c" +#line 913 "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 939 "PhotoTable.c" +#line 917 "PhotoTable.c" } else { #line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" *object_p = photo_row_ref (value->data[0].v_pointer); -#line 943 "PhotoTable.c" +#line 921 "PhotoTable.c" } #line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return NULL; -#line 947 "PhotoTable.c" +#line 925 "PhotoTable.c" } @@ -957,7 +935,7 @@ 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 961 "PhotoTable.c" +#line 939 "PhotoTable.c" } @@ -966,7 +944,7 @@ gpointer value_get_photo_row (const GValue* value) { 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 970 "PhotoTable.c" +#line 948 "PhotoTable.c" } @@ -986,17 +964,17 @@ 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 990 "PhotoTable.c" +#line 968 "PhotoTable.c" } else { #line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" value->data[0].v_pointer = NULL; -#line 994 "PhotoTable.c" +#line 972 "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 1000 "PhotoTable.c" +#line 978 "PhotoTable.c" } } @@ -1015,17 +993,17 @@ 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 1019 "PhotoTable.c" +#line 997 "PhotoTable.c" } else { #line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" value->data[0].v_pointer = NULL; -#line 1023 "PhotoTable.c" +#line 1001 "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 1029 "PhotoTable.c" +#line 1007 "PhotoTable.c" } } @@ -1035,14 +1013,14 @@ static void photo_row_class_init (PhotoRowClass * klass) { 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 1039 "PhotoTable.c" +#line 1017 "PhotoTable.c" } static void photo_row_instance_init (PhotoRow * self) { #line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" self->ref_count = 1; -#line 1046 "PhotoTable.c" +#line 1024 "PhotoTable.c" } @@ -1070,7 +1048,7 @@ 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 1074 "PhotoTable.c" +#line 1052 "PhotoTable.c" } @@ -1095,7 +1073,7 @@ gpointer photo_row_ref (gpointer instance) { g_atomic_int_inc (&self->ref_count); #line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return instance; -#line 1099 "PhotoTable.c" +#line 1077 "PhotoTable.c" } @@ -1108,7 +1086,7 @@ 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 1112 "PhotoTable.c" +#line 1090 "PhotoTable.c" } } @@ -1187,13 +1165,13 @@ static PhotoTable* photo_table_construct (GType object_type) { _tmp6_ = res; #line 148 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (_tmp6_ != SQLITE_DONE) { -#line 1191 "PhotoTable.c" +#line 1169 "PhotoTable.c" gint _tmp7_; #line 149 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp7_ = res; #line 149 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" database_table_fatal ("create photo table", _tmp7_); -#line 1197 "PhotoTable.c" +#line 1175 "PhotoTable.c" } #line 153 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp8_ = database_table_db; @@ -1219,13 +1197,13 @@ static PhotoTable* photo_table_construct (GType object_type) { _tmp14_ = res2; #line 158 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (_tmp14_ != SQLITE_DONE) { -#line 1223 "PhotoTable.c" +#line 1201 "PhotoTable.c" gint _tmp15_; #line 159 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp15_ = res2; #line 159 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" database_table_fatal ("create photo table", _tmp15_); -#line 1229 "PhotoTable.c" +#line 1207 "PhotoTable.c" } #line 165 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp16_ = database_table_db; @@ -1251,13 +1229,13 @@ static PhotoTable* photo_table_construct (GType object_type) { _tmp22_ = res; #line 168 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (_tmp22_ != SQLITE_DONE) { -#line 1255 "PhotoTable.c" +#line 1233 "PhotoTable.c" gint _tmp23_; #line 169 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp23_ = res; #line 169 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" database_table_warning ("Failed to drop old PhotoTable index", _tmp23_); -#line 1261 "PhotoTable.c" +#line 1239 "PhotoTable.c" } #line 172 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp24_ = database_table_db; @@ -1284,13 +1262,13 @@ static PhotoTable* photo_table_construct (GType object_type) { _tmp30_ = res; #line 175 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (_tmp30_ != SQLITE_DONE) { -#line 1287 "PhotoTable.c" +#line 1265 "PhotoTable.c" gint _tmp31_; #line 176 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp31_ = 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 1293 "PhotoTable.c" +#line 1271 "PhotoTable.c" } #line 180 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp32_ = database_table_db; @@ -1317,13 +1295,13 @@ static PhotoTable* photo_table_construct (GType object_type) { _tmp38_ = res; #line 183 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (_tmp38_ != SQLITE_DONE) { -#line 1319 "PhotoTable.c" +#line 1297 "PhotoTable.c" gint _tmp39_; #line 184 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp39_ = 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 1325 "PhotoTable.c" +#line 1303 "PhotoTable.c" } #line 188 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp40_ = database_table_db; @@ -1350,13 +1328,13 @@ static PhotoTable* photo_table_construct (GType object_type) { _tmp46_ = res; #line 191 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (_tmp46_ != SQLITE_DONE) { -#line 1351 "PhotoTable.c" +#line 1329 "PhotoTable.c" gint _tmp47_; #line 192 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp47_ = 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 1357 "PhotoTable.c" +#line 1335 "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"); @@ -1366,21 +1344,21 @@ static PhotoTable* photo_table_construct (GType object_type) { _sqlite3_finalize0 (stmt); #line 112 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return self; -#line 1367 "PhotoTable.c" +#line 1345 "PhotoTable.c" } static PhotoTable* photo_table_new (void) { #line 112 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return photo_table_construct (TYPE_PHOTO_TABLE); -#line 1374 "PhotoTable.c" +#line 1352 "PhotoTable.c" } 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 1381 "PhotoTable.c" +#line 1359 "PhotoTable.c" } @@ -1393,7 +1371,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 1394 "PhotoTable.c" +#line 1372 "PhotoTable.c" PhotoTable* _tmp1_; #line 200 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp1_ = photo_table_new (); @@ -1401,7 +1379,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 1402 "PhotoTable.c" +#line 1380 "PhotoTable.c" } #line 202 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp2_ = photo_table_instance; @@ -1411,7 +1389,7 @@ PhotoTable* photo_table_get_instance (void) { result = _tmp3_; #line 202 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 1412 "PhotoTable.c" +#line 1390 "PhotoTable.c" } @@ -1921,20 +1899,20 @@ void photo_table_add (PhotoTable* self, PhotoRow* photo_row, PhotoID* result) { _tmp129_ = res; #line 261 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (_tmp129_ != SQLITE_DONE) { -#line 1919 "PhotoTable.c" +#line 1897 "PhotoTable.c" gint _tmp130_; PhotoID _tmp132_ = {0}; #line 262 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp130_ = res; #line 262 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (_tmp130_ != SQLITE_CONSTRAINT) { -#line 1926 "PhotoTable.c" +#line 1904 "PhotoTable.c" gint _tmp131_; #line 263 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp131_ = res; #line 263 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" database_table_fatal ("add_photo", _tmp131_); -#line 1932 "PhotoTable.c" +#line 1910 "PhotoTable.c" } #line 265 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" photo_id_init (&_tmp132_, PHOTO_ID_INVALID); @@ -1944,7 +1922,7 @@ void photo_table_add (PhotoTable* self, PhotoRow* photo_row, PhotoID* result) { _sqlite3_finalize0 (stmt); #line 265 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; -#line 1942 "PhotoTable.c" +#line 1920 "PhotoTable.c" } #line 269 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp133_ = photo_row; @@ -1988,7 +1966,7 @@ void photo_table_add (PhotoTable* self, PhotoRow* photo_row, PhotoID* result) { _sqlite3_finalize0 (stmt); #line 275 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; -#line 1986 "PhotoTable.c" +#line 1964 "PhotoTable.c" } @@ -2366,7 +2344,7 @@ void photo_table_reimport (PhotoTable* self, PhotoRow* row, GError** error) { _tmp95_ = res; #line 324 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (_tmp95_ != SQLITE_DONE) { -#line 2361 "PhotoTable.c" +#line 2339 "PhotoTable.c" gint _tmp96_; #line 325 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp96_ = res; @@ -2382,7 +2360,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 2377 "PhotoTable.c" +#line 2355 "PhotoTable.c" } else { #line 325 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _sqlite3_finalize0 (stmt); @@ -2392,7 +2370,7 @@ 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 2387 "PhotoTable.c" +#line 2365 "PhotoTable.c" } } } @@ -2414,7 +2392,7 @@ void photo_table_reimport (PhotoTable* self, PhotoRow* row, GError** error) { _tmp99_->orientation = _tmp102_; #line 283 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _sqlite3_finalize0 (stmt); -#line 2409 "PhotoTable.c" +#line 2387 "PhotoTable.c" } @@ -2594,19 +2572,19 @@ gboolean photo_table_master_exif_updated (PhotoTable* self, PhotoID* photoID, gi _tmp37_ = res; #line 353 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (_tmp37_ != SQLITE_DONE) { -#line 2588 "PhotoTable.c" +#line 2566 "PhotoTable.c" gint _tmp38_; #line 354 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp38_ = res; #line 354 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (_tmp38_ != SQLITE_CONSTRAINT) { -#line 2594 "PhotoTable.c" +#line 2572 "PhotoTable.c" gint _tmp39_; #line 355 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp39_ = res; #line 355 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" database_table_fatal ("write_update_photo", _tmp39_); -#line 2600 "PhotoTable.c" +#line 2578 "PhotoTable.c" } #line 357 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" result = FALSE; @@ -2614,7 +2592,7 @@ 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 2608 "PhotoTable.c" +#line 2586 "PhotoTable.c" } #line 360 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp40_ = row; @@ -2668,7 +2646,7 @@ gboolean photo_table_master_exif_updated (PhotoTable* self, PhotoID* photoID, gi _sqlite3_finalize0 (stmt); #line 366 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 2662 "PhotoTable.c" +#line 2640 "PhotoTable.c" } @@ -2688,7 +2666,7 @@ static void photo_table_validate_orientation (PhotoTable* self, PhotoRow* row) { if (_tmp2_ < ORIENTATION_MIN) { #line 378 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp0_ = TRUE; -#line 2682 "PhotoTable.c" +#line 2660 "PhotoTable.c" } else { PhotoRow* _tmp3_; Orientation _tmp4_; @@ -2698,11 +2676,11 @@ static void photo_table_validate_orientation (PhotoTable* self, PhotoRow* row) { _tmp4_ = _tmp3_->orientation; #line 379 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp0_ = _tmp4_ > ORIENTATION_MAX; -#line 2692 "PhotoTable.c" +#line 2670 "PhotoTable.c" } #line 378 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (_tmp0_) { -#line 2696 "PhotoTable.c" +#line 2674 "PhotoTable.c" PhotoRow* _tmp5_; PhotoID _tmp6_; PhotoRow* _tmp7_; @@ -2716,7 +2694,7 @@ static void photo_table_validate_orientation (PhotoTable* self, PhotoRow* row) { _tmp7_ = row; #line 382 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp7_->orientation = ORIENTATION_MIN; -#line 2710 "PhotoTable.c" +#line 2688 "PhotoTable.c" } } @@ -2899,7 +2877,7 @@ PhotoRow* photo_table_get_row (PhotoTable* self, PhotoID* photo_id) { _sqlite3_finalize0 (stmt); #line 402 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 2890 "PhotoTable.c" +#line 2868 "PhotoTable.c" } #line 404 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp11_ = photo_row_new (); @@ -3141,7 +3119,7 @@ PhotoRow* photo_table_get_row (PhotoTable* self, PhotoID* photo_id) { _tmp99_ = sqlite3_column_text (_tmp98_, 23); #line 428 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (_tmp99_ != NULL) { -#line 3132 "PhotoTable.c" +#line 3110 "PhotoTable.c" sqlite3_stmt* _tmp100_; const gchar* _tmp101_; RawDeveloper _tmp102_; @@ -3153,11 +3131,11 @@ PhotoRow* photo_table_get_row (PhotoTable* self, PhotoID* photo_id) { _tmp102_ = raw_developer_from_string (_tmp101_); #line 428 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp97_ = _tmp102_; -#line 3144 "PhotoTable.c" +#line 3122 "PhotoTable.c" } else { #line 429 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp97_ = RAW_DEVELOPER_CAMERA; -#line 3148 "PhotoTable.c" +#line 3126 "PhotoTable.c" } #line 428 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp103_ = row; @@ -3229,7 +3207,7 @@ PhotoRow* photo_table_get_row (PhotoTable* self, PhotoID* photo_id) { _sqlite3_finalize0 (stmt); #line 435 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 3220 "PhotoTable.c" +#line 3198 "PhotoTable.c" } @@ -3269,7 +3247,7 @@ GeeArrayList* photo_table_get_all (PhotoTable* self) { all = _tmp4_; #line 451 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" while (TRUE) { -#line 3256 "PhotoTable.c" +#line 3234 "PhotoTable.c" sqlite3_stmt* _tmp5_; gint _tmp6_; gint _tmp7_; @@ -3405,7 +3383,7 @@ GeeArrayList* photo_table_get_all (PhotoTable* self) { if (!(_tmp7_ == SQLITE_ROW)) { #line 451 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" break; -#line 3392 "PhotoTable.c" +#line 3370 "PhotoTable.c" } #line 452 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp8_ = photo_row_new (); @@ -3649,7 +3627,7 @@ GeeArrayList* photo_table_get_all (PhotoTable* self) { _tmp97_ = sqlite3_column_text (_tmp96_, 24); #line 476 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (_tmp97_ != NULL) { -#line 3636 "PhotoTable.c" +#line 3614 "PhotoTable.c" sqlite3_stmt* _tmp98_; const gchar* _tmp99_; RawDeveloper _tmp100_; @@ -3661,11 +3639,11 @@ GeeArrayList* photo_table_get_all (PhotoTable* self) { _tmp100_ = raw_developer_from_string (_tmp99_); #line 476 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp95_ = _tmp100_; -#line 3648 "PhotoTable.c" +#line 3626 "PhotoTable.c" } else { #line 477 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp95_ = RAW_DEVELOPER_CAMERA; -#line 3652 "PhotoTable.c" +#line 3630 "PhotoTable.c" } #line 476 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp101_ = row; @@ -3743,7 +3721,7 @@ GeeArrayList* photo_table_get_all (PhotoTable* self) { gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp125_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp126_); #line 451 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _photo_row_unref0 (row); -#line 3730 "PhotoTable.c" +#line 3708 "PhotoTable.c" } #line 488 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" result = all; @@ -3751,7 +3729,7 @@ GeeArrayList* photo_table_get_all (PhotoTable* self) { _sqlite3_finalize0 (stmt); #line 488 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 3738 "PhotoTable.c" +#line 3716 "PhotoTable.c" } @@ -4372,20 +4350,20 @@ void photo_table_duplicate (PhotoTable* self, PhotoID* photo_id, const gchar* ne _tmp159_ = res; #line 562 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (_tmp159_ != SQLITE_DONE) { -#line 4355 "PhotoTable.c" +#line 4333 "PhotoTable.c" gint _tmp160_; PhotoID _tmp162_ = {0}; #line 563 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp160_ = res; #line 563 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (_tmp160_ != SQLITE_CONSTRAINT) { -#line 4362 "PhotoTable.c" +#line 4340 "PhotoTable.c" gint _tmp161_; #line 564 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp161_ = res; #line 564 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" database_table_fatal ("duplicate", _tmp161_); -#line 4368 "PhotoTable.c" +#line 4346 "PhotoTable.c" } #line 566 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" photo_id_init (&_tmp162_, PHOTO_ID_INVALID); @@ -4397,7 +4375,7 @@ void photo_table_duplicate (PhotoTable* self, PhotoID* photo_id, const gchar* ne _photo_row_unref0 (original); #line 566 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; -#line 4380 "PhotoTable.c" +#line 4358 "PhotoTable.c" } #line 569 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp163_ = database_table_db; @@ -4413,7 +4391,7 @@ void photo_table_duplicate (PhotoTable* self, PhotoID* photo_id, const gchar* ne _photo_row_unref0 (original); #line 569 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; -#line 4396 "PhotoTable.c" +#line 4374 "PhotoTable.c" } @@ -4432,17 +4410,17 @@ gboolean photo_table_set_title (PhotoTable* self, PhotoID* photo_id, const gchar _tmp1_ = new_title; #line 573 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (_tmp1_ != NULL) { -#line 4415 "PhotoTable.c" +#line 4393 "PhotoTable.c" const gchar* _tmp2_; #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 4421 "PhotoTable.c" +#line 4399 "PhotoTable.c" } else { #line 573 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp0_ = ""; -#line 4425 "PhotoTable.c" +#line 4403 "PhotoTable.c" } #line 573 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp3_ = *photo_id; @@ -4454,7 +4432,7 @@ gboolean photo_table_set_title (PhotoTable* self, PhotoID* photo_id, const gchar result = _tmp5_; #line 573 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 4437 "PhotoTable.c" +#line 4415 "PhotoTable.c" } @@ -4473,17 +4451,17 @@ gboolean photo_table_set_comment (PhotoTable* self, PhotoID* photo_id, const gch _tmp1_ = new_comment; #line 577 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (_tmp1_ != NULL) { -#line 4456 "PhotoTable.c" +#line 4434 "PhotoTable.c" const gchar* _tmp2_; #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 4462 "PhotoTable.c" +#line 4440 "PhotoTable.c" } else { #line 577 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp0_ = ""; -#line 4466 "PhotoTable.c" +#line 4444 "PhotoTable.c" } #line 577 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp3_ = *photo_id; @@ -4495,7 +4473,7 @@ gboolean photo_table_set_comment (PhotoTable* self, PhotoID* photo_id, const gch result = _tmp5_; #line 577 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 4478 "PhotoTable.c" +#line 4456 "PhotoTable.c" } @@ -4526,7 +4504,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 4509 "PhotoTable.c" +#line 4487 "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); @@ -4534,7 +4512,7 @@ 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 4517 "PhotoTable.c" +#line 4495 "PhotoTable.c" } } } @@ -4565,7 +4543,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 4548 "PhotoTable.c" +#line 4526 "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); @@ -4573,7 +4551,7 @@ 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 4556 "PhotoTable.c" +#line 4534 "PhotoTable.c" } } } @@ -4601,7 +4579,7 @@ gboolean photo_table_set_exposure_time (PhotoTable* self, PhotoID* photo_id, tim result = _tmp3_; #line 589 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 4584 "PhotoTable.c" +#line 4562 "PhotoTable.c" } @@ -4635,7 +4613,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 4618 "PhotoTable.c" +#line 4596 "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); @@ -4643,7 +4621,7 @@ 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 4626 "PhotoTable.c" +#line 4604 "PhotoTable.c" } } } @@ -4710,7 +4688,7 @@ gboolean photo_table_remove_by_file (PhotoTable* self, GFile* file) { _tmp12_ = res; #line 605 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (_tmp12_ != SQLITE_DONE) { -#line 4693 "PhotoTable.c" +#line 4671 "PhotoTable.c" gint _tmp13_; #line 606 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp13_ = res; @@ -4722,7 +4700,7 @@ gboolean photo_table_remove_by_file (PhotoTable* self, GFile* file) { _sqlite3_finalize0 (stmt); #line 608 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 4705 "PhotoTable.c" +#line 4683 "PhotoTable.c" } #line 611 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" result = TRUE; @@ -4730,7 +4708,7 @@ 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 4713 "PhotoTable.c" +#line 4691 "PhotoTable.c" } @@ -4756,7 +4734,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 4739 "PhotoTable.c" +#line 4717 "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); @@ -4764,7 +4742,7 @@ 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 4747 "PhotoTable.c" +#line 4725 "PhotoTable.c" } } } @@ -4800,14 +4778,14 @@ 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 4783 "PhotoTable.c" +#line 4761 "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 4790 "PhotoTable.c" +#line 4768 "PhotoTable.c" sqlite3_stmt* _tmp6_; gint _tmp7_; gint _tmp8_; @@ -4817,7 +4795,7 @@ GeeArrayList* photo_table_get_photos (PhotoTable* self) { PhotoID _tmp14_ = {0}; #line 624 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (!_tmp5_) { -#line 4800 "PhotoTable.c" +#line 4778 "PhotoTable.c" } #line 624 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp5_ = FALSE; @@ -4833,14 +4811,14 @@ GeeArrayList* photo_table_get_photos (PhotoTable* self) { if (_tmp8_ == SQLITE_DONE) { #line 627 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" break; -#line 4816 "PhotoTable.c" +#line 4794 "PhotoTable.c" } else { gint _tmp9_; #line 628 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp9_ = res; #line 628 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (_tmp9_ != SQLITE_ROW) { -#line 4823 "PhotoTable.c" +#line 4801 "PhotoTable.c" gint _tmp10_; #line 629 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp10_ = res; @@ -4848,7 +4826,7 @@ GeeArrayList* photo_table_get_photos (PhotoTable* self) { database_table_fatal ("get_photos", _tmp10_); #line 631 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" break; -#line 4831 "PhotoTable.c" +#line 4809 "PhotoTable.c" } } #line 634 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -4861,7 +4839,7 @@ GeeArrayList* photo_table_get_photos (PhotoTable* self) { photo_id_init (&_tmp14_, _tmp13_); #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 4844 "PhotoTable.c" +#line 4822 "PhotoTable.c" } } #line 637 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -4870,7 +4848,7 @@ GeeArrayList* photo_table_get_photos (PhotoTable* self) { _sqlite3_finalize0 (stmt); #line 637 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 4853 "PhotoTable.c" +#line 4831 "PhotoTable.c" } @@ -4896,7 +4874,7 @@ gboolean photo_table_set_orientation (PhotoTable* self, PhotoID* photo_id, Orien result = _tmp3_; #line 641 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 4879 "PhotoTable.c" +#line 4857 "PhotoTable.c" } @@ -4922,7 +4900,7 @@ gboolean photo_table_replace_flags (PhotoTable* self, PhotoID* photo_id, guint64 result = _tmp3_; #line 645 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 4905 "PhotoTable.c" +#line 4883 "PhotoTable.c" } @@ -4951,7 +4929,7 @@ gboolean photo_table_set_rating (PhotoTable* self, PhotoID* photo_id, Rating rat result = _tmp4_; #line 649 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 4934 "PhotoTable.c" +#line 4912 "PhotoTable.c" } @@ -5003,21 +4981,21 @@ gint photo_table_get_event_photo_count (PhotoTable* self, EventID* event_id) { _vala_assert (_tmp8_ == SQLITE_OK, "res == Sqlite.OK"); #line 660 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" count = 0; -#line 4986 "PhotoTable.c" +#line 4964 "PhotoTable.c" { gboolean _tmp9_ = FALSE; #line 661 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp9_ = TRUE; #line 661 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" while (TRUE) { -#line 4993 "PhotoTable.c" +#line 4971 "PhotoTable.c" sqlite3_stmt* _tmp10_; gint _tmp11_; gint _tmp12_; gint _tmp15_; #line 661 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (!_tmp9_) { -#line 5000 "PhotoTable.c" +#line 4978 "PhotoTable.c" } #line 661 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp9_ = FALSE; @@ -5033,14 +5011,14 @@ gint photo_table_get_event_photo_count (PhotoTable* self, EventID* event_id) { if (_tmp12_ == SQLITE_DONE) { #line 664 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" break; -#line 5016 "PhotoTable.c" +#line 4994 "PhotoTable.c" } else { gint _tmp13_; #line 665 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp13_ = res; #line 665 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (_tmp13_ != SQLITE_ROW) { -#line 5023 "PhotoTable.c" +#line 5001 "PhotoTable.c" gint _tmp14_; #line 666 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp14_ = res; @@ -5048,14 +5026,14 @@ gint photo_table_get_event_photo_count (PhotoTable* self, EventID* event_id) { database_table_fatal ("get_event_photo_count", _tmp14_); #line 668 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" break; -#line 5031 "PhotoTable.c" +#line 5009 "PhotoTable.c" } } #line 671 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp15_ = count; #line 671 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" count = _tmp15_ + 1; -#line 5038 "PhotoTable.c" +#line 5016 "PhotoTable.c" } } #line 674 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -5064,7 +5042,7 @@ 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 5047 "PhotoTable.c" +#line 5025 "PhotoTable.c" } @@ -5119,14 +5097,14 @@ GeeArrayList* photo_table_get_event_source_ids (PhotoTable* self, EventID* event _tmp9_ = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL); #line 685 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _result_ = _tmp9_; -#line 5102 "PhotoTable.c" +#line 5080 "PhotoTable.c" { gboolean _tmp10_ = FALSE; #line 686 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp10_ = TRUE; #line 686 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" while (TRUE) { -#line 5109 "PhotoTable.c" +#line 5087 "PhotoTable.c" sqlite3_stmt* _tmp11_; gint _tmp12_; gint _tmp13_; @@ -5138,7 +5116,7 @@ GeeArrayList* photo_table_get_event_source_ids (PhotoTable* self, EventID* event gchar* _tmp21_; #line 686 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (!_tmp10_) { -#line 5121 "PhotoTable.c" +#line 5099 "PhotoTable.c" } #line 686 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp10_ = FALSE; @@ -5154,14 +5132,14 @@ GeeArrayList* photo_table_get_event_source_ids (PhotoTable* self, EventID* event if (_tmp13_ == SQLITE_DONE) { #line 689 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" break; -#line 5137 "PhotoTable.c" +#line 5115 "PhotoTable.c" } else { gint _tmp14_; #line 690 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp14_ = res; #line 690 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (_tmp14_ != SQLITE_ROW) { -#line 5144 "PhotoTable.c" +#line 5122 "PhotoTable.c" gint _tmp15_; #line 691 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp15_ = res; @@ -5169,7 +5147,7 @@ GeeArrayList* photo_table_get_event_source_ids (PhotoTable* self, EventID* event database_table_fatal ("get_event_source_ids", _tmp15_); #line 693 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" break; -#line 5152 "PhotoTable.c" +#line 5130 "PhotoTable.c" } } #line 696 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -5188,7 +5166,7 @@ GeeArrayList* photo_table_get_event_source_ids (PhotoTable* self, EventID* event gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp21_); #line 696 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_free0 (_tmp21_); -#line 5171 "PhotoTable.c" +#line 5149 "PhotoTable.c" } } #line 699 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -5197,7 +5175,7 @@ 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 5180 "PhotoTable.c" +#line 5158 "PhotoTable.c" } @@ -5265,14 +5243,14 @@ gboolean photo_table_event_has_photos (PhotoTable* self, EventID* event_id) { _sqlite3_finalize0 (stmt); #line 712 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 5248 "PhotoTable.c" +#line 5226 "PhotoTable.c" } else { gint _tmp12_; #line 713 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp12_ = res; #line 713 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (_tmp12_ != SQLITE_ROW) { -#line 5255 "PhotoTable.c" +#line 5233 "PhotoTable.c" gint _tmp13_; #line 714 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp13_ = res; @@ -5284,7 +5262,7 @@ gboolean photo_table_event_has_photos (PhotoTable* self, EventID* event_id) { _sqlite3_finalize0 (stmt); #line 716 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 5267 "PhotoTable.c" +#line 5245 "PhotoTable.c" } } #line 719 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -5293,7 +5271,7 @@ 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 5276 "PhotoTable.c" +#line 5254 "PhotoTable.c" } @@ -5368,7 +5346,7 @@ gboolean photo_table_drop_event (PhotoTable* self, EventID* event_id) { _tmp14_ = res; #line 733 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (_tmp14_ != SQLITE_DONE) { -#line 5351 "PhotoTable.c" +#line 5329 "PhotoTable.c" gint _tmp15_; #line 734 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp15_ = res; @@ -5380,7 +5358,7 @@ gboolean photo_table_drop_event (PhotoTable* self, EventID* event_id) { _sqlite3_finalize0 (stmt); #line 736 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 5363 "PhotoTable.c" +#line 5341 "PhotoTable.c" } #line 739 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" result = TRUE; @@ -5388,7 +5366,7 @@ 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 5371 "PhotoTable.c" +#line 5349 "PhotoTable.c" } @@ -5419,7 +5397,7 @@ gboolean photo_table_set_event (PhotoTable* self, PhotoID* photo_id, EventID* ev result = _tmp4_; #line 743 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 5402 "PhotoTable.c" +#line 5380 "PhotoTable.c" } @@ -5458,7 +5436,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 5441 "PhotoTable.c" +#line 5419 "PhotoTable.c" } #line 751 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp4_ = stmt; @@ -5474,7 +5452,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 5457 "PhotoTable.c" +#line 5435 "PhotoTable.c" } else { const gchar* _tmp9_; gint _tmp10_; @@ -5487,7 +5465,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 5470 "PhotoTable.c" +#line 5448 "PhotoTable.c" } #line 752 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (_tmp7_) { @@ -5499,7 +5477,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 5482 "PhotoTable.c" +#line 5460 "PhotoTable.c" } #line 755 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" result = trans; @@ -5507,7 +5485,7 @@ 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 5490 "PhotoTable.c" +#line 5468 "PhotoTable.c" } @@ -5535,7 +5513,7 @@ static gboolean photo_table_set_raw_transformations (PhotoTable* self, PhotoID* result = _tmp3_; #line 759 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 5518 "PhotoTable.c" +#line 5496 "PhotoTable.c" } @@ -5638,7 +5616,7 @@ gboolean photo_table_set_transformation_state (PhotoTable* self, PhotoID* photo_ _tmp21_ = res; #line 777 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (_tmp21_ != SQLITE_DONE) { -#line 5620 "PhotoTable.c" +#line 5598 "PhotoTable.c" gint _tmp22_; #line 778 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp22_ = res; @@ -5650,7 +5628,7 @@ gboolean photo_table_set_transformation_state (PhotoTable* self, PhotoID* photo_ _sqlite3_finalize0 (stmt); #line 780 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 5632 "PhotoTable.c" +#line 5610 "PhotoTable.c" } #line 783 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" result = TRUE; @@ -5658,7 +5636,7 @@ 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 5640 "PhotoTable.c" +#line 5618 "PhotoTable.c" } @@ -5673,7 +5651,7 @@ GeeHashMap* photo_table_marshall_all_transformations (const gchar* trans) { if (_tmp1_ == NULL) { #line 787 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp0_ = TRUE; -#line 5655 "PhotoTable.c" +#line 5633 "PhotoTable.c" } else { const gchar* _tmp2_; gint _tmp3_; @@ -5686,7 +5664,7 @@ GeeHashMap* photo_table_marshall_all_transformations (const gchar* trans) { _tmp4_ = _tmp3_; #line 787 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp0_ = _tmp4_ == 0; -#line 5668 "PhotoTable.c" +#line 5646 "PhotoTable.c" } #line 787 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (_tmp0_) { @@ -5694,7 +5672,7 @@ GeeHashMap* photo_table_marshall_all_transformations (const gchar* trans) { result = NULL; #line 788 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 5676 "PhotoTable.c" +#line 5654 "PhotoTable.c" } { GKeyFile* keyfile = NULL; @@ -5738,7 +5716,7 @@ GeeHashMap* photo_table_marshall_all_transformations (const gchar* trans) { if (G_UNLIKELY (_inner_error_ != NULL)) { #line 792 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_key_file_unref0 (keyfile); -#line 5720 "PhotoTable.c" +#line 5698 "PhotoTable.c" goto __catch17_g_error; } #line 792 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -5749,7 +5727,7 @@ GeeHashMap* photo_table_marshall_all_transformations (const gchar* trans) { _g_key_file_unref0 (keyfile); #line 793 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 5731 "PhotoTable.c" +#line 5709 "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); @@ -5769,7 +5747,7 @@ GeeHashMap* photo_table_marshall_all_transformations (const gchar* trans) { _tmp17_ = objects; #line 798 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp17__length1 = objects_length1; -#line 5751 "PhotoTable.c" +#line 5729 "PhotoTable.c" { gchar** object_collection = NULL; gint object_collection_length1 = 0; @@ -5781,14 +5759,14 @@ GeeHashMap* photo_table_marshall_all_transformations (const gchar* trans) { object_collection_length1 = _tmp17__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 5763 "PhotoTable.c" +#line 5741 "PhotoTable.c" gchar* _tmp18_; gchar* object = NULL; #line 798 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp18_ = g_strdup (object_collection[object_it]); #line 798 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" object = _tmp18_; -#line 5770 "PhotoTable.c" +#line 5748 "PhotoTable.c" { gchar** keys = NULL; GKeyFile* _tmp19_; @@ -5828,7 +5806,7 @@ 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 5810 "PhotoTable.c" +#line 5788 "PhotoTable.c" goto __catch17_g_error; } #line 800 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -5839,7 +5817,7 @@ GeeHashMap* photo_table_marshall_all_transformations (const gchar* trans) { if (_tmp24_ == NULL) { #line 800 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp23_ = TRUE; -#line 5821 "PhotoTable.c" +#line 5799 "PhotoTable.c" } else { gchar** _tmp25_; gint _tmp25__length1; @@ -5849,7 +5827,7 @@ GeeHashMap* photo_table_marshall_all_transformations (const gchar* trans) { _tmp25__length1 = keys_length1; #line 800 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp23_ = _tmp25__length1 == 0; -#line 5831 "PhotoTable.c" +#line 5809 "PhotoTable.c" } #line 800 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (_tmp23_) { @@ -5859,7 +5837,7 @@ GeeHashMap* photo_table_marshall_all_transformations (const gchar* trans) { _g_free0 (object); #line 801 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" continue; -#line 5841 "PhotoTable.c" +#line 5819 "PhotoTable.c" } #line 803 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp26_ = object; @@ -5867,19 +5845,19 @@ GeeHashMap* photo_table_marshall_all_transformations (const gchar* trans) { _tmp27_ = key_value_map_new (_tmp26_); #line 803 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" key_map = _tmp27_; -#line 5849 "PhotoTable.c" +#line 5827 "PhotoTable.c" { gint ctr = 0; #line 804 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" ctr = 0; -#line 5854 "PhotoTable.c" +#line 5832 "PhotoTable.c" { gboolean _tmp28_ = FALSE; #line 804 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp28_ = TRUE; #line 804 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" while (TRUE) { -#line 5861 "PhotoTable.c" +#line 5839 "PhotoTable.c" gint _tmp30_; gchar** _tmp31_; gint _tmp31__length1; @@ -5898,13 +5876,13 @@ GeeHashMap* photo_table_marshall_all_transformations (const gchar* trans) { const gchar* _tmp42_; #line 804 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (!_tmp28_) { -#line 5880 "PhotoTable.c" +#line 5858 "PhotoTable.c" gint _tmp29_; #line 804 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp29_ = ctr; #line 804 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" ctr = _tmp29_ + 1; -#line 5886 "PhotoTable.c" +#line 5864 "PhotoTable.c" } #line 804 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp28_ = FALSE; @@ -5918,7 +5896,7 @@ GeeHashMap* photo_table_marshall_all_transformations (const gchar* trans) { if (!(_tmp30_ < _tmp31__length1)) { #line 804 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" break; -#line 5900 "PhotoTable.c" +#line 5878 "PhotoTable.c" } #line 805 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp33_ = keyfile; @@ -5950,7 +5928,7 @@ 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 5932 "PhotoTable.c" +#line 5910 "PhotoTable.c" goto __catch17_g_error; } #line 805 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -5967,7 +5945,7 @@ GeeHashMap* photo_table_marshall_all_transformations (const gchar* trans) { key_value_map_set_string (_tmp39_, _tmp42_, _tmp32_); #line 804 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_free0 (_tmp32_); -#line 5949 "PhotoTable.c" +#line 5927 "PhotoTable.c" } } } @@ -5985,7 +5963,7 @@ GeeHashMap* photo_table_marshall_all_transformations (const gchar* trans) { 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 5967 "PhotoTable.c" +#line 5945 "PhotoTable.c" } } } @@ -5997,7 +5975,7 @@ 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 5979 "PhotoTable.c" +#line 5957 "PhotoTable.c" } goto __finally17; __catch17_g_error: @@ -6014,7 +5992,7 @@ GeeHashMap* photo_table_marshall_all_transformations (const gchar* trans) { g_error ("PhotoTable.vala:812: %s", _tmp46_); #line 790 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_error_free0 (err); -#line 5996 "PhotoTable.c" +#line 5974 "PhotoTable.c" } __finally17: #line 790 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -6023,7 +6001,7 @@ 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 6005 "PhotoTable.c" +#line 5983 "PhotoTable.c" } @@ -6050,7 +6028,7 @@ gchar* photo_table_unmarshall_all_transformations (GeeHashMap* transformations) if (_tmp1_ == NULL) { #line 817 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp0_ = TRUE; -#line 6032 "PhotoTable.c" +#line 6010 "PhotoTable.c" } else { GeeHashMap* _tmp2_; GeeSet* _tmp3_; @@ -6074,7 +6052,7 @@ gchar* photo_table_unmarshall_all_transformations (GeeHashMap* transformations) _tmp0_ = _tmp7_ == 0; #line 817 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_object_unref0 (_tmp5_); -#line 6056 "PhotoTable.c" +#line 6034 "PhotoTable.c" } #line 817 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (_tmp0_) { @@ -6082,13 +6060,13 @@ gchar* photo_table_unmarshall_all_transformations (GeeHashMap* transformations) result = NULL; #line 818 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 6064 "PhotoTable.c" +#line 6042 "PhotoTable.c" } #line 820 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp8_ = g_key_file_new (); #line 820 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" keyfile = _tmp8_; -#line 6070 "PhotoTable.c" +#line 6048 "PhotoTable.c" { GeeIterator* _object_it = NULL; GeeHashMap* _tmp9_; @@ -6115,7 +6093,7 @@ gchar* photo_table_unmarshall_all_transformations (GeeHashMap* transformations) _object_it = _tmp14_; #line 822 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" while (TRUE) { -#line 6097 "PhotoTable.c" +#line 6075 "PhotoTable.c" GeeIterator* _tmp15_; gboolean _tmp16_; gchar* object = NULL; @@ -6133,7 +6111,7 @@ gchar* photo_table_unmarshall_all_transformations (GeeHashMap* transformations) if (!_tmp16_) { #line 822 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" break; -#line 6115 "PhotoTable.c" +#line 6093 "PhotoTable.c" } #line 822 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp17_ = _object_it; @@ -6149,7 +6127,7 @@ gchar* photo_table_unmarshall_all_transformations (GeeHashMap* transformations) _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 6131 "PhotoTable.c" +#line 6109 "PhotoTable.c" { GeeIterator* _key_it = NULL; KeyValueMap* _tmp22_; @@ -6173,7 +6151,7 @@ gchar* photo_table_unmarshall_all_transformations (GeeHashMap* transformations) _key_it = _tmp26_; #line 825 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" while (TRUE) { -#line 6155 "PhotoTable.c" +#line 6133 "PhotoTable.c" GeeIterator* _tmp27_; gboolean _tmp28_; gchar* key = NULL; @@ -6196,7 +6174,7 @@ gchar* photo_table_unmarshall_all_transformations (GeeHashMap* transformations) if (!_tmp28_) { #line 825 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" break; -#line 6178 "PhotoTable.c" +#line 6156 "PhotoTable.c" } #line 825 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp29_ = _key_it; @@ -6230,21 +6208,21 @@ gchar* photo_table_unmarshall_all_transformations (GeeHashMap* transformations) _g_free0 (value); #line 825 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_free0 (key); -#line 6212 "PhotoTable.c" +#line 6190 "PhotoTable.c" } #line 825 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_object_unref0 (_key_it); -#line 6216 "PhotoTable.c" +#line 6194 "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 6222 "PhotoTable.c" +#line 6200 "PhotoTable.c" } #line 822 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_object_unref0 (_object_it); -#line 6226 "PhotoTable.c" +#line 6204 "PhotoTable.c" } #line 834 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp39_ = keyfile; @@ -6272,7 +6250,7 @@ gchar* photo_table_unmarshall_all_transformations (GeeHashMap* transformations) _g_key_file_unref0 (keyfile); #line 838 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 6254 "PhotoTable.c" +#line 6232 "PhotoTable.c" } @@ -6297,7 +6275,7 @@ 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 6279 "PhotoTable.c" +#line 6257 "PhotoTable.c" { GKeyFile* keyfile = NULL; GKeyFile* _tmp2_; @@ -6321,7 +6299,7 @@ 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 6303 "PhotoTable.c" +#line 6281 "PhotoTable.c" gboolean _tmp4_ = FALSE; GKeyFile* _tmp5_; const gchar* _tmp6_; @@ -6347,7 +6325,7 @@ gboolean photo_table_set_transformation (PhotoTable* self, PhotoID* photo_id, Ke if (G_UNLIKELY (_inner_error_ != NULL)) { #line 847 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_key_file_unref0 (keyfile); -#line 6329 "PhotoTable.c" +#line 6307 "PhotoTable.c" goto __catch18_g_error; } #line 847 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -6360,7 +6338,7 @@ 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 6342 "PhotoTable.c" +#line 6320 "PhotoTable.c" } } #line 851 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -6369,7 +6347,7 @@ gboolean photo_table_set_transformation (PhotoTable* self, PhotoID* photo_id, Ke _tmp12_ = key_value_map_get_keys (_tmp11_); #line 851 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" keys = _tmp12_; -#line 6351 "PhotoTable.c" +#line 6329 "PhotoTable.c" { GeeIterator* _key_it = NULL; GeeSet* _tmp13_; @@ -6382,7 +6360,7 @@ gboolean photo_table_set_transformation (PhotoTable* self, PhotoID* photo_id, Ke _key_it = _tmp14_; #line 852 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" while (TRUE) { -#line 6364 "PhotoTable.c" +#line 6342 "PhotoTable.c" GeeIterator* _tmp15_; gboolean _tmp16_; gchar* key = NULL; @@ -6407,7 +6385,7 @@ gboolean photo_table_set_transformation (PhotoTable* self, PhotoID* photo_id, Ke if (!_tmp16_) { #line 852 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" break; -#line 6389 "PhotoTable.c" +#line 6367 "PhotoTable.c" } #line 852 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp17_ = _key_it; @@ -6447,11 +6425,11 @@ gboolean photo_table_set_transformation (PhotoTable* self, PhotoID* photo_id, Ke _g_free0 (value); #line 852 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_free0 (key); -#line 6429 "PhotoTable.c" +#line 6407 "PhotoTable.c" } #line 852 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_object_unref0 (_key_it); -#line 6433 "PhotoTable.c" +#line 6411 "PhotoTable.c" } #line 860 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp29_ = keyfile; @@ -6479,7 +6457,7 @@ gboolean photo_table_set_transformation (PhotoTable* self, PhotoID* photo_id, Ke _g_object_unref0 (keys); #line 844 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_key_file_unref0 (keyfile); -#line 6461 "PhotoTable.c" +#line 6439 "PhotoTable.c" } goto __finally18; __catch18_g_error: @@ -6496,12 +6474,12 @@ gboolean photo_table_set_transformation (PhotoTable* self, PhotoID* photo_id, Ke g_error ("PhotoTable.vala:864: %s", _tmp36_); #line 844 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_error_free0 (err); -#line 6478 "PhotoTable.c" +#line 6456 "PhotoTable.c" } __finally18: #line 844 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 6483 "PhotoTable.c" +#line 6461 "PhotoTable.c" gboolean _tmp37_ = FALSE; #line 844 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_free0 (trans); @@ -6511,7 +6489,7 @@ gboolean photo_table_set_transformation (PhotoTable* self, PhotoID* photo_id, Ke g_clear_error (&_inner_error_); #line 844 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return _tmp37_; -#line 6493 "PhotoTable.c" +#line 6471 "PhotoTable.c" } #line 867 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp38_ = *photo_id; @@ -6525,7 +6503,7 @@ gboolean photo_table_set_transformation (PhotoTable* self, PhotoID* photo_id, Ke _g_free0 (trans); #line 867 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 6507 "PhotoTable.c" +#line 6485 "PhotoTable.c" } @@ -6561,7 +6539,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 6543 "PhotoTable.c" +#line 6521 "PhotoTable.c" } { GKeyFile* keyfile = NULL; @@ -6605,7 +6583,7 @@ gboolean photo_table_remove_transformation (PhotoTable* self, PhotoID* photo_id, if (G_UNLIKELY (_inner_error_ != NULL)) { #line 877 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_key_file_unref0 (keyfile); -#line 6587 "PhotoTable.c" +#line 6565 "PhotoTable.c" goto __catch19_g_error; } #line 877 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -6618,7 +6596,7 @@ gboolean photo_table_remove_transformation (PhotoTable* self, PhotoID* photo_id, _g_free0 (trans); #line 878 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 6600 "PhotoTable.c" +#line 6578 "PhotoTable.c" } #line 880 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp11_ = keyfile; @@ -6636,7 +6614,7 @@ gboolean photo_table_remove_transformation (PhotoTable* self, PhotoID* photo_id, _g_free0 (trans); #line 881 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 6618 "PhotoTable.c" +#line 6596 "PhotoTable.c" } #line 883 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp14_ = keyfile; @@ -6648,7 +6626,7 @@ gboolean photo_table_remove_transformation (PhotoTable* self, PhotoID* photo_id, if (G_UNLIKELY (_inner_error_ != NULL)) { #line 883 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_key_file_unref0 (keyfile); -#line 6630 "PhotoTable.c" +#line 6608 "PhotoTable.c" goto __catch19_g_error; } #line 886 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -6667,7 +6645,7 @@ gboolean photo_table_remove_transformation (PhotoTable* self, PhotoID* photo_id, _vala_assert (_tmp19_ != NULL, "trans != null"); #line 875 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_key_file_unref0 (keyfile); -#line 6649 "PhotoTable.c" +#line 6627 "PhotoTable.c" } goto __finally19; __catch19_g_error: @@ -6684,12 +6662,12 @@ gboolean photo_table_remove_transformation (PhotoTable* self, PhotoID* photo_id, g_error ("PhotoTable.vala:889: %s", _tmp20_); #line 875 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_error_free0 (err); -#line 6666 "PhotoTable.c" +#line 6644 "PhotoTable.c" } __finally19: #line 875 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 6671 "PhotoTable.c" +#line 6649 "PhotoTable.c" gboolean _tmp21_ = FALSE; #line 875 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_free0 (trans); @@ -6699,7 +6677,7 @@ gboolean photo_table_remove_transformation (PhotoTable* self, PhotoID* photo_id, g_clear_error (&_inner_error_); #line 875 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return _tmp21_; -#line 6681 "PhotoTable.c" +#line 6659 "PhotoTable.c" } #line 892 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp22_ = *photo_id; @@ -6713,7 +6691,7 @@ gboolean photo_table_remove_transformation (PhotoTable* self, PhotoID* photo_id, _g_free0 (trans); #line 892 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 6695 "PhotoTable.c" +#line 6673 "PhotoTable.c" } @@ -6746,7 +6724,7 @@ gboolean photo_table_remove_all_transformations (PhotoTable* self, PhotoID* phot result = FALSE; #line 897 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 6728 "PhotoTable.c" +#line 6706 "PhotoTable.c" } #line 899 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp4_ = *photo_id; @@ -6758,7 +6736,7 @@ gboolean photo_table_remove_all_transformations (PhotoTable* self, PhotoID* phot result = _tmp6_; #line 899 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 6740 "PhotoTable.c" +#line 6718 "PhotoTable.c" } @@ -6797,27 +6775,27 @@ static sqlite3_stmt* photo_table_get_duplicate_stmt (PhotoTable* self, GFile* fi if (_tmp2_ != NULL) { #line 906 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp1_ = TRUE; -#line 6779 "PhotoTable.c" +#line 6757 "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 6786 "PhotoTable.c" +#line 6764 "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 6792 "PhotoTable.c" +#line 6770 "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 6799 "PhotoTable.c" +#line 6777 "PhotoTable.c" } #line 906 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _vala_assert (_tmp0_, "file != null || thumbnail_md5 != null || md5 != null"); @@ -6831,7 +6809,7 @@ static sqlite3_stmt* photo_table_get_duplicate_stmt (PhotoTable* self, GFile* fi _tmp6_ = file; #line 911 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (_tmp6_ != NULL) { -#line 6813 "PhotoTable.c" +#line 6791 "PhotoTable.c" const gchar* _tmp7_; gchar* _tmp8_; #line 912 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -6844,7 +6822,7 @@ static sqlite3_stmt* photo_table_get_duplicate_stmt (PhotoTable* self, GFile* fi sql = _tmp8_; #line 913 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" first = FALSE; -#line 6826 "PhotoTable.c" +#line 6804 "PhotoTable.c" } #line 916 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp10_ = thumbnail_md5; @@ -6852,18 +6830,18 @@ static sqlite3_stmt* photo_table_get_duplicate_stmt (PhotoTable* self, GFile* fi if (_tmp10_ != NULL) { #line 916 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp9_ = TRUE; -#line 6834 "PhotoTable.c" +#line 6812 "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 6841 "PhotoTable.c" +#line 6819 "PhotoTable.c" } #line 916 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (_tmp9_) { -#line 6845 "PhotoTable.c" +#line 6823 "PhotoTable.c" gboolean _tmp12_; const gchar* _tmp17_; const gchar* _tmp20_; @@ -6876,7 +6854,7 @@ static sqlite3_stmt* photo_table_get_duplicate_stmt (PhotoTable* self, GFile* fi _tmp12_ = first; #line 917 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (_tmp12_) { -#line 6858 "PhotoTable.c" +#line 6836 "PhotoTable.c" const gchar* _tmp13_; gchar* _tmp14_; #line 918 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -6887,7 +6865,7 @@ static sqlite3_stmt* photo_table_get_duplicate_stmt (PhotoTable* self, GFile* fi _g_free0 (sql); #line 918 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" sql = _tmp14_; -#line 6869 "PhotoTable.c" +#line 6847 "PhotoTable.c" } else { const gchar* _tmp15_; gchar* _tmp16_; @@ -6899,7 +6877,7 @@ static sqlite3_stmt* photo_table_get_duplicate_stmt (PhotoTable* self, GFile* fi _g_free0 (sql); #line 920 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" sql = _tmp16_; -#line 6881 "PhotoTable.c" +#line 6859 "PhotoTable.c" } #line 921 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" first = FALSE; @@ -6907,7 +6885,7 @@ static sqlite3_stmt* photo_table_get_duplicate_stmt (PhotoTable* self, GFile* fi _tmp17_ = md5; #line 923 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (_tmp17_ != NULL) { -#line 6889 "PhotoTable.c" +#line 6867 "PhotoTable.c" const gchar* _tmp18_; gchar* _tmp19_; #line 924 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -6918,19 +6896,19 @@ static sqlite3_stmt* photo_table_get_duplicate_stmt (PhotoTable* self, GFile* fi _g_free0 (sql); #line 924 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" sql = _tmp19_; -#line 6900 "PhotoTable.c" +#line 6878 "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 6906 "PhotoTable.c" +#line 6884 "PhotoTable.c" const gchar* _tmp21_; #line 928 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp21_ = md5; #line 928 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (_tmp21_ == NULL) { -#line 6912 "PhotoTable.c" +#line 6890 "PhotoTable.c" const gchar* _tmp22_; gchar* _tmp23_; #line 929 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -6941,7 +6919,7 @@ static sqlite3_stmt* photo_table_get_duplicate_stmt (PhotoTable* self, GFile* fi _g_free0 (sql); #line 929 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" sql = _tmp23_; -#line 6923 "PhotoTable.c" +#line 6901 "PhotoTable.c" } else { const gchar* _tmp24_; gchar* _tmp25_; @@ -6953,7 +6931,7 @@ static sqlite3_stmt* photo_table_get_duplicate_stmt (PhotoTable* self, GFile* fi _g_free0 (sql); #line 931 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" sql = _tmp25_; -#line 6935 "PhotoTable.c" +#line 6913 "PhotoTable.c" } } #line 934 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -6968,7 +6946,7 @@ static sqlite3_stmt* photo_table_get_duplicate_stmt (PhotoTable* self, GFile* fi _tmp28_ = file_format; #line 936 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (_tmp28_ != PHOTO_FILE_FORMAT_UNKNOWN) { -#line 6950 "PhotoTable.c" +#line 6928 "PhotoTable.c" const gchar* _tmp29_; gchar* _tmp30_; #line 937 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -6979,7 +6957,7 @@ static sqlite3_stmt* photo_table_get_duplicate_stmt (PhotoTable* self, GFile* fi _g_free0 (sql); #line 937 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" sql = _tmp30_; -#line 6961 "PhotoTable.c" +#line 6939 "PhotoTable.c" } #line 939 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp31_ = sql; @@ -6989,7 +6967,7 @@ static sqlite3_stmt* photo_table_get_duplicate_stmt (PhotoTable* self, GFile* fi _g_free0 (sql); #line 939 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" sql = _tmp32_; -#line 6971 "PhotoTable.c" +#line 6949 "PhotoTable.c" } #line 943 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp33_ = database_table_db; @@ -7013,7 +6991,7 @@ static sqlite3_stmt* photo_table_get_duplicate_stmt (PhotoTable* self, GFile* fi _tmp38_ = file; #line 948 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (_tmp38_ != NULL) { -#line 6995 "PhotoTable.c" +#line 6973 "PhotoTable.c" sqlite3_stmt* _tmp39_; gint _tmp40_; GFile* _tmp41_; @@ -7041,13 +7019,13 @@ static sqlite3_stmt* photo_table_get_duplicate_stmt (PhotoTable* self, GFile* fi _tmp45_ = res; #line 950 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _vala_assert (_tmp45_ == SQLITE_OK, "res == Sqlite.OK"); -#line 7023 "PhotoTable.c" +#line 7001 "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 7029 "PhotoTable.c" +#line 7007 "PhotoTable.c" sqlite3_stmt* _tmp47_; gint _tmp48_; const gchar* _tmp49_; @@ -7075,13 +7053,13 @@ static sqlite3_stmt* photo_table_get_duplicate_stmt (PhotoTable* self, GFile* fi _tmp53_ = res; #line 955 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _vala_assert (_tmp53_ == SQLITE_OK, "res == Sqlite.OK"); -#line 7057 "PhotoTable.c" +#line 7035 "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 7063 "PhotoTable.c" +#line 7041 "PhotoTable.c" sqlite3_stmt* _tmp55_; gint _tmp56_; const gchar* _tmp57_; @@ -7109,7 +7087,7 @@ static sqlite3_stmt* photo_table_get_duplicate_stmt (PhotoTable* self, GFile* fi _tmp61_ = res; #line 960 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _vala_assert (_tmp61_ == SQLITE_OK, "res == Sqlite.OK"); -#line 7091 "PhotoTable.c" +#line 7069 "PhotoTable.c" } #line 963 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp64_ = thumbnail_md5; @@ -7117,32 +7095,32 @@ static sqlite3_stmt* photo_table_get_duplicate_stmt (PhotoTable* self, GFile* fi if (_tmp64_ != NULL) { #line 963 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp63_ = TRUE; -#line 7099 "PhotoTable.c" +#line 7077 "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 7106 "PhotoTable.c" +#line 7084 "PhotoTable.c" } #line 963 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (_tmp63_) { -#line 7110 "PhotoTable.c" +#line 7088 "PhotoTable.c" PhotoFileFormat _tmp66_; #line 963 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp66_ = file_format; #line 963 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp62_ = _tmp66_ != PHOTO_FILE_FORMAT_UNKNOWN; -#line 7116 "PhotoTable.c" +#line 7094 "PhotoTable.c" } else { #line 963 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp62_ = FALSE; -#line 7120 "PhotoTable.c" +#line 7098 "PhotoTable.c" } #line 963 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (_tmp62_) { -#line 7124 "PhotoTable.c" +#line 7102 "PhotoTable.c" sqlite3_stmt* _tmp67_; gint _tmp68_; PhotoFileFormat _tmp69_; @@ -7167,7 +7145,7 @@ static sqlite3_stmt* photo_table_get_duplicate_stmt (PhotoTable* self, GFile* fi _tmp72_ = res; #line 965 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _vala_assert (_tmp72_ == SQLITE_OK, "res == Sqlite.OK"); -#line 7149 "PhotoTable.c" +#line 7127 "PhotoTable.c" } #line 968 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" result = stmt; @@ -7175,7 +7153,7 @@ static sqlite3_stmt* photo_table_get_duplicate_stmt (PhotoTable* self, GFile* fi _g_free0 (sql); #line 968 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 7157 "PhotoTable.c" +#line 7135 "PhotoTable.c" } @@ -7223,7 +7201,7 @@ gboolean photo_table_has_duplicate (PhotoTable* self, GFile* file, const gchar* _sqlite3_finalize0 (stmt); #line 977 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 7205 "PhotoTable.c" +#line 7183 "PhotoTable.c" } else { gint _tmp8_; #line 978 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -7236,7 +7214,7 @@ gboolean photo_table_has_duplicate (PhotoTable* self, GFile* file, const gchar* _sqlite3_finalize0 (stmt); #line 980 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 7218 "PhotoTable.c" +#line 7196 "PhotoTable.c" } else { gint _tmp9_; #line 982 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -7249,12 +7227,12 @@ gboolean photo_table_has_duplicate (PhotoTable* self, GFile* file, const gchar* _sqlite3_finalize0 (stmt); #line 984 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 7231 "PhotoTable.c" +#line 7209 "PhotoTable.c" } } #line 971 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _sqlite3_finalize0 (stmt); -#line 7236 "PhotoTable.c" +#line 7214 "PhotoTable.c" } @@ -7265,11 +7243,11 @@ static void _vala_array_add2 (PhotoID* * array, int* length, int* size, const Ph *size = (*size) ? (2 * (*size)) : 4; #line 996 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" *array = g_renew (PhotoID, *array, *size); -#line 7247 "PhotoTable.c" +#line 7225 "PhotoTable.c" } #line 996 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" (*array)[(*length)++] = *value; -#line 7251 "PhotoTable.c" +#line 7229 "PhotoTable.c" } @@ -7322,7 +7300,7 @@ PhotoID* photo_table_get_duplicate_ids (PhotoTable* self, GFile* file, const gch res = _tmp7_; #line 995 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" while (TRUE) { -#line 7304 "PhotoTable.c" +#line 7282 "PhotoTable.c" gint _tmp8_; PhotoID* _tmp9_; gint _tmp9__length1; @@ -7337,7 +7315,7 @@ PhotoID* photo_table_get_duplicate_ids (PhotoTable* self, GFile* file, const gch if (!(_tmp8_ == SQLITE_ROW)) { #line 995 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" break; -#line 7319 "PhotoTable.c" +#line 7297 "PhotoTable.c" } #line 996 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp9_ = ids; @@ -7357,7 +7335,7 @@ PhotoID* photo_table_get_duplicate_ids (PhotoTable* self, GFile* file, const gch _tmp14_ = sqlite3_step (_tmp13_); #line 997 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" res = _tmp14_; -#line 7339 "PhotoTable.c" +#line 7317 "PhotoTable.c" } #line 1000 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp15_ = ids; @@ -7367,7 +7345,7 @@ PhotoID* photo_table_get_duplicate_ids (PhotoTable* self, GFile* file, const gch if (result_length1) { #line 1000 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" *result_length1 = _tmp15__length1; -#line 7349 "PhotoTable.c" +#line 7327 "PhotoTable.c" } #line 1000 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" result = _tmp15_; @@ -7375,7 +7353,7 @@ PhotoID* photo_table_get_duplicate_ids (PhotoTable* self, GFile* file, const gch _sqlite3_finalize0 (stmt); #line 1000 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 7357 "PhotoTable.c" +#line 7335 "PhotoTable.c" } @@ -7393,17 +7371,17 @@ void photo_table_update_backlinks (PhotoTable* self, PhotoID* photo_id, const gc _tmp1_ = backlinks; #line 1004 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (_tmp1_ != NULL) { -#line 7375 "PhotoTable.c" +#line 7353 "PhotoTable.c" const gchar* _tmp2_; #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 7381 "PhotoTable.c" +#line 7359 "PhotoTable.c" } else { #line 1004 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp0_ = ""; -#line 7385 "PhotoTable.c" +#line 7363 "PhotoTable.c" } #line 1004 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp3_ = *photo_id; @@ -7419,7 +7397,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 7401 "PhotoTable.c" +#line 7379 "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); @@ -7427,7 +7405,7 @@ void photo_table_update_backlinks (PhotoTable* self, PhotoID* photo_id, const gc g_clear_error (&_inner_error_); #line 1004 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; -#line 7409 "PhotoTable.c" +#line 7387 "PhotoTable.c" } } } @@ -7468,7 +7446,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 7450 "PhotoTable.c" +#line 7428 "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); @@ -7476,7 +7454,7 @@ void photo_table_attach_editable (PhotoTable* self, PhotoRow* row, BackingPhotoI g_clear_error (&_inner_error_); #line 1008 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; -#line 7458 "PhotoTable.c" +#line 7436 "PhotoTable.c" } } #line 1010 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -7485,7 +7463,7 @@ void photo_table_attach_editable (PhotoTable* self, PhotoRow* row, BackingPhotoI _tmp6_ = *editable_id; #line 1010 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp5_->editable_id = _tmp6_; -#line 7467 "PhotoTable.c" +#line 7445 "PhotoTable.c" } @@ -7515,7 +7493,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 7497 "PhotoTable.c" +#line 7475 "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); @@ -7523,14 +7501,14 @@ void photo_table_detach_editable (PhotoTable* self, PhotoRow* row, GError** erro g_clear_error (&_inner_error_); #line 1014 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; -#line 7505 "PhotoTable.c" +#line 7483 "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 7512 "PhotoTable.c" +#line 7490 "PhotoTable.c" } @@ -7550,11 +7528,11 @@ void photo_table_set_metadata_dirty (PhotoTable* self, PhotoID* photo_id, gboole if (_tmp1_) { #line 1020 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp0_ = 1; -#line 7532 "PhotoTable.c" +#line 7510 "PhotoTable.c" } else { #line 1020 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp0_ = 0; -#line 7536 "PhotoTable.c" +#line 7514 "PhotoTable.c" } #line 1020 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp2_ = *photo_id; @@ -7570,7 +7548,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 7552 "PhotoTable.c" +#line 7530 "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); @@ -7578,7 +7556,7 @@ void photo_table_set_metadata_dirty (PhotoTable* self, PhotoID* photo_id, gboole g_clear_error (&_inner_error_); #line 1020 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; -#line 7560 "PhotoTable.c" +#line 7538 "PhotoTable.c" } } } @@ -7614,7 +7592,7 @@ void photo_table_update_raw_development (PhotoTable* self, PhotoRow* row, RawDev switch (_tmp0_) { #line 1027 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" case RAW_DEVELOPER_SHOTWELL: -#line 7596 "PhotoTable.c" +#line 7574 "PhotoTable.c" { gchar* _tmp1_; #line 1029 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -7625,11 +7603,11 @@ void photo_table_update_raw_development (PhotoTable* self, PhotoRow* row, RawDev col = _tmp1_; #line 1030 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" break; -#line 7607 "PhotoTable.c" +#line 7585 "PhotoTable.c" } #line 1027 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" case RAW_DEVELOPER_CAMERA: -#line 7611 "PhotoTable.c" +#line 7589 "PhotoTable.c" { gchar* _tmp2_; #line 1033 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -7640,11 +7618,11 @@ void photo_table_update_raw_development (PhotoTable* self, PhotoRow* row, RawDev col = _tmp2_; #line 1034 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" break; -#line 7622 "PhotoTable.c" +#line 7600 "PhotoTable.c" } #line 1027 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" case RAW_DEVELOPER_EMBEDDED: -#line 7626 "PhotoTable.c" +#line 7604 "PhotoTable.c" { gchar* _tmp3_; #line 1037 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -7655,13 +7633,13 @@ void photo_table_update_raw_development (PhotoTable* self, PhotoRow* row, RawDev col = _tmp3_; #line 1038 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" break; -#line 7637 "PhotoTable.c" +#line 7615 "PhotoTable.c" } default: { #line 1041 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_assert_not_reached (); -#line 7643 "PhotoTable.c" +#line 7621 "PhotoTable.c" } } #line 1044 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -7702,7 +7680,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 7684 "PhotoTable.c" +#line 7662 "PhotoTable.c" } else { #line 1045 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_free0 (col); @@ -7712,7 +7690,7 @@ void photo_table_update_raw_development (PhotoTable* self, PhotoRow* row, RawDev g_clear_error (&_inner_error_); #line 1045 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; -#line 7694 "PhotoTable.c" +#line 7672 "PhotoTable.c" } } #line 1047 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -7721,7 +7699,7 @@ void photo_table_update_raw_development (PhotoTable* self, PhotoRow* row, RawDev _tmp16_ = _tmp15_.id; #line 1047 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (_tmp16_ != BACKING_PHOTO_ID_INVALID) { -#line 7703 "PhotoTable.c" +#line 7681 "PhotoTable.c" PhotoRow* _tmp17_; PhotoID _tmp18_; gint64 _tmp19_; @@ -7754,7 +7732,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 7736 "PhotoTable.c" +#line 7714 "PhotoTable.c" } else { #line 1048 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_free0 (col); @@ -7764,13 +7742,13 @@ void photo_table_update_raw_development (PhotoTable* self, PhotoRow* row, RawDev g_clear_error (&_inner_error_); #line 1048 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; -#line 7746 "PhotoTable.c" +#line 7724 "PhotoTable.c" } } } #line 1023 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_free0 (col); -#line 7752 "PhotoTable.c" +#line 7730 "PhotoTable.c" } @@ -7799,7 +7777,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 7781 "PhotoTable.c" +#line 7759 "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); @@ -7807,7 +7785,7 @@ void photo_table_remove_development (PhotoTable* self, PhotoRow* row, RawDevelop g_clear_error (&_inner_error_); #line 1052 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; -#line 7789 "PhotoTable.c" +#line 7767 "PhotoTable.c" } } } @@ -7818,7 +7796,7 @@ static void photo_table_class_init (PhotoTableClass * klass) { photo_table_parent_class = g_type_class_peek_parent (klass); #line 109 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" ((DatabaseTableClass *) klass)->finalize = photo_table_finalize; -#line 7800 "PhotoTable.c" +#line 7778 "PhotoTable.c" } @@ -7832,7 +7810,7 @@ static void photo_table_finalize (DatabaseTable * obj) { self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PHOTO_TABLE, PhotoTable); #line 109 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" DATABASE_TABLE_CLASS (photo_table_parent_class)->finalize (obj); -#line 7814 "PhotoTable.c" +#line 7792 "PhotoTable.c" } @@ -7856,7 +7834,7 @@ void backing_photo_id_init (BackingPhotoID *self, gint64 id) { _tmp0_ = id; #line 1073 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" (*self).id = _tmp0_; -#line 7838 "PhotoTable.c" +#line 7816 "PhotoTable.c" } @@ -7869,7 +7847,7 @@ gboolean backing_photo_id_is_invalid (BackingPhotoID *self) { result = _tmp0_ == BACKING_PHOTO_ID_INVALID; #line 1077 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 7851 "PhotoTable.c" +#line 7829 "PhotoTable.c" } @@ -7882,7 +7860,7 @@ gboolean backing_photo_id_is_valid (BackingPhotoID *self) { result = _tmp0_ != BACKING_PHOTO_ID_INVALID; #line 1081 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 7864 "PhotoTable.c" +#line 7842 "PhotoTable.c" } @@ -7894,14 +7872,14 @@ BackingPhotoID* backing_photo_id_dup (const BackingPhotoID* self) { memcpy (dup, self, sizeof (BackingPhotoID)); #line 1067 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return dup; -#line 7876 "PhotoTable.c" +#line 7854 "PhotoTable.c" } void backing_photo_id_free (BackingPhotoID* self) { #line 1067 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_free (self); -#line 7883 "PhotoTable.c" +#line 7861 "PhotoTable.c" } @@ -7941,7 +7919,7 @@ gboolean backing_photo_row_matches_file_info (BackingPhotoRow* self, GFileInfo* result = FALSE; #line 1097 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 7923 "PhotoTable.c" +#line 7901 "PhotoTable.c" } #line 1099 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp3_ = self->timestamp; @@ -7955,7 +7933,7 @@ gboolean backing_photo_row_matches_file_info (BackingPhotoRow* self, GFileInfo* result = _tmp3_ == ((time_t) _tmp6_); #line 1099 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 7937 "PhotoTable.c" +#line 7915 "PhotoTable.c" } @@ -7984,7 +7962,7 @@ gboolean backing_photo_row_is_touched (BackingPhotoRow* self, GFileInfo* info) { result = FALSE; #line 1104 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 7966 "PhotoTable.c" +#line 7944 "PhotoTable.c" } #line 1106 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp3_ = self->timestamp; @@ -7998,7 +7976,7 @@ gboolean backing_photo_row_is_touched (BackingPhotoRow* self, GFileInfo* info) { result = _tmp3_ != ((time_t) _tmp6_); #line 1106 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 7980 "PhotoTable.c" +#line 7958 "PhotoTable.c" } @@ -8076,7 +8054,7 @@ void backing_photo_row_copy_from (BackingPhotoRow* self, BackingPhotoRow* from) _tmp16_ = _tmp15_->original_orientation; #line 1118 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" self->original_orientation = _tmp16_; -#line 8058 "PhotoTable.c" +#line 8036 "PhotoTable.c" } @@ -8086,21 +8064,21 @@ BackingPhotoRow* backing_photo_row_construct (GType object_type) { self = (BackingPhotoRow*) g_type_create_instance (object_type); #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return self; -#line 8068 "PhotoTable.c" +#line 8046 "PhotoTable.c" } BackingPhotoRow* backing_photo_row_new (void) { #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return backing_photo_row_construct (TYPE_BACKING_PHOTO_ROW); -#line 8075 "PhotoTable.c" +#line 8053 "PhotoTable.c" } static void value_backing_photo_row_init (GValue* value) { #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" value->data[0].v_pointer = NULL; -#line 8082 "PhotoTable.c" +#line 8060 "PhotoTable.c" } @@ -8109,7 +8087,7 @@ static void value_backing_photo_row_free_value (GValue* value) { if (value->data[0].v_pointer) { #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" backing_photo_row_unref (value->data[0].v_pointer); -#line 8091 "PhotoTable.c" +#line 8069 "PhotoTable.c" } } @@ -8119,11 +8097,11 @@ static void value_backing_photo_row_copy_value (const GValue* src_value, GValue* if (src_value->data[0].v_pointer) { #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" dest_value->data[0].v_pointer = backing_photo_row_ref (src_value->data[0].v_pointer); -#line 8101 "PhotoTable.c" +#line 8079 "PhotoTable.c" } else { #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" dest_value->data[0].v_pointer = NULL; -#line 8105 "PhotoTable.c" +#line 8083 "PhotoTable.c" } } @@ -8131,37 +8109,37 @@ static void value_backing_photo_row_copy_value (const GValue* src_value, GValue* static gpointer value_backing_photo_row_peek_pointer (const GValue* value) { #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return value->data[0].v_pointer; -#line 8113 "PhotoTable.c" +#line 8091 "PhotoTable.c" } static gchar* value_backing_photo_row_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (collect_values[0].v_pointer) { -#line 8120 "PhotoTable.c" +#line 8098 "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 8127 "PhotoTable.c" +#line 8105 "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 8131 "PhotoTable.c" +#line 8109 "PhotoTable.c" } #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" value->data[0].v_pointer = backing_photo_row_ref (object); -#line 8135 "PhotoTable.c" +#line 8113 "PhotoTable.c" } else { #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" value->data[0].v_pointer = NULL; -#line 8139 "PhotoTable.c" +#line 8117 "PhotoTable.c" } #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return NULL; -#line 8143 "PhotoTable.c" +#line 8121 "PhotoTable.c" } @@ -8172,25 +8150,25 @@ static gchar* value_backing_photo_row_lcopy_value (const GValue* value, guint n_ if (!object_p) { #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 8154 "PhotoTable.c" +#line 8132 "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 8160 "PhotoTable.c" +#line 8138 "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 8164 "PhotoTable.c" +#line 8142 "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 8168 "PhotoTable.c" +#line 8146 "PhotoTable.c" } #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return NULL; -#line 8172 "PhotoTable.c" +#line 8150 "PhotoTable.c" } @@ -8204,7 +8182,7 @@ GParamSpec* param_spec_backing_photo_row (const gchar* name, const gchar* nick, G_PARAM_SPEC (spec)->value_type = object_type; #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return G_PARAM_SPEC (spec); -#line 8186 "PhotoTable.c" +#line 8164 "PhotoTable.c" } @@ -8213,7 +8191,7 @@ gpointer value_get_backing_photo_row (const GValue* value) { g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_BACKING_PHOTO_ROW), NULL); #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return value->data[0].v_pointer; -#line 8195 "PhotoTable.c" +#line 8173 "PhotoTable.c" } @@ -8233,17 +8211,17 @@ void value_set_backing_photo_row (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" backing_photo_row_ref (value->data[0].v_pointer); -#line 8215 "PhotoTable.c" +#line 8193 "PhotoTable.c" } else { #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" value->data[0].v_pointer = NULL; -#line 8219 "PhotoTable.c" +#line 8197 "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 8225 "PhotoTable.c" +#line 8203 "PhotoTable.c" } } @@ -8262,17 +8240,17 @@ void value_take_backing_photo_row (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" value->data[0].v_pointer = v_object; -#line 8244 "PhotoTable.c" +#line 8222 "PhotoTable.c" } else { #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" value->data[0].v_pointer = NULL; -#line 8248 "PhotoTable.c" +#line 8226 "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 8254 "PhotoTable.c" +#line 8232 "PhotoTable.c" } } @@ -8282,7 +8260,7 @@ static void backing_photo_row_class_init (BackingPhotoRowClass * klass) { backing_photo_row_parent_class = g_type_class_peek_parent (klass); #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" ((BackingPhotoRowClass *) klass)->finalize = backing_photo_row_finalize; -#line 8264 "PhotoTable.c" +#line 8242 "PhotoTable.c" } @@ -8291,7 +8269,7 @@ static void backing_photo_row_instance_init (BackingPhotoRow * self) { self->filepath = NULL; #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" self->ref_count = 1; -#line 8273 "PhotoTable.c" +#line 8251 "PhotoTable.c" } @@ -8303,7 +8281,7 @@ static void backing_photo_row_finalize (BackingPhotoRow * obj) { g_signal_handlers_destroy (self); #line 1088 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _g_free0 (self->filepath); -#line 8285 "PhotoTable.c" +#line 8263 "PhotoTable.c" } @@ -8328,7 +8306,7 @@ gpointer backing_photo_row_ref (gpointer instance) { g_atomic_int_inc (&self->ref_count); #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return instance; -#line 8310 "PhotoTable.c" +#line 8288 "PhotoTable.c" } @@ -8341,7 +8319,7 @@ void backing_photo_row_unref (gpointer instance) { BACKING_PHOTO_ROW_GET_CLASS (self)->finalize (self); #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_type_free_instance ((GTypeInstance *) self); -#line 8323 "PhotoTable.c" +#line 8301 "PhotoTable.c" } } @@ -8385,26 +8363,26 @@ static BackingPhotoTable* backing_photo_table_construct (GType object_type) { _tmp6_ = res; #line 1145 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (_tmp6_ != SQLITE_DONE) { -#line 8367 "PhotoTable.c" +#line 8345 "PhotoTable.c" gint _tmp7_; #line 1146 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp7_ = res; #line 1146 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" database_table_fatal ("create PhotoBackingTable", _tmp7_); -#line 8373 "PhotoTable.c" +#line 8351 "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 8379 "PhotoTable.c" +#line 8357 "PhotoTable.c" } static BackingPhotoTable* backing_photo_table_new (void) { #line 1125 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return backing_photo_table_construct (TYPE_BACKING_PHOTO_TABLE); -#line 8386 "PhotoTable.c" +#line 8364 "PhotoTable.c" } @@ -8417,7 +8395,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 8399 "PhotoTable.c" +#line 8377 "PhotoTable.c" BackingPhotoTable* _tmp1_; #line 1151 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp1_ = backing_photo_table_new (); @@ -8425,7 +8403,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 8407 "PhotoTable.c" +#line 8385 "PhotoTable.c" } #line 1153 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp2_ = backing_photo_table_instance; @@ -8435,7 +8413,7 @@ BackingPhotoTable* backing_photo_table_get_instance (void) { result = _tmp3_; #line 1153 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 8417 "PhotoTable.c" +#line 8395 "PhotoTable.c" } @@ -8653,7 +8631,7 @@ void backing_photo_table_add (BackingPhotoTable* self, BackingPhotoRow* state, G _tmp51_ = res; #line 1185 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (_tmp51_ != SQLITE_DONE) { -#line 8635 "PhotoTable.c" +#line 8613 "PhotoTable.c" gint _tmp52_; #line 1186 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp52_ = res; @@ -8669,7 +8647,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 8651 "PhotoTable.c" +#line 8629 "PhotoTable.c" } else { #line 1186 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _sqlite3_finalize0 (stmt); @@ -8679,7 +8657,7 @@ void backing_photo_table_add (BackingPhotoTable* self, BackingPhotoRow* state, G g_clear_error (&_inner_error_); #line 1186 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; -#line 8661 "PhotoTable.c" +#line 8639 "PhotoTable.c" } } } @@ -8699,7 +8677,7 @@ void backing_photo_table_add (BackingPhotoTable* self, BackingPhotoRow* state, G _tmp56_->time_created = _tmp57_; #line 1156 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _sqlite3_finalize0 (stmt); -#line 8681 "PhotoTable.c" +#line 8659 "PhotoTable.c" } @@ -8798,14 +8776,14 @@ BackingPhotoRow* backing_photo_table_fetch (BackingPhotoTable* self, BackingPhot _sqlite3_finalize0 (stmt); #line 1204 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 8779 "PhotoTable.c" +#line 8757 "PhotoTable.c" } else { gint _tmp12_; #line 1205 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp12_ = res; #line 1205 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (_tmp12_ != SQLITE_ROW) { -#line 8786 "PhotoTable.c" +#line 8764 "PhotoTable.c" gint _tmp13_; #line 1206 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp13_ = res; @@ -8821,7 +8799,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 8802 "PhotoTable.c" +#line 8780 "PhotoTable.c" } else { #line 1206 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _sqlite3_finalize0 (stmt); @@ -8831,7 +8809,7 @@ BackingPhotoRow* backing_photo_table_fetch (BackingPhotoTable* self, BackingPhot g_clear_error (&_inner_error_); #line 1206 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return NULL; -#line 8812 "PhotoTable.c" +#line 8790 "PhotoTable.c" } } } @@ -8918,7 +8896,7 @@ BackingPhotoRow* backing_photo_table_fetch (BackingPhotoTable* self, BackingPhot _sqlite3_finalize0 (stmt); #line 1218 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return result; -#line 8899 "PhotoTable.c" +#line 8877 "PhotoTable.c" } @@ -9106,7 +9084,7 @@ void backing_photo_table_update (BackingPhotoTable* self, BackingPhotoRow* row, _tmp45_ = res; #line 1246 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (_tmp45_ != SQLITE_DONE) { -#line 9087 "PhotoTable.c" +#line 9065 "PhotoTable.c" gint _tmp46_; #line 1247 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp46_ = res; @@ -9122,7 +9100,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 9103 "PhotoTable.c" +#line 9081 "PhotoTable.c" } else { #line 1247 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _sqlite3_finalize0 (stmt); @@ -9132,13 +9110,13 @@ void backing_photo_table_update (BackingPhotoTable* self, BackingPhotoRow* row, g_clear_error (&_inner_error_); #line 1247 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; -#line 9113 "PhotoTable.c" +#line 9091 "PhotoTable.c" } } } #line 1222 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _sqlite3_finalize0 (stmt); -#line 9119 "PhotoTable.c" +#line 9097 "PhotoTable.c" } @@ -9232,7 +9210,7 @@ void backing_photo_table_update_attributes (BackingPhotoTable* self, BackingPhot _tmp19_ = res; #line 1264 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (_tmp19_ != SQLITE_DONE) { -#line 9213 "PhotoTable.c" +#line 9191 "PhotoTable.c" gint _tmp20_; #line 1265 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp20_ = res; @@ -9248,7 +9226,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 9229 "PhotoTable.c" +#line 9207 "PhotoTable.c" } else { #line 1265 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _sqlite3_finalize0 (stmt); @@ -9258,13 +9236,13 @@ void backing_photo_table_update_attributes (BackingPhotoTable* self, BackingPhot g_clear_error (&_inner_error_); #line 1265 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; -#line 9239 "PhotoTable.c" +#line 9217 "PhotoTable.c" } } } #line 1250 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _sqlite3_finalize0 (stmt); -#line 9245 "PhotoTable.c" +#line 9223 "PhotoTable.c" } @@ -9290,7 +9268,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 9271 "PhotoTable.c" +#line 9249 "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); @@ -9298,7 +9276,7 @@ void backing_photo_table_remove (BackingPhotoTable* self, BackingPhotoID* backin g_clear_error (&_inner_error_); #line 1269 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; -#line 9279 "PhotoTable.c" +#line 9257 "PhotoTable.c" } } } @@ -9331,7 +9309,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 9312 "PhotoTable.c" +#line 9290 "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); @@ -9339,7 +9317,7 @@ void backing_photo_table_set_filepath (BackingPhotoTable* self, BackingPhotoID* g_clear_error (&_inner_error_); #line 1273 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; -#line 9320 "PhotoTable.c" +#line 9298 "PhotoTable.c" } } } @@ -9370,7 +9348,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 9351 "PhotoTable.c" +#line 9329 "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); @@ -9378,7 +9356,7 @@ void backing_photo_table_update_timestamp (BackingPhotoTable* self, BackingPhoto g_clear_error (&_inner_error_); #line 1277 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" return; -#line 9359 "PhotoTable.c" +#line 9337 "PhotoTable.c" } } } @@ -9389,7 +9367,7 @@ static void backing_photo_table_class_init (BackingPhotoTableClass * klass) { backing_photo_table_parent_class = g_type_class_peek_parent (klass); #line 1122 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" ((DatabaseTableClass *) klass)->finalize = backing_photo_table_finalize; -#line 9370 "PhotoTable.c" +#line 9348 "PhotoTable.c" } @@ -9403,7 +9381,7 @@ static void backing_photo_table_finalize (DatabaseTable * obj) { self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_BACKING_PHOTO_TABLE, BackingPhotoTable); #line 1122 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" DATABASE_TABLE_CLASS (backing_photo_table_parent_class)->finalize (obj); -#line 9384 "PhotoTable.c" +#line 9362 "PhotoTable.c" } -- cgit v1.2.3