refine code for reviewing

diff --git a/bus/Makefile.am b/bus/Makefile.am
index 34686ef..118f80c 100644 (file)
--- a/bus/Makefile.am
+++ b/bus/Makefile.am
@@ -37,7 +37,7 @@ AM_CFLAGS =                        \
        -DPKGDATADIR=\"$(pkgdatadir)\" \
        -DLIBEXECDIR=\"$(libexecdir)\" \
        -DBINDIR=\"@bindir@\"          \
-    -DIBUS_DISABLE_DEPRECATED      \
+       -DIBUS_DISABLE_DEPRECATED      \
        $(INCLUDES)                    \
        $(NULL)
 AM_LDADD =                  \

diff --git a/bus/ibusimpl.c b/bus/ibusimpl.c
index cbe087f..902ec10 100644 (file)
--- a/bus/ibusimpl.c
+++ b/bus/ibusimpl.c
@@ -49,8 +49,6 @@ struct _BusIBusImpl {
     /* a fake input context for global engine support */
     BusInputContext *fake_context;
     
-    /* a list of engines that are preloaded. */
-    // GList *engine_list;
     /* a list of engines that are started by a user (without the --ibus command line flag.) */
     GList *register_engine_list;
 
@@ -552,15 +550,12 @@ bus_ibus_impl_set_focused_context (BusIBusImpl     *ibus,
     }
 
     BusEngineProxy *engine = NULL;
-    gboolean is_enabled = FALSE;
 
     if (ibus->focused_context) {
         if (ibus->use_global_engine) {
             /* dettach engine from the focused context */
             engine = bus_input_context_get_engine (ibus->focused_context);
             if (engine) {
-                // is_enabled = bus_input_context_is_enabled (ibus->focused_context);
-                is_enabled = TRUE;
                 g_object_ref (engine);
                 bus_input_context_set_engine (ibus->focused_context, NULL);
             }

diff --git a/engine/gensimple.py b/engine/gensimple.py
index 4a14052..fff21a1 100644 (file)
--- a/engine/gensimple.py
+++ b/engine/gensimple.py
@@ -1,5 +1,24 @@
 # vim:set et sts=4 sw=4:
-#!/usr/bin/env python
+#
+# ibus - The Input Bus
+#
+# Copyright (c) 2007-2010 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (c) 2007-2010 Red Hat, Inc.
+#
+# 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.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the
+# Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+# Boston, MA  02111-1307  USA
 
 from xml.dom import minidom
 import cgi