summaryrefslogtreecommitdiff
path: root/gdk/x11
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2013-10-24 20:35:55 -0400
committerMatthias Clasen <mclasen@redhat.com>2013-10-24 20:35:55 -0400
commitc46aca463a9d66cf402ec8c3f9f2e2efc98c42ca (patch)
treea0a62b38b2cebb5e4928cdb9d6f0efd5f126ef93 /gdk/x11
parent627a03683f5f41efbfc86cc0f10e1b7c11e9bb25 (diff)
downloadgtk+-c46aca463a9d66cf402ec8c3f9f2e2efc98c42ca.tar.gz
Respect deprecated button images setting
I have been convinced that it is a bad idea to change the behaviour at the same time as deprecating it, so go back to respecting the Gtk/ButtonImages xsetting in buttons created with gtk_button_new_from_stock() when it is set. The setting as well as the function are still deprecated, and the default value of the setting will remain FALSE.
Diffstat (limited to 'gdk/x11')
-rw-r--r--gdk/x11/gdksettings.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/gdk/x11/gdksettings.c b/gdk/x11/gdksettings.c
index e98b33ebd5..6d2f87d60b 100644
--- a/gdk/x11/gdksettings.c
+++ b/gdk/x11/gdksettings.c
@@ -36,6 +36,7 @@ static const struct {
{"Gtk/FontName", "gtk-font-name"},
{"Gtk/KeyThemeName", "gtk-key-theme-name"},
{"Gtk/Modules", "gtk-modules"},
+ {"Gtk/ButtonImages", "gtk-button-images"},
{"Gtk/MenuImages", "gtk-menu-images"},
{"Gtk/CursorThemeName", "gtk-cursor-theme-name"},
{"Gtk/CursorThemeSize", "gtk-cursor-theme-size"},