# HG changeset patch # User J. Ali Harlow # Date 1466785823 -3600 # Node ID 360621bc323e5a8265d65ed333afe7a0d4119ac6 # Parent a166277bc796b6a1dd16d6244439bfaf584c7e55 Port to razor 0.6.3.66 diff -r a166277bc796 -r 360621bc323e pre-inst/pre-inst.c --- a/pre-inst/pre-inst.c Wed Jun 22 17:32:44 2016 +0100 +++ b/pre-inst/pre-inst.c Fri Jun 24 17:30:23 2016 +0100 @@ -91,7 +91,7 @@ { int retval; char *path=data; - gchar *s; + gchar *s,*uri; char *install[]={"plover-gtkui",NULL}; GError *error=NULL; prefix=plover_pre_install_prefix(); @@ -99,8 +99,10 @@ plover_log_open(s); g_free(s); s=g_strconcat(prefix,"/var/lib/razor",NULL); - razor_set_database_path(s); + uri=razor_path_to_uri(s); g_free(s); + razor_set_database_uri(uri); + free(uri); if (verify_and_fix(prefix)) { free(path); @@ -192,14 +194,16 @@ gboolean pre_uninstall(void) { gboolean success; - gchar *s; + gchar *s,*uri; GError *error=NULL; razor_set_lua_loader("posix",(void (*)())luaopen_posix); razor_set_lua_loader("whelk",(void (*)())luaopen_whelk); prefix=plover_pre_install_prefix(); s=g_strconcat(prefix,"/var/lib/razor",NULL); - razor_set_database_path(s); + uri=razor_path_to_uri(s); g_free(s); + razor_set_database_uri(uri); + free(uri); success=plover_remove(NULL,&error); if (error) {