From 1f98a6b4366bfdb47ed784cf5783c2b3f2de4e63 Mon Sep 17 00:00:00 2001 From: "Sergey V. Udaltsov" Date: Thu, 9 Dec 2004 02:02:16 +0000 Subject: [PATCH] using XklGetMaxNumGroups --- capplets/keyboard/ChangeLog | 4 ++++ capplets/keyboard/gnome-keyboard-properties-xkblt.c | 5 +++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/capplets/keyboard/ChangeLog b/capplets/keyboard/ChangeLog index 8177b8dc7..531b07b6b 100644 --- a/capplets/keyboard/ChangeLog +++ b/capplets/keyboard/ChangeLog @@ -1,3 +1,7 @@ +2004-12-09 Sergey V. Udaltsov + + * gnome-keyboard-properties-xkblt.c: using of the XklGetMaxNumGroups + 2004-11-29 Sergey V. Udaltsov * gnome-keyboard-properties-xkb.c: preview only makes sense for XKB backend diff --git a/capplets/keyboard/gnome-keyboard-properties-xkblt.c b/capplets/keyboard/gnome-keyboard-properties-xkblt.c index 1327db077..c1dcfa97a 100644 --- a/capplets/keyboard/gnome-keyboard-properties-xkblt.c +++ b/capplets/keyboard/gnome-keyboard-properties-xkblt.c @@ -127,7 +127,8 @@ enable_disable_layouts_buttons (GladeXML * dialog) gtk_widget_set_sensitive (addLayoutBtn, (nSelectedAvailableLayouts > 0) - && (nSelectedLayouts < maxSelectedLayouts)); + && (nSelectedLayouts < maxSelectedLayouts || + maxSelectedLayouts == 0)); gtk_widget_set_sensitive (delLayoutBtn, nSelectedSelectedLayouts > 0); if (gtk_tree_selection_get_selected (sSelection, NULL, &iter)) @@ -168,7 +169,7 @@ prepare_selected_layouts_tree (GladeXML * dialog) g_signal_connect_swapped (G_OBJECT (selection), "changed", G_CALLBACK (enable_disable_layouts_buttons), dialog); - maxSelectedLayouts = ( XklGetBackendFeatures() & XKLF_MULTIPLE_LAYOUTS_SUPPORTED ) ? XkbNumKbdGroups : 1; + maxSelectedLayouts = XklGetMaxNumGroups(); } void