brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

make our theme search compliant to the XDG Base Directory Specification.

Browse Source 
2007-11-17  Benjamin Gramlich  <benjamin.gramlich@gmail.com>

        * src/theme-parser.c (meta_theme_load): make our theme
        search compliant to the XDG Base Directory Specification.
        Closes #480026.


svn path=/trunk/; revision=3411
This commit is contained in:
Benjamin Gramlich 2007-11-18 03:23:58 +00:00 committed by Thomas James Alexander Thurman
parent 14c046d18d
commit 3789229a70
2 changed files with 48 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2007-11-17 Benjamin Gramlich <benjamin.gramlich@gmail.com>
* src/theme-parser.c (meta_theme_load): make our theme
search compliant to the XDG Base Directory Specification.
Closes #480026.
2007-11-15 Thomas Thurman <thomas@thurman.org.uk> 2007-11-15 Thomas Thurman <thomas@thurman.org.uk>
* src/api.[ch]: remove almost-unused files. * src/api.[ch]: remove almost-unused files.

42
src/theme-parser.c
View File

@ -4466,6 +4466,8 @@ meta_theme_load (const char *theme_name,
char *theme_dir; char *theme_dir;
MetaTheme *retval; MetaTheme *retval;
guint version; guint version;
const gchar* const* xdg_data_dirs;
int i;
text = NULL; text = NULL;
length = 0; length = 0;
@ -4511,8 +4513,9 @@ meta_theme_load (const char *theme_name,
gchar *theme_filename = g_strdup_printf (METACITY_THEME_FILENAME_FORMAT, gchar *theme_filename = g_strdup_printf (METACITY_THEME_FILENAME_FORMAT,
version); version);
/* We try in home dir, then system dir for themes */ /* We try first in home dir, XDG_DATA_DIRS, then system dir for themes */
/* Try home dir for themes */
theme_dir = g_build_filename (g_get_home_dir (), theme_dir = g_build_filename (g_get_home_dir (),
".themes", ".themes",
theme_name, theme_name,
@ -4537,6 +4540,43 @@ meta_theme_load (const char *theme_name,
theme_file = NULL; theme_file = NULL;
} }
/* Try each XDG_DATA_DIRS for theme */
xdg_data_dirs = g_get_system_data_dirs();
for(i = 0; xdg_data_dirs[i] != NULL; i++)
{
if (text == NULL)
{
theme_dir = g_build_filename (xdg_data_dirs[i],
"themes",
theme_name,
THEME_SUBDIR,
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;
}
else
{
break;
}
}
}
/* Look for themes in METACITY_DATADIR */
if (text == NULL) if (text == NULL)
{ {
theme_dir = g_build_filename (METACITY_DATADIR, theme_dir = g_build_filename (METACITY_DATADIR,