diff --git a/ChangeLog b/ChangeLog index f85dbfc673..83b4584caf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2006-01-11 Matthias Clasen + * gdk/x11/gdkevents-x11.c: Fix string offsets. + Allow falling back to another icon theme before hicolor. (#325546, Rodney Dawes) diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index f85dbfc673..83b4584caf 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,5 +1,7 @@ 2006-01-11 Matthias Clasen + * gdk/x11/gdkevents-x11.c: Fix string offsets. + Allow falling back to another icon theme before hicolor. (#325546, Rodney Dawes) diff --git a/gdk/x11/gdkevents-x11.c b/gdk/x11/gdkevents-x11.c index d5fd2d9cab..f3445c21c1 100644 --- a/gdk/x11/gdkevents-x11.c +++ b/gdk/x11/gdkevents-x11.c @@ -2800,9 +2800,8 @@ static const char settings_names[] = "Net/DndDragThreshold\0" "gtk-dnd-drag-threshold\0" "Net/CursorBlink\0" "gtk-cursor-blink\0" "Net/CursorBlinkTime\0" "gtk-cursor-blink-time\0" - "Net/ThemeName\0" "gtk-theme-name\0" + "Net/ThemeName\0" "gtk-theme-name\0" "Net/IconThemeName\0" "gtk-icon-theme-name\0" - "Net/FallbackIconTheme\0" "gtk-fallback-icon-theme\0" "Gtk/CanChangeAccels\0" "gtk-can-change-accels\0" "Gtk/ColorPalette\0" "gtk-color-palette\0" "Gtk/FontName\0" "gtk-font-name\0" @@ -2829,7 +2828,8 @@ static const char settings_names[] = "Xft/Hinting\0" "gtk-xft-hinting\0" "Xft/HintStyle\0" "gtk-xft-hintstyle\0" "Xft/RGBA\0" "gtk-xft-rgba\0" - "Xft/DPI\0" "gtk-xft-dpi\0"; + "Xft/DPI\0" "gtk-xft-dpi\0" + "Net/FallbackIconTheme\0" "gtk-fallback-icon-theme\0"; static const struct { @@ -2869,7 +2869,8 @@ static const struct { 1137, 1149 }, { 1165, 1179 }, { 1197, 1206 }, - { 1219, 1227 } + { 1219, 1227 }, + { 1239, 1261 } }; static void