aboutsummaryrefslogtreecommitdiff
path: root/deskutils/gnome-initial-setup/files/patch-gnome-initial-setup_pages_keyboard_cc-input-chooser.c
diff options
context:
space:
mode:
authorKoop Mast <kwm@FreeBSD.org>2015-08-05 19:13:24 +0000
committerKoop Mast <kwm@FreeBSD.org>2015-08-05 19:13:24 +0000
commitd129587b5d568b0ff5300386f1e1b706c349f38e (patch)
treee398c7b6ea5203fd3953999e6dd9d6c83c9ec931 /deskutils/gnome-initial-setup/files/patch-gnome-initial-setup_pages_keyboard_cc-input-chooser.c
parentc13de12f75988e599e389d9c77ed92db8d927185 (diff)
downloadports-d129587b5d568b0ff5300386f1e1b706c349f38e.tar.gz
ports-d129587b5d568b0ff5300386f1e1b706c349f38e.zip
Notes
Diffstat (limited to 'deskutils/gnome-initial-setup/files/patch-gnome-initial-setup_pages_keyboard_cc-input-chooser.c')
-rw-r--r--deskutils/gnome-initial-setup/files/patch-gnome-initial-setup_pages_keyboard_cc-input-chooser.c23
1 files changed, 7 insertions, 16 deletions
diff --git a/deskutils/gnome-initial-setup/files/patch-gnome-initial-setup_pages_keyboard_cc-input-chooser.c b/deskutils/gnome-initial-setup/files/patch-gnome-initial-setup_pages_keyboard_cc-input-chooser.c
index 4f2b7f6516c2..f39f2b59badb 100644
--- a/deskutils/gnome-initial-setup/files/patch-gnome-initial-setup_pages_keyboard_cc-input-chooser.c
+++ b/deskutils/gnome-initial-setup/files/patch-gnome-initial-setup_pages_keyboard_cc-input-chooser.c
@@ -1,24 +1,15 @@
-$OpenBSD: patch-gnome-initial-setup_pages_keyboard_cc-input-chooser_c,v 1.1 2014/04/07 10:30:32 ajacoutot Exp $
+$OpenBSD: patch-gnome-initial-setup_pages_keyboard_cc-input-chooser_c,v 1.1 2014/04/07 10:30:32 a
gnome-initial-setup in free(): error: bogus pointer
---- gnome-initial-setup/pages/keyboard/cc-input-chooser.c.orig Mon Mar 10 05:47:29 2014
-+++ gnome-initial-setup/pages/keyboard/cc-input-chooser.c Mon Apr 7 12:20:04 2014
-@@ -366,6 +366,8 @@ get_locale_infos (CcInputChooser *chooser)
+--- gnome-initial-setup/pages/keyboard/cc-input-chooser.c.orig 2015-03-13 22:00:44.000000000 +0100
++++ gnome-initial-setup/pages/keyboard/cc-input-chooser.c 2015-05-14 07:45:27.366059000 +0200
+@@ -404,6 +404,8 @@
gchar *lang, *country;
GList *list;
+ lang = country = NULL;
+
- if (gnome_get_input_source_from_locale (priv->locale, &type, &id)) {
- if (g_str_equal (type, INPUT_SOURCE_TYPE_XKB))
- add_row_to_list (chooser, type, id);
-@@ -575,6 +577,8 @@ get_ibus_locale_infos (CcInputChooser *chooser)
- const gchar *engine_id;
- IBusEngineDesc *engine;
- gchar *lang, *country;
-+
-+ lang = country = NULL;
-
- if (!priv->ibus_engines)
- return;
+ if (gnome_get_input_source_from_locale (priv->locale, &type, &id)) {
+ add_row_to_list (chooser, type, id);
+ if (!priv->id) {