summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Hughes <richard@hughsie.com>2007-07-13 15:10:02 +0100
committerRichard Hughes <richard@hughsie.com>2007-07-13 15:10:02 +0100
commit1c7f169871670783c19cae40379f15d3c06f15f4 (patch)
tree86c45a0d1f29858bd4554dfa9dd434a31f0cc07b
parentb63b4b9938966e95caea230cad55653de737996d (diff)
require xorg if using the display
-rw-r--r--plugins/glue/idle/ohm-plugin-idle.c1
-rw-r--r--plugins/glue/xrandr/ohm-plugin-xrandr.c1
-rw-r--r--plugins/policy/display/ohm-plugin-display.c2
-rw-r--r--plugins/policy/suspend/ohm-plugin-suspend.c2
4 files changed, 4 insertions, 2 deletions
diff --git a/plugins/glue/idle/ohm-plugin-idle.c b/plugins/glue/idle/ohm-plugin-idle.c
index c9e6c00..33d08c7 100644
--- a/plugins/glue/idle/ohm-plugin-idle.c
+++ b/plugins/glue/idle/ohm-plugin-idle.c
@@ -44,6 +44,7 @@ static gboolean
plugin_preload (OhmPlugin *plugin)
{
/* tell ohmd what keys we are going to provide */
+ ohm_plugin_require (plugin, "xorg");
ohm_plugin_conf_provide (plugin, "idle.momentary");
ohm_plugin_conf_provide (plugin, "idle.powersave");
ohm_plugin_conf_provide (plugin, "idle.powerdown");
diff --git a/plugins/glue/xrandr/ohm-plugin-xrandr.c b/plugins/glue/xrandr/ohm-plugin-xrandr.c
index decc957..eb86a77 100644
--- a/plugins/glue/xrandr/ohm-plugin-xrandr.c
+++ b/plugins/glue/xrandr/ohm-plugin-xrandr.c
@@ -39,6 +39,7 @@ enum {
static gboolean
plugin_preload (OhmPlugin *plugin)
{
+ ohm_plugin_require (plugin, "xorg");
ohm_plugin_conf_provide (plugin, "xrandr.position");
return TRUE;
}
diff --git a/plugins/policy/display/ohm-plugin-display.c b/plugins/policy/display/ohm-plugin-display.c
index 5557957..57587d3 100644
--- a/plugins/policy/display/ohm-plugin-display.c
+++ b/plugins/policy/display/ohm-plugin-display.c
@@ -50,7 +50,7 @@ plugin_preload (OhmPlugin *plugin)
/* add in the required, suggested and prevented plugins */
ohm_plugin_suggest (plugin, "idle");
ohm_plugin_suggest (plugin, "acadapter");
- ohm_plugin_suggest (plugin, "button");
+ ohm_plugin_suggest (plugin, "buttons");
ohm_plugin_suggest (plugin, "xrandr");
ohm_plugin_suggest (plugin, "backlight");
return TRUE;
diff --git a/plugins/policy/suspend/ohm-plugin-suspend.c b/plugins/policy/suspend/ohm-plugin-suspend.c
index 7578839..1e08298 100644
--- a/plugins/policy/suspend/ohm-plugin-suspend.c
+++ b/plugins/policy/suspend/ohm-plugin-suspend.c
@@ -81,7 +81,7 @@ plugin_preload (OhmPlugin *plugin)
/* FIXME: detect if we have any backlights in the system and return false if not */
/* add in the required, suggested and prevented plugins */
ohm_plugin_suggest (plugin, "idle");
- ohm_plugin_suggest (plugin, "button");
+ ohm_plugin_suggest (plugin, "buttons");
return TRUE;
}