[geary/ricotz/vala: 3/3] client: Don't use custom binding of soup_uri_decode()

[Rico Tzschichholz <ricotz src gnome org>]

commit 0abd3cb2ad84fd8c4a78e3394fca7cca851afffc
Author: Rico Tzschichholz <ricotz ubuntu com>
Date:   Tue Apr 27 08:50:47 2021 +0200

    client: Don't use custom binding of soup_uri_decode()

 src/client/components/components-web-view.vala | 5 +----
 src/engine/db/db-database.vala                 | 2 +-
 src/engine/db/db.vala                          | 3 ---
 3 files changed, 2 insertions(+), 8 deletions(-)
---
diff --git a/src/client/components/components-web-view.vala b/src/client/components/components-web-view.vala
index fe3c036d2..c978863bd 100644
--- a/src/client/components/components-web-view.vala
+++ b/src/client/components/components-web-view.vala
@@ -696,7 +696,7 @@ public abstract class Components.WebView : WebKit.WebView, Geary.BaseInterface {
     }
 
     private bool handle_internal_response(WebKit.URISchemeRequest request) {
-        string name = soup_uri_decode(request.get_path());
+        string name = Soup.URI.decode(request.get_path());
         Geary.Memory.Buffer? buf = this.internal_resources[name];
         bool handled = false;
         if (buf != null) {
@@ -853,6 +853,3 @@ public abstract class Components.WebView : WebKit.WebView, Geary.BaseInterface {
     }
 
 }
-
-// XXX this needs to be moved into the libsoup bindings
-extern string soup_uri_decode(string part);
diff --git a/src/engine/db/db-database.vala b/src/engine/db/db-database.vala
index df5bed216..6121d0998 100644
--- a/src/engine/db/db-database.vala
+++ b/src/engine/db/db-database.vala
@@ -230,7 +230,7 @@ public class Geary.Db.Database : Context {
             sqlite_flags |= Sqlite.OPEN_CREATE;
 
         if (this.file == null) {
-            sqlite_flags |= SQLITE_OPEN_URI;
+            sqlite_flags |= Sqlite.OPEN_URI;
         }
 
         DatabaseConnection cx = new DatabaseConnection(
diff --git a/src/engine/db/db.vala b/src/engine/db/db.vala
index a79f4ae51..92891914f 100644
--- a/src/engine/db/db.vala
+++ b/src/engine/db/db.vala
@@ -22,9 +22,6 @@
  * [[http://code.google.com/p/sqlheavy/|SQLHeavy]].
  */
 
-// Work around missing const in sqlite3.vapi. See Bug 795627.
-extern const int SQLITE_OPEN_URI;
-
 [CCode (cheader_filename = "sqlite3.h")]
 extern int sqlite3_enable_shared_cache(int enabled);