rpms/gnome-initial-setup
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Resolves: rhbz#1172363

Browse Source
This commit is contained in:
Rui Matos 2014-12-16 16:46:00 +00:00
parent 22befd3fa9
commit a27e533ca9
2 changed files with 38 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
0001-keyboard-Fix-a-crash.patch Normal file
View File

@ -0,0 +1,31 @@
From c62b52a81d5ac9562d78607914736c29124db004 Mon Sep 17 00:00:00 2001
From: Rui Matos <tiagomatos@gmail.com>
Date: Tue, 16 Dec 2014 16:33:49 +0000
Subject: [PATCH] keyboard: Fix a crash
If there's no default input source for a given locale, id would go
uninitialized and then crash further down when accessing it for a
string comparison.
https://bugzilla.redhat.com/show_bug.cgi?id=1172363
---
gnome-initial-setup/pages/keyboard/cc-input-chooser.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/gnome-initial-setup/pages/keyboard/cc-input-chooser.c b/gnome-initial-setup/pages/keyboard/cc-input-chooser.c
index c5bd085..4e3400c 100644
--- a/gnome-initial-setup/pages/keyboard/cc-input-chooser.c
+++ b/gnome-initial-setup/pages/keyboard/cc-input-chooser.c
@@ -397,7 +397,8 @@ static void
get_locale_infos (CcInputChooser *chooser)
{
CcInputChooserPrivate *priv = cc_input_chooser_get_instance_private (chooser);
- const gchar *type, *id;
+ const gchar *type = NULL;
+ const gchar *id = NULL;
gchar *lang, *country;
GList *list;
--
1.9.0

8
gnome-initial-setup.spec
View File

@ -1,12 +1,14 @@
Name: gnome-initial-setup
Version: 3.14.2.1
Release: 1%{?dist}
Release: 2%{?dist}
Summary: Bootstrapping your OS
License: GPLv2+
URL: https://live.gnome.org/GnomeOS/Design/Whiteboards/InitialSetup
Source0: http://download.gnome.org/sources/%{name}/3.14/%{name}-%{version}.tar.xz
Patch0: 0001-keyboard-Fix-a-crash.patch
%global nm_version 0.9.6.4
%global glib_required_version 2.36.0
%global gtk_required_version 3.11.3
@ -60,6 +62,7 @@ you through configuring it. It is integrated with gdm.
%prep
%setup -q
%patch0 -p1
%build
%configure
@ -99,6 +102,9 @@ useradd -rM -d /run/gnome-initial-setup/ -s /sbin/nologin %{name} &>/dev/null ||
%{_datadir}/polkit-1/rules.d/20-gnome-initial-setup.rules
%changelog
* Tue Dec 16 2014 Rui Matos <rmatos@redhat.com> - 3.14.2.1-2
- Resolves: rhbz#1172363
* Tue Nov 11 2014 Rui Matos <rmatos@redhat.com> - 3.14.2.1-1
- Update to 3.14.2.1