AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

GtkSettings: Properly clean up style providers

Browse Source
This commit is contained in:
Matthias Clasen 2012-09-17 22:30:14 -04:00
parent ab3d6a0b0a
commit 6210e7fb80
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
gtk/gtksettings.c
View File

@ -253,6 +253,9 @@ static GHashTable *get_color_hash (GtkSettings *setting
static void gtk_settings_load_from_key_file (GtkSettings *settings, static void gtk_settings_load_from_key_file (GtkSettings *settings,
const gchar *path, const gchar *path,
GtkSettingsSource source); GtkSettingsSource source);
static void settings_update_provider (GdkScreen *screen,
GtkCssProvider **old,
GtkCssProvider *new);
/* the default palette for GtkColorSelelection */ /* the default palette for GtkColorSelelection */
static const gchar default_color_palette[] = static const gchar default_color_palette[] =
@ -1568,14 +1571,10 @@ gtk_settings_finalize (GObject *object)
g_datalist_clear (&priv->queued_settings); g_datalist_clear (&priv->queued_settings);
if (priv->theme_provider) settings_update_provider (priv->screen, &priv->theme_provider, NULL);
g_object_unref (priv->theme_provider); settings_update_provider (priv->screen, &priv->key_theme_provider, NULL);
if (priv->key_theme_provider) g_clear_object (&priv->style);
g_object_unref (priv->key_theme_provider);
if (priv->style)
g_object_unref (priv->style);
G_OBJECT_CLASS (gtk_settings_parent_class)->finalize (object); G_OBJECT_CLASS (gtk_settings_parent_class)->finalize (object);
} }