diff options
| author | fujiwarat <takao.fujiwara1@gmail.com> | 2012-03-23 11:25:28 +0900 |
|---|---|---|
| committer | fujiwarat <takao.fujiwara1@gmail.com> | 2012-03-23 11:25:28 +0900 |
| commit | b8c12964e9d14b8a15ef55b2f9ae23bf1592d6ee (patch) | |
| tree | 2ff2aa468762f24b396c036554ae31aed074d4d2 /tools | |
| parent | 99f6b739f3dd9d7448c5e546da1195a901881752 (diff) | |
| download | ibus-b8c12964e9d14b8a15ef55b2f9ae23bf1592d6ee.tar.gz | |
Add --help in ibus tool.
TEST=Linux desktop
Review URL: https://codereview.appspot.com/5868046
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/Makefile.am | 1 | ||||
| -rw-r--r-- | tools/main.vala | 16 |
2 files changed, 16 insertions, 1 deletions
diff --git a/tools/Makefile.am b/tools/Makefile.am index cd532559..c0cacd69 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -38,6 +38,7 @@ AM_CFLAGS = \ -DPKGDATADIR=\"$(pkgdatadir)\" \ -DLIBEXECDIR=\"$(libexecdir)\" \ -DBINDIR=\"@bindir@\" \ + -DIBUS_VERSION=\"@IBUS_VERSION@\" \ -DIBUS_DISABLE_DEPRECATED \ -Wno-unused-variable \ -Wno-unused-but-set-variable \ diff --git a/tools/main.vala b/tools/main.vala index 9d452424..0c51c4b8 100644 --- a/tools/main.vala +++ b/tools/main.vala @@ -23,6 +23,8 @@ using GLib; using IBus; +public extern const string IBUS_VERSION; + bool name_only = false; class EngineList { @@ -129,6 +131,11 @@ int exit_daemon(string[] argv) { return 0; } +int print_version (string[] argv) { + print("IBus %s\n", IBUS_VERSION); + return 0; +} + delegate int EntryFunc(string[] argv); struct CommandEntry { @@ -142,10 +149,17 @@ public int main(string[] argv) { { "exit", exit_daemon }, { "list-engine", list_engine }, { "watch", message_watch }, - { "restart", restart_daemon } + { "restart", restart_daemon }, + { "version", print_version } }; if (argv.length >= 2) { + if (argv[1] == "--help" || argv[1] == "help") { + foreach (var command in commands) { + print (" %s\n", command.name); + } + return 0; + } string[] new_argv = argv[1:argv.length]; foreach (var command in commands) { if (command.name == argv[1]) |