summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--common/test-settings-client.c2
-rw-r--r--daemon/factory-slave-main.c2
-rw-r--r--daemon/main.c2
-rw-r--r--daemon/product-slave-main.c2
-rw-r--r--daemon/session-worker-main.c2
-rw-r--r--daemon/simple-slave-main.c4
-rw-r--r--daemon/xdmcp-chooser-slave-main.c2
-rw-r--r--data/Makefile.am2
-rw-r--r--gui/simple-greeter/greeter-main.c2
-rw-r--r--gui/simple-greeter/test-greeter-login-window.c2
-rw-r--r--gui/simple-greeter/test-user-chooser.c2
-rw-r--r--gui/simple-greeter/test-user-manager.c2
-rw-r--r--gui/user-switch-applet/applet.c2
13 files changed, 14 insertions, 14 deletions
diff --git a/common/test-settings-client.c b/common/test-settings-client.c
index 8ca970eb..d3c1f736 100644
--- a/common/test-settings-client.c
+++ b/common/test-settings-client.c
@@ -78,7 +78,7 @@ main (int argc, char **argv)
g_type_init ();
- if (! gdm_settings_client_init (GDMCONFDIR "/gdm.schemas", "/")) {
+ if (! gdm_settings_client_init (DATADIR "/gdm/gdm.schemas", "/")) {
exit (1);
}
diff --git a/daemon/factory-slave-main.c b/daemon/factory-slave-main.c
index 832dc4f8..9caab1cb 100644
--- a/daemon/factory-slave-main.c
+++ b/daemon/factory-slave-main.c
@@ -207,7 +207,7 @@ main (int argc,
exit (1);
}
- if (! gdm_settings_direct_init (settings, GDMCONFDIR "/gdm.schemas", "/")) {
+ if (! gdm_settings_direct_init (settings, DATADIR "/gdm/gdm.schemas", "/")) {
g_warning ("Unable to initialize settings");
exit (1);
}
diff --git a/daemon/main.c b/daemon/main.c
index 19bdf302..5b8d66b2 100644
--- a/daemon/main.c
+++ b/daemon/main.c
@@ -597,7 +597,7 @@ main (int argc,
goto out;
}
- if (! gdm_settings_direct_init (settings, GDMCONFDIR "/gdm.schemas", "/")) {
+ if (! gdm_settings_direct_init (settings, DATADIR "/gdm/gdm.schemas", "/")) {
g_warning ("Unable to initialize settings");
goto out;
}
diff --git a/daemon/product-slave-main.c b/daemon/product-slave-main.c
index 7353f3af..b0ab03f4 100644
--- a/daemon/product-slave-main.c
+++ b/daemon/product-slave-main.c
@@ -211,7 +211,7 @@ main (int argc,
goto out;
}
- if (! gdm_settings_direct_init (settings, GDMCONFDIR "/gdm.schemas", "/")) {
+ if (! gdm_settings_direct_init (settings, DATADIR "/gdm/gdm.schemas", "/")) {
g_warning ("Unable to initialize settings");
goto out;
}
diff --git a/daemon/session-worker-main.c b/daemon/session-worker-main.c
index 4a4abcad..35b44636 100644
--- a/daemon/session-worker-main.c
+++ b/daemon/session-worker-main.c
@@ -169,7 +169,7 @@ main (int argc,
exit (1);
}
- if (! gdm_settings_direct_init (settings, GDMCONFDIR "/gdm.schemas", "/")) {
+ if (! gdm_settings_direct_init (settings, DATADIR "/gdm/gdm.schemas", "/")) {
g_warning ("Unable to initialize settings");
exit (1);
}
diff --git a/daemon/simple-slave-main.c b/daemon/simple-slave-main.c
index eed1742c..7751b61f 100644
--- a/daemon/simple-slave-main.c
+++ b/daemon/simple-slave-main.c
@@ -214,7 +214,7 @@ main (int argc,
goto out;
}
- if (! gdm_settings_direct_init (settings, GDMCONFDIR "/gdm.schemas", "/")) {
+ if (! gdm_settings_direct_init (settings, DATADIR "/gdm/gdm.schemas", "/")) {
g_warning ("Unable to initialize settings");
goto out;
}
@@ -226,7 +226,7 @@ main (int argc,
exit (1);
}
- if (! gdm_settings_client_init (GDMCONFDIR "/gdm.schemas", "/")) {
+ if (! gdm_settings_client_init (DATADIR "/gdm/gdm.schemas", "/")) {
g_critical ("Unable to initialize settings client");
exit (1);
}
diff --git a/daemon/xdmcp-chooser-slave-main.c b/daemon/xdmcp-chooser-slave-main.c
index 0b68af10..f86ea897 100644
--- a/daemon/xdmcp-chooser-slave-main.c
+++ b/daemon/xdmcp-chooser-slave-main.c
@@ -213,7 +213,7 @@ main (int argc,
goto out;
}
- if (! gdm_settings_direct_init (settings, GDMCONFDIR "/gdm.schemas", "/")) {
+ if (! gdm_settings_direct_init (settings, DATADIR "/gdm/gdm.schemas", "/")) {
g_warning ("Unable to initialize settings");
goto out;
}
diff --git a/data/Makefile.am b/data/Makefile.am
index 60d76244..7bcde1ac 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -42,7 +42,7 @@ dbusconf_DATA = $(dbusconf_in_files:.conf.in=.conf)
@INTLTOOL_SCHEMAS_RULE@
-schemasdir = $(gdmconfdir)
+schemasdir = $(datadir)/gdm
schemas_in_files = gdm.schemas.in
schemas_DATA = $(schemas_in_files:.schemas.in=.schemas)
diff --git a/gui/simple-greeter/greeter-main.c b/gui/simple-greeter/greeter-main.c
index 09f9e08e..aa165faa 100644
--- a/gui/simple-greeter/greeter-main.c
+++ b/gui/simple-greeter/greeter-main.c
@@ -257,7 +257,7 @@ main (int argc, char *argv[])
g_type_init ();
gdm_profile_start ("Initializing settings client");
- if (! gdm_settings_client_init (GDMCONFDIR "/gdm.schemas", "/")) {
+ if (! gdm_settings_client_init (DATADIR "/gdm/gdm.schemas", "/")) {
g_critical ("Unable to initialize settings client");
exit (1);
}
diff --git a/gui/simple-greeter/test-greeter-login-window.c b/gui/simple-greeter/test-greeter-login-window.c
index 347bbde3..cd64b7d1 100644
--- a/gui/simple-greeter/test-greeter-login-window.c
+++ b/gui/simple-greeter/test-greeter-login-window.c
@@ -91,7 +91,7 @@ main (int argc, char *argv[])
NULL,
NULL);
- if (! gdm_settings_client_init (GDMCONFDIR "/gdm.schemas", "/")) {
+ if (! gdm_settings_client_init (DATADIR "/gdm/gdm.schemas", "/")) {
g_critical ("Unable to initialize settings client");
exit (1);
}
diff --git a/gui/simple-greeter/test-user-chooser.c b/gui/simple-greeter/test-user-chooser.c
index 2f60a9b8..f2e019e8 100644
--- a/gui/simple-greeter/test-user-chooser.c
+++ b/gui/simple-greeter/test-user-chooser.c
@@ -46,7 +46,7 @@ main (int argc, char *argv[])
gtk_init (&argc, &argv);
- if (! gdm_settings_client_init (GDMCONFDIR "/gdm.schemas", "/")) {
+ if (! gdm_settings_client_init (DATADIR "/gdm/gdm.schemas", "/")) {
g_critical ("Unable to initialize settings client");
exit (1);
}
diff --git a/gui/simple-greeter/test-user-manager.c b/gui/simple-greeter/test-user-manager.c
index 61db416c..d0f64275 100644
--- a/gui/simple-greeter/test-user-manager.c
+++ b/gui/simple-greeter/test-user-manager.c
@@ -118,7 +118,7 @@ main (int argc, char *argv[])
g_log_set_always_fatal (fatal_mask);
}
- if (! gdm_settings_client_init (GDMCONFDIR "/gdm.schemas", "/")) {
+ if (! gdm_settings_client_init (DATADIR "/gdm/gdm.schemas", "/")) {
g_critical ("Unable to initialize settings client");
exit (1);
}
diff --git a/gui/user-switch-applet/applet.c b/gui/user-switch-applet/applet.c
index a0da74cb..b4f944cd 100644
--- a/gui/user-switch-applet/applet.c
+++ b/gui/user-switch-applet/applet.c
@@ -1421,7 +1421,7 @@ fill_applet (PanelApplet *applet)
gtk_window_set_default_icon_name ("stock_people");
g_set_application_name (_("User Switch Applet"));
- if (! gdm_settings_client_init (GDMCONFDIR "/gdm.schemas", "/")) {
+ if (! gdm_settings_client_init (DATADIR "/gdm/gdm.schemas", "/")) {
g_critical ("Unable to initialize settings client");
exit (1);
}
View Lorry Controller Status