1.1 --- a/plover-gtk/packageset.c	Thu Nov 10 11:15:09 2011 +0000
     1.2 +++ b/plover-gtk/packageset.c	Fri Mar 23 20:29:50 2012 +0000
     1.3 @@ -1,5 +1,5 @@
     1.4  /*
     1.5 - * Copyright (C) 2010, 2011  J. Ali Harlow <ali@juiblex.co.uk>
     1.6 + * Copyright (C) 2010-2012  J. Ali Harlow <ali@juiblex.co.uk>
     1.7   *
     1.8   * This program is free software; you can redistribute it and/or modify
     1.9   * it under the terms of the GNU General Public License as published by
    1.10 @@ -32,7 +32,6 @@
    1.11  G_DEFINE_TYPE(PloverPackageSet,plover_package_set,G_TYPE_OBJECT);
    1.12  
    1.13  typedef struct _PloverPackageSetPrivate {
    1.14 -    struct razor_atomic *atomic;
    1.15      struct razor_root *root;
    1.16      struct razor_set *set;
    1.17      GSList *packages;
    1.18 @@ -56,8 +55,6 @@
    1.19      PloverPackageSetPrivate *priv=PLOVER_PACKAGE_SET_GET_PRIVATE(obj);
    1.20      if (priv->root)
    1.21  	razor_root_close(priv->root);
    1.22 -    if (priv->atomic)
    1.23 -	razor_atomic_destroy(priv->atomic);
    1.24      if (G_OBJECT_CLASS(plover_package_set_parent_class)->finalize)
    1.25  	G_OBJECT_CLASS(plover_package_set_parent_class)->finalize(obj);
    1.26  }
    1.27 @@ -102,14 +99,15 @@
    1.28  {
    1.29      PloverPackageSet *set;
    1.30      PloverPackageSetPrivate *priv;
    1.31 +    struct razor_error *error=NULL;
    1.32      set=plover_package_set_new();
    1.33      priv=PLOVER_PACKAGE_SET_GET_PRIVATE(set);
    1.34 -    priv->atomic=razor_atomic_open("Read root package set");
    1.35 -    priv->root=razor_root_open(root,priv->atomic);
    1.36 +    priv->root=razor_root_open(root,&error);
    1.37      if (!priv->root)
    1.38      {
    1.39 -	g_set_error(err,PLOVER_RAZOR_ERROR,PLOVER_RAZOR_ERROR_FAILED,
    1.40 -	  "Failed to open %s as razor root",root);
    1.41 +	g_set_error_literal(err,PLOVER_RAZOR_ERROR,PLOVER_RAZOR_ERROR_FAILED,
    1.42 +	  razor_error_get_msg(error));
    1.43 +	razor_error_free(error);
    1.44  	g_object_unref(set);
    1.45  	return NULL;
    1.46      }
    1.47 @@ -135,7 +133,7 @@
    1.48  #endif
    1.49      gchar *s;
    1.50      struct razor_set *reloc;
    1.51 -    struct razor_atomic *atomic;
    1.52 +    struct razor_error *error=NULL;
    1.53      PloverPackageSet *set;
    1.54      PloverPackageSetPrivate *priv;
    1.55      set=plover_package_set_new();
    1.56 @@ -176,14 +174,12 @@
    1.57  #endif
    1.58      if (priv->set && relocations)
    1.59      {
    1.60 -	atomic=razor_atomic_open("Relocate packages");
    1.61 -	reloc=plover_relocate_packages(priv->set,atomic,base,relocations);
    1.62 -	if (!reloc)
    1.63 -	    g_set_error(err,PLOVER_RAZOR_ERROR,PLOVER_RAZOR_ERROR_FAILED,
    1.64 -	      razor_atomic_get_error_msg(atomic));
    1.65 -	razor_atomic_destroy(atomic);
    1.66 +	reloc=plover_relocate_packages(priv->set,base,relocations,&error);
    1.67  	if (!reloc)
    1.68  	{
    1.69 +	    g_set_error_literal(err,PLOVER_RAZOR_ERROR,
    1.70 +	      PLOVER_RAZOR_ERROR_FAILED,razor_error_get_msg(error));
    1.71 +	    razor_error_free(error);
    1.72  	    g_object_unref(set);
    1.73  	    return NULL;
    1.74  	}