Fix problem on x86_64 platform.

diff --git a/bus/engineproxy.c b/bus/engineproxy.c
index 963dfe2b11e0f3b45ba1d452d577fb5cb5b3e0c2..aabcc8a6b9ea3745845c83e0774b900138f4ecf7 100644 (file)
--- a/bus/engineproxy.c
+++ b/bus/engineproxy.c
@@ -345,7 +345,7 @@ bus_engine_proxy_real_destroy (BusEngineProxy *engine)
     if (ibus_proxy_get_connection ((IBusProxy *) engine)) {
         ibus_proxy_call ((IBusProxy *) engine,
                          "Destroy",
-                         DBUS_TYPE_INVALID);
+                         G_TYPE_INVALID);
     }
 
     if (priv->desc) {
@@ -688,7 +688,7 @@ void bus_engine_proxy_property_hide (BusEngineProxy *engine,
         g_assert (BUS_IS_ENGINE_PROXY (engine));            \
         ibus_proxy_call ((IBusProxy *) engine,              \
                      #Name,                                 \
-                     DBUS_TYPE_INVALID);                    \
+                     G_TYPE_INVALID);                       \
     }
 
 DEFINE_FUNCTION (FocusIn, focus_in)

diff --git a/bus/panelproxy.c b/bus/panelproxy.c
index 7d99f67dd2910e0e301350cec4a3632057e63ec0..1d24b2facfa9af60d8d3f2d84ae3b5f76dd79d3d 100644 (file)
--- a/bus/panelproxy.c
+++ b/bus/panelproxy.c
@@ -222,7 +222,7 @@ bus_panel_proxy_real_destroy (BusPanelProxy *panel)
     if (ibus_proxy_get_connection ((IBusProxy *)panel) != NULL) {
         ibus_proxy_call ((IBusProxy *) panel,
                          "Destroy",
-                         DBUS_TYPE_INVALID);
+                         G_TYPE_INVALID);
     }
 
     if (priv->focused_context) {

diff --git a/src/ibusbus.c b/src/ibusbus.c
index 481d303882b0553db0ded05bb304a79883a7f265..99657615df8fa3285982f9aefb193f6e13803e6a 100644 (file)
--- a/src/ibusbus.c
+++ b/src/ibusbus.c
@@ -138,50 +138,6 @@ ibus_bus_class_init (IBusBusClass *klass)
 #endif
 }
 
-#if 0
-static gboolean
-_connection_dbus_signal_cb (IBusConnection *connection,
-                            DBusMessage    *message,
-                            IBusBus        *bus)
-{
-    g_assert (IBUS_IS_BUS (bus));
-    g_assert (message != NULL);
-    g_assert (IBUS_IS_CONNECTION (connection));
-
-    IBusBusPrivate *priv;
-    priv = IBUS_BUS_GET_PRIVATE (bus);
-
-    if (dbus_message_is_signal (message, DBUS_INTERFACE_DBUS, "NameOwnerChanged")) {
-        DBusError error;
-        const gchar *name;
-        const gchar *old_name;
-        const gchar *new_name;
-        gboolean retval;
-
-        dbus_error_init (&error);
-        retval = dbus_message_get_args (message, &error,
-                                        DBUS_TYPE_STRING, &name,
-                                        DBUS_TYPE_STRING, &old_name,
-                                        DBUS_TYPE_STRING, &new_name,
-                                        DBUS_TYPE_INVALID);
-        if (!retval) {
-            g_warning ("%s: %s", error.name, error.message);
-            dbus_error_free (&error);
-        }
-        else {
-            g_signal_emit (bus,
-                           bus_signals[NAME_OWNER_CHANGED],
-                           0,
-                           name,
-                           old_name,
-                           new_name);
-        }
-    }
-
-    return FALSE;
-}
-#endif
-
 static void
 _connection_destroy_cb (IBusConnection  *connection,
                         IBusBus         *bus)
@@ -211,12 +167,6 @@ ibus_bus_connect (IBusBus *bus)
 
     if (priv->connection) {
         ibus_bus_hello (bus);
-#if 0
-        g_signal_connect (priv->connection,
-                          "dbus-signal",
-                          (GCallback) _connection_dbus_signal_cb,
-                          bus);
-#endif
         g_signal_connect (priv->connection,
                           "destroy",
                           (GCallback) _connection_destroy_cb,