Merge the devel branch

tools/main.vala

 /* vim:set et sts=4 sw=4:
  *
  * ibus - The Input Bus
  *
  * Copyright(c) 2011 Peng Huang <shawn.p.huang@gmail.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or(at your option) any later version.
@@ skipping 76 matching lines @@
     string engine = null;
     if (argv.length > 1)
         engine = argv[1];
 
     if (engine == null) {
         var desc = bus.get_global_engine();
         if (desc == null)
             return -1;
         print("%s\n", desc.get_name());
         return 0;
-    } else {
-        if(!bus.set_global_engine(engine))
-            return -1;
-        var desc = bus.get_global_engine();
-        if (desc == null)
-            return -1;
-        string cmdline = "setxkbmap %s".printf(desc.get_layout());
-        try {
-            if (!GLib.Process.spawn_command_line_sync(cmdline)) {
-                warning("Switch xkb layout to %s failed.",
-                    desc.get_layout());
-            }
-        } catch (GLib.SpawnError e) {
-            warning("execute setxkblayout failed");
+    }
+
+    if(!bus.set_global_engine(engine))
+        return -1;
+    var desc = bus.get_global_engine();
+    if (desc == null)
+        return -1;
+    string cmdline = "setxkbmap %s".printf(desc.get_layout());
+    try {
+        if (!GLib.Process.spawn_command_line_sync(cmdline)) {
+            warning("Switch xkb layout to %s failed.",
+                desc.get_layout());
         }
-        return 0;
+    } catch (GLib.SpawnError e) {
+        warning("execute setxkblayout failed");
     }
     return 0;
 }
 
 int message_watch(string[] argv) {
     return 0;
 }
 
 int restart_daemon(string[] argv) {
     var bus = get_bus();
@@ skipping 10 matching lines @@
 delegate int EntryFunc(string[] argv);
 
 struct CommandEntry {
     string name;
     EntryFunc entry;
 }
 
 public int main(string[] argv) {
     const CommandEntry commands[]  = {
         { "engine", get_set_engine },
+        { "exit", exit_daemon },
         { "list-engine", list_engine },
         { "watch", message_watch },
-        { "restart", restart_daemon },
-        { "exit", exit_daemon }
+        { "restart", restart_daemon }
     };
 
     if (argv.length >= 2) {
         string[] new_argv = argv[1:argv.length];
         foreach (var command in commands) {
             if (command.name == argv[1])
                 return command.entry(new_argv);
         }
         warning("%s is unknown command!", argv[1]);
     }
 
     return -1;
 }