[gnome-initial-setup] password: share files from account page

[Matthias Clasen <matthiasc src gnome org>]

commit 6b9ba63fbbd0999fd65dcf3ede95e08508ba6928
Author: Ondrej Holy <oholy redhat com>
Date:   Wed Apr 16 14:01:50 2014 +0200

    password: share files from account page
    
    Remove duplicated and unused files from password page. Change
    Makefile accordingly to share the codes with account page.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=702129

 gnome-initial-setup/pages/password/Makefile.am     |   20 +-
 .../pages/password/gis-account-page-enterprise.c   |  814 -----------------
 .../pages/password/gis-account-page-enterprise.h   |   62 --
 .../pages/password/gis-account-page-enterprise.ui  |  473 ----------
 .../pages/password/gis-account-page-local.c        |  381 --------
 .../pages/password/gis-account-page-local.h        |   56 --
 .../pages/password/gis-account-page-local.ui       |  299 -------
 .../pages/password/gis-password-page.c             |    3 +-
 .../pages/password/org.freedesktop.realmd.xml      |  666 --------------
 .../pages/password/password.gresource.xml          |    2 -
 .../pages/password/um-realm-manager.c              |  917 --------------------
 .../pages/password/um-realm-manager.h              |  108 ---
 gnome-initial-setup/pages/password/um-utils.c      |  385 --------
 gnome-initial-setup/pages/password/um-utils.h      |   43 -
 14 files changed, 6 insertions(+), 4223 deletions(-)
---
diff --git a/gnome-initial-setup/pages/password/Makefile.am b/gnome-initial-setup/pages/password/Makefile.am
index 015f5e3..5d9c52d 100644
--- a/gnome-initial-setup/pages/password/Makefile.am
+++ b/gnome-initial-setup/pages/password/Makefile.am
@@ -5,15 +5,7 @@ noinst_LTLIBRARIES = libgispassword.la
 
 BUILT_SOURCES =
 
-um-realm-generated.c: um-realm-generated.h
-um-realm-generated.h: $(srcdir)/org.freedesktop.realmd.xml
-       $(AM_V_GEN) gdbus-codegen \
-               --interface-prefix org.freedesktop.realmd \
-               --generate-c-code um-realm-generated \
-               --c-namespace UmRealm $< \
-               --c-generate-object-manager \
-               --annotate "org.freedesktop.realmd.Realm" org.gtk.GDBus.C.Name Common
-BUILT_SOURCES += um-realm-generated.c um-realm-generated.h
+BUILT_SOURCES += $(srcdir)/../account/um-realm-generated.c $(srcdir)/../account/um-realm-generated.h
 
 resource_files = $(shell glib-compile-resources --sourcedir=$(srcdir) --generate-dependencies 
$(srcdir)/password.gresource.xml)
 password-resources.c: password.gresource.xml $(resource_files)
@@ -25,18 +17,16 @@ BUILT_SOURCES += password-resources.c password-resources.h
 libgispassword_la_SOURCES =                                            \
        $(BUILT_SOURCES)                                                \
        gis-password-page.c gis-password-page.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                           \
-       um-utils.c um-utils.h                                           \
+       $(srcdir)/../account/um-realm-manager.c $(srcdir)/../account/um-realm-manager.h \
+       $(srcdir)/../account/um-utils.c $(srcdir)/../account/um-utils.h \
        pw-utils.c pw-utils.h                                           \
        $(NULL)
 
-libgispassword_la_CFLAGS = $(INITIAL_SETUP_CFLAGS) -I "$(srcdir)/../.."
+libgispassword_la_CFLAGS = $(INITIAL_SETUP_CFLAGS) -I "$(srcdir)/../.." -I "$(srcdir)/../account"
 libgispassword_la_LIBADD = $(INITIAL_SETUP_LIBS) -lcrypt
 libgispassword_la_LDFLAGS = -export_dynamic -avoid-version -module -no-undefined
 
 EXTRA_DIST =   \
-       org.freedesktop.realmd.xml      \
+       $(srcdir)/../account/org.freedesktop.realmd.xml \
        password.gresource.xml          \
        $(resource_files)
diff --git a/gnome-initial-setup/pages/password/gis-password-page.c 
b/gnome-initial-setup/pages/password/gis-password-page.c
index 586a316..1df9a14 100644
--- a/gnome-initial-setup/pages/password/gis-password-page.c
+++ b/gnome-initial-setup/pages/password/gis-password-page.c
@@ -26,11 +26,10 @@
 #include "config.h"
 #include "password-resources.h"
 #include "gis-password-page.h"
-#include "gis-account-page-local.h"
-#include "gis-account-page-enterprise.h"
 
 #include "gis-keyring.h"
 
+#include "um-utils.h"
 #include "pw-utils.h"
 #include "um-utils.h"
 
diff --git a/gnome-initial-setup/pages/password/password.gresource.xml 
b/gnome-initial-setup/pages/password/password.gresource.xml
index 9f240b1..404e623 100644
--- a/gnome-initial-setup/pages/password/password.gresource.xml
+++ b/gnome-initial-setup/pages/password/password.gresource.xml
@@ -2,7 +2,5 @@
 <gresources>
   <gresource prefix="/org/gnome/initial-setup">
     <file preprocess="xml-stripblanks" alias="gis-password-page.ui">gis-password-page.ui</file>
-    <file preprocess="xml-stripblanks" alias="gis-account-page-local.ui">gis-account-page-local.ui</file>
-    <file preprocess="xml-stripblanks" 
alias="gis-account-page-enterprise.ui">gis-account-page-enterprise.ui</file>
   </gresource>
 </gresources>