Merge the devel branch

bus/factoryproxy.c

 /* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */
 /* vim:set et sts=4: */
 /* ibus - The Input Bus
  * Copyright (C) 2008-2010 Peng Huang <shawn.p.huang@gmail.com>
  * Copyright (C) 2008-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 library; if not, write to the
  * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
  * Boston, MA 02111-1307, USA.
  */
 #include "factoryproxy.h"
+
+#include "dbusimpl.h"
+#include "global.h"
+#include "marshalers.h"
 #include "types.h"
-#include "marshalers.h"
-#include "dbusimpl.h"
-#include "option.h"
 
 struct _BusFactoryProxy {
     IBusProxy parent;
     /* instance members */
 };
 
 struct _BusFactoryProxyClass {
     IBusProxyClass parent;
     /* class members */
 };
@@ skipping 76 matching lines @@
         return NULL;
 
     gchar *object_path = NULL;
     g_variant_get (retval, "(o)", &object_path);
     g_variant_unref (retval);
 
     return object_path;
 }