[empathy] empathy_accounts_dialog_show_application: try to run "empathy-accounts" from source
- From: Guillaume Desmottes <gdesmott src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [empathy] empathy_accounts_dialog_show_application: try to run "empathy-accounts" from source
- Date: Tue, 16 Feb 2010 13:23:37 +0000 (UTC)
commit 613e72b79f276b5258ca06eece2fc5fa11edf232
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date: Tue Feb 16 12:19:10 2010 +0000
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.
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 d438eec..f6aaf07 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)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]