[accounts-dialog] Fix up installation location

[Matthias Clasen <matthiasc src gnome org>]

commit 3e6fa7dce415e6dcf51062f13cbdf17fd8c50596
Author: Matthias Clasen <mclasen redhat com>
Date:   Fri Jan 15 18:46:09 2010 -0500

    Fix up installation location
    
    ...a step towards a working make install.

 data/Makefile.am             |    2 +-
 src/Makefile.am              |    1 +
 src/main.c                   |    2 +-
 src/um-account-dialog.c      |    2 +-
 src/um-account-type-dialog.c |    2 +-
 src/um-email-dialog.c        |    2 +-
 src/um-fingerprint-dialog.c  |    2 +-
 src/um-language-dialog.c     |    2 +-
 src/um-location-dialog.c     |    2 +-
 src/um-names-dialog.c        |    2 +-
 src/um-password-dialog.c     |    2 +-
 11 files changed, 11 insertions(+), 10 deletions(-)
---
diff --git a/data/Makefile.am b/data/Makefile.am
index 5461f78..4910979 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,6 +1,6 @@
 SUBDIRS = icons
 
-uidir   = $(datadir)/user-manager
+uidir   = $(pkgdatadir)
 ui_DATA = \
 	account-dialog.ui	\
 	account-type-dialog.ui	\
diff --git a/src/Makefile.am b/src/Makefile.am
index 4d77d72..99e308e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -3,6 +3,7 @@ bin_PROGRAMS = accounts-dialog
 INCLUDES = \
 	-DUM_CACHE_DIR=\""$(localstatedir)/cache/um"\"	\
 	-DDATADIR=\""$(datadir)"\"			\
+	-DUIDIR=\""$(pkgdatadir)"\"			\
 	-DLIBLOCALEDIR=\""$(prefix)/lib/locale"\"       \
 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"        \
 	-DUM_PIXMAP_DIR=\""$(pkgdatadir)/pixmaps"\"	\
diff --git a/src/main.c b/src/main.c
index 856389a..432baa8 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1101,7 +1101,7 @@ main (int argc, char *argv[])
         d->builder = gtk_builder_new ();
         d->um = um_user_manager_ref_default ();
 
-        filename = DATADIR "/" PACKAGE_NAME "/user-accounts-dialog.ui";
+        filename = UIDIR "/user-accounts-dialog.ui";
         if (!g_file_test (filename, G_FILE_TEST_EXISTS))
                 filename = "../data/user-accounts-dialog.ui";
         error = NULL;
diff --git a/src/um-account-dialog.c b/src/um-account-dialog.c
index fa77a75..6b36257 100644
--- a/src/um-account-dialog.c
+++ b/src/um-account-dialog.c
@@ -139,7 +139,7 @@ um_account_dialog_new (void)
 
         builder = gtk_builder_new ();
 
