diff options
author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2010-02-16 20:19:10 +0800 |
---|---|---|
committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2010-02-16 20:19:10 +0800 |
commit | 613e72b79f276b5258ca06eece2fc5fa11edf232 (patch) | |
tree | 8fef48de0cf383d9c3c1775a4b5cb3e48f4b2306 | |
parent | 4253e9ae71c3df9918e1ee4f81ecd1e90639edeb (diff) | |
download | gsoc2013-empathy-613e72b79f276b5258ca06eece2fc5fa11edf232.tar gsoc2013-empathy-613e72b79f276b5258ca06eece2fc5fa11edf232.tar.gz gsoc2013-empathy-613e72b79f276b5258ca06eece2fc5fa11edf232.tar.bz2 gsoc2013-empathy-613e72b79f276b5258ca06eece2fc5fa11edf232.tar.lz gsoc2013-empathy-613e72b79f276b5258ca06eece2fc5fa11edf232.tar.xz gsoc2013-empathy-613e72b79f276b5258ca06eece2fc5fa11edf232.tar.zst gsoc2013-empathy-613e72b79f276b5258ca06eece2fc5fa11edf232.zip |
empathy_accounts_dialog_show_application: try to run "empathy-accounts" from source
This fix starting the accounts dialog for people (testers mostly) using
Empathy from a not installed build.
-rw-r--r-- | src/empathy-accounts-dialog.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/src/empathy-accounts-dialog.c b/src/empathy-accounts-dialog.c index d438eec04..f6aaf07ed 100644 --- a/src/empathy-accounts-dialog.c +++ b/src/empathy-accounts-dialog.c @@ -2243,7 +2243,16 @@ empathy_accounts_dialog_show_application (GdkScreen *screen, g_return_if_fail (GDK_IS_SCREEN (screen)); g_return_if_fail (!selected_account || TP_IS_ACCOUNT (selected_account)); - path = g_build_filename (BIN_DIR, "empathy-accounts", NULL); + /* Try to run from source directory if possible */ + path = g_build_filename (g_getenv ("EMPATHY_SRCDIR"), "src", + "empathy-accounts", NULL); + + if (!g_file_test (path, G_FILE_TEST_EXISTS)) + { + g_free (path); + path = g_build_filename (BIN_DIR, "empathy-accounts", NULL); + } + argv[i++] = path; if (selected_account) |