diff -r b0a35bae4961 -r 5cbb66c24fc6 plover-gtk/packageset.c
--- a/plover-gtk/packageset.c	Thu Nov 10 11:15:09 2011 +0000
+++ b/plover-gtk/packageset.c	Fri Mar 23 20:29:50 2012 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010, 2011  J. Ali Harlow <ali@juiblex.co.uk>
+ * Copyright (C) 2010-2012  J. Ali Harlow <ali@juiblex.co.uk>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -32,7 +32,6 @@
 G_DEFINE_TYPE(PloverPackageSet,plover_package_set,G_TYPE_OBJECT);
 
 typedef struct _PloverPackageSetPrivate {
-    struct razor_atomic *atomic;
     struct razor_root *root;
     struct razor_set *set;
     GSList *packages;
@@ -56,8 +55,6 @@
     PloverPackageSetPrivate *priv=PLOVER_PACKAGE_SET_GET_PRIVATE(obj);
     if (priv->root)
 	razor_root_close(priv->root);
-    if (priv->atomic)
-	razor_atomic_destroy(priv->atomic);
     if (G_OBJECT_CLASS(plover_package_set_parent_class)->finalize)
 	G_OBJECT_CLASS(plover_package_set_parent_class)->finalize(obj);
 }
@@ -102,14 +99,15 @@
 {
     PloverPackageSet *set;
     PloverPackageSetPrivate *priv;
+    struct razor_error *error=NULL;
     set=plover_package_set_new();
     priv=PLOVER_PACKAGE_SET_GET_PRIVATE(set);
-    priv->atomic=razor_atomic_open("Read root package set");
-    priv->root=razor_root_open(root,priv->atomic);
+    priv->root=razor_root_open(root,&error);
     if (!priv->root)
     {
-	g_set_error(err,PLOVER_RAZOR_ERROR,PLOVER_RAZOR_ERROR_FAILED,
-	  "Failed to open %s as razor root",root);
+	g_set_error_literal(err,PLOVER_RAZOR_ERROR,PLOVER_RAZOR_ERROR_FAILED,
+	  razor_error_get_msg(error));
+	razor_error_free(error);
 	g_object_unref(set);
 	return NULL;
     }
@@ -135,7 +133,7 @@
 #endif
     gchar *s;
     struct razor_set *reloc;
-    struct razor_atomic *atomic;
+    struct razor_error *error=NULL;
     PloverPackageSet *set;
     PloverPackageSetPrivate *priv;
     set=plover_package_set_new();
@@ -176,14 +174,12 @@
 #endif
     if (priv->set && relocations)
     {
-	atomic=razor_atomic_open("Relocate packages");
-	reloc=plover_relocate_packages(priv->set,atomic,base,relocations);
-	if (!reloc)
-	    g_set_error(err,PLOVER_RAZOR_ERROR,PLOVER_RAZOR_ERROR_FAILED,
-	      razor_atomic_get_error_msg(atomic));
-	razor_atomic_destroy(atomic);
+	reloc=plover_relocate_packages(priv->set,base,relocations,&error);
 	if (!reloc)
 	{
+	    g_set_error_literal(err,PLOVER_RAZOR_ERROR,
+	      PLOVER_RAZOR_ERROR_FAILED,razor_error_get_msg(error));
+	    razor_error_free(error);
 	    g_object_unref(set);
 	    return NULL;
 	}