summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKristian Høgsberg <krh@bitplanet.net>2011-04-25 15:59:15 -0400
committerKristian Høgsberg <krh@bitplanet.net>2011-04-25 15:59:15 -0400
commit172ffd101233ddd52c576ebd239e811b505e9884 (patch)
tree91ef7be4d0a1bb117aedcf0b9ee8b348629fb4e1
parent82ed0423a13d7fe8d3a8bd26f9f7df7093ee63f1 (diff)
compositor: Fix overlapping options
-rw-r--r--compositor/compositor.c4
1 files 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 }
};