summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorWilliam Jon McCann <mccann@jhu.edu>2007-03-05 21:56:52 -0500
committerWilliam Jon McCann <mccann@jhu.edu>2007-03-05 21:56:52 -0500
commit08436b041d6b334a5754266b11385941a71d3f81 (patch)
tree56bbb32be7a545c80e6c3990ee1c140bcb77b031 /src
parent5cc0ba8ec8c988d0068b07e4f67839d42b357537 (diff)
add x11-display-device to parse table
Diffstat (limited to 'src')
-rw-r--r--src/ck-manager.c13
-rwxr-xr-xsrc/test-open-session2
2 files changed, 9 insertions, 6 deletions
diff --git a/src/ck-manager.c b/src/ck-manager.c
index 9be4e07..8e0304c 100644
--- a/src/ck-manager.c
+++ b/src/ck-manager.c
@@ -650,12 +650,13 @@ static struct {
char *key;
CkAddParamFunc func;
} parse_ops[] = {
- { "display-device", add_param_string },
- { "x11-display", add_param_string },
- { "remote-host-name", add_param_string },
- { "session-type", add_param_string },
- { "is-local", add_param_boolean },
- { "user", add_param_int },
+ { "display-device", add_param_string },
+ { "x11-display-device", add_param_string },
+ { "x11-display", add_param_string },
+ { "remote-host-name", add_param_string },
+ { "session-type", add_param_string },
+ { "is-local", add_param_boolean },
+ { "user", add_param_int },
};
static GPtrArray *
diff --git a/src/test-open-session b/src/test-open-session
index 66a01dc..c037cee 100755
--- a/src/test-open-session
+++ b/src/test-open-session
@@ -8,6 +8,8 @@ import gobject
import dbus
import dbus.glib
+print "uid=%d pid=%d" % (os.geteuid (), os.getpid ())
+
bus = dbus.SystemBus ()
manager_obj = bus.get_object ('org.freedesktop.ConsoleKit', '/org/freedesktop/ConsoleKit/Manager')