applications/gnome-control-center
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix the build with gcc-2.95, patch from Jens Granseuer <jensgr@gmx.net>

Browse source 
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).
This commit is contained in:
Sebastien Bacher 2005-05-22 16:48:37 +00:00 • committed by Sebastien Bacher
parent 45b672f60f
commit 82b98de843
2 changed files with 12 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
capplets/keyboard/ChangeLog
View file

@ -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> 2005-04-10 Sergey V. Udaltsov <svu@gnome.org>
* gnome-keyboard-properties-xkbpv.c: improving the preview layout * gnome-keyboard-properties-xkbpv.c: improving the preview layout

11
capplets/keyboard/gnome-keyboard-properties-xkbot.c
View file

@ -242,21 +242,21 @@ xkb_options_add_group (const XklConfigItemPtr
Bool allowMultipleSelection, Bool allowMultipleSelection,
GladeXML * dialog) 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 *utfGroupName = xci_desc_to_utf8 (configItem);
gchar *titlemarkup = g_strconcat ("<span>", utfGroupName, "</span>", NULL); 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_object_set_data_full (G_OBJECT (expander), "utfGroupName", utfGroupName, g_free);
g_free (titlemarkup); g_free (titlemarkup);
gtk_expander_set_use_markup (GTK_EXPANDER (expander), TRUE); 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); 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 (align), vbox);
gtk_container_add (GTK_CONTAINER (expander), align); gtk_container_add (GTK_CONTAINER (expander), align);
currentVbox = vbox; currentVbox = vbox;
@ -264,6 +264,7 @@ xkb_options_add_group (const XklConfigItemPtr
currentMultiSelect = (gboolean) allowMultipleSelection; currentMultiSelect = (gboolean) allowMultipleSelection;
currentRadioGroup = NULL; currentRadioGroup = NULL;
current1stLevelId = configItem->name;
XklConfigEnumOptions (configItem->name, (ConfigItemProcessFunc) XklConfigEnumOptions (configItem->name, (ConfigItemProcessFunc)
xkb_options_add_option, dialog); xkb_options_add_option, dialog);