[gnome-initial-setup/f19] Add upstream patch for AcceptedFreezeException bug 928645
rtcm
rtcm at fedoraproject.org
Fri May 17 16:28:14 UTC 2013
commit 23e131a8ae418da4c04b05522eebc3423f5b368c
Author: Rui Matos <tiagomatos at gmail.com>
Date: Fri May 17 18:26:27 2013 +0200
Add upstream patch for AcceptedFreezeException bug 928645
...ite-out-the-settings-when-leaving-the-pag.patch | 53 ++++++++++++++++++++
gnome-initial-setup.spec | 7 ++-
2 files changed, 59 insertions(+), 1 deletions(-)
---
diff --git a/0001-keyboard-Write-out-the-settings-when-leaving-the-pag.patch b/0001-keyboard-Write-out-the-settings-when-leaving-the-pag.patch
new file mode 100644
index 0000000..c4fe6ad
--- /dev/null
+++ b/0001-keyboard-Write-out-the-settings-when-leaving-the-pag.patch
@@ -0,0 +1,53 @@
+From 7bfd8ff32418639e730cde0b4b2aca4da1b11885 Mon Sep 17 00:00:00 2001
+From: Rui Matos <tiagomatos at gmail.com>
+Date: Fri, 17 May 2013 16:42:16 +0200
+Subject: [PATCH] keyboard: Write out the settings when leaving the page
+
+Otherwise if users just click next without editing the default input
+sources list they'll end up with an empty setting.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=700535
+---
+ gnome-initial-setup/pages/keyboard/gis-keyboard-page.c | 13 +++++++++++++
+ 1 file changed, 13 insertions(+)
+
+diff --git a/gnome-initial-setup/pages/keyboard/gis-keyboard-page.c b/gnome-initial-setup/pages/keyboard/gis-keyboard-page.c
+index 345c0fc..4187bdd 100644
+--- a/gnome-initial-setup/pages/keyboard/gis-keyboard-page.c
++++ b/gnome-initial-setup/pages/keyboard/gis-keyboard-page.c
+@@ -112,12 +112,23 @@ gis_keyboard_page_finalize (GObject *object)
+
+ static void localed_proxy_ready (GObject *source, GAsyncResult *res, gpointer data);
+ static void setup_input_section (GisKeyboardPage *self);
++static void update_input (GisKeyboardPage *self);
++
++static void
++next_page_cb (GisAssistant *assistant,
++ GisPage *which_page,
++ GisPage *this_page)
++{
++ if (which_page == this_page)
++ update_input (GIS_KEYBOARD_PAGE (this_page));
++}
+
+ static void
+ gis_keyboard_page_constructed (GObject *object)
+ {
+ GisKeyboardPage *self = GIS_KEYBOARD_PAGE (object);
+ GisKeyboardPagePrivate *priv = self->priv;
++ GisAssistant *assistant = gis_driver_get_assistant (GIS_PAGE (self)->driver);
+
+ G_OBJECT_CLASS (gis_keyboard_page_parent_class)->constructed (object);
+
+@@ -137,6 +148,8 @@ gis_keyboard_page_constructed (GObject *object)
+ (GAsyncReadyCallback) localed_proxy_ready,
+ self);
+
++ g_signal_connect (assistant, "next-page", G_CALLBACK (next_page_cb), self);
++
+ gis_page_set_complete (GIS_PAGE (self), TRUE);
+ gtk_widget_show (GTK_WIDGET (self));
+ }
+--
+1.8.1.4
+
diff --git a/gnome-initial-setup.spec b/gnome-initial-setup.spec
index ac88c7f..e33b9ef 100644
--- a/gnome-initial-setup.spec
+++ b/gnome-initial-setup.spec
@@ -1,6 +1,6 @@
Name: gnome-initial-setup
Version: 0.10
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Bootstrapping your OS
License: GPLv2+
@@ -11,6 +11,7 @@ Source0: http://download.gnome.org/sources/%{name}/0.8/%{name}-%{version}
# https://bugzilla.gnome.org/show_bug.cgi?id=687957
Patch0: yelp-fixes.patch
Patch1: test-day-fixes.patch
+Patch2: 0001-keyboard-Write-out-the-settings-when-leaving-the-pag.patch
%global nm_version 0.9
%global glib_required_version 2.29.4
@@ -66,6 +67,7 @@ you through configuring it. It is integrated with gdm.
%setup -q
%patch0 -p1 -b .yelp-fixes
%patch1 -p1 -b .test-day-fixes
+%patch2 -p1
autoreconf -i -f
@@ -111,6 +113,9 @@ userdel %{name} &>/dev/null || :
%{_datadir}/polkit-1/rules.d/20-gnome-initial-setup.rules
%changelog
+* Fri May 17 2013 Rui Matos <rmatos at redhat.com> - 0.10-2
+- Add upstream patch for AcceptedFreezeException bug 928645
+
* Tue May 14 2013 Rui Matos <rmatos at redhat.com> - 0.10-1
- Update to 0.10
- Add BuildRequires on polkit-devel
More information about the scm-commits
mailing list