Refine coding style.

diff --git a/configure.ac b/configure.ac
index 470349c77e9668efc18cab65aff7aee51b0336c7..9bb34d163a931e87321070cdacf9809a2342e583 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-# vim:set noet ts=4:
+# vim:set et ts=4:
 #
 # ibus - The Input Bus
 #
@@ -25,10 +25,10 @@ m4_define([ibus_major_version], [0])
 m4_define([ibus_minor_version], [1])
 m4_define([ibus_micro_version], [0])
 m4_define(ibus_maybe_datestamp,
-       m4_esyscmd([if test x]ibus_released[ != x1; then date +.%Y%m%d | tr -d '\n\r'; fi]))
+    m4_esyscmd([if test x]ibus_released[ != x1; then date +.%Y%m%d | tr -d '\n\r'; fi]))
 
 m4_define([ibus_version],
-       ibus_major_version.ibus_minor_version.ibus_micro_version[]ibus_maybe_datestamp)
+    ibus_major_version.ibus_minor_version.ibus_micro_version[]ibus_maybe_datestamp)
 
 AC_INIT([ibus], [ibus_version], [http://code.google.com/p/ibus/issues/entry],[ibus])
 AM_INIT_AUTOMAKE([1.10])
@@ -56,28 +56,28 @@ AC_CHECK_HEADERS([sys/inotify.h])
 # check glib2
 AM_PATH_GLIB_2_0
 PKG_CHECK_MODULES(GLIB2, [
-       glib-2.0
+    glib-2.0
 ])
 PKG_CHECK_MODULES(GOBJECT2, [
-       gobject-2.0
+    gobject-2.0
 ])
 
 
 # check gtk, gdk & pygtk
 PKG_CHECK_MODULES(GTK2, [
-       gtk+-2.0
+    gtk+-2.0
 ])
 
 GTK_BINARY_VERSION=`$PKG_CONFIG --variable=gtk_binary_version gtk+-2.0`
 GTK_IM_MODULEDIR="$libdir"/gtk-2.0/immodules
 
 PKG_CHECK_MODULES(GDK2, [
-       gdk-2.0
+    gdk-2.0
 ])
 
 # check dbus-glib
 PKG_CHECK_MODULES(DBUS, [
-       dbus-glib-1
+    dbus-glib-1
 ])
 
 
@@ -89,23 +89,23 @@ PKG_CHECK_MODULES(QT,
 )
 
 if test x"$IBUS_HAS_QT4" == x"yes"; then
-       QMAKE=`$PKG_CONFIG --variable=qmake Qt`
-       if test x"$QMAKE" == x""; then
-               AC_PATH_PROG(QMAKE, qmake-qt4)
-       fi
-       if test x"$QMAKE" == x""; then
-               AC_PATH_PROG(QMAKE, qmake)
-       fi
-       if test x"$QMAKE" == x""; then
-               IBUS_HAS_QT4=no
-               AC_MSG_WARN([Can not find qmake.])
-       fi
-       AC_SUBST(QMAKE)
+    QMAKE=`$PKG_CONFIG --variable=qmake Qt`
+    if test x"$QMAKE" == x""; then
+        AC_PATH_PROG(QMAKE, qmake-qt4)
+    fi
+    if test x"$QMAKE" == x""; then
+        AC_PATH_PROG(QMAKE, qmake)
+    fi
+    if test x"$QMAKE" == x""; then
+        IBUS_HAS_QT4=no
+        AC_MSG_WARN([Can not find qmake.])
+    fi
+    AC_SUBST(QMAKE)
 fi
 
 # Check for x11
 PKG_CHECK_MODULES(X11, [
-       x11
+    x11
 ])
 
 # check env
@@ -115,8 +115,11 @@ AC_SUBST(ENV)
 
 # check python
 AM_PATH_PYTHON([2.5])
-PYTHON_CONFIG=`type -p python$PYTHON_VERSION-config`
-if test "$PYTHON_CONFIG" != ""; then
+AC_PATH_PROG(PYTHON_CONFIG, python$PYTHON_VERSION-config)
+if test x"$PYTHON_CONFIG" == x""; then
+    AC_PATH_PROG(PYTHON_CONFIG, python-config)
+fi
+if test x"$PYTHON_CONFIG" != x""; then
     PYTHON_CFLAGS=`$PYTHON_CONFIG --includes`
     PYTHON_LIBS=`$PYTHON_CONFIG --libs`
 else
@@ -138,20 +141,20 @@ AM_GNU_GETTEXT_VERSION(0.16.1)
 
 # define configure arguments
 AC_ARG_WITH(gtk-im-module-dir,
-       AS_HELP_STRING([--with-gtk-im-module-dir[=DIR]],
-               [Select gtk immodule dir]),
-       GTK_IM_MODULEDIR=$with_gtk_im_module_dir
+    AS_HELP_STRING([--with-gtk-im-module-dir[=DIR]],
+        [Select gtk immodule dir]),
+    GTK_IM_MODULEDIR=$with_gtk_im_module_dir
 )
 AC_SUBST(GTK_IM_MODULEDIR)
 
 AC_ARG_ENABLE(qt4-immodule,
-       AS_HELP_STRING([--disable-qt4-immodule],
-               [do not build qt4 immodule]),
-       [enable_qt4=$enableval],
-       [enable_qt4=yes],
+    AS_HELP_STRING([--disable-qt4-immodule],
+        [do not build qt4 immodule]),
+    [enable_qt4=$enableval],
+    [enable_qt4=yes],
 )
 if test x"$IBUS_HAS_QT4" != x"yes"; then
-       enable_qt4=no
+    enable_qt4=no
 fi
 AM_CONDITIONAL(IBUS_BUILD_QT4, [test x"$enable_qt4" = x"yes" ])
 

diff --git a/launcher/ibus.in b/launcher/ibus.in
index 5b4ce256a91cea3321bbdc6dc376b657a171f98a..fa285d88df39c1c07f53fb7565ceaad579d46189 100644 (file)
--- a/launcher/ibus.in
+++ b/launcher/ibus.in
@@ -21,6 +21,7 @@
 
 import os
 import os.path
+import atexit
 import sys
 import time
 import ibus
@@ -37,21 +38,21 @@ daemon_pid = 0
 # os.close(1)
 # os.close(2)
 # try:
-#      os.unlink(logname)
+#     os.unlink(logname)
 # except:
-#      pass
+#     pass
 # fd = os.open(logname, os.O_CREAT | os.O_WRONLY)
 # os.dup2(fd, 1)
 # os.dup2(fd, 2)
 bus = None
 
 try:
-       bus = ibus.Bus()
+    bus = ibus.Bus()
 except:
-       pass
+    pass
 if bus:
-       print >> sys.stderr, "Found an ibus-daemon has been started!"
-       sys.exit(1)
+    print >> sys.stderr, "Found an ibus-daemon has been started!"
+    sys.exit(1)
 
 try:
     print "start ibus-daemon"
@@ -64,30 +65,17 @@ time.sleep (1)
 
 try:
     print "start ibus-x11"
-    os.spawnv (os.P_NOWAIT, x11, [x11, "--kill-daemon"])
+    x11_pid = os.spawnv (os.P_NOWAIT, x11, [x11, "--kill-daemon"])
 except:
     print >> sys.stderr, "start ibus-x11 failed"
     sys.exit (1)
 
 try:
     print "start ibus-panel"
-    os.spawnv (os.P_NOWAIT, panel, [panel])
+    panel_pid = os.spawnv (os.P_NOWAIT, panel, [panel])
 except:
     print >> sys.stderr, "start ibus-panel failed"
     sys.exit (1)
 
-# try:
-#     print "start ibus-conf"
-#     os.spawnv (os.P_NOWAIT, conf, [conf])
-# except:
-#     print >> sys.stderr, "start ibus-conf failed"
-#     sys.exit (1)
-
-try:
-    os.kill (daemon_pid, 0)
-except:
-    sys.exit (1)
-
 os.waitpid (daemon_pid, 0)
-
 os.wait ()