diff options
| author | Havoc Pennington <hp@redhat.com> | 2002-07-24 18:28:56 +0000 |
|---|---|---|
| committer | Havoc Pennington <hp@src.gnome.org> | 2002-07-24 18:28:56 +0000 |
| commit | 88a0d1ff032093f93233c6faacef2689a989c2bc (patch) | |
| tree | 012e91a115ce140a2bb5a95e67c23ee6d43aa26d /src/theme-parser.c | |
| parent | 28958e51ef1f5db825366b08c401442f6c0c93da (diff) | |
| download | metacity-88a0d1ff032093f93233c6faacef2689a989c2bc.tar.gz | |
look for themes in ~/.themes/NAME/metacity-1/ and
2002-07-24 Havoc Pennington <hp@redhat.com>
* src/theme-parser.c (meta_theme_load): look for themes in
~/.themes/NAME/metacity-1/ and datadir/themes/NAME/metacity-1
instead of the old locations.
* src/themes/Makefile.am: install themes to
datadir/themes/NAME/metacity-1/ to match how GTK works, breaking
third-party themes yet again! woot!
Diffstat (limited to 'src/theme-parser.c')
| -rw-r--r-- | src/theme-parser.c | 41 |
1 files changed, 15 insertions, 26 deletions
diff --git a/src/theme-parser.c b/src/theme-parser.c index 0518afbf..54ffe275 100644 --- a/src/theme-parser.c +++ b/src/theme-parser.c @@ -4181,9 +4181,14 @@ text_handler (GMarkupParseContext *context, /* We change the filename when we break the format, * so themes can work with various metacity versions + * (note, this is obsolete now because we are versioning + * the directory this file is inside, so oh well) */ #define THEME_FILENAME "metacity-theme-1.xml" +/* now this is versioned, /usr/share/themes/NAME/THEME_SUBDIR/THEME_FILENAME */ +#define THEME_SUBDIR "metacity-1" + MetaTheme* meta_theme_load (const char *theme_name, GError **err) @@ -4206,6 +4211,7 @@ meta_theme_load (const char *theme_name, if (meta_is_debugging ()) { + /* Try in themes in our source tree */ theme_dir = g_build_filename ("./themes", theme_name, NULL); theme_file = g_build_filename (theme_dir, @@ -4227,34 +4233,15 @@ meta_theme_load (const char *theme_name, } } - /* We try in current dir, then home dir, then system dir for themes */ - if (text == NULL) - { - theme_dir = g_build_filename ("./", theme_name, NULL); - - theme_file = g_build_filename (theme_dir, - THEME_FILENAME, - NULL); - - error = NULL; - if (!g_file_get_contents (theme_file, - &text, - &length, - &error)) - { - meta_topic (META_DEBUG_THEMES, "Failed to read theme from file %s: %s\n", - theme_file, error->message); - g_error_free (error); - g_free (theme_dir); - g_free (theme_file); - theme_file = NULL; - } - } + /* We try in home dir, then system dir for themes */ if (text == NULL) { theme_dir = g_build_filename (g_get_home_dir (), - ".metacity/themes/", theme_name, NULL); + ".themes", + theme_name, + THEME_SUBDIR, + NULL); theme_file = g_build_filename (theme_dir, THEME_FILENAME, @@ -4277,9 +4264,11 @@ meta_theme_load (const char *theme_name, if (text == NULL) { - theme_dir = g_build_filename (METACITY_PKGDATADIR, + theme_dir = g_build_filename (METACITY_DATADIR, "themes", - theme_name, NULL); + theme_name, + THEME_SUBDIR, + NULL); theme_file = g_build_filename (theme_dir, THEME_FILENAME, |