Merge the devel branch

bus/panelproxy.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 "panelproxy.h"
+
+#include "global.h"
+#include "marshalers.h"
 #include "types.h"
-#include "marshalers.h"
-#include "option.h"
 
 /* panelproxy.c is a very simple proxy class for the panel component that does only the following:
  *
  * 1. Handle D-Bus signals from the panel process. For the list of the D-Bus signals, you can check the bus_panel_proxy_g_signal function, or
  *    introspection_xml in src/ibuspanelservice.c. The bus_panel_proxy_g_signal function simply emits a corresponding glib signal for each
  *    D-Bus signal.
  * 2. Handle glib signals for a BusPanelProxy object (which is usually emitted by bus_panel_proxy_g_signal.) The list of such glib signals is
  *    in the bus_panel_proxy_class_init function. The signal handler function, e.g. bus_panel_proxy_candidate_clicked, simply calls the
  *    corresponding function in inputcontext.c, e.g. bus_input_context_candidate_clicked, using the current focused context.
  * 3. Provide a way to call D-Bus methods in the panel process. For the list of the D-Bus methods, you can check the header file (panelproxy.h)
@@ skipping 650 matching lines @@
     g_dbus_proxy_call ((GDBusProxy *)panel,
                        "FocusOut",
                        g_variant_new ("(o)", path),
                        G_DBUS_CALL_FLAGS_NONE,
                        -1, NULL, NULL, NULL);
 
     g_object_unref (panel->focused_context);
     panel->focused_context = NULL;
 }