debian/midori
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Resolve symlink before looking for exec path

Browse source
This commit is contained in:
Christian Dywan 2012-06-04 22:38:14 +02:00
parent f71ebb53a9
commit 4a1e547cdb
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
midori/midori-app.c
View file

@ -1402,6 +1402,7 @@ midori_app_setup (gchar** argument_vector)
GtkIconSet* icon_set; GtkIconSet* icon_set;
GtkIconFactory* factory; GtkIconFactory* factory;
gsize i; gsize i;
gchar* executable;
typedef struct typedef struct
{ {
@ -1537,8 +1538,10 @@ midori_app_setup (gchar** argument_vector)
#ifdef G_OS_WIN32 #ifdef G_OS_WIN32
exec_path = g_win32_get_package_installation_directory_of_module (NULL); exec_path = g_win32_get_package_installation_directory_of_module (NULL);
#else #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 ( 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 #endif
/* Print messages to stdout on Win32 console, cf. AbiWord /* Print messages to stdout on Win32 console, cf. AbiWord