From 4a1e547cdb771f8774b8cca924584931ec80b783 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Mon, 4 Jun 2012 22:38:14 +0200 Subject: [PATCH] Resolve symlink before looking for exec path --- midori/midori-app.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/midori/midori-app.c b/midori/midori-app.c index 280ae1dc..d6507e00 100644 --- a/midori/midori-app.c +++ b/midori/midori-app.c @@ -1402,6 +1402,7 @@ midori_app_setup (gchar** argument_vector) GtkIconSet* icon_set; GtkIconFactory* factory; gsize i; + gchar* executable; typedef struct { @@ -1537,8 +1538,10 @@ midori_app_setup (gchar** argument_vector) #ifdef G_OS_WIN32 exec_path = g_win32_get_package_installation_directory_of_module (NULL); #else + executable = g_file_read_link (command_line[0], NULL); exec_path = g_file_get_path (g_file_get_parent (g_file_get_parent (g_file_new_for_path ( - g_find_program_in_path (command_line[0]))))); + g_find_program_in_path (executable ? executable : command_line[0]))))); + g_free (executable); #endif /* Print messages to stdout on Win32 console, cf. AbiWord -- 2.39.5