-        filename = DATADIR "/" PACKAGE_NAME "/account-dialog.ui";
+        filename = UIDIR "/account-dialog.ui";
         if (!g_file_test (filename, G_FILE_TEST_EXISTS))
                 filename = "../data/account-dialog.ui";
         if (!gtk_builder_add_from_file (builder, filename, &error)) {
diff --git a/src/um-account-type-dialog.c b/src/um-account-type-dialog.c
index 281ce8c..43b9f22 100644
--- a/src/um-account-type-dialog.c
+++ b/src/um-account-type-dialog.c
@@ -80,7 +80,7 @@ um_account_type_dialog_new (void)
 
         builder = gtk_builder_new ();
 
-        filename = DATADIR "/" PACKAGE_NAME "/account-type-dialog.ui";
+        filename = UIDIR "/account-type-dialog.ui";
         if (!g_file_test (filename, G_FILE_TEST_EXISTS))
                 filename = "../data/account-type-dialog.ui";
         if (!gtk_builder_add_from_file (builder, filename, &error)) {
diff --git a/src/um-email-dialog.c b/src/um-email-dialog.c
index c67e3b1..8fecdd6 100644
--- a/src/um-email-dialog.c
+++ b/src/um-email-dialog.c
@@ -70,7 +70,7 @@ um_email_dialog_new (void)
 
         builder = gtk_builder_new ();
 
-        filename = DATADIR "/" PACKAGE_NAME "/email-dialog.ui";
+        filename = UIDIR "/email-dialog.ui";
         if (!g_file_test (filename, G_FILE_TEST_EXISTS))
                 filename = "../data/email-dialog.ui";
         if (!gtk_builder_add_from_file (builder, filename, &error)) {
diff --git a/src/um-fingerprint-dialog.c b/src/um-fingerprint-dialog.c
index 7e8069e..b3b0c24 100644
--- a/src/um-fingerprint-dialog.c
+++ b/src/um-fingerprint-dialog.c
@@ -546,7 +546,7 @@ enroll_fingerprints (GtkWindow *parent,
         g_object_unref (p);
 
         dialog = gtk_builder_new ();
-        filename = DATADIR "/" PACKAGE_NAME "/account-fingerprint.ui";
+        filename = UIDIR "/account-fingerprint.ui";
         if (!g_file_test (filename, G_FILE_TEST_EXISTS))
                 filename = "../data/account-fingerprint.ui";
         if (!gtk_builder_add_from_file (dialog, filename, &error)) {
diff --git a/src/um-language-dialog.c b/src/um-language-dialog.c
index b9bdd5b..61e419d 100644
--- a/src/um-language-dialog.c
+++ b/src/um-language-dialog.c
@@ -356,7 +356,7 @@ setup_language_chooser (UmLanguageDialog *um)
         GtkListStore *store;
 
         builder = gtk_builder_new ();
-        filename = DATADIR "/" PACKAGE_NAME "/language-chooser.ui";
+        filename = UIDIR "/language-chooser.ui";
         if (!g_file_test (filename, G_FILE_TEST_EXISTS))
                 filename = "../data/language-chooser.ui";
         if (!gtk_builder_add_from_file (builder, filename, &error)) {
diff --git a/src/um-location-dialog.c b/src/um-location-dialog.c
index 4919fbd..18aee3e 100644
--- a/src/um-location-dialog.c
+++ b/src/um-location-dialog.c
@@ -70,7 +70,7 @@ um_location_dialog_new (void)
 
         builder = gtk_builder_new ();
 
-        filename = DATADIR "/" PACKAGE_NAME "/location-dialog.ui";
+        filename = UIDIR "/location-dialog.ui";
         if (!g_file_test (filename, G_FILE_TEST_EXISTS))
                 filename = "../data/location-dialog.ui";
         if (!gtk_builder_add_from_file (builder, filename, &error)) {
diff --git a/src/um-names-dialog.c b/src/um-names-dialog.c
index 4ff00e1..8708321 100644
--- a/src/um-names-dialog.c
+++ b/src/um-names-dialog.c
@@ -134,7 +134,7 @@ um_names_dialog_new (void)
 
         builder = gtk_builder_new ();
 
-        filename = DATADIR "/" PACKAGE_NAME "/names-dialog.ui";
+        filename = UIDIR "/names-dialog.ui";
         if (!g_file_test (filename, G_FILE_TEST_EXISTS))
                 filename = "../data/names-dialog.ui";
         if (!gtk_builder_add_from_file (builder, filename, &error)) {
diff --git a/src/um-password-dialog.c b/src/um-password-dialog.c
index 46f711d..eed7368 100644
--- a/src/um-password-dialog.c
+++ b/src/um-password-dialog.c
@@ -375,7 +375,7 @@ um_password_dialog_new (void)
         builder = gtk_builder_new ();
 
         error = NULL;
-        filename = DATADIR "/" PACKAGE_NAME "/password-dialog.ui";
+        filename = UIDIR "/password-dialog.ui";
         if (!g_file_test (filename, G_FILE_TEST_EXISTS))
                 filename = "../data/password-dialog.ui";
         if (!gtk_builder_add_from_file (builder, filename, &error)) {