diff options
| author | Max Kellermann <max@duempel.org> | 2009-07-16 07:37:13 +0200 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2009-07-16 07:37:13 +0200 |
| commit | 4100035b19a5d0dedcf8f71a272fa67f6a24361a (patch) | |
| tree | c4a0f11b0cf5d219fd70e55316ed0b95f348480c /src/database.c | |
| parent | 9bef46c0daa4fa2778db0e05d5883746cc995264 (diff) | |
| parent | d7bad6ae020ffabfd5d2ae9d2ce723e67e999077 (diff) | |
Merged release 0.15.1 from branch 'v0.15.x'
Diffstat (limited to 'src/database.c')
| -rw-r--r-- | src/database.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/database.c b/src/database.c index 7257930b..5a06dda9 100644 --- a/src/database.c +++ b/src/database.c @@ -318,10 +318,11 @@ db_load(GError **error) if (old_charset != NULL && strcmp(new_charset, old_charset)) { fclose(fp); - g_message("Existing database has charset \"%s\" " - "instead of \"%s\"; " - "discarding database file", - new_charset, old_charset); + g_set_error(error, db_quark(), 0, + "Existing database has charset " + "\"%s\" instead of \"%s\"; " + "discarding database file", + new_charset, old_charset); return false; } } else { |