On Mon, Jan 20, 2014 at 04:14:57PM -0600, Jonathon Jongsma wrote:
> When trying to load ui files, we try to find the file in several directories.
> If a file is not found in one directory, try to load it from the next directory.
> However, if a file is found in a directory but we are not able to load it (e.g.
> due to unsupported versions of glade used to generate it, etc), we should print
> a warning to the terminal to help the developer debug the issue.
>
> This is an unexpected failure (whereas not finding the file in that directory at
> all is an 'expected' failure).
> ---
> src/virt-viewer-util.c | 7 ++++++-
> 1 file changed, 6 insertions(+), 1 deletion(-)
>
> diff --git a/src/virt-viewer-util.c b/src/virt-viewer-util.c
> index 9deddad..f937345 100644
> --- a/src/virt-viewer-util.c
> +++ b/src/virt-viewer-util.c
> @@ -58,7 +58,12 @@ GtkBuilder *virt_viewer_util_load_ui(const char *name)
> gtk_builder_add_from_file(builder, name, &error);
> } else {
> gchar *path = g_build_filename(PACKAGE_DATADIR, "ui", name, NULL);
> - gboolean success = (gtk_builder_add_from_file(builder, path, NULL) != 0);
> + gboolean success = (gtk_builder_add_from_file(builder, path, &error) != 0);
> + if (error) {
> + if (error->domain != G_FILE_ERROR)
> + g_warning("Failed to add ui file '%s': %s", path, error->message);
> + g_clear_error(&error);
> + }
Maybe we should also test error->code for G_FILE_ERROR_NOENT in addition to
domain != G_FILE_ERROR ?
Christophe
Attachment:
pgpmIVZQHlGSA.pgp
Description: PGP signature
_______________________________________________ virt-tools-list mailing list virt-tools-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/virt-tools-list
