applications/gnome-control-center
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

when reading current settings from gconf, get the color scheme from the

Browse source 
2007-07-24  Jens Granseuer  <jensgr@gmx.net>

	* appearance-themes.c: (theme_load_from_gconf): when reading current
	settings from gconf, get the color scheme from the gtk theme if necessary
	to allow matching against themes retrieved via gnome-theme-info

svn path=/trunk/; revision=7879
This commit is contained in:
Jens Granseuer 2007-07-24 20:34:23 +00:00 • committed by Jens Granseuer
parent bb650ba152
commit 8b934e5ed4
2 changed files with 23 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
capplets/appearance/ChangeLog
View file

@ -1,3 +1,9 @@
2007-07-24 Jens Granseuer <jensgr@gmx.net>
* appearance-themes.c: (theme_load_from_gconf): when reading current
settings from gconf, get the color scheme from the gtk theme if necessary
to allow matching against themes retrieved via gnome-theme-info
2007-07-24 Thomas Wood <thos@gnome.org>
* data/Makefile.am: Add makefile

18
capplets/appearance/appearance-themes.c
View file

@ -24,6 +24,7 @@
#include "theme-installer.h"
#include "theme-save.h"
#include "theme-util.h"
#include "gtkrc-utils.h"
#include <glib/gi18n.h>
#include <libwindow-settings/gnome-wm-manager.h>
@ -110,11 +111,26 @@ is_locked_down (GConfClient *client)
static void
theme_load_from_gconf (GConfClient *client, GnomeThemeMetaInfo *theme)
{
gchar *scheme;
g_free (theme->gtk_theme_name);
theme->gtk_theme_name = gconf_client_get_string (client, GTK_THEME_KEY, NULL);
g_free (theme->gtk_color_scheme);
theme->gtk_color_scheme = gconf_client_get_string (client, COLOR_SCHEME_KEY, NULL);
scheme = gconf_client_get_string (client, COLOR_SCHEME_KEY, NULL);
if (scheme == NULL || !strcmp (scheme, "")) {
/* try to find the color scheme from the gtkrc */
gchar *gtkrc_file;
gtkrc_file = gtkrc_find_named (theme->gtk_theme_name);
if (gtkrc_file) {
g_free (scheme);
scheme = gtkrc_get_color_scheme (gtkrc_file);
g_free (gtkrc_file);
}
}
theme->gtk_color_scheme = scheme;
g_free (theme->metacity_theme_name);
theme->metacity_theme_name = gconf_client_get_string (client, METACITY_THEME_KEY, NULL);