From 172ffd101233ddd52c576ebd239e811b505e9884 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Kristian=20H=C3=B8gsberg?= Date: Mon, 25 Apr 2011 15:59:15 -0400 Subject: [PATCH] compositor: Fix overlapping options --- compositor/compositor.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/compositor/compositor.c b/compositor/compositor.c index 627dfef..c3c7de8 100644 --- a/compositor/compositor.c +++ b/compositor/compositor.c @@ -54,11 +54,11 @@ static const GOptionEntry option_entries[] = { &option_connector, "KMS connector" }, { "geometry", 'g', 0, G_OPTION_ARG_STRING, &option_geometry, "Geometry" }, - { "socket", 's', 0, G_OPTION_ARG_STRING, + { "socket", 0, 0, G_OPTION_ARG_STRING, &option_socket_name, "Socket Name" }, { "idle-time", 'i', 0, G_OPTION_ARG_INT, &option_idle_time, "Screensaver idle time" }, - { "shell", 'i', 0, G_OPTION_ARG_STRING, + { "shell", 's', 0, G_OPTION_ARG_STRING, &option_shell, "Shell module" }, { NULL } }; -- 2.7.4