diff options
| author | Sebastien Bacher <seb128@debian.org> | 2005-05-22 16:48:37 +0000 |
|---|---|---|
| committer | Sebastien Bacher <sbacher@src.gnome.org> | 2005-05-22 16:48:37 +0000 |
| commit | 82b98de843d38d7eb61bb206583bcc48a0f85f86 (patch) | |
| tree | 66c115530593e6d94b074ef3af45b49d4358becb /capplets | |
| parent | 45b672f60f7b78be7f3d15d0c6adf72f0e601851 (diff) | |
| download | gnome-control-center-82b98de843d38d7eb61bb206583bcc48a0f85f86.tar.gz | |
fix the build with gcc-2.95, patch from Jens Granseuer <jensgr@gmx.net>
2005-05-22 Sebastien Bacher <seb128@debian.org>
* gnome-keyboard-properties-xkbot.c: (xkb_options_add_group):
fix the build with gcc-2.95, patch from Jens Granseuer <jensgr@gmx.net>
(Closes: #170159).
Diffstat (limited to 'capplets')
| -rw-r--r-- | capplets/keyboard/ChangeLog | 6 | ||||
| -rw-r--r-- | capplets/keyboard/gnome-keyboard-properties-xkbot.c | 11 |
2 files changed, 12 insertions, 5 deletions
diff --git a/capplets/keyboard/ChangeLog b/capplets/keyboard/ChangeLog index 1e59bea13..1044e79aa 100644 --- a/capplets/keyboard/ChangeLog +++ b/capplets/keyboard/ChangeLog @@ -1,3 +1,9 @@ +2005-05-22 Sebastien Bacher <seb128@debian.org> + + * gnome-keyboard-properties-xkbot.c: (xkb_options_add_group): + fix the build with gcc-2.95, patch from Jens Granseuer <jensgr@gmx.net> + (Closes: #170159). + 2005-04-10 Sergey V. Udaltsov <svu@gnome.org> * gnome-keyboard-properties-xkbpv.c: improving the preview layout diff --git a/capplets/keyboard/gnome-keyboard-properties-xkbot.c b/capplets/keyboard/gnome-keyboard-properties-xkbot.c index 72b00950c..f06ef6dce 100644 --- a/capplets/keyboard/gnome-keyboard-properties-xkbot.c +++ b/capplets/keyboard/gnome-keyboard-properties-xkbot.c @@ -242,21 +242,21 @@ xkb_options_add_group (const XklConfigItemPtr Bool allowMultipleSelection, GladeXML * dialog) { - GSList * expanders_list = g_object_get_data (G_OBJECT (dialog), EXPANDERS_PROP); + GtkWidget *expander, *align, *vbox; - current1stLevelId = configItem->name; + GSList * expanders_list = g_object_get_data (G_OBJECT (dialog), EXPANDERS_PROP); gchar *utfGroupName = xci_desc_to_utf8 (configItem); gchar *titlemarkup = g_strconcat ("<span>", utfGroupName, "</span>", NULL); - GtkWidget *expander = gtk_expander_new (titlemarkup); + expander = gtk_expander_new (titlemarkup); g_object_set_data_full (G_OBJECT (expander), "utfGroupName", utfGroupName, g_free); g_free (titlemarkup); gtk_expander_set_use_markup (GTK_EXPANDER (expander), TRUE); - GtkWidget *align = gtk_alignment_new (0, 0, 1, 1); + align = gtk_alignment_new (0, 0, 1, 1); gtk_alignment_set_padding (GTK_ALIGNMENT (align), 6, 12, 12, 0); - GtkWidget *vbox = gtk_vbox_new (TRUE, 6); + vbox = gtk_vbox_new (TRUE, 6); gtk_container_add (GTK_CONTAINER (align), vbox); gtk_container_add (GTK_CONTAINER (expander), align); currentVbox = vbox; @@ -264,6 +264,7 @@ xkb_options_add_group (const XklConfigItemPtr currentMultiSelect = (gboolean) allowMultipleSelection; currentRadioGroup = NULL; + current1stLevelId = configItem->name; XklConfigEnumOptions (configItem->name, (ConfigItemProcessFunc) xkb_options_add_option, dialog); |