Remove ibusdbus.h

diff --git a/bindings/vala/ibus-1.0.vapi b/bindings/vala/ibus-1.0.vapi
index 23c8c5d..d07a719 100644 (file)
--- a/bindings/vala/ibus-1.0.vapi
+++ b/bindings/vala/ibus-1.0.vapi
@@ -117,14 +117,6 @@ namespace IBus {
                public virtual bool unset_value (string section, string name) throws GLib.Error;
                public void value_changed (string section, string name, GLib.Variant value);
        }
-       [Compact]
-       [CCode (cheader_filename = "ibus.h")]
-       public class DBusConnection {
-       }
-       [Compact]
-       [CCode (cheader_filename = "ibus.h")]
-       public class DBusServer {
-       }
        [CCode (cheader_filename = "ibus.h")]
        public class Engine : IBus.Service {
                public uint client_capabilities;
@@ -201,10 +193,6 @@ namespace IBus {
                public string name { get; construct; }
                public uint rank { get; construct; }
        }
-       [Compact]
-       [CCode (cheader_filename = "ibus.h")]
-       public class Error {
-       }
        [CCode (cheader_filename = "ibus.h")]
        public class Factory : IBus.Service {
                [CCode (has_construct_function = false)]
@@ -305,14 +293,6 @@ namespace IBus {
                public void set_page_size (uint page_size);
                public void set_round (bool round);
        }
-       [Compact]
-       [CCode (cheader_filename = "ibus.h")]
-       public class Message {
-       }
-       [Compact]
-       [CCode (cheader_filename = "ibus.h")]
-       public class MessageIter {
-       }
        [CCode (cheader_filename = "ibus.h")]
        public class Object : GLib.InitiallyUnowned {
                public uint32 flags;
@@ -396,10 +376,6 @@ namespace IBus {
                [NoWrapper]
                public virtual void update_property (IBus.Property prop);
        }
-       [Compact]
-       [CCode (cheader_filename = "ibus.h")]
-       public class PendingCall {
-       }
        [CCode (cheader_filename = "ibus.h")]
        public class PropList : IBus.Serializable {
                public weak GLib.Array properties;

diff --git a/bindings/vala/ibus-1.0/ibus-1.0.gi b/bindings/vala/ibus-1.0/ibus-1.0.gi
index 8728a9f..ac8e689 100644 (file)
--- a/bindings/vala/ibus-1.0/ibus-1.0.gi
+++ b/bindings/vala/ibus-1.0/ibus-1.0.gi
@@ -160,18 +160,6 @@
                </callback>
                <struct name="BusComponent">
                </struct>
-               <struct name="DBusConnection">
-               </struct>
-               <struct name="DBusServer">
-               </struct>
-               <struct name="IBusError">
-               </struct>
-               <struct name="IBusMessage">
-               </struct>
-               <struct name="IBusMessageIter">
-               </struct>
-               <struct name="IBusPendingCall">
-               </struct>
                <struct name="IBusRectangle">
                        <field name="x" type="gint"/>
                        <field name="y" type="gint"/>

diff --git a/src/Makefile.am b/src/Makefile.am
index 4613739..a1406d4 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -102,7 +102,6 @@ ibus_enumtypes_sources =    \
        $(NULL)
 ibus_headers =              \
        ibus.h                  \
-       ibusdbus.h              \
        ibusversion.h           \
        ibusshare.h             \
        ibusdebug.h             \

diff --git a/src/ibusdbus.h b/src/ibusdbus.h
deleted file mode 100644 (file)
index 3b49250..0000000
--- a/src/ibusdbus.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/* -*- 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.
- */
-
-#if !defined (__IBUS_H_INSIDE__) && !defined (IBUS_COMPILATION)
-#error "Only <ibus.h> can be included directly"
-#endif
-
-/**
- * SECTION: ibusdbus
- * @Title: IBusDBus
- * @Short_description: DBus types
- * @Stability: Stable
- *
- */
-#ifndef __IBUS_DBUS_H_
-#define __IBUS_DBUS_H_
-
-G_BEGIN_DECLS
-
-#ifndef DBUS_H
-typedef struct IBusError IBusError;
-typedef struct IBusMessage IBusMessage;
-typedef struct IBusMessageIter IBusMessageIter;
-typedef struct IBusPendingCall IBusPendingCall;
-typedef struct DBusServer DBusServer;
-typedef struct DBusConnection DBusConnection;
-#else
-/**
- * IBusError:
- *
- * A data type representing an IBusError.
- * An IBusError is actually a #DBusError.
- *
- * @see_also: #DBusError for detail structure definition.
- */
-typedef DBusError IBusError;
-
-/**
- * IBusMessage:
- *
- * An opaque data structure that represents IBusMessage.
- */
-typedef DBusMessage IBusMessage;
-
-/**
- * IBusMessageIter:
- *
- * An opaque data structure that represents IBusMessageIter.
- */
-typedef DBusMessageIter IBusMessageIter;
-
-/**
- * IBusPendingCall:
- *
- * An opaque data structure that represents IBusPendingCall.
- */
-typedef DBusPendingCall IBusPendingCall;
-
-#endif
-
-G_END_DECLS
-
-#endif