diff options
| author | Benjamin Otte <otte@redhat.com> | 2017-10-31 04:31:46 +0100 |
|---|---|---|
| committer | Benjamin Otte <otte@redhat.com> | 2017-10-31 04:33:54 +0100 |
| commit | 83fb7a649f07fc989ff149036b17698f7dee18c4 (patch) | |
| tree | 772d5c0ac1a4ee7054cef63e6f675fdbeebc081f /gtk/gtksettings.c | |
| parent | c8986e66ce482714f4ce2adf3c24dd53cca27bbe (diff) | |
| download | gtk+-83fb7a649f07fc989ff149036b17698f7dee18c4.tar.gz | |
css: Merge GtkStyleProviderPrivate into GtkStyleProvider
This is just lots of renaming.
The interface remains private, so the public API does not change, apart
from removing the definition of the Interface object to avoid
subclassing.
Diffstat (limited to 'gtk/gtksettings.c')
| -rw-r--r-- | gtk/gtksettings.c | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/gtk/gtksettings.c b/gtk/gtksettings.c index 61bf3a2cf1..319c783767 100644 --- a/gtk/gtksettings.c +++ b/gtk/gtksettings.c @@ -194,8 +194,7 @@ enum { }; /* --- prototypes --- */ -static void gtk_settings_provider_iface_init (GtkStyleProviderIface *iface); -static void gtk_settings_provider_private_init (GtkStyleProviderPrivateInterface *iface); +static void gtk_settings_provider_iface_init (GtkStyleProviderInterface *iface); static void gtk_settings_finalize (GObject *object); static void gtk_settings_get_property (GObject *object, @@ -245,9 +244,7 @@ static GPtrArray *display_settings; G_DEFINE_TYPE_EXTENDED (GtkSettings, gtk_settings, G_TYPE_OBJECT, 0, G_ADD_PRIVATE (GtkSettings) G_IMPLEMENT_INTERFACE (GTK_TYPE_STYLE_PROVIDER, - gtk_settings_provider_iface_init) - G_IMPLEMENT_INTERFACE (GTK_TYPE_STYLE_PROVIDER_PRIVATE, - gtk_settings_provider_private_init)); + gtk_settings_provider_iface_init)); /* --- functions --- */ static void @@ -1072,19 +1069,14 @@ gtk_settings_class_init (GtkSettingsClass *class) g_assert (result == PROP_KEYNAV_USE_CARET); } -static void -gtk_settings_provider_iface_init (GtkStyleProviderIface *iface) -{ -} - static GtkSettings * -gtk_settings_style_provider_get_settings (GtkStyleProviderPrivate *provider) +gtk_settings_style_provider_get_settings (GtkStyleProvider *provider) { return GTK_SETTINGS (provider); } static void -gtk_settings_provider_private_init (GtkStyleProviderPrivateInterface *iface) +gtk_settings_provider_iface_init (GtkStyleProviderInterface *iface) { iface->get_settings = gtk_settings_style_provider_get_settings; } @@ -1331,7 +1323,7 @@ gtk_settings_set_property (GObject *object, static void settings_invalidate_style (GtkSettings *settings) { - _gtk_style_provider_private_changed (GTK_STYLE_PROVIDER_PRIVATE (settings)); + gtk_style_provider_changed (GTK_STYLE_PROVIDER (settings)); } static void |