From 135ba71f85cbda751ada0e8f8a147ca18fa7da31 Mon Sep 17 00:00:00 2001 From: "Sergey V. Udaltsov" Date: Sat, 18 Oct 2008 00:14:52 +0000 Subject: [PATCH] Fixed group sorting, sort without formatting svn path=/trunk/; revision=9074 --- capplets/keyboard/ChangeLog | 5 +++++ capplets/keyboard/gnome-keyboard-properties-xkbot.c | 8 ++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/capplets/keyboard/ChangeLog b/capplets/keyboard/ChangeLog index 82a011f50..0b1a608b6 100644 --- a/capplets/keyboard/ChangeLog +++ b/capplets/keyboard/ChangeLog @@ -1,3 +1,8 @@ +2008-10-18 Sergey Udaltsov + + * gnome-keyboard-properties-xkbot.c: fixed group sorting, using group + name as is, without formatting + ==================== 2.24.0.1 ==================== 2008-09-21 Jens Granseuer diff --git a/capplets/keyboard/gnome-keyboard-properties-xkbot.c b/capplets/keyboard/gnome-keyboard-properties-xkbot.c index 0c184a3ef..dbf877484 100644 --- a/capplets/keyboard/gnome-keyboard-properties-xkbot.c +++ b/capplets/keyboard/gnome-keyboard-properties-xkbot.c @@ -304,9 +304,9 @@ xkb_options_expanders_compare (GtkWidget * expander1, GtkWidget * expander2) { const gchar *t1 = - gtk_expander_get_label (GTK_EXPANDER (expander1)); + g_object_get_data (G_OBJECT (expander1), "utfGroupName"); const gchar *t2 = - gtk_expander_get_label (GTK_EXPANDER (expander2)); + g_object_get_data (G_OBJECT (expander2), "utfGroupName"); return g_utf8_collate (t1, t2); } @@ -352,7 +352,7 @@ xkb_options_load_options (GladeXML * dialog) } static void -chooser_response_cb (GtkDialog *dialog, gint response, gpointer data) +chooser_response_cb (GtkDialog * dialog, gint response, gpointer data) { if (response == GTK_RESPONSE_CLOSE) gtk_widget_destroy (GTK_WIDGET (dialog)); @@ -374,7 +374,7 @@ xkb_options_popup_dialog (GladeXML * dialog) xkb_options_load_options (chooser_dialog); g_signal_connect (chooser, "response", - G_CALLBACK (chooser_response_cb), dialog); + G_CALLBACK (chooser_response_cb), dialog); gtk_dialog_run (GTK_DIALOG (chooser)); }