- Disable gd page transitions for now since they don't

completely work right (ask adamw).
- Fix crasher when realmd goes away
This commit is contained in:
Ray Strode 2013-03-20 21:36:21 -04:00
parent 5e3f5e09f3
commit 8c54fb1b3b
2 changed files with 71 additions and 1 deletions

View File

@ -1,6 +1,6 @@
Name: gnome-initial-setup
Version: 0.8
Release: 1%{?dist}
Release: 2%{?dist}
Summary: Bootstrapping your OS
License: GPLv2+
@ -10,6 +10,7 @@ Source0: http://download.gnome.org/sources/%{name}/0.8/%{name}-%{version}
# this depends on a yelp patch that hasn't been merged upstream yet
# https://bugzilla.gnome.org/show_bug.cgi?id=687957
Patch0: yelp-fixes.patch
Patch1: test-day-fixes.patch
%global nm_version 0.9
%global glib_required_version 2.29.4
@ -61,6 +62,7 @@ you through configuring it. It is integrated with gdm.
%prep
%setup -q
%patch0 -p1 -b .yelp-fixes
%patch1 -p1 -b .test-day-fixes
autoreconf -i -f
@ -116,6 +118,11 @@ userdel %{name} &>/dev/null || :
/usr/lib/systemd/system/gnome-initial-setup.service
%changelog
* Wed Mar 20 2013 Ray Strode <rstrode@redhat.com> 0.8-2
- Disable gd page transitions for now since they don't
completely work right (ask adamw).
- Fix crasher when realmd goes away
* Tue Mar 19 2013 Matthias Clasen <mclasen@redhat.com> - 0.8-1
- Update to 0.8

63
test-day-fixes.patch Normal file
View File

@ -0,0 +1,63 @@
From 4d54e7a12aaf048146f8c536c2125f4a16865b97 Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode@redhat.com>
Date: Wed, 20 Mar 2013 20:24:45 -0400
Subject: [PATCH 1/2] account-page: stop watching realmd when disposed
We don't want any handlers called when the page is freed.
---
gnome-initial-setup/pages/account/gis-account-page.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/gnome-initial-setup/pages/account/gis-account-page.c b/gnome-initial-setup/pages/account/gis-account-page.c
index c488098..594be4c 100644
--- a/gnome-initial-setup/pages/account/gis-account-page.c
+++ b/gnome-initial-setup/pages/account/gis-account-page.c
@@ -960,6 +960,11 @@ gis_account_page_dispose (GObject *object)
GisAccountPage *page = GIS_ACCOUNT_PAGE (object);
GisAccountPagePrivate *priv = page->priv;
+ if (priv->realmd_watch != 0) {
+ g_bus_unwatch_name (priv->realmd_watch);
+ priv->realmd_watch = 0;
+ }
+
g_clear_object (&priv->act_user);
g_clear_object (&priv->act_client);
g_clear_object (&priv->realm_manager);
--
1.8.1.4
From 43616d3cf13d671c3759da9a16c6eb4a4f6f7af0 Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode@redhat.com>
Date: Wed, 20 Mar 2013 21:34:14 -0400
Subject: [PATCH 2/2] disable GD transitions
They're screwing up at the moment.
---
gnome-initial-setup/gis-driver.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/gnome-initial-setup/gis-driver.c b/gnome-initial-setup/gis-driver.c
index 2802399..83bed0a 100644
--- a/gnome-initial-setup/gis-driver.c
+++ b/gnome-initial-setup/gis-driver.c
@@ -173,6 +173,7 @@ gis_driver_get_mode (GisDriver *driver)
static GType
get_assistant_type (void)
{
+#if 0
gboolean enable_animations;
g_object_get (gtk_settings_get_default (),
"gtk-enable-animations", &enable_animations,
@@ -181,6 +182,7 @@ get_assistant_type (void)
if (enable_animations && g_getenv ("GIS_DISABLE_GD") == NULL)
return GIS_TYPE_ASSISTANT_GD;
else
+#endif
return GIS_TYPE_ASSISTANT_GTK;
}
--
1.8.1.4