Include settings.h so the banner macro hildon version works.

[mapper] / src / db.c

diff --git a/src/db.c b/src/db.c
index 9bf76360a9be75b91fdb9350e22a9fd37fdc19d8..cf19118e9f3e1833aeaa1794725e9f31d630782c 100644 (file)
--- a/src/db.c
+++ b/src/db.c
@@ -93,10 +93,10 @@ db_exec_sql(sqlite3 *db, const gchar *sql)
 gint r;
 
 r=sqlite3_exec(db, sql, NULL, NULL, NULL);
-if (r!=SQLITE_OK)
-       g_printerr("SQL ERROR:(%s) %s\n", sql, sqlite3_errmsg(db));
+if (r!=SQLITE_OK && r!=SQLITE_DONE)
+       g_printerr("SQL ERROR %d:(%s) %s\n", r, sql, sqlite3_errmsg(db));
 
-return (r==SQLITE_OK) ? TRUE : FALSE;
+return (r==SQLITE_OK || r==SQLITE_DONE) ? TRUE : FALSE;
 }
 
 /**
@@ -111,12 +111,12 @@ gint r;
 
 g_assert(sql);
 r=sqlite3_step(sql);
-if (r!=SQLITE_OK)
-       g_printerr("SQL ERROR: %s\n", sqlite3_errmsg(db));
+if (r!=SQLITE_OK && r!=SQLITE_DONE)
+       g_printerr("SQL ERROR %d: %s\n", r, sqlite3_errmsg(db));
 sqlite3_reset(sql);
 sqlite3_clear_bindings(sql);
 
-return (r==SQLITE_OK) ? TRUE : FALSE;
+return (r==SQLITE_OK || r==SQLITE_DONE) ? TRUE : FALSE;
 }
 
 /**