Branch: refs/heads/master Author: Colomban Wendling ban@herbesfolles.org Committer: Colomban Wendling ban@herbesfolles.org Date: Tue, 19 Mar 2013 15:59:32 UTC Commit: 57940e67a30238eaeba85714fcba7750663e7d75 https://github.com/geany/geany/commit/57940e67a30238eaeba85714fcba7750663e7d...
Log Message: ----------- Windows: use absolute path to the icons directory
Modified Paths: -------------- src/main.c
Modified: src/main.c 13 files changed, 8 insertions(+), 5 deletions(-) =================================================================== @@ -228,13 +228,16 @@ static void apply_settings(void) static void main_init(void) { /* add our icon path in case we aren't installed in the system prefix */ -#ifndef G_OS_WIN32 - gchar *path = g_build_filename(GEANY_DATADIR, "icons", NULL); - gtk_icon_theme_append_search_path(gtk_icon_theme_get_default(), path); - g_free(path); + gchar *path; +#ifdef G_OS_WIN32 + gchar *install_dir = win32_get_installation_dir(); + path = g_build_filename(install_dir, "share", "icons", NULL); + g_free(install_dir); #else - gtk_icon_theme_append_search_path(gtk_icon_theme_get_default(), "share\icons"); + path = g_build_filename(GEANY_DATADIR, "icons", NULL); #endif + gtk_icon_theme_append_search_path(gtk_icon_theme_get_default(), path); + g_free(path);
/* inits */ ui_init_stock_items();
-------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).