diff options
author | William Jon McCann <mccann@jhu.edu> | 2007-12-22 21:07:32 +0000 |
---|---|---|
committer | William Jon McCann <mccann@src.gnome.org> | 2007-12-22 21:07:32 +0000 |
commit | a5afd99be2239ed291a7c12ccfa9ef580c33fdcc (patch) | |
tree | 72a664885ebf986f96a3a9b99b027c14ad5c0852 | |
parent | 37a40693f3121447dfd9ab5ce546c42fc883d19f (diff) | |
download | gnome-settings-daemon-a5afd99be2239ed291a7c12ccfa9ef580c33fdcc.tar.gz |
use new setting from libgnome to make toolbar icon size setting work (bug
2007-12-22 William Jon McCann <mccann@jhu.edu>
* plugins/xsettings/gsd-xsettings-manager.c:
use new setting from libgnome to make toolbar
icon size setting work (bug #401030)
Merge from gnome-control-center.
svn path=/trunk/; revision=37
-rw-r--r-- | ChangeLog | 7 | ||||
-rw-r--r-- | plugins/xsettings/gsd-xsettings-manager.c | 2 |
2 files changed, 8 insertions, 1 deletions
@@ -1,5 +1,12 @@ 2007-12-22 William Jon McCann <mccann@jhu.edu> + * plugins/xsettings/gsd-xsettings-manager.c: + use new setting from libgnome to make toolbar + icon size setting work (bug #401030) + Merge from gnome-control-center. + +2007-12-22 William Jon McCann <mccann@jhu.edu> + * plugins/xsettings/Makefile.am: * plugins/xsettings/gnome-xsettings-manager.c: * plugins/xsettings/gnome-xsettings-manager.h: diff --git a/plugins/xsettings/gsd-xsettings-manager.c b/plugins/xsettings/gsd-xsettings-manager.c index 34bd8b92..05d45d4f 100644 --- a/plugins/xsettings/gsd-xsettings-manager.c +++ b/plugins/xsettings/gsd-xsettings-manager.c @@ -175,7 +175,7 @@ static TranslationEntry translations [] = { { "/desktop/gnome/interface/font_name", "Gtk/FontName", GCONF_VALUE_STRING, translate_string_string }, { "/desktop/gnome/interface/gtk_key_theme", "Gtk/KeyThemeName", GCONF_VALUE_STRING, translate_string_string }, { "/desktop/gnome/interface/toolbar_style", "Gtk/ToolbarStyle", GCONF_VALUE_STRING, translate_string_string_toolbar }, - { "/desktop/gnome/interface/toolbar_icon_size", "Gtk/ToolbarIconSize", GCONF_VALUE_STRING, translate_string_string }, + { "/desktop/gnome/interface/toolbar_icons_size", "Gtk/ToolbarIconSize", GCONF_VALUE_STRING, translate_string_string }, { "/desktop/gnome/interface/can_change_accels", "Gtk/CanChangeAccels", GCONF_VALUE_BOOL, translate_bool_int }, { "/desktop/gnome/interface/cursor_blink", "Net/CursorBlink", GCONF_VALUE_BOOL, translate_bool_int }, { "/desktop/gnome/interface/cursor_blink_time", "Net/CursorBlinkTime", GCONF_VALUE_INT, translate_int_int }, |