[gnome-initial-setup] account: Move the prepare_func to another file



commit a247d5aa0a5a8818f7f8508b2dc50a607751e15f
Author: Jasper St. Pierre <jstpierre mecheye net>
Date:   Tue Nov 5 22:37:21 2013 -0500

    account: Move the prepare_func to another file
    
    We're going to split the account page into separate, interconnected pages.

 gnome-initial-setup/gnome-initial-setup.c          |    2 +-
 gnome-initial-setup/pages/account/Makefile.am      |    1 +
 .../pages/account/gis-account-page.c               |    9 -----
 .../pages/account/gis-account-pages.c              |   35 ++++++++++++++++++
 .../pages/account/gis-account-pages.h              |   38 ++++++++++++++++++++
 5 files changed, 75 insertions(+), 10 deletions(-)
---
diff --git a/gnome-initial-setup/gnome-initial-setup.c b/gnome-initial-setup/gnome-initial-setup.c
index 6fb4e33..c0ae5a7 100644
--- a/gnome-initial-setup/gnome-initial-setup.c
+++ b/gnome-initial-setup/gnome-initial-setup.c
@@ -44,7 +44,7 @@
 #include "pages/network/gis-network-page.h"
 #include "pages/timezone/gis-timezone-page.h"
 #include "pages/goa/gis-goa-page.h"
-#include "pages/account/gis-account-page.h"
+#include "pages/account/gis-account-pages.h"
 #include "pages/summary/gis-summary-page.h"
 
 static gboolean force_existing_user_mode;
diff --git a/gnome-initial-setup/pages/account/Makefile.am b/gnome-initial-setup/pages/account/Makefile.am
index 3965376..4a3180a 100644
--- a/gnome-initial-setup/pages/account/Makefile.am
+++ b/gnome-initial-setup/pages/account/Makefile.am
@@ -25,6 +25,7 @@ BUILT_SOURCES += account-resources.c account-resources.h
 libgisaccount_la_SOURCES =                                             \
        $(BUILT_SOURCES)                                                \
        gis-account-page.c gis-account-page.h                           \
+       gis-account-pages.c gis-account-pages.h                         \
        gis-account-page-local.c gis-account-page-local.h               \
        gis-account-page-enterprise.c gis-account-page-enterprise.h     \
        um-realm-manager.c um-realm-manager.h                           \
diff --git a/gnome-initial-setup/pages/account/gis-account-page.c 
b/gnome-initial-setup/pages/account/gis-account-page.c
index 62563ef..49d4d47 100644
--- a/gnome-initial-setup/pages/account/gis-account-page.c
+++ b/gnome-initial-setup/pages/account/gis-account-page.c
@@ -232,12 +232,3 @@ gis_account_page_init (GisAccountPage *page)
 
   gtk_widget_init_template (GTK_WIDGET (page));
 }
-
-void
-gis_prepare_account_page (GisDriver *driver)
-{
-  gis_driver_add_page (driver,
-                       g_object_new (GIS_TYPE_ACCOUNT_PAGE,
-                                     "driver", driver,
-                                     NULL));
-}
diff --git a/gnome-initial-setup/pages/account/gis-account-pages.c 
b/gnome-initial-setup/pages/account/gis-account-pages.c
new file mode 100644
index 0000000..66a220a
--- /dev/null
+++ b/gnome-initial-setup/pages/account/gis-account-pages.c
@@ -0,0 +1,35 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+/*
+ * Copyright (C) 2013 Red Hat
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.
+ *
+ * Written by:
+ *     Jasper St. Pierre <jstpierre mecheye net>
+ */
+
+#include "config.h"
+#include "gis-account-pages.h"
+#include "gis-account-page.h"
+
+void
+gis_prepare_account_page (GisDriver *driver)
+{
+  gis_driver_add_page (driver,
+                       g_object_new (GIS_TYPE_ACCOUNT_PAGE,
+                                     "driver", driver,
+                                     NULL));
+}
diff --git a/gnome-initial-setup/pages/account/gis-account-pages.h 
b/gnome-initial-setup/pages/account/gis-account-pages.h
new file mode 100644
index 0000000..e3ea9cc
--- /dev/null
+++ b/gnome-initial-setup/pages/account/gis-account-pages.h
@@ -0,0 +1,38 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+/*
+ * Copyright (C) 2013 Red Hat
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.
+ *
+ * Written by:
+ *     Jasper St. Pierre <jstpierre mecheye net>
+ */
+
+#ifndef __GIS_ACCOUNT_PAGES_H__
+#define __GIS_ACCOUNT_PAGES_H__
+
+#include <glib-object.h>
+
+#include "gnome-initial-setup.h"
+
+G_BEGIN_DECLS
+
+void gis_prepare_account_page (GisDriver *driver);
+
+G_END_DECLS
+
+#endif /* __GIS_ACCOUNT_PAGES_H__ */
+


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]