[epiphany] test-ephy-embed-shell: Do not assume XDG_DATA_DIRS is set
- From: Claudio Saavedra <csaavedra src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [epiphany] test-ephy-embed-shell: Do not assume XDG_DATA_DIRS is set
- Date: Sun, 1 Sep 2013 22:20:45 +0000 (UTC)
commit 8b9bfed919c6e105d40e5cd730469fa550281e5e
Author: Claudio Saavedra <csaavedra igalia com>
Date: Mon Sep 2 00:44:33 2013 +0300
test-ephy-embed-shell: Do not assume XDG_DATA_DIRS is set
Otherwise the test will fail in systens where this is unset.
tests/ephy-embed-shell-test.c | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
---
diff --git a/tests/ephy-embed-shell-test.c b/tests/ephy-embed-shell-test.c
index 7ba25ca..b41d03a 100644
--- a/tests/ephy-embed-shell-test.c
+++ b/tests/ephy-embed-shell-test.c
@@ -87,15 +87,17 @@ main (int argc, char *argv[])
{
int ret;
const char *xdg_data_dirs;
- char **dirs;
+ char **dirs = NULL;
char *schemas_dir;
/* Save XDG_DATA_DIRS to set GSETTINGS_SCHEME_DIR, otherwise we
* won't find the sytem schemas. */
xdg_data_dirs = g_getenv ("XDG_DATA_DIRS");
- dirs = g_strsplit (xdg_data_dirs, ":", -1);
+ if (xdg_data_dirs)
+ dirs = g_strsplit (xdg_data_dirs, ":", -1);
+
/* We can only use one directory, so use the first one or the system default. */
- schemas_dir = g_build_filename (dirs[0] ? dirs[0] : "/usr/share", "glib-2.0", "schemas", NULL);
+ schemas_dir = g_build_filename (dirs ? dirs[0] : "/usr/share", "glib-2.0", "schemas", NULL);
g_setenv ("GSETTINGS_SCHEMA_DIR", schemas_dir, TRUE);
g_strfreev (dirs);
g_free (schemas_dir);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]