summaryrefslogtreecommitdiff
path: root/gtk/gtksettings.c
diff options
context:
space:
mode:
authorCarlos Garnacho <carlosg@gnome.org>2010-10-29 06:47:32 +0200
committerCarlos Garnacho <carlosg@gnome.org>2010-12-04 15:38:29 +0100
commit4acc20abc142356c581dc58328fff408aed7a6b8 (patch)
tree7c9cce8247812e810ecbbc6ac213d23a6370e7d3 /gtk/gtksettings.c
parent1bdd761c3fb9e9b5c33cbb78174b3ae5d391b83e (diff)
downloadgtk+-4acc20abc142356c581dc58328fff408aed7a6b8.tar.gz
s/GtkStyleSet/GtkStyleProperties/
The former name had oddities such as gtk_style_set_set() and such, so the new name is nicer in that regard and not much longer.
Diffstat (limited to 'gtk/gtksettings.c')
-rw-r--r--gtk/gtksettings.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/gtk/gtksettings.c b/gtk/gtksettings.c
index d07ce4885b..cbfa7a7d85 100644
--- a/gtk/gtksettings.c
+++ b/gtk/gtksettings.c
@@ -1253,19 +1253,19 @@ gtk_settings_class_init (GtkSettingsClass *class)
g_assert (result == PROP_IM_STATUS_STYLE);
}
-static GtkStyleSet *
+static GtkStyleProperties *
gtk_settings_get_style (GtkStyleProvider *provider,
GtkWidgetPath *path)
{
PangoFontDescription *font_desc;
gchar *font_name, *color_scheme;
GtkSettings *settings;
- GtkStyleSet *set;
+ GtkStyleProperties *props;
gchar **colors;
guint i;
settings = GTK_SETTINGS (provider);
- set = gtk_style_set_new ();
+ props = gtk_style_properties_new ();
g_object_get (settings,
"gtk-font-name", &font_name,
@@ -1301,22 +1301,22 @@ gtk_settings_get_style (GtkStyleProvider *provider,
continue;
color = gtk_symbolic_color_new_literal (&col);
- gtk_style_set_map_color (set, name, color);
+ gtk_style_properties_map_color (props, name, color);
gtk_symbolic_color_unref (color);
}
font_desc = pango_font_description_from_string (font_name);
- gtk_style_set_set (set, 0,
- "font", font_desc,
- NULL);
+ gtk_style_properties_set (props, 0,
+ "font", font_desc,
+ NULL);
pango_font_description_free (font_desc);
g_strfreev (colors);
g_free (color_scheme);
g_free (font_name);
- return set;
+ return props;
}
static void