diff options
Diffstat (limited to 'plugins/shotwell-data-imports/FSpotMetaTable.c')
| -rw-r--r-- | plugins/shotwell-data-imports/FSpotMetaTable.c | 59 |
1 files changed, 31 insertions, 28 deletions
diff --git a/plugins/shotwell-data-imports/FSpotMetaTable.c b/plugins/shotwell-data-imports/FSpotMetaTable.c index 3be8630..55e20af 100644 --- a/plugins/shotwell-data-imports/FSpotMetaTable.c +++ b/plugins/shotwell-data-imports/FSpotMetaTable.c @@ -1,4 +1,4 @@ -/* FSpotMetaTable.c generated by valac 0.34.4, the Vala compiler +/* FSpotMetaTable.c generated by valac 0.34.7, the Vala compiler * generated from FSpotMetaTable.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -273,7 +273,7 @@ DataImportsFSpotDbFSpotMetaTable* data_imports_fspot_db_fspot_meta_table_constru #line 35 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala" _tmp0_ = db; #line 35 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala" - self = (DataImportsFSpotDbFSpotMetaTable*) data_imports_fspot_db_fspot_database_table_construct (object_type, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_META_ROW, (GBoxedCopyFunc) g_object_ref, g_object_unref, _tmp0_); + self = (DataImportsFSpotDbFSpotMetaTable*) data_imports_fspot_db_fspot_database_table_construct (object_type, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_META_ROW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, _tmp0_); #line 36 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala" _tmp1_ = data_imports_fspot_db_fspot_meta_behavior_get_instance (); #line 36 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala" @@ -1142,34 +1142,37 @@ gint64 data_imports_fspot_db_fspot_meta_table_get_hidden_tag_id (DataImportsFSpo if (G_UNLIKELY (_inner_error_ != NULL)) { #line 74 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala" if (_inner_error_->domain == DATABASE_ERROR) { +#line 1146 "FSpotMetaTable.c" + gint64 _tmp1_ = 0LL; #line 74 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala" g_propagate_error (error, _inner_error_); #line 74 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala" - return 0LL; -#line 1150 "FSpotMetaTable.c" + return _tmp1_; +#line 1152 "FSpotMetaTable.c" } else { + gint64 _tmp2_ = 0LL; #line 74 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); #line 74 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala" g_clear_error (&_inner_error_); #line 74 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala" - return 0LL; -#line 1158 "FSpotMetaTable.c" + return _tmp2_; +#line 1161 "FSpotMetaTable.c" } } #line 75 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala" if (id_str != NULL) { -#line 1163 "FSpotMetaTable.c" - gint64 _tmp1_ = 0LL; +#line 1166 "FSpotMetaTable.c" + gint64 _tmp3_ = 0LL; #line 76 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala" - _tmp1_ = int64_parse (id_str); + _tmp3_ = int64_parse (id_str); #line 76 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala" - result = _tmp1_; + result = _tmp3_; #line 76 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala" _g_free0 (id_str); #line 76 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala" return result; -#line 1173 "FSpotMetaTable.c" +#line 1176 "FSpotMetaTable.c" } else { #line 78 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala" result = (gint64) -1; @@ -1177,18 +1180,18 @@ gint64 data_imports_fspot_db_fspot_meta_table_get_hidden_tag_id (DataImportsFSpo _g_free0 (id_str); #line 78 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala" return result; -#line 1181 "FSpotMetaTable.c" +#line 1184 "FSpotMetaTable.c" } #line 73 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala" _g_free0 (id_str); -#line 1185 "FSpotMetaTable.c" +#line 1188 "FSpotMetaTable.c" } static void data_imports_fspot_db_fspot_meta_table_class_init (DataImportsFSpotDbFSpotMetaTableClass * klass) { #line 32 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala" data_imports_fspot_db_fspot_meta_table_parent_class = g_type_class_peek_parent (klass); -#line 1192 "FSpotMetaTable.c" +#line 1195 "FSpotMetaTable.c" } @@ -1228,21 +1231,21 @@ static DataImportsFSpotDbFSpotMetaBehavior* data_imports_fspot_db_fspot_meta_beh self = (DataImportsFSpotDbFSpotMetaBehavior*) g_object_new (object_type, NULL); #line 88 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala" return self; -#line 1232 "FSpotMetaTable.c" +#line 1235 "FSpotMetaTable.c" } static DataImportsFSpotDbFSpotMetaBehavior* data_imports_fspot_db_fspot_meta_behavior_new (void) { #line 88 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala" return data_imports_fspot_db_fspot_meta_behavior_construct (DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_META_BEHAVIOR); -#line 1239 "FSpotMetaTable.c" +#line 1242 "FSpotMetaTable.c" } static gpointer _g_object_ref0 (gpointer self) { #line 94 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala" return self ? g_object_ref (self) : NULL; -#line 1246 "FSpotMetaTable.c" +#line 1249 "FSpotMetaTable.c" } @@ -1255,7 +1258,7 @@ DataImportsFSpotDbFSpotMetaBehavior* data_imports_fspot_db_fspot_meta_behavior_g _tmp0_ = data_imports_fspot_db_fspot_meta_behavior_instance; #line 92 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala" if (_tmp0_ == NULL) { -#line 1259 "FSpotMetaTable.c" +#line 1262 "FSpotMetaTable.c" DataImportsFSpotDbFSpotMetaBehavior* _tmp1_ = NULL; #line 93 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala" _tmp1_ = data_imports_fspot_db_fspot_meta_behavior_new (); @@ -1263,7 +1266,7 @@ DataImportsFSpotDbFSpotMetaBehavior* data_imports_fspot_db_fspot_meta_behavior_g _g_object_unref0 (data_imports_fspot_db_fspot_meta_behavior_instance); #line 93 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala" data_imports_fspot_db_fspot_meta_behavior_instance = _tmp1_; -#line 1267 "FSpotMetaTable.c" +#line 1270 "FSpotMetaTable.c" } #line 94 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala" _tmp2_ = data_imports_fspot_db_fspot_meta_behavior_instance; @@ -1273,7 +1276,7 @@ DataImportsFSpotDbFSpotMetaBehavior* data_imports_fspot_db_fspot_meta_behavior_g result = _tmp3_; #line 94 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala" return result; -#line 1277 "FSpotMetaTable.c" +#line 1280 "FSpotMetaTable.c" } @@ -1289,7 +1292,7 @@ static gchar* data_imports_fspot_db_fspot_meta_behavior_real_get_table_name (Dat result = _tmp0_; #line 98 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala" return result; -#line 1293 "FSpotMetaTable.c" +#line 1296 "FSpotMetaTable.c" } @@ -1321,13 +1324,13 @@ static gchar** data_imports_fspot_db_fspot_meta_behavior_real_list_columns (Data if (result_length1) { #line 102 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala" *result_length1 = _tmp3__length1; -#line 1325 "FSpotMetaTable.c" +#line 1328 "FSpotMetaTable.c" } #line 102 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala" result = _tmp3_; #line 102 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala" return result; -#line 1331 "FSpotMetaTable.c" +#line 1334 "FSpotMetaTable.c" } @@ -1381,11 +1384,11 @@ static void data_imports_fspot_db_fspot_meta_behavior_real_build_row (DataImport if (row) { #line 105 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala" *row = _vala_row; -#line 1385 "FSpotMetaTable.c" +#line 1388 "FSpotMetaTable.c" } else { #line 105 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala" _g_object_unref0 (_vala_row); -#line 1389 "FSpotMetaTable.c" +#line 1392 "FSpotMetaTable.c" } } @@ -1395,7 +1398,7 @@ static void data_imports_fspot_db_fspot_meta_behavior_class_init (DataImportsFSp data_imports_fspot_db_fspot_meta_behavior_parent_class = g_type_class_peek_parent (klass); #line 83 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala" G_OBJECT_CLASS (klass)->finalize = data_imports_fspot_db_fspot_meta_behavior_finalize; -#line 1399 "FSpotMetaTable.c" +#line 1402 "FSpotMetaTable.c" } @@ -1408,7 +1411,7 @@ static void data_imports_fspot_db_fspot_meta_behavior_data_imports_fspot_db_fspo iface->list_columns = (gchar** (*)(DataImportsFSpotDbFSpotTableBehavior*, int*)) data_imports_fspot_db_fspot_meta_behavior_real_list_columns; #line 83 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala" iface->build_row = (void (*)(DataImportsFSpotDbFSpotTableBehavior*, sqlite3_stmt*, gpointer*, gint)) data_imports_fspot_db_fspot_meta_behavior_real_build_row; -#line 1412 "FSpotMetaTable.c" +#line 1415 "FSpotMetaTable.c" } @@ -1422,7 +1425,7 @@ static void data_imports_fspot_db_fspot_meta_behavior_finalize (GObject* obj) { self = G_TYPE_CHECK_INSTANCE_CAST (obj, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_META_BEHAVIOR, DataImportsFSpotDbFSpotMetaBehavior); #line 83 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala" G_OBJECT_CLASS (data_imports_fspot_db_fspot_meta_behavior_parent_class)->finalize (obj); -#line 1426 "FSpotMetaTable.c" +#line 1429 "FSpotMetaTable.c" } |