summaryrefslogtreecommitdiff
path: root/src/db
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2017-01-02 11:25:40 +0100
committerJörg Frings-Fürst <debian@jff-webhosting.net>2017-01-02 11:25:40 +0100
commitcd16e7b4a394b6ce885a618d8a96eccd662208bb (patch)
treec9bcd713dbea9467783f8d82c63218af91192da1 /src/db
parentb1cb72d29fa13b3b6f9f5fe66083dd60930a2b71 (diff)
parent66f6a7bd3f7e00022191f16cb0e82a39e7333a76 (diff)
Merge tag 'upstream/0.25.2'
Upstream version 0.25.2
Diffstat (limited to 'src/db')
-rw-r--r--src/db/DatabaseTable.c42
-rw-r--r--src/db/Db.c2
-rw-r--r--src/db/EventTable.c2
-rw-r--r--src/db/PhotoTable.c2
-rw-r--r--src/db/SavedSearchDBTable.c2
-rw-r--r--src/db/TagTable.c92
-rw-r--r--src/db/TombstoneTable.c2
-rw-r--r--src/db/VersionTable.c2
-rw-r--r--src/db/VideoTable.c2
9 files changed, 74 insertions, 74 deletions
diff --git a/src/db/DatabaseTable.c b/src/db/DatabaseTable.c
index c12525d..d1df4f4 100644
--- a/src/db/DatabaseTable.c
+++ b/src/db/DatabaseTable.c
@@ -1,4 +1,4 @@
-/* DatabaseTable.c generated by valac 0.34.2, the Vala compiler
+/* DatabaseTable.c generated by valac 0.32.1, the Vala compiler
* generated from DatabaseTable.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -343,54 +343,54 @@ static gint _sqlite3_exec (sqlite3* self, const gchar* sql, sqlite3_callback cal
const gchar* _tmp2_ = NULL;
gint _tmp3_ = 0;
const gchar* _tmp6_ = NULL;
-#line 34 "/usr/share/vala-0.34/vapi/sqlite3.vapi"
+#line 34 "/usr/share/vala-0.32/vapi/sqlite3.vapi"
g_return_val_if_fail (self != NULL, 0);
-#line 34 "/usr/share/vala-0.34/vapi/sqlite3.vapi"
+#line 34 "/usr/share/vala-0.32/vapi/sqlite3.vapi"
g_return_val_if_fail (sql != NULL, 0);
-#line 36 "/usr/share/vala-0.34/vapi/sqlite3.vapi"
+#line 36 "/usr/share/vala-0.32/vapi/sqlite3.vapi"
_tmp0_ = sql;
-#line 36 "/usr/share/vala-0.34/vapi/sqlite3.vapi"
+#line 36 "/usr/share/vala-0.32/vapi/sqlite3.vapi"
_tmp1_ = callback;
-#line 36 "/usr/share/vala-0.34/vapi/sqlite3.vapi"
+#line 36 "/usr/share/vala-0.32/vapi/sqlite3.vapi"
_tmp1__target = callback_target;
-#line 36 "/usr/share/vala-0.34/vapi/sqlite3.vapi"
+#line 36 "/usr/share/vala-0.32/vapi/sqlite3.vapi"
_tmp3_ = sqlite3_exec (self, _tmp0_, _tmp1_, _tmp1__target, (char**) (&_tmp2_));
-#line 36 "/usr/share/vala-0.34/vapi/sqlite3.vapi"
+#line 36 "/usr/share/vala-0.32/vapi/sqlite3.vapi"
sqlite_errmsg = _tmp2_;
-#line 36 "/usr/share/vala-0.34/vapi/sqlite3.vapi"
+#line 36 "/usr/share/vala-0.32/vapi/sqlite3.vapi"
ec = _tmp3_;
-#line 37 "/usr/share/vala-0.34/vapi/sqlite3.vapi"
+#line 37 "/usr/share/vala-0.32/vapi/sqlite3.vapi"
if ((&_vala_errmsg) != NULL) {
#line 365 "DatabaseTable.c"
const gchar* _tmp4_ = NULL;
gchar* _tmp5_ = NULL;
-#line 38 "/usr/share/vala-0.34/vapi/sqlite3.vapi"
+#line 38 "/usr/share/vala-0.32/vapi/sqlite3.vapi"
_tmp4_ = sqlite_errmsg;
-#line 38 "/usr/share/vala-0.34/vapi/sqlite3.vapi"
+#line 38 "/usr/share/vala-0.32/vapi/sqlite3.vapi"
_tmp5_ = g_strdup (_tmp4_);
-#line 38 "/usr/share/vala-0.34/vapi/sqlite3.vapi"
+#line 38 "/usr/share/vala-0.32/vapi/sqlite3.vapi"
_g_free0 (_vala_errmsg);
-#line 38 "/usr/share/vala-0.34/vapi/sqlite3.vapi"
+#line 38 "/usr/share/vala-0.32/vapi/sqlite3.vapi"
_vala_errmsg = _tmp5_;
#line 376 "DatabaseTable.c"
}
-#line 40 "/usr/share/vala-0.34/vapi/sqlite3.vapi"
+#line 40 "/usr/share/vala-0.32/vapi/sqlite3.vapi"
_tmp6_ = sqlite_errmsg;
-#line 40 "/usr/share/vala-0.34/vapi/sqlite3.vapi"
+#line 40 "/usr/share/vala-0.32/vapi/sqlite3.vapi"
sqlite3_free ((void*) _tmp6_);
-#line 41 "/usr/share/vala-0.34/vapi/sqlite3.vapi"
+#line 41 "/usr/share/vala-0.32/vapi/sqlite3.vapi"
result = ec;
-#line 41 "/usr/share/vala-0.34/vapi/sqlite3.vapi"
+#line 41 "/usr/share/vala-0.32/vapi/sqlite3.vapi"
if (errmsg) {
-#line 41 "/usr/share/vala-0.34/vapi/sqlite3.vapi"
+#line 41 "/usr/share/vala-0.32/vapi/sqlite3.vapi"
*errmsg = _vala_errmsg;
#line 388 "DatabaseTable.c"
} else {
-#line 41 "/usr/share/vala-0.34/vapi/sqlite3.vapi"
+#line 41 "/usr/share/vala-0.32/vapi/sqlite3.vapi"
_g_free0 (_vala_errmsg);
#line 392 "DatabaseTable.c"
}
-#line 41 "/usr/share/vala-0.34/vapi/sqlite3.vapi"
+#line 41 "/usr/share/vala-0.32/vapi/sqlite3.vapi"
return result;
#line 396 "DatabaseTable.c"
}
diff --git a/src/db/Db.c b/src/db/Db.c
index 2ad8248..9c7e328 100644
--- a/src/db/Db.c
+++ b/src/db/Db.c
@@ -1,4 +1,4 @@
-/* Db.c generated by valac 0.34.2, the Vala compiler
+/* Db.c generated by valac 0.32.1, the Vala compiler
* generated from Db.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/db/EventTable.c b/src/db/EventTable.c
index 63e2198..0e763e9 100644
--- a/src/db/EventTable.c
+++ b/src/db/EventTable.c
@@ -1,4 +1,4 @@
-/* EventTable.c generated by valac 0.34.2, the Vala compiler
+/* EventTable.c generated by valac 0.32.1, the Vala compiler
* generated from EventTable.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/db/PhotoTable.c b/src/db/PhotoTable.c
index 7551157..a2923f7 100644
--- a/src/db/PhotoTable.c
+++ b/src/db/PhotoTable.c
@@ -1,4 +1,4 @@
-/* PhotoTable.c generated by valac 0.34.2, the Vala compiler
+/* PhotoTable.c generated by valac 0.32.1, the Vala compiler
* generated from PhotoTable.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/db/SavedSearchDBTable.c b/src/db/SavedSearchDBTable.c
index 7a115ab..1747d47 100644
--- a/src/db/SavedSearchDBTable.c
+++ b/src/db/SavedSearchDBTable.c
@@ -1,4 +1,4 @@
-/* SavedSearchDBTable.c generated by valac 0.34.2, the Vala compiler
+/* SavedSearchDBTable.c generated by valac 0.32.1, the Vala compiler
* generated from SavedSearchDBTable.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/db/TagTable.c b/src/db/TagTable.c
index bd98bc0..1c58788 100644
--- a/src/db/TagTable.c
+++ b/src/db/TagTable.c
@@ -1,4 +1,4 @@
-/* TagTable.c generated by valac 0.34.2, the Vala compiler
+/* TagTable.c generated by valac 0.32.1, the Vala compiler
* generated from TagTable.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -645,11 +645,11 @@ static gpointer _g_object_ref0 (gpointer self) {
static gchar* string_replace (const gchar* self, const gchar* old, const gchar* replacement) {
gchar* result = NULL;
GError * _inner_error_ = NULL;
-#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1380 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, NULL);
-#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1380 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
g_return_val_if_fail (old != NULL, NULL);
-#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1380 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
g_return_val_if_fail (replacement != NULL, NULL);
#line 655 "TagTable.c"
{
@@ -664,73 +664,73 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
const gchar* _tmp7_ = NULL;
gchar* _tmp8_ = NULL;
gchar* _tmp9_ = NULL;
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
_tmp0_ = old;
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
_tmp1_ = g_regex_escape_string (_tmp0_, -1);
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
_tmp2_ = _tmp1_;
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
_tmp3_ = g_regex_new (_tmp2_, 0, 0, &_inner_error_);
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
_tmp4_ = _tmp3_;
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
_g_free0 (_tmp2_);
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
regex = _tmp4_;
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
if (_inner_error_->domain == G_REGEX_ERROR) {
#line 686 "TagTable.c"
goto __catch19_g_regex_error;
}
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
g_clear_error (&_inner_error_);
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
return NULL;
#line 695 "TagTable.c"
}
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
_tmp6_ = regex;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
_tmp7_ = replacement;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
_tmp8_ = g_regex_replace_literal (_tmp6_, self, (gssize) -1, 0, _tmp7_, 0, &_inner_error_);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
_tmp5_ = _tmp8_;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
if (_inner_error_->domain == G_REGEX_ERROR) {
#line 711 "TagTable.c"
goto __catch19_g_regex_error;
}
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
g_clear_error (&_inner_error_);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
return NULL;
#line 722 "TagTable.c"
}
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
_tmp9_ = _tmp5_;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
_tmp5_ = NULL;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
result = _tmp9_;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
_g_free0 (_tmp5_);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
return result;
#line 736 "TagTable.c"
}
@@ -738,24 +738,24 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
__catch19_g_regex_error:
{
GError* e = NULL;
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
e = _inner_error_;
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
_inner_error_ = NULL;
-#line 1385 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1385 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
g_assert_not_reached ();
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
_g_error_free0 (e);
#line 750 "TagTable.c"
}
__finally19:
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
g_clear_error (&_inner_error_);
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
return NULL;
#line 761 "TagTable.c"
}
@@ -2013,15 +2013,15 @@ static gchar string_get (const gchar* self, glong index) {
gchar result = '\0';
glong _tmp0_ = 0L;
gchar _tmp1_ = '\0';
-#line 1086 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1086 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, '\0');
-#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
_tmp0_ = index;
-#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
_tmp1_ = ((gchar*) self)[_tmp0_];
-#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
result = _tmp1_;
-#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
return result;
#line 2025 "TagTable.c"
}
diff --git a/src/db/TombstoneTable.c b/src/db/TombstoneTable.c
index c9afb97..542e568 100644
--- a/src/db/TombstoneTable.c
+++ b/src/db/TombstoneTable.c
@@ -1,4 +1,4 @@
-/* TombstoneTable.c generated by valac 0.34.2, the Vala compiler
+/* TombstoneTable.c generated by valac 0.32.1, the Vala compiler
* generated from TombstoneTable.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/db/VersionTable.c b/src/db/VersionTable.c
index 7aa577a..fa79d52 100644
--- a/src/db/VersionTable.c
+++ b/src/db/VersionTable.c
@@ -1,4 +1,4 @@
-/* VersionTable.c generated by valac 0.34.2, the Vala compiler
+/* VersionTable.c generated by valac 0.32.1, the Vala compiler
* generated from VersionTable.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/db/VideoTable.c b/src/db/VideoTable.c
index 736818c..8b8d78a 100644
--- a/src/db/VideoTable.c
+++ b/src/db/VideoTable.c
@@ -1,4 +1,4 @@
-/* VideoTable.c generated by valac 0.34.2, the Vala compiler
+/* VideoTable.c generated by valac 0.32.1, the Vala compiler
* generated from VideoTable.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.