Mercurial > audlegacy
changeset 3775:6f0b1aab0f30
Automated merge with ssh://hg.atheme.org//hg/audacious
author | William Pitcock <nenolod@atheme.org> |
---|---|
date | Wed, 17 Oct 2007 06:05:47 -0500 |
parents | 12d1d2969a1a (diff) 5152171d87af (current diff) |
children | 462f391ee02b |
files | |
diffstat | 1 files changed, 6 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/audacious/skin.c Wed Oct 17 03:56:42 2007 +0200 +++ b/src/audacious/skin.c Wed Oct 17 06:05:47 2007 -0500 @@ -1497,15 +1497,17 @@ GtkSettings *settings = gtk_settings_get_default(); gchar *tmp = g_strdup_printf("%s/.themes/aud-%s", g_get_home_dir(), basename(skin->path)); - gchar *troot = g_strdup_printf("%s/.themes"); + gchar *troot = g_strdup_printf("%s/.themes", g_get_home_dir()); g_mkdir_with_parents(troot, 0755); g_free(troot); symlink(skin->path, tmp); - gtk_settings_set_string_property (settings, "gtk-theme-name", basename(skin->path), "audacious"); + gtk_settings_set_string_property (settings, "gtk-theme-name", basename(tmp), "audacious"); +#if 0 unlink(tmp); g_free(tmp); +#endif } #endif @@ -1537,12 +1539,12 @@ GtkSettings *settings = gtk_settings_get_default(); gchar *tmp = g_strdup_printf("%s/.themes/aud-%s", g_get_home_dir(), basename(skin->path)); - gchar *troot = g_strdup_printf("%s/.themes"); + gchar *troot = g_strdup_printf("%s/.themes", g_get_home_dir()); g_mkdir_with_parents(troot, 0755); g_free(troot); symlink(skin->path, tmp); - gtk_settings_set_string_property (settings, "gtk-theme-name", basename(skin->path), "audacious"); + gtk_settings_set_string_property (settings, "gtk-theme-name", basename(tmp), "audacious"); unlink(tmp); g_free(tmp);