Merge the devel branch

bus/registry.c

 /* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */
 /* vim:set et sts=4: */
 /* bus - 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 "registry.h"
+
+#include <gio/gio.h>
 #include <glib/gstdio.h>
-#include <gio/gio.h>
 #include <stdlib.h>
 #include <string.h>
+
+#include "dbusimpl.h"
+#include "global.h"
+#include "marshalers.h"
 #include "types.h"
-#include "option.h"
-#include "marshalers.h"
-#include "dbusimpl.h"
 
 enum {
     CHANGED,
     LAST_SIGNAL,
 };
 
 static guint             _signals[LAST_SIGNAL] = { 0 };
 
 struct _BusRegistry {
     IBusObject parent;
@@ skipping 610 matching lines @@
         if (connection == NULL)
             return;
 
         factory = bus_factory_proxy_new (connection);
         if (factory == NULL)
             return;
         bus_component_set_factory (component, factory);
         g_object_unref (factory);
     }
 }