[gnome-initial-setup] gis-driver: Remove destruction of pages from default implementation
- From: Jasper St. Pierre <jstpierre src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-initial-setup] gis-driver: Remove destruction of pages from default implementation
- Date: Wed, 9 Jan 2013 23:01:24 +0000 (UTC)
commit e2bcd9d393d2157bf73cd951d8fd0599e9dbd1ce
Author: Jasper St. Pierre <jstpierre mecheye net>
Date: Wed Jan 9 00:51:18 2013 -0500
gis-driver: Remove destruction of pages from default implementation
This belongs in the signal callback, not the driver.
gnome-initial-setup/gis-driver.c | 8 --------
gnome-initial-setup/gnome-initial-setup.c | 1 +
2 files changed, 1 insertions(+), 8 deletions(-)
---
diff --git a/gnome-initial-setup/gis-driver.c b/gnome-initial-setup/gis-driver.c
index 00c9663..22d935d 100644
--- a/gnome-initial-setup/gis-driver.c
+++ b/gnome-initial-setup/gis-driver.c
@@ -190,13 +190,6 @@ gis_driver_startup (GApplication *app)
}
static void
-gis_driver_real_rebuild_pages (GisDriver *driver)
-{
- GisDriverPrivate *priv = driver->priv;
- gis_assistant_destroy_all_pages (priv->assistant);
-}
-
-static void
gis_driver_init (GisDriver *driver)
{
driver->priv = GET_PRIVATE (driver);
@@ -212,7 +205,6 @@ gis_driver_class_init (GisDriverClass *klass)
application_class->startup = gis_driver_startup;
application_class->activate = gis_driver_activate;
- klass->rebuild_pages = gis_driver_real_rebuild_pages;
signals[REBUILD_PAGES] =
g_signal_new ("rebuild-pages",
G_TYPE_FROM_CLASS (klass),
diff --git a/gnome-initial-setup/gnome-initial-setup.c b/gnome-initial-setup/gnome-initial-setup.c
index cc2769b..11c0345 100644
--- a/gnome-initial-setup/gnome-initial-setup.c
+++ b/gnome-initial-setup/gnome-initial-setup.c
@@ -50,6 +50,7 @@
static void
rebuild_pages_cb (GisDriver *driver)
{
+ gis_assistant_destroy_all_pages (gis_driver_get_assistant (driver));
gis_prepare_language_page (driver);
gis_prepare_eula_pages (driver);
gis_prepare_network_page (driver);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]